Merge tag 'omap-for-v5.4/fixes-rc1-signed' of git://git.kernel.org/pub/scm/linux...

Fixes for omaps for v5.4-rc cycle

Here are fixes for omaps to deal with few regressions, and to fix
more boot time errors and warnings:

- The recent ti-sysc interconnect target module driver changes had
  incorrect clock bits for both clocks and dts that cause warnings

- For omap3-gta04, gpio changes caused the LCD to break a while back,
  and after discussing things the right fix is to set spi-cs-high

- Recent omapdrm changes to use generic panels caused tfp410 to be
  disabled as we now must enable the generic support for it in
  defconfig

- Recent omapdrm and backlight changes also finally made droid4 LCD
  to work, so let's enable it in the defconfig it can be used out
  of the box. This is not strictly a fix, but we still also have the
  older CONFIG_MFD_TI_LMU options available so this cuts down the
  confusion for trying to guess which display and which backlight
  is needed

- Recent ti-sysc interconnect target module changes need the gpio
  module disabled on some boards, but this now needs to happen at
  the module level, not at the gpio driver level

- Recent changes to probe system timers with ti-sysc caused warnings
  about mismatch in syconfig registers, so let's configure the option
  for RESET_STATUS as available in the TRMs

- Recent changes to probe LCDC with ti-sysc caused warnings about
  mismatch in sysconfig registers, so let's configure the missing
  idlemodes for both platform data and dts as documented in TRMs

- Since we moved mach-omap2 to probe with device tree, we've been
  getting voltage controller warnings. Turns out this code is no
  longer needed, so let's just remove omap2_set_init_voltage() to
  get rid of the pointless warnings

- Configure am4372 dispc memory bandwidth to avoid underflow errors

* tag 'omap-for-v5.4/fixes-rc1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am4372: Set memory bandwidth limit for DISPC
  ARM: OMAP2+: Fix warnings with broken omap2_set_init_voltage()
  ARM: OMAP2+: Add missing LCDC midlemode for am335x
  ARM: OMAP2+: Fix missing reset done flag for am3 and am43
  ARM: dts: Fix gpio0 flags for am335x-icev2
  ARM: omap2plus_defconfig: Enable more droid4 devices as loadable modules
  ARM: omap2plus_defconfig: Enable DRM_TI_TFP410
  DTS: ARM: gta04: introduce legacy spi-cs-high to make display work again
  ARM: dts: Fix wrong clocks for dra7 mcasp
  clk: ti: dra7: Fix mcasp8 clock bits

Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Olof Johansson <[email protected]>

diff --combined arch/arm/boot/dts/am33xx-l4.dtsi
index 9915c891e05fa5e5c9d76149f5f90f5c4cc54578,3287cf695b5a41604277b69c26eb63294693990a..7a9eb2b0d45b012f6592e9227d55158899f5f2e7
--- 1/arch/arm/boot/dts/am33xx-l4.dtsi
--- 2/arch/arm/boot/dts/am33xx-l4.dtsi
+++ b/arch/arm/boot/dts/am33xx-l4.dtsi
@@@ -127,7 -127,7 +127,7 @@@
                        ranges = <0x0 0x5000 0x1000>;
                };
  
