Merge tag 'soc-for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
Linus Torvalds [Tue, 7 May 2013 18:02:18 +0000 (11:02 -0700)]
Pull ARM SoC platform updates (part 3) from Arnd Bergmann:
 "This is the third and smallest of the SoC specific updates.  Changes
  include:

   - SMP support for the Xilinx zynq platform
   - Smaller imx changes
   - LPAE support for mvebu
   - Moving the orion5x, kirkwood, dove and mvebu platforms to a common
     "mbus" driver for their internal devices.

  It would be good to get feedback on the location of the "mbus" driver.
  Since this is used on multiple platforms may potentially get shared
  with other architectures (powerpc and arm64), it was moved to
  drivers/bus/.  We expect other similar drivers to get moved to the
  same place in order to avoid creating more top-level directories under
  drivers/ or cluttering up the messy drivers/misc/ even more."

* tag 'soc-for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (50 commits)
  ARM: imx: reset_controller may be disabled
  ARM: mvebu: Align the internal registers virtual base to support LPAE
  ARM: mvebu: Limit the DMA zone when LPAE is selected
  arm: plat-orion: remove addr-map code
  arm: mach-mv78xx0: convert to use the mvebu-mbus driver
  arm: mach-orion5x: convert to use mvebu-mbus driver
  arm: mach-dove: convert to use mvebu-mbus driver
  arm: mach-kirkwood: convert to use mvebu-mbus driver
  arm: mach-mvebu: convert to use mvebu-mbus driver
  ARM i.MX53: set CLK_SET_RATE_PARENT flag on the tve_ext_sel clock
  ARM i.MX53: tve_di clock is not part of the CCM, but of TVE
  ARM i.MX53: make tve_ext_sel propagate rate change to PLL
  ARM i.MX53: Remove unused tve_gate clkdev entry
  ARM i.MX5: Remove tve_sel clock from i.MX53 clock tree
  ARM: i.MX5: Add PATA and SRTC clocks
  ARM: imx: do not bring up unavailable cores
  ARM: imx: add initial imx6dl support
  ARM: imx1: mm: add call to mxc_device_init
  ARM: imx_v4_v5_defconfig: Add CONFIG_GPIO_SYSFS
  ARM: imx_v6_v7_defconfig: Select CONFIG_PERF_EVENTS
  ...

19 files changed:
1  2 
Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/boot/dts/armada-370-xp.dtsi
arch/arm/boot/dts/zynq-7000.dtsi
arch/arm/configs/imx_v6_v7_defconfig
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/Makefile
arch/arm/mach-imx/clk-imx51-imx53.c
arch/arm/mach-imx/gpc.c
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-imx/src.c
arch/arm/mach-kirkwood/Makefile
arch/arm/mach-kirkwood/board-dt.c
arch/arm/mach-kirkwood/common.h
arch/arm/mach-orion5x/board-dt.c
arch/arm/mach-orion5x/common.c
arch/arm/mach-zynq/Kconfig
drivers/staging/imx-drm/ipu-v3/ipu-common.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -793,9 -800,9 +800,10 @@@ config SOC_IMX6
        select ARM_GIC
        select COMMON_CLK
        select CPU_V7
 -      select HAVE_ARM_SCU
 +      select HAVE_ARM_SCU if SMP
 +      select HAVE_ARM_TWD if LOCAL_TIMERS
        select HAVE_CAN_FLEXCAN if CAN
+       select HAVE_IMX_ANATOP
        select HAVE_IMX_GPC
        select HAVE_IMX_MMDC
        select HAVE_IMX_SRC
