ST SPEAr: Adding machine support for nand
Subsystems (2)
PATCH RESEND v5 25/63 ST SPEAr: Adding machine support for nand
In reply to a message not in the archiveFrom: Vipin Kumar <[email protected]>
Signed-off-by Vipin Kumar <[email protected]>
Signed-off-by Rajeev Kumar <[email protected]>
Signed-off-by Shiraz Hashim <[email protected]>
Signed-off-by Viresh Kumar <[email protected]>
--- arch/arm/mach-spear13xx/include/mach/generic.h | 2 + arch/arm/mach-spear13xx/include/mach/misc_regs.h | 10 ++ arch/arm/mach-spear13xx/spear1300_evb.c | 9 ++ arch/arm/mach-spear13xx/spear13xx.c | 58 +++++++++++++ arch/arm/mach-spear3xx/include/mach/generic.h | 15 ++-- arch/arm/mach-spear3xx/include/mach/spear320.h | 3 + arch/arm/mach-spear3xx/spear300.c | 98 ++++++++++++++++++++++ arch/arm/mach-spear3xx/spear300_evb.c | 8 ++ arch/arm/mach-spear3xx/spear310.c | 26 ++++++ arch/arm/mach-spear3xx/spear310_evb.c | 8 ++ arch/arm/mach-spear3xx/spear320.c | 26 ++++++ arch/arm/mach-spear3xx/spear320_evb.c | 8 ++ arch/arm/mach-spear6xx/include/mach/generic.h | 1 + arch/arm/mach-spear6xx/spear600_evb.c | 8 ++ arch/arm/mach-spear6xx/spear6xx.c | 26 ++++++ arch/arm/plat-spear/include/plat/fsmc.h | 36 ++++++++ 16 files changed, 336 insertions(+), 6 deletions(-) create mode 100644 arch/arm/plat-spear/include/plat/fsmc.h
arch/arm/mach-spear13xx/include/mach/generic.h +2 -0
@@ -35,6 +35,7 @@ extern struct platform_device spear13xx_ehci0_device;extern struct platform_device spear13xx_ehci1_device;extern struct platform_device spear13xx_i2c_device;extern struct platform_device spear13xx_kbd_device; +extern struct platform_device spear13xx_nand_device;extern struct platform_device spear13xx_ohci0_device;extern struct platform_device spear13xx_ohci1_device;extern struct platform_device spear13xx_rtc_device;
@@ -50,6 +51,7 @@ void __init spear1300_init(void);void __init spear13xx_map_io (void );void __init spear13xx_init_irq (void );void __init spear13xx_init (void ); +void __init nand_mach_init (u32 busw);void spear13xx_secondary_startup (void );#endif /* __MACH_GENERIC_H */
arch/arm/mach-spear13xx/include/mach/misc_regs.h +10 -0
@@ -210,6 +210,16 @@#define CF_MMC_ACTIVE 0x2#define XD_MMC_ACTIVE 0x3#define FSMC_CFG (MISC_BASE + 0x330) +/* FSMC_CFG register masks */ +#define FSMC_MEMSEL_MASK 0x3 +#define FSMC_MEMSEL_SHIFT 0 +#define FSMC_MEM_NOR 0 +#define FSMC_MEM_NAND 1 +#define FSMC_MEM_SRAM 2 +#define NAND_BANK_MASK 0x3 +#define NAND_BANK_SHIFT 2 +#define NAND_DEV_WIDTH16 4 +#define MPMC_CTR_STS (MISC_BASE + 0x334)/* Inter-Processor Communication Registers */
arch/arm/mach-spear13xx/spear1300_evb.c +9 -0
@@ -12,11 +12,14 @@*/ #include <linux/types.h> +#include <linux/mtd/nand.h> +#include <linux/mtd/fsmc.h> #include <asm/mach/arch.h> #include <asm/mach-types.h> #include <mach/generic.h> #include <mach/spear.h> #include <plat/keyboard.h> +#include <plat/fsmc.h> static struct amba_device *amba_devs[]__initdata = { &spear13xx_gpio_device[0 ],
@@ -29,6 +32,7 @@ static struct platform_device *plat_devs[] __initdata = { &spear13xx_ehci1_device, &spear13xx_i2c_device, &spear13xx_kbd_device, + &spear13xx_nand_device, &spear13xx_ohci0_device, &spear13xx_ohci1_device, &spear13xx_rtc_device,
@@ -53,6 +57,11 @@ static void __init spear1300_evb_init(void)/* set keyboard plat data */ kbd_set_plat_data (&spear13xx_kbd_device, &kbd_data); +/* set nand device's plat data */ +fsmc_nand_set_plat_data (&spear13xx_nand_device,NULL ,0 , +NAND_SKIP_BBTSCAN ,FSMC_NAND_BW8 ); +nand_mach_init (FSMC_NAND_BW8 ); +/* call spear1300 machine init function */ spear1300_init ();
arch/arm/mach-spear13xx/spear13xx.c +58 -0
76 lines not on this page · raw message
arch/arm/mach-spear3xx/include/mach/generic.h +9 -6
@@ -110,6 +110,10 @@ extern struct pmx_driver pmx_driver;extern struct amba_device clcd_device;extern struct amba_device gpio1_device;extern struct platform_device kbd_device; +extern struct platform_device nand0_device; +extern struct platform_device nand1_device; +extern struct platform_device nand2_device; +extern struct platform_device nand3_device;/* pad mux modes */ extern struct pmx_mode nand_mode;
@@ -147,12 +151,12 @@ void __init spear300_init(void);/* Add misc structure declarations here */ extern struct clcd_board clcd_plat_data; -#endif /* CONFIG_MACH_SPEAR300 */ /* spear310 declarations */ -#ifdef CONFIG_MACH_SPEAR310 +#elif defined(CONFIG_MACH_SPEAR310 )/* Add spear310 machine device structure declarations here */ extern struct platform_device plgpio_device; +extern struct platform_device nand_device;/* pad mux devices */ extern struct pmx_dev pmx_emi_cs_0_1_4_5;
@@ -167,13 +171,12 @@ extern struct pmx_dev pmx_tdm0;/* Add spear310 machine function declarations here */ void __init spear310_init (void ); -#endif /* CONFIG_MACH_SPEAR310 */ -/* spear320 declarations */ -#ifdef CONFIG_MACH_SPEAR320 +#elif defined(CONFIG_MACH_SPEAR320 )/* Add spear320 machine device structure declarations here */ extern struct amba_device clcd_device;extern struct platform_device i2c1_device; +extern struct platform_device nand_device;extern struct platform_device plgpio_device;extern struct platform_device pwm_device;
@@ -212,6 +215,6 @@ void __init spear320_init(void);/* Add misc structure declarations here */ extern struct clcd_board clcd_plat_data; -#endif /* CONFIG_MACH_SPEAR320 */ +#endif #endif /* __MACH_GENERIC_H */
arch/arm/mach-spear3xx/include/mach/spear320.h +3 -0
@@ -22,6 +22,9 @@#define SPEAR320_FSMC_BASE 0x4C000000#define SPEAR320_FSMC_SIZE 0x01000000 +#define SPEAR320_NAND_BASE 0x50000000 +#define SPEAR320_NAND_SIZE 0x04000000 +#define SPEAR320_I2S_BASE 0x60000000#define SPEAR320_I2S_SIZE 0x10000000
arch/arm/mach-spear3xx/spear300.c +98 -0
110 lines not on this page · raw message
arch/arm/mach-spear3xx/spear300_evb.c +8 -0
@@ -11,10 +11,13 @@* warranty of any kind, whether express or implied. */ +#include <linux/mtd/nand.h> +#include <linux/mtd/fsmc.h> #include <asm/mach/arch.h> #include <asm/mach-types.h> #include <mach/generic.h> #include <mach/spear.h> +#include <plat/fsmc.h> #include <plat/keyboard.h> /* padmux devices to enable */
@@ -48,6 +51,7 @@ static struct platform_device *plat_devs[] __initdata = {/* spear3xx specific devices */ &ehci_device, &i2c_device, + &nand0_device, &ohci0_device, &ohci1_device, &rtc_device,
@@ -80,6 +84,10 @@ static void __init spear300_evb_init(void)/* set keyboard plat data */ kbd_set_plat_data (&kbd_device, &kbd_data); +/* set nand0 device's plat data */ +fsmc_nand_set_plat_data (&nand0_device,NULL ,0 ,NAND_SKIP_BBTSCAN , +FSMC_NAND_BW8 ); +/* call spear300 machine init function */ spear300_init ();
arch/arm/mach-spear3xx/spear310.c +26 -0
@@ -12,6 +12,7 @@*/ #include <linux/ptrace.h> +#include <linux/mtd/fsmc.h> #include <asm/irq.h> #include <mach/generic.h> #include <mach/spear.h>
@@ -177,6 +178,31 @@ int spear300_o2p(int offset)return offset +2 ; } +/* nand device registeration */ +static struct fsmc_nand_platform_data nand_platform_data; + +static struct resource nand_resources[] = { + { + .name ="nand_data" , + .start =SPEAR310_NAND_BASE , + .end =SPEAR310_NAND_BASE +SZ_16 -1 , + .flags =IORESOURCE_MEM , + }, { + .name ="fsmc_regs" , + .start =SPEAR310_FSMC_BASE , + .end =SPEAR310_FSMC_BASE +SZ_4K -1 , + .flags =IORESOURCE_MEM , + }, +}; + +struct platform_device nand_device = { + .name ="fsmc-nand" , + .id =-1 , + .resource = nand_resources, + .num_resources =ARRAY_SIZE (nand_resources), + .dev.platform_data = &nand_platform_data, +}; +static struct plgpio_platform_data plgpio_plat_data = { .gpio_base =8 , .irq_base =SPEAR_PLGPIO_INT_BASE ,
arch/arm/mach-spear3xx/spear310_evb.c +8 -0
@@ -11,10 +11,13 @@* warranty of any kind, whether express or implied. */ +#include <linux/mtd/nand.h> +#include <linux/mtd/fsmc.h> #include <asm/mach/arch.h> #include <asm/mach-types.h> #include <mach/generic.h> #include <mach/spear.h> +#include <plat/fsmc.h> /* padmux devices to enable */ static struct pmx_dev *pmx_devs[] = {
@@ -53,6 +56,7 @@ static struct platform_device *plat_devs[] __initdata = {/* spear3xx specific devices */ &ehci_device, &i2c_device, + &nand_device, &ohci0_device, &ohci1_device, &rtc_device,
@@ -70,6 +74,10 @@ static void __init spear310_evb_init(void) pmx_driver.devs = pmx_devs; pmx_driver.devs_count =ARRAY_SIZE (pmx_devs); +/* set nand device's plat data */ +fsmc_nand_set_plat_data (&nand_device,NULL ,0 ,NAND_SKIP_BBTSCAN , +FSMC_NAND_BW8 ); +/* call spear310 machine init function */ spear310_init ();
arch/arm/mach-spear3xx/spear320.c +26 -0
@@ -12,6 +12,7 @@*/ #include <linux/ptrace.h> +#include <linux/mtd/fsmc.h> #include <asm/irq.h> #include <mach/generic.h> #include <mach/spear.h>
@@ -424,6 +425,31 @@ struct platform_device i2c1_device = { .resource = i2c1_resources, }; +/* nand device registeration */ +static struct fsmc_nand_platform_data nand_platform_data; + +static struct resource nand_resources[] = { + { + .name ="nand_data" , + .start =SPEAR320_NAND_BASE , + .end =SPEAR320_NAND_BASE +SZ_16 -1 , + .flags =IORESOURCE_MEM , + }, { + .name ="fsmc_regs" , + .start =SPEAR320_FSMC_BASE , + .end =SPEAR320_FSMC_BASE +SZ_4K -1 , + .flags =IORESOURCE_MEM , + }, +}; + +struct platform_device nand_device = { + .name ="fsmc-nand" , + .id =-1 , + .resource = nand_resources, + .num_resources =ARRAY_SIZE (nand_resources), + .dev.platform_data = &nand_platform_data, +}; +/* plgpio device registeration */ static struct plgpio_platform_data plgpio_plat_data = { .gpio_base =8 ,
arch/arm/mach-spear3xx/spear320_evb.c +8 -0
@@ -11,10 +11,13 @@* warranty of any kind, whether express or implied. */ +#include <linux/mtd/nand.h> +#include <linux/mtd/fsmc.h> #include <asm/mach/arch.h> #include <asm/mach-types.h> #include <mach/generic.h> #include <mach/spear.h> +#include <plat/fsmc.h> /* padmux devices to enable */ static struct pmx_dev *pmx_devs[] = {
@@ -51,6 +54,7 @@ static struct platform_device *plat_devs[] __initdata = {/* spear3xx specific devices */ &ehci_device, &i2c_device, + &nand_device, &ohci0_device, &ohci1_device, &rtc_device,
@@ -70,6 +74,10 @@ static void __init spear320_evb_init(void) pmx_driver.devs = pmx_devs; pmx_driver.devs_count =ARRAY_SIZE (pmx_devs); +/* set nand device's plat data */ +fsmc_nand_set_plat_data (&nand_device,NULL ,0 ,NAND_SKIP_BBTSCAN , +FSMC_NAND_BW8 ); +/* call spear320 machine init function */ spear320_init ();
arch/arm/mach-spear6xx/include/mach/generic.h +1 -0
@@ -36,6 +36,7 @@ extern struct amba_device wdt_device;extern struct platform_device ehci0_device;extern struct platform_device ehci1_device;extern struct platform_device i2c_device; +extern struct platform_device nand_device;extern struct platform_device ohci0_device;extern struct platform_device ohci1_device;extern struct platform_device rtc_device;
arch/arm/mach-spear6xx/spear600_evb.c +8 -0
@@ -11,10 +11,13 @@* warranty of any kind, whether express or implied. */ +#include <linux/mtd/nand.h> +#include <linux/mtd/fsmc.h> #include <asm/mach/arch.h> #include <asm/mach-types.h> #include <mach/generic.h> #include <mach/spear.h> +#include <plat/fsmc.h> static struct amba_device *amba_devs[]__initdata = { &clcd_device,
@@ -32,6 +35,7 @@ static struct platform_device *plat_devs[] __initdata = { &i2c_device, &ohci0_device, &ohci1_device, + &nand_device, &rtc_device, };
@@ -39,6 +43,10 @@ static void __init spear600_evb_init(void) {unsigned int i; +/* set nand device's plat data */ +fsmc_nand_set_plat_data (&nand_device,NULL ,0 ,NAND_SKIP_BBTSCAN , +FSMC_NAND_BW8 ); +/* call spear600 machine init function */ spear600_init ();
arch/arm/mach-spear6xx/spear6xx.c +26 -0
@@ -15,6 +15,7 @@#include <linux/amba/pl061.h> #include <linux/ptrace.h> #include <linux/io.h> +#include <linux/mtd/fsmc.h> #include <asm/hardware/vic.h> #include <asm/irq.h> #include <asm/mach/arch.h>
@@ -152,6 +153,31 @@ struct platform_device i2c_device = { .resource = i2c_resources, }; +/* nand device registeration */ +static struct fsmc_nand_platform_data nand_platform_data; + +static struct resource nand_resources[] = { + { + .name ="nand_data" , + .start =SPEAR6XX_ICM1_NAND_BASE , + .end =SPEAR6XX_ICM1_NAND_BASE +SZ_16 -1 , + .flags =IORESOURCE_MEM , + }, { + .name ="fsmc_regs" , + .start =SPEAR6XX_ICM1_FSMC_BASE , + .end =SPEAR6XX_ICM1_FSMC_BASE +SZ_4K -1 , + .flags =IORESOURCE_MEM , + }, +}; + +struct platform_device nand_device = { + .name ="fsmc-nand" , + .id =-1 , + .resource = nand_resources, + .num_resources =ARRAY_SIZE (nand_resources), + .dev.platform_data = &nand_platform_data, +}; +/* usb host device registeration */ static struct resource ehci0_resources[] = { [0 ] = {
arch/arm/plat-spear/include/plat/fsmc.h new file +36 -0
@@ -0,0 +1,36 @@ +/* +* arch/arm/plat-spear/include/plat/fsmc.h +* +* FSMC definitions for SPEAr platform +* +* Copyright (C) 2010 ST Microelectronics +* Vipin Kumar <[email protected]> +* +* This file is licensed under the terms of the GNU General Public +* License version 2. This program is licensed "as is" without any +* warranty of any kind, whether express or implied. +*/ + +#ifndef __PLAT_FSMC_H +#define __PLAT_FSMC_H + +#include <linux/mtd/fsmc.h> + +/* This function is used to set platform data field of pdev->dev */ +static inline void fsmc_nand_set_plat_data (struct platform_device *pdev, +struct mtd_partition *partitions,unsigned int nr_partitions, +unsigned int options,unsigned int width) +{ +struct fsmc_nand_platform_data *plat_data; + plat_data =dev_get_platdata (&pdev->dev); + +if (partitions) { + plat_data->partitions = partitions; + plat_data->nr_partitions = nr_partitions; + } + + plat_data->options = options; + plat_data->width = width; +} + +#endif /* __PLAT_FSMC_H */
Signature · 1 line
1.7.2.2