diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 12:21:17 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 12:21:17 +0000 |
| commit | ee80285e1b79e6a7a6855c8be65bddc61f4d69be (patch) | |
| tree | 70816118e053fac5983c06c0416053140fc1e438 /arch/arm/mach-mxs/clock-mx28.c | |
| parent | dae2efd750393565a90fa75eeab289dbeacc166e (diff) | |
| parent | 60c15358f603ca21e791d2cc17029b620c625258 (diff) | |
Merge branch 'mxs/gpmi' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/drivers
* 'mxs/gpmi' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: mxs: add GPMI-NAND support for imx23/imx28
Diffstat (limited to 'arch/arm/mach-mxs/clock-mx28.c')
| -rw-r--r-- | arch/arm/mach-mxs/clock-mx28.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/clock-mx28.c b/arch/arm/mach-mxs/clock-mx28.c index 5d68e415222..8dd7b02a4b9 100644 --- a/arch/arm/mach-mxs/clock-mx28.c +++ b/arch/arm/mach-mxs/clock-mx28.c @@ -643,6 +643,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("duart", NULL, uart_clk) _REGISTER_CLOCK("imx28-fec.0", NULL, fec_clk) _REGISTER_CLOCK("imx28-fec.1", NULL, fec_clk) + _REGISTER_CLOCK("imx28-gpmi-nand", NULL, gpmi_clk) _REGISTER_CLOCK("mxs-auart.0", NULL, uart_clk) _REGISTER_CLOCK("mxs-auart.1", NULL, uart_clk) _REGISTER_CLOCK("mxs-auart.2", NULL, uart_clk) |