ARM: OMAP2: convert sys_ck and osc_ck to standard clock types
authorTero Kristo <t-kristo@ti.com>
Thu, 20 Feb 2014 17:09:18 +0000 (19:09 +0200)
committerTero Kristo <t-kristo@ti.com>
Wed, 2 Jul 2014 11:26:06 +0000 (14:26 +0300)
osc_ck can be simply defined as a multiplexer clock, and the sys_ck
can be a simple divider.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/cclock2420_data.c
arch/arm/mach-omap2/cclock2430_data.c
arch/arm/mach-omap2/clkt2xxx_osc.c [deleted file]
arch/arm/mach-omap2/clkt2xxx_sys.c [deleted file]
arch/arm/mach-omap2/clock2xxx.h
arch/arm/mach-omap2/cm-regbits-24xx.h
arch/arm/mach-omap2/pm24xx.c

Simple merge
Simple merge
Simple merge
diff --cc arch/arm/mach-omap2/clkt2xxx_osc.c
Simple merge
diff --cc arch/arm/mach-omap2/clkt2xxx_sys.c
Simple merge
Simple merge
Simple merge
Simple merge