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 handful of fixes for 3.11 are still trickling in. These are:
- A couple of fixes for older OMAP platforms
- Another few fixes for at91 (lateish due to European summer
vacations)
- A late-found problem with USB on Tegra, fix is to keep VBUS
regulator on at all times
- One fix for Exynos 5440 dealing with CPU detection
- One MAINTAINERS update"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: tegra: always enable USB VBUS regulators
ARM: davinci: nand: specify ecc strength
ARM: OMAP: rx51: change musb mode to OTG
ARM: OMAP2: fix musb usage for n8x0
MAINTAINERS: Update email address for Benoit Cousson
ARM: at91/DT: fix at91sam9n12ek memory node
ARM: at91: add missing uart clocks DT entries
ARM: SAMSUNG: fix to support for missing cpu specific map_io
ARM: at91/DT: at91sam9x5ek: fix USB host property to enable port C

Linus Torvalds 1f8b7665 8351fcfe

+27 -18
+3 -3
MAINTAINERS
··· 5884 5884 F: include/linux/i2c-omap.h 5885 5885 5886 5886 OMAP DEVICE TREE SUPPORT 5887 - M: Benoît Cousson <b-cousson@ti.com> 5887 + M: Benoît Cousson <bcousson@baylibre.com> 5888 5888 M: Tony Lindgren <tony@atomide.com> 5889 5889 L: linux-omap@vger.kernel.org 5890 5890 L: devicetree@vger.kernel.org ··· 5964 5964 F: drivers/char/hw_random/omap-rng.c 5965 5965 5966 5966 OMAP HWMOD SUPPORT 5967 - M: Benoît Cousson <b-cousson@ti.com> 5967 + M: Benoît Cousson <bcousson@baylibre.com> 5968 5968 M: Paul Walmsley <paul@pwsan.com> 5969 5969 L: linux-omap@vger.kernel.org 5970 5970 S: Maintained 5971 5971 F: arch/arm/mach-omap2/omap_hwmod.* 5972 5972 5973 5973 OMAP HWMOD DATA FOR OMAP4-BASED DEVICES 5974 - M: Benoît Cousson <b-cousson@ti.com> 5974 + M: Benoît Cousson <bcousson@baylibre.com> 5975 5975 L: linux-omap@vger.kernel.org 5976 5976 S: Maintained 5977 5977 F: arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+2 -2
arch/arm/boot/dts/at91sam9n12ek.dts
··· 14 14 compatible = "atmel,at91sam9n12ek", "atmel,at91sam9n12", "atmel,at91sam9"; 15 15 16 16 chosen { 17 - bootargs = "mem=128M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2"; 17 + bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2"; 18 18 }; 19 19 20 20 memory { 21 - reg = <0x20000000 0x10000000>; 21 + reg = <0x20000000 0x8000000>; 22 22 }; 23 23 24 24 clocks {
+3 -2
arch/arm/boot/dts/at91sam9x5ek.dtsi
··· 94 94 95 95 usb0: ohci@00600000 { 96 96 status = "okay"; 97 - num-ports = <2>; 98 - atmel,vbus-gpio = <&pioD 19 GPIO_ACTIVE_LOW 97 + num-ports = <3>; 98 + atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW *//* Activate to have access to port A */ 99 + &pioD 19 GPIO_ACTIVE_LOW 99 100 &pioD 20 GPIO_ACTIVE_LOW 100 101 >; 101 102 };
+2
arch/arm/boot/dts/tegra20-seaboard.dts
··· 830 830 regulator-max-microvolt = <5000000>; 831 831 enable-active-high; 832 832 gpio = <&gpio 24 0>; /* PD0 */ 833 + regulator-always-on; 834 + regulator-boot-on; 833 835 }; 834 836 }; 835 837
+2
arch/arm/boot/dts/tegra20-trimslice.dts
··· 412 412 regulator-max-microvolt = <5000000>; 413 413 enable-active-high; 414 414 gpio = <&gpio 170 0>; /* PV2 */ 415 + regulator-always-on; 416 + regulator-boot-on; 415 417 }; 416 418 }; 417 419
+4
arch/arm/boot/dts/tegra20-whistler.dts
··· 588 588 regulator-max-microvolt = <5000000>; 589 589 enable-active-high; 590 590 gpio = <&tca6416 0 0>; /* GPIO_PMU0 */ 591 + regulator-always-on; 592 + regulator-boot-on; 591 593 }; 592 594 593 595 vbus3_reg: regulator@3 { ··· 600 598 regulator-max-microvolt = <5000000>; 601 599 enable-active-high; 602 600 gpio = <&tca6416 1 0>; /* GPIO_PMU1 */ 601 + regulator-always-on; 602 + regulator-boot-on; 603 603 }; 604 604 }; 605 605
+2
arch/arm/mach-at91/at91sam9x5.c
··· 227 227 CLKDEV_CON_DEV_ID("usart", "f8020000.serial", &usart1_clk), 228 228 CLKDEV_CON_DEV_ID("usart", "f8024000.serial", &usart2_clk), 229 229 CLKDEV_CON_DEV_ID("usart", "f8028000.serial", &usart3_clk), 230 + CLKDEV_CON_DEV_ID("usart", "f8040000.serial", &uart0_clk), 231 + CLKDEV_CON_DEV_ID("usart", "f8044000.serial", &uart1_clk), 230 232 CLKDEV_CON_DEV_ID("t0_clk", "f8008000.timer", &tcb0_clk), 231 233 CLKDEV_CON_DEV_ID("t0_clk", "f800c000.timer", &tcb0_clk), 232 234 CLKDEV_CON_DEV_ID("mci_clk", "f0008000.mmc", &mmc0_clk),
+1
arch/arm/mach-davinci/board-dm355-leopard.c
··· 75 75 .parts = davinci_nand_partitions, 76 76 .nr_parts = ARRAY_SIZE(davinci_nand_partitions), 77 77 .ecc_mode = NAND_ECC_HW_SYNDROME, 78 + .ecc_bits = 4, 78 79 .bbt_options = NAND_BBT_USE_FLASH, 79 80 }; 80 81
+1
arch/arm/mach-davinci/board-dm644x-evm.c
··· 153 153 .parts = davinci_evm_nandflash_partition, 154 154 .nr_parts = ARRAY_SIZE(davinci_evm_nandflash_partition), 155 155 .ecc_mode = NAND_ECC_HW, 156 + .ecc_bits = 1, 156 157 .bbt_options = NAND_BBT_USE_FLASH, 157 158 .timing = &davinci_evm_nandflash_timing, 158 159 };
+1
arch/arm/mach-davinci/board-dm646x-evm.c
··· 90 90 .parts = davinci_nand_partitions, 91 91 .nr_parts = ARRAY_SIZE(davinci_nand_partitions), 92 92 .ecc_mode = NAND_ECC_HW, 93 + .ecc_bits = 1, 93 94 .options = 0, 94 95 }; 95 96
+1
arch/arm/mach-davinci/board-neuros-osd2.c
··· 88 88 .parts = davinci_ntosd2_nandflash_partition, 89 89 .nr_parts = ARRAY_SIZE(davinci_ntosd2_nandflash_partition), 90 90 .ecc_mode = NAND_ECC_HW, 91 + .ecc_bits = 1, 91 92 .bbt_options = NAND_BBT_USE_FLASH, 92 93 }; 93 94
-4
arch/arm/mach-omap2/board-n8x0.c
··· 122 122 }; 123 123 124 124 static struct musb_hdrc_platform_data tusb_data = { 125 - #ifdef CONFIG_USB_GADGET_MUSB_HDRC 126 125 .mode = MUSB_OTG, 127 - #else 128 - .mode = MUSB_HOST, 129 - #endif 130 126 .set_power = tusb_set_power, 131 127 .min_power = 25, /* x2 = 50 mA drawn from VBUS as peripheral */ 132 128 .power = 100, /* Max 100 mA VBUS for host mode */
+1 -1
arch/arm/mach-omap2/board-rx51.c
··· 85 85 86 86 static struct omap_musb_board_data musb_board_data = { 87 87 .interface_type = MUSB_INTERFACE_ULPI, 88 - .mode = MUSB_PERIPHERAL, 88 + .mode = MUSB_OTG, 89 89 .power = 0, 90 90 }; 91 91
+1 -4
arch/arm/mach-omap2/usb-musb.c
··· 38 38 }; 39 39 40 40 static struct musb_hdrc_platform_data musb_plat = { 41 - #ifdef CONFIG_USB_GADGET_MUSB_HDRC 42 41 .mode = MUSB_OTG, 43 - #else 44 - .mode = MUSB_HOST, 45 - #endif 42 + 46 43 /* .clock is set dynamically */ 47 44 .config = &musb_config, 48 45
+3 -2
arch/arm/plat-samsung/init.c
··· 55 55 56 56 printk("CPU %s (id 0x%08lx)\n", cpu->name, idcode); 57 57 58 - if (cpu->map_io == NULL || cpu->init == NULL) { 58 + if (cpu->init == NULL) { 59 59 printk(KERN_ERR "CPU %s support not enabled\n", cpu->name); 60 60 panic("Unsupported Samsung CPU"); 61 61 } 62 62 63 - cpu->map_io(); 63 + if (cpu->map_io) 64 + cpu->map_io(); 64 65 } 65 66 66 67 /* s3c24xx_init_clocks