Skip to content

Commit 3c50ffb

Browse files
arndbarndb
committed
Merge tag 'omap-for-v6.6/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes
Fixes for omaps and ti-sysc Fixes for several ti-sysc interconnect target module driver issues for external abort on non-linefetch, am35x soc match, and uart module quirks handling needed for devices to work and to allow device wake-up to work. Fixes for droid4 boot time errors and warnings as noticed after boot doing dmesg -lerr,warn. Let's also cut down the debug uart noise by using overrun-throttle-ms, and downgrade the u-boot version warnings to debug statements to further reduce the boot time noise with warnings. * tag 'omap-for-v6.6/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: bus: ti-sysc: Fix SYSC_QUIRK_SWSUP_SIDLE_ACT handling for uart wake-up ARM: omap2+: Downgrade u-boot version warnings to debug statements ARM: dts: ti: omap: Fix noisy serial with overrun-throttle-ms for mapphone ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot ARM: dts: ti: omap: Fix bandgap thermal cells addressing for omap3/4 bus: ti-sysc: Fix missing AM35xx SoC matching bus: ti-sysc: Use fsleep() instead of usleep_range() in sysc_reset() Link: https://lore.kernel.org/r/pull-1695715881-95183@atomide.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 59a98f4 + 06f114c commit 3c50ffb

7 files changed

Lines changed: 34 additions & 16 deletions

File tree

‎arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -614,12 +614,12 @@
614614
/* Configure pwm clock source for timers 8 & 9 */
615615
&timer8 {
616616
assigned-clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>;
617-
assigned-clock-parents = <&sys_clkin_ck>;
617+
assigned-clock-parents = <&sys_32k_ck>;
618618
};
619619

620620
&timer9 {
621621
assigned-clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>;
622-
assigned-clock-parents = <&sys_clkin_ck>;
622+
assigned-clock-parents = <&sys_32k_ck>;
623623
};
624624

625625
/*
@@ -640,6 +640,7 @@
640640
&uart3 {
641641
interrupts-extended = <&wakeupgen GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH
642642
&omap4_pmx_core 0x17c>;
643+
overrun-throttle-ms = <500>;
643644
};
644645

645646
&uart4 {

‎arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ cpu_thermal: cpu-thermal {
1212
polling-delay = <1000>; /* milliseconds */
1313
coefficients = <0 20000>;
1414

15-
/* sensor ID */
16-
thermal-sensors = <&bandgap 0>;
15+
thermal-sensors = <&bandgap>;
1716

