diff options
author | Benoit Cousson <b-cousson@ti.com> | 2011-07-10 07:54:12 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2011-07-10 07:54:12 -0400 |
commit | bf1e0776cf5e4ef2622de3a4b63f84175b5b48ab (patch) | |
tree | df9b0b1c02f1f7c4774464bf5ca58d6ca791db9b /arch/arm/mach-omap2/clock44xx_data.c | |
parent | c84584139aaeef7631df152e13cbf319d8e55950 (diff) |
OMAP: omap_device: Create clkdev entry for hwmod main_clk
Extend the existing function to create clkdev for every optional
clocks to add a well one "fck" alias for the main_clk of the
omap_hwmod.
It will allow to remove these static clkdev entries from the
clockXXX_data.c file.
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@ti.com>
Cc: Todd Poynor <toddpoynor@google.com>
[paul@pwsan.com: remove all of the "fck" role clkdev aliases from the
clock data files; fixed error message]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/clock44xx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/clock44xx_data.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c index 257882028492..763507f54339 100644 --- a/arch/arm/mach-omap2/clock44xx_data.c +++ b/arch/arm/mach-omap2/clock44xx_data.c | |||
@@ -3057,12 +3057,12 @@ static struct omap_clk omap44xx_clks[] = { | |||
3057 | CLK(NULL, "gpio6_ick", &gpio6_ick, CK_443X), | 3057 | CLK(NULL, "gpio6_ick", &gpio6_ick, CK_443X), |
3058 | CLK(NULL, "gpmc_ick", &gpmc_ick, CK_443X), | 3058 | CLK(NULL, "gpmc_ick", &gpmc_ick, CK_443X), |
3059 | CLK(NULL, "gpu_fck", &gpu_fck, CK_443X), | 3059 | CLK(NULL, "gpu_fck", &gpu_fck, CK_443X), |
3060 | CLK("omap2_hdq.0", "fck", &hdq1w_fck, CK_443X), | 3060 | CLK(NULL, "hdq1w_fck", &hdq1w_fck, CK_443X), |
3061 | CLK(NULL, "hsi_fck", &hsi_fck, CK_443X), | 3061 | CLK(NULL, "hsi_fck", &hsi_fck, CK_443X), |
3062 | CLK("omap_i2c.1", "fck", &i2c1_fck, CK_443X), | 3062 | CLK(NULL, "i2c1_fck", &i2c1_fck, CK_443X), |
3063 | CLK("omap_i2c.2", "fck", &i2c2_fck, CK_443X), | 3063 | CLK(NULL, "i2c2_fck", &i2c2_fck, CK_443X), |
3064 | CLK("omap_i2c.3", "fck", &i2c3_fck, CK_443X), | 3064 | CLK(NULL, "i2c3_fck", &i2c3_fck, CK_443X), |
3065 | CLK("omap_i2c.4", "fck", &i2c4_fck, CK_443X), | 3065 | CLK(NULL, "i2c4_fck", &i2c4_fck, CK_443X), |
3066 | CLK(NULL, "ipu_fck", &ipu_fck, CK_443X), | 3066 | CLK(NULL, "ipu_fck", &ipu_fck, CK_443X), |
3067 | CLK(NULL, "iss_ctrlclk", &iss_ctrlclk, CK_443X), | 3067 | CLK(NULL, "iss_ctrlclk", &iss_ctrlclk, CK_443X), |
3068 | CLK(NULL, "iss_fck", &iss_fck, CK_443X), | 3068 | CLK(NULL, "iss_fck", &iss_fck, CK_443X), |
@@ -3073,23 +3073,23 @@ static struct omap_clk omap44xx_clks[] = { | |||
3073 | CLK(NULL, "mcasp_sync_mux_ck", &mcasp_sync_mux_ck, CK_443X), | 3073 | CLK(NULL, "mcasp_sync_mux_ck", &mcasp_sync_mux_ck, CK_443X), |
3074 | CLK(NULL, "mcasp_fck", &mcasp_fck, CK_443X), | 3074 | CLK(NULL, "mcasp_fck", &mcasp_fck, CK_443X), |
3075 | CLK(NULL, "mcbsp1_sync_mux_ck", &mcbsp1_sync_mux_ck, CK_443X), | 3075 | CLK(NULL, "mcbsp1_sync_mux_ck", &mcbsp1_sync_mux_ck, CK_443X), |
3076 | CLK("omap-mcbsp.1", "fck", &mcbsp1_fck, CK_443X), | 3076 | CLK(NULL, "mcbsp1_fck", &mcbsp1_fck, CK_443X), |
3077 | CLK(NULL, "mcbsp2_sync_mux_ck", &mcbsp2_sync_mux_ck, CK_443X), | 3077 | CLK(NULL, "mcbsp2_sync_mux_ck", &mcbsp2_sync_mux_ck, CK_443X), |
3078 | CLK("omap-mcbsp.2", "fck", &mcbsp2_fck, CK_443X), | 3078 | CLK(NULL, "mcbsp2_fck", &mcbsp2_fck, CK_443X), |
3079 | CLK(NULL, "mcbsp3_sync_mux_ck", &mcbsp3_sync_mux_ck, CK_443X), | 3079 | CLK(NULL, "mcbsp3_sync_mux_ck", &mcbsp3_sync_mux_ck, CK_443X), |
3080 | CLK("omap-mcbsp.3", "fck", &mcbsp3_fck, CK_443X), | 3080 | CLK(NULL, "mcbsp3_fck", &mcbsp3_fck, CK_443X), |
3081 | CLK(NULL, "mcbsp4_sync_mux_ck", &mcbsp4_sync_mux_ck, CK_443X), | 3081 | CLK(NULL, "mcbsp4_sync_mux_ck", &mcbsp4_sync_mux_ck, CK_443X), |
3082 | CLK("omap-mcbsp.4", "fck", &mcbsp4_fck, CK_443X), | 3082 | CLK(NULL, "mcbsp4_fck", &mcbsp4_fck, CK_443X), |
3083 | CLK(NULL, "mcpdm_fck", &mcpdm_fck, CK_443X), | 3083 | CLK(NULL, "mcpdm_fck", &mcpdm_fck, CK_443X), |
3084 | CLK("omap2_mcspi.1", "fck", &mcspi1_fck, CK_443X), | 3084 | CLK(NULL, "mcspi1_fck", &mcspi1_fck, CK_443X), |
3085 | CLK("omap2_mcspi.2", "fck", &mcspi2_fck, CK_443X), | 3085 | CLK(NULL, "mcspi2_fck", &mcspi2_fck, CK_443X), |
3086 | CLK("omap2_mcspi.3", "fck", &mcspi3_fck, CK_443X), | 3086 | CLK(NULL, "mcspi3_fck", &mcspi3_fck, CK_443X), |
3087 | CLK("omap2_mcspi.4", "fck", &mcspi4_fck, CK_443X), | 3087 | CLK(NULL, "mcspi4_fck", &mcspi4_fck, CK_443X), |
3088 | CLK("omap_hsmmc.0", "fck", &mmc1_fck, CK_443X), | 3088 | CLK(NULL, "mmc1_fck", &mmc1_fck, CK_443X), |
3089 | CLK("omap_hsmmc.1", "fck", &mmc2_fck, CK_443X), | 3089 | CLK(NULL, "mmc2_fck", &mmc2_fck, CK_443X), |
3090 | CLK("omap_hsmmc.2", "fck", &mmc3_fck, CK_443X), | 3090 | CLK(NULL, "mmc3_fck", &mmc3_fck, CK_443X), |
3091 | CLK("omap_hsmmc.3", "fck", &mmc4_fck, CK_443X), | 3091 | CLK(NULL, "mmc4_fck", &mmc4_fck, CK_443X), |
3092 | CLK("omap_hsmmc.4", "fck", &mmc5_fck, CK_443X), | 3092 | CLK(NULL, "mmc5_fck", &mmc5_fck, CK_443X), |
3093 | CLK(NULL, "ocp2scp_usb_phy_phy_48m", &ocp2scp_usb_phy_phy_48m, CK_443X), | 3093 | CLK(NULL, "ocp2scp_usb_phy_phy_48m", &ocp2scp_usb_phy_phy_48m, CK_443X), |
3094 | CLK(NULL, "ocp2scp_usb_phy_ick", &ocp2scp_usb_phy_ick, CK_443X), | 3094 | CLK(NULL, "ocp2scp_usb_phy_ick", &ocp2scp_usb_phy_ick, CK_443X), |
3095 | CLK(NULL, "ocp_wp_noc_ick", &ocp_wp_noc_ick, CK_443X), | 3095 | CLK(NULL, "ocp_wp_noc_ick", &ocp_wp_noc_ick, CK_443X), |
@@ -3146,7 +3146,7 @@ static struct omap_clk omap44xx_clks[] = { | |||
3146 | CLK(NULL, "usim_ck", &usim_ck, CK_443X), | 3146 | CLK(NULL, "usim_ck", &usim_ck, CK_443X), |
3147 | CLK(NULL, "usim_fclk", &usim_fclk, CK_443X), | 3147 | CLK(NULL, "usim_fclk", &usim_fclk, CK_443X), |
3148 | CLK(NULL, "usim_fck", &usim_fck, CK_443X), | 3148 | CLK(NULL, "usim_fck", &usim_fck, CK_443X), |
3149 | CLK("omap_wdt", "fck", &wd_timer2_fck, CK_443X), | 3149 | CLK(NULL, "wd_timer2_fck", &wd_timer2_fck, CK_443X), |
3150 | CLK(NULL, "wd_timer3_fck", &wd_timer3_fck, CK_443X), | 3150 | CLK(NULL, "wd_timer3_fck", &wd_timer3_fck, CK_443X), |
3151 | CLK(NULL, "stm_clk_div_ck", &stm_clk_div_ck, CK_443X), | 3151 | CLK(NULL, "stm_clk_div_ck", &stm_clk_div_ck, CK_443X), |
3152 | CLK(NULL, "trace_clk_div_ck", &trace_clk_div_ck, CK_443X), | 3152 | CLK(NULL, "trace_clk_div_ck", &trace_clk_div_ck, CK_443X), |