diff for duplicates of <20131125201142.GT10023@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 962232b..e1c09f4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,8 +15,8 @@ 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. -Cc: devicetree@vger.kernel.org -Cc: "Benoît Cousson" <bcousson@baylibre.com> +Cc: devicetree at vger.kernel.org +Cc: "Beno?t Cousson" <bcousson@baylibre.com> Signed-off-by: Tony Lindgren <tony@atomide.com> --- @@ -63,7 +63,7 @@ populating interrupts" to avoid intoducing nasty warnings. --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -207,7 +207,7 @@ - uart1: serial@4806a000 { + uart1: serial at 4806a000 { compatible = "ti,omap3-uart"; reg = <0x4806a000 0x2000>; - interrupts = <72>; @@ -72,7 +72,7 @@ populating interrupts" to avoid intoducing nasty warnings. dma-names = "tx", "rx"; ti,hwmods = "uart1"; @@ -217,7 +217,7 @@ - uart2: serial@4806c000 { + uart2: serial at 4806c000 { compatible = "ti,omap3-uart"; reg = <0x4806c000 0x400>; - interrupts = <73>; @@ -81,7 +81,7 @@ populating interrupts" to avoid intoducing nasty warnings. dma-names = "tx", "rx"; ti,hwmods = "uart2"; @@ -227,7 +227,7 @@ - uart3: serial@49020000 { + uart3: serial at 49020000 { compatible = "ti,omap3-uart"; reg = <0x49020000 0x400>; - interrupts = <74>; @@ -141,7 +141,7 @@ populating interrupts" to avoid intoducing nasty warnings. --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -236,7 +236,7 @@ - uart2: serial@4806c000 { + uart2: serial at 4806c000 { compatible = "ti,omap4-uart"; reg = <0x4806c000 0x100>; - interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; @@ -150,7 +150,7 @@ populating interrupts" to avoid intoducing nasty warnings. clock-frequency = <48000000>; }; @@ -244,7 +244,7 @@ - uart3: serial@48020000 { + uart3: serial at 48020000 { compatible = "ti,omap4-uart"; reg = <0x48020000 0x100>; - interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; @@ -159,7 +159,7 @@ populating interrupts" to avoid intoducing nasty warnings. clock-frequency = <48000000>; }; @@ -252,7 +252,7 @@ - uart4: serial@4806e000 { + uart4: serial at 4806e000 { compatible = "ti,omap4-uart"; reg = <0x4806e000 0x100>; - interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>; @@ -186,8 +186,3 @@ populating interrupts" to avoid intoducing nasty warnings. +#define OMAP4_UART4_RX 0x11c + #endif - --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index af8b2e9..803d4e7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,7 @@ - "From\0Tony Lindgren <tony@atomide.com>\0" + "From\0tony@atomide.com (Tony Lindgren)\0" "Subject\0[PATCH] ARM: dts: Fix omap serial wake-up when booted with device tree\0" "Date\0Mon, 25 Nov 2013 12:11:42 -0800\0" "To\0linux-arm-kernel@lists.infradead.org\0" - "Cc\0linux-omap@vger.kernel.org" - devicetree@vger.kernel.org - " Beno\303\256t Cousson <bcousson@baylibre.com>\0" "\00:1\0" "b\0" "We've had deeper idle states working on omaps for few years now,\n" @@ -24,8 +21,8 @@ "the pinctrl settings, the request_irq on the wake-up pin takes\n" "care of that.\n" "\n" - "Cc: devicetree@vger.kernel.org\n" - "Cc: \"Beno\303\256t Cousson\" <bcousson@baylibre.com>\n" + "Cc: devicetree at vger.kernel.org\n" + "Cc: \"Beno?t Cousson\" <bcousson@baylibre.com>\n" "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" "\n" "---\n" @@ -72,7 +69,7 @@ "--- a/arch/arm/boot/dts/omap3.dtsi\n" "+++ b/arch/arm/boot/dts/omap3.dtsi\n" "@@ -207,7 +207,7 @@\n" - " \t\tuart1: serial@4806a000 {\n" + " \t\tuart1: serial at 4806a000 {\n" " \t\t\tcompatible = \"ti,omap3-uart\";\n" " \t\t\treg = <0x4806a000 0x2000>;\n" "-\t\t\tinterrupts = <72>;\n" @@ -81,7 +78,7 @@ " \t\t\tdma-names = \"tx\", \"rx\";\n" " \t\t\tti,hwmods = \"uart1\";\n" "@@ -217,7 +217,7 @@\n" - " \t\tuart2: serial@4806c000 {\n" + " \t\tuart2: serial at 4806c000 {\n" " \t\t\tcompatible = \"ti,omap3-uart\";\n" " \t\t\treg = <0x4806c000 0x400>;\n" "-\t\t\tinterrupts = <73>;\n" @@ -90,7 +87,7 @@ " \t\t\tdma-names = \"tx\", \"rx\";\n" " \t\t\tti,hwmods = \"uart2\";\n" "@@ -227,7 +227,7 @@\n" - " \t\tuart3: serial@49020000 {\n" + " \t\tuart3: serial at 49020000 {\n" " \t\t\tcompatible = \"ti,omap3-uart\";\n" " \t\t\treg = <0x49020000 0x400>;\n" "-\t\t\tinterrupts = <74>;\n" @@ -150,7 +147,7 @@ "--- a/arch/arm/boot/dts/omap4.dtsi\n" "+++ b/arch/arm/boot/dts/omap4.dtsi\n" "@@ -236,7 +236,7 @@\n" - " \t\tuart2: serial@4806c000 {\n" + " \t\tuart2: serial at 4806c000 {\n" " \t\t\tcompatible = \"ti,omap4-uart\";\n" " \t\t\treg = <0x4806c000 0x100>;\n" "-\t\t\tinterrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -159,7 +156,7 @@ " \t\t\tclock-frequency = <48000000>;\n" " \t\t};\n" "@@ -244,7 +244,7 @@\n" - " \t\tuart3: serial@48020000 {\n" + " \t\tuart3: serial at 48020000 {\n" " \t\t\tcompatible = \"ti,omap4-uart\";\n" " \t\t\treg = <0x48020000 0x100>;\n" "-\t\t\tinterrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -168,7 +165,7 @@ " \t\t\tclock-frequency = <48000000>;\n" " \t\t};\n" "@@ -252,7 +252,7 @@\n" - " \t\tuart4: serial@4806e000 {\n" + " \t\tuart4: serial at 4806e000 {\n" " \t\t\tcompatible = \"ti,omap4-uart\";\n" " \t\t\treg = <0x4806e000 0x100>;\n" "-\t\t\tinterrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -194,11 +191,6 @@ "+#define OMAP4_UART3_RX\t\t0x104\n" "+#define OMAP4_UART4_RX\t\t0x11c\n" "+\n" - " #endif\n" - " \n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-omap\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + #endif -73dc00734134ff6ff54991a124071e5e3862d47cbf1a17cf5e187826e2cdff44 +e1c4bd007bc996a82ceb04d4203449c7d5f3493db4ab25b0de9f099926129a56
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.