ARM: S3C64XX: Move device and device setup into mach-s3c64xx
Move the S3C64XX specific device and setup files into mach-s3c64xx as they are unlikely to be used outside of this code. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
This commit is contained in:
parent
ed618aff8a
commit
88fc68a280
@ -26,6 +26,32 @@ config S3C64XX_SETUP_SDHCI
|
||||
Internal configuration for default SDHCI setup for S3C6400 and
|
||||
S3C6410 SoCs.
|
||||
|
||||
# platform specific device setup
|
||||
|
||||
config S3C64XX_SETUP_I2C0
|
||||
bool
|
||||
default y
|
||||
help
|
||||
Common setup code for i2c bus 0.
|
||||
|
||||
Note, currently since i2c0 is always compiled, this setup helper
|
||||
is always compiled with it.
|
||||
|
||||
config S3C64XX_SETUP_I2C1
|
||||
bool
|
||||
help
|
||||
Common setup code for i2c bus 1.
|
||||
|
||||
config S3C64XX_SETUP_FB_24BPP
|
||||
bool
|
||||
help
|
||||
Common setup code for S3C64XX with an 24bpp RGB display helper.
|
||||
|
||||
config S3C64XX_SETUP_SDHCI_GPIO
|
||||
bool
|
||||
help
|
||||
Common setup code for S3C64XX SDHCI GPIO configurations
|
||||
|
||||
# S36400 Macchine support
|
||||
|
||||
config MACH_SMDK6400
|
||||
|
@ -18,9 +18,13 @@ obj-$(CONFIG_CPU_S3C6410) += s3c6410.o
|
||||
obj-y += irq.o
|
||||
obj-y += irq-eint.o
|
||||
|
||||
# setup support
|
||||
# Device setup
|
||||
|
||||
obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o
|
||||
obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o
|
||||
obj-$(CONFIG_S3C64XX_SETUP_SDHCI) += setup-sdhci.o
|
||||
obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
|
||||
obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
|
||||
|
||||
# PM
|
||||
|
||||
@ -33,3 +37,10 @@ obj-$(CONFIG_MACH_SMDK6400) += mach-smdk6400.o
|
||||
obj-$(CONFIG_MACH_SMDK6410) += mach-smdk6410.o
|
||||
obj-$(CONFIG_MACH_NCP) += mach-ncp.o
|
||||
obj-$(CONFIG_MACH_HMT) += mach-hmt.o
|
||||
|
||||
# device support
|
||||
|
||||
obj-y += dev-uart.o
|
||||
obj-y += dev-rtc.o
|
||||
obj-$(CONFIG_S3C_ADC) += dev-adc.o
|
||||
obj-$(CONFIG_SND_S3C24XX_SOC) += dev-audio.o
|
||||
|
@ -17,8 +17,8 @@
|
||||
#include <mach/map.h>
|
||||
#include <mach/gpio.h>
|
||||
#include <mach/gpio-bank-c.h>
|
||||
#include <mach/spi-clocks.h>
|
||||
|
||||
#include <plat/spi-clocks.h>
|
||||
#include <plat/s3c64xx-spi.h>
|
||||
#include <plat/gpio-cfg.h>
|
||||
#include <plat/irqs.h>
|
@ -1,4 +1,4 @@
|
||||
/* linux/arch/arm/plat-s3c64xx/include/plat/spi-clocks.h
|
||||
/* linux/arch/arm/mach-s3c64xx/include/mach/spi-clocks.h
|
||||
*
|
||||
* Copyright (C) 2009 Samsung Electronics Ltd.
|
||||
* Jaswinder Singh <jassi.brar@samsung.com>
|
@ -46,30 +46,4 @@ config S3C64XX_DMA
|
||||
bool "S3C64XX DMA"
|
||||
select S3C_DMA
|
||||
|
||||
# platform specific device setup
|
||||
|
||||
config S3C64XX_SETUP_I2C0
|
||||
bool
|
||||
default y
|
||||
help
|
||||
Common setup code for i2c bus 0.
|
||||
|
||||
Note, currently since i2c0 is always compiled, this setup helper
|
||||
is always compiled with it.
|
||||
|
||||
config S3C64XX_SETUP_I2C1
|
||||
bool
|
||||
help
|
||||
Common setup code for i2c bus 1.
|
||||
|
||||
config S3C64XX_SETUP_FB_24BPP
|
||||
bool
|
||||
help
|
||||
Common setup code for S3C64XX with an 24bpp RGB display helper.
|
||||
|
||||
config S3C64XX_SETUP_SDHCI_GPIO
|
||||
bool
|
||||
help
|
||||
Common setup code for S3C64XX SDHCI GPIO configurations
|
||||
|
||||
endif
|
||||
|
@ -11,9 +11,6 @@ obj-n := dummy.o
|
||||
obj- :=
|
||||
|
||||
# Core files
|
||||
|
||||
obj-y += dev-uart.o
|
||||
obj-y += dev-rtc.o
|
||||
obj-y += cpu.o
|
||||
obj-y += clock.o
|
||||
obj-y += gpiolib.o
|
||||
@ -33,15 +30,3 @@ obj-$(CONFIG_PM) += sleep.o
|
||||
|
||||
obj-$(CONFIG_S3C64XX_DMA) += dma.o
|
||||
|
||||
# ADC support
|
||||
|
||||
obj-$(CONFIG_S3C_ADC) += dev-adc.o
|
||||
|
||||
# Device setup
|
||||
|
||||
obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o
|
||||
obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o
|
||||
obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
|
||||
obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
|
||||
obj-$(CONFIG_SND_S3C24XX_SOC) += dev-audio.o
|
||||
obj-$(CONFIG_SPI_S3C64XX) += dev-spi.o
|
||||
|
Loading…
Reference in New Issue
Block a user