mediatek: fix the name of buswidth to bus-width

Fix the issue of dts buswidth cannot be applied properly with spi driver.
Fix the name of buswidth to bus-width in dts in order to fit the format
in linux spi kernel[1] so that spi-tx-bus-width & spi-rx-bus-width can be
parsed properly.

[1] Documentation/devicetree/bindings/spi/spi-controller.yaml

Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
(cherry picked from commit 36746893ac690796bf7aad00a793ff4bf739d066)

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts
index 7c8a94d97c8e7636f59b22e8192539e4f3609846..7975d247b15f2e12e0a5458a4925f7ee50644b4d 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts
@@ -138,8 +138,8 @@
                reg = <0>;
 
                spi-max-frequency = <25000000>;
-               spi-tx-buswidth = <4>;
-               spi-rx-buswidth = <4>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
 
                partitions {
                        compatible = "fixed-partitions";

diff --git a/target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts b/target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts
index 27e7797b3b24ca2da933a21a5dd07fee6722947a..f9b8c16652e5ad8b6da9af5cab957a8bf43856f0 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts
+++ b/target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts
@@ -152,8 +152,8 @@
                spi-cal-addrlen = <5>;
                spi-cal-addr = /bits/ 32 <0x0 0x0 0x0 0x0 0x0>;
 
-               spi-tx-buswidth = <4>;
-               spi-rx-buswidth = <4>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
                mediatek,nmbm;
                mediatek,bmt-max-ratio = <1>;
                mediatek,bmt-max-reserved-blocks = <64>;

diff --git a/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts b/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
index 358365adba44bd51f074e7623ecf53d020f014cf..671e1f1839ab4973c9673e024d4d4ca799b745d7 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
+++ b/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
@@ -104,8 +104,8 @@
                reg = <0>;
 
                spi-max-frequency = <52000000>;
-               spi-tx-buswidth = <4>;
-               spi-rx-buswidth = <4>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
 
                partitions {
                        compatible = "fixed-partitions";

diff --git a/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts b/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts
index 87076d255cfdacec953d7a69f2f3e0f32faffd1b..d897697ef2331e8acde39959f8cf2f74364caa96 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts
+++ b/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts
@@ -97,8 +97,8 @@
                reg = <0>;
 
                spi-max-frequency = <52000000>;
-               spi-tx-buswidth = <4>;
-               spi-rx-buswidth = <4>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
 
                partitions {
                        compatible = "fixed-partitions";

diff --git a/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi b/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi
index 9467b18a7e02ad2f947c0d267efcfa4899fdd670..7ab94f36230c2a411df3dee4528768b335db21c1 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi
+++ b/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi
@@ -148,8 +148,8 @@
                reg = <0>;
 
                spi-max-frequency = <52000000>;
-               spi-tx-buswidth = <4>;
-               spi-rx-buswidth = <4>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
 
                partitions: partitions {
                        compatible = "fixed-partitions";

diff --git a/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts b/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts
index a7626d51a491f88d153206dffa1c2fc5d59d8cdf..c6dc1e5c4e6c33386d528b4ac766beac8d6191de 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts
+++ b/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts
@@ -108,8 +108,8 @@
                spi-cal-addrlen = <5>;
                spi-cal-addr = /bits/ 32 <0x0 0x0 0x0 0x0 0x0>;
 
-               spi-tx-buswidth = <4>;
-               spi-rx-buswidth = <4>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
                mediatek,nmbm;
                mediatek,bmt-max-ratio = <1>;
                mediatek,bmt-max-reserved-blocks = <64>;

diff --git a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts
index 239be9645f38ff60bcab1c09b3d1d1637dd05f3e..ac854f10d13ae505bd0f7ae9a3750ce1aa48fb81 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts
+++ b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts
@@ -211,8 +211,8 @@
                reg = <0>;
 
                spi-max-frequency = <20000000>;
-               spi-tx-buswidth = <4>;
-               spi-rx-buswidth = <4>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
 
                partitions: partitions {
                        compatible = "fixed-partitions";

diff --git a/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
index 94edfd121e42cf300c764ea37028b77de9988176..a1910e36d24b6c656415da5f41f2c9ead94db63d 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
@@ -164,8 +164,8 @@
                reg = <0>;
 
                spi-max-frequency = <20000000>;
-               spi-tx-buswidth = <4>;
-               spi-rx-buswidth = <4>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
 
                partitions {
                        compatible = "fixed-partitions";

diff --git a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
index 13f37cd7630b8dc9c89d82dafcbda1e69acfe0f1..a9b44f8df99f4ca83ac0ab1a5c934ff9a7cf1f3a 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
@@ -138,8 +138,8 @@
                reg = <0>;
 
                spi-max-frequency = <20000000>;
-               spi-tx-buswidth = <4>;
-               spi-rx-buswidth = <4>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
 
                partitions: partitions {
                        compatible = "fixed-partitions";

diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts
index bc9f6688b39361547bcf62960cde768c9c396714..2469d3d77d1f12fd72fdf86e7aec18fafd54f98b 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts
@@ -445,8 +445,8 @@
                compatible = "spi-nand";
                reg = <1>;
                spi-max-frequency = <10000000>;
-               spi-tx-buswidth = <4>;
-               spi-rx-buswidth = <4>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
 
                partitions {
                        compatible = "fixed-partitions";

diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts b/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
index b6bd746ef30b60326c7477d778bcc3f0ebdf2a70..a486f29fec8fe339fddc48feca883756acd2ca3e 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
@@ -316,8 +316,8 @@
                mediatek,bmt-max-reserved-blocks = <64>;
 
                spi-max-frequency = <20000000>;
-               spi-tx-buswidth = <4>;
-               spi-rx-buswidth = <4>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
 
                partitions {
                        compatible = "fixed-partitions";

diff --git a/target/linux/mediatek/dts/mt7986b-mercusys-mr90x-v1.dts b/target/linux/mediatek/dts/mt7986b-mercusys-mr90x-v1.dts
index 4e8cd7cf115738b8daef96834a39247617ab7b47..89ec613a8d9c3fed9359c74176734362e3024f8a 100644 (file)
--- a/target/linux/mediatek/dts/mt7986b-mercusys-mr90x-v1.dts
+++ b/target/linux/mediatek/dts/mt7986b-mercusys-mr90x-v1.dts
@@ -212,8 +212,8 @@
                reg = <0>;
 
                spi-max-frequency = <20000000>;
-               spi-tx-buswidth = <4>;
-               spi-rx-buswidth = <4>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
 
                partitions: partitions {
                        compatible = "fixed-partitions";

diff --git a/target/linux/mediatek/dts/mt7986b-netgear-wax220.dts b/target/linux/mediatek/dts/mt7986b-netgear-wax220.dts
index 09fdf677869e7792cb551c6b652b6506c2d97165..19419f593fb273245cb93f94bc48a41a9bb6de73 100644 (file)
--- a/target/linux/mediatek/dts/mt7986b-netgear-wax220.dts
+++ b/target/linux/mediatek/dts/mt7986b-netgear-wax220.dts
@@ -178,8 +178,8 @@
                reg = <0>;
 
                spi-max-frequency = <20000000>;
-               spi-tx-buswidth = <4>;
-               spi-rx-buswidth = <4>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
 
                mediatek,nmbm;
                mediatek,bmt-max-ratio = <1>;

diff --git a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso
index 15ee8c568f3c3f681fca32d547bcf16c94f239c5..0846d88f625aa5d1ea4cd2908a91d7887af7a6ce 100644 (file)
--- a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso
+++ b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso
@@ -19,8 +19,8 @@
                                compatible = "spi-nand";
                                reg = <0>;
                                spi-max-frequency = <10000000>;
-                               spi-tx-buswidth = <4>;
-                               spi-rx-buswidth = <4>;
+                               spi-tx-bus-width = <4>;
+                               spi-rx-bus-width = <4>;
 
                                partitions {
                                        compatible = "fixed-partitions";

diff --git a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nand.dts b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nand.dts
index 83a37150cf07ed9243f89f6334139711bd7e0afb..ce007099d2ba323254c452de70caaae00f5fecd2 100644 (file)
--- a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nand.dts
+++ b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nand.dts
@@ -15,8 +15,8 @@
                compatible = "spi-nand";
                reg = <1>;
                spi-max-frequency = <10000000>;
-               spi-tx-buswidth = <4>;
-               spi-rx-buswidth = <4>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
 
                partitions {
                        compatible = "fixed-partitions";

diff --git a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nor.dts b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nor.dts
index 868365a99429a73070a0257fef1cd7cbbd6233c3..ea148315f055345418516f7a3ce7c22f30f75cbc 100644 (file)
--- a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nor.dts
+++ b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nor.dts
@@ -15,8 +15,8 @@
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <52000000>;
-               spi-tx-buswidth = <4>;
-               spi-rx-buswidth = <4>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
                partitions {
                        compatible = "fixed-partitions";
                        #address-cells = <1>;

diff --git a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7988a-rfb-snfi-nand.dtso b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7988a-rfb-snfi-nand.dtso
index 618016517785164eb26a38b1c7867e37797e98c3..86b0042f6477686cd25af66acb3ab1bf061e5308 100644 (file)
--- a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7988a-rfb-snfi-nand.dtso
+++ b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7988a-rfb-snfi-nand.dtso
@@ -19,8 +19,8 @@
                                compatible = "spi-nand";
                                reg = <0>;
                                spi-max-frequency = <52000000>;
-                               spi-tx-buswidth = <4>;
-                               spi-rx-buswidth = <4>;
+                               spi-tx-bus-width = <4>;
+                               spi-rx-bus-width = <4>;
                                mediatek,nmbm;
                                mediatek,bmt-max-ratio = <1>;
                                mediatek,bmt-max-reserved-blocks = <64>;

diff --git a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand.dtso b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand.dtso
index e63436fa556de8fef42eaf1fb7f7f35aaaedef3e..a9eca00d4416cb2e85c3a922d1c8aaf535465f68 100644 (file)
--- a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand.dtso
+++ b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand.dtso
@@ -21,8 +21,8 @@
                                compatible = "spi-nand";
                                reg = <0>;
                                spi-max-frequency = <52000000>;
-                               spi-tx-buswidth = <4>;
-                               spi-rx-buswidth = <4>;
+                               spi-tx-bus-width = <4>;
+                               spi-rx-bus-width = <4>;
                                mediatek,nmbm;
                                mediatek,bmt-max-ratio = <1>;
                                mediatek,bmt-max-reserved-blocks = <64>;