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:
"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

Linus Torvalds 7ee94d97 22b6dd78

+9 -8
+1
arch/arm/mach-kirkwood/board-dt.c
··· 14 14 #include <linux/init.h> 15 15 #include <linux/of.h> 16 16 #include <linux/of_platform.h> 17 + #include <linux/kexec.h> 17 18 #include <asm/mach/arch.h> 18 19 #include <asm/mach/map.h> 19 20 #include <mach/bridge-regs.h>
+1 -1
arch/arm/mach-omap1/ams-delta-fiq.c
··· 48 48 struct irq_chip *irq_chip = NULL; 49 49 int gpio, irq_num, fiq_count; 50 50 51 - irq_desc = irq_to_desc(IH_GPIO_BASE); 51 + irq_desc = irq_to_desc(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK)); 52 52 if (irq_desc) 53 53 irq_chip = irq_desc->irq_data.chip; 54 54
+1 -1
arch/arm/mach-omap2/board-igep0020.c
··· 641 641 642 642 static void __init igep_init(void) 643 643 { 644 - regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies)); 644 + regulator_register_fixed(1, dummy_supplies, ARRAY_SIZE(dummy_supplies)); 645 645 omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); 646 646 647 647 /* Get IGEP2 hardware revision */
+4 -4
arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h
··· 941 941 #define OMAP4_DSI2_LANEENABLE_MASK (0x7 << 29) 942 942 #define OMAP4_DSI1_LANEENABLE_SHIFT 24 943 943 #define OMAP4_DSI1_LANEENABLE_MASK (0x1f << 24) 944 - #define OMAP4_DSI2_PIPD_SHIFT 19 945 - #define OMAP4_DSI2_PIPD_MASK (0x1f << 19) 946 - #define OMAP4_DSI1_PIPD_SHIFT 14 947 - #define OMAP4_DSI1_PIPD_MASK (0x1f << 14) 944 + #define OMAP4_DSI1_PIPD_SHIFT 19 945 + #define OMAP4_DSI1_PIPD_MASK (0x1f << 19) 946 + #define OMAP4_DSI2_PIPD_SHIFT 14 947 + #define OMAP4_DSI2_PIPD_MASK (0x1f << 14) 948 948 949 949 /* CONTROL_MCBSPLP */ 950 950 #define OMAP4_ALBCTRLRX_FSX_SHIFT 31
+2 -2
arch/arm/mach-orion5x/mpp.h
··· 65 65 #define MPP8_GIGE MPP(8, 0x1, 0, 0, 1, 1, 1) 66 66 67 67 #define MPP9_UNUSED MPP(9, 0x0, 0, 0, 1, 1, 1) 68 - #define MPP9_GPIO MPP(9, 0x0, 0, 0, 1, 1, 1) 69 - #define MPP9_GIGE MPP(9, 0x1, 1, 1, 1, 1, 1) 68 + #define MPP9_GPIO MPP(9, 0x0, 1, 1, 1, 1, 1) 69 + #define MPP9_GIGE MPP(9, 0x1, 0, 0, 1, 1, 1) 70 70 71 71 #define MPP10_UNUSED MPP(10, 0x0, 0, 0, 1, 1, 1) 72 72 #define MPP10_GPIO MPP(10, 0x0, 1, 1, 1, 1, 1)