From: Maxime Ripard Date: Thu, 8 Jan 2015 17:38:07 +0000 (+0100) Subject: ARM: mvebu: A38x: Remove redundant pinctrl informations X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~8712^2~35^2~7 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=684f216f9eee5b38432c398cbd045ee2f3f11ece;p=mirror_ubuntu-artful-kernel.git ARM: mvebu: A38x: Remove redundant pinctrl informations The compatible set in the armada-38x DTSI is always overridden, and the reg defined in there is duplicated in the armada-380 and armada-385 DTSIs. Remove these useless items. Signed-off-by: Maxime Ripard Acked-by: Gregory CLEMENT Signed-off-by: Gregory CLEMENT Signed-off-by: Andrew Lunn --- diff --git a/arch/arm/boot/dts/armada-380.dtsi b/arch/arm/boot/dts/armada-380.dtsi index 13400ce88c54..7e509d2d74d0 100644 --- a/arch/arm/boot/dts/armada-380.dtsi +++ b/arch/arm/boot/dts/armada-380.dtsi @@ -34,7 +34,6 @@ internal-regs { pinctrl@18000 { compatible = "marvell,mv88f6810-pinctrl"; - reg = <0x18000 0x20>; }; }; diff --git a/arch/arm/boot/dts/armada-385.dtsi b/arch/arm/boot/dts/armada-385.dtsi index 5249a4d3c207..a54a252ddb4c 100644 --- a/arch/arm/boot/dts/armada-385.dtsi +++ b/arch/arm/boot/dts/armada-385.dtsi @@ -39,7 +39,6 @@ internal-regs { pinctrl@18000 { compatible = "marvell,mv88f6820-pinctrl"; - reg = <0x18000 0x20>; }; }; diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index ada1f206028b..40200084c6c8 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi @@ -194,7 +194,6 @@ }; pinctrl@18000 { - compatible = "marvell,mv88f6820-pinctrl"; reg = <0x18000 0x20>; };