common clk support for mxs
Subsystems (4)
v2 cover common clk support for mxs
Changes since v1:
* Follow imx way to save clk pointer returned by registration in an array and ease the error checking and references to these clk pointers later.
* Add global locking to protect register access.
Shawn Guo (8):
clk: mxs: add mxs specific clocks
clk: mxs: add clock support for imx23
clk: mxs: add clock support for imx28
ARM: mxs: request clock for timer
ARM: mxs: change the lookup name for fec phy clock
ARM: mxs: switch to common clk framework
ARM: mxs: remove old clock support
ARM: mxs: remove now unused timer_clk argument from mxs_timer_init
arch/arm/Kconfig | 1 + arch/arm/mach-mxs/Makefile | 5 +- arch/arm/mach-mxs/clock-mx23.c | 536 --------------------- arch/arm/mach-mxs/clock-mx28.c | 803 ------------------------------- arch/arm/mach-mxs/clock.c | 211 -------- arch/arm/mach-mxs/include/mach/clock.h | 62 --- arch/arm/mach-mxs/include/mach/common.h | 6 +- arch/arm/mach-mxs/mach-mx28evk.c | 2 +- arch/arm/mach-mxs/regs-clkctrl-mx23.h | 331 ------------- arch/arm/mach-mxs/regs-clkctrl-mx28.h | 486 ------------------- arch/arm/mach-mxs/system.c | 16 - arch/arm/mach-mxs/timer.c | 11 +- drivers/clk/Makefile | 2 + drivers/clk/mxs/Makefile | 8 + drivers/clk/mxs/clk-div.c | 103 ++++ drivers/clk/mxs/clk-frac.c | 132 +++++ drivers/clk/mxs/clk-imx23.c | 204 ++++++++ drivers/clk/mxs/clk-imx28.c | 328 +++++++++++++ drivers/clk/mxs/clk-pll.c | 109 +++++ drivers/clk/mxs/clk-ref.c | 147 ++++++ drivers/clk/mxs/clk.c | 28 ++ drivers/clk/mxs/clk.h | 66 +++ 22 files changed, 1141 insertions(+), 2456 deletions(-) delete mode 100644 arch/arm/mach-mxs/clock-mx23.c delete mode 100644 arch/arm/mach-mxs/clock-mx28.c delete mode 100644 arch/arm/mach-mxs/clock.c delete mode 100644 arch/arm/mach-mxs/include/mach/clock.h delete mode 100644 arch/arm/mach-mxs/regs-clkctrl-mx23.h delete mode 100644 arch/arm/mach-mxs/regs-clkctrl-mx28.h create mode 100644 drivers/clk/mxs/Makefile create mode 100644 drivers/clk/mxs/clk-div.c create mode 100644 drivers/clk/mxs/clk-frac.c create mode 100644 drivers/clk/mxs/clk-imx23.c create mode 100644 drivers/clk/mxs/clk-imx28.c create mode 100644 drivers/clk/mxs/clk-pll.c create mode 100644 drivers/clk/mxs/clk-ref.c create mode 100644 drivers/clk/mxs/clk.c create mode 100644 drivers/clk/mxs/clk.h
Signature · 1 line
1.7.5.4
PATCH v2 1/8 clk: mxs: add mxs specific clocks
Add mxs specific clocks, pll, reference clock (PFD), integer divider and fractional divider.
--- drivers/clk/mxs/Makefile | 5 ++ drivers/clk/mxs/clk-div.c | 103 +++++++++++++++++++++++++++++++ drivers/clk/mxs/clk-frac.c | 132 +++++++++++++++++++++++++++++++++++++++ drivers/clk/mxs/clk-pll.c | 109 ++++++++++++++++++++++++++++++++ drivers/clk/mxs/clk-ref.c | 147 ++++++++++++++++++++++++++++++++++++++++++++ drivers/clk/mxs/clk.c | 28 ++++++++ drivers/clk/mxs/clk.h | 66 ++++++++++++++++++++ 7 files changed, 590 insertions(+), 0 deletions(-) create mode 100644 drivers/clk/mxs/Makefile create mode 100644 drivers/clk/mxs/clk-div.c create mode 100644 drivers/clk/mxs/clk-frac.c create mode 100644 drivers/clk/mxs/clk-pll.c create mode 100644 drivers/clk/mxs/clk-ref.c create mode 100644 drivers/clk/mxs/clk.c create mode 100644 drivers/clk/mxs/clk.h
drivers/clk/mxs/Makefile new file +5 -0
@@ -0,0 +1,5 @@ +# +# Makefile for mxs specific clk +# + +obj-y += clk.o clk-pll.o clk-ref.o clk-div.o clk-frac.o
drivers/clk/mxs/clk-div.c new file +103 -0
103 lines not on this page · raw message
drivers/clk/mxs/clk-frac.c new file +132 -0
132 lines not on this page · raw message
drivers/clk/mxs/clk-pll.c new file +109 -0
109 lines not on this page · raw message
drivers/clk/mxs/clk-ref.c new file +147 -0
147 lines not on this page · raw message
drivers/clk/mxs/clk.c new file +28 -0
@@ -0,0 +1,28 @@ +/* +* Copyright 2012 Freescale Semiconductor, Inc. +* +* The code contained herein is licensed under the GNU General Public +* License. You may obtain a copy of the GNU General Public License +* Version 2 or later at the following locations: +* +* http://www.opensource.org/licenses/gpl-license.html +* http://www.gnu.org/copyleft/gpl.html +*/ + +#include <linux/err.h> +#include <linux/io.h> +#include <linux/jiffies.h> +#include <linux/spinlock.h> + +DEFINE_SPINLOCK (mxs_lock); + +int mxs_clk_wait (void __iomem *reg,u8 shift) +{ +unsigned long timeout = jiffies +msecs_to_jiffies (10 ); + +while (readl_relaxed (reg) & (1 << shift)) +if (time_after (jiffies, timeout)) +return -ETIMEDOUT ; + +return 0 ; +}
drivers/clk/mxs/clk.h new file +66 -0
66 lines not on this page · raw message
Signature · 1 line
1.7.5.4
PATCH v2 2/8 clk: mxs: add clock support for imx23
In reply to Shawn GuoAdd imx23 clock support based on common clk framework.
--- drivers/clk/mxs/Makefile | 2 + drivers/clk/mxs/clk-imx23.c | 204 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 206 insertions(+), 0 deletions(-) create mode 100644 drivers/clk/mxs/clk-imx23.c
drivers/clk/mxs/Makefile +2 -0
@@ -3,3 +3,5 @@ # obj-y += clk.o clk-pll.o clk-ref.o clk-div.o clk-frac.o + +obj-$(CONFIG_SOC_IMX23) += clk-imx23.o
drivers/clk/mxs/clk-imx23.c new file +204 -0
204 lines not on this page · raw message
Signature · 1 line
1.7.5.4
PATCH v2 3/8 clk: mxs: add clock support for imx28
In reply to Shawn GuoAdd imx28 clock support based on common clk framework.
--- drivers/clk/mxs/Makefile | 1 + drivers/clk/mxs/clk-imx28.c | 328 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 329 insertions(+), 0 deletions(-) create mode 100644 drivers/clk/mxs/clk-imx28.c
drivers/clk/mxs/Makefile +1 -0
@@ -5,3 +5,4 @@ obj-y += clk.o clk-pll.o clk-ref.o clk-div.o clk-frac.o obj-$(CONFIG_SOC_IMX23) += clk-imx23.o +obj-$(CONFIG_SOC_IMX28) += clk-imx28.o
drivers/clk/mxs/clk-imx28.c new file +328 -0
328 lines not on this page · raw message
Signature · 1 line
1.7.5.4
PATCH v2 3/8 clk: mxs: add clock support for imx28
On 04/28/2012 06:02 PM, Shawn Guo wrote:
I know this patch has been already applied, but loading a module which uses clk_get() will result in a NULL pointer deref, because the "struct clk_lookup" are declared as __init_data, have already been freed.
I'm using v3.5-rc3. Is there a upstream fix that I'm missing?
Marc
Quoted 354 lines
Add imx28 clock support based on common clk framework.
Signed-off-by Shawn Guo <[email protected]>--- drivers/clk/mxs/Makefile | 1 + drivers/clk/mxs/clk-imx28.c | 328 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 329 insertions(+), 0 deletions(-) create mode 100644 drivers/clk/mxs/clk-imx28.cdrivers/clk/mxs/Makefile +1
-0@@ -5,3 +5,4 @@ obj-y += clk.o clk-pll.o clk-ref.o clk-div.o clk-frac.o obj-$(CONFIG_SOC_IMX23) += clk-imx23.o +obj-$(CONFIG_SOC_IMX28) += clk-imx28.odrivers/clk/mxs/clk-imx28.c new file +328
-0@@ -0,0 +1,328 @@ +/* +* Copyright 2012 Freescale Semiconductor, Inc. +* +* The code contained herein is licensed under the GNU General Public +* License. You may obtain a copy of the GNU General Public License +* Version 2 or later at the following locations: +* +* http://www.opensource.org/licenses/gpl-license.html +* http://www.gnu.org/copyleft/gpl.html +*/ + +#include <linux/clk.h> +#include <linux/clkdev.h> +#include <linux/err.h> +#include <linux/init.h> +#include <linux/io.h> +#include <mach/common.h> +#include <mach/mx28.h> +#include "clk.h" + +#define CLKCTRL MX28_IO_ADDRESS(MX28_CLKCTRL_BASE_ADDR) +#define PLL0CTRL0 (CLKCTRL + 0x0000) +#define PLL1CTRL0 (CLKCTRL + 0x0020) +#define PLL2CTRL0 (CLKCTRL + 0x0040) +#define CPU (CLKCTRL + 0x0050) +#define HBUS (CLKCTRL + 0x0060) +#define XBUS (CLKCTRL + 0x0070) +#define XTAL (CLKCTRL + 0x0080) +#define SSP0 (CLKCTRL + 0x0090) +#define SSP1 (CLKCTRL + 0x00a0) +#define SSP2 (CLKCTRL + 0x00b0) +#define SSP3 (CLKCTRL + 0x00c0) +#define GPMI (CLKCTRL + 0x00d0) +#define SPDIF (CLKCTRL + 0x00e0) +#define EMI (CLKCTRL + 0x00f0) +#define SAIF0 (CLKCTRL + 0x0100) +#define SAIF1 (CLKCTRL + 0x0110) +#define LCDIF (CLKCTRL + 0x0120) +#define ETM (CLKCTRL + 0x0130) +#define ENET (CLKCTRL + 0x0140) +#define FLEXCAN (CLKCTRL + 0x0160) +#define FRAC0 (CLKCTRL + 0x01b0) +#define FRAC1 (CLKCTRL + 0x01c0) +#define CLKSEQ (CLKCTRL + 0x01d0) + +#define BP_CPU_INTERRUPT_WAIT 12 +#define BP_SAIF_DIV_FRAC_EN 16 +#define BP_ENET_DIV_TIME 21 +#define BP_ENET_SLEEP 31 +#define BP_CLKSEQ_BYPASS_SAIF0 0 +#define BP_CLKSEQ_BYPASS_SSP0 3 +#define BP_FRAC0_IO1FRAC 16 +#define BP_FRAC0_IO0FRAC 24 + +#define DIGCTRL MX28_IO_ADDRESS(MX28_DIGCTL_BASE_ADDR) +#define BP_SAIF_CLKMUX 10 + +/* +* HW_SAIF_CLKMUX_SEL: +* DIRECT(0x0): SAIF0 clock pins selected for SAIF0 input clocks, and SAIF1 +* clock pins selected for SAIF1 input clocks. +* CROSSINPUT(0x1): SAIF1 clock inputs selected for SAIF0 input clocks, and +* SAIF0 clock inputs selected for SAIF1 input clocks. +* EXTMSTR0(0x2): SAIF0 clock pin selected for both SAIF0 and SAIF1 input +* clocks. +* EXTMSTR1(0x3): SAIF1 clock pin selected for both SAIF0 and SAIF1 input +* clocks. +*/ +int mxs_saif_clkmux_select (unsigned int clkmux) +{ +if (clkmux >0x3 ) +return -EINVAL ; + +__mxs_clrl (0x3 <<BP_SAIF_CLKMUX ,DIGCTRL ); +__mxs_setl (clkmux <<BP_SAIF_CLKMUX ,DIGCTRL ); + +return 0 ; +} + +static void __init clk_misc_init (void ) +{ +u32 val; + +/* Gate off cpu clock in WFI for power saving */ +__mxs_setl (1 <<BP_CPU_INTERRUPT_WAIT ,CPU ); + +/* 0 is a bad default value for a divider */ +__mxs_setl (1 <<BP_ENET_DIV_TIME ,ENET ); + +/* Clear BYPASS for SAIF */ +__mxs_clrl (0x3 <<BP_CLKSEQ_BYPASS_SAIF0 ,CLKSEQ ); + +/* SAIF has to use frac div for functional operation */ + val =readl_relaxed (SAIF0 ); + val |=1 <<BP_SAIF_DIV_FRAC_EN ; +writel_relaxed (val,SAIF0 ); + + val =readl_relaxed (SAIF1 ); + val |=1 <<BP_SAIF_DIV_FRAC_EN ; +writel_relaxed (val,SAIF1 ); + +/* Extra fec clock setting */ + val =readl_relaxed (ENET ); + val &= ~(1 <<BP_ENET_SLEEP ); +writel_relaxed (val,ENET ); + +/* +* Source ssp clock from ref_io than ref_xtal, +* as ref_xtal only provides 24 MHz as maximum. +*/ +__mxs_clrl (0xf <<BP_CLKSEQ_BYPASS_SSP0 ,CLKSEQ ); +} + +static struct clk_lookup uart_lookups[]__initdata = { + { .dev_id ="duart" , }, + { .dev_id ="mxs-auart.0" , }, + { .dev_id ="mxs-auart.1" , }, + { .dev_id ="mxs-auart.2" , }, + { .dev_id ="mxs-auart.3" , }, + { .dev_id ="mxs-auart.4" , }, + { .dev_id ="8006a000.serial" , }, + { .dev_id ="8006c000.serial" , }, + { .dev_id ="8006e000.serial" , }, + { .dev_id ="80070000.serial" , }, + { .dev_id ="80072000.serial" , }, + { .dev_id ="80074000.serial" , }, +}; + +static struct clk_lookup hbus_lookups[]__initdata = { + { .dev_id ="mxs-dma-apbh" , }, + { .dev_id ="80004000.dma-apbh" , }, +}; + +static struct clk_lookup xbus_lookups[]__initdata = { + { .dev_id ="duart" , .con_id ="apb_pclk" }, + { .dev_id ="mxs-dma-apbx" , }, + { .dev_id ="80024000.dma-apbx" , }, +}; + +static struct clk_lookup ssp0_lookups[]__initdata = { + { .dev_id ="mxs-mmc.0" , }, + { .dev_id ="80010000.ssp" , }, +}; + +static struct clk_lookup ssp1_lookups[]__initdata = { + { .dev_id ="mxs-mmc.1" , }, + { .dev_id ="80012000.ssp" , }, +}; + +static struct clk_lookup ssp2_lookups[]__initdata = { + { .dev_id ="mxs-mmc.2" , }, + { .dev_id ="80014000.ssp" , }, +}; + +static struct clk_lookup ssp3_lookups[]__initdata = { + { .dev_id ="mxs-mmc.3" , }, + { .dev_id ="80016000.ssp" , }, +}; + +static struct clk_lookup lcdif_lookups[]__initdata = { + { .dev_id ="imx28-fb" , }, + { .dev_id ="80030000.lcdif" , }, +}; + +static struct clk_lookup gpmi_lookups[]__initdata = { + { .dev_id ="imx28-gpmi-nand" , }, + { .dev_id ="8000c000.gpmi" , }, +}; + +static struct clk_lookup fec_lookups[]__initdata = { + { .dev_id ="imx28-fec.0" , }, + { .dev_id ="imx28-fec.1" , }, + { .dev_id ="800f0000.ethernet" , }, + { .dev_id ="800f4000.ethernet" , }, +}; + +static struct clk_lookup can0_lookups[]__initdata = { + { .dev_id ="flexcan.0" , }, + { .dev_id ="80032000.can" , }, +}; + +static struct clk_lookup can1_lookups[]__initdata = { + { .dev_id ="flexcan.1" , }, + { .dev_id ="80034000.can" , }, +}; + +static struct clk_lookup saif0_lookups[]__initdata = { + { .dev_id ="mxs-saif.0" , }, + { .dev_id ="80042000.saif" , }, +}; + +static struct clk_lookup saif1_lookups[]__initdata = { + { .dev_id ="mxs-saif.1" , }, + { .dev_id ="80046000.saif" , }, +}; + +static const char *sel_cpu[]__initconst = {"ref_cpu" ,"ref_xtal" , }; +static const char *sel_io0[]__initconst = {"ref_io0" ,"ref_xtal" , }; +static const char *sel_io1[]__initconst = {"ref_io1" ,"ref_xtal" , }; +static const char *sel_pix[]__initconst = {"ref_pix" ,"ref_xtal" , }; +static const char *sel_gpmi[]__initconst = {"ref_gpmi" ,"ref_xtal" , }; +static const char *sel_pll0[]__initconst = {"pll0" ,"ref_xtal" , }; +static const char *cpu_sels[]__initconst = {"cpu_pll" ,"cpu_xtal" , }; +static const char *emi_sels[]__initconst = {"emi_pll" ,"emi_xtal" , }; +static const char *ptp_sels[]__initconst = {"ref_xtal" ,"pll0" , }; + +enum imx28_clk { + ref_xtal, pll0, pll1, pll2, ref_cpu, ref_emi, ref_io0, ref_io1, + ref_pix, ref_hsadc, ref_gpmi, saif0_sel, saif1_sel, gpmi_sel, + ssp0_sel, ssp1_sel, ssp2_sel, ssp3_sel, emi_sel, etm_sel, + lcdif_sel, cpu, ptp_sel, cpu_pll, cpu_xtal, hbus, xbus, + ssp0_div, ssp1_div, ssp2_div, ssp3_div, gpmi_div, emi_pll, + emi_xtal, lcdif_div, etm_div, ptp, saif0_div, saif1_div, + clk32k_div, rtc, lradc, spdif_div, clk32k, pwm, uart, ssp0, + ssp1, ssp2, ssp3, gpmi, spdif, emi, saif0, saif1, lcdif, etm, + fec, can0, can1, usb0, usb1, usb0_pwr, usb1_pwr, enet_out, + clk_max +}; + +static struct clk *clks[clk_max]; + +static enum imx28_clk clks_init_on[]__initdata = { + cpu, hbus, xbus, emi, uart, +}; + +int __init mx28_clocks_init (void ) +{ +int i; + +clk_misc_init (); + + clks[ref_xtal] =mxs_clk_fixed ("ref_xtal" ,24000000 ); + clks[pll0] =mxs_clk_pll ("pll0" ,"ref_xtal" ,PLL0CTRL0 ,17 ,480000000 ); + clks[pll1] =mxs_clk_pll ("pll1" ,"ref_xtal" ,PLL1CTRL0 ,17 ,480000000 ); + clks[pll2] =mxs_clk_pll ("pll2" ,"ref_xtal" ,PLL2CTRL0 ,23 ,50000000 ); + clks[ref_cpu] =mxs_clk_ref ("ref_cpu" ,"pll0" ,FRAC0 ,0 ); + clks[ref_emi] =mxs_clk_ref ("ref_emi" ,"pll0" ,FRAC0 ,1 ); + clks[ref_io0] =mxs_clk_ref ("ref_io0" ,"pll0" ,FRAC0 ,2 ); + clks[ref_io1] =mxs_clk_ref ("ref_io1" ,"pll0" ,FRAC0 ,3 ); + clks[ref_pix] =mxs_clk_ref ("ref_pix" ,"pll0" ,FRAC1 ,0 ); + clks[ref_hsadc] =mxs_clk_ref ("ref_hsadc" ,"pll0" ,FRAC1 ,1 ); + clks[ref_gpmi] =mxs_clk_ref ("ref_gpmi" ,"pll0" ,FRAC1 ,2 ); + clks[saif0_sel] =mxs_clk_mux ("saif0_sel" ,CLKSEQ ,0 ,1 , sel_pll0,ARRAY_SIZE (sel_pll0)); + clks[saif1_sel] =mxs_clk_mux ("saif1_sel" ,CLKSEQ ,1 ,1 , sel_pll0,ARRAY_SIZE (sel_pll0)); + clks[gpmi_sel] =mxs_clk_mux ("gpmi_sel" ,CLKSEQ ,2 ,1 , sel_gpmi,ARRAY_SIZE (sel_gpmi)); + clks[ssp0_sel] =mxs_clk_mux ("ssp0_sel" ,CLKSEQ ,3 ,1 , sel_io0,ARRAY_SIZE (sel_io0)); + clks[ssp1_sel] =mxs_clk_mux ("ssp1_sel" ,CLKSEQ ,4 ,1 , sel_io0,ARRAY_SIZE (sel_io0)); + clks[ssp2_sel] =mxs_clk_mux ("ssp2_sel" ,CLKSEQ ,5 ,1 , sel_io1,ARRAY_SIZE (sel_io1)); + clks[ssp3_sel] =mxs_clk_mux ("ssp3_sel" ,CLKSEQ ,6 ,1 , sel_io1,ARRAY_SIZE (sel_io1)); + clks[emi_sel] =mxs_clk_mux ("emi_sel" ,CLKSEQ ,7 ,1 , emi_sels,ARRAY_SIZE (emi_sels)); + clks[etm_sel] =mxs_clk_mux ("etm_sel" ,CLKSEQ ,8 ,1 , sel_cpu,ARRAY_SIZE (sel_cpu)); + clks[lcdif_sel] =mxs_clk_mux ("lcdif_sel" ,CLKSEQ ,14 ,1 , sel_pix,ARRAY_SIZE (sel_pix)); + clks[cpu] =mxs_clk_mux ("cpu" ,CLKSEQ ,18 ,1 , cpu_sels,ARRAY_SIZE (cpu_sels)); + clks[ptp_sel] =mxs_clk_mux ("ptp_sel" ,ENET ,19 ,1 , ptp_sels,ARRAY_SIZE (ptp_sels)); + clks[cpu_pll] =mxs_clk_div ("cpu_pll" ,"ref_cpu" ,CPU ,0 ,6 ,28 ); + clks[cpu_xtal] =mxs_clk_div ("cpu_xtal" ,"ref_xtal" ,CPU ,16 ,10 ,29 ); + clks[hbus] =mxs_clk_div ("hbus" ,"cpu" ,HBUS ,0 ,5 ,31 ); + clks[xbus] =mxs_clk_div ("xbus" ,"ref_xtal" ,XBUS ,0 ,10 ,31 ); + clks[ssp0_div] =mxs_clk_div ("ssp0_div" ,"ssp0_sel" ,SSP0 ,0 ,9 ,29 ); + clks[ssp1_div] =mxs_clk_div ("ssp1_div" ,"ssp1_sel" ,SSP1 ,0 ,9 ,29 ); + clks[ssp2_div] =mxs_clk_div ("ssp2_div" ,"ssp2_sel" ,SSP2 ,0 ,9 ,29 ); + clks[ssp3_div] =mxs_clk_div ("ssp3_div" ,"ssp3_sel" ,SSP3 ,0 ,9 ,29 ); + clks[gpmi_div] =mxs_clk_div ("gpmi_div" ,"gpmi_sel" ,GPMI ,0 ,10 ,29 ); + clks[emi_pll] =mxs_clk_div ("emi_pll" ,"ref_emi" ,EMI ,0 ,6 ,28 ); + clks[emi_xtal] =mxs_clk_div ("emi_xtal" ,"ref_xtal" ,EMI ,8 ,4 ,29 ); + clks[lcdif_div] =mxs_clk_div ("lcdif_div" ,"lcdif_sel" ,LCDIF ,0 ,13 ,29 ); + clks[etm_div] =mxs_clk_div ("etm_div" ,"etm_sel" ,ETM ,0 ,7 ,29 ); + clks[ptp] =mxs_clk_div ("ptp" ,"ptp_sel" ,ENET ,21 ,6 ,27 ); + clks[saif0_div] =mxs_clk_frac ("saif0_div" ,"saif0_sel" ,SAIF0 ,0 ,16 ,29 ); + clks[saif1_div] =mxs_clk_frac ("saif1_div" ,"saif1_sel" ,SAIF1 ,0 ,16 ,29 ); + clks[clk32k_div] =mxs_clk_fixed_factor ("clk32k_div" ,"ref_xtal" ,1 ,750 ); + clks[rtc] =mxs_clk_fixed_factor ("rtc" ,"ref_xtal" ,1 ,768 ); + clks[lradc] =mxs_clk_fixed_factor ("lradc" ,"clk32k" ,1 ,16 ); + clks[spdif_div] =mxs_clk_fixed_factor ("spdif_div" ,"pll0" ,1 ,4 ); + clks[clk32k] =mxs_clk_gate ("clk32k" ,"clk32k_div" ,XTAL ,26 ); + clks[pwm] =mxs_clk_gate ("pwm" ,"ref_xtal" ,XTAL ,29 ); + clks[uart] =mxs_clk_gate ("uart" ,"ref_xtal" ,XTAL ,31 ); + clks[ssp0] =mxs_clk_gate ("ssp0" ,"ssp0_div" ,SSP0 ,31 ); + clks[ssp1] =mxs_clk_gate ("ssp1" ,"ssp1_div" ,SSP1 ,31 ); + clks[ssp2] =mxs_clk_gate ("ssp2" ,"ssp2_div" ,SSP2 ,31 ); + clks[ssp3] =mxs_clk_gate ("ssp3" ,"ssp3_div" ,SSP3 ,31 ); + clks[gpmi] =mxs_clk_gate ("gpmi" ,"gpmi_div" ,GPMI ,31 ); + clks[spdif] =mxs_clk_gate ("spdif" ,"spdif_div" ,SPDIF ,31 ); + clks[emi] =mxs_clk_gate ("emi" ,"emi_sel" ,EMI ,31 ); + clks[saif0] =mxs_clk_gate ("saif0" ,"saif0_div" ,SAIF0 ,31 ); + clks[saif1] =mxs_clk_gate ("saif1" ,"saif1_div" ,SAIF1 ,31 ); + clks[lcdif] =mxs_clk_gate ("lcdif" ,"lcdif_div" ,LCDIF ,31 ); + clks[etm] =mxs_clk_gate ("etm" ,"etm_div" ,ETM ,31 ); + clks[fec] =mxs_clk_gate ("fec" ,"hbus" ,ENET ,30 ); + clks[can0] =mxs_clk_gate ("can0" ,"ref_xtal" ,FLEXCAN ,30 ); + clks[can1] =mxs_clk_gate ("can1" ,"ref_xtal" ,FLEXCAN ,28 ); + clks[usb0] =mxs_clk_gate ("usb0" ,"usb0_pwr" ,DIGCTRL ,2 ); + clks[usb1] =mxs_clk_gate ("usb1" ,"usb1_pwr" ,DIGCTRL ,16 ); + clks[usb0_pwr] =clk_register_gate (NULL ,"usb0_pwr" ,"pll0" ,0 ,PLL0CTRL0 ,18 ,0 , &mxs_lock); + clks[usb1_pwr] =clk_register_gate (NULL ,"usb1_pwr" ,"pll1" ,0 ,PLL1CTRL0 ,18 ,0 , &mxs_lock); + clks[enet_out] =clk_register_gate (NULL ,"enet_out" ,"pll2" ,0 ,ENET ,18 ,0 , &mxs_lock); + +for (i =0 ; i <ARRAY_SIZE (clks); i++) +if (IS_ERR (clks[i])) { +pr_err ("i.MX28 clk %d: register failed with %ld\n" , + i,PTR_ERR (clks[i])); +return PTR_ERR (clks[i]); + } + +clk_register_clkdev (clks[clk32k],NULL ,"timrot" ); +clk_register_clkdev (clks[enet_out],NULL ,"enet_out" ); +clk_register_clkdevs (clks[hbus], hbus_lookups,ARRAY_SIZE (hbus_lookups)); +clk_register_clkdevs (clks[xbus], xbus_lookups,ARRAY_SIZE (xbus_lookups)); +clk_register_clkdevs (clks[uart], uart_lookups,ARRAY_SIZE (uart_lookups)); +clk_register_clkdevs (clks[ssp0], ssp0_lookups,ARRAY_SIZE (ssp0_lookups)); +clk_register_clkdevs (clks[ssp1], ssp1_lookups,ARRAY_SIZE (ssp1_lookups)); +clk_register_clkdevs (clks[ssp2], ssp2_lookups,ARRAY_SIZE (ssp2_lookups)); +clk_register_clkdevs (clks[ssp3], ssp3_lookups,ARRAY_SIZE (ssp3_lookups)); +clk_register_clkdevs (clks[gpmi], gpmi_lookups,ARRAY_SIZE (gpmi_lookups)); +clk_register_clkdevs (clks[saif0], saif0_lookups,ARRAY_SIZE (saif0_lookups)); +clk_register_clkdevs (clks[saif1], saif1_lookups,ARRAY_SIZE (saif1_lookups)); +clk_register_clkdevs (clks[lcdif], lcdif_lookups,ARRAY_SIZE (lcdif_lookups)); +clk_register_clkdevs (clks[fec], fec_lookups,ARRAY_SIZE (fec_lookups)); +clk_register_clkdevs (clks[can0], can0_lookups,ARRAY_SIZE (can0_lookups)); +clk_register_clkdevs (clks[can1], can1_lookups,ARRAY_SIZE (can1_lookups)); + +for (i =0 ; i <ARRAY_SIZE (clks_init_on); i++) +clk_prepare_enable (clks[clks_init_on[i]]); + +mxs_timer_init (NULL ,MX28_INT_TIMER0 ); + +return 0 ; +}
Signature · 12 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 262 bytes Desc: OpenPGP digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120621/e61655f0/attachment-0001.sig>
PATCH v2 4/8 ARM: mxs: request clock for timer
In reply to Shawn GuoWhen mxs_timer_init() does not have a timer_clk passed in, it should try to request clock from clkdev system.
--- arch/arm/mach-mxs/timer.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
arch/arm/mach-mxs/timer.c +9 -0
@@ -20,6 +20,7 @@* MA 02110-1301, USA. */ +#include <linux/err.h> #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/clockchips.h>
@@ -245,6 +246,14 @@ static int __init mxs_clocksource_init(struct clk *timer_clk)void __init mxs_timer_init (struct clk *timer_clk,int irq) { +if (!timer_clk) { + timer_clk =clk_get_sys ("timrot" ,NULL ); +if (IS_ERR (timer_clk)) { +pr_err ("%s: failed to get clk\n" , __func__); +return ; + } + } +clk_prepare_enable (timer_clk);/*
Signature · 1 line
1.7.5.4
PATCH v2 5/8 ARM: mxs: change the lookup name for fec phy clock
In reply to Shawn GuoChange the fec phy clock lookup name to be more accurate.
--- arch/arm/mach-mxs/clock-mx28.c | 2 +- arch/arm/mach-mxs/mach-mx28evk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-mxs/clock-mx28.c +1 -1
@@ -624,7 +624,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("mxs-auart.3", NULL, uart_clk) _REGISTER_CLOCK("mxs-auart.4", NULL, uart_clk) _REGISTER_CLOCK("rtc", NULL, rtc_clk) - _REGISTER_CLOCK("pll2", NULL, pll2_clk) + _REGISTER_CLOCK("enet_out", NULL, pll2_clk) _REGISTER_CLOCK("mxs-dma-apbh", NULL, hbus_clk) _REGISTER_CLOCK("mxs-dma-apbx", NULL, xbus_clk)_REGISTER_CLOCK ("mxs-mmc.0" ,NULL , ssp0_clk)
arch/arm/mach-mxs/mach-mx28evk.c +1 -1
@@ -226,7 +226,7 @@ static void __init mx28evk_fec_reset(void)struct clk *clk;/* Enable fec phy clock */ - clk =clk_get_sys ("pll2" ,NULL ); + clk =clk_get_sys ("enet_out" ,NULL );if (!IS_ERR (clk))clk_prepare_enable (clk);
Signature · 1 line
1.7.5.4
PATCH v2 6/8 ARM: mxs: switch to common clk framework
In reply to Shawn GuoIt switches mxs clock support to common clk framework based drivers.
--- arch/arm/Kconfig | 1 + arch/arm/mach-mxs/Makefile | 5 +---- drivers/clk/Makefile | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/Kconfig +1 -0
@@ -468,6 +468,7 @@ config ARCH_MXS select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP select CLKSRC_MMIO + select COMMON_CLK select HAVE_CLK_PREPARE help Support for Freescale MXS-based family of processors
arch/arm/mach-mxs/Makefile +1 -4
@@ -1,12 +1,9 @@ # Common support -obj-y := clock.o devices.o icoll.o iomux.o system.o timer.o mm.o +obj-y := devices.o icoll.o iomux.o system.o timer.o mm.o obj-$(CONFIG_MXS_OCOTP) += ocotp.o obj-$(CONFIG_PM) += pm.o -obj-$(CONFIG_SOC_IMX23) += clock-mx23.o -obj-$(CONFIG_SOC_IMX28) += clock-mx28.o - obj-$(CONFIG_MACH_STMP378X_DEVB) += mach-stmp378x_devb.o obj-$(CONFIG_MACH_MX23EVK) += mach-mx23evk.o obj-$(CONFIG_MACH_MX28EVK) += mach-mx28evk.o
drivers/clk/Makefile +2 -0
@@ -2,3 +2,5 @@ obj-$(CONFIG_CLKDEV_LOOKUP) += clkdev.o obj-$(CONFIG_COMMON_CLK) += clk.o clk-fixed-rate.o clk-gate.o \ clk-mux.o clk-divider.o clk-fixed-factor.o + +obj-$(CONFIG_ARCH_MXS) += mxs/
Signature · 1 line
1.7.5.4
PATCH v2 7/8 ARM: mxs: remove old clock support
In reply to Shawn GuoThe mxs clock has been switched to common clock framework, so the old clock support can be removed now.
--- arch/arm/mach-mxs/clock-mx23.c | 536 --------------------- arch/arm/mach-mxs/clock-mx28.c | 803 ------------------------------- arch/arm/mach-mxs/clock.c | 211 -------- arch/arm/mach-mxs/include/mach/clock.h | 62 --- arch/arm/mach-mxs/include/mach/common.h | 2 - arch/arm/mach-mxs/regs-clkctrl-mx23.h | 331 ------------- arch/arm/mach-mxs/regs-clkctrl-mx28.h | 486 ------------------- arch/arm/mach-mxs/system.c | 16 - 8 files changed, 0 insertions(+), 2447 deletions(-) delete mode 100644 arch/arm/mach-mxs/clock-mx23.c delete mode 100644 arch/arm/mach-mxs/clock-mx28.c delete mode 100644 arch/arm/mach-mxs/clock.c delete mode 100644 arch/arm/mach-mxs/include/mach/clock.h delete mode 100644 arch/arm/mach-mxs/regs-clkctrl-mx23.h delete mode 100644 arch/arm/mach-mxs/regs-clkctrl-mx28.h
arch/arm/mach-mxs/clock-mx23.c deleted +0 -536
@@ -1,536 +0,0 @@ -/* -* Copyright (C) 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#include <linux/mm.h> -#include <linux/delay.h> -#include <linux/clk.h> -#include <linux/io.h> -#include <linux/jiffies.h> -#include <linux/clkdev.h> - -#include <asm/clkdev.h> -#include <asm/div64.h> - -#include <mach/mx23.h> -#include <mach/common.h> -#include <mach/clock.h> - -#include "regs-clkctrl-mx23.h" - -#define CLKCTRL_BASE_ADDR MX23_IO_ADDRESS(MX23_CLKCTRL_BASE_ADDR) -#define DIGCTRL_BASE_ADDR MX23_IO_ADDRESS(MX23_DIGCTL_BASE_ADDR) - -#define PARENT_RATE_SHIFT 8 - -static int _raw_clk_enable (struct clk *clk) -{ -u32 reg; - -if (clk->enable_reg) { - reg =__raw_readl (clk->enable_reg); - reg &= ~(1 << clk->enable_shift); -__raw_writel (reg, clk->enable_reg); - } - -return 0 ; -} - -static void _raw_clk_disable (struct clk *clk) -{ -u32 reg; - -if (clk->enable_reg) { - reg =__raw_readl (clk->enable_reg); - reg |=1 << clk->enable_shift; -__raw_writel (reg, clk->enable_reg); - } -} - -/* -* ref_xtal_clk -*/ -static unsigned long ref_xtal_clk_get_rate (struct clk *clk) -{ -return 24000000 ; -} - -static struct clk ref_xtal_clk = { - .get_rate = ref_xtal_clk_get_rate, -}; - -/* -* pll_clk -*/ -static unsigned long pll_clk_get_rate (struct clk *clk) -{ -return 480000000 ; -} - -static int pll_clk_enable (struct clk *clk) -{ -__raw_writel (BM_CLKCTRL_PLLCTRL0_POWER | -BM_CLKCTRL_PLLCTRL0_EN_USB_CLKS , -CLKCTRL_BASE_ADDR +HW_CLKCTRL_PLLCTRL0_SET ); - -/* Only a 10us delay is need. PLLCTRL1 LOCK bitfied is only a timer -* and is incorrect (excessive). Per definition of the PLLCTRL0 -* POWER field, waiting at least 10us. -*/ -udelay (10 ); - -return 0 ; -} - -static void pll_clk_disable (struct clk *clk) -{ -__raw_writel (BM_CLKCTRL_PLLCTRL0_POWER | -BM_CLKCTRL_PLLCTRL0_EN_USB_CLKS , -CLKCTRL_BASE_ADDR +HW_CLKCTRL_PLLCTRL0_CLR ); -} - -static struct clk pll_clk = { - .get_rate = pll_clk_get_rate, - .enable = pll_clk_enable, - .disable = pll_clk_disable, - .parent = &ref_xtal_clk, -}; - -/* -* ref_clk -*/ -#define _CLK_GET_RATE_REF (name, sr, ss) \ -static unsigned long name##_get_rate(struct clk *clk) \ -{ \ - unsigned long parent_rate; \ - u32 reg, div; \ - \ - reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_##sr); \ - div = (reg >> BP_CLKCTRL_##sr##_##ss##FRAC) & 0x3f; \ - parent_rate = clk_get_rate(clk->parent); \ - \ - return SH_DIV((parent_rate >> PARENT_RATE_SHIFT) * 18, \ - div, PARENT_RATE_SHIFT); \ -} - -_CLK_GET_RATE_REF(ref_cpu_clk, FRAC, CPU) -_CLK_GET_RATE_REF(ref_emi_clk, FRAC, EMI) -_CLK_GET_RATE_REF(ref_pix_clk, FRAC, PIX) -_CLK_GET_RATE_REF(ref_io_clk, FRAC, IO) - -#define _DEFINE_CLOCK_REF (name, er, es) \ - static struct clk name = { \ - .enable_reg = CLKCTRL_BASE_ADDR + HW_CLKCTRL_##er, \ - .enable_shift = BP_CLKCTRL_##er##_CLKGATE##es, \ - .get_rate = name##_get_rate, \ - .enable = _raw_clk_enable, \ - .disable = _raw_clk_disable, \ - .parent = &pll_clk, \ - } - -_DEFINE_CLOCK_REF (ref_cpu_clk,FRAC ,CPU ); -_DEFINE_CLOCK_REF (ref_emi_clk,FRAC ,EMI ); -_DEFINE_CLOCK_REF (ref_pix_clk,FRAC ,PIX ); -_DEFINE_CLOCK_REF (ref_io_clk,FRAC ,IO ); - -/* -* General clocks -* -* clk_get_rate -*/ -static unsigned long rtc_clk_get_rate (struct clk *clk) -{ -/* ref_xtal_clk is implemented as the only parent */ -return clk_get_rate (clk->parent) /768 ; -} - -static unsigned long clk32k_clk_get_rate (struct clk *clk) -{ -return clk->parent->get_rate (clk->parent) /750 ; -} - -#define _CLK_GET_RATE (name, rs) \ -static unsigned long name##_get_rate(struct clk *clk) \ -{ \ - u32 reg, div; \ - \ - reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_##rs); \ - \ - if (clk->parent == &ref_xtal_clk) \ - div = (reg & BM_CLKCTRL_##rs##_DIV_XTAL) >> \ - BP_CLKCTRL_##rs##_DIV_XTAL; \ - else \ - div = (reg & BM_CLKCTRL_##rs##_DIV_##rs) >> \ - BP_CLKCTRL_##rs##_DIV_##rs; \ - \ - if (!div) \ - return -EINVAL; \ - \ - return clk_get_rate(clk->parent) / div; \ -} - -_CLK_GET_RATE(cpu_clk, CPU) -_CLK_GET_RATE(emi_clk, EMI) - -#define _CLK_GET_RATE1 (name, rs) \ -static unsigned long name##_get_rate(struct clk *clk) \ -{ \ - u32 reg, div; \ - \ - reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_##rs); \ - div = (reg & BM_CLKCTRL_##rs##_DIV) >> BP_CLKCTRL_##rs##_DIV; \ - \ - if (!div) \ - return -EINVAL; \ - \ - return clk_get_rate(clk->parent) / div; \ -} - -_CLK_GET_RATE1(hbus_clk, HBUS) -_CLK_GET_RATE1(xbus_clk, XBUS) -_CLK_GET_RATE1(ssp_clk, SSP) -_CLK_GET_RATE1(gpmi_clk, GPMI) -_CLK_GET_RATE1(lcdif_clk, PIX) - -#define _CLK_GET_RATE_STUB (name) \ -static unsigned long name##_get_rate(struct clk *clk) \ -{ \ - return clk_get_rate(clk->parent); \ -} - -_CLK_GET_RATE_STUB (uart_clk) -_CLK_GET_RATE_STUB (audio_clk ) -_CLK_GET_RATE_STUB (pwm_clk) - -/* -* clk_set_rate -*/ -static int cpu_clk_set_rate(struct clk *clk, unsigned long rate) -{ -u32 reg, bm_busy, div_max, d, f, div, frac; -unsigned long diff, parent_rate, calc_rate; - - parent_rate =clk_get_rate (clk->parent); - -if (clk->parent == &ref_xtal_clk) { - div_max =BM_CLKCTRL_CPU_DIV_XTAL >>BP_CLKCTRL_CPU_DIV_XTAL ; - bm_busy =BM_CLKCTRL_CPU_BUSY_REF_XTAL ; - div =DIV_ROUND_UP (parent_rate, rate); -if (div ==0 || div > div_max) -return -EINVAL ; - }else { - div_max =BM_CLKCTRL_CPU_DIV_CPU >>BP_CLKCTRL_CPU_DIV_CPU ; - bm_busy =BM_CLKCTRL_CPU_BUSY_REF_CPU ; - rate >>=PARENT_RATE_SHIFT ; - parent_rate >>=PARENT_RATE_SHIFT ; - diff = parent_rate; - div = frac =1 ; -for (d =1 ; d <= div_max; d++) { - f = parent_rate *18 / d / rate; -if ((parent_rate *18 / d) % rate) - f++; -if (f <18 || f >35 ) -continue ; - - calc_rate = parent_rate *18 / f / d; -if (calc_rate > rate) -continue ; - -if (rate - calc_rate < diff) { - frac = f; - div = d; - diff = rate - calc_rate; - } - -if (diff ==0 ) -break ; - } - -if (diff == parent_rate) -return -EINVAL ; - - reg =__raw_readl (CLKCTRL_BASE_ADDR +HW_CLKCTRL_FRAC ); - reg &= ~BM_CLKCTRL_FRAC_CPUFRAC ; - reg |= frac; -__raw_writel (reg,CLKCTRL_BASE_ADDR +HW_CLKCTRL_FRAC ); - } - - reg =__raw_readl (CLKCTRL_BASE_ADDR +HW_CLKCTRL_CPU ); - reg &= ~BM_CLKCTRL_CPU_DIV_CPU ; - reg |= div <<BP_CLKCTRL_CPU_DIV_CPU ; -__raw_writel (reg,CLKCTRL_BASE_ADDR +HW_CLKCTRL_CPU ); - -mxs_clkctrl_timeout (HW_CLKCTRL_CPU , bm_busy); - -return 0 ; -} - -#define _CLK_SET_RATE (name, dr) \ -static int name##_set_rate(struct clk *clk, unsigned long rate) \ -{ \ - u32 reg, div_max, div; \ - unsigned long parent_rate; \ - \ - parent_rate = clk_get_rate(clk->parent); \ - div_max = BM_CLKCTRL_##dr##_DIV >> BP_CLKCTRL_##dr##_DIV; \ - \ - div = DIV_ROUND_UP(parent_rate, rate); \ - if (div == 0 || div > div_max) \ - return -EINVAL; \ - \ - reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_##dr); \ - reg &= ~BM_CLKCTRL_##dr##_DIV; \ - reg |= div << BP_CLKCTRL_##dr##_DIV; \ - if (reg & (1 << clk->enable_shift)) { \ - pr_err("%s: clock is gated\n", __func__); \ - return -EINVAL; \ - } \ - __raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_##dr); \ - \ - mxs_clkctrl_timeout(HW_CLKCTRL_##dr, BM_CLKCTRL_##dr##_BUSY); \ - return 0; \ -} - -_CLK_SET_RATE(xbus_clk, XBUS) -_CLK_SET_RATE(ssp_clk, SSP) -_CLK_SET_RATE(gpmi_clk, GPMI) -_CLK_SET_RATE(lcdif_clk, PIX) - -#define _CLK_SET_RATE_STUB (name) \ -static int name##_set_rate(struct clk *clk, unsigned long rate) \ -{ \ - return -EINVAL; \ -} - -_CLK_SET_RATE_STUB(emi_clk) -_CLK_SET_RATE_STUB(uart_clk) -_CLK_SET_RATE_STUB(audio_clk) -_CLK_SET_RATE_STUB(pwm_clk) -_CLK_SET_RATE_STUB(clk32k_clk) - -/* - * clk_set_parent - */ -#define _CLK_SET_PARENT(name, bit) \ -static int name##_set_parent(struct clk *clk, struct clk *parent) \ -{ \ - if (parent != clk->parent) { \ - __raw_writel(BM_CLKCTRL_CLKSEQ_BYPASS_##bit, \ - CLKCTRL_BASE_ADDR + HW_CLKCTRL_CLKSEQ_TOG); \ - clk->parent = parent; \ - } \ - \ - return 0; \ -} - -_CLK_SET_PARENT(cpu_clk, CPU) -_CLK_SET_PARENT(emi_clk, EMI) -_CLK_SET_PARENT(ssp_clk, SSP) -_CLK_SET_PARENT(gpmi_clk, GPMI) -_CLK_SET_PARENT(lcdif_clk, PIX) - -#define _CLK_SET_PARENT_STUB(name) \ -static int name##_set_parent(struct clk *clk, struct clk *parent) \ -{ \ - if (parent != clk->parent) \ - return -EINVAL; \ - else \ - return 0; \ -} - -_CLK_SET_PARENT_STUB(uart_clk) -_CLK_SET_PARENT_STUB(audio_clk) -_CLK_SET_PARENT_STUB(pwm_clk) -_CLK_SET_PARENT_STUB(clk32k_clk) - -/* - * clk definition - */ -static struct clk cpu_clk = { - .get_rate = cpu_clk_get_rate, - .set_rate = cpu_clk_set_rate, - .set_parent = cpu_clk_set_parent, - .parent = &ref_cpu_clk, -}; - -static struct clk hbus_clk = { - .get_rate = hbus_clk_get_rate, - .parent = &cpu_clk, -}; - -static struct clk xbus_clk = { - .get_rate = xbus_clk_get_rate, - .set_rate = xbus_clk_set_rate, - .parent = &ref_xtal_clk, -}; - -static struct clk rtc_clk = { - .get_rate = rtc_clk_get_rate, - .parent = &ref_xtal_clk, -}; - -/* usb_clk gate is controlled in DIGCTRL other than CLKCTRL */ -static struct clk usb_clk = { - .enable_reg = DIGCTRL_BASE_ADDR, - .enable_shift = 2, - .enable = _raw_clk_enable, - .disable = _raw_clk_disable, - .parent = &pll_clk, -}; - -#define _DEFINE_CLOCK(name, er, es, p) \ - static struct clk name = { \ - .enable_reg = CLKCTRL_BASE_ADDR + HW_CLKCTRL_##er, \ - .enable_shift = BP_CLKCTRL_##er##_##es, \ - .get_rate = name##_get_rate, \ - .set_rate = name##_set_rate, \ - .set_parent = name##_set_parent, \ - .enable = _raw_clk_enable, \ - .disable = _raw_clk_disable, \ - .parent = p, \ - } - -_DEFINE_CLOCK(emi_clk, EMI, CLKGATE, &ref_xtal_clk); -_DEFINE_CLOCK(ssp_clk, SSP, CLKGATE, &ref_xtal_clk); -_DEFINE_CLOCK(gpmi_clk, GPMI, CLKGATE, &ref_xtal_clk); -_DEFINE_CLOCK(lcdif_clk, PIX, CLKGATE, &ref_xtal_clk); -_DEFINE_CLOCK(uart_clk, XTAL, UART_CLK_GATE, &ref_xtal_clk); -_DEFINE_CLOCK(audio_clk, XTAL, FILT_CLK24M_GATE, &ref_xtal_clk); -_DEFINE_CLOCK(pwm_clk, XTAL, PWM_CLK24M_GATE, &ref_xtal_clk); -_DEFINE_CLOCK(clk32k_clk, XTAL, TIMROT_CLK32K_GATE, &ref_xtal_clk); - -#define _REGISTER_CLOCK(d, n, c) \ - { \ - .dev_id = d, \ - .con_id = n, \ - .clk = &c, \ - }, - -static struct clk_lookup lookups[] = { - /* for amba bus driver */ - _REGISTER_CLOCK("duart", "apb_pclk", xbus_clk) - /* for amba-pl011 driver */ - _REGISTER_CLOCK("duart", NULL, uart_clk) - _REGISTER_CLOCK("mxs-auart.0", NULL, uart_clk) - _REGISTER_CLOCK("rtc", NULL, rtc_clk) - _REGISTER_CLOCK("mxs-dma-apbh", NULL, hbus_clk) - _REGISTER_CLOCK("mxs-dma-apbx", NULL, xbus_clk) - _REGISTER_CLOCK("mxs-mmc.0", NULL, ssp_clk) - _REGISTER_CLOCK("mxs-mmc.1", NULL, ssp_clk) - _REGISTER_CLOCK(NULL, "usb", usb_clk) - _REGISTER_CLOCK(NULL, "audio", audio_clk) - _REGISTER_CLOCK("mxs-pwm.0", NULL, pwm_clk) - _REGISTER_CLOCK("mxs-pwm.1", NULL, pwm_clk) - _REGISTER_CLOCK("mxs-pwm.2", NULL, pwm_clk) - _REGISTER_CLOCK("mxs-pwm.3", NULL, pwm_clk) - _REGISTER_CLOCK("mxs-pwm.4", NULL, pwm_clk) - _REGISTER_CLOCK("imx23-fb", NULL, lcdif_clk) - _REGISTER_CLOCK("imx23-gpmi-nand", NULL, gpmi_clk) -}; - -static int clk_misc_init(void) -{ - u32 reg; - int ret; - - /* Fix up parent per register setting */ - reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_CLKSEQ); - cpu_clk.parent = (reg & BM_CLKCTRL_CLKSEQ_BYPASS_CPU) ? - &ref_xtal_clk : &ref_cpu_clk; - emi_clk.parent = (reg & BM_CLKCTRL_CLKSEQ_BYPASS_EMI) ? - &ref_xtal_clk : &ref_emi_clk; - ssp_clk.parent = (reg & BM_CLKCTRL_CLKSEQ_BYPASS_SSP) ? - &ref_xtal_clk : &ref_io_clk; - gpmi_clk.parent = (reg & BM_CLKCTRL_CLKSEQ_BYPASS_GPMI) ? - &ref_xtal_clk : &ref_io_clk; - lcdif_clk.parent = (reg & BM_CLKCTRL_CLKSEQ_BYPASS_PIX) ? - &ref_xtal_clk : &ref_pix_clk; - - /* Use int div over frac when both are available */ - __raw_writel(BM_CLKCTRL_CPU_DIV_XTAL_FRAC_EN, - CLKCTRL_BASE_ADDR + HW_CLKCTRL_CPU_CLR); - __raw_writel(BM_CLKCTRL_CPU_DIV_CPU_FRAC_EN, - CLKCTRL_BASE_ADDR + HW_CLKCTRL_CPU_CLR); - __raw_writel(BM_CLKCTRL_HBUS_DIV_FRAC_EN, - CLKCTRL_BASE_ADDR + HW_CLKCTRL_HBUS_CLR); - - reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_XBUS); - reg &= ~BM_CLKCTRL_XBUS_DIV_FRAC_EN; - __raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_XBUS); - - reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_SSP); - reg &= ~BM_CLKCTRL_SSP_DIV_FRAC_EN; - __raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_SSP); - - reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_GPMI); - reg &= ~BM_CLKCTRL_GPMI_DIV_FRAC_EN; - __raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_GPMI); - - reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_PIX); - reg &= ~BM_CLKCTRL_PIX_DIV_FRAC_EN; - __raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_PIX); - - /* - * Set safe hbus clock divider. A divider of 3 ensure that - * the Vddd voltage required for the cpu clock is sufficiently - * high for the hbus clock. - */ - reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_HBUS); - reg &= BM_CLKCTRL_HBUS_DIV; - reg |= 3 << BP_CLKCTRL_HBUS_DIV; - __raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_HBUS); - - ret = mxs_clkctrl_timeout(HW_CLKCTRL_HBUS, BM_CLKCTRL_HBUS_BUSY); - - /* Gate off cpu clock in WFI for power saving */ - __raw_writel(BM_CLKCTRL_CPU_INTERRUPT_WAIT, - CLKCTRL_BASE_ADDR + HW_CLKCTRL_CPU_SET); - - /* - * 480 MHz seems too high to be ssp clock source directly, - * so set frac to get a 288 MHz ref_io. - */ - reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_FRAC); - reg &= ~BM_CLKCTRL_FRAC_IOFRAC; - reg |= 30 << BP_CLKCTRL_FRAC_IOFRAC; - __raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_FRAC); - - return ret; -} - -int __init mx23_clocks_init(void) -{ - clk_misc_init(); - - /* - * source ssp clock from ref_io than ref_xtal, - * as ref_xtal only provides 24 MHz as maximum. - */ - clk_set_parent(&ssp_clk, &ref_io_clk); - - clk_prepare_enable(&cpu_clk); - clk_prepare_enable(&hbus_clk); - clk_prepare_enable(&xbus_clk); - clk_prepare_enable(&emi_clk); - clk_prepare_enable(&uart_clk); - - clkdev_add_table(lookups, ARRAY_SIZE(lookups)); - - mxs_timer_init(&clk32k_clk, MX23_INT_TIMER0); - - return 0; -}
arch/arm/mach-mxs/clock-mx28.c deleted +0 -803
803 lines not on this page · raw message
arch/arm/mach-mxs/clock.c deleted +0 -211
211 lines not on this page · raw message
arch/arm/mach-mxs/include/mach/clock.h deleted +0 -62
62 lines not on this page · raw message
arch/arm/mach-mxs/include/mach/common.h +0 -2
@@ -31,6 +31,4 @@ extern void mx28_init_irq(void);extern void icoll_init_irq (void ); -extern int mxs_clkctrl_timeout (unsigned int reg_offset,unsigned int mask); -#endif /* __MACH_MXS_COMMON_H__ */
arch/arm/mach-mxs/regs-clkctrl-mx23.h deleted +0 -331
331 lines not on this page · raw message
arch/arm/mach-mxs/regs-clkctrl-mx28.h deleted +0 -486
486 lines not on this page · raw message
arch/arm/mach-mxs/system.c +0 -16
@@ -37,8 +37,6 @@#define MXS_MODULE_CLKGATE (1 << 30)#define MXS_MODULE_SFTRST (1 << 31) -#define CLKCTRL_TIMEOUT 10/* 10 ms */ -static void __iomem *mxs_clkctrl_reset_addr;/*
@@ -139,17 +137,3 @@ error:return -ETIMEDOUT ; }EXPORT_SYMBOL (mxs_reset_block); - -int mxs_clkctrl_timeout (unsigned int reg_offset,unsigned int mask) -{ -unsigned long timeout = jiffies +msecs_to_jiffies (CLKCTRL_TIMEOUT ); -while (readl_relaxed (MXS_IO_ADDRESS (MXS_CLKCTRL_BASE_ADDR ) - + reg_offset) & mask) { -if (time_after (jiffies, timeout)) { -pr_err ("Timeout@CLKCTRL + 0x%x\n" , reg_offset); -return -ETIMEDOUT ; - } - } - -return 0 ; -}
Signature · 1 line
1.7.5.4
PATCH v2 8/8 ARM: mxs: remove now unused timer_clk argument from mxs_timer_init
In reply to Shawn GuoWith old mxs clock support removed, the timer_clk argument of mxs_timer_init is unused now, so remove it.
--- arch/arm/mach-mxs/include/mach/common.h | 4 +--- arch/arm/mach-mxs/timer.c | 14 +++++++------- drivers/clk/mxs/clk-imx23.c | 2 +- drivers/clk/mxs/clk-imx28.c | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-)
arch/arm/mach-mxs/include/mach/common.h +1 -3
@@ -11,11 +11,9 @@#ifndef __MACH_MXS_COMMON_H__#define __MACH_MXS_COMMON_H__ -struct clk ; -extern const u32 *mxs_get_ocotp (void );extern int mxs_reset_block (void __iomem *); -extern void mxs_timer_init (struct clk *,int ); +extern void mxs_timer_init (int );extern void mxs_restart (char ,const char *);extern int mxs_saif_clkmux_select (unsigned int clkmux);
arch/arm/mach-mxs/timer.c +7 -7
@@ -244,14 +244,14 @@ static int __init mxs_clocksource_init(struct clk *timer_clk)return 0 ; } -void __init mxs_timer_init (struct clk *timer_clk,int irq) +void __init mxs_timer_init (int irq) { -if (!timer_clk) { - timer_clk =clk_get_sys ("timrot" ,NULL ); -if (IS_ERR (timer_clk)) { -pr_err ("%s: failed to get clk\n" , __func__); -return ; - } +struct clk *timer_clk; + + timer_clk =clk_get_sys ("timrot" ,NULL ); +if (IS_ERR (timer_clk)) { +pr_err ("%s: failed to get clk\n" , __func__); +return ; }clk_prepare_enable (timer_clk);
drivers/clk/mxs/clk-imx23.c +1 -1
@@ -198,7 +198,7 @@ int __init mx23_clocks_init(void)for (i =0 ; i <ARRAY_SIZE (clks_init_on); i++)clk_prepare_enable (clks[clks_init_on[i]]); -mxs_timer_init (NULL ,MX23_INT_TIMER0 ); +mxs_timer_init (MX23_INT_TIMER0 );return 0 ; }
drivers/clk/mxs/clk-imx28.c +1 -1
@@ -322,7 +322,7 @@ int __init mx28_clocks_init(void)for (i =0 ; i <ARRAY_SIZE (clks_init_on); i++)clk_prepare_enable (clks[clks_init_on[i]]); -mxs_timer_init (NULL ,MX28_INT_TIMER0 ); +mxs_timer_init (MX28_INT_TIMER0 );return 0 ; }
Signature · 1 line
1.7.5.4