Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756551AbYCaIpn (ORCPT ); Mon, 31 Mar 2008 04:45:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756098AbYCaIpG (ORCPT ); Mon, 31 Mar 2008 04:45:06 -0400 Received: from nf-out-0910.google.com ([64.233.182.186]:35092 "EHLO nf-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756069AbYCaIpB (ORCPT ); Mon, 31 Mar 2008 04:45:01 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=date:from:to:cc:subject:message-id:references:mime-version:content-type:content-disposition:in-reply-to:user-agent; b=JJp5afSPgurutZuu+SsommWayKYaYCVwplAlz5Fvh5pMQdgdDneq4Mwn2DnywxgWEXxN/CnKzDx0BPry0msR8SU2mc9/bKTNxzK/4BOk0UPO1gw4qmoWU7lY3u7NW4wUicBB63XyHHkccDF9W/7AiENxKJQ+ZysS+TAj7064LKY= Date: Mon, 31 Mar 2008 12:44:51 +0400 From: Dmitry Baryshkov To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, Haavard Skinnemoen , Russell King , Paul Mundt , pHilipp Zabel , Pavel Machek , tony@atomide.com, paul@pwsan.com Subject: [PATCH 4/6] Clocklib: support ARM pxa sub-arch. Message-ID: <20080331084451.GA11648@doriath.ww600.siemens.net> References: <20080331083947.GA11282@doriath.ww600.siemens.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080331083947.GA11282@doriath.ww600.siemens.net> User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 21011 Lines: 681 Signed-off-by: Dmitry Baryshkov --- arch/arm/Kconfig | 1 + arch/arm/mach-pxa/clock.c | 152 ++++++++++++++++---------------------------- arch/arm/mach-pxa/clock.h | 64 ++++++++---------- arch/arm/mach-pxa/pxa25x.c | 74 +++++++++++++-------- arch/arm/mach-pxa/pxa27x.c | 67 +++++++++++-------- arch/arm/mach-pxa/pxa3xx.c | 132 +++++++++++++++++++++----------------- 6 files changed, 244 insertions(+), 246 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6d78a27..ce2ffe0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -402,6 +402,7 @@ config ARCH_PXA select GENERIC_TIME select GENERIC_CLOCKEVENTS select TICK_ONESHOT + select HAVE_CLOCK_LIB help Support for Intel/Marvell's PXA2xx/PXA3xx processor line. diff --git a/arch/arm/mach-pxa/clock.c b/arch/arm/mach-pxa/clock.c index df5ae27..ba45ec0 100644 --- a/arch/arm/mach-pxa/clock.c +++ b/arch/arm/mach-pxa/clock.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -19,135 +20,92 @@ #include "generic.h" #include "clock.h" -static LIST_HEAD(clocks); -static DEFINE_MUTEX(clocks_mutex); -static DEFINE_SPINLOCK(clocks_lock); - -static struct clk *clk_lookup(struct device *dev, const char *id) +static int clk_gpio11_set_mode(struct clk *clk, bool enable) { - struct clk *p; - - list_for_each_entry(p, &clocks, node) - if (strcmp(id, p->name) == 0 && p->dev == dev) - return p; + if (enable) + pxa_gpio_mode(GPIO11_3_6MHz_MD); - return NULL; + return 0; } -struct clk *clk_get(struct device *dev, const char *id) +static unsigned long clk_gpio11_get_rate(struct clk *clk) { - struct clk *p, *clk = ERR_PTR(-ENOENT); + return 3686400; +} - mutex_lock(&clocks_mutex); - p = clk_lookup(dev, id); - if (!p) - p = clk_lookup(NULL, id); - if (p) - clk = p; - mutex_unlock(&clocks_mutex); +static const struct clk_ops clk_gpio11_ops = { + .get_rate = clk_gpio11_get_rate, + .set_mode = clk_gpio11_set_mode, +}; - return clk; -} -EXPORT_SYMBOL(clk_get); +static struct clk clk_gpio11 = { + .name = "GPIO11_CLK", + .ops = &clk_gpio11_ops, + .owner = THIS_MODULE, +}; -void clk_put(struct clk *clk) -{ -} -EXPORT_SYMBOL(clk_put); +static struct clk clk_3_6MHz= { + .name = "3_6MHz_CLK", + .parent = &clk_gpio11, + .owner = THIS_MODULE, +}; -int clk_enable(struct clk *clk) +int clk_cken_set_mode(struct clk *clk, bool enable) { - unsigned long flags; - - spin_lock_irqsave(&clocks_lock, flags); - if (clk->enabled++ == 0) - clk->ops->enable(clk); - spin_unlock_irqrestore(&clocks_lock, flags); + struct clk_cken *cclk = container_of(clk, struct clk_cken, clk); + int cken = cclk->cken; - if (clk->delay) - udelay(clk->delay); + if (enable) { + CKEN |= 1 << cken; + if (cclk->delay) + udelay(cclk->delay); + } else + CKEN &= ~(1 << cken); return 0; } -EXPORT_SYMBOL(clk_enable); - -void clk_disable(struct clk *clk) -{ - unsigned long flags; - WARN_ON(clk->enabled == 0); +unsigned long clk_cken_get_rate(struct clk *clk) { + struct clk_cken *cclk = container_of(clk, struct clk_cken, clk); - spin_lock_irqsave(&clocks_lock, flags); - if (--clk->enabled == 0) - clk->ops->disable(clk); - spin_unlock_irqrestore(&clocks_lock, flags); + return cclk->rate; } -EXPORT_SYMBOL(clk_disable); - -unsigned long clk_get_rate(struct clk *clk) -{ - unsigned long rate; - - rate = clk->rate; - if (clk->ops->getrate) - rate = clk->ops->getrate(clk); - - return rate; -} -EXPORT_SYMBOL(clk_get_rate); +const struct clk_ops clk_cken_ops = { + .set_mode = clk_cken_set_mode, + .get_rate = clk_cken_get_rate, +}; -static void clk_gpio27_enable(struct clk *clk) +static int clk_dev_can_get(struct clk *clk, struct device *dev) { - pxa_gpio_mode(GPIO11_3_6MHz_MD); -} + struct clk_function *cfunc = container_of(clk, struct clk_function, clk); -static void clk_gpio27_disable(struct clk *clk) -{ + return (dev == cfunc->priv); } -static const struct clkops clk_gpio27_ops = { - .enable = clk_gpio27_enable, - .disable = clk_gpio27_disable, -}; - - -void clk_cken_enable(struct clk *clk) +static int clk_dev_format(struct clk *clk, struct seq_file *s) { - CKEN |= 1 << clk->cken; -} + struct clk_function *cfunc = container_of(clk, struct clk_function, clk); -void clk_cken_disable(struct clk *clk) -{ - CKEN &= ~(1 << clk->cken); + BUG_ON(!cfunc->priv); + + seq_puts(s, " for device "); + seq_puts(s, ((struct device *)cfunc->priv)->bus_id); + return 0; } -const struct clkops clk_cken_ops = { - .enable = clk_cken_enable, - .disable = clk_cken_disable, +const struct clk_ops clk_dev_ops = { + .can_get = clk_dev_can_get, + .format = clk_dev_format, }; -static struct clk common_clks[] = { - { - .name = "GPIO27_CLK", - .ops = &clk_gpio27_ops, - .rate = 3686400, - }, +static struct clk * common_clks[] = { + &clk_gpio11, + &clk_3_6MHz, }; -void clks_register(struct clk *clks, size_t num) -{ - int i; - - mutex_lock(&clocks_mutex); - for (i = 0; i < num; i++) - list_add(&clks[i].node, &clocks); - mutex_unlock(&clocks_mutex); -} - static int __init clk_init(void) { - clks_register(common_clks, ARRAY_SIZE(common_clks)); - return 0; + return clks_register(common_clks, ARRAY_SIZE(common_clks)); } arch_initcall(clk_init); diff --git a/arch/arm/mach-pxa/clock.h b/arch/arm/mach-pxa/clock.h index bc6b77e..0b11d13 100644 --- a/arch/arm/mach-pxa/clock.h +++ b/arch/arm/mach-pxa/clock.h @@ -1,43 +1,37 @@ -struct clk; +#include +#include +#include -struct clkops { - void (*enable)(struct clk *); - void (*disable)(struct clk *); - unsigned long (*getrate)(struct clk *); -}; +extern int clk_cken_set_mode(struct clk *clk, bool enable); +extern unsigned long clk_cken_get_rate(struct clk *clk); +extern const struct clk_ops clk_cken_ops; -struct clk { - struct list_head node; - const char *name; - struct device *dev; - const struct clkops *ops; - unsigned long rate; - unsigned int cken; - unsigned int delay; - unsigned int enabled; +struct clk_cken { + unsigned int cken; + unsigned long rate; + int delay; + struct clk clk; }; -#define INIT_CKEN(_name, _cken, _rate, _delay, _dev) \ - { \ - .name = _name, \ - .dev = _dev, \ - .ops = &clk_cken_ops, \ +#define INIT_CKEN(_name, _cken, _rate, _delay) \ + &(&(struct clk_cken) { \ + .cken = CKEN_##_cken, \ .rate = _rate, \ - .cken = CKEN_##_cken, \ .delay = _delay, \ - } - -#define INIT_CK(_name, _cken, _ops, _dev) \ - { \ - .name = _name, \ - .dev = _dev, \ - .ops = _ops, \ - .cken = CKEN_##_cken, \ - } - -extern const struct clkops clk_cken_ops; + .clk = { \ + .name = _name, \ + .ops = &clk_cken_ops, \ + }, \ + })->clk -void clk_cken_enable(struct clk *clk); -void clk_cken_disable(struct clk *clk); +#define INIT_CK(_name, _cken, _ops) \ + &(&(struct clk_cken) { \ + .cken = CKEN_##_cken, \ + .clk = { \ + .name = _name, \ + .ops = _ops, \ + }, \ + })->clk -void clks_register(struct clk *clks, size_t num); +extern const struct clk_ops clk_dev_ops; +extern const struct clk_ops clk_pxa3xx_cken_ops; diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 599e53f..5924ef1 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c @@ -101,10 +101,9 @@ static unsigned long clk_pxa25x_lcd_getrate(struct clk *clk) return pxa25x_get_memclk_frequency_10khz() * 10000; } -static const struct clkops clk_pxa25x_lcd_ops = { - .enable = clk_cken_enable, - .disable = clk_cken_disable, - .getrate = clk_pxa25x_lcd_getrate, +static const struct clk_ops clk_pxa25x_lcd_ops = { + .set_mode = clk_cken_set_mode, + .get_rate = clk_pxa25x_lcd_getrate, }; /* @@ -112,29 +111,43 @@ static const struct clkops clk_pxa25x_lcd_ops = { * 95.842MHz -> MMC 19.169MHz, I2C 31.949MHz, FICP 47.923MHz, USB 47.923MHz * 147.456MHz -> UART 14.7456MHz, AC97 12.288MHz, I2S 5.672MHz (allegedly) */ -static struct clk pxa25x_hwuart_clk = - INIT_CKEN("UARTCLK", HWUART, 14745600, 1, &pxa_device_hwuart.dev) -; - -static struct clk pxa25x_clks[] = { - INIT_CK("LCDCLK", LCD, &clk_pxa25x_lcd_ops, &pxa_device_fb.dev), - INIT_CKEN("UARTCLK", FFUART, 14745600, 1, &pxa_device_ffuart.dev), - INIT_CKEN("UARTCLK", BTUART, 14745600, 1, &pxa_device_btuart.dev), - INIT_CKEN("UARTCLK", STUART, 14745600, 1, NULL), - INIT_CKEN("UDCCLK", USB, 47923000, 5, &pxa_device_udc.dev), - INIT_CKEN("MMCCLK", MMC, 19169000, 0, &pxa_device_mci.dev), - INIT_CKEN("I2CCLK", I2C, 31949000, 0, &pxa_device_i2c.dev), - - INIT_CKEN("SSPCLK", SSP, 3686400, 0, &pxa25x_device_ssp.dev), - INIT_CKEN("SSPCLK", NSSP, 3686400, 0, &pxa25x_device_nssp.dev), - INIT_CKEN("SSPCLK", ASSP, 3686400, 0, &pxa25x_device_assp.dev), +static struct clk *pxa25x_hwuart_cken_clk = + INIT_CKEN("HWUARTCLK", HWUART, 14745600, 1); + +static struct clk_function pxa25x_hwuart_func = + CLK_FUNC("HWUARTCLK", "UARTCLK", &clk_dev_ops, &pxa_device_hwuart.dev); + + +static struct clk *pxa25x_clks[] = { + INIT_CK("LCDCLK", LCD, &clk_pxa25x_lcd_ops), + INIT_CKEN("FFUARTCLK", FFUART, 14745600, 1), + INIT_CKEN("BTUARTCLK", BTUART, 14745600, 1), + INIT_CKEN("STUARTCLK", STUART, 14745600, 1), + INIT_CKEN("UDCCLK", USB, 47923000, 5), + INIT_CKEN("PXAMMCCLK", MMC, 19169000, 0), + INIT_CKEN("I2CCLK", I2C, 31949000, 0), + + INIT_CKEN("SSP_CLK", SSP, 3686400, 0), + INIT_CKEN("NSSPCLK", NSSP, 3686400, 0), + INIT_CKEN("ASSPCLK", ASSP, 3686400, 0), /* - INIT_CKEN("PWMCLK", PWM0, 3686400, 0, NULL), - INIT_CKEN("PWMCLK", PWM0, 3686400, 0, NULL), - INIT_CKEN("I2SCLK", I2S, 14745600, 0, NULL), + INIT_CKEN("PWMCLK", PWM0, 3686400, 0), + INIT_CKEN("PWMCLK", PWM0, 3686400, 0), + INIT_CKEN("I2SCLK", I2S, 14745600, 0), */ - INIT_CKEN("FICPCLK", FICP, 47923000, 0, NULL), + INIT_CKEN("FICPCLK", FICP, 47923000, 0), +}; + +static struct clk_function pxa25x_clk_funcs[] = { + CLK_FUNC("FFUARTCLK", "UARTCLK", &clk_dev_ops, &pxa_device_ffuart.dev), + CLK_FUNC("BTUARTCLK", "UARTCLK", &clk_dev_ops, &pxa_device_btuart.dev), + CLK_FUNC("STUARTCLK", "UARTCLK", &clk_dev_ops, &pxa_device_stuart.dev), + CLK_FUNC("STUARTCLK", "SIRCLK", NULL, NULL), + CLK_FUNC("PXAMMCCLK", "MMCCLK", &clk_dev_ops, &pxa_device_mci.dev), + CLK_FUNC("SSP_CLK", "SSPCLK", &clk_dev_ops, &pxa25x_device_ssp.dev), + CLK_FUNC("NSSPCLK", "SSPCLK", &clk_dev_ops, &pxa25x_device_nssp.dev), + CLK_FUNC("ASSPCLK", "SSPCLK", &clk_dev_ops, &pxa25x_device_assp.dev), }; #ifdef CONFIG_PM @@ -289,17 +302,22 @@ static struct sys_device pxa25x_sysdev[] = { .cls = &pxa_gpio_sysclass, }, }; - static int __init pxa25x_init(void) { int i, ret = 0; /* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */ - if (cpu_is_pxa25x()) - clks_register(&pxa25x_hwuart_clk, 1); + if (cpu_is_pxa25x()) { + ret = clk_register(pxa25x_hwuart_cken_clk); + if (!ret) + ret = clk_alloc_function( + pxa25x_hwuart_func.parent, + &pxa25x_hwuart_func.clk); + } if (cpu_is_pxa21x() || cpu_is_pxa25x()) { - clks_register(pxa25x_clks, ARRAY_SIZE(pxa25x_clks)); + ret = clks_register(pxa25x_clks, ARRAY_SIZE(pxa25x_clks)); + ret = clk_alloc_functions(pxa25x_clk_funcs, ARRAY_SIZE(pxa25x_clk_funcs)); if ((ret = pxa_init_dma(16))) return ret; diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 46a951c..11a15a6 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c @@ -129,44 +129,54 @@ static unsigned long clk_pxa27x_lcd_getrate(struct clk *clk) return pxa27x_get_lcdclk_frequency_10khz() * 10000; } -static const struct clkops clk_pxa27x_lcd_ops = { - .enable = clk_cken_enable, - .disable = clk_cken_disable, - .getrate = clk_pxa27x_lcd_getrate, +static const struct clk_ops clk_pxa27x_lcd_ops = { + .set_mode = clk_cken_set_mode, + .get_rate = clk_pxa27x_lcd_getrate, }; -static struct clk pxa27x_clks[] = { - INIT_CK("LCDCLK", LCD, &clk_pxa27x_lcd_ops, &pxa_device_fb.dev), - INIT_CK("CAMCLK", CAMERA, &clk_pxa27x_lcd_ops, NULL), +static struct clk *pxa27x_clks[] = { + INIT_CK("LCDCLK", LCD, &clk_pxa27x_lcd_ops), + INIT_CK("CAMCLK", CAMERA, &clk_pxa27x_lcd_ops), - INIT_CKEN("UARTCLK", FFUART, 14857000, 1, &pxa_device_ffuart.dev), - INIT_CKEN("UARTCLK", BTUART, 14857000, 1, &pxa_device_btuart.dev), - INIT_CKEN("UARTCLK", STUART, 14857000, 1, NULL), + INIT_CKEN("FFUARTCLK", FFUART, 14857000, 1), + INIT_CKEN("BTUARTCLK", BTUART, 14857000, 1), + INIT_CKEN("STUARTCLK", STUART, 14857000, 1), - INIT_CKEN("I2SCLK", I2S, 14682000, 0, &pxa_device_i2s.dev), - INIT_CKEN("I2CCLK", I2C, 32842000, 0, &pxa_device_i2c.dev), - INIT_CKEN("UDCCLK", USB, 48000000, 5, &pxa_device_udc.dev), - INIT_CKEN("MMCCLK", MMC, 19500000, 0, &pxa_device_mci.dev), - INIT_CKEN("FICPCLK", FICP, 48000000, 0, &pxa_device_ficp.dev), + INIT_CKEN("I2SCLK", I2S, 14682000, 0), + INIT_CKEN("I2CCLK", I2C, 32842000, 0), + INIT_CKEN("UDCCLK", USB, 48000000, 5), + INIT_CKEN("PXAMMCCLK", MMC, 19500000, 0), + INIT_CKEN("FICPCLK", FICP, 48000000, 0), - INIT_CKEN("USBCLK", USBHOST, 48000000, 0, &pxa27x_device_ohci.dev), - INIT_CKEN("I2CCLK", PWRI2C, 13000000, 0, &pxa27x_device_i2c_power.dev), - INIT_CKEN("KBDCLK", KEYPAD, 32768, 0, NULL), + INIT_CKEN("USBCLK", USBHOST, 48000000, 0), + INIT_CKEN("I2CCLK", PWRI2C, 13000000, 0), + INIT_CKEN("KBDCLK", KEYPAD, 32768, 0), - INIT_CKEN("SSPCLK", SSP1, 13000000, 0, &pxa27x_device_ssp1.dev), - INIT_CKEN("SSPCLK", SSP2, 13000000, 0, &pxa27x_device_ssp2.dev), - INIT_CKEN("SSPCLK", SSP3, 13000000, 0, &pxa27x_device_ssp3.dev), + INIT_CKEN("SSP1CLK", SSP1, 13000000, 0), + INIT_CKEN("SSP2CLK", SSP2, 13000000, 0), + INIT_CKEN("SSP3CLK", SSP3, 13000000, 0), /* - INIT_CKEN("PWMCLK", PWM0, 13000000, 0, NULL), - INIT_CKEN("MSLCLK", MSL, 48000000, 0, NULL), - INIT_CKEN("USIMCLK", USIM, 48000000, 0, NULL), - INIT_CKEN("MSTKCLK", MEMSTK, 19500000, 0, NULL), - INIT_CKEN("IMCLK", IM, 0, 0, NULL), - INIT_CKEN("MEMCLK", MEMC, 0, 0, NULL), + INIT_CKEN("PWMCLK", PWM0, 13000000, 0), + INIT_CKEN("MSLCLK", MSL, 48000000, 0), + INIT_CKEN("USIMCLK", USIM, 48000000, 0), + INIT_CKEN("MSTKCLK", MEMSTK, 19500000, 0), + INIT_CKEN("IMCLK", IM, 0, 0), + INIT_CKEN("MEMCLK", MEMC, 0, 0), */ }; +static struct clk_function pxa27x_clk_funcs[] = { + CLK_FUNC("FFUARTCLK", "UARTCLK", &clk_dev_ops, &pxa_device_ffuart.dev), + CLK_FUNC("BTUARTCLK", "UARTCLK", &clk_dev_ops, &pxa_device_btuart.dev), + CLK_FUNC("STUARTCLK", "UARTCLK", &clk_dev_ops, &pxa_device_stuart.dev), + CLK_FUNC("STUARTCLK", "SIRCLK", NULL, NULL), + CLK_FUNC("PXAMMCCLK", "MMCCLK", &clk_dev_ops, &pxa_device_mci.dev), + CLK_FUNC("SSP1CLK", "SSPCLK", &clk_dev_ops, &pxa27x_device_ssp1.dev), + CLK_FUNC("SSP2CLK", "SSPCLK", &clk_dev_ops, &pxa27x_device_ssp2.dev), + CLK_FUNC("SSP3CLK", "SSPCLK", &clk_dev_ops, &pxa27x_device_ssp3.dev), +}; + #ifdef CONFIG_PM #define SAVE(x) sleep_save[SLEEP_SAVE_##x] = x @@ -401,7 +411,8 @@ static int __init pxa27x_init(void) int i, ret = 0; if (cpu_is_pxa27x()) { - clks_register(pxa27x_clks, ARRAY_SIZE(pxa27x_clks)); + ret = clks_register(pxa27x_clks, ARRAY_SIZE(pxa27x_clks)); + ret = clk_alloc_functions(pxa27x_clk_funcs, ARRAY_SIZE(pxa27x_clk_funcs)); if ((ret = pxa_init_dma(32))) return ret; diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index 35f25fd..7a7cd3c 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c @@ -125,75 +125,90 @@ static unsigned long clk_pxa3xx_hsio_getrate(struct clk *clk) return hsio_clk; } -static void clk_pxa3xx_cken_enable(struct clk *clk) +static int clk_pxa3xx_cken_set_mode(struct clk *clk, bool enable) { - unsigned long mask = 1ul << (clk->cken & 0x1f); - - if (clk->cken < 32) - CKENA |= mask; + struct clk_cken *cclk = container_of(clk, struct clk_cken, clk); + int cken = cclk->cken; + unsigned long mask = 1ul << (cken & 0x1f); + + if (cken < 32) + if (enable) + CKENA |= mask; + else + CKENA &= ~mask; else - CKENB |= mask; -} - -static void clk_pxa3xx_cken_disable(struct clk *clk) -{ - unsigned long mask = 1ul << (clk->cken & 0x1f); + if (enable) + CKENB |= mask; + else + CKENB &= ~mask; - if (clk->cken < 32) - CKENA &= ~mask; - else - CKENB &= ~mask; + return 0; } -static const struct clkops clk_pxa3xx_cken_ops = { - .enable = clk_pxa3xx_cken_enable, - .disable = clk_pxa3xx_cken_disable, +const struct clk_ops clk_pxa3xx_cken_ops = { + .set_mode = clk_pxa3xx_cken_set_mode, + .get_rate = clk_cken_get_rate, }; -static const struct clkops clk_pxa3xx_hsio_ops = { - .enable = clk_pxa3xx_cken_enable, - .disable = clk_pxa3xx_cken_disable, - .getrate = clk_pxa3xx_hsio_getrate, +static const struct clk_ops clk_pxa3xx_hsio_ops = { + .set_mode = clk_pxa3xx_cken_set_mode, + .get_rate = clk_pxa3xx_hsio_getrate, }; -#define PXA3xx_CKEN(_name, _cken, _rate, _delay, _dev) \ - { \ - .name = _name, \ - .dev = _dev, \ - .ops = &clk_pxa3xx_cken_ops, \ +#define PXA3xx_CKEN(_name, _cken, _rate, _delay) \ + &(&(struct clk_cken) { \ + .cken = CKEN_##_cken, \ .rate = _rate, \ - .cken = CKEN_##_cken, \ .delay = _delay, \ - } - -#define PXA3xx_CK(_name, _cken, _ops, _dev) \ - { \ - .name = _name, \ - .dev = _dev, \ - .ops = _ops, \ - .cken = CKEN_##_cken, \ - } - -static struct clk pxa3xx_clks[] = { - PXA3xx_CK("LCDCLK", LCD, &clk_pxa3xx_hsio_ops, &pxa_device_fb.dev), - PXA3xx_CK("CAMCLK", CAMERA, &clk_pxa3xx_hsio_ops, NULL), - - PXA3xx_CKEN("UARTCLK", FFUART, 14857000, 1, &pxa_device_ffuart.dev), - PXA3xx_CKEN("UARTCLK", BTUART, 14857000, 1, &pxa_device_btuart.dev), - PXA3xx_CKEN("UARTCLK", STUART, 14857000, 1, NULL), - - PXA3xx_CKEN("I2CCLK", I2C, 32842000, 0, &pxa_device_i2c.dev), - PXA3xx_CKEN("UDCCLK", UDC, 48000000, 5, &pxa_device_udc.dev), - PXA3xx_CKEN("USBCLK", USBH, 48000000, 0, &pxa27x_device_ohci.dev), - - PXA3xx_CKEN("SSPCLK", SSP1, 13000000, 0, &pxa27x_device_ssp1.dev), - PXA3xx_CKEN("SSPCLK", SSP2, 13000000, 0, &pxa27x_device_ssp2.dev), - PXA3xx_CKEN("SSPCLK", SSP3, 13000000, 0, &pxa27x_device_ssp3.dev), - PXA3xx_CKEN("SSPCLK", SSP4, 13000000, 0, &pxa3xx_device_ssp4.dev), + .clk = { \ + .name = _name, \ + .ops = &clk_pxa3xx_cken_ops, \ + }, \ + })->clk + +#define PXA3xx_CK(_name, _cken, _ops) \ + &(&(struct clk_cken) { \ + .cken = CKEN_##_cken, \ + .clk = { \ + .name = _name, \ + .ops = _ops, \ + }, \ + })->clk + +static struct clk *pxa3xx_clks[] = { + PXA3xx_CK("LCDCLK", LCD, &clk_pxa3xx_hsio_ops), + PXA3xx_CK("CAMCLK", CAMERA, &clk_pxa3xx_hsio_ops), + + PXA3xx_CKEN("FFUARTCLK", FFUART, 14857000, 1), + PXA3xx_CKEN("BTUARTCLK", BTUART, 14857000, 1), + PXA3xx_CKEN("STUARTCLK", STUART, 14857000, 1), + + PXA3xx_CKEN("I2CCLK", I2C, 32842000, 0), + PXA3xx_CKEN("UDCCLK", UDC, 48000000, 5), + PXA3xx_CKEN("USBCLK", USBH, 48000000, 0), + + PXA3xx_CKEN("SSP1CLK", SSP1, 13000000, 0), + PXA3xx_CKEN("SSP2CLK", SSP2, 13000000, 0), + PXA3xx_CKEN("SSP3CLK", SSP3, 13000000, 0), + PXA3xx_CKEN("SSP4CLK", SSP4, 13000000, 0), + + PXA3xx_CKEN("MMC1CLK", MMC1, 19500000, 0), + PXA3xx_CKEN("MMC2CLK", MMC2, 19500000, 0), + PXA3xx_CKEN("MMC3CLK", MMC3, 19500000, 0), +}; - PXA3xx_CKEN("MMCCLK", MMC1, 19500000, 0, &pxa_device_mci.dev), - PXA3xx_CKEN("MMCCLK", MMC2, 19500000, 0, &pxa3xx_device_mci2.dev), - PXA3xx_CKEN("MMCCLK", MMC3, 19500000, 0, &pxa3xx_device_mci3.dev), +static struct clk_function pxa3xx_clk_funcs[] = { + CLK_FUNC("FFUARTCLK", "UARTCLK", &clk_dev_ops, &pxa_device_ffuart.dev), + CLK_FUNC("BTUARTCLK", "UARTCLK", &clk_dev_ops, &pxa_device_btuart.dev), + CLK_FUNC("STUARTCLK", "UARTCLK", &clk_dev_ops, &pxa_device_stuart.dev), + CLK_FUNC("STUARTCLK", "SIRCLK", NULL, NULL), + CLK_FUNC("SSP1CLK", "SSPCLK", &clk_dev_ops, &pxa27x_device_ssp1.dev), + CLK_FUNC("SSP2CLK", "SSPCLK", &clk_dev_ops, &pxa27x_device_ssp2.dev), + CLK_FUNC("SSP3CLK", "SSPCLK", &clk_dev_ops, &pxa27x_device_ssp3.dev), + CLK_FUNC("SSP4CLK", "SSPCLK", &clk_dev_ops, &pxa3xx_device_ssp4.dev), + CLK_FUNC("MMC1CLK", "MMCCLK", &clk_dev_ops, &pxa_device_mci.dev), + CLK_FUNC("MMC2CLK", "MMCCLK", &clk_dev_ops, &pxa3xx_device_mci2.dev), + CLK_FUNC("MMC3CLK", "MMCCLK", &clk_dev_ops, &pxa3xx_device_mci3.dev), }; #ifdef CONFIG_PM @@ -513,7 +528,8 @@ static int __init pxa3xx_init(void) */ ASCR &= ~(ASCR_RDH | ASCR_D1S | ASCR_D2S | ASCR_D3S); - clks_register(pxa3xx_clks, ARRAY_SIZE(pxa3xx_clks)); + ret = clks_register(pxa3xx_clks, ARRAY_SIZE(pxa3xx_clks)); + ret = clk_alloc_functions(pxa3xx_clk_funcs, ARRAY_SIZE(pxa3xx_clk_funcs)); if ((ret = pxa_init_dma(32))) return ret; -- 1.5.4.4 -- With best wishes Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/