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

Commit 2b348e2f authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD
Browse files

atmel_serial: keep the platform_device unchanged 



specify the port num via platform_data this will allow to match the clock
with the plaform_dev staticaly

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarAlan Cox <alan@linux.intel.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Patrice Vilchez <patrice.vilchez@atmel.com>
Cc: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
parent dd41d321

arch/arm/mach-at91/at572d940hf_devices.c

+3 −1
Original line number Diff line number Diff line
@@ -822,6 +822,7 @@ struct platform_device *atmel_default_console_device; /* the serial console devi 
void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)

{

	struct platform_device *pdev;

	struct atmel_uart_data *pdata;



	switch (id) {

		case 0:		/* DBGU */
@@ -847,7 +848,8 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) 
		default:

			return;

	}

	pdev->id = portnr;		/* update to mapped ID */

	pdata = pdev->dev.platform_data;

	pdata->num = portnr;		/* update to mapped ID */



	if (portnr < ATMEL_MAX_UART)

		at91_uarts[portnr] = pdev;

arch/arm/mach-at91/at91cap9_devices.c

+3 −1
Original line number Diff line number Diff line
@@ -1199,6 +1199,7 @@ struct platform_device *atmel_default_console_device; /* the serial console devi 
void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)

{

	struct platform_device *pdev;

	struct atmel_uart_data *pdata;



	switch (id) {

		case 0:		/* DBGU */
@@ -1224,7 +1225,8 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) 
		default:

			return;

	}

	pdev->id = portnr;		/* update to mapped ID */

	pdata = pdev->dev.platform_data;

	pdata->num = portnr;		/* update to mapped ID */



	if (portnr < ATMEL_MAX_UART)

		at91_uarts[portnr] = pdev;

arch/arm/mach-at91/at91rm9200_devices.c

+3 −1
Original line number Diff line number Diff line
@@ -1109,6 +1109,7 @@ struct platform_device *atmel_default_console_device; /* the serial console devi 
void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)

{

	struct platform_device *pdev;

	struct atmel_uart_data *pdata;



	switch (id) {

		case 0:		/* DBGU */
@@ -1139,7 +1140,8 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) 
		default:

			return;

	}

	pdev->id = portnr;		/* update to mapped ID */

	pdata = pdev->dev.platform_data;

	pdata->num = portnr;		/* update to mapped ID */



	if (portnr < ATMEL_MAX_UART)

		at91_uarts[portnr] = pdev;

arch/arm/mach-at91/at91sam9260_devices.c

+3 −1
Original line number Diff line number Diff line
@@ -1139,6 +1139,7 @@ struct platform_device *atmel_default_console_device; /* the serial console devi 
void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)

{

	struct platform_device *pdev;

	struct atmel_uart_data *pdata;



	switch (id) {

		case 0:		/* DBGU */
@@ -1179,7 +1180,8 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) 
		default:

			return;

	}

	pdev->id = portnr;		/* update to mapped ID */

	pdata = pdev->dev.platform_data;

	pdata->num = portnr;		/* update to mapped ID */



	if (portnr < ATMEL_MAX_UART)

		at91_uarts[portnr] = pdev;

arch/arm/mach-at91/at91sam9261_devices.c

+3 −1
Original line number Diff line number Diff line
@@ -989,6 +989,7 @@ struct platform_device *atmel_default_console_device; /* the serial console devi 
void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)

{

	struct platform_device *pdev;

	struct atmel_uart_data *pdata;



	switch (id) {

		case 0:		/* DBGU */
@@ -1014,7 +1015,8 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) 
		default:

			return;

	}

	pdev->id = portnr;		/* update to mapped ID */

	pdata = pdev->dev.platform_data;

	pdata->num = portnr;		/* update to mapped ID */



	if (portnr < ATMEL_MAX_UART)

		at91_uarts[portnr] = pdev;