bus: ti-sysc: Fix quirk flags for lcdc on am335x
Tony Lindgren
maintainerPATCH 1/1 bus: ti-sysc: Fix quirk flags for lcdc on am335x
Commit adb72394e2ab ("ARM: OMAP2+: Drop legacy platform data for am3 lcdc") dropped legacy platform data but we never added the quirks for SWSUP_SIDLE and SWSUP_MSTANDBY for lcdc for ti-sysc driver.
This breaks suspend/resume. Let's fix the issue by enabling the same quirks for ti-sysc driver as we had earlier with platform data.
---
This patch is against v5.6-rc series, it needs a merge conflict resolved for Linux next next is using -ENODEV instead of -1 for missing registers.
--- drivers/bus/ti-sysc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/bus/ti-sysc.c +2 -1
@@ -1266,6 +1266,8 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = {SYSC_QUIRK ("gpu" ,0x50000000 ,0x14 ,-1 ,-1 ,0x00010201 ,0xffffffff ,0 ),SYSC_QUIRK ("gpu" ,0x50000000 ,0xfe00 ,0xfe10 ,-1 ,0x40000000 ,0xffffffff ,SYSC_MODULE_QUIRK_SGX ), +SYSC_QUIRK ("lcdc" ,0 ,0 ,0x54 ,-1 ,0x4f201000 ,0xffffffff , +SYSC_QUIRK_SWSUP_SIDLE |SYSC_QUIRK_SWSUP_MSTANDBY ),SYSC_QUIRK ("usb_otg_hs" ,0 ,0x400 ,0x404 ,0x408 ,0x00000050 ,0xffffffff ,SYSC_QUIRK_SWSUP_SIDLE |SYSC_QUIRK_SWSUP_MSTANDBY ), SYSC_QUIRK("usb_otg_hs", 0, 0, 0x10, -1, 0x4ea2080d, 0xffffffff,
@@ -1294,7 +1296,6 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = {SYSC_QUIRK ("gpu" ,0 ,0xfe00 ,0xfe10 ,-1 ,0x40000000 ,0xffffffff ,0 ),SYSC_QUIRK ("hsi" ,0 ,0 ,0x10 ,0x14 ,0x50043101 ,0xffffffff ,0 ),SYSC_QUIRK ("iss" ,0 ,0 ,0x10 ,-1 ,0x40000101 ,0xffffffff ,0 ), -SYSC_QUIRK ("lcdc" ,0 ,0 ,0x54 ,-1 ,0x4f201000 ,0xffffffff ,0 ),SYSC_QUIRK ("mcasp" ,0 ,0 ,0x4 ,-1 ,0x44306302 ,0xffffffff ,0 ),SYSC_QUIRK ("mcasp" ,0 ,0 ,0x4 ,-1 ,0x44307b02 ,0xffffffff ,0 ), SYSC_QUIRK("mcbsp", 0, -1, 0x8c, -1, 0, 0, 0),
Signature · 1 line
2.25.1
Tony,
Quoted 15 lines · Tony Lindgren
Commit
adb72394e2ab("ARM: OMAP2+: Drop legacy platform data for am3 lcdc") dropped legacy platform data but we never added the quirks forSWSUP_SIDLEandSWSUP_MSTANDBYfor lcdc for ti-sysc driver.This breaks suspend/resume. Let's fix the issue by enabling the same quirks for ti-sysc driver as we had earlier with platform data.
Fixes adb72394e2ab ("ARM: OMAP2+: Drop legacy platform data for am3 lcdc")Fixes 23731eac9848 ("bus: ti-sysc: Detect devices on am335x when DEBUG is enabled")Reported-by Keerthy <[email protected]>Cc Jyri Sarha <[email protected]>Cc Keerthy <[email protected]>Cc Dave Gerlach <[email protected]>Cc Tero Kristo <[email protected]>Signed-off-by Tony Lindgren <[email protected]>
Quoted 4 lines
---
This patch is against v5.6-rc series, it needs a merge conflict resolved for Linux next next is using
-ENODEVinstead of -1 for missing registers.
Tested with v5.6-rc5, can confirm that suspend looks OK now and is exited without "pm33xx pm33xx: PM: Could not transition all powerdomains to target state" message with this patch.
Regards,
Dave
Quoted 26 lines
--- drivers/bus/ti-sysc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/bus/ti-sysc.c +2
-1@@ -1266,6 +1266,8 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = {SYSC_QUIRK ("gpu" ,0x50000000 ,0x14 ,-1 ,-1 ,0x00010201 ,0xffffffff ,0 ),SYSC_QUIRK ("gpu" ,0x50000000 ,0xfe00 ,0xfe10 ,-1 ,0x40000000 ,0xffffffff ,SYSC_MODULE_QUIRK_SGX ), +SYSC_QUIRK ("lcdc" ,0 ,0 ,0x54 ,-1 ,0x4f201000 ,0xffffffff , +SYSC_QUIRK_SWSUP_SIDLE |SYSC_QUIRK_SWSUP_MSTANDBY ),SYSC_QUIRK ("usb_otg_hs" ,0 ,0x400 ,0x404 ,0x408 ,0x00000050 ,0xffffffff ,SYSC_QUIRK_SWSUP_SIDLE |SYSC_QUIRK_SWSUP_MSTANDBY ), SYSC_QUIRK("usb_otg_hs", 0, 0, 0x10, -1, 0x4ea2080d, 0xffffffff,@@ -1294,7 +1296,6 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = {SYSC_QUIRK ("gpu" ,0 ,0xfe00 ,0xfe10 ,-1 ,0x40000000 ,0xffffffff ,0 ),SYSC_QUIRK ("hsi" ,0 ,0 ,0x10 ,0x14 ,0x50043101 ,0xffffffff ,0 ),SYSC_QUIRK ("iss" ,0 ,0 ,0x10 ,-1 ,0x40000101 ,0xffffffff ,0 ), -SYSC_QUIRK ("lcdc" ,0 ,0 ,0x54 ,-1 ,0x4f201000 ,0xffffffff ,0 ),SYSC_QUIRK ("mcasp" ,0 ,0 ,0x4 ,-1 ,0x44306302 ,0xffffffff ,0 ),SYSC_QUIRK ("mcasp" ,0 ,0 ,0x4 ,-1 ,0x44307b02 ,0xffffffff ,0 ), SYSC_QUIRK("mcbsp", 0, -1, 0x8c, -1, 0, 0, 0),