DSS fixes for v3.2-rc2

GIT PULL Tony Lindgren 3 participants 5 messages Nov 23, 2011 – Nov 29, 2011

lore

Share & tools

lore

Tony Lindgren

author

2011-11-23 23:55 UTC #0 lore raw

Hi Arnd,

This one has been separated out from the rest of the fixes.

If some of these need to go to stable, then Tomi should do the rebasing and send them to stable at vger.kernel.org as they don't apply cleanly on v3.1.

Regards,

Tony

The following changes since commit cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37:
Linus Torvalds (1):

        Linux 3.2-rc2

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap fixes-dss

Archit Taneja (1):
ARM: OMAP2PLUS: DSS: Ensure DSS works correctly if display is enabled in bootloader

Tomi Valkeinen (9):
ARM: OMAP2xxx: HWMOD: Fix DSS reset
ARM: OMAP2xxx: HWMOD: fix DSS clock data
ARM: OMAP3: HWMOD: Fix DSS reset
ARM: OMAP3: HWMOD: fix DSS clock data
ARM: OMAP4: HWMOD: remove extra clocks
ARM: OMAP4: HWMOD: Add HWMOD_CONTROL_OPT_CLKS_IN_RESET for dss_core
ARM: OMAP4: HWMOD: fix DSS clock data
ARM: OMAP2/3: HWMOD: Add SYSS_HAS_RESET_STATUS for dss
ARM: OMAP: HWMOD: Unify DSS resets for OMAPs

Tony Lindgren (1):
Merge branch 'hwmod_dss_fixes_3.2rc' of git://git.pwsan.com/linux-2.6 into fixes-dss

 arch/arm/mach-omap2/Makefile                       |    5 +-
 arch/arm/mach-omap2/display.c                      |  159 ++++++++++++++++++++
 arch/arm/mach-omap2/display.h                      |   29 ++++
 arch/arm/mach-omap2/omap_hwmod_2420_data.c         |   17 ++-
 arch/arm/mach-omap2/omap_hwmod_2430_data.c         |   17 ++-
 .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c |    5 +-
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |   37 ++++-
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |   24 ++--
 arch/arm/mach-omap2/omap_hwmod_common_data.c       |    4 +
 arch/arm/mach-omap2/omap_hwmod_common_data.h       |    4 +
 arch/arm/plat-omap/include/plat/common.h           |    3 +
 include/video/omapdss.h                            |    7 -
 12 files changed, 276 insertions(+), 35 deletions(-)
 create mode 100644 arch/arm/mach-omap2/display.h

Arnd Bergmann

2011-11-24 16:06 UTC #1 lore raw

Quoted 3 lines · Tony Lindgren

Hi Arnd,
This one has been separated out from the rest of the fixes.

Pulled into the fixes branch now. I'll send out the branch after testing it on tomorrow's linux-next.

Quoted 3 lines

If some of these need to go to stable, then Tomi should do the rebasing and send them to stable at vger.kernel.org as they don't apply cleanly on v3.1.

Ok. I've taken Tomi on Cc as a reminder for him, although I guess you already discussed it with him.

Kiitoksia paljon,

Arnd

Quoted 41 lines

The following changes since commit cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37:
Linus Torvalds (1):
        Linux 3.2-rc2
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap fixes-dss
Archit Taneja (1):
ARM: OMAP2PLUS: DSS: Ensure DSS works correctly if display is enabled in bootloader
Tomi Valkeinen (9):
ARM: OMAP2xxx: HWMOD: Fix DSS reset
ARM: OMAP2xxx: HWMOD: fix DSS clock data
ARM: OMAP3: HWMOD: Fix DSS reset
ARM: OMAP3: HWMOD: fix DSS clock data
ARM: OMAP4: HWMOD: remove extra clocks
ARM: OMAP4: HWMOD: Add HWMOD_CONTROL_OPT_CLKS_IN_RESET for dss_core
ARM: OMAP4: HWMOD: fix DSS clock data
ARM: OMAP2/3: HWMOD: Add SYSS_HAS_RESET_STATUS for dss
ARM: OMAP: HWMOD: Unify DSS resets for OMAPs
Tony Lindgren (1):
Merge branch 'hwmod_dss_fixes_3.2rc' of git://git.pwsan.com/linux-2.6 into fixes-dss
 arch/arm/mach-omap2/Makefile                       |    5 +-
 arch/arm/mach-omap2/display.c                      |  159 ++++++++++++++++++++
 arch/arm/mach-omap2/display.h                      |   29 ++++
 arch/arm/mach-omap2/omap_hwmod_2420_data.c         |   17 ++-
 arch/arm/mach-omap2/omap_hwmod_2430_data.c         |   17 ++-
 .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c |    5 +-
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |   37 ++++-
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |   24 ++--
 arch/arm/mach-omap2/omap_hwmod_common_data.c       |    4 +
 arch/arm/mach-omap2/omap_hwmod_common_data.h       |    4 +
 arch/arm/plat-omap/include/plat/common.h           |    3 +
 include/video/omapdss.h                            |    7 -
 12 files changed, 276 insertions(+), 35 deletions(-)
 create mode 100644 arch/arm/mach-omap2/display.h

