Commit d7ada73c authored by Linus Torvalds's avatar Linus Torvalds

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:
 "Another smallish batch of fixes, it's been quiet due to the holidays.
  Nothing controversial here, a handful of things across the board"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: pxa: fix USB gadget driver compilation regression
  ARM: OMAP2+: Fix LCD panel backlight regression for LDP legacy booting
  ARM: OMAP2+: hwmod_data: fix missing OMAP_INTC_START in irq data
  ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL
  ARM: shmobile: r8a7790: fix shdi resource sizes
  ARM: shmobile: bockw: fixup DMA mask
  ARM: shmobile: armadillo: Add PWM backlight power supply
parents 8cf126d9 9b17c165
...@@ -241,7 +241,7 @@ pfc: pfc@e6060000 { ...@@ -241,7 +241,7 @@ pfc: pfc@e6060000 {
sdhi0: sdhi@ee100000 { sdhi0: sdhi@ee100000 {
compatible = "renesas,sdhi-r8a7790"; compatible = "renesas,sdhi-r8a7790";
reg = <0 0xee100000 0 0x100>; reg = <0 0xee100000 0 0x200>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 165 4>; interrupts = <0 165 4>;
cap-sd-highspeed; cap-sd-highspeed;
...@@ -250,7 +250,7 @@ sdhi0: sdhi@ee100000 { ...@@ -250,7 +250,7 @@ sdhi0: sdhi@ee100000 {
sdhi1: sdhi@ee120000 { sdhi1: sdhi@ee120000 {
compatible = "renesas,sdhi-r8a7790"; compatible = "renesas,sdhi-r8a7790";
reg = <0 0xee120000 0 0x100>; reg = <0 0xee120000 0 0x200>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
interrupts = <0 166 4>; interrupts = <0 166 4>;
cap-sd-highspeed; cap-sd-highspeed;
......
...@@ -242,12 +242,18 @@ static void __init ldp_display_init(void) ...@@ -242,12 +242,18 @@ static void __init ldp_display_init(void)
static int ldp_twl_gpio_setup(struct device *dev, unsigned gpio, unsigned ngpio) static int ldp_twl_gpio_setup(struct device *dev, unsigned gpio, unsigned ngpio)
{ {
int res;
/* LCD enable GPIO */ /* LCD enable GPIO */
ldp_lcd_pdata.enable_gpio = gpio + 7; ldp_lcd_pdata.enable_gpio = gpio + 7;
/* Backlight enable GPIO */ /* Backlight enable GPIO */
ldp_lcd_pdata.backlight_gpio = gpio + 15; ldp_lcd_pdata.backlight_gpio = gpio + 15;
res = platform_device_register(&ldp_lcd_device);
if (res)
pr_err("Unable to register LCD: %d\n", res);
return 0; return 0;
} }
...@@ -346,7 +352,6 @@ static struct omap2_hsmmc_info mmc[] __initdata = { ...@@ -346,7 +352,6 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
static struct platform_device *ldp_devices[] __initdata = { static struct platform_device *ldp_devices[] __initdata = {
&ldp_gpio_keys_device, &ldp_gpio_keys_device,
&ldp_lcd_device,
}; };
#ifdef CONFIG_OMAP_MUX #ifdef CONFIG_OMAP_MUX
......
...@@ -796,7 +796,7 @@ struct omap_hwmod omap2xxx_counter_32k_hwmod = { ...@@ -796,7 +796,7 @@ struct omap_hwmod omap2xxx_counter_32k_hwmod = {
/* gpmc */ /* gpmc */
static struct omap_hwmod_irq_info omap2xxx_gpmc_irqs[] = { static struct omap_hwmod_irq_info omap2xxx_gpmc_irqs[] = {
{ .irq = 20 }, { .irq = 20 + OMAP_INTC_START, },
{ .irq = -1 } { .irq = -1 }
}; };
...@@ -841,7 +841,7 @@ static struct omap_hwmod_class omap2_rng_hwmod_class = { ...@@ -841,7 +841,7 @@ static struct omap_hwmod_class omap2_rng_hwmod_class = {
}; };
static struct omap_hwmod_irq_info omap2_rng_mpu_irqs[] = { static struct omap_hwmod_irq_info omap2_rng_mpu_irqs[] = {
{ .irq = 52 }, { .irq = 52 + OMAP_INTC_START, },
{ .irq = -1 } { .irq = -1 }
}; };
......
...@@ -2165,7 +2165,7 @@ static struct omap_hwmod_class omap3xxx_gpmc_hwmod_class = { ...@@ -2165,7 +2165,7 @@ static struct omap_hwmod_class omap3xxx_gpmc_hwmod_class = {
}; };
static struct omap_hwmod_irq_info omap3xxx_gpmc_irqs[] = { static struct omap_hwmod_irq_info omap3xxx_gpmc_irqs[] = {
{ .irq = 20 }, { .irq = 20 + OMAP_INTC_START, },
{ .irq = -1 } { .irq = -1 }
}; };
...@@ -2999,7 +2999,7 @@ static struct omap_mmu_dev_attr mmu_isp_dev_attr = { ...@@ -2999,7 +2999,7 @@ static struct omap_mmu_dev_attr mmu_isp_dev_attr = {
static struct omap_hwmod omap3xxx_mmu_isp_hwmod; static struct omap_hwmod omap3xxx_mmu_isp_hwmod;
static struct omap_hwmod_irq_info omap3xxx_mmu_isp_irqs[] = { static struct omap_hwmod_irq_info omap3xxx_mmu_isp_irqs[] = {
{ .irq = 24 }, { .irq = 24 + OMAP_INTC_START, },
{ .irq = -1 } { .irq = -1 }
}; };
...@@ -3041,7 +3041,7 @@ static struct omap_mmu_dev_attr mmu_iva_dev_attr = { ...@@ -3041,7 +3041,7 @@ static struct omap_mmu_dev_attr mmu_iva_dev_attr = {
static struct omap_hwmod omap3xxx_mmu_iva_hwmod; static struct omap_hwmod omap3xxx_mmu_iva_hwmod;
static struct omap_hwmod_irq_info omap3xxx_mmu_iva_irqs[] = { static struct omap_hwmod_irq_info omap3xxx_mmu_iva_irqs[] = {
{ .irq = 28 }, { .irq = 28 + OMAP_INTC_START, },
{ .irq = -1 } { .irq = -1 }
}; };
......
...@@ -1637,7 +1637,7 @@ static struct omap_hwmod dra7xx_uart1_hwmod = { ...@@ -1637,7 +1637,7 @@ static struct omap_hwmod dra7xx_uart1_hwmod = {
.class = &dra7xx_uart_hwmod_class, .class = &dra7xx_uart_hwmod_class,
.clkdm_name = "l4per_clkdm", .clkdm_name = "l4per_clkdm",
.main_clk = "uart1_gfclk_mux", .main_clk = "uart1_gfclk_mux",
.flags = HWMOD_SWSUP_SIDLE_ACT, .flags = HWMOD_SWSUP_SIDLE_ACT | DEBUG_OMAP2UART1_FLAGS,
.prcm = { .prcm = {
.omap4 = { .omap4 = {
.clkctrl_offs = DRA7XX_CM_L4PER_UART1_CLKCTRL_OFFSET, .clkctrl_offs = DRA7XX_CM_L4PER_UART1_CLKCTRL_OFFSET,
......
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <mach/irqs.h>
#define LUBBOCK_ETH_PHYS PXA_CS3_PHYS #define LUBBOCK_ETH_PHYS PXA_CS3_PHYS
#define LUBBOCK_FPGA_PHYS PXA_CS2_PHYS #define LUBBOCK_FPGA_PHYS PXA_CS2_PHYS
......
...@@ -614,6 +614,11 @@ static struct regulator_consumer_supply fixed3v3_power_consumers[] = { ...@@ -614,6 +614,11 @@ static struct regulator_consumer_supply fixed3v3_power_consumers[] = {
REGULATOR_SUPPLY("vqmmc", "sh_mmcif"), REGULATOR_SUPPLY("vqmmc", "sh_mmcif"),
}; };
/* Fixed 3.3V regulator used by LCD backlight */
static struct regulator_consumer_supply fixed5v0_power_consumers[] = {
REGULATOR_SUPPLY("power", "pwm-backlight.0"),
};
/* Fixed 3.3V regulator to be used by SDHI0 */ /* Fixed 3.3V regulator to be used by SDHI0 */
static struct regulator_consumer_supply vcc_sdhi0_consumers[] = { static struct regulator_consumer_supply vcc_sdhi0_consumers[] = {
REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"), REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
...@@ -1196,6 +1201,8 @@ static void __init eva_init(void) ...@@ -1196,6 +1201,8 @@ static void __init eva_init(void)
regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers, regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
ARRAY_SIZE(fixed3v3_power_consumers), 3300000); ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
regulator_register_always_on(3, "fixed-5.0V", fixed5v0_power_consumers,
ARRAY_SIZE(fixed5v0_power_consumers), 5000000);
pinctrl_register_mappings(eva_pinctrl_map, ARRAY_SIZE(eva_pinctrl_map)); pinctrl_register_mappings(eva_pinctrl_map, ARRAY_SIZE(eva_pinctrl_map));
pwm_add_table(pwm_lookup, ARRAY_SIZE(pwm_lookup)); pwm_add_table(pwm_lookup, ARRAY_SIZE(pwm_lookup));
......
...@@ -679,7 +679,7 @@ static void __init bockw_init(void) ...@@ -679,7 +679,7 @@ static void __init bockw_init(void)
.id = i, .id = i,
.data = &rsnd_card_info[i], .data = &rsnd_card_info[i],
.size_data = sizeof(struct asoc_simple_card_info), .size_data = sizeof(struct asoc_simple_card_info),
.dma_mask = ~0, .dma_mask = DMA_BIT_MASK(32),
}; };
platform_device_register_full(&cardinfo); platform_device_register_full(&cardinfo);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment