diff options
| author | Evan Wilson <evan@oliodevices.com> | 2015-09-05 01:53:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ip-172-31-25-77.us-west-1.compute.internal> | 2015-04-16 10:08:13 +0000 |
| commit | 7e69ea3e42d4d07c003b82b763fd26d008c4b837 (patch) | |
| tree | 9d7551af3be8d44e9865154b50fcffc1708226b0 /arch/arm/boot | |
| parent | 29b8205a22c3dbd5db25b0f312140959f028a9c5 (diff) | |
| parent | dd46a9cf6addb2f92778a8e9a39b387f96613a67 (diff) | |
| download | olio-linux-3.10-7e69ea3e42d4d07c003b82b763fd26d008c4b837.tar.xz olio-linux-3.10-7e69ea3e42d4d07c003b82b763fd26d008c4b837.zip | |
Merge "Turning USB chip off during sleep, saving 0.5mA." into android-3.10-bringup
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index b8c949698ae..ab2a48631e4 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -207,7 +207,7 @@ dev_pins: pinmux_pv_pins { pinctrl-single,pins = < - 0x5b2 0x004 /* USB control, ETK_D3, MODE4 | OUTPUT */ + 0x5b2 0x204 /* USB control, ETK_D3, MODE4 | OUTPUT */ /* 0x1a2 0x104 */ /* ALS interrupt, input, GPIO */ 0x086 0x004 /* DRV2605 vibrator, output, GPIO */ /* 0x938 0x104 */ /* Battery state, input, GPIO */ |