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

Commit 3c3796cc authored by Håvard Skinnemoen's avatar Håvard Skinnemoen Committed by David Woodhouse
Browse files

[MTD] [NAND] rename at91_nand -> atmel_nand: internal symbols 



This is basically s/at91_nand/atmel_nand/g with some manual inspection.

Signed-off-by: default avatarHåvard Skinnemoen <haavard.skinnemoen@atmel.com>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent d4f4c0aa

arch/arm/mach-at91/at91cap9_devices.c

+4 −4
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {} 
 * -------------------------------------------------------------------- */



#if defined(CONFIG_MTD_NAND_AT91) || defined(CONFIG_MTD_NAND_AT91_MODULE)

static struct at91_nand_data nand_data;

static struct atmel_nand_data nand_data;



#define NAND_BASE	AT91_CHIPSELECT_3
@@ -296,7 +296,7 @@ static struct resource nand_resources[] = { 
};



static struct platform_device at91cap9_nand_device = {

	.name		= "at91_nand",

	.name		= "atmel_nand",

	.id		= -1,

	.dev		= {

				.platform_data	= &nand_data,
@@ -305,7 +305,7 @@ static struct platform_device at91cap9_nand_device = { 
	.num_resources	= ARRAY_SIZE(nand_resources),

};



void __init at91_add_device_nand(struct at91_nand_data *data)

void __init at91_add_device_nand(struct atmel_nand_data *data)

{

	unsigned long csa, mode;
@@ -346,7 +346,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data) 
	platform_device_register(&at91cap9_nand_device);

}

#else

void __init at91_add_device_nand(struct at91_nand_data *data) {}

void __init at91_add_device_nand(struct atmel_nand_data *data) {}

#endif

arch/arm/mach-at91/at91rm9200_devices.c

+4 −4
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {} 
 * -------------------------------------------------------------------- */



#if defined(CONFIG_MTD_NAND_AT91) || defined(CONFIG_MTD_NAND_AT91_MODULE)

static struct at91_nand_data nand_data;

static struct atmel_nand_data nand_data;



#define NAND_BASE	AT91_CHIPSELECT_3
@@ -382,7 +382,7 @@ static struct resource nand_resources[] = { 
};



static struct platform_device at91rm9200_nand_device = {

	.name		= "at91_nand",

	.name		= "atmel_nand",

	.id		= -1,

	.dev		= {

				.platform_data	= &nand_data,
@@ -391,7 +391,7 @@ static struct platform_device at91rm9200_nand_device = { 
	.num_resources	= ARRAY_SIZE(nand_resources),

};



void __init at91_add_device_nand(struct at91_nand_data *data)

void __init at91_add_device_nand(struct atmel_nand_data *data)

{

	unsigned int csa;
@@ -429,7 +429,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data) 
	platform_device_register(&at91rm9200_nand_device);

}

#else

void __init at91_add_device_nand(struct at91_nand_data *data) {}

void __init at91_add_device_nand(struct atmel_nand_data *data) {}

#endif

arch/arm/mach-at91/at91sam9260_devices.c

+4 −4
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {} 
 * -------------------------------------------------------------------- */



#if defined(CONFIG_MTD_NAND_AT91) || defined(CONFIG_MTD_NAND_AT91_MODULE)

static struct at91_nand_data nand_data;

static struct atmel_nand_data nand_data;



#define NAND_BASE	AT91_CHIPSELECT_3
@@ -301,7 +301,7 @@ static struct resource nand_resources[] = { 
};



static struct platform_device at91sam9260_nand_device = {

	.name		= "at91_nand",

	.name		= "atmel_nand",

	.id		= -1,

	.dev		= {

				.platform_data	= &nand_data,
@@ -310,7 +310,7 @@ static struct platform_device at91sam9260_nand_device = { 
	.num_resources	= ARRAY_SIZE(nand_resources),

};



void __init at91_add_device_nand(struct at91_nand_data *data)

void __init at91_add_device_nand(struct atmel_nand_data *data)

{

	unsigned long csa, mode;
@@ -351,7 +351,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data) 
	platform_device_register(&at91sam9260_nand_device);

}

#else

void __init at91_add_device_nand(struct at91_nand_data *data) {}

void __init at91_add_device_nand(struct atmel_nand_data *data) {}

#endif

arch/arm/mach-at91/at91sam9261_devices.c

+6 −6
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {} 
 * -------------------------------------------------------------------- */



#if defined(CONFIG_MTD_NAND_AT91) || defined(CONFIG_MTD_NAND_AT91_MODULE)

static struct at91_nand_data nand_data;

static struct atmel_nand_data nand_data;



#define NAND_BASE	AT91_CHIPSELECT_3
@@ -211,8 +211,8 @@ static struct resource nand_resources[] = { 
	}

};



static struct platform_device at91_nand_device = {

	.name		= "at91_nand",

static struct platform_device atmel_nand_device = {

	.name		= "atmel_nand",

	.id		= -1,

	.dev		= {

				.platform_data	= &nand_data,
@@ -221,7 +221,7 @@ static struct platform_device at91_nand_device = { 
	.num_resources	= ARRAY_SIZE(nand_resources),

};



void __init at91_add_device_nand(struct at91_nand_data *data)

void __init at91_add_device_nand(struct atmel_nand_data *data)

{

	unsigned long csa, mode;
@@ -262,11 +262,11 @@ void __init at91_add_device_nand(struct at91_nand_data *data) 
	at91_set_A_periph(AT91_PIN_PC1, 0);		/* NANDWE */



	nand_data = *data;

	platform_device_register(&at91_nand_device);

	platform_device_register(&atmel_nand_device);

}



#else

void __init at91_add_device_nand(struct at91_nand_data *data) {}

void __init at91_add_device_nand(struct atmel_nand_data *data) {}

#endif

arch/arm/mach-at91/at91sam9263_devices.c

+4 −4
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {} 
 * -------------------------------------------------------------------- */



#if defined(CONFIG_MTD_NAND_AT91) || defined(CONFIG_MTD_NAND_AT91_MODULE)

static struct at91_nand_data nand_data;

static struct atmel_nand_data nand_data;



#define NAND_BASE	AT91_CHIPSELECT_3
@@ -371,7 +371,7 @@ static struct resource nand_resources[] = { 
};



static struct platform_device at91sam9263_nand_device = {

	.name		= "at91_nand",

	.name		= "atmel_nand",

	.id		= -1,

	.dev		= {

				.platform_data	= &nand_data,
@@ -380,7 +380,7 @@ static struct platform_device at91sam9263_nand_device = { 
	.num_resources	= ARRAY_SIZE(nand_resources),

};



void __init at91_add_device_nand(struct at91_nand_data *data)

void __init at91_add_device_nand(struct atmel_nand_data *data)

{

	unsigned long csa, mode;
@@ -421,7 +421,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data) 
	platform_device_register(&at91sam9263_nand_device);

}

#else

void __init at91_add_device_nand(struct at91_nand_data *data) {}

void __init at91_add_device_nand(struct atmel_nand_data *data) {}

#endif