From patchwork Wed May 25 08:58:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Behme X-Patchwork-Id: 9135013 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9D9AE60221 for ; Wed, 25 May 2016 08:58:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9133B280D2 for ; Wed, 25 May 2016 08:58:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8651F282DA; Wed, 25 May 2016 08:58:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3BC07280D2 for ; Wed, 25 May 2016 08:58:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754002AbcEYI6j (ORCPT ); Wed, 25 May 2016 04:58:39 -0400 Received: from smtp6-v.fe.bosch.de ([139.15.237.11]:10020 "EHLO smtp6-v.fe.bosch.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754008AbcEYI6g (ORCPT ); Wed, 25 May 2016 04:58:36 -0400 Received: from vsmta12.fe.internet.bosch.com (unknown [10.4.98.52]) by imta24.fe.bosch.de (Postfix) with ESMTP id 0B865D80239 for ; Wed, 25 May 2016 10:58:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=de.bosch.com; s=2015-01-21; t=1464166715; bh=3JCfcJFkOWEsjr1jlyfWUJVtOO8bh7k8OIKkS+2IQGw=; l=10; h=From:From:Reply-To:Sender; b=BNwdIiUKykparkRSy7dPNm441Ru5cTiPCcSpBFpI0UNXtbxH+E6qr5Pl1mxVbbIKl i8wOsXe1Ajz2xMrdpH+4YklcDBhr2t1j+r16aYZwbmslzYjqSPvLiVJcQK8XnaNopI /LPeM/PRWxunt/5/eB+WwMnNbELRrbOUnohs74Cg= Received: from FE-HUB1001.de.bosch.com (vsgw23.fe.internet.bosch.com [10.4.98.23]) by vsmta12.fe.internet.bosch.com (Postfix) with ESMTP id BD09D1B80522 for ; Wed, 25 May 2016 10:58:34 +0200 (CEST) Received: from hi-z08if.hi.de.bosch.com (10.34.209.31) by FE-HUB1001.de.bosch.com (10.4.103.109) with Microsoft SMTP Server id 14.3.195.1; Wed, 25 May 2016 10:58:32 +0200 Received: from hi-z08if.hi.de.bosch.com (localhost [127.0.0.1]) by hi-z08if.hi.de.bosch.com (Postfix) with ESMTP id CA37C625EC3; Wed, 25 May 2016 10:58:30 +0200 (CEST) From: Dirk Behme To: Geert Uytterhoeven , Simon Horman , , Koji Matsuoka CC: Dirk Behme Subject: [PATCH 4/4] drm: rcar-du: Use product register framework Date: Wed, 25 May 2016 10:58:28 +0200 Message-ID: <1464166708-18320-5-git-send-email-dirk.behme@de.bosch.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1464166708-18320-1-git-send-email-dirk.behme@de.bosch.com> References: <1464166708-18320-1-git-send-email-dirk.behme@de.bosch.com> MIME-Version: 1.0 X-TM-AS-MML: disable X-TM-AS-Product-Ver: IMSS-7.1.0.1679-8.0.0.1202-22342.006 X-TMASE-MatchedRID: 2wf8S1a0YJ2Dzdmvk4Gt0rMjW/sniEQKLdLfmiFS7ftJJReS9JUB3AHs 84h28iGSO+8+/TsUlown1aTwtcqsuG+K2RTOFgGNxEwSTOeVUQ6pPPWKXS4COwqiCYa6w8tvVSd AA6mVeIZiQCnErejxRJ/PKc+pIt08BLIUC3yGa8pRKfej56hSbH0tCKdnhB589yM15V5aWpj6C0 ePs7A07c+mdjb1i6PwCwsSOVMWz6ZFYXN99PAsGP/VHP4ujSCvzNKq8ks0CzhWXGvUUmKP2w== Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of hard coding the product register in the rcar-du, use the framework for it to get the SoC version and the revision needed for the enabling the workaround. Signed-off-by: Dirk Behme --- drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c index e10943b..ee639a6 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c @@ -13,6 +13,7 @@ #include #include +#include #include #include @@ -30,12 +31,6 @@ #include "rcar_du_regs.h" #include "rcar_du_vsp.h" -#define PRODUCT_REG 0xfff00044 -#define PRODUCT_H3_BIT (0x4f << 8) -#define PRODUCT_MASK (0x7f << 8) -#define CUT_ES1 (0x00) -#define CUT_ES1_MASK (0x000000ff) - static u32 rcar_du_crtc_read(struct rcar_du_crtc *rcrtc, u32 reg) { struct rcar_du_device *rcdu = rcrtc->group->dev; @@ -167,7 +162,6 @@ static void rcar_du_crtc_set_display_timing(struct rcar_du_crtc *rcrtc) u32 div; u32 dpll_reg = 0; struct dpll_info *dpll; - void __iomem *product_reg; bool h3_es1_workaround = false; dpll = kzalloc(sizeof(*dpll), GFP_KERNEL); @@ -175,11 +169,8 @@ static void rcar_du_crtc_set_display_timing(struct rcar_du_crtc *rcrtc) return; /* DU2 DPLL Clock Select bit workaround in R-Car H3(ES1.0) */ - product_reg = ioremap(PRODUCT_REG, 0x04); - if (((readl(product_reg) & PRODUCT_MASK) == PRODUCT_H3_BIT) - && ((readl(product_reg) & CUT_ES1_MASK) == CUT_ES1)) + if (cpu_is_rcar3_h3() && revision_is_rcar3_es1()) h3_es1_workaround = true; - iounmap(product_reg); /* Compute the clock divisor and select the internal or external dot * clock based on the requested frequency.