diff options
| author |   Tony Lindgren <tony@atomide.com> | 2020-03-10 09:06:02 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2020-03-10 09:06:02 -0700 |
| commit | aef067e8e95d856bc09557a91e740b2d6a81a6ae (patch) | |
| tree | a88c4bbfd924438f015e5c0a7edf2ae04b5b36cc /drivers/bus | |
| parent | bus: ti-sysc: Add support for PRUSS SYSC type (diff) | |
| parent | bus: ti-sysc: Fix quirk flags for lcdc on am335x (diff) | |
| download | linux-dev-aef067e8e95d856bc09557a91e740b2d6a81a6ae.tar.xz linux-dev-aef067e8e95d856bc09557a91e740b2d6a81a6ae.zip | |
Merge branch 'fix-lcdc-quirk' into omap-for-v5.7/ti-sysc
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/ti-sysc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index 86ac61fa5bc6..e5f5f48d69d2 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -1329,6 +1329,8 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = { SYSC_QUIRK("gpu", 0x50000000, 0x14, -ENODEV, -ENODEV, 0x00010201, 0xffffffff, 0), SYSC_QUIRK("gpu", 0x50000000, 0xfe00, 0xfe10, -ENODEV, 0x40000000 , 0xffffffff, SYSC_MODULE_QUIRK_SGX), + SYSC_QUIRK("lcdc", 0, 0, 0x54, -ENODEV, 0x4f201000, 0xffffffff, + SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_SWSUP_MSTANDBY), SYSC_QUIRK("rtc", 0, 0x74, 0x78, -ENODEV, 0x4eb01908, 0xffff00f0, SYSC_MODULE_QUIRK_RTC_UNLOCK), SYSC_QUIRK("tptc", 0, 0, 0x10, -ENODEV, 0x40006c00, 0xffffefff, @@ -1374,7 +1376,6 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = { SYSC_QUIRK("hdmi", 0, 0, 0x10, -ENODEV, 0x50031d00, 0xffffffff, 0), SYSC_QUIRK("hsi", 0, 0, 0x10, 0x14, 0x50043101, 0xffffffff, 0), SYSC_QUIRK("iss", 0, 0, 0x10, -ENODEV, 0x40000101, 0xffffffff, 0), - SYSC_QUIRK("lcdc", 0, 0, 0x54, -ENODEV, 0x4f201000, 0xffffffff, 0), SYSC_QUIRK("mcasp", 0, 0, 0x4, -ENODEV, 0x44306302, 0xffffffff, 0), SYSC_QUIRK("mcasp", 0, 0, 0x4, -ENODEV, 0x44307b02, 0xffffffff, 0), SYSC_QUIRK("mcbsp", 0, -ENODEV, 0x8c, -ENODEV, 0, 0, 0), |