diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-05-02 10:13:48 -0400 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-05-02 10:13:48 -0400 |
commit | adc00439952f2e2e2b11d120bfe62bcb5ec93d4a (patch) | |
tree | dbe0060eeb31799c6cc4a5423e2443b5bcdbe6e1 /arch/arm | |
parent | fb1dec1386bfd6f4f1bce71fe1b058f06cc42aad (diff) | |
parent | 7482b9bc86482f490d812f5c507767cd60bef6a7 (diff) |
Merge remote-tracking branch 'agreen/for-nicolas' into linaro-2.6.38
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 13 | ||||
-rw-r--r-- | arch/arm/mach-omap2/id.c | 20 | ||||
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 3 | ||||
-rw-r--r-- | arch/arm/plat-omap/Kconfig | 2 |
4 files changed, 30 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 920b7ba1c45..952784d852b 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -522,6 +522,19 @@ static struct omap_board_mux board_mux[] __initdata = { OMAP4_MUX(DPM_EMU18, OMAP_PIN_OUTPUT | OMAP_MUX_MODE5), /* dispc2_data0 */ OMAP4_MUX(DPM_EMU19, OMAP_PIN_OUTPUT | OMAP_MUX_MODE5), + /* WLAN IRQ - GPIO 53 */ + OMAP4_MUX(GPMC_NCS3, OMAP_MUX_MODE3 | OMAP_PIN_INPUT), + /* WLAN POWER ENABLE - GPIO 43 */ + OMAP4_MUX(GPMC_A19, OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT), + /* WLAN SDIO: MMC5 CMD */ + OMAP4_MUX(SDMMC5_CMD, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLUP), + /* WLAN SDIO: MMC5 CLK */ + OMAP4_MUX(SDMMC5_CLK, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLUP), + /* WLAN SDIO: MMC5 DAT[0-3] */ + OMAP4_MUX(SDMMC5_DAT0, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLUP), + OMAP4_MUX(SDMMC5_DAT1, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLUP), + OMAP4_MUX(SDMMC5_DAT2, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLUP), + OMAP4_MUX(SDMMC5_DAT3, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLUP), { .reg_offset = OMAP_MUX_TERMINATOR }, }; diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index e46b430c701..8887a5e69b8 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -141,14 +141,14 @@ static void __init omap24xx_check_revision(void) dev_type = (prod_id >> 16) & 0x0f; omap_get_die_id(&odi); - pr_debug("OMAP_TAP_IDCODE 0x%08x REV %i HAWKEYE 0x%04x MANF %03x\n", + pr_info("OMAP_TAP_IDCODE 0x%08x REV %i HAWKEYE 0x%04x MANF %03x\n", idcode, rev, hawkeye, (idcode >> 1) & 0x7ff); - pr_debug("OMAP_TAP_DIE_ID_0: 0x%08x\n", odi.id_0); - pr_debug("OMAP_TAP_DIE_ID_1: 0x%08x DEV_REV: %i\n", + pr_info("OMAP_TAP_DIE_ID_0: 0x%08x\n", odi.id_0); + pr_info("OMAP_TAP_DIE_ID_1: 0x%08x DEV_REV: %i\n", odi.id_1, (odi.id_1 >> 28) & 0xf); - pr_debug("OMAP_TAP_DIE_ID_2: 0x%08x\n", odi.id_2); - pr_debug("OMAP_TAP_DIE_ID_3: 0x%08x\n", odi.id_3); - pr_debug("OMAP_TAP_PROD_ID_0: 0x%08x DEV_TYPE: %i\n", + pr_info("OMAP_TAP_DIE_ID_2: 0x%08x\n", odi.id_2); + pr_info("OMAP_TAP_DIE_ID_3: 0x%08x\n", odi.id_3); + pr_info("OMAP_TAP_PROD_ID_0: 0x%08x DEV_TYPE: %i\n", prod_id, dev_type); /* Check hawkeye ids */ @@ -333,6 +333,14 @@ static void __init omap4_check_revision(void) u32 idcode; u16 hawkeye; u8 rev; + struct omap_die_id odi; + + omap_get_die_id(&odi); + + pr_info("OMAP_TAP_DIE_ID_0: 0x%08x\n", odi.id_0); + pr_info("OMAP_TAP_DIE_ID_1: 0x%08x\n", odi.id_1); + pr_info("OMAP_TAP_DIE_ID_2: 0x%08x\n", odi.id_2); + pr_info("OMAP_TAP_DIE_ID_3: 0x%08x\n", odi.id_3); /* * The IC rev detection is done with hawkeye and rev. diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index c5b67207e3e..57e7960a250 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -2130,7 +2130,8 @@ static struct omap_hwmod_class omap44xx_i2c_hwmod_class = { }; static struct omap_i2c_dev_attr i2c_dev_attr = { - .flags = OMAP_I2C_FLAG_BUS_SHIFT_NONE, + .flags = OMAP_I2C_FLAG_BUS_SHIFT_NONE | + OMAP_I2C_FLAG_RESET_REGS_POSTIDLE, }; /* i2c1 */ diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index 283f4552d1d..87a0eed3118 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig @@ -72,7 +72,7 @@ config OMAP_SMARTREFLEX_CLASS3 config OMAP_RESET_CLOCKS bool "Reset unused clocks during boot" - depends on ARCH_OMAP + depends on ARCH_OMAP && BROKEN help Say Y if you want to reset unused clocks during boot. This option saves power, but assumes all drivers are |