i.MX: remove legacy clock support
Subsystems (3)
Sascha Hauer
maintainerPATCH 1/1 i.MX: remove legacy clock support
This removes the last leftovers from the i.MX legacy clock support. As a bonus we get rid of mach/clock.h
----------------------------------------------------------------
Sascha Hauer (2):
ARM: i.MX clk pllv1: move mxc_decode_pll code to its user
ARM: i.MX remove last leftovers from legacy clock support
arch/arm/mach-imx/Makefile | 2 +- arch/arm/mach-imx/clk-pllv1.c | 49 +++++- arch/arm/mach-imx/clk.c | 3 + arch/arm/mach-imx/clk.h | 3 +- arch/arm/mach-imx/mach-kzm_arm11_01.c | 1 - arch/arm/plat-mxc/Makefile | 2 +- arch/arm/plat-mxc/clock.c | 257 -------------------------------- arch/arm/plat-mxc/cpufreq.c | 1 - arch/arm/plat-mxc/include/mach/clock.h | 70 --------- 9 files changed, 54 insertions(+), 334 deletions(-) create mode 100644 arch/arm/mach-imx/clk.c delete mode 100644 arch/arm/plat-mxc/clock.c delete mode 100644 arch/arm/plat-mxc/include/mach/clock.h
Sascha Hauer
maintainerPATCH 1/2 ARM: i.MX clk pllv1: move mxc_decode_pll code to its user
The only code using mxc_decode_pll is clk-pllv1.c, so move the code there.
--- arch/arm/mach-imx/clk-pllv1.c | 47 +++++++++++++++++++++++++++++++- arch/arm/plat-mxc/clock.c | 45 ------------------------------ arch/arm/plat-mxc/include/mach/clock.h | 2 -- 3 files changed, 46 insertions(+), 48 deletions(-)
arch/arm/mach-imx/clk-pllv1.c +46 -1
@@ -29,8 +29,53 @@ static unsigned long clk_pllv1_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) {struct clk_pllv1 *pll =to_clk_pllv1 (hw); +long long ll; +int mfn_abs; +unsigned int mfi, mfn, mfd, pd; +u32 reg; +unsigned long rate; -return mxc_decode_pll (readl (pll->base), parent_rate); + reg =readl (pll->base); + +/* +* Get the resulting clock rate from a PLL register value and the input +* frequency. PLLs with this register layout can be found on i.MX1, +* i.MX21, i.MX27 and i,MX31 +* +* mfi + mfn / (mfd + 1) +* f = 2 * f_ref * -------------------- +* pd + 1 +*/ + + mfi = (reg >>10 ) &0xf ; + mfn = reg &0x3ff ; + mfd = (reg >>16 ) &0x3ff ; + pd = (reg >>26 ) &0xf ; + + mfi = mfi <=5 ?5 : mfi; + + mfn_abs = mfn; + +/* +* On all i.MXs except i.MX1 and i.MX21 mfn is a 10bit +* 2's complements number +*/ +if (!cpu_is_mx1 () && !cpu_is_mx21 () && mfn >=0x200 ) + mfn_abs =0x400 - mfn; + + rate = parent_rate *2 ; + rate /= pd +1 ; + + ll = (unsigned long long )rate * mfn_abs; + +do_div (ll, mfd +1 ); + +if (!cpu_is_mx1 () && !cpu_is_mx21 () && mfn >=0x200 ) + ll = -ll; + + ll = (rate * mfi) + ll; + +return ll; }struct clk_ops clk_pllv1_ops = {
arch/arm/plat-mxc/clock.c +0 -45
48 lines not on this page · raw message
arch/arm/plat-mxc/include/mach/clock.h +0 -2
@@ -64,7 +64,5 @@ void clk_unregister(struct clk *clk);extern spinlock_t imx_ccm_lock; -unsigned long mxc_decode_pll (unsigned int pll,u32 f_ref); -#endif /* __ASSEMBLY__ */ #endif /* __ASM_ARCH_MXC_CLOCK_H__ */
Signature · 1 line
1.7.10.4
Sascha Hauer
maintainerPATCH 2/2 ARM: i.MX remove last leftovers from legacy clock support
In reply to Sascha HauerThis also removes mach/clock.h along the way
--- arch/arm/mach-imx/Makefile | 2 +- arch/arm/mach-imx/clk-pllv1.c | 2 +- arch/arm/mach-imx/clk.c | 3 + arch/arm/mach-imx/clk.h | 3 +- arch/arm/mach-imx/mach-kzm_arm11_01.c | 1 - arch/arm/plat-mxc/Makefile | 2 +- arch/arm/plat-mxc/clock.c | 212 -------------------------------- arch/arm/plat-mxc/cpufreq.c | 1 - arch/arm/plat-mxc/include/mach/clock.h | 68 ---------- 9 files changed, 8 insertions(+), 286 deletions(-) create mode 100644 arch/arm/mach-imx/clk.c delete mode 100644 arch/arm/plat-mxc/clock.c delete mode 100644 arch/arm/plat-mxc/include/mach/clock.h
arch/arm/mach-imx/Makefile +1 -1
@@ -12,7 +12,7 @@ obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o clk-imx35.o ehci-imx35.o pm-imx obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clk-imx51-imx53.o ehci-imx5.o pm-imx5.o cpu_op-mx51.o obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-gate2.o \ - clk-pfd.o clk-busy.o + clk-pfd.o clk-busy.o clk.o # Support for CMOS sensor interface obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o
arch/arm/mach-imx/clk-pllv1.c +1 -1
@@ -6,7 +6,7 @@#include <linux/err.h> #include <mach/common.h> #include <mach/hardware.h> -#include <mach/clock.h> +#include "clk.h" /**
arch/arm/mach-imx/clk.c new file +3 -0
@@ -0,0 +1,3 @@ +#include <linux/spinlock.h> + +DEFINE_SPINLOCK (imx_ccm_lock);
arch/arm/mach-imx/clk.h +2 -1
@@ -3,7 +3,8 @@#include <linux/spinlock.h> #include <linux/clk-provider.h> -#include <mach/clock.h> + +extern spinlock_t imx_ccm_lock;struct clk *imx_clk_pllv1 (const char *name,const char *parent,void __iomem *base);
arch/arm/mach-imx/mach-kzm_arm11_01.c +0 -1
@@ -36,7 +36,6 @@#include <asm/mach/map.h> #include <asm/mach/time.h> -#include <mach/clock.h> #include <mach/common.h> #include <mach/hardware.h> #include <mach/iomux-mx3.h>
arch/arm/plat-mxc/Makefile +1 -1
@@ -3,7 +3,7 @@ # # Common support -obj-y := clock.o time.o devices.o cpu.o system.o irq-common.o +obj-y := time.o devices.o cpu.o system.o irq-common.o obj-$(CONFIG_MXC_TZIC) += tzic.o obj-$(CONFIG_MXC_AVIC) += avic.o
arch/arm/plat-mxc/clock.c deleted +0 -212
212 lines not on this page · raw message
arch/arm/plat-mxc/cpufreq.c +0 -1
@@ -23,7 +23,6 @@#include <linux/err.h> #include <linux/slab.h> #include <mach/hardware.h> -#include <mach/clock.h> #define CLK32_FREQ 32768#define NANOSECOND (1000 * 1000 * 1000)
arch/arm/plat-mxc/include/mach/clock.h deleted +0 -68
68 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 1/1 i.MX: remove legacy clock support
In reply to Sascha HauerQuoted 8 lines · Sascha Hauer
This removes the last leftovers from the i.MX legacy clock support. As a bonus we get rid of
mach/clock.h----------------------------------------------------------------
Sascha Hauer (2):
ARM: i.MX clk pllv1: movemxc_decode_pllcode to its user
ARM: i.MX remove last leftovers from legacy clock support
Both:
Quoted 14 lines
arch/arm/mach-imx/Makefile | 2 +- arch/arm/mach-imx/clk-pllv1.c | 49 +++++- arch/arm/mach-imx/clk.c | 3 + arch/arm/mach-imx/clk.h | 3 +- arch/arm/mach-imx/mach-kzm_arm11_01.c | 1 - arch/arm/plat-mxc/Makefile | 2 +- arch/arm/plat-mxc/clock.c | 257 -------------------------------- arch/arm/plat-mxc/cpufreq.c | 1 - arch/arm/plat-mxc/include/mach/clock.h | 70 --------- 9 files changed, 54 insertions(+), 334 deletions(-) create mode 100644 arch/arm/mach-imx/clk.c delete mode 100644 arch/arm/plat-mxc/clock.c delete mode 100644 arch/arm/plat-mxc/include/mach/clock.h
PATCH 1/1 i.MX: remove legacy clock support
In reply to Sascha HauerQuoting Sascha Hauer (2012-09-10 23:53:14)
Quoted 8 lines
This removes the last leftovers from the i.MX legacy clock support. As a bonus we get rid of
mach/clock.h----------------------------------------------------------------
Sascha Hauer (2):
ARM: i.MX clk pllv1: movemxc_decode_pllcode to its user
ARM: i.MX remove last leftovers from legacy clock support
Nice! For the series:
Regards,
Mike
Quoted 19 lines
arch/arm/mach-imx/Makefile | 2 +- arch/arm/mach-imx/clk-pllv1.c | 49 +++++- arch/arm/mach-imx/clk.c | 3 + arch/arm/mach-imx/clk.h | 3 +- arch/arm/mach-imx/mach-kzm_arm11_01.c | 1 - arch/arm/plat-mxc/Makefile | 2 +- arch/arm/plat-mxc/clock.c | 257 -------------------------------- arch/arm/plat-mxc/cpufreq.c | 1 - arch/arm/plat-mxc/include/mach/clock.h | 70 --------- 9 files changed, 54 insertions(+), 334 deletions(-) create mode 100644 arch/arm/mach-imx/clk.c delete mode 100644 arch/arm/plat-mxc/clock.c delete mode 100644 arch/arm/plat-mxc/include/mach/clock.h_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel