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

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

[ARM] 3972/1: AT91: Update board.h 



Replace the 'is_b' variable with 'slot_b' in at91_mmc_data.
Also add the new 'chipselect' variable for CF/PCMCIA and 'bus_width_16'
variable for NAND.

This (and previous patches) will unfortunately break the current MMC,
USB Gadget and PCMCIA drivers.  Updates and fixes for those drivers will
be submitted to the various subsystem maintainers.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static struct at91_udc_data __initdata carmeva_udc_data = { 
// };



static struct at91_mmc_data __initdata carmeva_mmc_data = {

	.is_b		= 0,

	.slot_b		= 0,

	.wire4		= 1,

	.det_pin	= AT91_PIN_PB10,

	.wp_pin		= AT91_PIN_PC14,

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

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static struct at91_cf_data __initdata csb337_cf_data = { 


static struct at91_mmc_data __initdata csb337_mmc_data = {

	.det_pin	= AT91_PIN_PD5,

	.is_b		= 0,

	.slot_b		= 0,

	.wire4		= 1,

	.wp_pin		= AT91_PIN_PD6,

};

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

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static struct at91_cf_data __initdata dk_cf_data = { 
};



static struct at91_mmc_data __initdata dk_mmc_data = {

	.is_b		= 0,

	.slot_b		= 0,

	.wire4		= 1,

};

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

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static struct at91_cf_data __initdata eb9200_cf_data = { 
};



static struct at91_mmc_data __initdata eb9200_mmc_data = {

	.is_b		= 0,

	.slot_b		= 0,

	.wire4		= 1,

};

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

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static struct at91_udc_data __initdata ek_udc_data = { 


static struct at91_mmc_data __initdata ek_mmc_data = {

	.det_pin	= AT91_PIN_PB27,

	.is_b		= 0,

	.slot_b		= 0,

	.wire4		= 1,

	.wp_pin		= AT91_PIN_PA17,

};