Merge branch 'dm814x-soc' into omap-for-v4.3/soc

Update dm814x changes for sparse fixes to make data structures
static.

Conflicts:
	arch/arm/mach-omap2/omap_hwmod_81xx_data.c

diff --cc arch/arm/mach-omap2/board-generic.c
Simple merge

diff --cc arch/arm/mach-omap2/io.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod.h
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_81xx_data.c
index 280789a04ff9e84452bb124eca762a1e02d38d19,f12db1ff523fb2d0c3943a20191c7734bc62b447..b1288f56d5095b4ad782e81b0453c9094ec47ac1
--- 1/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
--- 2/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
@@@ -488,8 -535,8 +535,8 @@@ static struct omap_hwmod dm81xx_gpmc_hw
        },
  };
  
 -struct omap_hwmod_ocp_if dm81xx_alwon_l3_slow__gpmc = {
 +static struct omap_hwmod_ocp_if dm81xx_alwon_l3_slow__gpmc = {
-       .master         = &dm816x_alwon_l3_slow_hwmod,
+       .master         = &dm81xx_alwon_l3_slow_hwmod,
        .slave          = &dm81xx_gpmc_hwmod,
        .user           = OCP_USER_MPU,
  };
@@@ -694,6 -773,62 +773,62 @@@ static struct omap_hwmod_ocp_if dm816x_
        .user           = OCP_USER_MPU,
  };
  
 -struct omap_hwmod dm814x_cpgmac0_hwmod = {
+ /* CPSW on dm814x */
+ static struct omap_hwmod_class_sysconfig dm814x_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 dm814x_cpgmac0_hwmod_class = {
+       .name           = "cpgmac0",
+       .sysc           = &dm814x_cpgmac_sysc,
+ };
+ 
 -struct omap_hwmod dm814x_mdio_hwmod = {
++static struct omap_hwmod dm814x_cpgmac0_hwmod = {
+       .name           = "cpgmac0",
+       .class          = &dm814x_cpgmac0_hwmod_class,
+       .clkdm_name     = "alwon_ethernet_clkdm",
+       .flags          = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY,
+       .main_clk       = "cpsw_125mhz_gclk",
+       .prcm           = {
+               .omap4  = {
+                       .clkctrl_offs = DM81XX_CM_ALWON_ETHERNET_0_CLKCTRL,
+                       .modulemode = MODULEMODE_SWCTRL,
+               },
+       },
+ };
+ 
+ static struct omap_hwmod_class dm814x_mdio_hwmod_class = {
+       .name           = "davinci_mdio",
+ };
+ 
 -struct omap_hwmod_ocp_if dm814x_cpgmac0__mdio = {
++static struct omap_hwmod dm814x_mdio_hwmod = {
+       .name           = "davinci_mdio",
+       .class          = &dm814x_mdio_hwmod_class,
+       .clkdm_name     = "alwon_ethernet_clkdm",
+       .main_clk       = "cpsw_125mhz_gclk",
+ };
+ 
+ static struct omap_hwmod_ocp_if dm814x_l4_hs__cpgmac0 = {
+       .master         = &dm81xx_l4_hs_hwmod,
+       .slave          = &dm814x_cpgmac0_hwmod,
+       .clk            = "cpsw_125mhz_gclk",
+       .user           = OCP_USER_MPU,
+ };
+ 
++static struct omap_hwmod_ocp_if dm814x_cpgmac0__mdio = {
+       .master         = &dm814x_cpgmac0_hwmod,
+       .slave          = &dm814x_mdio_hwmod,
+       .user           = OCP_USER_MPU,
+       .flags          = HWMOD_NO_IDLEST,
+ };
+ 
  /* EMAC Ethernet */
  static struct omap_hwmod_class_sysconfig dm816x_emac_sysc = {
        .rev_offs       = 0x0,
@@@ -729,9 -864,9 +864,9 @@@ static struct omap_hwmod_class dm81xx_m
        .sysc           = &dm816x_emac_sysc,
  };
  
- static struct omap_hwmod dm816x_emac0_mdio_hwmod = {
 -struct omap_hwmod dm81xx_emac0_mdio_hwmod = {
++static struct omap_hwmod dm81xx_emac0_mdio_hwmod = {
        .name           = "davinci_mdio",
-       .class          = &dm816x_mdio_hwmod_class,
+       .class          = &dm81xx_mdio_hwmod_class,
        .clkdm_name     = "alwon_ethernet_clkdm",
        .main_clk       = "sysclk24_ck",
        .flags          = HWMOD_NO_IDLEST,
@@@ -747,9 -882,9 +882,9 @@@
        },
  };
  
- static struct omap_hwmod_ocp_if dm816x_emac0__mdio = {
-       .master         = &dm816x_l4_hs_hwmod,
-       .slave          = &dm816x_emac0_mdio_hwmod,
 -struct omap_hwmod_ocp_if dm81xx_emac0__mdio = {
++static struct omap_hwmod_ocp_if dm81xx_emac0__mdio = {
+       .master         = &dm81xx_l4_hs_hwmod,
+       .slave          = &dm81xx_emac0_mdio_hwmod,
        .user           = OCP_USER_MPU,
  };
  
@@@ -902,9 -1037,9 +1037,9 @@@ static struct omap_hwmod_class dm81xx_t
        .name           = "tpcc",
  };
  
- static struct omap_hwmod dm816x_tpcc_hwmod = {
 -struct omap_hwmod dm81xx_tpcc_hwmod = {
++static struct omap_hwmod dm81xx_tpcc_hwmod = {
        .name           = "tpcc",
-       .class          = &dm816x_tpcc_hwmod_class,
+       .class          = &dm81xx_tpcc_hwmod_class,
        .clkdm_name     = "alwon_l3s_clkdm",
        .main_clk       = "sysclk4_ck",
        .prcm           = {
@@@ -915,9 -1050,9 +1050,9 @@@
        },
  };
  
- static struct omap_hwmod_ocp_if dm816x_alwon_l3_fast__tpcc = {
-       .master         = &dm816x_alwon_l3_fast_hwmod,
-       .slave          = &dm816x_tpcc_hwmod,
 -struct omap_hwmod_ocp_if dm81xx_alwon_l3_fast__tpcc = {
++static struct omap_hwmod_ocp_if dm81xx_alwon_l3_fast__tpcc = {
+       .master         = &dm81xx_alwon_l3_fast_hwmod,
+       .slave          = &dm81xx_tpcc_hwmod,
        .clk            = "sysclk4_ck",
        .user           = OCP_USER_MPU,
  };
@@@ -935,9 -1070,9 +1070,9 @@@ static struct omap_hwmod_class dm81xx_t
        .name           = "tptc0",
  };
  
- static struct omap_hwmod dm816x_tptc0_hwmod = {
 -struct omap_hwmod dm81xx_tptc0_hwmod = {
++static struct omap_hwmod dm81xx_tptc0_hwmod = {
        .name           = "tptc0",
-       .class          = &dm816x_tptc0_hwmod_class,
+       .class          = &dm81xx_tptc0_hwmod_class,
        .clkdm_name     = "alwon_l3s_clkdm",
        .main_clk       = "sysclk4_ck",
        .prcm           = {
@@@ -948,19 -1083,19 +1083,19 @@@
        },
  };
  
- static struct omap_hwmod_ocp_if dm816x_alwon_l3_fast__tptc0 = {
-       .master         = &dm816x_alwon_l3_fast_hwmod,
-       .slave          = &dm816x_tptc0_hwmod,
 -struct omap_hwmod_ocp_if dm81xx_alwon_l3_fast__tptc0 = {
++static struct omap_hwmod_ocp_if dm81xx_alwon_l3_fast__tptc0 = {
+       .master         = &dm81xx_alwon_l3_fast_hwmod,
+       .slave          = &dm81xx_tptc0_hwmod,
        .clk            = "sysclk4_ck",
-       .addr           = dm816x_tptc0_addr_space,
+       .addr           = dm81xx_tptc0_addr_space,
        .user           = OCP_USER_MPU,
  };
  
- static struct omap_hwmod_ocp_if dm816x_tptc0__alwon_l3_fast = {
-       .master         = &dm816x_tptc0_hwmod,
-       .slave          = &dm816x_alwon_l3_fast_hwmod,
 -struct omap_hwmod_ocp_if dm81xx_tptc0__alwon_l3_fast = {
++static struct omap_hwmod_ocp_if dm81xx_tptc0__alwon_l3_fast = {
+       .master         = &dm81xx_tptc0_hwmod,
+       .slave          = &dm81xx_alwon_l3_fast_hwmod,
        .clk            = "sysclk4_ck",
-       .addr           = dm816x_tptc0_addr_space,
+       .addr           = dm81xx_tptc0_addr_space,
        .user           = OCP_USER_MPU,
  };
  
@@@ -977,9 -1112,9 +1112,9 @@@ static struct omap_hwmod_class dm81xx_t
        .name           = "tptc1",
  };
  
- static struct omap_hwmod dm816x_tptc1_hwmod = {
 -struct omap_hwmod dm81xx_tptc1_hwmod = {
++static struct omap_hwmod dm81xx_tptc1_hwmod = {
        .name           = "tptc1",
-       .class          = &dm816x_tptc1_hwmod_class,
+       .class          = &dm81xx_tptc1_hwmod_class,
        .clkdm_name     = "alwon_l3s_clkdm",
        .main_clk       = "sysclk4_ck",
        .prcm           = {
@@@ -990,19 -1125,19 +1125,19 @@@
        },
  };
  
- static struct omap_hwmod_ocp_if dm816x_alwon_l3_fast__tptc1 = {
-       .master         = &dm816x_alwon_l3_fast_hwmod,
-       .slave          = &dm816x_tptc1_hwmod,
 -struct omap_hwmod_ocp_if dm81xx_alwon_l3_fast__tptc1 = {
++static struct omap_hwmod_ocp_if dm81xx_alwon_l3_fast__tptc1 = {
+       .master         = &dm81xx_alwon_l3_fast_hwmod,
+       .slave          = &dm81xx_tptc1_hwmod,
        .clk            = "sysclk4_ck",
-       .addr           = dm816x_tptc1_addr_space,
+       .addr           = dm81xx_tptc1_addr_space,
        .user           = OCP_USER_MPU,
  };
  
- static struct omap_hwmod_ocp_if dm816x_tptc1__alwon_l3_fast = {
-       .master         = &dm816x_tptc1_hwmod,
-       .slave          = &dm816x_alwon_l3_fast_hwmod,
 -struct omap_hwmod_ocp_if dm81xx_tptc1__alwon_l3_fast = {
++static struct omap_hwmod_ocp_if dm81xx_tptc1__alwon_l3_fast = {
+       .master         = &dm81xx_tptc1_hwmod,
+       .slave          = &dm81xx_alwon_l3_fast_hwmod,
        .clk            = "sysclk4_ck",
-       .addr           = dm816x_tptc1_addr_space,
+       .addr           = dm81xx_tptc1_addr_space,
        .user           = OCP_USER_MPU,
  };
  
@@@ -1019,9 -1154,9 +1154,9 @@@ static struct omap_hwmod_class dm81xx_t
        .name           = "tptc2",
  };
  
- static struct omap_hwmod dm816x_tptc2_hwmod = {
 -struct omap_hwmod dm81xx_tptc2_hwmod = {
++static struct omap_hwmod dm81xx_tptc2_hwmod = {
        .name           = "tptc2",
-       .class          = &dm816x_tptc2_hwmod_class,
+       .class          = &dm81xx_tptc2_hwmod_class,
        .clkdm_name     = "alwon_l3s_clkdm",
        .main_clk       = "sysclk4_ck",
        .prcm           = {
@@@ -1032,19 -1167,19 +1167,19 @@@
        },
  };
  
- static struct omap_hwmod_ocp_if dm816x_alwon_l3_fast__tptc2 = {
-       .master         = &dm816x_alwon_l3_fast_hwmod,
-       .slave          = &dm816x_tptc2_hwmod,
 -struct omap_hwmod_ocp_if dm81xx_alwon_l3_fast__tptc2 = {
++static struct omap_hwmod_ocp_if dm81xx_alwon_l3_fast__tptc2 = {
+       .master         = &dm81xx_alwon_l3_fast_hwmod,
+       .slave          = &dm81xx_tptc2_hwmod,
        .clk            = "sysclk4_ck",
-       .addr           = dm816x_tptc2_addr_space,
+       .addr           = dm81xx_tptc2_addr_space,
        .user           = OCP_USER_MPU,
  };
  
- static struct omap_hwmod_ocp_if dm816x_tptc2__alwon_l3_fast = {
-       .master         = &dm816x_tptc2_hwmod,
-       .slave          = &dm816x_alwon_l3_fast_hwmod,
 -struct omap_hwmod_ocp_if dm81xx_tptc2__alwon_l3_fast = {
++static struct omap_hwmod_ocp_if dm81xx_tptc2__alwon_l3_fast = {
+       .master         = &dm81xx_tptc2_hwmod,
+       .slave          = &dm81xx_alwon_l3_fast_hwmod,
        .clk            = "sysclk4_ck",
-       .addr           = dm816x_tptc2_addr_space,
+       .addr           = dm81xx_tptc2_addr_space,
        .user           = OCP_USER_MPU,
  };
  
@@@ -1061,9 -1196,9 +1196,9 @@@ static struct omap_hwmod_class dm81xx_t
        .name           = "tptc3",
  };
  
- static struct omap_hwmod dm816x_tptc3_hwmod = {
 -struct omap_hwmod dm81xx_tptc3_hwmod = {
++static struct omap_hwmod dm81xx_tptc3_hwmod = {
        .name           = "tptc3",
-       .class          = &dm816x_tptc3_hwmod_class,
+       .class          = &dm81xx_tptc3_hwmod_class,
        .clkdm_name     = "alwon_l3s_clkdm",
        .main_clk       = "sysclk4_ck",
        .prcm           = {
@@@ -1074,19 -1209,19 +1209,19 @@@
        },
  };
  
- static struct omap_hwmod_ocp_if dm816x_alwon_l3_fast__tptc3 = {
-       .master         = &dm816x_alwon_l3_fast_hwmod,
-       .slave          = &dm816x_tptc3_hwmod,
 -struct omap_hwmod_ocp_if dm81xx_alwon_l3_fast__tptc3 = {
++static struct omap_hwmod_ocp_if dm81xx_alwon_l3_fast__tptc3 = {
+       .master         = &dm81xx_alwon_l3_fast_hwmod,
+       .slave          = &dm81xx_tptc3_hwmod,
        .clk            = "sysclk4_ck",
-       .addr           = dm816x_tptc3_addr_space,
+       .addr           = dm81xx_tptc3_addr_space,
        .user           = OCP_USER_MPU,
  };
  
- static struct omap_hwmod_ocp_if dm816x_tptc3__alwon_l3_fast = {
-       .master         = &dm816x_tptc3_hwmod,
-       .slave          = &dm816x_alwon_l3_fast_hwmod,
 -struct omap_hwmod_ocp_if dm81xx_tptc3__alwon_l3_fast = {
++static struct omap_hwmod_ocp_if dm81xx_tptc3__alwon_l3_fast = {
+       .master         = &dm81xx_tptc3_hwmod,
+       .slave          = &dm81xx_alwon_l3_fast_hwmod,
        .clk            = "sysclk4_ck",
-       .addr           = dm816x_tptc3_addr_space,
+       .addr           = dm81xx_tptc3_addr_space,
        .user           = OCP_USER_MPU,
  };
  

diff --cc arch/arm/mach-omap2/prcm-common.h
Simple merge