diff for duplicates of <526159EB.8070301@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index 4d69151..df97669 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,7 +35,7 @@ Benoit > ranges; > @@ -193,24 +196,40 @@ > -> uart1: serial@4806a000 { +> uart1: serial at 4806a000 { > compatible = "ti,omap3-uart"; > + reg = <0x4806a000 0x2000>; > + interrupts = <72>; @@ -45,7 +45,7 @@ Benoit > clock-frequency = <48000000>; > }; > -> uart2: serial@4806c000 { +> uart2: serial at 4806c000 { > compatible = "ti,omap3-uart"; > + reg = <0x4806c000 0x400>; > + interrupts = <73>; @@ -55,7 +55,7 @@ Benoit > clock-frequency = <48000000>; > }; > -> uart3: serial@49020000 { +> uart3: serial at 49020000 { > compatible = "ti,omap3-uart"; > + reg = <0x49020000 0x400>; > + interrupts = <74>; @@ -65,7 +65,7 @@ Benoit > clock-frequency = <48000000>; > }; > -> i2c1: i2c@48070000 { +> i2c1: i2c at 48070000 { > compatible = "ti,omap3-i2c"; > + reg = <0x48070000 0x80>; > + interrupts = <56>; @@ -76,7 +76,7 @@ Benoit > ti,hwmods = "i2c1"; > @@ -218,6 +237,10 @@ > -> i2c2: i2c@48072000 { +> i2c2: i2c at 48072000 { > compatible = "ti,omap3-i2c"; > + reg = <0x48072000 0x80>; > + interrupts = <57>; @@ -87,7 +87,7 @@ Benoit > ti,hwmods = "i2c2"; > @@ -225,6 +248,10 @@ > -> i2c3: i2c@48060000 { +> i2c3: i2c at 48060000 { > compatible = "ti,omap3-i2c"; > + reg = <0x48060000 0x80>; > + interrupts = <61>; @@ -98,7 +98,7 @@ Benoit > ti,hwmods = "i2c3"; > @@ -232,6 +259,8 @@ > -> mcspi1: spi@48098000 { +> mcspi1: spi at 48098000 { > compatible = "ti,omap2-mcspi"; > + reg = <0x48098000 0x100>; > + interrupts = <65>; @@ -107,7 +107,7 @@ Benoit > ti,hwmods = "mcspi1"; > @@ -250,6 +279,8 @@ > -> mcspi2: spi@4809a000 { +> mcspi2: spi at 4809a000 { > compatible = "ti,omap2-mcspi"; > + reg = <0x4809a000 0x100>; > + interrupts = <66>; @@ -116,7 +116,7 @@ Benoit > ti,hwmods = "mcspi2"; > @@ -263,6 +294,8 @@ > -> mcspi3: spi@480b8000 { +> mcspi3: spi at 480b8000 { > compatible = "ti,omap2-mcspi"; > + reg = <0x480b8000 0x100>; > + interrupts = <91>; @@ -125,7 +125,7 @@ Benoit > ti,hwmods = "mcspi3"; > @@ -276,6 +309,8 @@ > -> mcspi4: spi@480ba000 { +> mcspi4: spi at 480ba000 { > compatible = "ti,omap2-mcspi"; > + reg = <0x480ba000 0x100>; > + interrupts = <48>; @@ -136,14 +136,14 @@ Benoit > dma-names = "tx0", "rx0"; > }; > -> + hdqw1w: 1w@480b2000 { +> + hdqw1w: 1w at 480b2000 { > + compatible = "ti,omap3-1w"; > + reg = <0x480b2000 0x1000>; > + interrupts = <58>; > + ti,hwmods = "hdq1w"; > + }; > + -> mmc1: mmc@4809c000 { +> mmc1: mmc at 4809c000 { > compatible = "ti,omap3-hsmmc"; > + reg = <0x4809c000 0x200>; > + interrupts = <83>; @@ -152,7 +152,7 @@ Benoit > dmas = <&sdma 61>, <&sdma 62>; > @@ -294,6 +338,8 @@ > -> mmc2: mmc@480b4000 { +> mmc2: mmc at 480b4000 { > compatible = "ti,omap3-hsmmc"; > + reg = <0x480b4000 0x200>; > + interrupts = <86>; @@ -161,7 +161,7 @@ Benoit > dma-names = "tx", "rx"; > @@ -301,6 +347,8 @@ > -> mmc3: mmc@480ad000 { +> mmc3: mmc at 480ad000 { > compatible = "ti,omap3-hsmmc"; > + reg = <0x480ad000 0x200>; > + interrupts = <94>; @@ -170,7 +170,7 @@ Benoit > dma-names = "tx", "rx"; > @@ -308,6 +356,7 @@ > -> wdt2: wdt@48314000 { +> wdt2: wdt at 48314000 { > compatible = "ti,omap3-wdt"; > + reg = <0x48314000 0x80>; > ti,hwmods = "wd_timer2"; @@ -182,7 +182,7 @@ Benoit > +++ b/arch/arm/boot/dts/omap36xx.dtsi > @@ -31,6 +31,10 @@ > ocp { -> uart4: serial@49042000 { +> uart4: serial at 49042000 { > compatible = "ti,omap3-uart"; > + reg = <0x49042000 0x400>; > + interrupts = <80>; @@ -193,17 +193,13 @@ Benoit > }; > -- > To unsubscribe from this list: send the line "unsubscribe devicetree" in -> the body of a message to majordomo@vger.kernel.org +> the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- -Benoît Cousson +Beno?t Cousson BayLibre Embedded Linux Technology Lab www.baylibre.com --- -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 f69c505..7a8b4a5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,8 @@ "ref\020131017221522.GE15154@atomide.com\0" - "From\0Benoit Cousson <bcousson@baylibre.com>\0" - "Subject\0Re: [PATCH] ARM: dts: Add missing reg, interrupt and dma entries for omap3\0" + "From\0bcousson@baylibre.com (Benoit Cousson)\0" + "Subject\0[PATCH] ARM: dts: Add missing reg, interrupt and dma entries for omap3\0" "Date\0Fri, 18 Oct 2013 17:55:23 +0200\0" - "To\0Tony Lindgren <tony@atomide.com>" - linux-omap@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " devicetree@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Tony,\n" @@ -45,7 +42,7 @@ "> \t\tranges;\n" "> @@ -193,24 +196,40 @@\n" ">\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" @@ -55,7 +52,7 @@ "> \t\t\tclock-frequency = <48000000>;\n" "> \t\t};\n" ">\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" @@ -65,7 +62,7 @@ "> \t\t\tclock-frequency = <48000000>;\n" "> \t\t};\n" ">\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" @@ -75,7 +72,7 @@ "> \t\t\tclock-frequency = <48000000>;\n" "> \t\t};\n" ">\n" - "> \t\ti2c1: i2c@48070000 {\n" + "> \t\ti2c1: i2c at 48070000 {\n" "> \t\t\tcompatible = \"ti,omap3-i2c\";\n" "> +\t\t\treg = <0x48070000 0x80>;\n" "> +\t\t\tinterrupts = <56>;\n" @@ -86,7 +83,7 @@ "> \t\t\tti,hwmods = \"i2c1\";\n" "> @@ -218,6 +237,10 @@\n" ">\n" - "> \t\ti2c2: i2c@48072000 {\n" + "> \t\ti2c2: i2c at 48072000 {\n" "> \t\t\tcompatible = \"ti,omap3-i2c\";\n" "> +\t\t\treg = <0x48072000 0x80>;\n" "> +\t\t\tinterrupts = <57>;\n" @@ -97,7 +94,7 @@ "> \t\t\tti,hwmods = \"i2c2\";\n" "> @@ -225,6 +248,10 @@\n" ">\n" - "> \t\ti2c3: i2c@48060000 {\n" + "> \t\ti2c3: i2c at 48060000 {\n" "> \t\t\tcompatible = \"ti,omap3-i2c\";\n" "> +\t\t\treg = <0x48060000 0x80>;\n" "> +\t\t\tinterrupts = <61>;\n" @@ -108,7 +105,7 @@ "> \t\t\tti,hwmods = \"i2c3\";\n" "> @@ -232,6 +259,8 @@\n" ">\n" - "> \t\tmcspi1: spi@48098000 {\n" + "> \t\tmcspi1: spi at 48098000 {\n" "> \t\t\tcompatible = \"ti,omap2-mcspi\";\n" "> +\t\t\treg = <0x48098000 0x100>;\n" "> +\t\t\tinterrupts = <65>;\n" @@ -117,7 +114,7 @@ "> \t\t\tti,hwmods = \"mcspi1\";\n" "> @@ -250,6 +279,8 @@\n" ">\n" - "> \t\tmcspi2: spi@4809a000 {\n" + "> \t\tmcspi2: spi at 4809a000 {\n" "> \t\t\tcompatible = \"ti,omap2-mcspi\";\n" "> +\t\t\treg = <0x4809a000 0x100>;\n" "> +\t\t\tinterrupts = <66>;\n" @@ -126,7 +123,7 @@ "> \t\t\tti,hwmods = \"mcspi2\";\n" "> @@ -263,6 +294,8 @@\n" ">\n" - "> \t\tmcspi3: spi@480b8000 {\n" + "> \t\tmcspi3: spi at 480b8000 {\n" "> \t\t\tcompatible = \"ti,omap2-mcspi\";\n" "> +\t\t\treg = <0x480b8000 0x100>;\n" "> +\t\t\tinterrupts = <91>;\n" @@ -135,7 +132,7 @@ "> \t\t\tti,hwmods = \"mcspi3\";\n" "> @@ -276,6 +309,8 @@\n" ">\n" - "> \t\tmcspi4: spi@480ba000 {\n" + "> \t\tmcspi4: spi at 480ba000 {\n" "> \t\t\tcompatible = \"ti,omap2-mcspi\";\n" "> +\t\t\treg = <0x480ba000 0x100>;\n" "> +\t\t\tinterrupts = <48>;\n" @@ -146,14 +143,14 @@ "> \t\t\tdma-names = \"tx0\", \"rx0\";\n" "> \t\t};\n" ">\n" - "> +\t\thdqw1w: 1w@480b2000 {\n" + "> +\t\thdqw1w: 1w at 480b2000 {\n" "> +\t\t\tcompatible = \"ti,omap3-1w\";\n" "> +\t\t\treg = <0x480b2000 0x1000>;\n" "> +\t\t\tinterrupts = <58>;\n" "> +\t\t\tti,hwmods = \"hdq1w\";\n" "> +\t\t};\n" "> +\n" - "> \t\tmmc1: mmc@4809c000 {\n" + "> \t\tmmc1: mmc at 4809c000 {\n" "> \t\t\tcompatible = \"ti,omap3-hsmmc\";\n" "> +\t\t\treg = <0x4809c000 0x200>;\n" "> +\t\t\tinterrupts = <83>;\n" @@ -162,7 +159,7 @@ "> \t\t\tdmas = <&sdma 61>, <&sdma 62>;\n" "> @@ -294,6 +338,8 @@\n" ">\n" - "> \t\tmmc2: mmc@480b4000 {\n" + "> \t\tmmc2: mmc at 480b4000 {\n" "> \t\t\tcompatible = \"ti,omap3-hsmmc\";\n" "> +\t\t\treg = <0x480b4000 0x200>;\n" "> +\t\t\tinterrupts = <86>;\n" @@ -171,7 +168,7 @@ "> \t\t\tdma-names = \"tx\", \"rx\";\n" "> @@ -301,6 +347,8 @@\n" ">\n" - "> \t\tmmc3: mmc@480ad000 {\n" + "> \t\tmmc3: mmc at 480ad000 {\n" "> \t\t\tcompatible = \"ti,omap3-hsmmc\";\n" "> +\t\t\treg = <0x480ad000 0x200>;\n" "> +\t\t\tinterrupts = <94>;\n" @@ -180,7 +177,7 @@ "> \t\t\tdma-names = \"tx\", \"rx\";\n" "> @@ -308,6 +356,7 @@\n" ">\n" - "> \t\twdt2: wdt@48314000 {\n" + "> \t\twdt2: wdt at 48314000 {\n" "> \t\t\tcompatible = \"ti,omap3-wdt\";\n" "> +\t\t\treg = <0x48314000 0x80>;\n" "> \t\t\tti,hwmods = \"wd_timer2\";\n" @@ -192,7 +189,7 @@ "> +++ b/arch/arm/boot/dts/omap36xx.dtsi\n" "> @@ -31,6 +31,10 @@\n" "> \tocp {\n" - "> \t\tuart4: serial@49042000 {\n" + "> \t\tuart4: serial at 49042000 {\n" "> \t\t\tcompatible = \"ti,omap3-uart\";\n" "> +\t\t\treg = <0x49042000 0x400>;\n" "> +\t\t\tinterrupts = <80>;\n" @@ -203,19 +200,15 @@ "> \t\t};\n" "> --\n" "> To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" - "> the body of a message to majordomo@vger.kernel.org\n" + "> the body of a message to majordomo at vger.kernel.org\n" "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" ">\n" "\n" "\n" "-- \n" - "Beno\303\256t Cousson\n" + "Beno?t Cousson\n" "BayLibre\n" "Embedded Linux Technology Lab\n" - "www.baylibre.com\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 + www.baylibre.com -663af757b126db3c020fc0334a1991b124f3be5096d3030864637fa6710ebf6a +fc38e95fb7e4180f70d413f3e0beeb59d7e0ea4a470a0d41a459950052d067b7
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.