| Message ID | 20200312164320.22349-2-michael@walle.cc (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] net: dsa: felix: allow the device to be disabled | expand |
Am 2020-03-12 17:43, schrieb Michael Walle: > Disable the felix switch by default and enable it per board which are > actually using it. > > Signed-off-by: Michael Walle <michael@walle.cc> I forgot to mention that this patch depends on the following series: https://lore.kernel.org/linux-devicetree/20200311074929.19569-1-michael@walle.cc/ Sorry, -michael > --- > .../boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts | 4 ++++ > .../boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts | 4 ++++ > arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 4 ++++ > arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 3 ++- > 4 files changed, 14 insertions(+), 1 deletion(-) > > 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 a83a176cf18a..d4ca12b140b4 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 > @@ -63,6 +63,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 0d27b5667b8c..8294d364112e 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts > @@ -228,6 +228,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 c09279379723..70a10268bb83 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi > @@ -933,10 +933,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>;
On Thu, Mar 12, 2020 at 05:43:20PM +0100, Michael Walle wrote: > Disable the felix switch by default and enable it per board which are > actually using it. > > Signed-off-by: Michael Walle <michael@walle.cc> Applied, thanks.
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 a83a176cf18a..d4ca12b140b4 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 @@ -63,6 +63,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 0d27b5667b8c..8294d364112e 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts @@ -228,6 +228,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 c09279379723..70a10268bb83 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi @@ -933,10 +933,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>;
Disable the felix switch by default and enable it per board which are actually using it. Signed-off-by: Michael Walle <michael@walle.cc> --- .../boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts | 4 ++++ .../boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts | 4 ++++ arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 4 ++++ arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 3 ++- 4 files changed, 14 insertions(+), 1 deletion(-)