Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: ti: Fix missing omap4 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.

Fixes: 349355ce3a05 ("ARM: OMAP2+: Drop legacy platform data for omap4 mcbsp")
Reported-by: Andreas Kemnade <andreas@kemnade.info>
Reported-by: Péter Ujfalusi <peter.ujfalusi@gmail.com>
Acked-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

+13
+6
arch/arm/boot/dts/ti/omap/omap4-l4-abe.dtsi
··· 109 109 reg = <0x0 0xff>, /* MPU private access */ 110 110 <0x49022000 0xff>; /* L3 Interconnect */ 111 111 reg-names = "mpu", "dma"; 112 + clocks = <&abe_clkctrl OMAP4_MCBSP1_CLKCTRL 24>; 113 + clock-names = "fck"; 112 114 interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; 113 115 interrupt-names = "common"; 114 116 ti,buffer-size = <128>; ··· 144 142 reg = <0x0 0xff>, /* MPU private access */ 145 143 <0x49024000 0xff>; /* L3 Interconnect */ 146 144 reg-names = "mpu", "dma"; 145 + clocks = <&abe_clkctrl OMAP4_MCBSP2_CLKCTRL 24>; 146 + clock-names = "fck"; 147 147 interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>; 148 148 interrupt-names = "common"; 149 149 ti,buffer-size = <128>; ··· 179 175 reg = <0x0 0xff>, /* MPU private access */ 180 176 <0x49026000 0xff>; /* L3 Interconnect */ 181 177 reg-names = "mpu", "dma"; 178 + clocks = <&abe_clkctrl OMAP4_MCBSP3_CLKCTRL 24>; 179 + clock-names = "fck"; 182 180 interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; 183 181 interrupt-names = "common"; 184 182 ti,buffer-size = <128>;
+2
arch/arm/boot/dts/ti/omap/omap4-l4.dtsi
··· 2043 2043 compatible = "ti,omap4-mcbsp"; 2044 2044 reg = <0x0 0xff>; /* L4 Interconnect */ 2045 2045 reg-names = "mpu"; 2046 + clocks = <&l4_per_clkctrl OMAP4_MCBSP4_CLKCTRL 24>; 2047 + clock-names = "fck"; 2046 2048 interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>; 2047 2049 interrupt-names = "common"; 2048 2050 ti,buffer-size = <128>;
+5
drivers/clk/ti/clk-44xx.c
··· 749 749 DT_CLK(NULL, "mcbsp1_sync_mux_ck", "abe-clkctrl:0028:26"), 750 750 DT_CLK(NULL, "mcbsp2_sync_mux_ck", "abe-clkctrl:0030:26"), 751 751 DT_CLK(NULL, "mcbsp3_sync_mux_ck", "abe-clkctrl:0038:26"), 752 + DT_CLK("40122000.mcbsp", "prcm_fck", "abe-clkctrl:0028:26"), 753 + DT_CLK("40124000.mcbsp", "prcm_fck", "abe-clkctrl:0030:26"), 754 + DT_CLK("40126000.mcbsp", "prcm_fck", "abe-clkctrl:0038:26"), 752 755 DT_CLK(NULL, "mcbsp4_sync_mux_ck", "l4-per-clkctrl:00c0:26"), 756 + DT_CLK("48096000.mcbsp", "prcm_fck", "l4-per-clkctrl:00c0:26"), 753 757 DT_CLK(NULL, "ocp2scp_usb_phy_phy_48m", "l3-init-clkctrl:00c0:8"), 754 758 DT_CLK(NULL, "otg_60m_gfclk", "l3-init-clkctrl:0040:24"), 759 + DT_CLK(NULL, "pad_fck", "pad_clks_ck"), 755 760 DT_CLK(NULL, "per_mcbsp4_gfclk", "l4-per-clkctrl:00c0:24"), 756 761 DT_CLK(NULL, "pmd_stm_clock_mux_ck", "emu-sys-clkctrl:0000:20"), 757 762 DT_CLK(NULL, "pmd_trace_clk_mux_ck", "emu-sys-clkctrl:0000:22"),