author | Dan Murphy <dmurphy@ti.com> | |
Fri, 5 Apr 2013 15:32:55 +0000 (10:32 -0500) | ||
committer | Dan Murphy <dmurphy@ti.com> | |
Fri, 5 Apr 2013 15:32:55 +0000 (10:32 -0500) | ||
commit | 31d0e67132edd7b2d41a5c2f076538de6f2a199a | |
tree | 1fc8f87fd46e094a083e8d347e75ccbd0685e554 | tree | snapshot (tar.xz tar.gz zip) |
parent | 881dfafeae47da3a8f5ff8c791753e4b4df8065b | commit | diff |
parent | a9a396d1e65cf20337fae289589af7b4b50856a0 | commit | diff |
Merge branch 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into ti-linux-3.8.y
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>
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>