Skip to contentSkip to conversation

soc changes for omap variants for v5.4

GIT PULL Tony Lindgren 2 participants 8 messages Aug 28, 2019 – Sep 4, 2019

lore
Share & tools
lore
#0 lore raw

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

The following changes since commit 5f9e832c137075045d15cd6899ab0505cfb2ca4b:

Linus 5.3-rc1 (2019-07-21 14:05:38 -0700)

are available in the Git repository at:

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

for you to fetch changes up to 50f57ef83d836d727902a6a7e70cca61b0d02655:

ARM: OMAP2+: Delete an unnecessary kfree() call in omap_hsmmc_pdata_init() (2019-08-26 08:59:48 -0700)

----------------------------------------------------------------
SoC changes for omap variants for v5.4

The first change moves platform-specific asm-offsets.h to arch/arm/mach-omap2 to fix iessu with parallel build with CONFIG_IKHEADERS, and the second change removes a useless kfree.

Note that the first change causes a trivial merge conflict with the iommu changes for arch/arm/mach-omap2/Makefile.

----------------------------------------------------------------
Markus Elfring (1):
ARM: OMAP2+: Delete an unnecessary kfree() call in omap_hsmmc_pdata_init()

Masahiro Yamada (1):
ARM: OMAP2+: move platform-specific asm-offset.h to arch/arm/mach-omap2

 arch/arm/mach-omap2/.gitignore  | 1 +
 arch/arm/mach-omap2/Makefile    | 5 +++--
 arch/arm/mach-omap2/hsmmc.c     | 4 +---
 arch/arm/mach-omap2/sleep33xx.S | 2 +-
 arch/arm/mach-omap2/sleep43xx.S | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 arch/arm/mach-omap2/.gitignore
#1 lore raw

[GIT PULL 2/4] more ti-sysc driver changes for v5.4

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

The following changes since commit c8a738f4cfaeccce40b171aca6da5fc45433ce60:

bus: ti-sysc: remove set but not used variable 'quirks' (2019-08-13 04:40:11 -0700)

are available in the Git repository at:

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

for you to fetch changes up to 7edd00f71f4b91ca31dbfa08926495fe5e77aab4:

bus: ti-sysc: Detect d2d when debug is enabled (2019-08-26 08:33:25 -0700)

----------------------------------------------------------------
more ti-sysc driver changes for omap variants for v5.4

Few changes mostly to deal with sgx SoC glue quirk for omap36xx that is needed for the related sgx SoC glue dts branch. The other changes are to simplify sysc_check_one_child() sysc_check_children() to be void functions, and detect d2d module when debugging is enabled.

----------------------------------------------------------------
Nishka Dasgupta (1):
bus: ti-sysc: Change return types of functions

Tony Lindgren (2):
bus: ti-sysc: Add module enable quirk for SGX on omap36xx
bus: ti-sysc: Detect d2d when debug is enabled

 drivers/bus/ti-sysc.c                 | 45 ++++++++++++++++++++++-------------
 include/linux/platform_data/ti-sysc.h |  1 +
 2 files changed, 30 insertions(+), 16 deletions(-)
#2 lore raw

Re: [GIT PULL 2/4] more ti-sysc driver changes for v5.4

Quoted 6 lines · Tony Lindgren

more ti-sysc driver changes for omap variants for v5.4

Few changes mostly to deal with sgx SoC glue quirk for omap36xx that is needed for the related sgx SoC glue dts branch. The other changes are to simplify sysc_check_one_child() sysc_check_children() to be void functions, and detect d2d module when debugging is enabled.

Pulled into arm/late, thanks!

Arnd

#3 lore raw

[GIT PULL 3/4] drop more legacy pdata for omaps for v5.4

In reply to Tony Lindgren

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

The following changes since commit 5b63fb90adb95a178ad403e1703f59bf1ff2c16b:

