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

Commit 8cf93b9c authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD
Browse files

ARM: at91: standard device init only if DT is not populated. 



This will avoid the CONFIG_OF on the *_devices.c as this file is deprecated
for DT support.

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 4e114c95

arch/arm/mach-at91/at91sam9260_devices.c

+3 −17
Original line number Diff line number Diff line
@@ -702,25 +702,8 @@ static struct platform_device at91sam9260_tcb1_device = { 
	.num_resources	= ARRAY_SIZE(tcb1_resources),

};



#if defined(CONFIG_OF)

static struct of_device_id tcb_ids[] = {

	{ .compatible = "atmel,at91rm9200-tcb" },

	{ /*sentinel*/ }

};

#endif



static void __init at91_add_device_tc(void)

{

#if defined(CONFIG_OF)

	struct device_node *np;



	np = of_find_matching_node(NULL, tcb_ids);

	if (np) {

		of_node_put(np);

		return;

	}

#endif



	platform_device_register(&at91sam9260_tcb0_device);

	platform_device_register(&at91sam9260_tcb1_device);

}
@@ -1364,6 +1347,9 @@ void __init at91_add_device_cf(struct at91_cf_data * data) {} 
 */

static int __init at91_add_standard_devices(void)

{

	if (of_have_populated_dt())

		return 0;



	at91_add_device_rtt();

	at91_add_device_watchdog();

	at91_add_device_tc();

arch/arm/mach-at91/at91sam9g45_devices.c

+4 −26
Original line number Diff line number Diff line
@@ -69,14 +69,6 @@ static struct platform_device at_hdmac_device = { 


void __init at91_add_device_hdmac(void)

{

#if defined(CONFIG_OF)

	struct device_node *of_node =

		of_find_node_by_name(NULL, "dma-controller");



	if (of_node)

		of_node_put(of_node);

	else

#endif

	platform_device_register(&at_hdmac_device);

}

#else
@@ -1094,25 +1086,8 @@ static struct platform_device at91sam9g45_tcb1_device = { 
	.num_resources	= ARRAY_SIZE(tcb1_resources),

};



#if defined(CONFIG_OF)

static struct of_device_id tcb_ids[] = {

	{ .compatible = "atmel,at91rm9200-tcb" },

	{ /*sentinel*/ }

};

#endif



static void __init at91_add_device_tc(void)

{

#if defined(CONFIG_OF)

	struct device_node *np;



	np = of_find_matching_node(NULL, tcb_ids);

	if (np) {

		of_node_put(np);

		return;

	}

#endif



	platform_device_register(&at91sam9g45_tcb0_device);

	platform_device_register(&at91sam9g45_tcb1_device);

}
@@ -1763,6 +1738,9 @@ void __init at91_add_device_serial(void) {} 
 */

static int __init at91_add_standard_devices(void)

{

	if (of_have_populated_dt())

		return 0;



	at91_add_device_hdmac();

	at91_add_device_rtc();

	at91_add_device_rtt();