mbox series

[GIT,PULL,2/6] i.MX SoC update for 5.10

Message ID 20200923073009.23678-2-shawnguo@kernel.org (mailing list archive)
State Accepted
Commit fb956b3e20f0bbeac8c17a7a08e63528a23bd54c
Headers show
Series [GIT,PULL,1/6] i.MX drivers update for 5.10 | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git tags/imx-soc-5.10

Message

Shawn Guo Sept. 23, 2020, 7:30 a.m. UTC
Hi,

To maintain the patchset integrity, some defconfig change and clock code
removal are mixed in there.  They do not cause any merge conflicts
though.  Please consider to pull, thanks!

Shawn


The following changes since commit 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5:

  Linux 5.9-rc1 (2020-08-16 13:04:57 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git tags/imx-soc-5.10

for you to fetch changes up to fb956b3e20f0bbeac8c17a7a08e63528a23bd54c:

  clk: imx: imx35: Remove mx35_clocks_init() (2020-09-22 14:08:22 +0800)

----------------------------------------------------------------
i.MX SoC update for 5.10:

- A series from Fabio Estevam to remove legacy non-DT i.MX platforms
  support and related board files. This is a natural move, as the
  platforms had been converted to DT for years, and we have not seen
  any users around these legacy non-DT support for a while.
- Enable cpufreq support for i.MX7ULP platform.

----------------------------------------------------------------
Fabio Estevam (25):
      ARM: imx: Place "Cortex-A/Cortex-M" comment in the correct location
      ARM: imx: Remove imx21 support
      ARM: imx: Remove i.MX27 board files
      ARM: imx: Remove i.MX31 board files
      ARM: imx: Remove i.MX35 board files
      ARM: imx: Remove ehci board files
      ARM: imx27: Remove imx27_soc_init()
      ARM: imx27: Remove iomux-v1 board code
      ARM: imx27: Get rid of mm-imx27.c
      ARM: imx27: Retrieve AVIC base address from devicetree
      ARM: imx31: Remove remaining i.MX31 board code
      ARM: imx3: Remove imx3 soc_init()
      ARM: imx: Remove iomux-v3 board code
      ARM: imx: Remove imx device directory
      ARM: imx: Remove remnant board file support pieces
      ARM: imx27: Retrieve the SYSCTRL base address from devicetree
      ARM: imx27: Retrieve the CCM base address from devicetree
      ARM: imx31: Retrieve the IIM base address from devicetree
      ARM: imx3: Retrieve the CCM base address from devicetree
      ARM: imx3: Retrieve the AVIC base address from devicetree
      ARM: imx35: Retrieve the IIM base address from devicetree
      ARM: imx: Remove unused definitions
      clk: imx: imx27: Remove mx27_clocks_init()
      clk: imx: imx31: Remove mx31_clocks_init()
      clk: imx: imx35: Remove mx35_clocks_init()

Peng Fan (1):
      ARM: imx7ulp: enable cpufreq

 arch/arm/configs/imx_v4_v5_defconfig               |    2 +-
 arch/arm/configs/imx_v6_v7_defconfig               |   16 +-
 arch/arm/configs/multi_v5_defconfig                |    2 +-
 arch/arm/mach-imx/3ds_debugboard.c                 |  207 ----
 arch/arm/mach-imx/3ds_debugboard.h                 |   11 -
 arch/arm/mach-imx/Kconfig                          |  375 +-----
 arch/arm/mach-imx/Makefile                         |   45 +-
 arch/arm/mach-imx/board-mx31lilly.h                |   28 -
 arch/arm/mach-imx/board-mx31lite.h                 |   29 -
 arch/arm/mach-imx/board-mx31moboard.h              |   30 -
 arch/arm/mach-imx/common.h                         |   15 -
 arch/arm/mach-imx/cpu-imx27.c                      |   10 +-
 arch/arm/mach-imx/cpu-imx31.c                      |    9 +-
 arch/arm/mach-imx/cpu-imx35.c                      |    9 +-
 arch/arm/mach-imx/devices-imx21.h                  |   56 -
 arch/arm/mach-imx/devices-imx27.h                  |   86 --
 arch/arm/mach-imx/devices-imx31.h                  |   80 --
 arch/arm/mach-imx/devices-imx35.h                  |   87 --
 arch/arm/mach-imx/devices/Kconfig                  |   71 --
 arch/arm/mach-imx/devices/Makefile                 |   28 -
 arch/arm/mach-imx/devices/devices-common.h         |  293 -----
 arch/arm/mach-imx/devices/devices.c                |   35 -
 arch/arm/mach-imx/devices/platform-fec.c           |   49 -
 arch/arm/mach-imx/devices/platform-flexcan.c       |   45 -
 arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c  |   51 -
 arch/arm/mach-imx/devices/platform-gpio-mxc.c      |   31 -
 arch/arm/mach-imx/devices/platform-gpio_keys.c     |   15 -
 arch/arm/mach-imx/devices/platform-imx-dma.c       |   44 -
 arch/arm/mach-imx/devices/platform-imx-fb.c        |   47 -
 arch/arm/mach-imx/devices/platform-imx-i2c.c       |   74 --
 arch/arm/mach-imx/devices/platform-imx-keypad.c    |   54 -
 arch/arm/mach-imx/devices/platform-imx-ssi.c       |   86 --
 arch/arm/mach-imx/devices/platform-imx-uart.c      |   92 --
 arch/arm/mach-imx/devices/platform-imx2-wdt.c      |   52 -
 arch/arm/mach-imx/devices/platform-imx21-hcd.c     |   38 -
 arch/arm/mach-imx/devices/platform-imx27-coda.c    |   34 -
 arch/arm/mach-imx/devices/platform-ipu-core.c      |  127 --
 arch/arm/mach-imx/devices/platform-mx2-camera.c    |   59 -
 arch/arm/mach-imx/devices/platform-mx2-emma.c      |   37 -
 arch/arm/mach-imx/devices/platform-mxc-ehci.c      |   61 -
 arch/arm/mach-imx/devices/platform-mxc-mmc.c       |   72 --
 arch/arm/mach-imx/devices/platform-mxc_nand.c      |   72 --
 arch/arm/mach-imx/devices/platform-mxc_rtc.c       |   43 -
 arch/arm/mach-imx/devices/platform-mxc_w1.c        |   47 -
 arch/arm/mach-imx/devices/platform-pata_imx.c      |   45 -
 .../mach-imx/devices/platform-sdhci-esdhc-imx.c    |   64 -
 arch/arm/mach-imx/devices/platform-spi_imx.c       |   78 --
 arch/arm/mach-imx/ehci-imx27.c                     |   74 --
 arch/arm/mach-imx/ehci-imx31.c                     |   74 --
 arch/arm/mach-imx/ehci-imx35.c                     |   89 --
 arch/arm/mach-imx/ehci.h                           |   44 -
 arch/arm/mach-imx/hardware.h                       |    1 -
 arch/arm/mach-imx/imx27-dt.c                       |   26 -
 arch/arm/mach-imx/iomux-imx31.c                    |  161 ---
 arch/arm/mach-imx/iomux-mx21.h                     |  109 --
 arch/arm/mach-imx/iomux-mx27.h                     |  192 ---
 arch/arm/mach-imx/iomux-mx2x.h                     |  217 ----
 arch/arm/mach-imx/iomux-mx3.h                      |  706 -----------
 arch/arm/mach-imx/iomux-mx35.h                     | 1254 --------------------
 arch/arm/mach-imx/iomux-v1.c                       |  174 ---
 arch/arm/mach-imx/iomux-v1.h                       |   81 --
 arch/arm/mach-imx/iomux-v3.c                       |   65 -
 arch/arm/mach-imx/iomux-v3.h                       |  130 --
 arch/arm/mach-imx/mach-armadillo5x0.c              |  562 ---------
 arch/arm/mach-imx/mach-bug.c                       |   54 -
 arch/arm/mach-imx/mach-imx27.c                     |   81 ++
 arch/arm/mach-imx/mach-imx27_visstrim_m10.c        |  562 ---------
 arch/arm/mach-imx/{imx31-dt.c => mach-imx31.c}     |    0
 arch/arm/mach-imx/{imx35-dt.c => mach-imx35.c}     |    0
 arch/arm/mach-imx/mach-imx7ulp.c                   |    3 +
 arch/arm/mach-imx/mach-kzm_arm11_01.c              |  291 -----
 arch/arm/mach-imx/mach-mx21ads.c                   |  338 ------
 arch/arm/mach-imx/mach-mx27_3ds.c                  |  470 --------
 arch/arm/mach-imx/mach-mx27ads.c                   |  407 -------
 arch/arm/mach-imx/mach-mx31_3ds.c                  |  615 ----------
 arch/arm/mach-imx/mach-mx31ads.c                   |  579 ---------
 arch/arm/mach-imx/mach-mx31lilly.c                 |  312 -----
 arch/arm/mach-imx/mach-mx31lite.c                  |  290 -----
 arch/arm/mach-imx/mach-mx31moboard.c               |  581 ---------
 arch/arm/mach-imx/mach-mx35_3ds.c                  |  516 --------
 arch/arm/mach-imx/mach-pca100.c                    |  426 -------
 arch/arm/mach-imx/mach-pcm037.c                    |  585 ---------
 arch/arm/mach-imx/mach-pcm037_eet.c                |  166 ---
 arch/arm/mach-imx/mach-pcm043.c                    |  412 -------
 arch/arm/mach-imx/mach-qong.c                      |  262 ----
 arch/arm/mach-imx/mach-vpr200.c                    |  306 -----
 arch/arm/mach-imx/mm-imx21.c                       |   84 --
 arch/arm/mach-imx/mm-imx27.c                       |   88 --
 arch/arm/mach-imx/mm-imx3.c                        |  185 +--
 arch/arm/mach-imx/mx21.h                           |  176 ---
 arch/arm/mach-imx/mx27.h                           |  196 ---
 arch/arm/mach-imx/mx31.h                           |  179 ---
 arch/arm/mach-imx/mx31lilly-db.c                   |  182 ---
 arch/arm/mach-imx/mx31lite-db.c                    |  154 ---
 arch/arm/mach-imx/mx31moboard-devboard.c           |  238 ----
 arch/arm/mach-imx/mx31moboard-marxbot.c            |  270 -----
 arch/arm/mach-imx/mx31moboard-smartbot.c           |  124 --
 arch/arm/mach-imx/mx35.h                           |  173 ---
 arch/arm/mach-imx/pcm037.h                         |   18 -
 arch/arm/mach-imx/pm-imx27.c                       |   12 +-
 arch/arm/mach-imx/ulpi.h                           |   20 -
 drivers/clk/imx/clk-imx27.c                        |   73 --
 drivers/clk/imx/clk-imx31.c                        |   71 --
 drivers/clk/imx/clk-imx35.c                        |   68 --
 104 files changed, 167 insertions(+), 16300 deletions(-)
 delete mode 100644 arch/arm/mach-imx/3ds_debugboard.c
 delete mode 100644 arch/arm/mach-imx/3ds_debugboard.h
 delete mode 100644 arch/arm/mach-imx/board-mx31lilly.h
 delete mode 100644 arch/arm/mach-imx/board-mx31lite.h
 delete mode 100644 arch/arm/mach-imx/board-mx31moboard.h
 delete mode 100644 arch/arm/mach-imx/devices-imx21.h
 delete mode 100644 arch/arm/mach-imx/devices-imx27.h
 delete mode 100644 arch/arm/mach-imx/devices-imx31.h
 delete mode 100644 arch/arm/mach-imx/devices-imx35.h
 delete mode 100644 arch/arm/mach-imx/devices/Kconfig
 delete mode 100644 arch/arm/mach-imx/devices/Makefile
 delete mode 100644 arch/arm/mach-imx/devices/devices-common.h
 delete mode 100644 arch/arm/mach-imx/devices/devices.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-fec.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-flexcan.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-gpio-mxc.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-gpio_keys.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx-dma.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx-fb.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx-i2c.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx-keypad.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx-ssi.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx-uart.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx2-wdt.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx21-hcd.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx27-coda.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-ipu-core.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mx2-camera.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mx2-emma.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mxc-ehci.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mxc-mmc.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mxc_nand.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mxc_rtc.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mxc_w1.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-pata_imx.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-spi_imx.c
 delete mode 100644 arch/arm/mach-imx/ehci-imx27.c
 delete mode 100644 arch/arm/mach-imx/ehci-imx31.c
 delete mode 100644 arch/arm/mach-imx/ehci-imx35.c
 delete mode 100644 arch/arm/mach-imx/ehci.h
 delete mode 100644 arch/arm/mach-imx/imx27-dt.c
 delete mode 100644 arch/arm/mach-imx/iomux-imx31.c
 delete mode 100644 arch/arm/mach-imx/iomux-mx21.h
 delete mode 100644 arch/arm/mach-imx/iomux-mx27.h
 delete mode 100644 arch/arm/mach-imx/iomux-mx2x.h
 delete mode 100644 arch/arm/mach-imx/iomux-mx3.h
 delete mode 100644 arch/arm/mach-imx/iomux-mx35.h
 delete mode 100644 arch/arm/mach-imx/iomux-v1.c
 delete mode 100644 arch/arm/mach-imx/iomux-v1.h
 delete mode 100644 arch/arm/mach-imx/iomux-v3.c
 delete mode 100644 arch/arm/mach-imx/iomux-v3.h
 delete mode 100644 arch/arm/mach-imx/mach-armadillo5x0.c
 delete mode 100644 arch/arm/mach-imx/mach-bug.c
 create mode 100644 arch/arm/mach-imx/mach-imx27.c
 delete mode 100644 arch/arm/mach-imx/mach-imx27_visstrim_m10.c
 rename arch/arm/mach-imx/{imx31-dt.c => mach-imx31.c} (100%)
 rename arch/arm/mach-imx/{imx35-dt.c => mach-imx35.c} (100%)
 delete mode 100644 arch/arm/mach-imx/mach-kzm_arm11_01.c
 delete mode 100644 arch/arm/mach-imx/mach-mx21ads.c
 delete mode 100644 arch/arm/mach-imx/mach-mx27_3ds.c
 delete mode 100644 arch/arm/mach-imx/mach-mx27ads.c
 delete mode 100644 arch/arm/mach-imx/mach-mx31_3ds.c
 delete mode 100644 arch/arm/mach-imx/mach-mx31ads.c
 delete mode 100644 arch/arm/mach-imx/mach-mx31lilly.c
 delete mode 100644 arch/arm/mach-imx/mach-mx31lite.c
 delete mode 100644 arch/arm/mach-imx/mach-mx31moboard.c
 delete mode 100644 arch/arm/mach-imx/mach-mx35_3ds.c
 delete mode 100644 arch/arm/mach-imx/mach-pca100.c
 delete mode 100644 arch/arm/mach-imx/mach-pcm037.c
 delete mode 100644 arch/arm/mach-imx/mach-pcm037_eet.c
 delete mode 100644 arch/arm/mach-imx/mach-pcm043.c
 delete mode 100644 arch/arm/mach-imx/mach-qong.c
 delete mode 100644 arch/arm/mach-imx/mach-vpr200.c
 delete mode 100644 arch/arm/mach-imx/mm-imx21.c
 delete mode 100644 arch/arm/mach-imx/mm-imx27.c
 delete mode 100644 arch/arm/mach-imx/mx21.h
 delete mode 100644 arch/arm/mach-imx/mx31lilly-db.c
 delete mode 100644 arch/arm/mach-imx/mx31lite-db.c
 delete mode 100644 arch/arm/mach-imx/mx31moboard-devboard.c
 delete mode 100644 arch/arm/mach-imx/mx31moboard-marxbot.c
 delete mode 100644 arch/arm/mach-imx/mx31moboard-smartbot.c
 delete mode 100644 arch/arm/mach-imx/pcm037.h
 delete mode 100644 arch/arm/mach-imx/ulpi.h

Comments

Olof Johansson Oct. 3, 2020, 8:17 p.m. UTC | #1
On Wed, Sep 23, 2020 at 03:30:05PM +0800, Shawn Guo wrote:
> Hi,
> 
> To maintain the patchset integrity, some defconfig change and clock code
> removal are mixed in there.  They do not cause any merge conflicts
> though.  Please consider to pull, thanks!
> 
> Shawn
> 
> 
> The following changes since commit 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5:
> 
>   Linux 5.9-rc1 (2020-08-16 13:04:57 -0700)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git tags/imx-soc-5.10
> 
> for you to fetch changes up to fb956b3e20f0bbeac8c17a7a08e63528a23bd54c:
> 
>   clk: imx: imx35: Remove mx35_clocks_init() (2020-09-22 14:08:22 +0800)
> 
> ----------------------------------------------------------------
> i.MX SoC update for 5.10:
> 
> - A series from Fabio Estevam to remove legacy non-DT i.MX platforms
>   support and related board files. This is a natural move, as the
>   platforms had been converted to DT for years, and we have not seen
>   any users around these legacy non-DT support for a while.

[...]

>  104 files changed, 167 insertions(+), 16300 deletions(-)

Awesome work! Applied


-Olof