| Message ID | 1509368685-29112-15-git-send-email-t-kristo@ti.com |
|---|---|
| State | New |
| Headers | show |
| Series | clk: ti: clkctrl fixes and support for additional SoCs | expand |
On Mon, Oct 30, 2017 at 8:06 AM Tero Kristo <t-kristo@ti.com> wrote: > > Most of the clock aliases are no longer needed, only leave the ones > required by OMAP timer code in place. > According to git bisect, this patch seems to break the Ethernet on the AM3517-EVM. I noticed that the mdio clock was removed. The error I am seeing on the AM3517-evm is: davinci_mdio davinci_mdio.0: failed to get device clock davinci_mdio: probe of davinci_mdio.0 failed with error -2 Is there something we need to add to the device tree to correct this? thanks, adam > Signed-off-by: Tero Kristo <t-kristo@ti.com> > --- > drivers/clk/ti/clk-3xxx.c | 263 +--------------------------------------------- > 1 file changed, 2 insertions(+), 261 deletions(-) > > diff --git a/drivers/clk/ti/clk-3xxx.c b/drivers/clk/ti/clk-3xxx.c > index b1251ca..8aa5f57 100644 > --- a/drivers/clk/ti/clk-3xxx.c > +++ b/drivers/clk/ti/clk-3xxx.c > @@ -224,296 +224,43 @@ static void am35xx_clk_ipss_find_idlest(struct clk_hw_omap *clk, > }; > > static struct ti_dt_clk omap3xxx_clks[] = { > - DT_CLK(NULL, "apb_pclk", "dummy_apb_pclk"), > - DT_CLK(NULL, "omap_32k_fck", "omap_32k_fck"), > - DT_CLK(NULL, "virt_12m_ck", "virt_12m_ck"), > - DT_CLK(NULL, "virt_13m_ck", "virt_13m_ck"), > - DT_CLK(NULL, "virt_19200000_ck", "virt_19200000_ck"), > - DT_CLK(NULL, "virt_26000000_ck", "virt_26000000_ck"), > - DT_CLK(NULL, "virt_38_4m_ck", "virt_38_4m_ck"), > - DT_CLK(NULL, "osc_sys_ck", "osc_sys_ck"), > - DT_CLK("twl", "fck", "osc_sys_ck"), > - DT_CLK(NULL, "sys_ck", "sys_ck"), > - DT_CLK(NULL, "omap_96m_alwon_fck", "omap_96m_alwon_fck"), > - DT_CLK("etb", "emu_core_alwon_ck", "emu_core_alwon_ck"), > - DT_CLK(NULL, "sys_altclk", "sys_altclk"), > - DT_CLK(NULL, "sys_clkout1", "sys_clkout1"), > - DT_CLK(NULL, "dpll1_ck", "dpll1_ck"), > - DT_CLK(NULL, "dpll1_x2_ck", "dpll1_x2_ck"), > - DT_CLK(NULL, "dpll1_x2m2_ck", "dpll1_x2m2_ck"), > - DT_CLK(NULL, "dpll3_ck", "dpll3_ck"), > - DT_CLK(NULL, "core_ck", "core_ck"), > - DT_CLK(NULL, "dpll3_x2_ck", "dpll3_x2_ck"), > - DT_CLK(NULL, "dpll3_m2_ck", "dpll3_m2_ck"), > - DT_CLK(NULL, "dpll3_m2x2_ck", "dpll3_m2x2_ck"), > - DT_CLK(NULL, "dpll3_m3_ck", "dpll3_m3_ck"), > - DT_CLK(NULL, "dpll3_m3x2_ck", "dpll3_m3x2_ck"), > - DT_CLK(NULL, "dpll4_ck", "dpll4_ck"), > - DT_CLK(NULL, "dpll4_x2_ck", "dpll4_x2_ck"), > - DT_CLK(NULL, "omap_96m_fck", "omap_96m_fck"), > - DT_CLK(NULL, "cm_96m_fck", "cm_96m_fck"), > - DT_CLK(NULL, "omap_54m_fck", "omap_54m_fck"), > - DT_CLK(NULL, "omap_48m_fck", "omap_48m_fck"), > - DT_CLK(NULL, "omap_12m_fck", "omap_12m_fck"), > - DT_CLK(NULL, "dpll4_m2_ck", "dpll4_m2_ck"), > - DT_CLK(NULL, "dpll4_m2x2_ck", "dpll4_m2x2_ck"), > - DT_CLK(NULL, "dpll4_m3_ck", "dpll4_m3_ck"), > - DT_CLK(NULL, "dpll4_m3x2_ck", "dpll4_m3x2_ck"), > - DT_CLK(NULL, "dpll4_m4_ck", "dpll4_m4_ck"), > - DT_CLK(NULL, "dpll4_m4x2_ck", "dpll4_m4x2_ck"), > - DT_CLK(NULL, "dpll4_m5_ck", "dpll4_m5_ck"), > - DT_CLK(NULL, "dpll4_m5x2_ck", "dpll4_m5x2_ck"), > - DT_CLK(NULL, "dpll4_m6_ck", "dpll4_m6_ck"), > - DT_CLK(NULL, "dpll4_m6x2_ck", "dpll4_m6x2_ck"), > - DT_CLK("etb", "emu_per_alwon_ck", "emu_per_alwon_ck"), > - DT_CLK(NULL, "clkout2_src_ck", "clkout2_src_ck"), > - DT_CLK(NULL, "sys_clkout2", "sys_clkout2"), > - DT_CLK(NULL, "corex2_fck", "corex2_fck"), > - DT_CLK(NULL, "dpll1_fck", "dpll1_fck"), > - DT_CLK(NULL, "mpu_ck", "mpu_ck"), > - DT_CLK(NULL, "arm_fck", "arm_fck"), > - DT_CLK("etb", "emu_mpu_alwon_ck", "emu_mpu_alwon_ck"), > - DT_CLK(NULL, "l3_ick", "l3_ick"), > - DT_CLK(NULL, "l4_ick", "l4_ick"), > - DT_CLK(NULL, "rm_ick", "rm_ick"), > - DT_CLK(NULL, "gpt10_fck", "gpt10_fck"), > - DT_CLK(NULL, "gpt11_fck", "gpt11_fck"), > - DT_CLK(NULL, "core_96m_fck", "core_96m_fck"), > - DT_CLK(NULL, "mmchs2_fck", "mmchs2_fck"), > - DT_CLK(NULL, "mmchs1_fck", "mmchs1_fck"), > - DT_CLK(NULL, "i2c3_fck", "i2c3_fck"), > - DT_CLK(NULL, "i2c2_fck", "i2c2_fck"), > - DT_CLK(NULL, "i2c1_fck", "i2c1_fck"), > - DT_CLK(NULL, "core_48m_fck", "core_48m_fck"), > - DT_CLK(NULL, "mcspi4_fck", "mcspi4_fck"), > - DT_CLK(NULL, "mcspi3_fck", "mcspi3_fck"), > - DT_CLK(NULL, "mcspi2_fck", "mcspi2_fck"), > - DT_CLK(NULL, "mcspi1_fck", "mcspi1_fck"), > - DT_CLK(NULL, "uart2_fck", "uart2_fck"), > - DT_CLK(NULL, "uart1_fck", "uart1_fck"), > - DT_CLK(NULL, "core_12m_fck", "core_12m_fck"), > - DT_CLK("omap_hdq.0", "fck", "hdq_fck"), > - DT_CLK(NULL, "hdq_fck", "hdq_fck"), > - DT_CLK(NULL, "core_l3_ick", "core_l3_ick"), > - DT_CLK(NULL, "sdrc_ick", "sdrc_ick"), > - DT_CLK(NULL, "gpmc_fck", "gpmc_fck"), > - DT_CLK(NULL, "core_l4_ick", "core_l4_ick"), > - DT_CLK("omap_hsmmc.1", "ick", "mmchs2_ick"), > - DT_CLK("omap_hsmmc.0", "ick", "mmchs1_ick"), > - DT_CLK(NULL, "mmchs2_ick", "mmchs2_ick"), > - DT_CLK(NULL, "mmchs1_ick", "mmchs1_ick"), > - DT_CLK("omap_hdq.0", "ick", "hdq_ick"), > - DT_CLK(NULL, "hdq_ick", "hdq_ick"), > - DT_CLK("omap2_mcspi.4", "ick", "mcspi4_ick"), > - DT_CLK("omap2_mcspi.3", "ick", "mcspi3_ick"), > - DT_CLK("omap2_mcspi.2", "ick", "mcspi2_ick"), > - DT_CLK("omap2_mcspi.1", "ick", "mcspi1_ick"), > - DT_CLK(NULL, "mcspi4_ick", "mcspi4_ick"), > - DT_CLK(NULL, "mcspi3_ick", "mcspi3_ick"), > - DT_CLK(NULL, "mcspi2_ick", "mcspi2_ick"), > - DT_CLK(NULL, "mcspi1_ick", "mcspi1_ick"), > - DT_CLK("omap_i2c.3", "ick", "i2c3_ick"), > - DT_CLK("omap_i2c.2", "ick", "i2c2_ick"), > - DT_CLK("omap_i2c.1", "ick", "i2c1_ick"), > - DT_CLK(NULL, "i2c3_ick", "i2c3_ick"), > - DT_CLK(NULL, "i2c2_ick", "i2c2_ick"), > - DT_CLK(NULL, "i2c1_ick", "i2c1_ick"), > - DT_CLK(NULL, "uart2_ick", "uart2_ick"), > - DT_CLK(NULL, "uart1_ick", "uart1_ick"), > - DT_CLK(NULL, "gpt11_ick", "gpt11_ick"), > - DT_CLK(NULL, "gpt10_ick", "gpt10_ick"), > - DT_CLK(NULL, "omapctrl_ick", "omapctrl_ick"), > - DT_CLK(NULL, "dss_tv_fck", "dss_tv_fck"), > - DT_CLK(NULL, "dss_96m_fck", "dss_96m_fck"), > - DT_CLK(NULL, "dss2_alwon_fck", "dss2_alwon_fck"), > - DT_CLK(NULL, "init_60m_fclk", "dummy_ck"), > - DT_CLK(NULL, "gpt1_fck", "gpt1_fck"), > - DT_CLK(NULL, "aes2_ick", "aes2_ick"), > - DT_CLK(NULL, "wkup_32k_fck", "wkup_32k_fck"), > - DT_CLK(NULL, "gpio1_dbck", "gpio1_dbck"), > - DT_CLK(NULL, "sha12_ick", "sha12_ick"), > - DT_CLK(NULL, "wdt2_fck", "wdt2_fck"), > - DT_CLK("omap_wdt", "ick", "wdt2_ick"), > - DT_CLK(NULL, "wdt2_ick", "wdt2_ick"), > - DT_CLK(NULL, "wdt1_ick", "wdt1_ick"), > - DT_CLK(NULL, "gpio1_ick", "gpio1_ick"), > - DT_CLK(NULL, "omap_32ksync_ick", "omap_32ksync_ick"), > - DT_CLK(NULL, "gpt12_ick", "gpt12_ick"), > - DT_CLK(NULL, "gpt1_ick", "gpt1_ick"), > - DT_CLK(NULL, "per_96m_fck", "per_96m_fck"), > - DT_CLK(NULL, "per_48m_fck", "per_48m_fck"), > - DT_CLK(NULL, "uart3_fck", "uart3_fck"), > - DT_CLK(NULL, "gpt2_fck", "gpt2_fck"), > - DT_CLK(NULL, "gpt3_fck", "gpt3_fck"), > - DT_CLK(NULL, "gpt4_fck", "gpt4_fck"), > - DT_CLK(NULL, "gpt5_fck", "gpt5_fck"), > - DT_CLK(NULL, "gpt6_fck", "gpt6_fck"), > - DT_CLK(NULL, "gpt7_fck", "gpt7_fck"), > - DT_CLK(NULL, "gpt8_fck", "gpt8_fck"), > - DT_CLK(NULL, "gpt9_fck", "gpt9_fck"), > - DT_CLK(NULL, "per_32k_alwon_fck", "per_32k_alwon_fck"), > - DT_CLK(NULL, "gpio6_dbck", "gpio6_dbck"), > - DT_CLK(NULL, "gpio5_dbck", "gpio5_dbck"), > - DT_CLK(NULL, "gpio4_dbck", "gpio4_dbck"), > - DT_CLK(NULL, "gpio3_dbck", "gpio3_dbck"), > - DT_CLK(NULL, "gpio2_dbck", "gpio2_dbck"), > - DT_CLK(NULL, "wdt3_fck", "wdt3_fck"), > - DT_CLK(NULL, "per_l4_ick", "per_l4_ick"), > - DT_CLK(NULL, "gpio6_ick", "gpio6_ick"), > - DT_CLK(NULL, "gpio5_ick", "gpio5_ick"), > - DT_CLK(NULL, "gpio4_ick", "gpio4_ick"), > - DT_CLK(NULL, "gpio3_ick", "gpio3_ick"), > - DT_CLK(NULL, "gpio2_ick", "gpio2_ick"), > - DT_CLK(NULL, "wdt3_ick", "wdt3_ick"), > - DT_CLK(NULL, "uart3_ick", "uart3_ick"), > - DT_CLK(NULL, "gpt9_ick", "gpt9_ick"), > - DT_CLK(NULL, "gpt8_ick", "gpt8_ick"), > - DT_CLK(NULL, "gpt7_ick", "gpt7_ick"), > - DT_CLK(NULL, "gpt6_ick", "gpt6_ick"), > - DT_CLK(NULL, "gpt5_ick", "gpt5_ick"), > - DT_CLK(NULL, "gpt4_ick", "gpt4_ick"), > - DT_CLK(NULL, "gpt3_ick", "gpt3_ick"), > - DT_CLK(NULL, "gpt2_ick", "gpt2_ick"), > - DT_CLK(NULL, "mcbsp_clks", "mcbsp_clks"), > - DT_CLK(NULL, "mcbsp1_ick", "mcbsp1_ick"), > - DT_CLK(NULL, "mcbsp2_ick", "mcbsp2_ick"), > - DT_CLK(NULL, "mcbsp3_ick", "mcbsp3_ick"), > - DT_CLK(NULL, "mcbsp4_ick", "mcbsp4_ick"), > - DT_CLK(NULL, "mcbsp5_ick", "mcbsp5_ick"), > - DT_CLK(NULL, "mcbsp1_fck", "mcbsp1_fck"), > - DT_CLK(NULL, "mcbsp2_fck", "mcbsp2_fck"), > - DT_CLK(NULL, "mcbsp3_fck", "mcbsp3_fck"), > - DT_CLK(NULL, "mcbsp4_fck", "mcbsp4_fck"), > - DT_CLK(NULL, "mcbsp5_fck", "mcbsp5_fck"), > - DT_CLK("etb", "emu_src_ck", "emu_src_ck"), > - DT_CLK(NULL, "emu_src_ck", "emu_src_ck"), > - DT_CLK(NULL, "pclk_fck", "pclk_fck"), > - DT_CLK(NULL, "pclkx2_fck", "pclkx2_fck"), > - DT_CLK(NULL, "atclk_fck", "atclk_fck"), > - DT_CLK(NULL, "traceclk_src_fck", "traceclk_src_fck"), > - DT_CLK(NULL, "traceclk_fck", "traceclk_fck"), > - DT_CLK(NULL, "secure_32k_fck", "secure_32k_fck"), > - DT_CLK(NULL, "gpt12_fck", "gpt12_fck"), > - DT_CLK(NULL, "wdt1_fck", "wdt1_fck"), > DT_CLK(NULL, "timer_32k_ck", "omap_32k_fck"), > DT_CLK(NULL, "timer_sys_ck", "sys_ck"), > - DT_CLK(NULL, "cpufreq_ck", "dpll1_ck"), > - { .node_name = NULL }, > -}; > - > -static struct ti_dt_clk omap34xx_omap36xx_clks[] = { > - DT_CLK(NULL, "aes1_ick", "aes1_ick"), > - DT_CLK("omap_rng", "ick", "rng_ick"), > - DT_CLK("omap3-rom-rng", "ick", "rng_ick"), > - DT_CLK(NULL, "sha11_ick", "sha11_ick"), > - DT_CLK(NULL, "des1_ick", "des1_ick"), > - DT_CLK(NULL, "cam_mclk", "cam_mclk"), > - DT_CLK(NULL, "cam_ick", "cam_ick"), > - DT_CLK(NULL, "csi2_96m_fck", "csi2_96m_fck"), > - DT_CLK(NULL, "security_l3_ick", "security_l3_ick"), > - DT_CLK(NULL, "pka_ick", "pka_ick"), > - DT_CLK(NULL, "icr_ick", "icr_ick"), > - DT_CLK("omap-aes", "ick", "aes2_ick"), > - DT_CLK("omap-sham", "ick", "sha12_ick"), > - DT_CLK(NULL, "des2_ick", "des2_ick"), > - DT_CLK(NULL, "mspro_ick", "mspro_ick"), > - DT_CLK(NULL, "mailboxes_ick", "mailboxes_ick"), > - DT_CLK(NULL, "ssi_l4_ick", "ssi_l4_ick"), > - DT_CLK(NULL, "sr1_fck", "sr1_fck"), > - DT_CLK(NULL, "sr2_fck", "sr2_fck"), > - DT_CLK(NULL, "sr_l4_ick", "sr_l4_ick"), > - DT_CLK(NULL, "security_l4_ick2", "security_l4_ick2"), > - DT_CLK(NULL, "wkup_l4_ick", "wkup_l4_ick"), > - DT_CLK(NULL, "dpll2_fck", "dpll2_fck"), > - DT_CLK(NULL, "iva2_ck", "iva2_ck"), > - DT_CLK(NULL, "modem_fck", "modem_fck"), > - DT_CLK(NULL, "sad2d_ick", "sad2d_ick"), > - DT_CLK(NULL, "mad2d_ick", "mad2d_ick"), > - DT_CLK(NULL, "mspro_fck", "mspro_fck"), > - DT_CLK(NULL, "dpll2_ck", "dpll2_ck"), > - DT_CLK(NULL, "dpll2_m2_ck", "dpll2_m2_ck"), > { .node_name = NULL }, > }; > > static struct ti_dt_clk omap36xx_omap3430es2plus_clks[] = { > DT_CLK(NULL, "ssi_ssr_fck", "ssi_ssr_fck_3430es2"), > DT_CLK(NULL, "ssi_sst_fck", "ssi_sst_fck_3430es2"), > - DT_CLK("musb-omap2430", "ick", "hsotgusb_ick_3430es2"), > DT_CLK(NULL, "hsotgusb_ick", "hsotgusb_ick_3430es2"), > DT_CLK(NULL, "ssi_ick", "ssi_ick_3430es2"), > - DT_CLK(NULL, "usim_fck", "usim_fck"), > - DT_CLK(NULL, "usim_ick", "usim_ick"), > { .node_name = NULL }, > }; > > static struct ti_dt_clk omap3430es1_clks[] = { > - DT_CLK(NULL, "gfx_l3_ck", "gfx_l3_ck"), > - DT_CLK(NULL, "gfx_l3_fck", "gfx_l3_fck"), > - DT_CLK(NULL, "gfx_l3_ick", "gfx_l3_ick"), > - DT_CLK(NULL, "gfx_cg1_ck", "gfx_cg1_ck"), > - DT_CLK(NULL, "gfx_cg2_ck", "gfx_cg2_ck"), > - DT_CLK(NULL, "d2d_26m_fck", "d2d_26m_fck"), > - DT_CLK(NULL, "fshostusb_fck", "fshostusb_fck"), > DT_CLK(NULL, "ssi_ssr_fck", "ssi_ssr_fck_3430es1"), > DT_CLK(NULL, "ssi_sst_fck", "ssi_sst_fck_3430es1"), > - DT_CLK("musb-omap2430", "ick", "hsotgusb_ick_3430es1"), > DT_CLK(NULL, "hsotgusb_ick", "hsotgusb_ick_3430es1"), > - DT_CLK(NULL, "fac_ick", "fac_ick"), > DT_CLK(NULL, "ssi_ick", "ssi_ick_3430es1"), > - DT_CLK(NULL, "usb_l4_ick", "usb_l4_ick"), > DT_CLK(NULL, "dss1_alwon_fck", "dss1_alwon_fck_3430es1"), > - DT_CLK("omapdss_dss", "ick", "dss_ick_3430es1"), > DT_CLK(NULL, "dss_ick", "dss_ick_3430es1"), > { .node_name = NULL }, > }; > > static struct ti_dt_clk omap36xx_am35xx_omap3430es2plus_clks[] = { > - DT_CLK(NULL, "virt_16_8m_ck", "virt_16_8m_ck"), > - DT_CLK(NULL, "dpll5_ck", "dpll5_ck"), > - DT_CLK(NULL, "dpll5_m2_ck", "dpll5_m2_ck"), > - DT_CLK(NULL, "sgx_fck", "sgx_fck"), > - DT_CLK(NULL, "sgx_ick", "sgx_ick"), > - DT_CLK(NULL, "cpefuse_fck", "cpefuse_fck"), > - DT_CLK(NULL, "ts_fck", "ts_fck"), > - DT_CLK(NULL, "usbtll_fck", "usbtll_fck"), > - DT_CLK(NULL, "usbtll_ick", "usbtll_ick"), > - DT_CLK("omap_hsmmc.2", "ick", "mmchs3_ick"), > - DT_CLK(NULL, "mmchs3_ick", "mmchs3_ick"), > - DT_CLK(NULL, "mmchs3_fck", "mmchs3_fck"), > DT_CLK(NULL, "dss1_alwon_fck", "dss1_alwon_fck_3430es2"), > - DT_CLK("omapdss_dss", "ick", "dss_ick_3430es2"), > DT_CLK(NULL, "dss_ick", "dss_ick_3430es2"), > - DT_CLK(NULL, "usbhost_120m_fck", "usbhost_120m_fck"), > - DT_CLK(NULL, "usbhost_48m_fck", "usbhost_48m_fck"), > - DT_CLK(NULL, "usbhost_ick", "usbhost_ick"), > { .node_name = NULL }, > }; > > static struct ti_dt_clk am35xx_clks[] = { > - DT_CLK(NULL, "ipss_ick", "ipss_ick"), > - DT_CLK(NULL, "rmii_ck", "rmii_ck"), > - DT_CLK(NULL, "pclk_ck", "pclk_ck"), > - DT_CLK(NULL, "emac_ick", "emac_ick"), > - DT_CLK(NULL, "emac_fck", "emac_fck"), > - DT_CLK("davinci_emac.0", NULL, "emac_ick"), > - DT_CLK("davinci_mdio.0", NULL, "emac_fck"), > - DT_CLK("vpfe-capture", "master", "vpfe_ick"), > - DT_CLK("vpfe-capture", "slave", "vpfe_fck"), > DT_CLK(NULL, "hsotgusb_ick", "hsotgusb_ick_am35xx"), > DT_CLK(NULL, "hsotgusb_fck", "hsotgusb_fck_am35xx"), > - DT_CLK(NULL, "hecc_ck", "hecc_ck"), > DT_CLK(NULL, "uart4_ick", "uart4_ick_am35xx"), > DT_CLK(NULL, "uart4_fck", "uart4_fck_am35xx"), > { .node_name = NULL }, > }; > > -static struct ti_dt_clk omap36xx_clks[] = { > - DT_CLK(NULL, "omap_192m_alwon_fck", "omap_192m_alwon_fck"), > - DT_CLK(NULL, "uart4_fck", "uart4_fck"), > - DT_CLK(NULL, "uart4_ick", "uart4_ick"), > - { .node_name = NULL }, > -}; > - > static const char *enable_init_clks[] = { > "sdrc_ick", > "gpmc_fck", > @@ -579,16 +326,10 @@ static int __init omap3xxx_dt_clk_init(int soc_type) > soc_type == OMAP3_SOC_OMAP3630) > ti_dt_clocks_register(omap36xx_omap3430es2plus_clks); > > - if (soc_type == OMAP3_SOC_OMAP3430_ES1 || > - soc_type == OMAP3_SOC_OMAP3430_ES2_PLUS || > - soc_type == OMAP3_SOC_OMAP3630) > - ti_dt_clocks_register(omap34xx_omap36xx_clks); > - > - if (soc_type == OMAP3_SOC_OMAP3630) > - ti_dt_clocks_register(omap36xx_clks); > - > omap2_clk_disable_autoidle_all(); > > + ti_clk_add_aliases(); > + > omap2_clk_enable_init_clocks(enable_init_clks, > ARRAY_SIZE(enable_init_clks)); > > -- > 1.9.1 > > -- > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 23/06/18 13:44, Adam Ford wrote: > On Mon, Oct 30, 2017 at 8:06 AM Tero Kristo <t-kristo@ti.com> wrote: >> >> Most of the clock aliases are no longer needed, only leave the ones >> required by OMAP timer code in place. >> > > According to git bisect, this patch seems to break the Ethernet on the > AM3517-EVM. > I noticed that the mdio clock was removed. > > The error I am seeing on the AM3517-evm is: > > davinci_mdio davinci_mdio.0: failed to get device clock > davinci_mdio: probe of davinci_mdio.0 failed with error -2 Sorry about that, never had possibility to properly test that on am35xx board. > > Is there something we need to add to the device tree to correct this? > > thanks, Try adding: clocks = <&emac_fck>; clock-names = "fck"; ... under the mdio node. -Tero > > adam > >> Signed-off-by: Tero Kristo <t-kristo@ti.com> >> --- >> drivers/clk/ti/clk-3xxx.c | 263 +--------------------------------------------- >> 1 file changed, 2 insertions(+), 261 deletions(-) >> >> diff --git a/drivers/clk/ti/clk-3xxx.c b/drivers/clk/ti/clk-3xxx.c >> index b1251ca..8aa5f57 100644 >> --- a/drivers/clk/ti/clk-3xxx.c >> +++ b/drivers/clk/ti/clk-3xxx.c >> @@ -224,296 +224,43 @@ static void am35xx_clk_ipss_find_idlest(struct clk_hw_omap *clk, >> }; >> >> static struct ti_dt_clk omap3xxx_clks[] = { >> - DT_CLK(NULL, "apb_pclk", "dummy_apb_pclk"), >> - DT_CLK(NULL, "omap_32k_fck", "omap_32k_fck"), >> - DT_CLK(NULL, "virt_12m_ck", "virt_12m_ck"), >> - DT_CLK(NULL, "virt_13m_ck", "virt_13m_ck"), >> - DT_CLK(NULL, "virt_19200000_ck", "virt_19200000_ck"), >> - DT_CLK(NULL, "virt_26000000_ck", "virt_26000000_ck"), >> - DT_CLK(NULL, "virt_38_4m_ck", "virt_38_4m_ck"), >> - DT_CLK(NULL, "osc_sys_ck", "osc_sys_ck"), >> - DT_CLK("twl", "fck", "osc_sys_ck"), >> - DT_CLK(NULL, "sys_ck", "sys_ck"), >> - DT_CLK(NULL, "omap_96m_alwon_fck", "omap_96m_alwon_fck"), >> - DT_CLK("etb", "emu_core_alwon_ck", "emu_core_alwon_ck"), >> - DT_CLK(NULL, "sys_altclk", "sys_altclk"), >> - DT_CLK(NULL, "sys_clkout1", "sys_clkout1"), >> - DT_CLK(NULL, "dpll1_ck", "dpll1_ck"), >> - DT_CLK(NULL, "dpll1_x2_ck", "dpll1_x2_ck"), >> - DT_CLK(NULL, "dpll1_x2m2_ck", "dpll1_x2m2_ck"), >> - DT_CLK(NULL, "dpll3_ck", "dpll3_ck"), >> - DT_CLK(NULL, "core_ck", "core_ck"), >> - DT_CLK(NULL, "dpll3_x2_ck", "dpll3_x2_ck"), >> - DT_CLK(NULL, "dpll3_m2_ck", "dpll3_m2_ck"), >> - DT_CLK(NULL, "dpll3_m2x2_ck", "dpll3_m2x2_ck"), >> - DT_CLK(NULL, "dpll3_m3_ck", "dpll3_m3_ck"), >> - DT_CLK(NULL, "dpll3_m3x2_ck", "dpll3_m3x2_ck"), >> - DT_CLK(NULL, "dpll4_ck", "dpll4_ck"), >> - DT_CLK(NULL, "dpll4_x2_ck", "dpll4_x2_ck"), >> - DT_CLK(NULL, "omap_96m_fck", "omap_96m_fck"), >> - DT_CLK(NULL, "cm_96m_fck", "cm_96m_fck"), >> - DT_CLK(NULL, "omap_54m_fck", "omap_54m_fck"), >> - DT_CLK(NULL, "omap_48m_fck", "omap_48m_fck"), >> - DT_CLK(NULL, "omap_12m_fck", "omap_12m_fck"), >> - DT_CLK(NULL, "dpll4_m2_ck", "dpll4_m2_ck"), >> - DT_CLK(NULL, "dpll4_m2x2_ck", "dpll4_m2x2_ck"), >> - DT_CLK(NULL, "dpll4_m3_ck", "dpll4_m3_ck"), >> - DT_CLK(NULL, "dpll4_m3x2_ck", "dpll4_m3x2_ck"), >> - DT_CLK(NULL, "dpll4_m4_ck", "dpll4_m4_ck"), >> - DT_CLK(NULL, "dpll4_m4x2_ck", "dpll4_m4x2_ck"), >> - DT_CLK(NULL, "dpll4_m5_ck", "dpll4_m5_ck"), >> - DT_CLK(NULL, "dpll4_m5x2_ck", "dpll4_m5x2_ck"), >> - DT_CLK(NULL, "dpll4_m6_ck", "dpll4_m6_ck"), >> - DT_CLK(NULL, "dpll4_m6x2_ck", "dpll4_m6x2_ck"), >> - DT_CLK("etb", "emu_per_alwon_ck", "emu_per_alwon_ck"), >> - DT_CLK(NULL, "clkout2_src_ck", "clkout2_src_ck"), >> - DT_CLK(NULL, "sys_clkout2", "sys_clkout2"), >> - DT_CLK(NULL, "corex2_fck", "corex2_fck"), >> - DT_CLK(NULL, "dpll1_fck", "dpll1_fck"), >> - DT_CLK(NULL, "mpu_ck", "mpu_ck"), >> - DT_CLK(NULL, "arm_fck", "arm_fck"), >> - DT_CLK("etb", "emu_mpu_alwon_ck", "emu_mpu_alwon_ck"), >> - DT_CLK(NULL, "l3_ick", "l3_ick"), >> - DT_CLK(NULL, "l4_ick", "l4_ick"), >> - DT_CLK(NULL, "rm_ick", "rm_ick"), >> - DT_CLK(NULL, "gpt10_fck", "gpt10_fck"), >> - DT_CLK(NULL, "gpt11_fck", "gpt11_fck"), >> - DT_CLK(NULL, "core_96m_fck", "core_96m_fck"), >> - DT_CLK(NULL, "mmchs2_fck", "mmchs2_fck"), >> - DT_CLK(NULL, "mmchs1_fck", "mmchs1_fck"), >> - DT_CLK(NULL, "i2c3_fck", "i2c3_fck"), >> - DT_CLK(NULL, "i2c2_fck", "i2c2_fck"), >> - DT_CLK(NULL, "i2c1_fck", "i2c1_fck"), >> - DT_CLK(NULL, "core_48m_fck", "core_48m_fck"), >> - DT_CLK(NULL, "mcspi4_fck", "mcspi4_fck"), >> - DT_CLK(NULL, "mcspi3_fck", "mcspi3_fck"), >> - DT_CLK(NULL, "mcspi2_fck", "mcspi2_fck"), >> - DT_CLK(NULL, "mcspi1_fck", "mcspi1_fck"), >> - DT_CLK(NULL, "uart2_fck", "uart2_fck"), >> - DT_CLK(NULL, "uart1_fck", "uart1_fck"), >> - DT_CLK(NULL, "core_12m_fck", "core_12m_fck"), >> - DT_CLK("omap_hdq.0", "fck", "hdq_fck"), >> - DT_CLK(NULL, "hdq_fck", "hdq_fck"), >> - DT_CLK(NULL, "core_l3_ick", "core_l3_ick"), >> - DT_CLK(NULL, "sdrc_ick", "sdrc_ick"), >> - DT_CLK(NULL, "gpmc_fck", "gpmc_fck"), >> - DT_CLK(NULL, "core_l4_ick", "core_l4_ick"), >> - DT_CLK("omap_hsmmc.1", "ick", "mmchs2_ick"), >> - DT_CLK("omap_hsmmc.0", "ick", "mmchs1_ick"), >> - DT_CLK(NULL, "mmchs2_ick", "mmchs2_ick"), >> - DT_CLK(NULL, "mmchs1_ick", "mmchs1_ick"), >> - DT_CLK("omap_hdq.0", "ick", "hdq_ick"), >> - DT_CLK(NULL, "hdq_ick", "hdq_ick"), >> - DT_CLK("omap2_mcspi.4", "ick", "mcspi4_ick"), >> - DT_CLK("omap2_mcspi.3", "ick", "mcspi3_ick"), >> - DT_CLK("omap2_mcspi.2", "ick", "mcspi2_ick"), >> - DT_CLK("omap2_mcspi.1", "ick", "mcspi1_ick"), >> - DT_CLK(NULL, "mcspi4_ick", "mcspi4_ick"), >> - DT_CLK(NULL, "mcspi3_ick", "mcspi3_ick"), >> - DT_CLK(NULL, "mcspi2_ick", "mcspi2_ick"), >> - DT_CLK(NULL, "mcspi1_ick", "mcspi1_ick"), >> - DT_CLK("omap_i2c.3", "ick", "i2c3_ick"), >> - DT_CLK("omap_i2c.2", "ick", "i2c2_ick"), >> - DT_CLK("omap_i2c.1", "ick", "i2c1_ick"), >> - DT_CLK(NULL, "i2c3_ick", "i2c3_ick"), >> - DT_CLK(NULL, "i2c2_ick", "i2c2_ick"), >> - DT_CLK(NULL, "i2c1_ick", "i2c1_ick"), >> - DT_CLK(NULL, "uart2_ick", "uart2_ick"), >> - DT_CLK(NULL, "uart1_ick", "uart1_ick"), >> - DT_CLK(NULL, "gpt11_ick", "gpt11_ick"), >> - DT_CLK(NULL, "gpt10_ick", "gpt10_ick"), >> - DT_CLK(NULL, "omapctrl_ick", "omapctrl_ick"), >> - DT_CLK(NULL, "dss_tv_fck", "dss_tv_fck"), >> - DT_CLK(NULL, "dss_96m_fck", "dss_96m_fck"), >> - DT_CLK(NULL, "dss2_alwon_fck", "dss2_alwon_fck"), >> - DT_CLK(NULL, "init_60m_fclk", "dummy_ck"), >> - DT_CLK(NULL, "gpt1_fck", "gpt1_fck"), >> - DT_CLK(NULL, "aes2_ick", "aes2_ick"), >> - DT_CLK(NULL, "wkup_32k_fck", "wkup_32k_fck"), >> - DT_CLK(NULL, "gpio1_dbck", "gpio1_dbck"), >> - DT_CLK(NULL, "sha12_ick", "sha12_ick"), >> - DT_CLK(NULL, "wdt2_fck", "wdt2_fck"), >> - DT_CLK("omap_wdt", "ick", "wdt2_ick"), >> - DT_CLK(NULL, "wdt2_ick", "wdt2_ick"), >> - DT_CLK(NULL, "wdt1_ick", "wdt1_ick"), >> - DT_CLK(NULL, "gpio1_ick", "gpio1_ick"), >> - DT_CLK(NULL, "omap_32ksync_ick", "omap_32ksync_ick"), >> - DT_CLK(NULL, "gpt12_ick", "gpt12_ick"), >> - DT_CLK(NULL, "gpt1_ick", "gpt1_ick"), >> - DT_CLK(NULL, "per_96m_fck", "per_96m_fck"), >> - DT_CLK(NULL, "per_48m_fck", "per_48m_fck"), >> - DT_CLK(NULL, "uart3_fck", "uart3_fck"), >> - DT_CLK(NULL, "gpt2_fck", "gpt2_fck"), >> - DT_CLK(NULL, "gpt3_fck", "gpt3_fck"), >> - DT_CLK(NULL, "gpt4_fck", "gpt4_fck"), >> - DT_CLK(NULL, "gpt5_fck", "gpt5_fck"), >> - DT_CLK(NULL, "gpt6_fck", "gpt6_fck"), >> - DT_CLK(NULL, "gpt7_fck", "gpt7_fck"), >> - DT_CLK(NULL, "gpt8_fck", "gpt8_fck"), >> - DT_CLK(NULL, "gpt9_fck", "gpt9_fck"), >> - DT_CLK(NULL, "per_32k_alwon_fck", "per_32k_alwon_fck"), >> - DT_CLK(NULL, "gpio6_dbck", "gpio6_dbck"), >> - DT_CLK(NULL, "gpio5_dbck", "gpio5_dbck"), >> - DT_CLK(NULL, "gpio4_dbck", "gpio4_dbck"), >> - DT_CLK(NULL, "gpio3_dbck", "gpio3_dbck"), >> - DT_CLK(NULL, "gpio2_dbck", "gpio2_dbck"), >> - DT_CLK(NULL, "wdt3_fck", "wdt3_fck"), >> - DT_CLK(NULL, "per_l4_ick", "per_l4_ick"), >> - DT_CLK(NULL, "gpio6_ick", "gpio6_ick"), >> - DT_CLK(NULL, "gpio5_ick", "gpio5_ick"), >> - DT_CLK(NULL, "gpio4_ick", "gpio4_ick"), >> - DT_CLK(NULL, "gpio3_ick", "gpio3_ick"), >> - DT_CLK(NULL, "gpio2_ick", "gpio2_ick"), >> - DT_CLK(NULL, "wdt3_ick", "wdt3_ick"), >> - DT_CLK(NULL, "uart3_ick", "uart3_ick"), >> - DT_CLK(NULL, "gpt9_ick", "gpt9_ick"), >> - DT_CLK(NULL, "gpt8_ick", "gpt8_ick"), >> - DT_CLK(NULL, "gpt7_ick", "gpt7_ick"), >> - DT_CLK(NULL, "gpt6_ick", "gpt6_ick"), >> - DT_CLK(NULL, "gpt5_ick", "gpt5_ick"), >> - DT_CLK(NULL, "gpt4_ick", "gpt4_ick"), >> - DT_CLK(NULL, "gpt3_ick", "gpt3_ick"), >> - DT_CLK(NULL, "gpt2_ick", "gpt2_ick"), >> - DT_CLK(NULL, "mcbsp_clks", "mcbsp_clks"), >> - DT_CLK(NULL, "mcbsp1_ick", "mcbsp1_ick"), >> - DT_CLK(NULL, "mcbsp2_ick", "mcbsp2_ick"), >> - DT_CLK(NULL, "mcbsp3_ick", "mcbsp3_ick"), >> - DT_CLK(NULL, "mcbsp4_ick", "mcbsp4_ick"), >> - DT_CLK(NULL, "mcbsp5_ick", "mcbsp5_ick"), >> - DT_CLK(NULL, "mcbsp1_fck", "mcbsp1_fck"), >> - DT_CLK(NULL, "mcbsp2_fck", "mcbsp2_fck"), >> - DT_CLK(NULL, "mcbsp3_fck", "mcbsp3_fck"), >> - DT_CLK(NULL, "mcbsp4_fck", "mcbsp4_fck"), >> - DT_CLK(NULL, "mcbsp5_fck", "mcbsp5_fck"), >> - DT_CLK("etb", "emu_src_ck", "emu_src_ck"), >> - DT_CLK(NULL, "emu_src_ck", "emu_src_ck"), >> - DT_CLK(NULL, "pclk_fck", "pclk_fck"), >> - DT_CLK(NULL, "pclkx2_fck", "pclkx2_fck"), >> - DT_CLK(NULL, "atclk_fck", "atclk_fck"), >> - DT_CLK(NULL, "traceclk_src_fck", "traceclk_src_fck"), >> - DT_CLK(NULL, "traceclk_fck", "traceclk_fck"), >> - DT_CLK(NULL, "secure_32k_fck", "secure_32k_fck"), >> - DT_CLK(NULL, "gpt12_fck", "gpt12_fck"), >> - DT_CLK(NULL, "wdt1_fck", "wdt1_fck"), >> DT_CLK(NULL, "timer_32k_ck", "omap_32k_fck"), >> DT_CLK(NULL, "timer_sys_ck", "sys_ck"), >> - DT_CLK(NULL, "cpufreq_ck", "dpll1_ck"), >> - { .node_name = NULL }, >> -}; >> - >> -static struct ti_dt_clk omap34xx_omap36xx_clks[] = { >> - DT_CLK(NULL, "aes1_ick", "aes1_ick"), >> - DT_CLK("omap_rng", "ick", "rng_ick"), >> - DT_CLK("omap3-rom-rng", "ick", "rng_ick"), >> - DT_CLK(NULL, "sha11_ick", "sha11_ick"), >> - DT_CLK(NULL, "des1_ick", "des1_ick"), >> - DT_CLK(NULL, "cam_mclk", "cam_mclk"), >> - DT_CLK(NULL, "cam_ick", "cam_ick"), >> - DT_CLK(NULL, "csi2_96m_fck", "csi2_96m_fck"), >> - DT_CLK(NULL, "security_l3_ick", "security_l3_ick"), >> - DT_CLK(NULL, "pka_ick", "pka_ick"), >> - DT_CLK(NULL, "icr_ick", "icr_ick"), >> - DT_CLK("omap-aes", "ick", "aes2_ick"), >> - DT_CLK("omap-sham", "ick", "sha12_ick"), >> - DT_CLK(NULL, "des2_ick", "des2_ick"), >> - DT_CLK(NULL, "mspro_ick", "mspro_ick"), >> - DT_CLK(NULL, "mailboxes_ick", "mailboxes_ick"), >> - DT_CLK(NULL, "ssi_l4_ick", "ssi_l4_ick"), >> - DT_CLK(NULL, "sr1_fck", "sr1_fck"), >> - DT_CLK(NULL, "sr2_fck", "sr2_fck"), >> - DT_CLK(NULL, "sr_l4_ick", "sr_l4_ick"), >> - DT_CLK(NULL, "security_l4_ick2", "security_l4_ick2"), >> - DT_CLK(NULL, "wkup_l4_ick", "wkup_l4_ick"), >> - DT_CLK(NULL, "dpll2_fck", "dpll2_fck"), >> - DT_CLK(NULL, "iva2_ck", "iva2_ck"), >> - DT_CLK(NULL, "modem_fck", "modem_fck"), >> - DT_CLK(NULL, "sad2d_ick", "sad2d_ick"), >> - DT_CLK(NULL, "mad2d_ick", "mad2d_ick"), >> - DT_CLK(NULL, "mspro_fck", "mspro_fck"), >> - DT_CLK(NULL, "dpll2_ck", "dpll2_ck"), >> - DT_CLK(NULL, "dpll2_m2_ck", "dpll2_m2_ck"), >> { .node_name = NULL }, >> }; >> >> static struct ti_dt_clk omap36xx_omap3430es2plus_clks[] = { >> DT_CLK(NULL, "ssi_ssr_fck", "ssi_ssr_fck_3430es2"), >> DT_CLK(NULL, "ssi_sst_fck", "ssi_sst_fck_3430es2"), >> - DT_CLK("musb-omap2430", "ick", "hsotgusb_ick_3430es2"), >> DT_CLK(NULL, "hsotgusb_ick", "hsotgusb_ick_3430es2"), >> DT_CLK(NULL, "ssi_ick", "ssi_ick_3430es2"), >> - DT_CLK(NULL, "usim_fck", "usim_fck"), >> - DT_CLK(NULL, "usim_ick", "usim_ick"), >> { .node_name = NULL }, >> }; >> >> static struct ti_dt_clk omap3430es1_clks[] = { >> - DT_CLK(NULL, "gfx_l3_ck", "gfx_l3_ck"), >> - DT_CLK(NULL, "gfx_l3_fck", "gfx_l3_fck"), >> - DT_CLK(NULL, "gfx_l3_ick", "gfx_l3_ick"), >> - DT_CLK(NULL, "gfx_cg1_ck", "gfx_cg1_ck"), >> - DT_CLK(NULL, "gfx_cg2_ck", "gfx_cg2_ck"), >> - DT_CLK(NULL, "d2d_26m_fck", "d2d_26m_fck"), >> - DT_CLK(NULL, "fshostusb_fck", "fshostusb_fck"), >> DT_CLK(NULL, "ssi_ssr_fck", "ssi_ssr_fck_3430es1"), >> DT_CLK(NULL, "ssi_sst_fck", "ssi_sst_fck_3430es1"), >> - DT_CLK("musb-omap2430", "ick", "hsotgusb_ick_3430es1"), >> DT_CLK(NULL, "hsotgusb_ick", "hsotgusb_ick_3430es1"), >> - DT_CLK(NULL, "fac_ick", "fac_ick"), >> DT_CLK(NULL, "ssi_ick", "ssi_ick_3430es1"), >> - DT_CLK(NULL, "usb_l4_ick", "usb_l4_ick"), >> DT_CLK(NULL, "dss1_alwon_fck", "dss1_alwon_fck_3430es1"), >> - DT_CLK("omapdss_dss", "ick", "dss_ick_3430es1"), >> DT_CLK(NULL, "dss_ick", "dss_ick_3430es1"), >> { .node_name = NULL }, >> }; >> >> static struct ti_dt_clk omap36xx_am35xx_omap3430es2plus_clks[] = { >> - DT_CLK(NULL, "virt_16_8m_ck", "virt_16_8m_ck"), >> - DT_CLK(NULL, "dpll5_ck", "dpll5_ck"), >> - DT_CLK(NULL, "dpll5_m2_ck", "dpll5_m2_ck"), >> - DT_CLK(NULL, "sgx_fck", "sgx_fck"), >> - DT_CLK(NULL, "sgx_ick", "sgx_ick"), >> - DT_CLK(NULL, "cpefuse_fck", "cpefuse_fck"), >> - DT_CLK(NULL, "ts_fck", "ts_fck"), >> - DT_CLK(NULL, "usbtll_fck", "usbtll_fck"), >> - DT_CLK(NULL, "usbtll_ick", "usbtll_ick"), >> - DT_CLK("omap_hsmmc.2", "ick", "mmchs3_ick"), >> - DT_CLK(NULL, "mmchs3_ick", "mmchs3_ick"), >> - DT_CLK(NULL, "mmchs3_fck", "mmchs3_fck"), >> DT_CLK(NULL, "dss1_alwon_fck", "dss1_alwon_fck_3430es2"), >> - DT_CLK("omapdss_dss", "ick", "dss_ick_3430es2"), >> DT_CLK(NULL, "dss_ick", "dss_ick_3430es2"), >> - DT_CLK(NULL, "usbhost_120m_fck", "usbhost_120m_fck"), >> - DT_CLK(NULL, "usbhost_48m_fck", "usbhost_48m_fck"), >> - DT_CLK(NULL, "usbhost_ick", "usbhost_ick"), >> { .node_name = NULL }, >> }; >> >> static struct ti_dt_clk am35xx_clks[] = { >> - DT_CLK(NULL, "ipss_ick", "ipss_ick"), >> - DT_CLK(NULL, "rmii_ck", "rmii_ck"), >> - DT_CLK(NULL, "pclk_ck", "pclk_ck"), >> - DT_CLK(NULL, "emac_ick", "emac_ick"), >> - DT_CLK(NULL, "emac_fck", "emac_fck"), >> - DT_CLK("davinci_emac.0", NULL, "emac_ick"), >> - DT_CLK("davinci_mdio.0", NULL, "emac_fck"), >> - DT_CLK("vpfe-capture", "master", "vpfe_ick"), >> - DT_CLK("vpfe-capture", "slave", "vpfe_fck"), >> DT_CLK(NULL, "hsotgusb_ick", "hsotgusb_ick_am35xx"), >> DT_CLK(NULL, "hsotgusb_fck", "hsotgusb_fck_am35xx"), >> - DT_CLK(NULL, "hecc_ck", "hecc_ck"), >> DT_CLK(NULL, "uart4_ick", "uart4_ick_am35xx"), >> DT_CLK(NULL, "uart4_fck", "uart4_fck_am35xx"), >> { .node_name = NULL }, >> }; >> >> -static struct ti_dt_clk omap36xx_clks[] = { >> - DT_CLK(NULL, "omap_192m_alwon_fck", "omap_192m_alwon_fck"), >> - DT_CLK(NULL, "uart4_fck", "uart4_fck"), >> - DT_CLK(NULL, "uart4_ick", "uart4_ick"), >> - { .node_name = NULL }, >> -}; >> - >> static const char *enable_init_clks[] = { >> "sdrc_ick", >> "gpmc_fck", >> @@ -579,16 +326,10 @@ static int __init omap3xxx_dt_clk_init(int soc_type) >> soc_type == OMAP3_SOC_OMAP3630) >> ti_dt_clocks_register(omap36xx_omap3430es2plus_clks); >> >> - if (soc_type == OMAP3_SOC_OMAP3430_ES1 || >> - soc_type == OMAP3_SOC_OMAP3430_ES2_PLUS || >> - soc_type == OMAP3_SOC_OMAP3630) >> - ti_dt_clocks_register(omap34xx_omap36xx_clks); >> - >> - if (soc_type == OMAP3_SOC_OMAP3630) >> - ti_dt_clocks_register(omap36xx_clks); >> - >> omap2_clk_disable_autoidle_all(); >> >> + ti_clk_add_aliases(); >> + >> omap2_clk_enable_init_clocks(enable_init_clks, >> ARRAY_SIZE(enable_init_clks)); >> >> -- >> 1.9.1 >> >> -- >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-omap" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/clk/ti/clk-3xxx.c b/drivers/clk/ti/clk-3xxx.c index b1251ca..8aa5f57 100644 --- a/drivers/clk/ti/clk-3xxx.c +++ b/drivers/clk/ti/clk-3xxx.c @@ -224,296 +224,43 @@ static void am35xx_clk_ipss_find_idlest(struct clk_hw_omap *clk, }; static struct ti_dt_clk omap3xxx_clks[] = { - DT_CLK(NULL, "apb_pclk", "dummy_apb_pclk"), - DT_CLK(NULL, "omap_32k_fck", "omap_32k_fck"), - DT_CLK(NULL, "virt_12m_ck", "virt_12m_ck"), - DT_CLK(NULL, "virt_13m_ck", "virt_13m_ck"), - DT_CLK(NULL, "virt_19200000_ck", "virt_19200000_ck"), - DT_CLK(NULL, "virt_26000000_ck", "virt_26000000_ck"), - DT_CLK(NULL, "virt_38_4m_ck", "virt_38_4m_ck"), - DT_CLK(NULL, "osc_sys_ck", "osc_sys_ck"), - DT_CLK("twl", "fck", "osc_sys_ck"), - DT_CLK(NULL, "sys_ck", "sys_ck"), - DT_CLK(NULL, "omap_96m_alwon_fck", "omap_96m_alwon_fck"), - DT_CLK("etb", "emu_core_alwon_ck", "emu_core_alwon_ck"), - DT_CLK(NULL, "sys_altclk", "sys_altclk"), - DT_CLK(NULL, "sys_clkout1", "sys_clkout1"), - DT_CLK(NULL, "dpll1_ck", "dpll1_ck"), - DT_CLK(NULL, "dpll1_x2_ck", "dpll1_x2_ck"), - DT_CLK(NULL, "dpll1_x2m2_ck", "dpll1_x2m2_ck"), - DT_CLK(NULL, "dpll3_ck", "dpll3_ck"), - DT_CLK(NULL, "core_ck", "core_ck"), - DT_CLK(NULL, "dpll3_x2_ck", "dpll3_x2_ck"), - DT_CLK(NULL, "dpll3_m2_ck", "dpll3_m2_ck"), - DT_CLK(NULL, "dpll3_m2x2_ck", "dpll3_m2x2_ck"), - DT_CLK(NULL, "dpll3_m3_ck", "dpll3_m3_ck"), - DT_CLK(NULL, "dpll3_m3x2_ck", "dpll3_m3x2_ck"), - DT_CLK(NULL, "dpll4_ck", "dpll4_ck"), - DT_CLK(NULL, "dpll4_x2_ck", "dpll4_x2_ck"), - DT_CLK(NULL, "omap_96m_fck", "omap_96m_fck"), - DT_CLK(NULL, "cm_96m_fck", "cm_96m_fck"), - DT_CLK(NULL, "omap_54m_fck", "omap_54m_fck"), - DT_CLK(NULL, "omap_48m_fck", "omap_48m_fck"), - DT_CLK(NULL, "omap_12m_fck", "omap_12m_fck"), - DT_CLK(NULL, "dpll4_m2_ck", "dpll4_m2_ck"), - DT_CLK(NULL, "dpll4_m2x2_ck", "dpll4_m2x2_ck"), - DT_CLK(NULL, "dpll4_m3_ck", "dpll4_m3_ck"), - DT_CLK(NULL, "dpll4_m3x2_ck", "dpll4_m3x2_ck"), - DT_CLK(NULL, "dpll4_m4_ck", "dpll4_m4_ck"), - DT_CLK(NULL, "dpll4_m4x2_ck", "dpll4_m4x2_ck"), - DT_CLK(NULL, "dpll4_m5_ck", "dpll4_m5_ck"), - DT_CLK(NULL, "dpll4_m5x2_ck", "dpll4_m5x2_ck"), - DT_CLK(NULL, "dpll4_m6_ck", "dpll4_m6_ck"), - DT_CLK(NULL, "dpll4_m6x2_ck", "dpll4_m6x2_ck"), - DT_CLK("etb", "emu_per_alwon_ck", "emu_per_alwon_ck"), - DT_CLK(NULL, "clkout2_src_ck", "clkout2_src_ck"), - DT_CLK(NULL, "sys_clkout2", "sys_clkout2"), - DT_CLK(NULL, "corex2_fck", "corex2_fck"), - DT_CLK(NULL, "dpll1_fck", "dpll1_fck"), - DT_CLK(NULL, "mpu_ck", "mpu_ck"), - DT_CLK(NULL, "arm_fck", "arm_fck"), - DT_CLK("etb", "emu_mpu_alwon_ck", "emu_mpu_alwon_ck"), - DT_CLK(NULL, "l3_ick", "l3_ick"), - DT_CLK(NULL, "l4_ick", "l4_ick"), - DT_CLK(NULL, "rm_ick", "rm_ick"), - DT_CLK(NULL, "gpt10_fck", "gpt10_fck"), - DT_CLK(NULL, "gpt11_fck", "gpt11_fck"), - DT_CLK(NULL, "core_96m_fck", "core_96m_fck"), - DT_CLK(NULL, "mmchs2_fck", "mmchs2_fck"), - DT_CLK(NULL, "mmchs1_fck", "mmchs1_fck"), - DT_CLK(NULL, "i2c3_fck", "i2c3_fck"), - DT_CLK(NULL, "i2c2_fck", "i2c2_fck"), - DT_CLK(NULL, "i2c1_fck", "i2c1_fck"), - DT_CLK(NULL, "core_48m_fck", "core_48m_fck"), - DT_CLK(NULL, "mcspi4_fck", "mcspi4_fck"), - DT_CLK(NULL, "mcspi3_fck", "mcspi3_fck"), - DT_CLK(NULL, "mcspi2_fck", "mcspi2_fck"), - DT_CLK(NULL, "mcspi1_fck", "mcspi1_fck"), - DT_CLK(NULL, "uart2_fck", "uart2_fck"), - DT_CLK(NULL, "uart1_fck", "uart1_fck"), - DT_CLK(NULL, "core_12m_fck", "core_12m_fck"), - DT_CLK("omap_hdq.0", "fck", "hdq_fck"), - DT_CLK(NULL, "hdq_fck", "hdq_fck"), - DT_CLK(NULL, "core_l3_ick", "core_l3_ick"), - DT_CLK(NULL, "sdrc_ick", "sdrc_ick"), - DT_CLK(NULL, "gpmc_fck", "gpmc_fck"), - DT_CLK(NULL, "core_l4_ick", "core_l4_ick"), - DT_CLK("omap_hsmmc.1", "ick", "mmchs2_ick"), - DT_CLK("omap_hsmmc.0", "ick", "mmchs1_ick"), - DT_CLK(NULL, "mmchs2_ick", "mmchs2_ick"), - DT_CLK(NULL, "mmchs1_ick", "mmchs1_ick"), - DT_CLK("omap_hdq.0", "ick", "hdq_ick"), - DT_CLK(NULL, "hdq_ick", "hdq_ick"), - DT_CLK("omap2_mcspi.4", "ick", "mcspi4_ick"), - DT_CLK("omap2_mcspi.3", "ick", "mcspi3_ick"), - DT_CLK("omap2_mcspi.2", "ick", "mcspi2_ick"), - DT_CLK("omap2_mcspi.1", "ick", "mcspi1_ick"), - DT_CLK(NULL, "mcspi4_ick", "mcspi4_ick"), - DT_CLK(NULL, "mcspi3_ick", "mcspi3_ick"), - DT_CLK(NULL, "mcspi2_ick", "mcspi2_ick"), - DT_CLK(NULL, "mcspi1_ick", "mcspi1_ick"), - DT_CLK("omap_i2c.3", "ick", "i2c3_ick"), - DT_CLK("omap_i2c.2", "ick", "i2c2_ick"), - DT_CLK("omap_i2c.1", "ick", "i2c1_ick"), - DT_CLK(NULL, "i2c3_ick", "i2c3_ick"), - DT_CLK(NULL, "i2c2_ick", "i2c2_ick"), - DT_CLK(NULL, "i2c1_ick", "i2c1_ick"), - DT_CLK(NULL, "uart2_ick", "uart2_ick"), - DT_CLK(NULL, "uart1_ick", "uart1_ick"), - DT_CLK(NULL, "gpt11_ick", "gpt11_ick"), - DT_CLK(NULL, "gpt10_ick", "gpt10_ick"), - DT_CLK(NULL, "omapctrl_ick", "omapctrl_ick"), - DT_CLK(NULL, "dss_tv_fck", "dss_tv_fck"), - DT_CLK(NULL, "dss_96m_fck", "dss_96m_fck"), - DT_CLK(NULL, "dss2_alwon_fck", "dss2_alwon_fck"), - DT_CLK(NULL, "init_60m_fclk", "dummy_ck"), - DT_CLK(NULL, "gpt1_fck", "gpt1_fck"), - DT_CLK(NULL, "aes2_ick", "aes2_ick"), - DT_CLK(NULL, "wkup_32k_fck", "wkup_32k_fck"), - DT_CLK(NULL, "gpio1_dbck", "gpio1_dbck"), - DT_CLK(NULL, "sha12_ick", "sha12_ick"), - DT_CLK(NULL, "wdt2_fck", "wdt2_fck"), - DT_CLK("omap_wdt", "ick", "wdt2_ick"), - DT_CLK(NULL, "wdt2_ick", "wdt2_ick"), - DT_CLK(NULL, "wdt1_ick", "wdt1_ick"), - DT_CLK(NULL, "gpio1_ick", "gpio1_ick"), - DT_CLK(NULL, "omap_32ksync_ick", "omap_32ksync_ick"), - DT_CLK(NULL, "gpt12_ick", "gpt12_ick"), - DT_CLK(NULL, "gpt1_ick", "gpt1_ick"), - DT_CLK(NULL, "per_96m_fck", "per_96m_fck"), - DT_CLK(NULL, "per_48m_fck", "per_48m_fck"), - DT_CLK(NULL, "uart3_fck", "uart3_fck"), - DT_CLK(NULL, "gpt2_fck", "gpt2_fck"), - DT_CLK(NULL, "gpt3_fck", "gpt3_fck"), - DT_CLK(NULL, "gpt4_fck", "gpt4_fck"), - DT_CLK(NULL, "gpt5_fck", "gpt5_fck"), - DT_CLK(NULL, "gpt6_fck", "gpt6_fck"), - DT_CLK(NULL, "gpt7_fck", "gpt7_fck"), - DT_CLK(NULL, "gpt8_fck", "gpt8_fck"), - DT_CLK(NULL, "gpt9_fck", "gpt9_fck"), - DT_CLK(NULL, "per_32k_alwon_fck", "per_32k_alwon_fck"), - DT_CLK(NULL, "gpio6_dbck", "gpio6_dbck"), - DT_CLK(NULL, "gpio5_dbck", "gpio5_dbck"), - DT_CLK(NULL, "gpio4_dbck", "gpio4_dbck"), - DT_CLK(NULL, "gpio3_dbck", "gpio3_dbck"), - DT_CLK(NULL, "gpio2_dbck", "gpio2_dbck"), - DT_CLK(NULL, "wdt3_fck", "wdt3_fck"), - DT_CLK(NULL, "per_l4_ick", "per_l4_ick"), - DT_CLK(NULL, "gpio6_ick", "gpio6_ick"), - DT_CLK(NULL, "gpio5_ick", "gpio5_ick"), - DT_CLK(NULL, "gpio4_ick", "gpio4_ick"), - DT_CLK(NULL, "gpio3_ick", "gpio3_ick"), - DT_CLK(NULL, "gpio2_ick", "gpio2_ick"), - DT_CLK(NULL, "wdt3_ick", "wdt3_ick"), - DT_CLK(NULL, "uart3_ick", "uart3_ick"), - DT_CLK(NULL, "gpt9_ick", "gpt9_ick"), - DT_CLK(NULL, "gpt8_ick", "gpt8_ick"), - DT_CLK(NULL, "gpt7_ick", "gpt7_ick"), - DT_CLK(NULL, "gpt6_ick", "gpt6_ick"), - DT_CLK(NULL, "gpt5_ick", "gpt5_ick"), - DT_CLK(NULL, "gpt4_ick", "gpt4_ick"), - DT_CLK(NULL, "gpt3_ick", "gpt3_ick"), - DT_CLK(NULL, "gpt2_ick", "gpt2_ick"), - DT_CLK(NULL, "mcbsp_clks", "mcbsp_clks"), - DT_CLK(NULL, "mcbsp1_ick", "mcbsp1_ick"), - DT_CLK(NULL, "mcbsp2_ick", "mcbsp2_ick"), - DT_CLK(NULL, "mcbsp3_ick", "mcbsp3_ick"), - DT_CLK(NULL, "mcbsp4_ick", "mcbsp4_ick"), - DT_CLK(NULL, "mcbsp5_ick", "mcbsp5_ick"), - DT_CLK(NULL, "mcbsp1_fck", "mcbsp1_fck"), - DT_CLK(NULL, "mcbsp2_fck", "mcbsp2_fck"), - DT_CLK(NULL, "mcbsp3_fck", "mcbsp3_fck"), - DT_CLK(NULL, "mcbsp4_fck", "mcbsp4_fck"), - DT_CLK(NULL, "mcbsp5_fck", "mcbsp5_fck"), - DT_CLK("etb", "emu_src_ck", "emu_src_ck"), - DT_CLK(NULL, "emu_src_ck", "emu_src_ck"), - DT_CLK(NULL, "pclk_fck", "pclk_fck"), - DT_CLK(NULL, "pclkx2_fck", "pclkx2_fck"), - DT_CLK(NULL, "atclk_fck", "atclk_fck"), - DT_CLK(NULL, "traceclk_src_fck", "traceclk_src_fck"), - DT_CLK(NULL, "traceclk_fck", "traceclk_fck"), - DT_CLK(NULL, "secure_32k_fck", "secure_32k_fck"), - DT_CLK(NULL, "gpt12_fck", "gpt12_fck"), - DT_CLK(NULL, "wdt1_fck", "wdt1_fck"), DT_CLK(NULL, "timer_32k_ck", "omap_32k_fck"), DT_CLK(NULL, "timer_sys_ck", "sys_ck"), - DT_CLK(NULL, "cpufreq_ck", "dpll1_ck"), - { .node_name = NULL }, -}; - -static struct ti_dt_clk omap34xx_omap36xx_clks[] = { - DT_CLK(NULL, "aes1_ick", "aes1_ick"), - DT_CLK("omap_rng", "ick", "rng_ick"), - DT_CLK("omap3-rom-rng", "ick", "rng_ick"), - DT_CLK(NULL, "sha11_ick", "sha11_ick"), - DT_CLK(NULL, "des1_ick", "des1_ick"), - DT_CLK(NULL, "cam_mclk", "cam_mclk"), - DT_CLK(NULL, "cam_ick", "cam_ick"), - DT_CLK(NULL, "csi2_96m_fck", "csi2_96m_fck"), - DT_CLK(NULL, "security_l3_ick", "security_l3_ick"), - DT_CLK(NULL, "pka_ick", "pka_ick"), - DT_CLK(NULL, "icr_ick", "icr_ick"), - DT_CLK("omap-aes", "ick", "aes2_ick"), - DT_CLK("omap-sham", "ick", "sha12_ick"), - DT_CLK(NULL, "des2_ick", "des2_ick"), - DT_CLK(NULL, "mspro_ick", "mspro_ick"), - DT_CLK(NULL, "mailboxes_ick", "mailboxes_ick"), - DT_CLK(NULL, "ssi_l4_ick", "ssi_l4_ick"), - DT_CLK(NULL, "sr1_fck", "sr1_fck"), - DT_CLK(NULL, "sr2_fck", "sr2_fck"), - DT_CLK(NULL, "sr_l4_ick", "sr_l4_ick"), - DT_CLK(NULL, "security_l4_ick2", "security_l4_ick2"), - DT_CLK(NULL, "wkup_l4_ick", "wkup_l4_ick"), - DT_CLK(NULL, "dpll2_fck", "dpll2_fck"), - DT_CLK(NULL, "iva2_ck", "iva2_ck"), - DT_CLK(NULL, "modem_fck", "modem_fck"), - DT_CLK(NULL, "sad2d_ick", "sad2d_ick"), - DT_CLK(NULL, "mad2d_ick", "mad2d_ick"), - DT_CLK(NULL, "mspro_fck", "mspro_fck"), - DT_CLK(NULL, "dpll2_ck", "dpll2_ck"), - DT_CLK(NULL, "dpll2_m2_ck", "dpll2_m2_ck"), { .node_name = NULL }, }; static struct ti_dt_clk omap36xx_omap3430es2plus_clks[] = { DT_CLK(NULL, "ssi_ssr_fck", "ssi_ssr_fck_3430es2"), DT_CLK(NULL, "ssi_sst_fck", "ssi_sst_fck_3430es2"), - DT_CLK("musb-omap2430", "ick", "hsotgusb_ick_3430es2"), DT_CLK(NULL, "hsotgusb_ick", "hsotgusb_ick_3430es2"), DT_CLK(NULL, "ssi_ick", "ssi_ick_3430es2"), - DT_CLK(NULL, "usim_fck", "usim_fck"), - DT_CLK(NULL, "usim_ick", "usim_ick"), { .node_name = NULL }, }; static struct ti_dt_clk omap3430es1_clks[] = { - DT_CLK(NULL, "gfx_l3_ck", "gfx_l3_ck"), - DT_CLK(NULL, "gfx_l3_fck", "gfx_l3_fck"), - DT_CLK(NULL, "gfx_l3_ick", "gfx_l3_ick"), - DT_CLK(NULL, "gfx_cg1_ck", "gfx_cg1_ck"), - DT_CLK(NULL, "gfx_cg2_ck", "gfx_cg2_ck"), - DT_CLK(NULL, "d2d_26m_fck", "d2d_26m_fck"), - DT_CLK(NULL, "fshostusb_fck", "fshostusb_fck"), DT_CLK(NULL, "ssi_ssr_fck", "ssi_ssr_fck_3430es1"), DT_CLK(NULL, "ssi_sst_fck", "ssi_sst_fck_3430es1"), - DT_CLK("musb-omap2430", "ick", "hsotgusb_ick_3430es1"), DT_CLK(NULL, "hsotgusb_ick", "hsotgusb_ick_3430es1"), - DT_CLK(NULL, "fac_ick", "fac_ick"), DT_CLK(NULL, "ssi_ick", "ssi_ick_3430es1"), - DT_CLK(NULL, "usb_l4_ick", "usb_l4_ick"), DT_CLK(NULL, "dss1_alwon_fck", "dss1_alwon_fck_3430es1"), - DT_CLK("omapdss_dss", "ick", "dss_ick_3430es1"), DT_CLK(NULL, "dss_ick", "dss_ick_3430es1"), { .node_name = NULL }, }; static struct ti_dt_clk omap36xx_am35xx_omap3430es2plus_clks[] = { - DT_CLK(NULL, "virt_16_8m_ck", "virt_16_8m_ck"), - DT_CLK(NULL, "dpll5_ck", "dpll5_ck"), - DT_CLK(NULL, "dpll5_m2_ck", "dpll5_m2_ck"), - DT_CLK(NULL, "sgx_fck", "sgx_fck"), - DT_CLK(NULL, "sgx_ick", "sgx_ick"), - DT_CLK(NULL, "cpefuse_fck", "cpefuse_fck"), - DT_CLK(NULL, "ts_fck", "ts_fck"), - DT_CLK(NULL, "usbtll_fck", "usbtll_fck"), - DT_CLK(NULL, "usbtll_ick", "usbtll_ick"), - DT_CLK("omap_hsmmc.2", "ick", "mmchs3_ick"), - DT_CLK(NULL, "mmchs3_ick", "mmchs3_ick"), - DT_CLK(NULL, "mmchs3_fck", "mmchs3_fck"), DT_CLK(NULL, "dss1_alwon_fck", "dss1_alwon_fck_3430es2"), - DT_CLK("omapdss_dss", "ick", "dss_ick_3430es2"), DT_CLK(NULL, "dss_ick", "dss_ick_3430es2"), - DT_CLK(NULL, "usbhost_120m_fck", "usbhost_120m_fck"), - DT_CLK(NULL, "usbhost_48m_fck", "usbhost_48m_fck"), - DT_CLK(NULL, "usbhost_ick", "usbhost_ick"), { .node_name = NULL }, }; static struct ti_dt_clk am35xx_clks[] = { - DT_CLK(NULL, "ipss_ick", "ipss_ick"), - DT_CLK(NULL, "rmii_ck", "rmii_ck"), - DT_CLK(NULL, "pclk_ck", "pclk_ck"), - DT_CLK(NULL, "emac_ick", "emac_ick"), - DT_CLK(NULL, "emac_fck", "emac_fck"), - DT_CLK("davinci_emac.0", NULL, "emac_ick"), - DT_CLK("davinci_mdio.0", NULL, "emac_fck"), - DT_CLK("vpfe-capture", "master", "vpfe_ick"), - DT_CLK("vpfe-capture", "slave", "vpfe_fck"), DT_CLK(NULL, "hsotgusb_ick", "hsotgusb_ick_am35xx"), DT_CLK(NULL, "hsotgusb_fck", "hsotgusb_fck_am35xx"), - DT_CLK(NULL, "hecc_ck", "hecc_ck"), DT_CLK(NULL, "uart4_ick", "uart4_ick_am35xx"), DT_CLK(NULL, "uart4_fck", "uart4_fck_am35xx"), { .node_name = NULL }, }; -static struct ti_dt_clk omap36xx_clks[] = { - DT_CLK(NULL, "omap_192m_alwon_fck", "omap_192m_alwon_fck"), - DT_CLK(NULL, "uart4_fck", "uart4_fck"), - DT_CLK(NULL, "uart4_ick", "uart4_ick"), - { .node_name = NULL }, -}; - static const char *enable_init_clks[] = { "sdrc_ick", "gpmc_fck", @@ -579,16 +326,10 @@ static int __init omap3xxx_dt_clk_init(int soc_type) soc_type == OMAP3_SOC_OMAP3630) ti_dt_clocks_register(omap36xx_omap3430es2plus_clks); - if (soc_type == OMAP3_SOC_OMAP3430_ES1 || - soc_type == OMAP3_SOC_OMAP3430_ES2_PLUS || - soc_type == OMAP3_SOC_OMAP3630) - ti_dt_clocks_register(omap34xx_omap36xx_clks); - - if (soc_type == OMAP3_SOC_OMAP3630) - ti_dt_clocks_register(omap36xx_clks); - omap2_clk_disable_autoidle_all(); + ti_clk_add_aliases(); + omap2_clk_enable_init_clocks(enable_init_clks, ARRAY_SIZE(enable_init_clks));
Most of the clock aliases are no longer needed, only leave the ones required by OMAP timer code in place. Signed-off-by: Tero Kristo <t-kristo@ti.com> --- drivers/clk/ti/clk-3xxx.c | 263 +--------------------------------------------- 1 file changed, 2 insertions(+), 261 deletions(-) -- 1.9.1 -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html