mirror of
https://github.com/torvalds/linux.git
synced 2024-11-19 02:21:47 +00:00
1bfecd9358
These changes are all specific to one board only. We're trying to keep the number of board files low, but generally board level updates are ok on platforms that are working on moving towards DT based probing, which will eventually lead to removing them. The board-ams-delta.c board file gets a conflict between the removal of ams_delta_config and the addition of a lot of other data. The Kconfig file has two changes in the same line, and in exynos, the power domain cleanup conflicts with the addition of the image sensor device. Signed-off-by: Arnd Bergmann <arnd@arndb.de> [olof: Amended a fix for a mismerge to board-omap4panda.c] Signed-off-by: Olof Johansson <olof@lixom.net> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJPckIXAAoJEIwa5zzehBx35uUP/jns0renNAMmiu2vBHGQtn4z xiNXjDTJ8DeD4mKf17rjn/uaJgQ0w3Doq2nEsi5rPqLK4Uqqk+NG1zYa77QBWHbx FUgBPz+oViTDkanp4G8cygXvGfNkb1GvuJxEBvxQ1mwuG4JhwlFbQxGIaS8ZwOAN DIyVCgSXy40B+748RwdZ2AY7CYvWiQWrQYsIH6NO0rtZIXjyV0kIsyVtEXZpqWtF xNz2HHXVMrui2JQ7FQ0zZglY8+YCxjeJk4v++FfqCJiMzU1yZJw7E30NjhcWAaR6 odJM2YIyhvunxPfx3ZUHimsNjfU+l/0uXgDHeLFSWVyIjPFXwqZDi/6onP3FI4Jc sIoTSwDAQpnZJ6KffAYkcyyfsWN61GOE96Xa2eRb6+78CEiMh7vJ8TIRieiOWxjm NbB0xzaKxa97F/8z7w6V6Z4dNhnokWJZvtJdgLZUYAqIgnxstFkJZ9+Tqt77G4t3 5iSbIMeFPsfh5sUeAVjr5+zVeUOm9PTRI0n0RY+Wd16Ke6DO1qobKAYOzrzI5idz k7ni76/zgGn3NS5F3TxdRHowkeGUwUU6poyopgQ0pyscDylVpzgMIqmAwLdzrVp5 joVEoKi6h4oqhAZtiysXuF85bUfCW0ziDUuib07SX8wcEIAIr+mWob1Ei+wJrefe g0Ch3ZbCRQMOwSOQ70Ci =HPiJ -----END PGP SIGNATURE----- Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull "ARM: board specific updates" from Arnd Bergmann/Olof Johansson: "These changes are all specific to one board only. We're trying to keep the number of board files low, but generally board level updates are ok on platforms that are working on moving towards DT based probing, which will eventually lead to removing them. The board-ams-delta.c board file gets a conflict between the removal of ams_delta_config and the addition of a lot of other data. The Kconfig file has two changes in the same line, and in exynos, the power domain cleanup conflicts with the addition of the image sensor device. Signed-off-by: Arnd Bergmann <arnd@arndb.de> [olof: Amended a fix for a mismerge to board-omap4panda.c] Signed-off-by: Olof Johansson <olof@lixom.net>" Fixed up some fairly trivial conflicts manually. * tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (82 commits) i.MX35-PDK: Add Camera support ARM : mx35: 3ds-board: add framebuffer device pxa/hx4700: Remove pcmcia platform_device structure ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35% ARM: pxa/hx4700: Remove unwanted request for GPIO105 ARM: EXYNOS: support Exynos4210-bus Devfreq driver on Nuri board ARM: EXYNOS: Register JPEG on nuri ARM: EXYNOS: Register JPEG on universal_c210 ARM: S5PV210: Enable JPEG on SMDKV210 ARM: S5PV210: Add JPEG board definition ARM: EXYNOS: Enable JPEG on Origen ARM: EXYNOS: Enable JPEG on SMDKV310 ARM: EXYNOS: Add __init attribute to universal_camera_init() ARM: EXYNOS: Add __init attribute to nuri_camera_init() ARM: S5PV210: Enable FIMC on SMDKC110 ARM: S5PV210: Enable FIMC on SMDKV210 ARM: S5PV210: Enable MFC on SMDKC110 ARM: S5PV210: Enable MFC on SMDKV210 ARM: EXYNOS: Enable G2D on SMDKV310 ARM: tegra: update defconfig ...
196 lines
3.9 KiB
Plaintext
196 lines
3.9 KiB
Plaintext
# arch/arm/mach-s5pv210/Kconfig
|
|
#
|
|
# Copyright (c) 2010 Samsung Electronics Co., Ltd.
|
|
# http://www.samsung.com/
|
|
#
|
|
# Licensed under GPLv2
|
|
|
|
# Configuration options for the S5PV210/S5PC110
|
|
|
|
if ARCH_S5PV210
|
|
|
|
config CPU_S5PV210
|
|
bool
|
|
select SAMSUNG_DMADEV
|
|
select S5P_EXT_INT
|
|
select S5P_HRT
|
|
select S5P_PM if PM
|
|
select S5P_SLEEP if PM
|
|
help
|
|
Enable S5PV210 CPU support
|
|
|
|
config S5PV210_SETUP_I2C1
|
|
bool
|
|
help
|
|
Common setup code for i2c bus 1.
|
|
|
|
config S5PV210_SETUP_I2C2
|
|
bool
|
|
help
|
|
Common setup code for i2c bus 2.
|
|
|
|
config S5PV210_SETUP_IDE
|
|
bool
|
|
help
|
|
Common setup code for S5PV210 IDE GPIO configurations
|
|
|
|
config S5PV210_SETUP_FB_24BPP
|
|
bool
|
|
help
|
|
Common setup code for S5PV210 with an 24bpp RGB display helper.
|
|
|
|
config S5PV210_SETUP_KEYPAD
|
|
bool
|
|
help
|
|
Common setup code for keypad.
|
|
|
|
config S5PV210_SETUP_SDHCI
|
|
bool
|
|
select S5PV210_SETUP_SDHCI_GPIO
|
|
help
|
|
Internal helper functions for S5PV210 based SDHCI systems
|
|
|
|
config S5PV210_SETUP_SDHCI_GPIO
|
|
bool
|
|
help
|
|
Common setup code for SDHCI gpio.
|
|
|
|
config S5PV210_SETUP_FIMC
|
|
bool
|
|
help
|
|
Common setup code for the camera interfaces.
|
|
|
|
config S5PV210_SETUP_SPI
|
|
bool
|
|
help
|
|
Common setup code for SPI GPIO configurations.
|
|
|
|
config S5PV210_SETUP_USB_PHY
|
|
bool
|
|
help
|
|
Common setup code for USB PHY controller
|
|
|
|
menu "S5PC110 Machines"
|
|
|
|
config MACH_AQUILA
|
|
bool "Aquila"
|
|
select CPU_S5PV210
|
|
select S3C_DEV_FB
|
|
select S5P_DEV_FIMC0
|
|
select S5P_DEV_FIMC1
|
|
select S5P_DEV_FIMC2
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC1
|
|
select S3C_DEV_HSMMC2
|
|
select S5P_DEV_ONENAND
|
|
select S5PV210_SETUP_FB_24BPP
|
|
select S5PV210_SETUP_SDHCI
|
|
help
|
|
Machine support for the Samsung Aquila target based on S5PC110 SoC
|
|
|
|
config MACH_GONI
|
|
bool "GONI"
|
|
select CPU_S5PV210
|
|
select S5P_GPIO_INT
|
|
select S3C_DEV_FB
|
|
select S5P_DEV_FIMC0
|
|
select S5P_DEV_FIMC1
|
|
select S5P_DEV_FIMC2
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC1
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_I2C1
|
|
select S3C_DEV_I2C2
|
|
select S5P_DEV_MFC
|
|
select S3C_DEV_USB_HSOTG
|
|
select S5P_DEV_ONENAND
|
|
select SAMSUNG_DEV_KEYPAD
|
|
select S5P_DEV_TV
|
|
select S5PV210_SETUP_FB_24BPP
|
|
select S5PV210_SETUP_I2C1
|
|
select S5PV210_SETUP_I2C2
|
|
select S5PV210_SETUP_KEYPAD
|
|
select S5PV210_SETUP_SDHCI
|
|
select S5PV210_SETUP_FIMC
|
|
select S5PV210_SETUP_USB_PHY
|
|
help
|
|
Machine support for Samsung GONI board
|
|
S5PC110(MCP) is one of package option of S5PV210
|
|
|
|
config MACH_SMDKC110
|
|
bool "SMDKC110"
|
|
select CPU_S5PV210
|
|
select S3C_DEV_I2C1
|
|
select S3C_DEV_I2C2
|
|
select S3C_DEV_RTC
|
|
select S3C_DEV_WDT
|
|
select S5P_DEV_FIMC0
|
|
select S5P_DEV_FIMC1
|
|
select S5P_DEV_FIMC2
|
|
select S5P_DEV_MFC
|
|
select SAMSUNG_DEV_IDE
|
|
select S5PV210_SETUP_I2C1
|
|
select S5PV210_SETUP_I2C2
|
|
select S5PV210_SETUP_IDE
|
|
help
|
|
Machine support for Samsung SMDKC110
|
|
S5PC110(MCP) is one of package option of S5PV210
|
|
|
|
endmenu
|
|
|
|
menu "S5PV210 Machines"
|
|
|
|
config MACH_SMDKV210
|
|
bool "SMDKV210"
|
|
select CPU_S5PV210
|
|
select S3C_DEV_FB
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC1
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_HSMMC3
|
|
select S3C_DEV_I2C1
|
|
select S3C_DEV_I2C2
|
|
select S3C_DEV_RTC
|
|
select S3C_DEV_WDT
|
|
select S5P_DEV_FIMC0
|
|
select S5P_DEV_FIMC1
|
|
select S5P_DEV_FIMC2
|
|
select S5P_DEV_JPEG
|
|
select S5P_DEV_MFC
|
|
select SAMSUNG_DEV_ADC
|
|
select SAMSUNG_DEV_BACKLIGHT
|
|
select SAMSUNG_DEV_IDE
|
|
select SAMSUNG_DEV_KEYPAD
|
|
select SAMSUNG_DEV_PWM
|
|
select SAMSUNG_DEV_TS
|
|
select S5PV210_SETUP_FB_24BPP
|
|
select S5PV210_SETUP_I2C1
|
|
select S5PV210_SETUP_I2C2
|
|
select S5PV210_SETUP_IDE
|
|
select S5PV210_SETUP_KEYPAD
|
|
select S5PV210_SETUP_SDHCI
|
|
help
|
|
Machine support for Samsung SMDKV210
|
|
|
|
config MACH_TORBRECK
|
|
bool "Torbreck"
|
|
select CPU_S5PV210
|
|
select ARCH_SPARSEMEM_ENABLE
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC1
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_HSMMC3
|
|
select S3C_DEV_I2C1
|
|
select S3C_DEV_I2C2
|
|
select S3C_DEV_RTC
|
|
select S3C_DEV_WDT
|
|
select S5PV210_SETUP_I2C1
|
|
select S5PV210_SETUP_I2C2
|
|
select S5PV210_SETUP_SDHCI
|
|
help
|
|
Machine support for aESOP Torbreck
|
|
|
|
endmenu
|
|
|
|
endif
|