author | Dan Murphy <dmurphy@ti.com> | |
Thu, 30 May 2013 10:44:11 +0000 (05:44 -0500) | ||
committer | Dan Murphy <dmurphy@ti.com> | |
Thu, 30 May 2013 10:44:11 +0000 (05:44 -0500) | ||
commit | d46952dc97482889b72ab3b9dc683d13f6df0ec6 | |
tree | 308f66ef7a2a2641ec12fdf54d701e6764b08312 | tree | snapshot (tar.xz tar.gz zip) |
parent | f0c3968e54b5fd3d1c6751352a67383eedf01058 | commit | diff |
parent | 1215e6de72cc5a4a6129652a9f87f13ce1c97401 | commit | diff |
Merge branch 'pm-linux-2.8.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree into ti-linux-3.8.y
TI-Feature: power_management
TI-Tree: git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree.git
TI-Branch: pm-linux-3.8.y
* 'pm-linux-3.8.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree: (60 commits)
ARM: DRA7: dts: Remove the non existent l3_main_3 entry
ARM: DRA7: dpll: No freqsel on DRA7
ARM: DRA7: dpll: Lock GMAC PLL at boot
ARM: DRA7: dpll: Lock ABE PLL according to ATL needs
ARM: DRA7: id: Change control_id_code register address
thermal: consider emul_temperature while computing trend
ARM: OMAP5: Add select tuples to enable CPUFREQ on OMAP5
ARM: DRA7XX: PM: add soc_is_dra7xx check to take care of freqsel absence
ARM: dts: dra7: add clock nodes for CPU and link avs_mpu regulator to cpu
Arm: DRA7XX: Clock: Update dpll_mpu_ck_ops
ARM: DTS: DRA7: Link the actual TPS659038 regulators to
ARM: DTS: DRA7: Add avs class 0 regulator nodes
regulator: ti-avs-class0: use regulator name based on device instance
regulator: ti-avs-class0: dont reserve efuse memory offsets
cpufreq: cpufreq-cpu0: defer probe when regulator is not ready(v2)
regulator: core: return err value for regulator_get if there is no DT binding
ARM/dts: dra7-evm: Enable tps659038 on i2c1 bus
arm: dts: dra7: add I2C devices to dra7 DeviceTree file
arm: omap2plus_defconfig: enable DRA752 thermal support by default
arm: mach-omap2: flag DRA7 as having bandgap
...
Conflicts:
arch/arm/configs/omap2plus_defconfig
Signed-off-by: Dan Murphy <dmurphy@ti.com>
TI-Feature: power_management
TI-Tree: git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree.git
TI-Branch: pm-linux-3.8.y
* 'pm-linux-3.8.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree: (60 commits)
ARM: DRA7: dts: Remove the non existent l3_main_3 entry
ARM: DRA7: dpll: No freqsel on DRA7
ARM: DRA7: dpll: Lock GMAC PLL at boot
ARM: DRA7: dpll: Lock ABE PLL according to ATL needs
ARM: DRA7: id: Change control_id_code register address
thermal: consider emul_temperature while computing trend
ARM: OMAP5: Add select tuples to enable CPUFREQ on OMAP5
ARM: DRA7XX: PM: add soc_is_dra7xx check to take care of freqsel absence
ARM: dts: dra7: add clock nodes for CPU and link avs_mpu regulator to cpu
Arm: DRA7XX: Clock: Update dpll_mpu_ck_ops
ARM: DTS: DRA7: Link the actual TPS659038 regulators to
ARM: DTS: DRA7: Add avs class 0 regulator nodes
regulator: ti-avs-class0: use regulator name based on device instance
regulator: ti-avs-class0: dont reserve efuse memory offsets
cpufreq: cpufreq-cpu0: defer probe when regulator is not ready(v2)
regulator: core: return err value for regulator_get if there is no DT binding
ARM/dts: dra7-evm: Enable tps659038 on i2c1 bus
arm: dts: dra7: add I2C devices to dra7 DeviceTree file
arm: omap2plus_defconfig: enable DRA752 thermal support by default
arm: mach-omap2: flag DRA7 as having bandgap
...
Conflicts:
arch/arm/configs/omap2plus_defconfig
Signed-off-by: Dan Murphy <dmurphy@ti.com>
15 files changed: