diff options
| author | Evan Wilson <evan@oliodevices.com> | 2015-12-09 04:30:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ip-172-31-25-77.us-west-1.compute.internal> | 2015-04-16 10:08:13 +0000 |
| commit | 4cf43549a3bea53a65aa1b920b66734ea3c58a13 (patch) | |
| tree | ee4e87b0d5e187e74e2648a5c92622b023b9d304 | |
| parent | 8b56c64ab06318071f89590f2164a774f2450932 (diff) | |
| parent | e6c7eb806df9674bc38e065d7b79ffbca4fd4fb9 (diff) | |
| download | olio-linux-3.10-4cf43549a3bea53a65aa1b920b66734ea3c58a13.tar.xz olio-linux-3.10-4cf43549a3bea53a65aa1b920b66734ea3c58a13.zip | |
Merge "Turning all tps features on in device tree." into android-3.10-bringup
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index 40964563a1e..72f1bf0f11b 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -301,9 +301,7 @@ /* This is from HEAD */ /* ti,en-ck32k-xtal; */ - /* ti,en-dev-slp; */ - /* ti,sleepsig-pol; */ - /* ti,clkout32k-keepon; */ + /* set SR_CTL_I2C_SEL - access to smartreflex registers by control i2c */ /* ti,system-power-controller; */ @@ -311,9 +309,12 @@ /* crystal oscillator is installed on the board */ ti,en-ck32k-xtal; + ti,en-dev-slp; + ti,sleepsig-pol; + ti,clkout32k-keepon; /* set SR_CTL_I2C_SEL - access to smartreflex registers by control i2c */ - /* ti,system-power-controller; */ + ti,system-power-controller; vcc1-supply = <&vbat>; vcc2-supply = <&vbat>; |