ARM: dts: Fix incomplete dts data for am3 and am4 mmc (2019-08-13 04:03:30 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.4/ti-sysc-drop-pdata-take2-signed

for you to fetch changes up to 1170f235834bfb858f691670b127f8673af5923b:

ARM: dts: Drop legacy custom hwmods property for dra7 gpio (2019-08-26 10:59:25 -0700)

----------------------------------------------------------------
Drop legacy platform data omap variants for v5.4

We can now drop more platform data in favor of dts data for most devices like cpsw, gpio, i2c, mmc, uart and watchdog.

In general we can do this by dropping legacy "ti,hwmods" custom dts property, and the platform data assuming the related dts data is correct. This is best done as single patch as otherwise we'd have to revert two patches in case of any unexpected issues, and we're just removing data.

Fro cpsw, before we can do this, we need to configure the cpsw mdio clocks properly in dts though in the first patch. For omap4 i2c, we've already dropped the platform data earlier, but have been still allocting it dynamically based on the dts data based on the "ti,hwmods" property, but that is no longer needed. For d2d, we are missing the dts data, so we first add it and then drop the platform data.

For dra7, we drop platform data and "ti,hwmods" for mcasp and mcspi. We've already dropped platform data earlier for gpio, i2c, mmc, and uart so we just need to drop "ti,hwmods" property for those.

Note that this branch is based on earlier ti-sysc-fixes branch.

----------------------------------------------------------------
Tony Lindgren (13):
ARM: dts: Add fck for cpsw mdio for omap variants
ARM: OMAP2+: Drop legacy platform data for cpsw on am3 and am4
ARM: OMAP2+: Drop legacy platform data for cpsw on dra7
ARM: dts: Drop custom hwmod property for omap4 i2c
ARM: OMAP2+: Drop legacy watchdog platform data for omap4
ARM: dts: Configure d2d dts data for omap4
ARM: OMAP2+: Drop legacy platform data for omap4 d2d
ARM: OMAP2+: Drop legacy platform data for dra7 mcspi
ARM: OMAP2+: Drop legacy platform data for dra7 mcasp
ARM: dts: Drop legacy custom hwmods property for dra7 uart
ARM: dts: Drop legacy custom hwmods property for dra7 i2c
ARM: dts: Drop legacy custom hwmods property for dra7 mmc
ARM: dts: Drop legacy custom hwmods property for dra7 gpio

 arch/arm/boot/dts/am33xx-l4.dtsi                   |   4 +-
 arch/arm/boot/dts/am437x-l4.dtsi                   |   6 +-
 arch/arm/boot/dts/dra7-l4.dtsi                     |  43 +-
 arch/arm/boot/dts/omap4-l4-abe.dtsi                |   1 -
 arch/arm/boot/dts/omap4-l4.dtsi                    |  39 +-
 .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h  |   3 -
 .../omap_hwmod_33xx_43xx_interconnect_data.c       |   6 -
 .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c |  50 ---
 arch/arm/mach-omap2/omap_hwmod_33xx_data.c         |   9 -
 arch/arm/mach-omap2/omap_hwmod_43xx_data.c         |   9 -
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c         | 115 -----
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c          | 475 ---------------------
 12 files changed, 36 insertions(+), 724 deletions(-)
#4 lore raw

Re: [GIT PULL 3/4] drop more legacy pdata for omaps for v5.4

Quoted 17 lines · Tony Lindgren

Drop legacy platform data omap variants for v5.4

We can now drop more platform data in favor of dts data for most devices like cpsw, gpio, i2c, mmc, uart and watchdog.

In general we can do this by dropping legacy "ti,hwmods" custom dts property, and the platform data assuming the related dts data is correct. This is best done as single patch as otherwise we'd have to revert two patches in case of any unexpected issues, and we're just removing data.

Fro cpsw, before we can do this, we need to configure the cpsw mdio clocks properly in dts though in the first patch. For omap4 i2c, we've already dropped the platform data earlier, but have been still allocting it dynamically based on the dts data based on the "ti,hwmods" property, but that is no longer needed. For d2d, we are missing the dts data, so we first add it and then drop the platform data.

Quoted 5 lines

For dra7, we drop platform data and "ti,hwmods" for mcasp and mcspi. We've already dropped platform data earlier for gpio, i2c, mmc, and uart so we just need to drop "ti,hwmods" property for those.

Note that this branch is based on earlier ti-sysc-fixes branch.

Pulled into arm/late, thanks!

Arnd

#5 lore raw

[GIT PULL 4/4] sgx soc glue changes for omaps for v5.4

In reply to Tony Lindgren

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

The following changes since commit 7edd00f71f4b91ca31dbfa08926495fe5e77aab4:

bus: ti-sysc: Detect d2d when debug is enabled (2019-08-26 08:33:25 -0700)

are available in the Git repository at:

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

for you to fetch changes up to 6cb0ac0fb9786d01f140dcfcd3d09ce850dd0a64:

ARM: dts: ARM: dts: Configure interconnect target module for am3517sgx (2019-08-26 08:47:09 -0700)

----------------------------------------------------------------
SoC glue layer changes for SGX on omap variants for v5.4

For a while we've had omap4 sgx glue layer defined in dts and probed with ti-sysc driver. This allows idling the sgx module for PM, and removes the need for custom platform glue layer code for any further driver changes.

We first drop the unused legacy platform data for omap4 sgx. Then for omap5, we need add the missing clkctrl clock data so we can configure sgx. And we configure sgx for omap34xx, omap36xx and am3517.

For am335x, we still have a dependency for rstctrl reset driver changes, so that will be added later on.

Note that this branch is based on earlier ti-sysc branch for omap36xx glue layer quirk handling.

----------------------------------------------------------------
Adam Ford (1):
ARM: dts: ARM: dts: Configure interconnect target module for am3517sgx

Tony Lindgren (4):
ARM: OMAP2+: Drop legacy platform data for omap4 gpu
clk: ti: add clkctrl data omap5 sgx
ARM: dts: Configure sgx for omap5
ARM: dts: Configure interconnect target module for omap3 sgx

 arch/arm/boot/dts/am3517.dtsi              | 24 ++++++++++++++
 arch/arm/boot/dts/omap34xx.dtsi            | 26 +++++++++++++++
 arch/arm/boot/dts/omap36xx.dtsi            | 28 ++++++++++++++++
 arch/arm/boot/dts/omap4.dtsi               |  1 -
 arch/arm/boot/dts/omap5.dtsi               | 23 +++++++++++++
 arch/arm/boot/dts/omap54xx-clocks.dtsi     | 14 ++++++++
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 53 ------------------------------
 drivers/clk/ti/clk-54xx.c                  | 34 +++++++++++++++++++
 include/dt-bindings/clock/omap5.h          |  3 ++
 9 files changed, 152 insertions(+), 54 deletions(-)
#6 lore raw

Re: [GIT PULL 4/4] sgx soc glue changes for omaps for v5.4

Quoted 11 lines · Tony Lindgren

SoC glue layer changes for SGX on omap variants for v5.4

For a while we've had omap4 sgx glue layer defined in dts and probed with ti-sysc driver. This allows idling the sgx module for PM, and removes the need for custom platform glue layer code for any further driver changes.

We first drop the unused legacy platform data for omap4 sgx. Then for omap5, we need add the missing clkctrl clock data so we can configure sgx. And we configure sgx for omap34xx, omap36xx and am3517.

Quoted 5 lines

For am335x, we still have a dependency for rstctrl reset driver changes, so that will be added later on.

Note that this branch is based on earlier ti-sysc branch for omap36xx glue layer quirk handling.

Pulled into arm/late, thanks!

Arnd

#7 lore raw
In reply to Tony Lindgren
Quoted 18 lines · Tony Lindgren

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

The following changes since commit 5f9e832c137075045d15cd6899ab0505cfb2ca4b:

Linus 5.3-rc1 (2019-07-21 14:05:38 -0700)

are available in the Git repository at:

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

for you to fetch changes up to 50f57ef83d836d727902a6a7e70cca61b0d02655:

ARM: OMAP2+: Delete an unnecessary kfree() call in omap_hsmmc_pdata_init() (2019-08-26 08:59:48 -0700)

----------------------------------------------------------------
SoC changes for omap variants for v5.4

Quoted 6 lines

The first change moves platform-specific asm-offsets.h to arch/arm/mach-omap2 to fix iessu with parallel build with CONFIG_IKHEADERS, and the second change removes a useless kfree.

Note that the first change causes a trivial merge conflict with the iommu changes for arch/arm/mach-omap2/Makefile.

Pulled into arm/soc, thanks!

Arnd