From: Roland Stigge <stigge@antcom.de>
To: arm@kernel.org, linux-arm-kernel@lists.infradead.org,
thierry.reding@avionic-design.de, gregkh@linuxfoundation.org,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-input@vger.kernel.org, dmitry.torokhov@gmail.com,
axel.lin@gmail.com, broonie@opensource.wolfsonmicro.com,
marek.vasut@gmail.com, devel@driverdev.osuosl.org,
kevin.wells@nxp.com, srinivas.bakki@nxp.com
Cc: Roland Stigge <stigge@antcom.de>
Subject: [PATCH v2 3/8] ARM: LPC32xx: clock.c update
Date: Tue, 17 Apr 2012 19:08:22 +0200 [thread overview]
Message-ID: <1334682507-15055-4-git-send-email-stigge@antcom.de> (raw)
In-Reply-To: <1334682507-15055-1-git-send-email-stigge@antcom.de>
Besides switching to the default macro CLKDEV_INIT() for clock registration,
this patch actually updates the clock registrations of pl08xdmac.
Signed-off-by: Roland Stigge <stigge@antcom.de>
---
Applies to v3.4-rc3
--- linux-2.6.orig/arch/arm/mach-lpc32xx/clock.c
+++ linux-2.6/arch/arm/mach-lpc32xx/clock.c
@@ -1095,49 +1095,42 @@ struct clk *clk_get_parent(struct clk *c
}
EXPORT_SYMBOL(clk_get_parent);
-#define _REGISTER_CLOCK(d, n, c) \
- { \
- .dev_id = (d), \
- .con_id = (n), \
- .clk = &(c), \
- },
-
static struct clk_lookup lookups[] = {
- _REGISTER_CLOCK(NULL, "osc_32KHz", osc_32KHz)
- _REGISTER_CLOCK(NULL, "osc_pll397", osc_pll397)
- _REGISTER_CLOCK(NULL, "osc_main", osc_main)
- _REGISTER_CLOCK(NULL, "sys_ck", clk_sys)
- _REGISTER_CLOCK(NULL, "arm_pll_ck", clk_armpll)
- _REGISTER_CLOCK(NULL, "ck_pll5", clk_usbpll)
- _REGISTER_CLOCK(NULL, "hclk_ck", clk_hclk)
- _REGISTER_CLOCK(NULL, "pclk_ck", clk_pclk)
- _REGISTER_CLOCK(NULL, "timer0_ck", clk_timer0)
- _REGISTER_CLOCK(NULL, "timer1_ck", clk_timer1)
- _REGISTER_CLOCK(NULL, "timer2_ck", clk_timer2)
- _REGISTER_CLOCK(NULL, "timer3_ck", clk_timer3)
- _REGISTER_CLOCK(NULL, "vfp9_ck", clk_vfp9)
- _REGISTER_CLOCK(NULL, "clk_dmac", clk_dma)
- _REGISTER_CLOCK("pnx4008-watchdog", NULL, clk_wdt)
- _REGISTER_CLOCK(NULL, "uart3_ck", clk_uart3)
- _REGISTER_CLOCK(NULL, "uart4_ck", clk_uart4)
- _REGISTER_CLOCK(NULL, "uart5_ck", clk_uart5)
- _REGISTER_CLOCK(NULL, "uart6_ck", clk_uart6)
- _REGISTER_CLOCK("pnx-i2c.0", NULL, clk_i2c0)
- _REGISTER_CLOCK("pnx-i2c.1", NULL, clk_i2c1)
- _REGISTER_CLOCK("pnx-i2c.2", NULL, clk_i2c2)
- _REGISTER_CLOCK("dev:ssp0", NULL, clk_ssp0)
- _REGISTER_CLOCK("dev:ssp1", NULL, clk_ssp1)
- _REGISTER_CLOCK("lpc32xx_keys.0", NULL, clk_kscan)
- _REGISTER_CLOCK("lpc32xx-nand.0", "nand_ck", clk_nand)
- _REGISTER_CLOCK("lpc32xx-adc", NULL, clk_adc)
- _REGISTER_CLOCK(NULL, "i2s0_ck", clk_i2s0)
- _REGISTER_CLOCK(NULL, "i2s1_ck", clk_i2s1)
- _REGISTER_CLOCK("ts-lpc32xx", NULL, clk_tsc)
- _REGISTER_CLOCK("dev:mmc0", NULL, clk_mmc)
- _REGISTER_CLOCK("lpc-eth.0", NULL, clk_net)
- _REGISTER_CLOCK("dev:clcd", NULL, clk_lcd)
- _REGISTER_CLOCK("lpc32xx_udc", "ck_usbd", clk_usbd)
- _REGISTER_CLOCK("lpc32xx_rtc", NULL, clk_rtc)
+ CLKDEV_INIT(NULL, "osc_32KHz", &osc_32KHz),
+ CLKDEV_INIT(NULL, "osc_pll397", &osc_pll397),
+ CLKDEV_INIT(NULL, "osc_main", &osc_main),
+ CLKDEV_INIT(NULL, "sys_ck", &clk_sys),
+ CLKDEV_INIT(NULL, "arm_pll_ck", &clk_armpll),
+ CLKDEV_INIT(NULL, "ck_pll5", &clk_usbpll),
+ CLKDEV_INIT(NULL, "hclk_ck", &clk_hclk),
+ CLKDEV_INIT(NULL, "pclk_ck", &clk_pclk),
+ CLKDEV_INIT(NULL, "timer0_ck", &clk_timer0),
+ CLKDEV_INIT(NULL, "timer1_ck", &clk_timer1),
+ CLKDEV_INIT(NULL, "timer2_ck", &clk_timer2),
+ CLKDEV_INIT(NULL, "timer3_ck", &clk_timer3),
+ CLKDEV_INIT(NULL, "vfp9_ck", &clk_vfp9),
+ CLKDEV_INIT("pl08xdmac", NULL, &clk_dma),
+ CLKDEV_INIT("pnx4008-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("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(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("dev:clcd", NULL, &clk_lcd),
+ CLKDEV_INIT("lpc32xx_udc", "ck_usbd", &clk_usbd),
+ CLKDEV_INIT("lpc32xx_rtc", NULL, &clk_rtc),
};
static int __init clk_init(void)
next prev parent reply other threads:[~2012-04-17 17:09 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-17 17:08 [PATCH v2 0/8] Second patchset for LPC32xx device tree conversion Roland Stigge
2012-04-17 17:08 ` [PATCH v2 1/8] ohci-nxp: Driver cleanup Roland Stigge
2012-04-17 20:36 ` Arnd Bergmann
2012-04-17 21:03 ` Roland Stigge
2012-04-17 20:57 ` Dan Carpenter
2012-04-18 8:23 ` Roland Stigge
2012-04-18 4:55 ` Thierry Reding
2012-04-17 17:08 ` [PATCH v2 2/8] ohci-nxp: Device tree support Roland Stigge
2012-04-17 17:08 ` Roland Stigge [this message]
2012-04-17 21:09 ` [PATCH v2 3/8] ARM: LPC32xx: clock.c update Dan Carpenter
2012-04-18 8:33 ` Roland Stigge
2012-04-17 17:08 ` [PATCH v2 4/8] ARM: LPC32xx: Remove obsolete platform Kconfig Roland Stigge
2012-04-17 17:08 ` [PATCH v2 5/8] input: Device tree support for LPC32xx touchscreen Roland Stigge
2012-04-17 17:08 ` [PATCH v2 6/8] iio: lpc32xx-adc: Remove driver conflict due to device tree Roland Stigge
[not found] ` <1334682507-15055-1-git-send-email-stigge-uj/7R2tJ6VmzQB+pC5nmwQ@public.gmane.org>
2012-04-17 17:08 ` [PATCH v2 7/8] ARM: LPC32xx: DTS files for device tree conversion Roland Stigge
[not found] ` <1334682507-15055-8-git-send-email-stigge-uj/7R2tJ6VmzQB+pC5nmwQ@public.gmane.org>
2012-04-18 5:46 ` Thierry Reding
[not found] ` <20120418054615.GB17506-RM9K5IK7kjIyiCvfTdI0JKcOhU4Rzj621B7CTYaBSLdn68oJJulU0Q@public.gmane.org>
2012-04-18 8:10 ` Arnd Bergmann
2012-04-18 8:36 ` Arnd Bergmann
2012-04-17 17:08 ` [PATCH v2 8/8] ARM: LPC32xx: Device tree support Roland Stigge
2012-04-18 6:02 ` Thierry Reding
2012-04-18 8:15 ` Arnd Bergmann
[not found] ` <20120418060230.GC17506-RM9K5IK7kjIyiCvfTdI0JKcOhU4Rzj621B7CTYaBSLdn68oJJulU0Q@public.gmane.org>
2012-04-18 12:30 ` Roland Stigge
2012-04-18 14:01 ` Arnd Bergmann
2012-04-17 20:50 ` [PATCH v2 0/8] Second patchset for LPC32xx device tree conversion Dan Carpenter
2012-04-18 8:00 ` Roland Stigge
2012-04-18 8:06 ` Arnd Bergmann
2012-04-18 9:36 ` Dan Carpenter
2012-04-18 11:00 ` Arnd Bergmann
2012-04-18 12:14 ` Dan Carpenter
2012-04-18 16:56 ` Mark Brown
2012-04-19 14:21 ` Arnd Bergmann
2012-04-18 10:45 ` Mark Brown
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=1334682507-15055-4-git-send-email-stigge@antcom.de \
--to=stigge@antcom.de \
--cc=arm@kernel.org \
--cc=axel.lin@gmail.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=devel@driverdev.osuosl.org \
--cc=dmitry.torokhov@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=kevin.wells@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=marek.vasut@gmail.com \
--cc=srinivas.bakki@nxp.com \
--cc=thierry.reding@avionic-design.de \
/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).