Skip to content

Commit 383ffda

Browse files
committed
ARM: EXYNOS: no more support non-DT for EXYNOS SoCs
As we discussed in mailing list, non-DT for EXYNOS SoCs will not be supported from v3.11. This patch removes regarding files for non-DT including board files and defconfig. Cc: Sylwester Nawrocki <[email protected]> Cc: Tomasz Figa <[email protected]> Cc: Thomas Abraham <[email protected]> Cc: Kyungmin Park <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: Olof Johansson <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
1 parent 317ddd2 commit 383ffda

File tree

7 files changed

+1
-991
lines changed

7 files changed

+1
-991
lines changed

arch/arm/mach-exynos/Kconfig

Lines changed: 1 addition & 319 deletions
Original file line numberDiff line numberDiff line change
@@ -84,329 +84,11 @@ config SOC_EXYNOS5440
8484
help
8585
Enable EXYNOS5440 SoC support
8686

87-
config EXYNOS_ATAGS
88-
bool "ATAGS based boot for EXYNOS (deprecated)"
89-
depends on !ARCH_MULTIPLATFORM
90-
depends on ATAGS
91-
default y
92-
help
93-
The EXYNOS platform is moving towards being completely probed
94-
through device tree. This enables support for board files using
95-
the traditional ATAGS boot format.
96-
Note that this option is not available for multiplatform builds.
97-
98-
if EXYNOS_ATAGS
99-
100-
config EXYNOS_DEV_DMA
101-
bool
102-
help
103-
Compile in amba device definitions for DMA controller
104-
105-
config EXYNOS4_DEV_AHCI
106-
bool
107-
help
108-
Compile in platform device definitions for AHCI
109-
110-
config EXYNOS4_SETUP_FIMD0
111-
bool
112-
help
113-
Common setup code for FIMD0.
114-
115-
config EXYNOS4_DEV_USB_OHCI
116-
bool
117-
help
118-
Compile in platform device definition for USB OHCI
119-
120-
config EXYNOS4_SETUP_I2C1
121-
bool
122-
help
123-
Common setup code for i2c bus 1.
124-
125-
config EXYNOS4_SETUP_I2C2
126-
bool
127-
help
128-
Common setup code for i2c bus 2.
129-
130-
config EXYNOS4_SETUP_I2C3
131-
bool
132-
help
133-
Common setup code for i2c bus 3.
134-
135-
config EXYNOS4_SETUP_I2C4
136-
bool
137-
help
138-
Common setup code for i2c bus 4.
139-
140-
config EXYNOS4_SETUP_I2C5
141-
bool
142-
help
143-
Common setup code for i2c bus 5.
144-
145-
config EXYNOS4_SETUP_I2C6
146-
bool
147-
help
148-
Common setup code for i2c bus 6.
149-
150-
config EXYNOS4_SETUP_I2C7
151-
bool
152-
help
153-
Common setup code for i2c bus 7.
154-
155-
config EXYNOS4_SETUP_KEYPAD
156-
bool
157-
help
158-
Common setup code for keypad.
159-
160-
config EXYNOS4_SETUP_SDHCI
161-
bool
162-
select EXYNOS4_SETUP_SDHCI_GPIO
163-
help
164-
Internal helper functions for EXYNOS4 based SDHCI systems.
165-
166-
config EXYNOS4_SETUP_SDHCI_GPIO
167-
bool
168-
help
169-
Common setup code for SDHCI gpio.
170-
171-
config EXYNOS4_SETUP_FIMC
172-
bool
173-
help
174-
Common setup code for the camera interfaces.
175-
176-
config EXYNOS4_SETUP_USB_PHY
177-
bool
178-
help
179-
Common setup code for USB PHY controller
180-
181-
config EXYNOS_SETUP_SPI
182-
bool
183-
help
184-
Common setup code for SPI GPIO configurations.
185-
186-
# machine support
187-
188-
if ARCH_EXYNOS4
189-
190-
comment "EXYNOS4210 Boards"
191-
192-
config MACH_SMDKC210
193-
bool "SMDKC210"
194-
select MACH_SMDKV310
195-
help
196-
Machine support for Samsung SMDKC210
197-
198-
config MACH_SMDKV310
199-
bool "SMDKV310"
200-
select CPU_EXYNOS4210
201-
select EXYNOS4_DEV_AHCI
202-
select EXYNOS4_DEV_USB_OHCI
203-
select EXYNOS4_SETUP_FIMD0
204-
select EXYNOS4_SETUP_I2C1
205-
select EXYNOS4_SETUP_KEYPAD
206-
select EXYNOS4_SETUP_SDHCI
207-
select EXYNOS4_SETUP_USB_PHY
208-
select EXYNOS_DEV_DMA
209-
select EXYNOS_DEV_SYSMMU
210-
select S3C24XX_PWM
211-
select S3C_DEV_HSMMC
212-
select S3C_DEV_HSMMC1
213-
select S3C_DEV_HSMMC2
214-
select S3C_DEV_HSMMC3
215-
select S3C_DEV_I2C1
216-
select S3C_DEV_RTC
217-
select S3C_DEV_USB_HSOTG
218-
select S3C_DEV_WDT
219-
select S5P_DEV_FIMC0
220-
select S5P_DEV_FIMC1
221-
select S5P_DEV_FIMC2
222-
select S5P_DEV_FIMC3
223-
select S5P_DEV_FIMD0
224-
select S5P_DEV_G2D
225-
select S5P_DEV_I2C_HDMIPHY
226-
select S5P_DEV_JPEG
227-
select S5P_DEV_MFC
228-
select S5P_DEV_TV
229-
select S5P_DEV_USB_EHCI
230-
select SAMSUNG_DEV_BACKLIGHT
231-
select SAMSUNG_DEV_KEYPAD
232-
select SAMSUNG_DEV_PWM
233-
help
234-
Machine support for Samsung SMDKV310
235-
236-
config MACH_ARMLEX4210
237-
bool "ARMLEX4210"
238-
select CPU_EXYNOS4210
239-
select EXYNOS4_DEV_AHCI
240-
select EXYNOS4_SETUP_SDHCI
241-
select EXYNOS_DEV_DMA
242-
select S3C_DEV_HSMMC
243-
select S3C_DEV_HSMMC2
244-
select S3C_DEV_HSMMC3
245-
select S3C_DEV_RTC
246-
select S3C_DEV_WDT
247-
help
248-
Machine support for Samsung ARMLEX4210 based on EXYNOS4210
249-
250-
config MACH_UNIVERSAL_C210
251-
bool "Mobile UNIVERSAL_C210 Board"
252-
select CLKSRC_MMIO
253-
select CLKSRC_SAMSUNG_PWM
254-
select CPU_EXYNOS4210
255-
select EXYNOS4_SETUP_FIMC
256-
select EXYNOS4_SETUP_FIMD0
257-
select EXYNOS4_SETUP_I2C1
258-
select EXYNOS4_SETUP_I2C3
259-
select EXYNOS4_SETUP_I2C5
260-
select EXYNOS4_SETUP_SDHCI
261-
select EXYNOS4_SETUP_USB_PHY
262-
select EXYNOS_DEV_DMA
263-
select EXYNOS_DEV_SYSMMU
264-
select S3C_DEV_HSMMC
265-
select S3C_DEV_HSMMC2
266-
select S3C_DEV_HSMMC3
267-
select S3C_DEV_I2C1
268-
select S3C_DEV_I2C3
269-
select S3C_DEV_I2C5
270-
select S3C_DEV_USB_HSOTG
271-
select S5P_DEV_CSIS0
272-
select S5P_DEV_FIMC0
273-
select S5P_DEV_FIMC1
274-
select S5P_DEV_FIMC2
275-
select S5P_DEV_FIMC3
276-
select S5P_DEV_FIMD0
277-
select S5P_DEV_G2D
278-
select S5P_DEV_I2C_HDMIPHY
279-
select S5P_DEV_JPEG
280-
select S5P_DEV_MFC
281-
select S5P_DEV_ONENAND
282-
select S5P_DEV_TV
283-
select S5P_GPIO_INT
284-
select S5P_SETUP_MIPIPHY
285-
help
286-
Machine support for Samsung Mobile Universal S5PC210 Reference
287-
Board.
288-
289-
config MACH_NURI
290-
bool "Mobile NURI Board"
291-
select CPU_EXYNOS4210
292-
select EXYNOS4_SETUP_FIMC
293-
select EXYNOS4_SETUP_FIMD0
294-
select EXYNOS4_SETUP_I2C1
295-
select EXYNOS4_SETUP_I2C3
296-
select EXYNOS4_SETUP_I2C5
297-
select EXYNOS4_SETUP_I2C6
298-
select EXYNOS4_SETUP_SDHCI
299-
select EXYNOS4_SETUP_USB_PHY
300-
select EXYNOS_DEV_DMA
301-
select S3C_DEV_HSMMC
302-
select S3C_DEV_HSMMC2
303-
select S3C_DEV_HSMMC3
304-
select S3C_DEV_I2C1
305-
select S3C_DEV_I2C3
306-
select S3C_DEV_I2C5
307-
select S3C_DEV_I2C6
308-
select S3C_DEV_RTC
309-
select S3C_DEV_USB_HSOTG
310-
select S3C_DEV_WDT
311-
select S5P_DEV_CSIS0
312-
select S5P_DEV_FIMC0
313-
select S5P_DEV_FIMC1
314-
select S5P_DEV_FIMC2
315-
select S5P_DEV_FIMC3
316-
select S5P_DEV_FIMD0
317-
select S5P_DEV_G2D
318-
select S5P_DEV_JPEG
319-
select S5P_DEV_MFC
320-
select S5P_DEV_USB_EHCI
321-
select S5P_GPIO_INT
322-
select S5P_SETUP_MIPIPHY
323-
select SAMSUNG_DEV_ADC
324-
select SAMSUNG_DEV_PWM
325-
help
326-
Machine support for Samsung Mobile NURI Board.
327-
328-
config MACH_ORIGEN
329-
bool "ORIGEN"
330-
select CPU_EXYNOS4210
331-
select EXYNOS4_DEV_USB_OHCI
332-
select EXYNOS4_SETUP_FIMD0
333-
select EXYNOS4_SETUP_SDHCI
334-
select EXYNOS4_SETUP_USB_PHY
335-
select EXYNOS_DEV_DMA
336-
select EXYNOS_DEV_SYSMMU
337-
select S3C24XX_PWM
338-
select S3C_DEV_HSMMC
339-
select S3C_DEV_HSMMC2
340-
select S3C_DEV_RTC
341-
select S3C_DEV_USB_HSOTG
342-
select S3C_DEV_WDT
343-
select S5P_DEV_FIMC0
344-
select S5P_DEV_FIMC1
345-
select S5P_DEV_FIMC2
346-
select S5P_DEV_FIMC3
347-
select S5P_DEV_FIMD0
348-
select S5P_DEV_G2D
349-
select S5P_DEV_I2C_HDMIPHY
350-
select S5P_DEV_JPEG
351-
select S5P_DEV_MFC
352-
select S5P_DEV_TV
353-
select S5P_DEV_USB_EHCI
354-
select SAMSUNG_DEV_BACKLIGHT
355-
select SAMSUNG_DEV_PWM
356-
help
357-
Machine support for ORIGEN based on Samsung EXYNOS4210
358-
359-
comment "EXYNOS4212 Boards"
360-
361-
config MACH_SMDK4212
362-
bool "SMDK4212"
363-
select EXYNOS4_SETUP_FIMD0
364-
select EXYNOS4_SETUP_I2C1
365-
select EXYNOS4_SETUP_I2C3
366-
select EXYNOS4_SETUP_I2C7
367-
select EXYNOS4_SETUP_KEYPAD
368-
select EXYNOS4_SETUP_SDHCI
369-
select EXYNOS4_SETUP_USB_PHY
370-
select EXYNOS_DEV_DMA
371-
select EXYNOS_DEV_SYSMMU
372-
select S3C24XX_PWM
373-
select S3C_DEV_HSMMC2
374-
select S3C_DEV_HSMMC3
375-
select S3C_DEV_I2C1
376-
select S3C_DEV_I2C3
377-
select S3C_DEV_I2C7
378-
select S3C_DEV_RTC
379-
select S3C_DEV_USB_HSOTG
380-
select S3C_DEV_WDT
381-
select S5P_DEV_FIMC0
382-
select S5P_DEV_FIMC1
383-
select S5P_DEV_FIMC2
384-
select S5P_DEV_FIMC3
385-
select S5P_DEV_FIMD0
386-
select S5P_DEV_MFC
387-
select SAMSUNG_DEV_BACKLIGHT
388-
select SAMSUNG_DEV_KEYPAD
389-
select SAMSUNG_DEV_PWM
390-
select SOC_EXYNOS4212
391-
help
392-
Machine support for Samsung SMDK4212
393-
394-
comment "EXYNOS4412 Boards"
395-
396-
config MACH_SMDK4412
397-
bool "SMDK4412"
398-
select MACH_SMDK4212
399-
select SOC_EXYNOS4412
400-
help
401-
Machine support for Samsung SMDK4412
402-
endif
403-
404-
endif
405-
40687
comment "Flattened Device Tree based board for EXYNOS SoCs"
40788

