ARM: dts: lpc32xx: remove usb bus and elevate all children nodes

Remove usb bus and elevate all children nodes because usb bus is not
existed and only group usb devices logically.

Update register address and related full node name.

Fix below CHECK_DTBS warnings:
arm/boot/dts/nxp/lpc/lpc3250-ea3250.dtb: usb (simple-bus): $nodename:0: 'usb' does not match '^([a-z][a-z0-9\\-]+-bus|bus|localbus|soc|axi|ahb|apb)(@.+)?$'
        from schema $id: http://devicetree.org/schemas/simple-bus.yaml#

Signed-off-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>

diff --git a/arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi b/arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi
index 2236901a003130d972bd09c208b296eeb3e2023d..e780451fd3352e8b0cf6d0c37c301246aec4e333 100644 (file)
--- a/arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi
+++ b/arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi
@@ -86,51 +86,44 @@
                        #dma-cells = <2>;
                };
 
-               usb {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       compatible = "simple-bus";
-                       ranges = <0x0 0x31020000 0x00001000>;
-
-                       /*
-                        * Enable either ohci or usbd (gadget)!
-                        */
-                       ohci: usb@0 {
-                               compatible = "nxp,ohci-nxp", "usb-ohci";
-                               reg = <0x0 0x300>;
-                               interrupt-parent = <&sic1>;
-                               interrupts = <27 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&usbclk LPC32XX_USB_CLK_HOST>;
-                               status = "disabled";
-                       };
+               /*
+                * Enable either ohci or usbd (gadget)!
+                */
+               ohci: usb@31020000 {
+                       compatible = "nxp,ohci-nxp", "usb-ohci";
+                       reg = <0x31020000 0x300>;
+                       interrupt-parent = <&sic1>;
+                       interrupts = <27 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&usbclk LPC32XX_USB_CLK_HOST>;
+                       status = "disabled";
+               };
 
-                       usbd: usbd@0 {
-                               compatible = "nxp,lpc3220-udc";
-                               reg = <0x0 0x300>;
-                               interrupt-parent = <&sic1>;
-                               interrupts = <29 IRQ_TYPE_LEVEL_HIGH>,
-                                            <30 IRQ_TYPE_LEVEL_HIGH>,
-                                            <28 IRQ_TYPE_LEVEL_HIGH>,
-                                            <26 IRQ_TYPE_LEVEL_LOW>;
-                               clocks = <&usbclk LPC32XX_USB_CLK_DEVICE>;
-                               status = "disabled";
-                       };
+               usbd: usbd@31020000 {
+                       compatible = "nxp,lpc3220-udc";
+                       reg = <0x31020000 0x300>;
+                       interrupt-parent = <&sic1>;
+                       interrupts = <29 IRQ_TYPE_LEVEL_HIGH>,
+                                    <30 IRQ_TYPE_LEVEL_HIGH>,
+                                    <28 IRQ_TYPE_LEVEL_HIGH>,
+                                    <26 IRQ_TYPE_LEVEL_LOW>;
+                       clocks = <&usbclk LPC32XX_USB_CLK_DEVICE>;
+                       status = "disabled";
+               };
 
-                       i2cusb: i2c@300 {
-                               compatible = "nxp,pnx-i2c";
-                               reg = <0x300 0x100>;
-                               interrupt-parent = <&sic1>;
-                               interrupts = <31 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&usbclk LPC32XX_USB_CLK_I2C>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                       };
+               i2cusb: i2c@31020300 {
+                       compatible = "nxp,pnx-i2c";
+                       reg = <0x31020300 0x100>;
+                       interrupt-parent = <&sic1>;
+                       interrupts = <31 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&usbclk LPC32XX_USB_CLK_I2C>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+               };
 
-                       usbclk: clock-controller@f00 {
-                               compatible = "nxp,lpc3220-usb-clk";
-                               reg = <0xf00 0x100>;
-                               #clock-cells = <1>;
-                       };
+               usbclk: clock-controller@31020f00 {
+                       compatible = "nxp,lpc3220-usb-clk";
+                       reg = <0x31020f00 0x100>;
+                       #clock-cells = <1>;
                };
 
                clcd: clcd@31040000 {