tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
"A few more fixes for final 3.7. Two dealing with pinmux setup on
OMAP, and one dealing with TV output on DaVinci. And one small
MAINTAINER update."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: davinci: dm644x: fix out range signal for ED
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

Linus Torvalds 5a903166 b80d60e1

+15 -2
+8
MAINTAINERS
··· 841 841 F: arch/arm/mach-sa1100/jornada720.c 842 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 852 ARM/INCOME PXA270 SUPPORT 845 853 M: Marek Vasut <marek.vasut@gmail.com> 846 854 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+1 -2
arch/arm/mach-davinci/dm644x.c
··· 713 713 break; 714 714 case VPBE_ENC_CUSTOM_TIMINGS: 715 715 if (pclock <= 27000000) { 716 - v |= DM644X_VPSS_MUXSEL_PLL2_MODE | 717 - DM644X_VPSS_DACCLKEN; 716 + v |= DM644X_VPSS_DACCLKEN; 718 717 writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL)); 719 718 } else { 720 719 /*
+5
arch/arm/mach-omap2/board-igep0020.c
··· 580 580 } else 581 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 588 err = gpio_request_array(igep_wlan_bt_gpios, 584 589 ARRAY_SIZE(igep_wlan_bt_gpios)); 585 590 if (err) {
+1
arch/arm/mach-omap2/twl-common.c
··· 73 73 { 74 74 /* PMIC part*/ 75 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 77 omap_pmic_init(1, 400, pmic_type, 7 + OMAP44XX_IRQ_GIC_START, pmic_data); 77 78 78 79 /* Register additional devices on i2c1 bus if needed */