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

Commit 8f4f9d4d 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:
 * at91, ux500, imx, omap and bcmring:
  - at91 fixes for =m driver build issues, irqdomain fixes and config
    dependency fixes
  - ux500 kconfig dependency fixes and a  smp wakeup bugfix
  - imx idle bugfix and build fix due to irq domain changes
  - omap uart pinmux fixes, softreset regression revert and misc fixes
  - bcmring build error regression fix

 * ux500 and imx had some small defconfig updates in this branch

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (27 commits)
  ARM: bcmring: fix UART declarations
  ARM: imx: Fix imx5 idle logic bug
  ARM: imx27-dt: Fix build due to removal of irq_domain_add_simple()
  ARM: imx_v4_v5_defconfig: Add support for CONFIG_REGULATOR_FIXED_VOLTAGE
  ARM: OMAP1: DMTIMER: fix broken timer clock source selection
  ARM: OMAP: serial: Fix the ocp smart idlemode handling bug
  ARM: OMAP2+: UART: Fix incorrect population of default uart pads
  ARM: OMAP: sram: fix BUG in dpll code for !PM case
  dmaengine: Kconfig: fix Atmel at_hdmac entry
  USB: gadget/at91_udc: add gpio_to_irq() function to vbus interrupt
  USB: ohci-at91: change annotations for probe/remove functions
  leds-atmel-pwm.c: Make pwmled_probe() __devinit
  ARM: at91: fix at91sam9261ek Ethernet dm9000 irq
  ARM: at91: fix rm9200ek flash size
  ARM: at91: remove empty at91_init_serial function
  ARM: at91: fix typo in at91_pmc_base assembly declaration
  ARM: at91: Export at91_matrix_base
  ARM: at91: Export at91_pmc_base
  ARM: at91: Export at91_ramc_base
  ARM: at91: Export at91_st_base
  ...
parents 126a3483 6842d4c2

arch/arm/configs/imx_v4_v5_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -112,6 +112,7 @@ CONFIG_WATCHDOG=y 
CONFIG_IMX2_WDT=y

CONFIG_IMX2_WDT=y

CONFIG_MFD_MC13XXX=y

CONFIG_MFD_MC13XXX=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_MC13783=y

CONFIG_REGULATOR_MC13783=y

CONFIG_REGULATOR_MC13892=y

CONFIG_REGULATOR_MC13892=y

CONFIG_FB=y

CONFIG_FB=y

arch/arm/configs/u8500_defconfig

+4 −5
Original line number Original line Diff line number Diff line
@@ -8,8 +8,6 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_LBDAF is not set

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_U8500=y

CONFIG_ARCH_U8500=y

CONFIG_UX500_SOC_DB5500=y

CONFIG_UX500_SOC_DB8500=y

CONFIG_MACH_HREFV60=y

CONFIG_MACH_HREFV60=y

CONFIG_MACH_SNOWBALL=y

CONFIG_MACH_SNOWBALL=y

CONFIG_MACH_U5500=y

CONFIG_MACH_U5500=y
@@ -39,7 +37,6 @@ CONFIG_CAIF=y 
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=65536

CONFIG_BLK_DEV_RAM_SIZE=65536

CONFIG_MISC_DEVICES=y

CONFIG_AB8500_PWM=y

CONFIG_AB8500_PWM=y

CONFIG_SENSORS_BH1780=y

CONFIG_SENSORS_BH1780=y

CONFIG_NETDEVICES=y

CONFIG_NETDEVICES=y
@@ -65,16 +62,18 @@ CONFIG_SERIAL_AMBA_PL011=y 
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_NOMADIK=y

CONFIG_HW_RANDOM_NOMADIK=y

CONFIG_I2C=y

CONFIG_I2C_NOMADIK=y

CONFIG_SPI=y

CONFIG_SPI=y

CONFIG_SPI_PL022=y

CONFIG_SPI_PL022=y

CONFIG_GPIO_STMPE=y

CONFIG_GPIO_STMPE=y

CONFIG_GPIO_TC3589X=y

CONFIG_GPIO_TC3589X=y

CONFIG_POWER_SUPPLY=y

CONFIG_AB8500_BM=y

CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL=y

CONFIG_MFD_STMPE=y

CONFIG_MFD_STMPE=y

CONFIG_MFD_TC3589X=y

CONFIG_MFD_TC3589X=y

CONFIG_AB5500_CORE=y

CONFIG_AB5500_CORE=y

CONFIG_AB8500_CORE=y

CONFIG_AB8500_CORE=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_AB8500=y

CONFIG_REGULATOR_AB8500=y

# CONFIG_HID_SUPPORT is not set

# CONFIG_HID_SUPPORT is not set

CONFIG_USB_GADGET=y

CONFIG_USB_GADGET=y

arch/arm/mach-at91/at91rm9200_devices.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -1173,7 +1173,6 @@ void __init at91_add_device_serial(void) 
		printk(KERN_INFO "AT91: No default serial console defined.\n");

		printk(KERN_INFO "AT91: No default serial console defined.\n");

}

}

#else

#else

void __init __deprecated at91_init_serial(struct at91_uart_config *config) {}

void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {}

void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {}

void __init at91_set_serial_console(unsigned portnr) {}

void __init at91_set_serial_console(unsigned portnr) {}

void __init at91_add_device_serial(void) {}

void __init at91_add_device_serial(void) {}

arch/arm/mach-at91/at91rm9200_time.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/clockchips.h>

#include <linux/clockchips.h>

#include <linux/export.h>





#include <asm/mach/time.h>

#include <asm/mach/time.h>
@@ -176,6 +177,7 @@ static struct clock_event_device clkevt = { 
};

};





void __iomem *at91_st_base;

void __iomem *at91_st_base;

EXPORT_SYMBOL_GPL(at91_st_base);





void __init at91rm9200_ioremap_st(u32 addr)

void __init at91rm9200_ioremap_st(u32 addr)

{

{

arch/arm/mach-at91/board-rm9200ek.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -117,7 +117,7 @@ static struct i2c_board_info __initdata ek_i2c_devices[] = { 
};

};





#define EK_FLASH_BASE	AT91_CHIPSELECT_0

#define EK_FLASH_BASE	AT91_CHIPSELECT_0

#define EK_FLASH_SIZE	SZ_2M

#define EK_FLASH_SIZE	SZ_8M





static struct physmap_flash_data ek_flash_data = {

static struct physmap_flash_data ek_flash_data = {

	.width		= 2,

	.width		= 2,