omap2plus_defconfig changes for v5.5

From: "Tony Lindgren" <[email protected]>

The following changes since commit 96d49bbfe6c1a6bb43ccd00fb87aca100e32e5e2:

ARM: omap2plus_defconfig: Fix selected panels after generic panel changes (2019-10-03 09:44:40 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.5/defconfig-signed

for you to fetch changes up to ec2b31267263cd7d5a7567d315f839796c2a8c87:

configs: omap2plus: Enable VIDEO_MT9P031 module (2019-10-22 09:11:03 -0700)

----------------------------------------------------------------
Defconfig changes for omap2plus_defconfig for v5.5

A series of changes from Adam Ford to update for removed and moved items, and then enable crypto devices and MT9P031 video as loadable modules.

Looks like I missed unifying the subject line for one commit, but I did not want to mess with the commit after pushing it out.

----------------------------------------------------------------
Adam Ford (4):
ARM: omap2plus_defconfig: Update for removed items
ARM: omap2plus_defconfig: Update for moved item
ARM: omap2plus_defconfig: Enable HW Crypto engine modules
configs: omap2plus: Enable VIDEO_MT9P031 module

 arch/arm/configs/omap2plus_defconfig | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

From: "Tony Lindgren" <[email protected]>

The following changes since commit c7d8669f46ba97f6a8e14d6e9b8d6c39e2c07727:

bus: ti-sysc: Fix watchdog quirk handling (2019-10-18 08:45:32 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.5/ti-sysc-signed

for you to fetch changes up to 1819ef2e2d12d5b1a6ee54ac1c2afe35cffc677c:

bus: ti-sysc: Use swsup quirks also for am335x musb (2019-10-21 14:15:55 -0700)

----------------------------------------------------------------
Changes for ti-sysc interconnect target module driver for v5.5

A series of changes from Tero Kristo for rpm reset control driver to deal with the ordering requirements between clocks and resets, and two changes to deal with quirks for musb otg device.

----------------------------------------------------------------
Tero Kristo (3):
bus: ti-sysc: re-order reset and main clock controls
bus: ti-sysc: drop the extra hardreset during init
bus: ti-sysc: avoid toggling power state of module during probe

Tony Lindgren (3):
Merge branch 'watchdog-fix' into omap-for-v5.5/ti-sysc
bus: ti-sysc: Handle mstandby quirk and use it for musb
bus: ti-sysc: Use swsup quirks also for am335x musb

 drivers/bus/ti-sysc.c | 87 +++++++++++++++++++--------------------------------
 1 file changed, 33 insertions(+), 54 deletions(-)

Looks like this branch had a minor conflict with one of your fixes branches. Easy to patch up, but feel free to use your fixes as a base for the topics if needed.

-Olof

Oh sorry, I thought I did that. But sounds like I also had some additional merge resolve in my for-next.

Thanks,

Tony