Commit d0760b3b authored by Andrew Victor's avatar Andrew Victor Committed by Russell King
Browse files

[ARM] 4143/1: AT91: Prepare for AT91SAM9263 support 



The Atmel AT91SAM9263 processor includes many more integrated
peripherals than Atmel's previous ARM9-based AT91 processors, so this
has necessitated a few changes to the core AT91 support.

These changes are:
      * The system peripheral I/O region we remap has increased from
        0xFFFA0000..0xFFFFFFFF to 0xFFF78000..0xFFFFFFFF.
      * The increased I/O region forces changes to entry-macro.S and
        debug-macro.S due to ARM's limited immediate offset addressing
        modes.
      * Maximum number of GPIO banks increases to 5.
      * 2 MMC controllers so the board-setup code needs to specify which
        controller it wishes to use when calling at91_add_device_mmc().

Original patch from Nicolas Ferre.

Signed-off-by: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9d041268

arch/arm/mach-at91/at91rm9200_devices.c

+2 −2
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ static struct platform_device at91rm9200_mmc_device = { 
	.num_resources	= ARRAY_SIZE(mmc_resources),

};



void __init at91_add_device_mmc(struct at91_mmc_data *data)

void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)

{

	if (!data)

		return;
@@ -361,7 +361,7 @@ void __init at91_add_device_mmc(struct at91_mmc_data *data) 
	platform_device_register(&at91rm9200_mmc_device);

}

#else

void __init at91_add_device_mmc(struct at91_mmc_data *data) {}

void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {}

#endif

arch/arm/mach-at91/at91sam9260_devices.c

+2 −2
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static struct platform_device at91sam9260_mmc_device = { 
	.num_resources	= ARRAY_SIZE(mmc_resources),

};



void __init at91_add_device_mmc(struct at91_mmc_data *data)

void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)

{

	if (!data)

		return;
@@ -275,7 +275,7 @@ void __init at91_add_device_mmc(struct at91_mmc_data *data) 
	platform_device_register(&at91sam9260_mmc_device);

}

#else

void __init at91_add_device_mmc(struct at91_mmc_data *data) {}

void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {}

#endif

arch/arm/mach-at91/at91sam9261_devices.c

+2 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static struct platform_device at91sam9261_mmc_device = { 
	.num_resources	= ARRAY_SIZE(mmc_resources),

};



void __init at91_add_device_mmc(struct at91_mmc_data *data)

void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)

{

	if (!data)

		return;
@@ -192,7 +192,7 @@ void __init at91_add_device_mmc(struct at91_mmc_data *data) 
	platform_device_register(&at91sam9261_mmc_device);

}

#else

void __init at91_add_device_mmc(struct at91_mmc_data *data) {}

void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {}

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static void __init carmeva_board_init(void) 
	/* Compact Flash */

//	at91_add_device_cf(&carmeva_cf_data);

	/* MMC */

	at91_add_device_mmc(&carmeva_mmc_data);

	at91_add_device_mmc(0, &carmeva_mmc_data);

}



MACHINE_START(CARMEVA, "Carmeva")

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

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static void __init csb337_board_init(void) 
	/* SPI */

	at91_add_device_spi(csb337_spi_devices, ARRAY_SIZE(csb337_spi_devices));

	/* MMC */

	at91_add_device_mmc(&csb337_mmc_data);

	at91_add_device_mmc(0, &csb337_mmc_data);

}



MACHINE_START(CSB337, "Cogent CSB337")

CRA Git | Maintained and supported by SUSTech CRA and CCSE