Skip to content

Commit 17529d4

Browse files
committed
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: f711c57 ("ARM: dts: am335x: Add l4 interconnect hierarchy and ti-sysc data") Cc: Jyri Sarha <[email protected]> Cc: Keerthy <[email protected]> Cc: Robert Nelson <[email protected]> Cc: Suman Anna <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
1 parent 8ad8041 commit 17529d4

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

arch/arm/boot/dts/am33xx-l4.dtsi

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2038,7 +2038,9 @@
20382038
reg = <0xe000 0x4>,
20392039
<0xe054 0x4>;
20402040
reg-names = "rev", "sysc";
2041-
ti,sysc-midle ;
2041+
ti,sysc-midle = <SYSC_IDLE_FORCE>,
2042+
<SYSC_IDLE_NO>,
2043+
<SYSC_IDLE_SMART>;
20422044
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
20432045
<SYSC_IDLE_NO>,
20442046
<SYSC_IDLE_SMART>;

arch/arm/mach-omap2/omap_hwmod_33xx_data.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,9 @@ static struct omap_hwmod am33xx_control_hwmod = {
231231
static struct omap_hwmod_class_sysconfig lcdc_sysc = {
232232
.rev_offs = 0x0,
233233
.sysc_offs = 0x54,
234-
.sysc_flags = (SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE),
235-
.idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
234+
.sysc_flags = SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE,
235+
.idlemodes = SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
236+
MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART,
236237
.sysc_fields = &omap_hwmod_sysc_type2,
237238
};
238239

0 commit comments

Comments
 (0)