Skip to content

Commit 6b4670a

Browse files
olofjolofj
committed
Merge tag 'omap-for-v5.14/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc
Non-urgent fixes for omaps for v5.14 merge window Warn and block suspend for am335x unless the PM related modules and firmware are loaded and warn otherwise. Otherwise we easily end up with a suspended system with nothing capable of waking it up. We also drop a duplicated prototype for am33xx_init_early(). * tag 'omap-for-v5.14/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Block suspend for am3 and am4 if PM is not configured ARM: OMAP2+: remove duplicated prototype ARM: dts: dra7: Fix duplicate USB4 target module node ARM: OMAP1: ams-delta: remove unused function ams_delta_camera_power bus: ti-sysc: Fix flakey idling of uarts and stop using swsup_sidle_act bus: ti-sysc: Fix am335x resume hang for usb otg module ARM: OMAP2+: Fix build warning when mmc_omap is not built ARM: OMAP1: isp1301-omap: Add missing gpiod_add_lookup_table function ARM: OMAP1: Fix use of possibly uninitialized irq variable bus: ti-sysc: Fix missing quirk flags for sata Link: https://lore.kernel.org/r/pull-1624002812-396117@atomide.com Signed-off-by: Olof Johansson <olof@lixom.net>
2 parents 777cf27 + 093a474 commit 6b4670a

13 files changed

Lines changed: 156 additions & 104 deletions

File tree

‎arch/arm/boot/dts/am5718.dtsi‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,13 @@
1717
* VCP1, VCP2
1818
* MLB
1919
* ISS
20-
* USB3, USB4
20+
* USB3
2121
*/
2222

2323
&usb3_tm {
2424
status = "disabled";
2525
};
2626

27-
&usb4_tm {
28-
status = "disabled";
29-
};
30-
3127
&atl_tm {
3228
status = "disabled";
3329
};

‎arch/arm/boot/dts/dra7-l4.dtsi‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4129,28 +4129,6 @@
41294129
};
41304130
};
41314131

4132-
usb4_tm: target-module@140000 { /* 0x48940000, ap 75 3c.0 */
4133-
compatible = "ti,sysc-omap4", "ti,sysc";
4134-
reg = <0x140000 0x4>,
4135-
<0x140010 0x4>;
4136-
reg-names = "rev", "sysc";
4137-
ti,sysc-mask = <SYSC_OMAP4_DMADISABLE>;
4138-
ti,sysc-midle = <SYSC_IDLE_FORCE>,
4139-
<SYSC_IDLE_NO>,
4140-
<SYSC_IDLE_SMART>,
4141-
<SYSC_IDLE_SMART_WKUP>;
4142-
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
4143-
<SYSC_IDLE_NO>,
4144-
<SYSC_IDLE_SMART>,
4145-
<SYSC_IDLE_SMART_WKUP>;
4146-
/* Domains (P, C): l3init_pwrdm, l3init_clkdm */
4147-
clocks = <&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS4_CLKCTRL 0>;
4148-
clock-names = "fck";
4149-
#address-cells = <1>;
4150-
#size-cells = <1>;
4151-
ranges = <0x0 0x140000 0x20000>;
4152-
};
4153-
41544132
target-module@170000 { /* 0x48970000, ap 21 0a.0 */
41554133
compatible = "ti,sysc-omap4", "ti,sysc";
41564134
reg = <0x170010 0x4>;

‎arch/arm/boot/dts/dra71x.dtsi‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,3 @@
1111
&rtctarget {
1212
status = "disabled";
1313
};
14-
15-
&usb4_tm {
16-
status = "disabled";
17-
};

‎arch/arm/boot/dts/dra72x.dtsi‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,3 @@
108108
&pcie2_rc {
109109
compatible = "ti,dra726-pcie-rc", "ti,dra7-pcie";
110110
};
111-
112-
&usb4_tm {
113-
status = "disabled";
114-
};

‎arch/arm/boot/dts/dra74x.dtsi‎

Lines changed: 49 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -49,49 +49,6 @@
4949
reg = <0x41500000 0x100>;
5050
};
5151

