diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-28 11:48:33 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-28 11:48:33 -0400 |
| commit | 1e7f4cfec7a377798b3ab023e910eea9a7b94438 (patch) | |
| tree | 66b7eab25cc317c9b6b8529b1131e474c8bd0cc8 | |
| parent | 8e4bcfeaecc30eae9da75f8d5f2d45a8c6f08509 (diff) | |
| download | longterm-queue-5.2-1e7f4cfec7a377798b3ab023e910eea9a7b94438.tar.gz | |
bus: ti-sysc: ENODEV vs. hard coded integers
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/bus-ti-sysc-Add-missing-quirk-flags-for-usb_host_hs.patch | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/queue/bus-ti-sysc-Add-missing-quirk-flags-for-usb_host_hs.patch b/queue/bus-ti-sysc-Add-missing-quirk-flags-for-usb_host_hs.patch index 2376dbe1..d6094c91 100644 --- a/queue/bus-ti-sysc-Add-missing-quirk-flags-for-usb_host_hs.patch +++ b/queue/bus-ti-sysc-Add-missing-quirk-flags-for-usb_host_hs.patch @@ -1,4 +1,4 @@ -From 4254632dba27271f6de66efd87e444ee405dee29 Mon Sep 17 00:00:00 2001 +From dc881e740d189865d46a599f2b9f2709db242a33 Mon Sep 17 00:00:00 2001 From: Tony Lindgren <tony@atomide.com> Date: Mon, 13 Jul 2020 09:59:47 -0700 Subject: [PATCH] bus: ti-sysc: Add missing quirk flags for usb_host_hs @@ -11,31 +11,32 @@ configure SWSUP_SIDLE and SWSUP_MSTANDBY quirks for usb_host_hs. These are needed to drop the legacy platform data for usb_host_hs. Signed-off-by: Tony Lindgren <tony@atomide.com> +[PG: use -1 vs. -ENODEV ; see v5.7-rc1~99^2~5^2~11.] diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c -index 3affd180baac..78fc3da39088 100644 +index 8fb90245f7b6..801c39ca46a5 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c -@@ -1330,6 +1330,10 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = { - SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_SWSUP_MSTANDBY), - SYSC_QUIRK("tptc", 0, 0, -ENODEV, -ENODEV, 0x40007c00, 0xffffffff, - SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_SWSUP_MSTANDBY), +@@ -1109,6 +1109,10 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = { + SYSC_QUIRK_LEGACY_IDLE), + SYSC_QUIRK("smartreflex", 0, -1, 0x24, -1, 0x00000000, 0xffffffff, + SYSC_QUIRK_LEGACY_IDLE), + SYSC_QUIRK("usb_host_hs", 0, 0, 0x10, 0x14, 0x50700100, 0xffffffff, + SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_SWSUP_MSTANDBY), -+ SYSC_QUIRK("usb_host_hs", 0, 0, 0x10, -ENODEV, 0x50700101, 0xffffffff, ++ SYSC_QUIRK("usb_host_hs", 0, 0, 0x10, -1, 0x50700101, 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, -ENODEV, 0x4ea2080d, 0xffffffff, -@@ -1408,8 +1412,6 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = { - SYSC_QUIRK("tpcc", 0, 0, -ENODEV, -ENODEV, 0x40014c00, 0xffffffff, 0), + SYSC_QUIRK("smartreflex", 0, -1, 0x38, -1, 0x00000000, 0xffffffff, + SYSC_QUIRK_LEGACY_IDLE), + SYSC_QUIRK("timer", 0, 0, 0x10, 0x14, 0x00000015, 0xffffffff, +@@ -1181,8 +1185,6 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = { + SYSC_QUIRK("timer32k", 0, 0, 0x4, -1, 0x00000060, 0xffffffff, 0), SYSC_QUIRK("usbhstll", 0, 0, 0x10, 0x14, 0x00000004, 0xffffffff, 0), SYSC_QUIRK("usbhstll", 0, 0, 0x10, 0x14, 0x00000008, 0xffffffff, 0), - SYSC_QUIRK("usb_host_hs", 0, 0, 0x10, 0x14, 0x50700100, 0xffffffff, 0), -- SYSC_QUIRK("usb_host_hs", 0, 0, 0x10, -ENODEV, 0x50700101, 0xffffffff, 0), - SYSC_QUIRK("venc", 0x58003000, 0, -ENODEV, -ENODEV, 0x00000002, 0xffffffff, 0), - SYSC_QUIRK("vfpe", 0, 0, 0x104, -ENODEV, 0x4d001200, 0xffffffff, 0), - #endif +- SYSC_QUIRK("usb_host_hs", 0, 0, 0x10, -1, 0x50700101, 0xffffffff, 0), + SYSC_QUIRK("usb_otg_hs", 0, 0x400, 0x404, 0x408, 0x00000050, + 0xffffffff, 0), + SYSC_QUIRK("wdt", 0, 0, 0x10, 0x14, 0x502a0500, 0xfffff0f0, 0), -- 2.27.0 |