Skip to content

Commit eaf16b9

Browse files
arndbarndb
committed
Merge tag 'omap-fixes-audio-clock-and-modem-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes
Few minor fixes for omaps Regression fixes for mcbsp audio clock, and for ams-delta modem. And two warning fixes. These all can be merged whenever and are not urgent by any means. Feel free to defer to the merge window unless other fixes are still pending. * tag 'omap-fixes-audio-clock-and-modem-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: clk: ti: Fix missing omap5 mcbsp functional clock and aliases clk: ti: Fix missing omap4 mcbsp functional clock and aliases ARM: OMAP1: ams-delta: Fix MODEM initialization failure ARM: OMAP: timer32K: fix all kernel-doc warnings ARM: omap2: fix a debug printk Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 5e8a5e8 + 0b9a4a6 commit eaf16b9

File tree

8 files changed

+47
-52
lines changed

8 files changed

+47
-52
lines changed

‎arch/arm/boot/dts/ti/omap/omap4-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 OMAP4_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 OMAP4_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 OMAP4_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>;

‎arch/arm/boot/dts/ti/omap/omap4-l4.dtsi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2043,6 +2043,8 @@
20432043
compatible = "ti,omap4-mcbsp";
20442044
reg = <0x0 0xff>; /* L4 Interconnect */
20452045
reg-names = "mpu";
2046+
clocks = <&l4_per_clkctrl OMAP4_MCBSP4_CLKCTRL 24>;
2047+
clock-names = "fck";
20462048
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
20472049
interrupt-names = "common";
20482050
ti,buffer-size = <128>;

‎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>;

‎arch/arm/mach-omap1/board-ams-delta.c‎

Lines changed: 16 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,7 @@ static struct platform_device *ams_delta_devices[] __initdata = {
550550
&ams_delta_nand_device,
551551
&ams_delta_lcd_device,
552552
&cx20442_codec_device,
553+
&modem_nreset_device,
553554
};
554555

555556
static struct gpiod_lookup_table *ams_delta_gpio_tables[] __initdata = {
@@ -782,26 +783,28 @@ static struct plat_serial8250_port ams_delta_modem_ports[] = {
782783
{ },
783784
};
784785

786+
static int ams_delta_modem_pm_activate(struct device *dev)
787+
{
788+
modem_priv.regulator = regulator_get(dev, "RESET#");
789+
if (IS_ERR(modem_priv.regulator))
790+
return -EPROBE_DEFER;
791+
792+
return 0;
793+
}
794+
795+
static struct dev_pm_domain ams_delta_modem_pm_domain = {
796+
.activate = ams_delta_modem_pm_activate,
797+
};
798+
785799
static struct platform_device ams_delta_modem_device = {
786800
.name = "serial8250",
787801
.id = PLAT8250_DEV_PLATFORM1,
788802
.dev = {
789803
.platform_data = ams_delta_modem_ports,
804+
.pm_domain = &ams_delta_modem_pm_domain,
790805
},
791806
};
792807

793-
static int __init modem_nreset_init(void)
794-
{
795-
int err;
796-
797-
err = platform_device_register(&modem_nreset_device);
798-
if (err)
799-
pr_err("Couldn't register the modem regulator device\n");
800-
801-
return err;
802-
}
803-
804-
805808
/*
806809
* This function expects MODEM IRQ number already assigned to the port.
807810
* The MODEM device requires its RESET# pin kept high during probe.
@@ -833,37 +836,6 @@ static int __init ams_delta_modem_init(void)
833836
}
834837
arch_initcall_sync(ams_delta_modem_init);
835838

836-
static int __init late_init(void)
837-
{
838-
int err;
839-
840-
err = modem_nreset_init();
841-
if (err)
842-
return err;
843-
844-
/*
845-
* Once the modem device is registered, the modem_nreset
846-
* regulator can be requested on behalf of that device.
847-
*/
848-
modem_priv.regulator = regulator_get(&ams_delta_modem_device.dev,
849-
"RESET#");
850-
if (IS_ERR(modem_priv.regulator)) {
851-
err = PTR_ERR(modem_priv.regulator);
852-
goto unregister;
853-
}
854-
return 0;
855-
856-
unregister:
857-
platform_device_unregister(&ams_delta_modem_device);
858-
return err;
859-
}
860-
861-
static void __init ams_delta_init_late(void)
862-
{
863-
omap1_init_late();
864-
late_init();
865-
}
866-
867839
static void __init ams_delta_map_io(void)
868840
{
869841
omap1_map_io();
@@ -877,7 +849,7 @@ MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)")
877849
.init_early = omap1_init_early,
878850
.init_irq = omap1_init_irq,
879851
.init_machine = ams_delta_init,
880-
.init_late = ams_delta_init_late,
852+
.init_late = omap1_init_late,
881853
.init_time = omap1_timer_init,
882854
.restart = omap1_restart,
883855
MACHINE_END