-               target-module@7000 {                    /* 0x44e07000, ap 14 20.0 */
+               gpio0_target: target-module@7000 {      /* 0x44e07000, ap 14 20.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
                        ti,hwmods = "gpio1";
                        reg = <0x7000 0x4>,
@@@ -673,6 -673,7 +673,6 @@@
  
                target-module@100000 {                  /* 0x4a100000, ap 3 08.0 */
                        compatible = "ti,sysc-omap4-simple", "ti,sysc";
 -                      ti,hwmods = "cpgmac0";
                        reg = <0x101200 0x4>,
                              <0x101208 0x4>,
                              <0x101204 0x4>;
@@@ -718,10 -719,9 +718,10 @@@
  
                                davinci_mdio: mdio@1000 {
                                        compatible = "ti,cpsw-mdio","ti,davinci_mdio";
 +                                      clocks = <&cpsw_125mhz_clkctrl AM3_CPSW_125MHZ_CPGMAC0_CLKCTRL 0>;
 +                                      clock-names = "fck";
                                        #address-cells = <1>;
                                        #size-cells = <0>;
 -                                      ti,hwmods = "davinci_mdio";
                                        bus_freq = <1000000>;
                                        reg = <0x1000 0x100>;
                                        status = "disabled";
@@@ -2038,7 -2038,9 +2038,9 @@@
                        reg = <0xe000 0x4>,
                              <0xe054 0x4>;
                        reg-names = "rev", "sysc";
-                       ti,sysc-midle ;
+                       ti,sysc-midle = <SYSC_IDLE_FORCE>,
+                                       <SYSC_IDLE_NO>,
+                                       <SYSC_IDLE_SMART>;
                        ti,sysc-sidle = <SYSC_IDLE_FORCE>,
                                        <SYSC_IDLE_NO>,
                                        <SYSC_IDLE_SMART>;

diff --combined arch/arm/boot/dts/dra7-l4.dtsi
index ea0e7c19eb4e3e3cb4fcdeb790229bcda971f928,099d6fe2a57adc4ab1ff1889bc8a9d02ad7119a3..5cac2dd58241fb33aff9356c8b0f6e7097ad860f
--- 1/arch/arm/boot/dts/dra7-l4.dtsi
--- 2/arch/arm/boot/dts/dra7-l4.dtsi
+++ b/arch/arm/boot/dts/dra7-l4.dtsi
@@@ -1118,6 -1118,7 +1118,6 @@@
  
                target-module@20000 {                   /* 0x48020000, ap 3 04.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "uart3";
                        reg = <0x20050 0x4>,
                              <0x20054 0x4>,
                              <0x20058 0x4>;
@@@ -1262,6 -1263,7 +1262,6 @@@
  
                gpio7_target: target-module@51000 {             /* 0x48051000, ap 45 2e.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "gpio7";
                        reg = <0x51000 0x4>,
                              <0x51010 0x4>,
                              <0x51114 0x4>;
@@@ -1295,6 -1297,7 +1295,6 @@@
  
                target-module@53000 {                   /* 0x48053000, ap 35 36.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "gpio8";
                        reg = <0x53000 0x4>,
                              <0x53010 0x4>,
                              <0x53114 0x4>;
@@@ -1328,6 -1331,7 +1328,6 @@@
  
                target-module@55000 {                   /* 0x48055000, ap 13 0e.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "gpio2";
                        reg = <0x55000 0x4>,
                              <0x55010 0x4>,
                              <0x55114 0x4>;
@@@ -1361,6 -1365,7 +1361,6 @@@
  
                target-module@57000 {                   /* 0x48057000, ap 15 06.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "gpio3";
                        reg = <0x57000 0x4>,
                              <0x57010 0x4>,
                              <0x57114 0x4>;
@@@ -1394,6 -1399,7 +1394,6 @@@
  
                target-module@59000 {                   /* 0x48059000, ap 17 16.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "gpio4";
                        reg = <0x59000 0x4>,
                              <0x59010 0x4>,
                              <0x59114 0x4>;
@@@ -1427,6 -1433,7 +1427,6 @@@
  
                target-module@5b000 {                   /* 0x4805b000, ap 19 1e.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "gpio5";
                        reg = <0x5b000 0x4>,
                              <0x5b010 0x4>,
                              <0x5b114 0x4>;
@@@ -1460,6 -1467,7 +1460,6 @@@
  
                target-module@5d000 {                   /* 0x4805d000, ap 21 26.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "gpio6";
                        reg = <0x5d000 0x4>,
                              <0x5d010 0x4>,
                              <0x5d114 0x4>;
@@@ -1493,6 -1501,7 +1493,6 @@@
  
                target-module@60000 {                   /* 0x48060000, ap 23 32.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "i2c3";
                        reg = <0x60000 0x8>,
                              <0x60010 0x8>,
                              <0x60090 0x8>;
@@@ -1525,6 -1534,7 +1525,6 @@@
  
                target-module@66000 {                   /* 0x48066000, ap 63 14.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "uart5";
                        reg = <0x66050 0x4>,
                              <0x66054 0x4>,
                              <0x66058 0x4>;
@@@ -1557,6 -1567,7 +1557,6 @@@
  
                target-module@68000 {                   /* 0x48068000, ap 53 1c.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "uart6";
                        reg = <0x68050 0x4>,
                              <0x68054 0x4>,
                              <0x68058 0x4>;
@@@ -1589,6 -1600,7 +1589,6 @@@
  
                target-module@6a000 {                   /* 0x4806a000, ap 24 24.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "uart1";
                        reg = <0x6a050 0x4>,
                              <0x6a054 0x4>,
                              <0x6a058 0x4>;
@@@ -1621,6 -1633,7 +1621,6 @@@
  
                target-module@6c000 {                   /* 0x4806c000, ap 26 2c.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "uart2";
                        reg = <0x6c050 0x4>,
                              <0x6c054 0x4>,
                              <0x6c058 0x4>;
@@@ -1653,6 -1666,7 +1653,6 @@@
  
                target-module@6e000 {                   /* 0x4806e000, ap 28 0c.1 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "uart4";
                        reg = <0x6e050 0x4>,
                              <0x6e054 0x4>,
                              <0x6e058 0x4>;
@@@ -1685,6 -1699,7 +1685,6 @@@
  
                target-module@70000 {                   /* 0x48070000, ap 30 22.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "i2c1";
                        reg = <0x70000 0x8>,
                              <0x70010 0x8>,
                              <0x70090 0x8>;
@@@ -1717,6 -1732,7 +1717,6 @@@
  
                target-module@72000 {                   /* 0x48072000, ap 32 2a.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "i2c2";
                        reg = <0x72000 0x8>,
                              <0x72010 0x8>,
                              <0x72090 0x8>;
@@@ -1779,6 -1795,7 +1779,6 @@@
  
                target-module@7a000 {                   /* 0x4807a000, ap 81 3a.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "i2c4";
                        reg = <0x7a000 0x8>,
                              <0x7a010 0x8>,
                              <0x7a090 0x8>;
@@@ -1811,6 -1828,7 +1811,6 @@@
  
                target-module@7c000 {                   /* 0x4807c000, ap 83 4a.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "i2c5";
                        reg = <0x7c000 0x8>,
                              <0x7c010 0x8>,
                              <0x7c090 0x8>;
@@@ -1924,6 -1942,7 +1924,6 @@@
  
                target-module@98000 {                   /* 0x48098000, ap 47 08.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
 -                      ti,hwmods = "mcspi1";
                        reg = <0x98000 0x4>,
                              <0x98010 0x4>;
                        reg-names = "rev", "sysc";
@@@ -1963,6 -1982,7 +1963,6 @@@
  
                target-module@9a000 {                   /* 0x4809a000, ap 49 10.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
 -                      ti,hwmods = "mcspi2";
                        reg = <0x9a000 0x4>,
                              <0x9a010 0x4>;
                        reg-names = "rev", "sysc";
@@@ -1997,6 -2017,7 +1997,6 @@@
  
                target-module@9c000 {                   /* 0x4809c000, ap 51 38.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
 -                      ti,hwmods = "mmc1";
                        reg = <0x9c000 0x4>,
                              <0x9c010 0x4>;
                        reg-names = "rev", "sysc";
@@@ -2056,6 -2077,7 +2056,6 @@@
  
                target-module@ad000 {                   /* 0x480ad000, ap 61 20.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
 -                      ti,hwmods = "mmc3";
                        reg = <0xad000 0x4>,
                              <0xad010 0x4>;
                        reg-names = "rev", "sysc";
@@@ -2115,6 -2137,7 +2115,6 @@@
  
                target-module@b4000 {                   /* 0x480b4000, ap 65 40.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
 -                      ti,hwmods = "mmc2";
                        reg = <0xb4000 0x4>,
                              <0xb4010 0x4>;
                        reg-names = "rev", "sysc";
@@@ -2151,6 -2174,7 +2151,6 @@@
  
                target-module@b8000 {                   /* 0x480b8000, ap 67 48.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
 -                      ti,hwmods = "mcspi3";
                        reg = <0xb8000 0x4>,
                              <0xb8010 0x4>;
                        reg-names = "rev", "sysc";
@@@ -2182,6 -2206,7 +2182,6 @@@
  
                target-module@ba000 {                   /* 0x480ba000, ap 69 18.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
 -                      ti,hwmods = "mcspi4";
                        reg = <0xba000 0x4>,
                              <0xba010 0x4>;
                        reg-names = "rev", "sysc";
@@@ -2213,6 -2238,7 +2213,6 @@@
  
                target-module@d1000 {                   /* 0x480d1000, ap 71 28.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
 -                      ti,hwmods = "mmc4";
                        reg = <0xd1000 0x4>,
                              <0xd1010 0x4>;
                        reg-names = "rev", "sysc";
@@@ -2358,6 -2384,7 +2358,6 @@@
  
                target-module@20000 {                   /* 0x48420000, ap 47 02.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "uart7";
                        reg = <0x20050 0x4>,
                              <0x20054 0x4>,
                              <0x20058 0x4>;
@@@ -2388,6 -2415,7 +2388,6 @@@
  
                target-module@22000 {                   /* 0x48422000, ap 49 0a.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "uart8";
                        reg = <0x22050 0x4>,
                              <0x22054 0x4>,
                              <0x22058 0x4>;
@@@ -2418,6 -2446,7 +2418,6 @@@
  
                target-module@24000 {                   /* 0x48424000, ap 51 12.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "uart9";
                        reg = <0x24050 0x4>,
                              <0x24054 0x4>,
                              <0x24058 0x4>;
@@@ -2706,6 -2735,7 +2706,6 @@@
  
                target-module@60000 {                   /* 0x48460000, ap 9 0e.0 */
                        compatible = "ti,sysc-dra7-mcasp", "ti,sysc";
 -                      ti,hwmods = "mcasp1";
                        reg = <0x60000 0x4>,
                              <0x60004 0x4>;
                        reg-names = "rev", "sysc";
@@@ -2732,7 -2762,7 +2732,7 @@@
                                interrupt-names = "tx", "rx";
                                dmas = <&edma_xbar 129 1>, <&edma_xbar 128 1>;
                                dma-names = "tx", "rx";
-                               clocks = <&ipu_clkctrl DRA7_IPU_MCASP1_CLKCTRL 22>,
+                               clocks = <&ipu_clkctrl DRA7_IPU_MCASP1_CLKCTRL 0>,
                                         <&ipu_clkctrl DRA7_IPU_MCASP1_CLKCTRL 24>,
                                         <&ipu_clkctrl DRA7_IPU_MCASP1_CLKCTRL 28>;
                                clock-names = "fck", "ahclkx", "ahclkr";
@@@ -2742,6 -2772,7 +2742,6 @@@
  
                target-module@64000 {                   /* 0x48464000, ap 11 1e.0 */
                        compatible = "ti,sysc-dra7-mcasp", "ti,sysc";
 -                      ti,hwmods = "mcasp2";
                        reg = <0x64000 0x4>,
                              <0x64004 0x4>;
                        reg-names = "rev", "sysc";
@@@ -2768,8 -2799,8 +2768,8 @@@
                                interrupt-names = "tx", "rx";
                                dmas = <&edma_xbar 131 1>, <&edma_xbar 130 1>;
                                dma-names = "tx", "rx";
-                               clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP2_CLKCTRL 22>,
-                                        <&l4per2_clkctrl DRA7_L4PER2_MCASP2_CLKCTRL 24>,
+                               clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP2_CLKCTRL 0>,
+                                        <&ipu_clkctrl DRA7_IPU_MCASP1_CLKCTRL 24>,
                                         <&l4per2_clkctrl DRA7_L4PER2_MCASP2_CLKCTRL 28>;
                                clock-names = "fck", "ahclkx", "ahclkr";
                                status = "disabled";
@@@ -2778,6 -2809,7 +2778,6 @@@
  
                target-module@68000 {                   /* 0x48468000, ap 13 26.0 */
                        compatible = "ti,sysc-dra7-mcasp", "ti,sysc";
 -                      ti,hwmods = "mcasp3";
                        reg = <0x68000 0x4>,
                              <0x68004 0x4>;
                        reg-names = "rev", "sysc";
@@@ -2786,9 -2818,8 +2786,8 @@@
                                        <SYSC_IDLE_SMART>;
                        /* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
                        clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 0>,
-                                <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>,
-                                <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 28>;
-                       clock-names = "fck", "ahclkx", "ahclkr";
+                                <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>;
+                       clock-names = "fck", "ahclkx";
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0x0 0x68000 0x2000>,
@@@ -2804,7 -2835,7 +2803,7 @@@
                                interrupt-names = "tx", "rx";
                                dmas = <&edma_xbar 133 1>, <&edma_xbar 132 1>;
                                dma-names = "tx", "rx";
-                               clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 22>,
+                               clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 0>,
                                         <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>;
                                clock-names = "fck", "ahclkx";
                                status = "disabled";
@@@ -2813,6 -2844,7 +2812,6 @@@
  
                target-module@6c000 {                   /* 0x4846c000, ap 15 2e.0 */
                        compatible = "ti,sysc-dra7-mcasp", "ti,sysc";
 -                      ti,hwmods = "mcasp4";
                        reg = <0x6c000 0x4>,
                              <0x6c004 0x4>;
                        reg-names = "rev", "sysc";
@@@ -2821,9 -2853,8 +2820,8 @@@
                                        <SYSC_IDLE_SMART>;
                        /* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
                        clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 0>,
-                                <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 24>,
-                                <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 28>;
-                       clock-names = "fck", "ahclkx", "ahclkr";
+                                <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 24>;
+                       clock-names = "fck", "ahclkx";
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0x0 0x6c000 0x2000>,
@@@ -2839,7 -2870,7 +2837,7 @@@
                                interrupt-names = "tx", "rx";
                                dmas = <&edma_xbar 135 1>, <&edma_xbar 134 1>;
                                dma-names = "tx", "rx";
-                               clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 22>,
+                               clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 0>,
                                         <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 24>;
                                clock-names = "fck", "ahclkx";
                                status = "disabled";
@@@ -2848,6 -2879,7 +2846,6 @@@
  
                target-module@70000 {                   /* 0x48470000, ap 19 36.0 */
                        compatible = "ti,sysc-dra7-mcasp", "ti,sysc";
 -                      ti,hwmods = "mcasp5";
                        reg = <0x70000 0x4>,
                              <0x70004 0x4>;
                        reg-names = "rev", "sysc";
@@@ -2856,9 -2888,8 +2854,8 @@@
                                        <SYSC_IDLE_SMART>;
                        /* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
                        clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 0>,
-                                <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 24>,
-                                <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 28>;
-                       clock-names = "fck", "ahclkx", "ahclkr";
+                                <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 24>;
+                       clock-names = "fck", "ahclkx";
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0x0 0x70000 0x2000>,
@@@ -2874,7 -2905,7 +2871,7 @@@
                                interrupt-names = "tx", "rx";
                                dmas = <&edma_xbar 137 1>, <&edma_xbar 136 1>;
                                dma-names = "tx", "rx";
-                               clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 22>,
+                               clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 0>,
                                         <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 24>;
                                clock-names = "fck", "ahclkx";
                                status = "disabled";
@@@ -2883,6 -2914,7 +2880,6 @@@
  
                target-module@74000 {                   /* 0x48474000, ap 35 14.0 */
                        compatible = "ti,sysc-dra7-mcasp", "ti,sysc";
 -                      ti,hwmods = "mcasp6";
                        reg = <0x74000 0x4>,
                              <0x74004 0x4>;
                        reg-names = "rev", "sysc";
@@@ -2891,9 -2923,8 +2888,8 @@@
                                        <SYSC_IDLE_SMART>;
                        /* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
                        clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 0>,
-                                <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 24>,
-                                <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 28>;
-                       clock-names = "fck", "ahclkx", "ahclkr";
+                                <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 24>;
+                       clock-names = "fck", "ahclkx";
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0x0 0x74000 0x2000>,
@@@ -2909,7 -2940,7 +2905,7 @@@
                                interrupt-names = "tx", "rx";
                                dmas = <&edma_xbar 139 1>, <&edma_xbar 138 1>;
                                dma-names = "tx", "rx";
-                               clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 22>,
+                               clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 0>,
                                         <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 24>;
                                clock-names = "fck", "ahclkx";
                                status = "disabled";
@@@ -2918,6 -2949,7 +2914,6 @@@
  
                target-module@78000 {                   /* 0x48478000, ap 39 0c.0 */
                        compatible = "ti,sysc-dra7-mcasp", "ti,sysc";
 -                      ti,hwmods = "mcasp7";
                        reg = <0x78000 0x4>,
                              <0x78004 0x4>;
                        reg-names = "rev", "sysc";
@@@ -2926,9 -2958,8 +2922,8 @@@
                                        <SYSC_IDLE_SMART>;
                        /* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
                        clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 0>,
-                                <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 24>,
-                                <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 28>;
-                       clock-names = "fck", "ahclkx", "ahclkr";
+                                <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 24>;
+                       clock-names = "fck", "ahclkx";
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0x0 0x78000 0x2000>,
@@@ -2944,7 -2975,7 +2939,7 @@@
                                interrupt-names = "tx", "rx";
                                dmas = <&edma_xbar 141 1>, <&edma_xbar 140 1>;
                                dma-names = "tx", "rx";
-                               clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 22>,
+                               clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 0>,
                                         <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 24>;
                                clock-names = "fck", "ahclkx";
                                status = "disabled";
@@@ -2953,6 -2984,7 +2948,6 @@@
  
                target-module@7c000 {                   /* 0x4847c000, ap 43 04.0 */
                        compatible = "ti,sysc-dra7-mcasp", "ti,sysc";
 -                      ti,hwmods = "mcasp8";
                        reg = <0x7c000 0x4>,
                              <0x7c004 0x4>;
                        reg-names = "rev", "sysc";
@@@ -2961,9 -2993,8 +2956,8 @@@
                                        <SYSC_IDLE_SMART>;
                        /* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
                        clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 0>,
-                                <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 24>,
-                                <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 28>;
-                       clock-names = "fck", "ahclkx", "ahclkr";
+                                <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 24>;
+                       clock-names = "fck", "ahclkx";
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0x0 0x7c000 0x2000>,
@@@ -2979,7 -3010,7 +2973,7 @@@
                                interrupt-names = "tx", "rx";
                                dmas = <&edma_xbar 143 1>, <&edma_xbar 142 1>;
                                dma-names = "tx", "rx";
-                               clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 22>,
+                               clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 0>,
                                         <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 24>;
                                clock-names = "fck", "ahclkx";
                                status = "disabled";
@@@ -3008,6 -3039,7 +3002,6 @@@
  
                target-module@84000 {                   /* 0x48484000, ap 3 10.0 */
                        compatible = "ti,sysc-omap4-simple", "ti,sysc";
 -                      ti,hwmods = "gmac";
                        reg = <0x85200 0x4>,
                              <0x85208 0x4>,
                              <0x85204 0x4>;
@@@ -3065,10 -3097,9 +3059,10 @@@
  
                                davinci_mdio: mdio@1000 {
                                        compatible = "ti,cpsw-mdio","ti,davinci_mdio";
 +                                      clocks = <&gmac_clkctrl DRA7_GMAC_GMAC_CLKCTRL 0>;
 +                                      clock-names = "fck";
                                        #address-cells = <1>;
                                        #size-cells = <0>;
 -                                      ti,hwmods = "davinci_mdio";
                                        bus_freq = <1000000>;
                                        reg = <0x1000 0x100>;
                                };
@@@ -4274,6 -4305,7 +4268,6 @@@
  
                target-module@0 {                       /* 0x4ae10000, ap 5 20.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "gpio1";
                        reg = <0x0 0x4>,
                              <0x10 0x4>,
                              <0x114 0x4>;
@@@ -4441,6 -4473,7 +4435,6 @@@
  
                target-module@b000 {                    /* 0x4ae2b000, ap 28 02.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
 -                      ti,hwmods = "uart10";
                        reg = <0xb050 0x4>,
                              <0xb054 0x4>,
                              <0xb058 0x4>;

diff --combined arch/arm/boot/dts/omap3-gta04.dtsi
index d01fc8744fd79246fe068f2886b04dca2c75833a,954c216140ad54f75d2d3be5cca9d67acf0c32b5..b6ef1a7ac8a4ee6c2b7dcf01fda66b600dc60f91
--- 1/arch/arm/boot/dts/omap3-gta04.dtsi
--- 2/arch/arm/boot/dts/omap3-gta04.dtsi
+++ b/arch/arm/boot/dts/omap3-gta04.dtsi
@@@ -24,10 -24,6 +24,10 @@@
                reg = <0x80000000 0x20000000>; /* 512 MB */
        };
  
 +      chosen {
 +              stdout-path = &uart3;
 +      };
 +
        aliases {
                display0 = &lcd;
                display1 = &tv0;
@@@ -124,6 -120,7 +124,7 @@@
                        spi-max-frequency = <100000>;
                        spi-cpol;
                        spi-cpha;
+                       spi-cs-high;
  
                        backlight= <&backlight>;
                        label = "lcd";

diff --combined arch/arm/configs/omap2plus_defconfig
index af406947658233192a787818fbe04d2b7b7aafc8,ae326572c62a69c0d3a304bd7f578ef8f00b8fef..d3f50971e451a4234da97cb09bcd05cf3fad60e1
--- 1/arch/arm/configs/omap2plus_defconfig
--- 2/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@@ -364,6 -364,7 +364,7 @@@ CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=
  CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11=m
  CONFIG_DRM_TILCDC=m
  CONFIG_DRM_PANEL_SIMPLE=m
+ CONFIG_DRM_TI_TFP410=m
  CONFIG_FB=y
  CONFIG_FIRMWARE_EDID=y
  CONFIG_FB_MODE_HELPERS=y
@@@ -423,6 -424,7 +424,7 @@@ CONFIG_USB_SERIAL_GENERIC=
  CONFIG_USB_SERIAL_SIMPLE=m
  CONFIG_USB_SERIAL_FTDI_SIO=m
  CONFIG_USB_SERIAL_PL2303=m
+ CONFIG_USB_SERIAL_OPTION=m
  CONFIG_USB_TEST=m
  CONFIG_NOP_USB_XCEIV=m
  CONFIG_AM335X_PHY_USB=m
@@@ -460,6 -462,7 +462,7 @@@ CONFIG_MMC_SDHCI_OMAP=
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=m
  CONFIG_LEDS_CPCAP=m
+ CONFIG_LEDS_LM3532=m
  CONFIG_LEDS_GPIO=m
  CONFIG_LEDS_PCA963X=m
  CONFIG_LEDS_PWM=m
@@@ -481,7 -484,7 +484,7 @@@ CONFIG_RTC_DRV_OMAP=
  CONFIG_RTC_DRV_CPCAP=m
  CONFIG_DMADEVICES=y
  CONFIG_OMAP_IOMMU=y
 -CONFIG_REMOTEPROC=m
 +CONFIG_REMOTEPROC=y
  CONFIG_OMAP_REMOTEPROC=m
  CONFIG_WKUP_M3_RPROC=m
  CONFIG_SOC_TI=y

diff --combined arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
index dd939e1325c64a4d1496c02465b18f225bd22b9b,7773876d165f1878668d1aaa859efa4e16109b16..29fd13684a68afd37e6cb6b9e6d6201ffa187cd8
--- 1/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
--- 2/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
@@@ -349,6 -349,54 +349,6 @@@ struct omap_hwmod_class am33xx_control_
        .name           = "control",
  };
  
 -/*
 - * 'cpgmac' class
 - * cpsw/cpgmac sub system
 - */
 -static struct omap_hwmod_class_sysconfig am33xx_cpgmac_sysc = {
 -      .rev_offs       = 0x0,
 -      .sysc_offs      = 0x8,
 -      .syss_offs      = 0x4,
 -      .sysc_flags     = (SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE |
 -                         SYSS_HAS_RESET_STATUS),
 -      .idlemodes      = (SIDLE_FORCE | SIDLE_NO | MSTANDBY_FORCE |
 -                         MSTANDBY_NO),
 -      .sysc_fields    = &omap_hwmod_sysc_type3,
 -};
 -
 -static struct omap_hwmod_class am33xx_cpgmac0_hwmod_class = {
 -      .name           = "cpgmac0",
 -      .sysc           = &am33xx_cpgmac_sysc,
 -};
 -
 -struct omap_hwmod am33xx_cpgmac0_hwmod = {
 -      .name           = "cpgmac0",
 -      .class          = &am33xx_cpgmac0_hwmod_class,
 -      .clkdm_name     = "cpsw_125mhz_clkdm",
 -      .flags          = (HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY),
 -      .main_clk       = "cpsw_125mhz_gclk",
 -      .mpu_rt_idx     = 1,
 -      .prcm           = {
 -              .omap4  = {
 -                      .modulemode     = MODULEMODE_SWCTRL,
 -              },
 -      },
 -};
 -
 -/*
 - * mdio class
 - */
 -static struct omap_hwmod_class am33xx_mdio_hwmod_class = {
 -      .name           = "davinci_mdio",
 -};
 -
 -struct omap_hwmod am33xx_mdio_hwmod = {
 -      .name           = "davinci_mdio",
 -      .class          = &am33xx_mdio_hwmod_class,
 -      .clkdm_name     = "cpsw_125mhz_clkdm",
 -      .main_clk       = "cpsw_125mhz_gclk",
 -};
 -
  /*
   * dcan class
   */
@@@ -763,7 -811,8 +763,8 @@@ static struct omap_hwmod_class_sysconfi
        .rev_offs       = 0x0000,
        .sysc_offs      = 0x0010,
        .syss_offs      = 0x0014,
-       .sysc_flags     = (SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET),
+       .sysc_flags     = SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
+                         SYSC_HAS_RESET_STATUS,
        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
                          SIDLE_SMART_WKUP),
        .sysc_fields    = &omap_hwmod_sysc_type2,
@@@ -1024,6 -1073,7 +1025,6 @@@ static void omap_hwmod_am33xx_clkctrl(v
        CLKCTRL(am33xx_tptc1_hwmod, AM33XX_CM_PER_TPTC1_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_tptc2_hwmod, AM33XX_CM_PER_TPTC2_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_gfx_hwmod, AM33XX_CM_GFX_GFX_CLKCTRL_OFFSET);
 -      CLKCTRL(am33xx_cpgmac0_hwmod, AM33XX_CM_PER_CPGMAC0_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_pruss_hwmod, AM33XX_CM_PER_PRUSS_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_mpu_hwmod , AM33XX_CM_MPU_MPU_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_l3_instr_hwmod , AM33XX_CM_PER_L3_INSTR_CLKCTRL_OFFSET);
@@@ -1085,6 -1135,7 +1086,6 @@@ static void omap_hwmod_am43xx_clkctrl(v
        CLKCTRL(am33xx_tptc1_hwmod, AM43XX_CM_PER_TPTC1_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_tptc2_hwmod, AM43XX_CM_PER_TPTC2_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_gfx_hwmod, AM43XX_CM_GFX_GFX_CLKCTRL_OFFSET);
 -      CLKCTRL(am33xx_cpgmac0_hwmod, AM43XX_CM_PER_CPGMAC0_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_pruss_hwmod, AM43XX_CM_PER_PRUSS_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_mpu_hwmod , AM43XX_CM_MPU_MPU_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_l3_instr_hwmod , AM43XX_CM_PER_L3_INSTR_CLKCTRL_OFFSET);

diff --combined arch/arm/mach-omap2/omap_hwmod_33xx_data.c
index 2bcb6345b8735bc75accd0b82f4c3d2e63919570,81d9912f17c8512637dbf3e210d86eba6b01b351..54524775f2782ddd3998eb51e9e90123106557ac
--- 1/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
--- 2/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
@@@ -231,8 -231,9 +231,9 @@@ static struct omap_hwmod am33xx_control
  static struct omap_hwmod_class_sysconfig lcdc_sysc = {
        .rev_offs       = 0x0,
        .sysc_offs      = 0x54,
-       .sysc_flags     = (SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE),
-       .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
+       .sysc_flags     = SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE,
+       .idlemodes      = SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                         MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART,
        .sysc_fields    = &omap_hwmod_sysc_type2,
  };
  
@@@ -372,6 -373,13 +373,6 @@@ static struct omap_hwmod_ocp_if am33xx_
        .user           = OCP_USER_MPU,
  };
  
 -static struct omap_hwmod_ocp_if am33xx_l4_hs__cpgmac0 = {
 -      .master         = &am33xx_l4_hs_hwmod,
 -      .slave          = &am33xx_cpgmac0_hwmod,
 -      .clk            = "cpsw_125mhz_gclk",
 -      .user           = OCP_USER_MPU,
 -};
 -
  static struct omap_hwmod_ocp_if am33xx_l3_main__lcdc = {
        .master         = &am33xx_l3_main_hwmod,
        .slave          = &am33xx_lcdc_hwmod,
@@@ -455,6 -463,8 +456,6 @@@ static struct omap_hwmod_ocp_if *am33xx
        &am33xx_l3_main__tptc2,
        &am33xx_l3_main__ocmc,
        &am33xx_l3_s__usbss,
 -      &am33xx_l4_hs__cpgmac0,
 -      &am33xx_cpgmac0__mdio,
        &am33xx_l3_main__sha0,
        &am33xx_l3_main__aes0,
        &am33xx_l4_per__rng,