| commit | af38c78f36c204931e4e9a45f0641cb9a70e5d3c | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Tue Jul 16 02:27:07 2013 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Tue Jul 16 02:27:03 2013 -0700 |
| tree | ca58ad89e52d251eeaa653983811224dbb0352b1 | |
| parent | e03dcda86e683e3b51a81b4d1c9ab0a20588838a [diff] | |
| parent | 78cc58415371c6cca48f708f119f3ed66cd82c97 [diff] |
Merge "ARM: dts: msm: Support no lpm for atmel touch controller"
diff --git a/arch/arm/boot/dts/msm8610-cdp.dts b/arch/arm/boot/dts/msm8610-cdp.dts index ce4ada5..b0c0191 100644 --- a/arch/arm/boot/dts/msm8610-cdp.dts +++ b/arch/arm/boot/dts/msm8610-cdp.dts
@@ -42,6 +42,7 @@ atmel,display-coords = <0 0 480 800>; atmel,i2c-pull-up; atmel,no-force-update; + atmel,no-lpm-support; atmel,cfg_1 { atmel,family-id = <0x81>; atmel,variant-id = <0x15>;