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
  ...

1 files changed, 90 insertions, 0 deletions

diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index d556de141114..0ded951f785a 100644
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -17,12 +17,15 @@
 #include <linux/platform_device.h>
 #include <linux/i2c-gpio.h>
 
+#include <linux/platform_data/at91_adc.h>
+
 #include <mach/board.h>
 #include <mach/cpu.h>
 #include <mach/at91sam9260.h>
 #include <mach/at91sam9260_matrix.h>
 #include <mach/at91_matrix.h>
 #include <mach/at91sam9_smc.h>
+#include <mach/at91_adc.h>
 
 #include "generic.h"
 
@@ -1340,6 +1343,93 @@ void __init at91_add_device_cf(struct at91_cf_data *data)
 void __init at91_add_device_cf(struct at91_cf_data * data) {}
 #endif
 
+/* --------------------------------------------------------------------
+ *  ADCs
+ * -------------------------------------------------------------------- */
+
+#if IS_ENABLED(CONFIG_AT91_ADC)
+static struct at91_adc_data adc_data;
+
+static struct resource adc_resources[] = {
+        [0] = {
+                .start  = AT91SAM9260_BASE_ADC,
+                .end    = AT91SAM9260_BASE_ADC + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9260_ID_ADC,
+                .end    = AT91SAM9260_ID_ADC,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device at91_adc_device = {
+        .name           = "at91_adc",
+        .id             = -1,
+        .dev            = {
+                                .platform_data          = &adc_data,
+        },
+        .resource       = adc_resources,
+        .num_resources  = ARRAY_SIZE(adc_resources),
+};
+
+static struct at91_adc_trigger at91_adc_triggers[] = {
+        [0] = {
+                .name = "timer-counter-0",
+                .value = AT91_ADC_TRGSEL_TC0 | AT91_ADC_TRGEN,
+        },
+        [1] = {
+                .name = "timer-counter-1",
+                .value = AT91_ADC_TRGSEL_TC1 | AT91_ADC_TRGEN,
+        },
+        [2] = {
+                .name = "timer-counter-2",
+                .value = AT91_ADC_TRGSEL_TC2 | AT91_ADC_TRGEN,
+        },
+        [3] = {
+                .name = "external",
+                .value = AT91_ADC_TRGSEL_EXTERNAL | AT91_ADC_TRGEN,
+                .is_external = true,
+        },
+};
+
+static struct at91_adc_reg_desc at91_adc_register_g20 = {
+        .channel_base = AT91_ADC_CHR(0),
+        .drdy_mask = AT91_ADC_DRDY,
+        .status_register = AT91_ADC_SR,
+        .trigger_register = AT91_ADC_MR,
+};
+
+void __init at91_add_device_adc(struct at91_adc_data *data)
+{
+        if (!data)
+                return;
+
+        if (test_bit(0, &data->channels_used))
+                at91_set_A_periph(AT91_PIN_PC0, 0);
+        if (test_bit(1, &data->channels_used))
+                at91_set_A_periph(AT91_PIN_PC1, 0);
+        if (test_bit(2, &data->channels_used))
+                at91_set_A_periph(AT91_PIN_PC2, 0);
+        if (test_bit(3, &data->channels_used))
+                at91_set_A_periph(AT91_PIN_PC3, 0);
+
+        if (data->use_external_triggers)
+                at91_set_A_periph(AT91_PIN_PA22, 0);
+
+        data->num_channels = 4;
+        data->startup_time = 10;
+        data->registers = &at91_adc_register_g20;
+        data->trigger_number = 4;
+        data->trigger_list = at91_adc_triggers;
+
+        adc_data = *data;
+        platform_device_register(&at91_adc_device);
+}
+#else
+void __init at91_add_device_adc(struct at91_adc_data *data) {}
+#endif
+
 /* -------------------------------------------------------------------- */
 /*
  * These devices are always present and don't need any board-specific