summaryrefslogtreecommitdiff
path: root/arch/arm64/boot
diff options
context:
space:
mode:
authorMichael Walle <michael@walle.cc>2020-03-12 19:43:20 +0300
committerShawn Guo <shawnguo@kernel.org>2020-03-16 11:16:00 +0300
commit630952e1f816814e2fafbbaecfe90bcfe3e117d3 (patch)
tree427033c674065d1ccb991df020ecce6675a8c7c8 /arch/arm64/boot
parent6c389f29beb74c4a66e272a8df20367821ad3daa (diff)
downloadlinux-630952e1f816814e2fafbbaecfe90bcfe3e117d3.tar.xz
arm64: dts: ls1028a: disable the felix switch by default
Disable the felix switch by default and enable it per board which are actually using it. Signed-off-by: Michael Walle <michael@walle.cc> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm64/boot')
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts4
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts4
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts4
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi3
4 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts
index 4e30558485b0..4b4cc6a1573d 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts
@@ -49,6 +49,10 @@
};
};
+&mscc_felix {
+ status = "okay";
+};
+
&mscc_felix_port0 {
label = "swp0";
managed = "in-band-status";
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts
index 0a34ff682027..901b5b161def 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts
@@ -48,6 +48,10 @@
status = "okay";
};
+&mscc_felix {
+ status = "okay";
+};
+
&mscc_felix_port0 {
label = "gbe0";
phy-handle = <&phy0>;
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
index 6d05b76c2c7a..c2dc1232f93f 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
@@ -214,6 +214,10 @@
status = "okay";
};
+&mscc_felix {
+ status = "okay";
+};
+
&mscc_felix_port0 {
label = "swp0";
managed = "in-band-status";
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
index 388aefcdacfc..09f37ba38b38 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -836,10 +836,11 @@
fsl,extts-fifo;
};
- ethernet-switch@0,5 {
+ mscc_felix: ethernet-switch@0,5 {
reg = <0x000500 0 0 0 0>;
/* IEP INT_B */
interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
ports {
#address-cells = <1>;