Skip to content

Commit 0b9a4a6

Browse files
committed
clk: ti: Fix missing omap5 mcbsp functional clock and aliases
We are using a wrong mcbsp functional clock. The interconnect target module driver provided clock for mcbsp is not same as the mcbsp functional clock known as the gfclk main_clk. The mcbsp functional clocks for mcbsp should have been added before we dropped the legacy platform data. Additionally we are also missing the clock aliases for the clocks used by the audio driver if reparenting is needed. This causes audio driver errors like "CLKS: could not clk_get() prcm_fck" for mcbsp as reported by Andreas. The mcbsp clock aliases too should have been added before we dropped the legacy platform data. Let's add the clocks and aliases with a single patch to fix the issue similar to omap4. On omap5, there is no mcbsp4 instance on the l4_per interconnect. Fixes: b1da0fa ("ARM: OMAP2+: Drop legacy platform data for omap5 mcbsp") Cc: H. Nikolaus Schaller <[email protected]> Reported-by: Andreas Kemnade <[email protected]> Reported-by: Péter Ujfalusi <[email protected]> Acked-by: Stephen Boyd <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
1 parent cc2d819 commit 0b9a4a6

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

arch/arm/boot/dts/ti/omap/omap5-l4-abe.dtsi

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@
109109
reg = <0x0 0xff>, /* MPU private access */
110110
<0x49022000 0xff>; /* L3 Interconnect */
111111
reg-names = "mpu", "dma";
112+
clocks = <&abe_clkctrl OMAP5_MCBSP1_CLKCTRL 24>;
113+
clock-names = "fck";
112114
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
113115
interrupt-names = "common";
114116
ti,buffer-size = <128>;
@@ -142,6 +144,8 @@
142144
reg = <0x0 0xff>, /* MPU private access */
143145
<0x49024000 0xff>; /* L3 Interconnect */
144146
reg-names = "mpu", "dma";
147+
clocks = <&abe_clkctrl OMAP5_MCBSP2_CLKCTRL 24>;
148+
clock-names = "fck";
145149
interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
146150
interrupt-names = "common";
147151
ti,buffer-size = <128>;
@@ -175,6 +179,8 @@
175179
reg = <0x0 0xff>, /* MPU private access */
176180
<0x49026000 0xff>; /* L3 Interconnect */
177181
reg-names = "mpu", "dma";
182+
clocks = <&abe_clkctrl OMAP5_MCBSP3_CLKCTRL 24>;
183+
clock-names = "fck";
178184
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
179185
interrupt-names = "common";
180186
ti,buffer-size = <128>;

drivers/clk/ti/clk-54xx.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -565,15 +565,19 @@ static struct ti_dt_clk omap54xx_clks[] = {
565565
DT_CLK(NULL, "gpio8_dbclk", "l4per-clkctrl:00f8:8"),
566566
DT_CLK(NULL, "mcbsp1_gfclk", "abe-clkctrl:0028:24"),
567567
DT_CLK(NULL, "mcbsp1_sync_mux_ck", "abe-clkctrl:0028:26"),
568+
DT_CLK("40122000.mcbsp", "prcm_fck", "abe-clkctrl:0028:26"),
568569
DT_CLK(NULL, "mcbsp2_gfclk", "abe-clkctrl:0030:24"),
569570
DT_CLK(NULL, "mcbsp2_sync_mux_ck", "abe-clkctrl:0030:26"),
571+
DT_CLK("40124000.mcbsp", "prcm_fck", "abe-clkctrl:0030:26"),
570572
DT_CLK(NULL, "mcbsp3_gfclk", "abe-clkctrl:0038:24"),
571573
DT_CLK(NULL, "mcbsp3_sync_mux_ck", "abe-clkctrl:0038:26"),
574+
DT_CLK("40126000.mcbsp", "prcm_fck", "abe-clkctrl:0038:26"),
572575
DT_CLK(NULL, "mmc1_32khz_clk", "l3init-clkctrl:0008:8"),
573576
DT_CLK(NULL, "mmc1_fclk", "l3init-clkctrl:0008:25"),
574577
DT_CLK(NULL, "mmc1_fclk_mux", "l3init-clkctrl:0008:24"),
575578
DT_CLK(NULL, "mmc2_fclk", "l3init-clkctrl:0010:25"),
576579
DT_CLK(NULL, "mmc2_fclk_mux", "l3init-clkctrl:0010:24"),
580+
DT_CLK(NULL, "pad_fck", "pad_clks_ck"),
577581
DT_CLK(NULL, "sata_ref_clk", "l3init-clkctrl:0068:8"),
578582
DT_CLK(NULL, "timer10_gfclk_mux", "l4per-clkctrl:0008:24"),
579583
DT_CLK(NULL, "timer11_gfclk_mux", "l4per-clkctrl:0010:24"),

0 commit comments

Comments
 (0)