Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a6cb8ce authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'zynq/master' of... 

Merge branch 'zynq/master' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/soc

Conflicts:
	arch/arm/Kconfig
	arch/arm/mm/Kconfig
parents a990cbd8 3d64b449

Documentation/devicetree/bindings/arm/xilinx.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
Xilinx Zynq EP107 Emulation Platform board



This board is an emulation platform for the Zynq product which is

based on an ARM Cortex A9 processor.



Required root node properties:

    - compatible = "xlnx,zynq-ep107";

arch/arm/Kconfig

+19 −7
Original line number Diff line number Diff line
@@ -337,6 +337,19 @@ config ARCH_GEMINI 
	help

	  Support for the Cortina Systems Gemini family SoCs



config ARCH_PRIMA2

	bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"

	select CPU_V7

	select GENERIC_TIME

	select NO_IOPORT

	select GENERIC_CLOCKEVENTS

	select CLKDEV_LOOKUP

	select GENERIC_IRQ_CHIP

	select USE_OF

	select ZONE_DMA

	help

          Support for CSR SiRFSoC ARM Cortex A9 Platform



config ARCH_EBSA110

	bool "EBSA-110"

	select CPU_SA110
@@ -880,19 +893,18 @@ config ARCH_VT8500 
	help

	  Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.



config ARCH_PRIMA2

	bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"

config ARCH_ZYNQ

	bool "Xilinx Zynq ARM Cortex A9 Platform"

	select CPU_V7

	select GENERIC_TIME

	select NO_IOPORT

	select GENERIC_CLOCKEVENTS

	select CLKDEV_LOOKUP

	select GENERIC_IRQ_CHIP

	select ARM_GIC

	select ARM_AMBA

	select ICST

	select USE_OF

	select ZONE_DMA

	help

          Support for CSR SiRFSoC ARM Cortex A9 Platform



	  Support for Xilinx Zynq ARM Cortex A9 Platform

endchoice



#

arch/arm/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ machine-$(CONFIG_MACH_SPEAR300) := spear3xx 
machine-$(CONFIG_MACH_SPEAR310)		:= spear3xx

machine-$(CONFIG_MACH_SPEAR320)		:= spear3xx

machine-$(CONFIG_MACH_SPEAR600)		:= spear6xx

machine-$(CONFIG_ARCH_ZYNQ)		:= zynq



# Platform directory name.  This list is sorted alphanumerically

# by CONFIG_* macro name.
@@ -204,6 +205,7 @@ plat-$(CONFIG_ARCH_MXC) := mxc 
plat-$(CONFIG_ARCH_OMAP)	:= omap

plat-$(CONFIG_ARCH_S3C64XX)	:= samsung

plat-$(CONFIG_ARCH_TCC_926)	:= tcc

plat-$(CONFIG_ARCH_ZYNQ)	:= versatile

plat-$(CONFIG_PLAT_IOP)		:= iop

plat-$(CONFIG_PLAT_NOMADIK)	:= nomadik

plat-$(CONFIG_PLAT_ORION)	:= orion

arch/arm/boot/dts/zynq-ep107.dts

0 → 100644
+52 −0
Original line number Diff line number Diff line 
/*

 *  Copyright (C) 2011 Xilinx

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



/dts-v1/;

/ {

	model = "Xilinx Zynq EP107";

	compatible = "xlnx,zynq-ep107";

	#address-cells = <1>;

	#size-cells = <1>;

	interrupt-parent = <&intc>;



	memory {

		device_type = "memory";

		reg = <0x0 0x10000000>;

	};



	chosen {

		bootargs = "console=ttyPS0,9600 root=/dev/ram rw initrd=0x800000,8M earlyprintk";

		linux,stdout-path = &uart0;

	};



	amba {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		intc: interrupt-controller@f8f01000 {

			interrupt-controller;

			compatible = "arm,gic";

			reg = <0xF8F01000 0x1000>;

			#interrupt-cells = <2>;

		};



		uart0: uart@e0000000 {

			compatible = "xlnx,xuartps";

			reg = <0xE0000000 0x1000>;

			interrupts = <59 0>;

			clock = <50000000>;

		};

	};

};

arch/arm/mach-zynq/Makefile

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#

# Makefile for the linux kernel.

#



# Common support

obj-y 				:= common.o timer.o board_dt.o