diff for duplicates of <20130326141256.19958.260.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index 0b3f2e4..bd99ac3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,12 +25,12 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + bootargs = "console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp"; }; - memory@40000000 { + memory at 40000000 { device_type = "memory"; reg = <0x40000000 0x40000000>; }; + -+ ape6evm_fixed_3v3: fixedregulator@0 { ++ ape6evm_fixed_3v3: fixedregulator at 0 { + compatible = "regulator-fixed"; + regulator-name = "3V3"; + regulator-min-microvolt = <3300000>; @@ -38,7 +38,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + regulator-always-on; + }; + -+ ethernet@8000000 { ++ ethernet at 8000000 { + compatible = "smsc,lan9118", "smsc,lan9115"; + reg = <0x08000000 0x1000>; + interrupt-parent = <&irqc1>; diff --git a/a/content_digest b/N1/content_digest index 064f638..65d2677 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020130326141228.19958.93081.sendpatchset@w520\0" - "From\0Magnus Damm <magnus.damm@gmail.com>\0" + "From\0magnus.damm@gmail.com (Magnus Damm)\0" "Subject\0[PATCH 03/03 v2] ARM: shmobile: APE6EVM LAN9220 support\0" - "Date\0Tue, 26 Mar 2013 14:12:56 +0000\0" + "Date\0Tue, 26 Mar 2013 23:12:56 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -32,12 +32,12 @@ "+\t\tbootargs = \"console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp\";\n" " \t};\n" " \n" - " \tmemory@40000000 {\n" + " \tmemory at 40000000 {\n" " \t\tdevice_type = \"memory\";\n" " \t\treg = <0x40000000 0x40000000>;\n" " \t};\n" "+\n" - "+\tape6evm_fixed_3v3: fixedregulator@0 {\n" + "+\tape6evm_fixed_3v3: fixedregulator at 0 {\n" "+\t\tcompatible = \"regulator-fixed\";\n" "+\t\tregulator-name = \"3V3\";\n" "+\t\tregulator-min-microvolt = <3300000>;\n" @@ -45,7 +45,7 @@ "+\t\tregulator-always-on;\n" "+\t};\n" "+\n" - "+\tethernet@8000000 {\n" + "+\tethernet at 8000000 {\n" "+\t\tcompatible = \"smsc,lan9118\", \"smsc,lan9115\";\n" "+\t\treg = <0x08000000 0x1000>;\n" "+\t\tinterrupt-parent = <&irqc1>;\n" @@ -127,4 +127,4 @@ " \n" static const char *ape6evm_boards_compat_dt[] __initdata = { -618bbc3ed6ccc0499e34d6c48c157c49080e616672187121d160eca2ccc5589d +48ce013199f1834590167164a0bb9d39a2e6f3ed7b2d88203acbc2b1347efc44
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.