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

Commit 7ee94d97 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:
 "Things have slowed down a lot for us, but we have five more fixes for
  omap and kirkwood below.  Three are for boards setup issues, two are
  SoC-level fixes."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: OMAP: igep0020: fix smsc911x dummy regulator id
  ARM: orion5x: Fix GPIO enable bits for MPP9
  ARM: kirkwood: add missing kexec.h include
  ARM: OMAP: Revert "ARM: OMAP: ctrl: Fix CONTROL_DSIPHY register fields"
  ARM: OMAP1: Amstrad Delta: Fix wrong IRQ base in FIQ handler
parents 22b6dd78 e396dbd4

arch/arm/mach-kirkwood/board-dt.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/init.h>

#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/kexec.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <mach/bridge-regs.h>

arch/arm/mach-omap1/ams-delta-fiq.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static irqreturn_t deferred_fiq(int irq, void *dev_id) 
	struct irq_chip *irq_chip = NULL;

	int gpio, irq_num, fiq_count;



	irq_desc = irq_to_desc(IH_GPIO_BASE);

	irq_desc = irq_to_desc(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK));

	if (irq_desc)

		irq_chip = irq_desc->irq_data.chip;

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

+1 −1
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ static struct regulator_consumer_supply dummy_supplies[] = { 


static void __init igep_init(void)

{

	regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));

	regulator_register_fixed(1, dummy_supplies, ARRAY_SIZE(dummy_supplies));

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);



	/* Get IGEP2 hardware revision */

arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h

+4 −4
Original line number Diff line number Diff line
@@ -941,10 +941,10 @@ 
#define OMAP4_DSI2_LANEENABLE_MASK				(0x7 << 29)

#define OMAP4_DSI1_LANEENABLE_SHIFT				24

#define OMAP4_DSI1_LANEENABLE_MASK				(0x1f << 24)

#define OMAP4_DSI2_PIPD_SHIFT					19

#define OMAP4_DSI2_PIPD_MASK					(0x1f << 19)

#define OMAP4_DSI1_PIPD_SHIFT					14

#define OMAP4_DSI1_PIPD_MASK					(0x1f << 14)

#define OMAP4_DSI1_PIPD_SHIFT					19

#define OMAP4_DSI1_PIPD_MASK					(0x1f << 19)

#define OMAP4_DSI2_PIPD_SHIFT					14

#define OMAP4_DSI2_PIPD_MASK					(0x1f << 14)



/* CONTROL_MCBSPLP */

#define OMAP4_ALBCTRLRX_FSX_SHIFT				31

arch/arm/mach-orion5x/mpp.h

+2 −2
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ 
#define MPP8_GIGE               MPP(8,  0x1, 0, 0, 1,   1,   1)



#define MPP9_UNUSED		MPP(9,  0x0, 0, 0, 1,   1,   1)

#define MPP9_GPIO		MPP(9,  0x0, 0, 0, 1,   1,   1)

#define MPP9_GIGE               MPP(9,  0x1, 1, 1, 1,   1,   1)

#define MPP9_GPIO		MPP(9,  0x0, 1, 1, 1,   1,   1)

#define MPP9_GIGE               MPP(9,  0x1, 0, 0, 1,   1,   1)



#define MPP10_UNUSED		MPP(10, 0x0, 0, 0, 1,   1,   1)

#define MPP10_GPIO		MPP(10, 0x0, 1, 1, 1,   1,   1)