From patchwork Wed Aug 22 07:18:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 179255 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2E4282C008B for ; Wed, 22 Aug 2012 17:42:51 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T45X2-0002vR-Kr; Wed, 22 Aug 2012 07:39:16 +0000 Received: from co1ehsobe006.messaging.microsoft.com ([216.32.180.189] helo=co1outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T45WG-0002fA-1r for linux-arm-kernel@lists.infradead.org; Wed, 22 Aug 2012 07:38:32 +0000 Received: from mail99-co1-R.bigfish.com (10.243.78.229) by CO1EHSOBE012.bigfish.com (10.243.66.75) with Microsoft SMTP Server id 14.1.225.23; Wed, 22 Aug 2012 07:38:25 +0000 Received: from mail99-co1 (localhost [127.0.0.1]) by mail99-co1-R.bigfish.com (Postfix) with ESMTP id E4B5D600A8; Wed, 22 Aug 2012 07:38:25 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 6 X-BigFish: VS6(zcb8kzzz1202h1082kzz8275dhz2dh2a8h668h839hd24he5bhf0ah107ah1155h) Received: from mail99-co1 (localhost.localdomain [127.0.0.1]) by mail99-co1 (MessageSwitch) id 1345621103915194_28694; Wed, 22 Aug 2012 07:38:23 +0000 (UTC) Received: from CO1EHSMHS027.bigfish.com (unknown [10.243.78.228]) by mail99-co1.bigfish.com (Postfix) with ESMTP id CDCDAC0042; Wed, 22 Aug 2012 07:38:23 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO1EHSMHS027.bigfish.com (10.243.66.37) with Microsoft SMTP Server (TLS) id 14.1.225.23; Wed, 22 Aug 2012 07:38:21 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.2.309.3; Wed, 22 Aug 2012 02:38:14 -0500 Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id q7M7bcgt031199; Wed, 22 Aug 2012 00:38:10 -0700 From: Dong Aisheng To: Subject: [PATCH 5/7] ARM: imx6q: convert to use imx-syscon to access anatop registers Date: Wed, 22 Aug 2012 15:18:46 +0800 Message-ID: <1345619928-15446-6-git-send-email-b29396@freescale.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1345619928-15446-1-git-send-email-b29396@freescale.com> References: <1345619928-15446-1-git-send-email-b29396@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [216.32.180.189 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linus.walleij@stericsson.com, swarren@wwwdotorg.org, devicetree-discuss@lists.ozlabs.org, s.hauer@pengutronix.de, broonie@opensource.wolfsonmicro.com, rob.herring@calxeda.com, grant.likely@secretlab.ca, richard.zhao@freescale.com, kernel@pengutronix.de, paul.liu@linaro.org, shawn.guo@linaro.org, lrg@ti.com, linux-arm-kernel@lists.infradead.org, sameo@linux.intel.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org From: Dong Aisheng Using standard imx syscon API to access anatop registers. Signed-off-by: Dong Aisheng --- arch/arm/mach-imx/Kconfig | 2 +- arch/arm/mach-imx/mach-imx6q.c | 25 ++++++------------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index afd542a..c7b2adb 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -839,7 +839,7 @@ config SOC_IMX6Q select HAVE_IMX_MMDC select HAVE_IMX_SRC select HAVE_SMP - select MFD_ANATOP + select MFD_IMX_SYSCON select PINCTRL select PINCTRL_IMX6Q diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 5ec0608..32a9c9e 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -24,8 +24,9 @@ #include #include #include +#include #include -#include +#include #include #include #include @@ -121,20 +122,8 @@ static void __init imx6q_sabrelite_init(void) static void __init imx6q_usb_init(void) { struct device_node *np; - struct platform_device *pdev = NULL; - struct anatop *adata = NULL; np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-anatop"); - if (np) - pdev = of_find_device_by_node(np); - if (pdev) - adata = platform_get_drvdata(pdev); - if (!adata) { - if (np) - of_node_put(np); - return; - } - #define HW_ANADIG_USB1_CHRG_DETECT 0x000001b0 #define HW_ANADIG_USB2_CHRG_DETECT 0x00000210 @@ -145,14 +134,12 @@ static void __init imx6q_usb_init(void) * The external charger detector needs to be disabled, * or the signal at DP will be poor */ - anatop_write_reg(adata, HW_ANADIG_USB1_CHRG_DETECT, + imx_syscon_write(np, HW_ANADIG_USB1_CHRG_DETECT, BM_ANADIG_USB_CHRG_DETECT_EN_B - | BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B, - ~0); - anatop_write_reg(adata, HW_ANADIG_USB2_CHRG_DETECT, + | BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B); + imx_syscon_write(np, HW_ANADIG_USB2_CHRG_DETECT, BM_ANADIG_USB_CHRG_DETECT_EN_B | - BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B, - ~0); + BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B); of_node_put(np); }