author | Praneeth Bajjuri <praneeth@ti.com> | |
Tue, 7 Apr 2015 20:08:17 +0000 (15:08 -0500) | ||
committer | Praneeth Bajjuri <praneeth@ti.com> | |
Tue, 7 Apr 2015 20:08:17 +0000 (15:08 -0500) | ||
commit | b571604c0e1dd34e8be23c4024ca1d36cbcb79a4 | |
tree | ccbb9fe0171fae57abef41565c07326a0bb37b8b | tree | snapshot (tar.xz tar.gz zip) |
parent | 31034574f632dfa898e88c9f7fc520a0f8414257 | commit | diff |
parent | 40cac08ad8e7110b4600fb58f82bccf80a9ead1b | commit | diff |
Merge branch 'ti-linux-3.14.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel into p-ti-linux-3.14.y-common
* 'ti-linux-3.14.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel:
CLK: ti: dra7: Initialize USB_DPLL
ARM: DRA7: Enable Cortex A15 errata 798181
ARM: OMAP: dmtimer: disable pm runtime on remove
ARM: OMAP: dmtimer: check for pm_runtime_get_sync() failure
CLK: TI: DRA7: Add timer_sys_ck aliases for Timers 13 through 16
CLK: TI: DRA7: Correct timer_sys_ck clock aliases for Timers
ARM: OMAP2+: timer: Remove secure timer for DRA7xx devices
ARM: DRA7: hwmod: Add data for GPTimer 12
ARM: dts: DRA7: Add timer12 node
ARM: dts: DRA7: Remove ti,timer-dsp and ti,timer-pwm properties
ARM: DRA7: hwmod: Fix the hwmod class for GPTimer4
ARM: DRA7: hwmod: Add data for GPTimers 13 through 16
regulator: Palmas: Add has_regen3 check for TPS659038
regulator: palmas: Correct TPS659038 register definition for REGEN2
regulator: palmas: Fix SMPS enable/disable/is_enable for tps65917
regulator: palmas: Simplify code by not indexing regulator_desc unnecessarily
regulator: palmas: Rename palmas_regs_info to palmas_generic_regs_info
regulator: palmas: Simplify code by using pointer to palmas_reg_info
regulator: palmas: Rename reg_info to palmas_reg_info
regulator: palmas: Squelch sparse warnings
Conflicts:
drivers/clk/ti/clk-7xx.c
Change-Id: I571c6cb8d417a1ae2fb93e800f1db322045d9008
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
* 'ti-linux-3.14.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel:
CLK: ti: dra7: Initialize USB_DPLL
ARM: DRA7: Enable Cortex A15 errata 798181
ARM: OMAP: dmtimer: disable pm runtime on remove
ARM: OMAP: dmtimer: check for pm_runtime_get_sync() failure
CLK: TI: DRA7: Add timer_sys_ck aliases for Timers 13 through 16
CLK: TI: DRA7: Correct timer_sys_ck clock aliases for Timers
ARM: OMAP2+: timer: Remove secure timer for DRA7xx devices
ARM: DRA7: hwmod: Add data for GPTimer 12
ARM: dts: DRA7: Add timer12 node
ARM: dts: DRA7: Remove ti,timer-dsp and ti,timer-pwm properties
ARM: DRA7: hwmod: Fix the hwmod class for GPTimer4
ARM: DRA7: hwmod: Add data for GPTimers 13 through 16
regulator: Palmas: Add has_regen3 check for TPS659038
regulator: palmas: Correct TPS659038 register definition for REGEN2
regulator: palmas: Fix SMPS enable/disable/is_enable for tps65917
regulator: palmas: Simplify code by not indexing regulator_desc unnecessarily
regulator: palmas: Rename palmas_regs_info to palmas_generic_regs_info
regulator: palmas: Simplify code by using pointer to palmas_reg_info
regulator: palmas: Rename reg_info to palmas_reg_info
regulator: palmas: Squelch sparse warnings
Conflicts:
drivers/clk/ti/clk-7xx.c
Change-Id: I571c6cb8d417a1ae2fb93e800f1db322045d9008
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
arch/arm/boot/dts/dra7.dtsi | diff1 | | diff2 | | blob | history |
arch/arm/mach-omap2/omap_hwmod_7xx_data.c | diff1 | | diff2 | | blob | history |
drivers/clk/ti/clk-7xx.c | diff1 | | diff2 | | blob | history |