From 29130d39e3f002b684d4fdbcb3dff4ecc202be2c Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Mon, 16 Feb 2015 12:48:05 +0000 Subject: mvebu: refresh 3.18 patches Signed-off-by: Imre Kaloz SVN-Revision: 44462 --- .../020-ARM-mvebu-Add-a-number-of-pinctrl-functions.patch | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'target/linux/mvebu/patches-3.18/020-ARM-mvebu-Add-a-number-of-pinctrl-functions.patch') diff --git a/target/linux/mvebu/patches-3.18/020-ARM-mvebu-Add-a-number-of-pinctrl-functions.patch b/target/linux/mvebu/patches-3.18/020-ARM-mvebu-Add-a-number-of-pinctrl-functions.patch index 7e27ae2..551d5bf 100644 --- a/target/linux/mvebu/patches-3.18/020-ARM-mvebu-Add-a-number-of-pinctrl-functions.patch +++ b/target/linux/mvebu/patches-3.18/020-ARM-mvebu-Add-a-number-of-pinctrl-functions.patch @@ -15,13 +15,11 @@ Signed-off-by: Andrew Lunn arch/arm/boot/dts/armada-38x.dtsi | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) -diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi -index 40200084c6c8..98885c58be29 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi -@@ -195,6 +195,45 @@ - - pinctrl@18000 { +@@ -196,6 +196,45 @@ + pinctrl { + compatible = "marvell,mv88f6820-pinctrl"; reg = <0x18000 0x20>; + + ge0_rgmii_pins: ge-rgmii-pins-0 { @@ -65,6 +63,3 @@ index 40200084c6c8..98885c58be29 100644 }; gpio0: gpio@18100 { --- -2.2.1 - -- cgit v1.1