summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2019-09-24 12:25:51 -0400
committerTony Lindgren <tony@atomide.com>2019-09-25 13:07:27 -0400
commit17529d43b21c72466e9109d602c6f5c360a1a9e8 (patch)
tree68c83634d5b6db1ce408ec2cdb91331ce4643f18
parent8ad8041b98c665b6147e607b749586d6e20ba73a (diff)
ARM: OMAP2+: Add missing LCDC midlemode for am335x
TRM "Table 13-34. SYSCONFIG Register Field Descriptions" lists both standbymode and idlemode that should be just the sidle and midle registers where midle is currently unconfigured for lcdc_sysc. As the dts data has been generated based on lcdc_sysc, we now have an empty "ti,sysc-midle" property. And so we currently get a warning for lcdc because of a difference with dts provided configuration compared to the legacy platform data. This is because lcdc has SYSC_HAS_MIDLEMODE configured in the platform data without configuring the modes. Let's fix the issue by adding the missing midlemode to lcdc_sysc, and configuring the "ti,sysc-midle" property based on the TRM values. Fixes: f711c575cfec ("ARM: dts: am335x: Add l4 interconnect hierarchy and ti-sysc data") Cc: Jyri Sarha <jsarha@ti.com> Cc: Keerthy <j-keerthy@ti.com> Cc: Robert Nelson <robertcnelson@gmail.com> Cc: Suman Anna <s-anna@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/boot/dts/am33xx-l4.dtsi4
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_33xx_data.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi
index 1515f4f91499..3287cf695b5a 100644
--- a/arch/arm/boot/dts/am33xx-l4.dtsi
+++ b/arch/arm/boot/dts/am33xx-l4.dtsi
@@ -2038,7 +2038,9 @@
2038 reg = <0xe000 0x4>, 2038 reg = <0xe000 0x4>,
2039 <0xe054 0x4>; 2039 <0xe054 0x4>;
2040 reg-names = "rev", "sysc"; 2040 reg-names = "rev", "sysc";
2041 ti,sysc-midle ; 2041 ti,sysc-midle = <SYSC_IDLE_FORCE>,
2042 <SYSC_IDLE_NO>,
2043 <SYSC_IDLE_SMART>;
2042 ti,sysc-sidle = <SYSC_IDLE_FORCE>, 2044 ti,sysc-sidle = <SYSC_IDLE_FORCE>,
2043 <SYSC_IDLE_NO>, 2045 <SYSC_IDLE_NO>,
2044 <SYSC_IDLE_SMART>; 2046 <SYSC_IDLE_SMART>;
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
index c965af275e34..81d9912f17c8 100644
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
@@ -231,8 +231,9 @@ static struct omap_hwmod am33xx_control_hwmod = {
231static struct omap_hwmod_class_sysconfig lcdc_sysc = { 231static struct omap_hwmod_class_sysconfig lcdc_sysc = {
232 .rev_offs = 0x0, 232 .rev_offs = 0x0,
233 .sysc_offs = 0x54, 233 .sysc_offs = 0x54,
234 .sysc_flags = (SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE), 234 .sysc_flags = SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE,
235 .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART), 235 .idlemodes = SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
236 MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART,
236 .sysc_fields = &omap_hwmod_sysc_type2, 237 .sysc_fields = &omap_hwmod_sysc_type2,
237}; 238};
238 239