aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorRyan Mounce <ryan@mounce.com.au>2018-02-20 00:31:34 +1030
committerHauke Mehrtens <hauke@hauke-m.de>2018-03-09 22:19:07 +0100
commit7b33f6c1bba7c74a864b7e6f58fa9361a4881cc3 (patch)
treeecf883b1161cf6661411ba75300728bc3b7d62e2 /target/linux
parent21486911ac5b82ac643e277c5415487bd3e5a52c (diff)
downloadupstream-7b33f6c1bba7c74a864b7e6f58fa9361a4881cc3.tar.gz
upstream-7b33f6c1bba7c74a864b7e6f58fa9361a4881cc3.tar.bz2
upstream-7b33f6c1bba7c74a864b7e6f58fa9361a4881cc3.zip
mvebu: disable DSA DT nodes for boards using mvsw61xx
As at this commit, DSA is not enabled in the kernel config for mvebu, so these nodes have been ignored. In preparation for the first mvebu board using DSA, disable these nodes for existing boards to avoid issues. Signed-off-by: Ryan Mounce <ryan@mounce.com.au>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/mvebu/patches-4.14/220-disable-untested-dsa-boards.patch30
-rw-r--r--target/linux/mvebu/patches-4.14/415-ARM-dts-armada388-clearfog-document-MPP-usage.patch2
2 files changed, 31 insertions, 1 deletions
diff --git a/target/linux/mvebu/patches-4.14/220-disable-untested-dsa-boards.patch b/target/linux/mvebu/patches-4.14/220-disable-untested-dsa-boards.patch
new file mode 100644
index 0000000000..8f2275b1ff
--- /dev/null
+++ b/target/linux/mvebu/patches-4.14/220-disable-untested-dsa-boards.patch
@@ -0,0 +1,30 @@
+--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
++++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
+@@ -194,6 +194,7 @@
+ status = "okay";
+
+ switch@0 {
++ status = "disabled";
+ compatible = "marvell,mv88e6085";
+ #address-cells = <1>;
+ #size-cells = <0>;
+--- a/arch/arm/boot/dts/armada-388-clearfog.dts
++++ b/arch/arm/boot/dts/armada-388-clearfog.dts
+@@ -202,6 +202,7 @@
+ status = "okay";
+
+ switch@4 {
++ status = "disabled";
+ compatible = "marvell,mv88e6085";
+ #address-cells = <1>;
+ #size-cells = <0>;
+--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
++++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+@@ -516,6 +516,7 @@
+ status = "okay";
+
+ switch@0 {
++ status = "disabled";
+ compatible = "marvell,mv88e6085";
+ #address-cells = <1>;
+ #size-cells = <0>;
diff --git a/target/linux/mvebu/patches-4.14/415-ARM-dts-armada388-clearfog-document-MPP-usage.patch b/target/linux/mvebu/patches-4.14/415-ARM-dts-armada388-clearfog-document-MPP-usage.patch
index 481ee6276a..0e24d08c8d 100644
--- a/target/linux/mvebu/patches-4.14/415-ARM-dts-armada388-clearfog-document-MPP-usage.patch
+++ b/target/linux/mvebu/patches-4.14/415-ARM-dts-armada388-clearfog-document-MPP-usage.patch
@@ -68,7 +68,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+*/
--- a/arch/arm/boot/dts/armada-388-clearfog.dts
+++ b/arch/arm/boot/dts/armada-388-clearfog.dts
-@@ -289,3 +289,53 @@
+@@ -290,3 +290,53 @@
*/
pinctrl-0 = <&spi1_pins &clearfog_spi1_cs_pins &mikro_spi_pins>;
};