diff for duplicates of <525CFB85.6080801@ti.com> diff --git a/a/1.txt b/N1/1.txt index 52a7113..73e2e21 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -91,9 +91,9 @@ Yes, sounds good. Thanks Benoit. >>>>> + ti,no-reset-on-init; >>>>> }; >>>>> ->>>>> elm: elm@48080000 { +>>>>> elm: elm at 48080000 { >>>>> @@ -637,6 +638,7 @@ ->>>>> gpmc: gpmc@50000000 { +>>>>> gpmc: gpmc at 50000000 { >>>>> compatible = "ti,am3352-gpmc"; >>>>> ti,hwmods = "gpmc"; >>>>> + ti,no-idle-on-init; @@ -112,7 +112,7 @@ Yes, sounds good. Thanks Benoit. >>>>> + ti,no-idle-on-init; >>>>> }; >>>>> ->>>>> uart1: serial@4806a000 { +>>>>> uart1: serial at 4806a000 { >>>>> @@ -492,6 +493,7 @@ >>>>> reg = <0x4c000000 0x100>; >>>>> interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>; @@ -135,7 +135,7 @@ Yes, sounds good. Thanks Benoit. >>>>> --- a/arch/arm/boot/dts/omap5.dtsi >>>>> +++ b/arch/arm/boot/dts/omap5.dtsi >>>>> @@ -607,6 +607,7 @@ ->>>>> emif1: emif@0x4c000000 { +>>>>> emif1: emif at 0x4c000000 { >>>>> compatible = "ti,emif-4d5"; >>>>> ti,hwmods = "emif1"; >>>>> + ti,no-idle-on-init; @@ -143,7 +143,7 @@ Yes, sounds good. Thanks Benoit. >>>>> reg = <0x4c000000 0x400>; >>>>> interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>; >>>>> @@ -618,6 +619,7 @@ ->>>>> emif2: emif@0x4d000000 { +>>>>> emif2: emif at 0x4d000000 { >>>>> compatible = "ti,emif-4d5"; >>>>> ti,hwmods = "emif2"; >>>>> + ti,no-idle-on-init; diff --git a/a/content_digest b/N1/content_digest index d432e46..c6b806e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,18 +4,10 @@ "ref\05255872A.30702@ti.com\0" "ref\052558842.6040409@baylibre.com\0" "ref\0525CEE4E.6010601@baylibre.com\0" - "From\0Rajendra Nayak <rnayak@ti.com>\0" - "Subject\0Re: [PATCH v2 2/5] ARM: dts: omap: Add new bindings for OMAP\0" + "From\0rnayak@ti.com (Rajendra Nayak)\0" + "Subject\0[PATCH v2 2/5] ARM: dts: omap: Add new bindings for OMAP\0" "Date\0Tue, 15 Oct 2013 13:53:33 +0530\0" - "To\0Benoit Cousson <bcousson@baylibre.com>\0" - "Cc\0paul@pwsan.com" - tony@atomide.com - linux-omap@vger.kernel.org - linux-arm-kernel@lists.infradead.org - devicetree@vger.kernel.org - linux-doc@vger.kernel.org - Mark Rutland <mark.rutland@arm.com> - " rob.herring@calxeda.com <rob.herring@calxeda.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tuesday 15 October 2013 12:57 PM, Benoit Cousson wrote:\n" @@ -111,9 +103,9 @@ ">>>>> + ti,no-reset-on-init;\n" ">>>>> };\n" ">>>>>\n" - ">>>>> elm: elm@48080000 {\n" + ">>>>> elm: elm at 48080000 {\n" ">>>>> @@ -637,6 +638,7 @@\n" - ">>>>> gpmc: gpmc@50000000 {\n" + ">>>>> gpmc: gpmc at 50000000 {\n" ">>>>> compatible = \"ti,am3352-gpmc\";\n" ">>>>> ti,hwmods = \"gpmc\";\n" ">>>>> + ti,no-idle-on-init;\n" @@ -132,7 +124,7 @@ ">>>>> + ti,no-idle-on-init;\n" ">>>>> };\n" ">>>>>\n" - ">>>>> uart1: serial@4806a000 {\n" + ">>>>> uart1: serial at 4806a000 {\n" ">>>>> @@ -492,6 +493,7 @@\n" ">>>>> reg = <0x4c000000 0x100>;\n" ">>>>> interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -155,7 +147,7 @@ ">>>>> --- a/arch/arm/boot/dts/omap5.dtsi\n" ">>>>> +++ b/arch/arm/boot/dts/omap5.dtsi\n" ">>>>> @@ -607,6 +607,7 @@\n" - ">>>>> emif1: emif@0x4c000000 {\n" + ">>>>> emif1: emif at 0x4c000000 {\n" ">>>>> compatible = \"ti,emif-4d5\";\n" ">>>>> ti,hwmods = \"emif1\";\n" ">>>>> + ti,no-idle-on-init;\n" @@ -163,7 +155,7 @@ ">>>>> reg = <0x4c000000 0x400>;\n" ">>>>> interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;\n" ">>>>> @@ -618,6 +619,7 @@\n" - ">>>>> emif2: emif@0x4d000000 {\n" + ">>>>> emif2: emif at 0x4d000000 {\n" ">>>>> compatible = \"ti,emif-4d5\";\n" ">>>>> ti,hwmods = \"emif2\";\n" ">>>>> + ti,no-idle-on-init;\n" @@ -177,4 +169,4 @@ "> \n" > -e39f9c9fb4165b767dc47f08ae8132d17f66b68200eaff42a67f1474e145578d +9d5f0cb7d7932d7569ab38fa207680913e0880b446c0fcadafabb9d75657c3bd
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.