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

Commit e2265abe authored by Nishanth Menon's avatar Nishanth Menon
Browse files

ARM: dts: OMAP5 / DRA7: switch over to interrupts-extended property for UART 



We've had deeper idle states working on omaps for few years now,
but only in the legacy mode. When booted with device tree, the
wake-up events did not have a chance to work until commit
3e6cee17 ("pinctrl: single: Add support for wake-up interrupts")
that recently got merged. In addition to that we also needed
commit 79d97015 ("of/irq: create interrupts-extended property")
that's now also merged.

Note that there's no longer need to specify the wake-up bit in
the pinctrl settings, the request_irq on the wake-up pin takes
care of that.

Signed-off-by: default avatarNishanth Menon <nm@ti.com>
parent d8c5bab6

arch/arm/boot/dts/dra7.dtsi

+10 −10
Original line number Diff line number Diff line
@@ -330,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";
@@ -339,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";
@@ -348,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";
@@ -357,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";
@@ -366,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";
@@ -375,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";
@@ -384,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";
@@ -393,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";
@@ -402,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";
@@ -411,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

+6 −6
Original line number Diff line number Diff line
@@ -451,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>;

		};
@@ -459,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>;

		};
@@ -467,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>;

		};
@@ -475,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>;

		};
@@ -483,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>;

		};
@@ -491,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>;

		};