diff options
| author |   Linus Walleij <linus.walleij@stericsson.com> | 2010-09-13 00:35:37 +0200 |
|---|---|---|
| committer |   David Woodhouse <David.Woodhouse@intel.com> | 2010-10-25 00:35:46 +0100 |
| commit | 93ac5a552c831096003f9bc74471300dc1710a42 (patch) | |
| tree | 91f79071e37e84adbd6d0e9b66d6a53292c0dd47 /arch/arm/mach-u300/clock.c | |
| parent | mtd: generic FSMC NAND MTD driver (diff) | |
| download | linux-dev-93ac5a552c831096003f9bc74471300dc1710a42.tar.xz linux-dev-93ac5a552c831096003f9bc74471300dc1710a42.zip | |
ARM: platform data to use the FSMC NAND with the U300
Just as it says, if this is merged along with the other patch, the
driver supports the U300 NAND flash interface.
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'arch/arm/mach-u300/clock.c')
| -rw-r--r-- | arch/arm/mach-u300/clock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-u300/clock.c b/arch/arm/mach-u300/clock.c index 60acf9e708ae..7458fc6df5c6 100644 --- a/arch/arm/mach-u300/clock.c +++ b/arch/arm/mach-u300/clock.c @@ -66,7 +66,7 @@ static DEFINE_SPINLOCK(syscon_resetreg_lock); * AMBA bus * | * +- CPU - * +- NANDIF NAND Flash interface + * +- FSMC NANDIF NAND Flash interface * +- SEMI Shared Memory interface * +- ISP Image Signal Processor (U335 only) * +- CDS (U335 only) @@ -726,7 +726,7 @@ static struct clk cpu_clk = { }; static struct clk nandif_clk = { - .name = "NANDIF", + .name = "FSMC", .parent = &amba_clk, .hw_ctrld = false, .reset = true, @@ -1259,7 +1259,7 @@ static struct clk_lookup lookups[] = { /* Connected directly to the AMBA bus */ DEF_LOOKUP("amba", &amba_clk), DEF_LOOKUP("cpu", &cpu_clk), - DEF_LOOKUP("fsmc", &nandif_clk), + DEF_LOOKUP("fsmc-nand", &nandif_clk), DEF_LOOKUP("semi", &semi_clk), #ifdef CONFIG_MACH_U300_BS335 DEF_LOOKUP("isp", &isp_clk), |