Commit d595f0a0 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'ux500-arm-soc-v3.10-fixes' of... 

Merge tag 'ux500-arm-soc-v3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes

From Linus Walleij, some ux500 fixes for the v3.10-rc series:
- Fixes up the debug UART
- Fix dangerous platform data double-assignment
- Fix auxdata for the ethernet device
- Select REGULATOR to satisfy Kconfig

* tag 'ux500-arm-soc-v3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson

:
  ARM: ux500: select REGULATOR
  ARM: ux500: Provide device enumeration number suffix for SMSC911x
  ARM: ux500: Fix incorrect DEBUG UART virtual addresses
  ARM: ux500: Remove duplicated assignment of ab8500_platdata

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a706d850 74ba4ec7

arch/arm/include/debug/ux500.S

+3 −3
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ 
#define U8500_UART0_PHYS_BASE	(0x80120000)

#define U8500_UART1_PHYS_BASE	(0x80121000)

#define U8500_UART2_PHYS_BASE	(0x80007000)

#define U8500_UART0_VIRT_BASE	(0xa8120000)

#define U8500_UART1_VIRT_BASE	(0xa8121000)

#define U8500_UART2_VIRT_BASE	(0xa8007000)

#define U8500_UART0_VIRT_BASE	(0xf8120000)

#define U8500_UART1_VIRT_BASE	(0xf8121000)

#define U8500_UART2_VIRT_BASE	(0xf8007000)

#define __UX500_PHYS_UART(n)	U8500_UART##n##_PHYS_BASE

#define __UX500_VIRT_UART(n)	U8500_UART##n##_VIRT_BASE

#endif

arch/arm/mach-ux500/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ config MACH_MOP500 
	bool "U8500 Development platform, MOP500 versions"

	select I2C

	select I2C_NOMADIK

	select REGULATOR

	select REGULATOR_FIXED_VOLTAGE

	select SOC_BUS

	select UX500_SOC_DB8500

arch/arm/mach-ux500/board-mop500.c

+3 −3
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ static void __init mop500_init_machine(void) 
	sdi0_reg_info.gpios[0].gpio = GPIO_SDMMC_1V8_3V_SEL;



	mop500_pinmaps_init();

	parent = u8500_init_devices(&ab8500_platdata);

	parent = u8500_init_devices();



	for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++)

		mop500_platform_devs[i]->dev.parent = parent;
@@ -660,7 +660,7 @@ static void __init snowball_init_machine(void) 
	sdi0_reg_info.gpios[0].gpio = SNOWBALL_SDMMC_1V8_3V_GPIO;



	snowball_pinmaps_init();

	parent = u8500_init_devices(&ab8500_platdata);

	parent = u8500_init_devices();



	for (i = 0; i < ARRAY_SIZE(snowball_platform_devs); i++)

		snowball_platform_devs[i]->dev.parent = parent;
@@ -698,7 +698,7 @@ static void __init hrefv60_init_machine(void) 
	sdi0_reg_info.gpios[0].gpio = HREFV60_SDMMC_1V8_3V_GPIO;



	hrefv60_pinmaps_init();

	parent = u8500_init_devices(&ab8500_platdata);

	parent = u8500_init_devices();



	for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++)

		mop500_platform_devs[i]->dev.parent = parent;

arch/arm/mach-ux500/cpu-db8500.c

+2 −4
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static struct device * __init db8500_soc_device_init(void) 
/*

 * This function is called from the board init

 */

struct device * __init u8500_init_devices(struct ab8500_platform_data *ab8500)

struct device * __init u8500_init_devices(void)

{

	struct device *parent;

	int i;
@@ -220,8 +220,6 @@ struct device * __init u8500_init_devices(struct ab8500_platform_data *ab8500) 
	for (i = 0; i < ARRAY_SIZE(platform_devs); i++)

		platform_devs[i]->dev.parent = parent;



	db8500_prcmu_device.dev.platform_data = ab8500;



	platform_add_devices(platform_devs, ARRAY_SIZE(platform_devs));



	return parent;
@@ -278,7 +276,7 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { 
	OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL),

	OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu",

			&db8500_prcmu_pdata),

	OF_DEV_AUXDATA("smsc,lan9115", 0x50000000, "smsc911x", NULL),

	OF_DEV_AUXDATA("smsc,lan9115", 0x50000000, "smsc911x.0", NULL),

	/* Requires device name bindings. */

	OF_DEV_AUXDATA("stericsson,nmk-pinctrl", U8500_PRCMU_BASE,

		"pinctrl-db8500", NULL),

arch/arm/mach-ux500/setup.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
void __init ux500_map_io(void);

extern void __init u8500_map_io(void);



extern struct device * __init u8500_init_devices(struct ab8500_platform_data *ab8500);

extern struct device * __init u8500_init_devices(void);



extern void __init ux500_init_irq(void);

extern void __init ux500_init_late(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE