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

Commit 065c8012 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull arm-soc fixes from Arnd Bergmann:
 "Bug fixes for a number of ARM platforms, mostly OMAP, imx and at91.

  These come a little later than I had hoped but unfortunately we had a
  few of these patches cause regressions themselves and had to work out
  how to deal with those in the meantime."

* tag 'fixes-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (38 commits)
  Revert "ARM i.MX25: Fix PWM per clock lookups"
  ARM: versatile: fix versatile_defconfig
  ARM: mvebu: update defconfig with 3.7 changes
  ARM: at91: fix at91x40 build
  ARM: socfpga: Fix socfpga compilation with early_printk() enabled
  ARM: SPEAr: Remove unused empty files
  MAINTAINERS: Add arm-soc tree entry
  ARM: dts: mxs: add the "clock-names" for gpmi-nand
  ARM: ux500: Correct SDI5 address and add some format changes
  ARM: ux500: Specify AMBA Primecell IDs for Nomadik I2C in DT
  ARM: ux500: Fix build error relating to IRQCHIP_SKIP_SET_WAKE
  ARM: at91: drop duplicated config SOC_AT91SAM9 entry
  ARM: at91/i2c: change id to let i2c-at91 work
  ARM: at91/i2c: change id to let i2c-gpio work
  ARM: at91/dts: at91sam9g20ek_common: Fix typos in buttons labels.
  ARM: at91: fix external interrupt specification in board code
  ARM: at91: fix external interrupts in non-DT case
  ARM: at91: at91sam9g10: fix SOC type detection
  ARM: at91/tc: fix typo in the DT document
  ARM: AM33XX: Fix configuration of dmtimer parent clock by dmtimer driverDate:Wed, 17 Oct 2012 13:55:55 -0500
  ...
parents 1a25b1c4 943bb487

Documentation/devicetree/bindings/arm/atmel-at91.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ PIT Timer required properties: 
  shared across all System Controller members.

  shared across all System Controller members.





TC/TCLIB Timer required properties:

TC/TCLIB Timer required properties:

- compatible: Should be "atmel,<chip>-pit".

- compatible: Should be "atmel,<chip>-tcb".

  <chip> can be "at91rm9200" or "at91sam9x5"

  <chip> can be "at91rm9200" or "at91sam9x5"

- reg: Should contain registers location and length

- reg: Should contain registers location and length

- interrupts: Should contain all interrupts for the TC block

- interrupts: Should contain all interrupts for the TC block

MAINTAINERS

+7 −0
Original line number Original line Diff line number Diff line
@@ -637,6 +637,13 @@ W: http://www.arm.linux.org.uk/ 
S:	Maintained

S:	Maintained

F:	arch/arm/

F:	arch/arm/





ARM SUB-ARCHITECTURES

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	MAINTAINED

F:	arch/arm/mach-*/

F:	arch/arm/plat-*/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git



ARM PRIMECELL AACI PL041 DRIVER

ARM PRIMECELL AACI PL041 DRIVER

M:	Russell King <linux@arm.linux.org.uk>

M:	Russell King <linux@arm.linux.org.uk>

S:	Maintained

S:	Maintained

arch/arm/boot/dts/at91sam9g20ek_common.dtsi

