diff for duplicates of <1387450064-6598-3-git-send-email-jonas.jensen@gmail.com> diff --git a/a/1.txt b/N1/1.txt index c4350db..bb6666b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -76,25 +76,25 @@ index 0000000..10d088d + }; + }; + -+ flash at 80000000,0 { ++ flash@80000000,0 { + compatible = "numonyx,js28f128", "cfi-flash"; + reg = <0x80000000 0x1000000>; + bank-width = <2>; + #address-cells = <1>; + #size-cells = <1>; -+ partition at 0 { ++ partition@0 { + label = "bootloader"; + reg = <0x0 0x40000>; + }; -+ partition at 40000 { ++ partition@40000 { + label = "linux kernel"; + reg = <0x40000 0x1C0000>; + }; -+ partition at 200000 { ++ partition@200000 { + label = "root filesystem"; + reg = <0x200000 0x800000>; + }; -+ partition at a00000 { ++ partition@a00000 { + label = "user filesystem"; + reg = <0xa00000 0x600000>; + }; @@ -115,7 +115,7 @@ index 0000000..10d088d + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <500>; -+ button at 25 { ++ button@25 { + label = "GPIO Reset"; + linux,code = <116>; + gpios = <&gpio 25 1>; @@ -138,7 +138,7 @@ index 0000000..10d088d +&mdio0 { + status = "okay"; + -+ ethphy0: ethernet-phy at 1 { ++ ethphy0: ethernet-phy@1 { + device_type = "ethernet-phy"; + compatible = "moxa,moxart-rtl8201cp", "ethernet-phy-ieee802.3-c22"; + reg = <1>; @@ -148,7 +148,7 @@ index 0000000..10d088d +&mdio1 { + status = "okay"; + -+ ethphy1: ethernet-phy at 1 { ++ ethphy1: ethernet-phy@1 { + device_type = "ethernet-phy"; + compatible = "moxa,moxart-rtl8201cp", "ethernet-phy-ieee802.3-c22"; + reg = <1>; @@ -190,7 +190,7 @@ index 0000000..1fd27ed + #address-cells = <1>; + #size-cells = <0>; + -+ cpu at 0 { ++ cpu@0 { + device_type = "cpu"; + compatible = "faraday,fa526"; + reg = <0>; @@ -209,7 +209,7 @@ index 0000000..1fd27ed + reg = <0x90000000 0x10000000>; + ranges; + -+ intc: interrupt-controller at 98800000 { ++ intc: interrupt-controller@98800000 { + compatible = "moxa,moxart-ic"; + reg = <0x98800000 0x38>; + interrupt-controller; @@ -217,27 +217,27 @@ index 0000000..1fd27ed + interrupt-mask = <0x00080000>; + }; + -+ clk_pll: clk_pll at 98100000 { ++ clk_pll: clk_pll@98100000 { + compatible = "moxa,moxart-pll-clock"; + #clock-cells = <0>; + reg = <0x98100000 0x34>; + }; + -+ clk_apb: clk_apb at 98100000 { ++ clk_apb: clk_apb@98100000 { + compatible = "moxa,moxart-apb-clock"; + #clock-cells = <0>; + reg = <0x98100000 0x34>; + clocks = <&clk_pll>; + }; + -+ timer: timer at 98400000 { ++ timer: timer@98400000 { + compatible = "moxa,moxart-timer"; + reg = <0x98400000 0x42>; + interrupts = <19 1>; + clocks = <&clk_apb>; + }; + -+ gpio: gpio at 98700000 { ++ gpio: gpio@98700000 { + gpio-controller; + #gpio-cells = <2>; + compatible = "moxa,moxart-gpio"; @@ -251,20 +251,20 @@ index 0000000..1fd27ed + gpio-rtc-reset = <&gpio 7 0>; + }; + -+ dma: dma at 90500000 { ++ dma: dma@90500000 { + compatible = "moxa,moxart-dma"; + reg = <0x90500080 0x40>; + interrupts = <24 0>; + #dma-cells = <1>; + }; + -+ watchdog: watchdog at 98500000 { ++ watchdog: watchdog@98500000 { + compatible = "moxa,moxart-watchdog"; + reg = <0x98500000 0x10>; + clocks = <&clk_apb>; + }; + -+ sdhci: sdhci at 98e00000 { ++ sdhci: sdhci@98e00000 { + compatible = "moxa,moxart-sdhci"; + reg = <0x98e00000 0x5C>; + interrupts = <5 0>; @@ -275,7 +275,7 @@ index 0000000..1fd27ed + status = "disabled"; + }; + -+ mdio0: mdio at 90900090 { ++ mdio0: mdio@90900090 { + compatible = "moxa,moxart-mdio"; + reg = <0x90900090 0x8>; + #address-cells = <1>; @@ -283,7 +283,7 @@ index 0000000..1fd27ed + status = "disabled"; + }; + -+ mdio1: mdio at 92000090 { ++ mdio1: mdio@92000090 { + compatible = "moxa,moxart-mdio"; + reg = <0x92000090 0x8>; + #address-cells = <1>; @@ -291,7 +291,7 @@ index 0000000..1fd27ed + status = "disabled"; + }; + -+ mac0: mac at 90900000 { ++ mac0: mac@90900000 { + compatible = "moxa,moxart-mac"; + reg = <0x90900000 0x90>; + interrupts = <25 0>; @@ -300,7 +300,7 @@ index 0000000..1fd27ed + status = "disabled"; + }; + -+ mac1: mac at 92000000 { ++ mac1: mac@92000000 { + compatible = "moxa,moxart-mac"; + reg = <0x92000000 0x90>; + interrupts = <27 0>; @@ -309,7 +309,7 @@ index 0000000..1fd27ed + status = "disabled"; + }; + -+ uart0: uart at 98200000 { ++ uart0: uart@98200000 { + compatible = "ns16550a"; + reg = <0x98200000 0x20>; + interrupts = <31 8>; diff --git a/a/content_digest b/N1/content_digest index 7fdb641..44d432a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,18 @@ "ref\01387450064-6598-1-git-send-email-jonas.jensen@gmail.com\0" - "From\0jonas.jensen@gmail.com (Jonas Jensen)\0" + "From\0Jonas Jensen <jonas.jensen@gmail.com>\0" "Subject\0[PATCH v7 2/2] ARM: mach-moxart: add MOXA ART SoC device tree files\0" "Date\0Thu, 19 Dec 2013 11:47:44 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" + "Cc\0linux-kernel@vger.kernel.org" + devicetree@vger.kernel.org + arm@kernel.org + linux@arm.linux.org.uk + arnd@arndb.de + olof@lixom.net + soren.brinkmann@xilinx.com + peter.crosthwaite@xilinx.com + linux@roeck-us.net + " Jonas Jensen <jonas.jensen@gmail.com>\0" "\00:1\0" "b\0" "Add a generic (dtsi) include file for MOXA ART SoCs.\n" @@ -83,25 +93,25 @@ "+\t\t};\n" "+\t};\n" "+\n" - "+\tflash at 80000000,0 {\n" + "+\tflash@80000000,0 {\n" "+\t\tcompatible = \"numonyx,js28f128\", \"cfi-flash\";\n" "+\t\treg = <0x80000000 0x1000000>;\n" "+\t\tbank-width = <2>;\n" "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <1>;\n" - "+\t\tpartition at 0 {\n" + "+\t\tpartition@0 {\n" "+\t\t\tlabel = \"bootloader\";\n" "+\t\t\treg = <0x0 0x40000>;\n" "+\t\t};\n" - "+\t\tpartition at 40000 {\n" + "+\t\tpartition@40000 {\n" "+\t\t\tlabel = \"linux kernel\";\n" "+\t\t\treg = <0x40000 0x1C0000>;\n" "+\t\t};\n" - "+\t\tpartition at 200000 {\n" + "+\t\tpartition@200000 {\n" "+\t\t\tlabel = \"root filesystem\";\n" "+\t\t\treg = <0x200000 0x800000>;\n" "+\t\t};\n" - "+\t\tpartition at a00000 {\n" + "+\t\tpartition@a00000 {\n" "+\t\t\tlabel = \"user filesystem\";\n" "+\t\t\treg = <0xa00000 0x600000>;\n" "+\t\t};\n" @@ -122,7 +132,7 @@ "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <0>;\n" "+\t\tpoll-interval = <500>;\n" - "+\t\tbutton at 25 {\n" + "+\t\tbutton@25 {\n" "+\t\t\tlabel = \"GPIO Reset\";\n" "+\t\t\tlinux,code = <116>;\n" "+\t\t\tgpios = <&gpio 25 1>;\n" @@ -145,7 +155,7 @@ "+&mdio0 {\n" "+\tstatus = \"okay\";\n" "+\n" - "+\tethphy0: ethernet-phy at 1 {\n" + "+\tethphy0: ethernet-phy@1 {\n" "+\t\tdevice_type = \"ethernet-phy\";\n" "+\t\tcompatible = \"moxa,moxart-rtl8201cp\", \"ethernet-phy-ieee802.3-c22\";\n" "+\t\treg = <1>;\n" @@ -155,7 +165,7 @@ "+&mdio1 {\n" "+\tstatus = \"okay\";\n" "+\n" - "+\tethphy1: ethernet-phy at 1 {\n" + "+\tethphy1: ethernet-phy@1 {\n" "+\t\tdevice_type = \"ethernet-phy\";\n" "+\t\tcompatible = \"moxa,moxart-rtl8201cp\", \"ethernet-phy-ieee802.3-c22\";\n" "+\t\treg = <1>;\n" @@ -197,7 +207,7 @@ "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <0>;\n" "+\n" - "+\t\tcpu at 0 {\n" + "+\t\tcpu@0 {\n" "+\t\t\tdevice_type = \"cpu\";\n" "+\t\t\tcompatible = \"faraday,fa526\";\n" "+\t\t\treg = <0>;\n" @@ -216,7 +226,7 @@ "+\t\treg = <0x90000000 0x10000000>;\n" "+\t\tranges;\n" "+\n" - "+\t\tintc: interrupt-controller at 98800000 {\n" + "+\t\tintc: interrupt-controller@98800000 {\n" "+\t\t\tcompatible = \"moxa,moxart-ic\";\n" "+\t\t\treg = <0x98800000 0x38>;\n" "+\t\t\tinterrupt-controller;\n" @@ -224,27 +234,27 @@ "+\t\t\tinterrupt-mask = <0x00080000>;\n" "+\t\t};\n" "+\n" - "+\t\tclk_pll: clk_pll at 98100000 {\n" + "+\t\tclk_pll: clk_pll@98100000 {\n" "+\t\t\tcompatible = \"moxa,moxart-pll-clock\";\n" "+\t\t\t#clock-cells = <0>;\n" "+\t\t\treg = <0x98100000 0x34>;\n" "+\t\t};\n" "+\n" - "+\t\tclk_apb: clk_apb at 98100000 {\n" + "+\t\tclk_apb: clk_apb@98100000 {\n" "+\t\t\tcompatible = \"moxa,moxart-apb-clock\";\n" "+\t\t\t#clock-cells = <0>;\n" "+\t\t\treg = <0x98100000 0x34>;\n" "+\t\t\tclocks = <&clk_pll>;\n" "+\t\t};\n" "+\n" - "+\t\ttimer: timer at 98400000 {\n" + "+\t\ttimer: timer@98400000 {\n" "+\t\t\tcompatible = \"moxa,moxart-timer\";\n" "+\t\t\treg = <0x98400000 0x42>;\n" "+\t\t\tinterrupts = <19 1>;\n" "+\t\t\tclocks = <&clk_apb>;\n" "+\t\t};\n" "+\n" - "+\t\tgpio: gpio at 98700000 {\n" + "+\t\tgpio: gpio@98700000 {\n" "+\t\t\tgpio-controller;\n" "+\t\t\t#gpio-cells = <2>;\n" "+\t\t\tcompatible = \"moxa,moxart-gpio\";\n" @@ -258,20 +268,20 @@ "+\t\t\tgpio-rtc-reset = <&gpio 7 0>;\n" "+\t\t};\n" "+\n" - "+\t\tdma: dma at 90500000 {\n" + "+\t\tdma: dma@90500000 {\n" "+\t\t\tcompatible = \"moxa,moxart-dma\";\n" "+\t\t\treg = <0x90500080 0x40>;\n" "+\t\t\tinterrupts = <24 0>;\n" "+\t\t\t#dma-cells = <1>;\n" "+\t\t};\n" "+\n" - "+\t\twatchdog: watchdog at 98500000 {\n" + "+\t\twatchdog: watchdog@98500000 {\n" "+\t\t\tcompatible = \"moxa,moxart-watchdog\";\n" "+\t\t\treg = <0x98500000 0x10>;\n" "+\t\t\tclocks = <&clk_apb>;\n" "+\t\t};\n" "+\n" - "+\t\tsdhci: sdhci at 98e00000 {\n" + "+\t\tsdhci: sdhci@98e00000 {\n" "+\t\t\tcompatible = \"moxa,moxart-sdhci\";\n" "+\t\t\treg = <0x98e00000 0x5C>;\n" "+\t\t\tinterrupts = <5 0>;\n" @@ -282,7 +292,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tmdio0: mdio at 90900090 {\n" + "+\t\tmdio0: mdio@90900090 {\n" "+\t\t\tcompatible = \"moxa,moxart-mdio\";\n" "+\t\t\treg = <0x90900090 0x8>;\n" "+\t\t\t#address-cells = <1>;\n" @@ -290,7 +300,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tmdio1: mdio at 92000090 {\n" + "+\t\tmdio1: mdio@92000090 {\n" "+\t\t\tcompatible = \"moxa,moxart-mdio\";\n" "+\t\t\treg = <0x92000090 0x8>;\n" "+\t\t\t#address-cells = <1>;\n" @@ -298,7 +308,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tmac0: mac at 90900000 {\n" + "+\t\tmac0: mac@90900000 {\n" "+\t\t\tcompatible = \"moxa,moxart-mac\";\n" "+\t\t\treg = <0x90900000 0x90>;\n" "+\t\t\tinterrupts = <25 0>;\n" @@ -307,7 +317,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tmac1: mac at 92000000 {\n" + "+\t\tmac1: mac@92000000 {\n" "+\t\t\tcompatible = \"moxa,moxart-mac\";\n" "+\t\t\treg = <0x92000000 0x90>;\n" "+\t\t\tinterrupts = <27 0>;\n" @@ -316,7 +326,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tuart0: uart at 98200000 {\n" + "+\t\tuart0: uart@98200000 {\n" "+\t\t\tcompatible = \"ns16550a\";\n" "+\t\t\treg = <0x98200000 0x20>;\n" "+\t\t\tinterrupts = <31 8>;\n" @@ -330,4 +340,4 @@ "-- \n" 1.8.2.1 -6e60d7232313450056a88287aa74d756e2ef9243a8a1112929fd598049554851 +f3987a9419fee517a2eed9c1c8d06d5d29869076b20a2a8612c1d2189e04ff96
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.