40889
config MACH_EXYNOS4_DT
40990
bool "Samsung Exynos4 Machine using device tree"
91+
default y
41092
depends on ARCH_EXYNOS4
41193
select ARM_AMBA
41294
select CLKSRC_OF

arch/arm/mach-exynos/Makefile

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -32,38 +32,12 @@ AFLAGS_exynos-smc.o :=-Wa,-march=armv7-a$(plus_sec)
3232

3333
# machine support
3434

35-
obj-$(CONFIG_MACH_SMDKC210) += mach-smdkv310.o
36-
obj-$(CONFIG_MACH_SMDKV310) += mach-smdkv310.o
37-
obj-$(CONFIG_MACH_ARMLEX4210) += mach-armlex4210.o
38-
obj-$(CONFIG_MACH_UNIVERSAL_C210) += mach-universal_c210.o
39-
obj-$(CONFIG_MACH_NURI) += mach-nuri.o
40-
obj-$(CONFIG_MACH_ORIGEN) += mach-origen.o
41-
42-
obj-$(CONFIG_MACH_SMDK4212) += mach-smdk4x12.o
43-
obj-$(CONFIG_MACH_SMDK4412) += mach-smdk4x12.o
44-
4535
obj-$(CONFIG_MACH_EXYNOS4_DT) += mach-exynos4-dt.o
4636
obj-$(CONFIG_MACH_EXYNOS5_DT) += mach-exynos5-dt.o
4737

