From patchwork Thu Mar 23 08:03:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 95891 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp624598qgd; Thu, 23 Mar 2017 01:04:03 -0700 (PDT) X-Received: by 10.99.101.67 with SMTP id z64mr1469177pgb.78.1490256242945; Thu, 23 Mar 2017 01:04:02 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z12si3318934pfg.149.2017.03.23.01.04.02; Thu, 23 Mar 2017 01:04:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932370AbdCWIEA (ORCPT + 4 others); Thu, 23 Mar 2017 04:04:00 -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 S1753575AbdCWID5 (ORCPT ); Thu, 23 Mar 2017 04:03:57 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0ON9004CHD2CLP50@mailout4.w1.samsung.com>; Thu, 23 Mar 2017 08:03:48 +0000 (GMT) Received: from eusmges2.samsung.com (unknown [203.254.199.241]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170323080348eucas1p2fc6ad1be3c1e1145393a3b41928702a2~udCTSvERx2297922979eucas1p2U; Thu, 23 Mar 2017 08:03:48 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2.samsung.com (EUCPMTA) with SMTP id 7A.7C.30614.36183D85; Thu, 23 Mar 2017 08:03:47 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170323080347eucas1p2d0340709543b3ce128281e5a490216d4~udCSn16bd2295722957eucas1p2f; Thu, 23 Mar 2017 08:03:47 +0000 (GMT) X-AuditID: cbfec7f1-f793f6d000007796-ae-58d381630005 Received: from eusync2.samsung.com ( [203.254.199.212]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 6C.A7.10233.27183D85; Thu, 23 Mar 2017 08:04:02 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0ON90067HD26AT60@eusync2.samsung.com>; Thu, 23 Mar 2017 08:03:47 +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 , Chanwoo Choi Subject: [PATCH v4 1/6] pinctrl: samsung: Ensure that pad retention is disabled on driver init Date: Thu, 23 Mar 2017 09:03:22 +0100 Message-id: <1490256207-10061-2-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+NgFnrGIsWRmVeSWpSXmKPExsWy7djPc7rJjZcjDOZtt7TYOGM9q8X1L89Z Lc6f38Bucf/rUUaLKX+WM1lsenyN1WLz/D+MFpd3zWGzmHF+H5PF2iN32S0Ov2lntVi16w+j A4/Hzll32T02repk87hzbQ+bx+Yl9R59W1YxenzeJBfAFsVlk5Kak1mWWqRvl8CVsenLNqaC r1wV33pWsjUwzuTsYuTkkBAwkdi4Zy0LhC0mceHeerYuRi4OIYGljBL73zeyQjifGSX+zPzO BNNx83w/I0RiGaPEi0s32UESQgINTBINfaEgNpuAoUTX2y6wUSIC7YwSd/s6mEAcZoEbTBIt 96eygVQJCyRI/LxxghnEZhFQlTi0sRtsBa+Ah8TLN3tYIdbJSZw8NhnM5hTwlLi65iDUsfPY JdbNA9rMAWTLSmw6wAwRdpHYdPgpI4QtLPHq+BZ2CFtG4vLkbqjWfkaJplZtCHsGo8S5t7wQ trXE4eMXwVYxC/BJTNo2nRliPK9ER5sQRImHRHf/a2hAOEqcuPGSBRIQcxgljnf/ZJzAKLOA kWEVo0hqaXFuemqxkV5xYm5xaV66XnJ+7iZGYOyf/nf84w7G9yesDjEKcDAq8fBG1FyKEGJN LCuuzD3EKMHBrCTCa1t4OUKINyWxsiq1KD++qDQntfgQozQHi5I4754FV8KFBNITS1KzU1ML UotgskwcnFINjHtjP7l2sNwt/bE/P5BX0qilJSnk0JULRlMzhXdxOcaXne36cWRylYTkrRPB x3a8v+vaPn33W19l1jpR5RqmglSbqS+OdllPUCr8M83MfvW+Q8fiXhd3Fu03Er8VprRPZc7e cOEJbP7rN6rUt2+2OSfnGFyy+uMJxtTiyNSfmfv23mXW5bn7RImlOCPRUIu5qDgRAF7oeaT5 AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpjkeLIzCtJLcpLzFFi42I5/e/4Fd2ixssRBr33TS02zljPanH9y3NW i/PnN7Bb3P96lNFiyp/lTBabHl9jtdg8/w+jxeVdc9gsZpzfx2Sx9shddovDb9pZLVbt+sPo wOOxc9Zddo9NqzrZPO5c28PmsXlJvUffllWMHp83yQWwRbnZZKQmpqQWKaTmJeenZOal2yqF hrjpWigp5CXmptoqRej6hgQpKZQl5pQCeUYGaMDBOcA9WEnfLsEtY9OXbUwFX7kqvvWsZGtg nMnZxcjJISFgInHzfD8jhC0mceHeerYuRi4OIYEljBITdt6AcpqYJCac380OUsUmYCjR9bYL LCEi0M4o8fr2NSaQBLPAHSaJDS9Tuhg5OIQFEiS2H9MHCbMIqEoc2tgNVsIr4CHx8s0eVoht chInj00GszkFPCWurjnIAmILAdVsuPOJfQIj7wJGhlWMIqmlxbnpucVGesWJucWleel6yfm5 mxiBcbDt2M8tOxi73gUfYhTgYFTi4d1QdylCiDWxrLgy9xCjBAezkgivbeHlCCHelMTKqtSi /Pii0pzU4kOMpkBHTWSWEk3OB8ZoXkm8oYmhuaWhkbGFhbmRkZI479QPV8KFBNITS1KzU1ML Uotg+pg4OKUaGBeJqrIUfY52OSzKv+5ad9SNXN+0vaf2P2DoZFA/ovD1hZK402JTiV9Ldq/s Oxe+oKpMdKd2ypsz9U5s7Lc3Hnf39kh2L3nYft1S4PYs9rR7ph1e9SfTNhckHzj489v9y7UH HnLHd9uw7xZ+sa2ILfJyi4EMX++aRV7XY7p7xO08TXlcTsezKbEUZyQaajEXFScCAMb2smWZ AgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170323080347eucas1p2d0340709543b3ce128281e5a490216d4 X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 X-Local-Sender: =?utf-8?q?Marek_Szyprowski=1BSRPOL-Kernel_=28TP=29=1B?= =?utf-8?b?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?utf-8?q?Marek_Szyprowski=1BSRPOL-Kernel_=28TP=29=1BSam?= =?utf-8?q?sung_Electronics=1BSenior_Software_Engineer?= X-Sender-Code: =?utf-8?q?C10=1BEHQ=1BC10CD02CD027392?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170323080347eucas1p2d0340709543b3ce128281e5a490216d4 X-RootMTR: 20170323080347eucas1p2d0340709543b3ce128281e5a490216d4 References: <1490256207-10061-1-git-send-email-m.szyprowski@samsung.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org When pin controller device is a part of power domain, there is no guarantee that the power domain was not turned off and then on during boot process before probing of the pin control driver. If it happened, then pin control driver should ensure that pad retention is turned off during its probe call. Signed-off-by: Marek Szyprowski Reviewed-by: Krzysztof Kozlowski --- drivers/pinctrl/samsung/pinctrl-exynos.c | 5 +++++ 1 file changed, 5 insertions(+) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pinctrl/samsung/pinctrl-exynos.c b/drivers/pinctrl/samsung/pinctrl-exynos.c index f9b49967f512..fa8bdd9ae198 100644 --- a/drivers/pinctrl/samsung/pinctrl-exynos.c +++ b/drivers/pinctrl/samsung/pinctrl-exynos.c @@ -777,6 +777,7 @@ static void exynos_retention_disable(struct samsung_pinctrl_drv_data *drvdata) { struct samsung_retention_ctrl *ctrl; struct regmap *pmu_regs; + int i; ctrl = devm_kzalloc(drvdata->dev, sizeof(*ctrl), GFP_KERNEL); if (!ctrl) @@ -794,6 +795,10 @@ static void exynos_retention_disable(struct samsung_pinctrl_drv_data *drvdata) ctrl->enable = exynos_retention_enable; ctrl->disable = exynos_retention_disable; + /* Ensure that retention is disabled on driver init */ + for (i = 0; i < ctrl->nr_regs; i++) + regmap_write(pmu_regs, ctrl->regs[i], ctrl->value); + return ctrl; } From patchwork Thu Mar 23 08:03:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 95892 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp624601qgd; Thu, 23 Mar 2017 01:04:03 -0700 (PDT) X-Received: by 10.84.247.23 with SMTP id n23mr1763901pll.39.1490256243805; Thu, 23 Mar 2017 01:04:03 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z12si3318934pfg.149.2017.03.23.01.04.03; Thu, 23 Mar 2017 01:04:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932117AbdCWIED (ORCPT + 4 others); Thu, 23 Mar 2017 04:04:03 -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 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 <0ON9005A3D2DJ350@mailout4.w1.samsung.com>; Thu, 23 Mar 2017 08:03:49 +0000 (GMT) Received: from eusmges3.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170323080348eucas1p2449d81501b001a06209cd768ddb83558~udCUBpcy02296122961eucas1p2U; Thu, 23 Mar 2017 08:03:48 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3.samsung.com (EUCPMTA) with SMTP id 74.9B.09557.46183D85; Thu, 23 Mar 2017 08:03:48 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170323080348eucas1p29d1fb4eb06e4785d20341be7a374bfb3~udCTaGTuN0531405314eucas1p2M; Thu, 23 Mar 2017 08:03:48 +0000 (GMT) X-AuditID: cbfec7f2-f790f6d000002555-c0-58d381641294 Received: from eusync2.samsung.com ( [203.254.199.212]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 3A.E5.06687.0D183D85; Thu, 23 Mar 2017 08:05:36 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0ON90067HD26AT60@eusync2.samsung.com>; Thu, 23 Mar 2017 08:03:48 +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 , 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?q?Marek_Szyprowski=1BSRPOL-Kernel_=28TP=29=1B?= =?utf-8?b?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?utf-8?q?Marek_Szyprowski=1BSRPOL-Kernel_=28TP=29=1BSam?= =?utf-8?q?sung_Electronics=1BSenior_Software_Engineer?= X-Sender-Code: =?utf-8?q?C10=1BEHQ=1BC10CD02CD027392?= 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-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@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(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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_ */