Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y

* p-ti-linux-3.8.y:
  ARM: DRA7x: fix null pointer exception when accessing fpdlink sysfs entry
  arm: dra7: clockdomain: disable HW_AUTO for wakeupaon clockdomain

Change-Id: Ie209184907d06f361fc2fd48205c31f76b0fc60c
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>

2 files changed, 1 insertions, 12 deletions

diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index 90f9fdacdc24..dda8e0128590 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -1222,17 +1222,6 @@
         };
 };
 
-&dpi3 {
-        fpdlink {
-                compatible = "ti,lg101";
-                gpios = <&pcf_lcd3 0 0>; /* pcf8575@21 P0, SEL_GPMC_AD_VID_S0 */
-                data-lines = <24>;
-
-                serializer = <&lvds_fpd>;
-                dserializer = <&lvds_fpd1>;
-        };
-};
-
 &mXT244 {
         compatible = "atmel,mXT244";
         interrupts = <0 119 0x4>;
diff --git a/arch/arm/mach-omap2/clockdomains7xx_data.c b/arch/arm/mach-omap2/clockdomains7xx_data.c
index a261f6fa5185..2b2fb1c33258 100644
--- a/arch/arm/mach-omap2/clockdomains7xx_data.c
+++ b/arch/arm/mach-omap2/clockdomains7xx_data.c
@@ -676,7 +676,7 @@ static struct clockdomain wkupaon_7xx_clkdm = {
         .cm_inst          = DRA7XX_PRM_WKUPAON_CM_INST,
         .clkdm_offs       = DRA7XX_PRM_WKUPAON_CM_WKUPAON_CDOFFS,
         .dep_bit          = DRA7XX_WKUPAON_STATDEP_SHIFT,
-        .flags            = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP,
+        .flags            = CLKDM_CAN_FORCE_WAKEUP,
 };
 
 static struct clockdomain eve1_7xx_clkdm = {