Skip to content

Commit accdab6

Browse files
committed
Merge tag 'imx-soc-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/soc
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. * tag 'imx-soc-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (26 commits) clk: imx: imx35: Remove mx35_clocks_init() clk: imx: imx31: Remove mx31_clocks_init() clk: imx: imx27: Remove mx27_clocks_init() ARM: imx: Remove unused definitions ARM: imx35: Retrieve the IIM base address from devicetree ARM: imx3: Retrieve the AVIC base address from devicetree ARM: imx3: Retrieve the CCM base address from devicetree ARM: imx31: Retrieve the IIM base address from devicetree ARM: imx27: Retrieve the CCM base address from devicetree ARM: imx27: Retrieve the SYSCTRL base address from devicetree ARM: imx: Remove remnant board file support pieces ARM: imx: Remove imx device directory ARM: imx: Remove iomux-v3 board code ARM: imx3: Remove imx3 soc_init() ARM: imx31: Remove remaining i.MX31 board code ARM: imx27: Retrieve AVIC base address from devicetree ARM: imx27: Get rid of mm-imx27.c ARM: imx27: Remove iomux-v1 board code ARM: imx27: Remove imx27_soc_init() ARM: imx7ulp: enable cpufreq ... Link: https://lore.kernel.org/r/20200923073009.23678-2-shawnguo@kernel.org Signed-off-by: Olof Johansson <olof@lixom.net>
2 parents a4f0700 + fb956b3 commit accdab6

104 files changed

Lines changed: 167 additions & 16300 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

arch/arm/configs/imx_v4_v5_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ CONFIG_MACH_MX27ADS=y
2020
CONFIG_MACH_MX27_3DS=y
2121
CONFIG_MACH_IMX27_VISSTRIM_M10=y
2222
CONFIG_MACH_PCA100=y
23-
CONFIG_MACH_IMX27_DT=y
2423
CONFIG_SOC_IMX1=y
2524
CONFIG_SOC_IMX25=y
25+
CONFIG_SOC_IMX27=y
2626
CONFIG_AEABI=y
2727
CONFIG_ZBOOT_ROM_TEXT=0x0
2828
CONFIG_ZBOOT_ROM_BSS=0x0

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,8 @@ CONFIG_PERF_EVENTS=y
1515
# CONFIG_COMPAT_BRK is not set
1616
CONFIG_ARCH_MULTI_V6=y
1717
CONFIG_ARCH_MXC=y
18-
CONFIG_MACH_MX31LILLY=y
19-
CONFIG_MACH_MX31LITE=y
20-
CONFIG_MACH_PCM037=y
21-
CONFIG_MACH_PCM037_EET=y
22-
CONFIG_MACH_MX31_3DS=y
23-
CONFIG_MACH_MX31MOBOARD=y
24-
CONFIG_MACH_QONG=y
25-
CONFIG_MACH_ARMADILLO5X0=y
26-
CONFIG_MACH_KZM_ARM11_01=y
27-
CONFIG_MACH_IMX31_DT=y
28-
CONFIG_MACH_IMX35_DT=y
29-
CONFIG_MACH_PCM043=y
30-
CONFIG_MACH_MX35_3DS=y
31-
CONFIG_MACH_VPR200=y
18+
CONFIG_SOC_IMX31=y
19+
CONFIG_SOC_IMX35=y
3220
CONFIG_SOC_IMX50=y
3321
CONFIG_SOC_IMX51=y
3422
CONFIG_SOC_IMX53=y

arch/arm/configs/multi_v5_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ CONFIG_MACH_MX27ADS=y
2929
CONFIG_MACH_MX27_3DS=y
3030
CONFIG_MACH_IMX27_VISSTRIM_M10=y
3131
CONFIG_MACH_PCA100=y
32-
CONFIG_MACH_IMX27_DT=y
3332
CONFIG_SOC_IMX25=y
33+
CONFIG_SOC_IMX27=y
3434
CONFIG_ARCH_MVEBU=y
3535
CONFIG_MACH_KIRKWOOD=y
3636
CONFIG_ARCH_ORION5X=y

arch/arm/mach-imx/3ds_debugboard.c

Lines changed: 0 additions & 207 deletions
This file was deleted.

arch/arm/mach-imx/3ds_debugboard.h

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)