Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Board-level changes

This adds and extends support for specific boards on a number of
ARM platforms:  omap, imx, samsung, tegra, ...

* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (49 commits)
  Enable 32 bit flash support for iMX21ADS board
  ARM: mx31pdk: Add MC13783 RTC support
  iomux-mx25: configuration to support CSPI3 on CSI pins
  MX1:apf9328: Add i2c support
  mioa701: add newly available DoC G3 chip
  arm/tegra: remove __initdata annotation from pinmux tables
  arm/tegra: Use bus notifiers to trigger pinmux setup
  arm/tegra: Refactor board-*-pinmux.c to share code
  arm/tegra: Fix mistake in Trimslice's pinmux
  arm/tegra: Rework Seaboard-vs-Ventana pinmux table
  arm/tegra: Remove useless entries from ventana_pinmux[]
  arm/tegra: PCIe: Remove include of mach/pinmux.h
  arm/tegra: Harmony PCIe: Don't touch pinmux
  arm/tegra: Add AUXDATA for tegra-pinmux and tegra-gpio
  arm/tegra: Split Seaboard GPIO table to allow for Ventana
  ARM: imx6q: generate imx6q dtb files
  arm/imx6q: Rename Sabreauto to Armadillo2
  arm/imx6q-sabrelite: add enet phy ksz9021rn fixup
  arm/imx6: add imx6q sabrelite board support
  dts/imx: rename uart labels to consistent with hw spec
  ...

1 files changed, 17 insertions, 12 deletions

diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c
index 924a3b5f8da6..dce71b4a3a55 100644
--- a/arch/arm/mach-pxa/mioa701.c
+++ b/arch/arm/mach-pxa/mioa701.c
@@ -53,6 +53,7 @@
 #include <mach/pxa27x-udc.h>
 #include <mach/camera.h>
 #include <mach/audio.h>
+#include <mach/smemc.h>
 #include <media/soc_camera.h>
 
 #include <mach/mioa701.h>
@@ -390,24 +391,19 @@ static struct pxamci_platform_data mioa701_mci_info = {
 };
 
 /* FlashRAM */
-static struct resource strataflash_resource = {
+static struct resource docg3_resource = {
         .start = PXA_CS0_PHYS,
-        .end   = PXA_CS0_PHYS + SZ_64M - 1,
+        .end   = PXA_CS0_PHYS + SZ_8K - 1,
         .flags = IORESOURCE_MEM,
 };
 
-static struct physmap_flash_data strataflash_data = {
-        .width = 2,
-        /* .set_vpp = mioa701_set_vpp, */
-};
-
-static struct platform_device strataflash = {
-        .name          = "physmap-flash",
+static struct platform_device docg3 = {
+        .name          = "docg3",
         .id            = -1,
-        .resource      = &strataflash_resource,
+        .resource      = &docg3_resource,
         .num_resources = 1,
         .dev = {
-                .platform_data = &strataflash_data,
+                .platform_data = NULL,
         },
 };
 
@@ -685,7 +681,7 @@ static struct platform_device *devices[] __initdata = {
         &pxa2xx_pcm,
         &mioa701_sound,
         &power_dev,
-        &strataflash,
+        &docg3,
         &gpio_vbus,
         &mioa701_camera,
         &mioa701_board,
@@ -720,6 +716,15 @@ static void __init mioa701_machine_init(void)
         RTTR = 32768 - 1; /* Reset crazy WinCE value */
         UP2OCR = UP2OCR_HXOE;
 
+        /*
+         * Set up the flash memory : DiskOnChip G3 on first static memory bank
+         */
+        __raw_writel(0x7ff02dd8, MSC0);
+        __raw_writel(0x0001c391, MCMEM0);
+        __raw_writel(0x0001c391, MCATT0);
+        __raw_writel(0x0001c391, MCIO0);
+
+
         pxa2xx_mfp_config(ARRAY_AND_SIZE(mioa701_pin_config));
         pxa_set_ffuart_info(NULL);
         pxa_set_btuart_info(NULL);