Simple merge
Simple merge
Simple merge
@@@ -62,17 -51,22 +51,22 @@@ static void __init imx6q_init_revision(
  
        switch (rev & 0xff) {
        case 0:
-               return IMX_CHIP_REVISION_1_0;
+               chip_revision = IMX_CHIP_REVISION_1_0;
+               break;
        case 1:
-               return IMX_CHIP_REVISION_1_1;
+               chip_revision = IMX_CHIP_REVISION_1_1;
+               break;
        case 2:
-               return IMX_CHIP_REVISION_1_2;
+               chip_revision = IMX_CHIP_REVISION_1_2;
+               break;
        default:
-               return IMX_CHIP_REVISION_UNKNOWN;
+               chip_revision = IMX_CHIP_REVISION_UNKNOWN;
        }
+       mxc_set_cpu_type(rev >> 16 & 0xff);
  }
  
 -void imx6q_restart(char mode, const char *cmd)
 +static void imx6q_restart(char mode, const char *cmd)
  {
        struct device_node *np;
        void __iomem *wdog_base;
  #include <linux/io.h>
  #include <linux/of.h>
  #include <linux/of_address.h>
+ #include <linux/reset-controller.h>
  #include <linux/smp.h>
  #include <asm/smp_plat.h>
 +#include "common.h"
  
  #define SRC_SCR                               0x000
  #define SRC_GPR1                      0x020
@@@ -1,44 -1,42 +1,44 @@@
- obj-y                         += common.o addr-map.o irq.o pcie.o mpp.o
+ obj-y                         += common.o irq.o pcie.o mpp.o
  
 +obj-$(CONFIG_MACH_D2NET_V2)           += d2net_v2-setup.o lacie_v2-common.o
  obj-$(CONFIG_MACH_DB88F6281_BP)               += db88f6281-bp-setup.o
 -obj-$(CONFIG_MACH_RD88F6192_NAS)      += rd88f6192-nas-setup.o
 -obj-$(CONFIG_MACH_RD88F6281)          += rd88f6281-setup.o
 -obj-$(CONFIG_MACH_MV88F6281GTW_GE)    += mv88f6281gtw_ge-setup.o
 -obj-$(CONFIG_MACH_SHEEVAPLUG)         += sheevaplug-setup.o
 +obj-$(CONFIG_MACH_DOCKSTAR)           += dockstar-setup.o
  obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG)   += sheevaplug-setup.o
  obj-$(CONFIG_MACH_GURUPLUG)           += guruplug-setup.o
 -obj-$(CONFIG_MACH_DOCKSTAR)           += dockstar-setup.o
 -obj-$(CONFIG_MACH_TS219)              += ts219-setup.o tsx1x-common.o
 -obj-$(CONFIG_MACH_TS41X)              += ts41x-setup.o tsx1x-common.o
 -obj-$(CONFIG_MACH_OPENRD)             += openrd-setup.o
 -obj-$(CONFIG_MACH_NETSPACE_V2)                += netspace_v2-setup.o lacie_v2-common.o
  obj-$(CONFIG_MACH_INETSPACE_V2)               += netspace_v2-setup.o lacie_v2-common.o
 -obj-$(CONFIG_MACH_NETSPACE_MAX_V2)    += netspace_v2-setup.o lacie_v2-common.o
 -obj-$(CONFIG_MACH_D2NET_V2)           += d2net_v2-setup.o lacie_v2-common.o
 +obj-$(CONFIG_MACH_MV88F6281GTW_GE)    += mv88f6281gtw_ge-setup.o
  obj-$(CONFIG_MACH_NET2BIG_V2)         += netxbig_v2-setup.o lacie_v2-common.o
  obj-$(CONFIG_MACH_NET5BIG_V2)         += netxbig_v2-setup.o lacie_v2-common.o
 +obj-$(CONFIG_MACH_NETSPACE_MAX_V2)    += netspace_v2-setup.o lacie_v2-common.o
 +obj-$(CONFIG_MACH_NETSPACE_V2)                += netspace_v2-setup.o lacie_v2-common.o
 +obj-$(CONFIG_MACH_OPENRD)             += openrd-setup.o
 +obj-$(CONFIG_MACH_RD88F6192_NAS)      += rd88f6192-nas-setup.o
 +obj-$(CONFIG_MACH_RD88F6281)          += rd88f6281-setup.o
 +obj-$(CONFIG_MACH_SHEEVAPLUG)         += sheevaplug-setup.o
  obj-$(CONFIG_MACH_T5325)              += t5325-setup.o
 +obj-$(CONFIG_MACH_TS219)              += ts219-setup.o tsx1x-common.o
 +obj-$(CONFIG_MACH_TS41X)              += ts41x-setup.o tsx1x-common.o
  
  obj-$(CONFIG_ARCH_KIRKWOOD_DT)                += board-dt.o
 -obj-$(CONFIG_MACH_DREAMPLUG_DT)               += board-dreamplug.o
 -obj-$(CONFIG_MACH_GURUPLUG_DT)                += board-guruplug.o
 -obj-$(CONFIG_MACH_ICONNECT_DT)                += board-iconnect.o
 +obj-$(CONFIG_MACH_CLOUDBOX_DT)                += board-ns2.o
  obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT)  += board-dnskw.o
 -obj-$(CONFIG_MACH_IB62X0_DT)          += board-ib62x0.o
 -obj-$(CONFIG_MACH_TS219_DT)           += board-ts219.o tsx1x-common.o
  obj-$(CONFIG_MACH_DOCKSTAR_DT)                += board-dockstar.o
 +obj-$(CONFIG_MACH_DREAMPLUG_DT)               += board-dreamplug.o
  obj-$(CONFIG_MACH_GOFLEXNET_DT)               += board-goflexnet.o
 -obj-$(CONFIG_MACH_LSXL_DT)            += board-lsxl.o
 +obj-$(CONFIG_MACH_GURUPLUG_DT)                += board-guruplug.o
 +obj-$(CONFIG_MACH_IB62X0_DT)          += board-ib62x0.o
 +obj-$(CONFIG_MACH_ICONNECT_DT)                += board-iconnect.o
 +obj-$(CONFIG_MACH_INETSPACE_V2_DT)    += board-ns2.o
  obj-$(CONFIG_MACH_IOMEGA_IX2_200_DT)  += board-iomega_ix2_200.o
  obj-$(CONFIG_MACH_KM_KIRKWOOD_DT)     += board-km_kirkwood.o
 -obj-$(CONFIG_MACH_INETSPACE_V2_DT)    += board-ns2.o
 +obj-$(CONFIG_MACH_LSXL_DT)            += board-lsxl.o
  obj-$(CONFIG_MACH_MPLCEC4_DT)         += board-mplcec4.o
 -obj-$(CONFIG_MACH_NETSPACE_V2_DT)     += board-ns2.o
 -obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT) += board-ns2.o
  obj-$(CONFIG_MACH_NETSPACE_LITE_V2_DT)        += board-ns2.o
 +obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT) += board-ns2.o
  obj-$(CONFIG_MACH_NETSPACE_MINI_V2_DT)        += board-ns2.o
 +obj-$(CONFIG_MACH_NETSPACE_V2_DT)     += board-ns2.o
  obj-$(CONFIG_MACH_NSA310_DT)          += board-nsa310.o
  obj-$(CONFIG_MACH_OPENBLOCKS_A6_DT)   += board-openblocks_a6.o
 +obj-$(CONFIG_MACH_READYNAS_DT)                += board-readynas.o
  obj-$(CONFIG_MACH_TOPKICK_DT)         += board-usi_topkick.o
 +obj-$(CONFIG_MACH_TS219_DT)           += board-ts219.o tsx1x-common.o
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge