Commit 97c0bd41 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/soc-exynos5440' of... 

Merge branch 'next/soc-exynos5440' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc

From Kukjin Kim:
This is adding support for exynos5440, including Quad ARM Cortex-A15
cores and its reference board SSDK5440.

Note, at this moment, just enabled minimal system part for initial kernel
boot and pinctrl driver.

* 'next/soc-exynos5440' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: dts: Add pin controller node for Samsung EXYNOS5440 SoC
  pinctrl: exynos5440: add pinctrl driver for Samsung EXYNOS5440 SoC
  ARM: dts: add initial dts file for EXYNOS5440, SSDK5440
  ARM: EXYNOS: add support for EXYNOS5440 SoC

Add/add conflict in arch/arm/boot/dts/Makefile.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0f327cb1 b1ce101b

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \ 
dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \

	exynos4210-smdkv310.dtb \

	exynos4210-trats.dtb \

	exynos5250-smdk5250.dtb

	exynos5250-smdk5250.dtb \

	exynos5440-ssdk5440.dtb

dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \

	ecx-2000.dtb

dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \

arch/arm/boot/dts/exynos5440-ssdk5440.dts

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

 * SAMSUNG SSDK5440 board device tree source

 *

 * Copyright (c) 2012 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



/dts-v1/;

/include/ "exynos5440.dtsi"



/ {

	model = "SAMSUNG SSDK5440 board based on EXYNOS5440";

	compatible = "samsung,ssdk5440", "samsung,exynos5440";



	memory {

		reg = <0x80000000 0x80000000>;

	};



	chosen {

		bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x81000000,8M console=ttySAC2,115200 init=/linuxrc";

	};



	spi {

		status = "disabled";

	};



	i2c@F0000 {

		status = "disabled";

	};



	i2c@100000 {

		status = "disabled";

	};



	watchdog {

		status = "disabled";

	};



	rtc {

		status = "disabled";

	};

};

arch/arm/boot/dts/exynos5440.dtsi

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

 * SAMSUNG EXYNOS5440 SoC device tree source

 *

 * Copyright (c) 2012 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



/include/ "skeleton.dtsi"



/ {

	compatible = "samsung,exynos5440";



	interrupt-parent = <&gic>;



	gic:interrupt-controller@2E0000 {

		compatible = "arm,cortex-a15-gic";

		#interrupt-cells = <3>;

		interrupt-controller;

		reg = <0x2E1000 0x1000>, <0x2E2000 0x1000>;

	};



	cpus {

		cpu@0 {

			compatible = "arm,cortex-a15";

			timer {

				compatible = "arm,armv7-timer";

				interrupts = <1 13 0xf08>;

				clock-frequency = <1000000>;

			};

		};

		cpu@1 {

			compatible = "arm,cortex-a15";

			timer {

				compatible = "arm,armv7-timer";

				interrupts = <1 14 0xf08>;

				clock-frequency = <1000000>;

			};

		};

		cpu@2 {

			compatible = "arm,cortex-a15";

			timer {

				compatible = "arm,armv7-timer";

				interrupts = <1 14 0xf08>;

				clock-frequency = <1000000>;

			};

		};

		cpu@3 {

			compatible = "arm,cortex-a15";

			timer {

				compatible = "arm,armv7-timer";

				interrupts = <1 14 0xf08>;

				clock-frequency = <1000000>;

			};

		};

	};



	common {

		compatible = "samsung,exynos5440";



	};



	serial@B0000 {

		compatible = "samsung,exynos4210-uart";

		reg = <0xB0000 0x1000>;

		interrupts = <0 2 0>;

	};



	serial@C0000 {

		compatible = "samsung,exynos4210-uart";

		reg = <0xC0000 0x1000>;

		interrupts = <0 3 0>;

	};



	spi {

		compatible = "samsung,exynos4210-spi";

		reg = <0xD0000 0x1000>;

		interrupts = <0 4 0>;

		tx-dma-channel = <&pdma0 5>; /* preliminary */

		rx-dma-channel = <&pdma0 4>; /* preliminary */

		#address-cells = <1>;

		#size-cells = <0>;

	};



	pinctrl {

		compatible = "samsung,pinctrl-exynos5440";

		reg = <0xE0000 0x1000>;

		interrupt-controller;

		#interrupt-cells = <2>;

		#gpio-cells = <2>;



		fan: fan {

			samsung,exynos5440-pin-function = <1>;

		};



		hdd_led0: hdd_led0 {

			samsung,exynos5440-pin-function = <2>;

		};



		hdd_led1: hdd_led1 {

			samsung,exynos5440-pin-function = <3>;

		};



		uart1: uart1 {

			samsung,exynos5440-pin-function = <4>;

		};

	};



	i2c@F0000 {

		compatible = "samsung,s3c2440-i2c";

		reg = <0xF0000 0x1000>;

		interrupts = <0 5 0>;

		#address-cells = <1>;

		#size-cells = <0>;

	};



	i2c@100000 {

		compatible = "samsung,s3c2440-i2c";

		reg = <0x100000 0x1000>;

		interrupts = <0 6 0>;

		#address-cells = <1>;

		#size-cells = <0>;

	};



	watchdog {

		compatible = "samsung,s3c2410-wdt";

		reg = <0x110000 0x1000>;

		interrupts = <0 1 0>;

	};



	amba {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "arm,amba-bus";

		interrupt-parent = <&gic>;

		ranges;



		pdma0: pdma@121A0000 {

			compatible = "arm,pl330", "arm,primecell";

			reg = <0x120000 0x1000>;

			interrupts = <0 34 0>;

		};



		pdma1: pdma@121B0000 {

			compatible = "arm,pl330", "arm,primecell";

			reg = <0x121000 0x1000>;

			interrupts = <0 35 0>;

		};

	};



	rtc {

		compatible = "samsung,s3c6410-rtc";

		reg = <0x130000 0x1000>;

		interrupts = <0 16 0>, <0 17 0>;

	};

};

arch/arm/mach-exynos/Kconfig

+10 −1
Original line number Diff line number Diff line
@@ -67,6 +67,15 @@ config SOC_EXYNOS5250 
	help

	  Enable EXYNOS5250 SoC support



config SOC_EXYNOS5440

	bool "SAMSUNG EXYNOS5440"

	default y

	depends on ARCH_EXYNOS5

	select ARM_ARCH_TIMER

	select AUTO_ZRELADDR

	help

	  Enable EXYNOS5440 SoC support



config EXYNOS4_MCT

	bool

	default y
@@ -417,9 +426,9 @@ config MACH_EXYNOS4_DT 


config MACH_EXYNOS5_DT

	bool "SAMSUNG EXYNOS5 Machine using device tree"

	default y

	depends on ARCH_EXYNOS5

	select ARM_AMBA

	select SOC_EXYNOS5250

	select USE_OF

	help

	  Machine support for Samsung EXYNOS5 machine with device tree enabled.

arch/arm/mach-exynos/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ obj- := 


obj-$(CONFIG_ARCH_EXYNOS)	+= common.o

obj-$(CONFIG_ARCH_EXYNOS4)	+= clock-exynos4.o

obj-$(CONFIG_ARCH_EXYNOS5)	+= clock-exynos5.o

obj-$(CONFIG_CPU_EXYNOS4210)	+= clock-exynos4210.o

obj-$(CONFIG_SOC_EXYNOS4212)	+= clock-exynos4212.o

obj-$(CONFIG_SOC_EXYNOS5250)	+= clock-exynos5.o



obj-$(CONFIG_PM)		+= pm.o

obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE