diff options
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index 235a7cbe377..e570db34a7c 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -58,24 +58,26 @@ /* Test code for the ACC input pin. Should be disabled when * we're using the accelerometer. */ - + + /* gpio_buttons: gpio_buttons@0 { compatible = "gpio-keys"; #address-cells = <1>; #size-cells = <0>; + */ /* interrupt-parent = <&gpio1>; interrupts = <31>; wakeup-source; */ - + /* power { label = "mattis_button"; linux,code = <116>; gpios = <&gpio1 31 1>; gpio-key,wakeup; }; - }; + };*/ pad-wkup { @@ -103,18 +105,6 @@ <0x9f4 123 1>, /* BT host wake */ <0x1b0 23 1>; /* sys_nirq */ }; - - /* - gpio-keys { - compatible = "gpio-keys"; - - wkup-button { - label = "wkup-debug-button"; - gpios = <&gpio1 31 1>; - gpio-key,wakeup; - linux,code = <169>; - }; - };*/ }; &vc { @@ -261,7 +251,7 @@ /* 0x024 0x4104 */ /* JTAG_EMU0, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | OMAP_PIN_OFF_WAKEUPENABLE */ /* Accelerometer interrupt */ - 0x026 0x410c /* JTAG_EMU1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | + 0x026 0x410C /* JTAG_EMU1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | OMAP_PIN_OFF_WAKEUPENABLE */ >; }; @@ -314,6 +304,8 @@ regulator-always-on; }; + /* Leave one and two on for reliable wake-up */ + vdd1_reg: regulator@2 { /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */ /* @@ -324,7 +316,7 @@ regulator-name = "vdd_mpu_iva"; regulator-min-microvolt = <900000>; regulator-max-microvolt = <1350000>; - ti,regulator-ext-sleep-control = <8>; + /* ti,regulator-ext-sleep-control = <8>; */ }; vdd2_reg: regulator@3 { @@ -337,7 +329,7 @@ regulator-name = "vdd_core"; regulator-min-microvolt = <900000>; regulator-max-microvolt = <1200000>; - ti,regulator-ext-sleep-control = <8>; + /* ti,regulator-ext-sleep-control = <8>; */ }; /* not used, I think */ |