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

Pull ARM SoC platform changes from Olof Johansson:
 "This branch contains mostly additions and changes to platform
  enablement and SoC-level drivers.  Since there's sometimes a
  dependency on device-tree changes, there's also a fair amount of
  those in this branch.

  Pieces worth mentioning are:

   - Mbus driver for Marvell platforms, allowing kernel configuration
     and resource allocation of on-chip peripherals.
   - Enablement of the mbus infrastructure from Marvell PCI-e drivers.
   - Preparation of MSI support for Marvell platforms.
   - Addition of new PCI-e host controller driver for Tegra platforms
   - Some churn caused by sharing of macro names between i.MX 6Q and 6DL
     platforms in the device tree sources and header files.
   - Various suspend/PM updates for Tegra, including LP1 support.
   - Versatile Express support for MCPM, part of big little support.
   - Allwinner platform support for A20 and A31 SoCs (dual and quad
     Cortex-A7)
   - OMAP2+ support for DRA7, a new Cortex-A15-based SoC.

  The code that touches other architectures are patches moving MSI
  arch-specific functions over to weak symbols and removal of
  ARCH_SUPPORTS_MSI, acked by PCI maintainers"

* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (266 commits)
  tegra-cpuidle: provide stub when !CONFIG_CPU_IDLE
  PCI: tegra: replace devm_request_and_ioremap by devm_ioremap_resource
  ARM: tegra: Drop ARCH_SUPPORTS_MSI and sort list
  ARM: dts: vf610-twr: enable i2c0 device
  ARM: dts: i.MX51: Add one more I2C2 pinmux entry
  ARM: dts: i.MX51: Move pins configuration under "iomuxc" label
  ARM: dtsi: imx6qdl-sabresd: Add USB OTG vbus pin to pinctrl_hog
  ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator
  ARM: dts: imx27-phytec-phycore-som: Enable AUDMUX
  ARM: dts: i.MX27: Disable AUDMUX in the template
  ARM: dts: wandboard: Add support for SDIO bcm4329
  ARM: i.MX5 clocks: Remove optional clock setup (CKIH1) from i.MX51 template
  ARM: dts: imx53-qsb: Make USBH1 functional
  ARM i.MX6Q: dts: Enable I2C1 with EEPROM and PMIC on Phytec phyFLEX-i.MX6 Ouad module
  ARM i.MX6Q: dts: Enable SPI NOR flash on Phytec phyFLEX-i.MX6 Ouad module
  ARM: dts: imx6qdl-sabresd: Add touchscreen support
  ARM: imx: add ocram clock for imx53
  ARM: dts: imx: ocram size is different between imx6q and imx6dl
  ARM: dts: imx27-phytec-phycore-som: Fix regulator settings
  ARM: dts: i.MX27: Remove clock name from CPU node
  ...

1 files changed, 40 insertions, 14 deletions

diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index d1259e80141b..68f8d1f1aca1 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -342,15 +342,16 @@ static struct clk_lookup dm646x_clks[] = {
         CLK(NULL, "edma_tc1", &edma_tc1_clk),
         CLK(NULL, "edma_tc2", &edma_tc2_clk),
         CLK(NULL, "edma_tc3", &edma_tc3_clk),
-        CLK(NULL, "uart0", &uart0_clk),
-        CLK(NULL, "uart1", &uart1_clk),
-        CLK(NULL, "uart2", &uart2_clk),
+        CLK("serial8250.0", NULL, &uart0_clk),
+        CLK("serial8250.1", NULL, &uart1_clk),
+        CLK("serial8250.2", NULL, &uart2_clk),
         CLK("i2c_davinci.1", NULL, &i2c_clk),
         CLK(NULL, "gpio", &gpio_clk),
         CLK("davinci-mcasp.0", NULL, &mcasp0_clk),
         CLK("davinci-mcasp.1", NULL, &mcasp1_clk),
         CLK(NULL, "aemif", &aemif_clk),
         CLK("davinci_emac.1", NULL, &emac_clk),
+        CLK("davinci_mdio.0", "fck", &emac_clk),
         CLK(NULL, "pwm0", &pwm0_clk),
         CLK(NULL, "pwm1", &pwm1_clk),
         CLK(NULL, "timer0", &timer0_clk),
@@ -790,7 +791,7 @@ static struct davinci_timer_info dm646x_timer_info = {
         .clocksource_id = T0_TOP,
 };
 
-static struct plat_serial8250_port dm646x_serial_platform_data[] = {
+static struct plat_serial8250_port dm646x_serial0_platform_data[] = {
         {
                 .mapbase        = DAVINCI_UART0_BASE,
                 .irq            = IRQ_UARTINT0,
@@ -800,6 +801,11 @@ static struct plat_serial8250_port dm646x_serial_platform_data[] = {
                 .regshift       = 2,
         },
         {
+                .flags  = 0,
+        }
+};
+static struct plat_serial8250_port dm646x_serial1_platform_data[] = {
+        {
                 .mapbase        = DAVINCI_UART1_BASE,
                 .irq            = IRQ_UARTINT1,
                 .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
@@ -808,6 +814,11 @@ static struct plat_serial8250_port dm646x_serial_platform_data[] = {
                 .regshift       = 2,
         },
         {
+                .flags  = 0,
+        }
+};
+static struct plat_serial8250_port dm646x_serial2_platform_data[] = {
+        {
                 .mapbase        = DAVINCI_UART2_BASE,
                 .irq            = IRQ_DM646X_UARTINT2,
                 .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
@@ -816,16 +827,34 @@ static struct plat_serial8250_port dm646x_serial_platform_data[] = {
                 .regshift       = 2,
         },
         {
-                .flags          = 0
-        },
+                .flags  = 0,
+        }
 };
 
-static struct platform_device dm646x_serial_device = {
-        .name                   = "serial8250",
-        .id                     = PLAT8250_DEV_PLATFORM,
-        .dev                    = {
-                .platform_data  = dm646x_serial_platform_data,
+struct platform_device dm646x_serial_device[] = {
+        {
+                .name                   = "serial8250",
+                .id                     = PLAT8250_DEV_PLATFORM,
+                .dev                    = {
+                        .platform_data  = dm646x_serial0_platform_data,
+                }
+        },
+        {
+                .name                   = "serial8250",
+                .id                     = PLAT8250_DEV_PLATFORM1,
+                .dev                    = {
+                        .platform_data  = dm646x_serial1_platform_data,
+                }
         },
+        {
+                .name                   = "serial8250",
+                .id                     = PLAT8250_DEV_PLATFORM2,
+                .dev                    = {
+                        .platform_data  = dm646x_serial2_platform_data,
+                }
+        },
+        {
+        }
 };
 
 static struct davinci_soc_info davinci_soc_info_dm646x = {
@@ -849,7 +878,6 @@ static struct davinci_soc_info davinci_soc_info_dm646x = {
         .gpio_base              = DAVINCI_GPIO_BASE,
         .gpio_num               = 43, /* Only 33 usable */
         .gpio_irq               = IRQ_DM646X_GPIOBNK0,
-        .serial_dev             = &dm646x_serial_device,
         .emac_pdata             = &dm646x_emac_pdata,
         .sram_dma               = 0x10010000,
         .sram_len               = SZ_32K,
@@ -913,8 +941,6 @@ static int __init dm646x_init_devices(void)
 
         platform_device_register(&dm646x_mdio_device);
         platform_device_register(&dm646x_emac_device);
-        clk_add_alias(NULL, dev_name(&dm646x_mdio_device.dev),
-                      NULL, &dm646x_emac_device.dev);
 
         return 0;
 }