From: Arnd Bergmann Date: Fri, 16 Nov 2012 16:47:11 +0000 (+0100) Subject: Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/dt X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8ec1c811722b940c09961edd20bffb9eda1027c3;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/dt From Michal Simek : These are based on previous patches (arm-soc zynq/cleanup branch). The branch is still based on rc3 but I have also tried to merged it with the v3.7-rc5 and there is no issue. * 'arm-next' of git://git.xilinx.com/linux-xlnx: ARM: zynq: add clk binding support to the ttc ARM: zynq: use zynq clk bindings clk: Add support for fundamental zynq clks ARM: zynq: dts: split up device tree ARM: zynq: Allow UART1 to be used as DEBUG_LL console. ARM: zynq: dts: add description of the second uart ARM: zynq: move arm-specific sys_timer out of ttc zynq: move static peripheral mappings zynq: remove use of CLKDEV_LOOKUP zynq: use pl310 device tree bindings zynq: use GIC device tree bindings Signed-off-by: Arnd Bergmann --- 8ec1c811722b940c09961edd20bffb9eda1027c3 diff --cc arch/arm/Makefile index 3353b7613208,554cfac41429..97252d86a701 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@@ -196,9 -196,9 +196,8 @@@ machine-$(CONFIG_ARCH_ZYNQ) += zyn # Platform directory name. This list is sorted alphanumerically # by CONFIG_* macro name. -plat-$(CONFIG_ARCH_MXC) += mxc plat-$(CONFIG_ARCH_OMAP) += omap plat-$(CONFIG_ARCH_S3C64XX) += samsung - plat-$(CONFIG_ARCH_ZYNQ) += versatile plat-$(CONFIG_PLAT_IOP) += iop plat-$(CONFIG_PLAT_NOMADIK) += nomadik plat-$(CONFIG_PLAT_ORION) += orion