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

Commit 63365013 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull arm-soc bug fixes from Olof Johansson:
 "A couple of samsung clock locking fixes, at91 device tree gpio
  configuration fix and a couple more for shmobile and i.MX.

  All small targeted fixes."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM i.MX25: Make timer irq work again
  ARM: imx: armadillo5x0: Fix illegal register access
  ARM: shmobile: kzm9g: bugfix: correct mmcif interrupt settings
  ARM: SAMSUNG: Use spin_lock_{irqsave,irqrestore} in clk_set_rate
  ARM: at91: fix missing #interrupt-cells on gpio-controller
  ARM: SAMSUNG: use spin_lock_irqsave() in clk_set_parent
parents 267b50fe 23f3f061

arch/arm/boot/dts/at91sam9260.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioB: gpio@fffff600 {
@@ -113,6 +114,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioC: gpio@fffff800 {
@@ -122,6 +124,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			dbgu: serial@fffff200 {

arch/arm/boot/dts/at91sam9263.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioB: gpio@fffff400 {
@@ -104,6 +105,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioC: gpio@fffff600 {
@@ -113,6 +115,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioD: gpio@fffff800 {
@@ -122,6 +125,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioE: gpio@fffffa00 {
@@ -131,6 +135,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			dbgu: serial@ffffee00 {

arch/arm/boot/dts/at91sam9g45.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioB: gpio@fffff400 {
@@ -122,6 +123,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioC: gpio@fffff600 {
@@ -131,6 +133,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioD: gpio@fffff800 {
@@ -140,6 +143,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioE: gpio@fffffa00 {
@@ -149,6 +153,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			dbgu: serial@ffffee00 {

arch/arm/boot/dts/at91sam9n12.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioB: gpio@fffff600 {
@@ -116,6 +117,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioC: gpio@fffff800 {
@@ -125,6 +127,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioD: gpio@fffffa00 {
@@ -134,6 +137,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			dbgu: serial@fffff200 {

arch/arm/boot/dts/at91sam9x5.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioB: gpio@fffff600 {
@@ -124,6 +125,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioC: gpio@fffff800 {
@@ -133,6 +135,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioD: gpio@fffffa00 {
@@ -142,6 +145,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			dbgu: serial@fffff200 {