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

Commit cae617b6 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'fixes-for-3.9' into next/fixes-non-critical 



This is a branch of fixes that originally were scheduled for 3.8 but
due to the request from Linus to hold back on all but the most critical
of fixes, we're re-queueing them for 3.9 here.

* fixes-for-3.9:
  ARM: dts: imx6: fix fec ptp clock slow 10 time
  ARM: highbank: mask cluster id from cpu_logical_map
  ARM: scu: mask cluster id from cpu_logical_map
  ARM: scu: add empty scu_enable for !CONFIG_SMP
  ARM: at91/at91sam9x5.dtsi: fix usart3 TXD
  ARM: at91: at91sam9x5: fix usart3 pinctrl name
  ARM: EXYNOS: Fix crash on soft reset on EXYNOS5440
  ARM: dts: fix tick and alarm irq numbers for exynos5440
  ARM: dts: fix compatible value for exynos pinctrl
  ARM: dts: Fix compatible value of pinctrl module on EXYNOS5440
  ARM: S3C24XX: fix uninitialized variable warning
  mfd/vexpress: vexpress_sysreg_setup must not be __init
  ARM: ux500: Fix u9540 booting issues
  arm: mvebu: i2c come back in defconfig
  arm: plat-orion: fix printing of "MPP config unavailable on this hardware"
  Dove: activate GPIO interrupts in DT
  ARM: ux500: add spin_unlock(&master_lock).
  ARM: ux500: Disable Power Supply and Battery Management by default

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 389d2111 9916c159

Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt

+6 −6
Original line number Original line Diff line number Diff line
@@ -7,9 +7,9 @@ on-chip controllers onto these pads. 




Required Properties:

Required Properties:

- compatible: should be one of the following.

- compatible: should be one of the following.

  - "samsung,pinctrl-exynos4210": for Exynos4210 compatible pin-controller.

  - "samsung,exynos4210-pinctrl": for Exynos4210 compatible pin-controller.

  - "samsung,pinctrl-exynos4x12": for Exynos4x12 compatible pin-controller.

  - "samsung,exynos4x12-pinctrl": for Exynos4x12 compatible pin-controller.

  - "samsung,pinctrl-exynos5250": for Exynos5250 compatible pin-controller.

  - "samsung,exynos5250-pinctrl": for Exynos5250 compatible pin-controller.





- reg: Base address of the pin controller hardware module and length of

- reg: Base address of the pin controller hardware module and length of

  the address space it occupies.

  the address space it occupies.
@@ -142,7 +142,7 @@ the following format 'pinctrl{n}' where n is a unique number for the alias. 
Example: A pin-controller node with pin banks:

