diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 19:42:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 19:42:32 -0400 |
| commit | b5153163ed580e00c67bdfecb02b2e3843817b3e (patch) | |
| tree | b8c878601f07f5df8f694435857a5f3dcfd75482 /arch/arm/mach-imx/clock-imx21.c | |
| parent | a8cbf22559ceefdcdfac00701e8e6da7518b7e8e (diff) | |
| parent | 6451d7783ba5ff24eb1a544eaa6665b890f30466 (diff) | |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (278 commits)
arm: remove machine_desc.io_pg_offst and .phys_io
arm: use addruart macro to establish debug mappings
arm: return both physical and virtual addresses from addruart
arm/debug: consolidate addruart macros for CONFIG_DEBUG_ICEDCC
ARM: make struct machine_desc definition coherent with its comment
eukrea_mbimxsd-baseboard: Pass the correct GPIO to gpio_free
cpuimx27: fix compile when ULPI is selected
mach-pcm037_eet: fix compile errors
Fixing ethernet driver compilation error for i.MX31 ADS board
cpuimx51: update board support
mx5: add cpuimx51sd module and its baseboard
iomux-mx51: fix GPIO_1_xx 's IOMUX configuration
imx-esdhc: update devices registration
mx51: add resources for SD/MMC on i.MX51
iomux-mx51: fix SD1 and SD2's iomux configuration
clock-mx51: rename CLOCK1 to CLOCK_CCGR for better readability
clock-mx51: factorize clk_set_parent and clk_get_rate
eukrea_mbimxsd: add support for DVI displays
cpuimx25 & cpuimx35: fix OTG port registration in host mode
i.MX31 and i.MX35 : fix errate TLSbo65953 and ENGcm09472
...
Diffstat (limited to 'arch/arm/mach-imx/clock-imx21.c')
| -rw-r--r-- | arch/arm/mach-imx/clock-imx21.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/clock-imx21.c b/arch/arm/mach-imx/clock-imx21.c index bb419ef4d133..cf15ea516a72 100644 --- a/arch/arm/mach-imx/clock-imx21.c +++ b/arch/arm/mach-imx/clock-imx21.c | |||
| @@ -1172,9 +1172,9 @@ static struct clk_lookup lookups[] = { | |||
| 1172 | _REGISTER_CLOCK(NULL, "pwm", pwm_clk[0]) | 1172 | _REGISTER_CLOCK(NULL, "pwm", pwm_clk[0]) |
| 1173 | _REGISTER_CLOCK(NULL, "sdhc1", sdhc_clk[0]) | 1173 | _REGISTER_CLOCK(NULL, "sdhc1", sdhc_clk[0]) |
| 1174 | _REGISTER_CLOCK(NULL, "sdhc2", sdhc_clk[1]) | 1174 | _REGISTER_CLOCK(NULL, "sdhc2", sdhc_clk[1]) |
| 1175 | _REGISTER_CLOCK(NULL, "cspi1", cspi_clk[0]) | 1175 | _REGISTER_CLOCK("imx21-cspi.0", NULL, cspi_clk[0]) |
| 1176 | _REGISTER_CLOCK(NULL, "cspi2", cspi_clk[1]) | 1176 | _REGISTER_CLOCK("imx21-cspi.1", NULL, cspi_clk[1]) |
| 1177 | _REGISTER_CLOCK(NULL, "cspi3", cspi_clk[2]) | 1177 | _REGISTER_CLOCK("imx21-cspi.2", NULL, cspi_clk[2]) |
| 1178 | _REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk[0]) | 1178 | _REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk[0]) |
| 1179 | _REGISTER_CLOCK(NULL, "csi", csi_clk[0]) | 1179 | _REGISTER_CLOCK(NULL, "csi", csi_clk[0]) |
| 1180 | _REGISTER_CLOCK("imx21-hcd.0", NULL, usb_clk[0]) | 1180 | _REGISTER_CLOCK("imx21-hcd.0", NULL, usb_clk[0]) |