‎arch/arm/mach-omap1/timer32k.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -176,17 +176,18 @@ static u64 notrace omap_32k_read_sched_clock(void)
176176
return sync32k_cnt_reg ? readl_relaxed(sync32k_cnt_reg) : 0;
177177
}
178178

179+
static struct timespec64 persistent_ts;
180+
static cycles_t cycles;
181+
static unsigned int persistent_mult, persistent_shift;
182+
179183
/**
180184
* omap_read_persistent_clock64 - Return time from a persistent clock.
185+
* @ts: &struct timespec64 for the returned time
181186
*
182187
* Reads the time from a source which isn't disabled during PM, the
183188
* 32k sync timer. Convert the cycles elapsed since last read into
184189
* nsecs and adds to a monotonically increasing timespec64.
185190
*/
186-
static struct timespec64 persistent_ts;
187-
static cycles_t cycles;
188-
static unsigned int persistent_mult, persistent_shift;
189-
190191
static void omap_read_persistent_clock64(struct timespec64 *ts)
191192
{
192193
unsigned long long nsecs;
@@ -206,10 +207,9 @@ static void omap_read_persistent_clock64(struct timespec64 *ts)
206207
/**
207208
* omap_init_clocksource_32k - setup and register counter 32k as a
208209
* kernel clocksource
209-
* @pbase: base addr of counter_32k module
210-
* @size: size of counter_32k to map
210+
* @vbase: base addr of counter_32k module
211211
*
212-
* Returns 0 upon success or negative error code upon failure.
212+
* Returns: %0 upon success or negative error code upon failure.
213213
*
214214
*/
215215
static int __init omap_init_clocksource_32k(void __iomem *vbase)

‎arch/arm/mach-omap2/omap_hwmod.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2209,7 +2209,7 @@ int omap_hwmod_parse_module_range(struct omap_hwmod *oh,
22092209
return err;
22102210

22112211
pr_debug("omap_hwmod: %s %pOFn at %pR\n",
2212-
oh->name, np, &res);
2212+
oh->name, np, res);
22132213

22142214
if (oh && oh->mpu_rt_idx) {
22152215
omap_hwmod_fix_mpu_rt_idx(oh, np, res);

‎drivers/clk/ti/clk-44xx.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -749,9 +749,14 @@ static struct ti_dt_clk omap44xx_clks[] = {
749749
DT_CLK(NULL, "mcbsp1_sync_mux_ck", "abe-clkctrl:0028:26"),
750750
DT_CLK(NULL, "mcbsp2_sync_mux_ck", "abe-clkctrl:0030:26"),
751751
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"),
752755
DT_CLK(NULL, "mcbsp4_sync_mux_ck", "l4-per-clkctrl:00c0:26"),
756+
DT_CLK("48096000.mcbsp", "prcm_fck", "l4-per-clkctrl:00c0:26"),
753757
DT_CLK(NULL, "ocp2scp_usb_phy_phy_48m", "l3-init-clkctrl:00c0:8"),
754758
DT_CLK(NULL, "otg_60m_gfclk", "l3-init-clkctrl:0040:24"),
759+
DT_CLK(NULL, "pad_fck", "pad_clks_ck"),
755760
DT_CLK(NULL, "per_mcbsp4_gfclk", "l4-per-clkctrl:00c0:24"),
756761
DT_CLK(NULL, "pmd_stm_clock_mux_ck", "emu-sys-clkctrl:0000:20"),
757762
DT_CLK(NULL, "pmd_trace_clk_mux_ck", "emu-sys-clkctrl:0000:22"),

‎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)