Example: A pin-controller node with pin banks:





	pinctrl_0: pinctrl@11400000 {

	pinctrl_0: pinctrl@11400000 {

		compatible = "samsung,pinctrl-exynos4210";

		compatible = "samsung,exynos4210-pinctrl";

		reg = <0x11400000 0x1000>;

		reg = <0x11400000 0x1000>;

		interrupts = <0 47 0>;

		interrupts = <0 47 0>;
@@ -185,7 +185,7 @@ Example: A pin-controller node with pin banks: 
Example 1: A pin-controller node with pin groups.

Example 1: A pin-controller node with pin groups.





	pinctrl_0: pinctrl@11400000 {

	pinctrl_0: pinctrl@11400000 {

		compatible = "samsung,pinctrl-exynos4210";

		compatible = "samsung,exynos4210-pinctrl";

		reg = <0x11400000 0x1000>;

		reg = <0x11400000 0x1000>;

		interrupts = <0 47 0>;

		interrupts = <0 47 0>;
@@ -230,7 +230,7 @@ Example 1: A pin-controller node with pin groups. 
Example 2: A pin-controller node with external wakeup interrupt controller node.

Example 2: A pin-controller node with external wakeup interrupt controller node.





	pinctrl_1: pinctrl@11000000 {

	pinctrl_1: pinctrl@11000000 {

		compatible = "samsung,pinctrl-exynos4210";

		compatible = "samsung,exynos4210-pinctrl";

		reg = <0x11000000 0x1000>;

		reg = <0x11000000 0x1000>;

		interrupts = <0 46 0>

		interrupts = <0 46 0>

arch/arm/boot/dts/at91sam9x5.dtsi

+2 −2
Original line number Original line Diff line number Diff line
@@ -197,9 +197,9 @@ 
				};

				};





				usart3 {

				usart3 {

					pinctrl_uart3: usart3-0 {

					pinctrl_usart3: usart3-0 {

						atmel,pins =

						atmel,pins =

							<2 23 0x2 0x1	/* PC22 periph B with pullup */

							<2 22 0x2 0x1	/* PC22 periph B with pullup */

							 2 23 0x2 0x0>;	/* PC23 periph B */

							 2 23 0x2 0x0>;	/* PC23 periph B */

					};

					};

arch/arm/boot/dts/dove.dtsi

+2 −0
Original line number Original line Diff line number Diff line
@@ -93,6 +93,7 @@ 
			reg = <0xd0400 0x20>;

			reg = <0xd0400 0x20>;

			ngpios = <32>;

			ngpios = <32>;

			interrupt-controller;

			interrupt-controller;

			#interrupt-cells = <2>;

			interrupts = <12>, <13>, <14>, <60>;

			interrupts = <12>, <13>, <14>, <60>;

		};

		};
@@ -103,6 +104,7 @@ 
			reg = <0xd0420 0x20>;

			reg = <0xd0420 0x20>;

			ngpios = <32>;

			ngpios = <32>;

			interrupt-controller;

			interrupt-controller;

			#interrupt-cells = <2>;

			interrupts = <61>;

			interrupts = <61>;

		};

		};

arch/arm/boot/dts/exynos4210.dtsi

+3 −3
Original line number Original line Diff line number Diff line
@@ -48,13 +48,13 @@ 
	};

	};





	pinctrl_0: pinctrl@11400000 {

	pinctrl_0: pinctrl@11400000 {

		compatible = "samsung,pinctrl-exynos4210";

		compatible = "samsung,exynos4210-pinctrl";

		reg = <0x11400000 0x1000>;

		reg = <0x11400000 0x1000>;

		interrupts = <0 47 0>;

		interrupts = <0 47 0>;

	};

	};





	pinctrl_1: pinctrl@11000000 {

	pinctrl_1: pinctrl@11000000 {

		compatible = "samsung,pinctrl-exynos4210";

		compatible = "samsung,exynos4210-pinctrl";

		reg = <0x11000000 0x1000>;

		reg = <0x11000000 0x1000>;

		interrupts = <0 46 0>;

		interrupts = <0 46 0>;
@@ -66,7 +66,7 @@ 
	};

	};





	pinctrl_2: pinctrl@03860000 {

	pinctrl_2: pinctrl@03860000 {

		compatible = "samsung,pinctrl-exynos4210";

		compatible = "samsung,exynos4210-pinctrl";

		reg = <0x03860000 0x1000>;

		reg = <0x03860000 0x1000>;

	};

	};

arch/arm/boot/dts/exynos4x12.dtsi

+4 −4
Original line number Original line Diff line number Diff line
@@ -37,13 +37,13 @@ 
	};

	};





	pinctrl_0: pinctrl@11400000 {

	pinctrl_0: pinctrl@11400000 {

		compatible = "samsung,pinctrl-exynos4x12";

		compatible = "samsung,exynos4x12-pinctrl";

		reg = <0x11400000 0x1000>;

		reg = <0x11400000 0x1000>;

		interrupts = <0 47 0>;

		interrupts = <0 47 0>;

	};

	};





	pinctrl_1: pinctrl@11000000 {

	pinctrl_1: pinctrl@11000000 {

		compatible = "samsung,pinctrl-exynos4x12";

		compatible = "samsung,exynos4x12-pinctrl";

		reg = <0x11000000 0x1000>;

		reg = <0x11000000 0x1000>;

		interrupts = <0 46 0>;

		interrupts = <0 46 0>;
@@ -55,14 +55,14 @@ 
	};

	};





	pinctrl_2: pinctrl@03860000 {

	pinctrl_2: pinctrl@03860000 {

		compatible = "samsung,pinctrl-exynos4x12";

		compatible = "samsung,exynos4x12-pinctrl";

		reg = <0x03860000 0x1000>;

		reg = <0x03860000 0x1000>;

		interrupt-parent = <&combiner>;

		interrupt-parent = <&combiner>;

		interrupts = <10 0>;

		interrupts = <10 0>;

	};

	};





	pinctrl_3: pinctrl@106E0000 {

	pinctrl_3: pinctrl@106E0000 {

		compatible = "samsung,pinctrl-exynos4x12";

		compatible = "samsung,exynos4x12-pinctrl";

		reg = <0x106E0000 0x1000>;

		reg = <0x106E0000 0x1000>;

		interrupts = <0 72 0>;

		interrupts = <0 72 0>;

	};

	};