Merge branch 'pm-linux-2.8.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux...

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>

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/configs/omap2plus_defconfig
index 6d3a3e6d0549d7aee35d4c849975cfeae0ef2fcd,64dc3c157327870fb6e6a6495d5f75c8589dbc70..6558691216c7e4f5430c341b3587348bceaef1f9
--- 1/arch/arm/configs/omap2plus_defconfig
--- 2/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@@ -326,3 -291,8 +327,6 @@@ CONFIG_CRC_T10DIF=
  CONFIG_CRC_ITU_T=y
  CONFIG_CRC7=y
  CONFIG_LIBCRC32C=y
 -CONFIG_SOC_OMAP5=y
+ CONFIG_TI_DAVINCI_MDIO=y
+ CONFIG_TI_DAVINCI_CPDMA=y
 -CONFIG_TI_CPSW=y
+ CONFIG_SOC_DRA7XX=y

diff --cc arch/arm/mach-omap2/Kconfig
index 3ceda910e4b98ac1c369fed8c79c4e0d043b428f,fc986456175f3a29c074ca69d3e71dae03b8c68e..ed1b71e10663cf37731410e6e89562e20eac8326
--- 1/arch/arm/mach-omap2/Kconfig
--- 2/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@@ -87,9 -88,17 +88,19 @@@ config SOC_OMAP
        select CPU_V7
        select HAVE_SMP
        select COMMON_CLK
 +      select USB_ARCH_HAS_EHCI if USB_SUPPORT
 +      select USB_ARCH_HAS_XHCI if USB_SUPPORT
        select ARCH_NEEDS_CPU_IDLE_COUPLED
+       select PM_OPP if PM
+ 
+ config SOC_DRA7XX
+       bool "TI DRA7XX"
+       select ARCH_HAS_BANDGAP
+       select ARM_ARCH_TIMER
+       select CPU_V7
+       select ARM_GIC
+       select HAVE_SMP
+       select COMMON_CLK
  
  comment "OMAP Core Type"
        depends on ARCH_OMAP2

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

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

diff --cc arch/arm/mach-omap2/common.h
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/timer.c
Simple merge

diff --cc arch/arm/plat-omap/Kconfig
index 23d429bbf73b708c083b12530ce52d2d64e8bc1c,98000b22d04726b39482ccc1928d8e23e9011b91..5d6975084fb862672893bc36ade9eefb4d377333
--- 1/arch/arm/plat-omap/Kconfig
--- 2/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@@ -29,10 -29,9 +29,10 @@@ config ARCH_OMAP2PLU
        select PINCTRL
        select PROC_DEVICETREE if PROC_FS
        select SPARSE_IRQ
 +      select TI_PRIV_EDMA
        select USE_OF
        help
-         "Systems based on OMAP2, OMAP3, OMAP4 or OMAP5"
+         "Systems based on OMAP2, OMAP3, OMAP4, OMAP5 or DRA7XX"
  
  endchoice
  

diff --cc drivers/regulator/core.c
Simple merge

diff --cc drivers/regulator/palmas-regulator.c
Simple merge

diff --cc include/linux/mfd/palmas.h
index 46dbfb7f87852e2f8ab6b3de606a6837c20a6f84,14a09657afa902509e00d853dc331ef7430fd282..bbe280e1343bf9396127bde0933063082bab299e
--- 1/include/linux/mfd/palmas.h
--- 2/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@@ -363,9 -366,29 +371,29 @@@ struct palmas_usb 
  
        int vbus_enable;
  
 -      u8 linkstat;
 +      enum omap_dwc3_vbus_id_status linkstat;
  };
  
+ /**
+  * struct palmas_pmic_data -  Maintains the specific data for PMICs of PALMAS
+  *                            family
+  * @irq_chip:                 regmap_irq_chip specific to individual members
+  *                            of PALMAS family.
+  * @regmap_config:            regmap_config specific to the individual members
+  *                            of PALMAS family.
+  * @mfd_cell:                 mfd cell  specific to the individual members of
+  *                            PALMAS family.
+  * @id:                               Id of the member of the PALMAS family.
+  * @has_usb:                  Flag indicating whether PMIC supports USB
+  */
+ struct palmas_pmic_data {
+       struct regmap_irq_chip *irq_chip;
+       const struct regmap_config *regmap_config;
+       const struct mfd_cell *mfd_cell;
+       int id;
+       int has_usb;
+ };
+ 
  #define comparator_to_palmas(x) container_of((x), struct palmas_usb, comparator)
  
  enum usb_irq_events {

diff --cc include/linux/thermal.h
Simple merge