diff options
Diffstat (limited to 'arch/arm/boot/dts/omap3_h1.dts')
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 59 |
1 files changed, 19 insertions, 40 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index e570db34a7c..9111ebf872e 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -193,13 +193,21 @@ 0x188 0x100 /* HSUSB0_DATA7, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT) */ /* pin for controlling bluetooth chip, settings from uboot */ + 0x1a8 0x004 /* CONTROL_PADCONF_MCSPI2_SIMO, (IDIS | PI | M4 ) */ 0x1aa 0x004 /* CONTROL_PADCONF_MCSPI2_SOMI, (IDIS | PI | M4 ) */ /* BT_WAKE_GPIO - for waking up BT */ - /* OMAP_OFF_ENABLE and OMAP_OFF_PULL_EN for sleep modes. */ - 0x0da 0x1204 /* DSS_DATA23, (IDIS | PI | M4 ) */ + /* OMAP_OFF_ENABLE, OMAP_OFF_PULL_EN, OMAP_OFF_OUTENABLE for sleep modes. */ + 0x0da 0x1604 /* DSS_DATA23, (IDIS | PI | M4 ) */ + /* UART3 pins */ + 0x16e 0x4100 /* RX, input, off wake up */ + 0x170 0x000 /* TX, output */ + + /* 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 | @@ -213,29 +221,15 @@ 0x18c 0x118 /* I2C1_SCA, MODE0 | INPUT_PULLUP */ >; }; - + + /* i2c2_pins: pinmux_i2c2_pins { pinctrl-single,pins = < - 0x18e 0x118 /* I2C2_SCL, MODE0 | INPUT_PULLUP */ - 0x190 0x118 /* I2C2_SDA, MODE0 | INPUT_PULLUP */ - >; - }; - - uart1_pins: pinmux_uart1_pins { - pinctrl-single,pins = < - /* uart1 */ - 0x152 0x118 /* UART1_RX, MODEO | (uboot: ien, pullup, m0 */ - 0x146 0x000 /* UART1_TX, MODE0 | OUTPUT, MODE0 */ - >; - }; - - uart3_pins: pinmux_uart3_pins { - pinctrl-single,pins = < - /* uart3 */ - 0x16e 0x4118 /* UART3_RX, MODEO | INPUT_PULLUP | OFFWAKEUP*/ - 0x170 0x000 /* UART3_TX, MODE0 | OUTPUT */ - >; - }; + 0x18e 0x118 */ /* I2C2_SCL, MODE0 | INPUT_PULLUP */ + /* 0x190 0x118 */ /* I2C2_SDA, MODE0 | INPUT_PULLUP */ + /* >; */ + /* }; */ + }; &omap3_pmx_wkup { /* pinmux@0x48002a00 */ @@ -248,11 +242,12 @@ 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 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 | OMAP_PIN_OFF_WAKEUPENABLE */ + >; }; }; @@ -439,19 +434,3 @@ }; - -&uart1 { - pinctrl-0 = <&uart1_pins>; - pinctrl-names = "default"; -}; - -&uart2 { - status = "disabled"; -}; - -&uart3 { - pinctrl-0 = <&uart3_pins>; - pinctrl-names = "default"; - autosuspend-delay = <(-1)>; /* -1 = infinity. Negative value needs parens */ - wakeup-capable; -}; |