diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2015-02-16 12:48:05 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2015-02-16 12:48:05 +0000 |
commit | 29130d39e3f002b684d4fdbcb3dff4ecc202be2c (patch) | |
tree | 481f328f8e8475fbd2b56a0a375da99e187d1cb9 /target/linux/mvebu/patches-3.18/020-ARM-mvebu-Add-a-number-of-pinctrl-functions.patch | |
parent | 00d422fc600232d02f70877305288501d15ed07d (diff) | |
download | upstream-29130d39e3f002b684d4fdbcb3dff4ecc202be2c.tar.gz upstream-29130d39e3f002b684d4fdbcb3dff4ecc202be2c.tar.bz2 upstream-29130d39e3f002b684d4fdbcb3dff4ecc202be2c.zip |
mvebu: refresh 3.18 patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 44462
Diffstat (limited to 'target/linux/mvebu/patches-3.18/020-ARM-mvebu-Add-a-number-of-pinctrl-functions.patch')
-rw-r--r-- | target/linux/mvebu/patches-3.18/020-ARM-mvebu-Add-a-number-of-pinctrl-functions.patch | 11 |
1 files changed, 3 insertions, 8 deletions
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 7e27ae2b41..551d5bf510 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 <andrew@lunn.ch> 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 - |