Skip to content

Commit 743c8fb

Browse files
committed
ARM: s3c: remove most s3c64xx board support
All traditional board files except for MACH_WLF_CRAGG_6410 were marked as unused, so remove them now. Cc: Kwangwoo Lee <kwangwoo.lee@gmail.com> Cc: Peter Korsgaard <jacmet@sunsite.dk> Cc: Darius Augulis <augulis.darius@gmail.com> Cc: Maurus Cuelenaere <mcuelenaere@gmail.com> Cc: Ben Dooks <ben-linux@fluff.org> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent 1ea35b3 commit 743c8fb

14 files changed

+0
-3226
lines changed

arch/arm/mach-s3c/Kconfig.s3c64xx

Lines changed: 0 additions & 206 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,6 @@ config S3C64XX_SETUP_SDHCI
5454
Internal configuration for default SDHCI setup for S3C6400 and
5555
S3C6410 SoCs.
5656

57-
config S3C64XX_DEV_ONENAND1
58-
bool
59-
help
60-
Compile in platform device definition for OneNAND1 controller
61-
62-
config SAMSUNG_DEV_BACKLIGHT
63-
bool
64-
depends on SAMSUNG_DEV_PWM
65-
help
66-
Compile in platform device definition LCD backlight with PWM Timer
67-
6857
# platform specific device setup
6958

7059
config S3C64XX_SETUP_I2C0
@@ -113,201 +102,6 @@ config S3C64XX_SETUP_USB_PHY
113102

114103
# S36400 Macchine support
115104

116-
config MACH_SMDK6400
117-
bool "SMDK6400"
118-
depends on ATAGS && UNUSED_BOARD_FILES
119-
select CPU_S3C6400
120-
select S3C64XX_SETUP_SDHCI
121-
select S3C_DEV_HSMMC1
122-
help
123-
Machine support for the Samsung SMDK6400
124-
125-
# S3C6410 machine support
126-
127-
config MACH_ANW6410
128-
bool "A&W6410"
129-
depends on ATAGS && UNUSED_BOARD_FILES
130-
select CPU_S3C6410
131-
select S3C64XX_SETUP_FB_24BPP
132-
select S3C_DEV_FB
133-
help
134-
Machine support for the A&W6410
135-
136-
config MACH_MINI6410
137-
bool "MINI6410"
138-
depends on ATAGS && UNUSED_BOARD_FILES
139-
select CPU_S3C6410
140-
select S3C64XX_SETUP_FB_24BPP
141-
select S3C64XX_SETUP_SDHCI
142-
select S3C_DEV_FB
143-
select S3C_DEV_HSMMC
144-
select S3C_DEV_HSMMC1
145-
select S3C_DEV_NAND
146-
select S3C_DEV_USB_HOST
147-
select SAMSUNG_DEV_ADC
148-
select SAMSUNG_DEV_TS
149-
help
150-
Machine support for the FriendlyARM MINI6410
151-
152-
config MACH_REAL6410
153-
bool "REAL6410"
154-
depends on ATAGS && UNUSED_BOARD_FILES
155-
select CPU_S3C6410
156-
select S3C64XX_SETUP_FB_24BPP
157-
select S3C64XX_SETUP_SDHCI
158-
select S3C_DEV_FB
159-
select S3C_DEV_HSMMC
160-
select S3C_DEV_HSMMC1
161-
select S3C_DEV_NAND
162-
select S3C_DEV_USB_HOST
163-
select SAMSUNG_DEV_ADC
164-
select SAMSUNG_DEV_TS
165-
help
166-
Machine support for the CoreWind REAL6410
167-
168-
config MACH_SMDK6410
169-
bool "SMDK6410"
170-
depends on ATAGS && UNUSED_BOARD_FILES
171-
select CPU_S3C6410
172-
select S3C64XX_SETUP_FB_24BPP
173-
select S3C64XX_SETUP_I2C1
174-
select S3C64XX_SETUP_IDE
175-
select S3C64XX_SETUP_KEYPAD
176-
select S3C64XX_SETUP_SDHCI
177-
select S3C64XX_SETUP_USB_PHY
178-
select S3C_DEV_FB
179-
select S3C_DEV_HSMMC
180-
select S3C_DEV_HSMMC1
181-
select S3C_DEV_I2C1
182-
select S3C_DEV_RTC
183-
select S3C_DEV_USB_HOST
184-
select S3C_DEV_USB_HSOTG
185-
select S3C_DEV_WDT
186-
select SAMSUNG_DEV_ADC
187-
select SAMSUNG_DEV_BACKLIGHT
188-
select SAMSUNG_DEV_IDE
189-
select SAMSUNG_DEV_KEYPAD
190-
select SAMSUNG_DEV_PWM
191-
select SAMSUNG_DEV_TS
192-
help
193-
Machine support for the Samsung SMDK6410
194-
195-
# At least some of the SMDK6410s were shipped with the card detect
196-
# for the MMC/SD slots connected to the same input. This means that
197-
# either the boards need to be altered to have channel0 to an alternate
198-
# configuration or that only one slot can be used.
199-
200-
choice
201-
prompt "SMDK6410 MMC/SD slot setup"
202-
depends on MACH_SMDK6410
203-
204-
config SMDK6410_SD_CH0
205-
bool "Use channel 0 only"
206-
depends on MACH_SMDK6410
207-
help
208-
Select CON7 (channel 0) as the MMC/SD slot, as
209-
at least some SMDK6410 boards come with the
210-
resistors fitted so that the card detects for
211-
channels 0 and 1 are the same.
212-
213-
config SMDK6410_SD_CH1
214-
bool "Use channel 1 only"
215-
depends on MACH_SMDK6410
216-
help
217-
Select CON6 (channel 1) as the MMC/SD slot, as
218-
at least some SMDK6410 boards come with the
219-
resistors fitted so that the card detects for
220-
channels 0 and 1 are the same.
221-
222-
endchoice
223-
224-
config SMDK6410_WM1190_EV1
225-
bool "Support Wolfson Microelectronics 1190-EV1 PMIC card"
226-
depends on MACH_SMDK6410
227-
depends on I2C=y
228-
select MFD_WM8350_I2C
229-
select REGULATOR
230-
select REGULATOR_WM8350
231-
help
232-
The Wolfson Microelectronics 1190-EV1 is a WM835x based PMIC
233-
and audio daughtercard for the Samsung SMDK6410 reference
234-
platform. Enabling this option will build support for this
235-
module into the kernel. The presence of the module will be
236-
detected at runtime so the resulting kernel can be used
237-
with or without the 1190-EV1 fitted.
238-
239-
config SMDK6410_WM1192_EV1
240-
bool "Support Wolfson Microelectronics 1192-EV1 PMIC card"
241-
depends on MACH_SMDK6410
242-
depends on I2C=y
243-
select MFD_WM831X
244-
select MFD_WM831X_I2C
245-
select REGULATOR
246-
select REGULATOR_WM831X
247-
help
248-
The Wolfson Microelectronics 1192-EV1 is a WM831x based PMIC
249-
daughtercard for the Samsung SMDK6410 reference platform.
250-
Enabling this option will build support for this module into
251-
the kernel. The presence of the daughtercard will be
252-
detected at runtime so the resulting kernel can be used
253-
with or without the 1192-EV1 fitted.
254-
255-
config MACH_NCP
256-
bool "NCP"
257-
depends on ATAGS && UNUSED_BOARD_FILES
258-
select CPU_S3C6410
259-
select S3C64XX_SETUP_I2C1
260-
select S3C_DEV_HSMMC1
261-
select S3C_DEV_I2C1
262-
help
263-
Machine support for the Samsung NCP
264-
265-
config MACH_HMT
266-
bool "Airgoo HMT"
267-
depends on ATAGS && UNUSED_BOARD_FILES
268-
select CPU_S3C6410
269-
select S3C64XX_SETUP_FB_24BPP
270-
select S3C_DEV_FB
271-
select S3C_DEV_NAND
272-
select S3C_DEV_USB_HOST
273-
select SAMSUNG_DEV_PWM
274-
help
275-
Machine support for the Airgoo HMT
276-
277-
config MACH_SMARTQ
278-
bool
279-
select CPU_S3C6410
280-
select S3C64XX_SETUP_FB_24BPP
281-
select S3C64XX_SETUP_SDHCI
282-
select S3C64XX_SETUP_USB_PHY
283-
select S3C_DEV_FB
284-
select S3C_DEV_HSMMC
285-
select S3C_DEV_HSMMC1
286-
select S3C_DEV_HSMMC2
287-
select S3C_DEV_HWMON
288-
select S3C_DEV_RTC
289-
select S3C_DEV_USB_HOST
290-
select S3C_DEV_USB_HSOTG
291-
select SAMSUNG_DEV_ADC
292-
select SAMSUNG_DEV_PWM
293-
select SAMSUNG_DEV_TS
294-
help
295-
Shared machine support for SmartQ 5/7
296-
297-
config MACH_SMARTQ5
298-
bool "SmartQ 5"
299-
depends on ATAGS && UNUSED_BOARD_FILES
300-
select MACH_SMARTQ
301-
help
302-
Machine support for the SmartQ 5
303-
304-
config MACH_SMARTQ7
305-
bool "SmartQ 7"
306-
depends on ATAGS && UNUSED_BOARD_FILES
307-
select MACH_SMARTQ
308-
help
309-
Machine support for the SmartQ 7
310-
311105
config MACH_WLF_CRAGG_6410
312106
bool "Wolfson Cragganmore 6410"
313107
depends on ATAGS

