diff options
Diffstat (limited to 'arch/arm/boot/dts/omap3_h1.dts')
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 58 |
1 files changed, 12 insertions, 46 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index 5673768878d..b7a50f595e7 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -54,32 +54,7 @@ ti,vp = <&vp_core>; }; }; - - /* 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 { /* on omap, the irqs are calculated as follows: * for the 96 intc IRQs @@ -100,7 +75,8 @@ /* listed below will be reported as the wakeup reason */ /* */ /* off IRQ handle */ - ti,pad_irq = <0x16e 90 0>, /* uart3 - serial rx */ + ti,pad_irq = <0x150 88 1>, /* uart1 - BT input */ + <0x16e 90 0>, /* uart3 - serial rx */ <0x9f6 143 1>, /* mpu6515 irq pin - is this offset correct? */ <0x9f4 123 1>, /* BT host wake */ <0x1b0 23 1>; /* sys_nirq */ @@ -204,7 +180,8 @@ /* BT_WAKE_GPIO - for waking up BT */ /* OMAP_OFF_ENABLE, OMAP_OFF_PULL_EN, OMAP_OFF_OUTENABLE for sleep modes. */ - 0x0da 0x1604 /* DSS_DATA23, (IDIS | PI | M4 ) */ + /* Now set this to regular old output */ + 0x0da 0x004 /* 0x1604 */ /* DSS_DATA23, (IDIS | PI | M4 ) */ /* UART3 pins */ 0x16e 0x100 /* RX, input, off wake up */ @@ -213,22 +190,17 @@ /* GPIO146, aka UART2TX, aka Microphone enable */ 0x148 0x161C /* (204) OUTPUT | GPIO | OFF_ENABLE | OFF_PULL_LOW */ /* (0x161C) 0001011000011100 | PULL_ENA | PULL_UP */ - /* BT_HOST_WAKE */ - /* 0x9f4 0x4104 */ /* JTAG_EMU0 , (OMAP_MUX_MODE4 | OMAP_PIN_INPUT | OMAP_WAKEUPENABLE) */ + /* Accelerometer interrupt */ - /* I've tried configuring this both in the wkup pinmux (below) and here, but this location makes it not function as an interrupt... ??? */ /* 0x9f6 0x4104 */ /* JTAG_EMU1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | OMAP_PIN_OFF_WAKEUPENABLE */ - - /* UART 1 needs to be in safe mode for FCC tests */ - /* - 0x14c 0x007 - 0x14e 0x007 - 0x150 0x007 - 0x152 0x007 - */ + + 0x14c 0x000 /* UART1, BT, TX */ + 0x14e 0x000 /* UART1, BT, RTS */ + 0x150 0x4100 /* UART1, BT, CTS */ + 0x152 0x100 /* UART1, BT, RX */ >; }; @@ -248,13 +220,7 @@ >; }; - /* - i2c2_pins: pinmux_i2c2_pins { - pinctrl-single,pins = < - 0x18e 0x118 */ /* I2C2_SCL, MODE0 | INPUT_PULLUP */ - /* 0x190 0x118 */ /* I2C2_SDA, MODE0 | INPUT_PULLUP */ - /* >; */ - /* }; */ + }; @@ -268,7 +234,7 @@ 0x018 0x000 /* SYS_OFF_MODE, MODE0 */ 0x01a 0x10c /* SYS_CLKOUT1, MODE4 | INPUT_PULLDOWN */ /* Wakeup from Bluetooth */ - 0x024 0x4104 /* JTAG_EMU0, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | + 0x024 0x410C /* JTAG_EMU0, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | OMAP_PIN_OFF_WAKEUPENABLE */ /* Accelerometer interrupt */ 0x026 0x410C /* JTAG_EMU1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | |