AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity
6ba900676b
kernel_optimize_test/sound/soc/omap
History
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
  ...
2012-03-27 16:27:28 -07:00
..
am3517evm.c ASoC: omap-mcbsp: Create a single driver for McBSP 2012-03-12 13:34:19 +00:00
ams-delta.c ARM: board specific updates 2012-03-27 16:27:28 -07:00
igep0020.c ASoC: omap-mcbsp: Create a single driver for McBSP 2012-03-12 13:34:19 +00:00
Kconfig ASoC: OMAP: Build config cleanup for McBSP 2012-03-12 13:34:25 +00:00
Makefile ASoC: OMAP: Build config cleanup for McBSP 2012-03-12 13:34:25 +00:00
mcbsp.c ASoC: omap-mcbsp: Correct clock muxing for CLKR/FSR signals 2012-03-12 13:34:23 +00:00
mcbsp.h ASoC: omap-mcbsp: Single function CLKR/FSR source mux configuration 2012-03-12 13:34:23 +00:00
n810.c ASoC: omap-mcbsp: Create a single driver for McBSP 2012-03-12 13:34:19 +00:00
omap3beagle.c ASoC: omap-mcbsp: Create a single driver for McBSP 2012-03-12 13:34:19 +00:00
omap3evm.c ASoC: omap-mcbsp: Create a single driver for McBSP 2012-03-12 13:34:19 +00:00
omap3pandora.c ASoC: omap-mcbsp: Create a single driver for McBSP 2012-03-12 13:34:19 +00:00
omap4-hdmi-card.c ASoC: omap: Add .owner to struct snd_soc_card 2011-12-23 18:13:01 +00:00
omap-abe-twl6040.c ASoC: omap-abe-twl6040: Use provided MCLK frequency from pdata 2012-01-26 15:40:53 +02:00
omap-dmic.c ASoC: omap-dmic: Use core to set the msbits constraint 2012-01-20 13:58:31 +00:00
omap-dmic.h ASoC: OMAP4: omap-dmic: Initial support for OMAP DMIC 2011-11-28 17:21:44 +00:00
omap-hdmi.c ASoC: Convert omap directory to module_platform_driver 2011-11-25 13:15:31 +00:00
omap-hdmi.h
omap-mcbsp.c ASoC: omap-mcbsp: fix snd_pcm_hw_rule_add arguments 2012-03-12 13:34:24 +00:00
omap-mcbsp.h ASoC: omap-mcbsp: Create a single driver for McBSP 2012-03-12 13:34:19 +00:00
omap-mcpdm.c ASoC: omap-mcpdm: Set 24msbits constraint 2012-01-20 13:58:31 +00:00
omap-mcpdm.h ASoC: omap-mcpdm: API to configure offset cancellation 2011-09-26 22:23:32 +01:00
omap-pcm.c ASoC: check for substream not channels_min in pcm engines 2012-01-07 11:18:05 -08:00
omap-pcm.h ASoC: omap-mcbsp: Create a single driver for McBSP 2012-03-12 13:34:19 +00:00
osk5912.c ASoC: omap-mcbsp: Create a single driver for McBSP 2012-03-12 13:34:19 +00:00
overo.c ASoC: omap-mcbsp: Create a single driver for McBSP 2012-03-12 13:34:19 +00:00
rx51.c ASoC: omap-mcbsp: Create a single driver for McBSP 2012-03-12 13:34:19 +00:00
sdp3430.c ASoC: omap-mcbsp: Create a single driver for McBSP 2012-03-12 13:34:19 +00:00
zoom2.c ASoC: omap-mcbsp: Create a single driver for McBSP 2012-03-12 13:34:19 +00:00