Merge branch 'dts-fixes' into omap-for-v4.15/fixes-dt

diff --combined Documentation/devicetree/bindings/usb/am33xx-usb.txt
index 6eb0a74d50a77036982769c3c9c9d4509f1c6f18,7a33f22c815a76ca534bf16f5d158e6d9ae07033..7a198a30408abf3f8a164189d60248f1dfcddc8b
--- 1/Documentation/devicetree/bindings/usb/am33xx-usb.txt
--- 2/Documentation/devicetree/bindings/usb/am33xx-usb.txt
+++ b/Documentation/devicetree/bindings/usb/am33xx-usb.txt
@@@ -95,7 -95,6 +95,7 @@@ usb: usb@47400000 
                reg = <0x47401300 0x100>;
                reg-names = "phy";
                ti,ctrl_mod = <&ctrl_mod>;
 +              #phy-cells = <0>;
        };
  
        usb0: usb@47401000 {
@@@ -142,7 -141,6 +142,7 @@@
                reg = <0x47401b00 0x100>;
                reg-names = "phy";
                ti,ctrl_mod = <&ctrl_mod>;
 +              #phy-cells = <0>;
        };
  
        usb1: usb@47401800 {
@@@ -183,7 -181,7 +183,7 @@@
                        "tx14", "tx15";
        };
  
