From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yingjoe Chen Subject: [PATCH v2 2/2] arm64: dts: mt8173: Fixup pinctrl nodes Date: Fri, 1 May 2015 14:49:31 +0800 Message-ID: <1430462971-28195-2-git-send-email-yingjoe.chen@mediatek.com> References: <1430462971-28195-1-git-send-email-yingjoe.chen@mediatek.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <1430462971-28195-1-git-send-email-yingjoe.chen@mediatek.com> Sender: linux-kernel-owner@vger.kernel.org To: Matthias Brugger , Rob Herring , Mark Rutland Cc: devicetree@vger.kernel.org, Russell King , srv_heupstream@mediatek.com, Hongzhou Yang , Catalin Marinas , Will Deacon , linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Sascha Hauer , Yingjoe Chen , Eddie Huang , linux-arm-kernel@lists.infradead.org, Daniel Kurtz List-Id: devicetree@vger.kernel.org The 8173 pinctrl node doesn't follow dts convention. Fix them. Also add a comment to explain pinctrl register usage to make it more clear. Signed-off-by: Yingjoe Chen Reviewed-by: Daniel Kurtz --- arch/arm64/boot/dts/mediatek/mt8173.dtsi | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi index 924fdb6..4595196 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi @@ -106,14 +106,13 @@ compatible = "simple-bus"; ranges; - syscfg_pctl_a: syscfg_pctl_a@10005000 { - compatible = "mediatek,mt8173-pctl-a-syscfg", "syscon"; - reg = <0 0x10005000 0 0x1000>; - }; - - pio: pinctrl@0x10005000 { + /* + * Pinctrl access register at 0x10005000 through regmap. + * Register 0x1000b000 is used by EINT. + */ + pio: pinctrl@10005000 { compatible = "mediatek,mt8173-pinctrl"; - reg = <0 0x1000B000 0 0x1000>; + reg = <0 0x1000b000 0 0x1000>; mediatek,pctl-regmap = <&syscfg_pctl_a>; pins-are-numbered; gpio-controller; @@ -121,8 +120,13 @@ interrupt-controller; #interrupt-cells = <2>; interrupts = , - , - ; + , + ; + }; + + syscfg_pctl_a: syscfg_pctl_a@10005000 { + compatible = "mediatek,mt8173-pctl-a-syscfg", "syscon"; + reg = <0 0x10005000 0 0x1000>; }; sysirq: intpol-controller@10200620 { -- 1.8.1.1.dirty