4838
# device support
4939

5040
obj-y += dev-uart.o
5141
obj-$(CONFIG_ARCH_EXYNOS4) += dev-audio.o
52-
obj-$(CONFIG_EXYNOS4_DEV_AHCI) += dev-ahci.o
53-
obj-$(CONFIG_EXYNOS_DEV_DMA) += dma.o
54-
obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI) += dev-ohci.o
5542

5643
obj-$(CONFIG_ARCH_EXYNOS) += setup-i2c0.o
57-
obj-$(CONFIG_EXYNOS4_SETUP_FIMC) += setup-fimc.o
58-
obj-$(CONFIG_EXYNOS4_SETUP_FIMD0) += setup-fimd0.o
59-
obj-$(CONFIG_EXYNOS4_SETUP_I2C1) += setup-i2c1.o
60-
obj-$(CONFIG_EXYNOS4_SETUP_I2C2) += setup-i2c2.o
61-
obj-$(CONFIG_EXYNOS4_SETUP_I2C3) += setup-i2c3.o
62-
obj-$(CONFIG_EXYNOS4_SETUP_I2C4) += setup-i2c4.o
63-
obj-$(CONFIG_EXYNOS4_SETUP_I2C5) += setup-i2c5.o
64-
obj-$(CONFIG_EXYNOS4_SETUP_I2C6) += setup-i2c6.o
65-
obj-$(CONFIG_EXYNOS4_SETUP_I2C7) += setup-i2c7.o
66-
obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD) += setup-keypad.o
67-
obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
68-
obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY) += setup-usb-phy.o
69-
obj-$(CONFIG_EXYNOS_SETUP_SPI) += setup-spi.o

0 commit comments

Comments
 (0)