-       cppi41dma: dma-controller@07402000 {
+       cppi41dma: dma-controller@7402000 {
                compatible = "ti,am3359-cppi41";
                reg =  <0x47400000 0x1000
                        0x47402000 0x1000

diff --combined arch/arm/boot/dts/am33xx.dtsi
index 29f3fbb6bee244ce35150f9cf032222a6157ec96,1b81c4e757727d2abcc798fefaaa55e0b0fecfec..d37f95025807708a9c486d1e6f6365f9960286b5
--- 1/arch/arm/boot/dts/am33xx.dtsi
--- 2/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@@ -36,6 -36,8 +36,8 @@@
                phy1 = &usb1_phy;
                ethernet0 = &cpsw_emac0;
                ethernet1 = &cpsw_emac1;
+               spi0 = &spi0;
+               spi1 = &spi1;
        };
  
        cpus {
@@@ -628,7 -630,6 +630,7 @@@
                                reg-names = "phy";
                                status = "disabled";
                                ti,ctrl_mod = <&usb_ctrl_mod>;
 +                              #phy-cells = <0>;
                        };
  
                        usb0: usb@47401000 {
@@@ -677,7 -678,6 +679,7 @@@
                                reg-names = "phy";
                                status = "disabled";
                                ti,ctrl_mod = <&usb_ctrl_mod>;
 +                              #phy-cells = <0>;
                        };
  
                        usb1: usb@47401800 {

diff --combined arch/arm/boot/dts/logicpd-som-lv.dtsi
index 4a79ce84045c4e25f49f30ee2823909ab26f998e,4f2c5ec7571450a59aca89293f3a6e71e30db1da..29cb804d10cc7d8ad9c37b13296d31bdf0f83ffe
--- 1/arch/arm/boot/dts/logicpd-som-lv.dtsi
--- 2/arch/arm/boot/dts/logicpd-som-lv.dtsi
+++ b/arch/arm/boot/dts/logicpd-som-lv.dtsi
@@@ -33,12 -33,11 +33,12 @@@
        hsusb2_phy: hsusb2_phy {
                compatible = "usb-nop-xceiv";
                reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; /* gpio_4 */
 +              #phy-cells = <0>;
        };
  };
  
  &gpmc {
-       ranges = <0 0 0x00000000 0x1000000>;    /* CS0: 16MB for NAND */
+       ranges = <0 0 0x30000000 0x1000000>;    /* CS0: 16MB for NAND */
  
        nand@0,0 {
                compatible = "ti,omap2-nand";
@@@ -122,7 -121,7 +122,7 @@@
  
  &mmc3 {
        interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>;
-       pinctrl-0 = <&mmc3_pins>;
+       pinctrl-0 = <&mmc3_pins &wl127x_gpio>;
        pinctrl-names = "default";
        vmmc-supply = <&wl12xx_vmmc>;
        non-removable;
@@@ -133,8 -132,8 +133,8 @@@
        wlcore: wlcore@2 {
                compatible = "ti,wl1273";
                reg = <2>;
-               interrupt-parent = <&gpio5>;
-               interrupts = <24 IRQ_TYPE_LEVEL_HIGH>; /* gpio 152 */
+               interrupt-parent = <&gpio1>;
+               interrupts = <2 IRQ_TYPE_LEVEL_HIGH>; /* gpio 2 */
                ref-clock-frequency = <26000000>;
        };
  };
@@@ -158,8 -157,6 +158,6 @@@
                        OMAP3_CORE1_IOPAD(0x2166, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat5.sdmmc3_dat1 */
                        OMAP3_CORE1_IOPAD(0x2168, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat6.sdmmc3_dat2 */
                        OMAP3_CORE1_IOPAD(0x216a, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat6.sdmmc3_dat3 */
-                       OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT_PULLUP | MUX_MODE4) /* mcbsp4_clkx.gpio_152 */
-                       OMAP3_CORE1_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4)       /* sys_boot1.gpio_3 */
                        OMAP3_CORE1_IOPAD(0x21d0, PIN_INPUT_PULLUP | MUX_MODE3) /* mcspi1_cs1.sdmmc3_cmd */
                        OMAP3_CORE1_IOPAD(0x21d2, PIN_INPUT_PULLUP | MUX_MODE3) /* mcspi1_cs2.sdmmc_clk */
                >;
@@@ -229,6 -226,12 +227,12 @@@
                        OMAP3_WKUP_IOPAD(0x2a0e, PIN_OUTPUT | MUX_MODE4)        /* sys_boot2.gpio_4 */
                >;
        };
+       wl127x_gpio: pinmux_wl127x_gpio_pin {
+               pinctrl-single,pins = <
+                       OMAP3_WKUP_IOPAD(0x2a0c, PIN_INPUT | MUX_MODE4)         /* sys_boot0.gpio_2 */
+                       OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4)        /* sys_boot1.gpio_3 */
+               >;
+       };
  };
  
  &omap3_pmx_core2 {

diff --combined arch/arm/boot/dts/omap3-cm-t3x.dtsi
index 08533fcdbbe8e3b641b4922f01d72886068c5bc6,31d5ebf38892e77d04fc53fcd37922ffaca282e2..ab6003fe5a4341ded0b7668861e7ff1553a9ef57
--- 1/arch/arm/boot/dts/omap3-cm-t3x.dtsi
--- 2/arch/arm/boot/dts/omap3-cm-t3x.dtsi
+++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
@@@ -1,3 -1,4 +1,4 @@@
+ // SPDX-License-Identifier: GPL-2.0
  /*
   * Common support for CompuLab CM-T3x CoMs
   */
@@@ -42,14 -43,12 +43,14 @@@
        hsusb1_phy: hsusb1_phy {
                compatible = "usb-nop-xceiv";
                vcc-supply = <&hsusb1_power>;
 +              #phy-cells = <0>;
        };
  
        /* HS USB Host PHY on PORT 2 */
        hsusb2_phy: hsusb2_phy {
                compatible = "usb-nop-xceiv";
                vcc-supply = <&hsusb2_power>;
 +              #phy-cells = <0>;
        };
  
        ads7846reg: ads7846-reg {

diff --combined arch/arm/boot/dts/omap3-evm-common.dtsi
index 26badcc64d7708113e1563e8fc1a4df4fa34f27b,dbc3f030a16c00cf8baf4e75cbd53fa5d21dc2a0..ee64191e41ca187b60eda4e36dc7aeb641c34896
--- 1/arch/arm/boot/dts/omap3-evm-common.dtsi
--- 2/arch/arm/boot/dts/omap3-evm-common.dtsi
+++ b/arch/arm/boot/dts/omap3-evm-common.dtsi
@@@ -1,3 -1,4 +1,4 @@@
+ // SPDX-License-Identifier: GPL-2.0
  /*
   * Common support for omap3 EVM boards
   */
@@@ -28,7 -29,6 +29,7 @@@
                compatible = "usb-nop-xceiv";
                reset-gpios = <&gpio1 21 GPIO_ACTIVE_LOW>; /* gpio_21 */
                vcc-supply = <&hsusb2_power>;
 +              #phy-cells = <0>;
        };
  
        leds {

diff --combined arch/arm/boot/dts/omap3-lilly-a83x.dtsi
index a87c0b6304359cd07e1fa8df05cee2e24d353a8a,343a36d8031d8a2207d9b411ae71000b50232fa0..7ada1e93e166389eb4472cc39d61003b4cc68360
--- 1/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
--- 2/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
+++ b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
@@@ -51,7 -51,6 +51,7 @@@
        hsusb1_phy: hsusb1_phy {
                compatible = "usb-nop-xceiv";
                vcc-supply = <&reg_vcc3>;
 +              #phy-cells = <0>;
        };
  };
  
@@@ -258,7 -257,7 +258,7 @@@
        pinctrl-names = "default";
        pinctrl-0 = <&i2c3_pins>;
                gpiom1: gpio@20 {
-                       compatible = "mcp,mcp23017";
+                       compatible = "microchip,mcp23017";
                        gpio-controller;
                        #gpio-cells = <2>;
                        reg = <0x20>;

diff --combined arch/arm/boot/dts/omap4-panda-common.dtsi
index 83b31682e5f15818cda8fa4c7c5b5c95e4788c97,22c1eee9b07a28e27cd1a2d66e89100065a3ce7b..5501d1b4e6cdfa152804b7cbb5b277fcdc0417f6
--- 1/arch/arm/boot/dts/omap4-panda-common.dtsi
--- 2/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@@ -13,6 -13,10 +13,10 @@@
                reg = <0x80000000 0x40000000>; /* 1 GB */
        };
  
+       chosen {
+               stdout-path = &uart3;
+       };
+ 
        aliases {
                display0 = &dvi0;
                display1 = &hdmi0;
@@@ -85,7 -89,6 +89,7 @@@
        hsusb1_phy: hsusb1_phy {
                compatible = "usb-nop-xceiv";
                reset-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>;   /* gpio_62 */
 +              #phy-cells = <0>;
                vcc-supply = <&hsusb1_power>;
                clocks = <&auxclk3_ck>;
                clock-names = "main_clk";

diff --combined arch/arm/boot/dts/omap4.dtsi
index 27454b1c2fdfbe4164f559b66b6558c1b9b646c1,d24291ed9f6ab9cf685e13ff0c8dc4b9f552dc23..3bba7128b8f3e74c8292e09b6469afa534c56dcd
--- 1/arch/arm/boot/dts/omap4.dtsi
--- 2/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@@ -1081,15 -1081,12 +1081,13 @@@
                        usbhsohci: ohci@4a064800 {
                                compatible = "ti,ohci-omap3";
                                reg = <0x4a064800 0x400>;
-                               interrupt-parent = <&gic>;
                                interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
 +                              remote-wakeup-connected;
                        };
  
                        usbhsehci: ehci@4a064c00 {
                                compatible = "ti,ehci-omap";
                                reg = <0x4a064c00 0x400>;
-                               interrupt-parent = <&gic>;
                                interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
                        };
                };

diff --combined arch/arm/boot/dts/omap5-board-common.dtsi
index d9ca403d8b24ff294f8c916c48b36ab52f102e3d,575ecffb0e9e47cfda8373c22071de12e8789302..1b20838bb9a42ed64b80b0943dd59acf8be0d06d
--- 1/arch/arm/boot/dts/omap5-board-common.dtsi
--- 2/arch/arm/boot/dts/omap5-board-common.dtsi
+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
@@@ -14,6 -14,10 +14,10 @@@
                display0 = &hdmi0;
        };
  
+       chosen {
+               stdout-path = &uart3;
+       };
+ 
        vmain: fixedregulator-vmain {
                compatible = "regulator-fixed";
                regulator-name = "vmain";
@@@ -69,14 -73,12 +73,14 @@@
                clocks = <&auxclk1_ck>;
                clock-names = "main_clk";
                clock-frequency = <19200000>;
 +              #phy-cells = <0>;
        };
  
        /* HS USB Host PHY on PORT 3 */
        hsusb3_phy: hsusb3_phy {
                compatible = "usb-nop-xceiv";
                reset-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>; /* gpio3_79 ETH_NRESET */
 +              #phy-cells = <0>;
        };
  
        tpd12s015: encoder {

diff --combined arch/arm/boot/dts/omap5-cm-t54.dts
index 73fcdda57dc2c51f6c95e605078ce77d718accf0,5b172a04b6f1b14193f280228432adf19b00296d..5e21fb430a65daa8e29a1ca90a404389d9dc99a9
--- 1/arch/arm/boot/dts/omap5-cm-t54.dts
--- 2/arch/arm/boot/dts/omap5-cm-t54.dts
+++ b/arch/arm/boot/dts/omap5-cm-t54.dts
@@@ -1,3 -1,4 +1,4 @@@
+ // SPDX-License-Identifier: GPL-2.0
  /*
   * Support for CompuLab CM-T54
   */
@@@ -62,14 -63,12 +63,14 @@@
        hsusb2_phy: hsusb2_phy {
                compatible = "usb-nop-xceiv";
                reset-gpios = <&gpio3 12 GPIO_ACTIVE_LOW>; /* gpio3_76 HUB_RESET */
 +              #phy-cells = <0>;
        };
  
        /* HS USB Host PHY on PORT 3 */
        hsusb3_phy: hsusb3_phy {
                compatible = "usb-nop-xceiv";
                reset-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>; /* gpio3_83 ETH_RESET */
 +              #phy-cells = <0>;
        };
  
        leds {

diff --combined arch/arm/boot/dts/omap5.dtsi
index 86054e89fa72cdaa0283be82f42d02e56f69f869,4cd0005e462f7a0b88577a578d0baff8f2b13714..51a7fb3d7b9a019f5b76d5f72afaa0c0c857e050
--- 1/arch/arm/boot/dts/omap5.dtsi
--- 2/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@@ -194,7 -194,7 +194,7 @@@
                                                pbias_mmc_reg: pbias_mmc_omap5 {
                                                        regulator-name = "pbias_mmc_omap5";
                                                        regulator-min-microvolt = <1800000>;
-                                                       regulator-max-microvolt = <3000000>;
+                                                       regulator-max-microvolt = <3300000>;
                                                };
                                        };
                                };
@@@ -940,7 -940,6 +940,7 @@@
                                compatible = "ti,ohci-omap3";
                                reg = <0x4a064800 0x400>;
                                interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
 +                              remote-wakeup-connected;
                        };
  
                        usbhsehci: ehci@4a064c00 {