From: stigge@antcom.de (Roland Stigge)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 4/10] ARM: LPC32xx: clock.c registration adjustment
Date: Sat, 21 Apr 2012 11:34:22 +0200 [thread overview]
Message-ID: <1335000868-21974-5-git-send-email-stigge@antcom.de> (raw)
In-Reply-To: <1335000868-21974-1-git-send-email-stigge@antcom.de>
This patch adjusts the clocks of the LPC32xx SoC to be picked up correctly by
the respective drivers.
* AMBA dmaengine
* watchdog
* I2C
* TSC
* MMC
* Ethernet
* ADC
* USB Device
(All except the pl08xdmac AMBA dmaengine via DT generated device name)
Signed-off-by: Roland Stigge <stigge@antcom.de>
---
arch/arm/mach-lpc32xx/clock.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
--- linux-2.6.orig/arch/arm/mach-lpc32xx/clock.c
+++ linux-2.6/arch/arm/mach-lpc32xx/clock.c
@@ -1109,27 +1109,27 @@ static struct clk_lookup lookups[] = {
CLKDEV_INIT(NULL, "timer2_ck", &clk_timer2),
CLKDEV_INIT(NULL, "timer3_ck", &clk_timer3),
CLKDEV_INIT(NULL, "vfp9_ck", &clk_vfp9),
- CLKDEV_INIT(NULL, "clk_dmac", &clk_dma),
- CLKDEV_INIT("pnx4008-watchdog", NULL, &clk_wdt),
+ CLKDEV_INIT("pl08xdmac", NULL, &clk_dma),
+ CLKDEV_INIT("4003c000.watchdog", NULL, &clk_wdt),
CLKDEV_INIT(NULL, "uart3_ck", &clk_uart3),
CLKDEV_INIT(NULL, "uart4_ck", &clk_uart4),
CLKDEV_INIT(NULL, "uart5_ck", &clk_uart5),
CLKDEV_INIT(NULL, "uart6_ck", &clk_uart6),
- CLKDEV_INIT("pnx-i2c.0", NULL, &clk_i2c0),
- CLKDEV_INIT("pnx-i2c.1", NULL, &clk_i2c1),
- CLKDEV_INIT("pnx-i2c.2", NULL, &clk_i2c2),
+ CLKDEV_INIT("400a0000.i2c", NULL, &clk_i2c0),
+ CLKDEV_INIT("400a8000.i2c", NULL, &clk_i2c1),
+ CLKDEV_INIT("31020300.i2c", NULL, &clk_i2c2),
CLKDEV_INIT("dev:ssp0", NULL, &clk_ssp0),
CLKDEV_INIT("dev:ssp1", NULL, &clk_ssp1),
CLKDEV_INIT("lpc32xx_keys.0", NULL, &clk_kscan),
CLKDEV_INIT("lpc32xx-nand.0", "nand_ck", &clk_nand),
- CLKDEV_INIT("lpc32xx-adc", NULL, &clk_adc),
+ CLKDEV_INIT("40048000.adc", NULL, &clk_adc),
CLKDEV_INIT(NULL, "i2s0_ck", &clk_i2s0),
CLKDEV_INIT(NULL, "i2s1_ck", &clk_i2s1),
- CLKDEV_INIT("ts-lpc32xx", NULL, &clk_tsc),
- CLKDEV_INIT("dev:mmc0", NULL, &clk_mmc),
- CLKDEV_INIT("lpc-eth.0", NULL, &clk_net),
+ CLKDEV_INIT("40048000.tsc", NULL, &clk_tsc),
+ CLKDEV_INIT("20098000.sd", NULL, &clk_mmc),
+ CLKDEV_INIT("31060000.ethernet", NULL, &clk_net),
CLKDEV_INIT("dev:clcd", NULL, &clk_lcd),
- CLKDEV_INIT("lpc32xx_udc", "ck_usbd", &clk_usbd),
+ CLKDEV_INIT("31020000.usbd", "ck_usbd", &clk_usbd),
CLKDEV_INIT("lpc32xx_rtc", NULL, &clk_rtc),
};
next prev parent reply other threads:[~2012-04-21 9:34 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-21 9:34 [PATCH v5 0/10] Second patchset for LPC32xx device tree conversion Roland Stigge
2012-04-21 9:34 ` [PATCH v5 1/10] ohci-nxp: Driver cleanup Roland Stigge
2012-04-21 9:34 ` [PATCH v5 2/10] ohci-nxp: Device tree support Roland Stigge
2012-04-21 9:34 ` [PATCH v5 3/10] ARM: LPC32xx: clock.c cleanup Roland Stigge
2012-04-21 9:34 ` Roland Stigge [this message]
2012-04-21 9:34 ` [PATCH v5 5/10] ARM: LPC32xx: Remove obsolete platform Kconfig Roland Stigge
2012-04-21 9:34 ` [PATCH v5 6/10] input: Device tree support for LPC32xx touchscreen Roland Stigge
2012-04-21 9:34 ` [PATCH v5 7/10] iio: lpc32xx-adc: Remove driver conflict due to device tree Roland Stigge
2012-04-21 9:34 ` [PATCH v5 8/10] ARM: LPC32xx: DTS files for device tree conversion Roland Stigge
2012-04-21 9:34 ` [PATCH v5 9/10] ARM: LPC32xx: Device tree support Roland Stigge
2012-04-21 9:34 ` [PATCH v5 10/10] ARM: LPC32xx: Move common code to common.c Roland Stigge
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1335000868-21974-5-git-send-email-stigge@antcom.de \
--to=stigge@antcom.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).