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

Commit 6a445c7f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devel-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull late-merged development and first fixes for arm-soc from Olof Johansson:
 "This branch contains a few development patches for Samsung and
  Versatile Express that were submitted to arm-soc near the beginning of
  the merge window.  We picked them up with the agreement that they
  would need to sit in linux-next for a while, and now they have.

  There are also two fixes:
   - One long-standing build breakage on ixp4xx due to missing gpiolib
     dependencies.
   - The other is for some gpio device tree changes needed on lpc32xx."

* tag 'devel-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: LPC32xx: Adjust dts files to gpio dt binding
  ixp4xx: fix compilation by adding gpiolib support
  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
  ARM: S3C64XX: use timekeeping wrapper on cpuidle
  ARM: S3C64XX: declare the states with the new api on cpuidle
  ARM: S3C64XX: Hook up carrier class modules on Cragganmore
  ARM: S3C64XX: Initial hookup for Bells module on Cragganmore
parents f737c770 47e1993d

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ config ARCH_IXP4XX 
	select ARCH_HAS_DMA_SET_COHERENT_MASK

	select CLKSRC_MMIO

	select CPU_XSCALE

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_PCI

	select NEED_MACH_IO_H

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/lpc32xx.dtsi

+2 −39
Original line number Diff line number Diff line
@@ -215,45 +215,8 @@ 
			gpio: gpio@40028000 {

				compatible = "nxp,lpc3220-gpio";

				reg = <0x40028000 0x1000>;

				/* create a private address space for enumeration */

				#address-cells = <1>;

				#size-cells = <0>;



				gpio_p0: gpio-bank@0 {

					gpio-controller;

					#gpio-cells = <2>;

					reg = <0>;

				};



				gpio_p1: gpio-bank@1 {

				gpio-controller;

					#gpio-cells = <2>;

					reg = <1>;

				};



				gpio_p2: gpio-bank@2 {

					gpio-controller;

					#gpio-cells = <2>;

					reg = <2>;

				};



				gpio_p3: gpio-bank@3 {

					gpio-controller;

					#gpio-cells = <2>;

					reg = <3>;

				};



				gpi_p3: gpio-bank@4 {

					gpio-controller;

					#gpio-cells = <2>;

					reg = <4>;

				};



				gpo_p3: gpio-bank@5 {

					gpio-controller;

					#gpio-cells = <2>;

					reg = <5>;

				};

				#gpio-cells = <3>; /* bank, pin, flags */

			};



			watchdog@4003C000 {

arch/arm/boot/dts/phy3250.dts

+2 −2
Original line number Diff line number Diff line
@@ -131,13 +131,13 @@ 
		compatible = "gpio-leds";



		led0 {

			gpios = <&gpo_p3 1 1>; /* GPO_P3 1, GPIO 80, active low */

			gpios = <&gpio 5 1 1>; /* GPO_P3 1, GPIO 80, active low */

			linux,default-trigger = "heartbeat";

			default-state = "off";

		};



		led1 {

			gpios = <&gpo_p3 14 1>; /* GPO_P3 14, GPIO 93, active low */

			gpios = <&gpio 5 14 1>; /* GPO_P3 14, GPIO 93, active low */

			linux,default-trigger = "timer";

			default-state = "off";

		};

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>,