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

Commit 929d138a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'late/soc' into devel-late 

* late/soc:
  ARM: vexpress: Remove twice included header files
  ARM: vexpress: Device Tree updates
  ARM: EXYNOS: Support suspend and resume for EXYNOS5250
  ARM: EXYNOS: Add Clock register list for save and restore
  ARM: EXYNOS: Add PMU table for EXYNOS5250
  ARM: EXYNOS: Rename of function for pm.c
  ARM: EXYNOS: Remove GIC save & restore function
  ARM: dts: Add node for interrupt combiner controller on EXYNOS5250
  ARM: S3C24XX: add support for second irq set of S3C2416
parents d64f41d8 67e7ebc2

arch/arm/boot/dts/exynos5250.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -30,6 +30,22 @@ 
		reg = <0x10481000 0x1000>, <0x10482000 0x2000>;

	};



	combiner:interrupt-controller@10440000 {

		compatible = "samsung,exynos4210-combiner";

		#interrupt-cells = <2>;

		interrupt-controller;

		samsung,combiner-nr = <32>;

		reg = <0x10440000 0x1000>;

		interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,

			     <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,

			     <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,

			     <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>,

			     <0 16 0>, <0 17 0>, <0 18 0>, <0 19 0>,

			     <0 20 0>, <0 21 0>, <0 22 0>, <0 23 0>,

			     <0 24 0>, <0 25 0>, <0 26 0>, <0 27 0>,

			     <0 28 0>, <0 29 0>, <0 30 0>, <0 31 0>;

	};



	watchdog {

		compatible = "samsung,s3c2410-wdt";

		reg = <0x101D0000 0x100>;

arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts

+12 −1
Original line number Diff line number Diff line
@@ -73,7 +73,10 @@ 
		#address-cells = <0>;

		interrupt-controller;

		reg = <0x2c001000 0x1000>,

		      <0x2c002000 0x100>;

		      <0x2c002000 0x1000>,

		      <0x2c004000 0x2000>,

		      <0x2c006000 0x2000>;

		interrupts = <1 9 0xf04>;

	};



	memory-controller@7ffd0000 {
@@ -93,6 +96,14 @@ 
			     <0 91 4>;

	};



	timer {

		compatible = "arm,armv7-timer";

		interrupts = <1 13 0xf08>,

			     <1 14 0xf08>,

			     <1 11 0xf08>,

			     <1 10 0xf08>;

	};



	pmu {

		compatible = "arm,cortex-a15-pmu", "arm,cortex-a9-pmu";

		interrupts = <0 68 4>,

arch/arm/boot/dts/vexpress-v2p-ca5s.dts

+9 −4
Original line number Diff line number Diff line
@@ -77,13 +77,18 @@ 


	timer@2c000600 {

		compatible = "arm,cortex-a5-twd-timer";

		reg = <0x2c000600 0x38>;

		interrupts = <1 2 0x304>,

			     <1 3 0x304>;

		reg = <0x2c000600 0x20>;

		interrupts = <1 13 0x304>;

	};



	watchdog@2c000620 {

		compatible = "arm,cortex-a5-twd-wdt";

		reg = <0x2c000620 0x20>;

		interrupts = <1 14 0x304>;

	};



	gic: interrupt-controller@2c001000 {

		compatible = "arm,corex-a5-gic", "arm,cortex-a9-gic";

		compatible = "arm,cortex-a5-gic", "arm,cortex-a9-gic";

		#interrupt-cells = <3>;

		#address-cells = <0>;

		interrupt-controller;

arch/arm/boot/dts/vexpress-v2p-ca9.dts

+7 −2
Original line number Diff line number Diff line
@@ -105,8 +105,13 @@ 
	timer@1e000600 {

		compatible = "arm,cortex-a9-twd-timer";

		reg = <0x1e000600 0x20>;

		interrupts = <1 2 0xf04>,

			     <1 3 0xf04>;

		interrupts = <1 13 0xf04>;

	};



	watchdog@1e000620 {

		compatible = "arm,cortex-a9-twd-wdt";

		reg = <0x1e000620 0x20>;

		interrupts = <1 14 0xf04>;

	};



	gic: interrupt-controller@1e001000 {

arch/arm/mach-exynos/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ config SOC_EXYNOS5250 
	default y

	depends on ARCH_EXYNOS5

	select SAMSUNG_DMADEV

	select S5P_PM if PM

	select S5P_SLEEP if PM

	help

	  Enable EXYNOS5250 SoC support