52-
target-module@48940000 {
53-
compatible = "ti,sysc-omap4", "ti,sysc";
54-
reg = <0x48940000 0x4>,
55-
<0x48940010 0x4>;
56-
reg-names = "rev", "sysc";
57-
ti,sysc-mask = <SYSC_OMAP4_DMADISABLE>;
58-
ti,sysc-midle = <SYSC_IDLE_FORCE>,
59-
<SYSC_IDLE_NO>,
60-
<SYSC_IDLE_SMART>,
61-
<SYSC_IDLE_SMART_WKUP>;
62-
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
63-
<SYSC_IDLE_NO>,
64-
<SYSC_IDLE_SMART>,
65-
<SYSC_IDLE_SMART_WKUP>;
66-
clocks = <&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS4_CLKCTRL 0>;
67-
clock-names = "fck";
68-
#address-cells = <1>;
69-
#size-cells = <1>;
70-
ranges = <0x0 0x48940000 0x20000>;
71-
72-
omap_dwc3_4: omap_dwc3_4@0 {
73-
compatible = "ti,dwc3";
74-
reg = <0 0x10000>;
75-
interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>;
76-
#address-cells = <1>;
77-
#size-cells = <1>;
78-
utmi-mode = <2>;
79-
ranges;
80-
status = "disabled";
81-
usb4: usb@10000 {
82-
compatible = "snps,dwc3";
83-
reg = <0x10000 0x17000>;
84-
interrupts = <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
85-
<GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
86-
<GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>;
87-
interrupt-names = "peripheral",
88-
"host",
89-
"otg";
90-
maximum-speed = "high-speed";
91-
dr_mode = "otg";
92-
};
93-
};
94-
};
9552