1817
cpu_trips: trips {
1918
cpu_alert0: cpu_alert {

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ cpu_thermal: cpu_thermal {
1212
polling-delay-passive = <250>; /* milliseconds */
1313
polling-delay = <1000>; /* milliseconds */
1414

15-
/* sensor ID */
15+
/*
16+
* See 44xx files for single sensor addressing, omap5 and dra7 need
17+
* also sensor ID for addressing.
18+
*/
1619
thermal-sensors = <&bandgap 0>;
1720

1821
cpu_trips: trips {

‎arch/arm/boot/dts/ti/omap/omap443x.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
};
7070

7171
&cpu_thermal {
72+
thermal-sensors = <&bandgap>;
7273
coefficients = <0 20000>;
7374
};
7475

‎arch/arm/boot/dts/ti/omap/omap4460.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
};
8080

8181
&cpu_thermal {
82+
thermal-sensors = <&bandgap>;
8283
coefficients = <348 (-9301)>;
8384
};
8485

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ static int omap4_pm_suspend(void)
9999
* possible causes.
100100
* http://www.spinics.net/lists/arm-kernel/msg218641.html
101101
*/
102-
pr_warn("A possible cause could be an old bootloader - try u-boot >= v2012.07\n");
102+
pr_debug("A possible cause could be an old bootloader - try u-boot >= v2012.07\n");
103103
} else {
104104
pr_info("Successfully put all powerdomains to target state\n");
105105
}
@@ -257,7 +257,7 @@ int __init omap4_pm_init(void)
257257
* http://www.spinics.net/lists/arm-kernel/msg218641.html
258258
*/
259259
if (cpu_is_omap44xx())
260-
pr_warn("OMAP4 PM: u-boot >= v2012.07 is required for full PM support\n");
260+
pr_debug("OMAP4 PM: u-boot >= v2012.07 is required for full PM support\n");
261261

262262
ret = pwrdm_for_each(pwrdms_setup, NULL);
263263
if (ret) {

‎drivers/bus/ti-sysc.c‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ enum sysc_soc {
3838
SOC_2420,
3939
SOC_2430,
4040
SOC_3430,
41+
SOC_AM35,
4142
SOC_3630,
4243
SOC_4430,
4344
SOC_4460,
@@ -1097,6 +1098,11 @@ static int sysc_enable_module(struct device *dev)
10971098
if (ddata->cfg.quirks & (SYSC_QUIRK_SWSUP_SIDLE |
10981099
SYSC_QUIRK_SWSUP_SIDLE_ACT)) {
10991100
best_mode = SYSC_IDLE_NO;
1101+
1102+
/* Clear WAKEUP */
1103+
if (regbits->enwkup_shift >= 0 &&
1104+
ddata->cfg.sysc_val & BIT(regbits->enwkup_shift))
1105+
reg &= ~BIT(regbits->enwkup_shift);
11001106
} else {
11011107
best_mode = fls(ddata->cfg.sidlemodes) - 1;
11021108
if (best_mode > SYSC_IDLE_MASK) {
@@ -1224,6 +1230,13 @@ static int sysc_disable_module(struct device *dev)
12241230
}
12251231
}
12261232

1233+
if (ddata->cfg.quirks & SYSC_QUIRK_SWSUP_SIDLE_ACT) {
1234+
/* Set WAKEUP */
1235+
if (regbits->enwkup_shift >= 0 &&
1236+
ddata->cfg.sysc_val & BIT(regbits->enwkup_shift))
1237+
reg |= BIT(regbits->enwkup_shift);
1238+
}
1239+
12271240
reg &= ~(SYSC_IDLE_MASK << regbits->sidle_shift);
12281241
reg |= best_mode << regbits->sidle_shift;
12291242
if (regbits->autoidle_shift >= 0 &&
@@ -1518,16 +1531,16 @@ struct sysc_revision_quirk {
15181531
static const struct sysc_revision_quirk sysc_revision_quirks[] = {
15191532
/* These drivers need to be fixed to not use pm_runtime_irq_safe() */
15201533
SYSC_QUIRK("uart", 0, 0x50, 0x54, 0x58, 0x00000046, 0xffffffff,
1521-
SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_LEGACY_IDLE),
1534+
SYSC_QUIRK_SWSUP_SIDLE_ACT | SYSC_QUIRK_LEGACY_IDLE),
15221535
SYSC_QUIRK("uart", 0, 0x50, 0x54, 0x58, 0x00000052, 0xffffffff,
1523-
SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_LEGACY_IDLE),
1536+
SYSC_QUIRK_SWSUP_SIDLE_ACT | SYSC_QUIRK_LEGACY_IDLE),
15241537
/* Uarts on omap4 and later */
15251538
SYSC_QUIRK("uart", 0, 0x50, 0x54, 0x58, 0x50411e03, 0xffff00ff,
1526-
SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_LEGACY_IDLE),
1539+
SYSC_QUIRK_SWSUP_SIDLE_ACT | SYSC_QUIRK_LEGACY_IDLE),
15271540
SYSC_QUIRK("uart", 0, 0x50, 0x54, 0x58, 0x47422e03, 0xffffffff,
1528-
SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_LEGACY_IDLE),
1541+
SYSC_QUIRK_SWSUP_SIDLE_ACT | SYSC_QUIRK_LEGACY_IDLE),
15291542
SYSC_QUIRK("uart", 0, 0x50, 0x54, 0x58, 0x47424e03, 0xffffffff,
1530-
SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_LEGACY_IDLE),
1543+
SYSC_QUIRK_SWSUP_SIDLE_ACT | SYSC_QUIRK_LEGACY_IDLE),
15311544

15321545
/* Quirks that need to be set based on the module address */
15331546
SYSC_QUIRK("mcpdm", 0x40132000, 0, 0x10, -ENODEV, 0x50000800, 0xffffffff,
@@ -1862,7 +1875,7 @@ static void sysc_pre_reset_quirk_dss(struct sysc *ddata)
18621875
dev_warn(ddata->dev, "%s: timed out %08x !+ %08x\n",
18631876
__func__, val, irq_mask);
18641877

1865-
if (sysc_soc->soc == SOC_3430) {
1878+
if (sysc_soc->soc == SOC_3430 || sysc_soc->soc == SOC_AM35) {
18661879
/* Clear DSS_SDI_CONTROL */
18671880
sysc_write(ddata, 0x44, 0);
18681881

@@ -2150,8 +2163,7 @@ static int sysc_reset(struct sysc *ddata)
21502163
}
21512164

21522165
if (ddata->cfg.srst_udelay)
2153-
usleep_range(ddata->cfg.srst_udelay,
2154-
ddata->cfg.srst_udelay * 2);
2166+
fsleep(ddata->cfg.srst_udelay);
21552167

21562168
if (ddata->post_reset_quirk)
21572169
ddata->post_reset_quirk(ddata);
@@ -3025,6 +3037,7 @@ static void ti_sysc_idle(struct work_struct *work)
30253037
static const struct soc_device_attribute sysc_soc_match[] = {
30263038
SOC_FLAG("OMAP242*", SOC_2420),
30273039
SOC_FLAG("OMAP243*", SOC_2430),
3040+
SOC_FLAG("AM35*", SOC_AM35),
30283041
SOC_FLAG("OMAP3[45]*", SOC_3430),
30293042
SOC_FLAG("OMAP3[67]*", SOC_3630),
30303043
SOC_FLAG("OMAP443*", SOC_4430),
@@ -3229,7 +3242,7 @@ static int sysc_check_active_timer(struct sysc *ddata)
32293242
* can be dropped if we stop supporting old beagleboard revisions
32303243
* A to B4 at some point.
32313244
*/
3232-
if (sysc_soc->soc == SOC_3430)
3245+
if (sysc_soc->soc == SOC_3430 || sysc_soc->soc == SOC_AM35)
32333246
error = -ENXIO;
32343247
else
32353248
error = -EBUSY;

0 commit comments

Comments
 (0)