diff options
Diffstat (limited to 'target/linux/mvebu/patches-3.18/017-define_and_use_common_armada_xp_spi_pinctrl_setting.patch')
-rw-r--r-- | target/linux/mvebu/patches-3.18/017-define_and_use_common_armada_xp_spi_pinctrl_setting.patch | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/target/linux/mvebu/patches-3.18/017-define_and_use_common_armada_xp_spi_pinctrl_setting.patch b/target/linux/mvebu/patches-3.18/017-define_and_use_common_armada_xp_spi_pinctrl_setting.patch deleted file mode 100644 index 9085db0..0000000 --- a/target/linux/mvebu/patches-3.18/017-define_and_use_common_armada_xp_spi_pinctrl_setting.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 547c653b64022618250ca9c7c30151927509ae98 Mon Sep 17 00:00:00 2001 -From: Arnaud Ebalard <arno@natisbad.org> -Date: Sat, 22 Nov 2014 00:46:39 +0100 -Subject: arm: mvebu: define and use common Armada XP SPI pinctrl setting - -This patch defines common Armada XP pinctrl settings in armada-xp.dtsi -for the supported SPI interface (MPP36-39) and use it as default -for Armada XP spi interface. That being done, it removes the now -redundant definitions in armada-xp-axpwifiap.dts. - -Note: this patch has the potential to break out-of-tree users w/o -specific pinctrl settings for their spi interfaces if the default -above does not match their config (i.e. if they do not use CS0). - -Acked-by: Andrew Lunn <andrew@lunn.ch> -Signed-off-by: Arnaud Ebalard <arno@natisbad.org> -Link: https://lkml.kernel.org/r/d404b7abd80ee5a0fd8e8d3586d33cd37740d589.1416613429.git.arno@natisbad.org -Signed-off-by: Jason Cooper <jason@lakedaemon.net> - ---- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts -+++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts -@@ -100,8 +100,6 @@ - - spi0: spi@10600 { - status = "okay"; -- pinctrl-0 = <&pmx_spi>; -- pinctrl-names = "default"; - - spi-flash@0 { - #address-cells = <1>; -@@ -138,11 +136,6 @@ - marvell,function = "gpio"; - }; - -- pmx_spi: pmx-spi { -- marvell,pins = "mpp36", "mpp37", "mpp38", "mpp39"; -- marvell,function = "spi"; -- }; -- - pmx_phy_int: pmx-phy-int { - marvell,pins = "mpp32"; - marvell,function = "gpio"; ---- a/arch/arm/boot/dts/armada-xp.dtsi -+++ b/arch/arm/boot/dts/armada-xp.dtsi -@@ -43,6 +43,11 @@ - wt-override; - }; - -+ spi0: spi@10600 { -+ pinctrl-0 = <&spi0_pins>; -+ pinctrl-names = "default"; -+ }; -+ - i2c0: i2c@11000 { - compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c"; - reg = <0x11000 0x100>; -@@ -248,6 +253,12 @@ - marvell,function = "sd0"; - }; - -+ spi0_pins: spi0-pins { -+ marvell,pins = "mpp36", "mpp37", -+ "mpp38", "mpp39"; -+ marvell,function = "spi"; -+ }; -+ - uart2_pins: uart2-pins { - marvell,pins = "mpp42", "mpp43"; - marvell,function = "uart2"; |