9653
target-module@41501000 {
9754
compatible = "ti,sysc-omap2", "ti,sysc";
@@ -224,3 +181,52 @@
224181
&pcie2_rc {
225182
compatible = "ti,dra746-pcie-rc", "ti,dra7-pcie";
226183
};
184+
185+
&l4_per3 {
186+
segment@0 {
187+
usb4_tm: target-module@140000 { /* 0x48940000, ap 75 3c.0 */
188+
compatible = "ti,sysc-omap4", "ti,sysc";
189+
reg = <0x140000 0x4>,
190+
<0x140010 0x4>;
191+
reg-names = "rev", "sysc";
192+
ti,sysc-mask = <SYSC_OMAP4_DMADISABLE>;
193+
ti,sysc-midle = <SYSC_IDLE_FORCE>,
194+
<SYSC_IDLE_NO>,
195+
<SYSC_IDLE_SMART>,
196+
<SYSC_IDLE_SMART_WKUP>;
197+
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
198+
<SYSC_IDLE_NO>,
199+
<SYSC_IDLE_SMART>,
200+
<SYSC_IDLE_SMART_WKUP>;
201+
/* Domains (P, C): l3init_pwrdm, l3init_clkdm */
202+
clocks = <&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS4_CLKCTRL 0>;
203+
clock-names = "fck";
204+
#address-cells = <1>;
205+
#size-cells = <1>;
206+
ranges = <0x0 0x140000 0x20000>;
207+
208+
omap_dwc3_4: omap_dwc3_4@0 {
209+
compatible = "ti,dwc3";
210+
reg = <0 0x10000>;
211+
interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>;
212+
#address-cells = <1>;
213+
#size-cells = <1>;
214+
utmi-mode = <2>;
215+
ranges;
216+
status = "disabled";
217+
usb4: usb@10000 {
218+
compatible = "snps,dwc3";
219+
reg = <0x10000 0x17000>;
220+
interrupts = <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
221+
<GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
222+
<GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>;
223+
interrupt-names = "peripheral",
224+
"host",
225+
"otg";
226+
maximum-speed = "high-speed";
227+
dr_mode = "otg";
228+
};
229+
};
230+
};
231+
};
232+
};

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -458,20 +458,6 @@ static struct gpiod_lookup_table leds_gpio_table = {
458458

459459
#ifdef CONFIG_LEDS_TRIGGERS
460460
DEFINE_LED_TRIGGER(ams_delta_camera_led_trigger);
461-
462-
static int ams_delta_camera_power(struct device *dev, int power)
463-
{
464-
/*
465-
* turn on camera LED
466-
*/
467-
if (power)
468-
led_trigger_event(ams_delta_camera_led_trigger, LED_FULL);
469-
else
470-
led_trigger_event(ams_delta_camera_led_trigger, LED_OFF);
471-
return 0;
472-
}
473-
#else
474-
#define ams_delta_camera_power NULL
475461
#endif
476462

477463
static struct platform_device ams_delta_audio_device = {

‎arch/arm/mach-omap1/board-h2.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ static int tps_setup(struct i2c_client *client, void *context)
320320
{
321321
if (!IS_BUILTIN(CONFIG_TPS65010))
322322
return -ENOSYS;
323-
323+
324324
tps65010_config_vregs1(TPS_LDO2_ENABLE | TPS_VLDO2_3_0V |
325325
TPS_LDO1_ENABLE | TPS_VLDO1_3_0V);
326326

@@ -394,6 +394,8 @@ static void __init h2_init(void)
394394
BUG_ON(gpio_request(H2_NAND_RB_GPIO_PIN, "NAND ready") < 0);
395395
gpio_direction_input(H2_NAND_RB_GPIO_PIN);
396396

397+
gpiod_add_lookup_table(&isp1301_gpiod_table);
398+
397399
omap_cfg_reg(L3_1610_FLASH_CS2B_OE);
398400
omap_cfg_reg(M8_1610_FLASH_CS2B_WE);
399401

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -655,9 +655,13 @@ static int __init omap_pm_init(void)
655655
irq = INT_7XX_WAKE_UP_REQ;
656656
else if (cpu_is_omap16xx())
657657
irq = INT_1610_WAKE_UP_REQ;
658-
if (request_irq(irq, omap_wakeup_interrupt, 0, "peripheral wakeup",
659-
NULL))
660-
pr_err("Failed to request irq %d (peripheral wakeup)\n", irq);
658+
else
659+
irq = -1;
660+
661+
if (irq >= 0) {
662+
if (request_irq(irq, omap_wakeup_interrupt, 0, "peripheral wakeup", NULL))
663+
pr_err("Failed to request irq %d (peripheral wakeup)\n", irq);
664+
}
661665

662666
/* Program new power ramp-up time
663667
* (0 for most boards since we don't lower voltage when in deep sleep)

‎arch/arm/mach-omap2/board-n8x0.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@ static int n8x0_mmc_get_cover_state(struct device *dev, int slot)
322322

323323
static void n8x0_mmc_callback(void *data, u8 card_mask)
324324
{
325+
#ifdef CONFIG_MMC_OMAP
325326
int bit, *openp, index;
326327

327328
if (board_is_n800()) {
@@ -339,7 +340,6 @@ static void n8x0_mmc_callback(void *data, u8 card_mask)
339340
else
340341
*openp = 0;
341342

342-
#ifdef CONFIG_MMC_OMAP
343343
omap_mmc_notify_cover_event(mmc_device, index, *openp);
344344
#else
345345
pr_warn("MMC: notify cover event not available\n");

‎arch/arm/mach-omap2/common.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ void am33xx_init_early(void);
130130
void am35xx_init_early(void);
131131
void ti814x_init_early(void);
132132
void ti816x_init_early(void);
133-
void am33xx_init_early(void);
134133
void am43xx_init_early(void);
135134
void am43xx_init_late(void);
136135
void omap4430_init_early(void);

0 commit comments

Comments
 (0)