You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 1bfecd9358 ARM: board specific updates ... 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 ...		13 years ago
..
Kconfig	ASoC: OMAP: Build config cleanup for McBSP	13 years ago
Makefile	ASoC: OMAP: Build config cleanup for McBSP	13 years ago
am3517evm.c	ASoC: omap-mcbsp: Create a single driver for McBSP	13 years ago
ams-delta.c	ARM: board specific updates	13 years ago
igep0020.c	ASoC: omap-mcbsp: Create a single driver for McBSP	13 years ago
mcbsp.c	ASoC: omap-mcbsp: Correct clock muxing for CLKR/FSR signals	13 years ago
mcbsp.h	ASoC: omap-mcbsp: Single function CLKR/FSR source mux configuration	13 years ago
n810.c	ASoC: omap-mcbsp: Create a single driver for McBSP	13 years ago
omap-abe-twl6040.c	ASoC: omap-abe-twl6040: Use provided MCLK frequency from pdata	13 years ago
omap-dmic.c	ASoC: omap-dmic: Use core to set the msbits constraint	13 years ago
omap-dmic.h	ASoC: OMAP4: omap-dmic: Initial support for OMAP DMIC	13 years ago
omap-hdmi.c	ASoC: Convert omap directory to module_platform_driver	13 years ago
omap-hdmi.h	ASoC: OMAP: Add CPU DAI driver for HDMI	14 years ago
omap-mcbsp.c	ASoC: omap-mcbsp: fix snd_pcm_hw_rule_add arguments	13 years ago
omap-mcbsp.h	ASoC: omap-mcbsp: Create a single driver for McBSP	13 years ago
omap-mcpdm.c	ASoC: omap-mcpdm: Set 24msbits constraint	13 years ago
omap-mcpdm.h	ASoC: omap-mcpdm: API to configure offset cancellation	14 years ago
omap-pcm.c	ASoC: check for substream not channels_min in pcm engines	13 years ago
omap-pcm.h	ASoC: omap-mcbsp: Create a single driver for McBSP	13 years ago
omap3beagle.c	ASoC: omap-mcbsp: Create a single driver for McBSP	13 years ago
omap3evm.c	ASoC: omap-mcbsp: Create a single driver for McBSP	13 years ago
omap3pandora.c	ASoC: omap-mcbsp: Create a single driver for McBSP	13 years ago
omap4-hdmi-card.c	ASoC: omap: Add .owner to struct snd_soc_card	13 years ago
osk5912.c	ASoC: omap-mcbsp: Create a single driver for McBSP	13 years ago
overo.c	ASoC: omap-mcbsp: Create a single driver for McBSP	13 years ago
rx51.c	ASoC: omap-mcbsp: Create a single driver for McBSP	13 years ago
sdp3430.c	ASoC: omap-mcbsp: Create a single driver for McBSP	13 years ago
zoom2.c	ASoC: omap-mcbsp: Create a single driver for McBSP	13 years ago