Tony Lindgren

author

2011-11-24 19:42 UTC #2 lore raw

Quoted 8 lines · Arnd Bergmann

Quoted 3 lines · Tony Lindgren
Hi Arnd,
This one has been separated out from the rest of the fixes.
Pulled into the fixes branch now. I'll send out the branch after testing it on tomorrow's linux-next.

Quoted 6 lines

Quoted 3 lines
If some of these need to go to stable, then Tomi should do the rebasing and send them to stable at vger.kernel.org as they don't apply cleanly on v3.1.
Ok. I've taken Tomi on Cc as a reminder for him, although I guess you already discussed it with him.

Well did not discuss with Tomi yet, but based on some comments from Greg if the patches did not originally have Cc: stable in them when committed, then it's probably best to send to the stable list only after the commits hit the mainline so he knows what they are.

Quoted 1 line

Kiitoksia paljon,

Samoin!

Tony

Tomi Valkeinen

2011-11-29 08:12 UTC #3 lore raw

In reply to Arnd Bergmann

Quoted 8 lines · Arnd Bergmann

Quoted 3 lines · Tony Lindgren
Hi Arnd,
This one has been separated out from the rest of the fixes.
Pulled into the fixes branch now. I'll send out the branch after testing it on tomorrow's linux-next.

Quoted 6 lines

Quoted 3 lines
If some of these need to go to stable, then Tomi should do the rebasing and send them to stable at vger.kernel.org as they don't apply cleanly on v3.1.
Ok. I've taken Tomi on Cc as a reminder for him, although I guess you already discussed it with him.

I don't think we need these in 3.1 stable. The omapdss driver in 3.1 contains hacks to circumvent the HWMOD issues the patches below fix. These hacks were removed for 3.2.

Well, the "ARM: OMAP2PLUS: DSS: Ensure DSS works correctly..." patch could be used for 3.1 also, but I fear it depends on HWMOD and DSS patches missing from 3.1. I'll check it out.

Tomi

Quoted 47 lines

Kiitoksia paljon,
Arnd
Quoted 41 lines
The following changes since commit cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37:
Linus Torvalds (1):
        Linux 3.2-rc2
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap fixes-dss
Archit Taneja (1):
ARM: OMAP2PLUS: DSS: Ensure DSS works correctly if display is enabled in bootloader
Tomi Valkeinen (9):
ARM: OMAP2xxx: HWMOD: Fix DSS reset
ARM: OMAP2xxx: HWMOD: fix DSS clock data
ARM: OMAP3: HWMOD: Fix DSS reset
ARM: OMAP3: HWMOD: fix DSS clock data
ARM: OMAP4: HWMOD: remove extra clocks
ARM: OMAP4: HWMOD: Add HWMOD_CONTROL_OPT_CLKS_IN_RESET for dss_core
ARM: OMAP4: HWMOD: fix DSS clock data
ARM: OMAP2/3: HWMOD: Add SYSS_HAS_RESET_STATUS for dss
ARM: OMAP: HWMOD: Unify DSS resets for OMAPs
Tony Lindgren (1):
Merge branch 'hwmod_dss_fixes_3.2rc' of git://git.pwsan.com/linux-2.6 into fixes-dss
 arch/arm/mach-omap2/Makefile                       |    5 +-
 arch/arm/mach-omap2/display.c                      |  159 ++++++++++++++++++++
 arch/arm/mach-omap2/display.h                      |   29 ++++
 arch/arm/mach-omap2/omap_hwmod_2420_data.c         |   17 ++-
 arch/arm/mach-omap2/omap_hwmod_2430_data.c         |   17 ++-
 .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c |    5 +-
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |   37 ++++-
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |   24 ++--
 arch/arm/mach-omap2/omap_hwmod_common_data.c       |    4 +
 arch/arm/mach-omap2/omap_hwmod_common_data.h       |    4 +
 arch/arm/plat-omap/include/plat/common.h           |    3 +
 include/video/omapdss.h                            |    7 -
 12 files changed, 276 insertions(+), 35 deletions(-)
 create mode 100644 arch/arm/mach-omap2/display.h

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20111129/0abe1735/attachment.sig>

Arnd Bergmann

2011-11-29 14:51 UTC #4 lore raw

Quoted 7 lines · Tomi Valkeinen

I don't think we need these in 3.1 stable. The omapdss driver in 3.1 contains hacks to circumvent the HWMOD issues the patches below fix. These hacks were removed for 3.2.
Well, the "ARM: OMAP2PLUS: DSS: Ensure DSS works correctly..." patch could be used for 3.1 also, but I fear it depends on HWMOD and DSS patches missing from 3.1. I'll check it out.

Ok, thanks for taking a look,

Arnd