diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 29 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 9 |
2 files changed, 22 insertions, 16 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index 7b922bb66b0..46c6e2d97b1 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -68,7 +68,7 @@ * for a gpio IRQ (banks numbered 1 to 6) * irq = 16 + 96 + (gpio_bank - 1) * 32 + GPIO no. */ - compatible = "ti,pad-wkup"; + compatible = "ti,pad-wkup"; /* Map the pad offset (off) to an interrupt (IRQ). */ /* if handle is 1, an irq will be generated based on */ @@ -83,15 +83,16 @@ /* off IRQ handle */ ti,pad_irq = <0x150 88 1>, /* 72 + 16, uart1 - BT input */ - <0x9f6 143 1>, /* mpu6515 irq pin - is this offset correct? */ - <0x9ea 122 1>, /* bq27400 chg irq8 */ - <0x9f4 123 1>, /* BT host wake */ - <0x1b0 23 1>; /* sys_nirq */ + <0x9f6 143 1>, /* mpu6515 irq pin - is this offset correct? */ + /* <0x9ea 122 1>, */ /* bq27400 chg irq8 - needed here? */ + <0x9f4 123 1>, /* BT host wake */ + <0x1b0 23 1>; /* sys_nirq */ }; sound { compatible = "olio,omap-soc-omap3h1"; - olio,mcbsp = <&mcbsp3>; + olio,mcbsp_bt = <&mcbsp2>; + olio,mcbsp_mic = <&mcbsp3>; olio,mic_enable = <&gpio5 18 0>; }; }; @@ -215,14 +216,14 @@ >; }; - dev_pins: pinmux_pv_pins { - pinctrl-single,pins = < - 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 */ - >; - }; +dev_pins: pinmux_pv_pins { + pinctrl-single,pins = < + 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 */ + >; + }; /* i2c1_pins: pinmux_i2c1_pins { diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index ad40bd6d90e..7915962e45b 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -254,6 +254,10 @@ static struct platform_device omap3h1_dmic_codec = { .id = -1, }; +static struct platform_device omap3h1_bt_codec = { + .name = "omap3h1_bt_sco", + .id = -1, +}; /* --------------------------------------------------------------------------- */ /* USB settings @@ -473,9 +477,10 @@ static int __init omap3_h1_i2c_init(void) static struct platform_device *omap3h1_devices[] __initdata = { - &bcm20702_bluetooth_device, - &nop_phy_device, + &bcm20702_bluetooth_device, + &nop_phy_device, &omap3h1_dmic_codec, + &omap3h1_bt_codec, }; static void __init omap3_h1_init(void) |