diff options
author | Mike Rapoport <mike@compulab.co.il> | 2009-01-18 11:55:19 +0200 |
---|---|---|
committer | Eric Miao <eric.miao@marvell.com> | 2009-01-19 10:55:16 +0800 |
commit | 8d69abb08343706f88380edb83927ffc0fc83098 (patch) | |
tree | 9d1f241988e7558c718d967d34751866ccb2431d /arch/arm/mach-pxa/pxa320.c | |
parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
download | linux-3.10-8d69abb08343706f88380edb83927ffc0fc83098.tar.gz linux-3.10-8d69abb08343706f88380edb83927ffc0fc83098.tar.bz2 linux-3.10-8d69abb08343706f88380edb83927ffc0fc83098.zip |
[ARM] pxa: fix NAND and MMC clock initialization for pxa3xx
After commit 8c3abc7d903df492a7394b0adae4349d9a381aaf
("[ARM] pxa: convert to clkdev and match clocks by struct device where possible")
get_clk in pxa3xx_nand fails with -ENOENT.
Apparently, clk_get in pxamci will also fail for MCI2 on PXA310.
The 'clk_find' and therefore 'clk_get' require driver to supply
both 'dev_id' and 'con_id' if they are not NULL in the 'strcut clk_lookup',
but neither pxa3xx_nand nor pxamci supply 'con_id'.
This patch sets 'con_id' to NULL in NAND clock and MCI2 clock registration.
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/pxa320.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa320.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa320.c b/arch/arm/mach-pxa/pxa320.c index effe408c186..36f066196fa 100644 --- a/arch/arm/mach-pxa/pxa320.c +++ b/arch/arm/mach-pxa/pxa320.c @@ -83,7 +83,7 @@ static struct pxa3xx_mfp_addr_map pxa320_mfp_addr_map[] __initdata = { static DEFINE_PXA3_CKEN(pxa320_nand, NAND, 104000000, 0); static struct clk_lookup pxa320_clkregs[] = { - INIT_CLKREG(&clk_pxa320_nand, "pxa3xx-nand", "NANDCLK"), + INIT_CLKREG(&clk_pxa320_nand, "pxa3xx-nand", NULL), }; static int __init pxa320_init(void) |