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

[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
...@@ -278,7 +278,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {} ...@@ -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) #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 #define NAND_BASE AT91_CHIPSELECT_3
...@@ -296,7 +296,7 @@ static struct resource nand_resources[] = { ...@@ -296,7 +296,7 @@ static struct resource nand_resources[] = {
}; };
static struct platform_device at91cap9_nand_device = { static struct platform_device at91cap9_nand_device = {
.name = "at91_nand", .name = "atmel_nand",
.id = -1, .id = -1,
.dev = { .dev = {
.platform_data = &nand_data, .platform_data = &nand_data,
...@@ -305,7 +305,7 @@ static struct platform_device at91cap9_nand_device = { ...@@ -305,7 +305,7 @@ static struct platform_device at91cap9_nand_device = {
.num_resources = ARRAY_SIZE(nand_resources), .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; unsigned long csa, mode;
...@@ -346,7 +346,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data) ...@@ -346,7 +346,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data)
platform_device_register(&at91cap9_nand_device); platform_device_register(&at91cap9_nand_device);
} }
#else #else
void __init at91_add_device_nand(struct at91_nand_data *data) {} void __init at91_add_device_nand(struct atmel_nand_data *data) {}
#endif #endif
......
...@@ -369,7 +369,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {} ...@@ -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) #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 #define NAND_BASE AT91_CHIPSELECT_3
...@@ -382,7 +382,7 @@ static struct resource nand_resources[] = { ...@@ -382,7 +382,7 @@ static struct resource nand_resources[] = {
}; };
static struct platform_device at91rm9200_nand_device = { static struct platform_device at91rm9200_nand_device = {
.name = "at91_nand", .name = "atmel_nand",
.id = -1, .id = -1,
.dev = { .dev = {
.platform_data = &nand_data, .platform_data = &nand_data,
...@@ -391,7 +391,7 @@ static struct platform_device at91rm9200_nand_device = { ...@@ -391,7 +391,7 @@ static struct platform_device at91rm9200_nand_device = {
.num_resources = ARRAY_SIZE(nand_resources), .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; unsigned int csa;
...@@ -429,7 +429,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data) ...@@ -429,7 +429,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data)
platform_device_register(&at91rm9200_nand_device); platform_device_register(&at91rm9200_nand_device);
} }
#else #else
void __init at91_add_device_nand(struct at91_nand_data *data) {} void __init at91_add_device_nand(struct atmel_nand_data *data) {}
#endif #endif
......
...@@ -283,7 +283,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {} ...@@ -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) #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 #define NAND_BASE AT91_CHIPSELECT_3
...@@ -301,7 +301,7 @@ static struct resource nand_resources[] = { ...@@ -301,7 +301,7 @@ static struct resource nand_resources[] = {
}; };
static struct platform_device at91sam9260_nand_device = { static struct platform_device at91sam9260_nand_device = {
.name = "at91_nand", .name = "atmel_nand",
.id = -1, .id = -1,
.dev = { .dev = {
.platform_data = &nand_data, .platform_data = &nand_data,
...@@ -310,7 +310,7 @@ static struct platform_device at91sam9260_nand_device = { ...@@ -310,7 +310,7 @@ static struct platform_device at91sam9260_nand_device = {
.num_resources = ARRAY_SIZE(nand_resources), .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; unsigned long csa, mode;
...@@ -351,7 +351,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data) ...@@ -351,7 +351,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data)
platform_device_register(&at91sam9260_nand_device); platform_device_register(&at91sam9260_nand_device);
} }
#else #else
void __init at91_add_device_nand(struct at91_nand_data *data) {} void __init at91_add_device_nand(struct atmel_nand_data *data) {}
#endif #endif
......
...@@ -199,7 +199,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {} ...@@ -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) #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 #define NAND_BASE AT91_CHIPSELECT_3
...@@ -211,8 +211,8 @@ static struct resource nand_resources[] = { ...@@ -211,8 +211,8 @@ static struct resource nand_resources[] = {
} }
}; };
static struct platform_device at91_nand_device = { static struct platform_device atmel_nand_device = {
.name = "at91_nand", .name = "atmel_nand",
.id = -1, .id = -1,
.dev = { .dev = {
.platform_data = &nand_data, .platform_data = &nand_data,
...@@ -221,7 +221,7 @@ static struct platform_device at91_nand_device = { ...@@ -221,7 +221,7 @@ static struct platform_device at91_nand_device = {
.num_resources = ARRAY_SIZE(nand_resources), .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; unsigned long csa, mode;
...@@ -262,11 +262,11 @@ void __init at91_add_device_nand(struct at91_nand_data *data) ...@@ -262,11 +262,11 @@ void __init at91_add_device_nand(struct at91_nand_data *data)
at91_set_A_periph(AT91_PIN_PC1, 0); /* NANDWE */ at91_set_A_periph(AT91_PIN_PC1, 0); /* NANDWE */
nand_data = *data; nand_data = *data;
platform_device_register(&at91_nand_device); platform_device_register(&atmel_nand_device);
} }
#else #else
void __init at91_add_device_nand(struct at91_nand_data *data) {} void __init at91_add_device_nand(struct atmel_nand_data *data) {}
#endif #endif
......
...@@ -353,7 +353,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {} ...@@ -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) #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 #define NAND_BASE AT91_CHIPSELECT_3
...@@ -371,7 +371,7 @@ static struct resource nand_resources[] = { ...@@ -371,7 +371,7 @@ static struct resource nand_resources[] = {
}; };
static struct platform_device at91sam9263_nand_device = { static struct platform_device at91sam9263_nand_device = {
.name = "at91_nand", .name = "atmel_nand",
.id = -1, .id = -1,
.dev = { .dev = {
.platform_data = &nand_data, .platform_data = &nand_data,
...@@ -380,7 +380,7 @@ static struct platform_device at91sam9263_nand_device = { ...@@ -380,7 +380,7 @@ static struct platform_device at91sam9263_nand_device = {
.num_resources = ARRAY_SIZE(nand_resources), .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; unsigned long csa, mode;
...@@ -421,7 +421,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data) ...@@ -421,7 +421,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data)
platform_device_register(&at91sam9263_nand_device); platform_device_register(&at91sam9263_nand_device);
} }
#else #else
void __init at91_add_device_nand(struct at91_nand_data *data) {} void __init at91_add_device_nand(struct atmel_nand_data *data) {}
#endif #endif
......
...@@ -100,7 +100,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {} ...@@ -100,7 +100,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) #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 #define NAND_BASE AT91_CHIPSELECT_3
...@@ -117,8 +117,8 @@ static struct resource nand_resources[] = { ...@@ -117,8 +117,8 @@ static struct resource nand_resources[] = {
} }
}; };
static struct platform_device at91_nand_device = { static struct platform_device atmel_nand_device = {
.name = "at91_nand", .name = "atmel_nand",
.id = -1, .id = -1,
.dev = { .dev = {
.platform_data = &nand_data, .platform_data = &nand_data,
...@@ -127,7 +127,7 @@ static struct platform_device at91_nand_device = { ...@@ -127,7 +127,7 @@ static struct platform_device at91_nand_device = {
.num_resources = ARRAY_SIZE(nand_resources), .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; unsigned long csa;
...@@ -164,11 +164,11 @@ void __init at91_add_device_nand(struct at91_nand_data *data) ...@@ -164,11 +164,11 @@ void __init at91_add_device_nand(struct at91_nand_data *data)
at91_set_A_periph(AT91_PIN_PB5, 0); /* NANDWE */ at91_set_A_periph(AT91_PIN_PB5, 0); /* NANDWE */
nand_data = *data; nand_data = *data;
platform_device_register(&at91_nand_device); platform_device_register(&atmel_nand_device);
} }
#else #else
void __init at91_add_device_nand(struct at91_nand_data *data) {} void __init at91_add_device_nand(struct atmel_nand_data *data) {}
#endif #endif
......
...@@ -142,7 +142,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio ...@@ -142,7 +142,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio
return cam60_nand_partition; return cam60_nand_partition;
} }
static struct at91_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 = ... not there
......
...@@ -175,7 +175,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio ...@@ -175,7 +175,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio
return cap9adk_nand_partitions; return cap9adk_nand_partitions;
} }
static struct at91_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 = ... not connected
......
...@@ -150,7 +150,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio ...@@ -150,7 +150,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio
return dk_nand_partition; return dk_nand_partition;
} }
static struct at91_nand_data __initdata dk_nand_data = { static struct atmel_nand_data __initdata dk_nand_data = {
.ale = 22, .ale = 22,
.cle = 21, .cle = 21,
.det_pin = AT91_PIN_PB1, .det_pin = AT91_PIN_PB1,
......
...@@ -102,7 +102,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio ...@@ -102,7 +102,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio
return kb9202_nand_partition; return kb9202_nand_partition;
} }
static struct at91_nand_data __initdata kb9202_nand_data = { static struct atmel_nand_data __initdata kb9202_nand_data = {
.ale = 22, .ale = 22,
.cle = 21, .cle = 21,
// .det_pin = ... not there // .det_pin = ... not there
......
...@@ -141,7 +141,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio ...@@ -141,7 +141,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio
return ek_nand_partition; return ek_nand_partition;
} }
static struct at91_nand_data __initdata ek_nand_data = { static struct atmel_nand_data __initdata ek_nand_data = {
.ale = 21, .ale = 21,
.cle = 22, .cle = 22,
// .det_pin = ... not connected // .det_pin = ... not connected
......
...@@ -178,7 +178,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio ...@@ -178,7 +178,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio
return ek_nand_partition; return ek_nand_partition;
} }
static struct at91_nand_data __initdata ek_nand_data = { static struct atmel_nand_data __initdata ek_nand_data = {
.ale = 21, .ale = 21,
.cle = 22, .cle = 22,
// .det_pin = ... not connected // .det_pin = ... not connected
......
...@@ -183,7 +183,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio ...@@ -183,7 +183,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio
return ek_nand_partition; return ek_nand_partition;
} }
static struct at91_nand_data __initdata ek_nand_data = { static struct atmel_nand_data __initdata ek_nand_data = {
.ale = 22, .ale = 22,
.cle = 21, .cle = 21,
// .det_pin = ... not connected // .det_pin = ... not connected
......
...@@ -187,7 +187,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio ...@@ -187,7 +187,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio
return ek_nand_partition; return ek_nand_partition;
} }
static struct at91_nand_data __initdata ek_nand_data = { static struct atmel_nand_data __initdata ek_nand_data = {
.ale = 21, .ale = 21,
.cle = 22, .cle = 22,
// .det_pin = ... not connected // .det_pin = ... not connected
......
...@@ -88,7 +88,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio ...@@ -88,7 +88,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio
return ek_nand_partition; return ek_nand_partition;
} }
static struct at91_nand_data __initdata ek_nand_data = { static struct atmel_nand_data __initdata ek_nand_data = {
.ale = 21, .ale = 21,
.cle = 22, .cle = 22,
// .det_pin = ... not connected // .det_pin = ... not connected
......
...@@ -251,7 +251,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio ...@@ -251,7 +251,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio
return yl_9200_nand_partition; return yl_9200_nand_partition;
} }
static struct at91_nand_data __initdata yl_9200_nand_data = { static struct atmel_nand_data __initdata yl_9200_nand_data = {
.ale= 6, .ale= 6,
.cle= 7, .cle= 7,
/*.det_pin = AT91_PIN_PCxx,*/ /*we don't have a det pin because NandFlash is fixed to board*/ /*.det_pin = AT91_PIN_PCxx,*/ /*we don't have a det pin because NandFlash is fixed to board*/
......
This diff is collapsed.
...@@ -11,26 +11,26 @@ ...@@ -11,26 +11,26 @@
#ifndef ATMEL_NAND_ECC_H #ifndef ATMEL_NAND_ECC_H
#define ATMEL_NAND_ECC_H #define ATMEL_NAND_ECC_H
#define AT91_ECC_CR 0x00 /* Control register */ #define ATMEL_ECC_CR 0x00 /* Control register */
#define AT91_ECC_RST (1 << 0) /* Reset parity */ #define ATMEL_ECC_RST (1 << 0) /* Reset parity */
#define AT91_ECC_MR 0x04 /* Mode register */ #define ATMEL_ECC_MR 0x04 /* Mode register */
#define AT91_ECC_PAGESIZE (3 << 0) /* Page Size */ #define ATMEL_ECC_PAGESIZE (3 << 0) /* Page Size */
#define AT91_ECC_PAGESIZE_528 (0) #define ATMEL_ECC_PAGESIZE_528 (0)
#define AT91_ECC_PAGESIZE_1056 (1) #define ATMEL_ECC_PAGESIZE_1056 (1)
#define AT91_ECC_PAGESIZE_2112 (2) #define ATMEL_ECC_PAGESIZE_2112 (2)
#define AT91_ECC_PAGESIZE_4224 (3) #define ATMEL_ECC_PAGESIZE_4224 (3)
#define AT91_ECC_SR 0x08 /* Status register */ #define ATMEL_ECC_SR 0x08 /* Status register */
#define AT91_ECC_RECERR (1 << 0) /* Recoverable Error */ #define ATMEL_ECC_RECERR (1 << 0) /* Recoverable Error */
#define AT91_ECC_ECCERR (1 << 1) /* ECC Single Bit Error */ #define ATMEL_ECC_ECCERR (1 << 1) /* ECC Single Bit Error */
#define AT91_ECC_MULERR (1 << 2) /* Multiple Errors */ #define ATMEL_ECC_MULERR (1 << 2) /* Multiple Errors */
#define AT91_ECC_PR 0x0c /* Parity register */ #define ATMEL_ECC_PR 0x0c /* Parity register */
#define AT91_ECC_BITADDR (0xf << 0) /* Bit Error Address */ #define ATMEL_ECC_BITADDR (0xf << 0) /* Bit Error Address */
#define AT91_ECC_WORDADDR (0xfff << 4) /* Word Error Address */ #define ATMEL_ECC_WORDADDR (0xfff << 4) /* Word Error Address */
#define AT91_ECC_NPR 0x10 /* NParity register */ #define ATMEL_ECC_NPR 0x10 /* NParity register */
#define AT91_ECC_NPARITY (0xffff << 0) /* NParity */ #define ATMEL_ECC_NPARITY (0xffff << 0) /* NParity */
#endif #endif
...@@ -85,7 +85,7 @@ struct at91_usbh_data { ...@@ -85,7 +85,7 @@ struct at91_usbh_data {
extern void __init at91_add_device_usbh(struct at91_usbh_data *data); extern void __init at91_add_device_usbh(struct at91_usbh_data *data);
/* NAND / SmartMedia */ /* NAND / SmartMedia */
struct at91_nand_data { struct atmel_nand_data {
u8 enable_pin; /* chip enable */ u8 enable_pin; /* chip enable */
u8 det_pin; /* card detect */ u8 det_pin; /* card detect */
u8 rdy_pin; /* ready/busy */ u8 rdy_pin; /* ready/busy */
...@@ -94,7 +94,7 @@ struct at91_nand_data { ...@@ -94,7 +94,7 @@ struct at91_nand_data {
u8 bus_width_16; /* buswidth is 16 bit */ u8 bus_width_16; /* buswidth is 16 bit */
struct mtd_partition* (*partition_info)(int, int*); struct mtd_partition* (*partition_info)(int, int*);
}; };
extern void __init at91_add_device_nand(struct at91_nand_data *data); extern void __init at91_add_device_nand(struct atmel_nand_data *data);
/* I2C*/ /* I2C*/
extern void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices); extern void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment