Skip to contentSkip to conversation

soc changes for omaps for v5.5

GIT PULL Tony Lindgren 2 participants 4 messages Oct 24, 2019

lore
Share & tools
lore
#0 lore raw

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

The following changes since commit 17a9e5bbbfe5a5a6356e47cdc1c1656e1e5e1f62:

Merge tag 'wlcore-fix' into fixes (2019-10-11 09:15:35 -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/soc-signed

for you to fetch changes up to bc794744cdc56f53b495debbe054946d1b620441:

Merge branch 'omap-for-v5.5/pm' into omap-for-v5.5/soc (2019-10-23 10:42:39 -0700)

----------------------------------------------------------------
SoC changes for omaps for v5.5

This series of changes contains SoC related clean-up, and some PM improvments:

- SoC clean-up to drop unused enable_wakeup and disable_wakeup, simplify clkdm_clock_enable and disable, and few sparse fixes

- Drop pdata-quirks for TI bluetooth, this is now handled by a serdev driver

- A series of PM changes to re-enable core oswr (open switch retention) for omap4 that got disabled earlier because of various gpio-omap issues that have been fixed earlier this year. We want to do this in small steps for the pwrdm_set_logic_retst() changes so we can identify the domain in case of unexpected issues

- A series of PM changes to configure voltage controller for droid4. Eventually the voltage controller configuration should use device tree, but we want to get things working first. These changes bring down down the idle power consumption for droid4 with LCD blanked, WLAN connected, USB disabled, and modem disabled to about 32 to 35mW from about 39 to 45 mW

----------------------------------------------------------------
Ben Dooks (4):
ARM: OMAP2+: do not export am43xx_control functions
ARM: OMAP2+: make dra7xx_sha0_hwmod static
ARM: OMAP2+: prm44xx: make prm_{save,restore}_context static
ARM: OMAP2+: make omap44xx_sha0_hwmod and omap44xx_l3_main_2__des static

Sebastian Reichel (1):
ARM: OMAP2+: pdata-quirks: drop TI_ST/KIM support

Tony Lindgren (13):
ARM: OMAP2+: Remove unused wakeup_cpu
ARM: OMAP2+: Drop bogus wkup domain oswr setting
ARM: OMAP2+: Remove bogus warnings for machines without twl PMIC
ARM: OMAP2+: Update 4430 voltage controller operating points
ARM: OMAP2+: Configure voltage controller for cpcap
ARM: OMAP2+: Allow per oswr for omap4
ARM: OMAP2+: Allow core oswr for omap4
ARM: OMAP2+: Initialize voltage controller for omap4
ARM: OMAP2+: Drop unused enable_wakeup and disable_wakeup
ARM: OMAP2+: Simplify code for clkdm_clock_enable and disable
ARM: OMAP2+: Configure voltage controller for retention
ARM: OMAP2+: Configure voltage controller for cpcap to low-speed Merge branch 'omap-for-v5.5/pm' into omap-for-v5.5/soc

YueHaibing (2):
ARM: OMAP2+: Make some functions static
ARM: OMAP2+: Remove duplicated include from pmic-cpcap.c

 arch/arm/mach-omap2/Makefile               |   5 +
 arch/arm/mach-omap2/clockdomain.c          |  78 +++------
 arch/arm/mach-omap2/control.c              |   4 +-
 arch/arm/mach-omap2/control.h              |   1 +
 arch/arm/mach-omap2/omap-mpuss-lowpower.c  |   2 -
 arch/arm/mach-omap2/omap_hwmod.c           |  97 -----------
 arch/arm/mach-omap2/omap_hwmod.h           |   3 -
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c |   4 +-
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c  |   2 +-
 arch/arm/mach-omap2/omap_twl.c             |   8 +-
 arch/arm/mach-omap2/opp4xxx_data.c         |  16 +-
 arch/arm/mach-omap2/pdata-quirks.c         |  52 ------
 arch/arm/mach-omap2/pm.c                   |   1 +
 arch/arm/mach-omap2/pm.h                   |  14 ++
 arch/arm/mach-omap2/pm44xx.c               |  13 +-
 arch/arm/mach-omap2/pmic-cpcap.c           | 271 +++++++++++++++++++++++++++++
 arch/arm/mach-omap2/prm44xx.c              |   4 +-
 arch/arm/mach-omap2/vc.c                   |  57 +++++-
 arch/arm/mach-omap2/vc.h                   |   2 +-
 19 files changed, 389 insertions(+), 245 deletions(-)
 create mode 100644 arch/arm/mach-omap2/pmic-cpcap.c
#1 lore raw

[GIT PULL 2/3] device tree changes for omaps for v5.5

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

The following changes since commit 087a2b7ec973f6f30f6e7b72cb50b6f7734ffdd2:

ARM: dts: Use level interrupt for omap4 & 5 wlcore (2019-10-09 15:11:27 -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/dt-signed

for you to fetch changes up to fedc8844d5004ffa69d3e320081bfd59979e1937:

Merge branch 'omap-for-v5.5/droid4' into omap-for-v5.5/dt (2019-10-23 10:34:28 -0700)

----------------------------------------------------------------
Device tree changes for omaps for v5.5

This series of changes adds support for few new boards, moves remaining ti wilink bluetooth users to use the serdev driver, and improves support for existing devices:

- Add support for NetCAN Plus devices

- Configure wilink bluetooth for logicpd-torpedo and omap3-igep

- Switch to using generic LCD panel for logicpd-torpedo and increase camera pixel clock

- Configure droid4 for 300mA USB host mode and move to a common file to start adding support for droid bionic

- Rename ocmcram node to sram

----------------------------------------------------------------
Adam Ford (4):
ARM: dts: logicpd-torpedo-baseboard: Reduce video regulator chatter
ARM: dts: logicpd-torpedo-37xx-devkit-28: Reference new DRM panel
ARM: dts: logicpd-torpedo: Disable Bluetooth Serial DMA
ARM: dts: logicpd-torpedo-37xx-devkit: Increase camera pixel clock

Krzysztof Kozlowski (2):
ARM: dts: am: Rename "ocmcram" node to "sram"
ARM: dts: omap: Rename "ocmcram" node to "sram"

Sebastian Reichel (2):
ARM: dts: LogicPD Torpedo: Add WiLink UART node
ARM: dts: IGEP: Add WiLink UART node

Tony Lindgren (3):
ARM: dts: omap4-droid4: Allow 300mA current for USB peripherals
ARM: dts: Add minimal support for Droid Bionic xt875 Merge branch 'omap-for-v5.5/droid4' into omap-for-v5.5/dt

Yegor Yefremov (3):
ARM: dts: add DTS for NetCAN Plus devices
ARM: dts: add DTS for NetCom Plus 1xx and 2xx device series
ARM: dts: add DTS for NetCom Plus 4xx and 8xx device series

 arch/arm/boot/dts/Makefile                         |   4 +
 arch/arm/boot/dts/am335x-netcan-plus-1xx.dts       |  87 +++
 arch/arm/boot/dts/am335x-netcom-plus-2xx.dts       |  95 +++
 arch/arm/boot/dts/am335x-netcom-plus-8xx.dts       | 115 +++
 arch/arm/boot/dts/am33xx.dtsi                      |   6 +-
 arch/arm/boot/dts/am4372.dtsi                      |   6 +-
 .../boot/dts/logicpd-torpedo-37xx-devkit-28.dts    |  20 +-
 arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts  |  14 +
 arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi   |   1 +
 arch/arm/boot/dts/motorola-mapphone-common.dtsi    | 786 +++++++++++++++++++++
 arch/arm/boot/dts/omap3-igep0020-rev-f.dts         |   8 +
 arch/arm/boot/dts/omap3-igep0030-rev-g.dts         |   8 +
 arch/arm/boot/dts/omap4-droid-bionic-xt875.dts     |   9 +
 arch/arm/boot/dts/omap4-droid4-xt894.dts           | 777 +-------------------
 arch/arm/boot/dts/omap4.dtsi                       |   2 +-
 arch/arm/boot/dts/omap5.dtsi                       |   2 +-
 16 files changed, 1138 insertions(+), 802 deletions(-)
 create mode 100644 arch/arm/boot/dts/am335x-netcan-plus-1xx.dts
 create mode 100644 arch/arm/boot/dts/am335x-netcom-plus-2xx.dts
 create mode 100644 arch/arm/boot/dts/am335x-netcom-plus-8xx.dts
 create mode 100644 arch/arm/boot/dts/motorola-mapphone-common.dtsi
 create mode 100644 arch/arm/boot/dts/omap4-droid-bionic-xt875.dts
#2 lore raw

[GIT PULL 3/3] drop legacy platform data for omaps for v5.5

In reply to Tony Lindgren

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

The following changes since commit 1819ef2e2d12d5b1a6ee54ac1c2afe35cffc677c:

bus: ti-sysc: Use swsup quirks also for am335x musb (2019-10-21 14:15:55 -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-drop-pdata-v2-signed-take2

for you to fetch changes up to b08a0c577518a02ea08673f68881223a3ed35cc6:

ARM: OMAP2+: Drop legacy platform data for am335x musb (2019-10-23 07:46:32 -0700)

----------------------------------------------------------------
Drop legacy platform data for omaps for v5.5

This series of changes continues dropping legacy platform data for omaps. With the proper device tree configuration in place in the dts files for ti-sysc interconnect target module driver, we can drop the related platform data and legacy ti,hwmods custom property.

Most of the patches in this series drop platform data and custom dts property one device class and one SoC at time. This way we can easily revert one patch at a time in case of unexpected issues if the fix is not trivial.

For am335x musb, we need to first update the device tree to probe with ti-sysc interconnect target module driver. And then the following patches drop the legacy platform data.

Note that this series depends on earlier ti-sysc related driver changes

----------------------------------------------------------------
Tony Lindgren (34):
ARM: OMAP2+: Drop legacy platform data for am3 and am4 gpio
ARM: dts: Drop custom hwmod property for omap4 gpio
ARM: dts: Drop custom hwmod property for omap5 gpio
ARM: OMAP2+: Drop legacy platform data for dra7 mailbox
ARM: OMAP2+: Drop legacy platform data for am3 and am4 mailbox
ARM: OMAP2+: Drop legacy platform data for omap4 mailbox
ARM: OMAP2+: Drop legacy platform data for omap5 mailbox
ARM: dts: Drop custom hwmod property for omap5 mcspi
ARM: OMAP2+: Drop legacy platform data for omap5 mcspi
ARM: dts: Drop custom hwmod property for am33xx uart
ARM: dts: Drop custom hwmod property for am4 uart
ARM: dts: Drop custom hwmod property for omap5 uart
ARM: dts: Drop custom hwmod property for am3 i2c
ARM: dts: Drop custom hwmod property for am4 i2c
ARM: dts: Drop custom hwmod property for omap5 i2c
ARM: dts: Drop custom hwmod property for am3 mmc
ARM: dts: Drop custom hwmod property for am4 mmc
ARM: dts: Drop custom hwmod property for omap5 mmc
ARM: OMAP2+: Drop legacy platform data for am3 and am4 wdt
ARM: OMAP2+: Drop legacy platform data for dra7 wdt
ARM: OMAP2+: Drop legacy platform data for omap5 wdt
ARM: OMAP2+: Drop legacy platform data for omap4 mcbsp
ARM: OMAP2+: Drop legacy platform data for omap5 mcbsp
ARM: OMAP2+: Drop legacy platform data for am4 hdq1w
ARM: OMAP2+: Drop legacy platform data for dra7 hdq1w
ARM: OMAP2+: Drop legacy platform data for omap4 hdq1w
ARM: OMAP2+: Drop legacy platform data for am3 and am4 rng
ARM: OMAP2+: Drop legacy platform data for dra7 rng
ARM: OMAP2+: Drop legacy platform data for am3 and am4 mcasp
ARM: OMAP2+: Drop legacy platform data for omap4 mcasp
ARM: OMAP2+: Drop legacy platform data for musb on omap4
ARM: dts: Probe am335x musb with ti-sysc
ARM: dts: Drop pointless status changing for am3 musb
ARM: OMAP2+: Drop legacy platform data for am335x musb

 arch/arm/boot/dts/am335x-baltos.dtsi               |  12 -
 arch/arm/boot/dts/am335x-bone-common.dtsi          |  22 --
 arch/arm/boot/dts/am335x-boneblue.dts              |  22 --
 arch/arm/boot/dts/am335x-chiliboard.dts            |  18 -
 arch/arm/boot/dts/am335x-cm-t335.dts               |  20 -
 arch/arm/boot/dts/am335x-evm.dts                   |  25 --
 arch/arm/boot/dts/am335x-evmsk.dts                 |  25 --
 arch/arm/boot/dts/am335x-guardian.dts              |  22 --
 arch/arm/boot/dts/am335x-igep0033.dtsi             |  25 --
 arch/arm/boot/dts/am335x-lxm.dts                   |  22 --
 arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi  |  17 -
 arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts     |  22 --
 arch/arm/boot/dts/am335x-osd3358-sm-red.dts        |  22 --
 arch/arm/boot/dts/am335x-pcm-953.dtsi              |  25 --
 arch/arm/boot/dts/am335x-pdu001.dts                |  28 --
 arch/arm/boot/dts/am335x-pepper.dts                |  20 -
 arch/arm/boot/dts/am335x-pocketbeagle.dts          |  22 --
 arch/arm/boot/dts/am335x-regor.dtsi                |  21 -
 arch/arm/boot/dts/am335x-shc.dts                   |  17 -
 arch/arm/boot/dts/am335x-sl50.dts                  |  22 --
 arch/arm/boot/dts/am335x-wega.dtsi                 |  26 --
 arch/arm/boot/dts/am33xx-l4.dtsi                   |  27 +-
 arch/arm/boot/dts/am33xx.dtsi                      |  67 ++--
 arch/arm/boot/dts/am4372.dtsi                      |   1 -
 arch/arm/boot/dts/am437x-l4.dtsi                   |  23 --
 arch/arm/boot/dts/dra7-l4.dtsi                     |  16 -
 arch/arm/boot/dts/omap4-l4-abe.dtsi                |   4 -
 arch/arm/boot/dts/omap4-l4.dtsi                    |  14 -
 arch/arm/boot/dts/omap5-l4-abe.dtsi                |   3 -
 arch/arm/boot/dts/omap5-l4.dtsi                    |  30 --
 .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h  |   9 -
 .../omap_hwmod_33xx_43xx_interconnect_data.c       |  32 --
 .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 231 -----------
 arch/arm/mach-omap2/omap_hwmod_33xx_data.c         |  58 ---
 arch/arm/mach-omap2/omap_hwmod_43xx_data.c         |  48 ---
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c         | 343 ----------------
 arch/arm/mach-omap2/omap_hwmod_54xx_data.c         | 317 ---------------
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c          | 431 ---------------------
 38 files changed, 39 insertions(+), 2070 deletions(-)
#3 lore raw

Re: [GIT PULL 3/3] drop legacy platform data for omaps for v5.5

Quoted 28 lines · Tony Lindgren

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

The following changes since commit 1819ef2e2d12d5b1a6ee54ac1c2afe35cffc677c:

bus: ti-sysc: Use swsup quirks also for am335x musb (2019-10-21 14:15:55 -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-drop-pdata-v2-signed-take2

for you to fetch changes up to b08a0c577518a02ea08673f68881223a3ed35cc6:

ARM: OMAP2+: Drop legacy platform data for am335x musb (2019-10-23 07:46:32 -0700)

----------------------------------------------------------------
Drop legacy platform data for omaps for v5.5

This series of changes continues dropping legacy platform data for omaps. With the proper device tree configuration in place in the dts files for ti-sysc interconnect target module driver, we can drop the related platform data and legacy ti,hwmods custom property.

Most of the patches in this series drop platform data and custom dts property one device class and one SoC at time. This way we can easily revert one patch at a time in case of unexpected issues if the fix is not trivial.

Quoted 5 lines

For am335x musb, we need to first update the device tree to probe with ti-sysc interconnect target module driver. And then the following patches drop the legacy platform data.

Note that this series depends on earlier ti-sysc related driver changes

Couldn't quite tell where to land this, but I picked arm/dt mostly to avoid possible toplevel conflicts with other branches that touch device trees.

Thanks!

-Olof