Merge branch 'led_enablement' of git://gitorious.ti.com/ti-linux-kernel/ti-linux...

* 'led_enablement' of git://gitorious.ti.com/ti-linux-kernel/ti-linux-feature-trees:
  ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers
  ARM: dts: omap5-uevm: Add LED support for uEVM blue LED
  ARM: dts: omap4-panda: Fix LED support for panda and pandaes
  TI-Integration: ARM:dts:omap4-panda-common: Add back integrated content for USB

Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
	arch/arm/boot/dts/omap4-panda-common.dtsi
	arch/arm/boot/dts/omap4-panda.dts
	arch/arm/configs/omap2plus_defconfig

diff --cc arch/arm/boot/dts/omap4-panda-common.dtsi
index 52bb823065d1617d7a42b251efafdc3291f7aa45,638c8659a212e7e7380c6b2afe743e702545421c..b2ceda1a951aa6aff47db1ebfbf876fa66ded3f5
--- 1/arch/arm/boot/dts/omap4-panda-common.dtsi
--- 2/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@@ -108,6 -90,6 +108,28 @@@
                clock-alias = "main_clk";
                device = <&hsusb1_phy>;
        };
++
++      /* HS USB Port 1 RESET */
++      hsusb1_reset: hsusb1_reset_reg {
++              compatible = "regulator-fixed";
++              regulator-name = "hsusb1_reset";
++              regulator-min-microvolt = <3300000>;
++              regulator-max-microvolt = <3300000>;
++              gpio = <&gpio2 30 0>;   /* gpio_62 */
++              startup-delay-us = <70000>;
++              enable-active-high;
++      };
++
++      /* HS USB Port 1 Power */
++      hsusb1_power: hsusb1_power_reg {
++              compatible = "regulator-fixed";
++              regulator-name = "hsusb1_vbus";
++              regulator-min-microvolt = <3300000>;
++              regulator-max-microvolt = <3300000>;
++              gpio = <&gpio1 1 0>;    /* gpio_1 */
++              startup-delay-us = <70000>;
++              enable-active-high;
++      };
  };
  
  &omap4_pmx_core {

diff --cc arch/arm/boot/dts/omap5-uevm.dts
Simple merge

diff --cc arch/arm/configs/omap2plus_defconfig
index 15cd735d9259635b4fbb4e9e4109d0706c0bc324,9c2eb539e3d7caa9317844e7db998f3d603004c3..6d3a3e6d0549d7aee35d4c849975cfeae0ef2fcd
--- 1/arch/arm/configs/omap2plus_defconfig
--- 2/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@@ -143,18 -152,14 +152,20 @@@ CONFIG_GPIO_SYSFS=
  CONFIG_GPIO_TWL4030=y
  CONFIG_W1=y
  CONFIG_POWER_SUPPLY=y
+ CONFIG_SENSORS_LM75=m
  CONFIG_WATCHDOG=y
 +CONFIG_THERMAL=y
 +CONFIG_THERMAL_HWMON=y
 +CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 +CONFIG_THERMAL_GOV_FAIR_SHARE=y
 +CONFIG_THERMAL_GOV_STEP_WISE=y
 +CONFIG_THERMAL_GOV_USER_SPACE=y
 +CONFIG_CPU_THERMAL=y
  CONFIG_OMAP_WATCHDOG=y
  CONFIG_TWL4030_WATCHDOG=y
  CONFIG_PALMAS_WATCHDOG=y
  CONFIG_MFD_TPS65217=y
 -CONFIG_MFD_TPS65910=y
+ CONFIG_TWL6040_CORE=y
  CONFIG_REGULATOR_TWL4030=y
  CONFIG_MFD_PALMAS=y
  CONFIG_MFD_PALMAS_GPADC=y