diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-06-09 12:37:13 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-06-09 12:37:13 -0700 |
| commit | bb90aba3439775f08fe1289fbb40dee85624c398 (patch) | |
| tree | c1a4f470c6817cb12f517458cf07c525b7ded39e | |
| parent | 9bdcd4a656be073b446823908c98d0a8c441f0df (diff) | |
| download | olio-linux-3.10-bb90aba3439775f08fe1289fbb40dee85624c398.tar.xz olio-linux-3.10-bb90aba3439775f08fe1289fbb40dee85624c398.zip | |
Better sleep and device tree, now mostly working in Android.
Change-Id: I88bcc5cd5c47b9f68b60c4081e3f0e2ba3e4ee77
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 26 | ||||
| -rw-r--r-- | arch/arm/configs/omap3_h1_defconfig | 7 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 5 |
3 files changed, 18 insertions, 20 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index 4c28fdf293b..eeecb84bc80 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -52,7 +52,8 @@ /* listed below will be reported as the wakeup reason */ /* */ /* off IRQ handle */ - ti,pad_irq = <0x16e 90 1>; /* uart3 - serial rx */ + ti,pad_irq = <0x16e 90 1>, /* uart3 - serial rx */ + <0x9f6 143 1>; /* mpu6515 irq pin */ }; }; @@ -79,7 +80,7 @@ clksetup_time = <1000>; }; -&omap3_pmx_core { +&omap3_pmx_core { /* pinmux@48002030 */ pinctrl-names = "default"; pinctrl-0 = < &board_pins @@ -140,16 +141,10 @@ 0x186 0x100 /* HSUSB0_DATA6, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT) */ 0x188 0x100 /* HSUSB0_DATA7, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT) */ - /* USB connected interrupt */ - 0x5ba 0x004 /* ETK_D7, (OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT)) */ - - 0x1b0 0x100 /* SYS_NIRQ, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)) */ - - /* Accelerometer interrupt */ - 0x9fc 0x4104 /* JTAG_EMU1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | - OMAP_PIN_OFF_WAKEUPENABLE) */ - - >; + /* Accelerometer interrupt */ + /* 0x9f6 0x4104 */ /* JTAG_EMU1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | + OMAP_PIN_OFF_WAKEUPENABLE */ + >; }; uart3_pins: pinmux_uart3_pins { @@ -159,9 +154,11 @@ 0x170 0x000 /* UART3_TX, MODE0 | OUTPUT */ >; }; + + }; -&omap3_pmx_wkup{ +&omap3_pmx_wkup { /* pinmux@0x48002a00 */ pinctrl-names = "default"; pinctrl-0 = <&wkup_pins>; @@ -170,6 +167,9 @@ 0x006 0x008 /* SYS_CLKREQ, MODE0 | PULLDOWN */ 0x018 0x000 /* SYS_OFF_MODE, MODE0 */ 0x01a 0x10c /* SYS_CLKOUT1, MODE4 | INPUT_PULLDOWN */ + /* Accelerometer interrupt */ + 0x026 0x4104 /* JTAG_EMU1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | + OMAP_PIN_OFF_WAKEUPENABLE */ >; }; }; diff --git a/arch/arm/configs/omap3_h1_defconfig b/arch/arm/configs/omap3_h1_defconfig index d23f8dc5188..fd9226100e1 100644 --- a/arch/arm/configs/omap3_h1_defconfig +++ b/arch/arm/configs/omap3_h1_defconfig @@ -2318,10 +2318,9 @@ CONFIG_STAGING=y # Triggers - standalone # # CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set -# CONFIG_IIO_GPIO_TRIGGER is not set -# CONFIG_IIO_SYSFS_TRIGGER is not set +CONFIG_IIO_GPIO_TRIGGER=y +CONFIG_IIO_SYSFS_TRIGGER=y CONFIG_INV_MPU_IIO=y -# CONFIG_OLIO_TAP_ENABLE is not set # CONFIG_INV_IIO_MPU3050_ACCEL_SLAVE_BMA250 is not set # CONFIG_DTS_INV_MPU_IIO is not set # CONFIG_IIO_SIMPLE_DUMMY is not set @@ -2393,7 +2392,7 @@ CONFIG_OMAP_IOMMU_DEBUG=y # CONFIG_MEMORY is not set CONFIG_IIO=y CONFIG_IIO_BUFFER=y -# CONFIG_IIO_BUFFER_CB is not set +CONFIG_IIO_BUFFER_CB=y CONFIG_IIO_KFIFO_BUF=y CONFIG_IIO_TRIGGER=y CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index aba0cdfa5b1..a3fc2d10bc8 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -215,12 +215,11 @@ static struct mxt_platform_data mxt_data = { .irqflags = IRQF_TRIGGER_FALLING, }; -/* + static struct platform_device bcm20702_bluetooth_device = { .name = "bcm20702_bluetooth", .id = -1, }; - */ static struct platform_device omap3h1_dmic_codec = { .name = "dmic-codec", @@ -1106,7 +1105,7 @@ static int __init omap3_h1_i2c_init(void) static struct platform_device *omap3h1_devices[] __initdata = { &omap3h1_vbat, - // &bcm20702_bluetooth_device, + &bcm20702_bluetooth_device, &nop_phy_device, &omap3h1_dmic_codec, }; |