+2 −2
Original line number Original line Diff line number Diff line
@@ -126,14 +126,14 @@ 
		#size-cells = <0>;

		#size-cells = <0>;





		btn3 {

		btn3 {

			label = "Buttin 3";

			label = "Button 3";

			gpios = <&pioA 30 1>;

			gpios = <&pioA 30 1>;

			linux,code = <0x103>;

			linux,code = <0x103>;

			gpio-key,wakeup;

			gpio-key,wakeup;

		};

		};





		btn4 {

		btn4 {

			label = "Buttin 4";

			label = "Button 4";

			gpios = <&pioA 31 1>;

			gpios = <&pioA 31 1>;

			linux,code = <0x104>;

			linux,code = <0x104>;

			gpio-key,wakeup;

			gpio-key,wakeup;

arch/arm/boot/dts/dbx5x0.dtsi

+16 −1
Original line number Original line Diff line number Diff line
@@ -483,6 +483,8 @@ 
			compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";

			compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";

			reg = <0x80004000 0x1000>;

			reg = <0x80004000 0x1000>;

			interrupts = <0 21 0x4>;

			interrupts = <0 21 0x4>;

			arm,primecell-periphid = <0x180024>;



			#address-cells = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			#size-cells = <0>;

			v-i2c-supply = <&db8500_vape_reg>;

			v-i2c-supply = <&db8500_vape_reg>;
@@ -494,6 +496,8 @@ 
			compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";

			compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";

			reg = <0x80122000 0x1000>;

			reg = <0x80122000 0x1000>;

			interrupts = <0 22 0x4>;

			interrupts = <0 22 0x4>;

			arm,primecell-periphid = <0x180024>;



			#address-cells = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			#size-cells = <0>;

			v-i2c-supply = <&db8500_vape_reg>;

			v-i2c-supply = <&db8500_vape_reg>;
@@ -505,6 +509,8 @@ 
			compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";

			compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";

			reg = <0x80128000 0x1000>;

			reg = <0x80128000 0x1000>;

			interrupts = <0 55 0x4>;

			interrupts = <0 55 0x4>;

			arm,primecell-periphid = <0x180024>;



			#address-cells = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			#size-cells = <0>;

			v-i2c-supply = <&db8500_vape_reg>;

			v-i2c-supply = <&db8500_vape_reg>;
@@ -516,6 +522,8 @@ 
			compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";

			compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";

			reg = <0x80110000 0x1000>;

			reg = <0x80110000 0x1000>;

			interrupts = <0 12 0x4>;

			interrupts = <0 12 0x4>;

			arm,primecell-periphid = <0x180024>;



			#address-cells = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			#size-cells = <0>;

			v-i2c-supply = <&db8500_vape_reg>;

			v-i2c-supply = <&db8500_vape_reg>;
@@ -527,6 +535,8 @@ 
			compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";

			compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";

			reg = <0x8012a000 0x1000>;

			reg = <0x8012a000 0x1000>;

			interrupts = <0 51 0x4>;

			interrupts = <0 51 0x4>;

			arm,primecell-periphid = <0x180024>;



			#address-cells = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			#size-cells = <0>;

			v-i2c-supply = <&db8500_vape_reg>;

			v-i2c-supply = <&db8500_vape_reg>;
@@ -573,33 +583,38 @@ 
			interrupts = <0 60 0x4>;

			interrupts = <0 60 0x4>;

			status = "disabled";

			status = "disabled";

		};

		};



		sdi@80118000 {

		sdi@80118000 {

			compatible = "arm,pl18x", "arm,primecell";

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80118000 0x1000>;

			reg = <0x80118000 0x1000>;

			interrupts = <0 50 0x4>;

			interrupts = <0 50 0x4>;

			status = "disabled";

			status = "disabled";

		};

		};



		sdi@80005000 {

		sdi@80005000 {

			compatible = "arm,pl18x", "arm,primecell";

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80005000 0x1000>;

			reg = <0x80005000 0x1000>;

			interrupts = <0 41 0x4>;

			interrupts = <0 41 0x4>;

			status = "disabled";

			status = "disabled";

		};

		};



		sdi@80119000 {

		sdi@80119000 {

			compatible = "arm,pl18x", "arm,primecell";

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80119000 0x1000>;

			reg = <0x80119000 0x1000>;

			interrupts = <0 59 0x4>;

			interrupts = <0 59 0x4>;

			status = "disabled";

			status = "disabled";

		};

		};



		sdi@80114000 {

		sdi@80114000 {

			compatible = "arm,pl18x", "arm,primecell";

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80114000 0x1000>;

			reg = <0x80114000 0x1000>;

			interrupts = <0 99 0x4>;

			interrupts = <0 99 0x4>;

			status = "disabled";

			status = "disabled";

		};

		};



		sdi@80008000 {

		sdi@80008000 {

			compatible = "arm,pl18x", "arm,primecell";

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80114000 0x1000>;

			reg = <0x80008000 0x1000>;

			interrupts = <0 100 0x4>;

			interrupts = <0 100 0x4>;

			status = "disabled";

			status = "disabled";

		};

		};

arch/arm/boot/dts/exynos4210-trats.dts

+4 −2
Original line number Original line Diff line number Diff line
@@ -20,8 +20,10 @@ 
	compatible = "samsung,trats", "samsung,exynos4210";

	compatible = "samsung,trats", "samsung,exynos4210";





	memory {

	memory {

		reg =  <0x40000000 0x20000000

		reg =  <0x40000000 0x10000000

			0x60000000 0x20000000>;

			0x50000000 0x10000000

			0x60000000 0x10000000

			0x70000000 0x10000000>;

	};

	};





	chosen {

	chosen {