From patchwork Thu Jan 26 08:33:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 9538451 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 70D076046A for ; Thu, 26 Jan 2017 08:35:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64BD92819A for ; Thu, 26 Jan 2017 08:35:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5978B281C3; Thu, 26 Jan 2017 08:35:31 +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 CB7BE2819A for ; Thu, 26 Jan 2017 08:35:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753174AbdAZIf1 (ORCPT ); Thu, 26 Jan 2017 03:35:27 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:43161 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752950AbdAZIeJ (ORCPT ); Thu, 26 Jan 2017 03:34:09 -0500 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OKD008B1P4SHX50@mailout4.w1.samsung.com>; Thu, 26 Jan 2017 08:34:04 +0000 (GMT) Received: from eusmges5.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170126083404eucas1p2095c33bfcd1ff92c9cb1b2fe1c6b265a~dRUvd5x0O0139801398eucas1p2F; Thu, 26 Jan 2017 08:34:04 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges5.samsung.com (EUCPMTA) with SMTP id 9B.BC.17477.B74B9885; Thu, 26 Jan 2017 08:34:03 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170126083403eucas1p2328ed884334b453ffb1faac3c745cec3~dRUutKHjt0057100571eucas1p21; Thu, 26 Jan 2017 08:34:03 +0000 (GMT) X-AuditID: cbfec7f5-f79d06d000004445-e8-5889b47b50ae Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 18.34.06687.BB4B9885; Thu, 26 Jan 2017 08:35:07 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OKD000KKP4KMO50@eusync1.samsung.com>; Thu, 26 Jan 2017 08:34:03 +0000 (GMT) From: Marek Szyprowski To: linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, devicetree@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 v2 5/8] mfd: exynos-lpass: Remove pad retention control Date: Thu, 26 Jan 2017 09:33:51 +0100 Message-id: <1485419634-28331-6-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1485419634-28331-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrGIsWRmVeSWpSXmKPExsWy7djPc7rVWzojDE49sbHYOGM9q8X8I+dY Lc6f38Bucf/rUUaLKX+WM1lsenyN1WLz/D+MFpd3zWGzmHF+H5PF2iN32S0Ov2lntVi16w+j A4/Hzll32T02repk87hzbQ+bx+Yl9R59W1YxenzeJBfAFsVlk5Kak1mWWqRvl8CVcXTNf9aC C/IVj37MZG9gPCzVxcjJISFgInG38wg7hC0mceHeejYQW0hgKaPEk91VXYxcQPZnRom73w4z wjTMmbqVGSKxjFFiYvcGRgingUni99eLYO1sAoYSXW+72EASIiCjji7rBHOYBTYxSbQtOcEM UiUs4C5xb/l2sA4WAVWJ1cd7WUFsXgEPiVmXe6GOkpM4eWwyWJxTwFPi9NNX7CCDJAQWsUss XrsYKMEB5MhKbDrADFHvIrFs5gSoXmGJV8e3QNkyEp0dB5kg7H5GiaZWbQh7BqPEube8ELa1 xOHjF8F2MQvwSUzaNp0ZYjyvREebEESJh0TD0q9QIx0l7tw7wA4JrzmMEqe3BE9glFnAyLCK USS1tDg3PbXYVK84Mbe4NC9dLzk/dxMjMPZP/zv+dQfj0mNWhxgFOBiVeHgP7OiIEGJNLCuu zD3EKMHBrCTCe351Z4QQb0piZVVqUX58UWlOavEhRmkOFiVx3j0LroQLCaQnlqRmp6YWpBbB ZJk4OKUaGBMsShaaSt1+qMSeql15mS8g3sN69wVp3U3P5O+W/Lh/UP/qpJ1pD5ttgqbWMcY2 JQY7f1j5re++q//ibj2zJbo3n6n7vpgeLr35n1Lt1V0VT1oZ5RJYcsz1rjw9zXMl1uDU9bbY f8fuLYq/VXd0lQWTkyhTgw8f94nc2sb9J1q4tliE2K1lUWIpzkg01GIuKk4EALMaswj5AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgkeLIzCtJLcpLzFFi42I5/e/4Zd3dWzojDKYuErXYOGM9q8X8I+dY Lc6f38Bucf/rUUaLKX+WM1lsenyN1WLz/D+MFpd3zWGzmHF+H5PF2iN32S0Ov2lntVi16w+j A4/Hzll32T02repk87hzbQ+bx+Yl9R59W1YxenzeJBfAFuVmk5GamJJapJCal5yfkpmXbqsU GuKma6GkkJeYm2qrFKHrGxKkpFCWmFMK5BkZoAEH5wD3YCV9uwS3jKNr/rMWXJCvePRjJnsD 42GpLkZODgkBE4k5U7cyQ9hiEhfurWfrYuTiEBJYwihx88NKJginiUli7utnLCBVbAKGEl1v u8CqRASWMkr8X/mZHcRhFtjCJNG16SI7SJWwgLvEveXb2UBsFgFVidXHe1lBbF4BD4lZl3vZ IfbJSZw8NhkszingKXH66SuwuBBQzaaLC9knMPIuYGRYxSiSWlqcm55bbKhXnJhbXJqXrpec n7uJERgL24793LyD8dLG4EOMAhyMSjy8B3Z0RAixJpYVV+YeYpTgYFYS4T2/ujNCiDclsbIq tSg/vqg0J7X4EKMp0FETmaVEk/OBcZpXEm9oYmhuaWhkbGFhbmSkJM5b8uFKuJBAemJJanZq akFqEUwfEwenVANjuNV1mXuaX2TD7gSWqzKt1ZmjpluUz/PtstPJ3ZZrfTyjvV5KO93Zr1D+ 3NInkaFy29/p5bd5J86KtzO1v534Ml8wTaXx+lTOr1856xIUFZR070d8kJcVuTHL+tO+iXMb 3Ow9Lrjv3Xvy2OozeQHxa1Lld+eezZqhfvjDf5V/TnPXPn/mf6xIiaU4I9FQi7moOBEA3FmZ MpsCAAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170126083403eucas1p2328ed884334b453ffb1faac3c745cec3 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: 20170126083403eucas1p2328ed884334b453ffb1faac3c745cec3 X-RootMTR: 20170126083403eucas1p2328ed884334b453ffb1faac3c745cec3 References: <1485419634-28331-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 Acked-by: Rob Herring --- .../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_ */