arch/arm/mach-s3c/Makefile.s3c64xx

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,7 @@ obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio-s3c64xx.o
3939
obj-$(CONFIG_S3C64XX_SETUP_SPI) += setup-spi-s3c64xx.o
4040
obj-$(CONFIG_S3C64XX_SETUP_USB_PHY) += setup-usb-phy-s3c64xx.o
4141

42-
obj-$(CONFIG_SAMSUNG_DEV_BACKLIGHT) += dev-backlight-s3c64xx.o
43-
4442
# Machine support
45-
46-
obj-$(CONFIG_MACH_ANW6410) += mach-anw6410.o
47-
obj-$(CONFIG_MACH_HMT) += mach-hmt.o
48-
obj-$(CONFIG_MACH_MINI6410) += mach-mini6410.o
49-
obj-$(CONFIG_MACH_NCP) += mach-ncp.o
50-
obj-$(CONFIG_MACH_REAL6410) += mach-real6410.o
51-
obj-$(CONFIG_MACH_SMARTQ) += mach-smartq.o
52-
obj-$(CONFIG_MACH_SMARTQ5) += mach-smartq5.o
53-
obj-$(CONFIG_MACH_SMARTQ7) += mach-smartq7.o
54-
obj-$(CONFIG_MACH_SMDK6400) += mach-smdk6400.o
55-
obj-$(CONFIG_MACH_SMDK6410) += mach-smdk6410.o
5643
obj-$(CONFIG_MACH_WLF_CRAGG_6410) += mach-crag6410.o mach-crag6410-module.o
5744
endif
5845

arch/arm/mach-s3c/dev-backlight-s3c64xx.c

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

0 commit comments

Comments
 (0)