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

Commit a89e14ed authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'ux500/fixes-3.5' into next/dt 

prerequisite for ux500/dt branch
parents 5d74c8a0 2b667a2d

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

+7 −5
Original line number Diff line number Diff line
@@ -625,11 +625,6 @@ static struct platform_device *snowball_platform_devs[] __initdata = { 
	&ab8500_device,

};



static struct platform_device *snowball_of_platform_devs[] __initdata = {

	&snowball_led_dev,

	&snowball_key_dev,

};



static void __init mop500_init_machine(void)

{

	struct device *parent = NULL;
@@ -769,6 +764,11 @@ MACHINE_END 


#ifdef CONFIG_MACH_UX500_DT



static struct platform_device *snowball_of_platform_devs[] __initdata = {

	&snowball_led_dev,

	&snowball_key_dev,

};



struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {

	/* Requires DMA and call-back bindings. */

	OF_DEV_AUXDATA("arm,pl011", 0x80120000, "uart0", &uart0_plat),
@@ -786,6 +786,8 @@ struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { 
	OF_DEV_AUXDATA("st,nomadik-gpio", 0x8011e000, "gpio.6", NULL),

	OF_DEV_AUXDATA("st,nomadik-gpio", 0x8011e080, "gpio.7", NULL),

	OF_DEV_AUXDATA("st,nomadik-gpio", 0xa03fe000, "gpio.8", NULL),

	/* Requires device name bindings. */

	OF_DEV_AUXDATA("stericsson,nmk_pinctrl", 0, "pinctrl-db8500", NULL),

	{},

};

arch/arm/mach-ux500/timer.c

+2 −0
Original line number Diff line number Diff line
@@ -63,8 +63,10 @@ static void __init ux500_timer_init(void) 


	/* TODO: Once MTU has been DT:ed place code above into else. */

	if (of_have_populated_dt()) {

#ifdef CONFIG_OF

		np = of_find_matching_node(NULL, prcmu_timer_of_match);

		if (!np)

#endif

			goto dt_fail;



		tmp_base = of_iomap(np, 0);

drivers/of/platform.c

+3 −4
Original line number Diff line number Diff line
@@ -317,8 +317,7 @@ static const struct of_dev_auxdata *of_dev_lookup(const struct of_dev_auxdata *l 
	for(; lookup->compatible != NULL; lookup++) {

		if (!of_device_is_compatible(np, lookup->compatible))

			continue;

		if (of_address_to_resource(np, 0, &res))

			continue;

		if (!of_address_to_resource(np, 0, &res))

			if (res.start != lookup->phys_addr)

				continue;

		pr_debug("%s: devname=%s\n", np->full_name, lookup->name);