Merge branch 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel...

TI-Feature: platform_base
TI-Tree: http://git.ti.com/git/~rrnayak/ti-linux-kernel/platform-linux-feature-tree
TI-Branch: platform-base-3.8.y

* 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
  ARM: OMAP2+: Fix sparse warnings
  ARM: OMAP2+: AM33xx: Add missing reset status info to GFX hwmod
  ARM: OMAP AM33XX: clock data: SET_RATE_PARENT in lcd path
  ARM: OMAP2+: clock data: add DEFINE_STRUCT_CLK_FLAGS helper
  ARM: OMAP2+: dpll: am335x - avoid freqsel
  ARM: OMAP: clock: Helpers to reparent and init rates
  ARM: OMAP4: clock: Initialize USB DPLL
  ARM: dts: AM33XX: Add default pinctrl binding for UART0 device
  ARM: dts: AM33XX: Fix uart numbering to match hardware/TRM
  ARM: dts: AM33XX: Add pinctrl binding to gpio-leds node
  ARM: dts: AM33XX: Fix gpio numbering to match hardware/TRM
  ARM: dts: AM33XX: Add default pinctrl binding for I2C device
  ARM: dts: AM33XX: Fix the i2c numbering to match hardware/TRM
  ARM: OMAP2+: AM335x: hwmod: do not reset GPIO0
  ARM: OMAP2: AM33XX: id: Add support for new AM335x PG2.1 Si
  ARM: AM33XX: Add missing .clkdm_name to clkdiv32k_ick clock
  ARM: OMAP2: AM33XX: id: Add support for AM335x PG2.0
  ARM: OMAP2+: Add command line parameter for debugSS module control
  ARM: AM33XX: hwmod: Add hwmod data for debugSS

Conflicts:
	arch/arm/boot/dts/am33xx.dtsi
	arch/arm/mach-omap2/omap-mpuss-lowpower.c
	arch/arm/mach-omap2/omap_hwmod_33xx_data.c

Signed-off-by: Dan Murphy <dmurphy@ti.com>

diff --cc arch/arm/boot/dts/am335x-bone.dts
Simple merge

diff --cc arch/arm/boot/dts/am335x-evm.dts
Simple merge

diff --cc arch/arm/boot/dts/am335x-evmsk.dts
Simple merge

diff --cc arch/arm/boot/dts/am33xx.dtsi
index ec5526cc90b6a428fc57e4b12031f310e728dd08,004e44e17b118ed978dee6541f1f8652d4ecc60f..6dd9674cb1a29563affc246bf9a6dab48dced6df
--- 1/arch/arm/boot/dts/am33xx.dtsi
--- 2/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@@ -87,27 -87,7 +87,27 @@@
                        reg = <0x48200000 0x1000>;
                };
  
-               gpio1: gpio@44e07000 {
 +              edma: edma@49000000 {
 +                      compatible = "ti,edma3";
 +                      ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2";
 +                      reg =   <0x49000000 0x10000>,
 +                              <0x44e10f90 0x10>;
 +                      interrupt-parent = <&intc>;
 +                      interrupts = <12 13 14>;
 +                      #dma-cells = <1>;
 +                      dma-channels = <64>;
 +                      ti,edma-regions = <4>;
 +                      ti,edma-slots = <256>;
 +                      ti,edma-queue-tc-map = <0 0
 +                                              1 1
 +                                              2 2>;
 +                      ti,edma-queue-priority-map = <0 0
 +                                                    1 1
 +                                                    2 2>;
 +                      ti,edma-default-queue = <0>;
 +              };
 +
+               gpio0: gpio@44e07000 {
                        compatible = "ti,omap4-gpio";
                        ti,hwmods = "gpio1";
                        gpio-controller;

diff --cc arch/arm/mach-omap2/Makefile
index 8c264aef5adef1f1945a0c26607f497d84030554,bfc50cb8807c281611df27c8e9027869bf786c6e..3c463a46dfc445ec4a420037dd9f7d85ffd890bc
--- 1/arch/arm/mach-omap2/Makefile
--- 2/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -5,10 -5,10 +5,10 @@@
  # Common support
  obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o gpmc.o timer.o pm.o \
         common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \
-        omap_device.o sram.o
+        omap_device.o sram.o debugss.o
  
  omap-2-3-common                               = irq.o
 -hwmod-common                          = omap_hwmod.o \
 +hwmod-common                          = omap_hwmod.o omap_hwmod_reset.o \
                                          omap_hwmod_common_data.o
  clock-common                          = clock.o clock_common_data.o \
                                          clkt_dpll.o clkt_clksel.o

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

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

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

diff --cc arch/arm/mach-omap2/omap-mpuss-lowpower.c
Simple merge

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

diff --cc arch/arm/mach-omap2/omap_hwmod_33xx_data.c
index f4783c0844529e672a7672b0e56874ecd481636e,8584201af82649f2adf2e57876ccfb90835b44d6..679f4c1dc9a166e446953c35544349cb2b9db080
--- 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
@@@ -417,8 -416,10 +418,8 @@@ static struct omap_hwmod am33xx_adc_tsc
   *
   *    - cEFUSE (doesn't fall under any ocp_if)
   *    - clkdiv32k
-  *    - debugss
+  *    - ocmc ram
   *    - ocp watch point
 - *    - aes0
 - *    - sha0
   */
  #if 0
  /*
@@@ -617,6 -549,37 +579,34 @@@ static struct omap_hwmod am33xx_sha0_hw
        },
  };
  
 -#endif
 -
 -
+ /*
+  * 'debugss' class
+  * debug sub system
+  */
+ static struct omap_hwmod_opt_clk debugss_opt_clks[] = {
+       { .role = "dbg_sysclk", .clk = "dbg_sysclk_ck" },
+       { .role = "dbg_clka", .clk = "dbg_clka_ck" },
+ };
+ 
+ static struct omap_hwmod_class am33xx_debugss_hwmod_class = {
+       .name           = "debugss",
+ };
+ 
+ static struct omap_hwmod am33xx_debugss_hwmod = {
+       .name           = "debugss",
+       .class          = &am33xx_debugss_hwmod_class,
+       .clkdm_name     = "l3_aon_clkdm",
+       .main_clk       = "trace_clk_div_ck",
+       .prcm           = {
+               .omap4  = {
+                       .clkctrl_offs   = AM33XX_CM_WKUP_DEBUGSS_CLKCTRL_OFFSET,
+                       .modulemode     = MODULEMODE_SWCTRL,
+               },
+       },
+       .opt_clks       = debugss_opt_clks,
+       .opt_clks_cnt   = ARRAY_SIZE(debugss_opt_clks),
+ };
+ 
  /* 'smartreflex' class */
  static struct omap_hwmod_class am33xx_smartreflex_hwmod_class = {
        .name           = "smartreflex",