diff options
author | Greg Kroah-Hartman | 2020-05-25 08:55:12 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2020-05-25 08:55:12 +0200 |
commit | f7d8f3f092d001f8d91552d2697643e727694942 (patch) | |
tree | 0dfa61cc5b94eef94dfbaf1efdc362385792d0f2 /drivers/clk/ti/clk-33xx.c | |
parent | 2cd38fd15e4ebcfe917a443734820269f8b5ba2b (diff) | |
parent | 9cb1fd0efd195590b828b9b865421ad345a4a145 (diff) |
Merge 5.7-rc7 into driver-core-next
We need the driver core fixes in here as well
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clk/ti/clk-33xx.c')
-rw-r--r-- | drivers/clk/ti/clk-33xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/ti/clk-33xx.c b/drivers/clk/ti/clk-33xx.c index e001b9bcb6bf..7dc30dd6c8d5 100644 --- a/drivers/clk/ti/clk-33xx.c +++ b/drivers/clk/ti/clk-33xx.c @@ -212,7 +212,7 @@ static const struct omap_clkctrl_reg_data am3_mpu_clkctrl_regs[] __initconst = { }; static const struct omap_clkctrl_reg_data am3_l4_rtc_clkctrl_regs[] __initconst = { - { AM3_L4_RTC_RTC_CLKCTRL, NULL, CLKF_SW_SUP, "clk_32768_ck" }, + { AM3_L4_RTC_RTC_CLKCTRL, NULL, CLKF_SW_SUP, "clk-24mhz-clkctrl:0000:0" }, { 0 }, }; |