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

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

[ARM] 3956/1: AT91: Carmeva board update 



This patch updates the Carmeva board support:
      * Specify the MMC Write-protect and Detection pins.
      * Add configuration of SPI devices.

Patch from Peer Georgi.

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

arch/arm/configs/carmeva_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ CONFIG_LEGACY_PTY_COUNT=256 
# CONFIG_WATCHDOG is not set

# CONFIG_NVRAM is not set

# CONFIG_RTC is not set

# CONFIG_AT91_RTC is not set

# CONFIG_AT91RM9200_RTC is not set

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

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

+27 −3
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ static void __init carmeva_init_irq(void) 
	at91rm9200_init_interrupts(NULL);

}





static struct at91_eth_data __initdata carmeva_eth_data = {

	.phy_irq_pin	= AT91_PIN_PC4,

	.is_rmii	= 1,
@@ -91,6 +90,31 @@ static struct at91_udc_data __initdata carmeva_udc_data = { 
static struct at91_mmc_data __initdata carmeva_mmc_data = {

	.is_b		= 0,

	.wire4		= 1,

	.det_pin	= AT91_PIN_PB10,

	.wp_pin		= AT91_PIN_PC14,

};



static struct spi_board_info carmeva_spi_devices[] = {

	{ /* DataFlash chip */

		.modalias = "mtd_dataflash",

		.chip_select  = 0,

		.max_speed_hz = 10 * 1000 * 1000,

	},

	{ /* User accessable spi - cs1 (250KHz) */

		.modalias = "spi-cs1",

		.chip_select  = 1,

		.max_speed_hz = 250 *  1000,

	},

	{ /* User accessable spi - cs2 (1MHz) */

		.modalias = "spi-cs2",

		.chip_select  = 2,

		.max_speed_hz = 1 * 1000 *  1000,

	},

	{ /* User accessable spi - cs3 (10MHz) */

		.modalias = "spi-cs3",

		.chip_select  = 3,

		.max_speed_hz = 10 * 1000 *  1000,

	},

};



static void __init carmeva_board_init(void)
@@ -105,10 +129,10 @@ static void __init carmeva_board_init(void) 
	at91_add_device_udc(&carmeva_udc_data);

	/* I2C */

	at91_add_device_i2c();

	/* SPI */

	at91_add_device_spi(carmeva_spi_devices, ARRAY_SIZE(carmeva_spi_devices));

	/* Compact Flash */

//	at91_add_device_cf(&carmeva_cf_data);

	/* SPI */

//	at91_add_device_spi(NULL, 0);

	/* MMC */

	at91_add_device_mmc(&carmeva_mmc_data);

}