Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a903166 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b80d60e1 65546ab0

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -841,6 +841,14 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git 
F:	arch/arm/mach-sa1100/jornada720.c

F:	arch/arm/mach-sa1100/include/mach/jornada720.h



ARM/IGEP MACHINE SUPPORT

M:	Enric Balletbo i Serra <eballetbo@gmail.com>

M:	Javier Martinez Canillas <javier@dowhile0.org>

L:	linux-omap@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-omap2/board-igep0020.c



ARM/INCOME PXA270 SUPPORT

M:	Marek Vasut <marek.vasut@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/arm/mach-davinci/dm644x.c

+1 −2
Original line number Diff line number Diff line
@@ -713,8 +713,7 @@ static int dm644x_venc_setup_clock(enum vpbe_enc_timings_type type, 
		break;

	case VPBE_ENC_CUSTOM_TIMINGS:

		if (pclock <= 27000000) {

			v |= DM644X_VPSS_MUXSEL_PLL2_MODE |

			     DM644X_VPSS_DACCLKEN;

			v |= DM644X_VPSS_DACCLKEN;

			writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL));

		} else {

			/*

arch/arm/mach-omap2/board-igep0020.c

+5 −0
Original line number Diff line number Diff line
@@ -580,6 +580,11 @@ static void __init igep_wlan_bt_init(void) 
	} else

		return;



	/* Make sure that the GPIO pins are muxed correctly */

	omap_mux_init_gpio(igep_wlan_bt_gpios[0].gpio, OMAP_PIN_OUTPUT);

	omap_mux_init_gpio(igep_wlan_bt_gpios[1].gpio, OMAP_PIN_OUTPUT);

	omap_mux_init_gpio(igep_wlan_bt_gpios[2].gpio, OMAP_PIN_OUTPUT);



	err = gpio_request_array(igep_wlan_bt_gpios,

				 ARRAY_SIZE(igep_wlan_bt_gpios));

	if (err) {

arch/arm/mach-omap2/twl-common.c

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ void __init omap4_pmic_init(const char *pmic_type, 
{

	/* PMIC part*/

	omap_mux_init_signal("sys_nirq1", OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE);

	omap_mux_init_signal("fref_clk0_out.sys_drm_msecure", OMAP_PIN_OUTPUT);

	omap_pmic_init(1, 400, pmic_type, 7 + OMAP44XX_IRQ_GIC_START, pmic_data);



	/* Register additional devices on i2c1 bus if needed */