diff mbox series

ipq40xx: luma_wrtq-329acn: convert to DSA

Message ID 20221003125853.6890-1-tmn505@terefe.re
State Accepted
Headers show
Series ipq40xx: luma_wrtq-329acn: convert to DSA | expand

Commit Message

Tomasz Maciej Nowak Oct. 3, 2022, 12:58 p.m. UTC 
From: Tomasz Maciej Nowak <tmn505@gmail.com>

And enable the device.

Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
---
 .../ipq40xx/base-files/etc/board.d/02_network |  1 +
 .../arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts | 55 +++++++++++++------
 target/linux/ipq40xx/image/generic.mk         |  3 +-
 3 files changed, 41 insertions(+), 18 deletions(-)

Comments

Robert Marko Oct. 5, 2022, 4:21 p.m. UTC | #1 
On Mon, 3 Oct 2022 at 15:00, Tomasz Maciej Nowak <tmn505@terefe.re> wrote:
>
> From: Tomasz Maciej Nowak <tmn505@gmail.com>
>
> And enable the device.
>
> Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>

LGTM, so:
Reviewed-by: Robert Marko <robimarko@gmail.com>
> ---
>  .../ipq40xx/base-files/etc/board.d/02_network |  1 +
>  .../arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts | 55 +++++++++++++------
>  target/linux/ipq40xx/image/generic.mk         |  3 +-
>  3 files changed, 41 insertions(+), 18 deletions(-)
>
> diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
> index 3d05589369b5..d9a162b10d42 100644
> --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
> +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
> @@ -30,6 +30,7 @@ ipq40xx_setup_interfaces()
>         cilab,meshpoint-one|\
>         edgecore,ecw5211|\
>         glinet,gl-b2200|\
> +       luma,wrtq-329acn|\
>         mikrotik,cap-ac|\
>         netgear,wac510)
>                 ucidef_set_interfaces_lan_wan "lan" "wan"
> diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts
> index 2407698fe1c8..4694c5681914 100644
> --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts
> +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts
> @@ -45,10 +45,6 @@
>                         status = "okay";
>                 };
>
> -               mdio@90000 {
> -                       status = "okay";
> -               };
> -
>                 tcsr@1949000 {
>                         compatible = "qcom,tcsr";
>                         reg = <0x1949000 0x100>;
> @@ -213,6 +209,45 @@
>         status = "okay";
>  };
>
> +&gmac {
> +       status = "okay";
> +};
> +
> +&ethphy0 {
> +       status = "disabled";
> +};
> +
> +&ethphy1 {
> +       status = "disabled";
> +};
> +
> +&ethphy3 {
> +       status = "disabled";
> +};
> +
> +&mdio {
> +       status = "okay";
> +};
> +
> +&switch {
> +       status = "okay";
> +};
> +
> +&swport3 {
> +       status = "okay";
> +
> +       label = "lan";
> +       nvmem-cell-names = "mac-address";
> +       nvmem-cells = <&macaddr_art_6>;
> +};
> +
> +&swport5 {
> +       status = "okay";
> +
> +       nvmem-cell-names = "mac-address";
> +       nvmem-cells = <&macaddr_art_0>;
> +};
> +
>  &tlmm {
>         serial0_pins: serial0_pinmux {
>                 mux {
> @@ -252,18 +287,6 @@
>         status = "okay";
>  };
>
> -&ethphy0 {
> -       status = "disabled";
> -};
> -
> -&ethphy1 {
> -       status = "disabled";
> -};
> -
> -&ethphy3 {
> -       status = "disabled";
> -};
> -
>  &wifi0 {
>         status = "okay";
>         nvmem-cell-names = "pre-calibration";
> diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
> index 47e8c129b49c..69ec42c26657 100644
> --- a/target/linux/ipq40xx/image/generic.mk
> +++ b/target/linux/ipq40xx/image/generic.mk
> @@ -727,8 +727,7 @@ define Device/luma_wrtq-329acn
>         BLOCKSIZE := 128k
>         PAGESIZE := 2048
>  endef
> -# Missing DSA Setup
> -#TARGET_DEVICES += luma_wrtq-329acn
> +TARGET_DEVICES += luma_wrtq-329acn
>
>  define Device/meraki_mr33
>         $(call Device/FitImage)
> --
> 2.37.3
>
>
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Christian Marangi Oct. 5, 2022, 5:13 p.m. UTC | #2 
On Mon, Oct 03, 2022 at 02:58:53PM +0200, Tomasz Maciej Nowak wrote:
> From: Tomasz Maciej Nowak <tmn505@gmail.com>
> 
> And enable the device.
> 
> Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>

Hi, merged with 70d9193b511f957054245195857cfbc5d5632c42 with minor
changes to the commit description.

Thanks!

> ---
>  .../ipq40xx/base-files/etc/board.d/02_network |  1 +
>  .../arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts | 55 +++++++++++++------
>  target/linux/ipq40xx/image/generic.mk         |  3 +-
>  3 files changed, 41 insertions(+), 18 deletions(-)
> 
> diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
> index 3d05589369b5..d9a162b10d42 100644
> --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
> +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
> @@ -30,6 +30,7 @@ ipq40xx_setup_interfaces()
>  	cilab,meshpoint-one|\
>  	edgecore,ecw5211|\
>  	glinet,gl-b2200|\
> +	luma,wrtq-329acn|\
>  	mikrotik,cap-ac|\
>  	netgear,wac510)
>  		ucidef_set_interfaces_lan_wan "lan" "wan"
> diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts
> index 2407698fe1c8..4694c5681914 100644
> --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts
> +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts
> @@ -45,10 +45,6 @@
>  			status = "okay";
>  		};
>  
> -		mdio@90000 {
> -			status = "okay";
> -		};
> -
>  		tcsr@1949000 {
>  			compatible = "qcom,tcsr";
>  			reg = <0x1949000 0x100>;
> @@ -213,6 +209,45 @@
>  	status = "okay";
>  };
>  
> +&gmac {
> +	status = "okay";
> +};
> +
> +&ethphy0 {
> +	status = "disabled";
> +};
> +
> +&ethphy1 {
> +	status = "disabled";
> +};
> +
> +&ethphy3 {
> +	status = "disabled";
> +};
> +
> +&mdio {
> +	status = "okay";
> +};
> +
> +&switch {
> +	status = "okay";
> +};
> +
> +&swport3 {
> +	status = "okay";
> +
> +	label = "lan";
> +	nvmem-cell-names = "mac-address";
> +	nvmem-cells = <&macaddr_art_6>;
> +};
> +
> +&swport5 {
> +	status = "okay";
> +
> +	nvmem-cell-names = "mac-address";
> +	nvmem-cells = <&macaddr_art_0>;
> +};
> +
>  &tlmm {
>  	serial0_pins: serial0_pinmux {
>  		mux {
> @@ -252,18 +287,6 @@
>  	status = "okay";
>  };
>  
> -&ethphy0 {
> -	status = "disabled";
> -};
> -
> -&ethphy1 {
> -	status = "disabled";
> -};
> -
> -&ethphy3 {
> -	status = "disabled";
> -};
> -
>  &wifi0 {
>  	status = "okay";
>  	nvmem-cell-names = "pre-calibration";
> diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
> index 47e8c129b49c..69ec42c26657 100644
> --- a/target/linux/ipq40xx/image/generic.mk
> +++ b/target/linux/ipq40xx/image/generic.mk
> @@ -727,8 +727,7 @@ define Device/luma_wrtq-329acn
>  	BLOCKSIZE := 128k
>  	PAGESIZE := 2048
>  endef
> -# Missing DSA Setup
> -#TARGET_DEVICES += luma_wrtq-329acn
> +TARGET_DEVICES += luma_wrtq-329acn
>  
>  define Device/meraki_mr33
>  	$(call Device/FitImage)
> -- 
> 2.37.3
> 
> 
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
diff mbox series

Patch

diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
index 3d05589369b5..d9a162b10d42 100644
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -30,6 +30,7 @@  ipq40xx_setup_interfaces()
 	cilab,meshpoint-one|\
 	edgecore,ecw5211|\
 	glinet,gl-b2200|\
+	luma,wrtq-329acn|\
 	mikrotik,cap-ac|\
 	netgear,wac510)
 		ucidef_set_interfaces_lan_wan "lan" "wan"
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts
index 2407698fe1c8..4694c5681914 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts
@@ -45,10 +45,6 @@ 
 			status = "okay";
 		};
 
-		mdio@90000 {
-			status = "okay";
-		};
-
 		tcsr@1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -213,6 +209,45 @@ 
 	status = "okay";
 };
 
+&gmac {
+	status = "okay";
+};
+
+&ethphy0 {
+	status = "disabled";
+};
+
+&ethphy1 {
+	status = "disabled";
+};
+
+&ethphy3 {
+	status = "disabled";
+};
+
+&mdio {
+	status = "okay";
+};
+
+&switch {
+	status = "okay";
+};
+
+&swport3 {
+	status = "okay";
+
+	label = "lan";
+	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_art_6>;
+};
+
+&swport5 {
+	status = "okay";
+
+	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_art_0>;
+};
+
 &tlmm {
 	serial0_pins: serial0_pinmux {
 		mux {
@@ -252,18 +287,6 @@ 
 	status = "okay";
 };
 
-&ethphy0 {
-	status = "disabled";
-};
-
-&ethphy1 {
-	status = "disabled";
-};
-
-&ethphy3 {
-	status = "disabled";
-};
-
 &wifi0 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration";
diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
index 47e8c129b49c..69ec42c26657 100644
--- a/target/linux/ipq40xx/image/generic.mk
+++ b/target/linux/ipq40xx/image/generic.mk
@@ -727,8 +727,7 @@  define Device/luma_wrtq-329acn
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 endef
-# Missing DSA Setup
-#TARGET_DEVICES += luma_wrtq-329acn
+TARGET_DEVICES += luma_wrtq-329acn
 
 define Device/meraki_mr33
 	$(call Device/FitImage)