Skip to content

Commit 046322f

Browse files
maquefelarndb
authored andcommitted
ARM: ep93xx: DT for the Cirrus ep93xx SoC platforms
Add compulsory device tree support to the Cirrus ep93xx ARMv4 platform. - select PINCTRL_EP93xx - select COMMON_CLK_EP93XX, as clock driver moved out of platform code - select ARCH_HAS_RESET_CONTROLLER Select ARM_ATAG_DTB_COMPAT to update device tree with information about memory passed from bootloader. We have to leave all MACH options as they are used for board checking before decomp, to turn off watchdog and ethernet DMA. Tested-by: Alexander Sverdlin <[email protected]> Signed-off-by: Nikita Shubin <[email protected]> Tested-by: Michael Peters <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Reviewed-by: Krzysztof Kozlowski <[email protected]> Reviewed-by: Guenter Roeck <[email protected]> Reviewed-by: Mark Brown <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Reviewed-by: Linus Walleij <[email protected]> Reviewed-by: Kris Bahnsen <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Reviewed-by: Sergey Shtylyov <[email protected]> Acked-by: Miquel Raynal <[email protected]> Acked-by: Alexander Sverdlin <[email protected]> Acked-by: Uwe Kleine-König <[email protected]> Acked-by: Damien Le Moal <[email protected]> Acked-by: Sebastian Reichel <[email protected]> Acked-by: Vinod Koul <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent bd8511f commit 046322f

File tree

3 files changed

+10
-22
lines changed

3 files changed

+10
-22
lines changed

arch/arm/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ machine-$(CONFIG_ARCH_CLPS711X) += clps711x
183183
machine-$(CONFIG_ARCH_DAVINCI) += davinci
184184
machine-$(CONFIG_ARCH_DIGICOLOR) += digicolor
185185
machine-$(CONFIG_ARCH_DOVE) += dove
186-
machine-$(CONFIG_ARCH_EP93XX) += ep93xx
187186
machine-$(CONFIG_ARCH_EXYNOS) += exynos
188187
machine-$(CONFIG_ARCH_FOOTBRIDGE) += footbridge
189188
machine-$(CONFIG_ARCH_GEMINI) += gemini

arch/arm/mach-ep93xx/Kconfig

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@ menuconfig ARCH_EP93XX
33
bool "EP93xx-based"
44
depends on ATAGS
55
depends on ARCH_MULTI_V4T
6+
# CONFIG_ARCH_MULTI_V7 is not set
67
depends on CPU_LITTLE_ENDIAN
8+
select ARCH_HAS_RESET_CONTROLLER
79
select ARCH_SPARSEMEM_ENABLE
810
select ARM_AMBA
911
select ARM_VIC
12+
select ARM_APPENDED_DTB # Old Redboot bootloaders deployed
13+
select ARM_ATAG_DTB_COMPAT # we need this to update dt memory node
14+
select COMMON_CLK_EP93XX
15+
select EP93XX_TIMER
1016
select CLKSRC_MMIO
1117
select CPU_ARM920T
1218
select GPIOLIB
19+
select PINCTRL
20+
select PINCTRL_EP93XX
1321
help
1422
This enables support for the Cirrus EP93xx series of CPUs.
1523

1624
if ARCH_EP93XX
1725

18-
menu "Cirrus EP93xx Implementation Options"
19-
20-
config EP93XX_SOC_COMMON
21-
bool
22-
default y
23-
select SOC_BUS
24-
select LEDS_GPIO_REGISTER
25-
26-
comment "EP93xx Platforms"
26+
# menu "EP93xx Platforms"
2727

2828
config MACH_BK3
2929
bool "Support Liebherr BK3.1"
@@ -103,6 +103,6 @@ config MACH_VISION_EP9307
103103
Say 'Y' here if you want your kernel to support the
104104
Vision Engraving Systems EP9307 SoM.
105105

106-
endmenu
106+
# endmenu
107107

108108
endif

arch/arm/mach-ep93xx/Makefile

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

0 commit comments

Comments
 (0)