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

Commit 6e554260 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'pull/v3.18/for-dt-pinctrl-updates' of... 

Merge branch 'pull/v3.18/for-dt-pinctrl-updates' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.18/dt
parents 83c9b2af 66b04369

arch/arm/boot/dts/am4372.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -58,10 +58,12 @@ 
	};



	am43xx_pinmux: pinmux@44e10800 {

		compatible = "pinctrl-single";

		compatible = "ti,am437-padconf", "pinctrl-single";

		reg = <0x44e10800 0x31c>;

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;

		interrupt-controller;

		pinctrl-single,register-width = <32>;

		pinctrl-single,function-mask = <0xffffffff>;

	};

arch/arm/boot/dts/dra7-evm.dts

+2 −0
Original line number Diff line number Diff line
@@ -303,6 +303,8 @@ 
	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&uart1_pins>;

	interrupts-extended = <&gic GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,

			      <&dra7_pmx_core 0x3e0>;

};



&uart2 {

arch/arm/boot/dts/dra7.dtsi

+13 −11
Original line number Diff line number Diff line
@@ -217,10 +217,12 @@ 
		};



		dra7_pmx_core: pinmux@4a003400 {

			compatible = "pinctrl-single";

			compatible = "ti,dra7-padconf", "pinctrl-single";

			reg = <0x4a003400 0x0464>;

			#address-cells = <1>;

			#size-cells = <0>;

			#interrupt-cells = <1>;

			interrupt-controller;

			pinctrl-single,register-width = <32>;

			pinctrl-single,function-mask = <0x3fffffff>;

		};
@@ -328,7 +330,7 @@ 
		uart1: serial@4806a000 {

			compatible = "ti,omap4-uart";

			reg = <0x4806a000 0x100>;

			interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;

			interrupts-extended = <&gic GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart1";

			clock-frequency = <48000000>;

			status = "disabled";
@@ -337,7 +339,7 @@ 
		uart2: serial@4806c000 {

			compatible = "ti,omap4-uart";

			reg = <0x4806c000 0x100>;

			interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;

			interrupts-extended = <&gic GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart2";

			clock-frequency = <48000000>;

			status = "disabled";
@@ -346,7 +348,7 @@ 
		uart3: serial@48020000 {

			compatible = "ti,omap4-uart";

			reg = <0x48020000 0x100>;

			interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;

			interrupts-extended = <&gic GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart3";

			clock-frequency = <48000000>;

			status = "disabled";
@@ -355,7 +357,7 @@ 
		uart4: serial@4806e000 {

			compatible = "ti,omap4-uart";

			reg = <0x4806e000 0x100>;

			interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;

			interrupts-extended = <&gic GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart4";

			clock-frequency = <48000000>;

                        status = "disabled";
@@ -364,7 +366,7 @@ 
		uart5: serial@48066000 {

			compatible = "ti,omap4-uart";

			reg = <0x48066000 0x100>;

			interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;

			interrupts-extended = <&gic GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart5";

			clock-frequency = <48000000>;

			status = "disabled";
@@ -373,7 +375,7 @@ 
		uart6: serial@48068000 {

			compatible = "ti,omap4-uart";

			reg = <0x48068000 0x100>;

			interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;

			interrupts-extended = <&gic GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart6";

			clock-frequency = <48000000>;

			status = "disabled";
@@ -382,7 +384,7 @@ 
		uart7: serial@48420000 {

			compatible = "ti,omap4-uart";

			reg = <0x48420000 0x100>;

			interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>;

			interrupts-extended = <&gic GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart7";

			clock-frequency = <48000000>;

			status = "disabled";
@@ -391,7 +393,7 @@ 
		uart8: serial@48422000 {

			compatible = "ti,omap4-uart";

			reg = <0x48422000 0x100>;

			interrupts = <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>;

			interrupts-extended = <&gic GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart8";

			clock-frequency = <48000000>;

			status = "disabled";
@@ -400,7 +402,7 @@ 
		uart9: serial@48424000 {

			compatible = "ti,omap4-uart";

			reg = <0x48424000 0x100>;

			interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>;

			interrupts-extended = <&gic GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart9";

			clock-frequency = <48000000>;

			status = "disabled";
@@ -409,7 +411,7 @@ 
		uart10: serial@4ae2b000 {

			compatible = "ti,omap4-uart";

			reg = <0x4ae2b000 0x100>;

			interrupts = <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;

			interrupts-extended = <&gic GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart10";

			clock-frequency = <48000000>;

			status = "disabled";

arch/arm/boot/dts/omap5.dtsi

+12 −8
Original line number Diff line number Diff line
@@ -187,18 +187,22 @@ 
		};



		omap5_pmx_core: pinmux@4a002840 {

			compatible = "ti,omap4-padconf", "pinctrl-single";

			compatible = "ti,omap5-padconf", "pinctrl-single";

			reg = <0x4a002840 0x01b6>;

			#address-cells = <1>;

			#size-cells = <0>;

			#interrupt-cells = <1>;

			interrupt-controller;

			pinctrl-single,register-width = <16>;

			pinctrl-single,function-mask = <0x7fff>;

		};

		omap5_pmx_wkup: pinmux@4ae0c840 {

			compatible = "ti,omap4-padconf", "pinctrl-single";

			compatible = "ti,omap5-padconf", "pinctrl-single";

			reg = <0x4ae0c840 0x0038>;

			#address-cells = <1>;

			#size-cells = <0>;

			#interrupt-cells = <1>;

			interrupt-controller;

			pinctrl-single,register-width = <16>;

			pinctrl-single,function-mask = <0x7fff>;

		};
@@ -447,7 +451,7 @@ 
		uart1: serial@4806a000 {

			compatible = "ti,omap4-uart";

			reg = <0x4806a000 0x100>;

			interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;

			interrupts-extended = <&gic GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart1";

			clock-frequency = <48000000>;

		};
@@ -455,7 +459,7 @@ 
		uart2: serial@4806c000 {

			compatible = "ti,omap4-uart";

			reg = <0x4806c000 0x100>;

			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;

			interrupts-extended = <&gic GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart2";

			clock-frequency = <48000000>;

		};
@@ -463,7 +467,7 @@ 
		uart3: serial@48020000 {

			compatible = "ti,omap4-uart";

			reg = <0x48020000 0x100>;

			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;

			interrupts-extended = <&gic GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart3";

			clock-frequency = <48000000>;

		};
@@ -471,7 +475,7 @@ 
		uart4: serial@4806e000 {

			compatible = "ti,omap4-uart";

			reg = <0x4806e000 0x100>;

			interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;

			interrupts-extended = <&gic GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart4";

			clock-frequency = <48000000>;

		};
@@ -479,7 +483,7 @@ 
		uart5: serial@48066000 {

			compatible = "ti,omap4-uart";

			reg = <0x48066000 0x100>;

			interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;

			interrupts-extended = <&gic GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart5";

			clock-frequency = <48000000>;

		};
@@ -487,7 +491,7 @@ 
		uart6: serial@48068000 {

			compatible = "ti,omap4-uart";

			reg = <0x48068000 0x100>;

			interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;

			interrupts-extended = <&gic GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart6";

			clock-frequency = <48000000>;

		};