diff options
Diffstat (limited to 'arch/arm/mach-omap2/clock2430_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock2430_data.c | 26 | 
1 files changed, 25 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock2430_data.c b/arch/arm/mach-omap2/clock2430_data.c index cacabb070e2..22404fe435e 100644 --- a/arch/arm/mach-omap2/clock2430_data.c +++ b/arch/arm/mach-omap2/clock2430_data.c @@ -17,9 +17,9 @@  #include <linux/clk.h>  #include <linux/list.h> -#include <plat/hardware.h>  #include <plat/clkdev_omap.h> +#include "soc.h"  #include "iomap.h"  #include "clock.h"  #include "clock2xxx.h" @@ -1856,6 +1856,7 @@ static struct omap_clk omap2430_clks[] = {  	CLK(NULL,	"func_32k_ck",	&func_32k_ck,	CK_243X),  	CLK(NULL,	"secure_32k_ck", &secure_32k_ck, CK_243X),  	CLK(NULL,	"osc_ck",	&osc_ck,	CK_243X), +	CLK("twl",	"fck",		&osc_ck,	CK_243X),  	CLK(NULL,	"sys_ck",	&sys_ck,	CK_243X),  	CLK(NULL,	"alt_ck",	&alt_ck,	CK_243X),  	CLK(NULL,	"mcbsp_clks",	&mcbsp_clks,	CK_243X), @@ -1887,6 +1888,7 @@ static struct omap_clk omap2430_clks[] = {  	CLK(NULL,	"mdm_osc_ck",	&mdm_osc_ck,	CK_243X),  	/* DSS domain clocks */  	CLK("omapdss_dss",	"ick",		&dss_ick,	CK_243X), +	CLK(NULL,	"dss_ick",		&dss_ick,	CK_243X),  	CLK(NULL,	"dss1_fck",		&dss1_fck,	CK_243X),  	CLK(NULL,	"dss2_fck",	&dss2_fck,	CK_243X),  	CLK(NULL,	"dss_54m_fck",	&dss_54m_fck,	CK_243X), @@ -1926,20 +1928,28 @@ static struct omap_clk omap2430_clks[] = {  	CLK(NULL,	"gpt12_ick",	&gpt12_ick,	CK_243X),  	CLK(NULL,	"gpt12_fck",	&gpt12_fck,	CK_243X),  	CLK("omap-mcbsp.1", "ick",	&mcbsp1_ick,	CK_243X), +	CLK(NULL,	"mcbsp1_ick",	&mcbsp1_ick,	CK_243X),  	CLK(NULL,	"mcbsp1_fck",	&mcbsp1_fck,	CK_243X),  	CLK("omap-mcbsp.2", "ick",	&mcbsp2_ick,	CK_243X), +	CLK(NULL,	"mcbsp2_ick",	&mcbsp2_ick,	CK_243X),  	CLK(NULL,	"mcbsp2_fck",	&mcbsp2_fck,	CK_243X),  	CLK("omap-mcbsp.3", "ick",	&mcbsp3_ick,	CK_243X), +	CLK(NULL,	"mcbsp3_ick",	&mcbsp3_ick,	CK_243X),  	CLK(NULL,	"mcbsp3_fck",	&mcbsp3_fck,	CK_243X),  	CLK("omap-mcbsp.4", "ick",	&mcbsp4_ick,	CK_243X), +	CLK(NULL,	"mcbsp4_ick",	&mcbsp4_ick,	CK_243X),  	CLK(NULL,	"mcbsp4_fck",	&mcbsp4_fck,	CK_243X),  	CLK("omap-mcbsp.5", "ick",	&mcbsp5_ick,	CK_243X), +	CLK(NULL,	"mcbsp5_ick",	&mcbsp5_ick,	CK_243X),  	CLK(NULL,	"mcbsp5_fck",	&mcbsp5_fck,	CK_243X),  	CLK("omap2_mcspi.1", "ick",	&mcspi1_ick,	CK_243X), +	CLK(NULL,	"mcspi1_ick",	&mcspi1_ick,	CK_243X),  	CLK(NULL,	"mcspi1_fck",	&mcspi1_fck,	CK_243X),  	CLK("omap2_mcspi.2", "ick",	&mcspi2_ick,	CK_243X), +	CLK(NULL,	"mcspi2_ick",	&mcspi2_ick,	CK_243X),  	CLK(NULL,	"mcspi2_fck",	&mcspi2_fck,	CK_243X),  	CLK("omap2_mcspi.3", "ick",	&mcspi3_ick,	CK_243X), +	CLK(NULL,	"mcspi3_ick",	&mcspi3_ick,	CK_243X),  	CLK(NULL,	"mcspi3_fck",	&mcspi3_fck,	CK_243X),  	CLK(NULL,	"uart1_ick",	&uart1_ick,	CK_243X),  	CLK(NULL,	"uart1_fck",	&uart1_fck,	CK_243X), @@ -1950,13 +1960,16 @@ static struct omap_clk omap2430_clks[] = {  	CLK(NULL,	"gpios_ick",	&gpios_ick,	CK_243X),  	CLK(NULL,	"gpios_fck",	&gpios_fck,	CK_243X),  	CLK("omap_wdt",	"ick",		&mpu_wdt_ick,	CK_243X), +	CLK(NULL,	"mpu_wdt_ick",	&mpu_wdt_ick,	CK_243X),  	CLK(NULL,	"mpu_wdt_fck",	&mpu_wdt_fck,	CK_243X),  	CLK(NULL,	"sync_32k_ick",	&sync_32k_ick,	CK_243X),  	CLK(NULL,	"wdt1_ick",	&wdt1_ick,	CK_243X),  	CLK(NULL,	"omapctrl_ick",	&omapctrl_ick,	CK_243X),  	CLK(NULL,	"icr_ick",	&icr_ick,	CK_243X),  	CLK("omap24xxcam", "fck",	&cam_fck,	CK_243X), +	CLK(NULL,	"cam_fck",	&cam_fck,	CK_243X),  	CLK("omap24xxcam", "ick",	&cam_ick,	CK_243X), +	CLK(NULL,	"cam_ick",	&cam_ick,	CK_243X),  	CLK(NULL,	"mailboxes_ick", &mailboxes_ick,	CK_243X),  	CLK(NULL,	"wdt4_ick",	&wdt4_ick,	CK_243X),  	CLK(NULL,	"wdt4_fck",	&wdt4_fck,	CK_243X), @@ -1965,10 +1978,14 @@ static struct omap_clk omap2430_clks[] = {  	CLK(NULL,	"fac_ick",	&fac_ick,	CK_243X),  	CLK(NULL,	"fac_fck",	&fac_fck,	CK_243X),  	CLK("omap_hdq.0", "ick",	&hdq_ick,	CK_243X), +	CLK(NULL,	"hdq_ick",	&hdq_ick,	CK_243X),  	CLK("omap_hdq.1", "fck",	&hdq_fck,	CK_243X), +	CLK(NULL,	"hdq_fck",	&hdq_fck,	CK_243X),  	CLK("omap_i2c.1", "ick",	&i2c1_ick,	CK_243X), +	CLK(NULL,	"i2c1_ick",	&i2c1_ick,	CK_243X),  	CLK(NULL,	"i2chs1_fck",	&i2chs1_fck,	CK_243X),  	CLK("omap_i2c.2", "ick",	&i2c2_ick,	CK_243X), +	CLK(NULL,	"i2c2_ick",	&i2c2_ick,	CK_243X),  	CLK(NULL,	"i2chs2_fck",	&i2chs2_fck,	CK_243X),  	CLK(NULL,	"gpmc_fck",	&gpmc_fck,	CK_243X),  	CLK(NULL,	"sdma_fck",	&sdma_fck,	CK_243X), @@ -1977,22 +1994,29 @@ static struct omap_clk omap2430_clks[] = {  	CLK(NULL,	"des_ick",	&des_ick,	CK_243X),  	CLK("omap-sham",	"ick",	&sha_ick,	CK_243X),  	CLK("omap_rng",	"ick",		&rng_ick,	CK_243X), +	CLK(NULL,	"rng_ick",	&rng_ick,	CK_243X),  	CLK("omap-aes",	"ick",	&aes_ick,	CK_243X),  	CLK(NULL,	"pka_ick",	&pka_ick,	CK_243X),  	CLK(NULL,	"usb_fck",	&usb_fck,	CK_243X),  	CLK("musb-omap2430",	"ick",	&usbhs_ick,	CK_243X), +	CLK(NULL,	"usbhs_ick",	&usbhs_ick,	CK_243X),  	CLK("omap_hsmmc.0", "ick",	&mmchs1_ick,	CK_243X), +	CLK(NULL,	"mmchs1_ick",	&mmchs1_ick,	CK_243X),  	CLK(NULL,	"mmchs1_fck",	&mmchs1_fck,	CK_243X),  	CLK("omap_hsmmc.1", "ick",	&mmchs2_ick,	CK_243X), +	CLK(NULL,	"mmchs2_ick",	&mmchs2_ick,	CK_243X),  	CLK(NULL,	"mmchs2_fck",	&mmchs2_fck,	CK_243X),  	CLK(NULL,	"gpio5_ick",	&gpio5_ick,	CK_243X),  	CLK(NULL,	"gpio5_fck",	&gpio5_fck,	CK_243X),  	CLK(NULL,	"mdm_intc_ick",	&mdm_intc_ick,	CK_243X),  	CLK("omap_hsmmc.0", "mmchsdb_fck",	&mmchsdb1_fck,	CK_243X), +	CLK(NULL,	"mmchsdb1_fck",		&mmchsdb1_fck,	CK_243X),  	CLK("omap_hsmmc.1", "mmchsdb_fck",	&mmchsdb2_fck,	CK_243X), +	CLK(NULL,	"mmchsdb2_fck",		&mmchsdb2_fck,	CK_243X),  	CLK(NULL,	"timer_32k_ck",  &func_32k_ck,   CK_243X),  	CLK(NULL,	"timer_sys_ck",	&sys_ck,	CK_243X),  	CLK(NULL,	"timer_ext_ck",	&alt_ck,	CK_243X), +	CLK(NULL,	"cpufreq_ck",	&virt_prcm_set,	CK_243X),  };  /*  |