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

Commit 63b4c296 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Arnd Bergmann
Browse files

ARM: at91/boards: use -EINVAL for invalid gpio 



this will allow to use gpio_is_valid

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
parent 1a2d9156

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -70,6 +70,8 @@ static struct macb_platform_data __initdata onearm_eth_data = { 




static struct at91_usbh_data __initdata onearm_usbh_data = {

static struct at91_usbh_data __initdata onearm_usbh_data = {

	.ports		= 1,

	.ports		= 1,

	.vbus_pin	= {-EINVAL, -EINVAL},

	.overcurrent_pin= {-EINVAL, -EINVAL},

};

};





static struct at91_udc_data __initdata onearm_udc_data = {

static struct at91_udc_data __initdata onearm_udc_data = {

arch/arm/mach-at91/board-afeb-9260v1.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -75,6 +75,8 @@ static void __init afeb9260_init_early(void) 
 */

 */

static struct at91_usbh_data __initdata afeb9260_usbh_data = {

static struct at91_usbh_data __initdata afeb9260_usbh_data = {

	.ports		= 1,

	.ports		= 1,

	.vbus_pin	= {-EINVAL, -EINVAL},

	.overcurrent_pin= {-EINVAL, -EINVAL},

};

};





/*

/*
@@ -82,7 +84,7 @@ static struct at91_usbh_data __initdata afeb9260_usbh_data = { 
 */

 */

static struct at91_udc_data __initdata afeb9260_udc_data = {

static struct at91_udc_data __initdata afeb9260_udc_data = {

	.vbus_pin	= AT91_PIN_PC5,

	.vbus_pin	= AT91_PIN_PC5,

	.pullup_pin	= 0,		/* pull-up driven by UDC */

	.pullup_pin	= -EINVAL,		/* pull-up driven by UDC */

};

};
@@ -138,6 +140,7 @@ static struct atmel_nand_data __initdata afeb9260_nand_data = { 
	.bus_width_16	= 0,

	.bus_width_16	= 0,

	.parts		= afeb9260_nand_partition,

	.parts		= afeb9260_nand_partition,

	.num_parts	= ARRAY_SIZE(afeb9260_nand_partition),

	.num_parts	= ARRAY_SIZE(afeb9260_nand_partition),

	.det_pin	= -EINVAL,

};

};
@@ -149,6 +152,7 @@ static struct at91_mmc_data __initdata afeb9260_mmc_data = { 
	.wp_pin 	= AT91_PIN_PC4,

	.wp_pin 	= AT91_PIN_PC4,

	.slot_b		= 1,

	.slot_b		= 1,

	.wire4		= 1,

	.wire4		= 1,

	.vcc_pin	= -EINVAL,

};

};
@@ -169,6 +173,8 @@ static struct i2c_board_info __initdata afeb9260_i2c_devices[] = { 
static struct at91_cf_data afeb9260_cf_data = {

static struct at91_cf_data afeb9260_cf_data = {

	.chipselect = 4,

	.chipselect = 4,

	.irq_pin    = AT91_PIN_PA6,

	.irq_pin    = AT91_PIN_PA6,

	.det_pin	= -EINVAL,

	.vcc_pin	= -EINVAL,

	.rst_pin    = AT91_PIN_PA7,

	.rst_pin    = AT91_PIN_PA7,

	.flags      = AT91_CF_TRUE_IDE,

	.flags      = AT91_CF_TRUE_IDE,

};

};

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -62,6 +62,8 @@ static void __init cam60_init_early(void) 
 */

 */

static struct at91_usbh_data __initdata cam60_usbh_data = {

static struct at91_usbh_data __initdata cam60_usbh_data = {

	.ports		= 1,

	.ports		= 1,

	.vbus_pin	= {-EINVAL, -EINVAL},

	.overcurrent_pin= {-EINVAL, -EINVAL},

};

};
@@ -135,7 +137,7 @@ static struct mtd_partition __initdata cam60_nand_partition[] = { 
static struct atmel_nand_data __initdata cam60_nand_data = {

static struct atmel_nand_data __initdata cam60_nand_data = {

	.ale		= 21,

	.ale		= 21,

	.cle		= 22,

	.cle		= 22,

	// .det_pin	= ... not there

	.det_pin	= -EINVAL,

	.rdy_pin	= AT91_PIN_PA9,

	.rdy_pin	= AT91_PIN_PA9,

	.enable_pin	= AT91_PIN_PA7,

	.enable_pin	= AT91_PIN_PA7,

	.parts		= cam60_nand_partition,

	.parts		= cam60_nand_partition,

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

+9 −6
Original line number Original line Diff line number Diff line
@@ -70,6 +70,8 @@ static void __init cap9adk_init_early(void) 
 */

 */

static struct at91_usbh_data __initdata cap9adk_usbh_data = {

static struct at91_usbh_data __initdata cap9adk_usbh_data = {

	.ports		= 2,

	.ports		= 2,

	.vbus_pin	= {-EINVAL, -EINVAL},

	.overcurrent_pin= {-EINVAL, -EINVAL},

};

};





/*

/*
@@ -144,9 +146,9 @@ static struct spi_board_info cap9adk_spi_devices[] = { 
 */

 */

static struct at91_mmc_data __initdata cap9adk_mmc_data = {

static struct at91_mmc_data __initdata cap9adk_mmc_data = {

	.wire4		= 1,

	.wire4		= 1,

//	.det_pin	= ... not connected

	.det_pin	= -EINVAL,

//	.wp_pin		= ... not connected

	.wp_pin		= -EINVAL,

//	.vcc_pin	= ... not connected

	.vcc_pin	= -EINVAL,

};

};
@@ -154,6 +156,7 @@ static struct at91_mmc_data __initdata cap9adk_mmc_data = { 
 * MACB Ethernet device

 * MACB Ethernet device

 */

 */

static struct macb_platform_data __initdata cap9adk_macb_data = {

static struct macb_platform_data __initdata cap9adk_macb_data = {

	.phy_irq_pin	= -EINVAL,

	.is_rmii	= 1,

	.is_rmii	= 1,

};

};
@@ -172,8 +175,8 @@ static struct mtd_partition __initdata cap9adk_nand_partitions[] = { 
static struct atmel_nand_data __initdata cap9adk_nand_data = {

static struct atmel_nand_data __initdata cap9adk_nand_data = {

	.ale		= 21,

	.ale		= 21,

	.cle		= 22,

	.cle		= 22,

//	.det_pin	= ... not connected

	.det_pin	= -EINVAL,

//	.rdy_pin	= ... not connected

	.rdy_pin	= -EINVAL,

	.enable_pin	= AT91_PIN_PD15,

	.enable_pin	= AT91_PIN_PD15,

	.parts		= cap9adk_nand_partitions,

	.parts		= cap9adk_nand_partitions,

	.num_parts	= ARRAY_SIZE(cap9adk_nand_partitions),

	.num_parts	= ARRAY_SIZE(cap9adk_nand_partitions),
@@ -351,7 +354,7 @@ static struct atmel_lcdfb_info __initdata cap9adk_lcdc_data; 
 * AC97

 * AC97

 */

 */

static struct ac97c_platform_data cap9adk_ac97_data = {

static struct ac97c_platform_data cap9adk_ac97_data = {

//	.reset_pin	= ... not connected

	.reset_pin	= -EINVAL,

};

};

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

+5 −2
Original line number Original line Diff line number Diff line
@@ -64,6 +64,8 @@ static struct macb_platform_data __initdata carmeva_eth_data = { 




static struct at91_usbh_data __initdata carmeva_usbh_data = {

static struct at91_usbh_data __initdata carmeva_usbh_data = {

	.ports		= 2,

	.ports		= 2,

	.vbus_pin	= {-EINVAL, -EINVAL},

	.overcurrent_pin= {-EINVAL, -EINVAL},

};

};





static struct at91_udc_data __initdata carmeva_udc_data = {

static struct at91_udc_data __initdata carmeva_udc_data = {
@@ -75,8 +77,8 @@ static struct at91_udc_data __initdata carmeva_udc_data = { 
// static struct at91_cf_data __initdata carmeva_cf_data = {

// static struct at91_cf_data __initdata carmeva_cf_data = {

//	.det_pin	= AT91_PIN_PB0,

//	.det_pin	= AT91_PIN_PB0,

//	.rst_pin	= AT91_PIN_PC5,

//	.rst_pin	= AT91_PIN_PC5,

	// .irq_pin	= ... not connected

	// .irq_pin	= -EINVAL,

	// .vcc_pin	= ... always powered

	// .vcc_pin	= -EINVAL,

// };

// };





static struct at91_mmc_data __initdata carmeva_mmc_data = {

static struct at91_mmc_data __initdata carmeva_mmc_data = {
@@ -84,6 +86,7 @@ static struct at91_mmc_data __initdata carmeva_mmc_data = { 
	.wire4		= 1,

	.wire4		= 1,

	.det_pin	= AT91_PIN_PB10,

	.det_pin	= AT91_PIN_PB10,

	.wp_pin		= AT91_PIN_PC14,

	.wp_pin		= AT91_PIN_PC14,

	.vcc_pin	= -EINVAL,

};

};





static struct spi_board_info carmeva_spi_devices[] = {

static struct spi_board_info carmeva_spi_devices[] = {