qualcommax: move switch tick mode setting to ESS DTSI

Every board in qualcommax is using the same BM and TM switch tick modes, so
instead of specifying them in each board lets just set them in the ESS DTSI
directly.

Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts
index 5b3a56fdd0d4f72f5176354f8677af54db48dd75..6dbd0e95f513aa61c49c678523c550d3efb6990a 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts
@@ -274,8 +274,6 @@
        switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>; /* lan port bitmap */
        switch_wan_bmp = <ESS_PORT5>; /* wan port bitmap */
        switch_mac_mode = <MAC_MODE_PSGMII>; /* mac mode for uniphy instance0*/
-       bm_tick_mode = <0>; /* bm tick mode */
-       tm_tick_mode = <0>; /* tm tick mode */
 
        qcom,port_phyinfo {
                port@0 {

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi
index 5c28862fc4fd90f5376b7bb156b99c319626b283..0494fff0e36af0dbc80ecf7cff8a38153baf1798 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi
@@ -238,8 +238,6 @@
        switch_lan_bmp = <(ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>; /* lan port bitmap */
        switch_wan_bmp = <ESS_PORT5>; /* wan port bitmap */
        switch_mac_mode = <MAC_MODE_PSGMII>; /* mac mode for uniphy instance0*/
-       bm_tick_mode = <0>; /* bm tick mode */
-       tm_tick_mode = <0>; /* tm tick mode */
 
        qcom,port_phyinfo {
                port@1 {

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-eap102.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-eap102.dts
index 0da587571210cb955bfbf38a7cbdacb974943102..d76c9a12eb602fb0bbde6b1e38ee6e3548c95144 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-eap102.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-eap102.dts
@@ -347,8 +347,6 @@
        switch_wan_bmp = <ESS_PORT6>; /* wan port bitmap */
        switch_mac_mode1 = <MAC_MODE_SGMII_CHANNEL0>; /* mac mode for uniphy instance1*/
        switch_mac_mode2 = <MAC_MODE_SGMII_CHANNEL0>; /* mac mode for uniphy instance2*/
-       bm_tick_mode = <0>; /* bm tick mode */
-       tm_tick_mode = <0>; /* tm tick mode */
 
        qcom,port_phyinfo {
                port@4 {

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts
index f92291e6b248f122ea055fe5a7cd92a045b51eb5..683cf775b3e18495aa19d8d98a206887e5ca8232 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts
@@ -327,8 +327,6 @@
        switch_mac_mode = <MAC_MODE_QSGMII>; /* mac mode for uniphy instance0*/
        switch_mac_mode1 = <MAC_MODE_USXGMII>; /* mac mode for uniphy instance1*/
        switch_mac_mode2 = <MAC_MODE_USXGMII>; /* mac mode for uniphy instance2*/
-       bm_tick_mode = <0>; /* bm tick mode */
-       tm_tick_mode = <0>; /* tm tick mode */
 
        qcom,port_phyinfo {
                port@0 {

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts
index f8eb9c9fe822dbc78720519a581f210be96c0c6c..81affdc3d0d4e10617e6d1c36b8370206acdd30d 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts
@@ -329,8 +329,6 @@
        switch_wan_bmp = <ESS_PORT6>; /* wan port bitmap */
        switch_mac_mode1 = <MAC_MODE_SGMII_CHANNEL0>; /* mac mode for uniphy instance1*/
        switch_mac_mode2 = <MAC_MODE_SGMII_CHANNEL0>; /* mac mode for uniphy instance2*/
-       bm_tick_mode = <0>; /* bm tick mode */
-       tm_tick_mode = <0>; /* tm tick mode */
 
        qcom,port_phyinfo {
                port@4 {

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
index 3b175ec1624a8468b8c5bc2f4d45949c2b9ea88e..9e97e4e066baff02419790b24bc94d3a5866bc6b 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
@@ -386,8 +386,6 @@
        switch_wan_bmp = <ESS_PORT5>; /* wan port bitmap */
        switch_mac_mode = <MAC_MODE_QSGMII>; /* mac mode for uniphy instance0*/
        switch_mac_mode1 = <MAC_MODE_SGMII_PLUS>; /* mac mode for uniphy instance1*/
-       bm_tick_mode = <0>; /* bm tick mode */
-       tm_tick_mode = <0>; /* tm tick mode */
 
        qcom,port_phyinfo {
                port@0 {

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts
index 8ae5924c63be02f4339092b7aad4b779bf203fe1..e2971103c847fb33934a815f478534d2794d1239 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts
@@ -173,8 +173,6 @@
        switch_wan_bmp = <ESS_PORT6>; /* wan port bitmap */
        switch_mac_mode = <MAC_MODE_QSGMII>; /* mac mode for uniphy instance0*/
        switch_mac_mode2 = <MAC_MODE_SGMII_PLUS>; /* mac mode for uniphy instance2*/
-       bm_tick_mode = <0>; /* bm tick mode */
-       tm_tick_mode = <0>; /* tm tick mode */
 
        qcom,port_phyinfo {
                port@0 {

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts
index 2e92a18cc7563c591a87c6ec3ef158e3d5c26404..ba22d16c0a6ce1ebead4717b0cdb1d2d637bae30 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts
@@ -191,8 +191,6 @@
        switch_mac_mode = <MAC_MODE_PSGMII>; /* mac mode for uniphy instance0*/
        switch_mac_mode1 = <MAC_MODE_10GBASE_R>; /* mac mode for uniphy instance1*/
        switch_mac_mode2 = <MAC_MODE_USXGMII>; /* mac mode for uniphy instance2*/
-       bm_tick_mode = <0>; /* bm tick mode */
-       tm_tick_mode = <0>; /* tm tick mode */
 
        qcom,port_phyinfo {
                port@0 {

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts
index 59835a7059d2c287ce61f02d3e0ec973a341ded8..9da475c5e70e150077fe4eb41b4095b1957157ef 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts
@@ -92,8 +92,6 @@
        switch_wan_bmp = <ESS_PORT6>;
        switch_mac_mode = <MAC_MODE_PSGMII>;
        switch_mac_mode2 = <MAC_MODE_SGMII_CHANNEL0>;
-       bm_tick_mode = <0>;
-       tm_tick_mode = <0>;
 
        qcom,port_phyinfo {
                port@5 {

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts
index 2175f0e69e17759d6197677afe2b4b03dfb7b611..c4cc8c0b97a09a9c1d3bb95c2ac063b3118110fa 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts
@@ -120,8 +120,6 @@
        switch_wan_bmp = <ESS_PORT6>;
        switch_mac_mode = <MAC_MODE_PSGMII>;
        switch_mac_mode2 = <MAC_MODE_SGMII_CHANNEL0>;
-       bm_tick_mode = <0x00>;
-       tm_tick_mode = <0x00>;
 
        qcom,port_phyinfo {
                port@5 {

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts
index 7b47a0d97ef72cfba2f2c7cc49ef64daa56728a7..b9a882f1dbaa953daca694d27e71d4979253e250 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts
@@ -393,8 +393,6 @@
        switch_mac_mode = <MAC_MODE_PSGMII>; /* mac mode for uniphy instance0*/
        switch_mac_mode1 = <MAC_MODE_SGMII_CHANNEL0>; /* mac mode for uniphy instance1*/
        switch_mac_mode2 = <MAC_MODE_SGMII_CHANNEL0>; /* mac mode for uniphy instance2*/
-       bm_tick_mode = <0>; /* bm tick mode */
-       tm_tick_mode = <0>; /* tm tick mode */
 
        qcom,port_phyinfo {
                port@2 {

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-ess.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-ess.dtsi
index 5cfd75664f269449fc1a562bad9ded4d0f115ce5..a4ed3ce38cd0f17cd740b34e8053d04fa0efdf01 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-ess.dtsi
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-ess.dtsi
@@ -163,6 +163,9 @@
                switch_mac_mode1 = <MAC_MODE_DISABLED>; /* MAC mode for UNIPHY instance 1 */
                switch_mac_mode2 = <MAC_MODE_DISABLED>; /* MAC mode for UNIPHY instance 2 */
 
+               bm_tick_mode = <0>; /* bm tick mode */
+               tm_tick_mode = <0>; /* tm tick mode */
+
                status = "disabled";
 
                port_scheduler_resource {

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts
index b32bc318174799267e5a64d03b3bf1c6e3a77b51..0931c8ca326cd055d62c55fec5e6fd08a4b3c4c9 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts
@@ -303,8 +303,6 @@
        switch_mac_mode = <MAC_MODE_PSGMII>;
        switch_mac_mode1 = <MAC_MODE_SGMII_CHANNEL0>;
        switch_mac_mode2 = <MAC_MODE_USXGMII>;
-       bm_tick_mode = <0>;
-       tm_tick_mode = <0>;
 
        qcom,port_phyinfo {
                port@0 {

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts
index 30b08eee3219f2ae86d4ba9f79b132747b6d20ba..501b53982cb5a2658ccf24e28b7667328d9d3bfe 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts
@@ -199,8 +199,6 @@
        switch_wan_bmp = <ESS_PORT6>; /* wan port bitmap */
        switch_mac_mode = <MAC_MODE_PSGMII>; /* mac mode for uniphy instance0*/
        switch_mac_mode2 = <MAC_MODE_USXGMII>; /* mac mode for uniphy instance2*/
-       bm_tick_mode = <0>; /* bm tick mode */
-       tm_tick_mode = <0>; /* tm tick mode */
 
        qcom,port_phyinfo {
                port@1 {

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts
index b8beec6bcc3a3d31fefab80f94189f4dd8039c46..af06fac3a46c344138010184af790681aa410ed2 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts
@@ -155,8 +155,6 @@
        switch_wan_bmp = <ESS_PORT6>;
        switch_mac_mode = <MAC_MODE_PSGMII>;
        switch_mac_mode2 = <MAC_MODE_USXGMII>;
-       bm_tick_mode = <0x00>;
-       tm_tick_mode = <0x00>;
 
        qcom,port_phyinfo {
                port@3 {

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts
index be9429ea394dbcd01648b4925d1a7a437a88a554..88ae3831173f8d8212b2ddad3d0eaaa254020e12 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts
@@ -272,8 +272,6 @@
        switch_mac_mode = <MAC_MODE_QSGMII>;
        switch_mac_mode1 = <MAC_MODE_USXGMII>;
        switch_mac_mode2 = <MAC_MODE_USXGMII>;
-       bm_tick_mode = <0>;
-       tm_tick_mode = <0>;
 
        qcom,port_phyinfo {
                port@0 {