From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932619AbdCWIEH (ORCPT ); Thu, 23 Mar 2017 04:04:07 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:36951 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932354AbdCWID7 (ORCPT ); Thu, 23 Mar 2017 04:03:59 -0400 X-AuditID: cbfec7f2-f790f6d000002555-c0-58d381641294 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 , Chanwoo Choi Subject: [PATCH v4 3/6] mfd: exynos-lpass: Remove pad retention control Date: Thu, 23 Mar 2017 09:03:24 +0100 Message-id: <1490256207-10061-4-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1490256207-10061-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrCIsWRmVeSWpSXmKPExsWy7djP87opjZcjDA5O17HYOGM9q8X1L89Z Lc6f38Bucf/rUUaLKX+WM1lsenyN1WLz/D+MFpd3zWGzmHF+H5PF2iN32S0Ov2lntVi16w+j A4/Hzll32T02repk87hzbQ+bx+Yl9R59W1YxenzeJBfAFsVlk5Kak1mWWqRvl8CV0Xr2K3PB E4WKZ48vsjYwnpDuYuTgkBAwkTixubqLkRPIFJO4cG89G0hYSGApo0QfSxcjF5D5mVFiwel1 7DDlM5erQsSXMUrc7jjNCuE0MEl0zzrKBDKITcBQouttFxtIQkSgnVHibl8HE4jDLHCDSaLl /lQ2kCphAXeJ3XuvM4LYLAKqEru7zoDFeQU8JHa/bGCGOElO4uSxyawgNqeAp8TVNQfBbpIQ WMYuMX32FDaIm2QlNh2AqneR+N+xBcoWlnh1fAs7hC0j0dlxkAnC7meUaGrVhrBnMEqce8sL YVtLHD5+EWwXswCfxKRt05khxvNKdLQJQZR4SBw59Y0NwnaUmPz6FTPE93MYJdbv3sA0gVFm ASPDKkaR1NLi3PTUYmO94sTc4tK8dL3k/NxNjMC4P/3v+KcdjF9PWB1iFOBgVOLh3VB3KUKI NbGsuDL3EKMEB7OSCK9t4eUIId6UxMqq1KL8+KLSnNTiQ4zSHCxK4rx7FlwJFxJITyxJzU5N LUgtgskycXBKNTCW+ySYGhxW3O3F+tJdf51X1Fu1bUusDjY/3qcVkbMjLuJu45+phq9PVJd9 Kj1e9cvpUIXYF0euitJ/q9dvfv4l1mGTaPu9tU8zdcOuv72UoPOiM07p7AoHo4r8s9encn4U 5rVV3/1p6vzotYyZH2e/Xe69IKBaa6pt9L6PdYWuiQ+495hs+VStxFKckWioxVxUnAgABaVe KfcCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmplkeLIzCtJLcpLzFFi42I5/e/4Fd0LjZcjDN7clrLYOGM9q8X1L89Z Lc6f38Bucf/rUUaLKX+WM1lsenyN1WLz/D+MFpd3zWGzmHF+H5PF2iN32S0Ov2lntVi16w+j A4/Hzll32T02repk87hzbQ+bx+Yl9R59W1YxenzeJBfAFuVmk5GamJJapJCal5yfkpmXbqsU GuKma6GkkJeYm2qrFKHrGxKkpFCWmFMK5BkZoAEH5wD3YCV9uwS3jNazX5kLnihUPHt8kbWB 8YR0FyMHh4SAicTM5apdjJxAppjEhXvr2UBsIYEljBIfv7N2MXIB2U1MEmvXvGYHSbAJGEp0 ve1iA0mICLQzSry+fY0JJMEscIdJYsPLFBBbWMBdYvfe64wgNouAqsTurjNgU3kFPCR2v2xg htgmJ3Hy2GRWEJtTwFPi6pqDLBCbPSQ23PnEPoGRdwEjwypGkdTS4tz03GJDveLE3OLSvHS9 5PzcTYzAKNh27OfmHYyXNgYfYhTgYFTi4Y2ouRQhxJpYVlyZe4hRgoNZSYTXtvByhBBvSmJl VWpRfnxRaU5q8SFGU6CjJjJLiSbnAyM0ryTe0MTQ3NLQyNjCwtzISEmct+TDlXAhgfTEktTs 1NSC1CKYPiYOTqkGRttl38K7jjZ8v7jS5uvKPY8jF3quZjg3cY322fKenk3bL+epF+x9PEtH fvFUzmqOPV9XSQTpHJr3slb3cMP12H0hB5/uMJ1W+VDFUlKi8+JliX0zCp8sMLi17WOIoGtj yL9nM15zFlw7cOtM6Qv53eKmNbaeqZ8Ud0/8m33PY48Yt+VlT583S64rsRRnJBpqMRcVJwIA OWtyL5gCAAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170323080348eucas1p29d1fb4eb06e4785d20341be7a374bfb3 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: 20170323080348eucas1p29d1fb4eb06e4785d20341be7a374bfb3 X-RootMTR: 20170323080348eucas1p29d1fb4eb06e4785d20341be7a374bfb3 References: <1490256207-10061-1-git-send-email-m.szyprowski@samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Acked-for-MFD-by: Lee Jones --- .../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_ */ -- 1.9.1