ARM: dts: imx23/8: Rename apbh and apbx nodes

According to simple-bus.yaml, apbh and apbx are not valid bus names.

Rename them to apbh-bus and apbx-bus to fix the following dt-schema
warnings:

'apbh@80000000' does not match '^([a-z][a-z0-9\\-]+-bus|bus|localbus|soc|axi|ahb|apb)(@.+)?$'
'apbx@80040000' does not match '^([a-z][a-z0-9\\-]+-bus|bus|localbus|soc|axi|ahb|apb)(@.+)?$'

Signed-off-by: Fabio Estevam <festevam@denx.de>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/nxp/mxs/imx23-evk.dts b/arch/arm/boot/dts/nxp/mxs/imx23-evk.dts
index 7365fe4581a3a2a947e8a3f6243ade346a6d95d7..33b36af1656f05f22cfc65a1eed076006169439e 100644 (file)
--- a/arch/arm/boot/dts/nxp/mxs/imx23-evk.dts
+++ b/arch/arm/boot/dts/nxp/mxs/imx23-evk.dts
@@ -52,7 +52,7 @@
        };
 
        apb@80000000 {
-               apbh@80000000 {
+               apbh-bus@80000000 {
                        nand-controller@8000c000 {
                                pinctrl-names = "default";
                                pinctrl-0 = <&gpmi_pins_a &gpmi_pins_fixup>;
@@ -99,7 +99,7 @@
                        };
                };
 
-               apbx@80040000 {
+               apbx-bus@80040000 {
                        lradc@80050000 {
                                status = "okay";
                                fsl,lradc-touchscreen-wires = <4>;

diff --git a/arch/arm/boot/dts/nxp/mxs/imx23-olinuxino.dts b/arch/arm/boot/dts/nxp/mxs/imx23-olinuxino.dts
index 229e727b222ecfb6c38a7e178500725e8c25c696..e372e9327a475e6cb895053fd0c7e3e420d51d94 100644 (file)
--- a/arch/arm/boot/dts/nxp/mxs/imx23-olinuxino.dts
+++ b/arch/arm/boot/dts/nxp/mxs/imx23-olinuxino.dts
@@ -19,7 +19,7 @@
        };
 
        apb@80000000 {
-               apbh@80000000 {
+               apbh-bus@80000000 {
                        ssp0: spi@80010000 {
                                compatible = "fsl,imx23-mmc";
                                pinctrl-names = "default";
@@ -64,7 +64,7 @@
                        };
                };
 
-               apbx@80040000 {
+               apbx-bus@80040000 {
                        lradc@80050000 {
                                status = "okay";
                        };

diff --git a/arch/arm/boot/dts/nxp/mxs/imx23-sansa.dts b/arch/arm/boot/dts/nxp/mxs/imx23-sansa.dts
index b23e7ada9c804f0721c908c419a47757ee20f52a..cb661bf2d1578f7b048d821060d7efd7163b2a4d 100644 (file)
--- a/arch/arm/boot/dts/nxp/mxs/imx23-sansa.dts
+++ b/arch/arm/boot/dts/nxp/mxs/imx23-sansa.dts
@@ -55,7 +55,7 @@
        };
 
        apb@80000000 {
-               apbh@80000000 {
+               apbh-bus@80000000 {
                        ssp0: spi@80010000 {
                                compatible = "fsl,imx23-mmc";
                                pinctrl-names = "default";
@@ -100,7 +100,7 @@
                        };
                };
 
-               apbx@80040000 {
+               apbx-bus@80040000 {
                        pwm: pwm@80064000 {
                                pinctrl-names = "default";
                                pinctrl-0 = <&pwm2_pins_a>;

diff --git a/arch/arm/boot/dts/nxp/mxs/imx23-stmp378x_devb.dts b/arch/arm/boot/dts/nxp/mxs/imx23-stmp378x_devb.dts
index 69124ba6a6667cf59ab03573feaef9953a3b63d3..b2b6f851499954c8477cf48f5b2849c678ead76e 100644 (file)
--- a/arch/arm/boot/dts/nxp/mxs/imx23-stmp378x_devb.dts
+++ b/arch/arm/boot/dts/nxp/mxs/imx23-stmp378x_devb.dts
@@ -16,7 +16,7 @@
        };
 
        apb@80000000 {
-               apbh@80000000 {
+               apbh-bus@80000000 {
                        ssp0: spi@80010000 {
                                compatible = "fsl,imx23-mmc";
                                pinctrl-names = "default";
@@ -44,7 +44,7 @@
                        };
                };
 
-               apbx@80040000 {
+               apbx-bus@80040000 {
                        auart0: serial@8006c000 {
                                pinctrl-names = "default";
                                pinctrl-0 = <&auart0_pins_a>;

diff --git a/arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts b/arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts
index 28341d8315c25b2d7103c32e311b7d6a019324f9..0b088c8ab6b6466046453fc01e7ad7470db83031 100644 (file)
--- a/arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts
+++ b/arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts
@@ -54,7 +54,7 @@
        };
 
        apb@80000000 {
-               apbh@80000000 {
+               apbh-bus@80000000 {
                        ssp0: spi@80010000 {
                                compatible = "fsl,imx23-mmc";
                                pinctrl-names = "default";
@@ -101,7 +101,7 @@
                        };
                };
 
-               apbx@80040000 {
+               apbx-bus@80040000 {
                        i2c: i2c@80058000 {
                                pinctrl-names = "default";
                                pinctrl-0 = <&i2c_pins_a>;

diff --git a/arch/arm/boot/dts/nxp/mxs/imx23.dtsi b/arch/arm/boot/dts/nxp/mxs/imx23.dtsi
index 0309592af1e1eba8f767564a1fc663f6863f8a86..5e21252fb7c96965a627db7dd90f53889c72af30 100644 (file)
--- a/arch/arm/boot/dts/nxp/mxs/imx23.dtsi
+++ b/arch/arm/boot/dts/nxp/mxs/imx23.dtsi
@@ -45,7 +45,7 @@
                reg = <0x80000000 0x80000>;
                ranges;
 
-               apbh@80000000 {
+               apbh-bus@80000000 {
                        compatible = "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -476,7 +476,7 @@
                        };
                };
 
-               apbx@80040000 {
+               apbx-bus@80040000 {
                        compatible = "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm/boot/dts/nxp/mxs/imx28-cfa10037.dts b/arch/arm/boot/dts/nxp/mxs/imx28-cfa10037.dts
index c72fe2d392f10096c1cc6152b9c85cbe38ce07bb..fd177daa63853ffc9c7f61f666aef966c9e2550b 100644 (file)
--- a/arch/arm/boot/dts/nxp/mxs/imx28-cfa10037.dts
+++ b/arch/arm/boot/dts/nxp/mxs/imx28-cfa10037.dts
@@ -14,7 +14,7 @@
        compatible = "crystalfontz,cfa10037", "crystalfontz,cfa10036", "fsl,imx28";
 
        apb@80000000 {
-               apbh@80000000 {
+               apbh-bus@80000000 {
                        pinctrl@80018000 {
                                usb_pins_cfa10037: usb-10037@0 {
                                        reg = <0>;
@@ -38,7 +38,7 @@
                        };
                };
 
-               apbx@80040000 {
+               apbx-bus@80040000 {
                        usbphy1: usbphy@8007e000 {
                                status = "okay";
                        };

diff --git a/arch/arm/boot/dts/nxp/mxs/imx28.dtsi b/arch/arm/boot/dts/nxp/mxs/imx28.dtsi
index 4817fba2d938b97980e2fb44c33955f666c1cd4a..bbea8b77386f1153247d1e191dcaa874a7f7969f 100644 (file)
--- a/arch/arm/boot/dts/nxp/mxs/imx28.dtsi
+++ b/arch/arm/boot/dts/nxp/mxs/imx28.dtsi
@@ -56,7 +56,7 @@
                reg = <0x80000000 0x80000>;
                ranges;
 
-               apbh@80000000 {
+               apbh-bus@80000000 {
                        compatible = "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -1092,7 +1092,7 @@
                        };
                };
 
-               apbx@80040000 {
+               apbx-bus@80040000 {
                        compatible = "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;