From patchwork Mon Jan 30 12:38:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 9545141 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 BDBD060417 for ; Mon, 30 Jan 2017 12:40:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9DA0226E47 for ; Mon, 30 Jan 2017 12:40:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 927C826E54; Mon, 30 Jan 2017 12:40:47 +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=-1.9 required=2.0 tests=BAYES_00 autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F0AF026E47 for ; Mon, 30 Jan 2017 12:40:46 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cYBGH-0006rE-OD; Mon, 30 Jan 2017 12:40:45 +0000 Received: from mailout2.w1.samsung.com ([210.118.77.12]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cYBEf-0004aM-7j for linux-arm-kernel@lists.infradead.org; Mon, 30 Jan 2017 12:39:07 +0000 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OKL00CB3F4G1K60@mailout2.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 30 Jan 2017 12:38:40 +0000 (GMT) Received: from eusmges1.samsung.com (unknown [203.254.199.239]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170130123839eucas1p175cb8902925e7a90278ceb68b100ac16~ejPcRTSLS0307403074eucas1p1n; Mon, 30 Jan 2017 12:38:39 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1.samsung.com (EUCPMTA) with SMTP id DD.93.16908.2D33F885; Mon, 30 Jan 2017 12:38:42 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170130123839eucas1p156e10c543d4daf6675fa3e326a724cc2~ejPbndXxr0307403074eucas1p1k; Mon, 30 Jan 2017 12:38:39 +0000 (GMT) X-AuditID: cbfec7ef-f79d26d00000420c-dc-588f33d2a2cb Received: from eusync3.samsung.com ( [203.254.199.213]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 61.D6.06687.2143F885; Mon, 30 Jan 2017 12:39:46 +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 <0OKL0038AF49F510@eusync3.samsung.com>; Mon, 30 Jan 2017 12:38:39 +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 Subject: [PATCH v3 4/7] mfd: exynos-lpass: Remove pad retention control Date: Mon, 30 Jan 2017 13:38:25 +0100 Message-id: <1485779908-32147-5-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1485779908-32147-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrEIsWRmVeSWpSXmKPExsWy7djP87qXjPsjDGbMEbDYOGM9q8X58xvY Le5/PcpoMeXPciaLTY+vsVpsnv+H0eLyrjlsFjPO72OyWHvkLrvF4TftrBardv1hdOD22Dnr LrvHplWdbB53ru1h89i8pN6jb8sqRo/Pm+QC2KK4bFJSczLLUov07RK4Mm61lxW0K1ScujmV pYHxq1QXIyeHhICJxKpX21ggbDGJC/fWs3UxcnEICSxjlHi19RIThPOZUaLh6hlWmI6p/+Yy wVVdedoI1dLAJHG18xUzSBWbgKFE19susISIQDujxN2+DrAWZoFNTBJtS06AVQkLuEtcbJ/F CGKzCKhKbHu2F8zmFfCQmH75GhvEPjmJk8cmg+3mFPCU2PL0EDPIIAmB6ewSBz9NBjqdA8iR ldh0gBmi3kXizLYPULcKS7w6voUdwpaR6Ow4yARh9zNKNLVqQ9gzGCXOveWFsK0lDh+/CNbL LMAnMWnbdGaI8bwSHW1CECUeEqf3t0GtcpRY3fWREeL7OYwS6440sk1glFnAyLCKUSS1tDg3 PbXYUK84Mbe4NC9dLzk/dxMjMOZP/zv+fgfj0+aQQ4wCHIxKPLwNgn0RQqyJZcWVuYcYJTiY lUR4T6r2RwjxpiRWVqUW5ccXleakFh9ilOZgURLn3bvgSriQQHpiSWp2ampBahFMlomDU6qB MaLlzdFVj0ym3ZHMkVyuavnN8eeF4JWn2By+nuJcVNDic1n8T0I3w0KV6MB/L4PeHGwu3Hrp suk5EZG7Cyw5rh65Os/6d+untstRcxd8LFEpv7R/gaCpoZjCvhZus/rdqjm73X6oxf17eU4v 9b/RNfHHRYIzGWP2xD4wu8gdPWPieZvaSg5ebyWW4oxEQy3mouJEAIZBBOj1AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpikeLIzCtJLcpLzFFi42I5/e/4VV0hk/4Ig8Z5khYbZ6xntTh/fgO7 xf2vRxktpvxZzmSx6fE1VovN8/8wWlzeNYfNYsb5fUwWa4/cZbc4/Kad1WLVrj+MDtweO2fd ZffYtKqTzePOtT1sHpuX1Hv0bVnF6PF5k1wAW5SbTUZqYkpqkUJqXnJ+SmZeuq1SaIibroWS Ql5ibqqtUoSub0iQkkJZYk4pkGdkgAYcnAPcg5X07RLcMm61lxW0K1ScujmVpYHxq1QXIyeH hICJxNR/c5kgbDGJC/fWs3UxcnEICSxhlPh86ggLhNPEJNF1ex0bSBWbgKFE19susCoRgXZG ide3rzGBOMwCW4CqNl1kB6kSFnCXuNg+ixHEZhFQldj2bC+YzSvgITH98jU2iH1yEiePTWYF sTkFPCW2PD3EDGILAdWcv/GfZQIj7wJGhlWMIqmlxbnpucWGesWJucWleel6yfm5mxiB4b/t 2M/NOxgvbQw+xCjAwajEw3tDuC9CiDWxrLgy9xCjBAezkgjvSdX+CCHelMTKqtSi/Pii0pzU 4kOMpkBHTWSWEk3OB8ZmXkm8oYmhuaWhkbGFhbmRkZI4b8mHK+FCAumJJanZqakFqUUwfUwc nFINjJLcijfeVBlzqLTP1Ok5u//LoUf1ykW1R6+yz+Q3uLnBcZa2pHZv0qTDTvPep7oYNSyK e3hY/daut/fusC+1c4rf/HPivfWPTjaxcN3fe1OO8e/ZrGLVlMl2xnrHFsrsE75af1Q7fM7z rMS0x1Pe3zn07MF37fP31Z8/+jArTfAY58MXTustt7IosRRnJBpqMRcVJwIAumVccJUCAAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170130123839eucas1p156e10c543d4daf6675fa3e326a724cc2 X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 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: 20170130123839eucas1p156e10c543d4daf6675fa3e326a724cc2 X-RootMTR: 20170130123839eucas1p156e10c543d4daf6675fa3e326a724cc2 References: <1485779908-32147-1-git-send-email-m.szyprowski@samsung.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170130_043905_434787_26DCB205 X-CRM114-Status: GOOD ( 17.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartlomiej Zolnierkiewicz , Linus Walleij , Tomasz Figa , Krzysztof Kozlowski , Sylwester Nawrocki , Lee Jones , Marek Szyprowski MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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_ */