From patchwork Wed Jan 25 11:50:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 9536883 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 6DAC0604A0 for ; Wed, 25 Jan 2017 11:52:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 54A8326E94 for ; Wed, 25 Jan 2017 11:52:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4988627D9B; Wed, 25 Jan 2017 11:52:57 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 D5CE026E94 for ; Wed, 25 Jan 2017 11:52:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752162AbdAYLwz (ORCPT ); Wed, 25 Jan 2017 06:52:55 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:50191 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751418AbdAYLvH (ORCPT ); Wed, 25 Jan 2017 06:51:07 -0500 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OKC00ECG3L54U10@mailout1.w1.samsung.com>; Wed, 25 Jan 2017 11:51:05 +0000 (GMT) Received: from eusmges5.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170125115104eucas1p111e8adf32150c9fbd763d63f2fc01c20~dAXd5lBUK0875708757eucas1p1Q; Wed, 25 Jan 2017 11:51:04 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges5.samsung.com (EUCPMTA) with SMTP id B7.D0.17477.82198885; Wed, 25 Jan 2017 11:51:04 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170125115104eucas1p219f763cea7fdb2dfea092d1f2a28fc31~dAXdMoXZs1193111931eucas1p2r; Wed, 25 Jan 2017 11:51:03 +0000 (GMT) X-AuditID: cbfec7f5-f79d06d000004445-6f-588891289264 Received: from eusync3.samsung.com ( [203.254.199.213]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 48.8E.10233.52198885; Wed, 25 Jan 2017 11:51:01 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OKC00H7J3KW4970@eusync3.samsung.com>; Wed, 25 Jan 2017 11:51:03 +0000 (GMT) From: Marek Szyprowski To: linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Marek Szyprowski , Sylwester Nawrocki , Krzysztof Kozlowski , Linus Walleij , Tomasz Figa , Lee Jones , Bartlomiej Zolnierkiewicz Subject: [PATCH 5/7] mfd: exynos-lpass: Remove pad retention control Date: Wed, 25 Jan 2017 12:50:29 +0100 Message-id: <1485345031-2948-6-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1485345031-2948-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrIIsWRmVeSWpSXmKPExsWy7djP87oaEzsiDO53y1lsnLGe1eL8+Q3s Fve/HmW0mPJnOZPFpsfXWC02z//DaHF51xw2ixnn9zFZrD1yl93i8Jt2VotVu/4wOnB77Jx1 l91j06pONo871/aweWxeUu/Rt2UVo8fnTXIBbFFcNimpOZllqUX6dglcGcdP3mEtmC9fcaF1 G2MD43SpLkZODgkBE4nezVOZIGwxiQv31rN1MXJxCAksZZR40rqNBcL5zChxZfl0JpiOv3vW MEEkljFKHFg+GcppYJJoubqFGaSKTcBQouttF9gsEYF2Rom7fR1gVcwCm5gk2pacAKsSFnCR mL8UZDsHB4uAqsTypXogYV4Bd4mzi+YxQqyTkzh5bDIrSAmngIfEkTcmIGMkBKazS6z60cwM EpcQkJXYdIAZotxF4l3bIyhbWOLV8S3sELaMxOXJ3SwQdj+jRFOrNoQ9g1Hi3FteCNta4vDx i6wgNrMAn8SkbdOhxvNKdLQJQZR4SHTu/w81xlGib9NXaAjNZpQ4v+8NywRGmQWMDKsYRVJL i3PTU4tN9YoTc4tL89L1kvNzNzECI/70v+NfdzAuPWZ1iFGAg1GJh3dCUnuEEGtiWXFl7iFG CQ5mJRFeh5aOCCHelMTKqtSi/Pii0pzU4kOM0hwsSuK8exZcCRcSSE8sSc1OTS1ILYLJMnFw SjUwbvo1qzvC+3t1b8pF9TyBhzMuCm+wFRYKic74sU46ptPZ7/bsa7s/O2Y3vefXSA7wWKk8 P+fHpntm3b8n/7umNC/M7OS1jXNUZXp4PM4ZNYmGcpiFnYq4KX1uofQqg6tOf8tvuBXtnvxr 9s7SSONOxYelFcXJR1/Hz96s7fRqbuJOxjXlX+ZPUmIpzkg01GIuKk4EAIQpO4P0AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpgkeLIzCtJLcpLzFFi42I5/e/4VV3ViR0RBgtO8VpsnLGe1eL8+Q3s Fve/HmW0mPJnOZPFpsfXWC02z//DaHF51xw2ixnn9zFZrD1yl93i8Jt2VotVu/4wOnB77Jx1 l91j06pONo871/aweWxeUu/Rt2UVo8fnTXIBbFFuNhmpiSmpRQqpecn5KZl56bZKoSFuuhZK CnmJuam2ShG6viFBSgpliTmlQJ6RARpwcA5wD1bSt0twyzh+8g5rwXz5igut2xgbGKdLdTFy ckgImEj83bOGCcIWk7hwbz0biC0ksIRRouEpSxcjF5DdxCTR938iO0iCTcBQouttFxtIQkSg nVHi9e1rTCAOs8AWJomuTRfBqoQFXCTmL50KlODgYBFQlVi+VA8kzCvgLnF20TxGiG1yEieP TWYFKeEU8JA48sYEYrG7xJzmXuYJjLwLGBlWMYqklhbnpucWG+kVJ+YWl+al6yXn525iBIb+ tmM/t+xg7HoXfIhRgINRiYd3QlJ7hBBrYllxZe4hRgkOZiURXoeWjggh3pTEyqrUovz4otKc 1OJDjKZAJ01klhJNzgfGZV5JvKGJobmloZGxhYW5kZGSOO/UD1fChQTSE0tSs1NTC1KLYPqY ODilGhirJ1q8WZC7ftcmrXtT894ryXjnf37sJ+Y5IeiN8wGxtILO4/2ltw4b3FntnVD1f/0X V9X2OplV/C8ffVNh6Yuc+X7akjcTPDlqZMPNT/Xz8WVN5lvy+X5mRVzklQvzxZZemNTZ8/kn l2/uvvdPHD/wy8yM9OirkU9/1mG69VxBn9r9G1wvHeKVWIozEg21mIuKEwGK8gTUkwIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170125115104eucas1p219f763cea7fdb2dfea092d1f2a28fc31 X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 X-Local-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRs=?= =?UTF-8?B?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRtT?= =?UTF-8?B?YW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170125115104eucas1p219f763cea7fdb2dfea092d1f2a28fc31 X-RootMTR: 20170125115104eucas1p219f763cea7fdb2dfea092d1f2a28fc31 References: <1485345031-2948-1-git-send-email-m.szyprowski@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Pad retention should be controlled from pin control driver, so remove it from Exynos LPASS driver. After this change, no more access to PMU regmap is needed, so remove also the code for handling PMU regmap. Signed-off-by: Marek Szyprowski Acked-by: Krzysztof Kozlowski Acked-by: Sylwester Nawrocki --- .../bindings/mfd/samsung,exynos5433-lpass.txt | 2 -- drivers/mfd/exynos-lpass.c | 17 ----------------- include/linux/mfd/syscon/exynos5-pmu.h | 3 --- 3 files changed, 22 deletions(-) diff --git a/Documentation/devicetree/bindings/mfd/samsung,exynos5433-lpass.txt b/Documentation/devicetree/bindings/mfd/samsung,exynos5433-lpass.txt index c110e118b79f..a8deaee82c44 100644 --- a/Documentation/devicetree/bindings/mfd/samsung,exynos5433-lpass.txt +++ b/Documentation/devicetree/bindings/mfd/samsung,exynos5433-lpass.txt @@ -5,7 +5,6 @@ Required properties: - compatible : "samsung,exynos5433-lpass" - reg : should contain the LPASS top SFR region location and size - - samsung,pmu-syscon : the phandle to the Power Management Unit node - #address-cells : should be 1 - #size-cells : should be 1 - ranges : must be present @@ -25,7 +24,6 @@ Example: audio-subsystem { compatible = "samsung,exynos5433-lpass"; reg = <0x11400000 0x100>, <0x11500000 0x08>; - samsung,pmu-syscon = <&pmu_system_controller>; #address-cells = <1>; #size-cells = <1>; ranges; diff --git a/drivers/mfd/exynos-lpass.c b/drivers/mfd/exynos-lpass.c index 2e064fb8826f..17915daa2e80 100644 --- a/drivers/mfd/exynos-lpass.c +++ b/drivers/mfd/exynos-lpass.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -51,8 +50,6 @@ #define LPASS_INTR_SFR BIT(0) struct exynos_lpass { - /* pointer to the Power Management Unit regmap */ - struct regmap *pmu; /* pointer to the LPASS TOP regmap */ struct regmap *top; }; @@ -81,10 +78,6 @@ static void exynos_lpass_enable(struct exynos_lpass *lpass) regmap_write(lpass->top, SFR_LPASS_INTR_CPU_MASK, LPASS_INTR_SFR | LPASS_INTR_DMA | LPASS_INTR_I2S); - /* Activate related PADs from retention state */ - regmap_write(lpass->pmu, EXYNOS5433_PAD_RETENTION_AUD_OPTION, - EXYNOS5433_PAD_INITIATE_WAKEUP_FROM_LOWPWR); - exynos_lpass_core_sw_reset(lpass, LPASS_I2S_SW_RESET); exynos_lpass_core_sw_reset(lpass, LPASS_DMA_SW_RESET); exynos_lpass_core_sw_reset(lpass, LPASS_MEM_SW_RESET); @@ -95,9 +88,6 @@ static void exynos_lpass_disable(struct exynos_lpass *lpass) /* Mask any unmasked IP interrupt sources */ regmap_write(lpass->top, SFR_LPASS_INTR_CPU_MASK, 0); regmap_write(lpass->top, SFR_LPASS_INTR_CA5_MASK, 0); - - /* Deactivate related PADs from retention state */ - regmap_write(lpass->pmu, EXYNOS5433_PAD_RETENTION_AUD_OPTION, 0); } static const struct regmap_config exynos_lpass_reg_conf = { @@ -131,13 +121,6 @@ static int exynos_lpass_probe(struct platform_device *pdev) return PTR_ERR(lpass->top); } - lpass->pmu = syscon_regmap_lookup_by_phandle(dev->of_node, - "samsung,pmu-syscon"); - if (IS_ERR(lpass->pmu)) { - dev_err(dev, "Failed to lookup PMU regmap\n"); - return PTR_ERR(lpass->pmu); - } - platform_set_drvdata(pdev, lpass); exynos_lpass_enable(lpass); diff --git a/include/linux/mfd/syscon/exynos5-pmu.h b/include/linux/mfd/syscon/exynos5-pmu.h index c28ff21ca4d2..0622ae86f9db 100644 --- a/include/linux/mfd/syscon/exynos5-pmu.h +++ b/include/linux/mfd/syscon/exynos5-pmu.h @@ -46,7 +46,4 @@ #define EXYNOS5_MIPI_PHY_S_RESETN BIT(1) #define EXYNOS5_MIPI_PHY_M_RESETN BIT(2) -#define EXYNOS5433_PAD_RETENTION_AUD_OPTION (0x3028) -#define EXYNOS5433_PAD_INITIATE_WAKEUP_FROM_LOWPWR BIT(28) - #endif /* _LINUX_MFD_SYSCON_PMU_EXYNOS5_H_ */