diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-21 16:56:36 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-21 16:56:36 -0500 |
commit | 65546ab097b023886a60df4cbc931d4cc362b98e (patch) | |
tree | 590906039c8c6cd2d5a9da9cc528d7ccbb5fc04c | |
parent | b3055556fc349b23f09e2c374054a4a80571169c (diff) | |
parent | 1ef43369c681bf30a980a4ba42df20514b15fdda (diff) |
Merge tag 'omap-for-v3.7-rc5/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
From Tony Lindgren:
Few more regression fixes related to u-boot only muxing
essential pins.
* tag 'omap-for-v3.7-rc5/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP4: TWL: mux sys_drm_msecure as output for PMIC
ARM: OMAP3: igep0020: Set WIFI/BT GPIO pins in correct mux mode
ARM: OMAP: Add maintainer entry for IGEP machines
-rw-r--r-- | MAINTAINERS | 8 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-igep0020.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-omap2/twl-common.c | 1 |
3 files changed, 14 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bb0b27db673f..bad3504b094c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -841,6 +841,14 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git | |||
841 | F: arch/arm/mach-sa1100/jornada720.c | 841 | F: arch/arm/mach-sa1100/jornada720.c |
842 | F: arch/arm/mach-sa1100/include/mach/jornada720.h | 842 | F: arch/arm/mach-sa1100/include/mach/jornada720.h |
843 | 843 | ||
844 | ARM/IGEP MACHINE SUPPORT | ||
845 | M: Enric Balletbo i Serra <eballetbo@gmail.com> | ||
846 | M: Javier Martinez Canillas <javier@dowhile0.org> | ||
847 | L: linux-omap@vger.kernel.org | ||
848 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
849 | S: Maintained | ||
850 | F: arch/arm/mach-omap2/board-igep0020.c | ||
851 | |||
844 | ARM/INCOME PXA270 SUPPORT | 852 | ARM/INCOME PXA270 SUPPORT |
845 | M: Marek Vasut <marek.vasut@gmail.com> | 853 | M: Marek Vasut <marek.vasut@gmail.com> |
846 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 854 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c index 48d5e41dfbfa..378590694447 100644 --- a/arch/arm/mach-omap2/board-igep0020.c +++ b/arch/arm/mach-omap2/board-igep0020.c | |||
@@ -580,6 +580,11 @@ static void __init igep_wlan_bt_init(void) | |||
580 | } else | 580 | } else |
581 | return; | 581 | return; |
582 | 582 | ||
583 | /* Make sure that the GPIO pins are muxed correctly */ | ||
584 | omap_mux_init_gpio(igep_wlan_bt_gpios[0].gpio, OMAP_PIN_OUTPUT); | ||
585 | omap_mux_init_gpio(igep_wlan_bt_gpios[1].gpio, OMAP_PIN_OUTPUT); | ||
586 | omap_mux_init_gpio(igep_wlan_bt_gpios[2].gpio, OMAP_PIN_OUTPUT); | ||
587 | |||
583 | err = gpio_request_array(igep_wlan_bt_gpios, | 588 | err = gpio_request_array(igep_wlan_bt_gpios, |
584 | ARRAY_SIZE(igep_wlan_bt_gpios)); | 589 | ARRAY_SIZE(igep_wlan_bt_gpios)); |
585 | if (err) { | 590 | if (err) { |
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c index 44c42057b61c..a256135d8e48 100644 --- a/arch/arm/mach-omap2/twl-common.c +++ b/arch/arm/mach-omap2/twl-common.c | |||
@@ -73,6 +73,7 @@ void __init omap4_pmic_init(const char *pmic_type, | |||
73 | { | 73 | { |
74 | /* PMIC part*/ | 74 | /* PMIC part*/ |
75 | omap_mux_init_signal("sys_nirq1", OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE); | 75 | omap_mux_init_signal("sys_nirq1", OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE); |
76 | omap_mux_init_signal("fref_clk0_out.sys_drm_msecure", OMAP_PIN_OUTPUT); | ||
76 | omap_pmic_init(1, 400, pmic_type, 7 + OMAP44XX_IRQ_GIC_START, pmic_data); | 77 | omap_pmic_init(1, 400, pmic_type, 7 + OMAP44XX_IRQ_GIC_START, pmic_data); |
77 | 78 | ||
78 | /* Register additional devices on i2c1 bus if needed */ | 79 | /* Register additional devices on i2c1 bus if needed */ |