diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-22 19:34:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-22 19:34:21 -0400 |
commit | fb09bafda67041b74a668dc9d77735e36bd33d3b (patch) | |
tree | 2dd32b65062a95045468fdcab366ecdb8e4fcac6 /arch/arm/mach-at91/board-sam9g20ek.c | |
parent | 94b5aff4c6f72fee6b0f49d49e4fa8b204e8ded9 (diff) | |
parent | c3c6cc91b0ae7b3d598488ad0b593bafba4a0817 (diff) |
Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging tree changes from Greg Kroah-Hartman:
"Here is the big staging tree pull request for the 3.5-rc1 merge
window.
Loads of changes here, and we just narrowly added more lines than we
added:
622 files changed, 28356 insertions(+), 26059 deletions(-)
But, good news is that there is a number of subsystems that moved out
of the staging tree, to their respective "real" portions of the
kernel.
Code that moved out was:
- iio core code
- mei driver
- vme core and bridge drivers
There was one broken network driver that moved into staging as a step
before it is removed from the tree (pc300), and there was a few new
drivers added to the tree:
- new iio drivers
- gdm72xx wimax USB driver
- ipack subsystem and 2 drivers
All of the movements around have acks from the various subsystem
maintainers, and all of this has been in the linux-next tree for a
while.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
Fixed up various trivial conflicts, along with a non-trivial one found
in -next and pointed out by Olof Johanssen: a clean - but incorrect -
merge of the arch/arm/boot/dts/at91sam9g20.dtsi file. Fix up manually
as per Stephen Rothwell.
* tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (536 commits)
Staging: bcm: Remove two unused variables from Adapter.h
Staging: bcm: Removes the volatile type definition from Adapter.h
Staging: bcm: Rename all "INT" to "int" in Adapter.h
Staging: bcm: Fix warning: __packed vs. __attribute__((packed)) in Adapter.h
Staging: bcm: Correctly format all comments in Adapter.h
Staging: bcm: Fix all whitespace issues in Adapter.h
Staging: bcm: Properly format braces in Adapter.h
Staging: ipack/bridges/tpci200: remove unneeded casts
Staging: ipack/bridges/tpci200: remove TPCI200_SHORTNAME constant
Staging: ipack: remove board_name and bus_name fields from struct ipack_device
Staging: ipack: improve the register of a bus and a device in the bus.
staging: comedi: cleanup all the comedi_driver 'detach' functions
staging: comedi: remove all 'default N' in Kconfig
staging: line6/config.h: Delete unused header
staging: gdm72xx depends on NET
staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices
staging: drm/omap: initial dmabuf/prime import support
staging: drm/omap: dmabuf/prime mmap support
pstore/ram: Add ECC support
pstore/ram: Switch to persistent_ram routines
...
Diffstat (limited to 'arch/arm/mach-at91/board-sam9g20ek.c')
-rw-r--r-- | arch/arm/mach-at91/board-sam9g20ek.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c index 3d615532ae5c..6860d3451100 100644 --- a/arch/arm/mach-at91/board-sam9g20ek.c +++ b/arch/arm/mach-at91/board-sam9g20ek.c | |||
@@ -32,6 +32,8 @@ | |||
32 | #include <linux/regulator/fixed.h> | 32 | #include <linux/regulator/fixed.h> |
33 | #include <linux/regulator/consumer.h> | 33 | #include <linux/regulator/consumer.h> |
34 | 34 | ||
35 | #include <linux/platform_data/at91_adc.h> | ||
36 | |||
35 | #include <mach/hardware.h> | 37 | #include <mach/hardware.h> |
36 | #include <asm/setup.h> | 38 | #include <asm/setup.h> |
37 | #include <asm/mach-types.h> | 39 | #include <asm/mach-types.h> |
@@ -304,6 +306,16 @@ static void __init ek_add_device_buttons(void) | |||
304 | static void __init ek_add_device_buttons(void) {} | 306 | static void __init ek_add_device_buttons(void) {} |
305 | #endif | 307 | #endif |
306 | 308 | ||
309 | /* | ||
310 | * ADCs | ||
311 | */ | ||
312 | |||
313 | static struct at91_adc_data ek_adc_data = { | ||
314 | .channels_used = BIT(0) | BIT(1) | BIT(2) | BIT(3), | ||
315 | .use_external_triggers = true, | ||
316 | .vref = 3300, | ||
317 | }; | ||
318 | |||
307 | #if defined(CONFIG_REGULATOR_FIXED_VOLTAGE) || defined(CONFIG_REGULATOR_FIXED_VOLTAGE_MODULE) | 319 | #if defined(CONFIG_REGULATOR_FIXED_VOLTAGE) || defined(CONFIG_REGULATOR_FIXED_VOLTAGE_MODULE) |
308 | static struct regulator_consumer_supply ek_audio_consumer_supplies[] = { | 320 | static struct regulator_consumer_supply ek_audio_consumer_supplies[] = { |
309 | REGULATOR_SUPPLY("AVDD", "0-001b"), | 321 | REGULATOR_SUPPLY("AVDD", "0-001b"), |
@@ -389,6 +401,8 @@ static void __init ek_board_init(void) | |||
389 | ek_add_device_gpio_leds(); | 401 | ek_add_device_gpio_leds(); |
390 | /* Push Buttons */ | 402 | /* Push Buttons */ |
391 | ek_add_device_buttons(); | 403 | ek_add_device_buttons(); |
404 | /* ADCs */ | ||
405 | at91_add_device_adc(&ek_adc_data); | ||
392 | /* PCK0 provides MCLK to the WM8731 */ | 406 | /* PCK0 provides MCLK to the WM8731 */ |
393 | at91_set_B_periph(AT91_PIN_PC1, 0); | 407 | at91_set_B_periph(AT91_PIN_PC1, 0); |
394 | /* SSC (for WM8731) */ | 408 | /* SSC (for WM8731) */ |