diff for duplicates of <1468142645-4360-4-git-send-email-narmstrong@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index 8b8a997..c7d5413 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,28 +11,28 @@ index 806b903..2eacef0 100644 status = "disabled"; }; -+ pwm_ab: pwm at 8550 { ++ pwm_ab: pwm@8550 { + compatible = "amlogic,meson-gxbb-pwm"; + reg = <0x0 0x08550 0x0 0x10>; + #pwm-cells = <3>; + status = "disabled"; + }; + -+ pwm_cd: pwm at 8650 { ++ pwm_cd: pwm@8650 { + compatible = "amlogic,meson-gxbb-pwm"; + reg = <0x0 0x08650 0x0 0x10>; + #pwm-cells = <3>; + status = "disabled"; + }; + -+ pwm_ef: pwm at 86c0 { ++ pwm_ef: pwm@86c0 { + compatible = "amlogic,meson-gxbb-pwm"; + reg = <0x0 0x086c0 0x0 0x10>; + #pwm-cells = <3>; + status = "disabled"; + }; + - uart_C: serial at 8700 { + uart_C: serial@8700 { compatible = "amlogic,meson-uart"; reg = <0x0 0x8700 0x0 0x14>; @@ -212,6 +233,13 @@ @@ -40,7 +40,7 @@ index 806b903..2eacef0 100644 status = "disabled"; }; + -+ pwm_ab_AO: pwm at 550 { ++ pwm_ab_AO: pwm@550 { + compatible = "amlogic,meson-gxbb-pwm"; + reg = <0x0 0x0550 0x0 0x10>; + #pwm-cells = <3>; @@ -48,6 +48,6 @@ index 806b903..2eacef0 100644 + }; }; - periphs: periphs at c8834000 { + periphs: periphs@c8834000 { -- 2.7.0 diff --git a/a/content_digest b/N1/content_digest index 3acdf14..6948879 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,16 @@ "ref\01468142645-4360-1-git-send-email-narmstrong@baylibre.com\0" - "From\0narmstrong@baylibre.com (Neil Armstrong)\0" + "From\0Neil Armstrong <narmstrong@baylibre.com>\0" "Subject\0[PATCH v2 3/4] ARM64: dts: meson-gxbb: Add Meson GXBB PWM Controller nodes\0" "Date\0Sun, 10 Jul 2016 11:24:04 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0thierry.reding@gmail.com" + carlo@caione.org + " khilman@baylibre.com\0" + "Cc\0Neil Armstrong <narmstrong@baylibre.com>" + linux-pwm@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-amlogic@lists.infradead.org + linux-kernel@vger.kernel.org + " devicetree@vger.kernel.org\0" "\00:1\0" "b\0" "Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>\n" @@ -18,28 +26,28 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "+\t\t\tpwm_ab: pwm at 8550 {\n" + "+\t\t\tpwm_ab: pwm@8550 {\n" "+\t\t\t\tcompatible = \"amlogic,meson-gxbb-pwm\";\n" "+\t\t\t\treg = <0x0 0x08550 0x0 0x10>;\n" "+\t\t\t\t#pwm-cells = <3>;\n" "+\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tpwm_cd: pwm at 8650 {\n" + "+\t\t\tpwm_cd: pwm@8650 {\n" "+\t\t\t\tcompatible = \"amlogic,meson-gxbb-pwm\";\n" "+\t\t\t\treg = <0x0 0x08650 0x0 0x10>;\n" "+\t\t\t\t#pwm-cells = <3>;\n" "+\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tpwm_ef: pwm at 86c0 {\n" + "+\t\t\tpwm_ef: pwm@86c0 {\n" "+\t\t\t\tcompatible = \"amlogic,meson-gxbb-pwm\";\n" "+\t\t\t\treg = <0x0 0x086c0 0x0 0x10>;\n" "+\t\t\t\t#pwm-cells = <3>;\n" "+\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t};\n" "+\n" - " \t\t\tuart_C: serial at 8700 {\n" + " \t\t\tuart_C: serial@8700 {\n" " \t\t\t\tcompatible = \"amlogic,meson-uart\";\n" " \t\t\t\treg = <0x0 0x8700 0x0 0x14>;\n" "@@ -212,6 +233,13 @@\n" @@ -47,7 +55,7 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" "+\n" - "+\t\t\tpwm_ab_AO: pwm at 550 {\n" + "+\t\t\tpwm_ab_AO: pwm@550 {\n" "+\t\t\t\tcompatible = \"amlogic,meson-gxbb-pwm\";\n" "+\t\t\t\treg = <0x0 0x0550 0x0 0x10>;\n" "+\t\t\t\t#pwm-cells = <3>;\n" @@ -55,8 +63,8 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\tperiphs: periphs at c8834000 {\n" + " \t\tperiphs: periphs@c8834000 {\n" "-- \n" 2.7.0 -e76393331427f9d53edf71b2eaedfe4efd323087c822d143c4c2e8e0971142d1 +78769d0099ce71552a72de7db356ce3a4ea3f6814f0f0cf797ebfa0578d5abc4
diff --git a/a/content_digest b/N2/content_digest index 3acdf14..f06d1c6 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "From\0narmstrong@baylibre.com (Neil Armstrong)\0" "Subject\0[PATCH v2 3/4] ARM64: dts: meson-gxbb: Add Meson GXBB PWM Controller nodes\0" "Date\0Sun, 10 Jul 2016 11:24:04 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>\n" @@ -59,4 +59,4 @@ "-- \n" 2.7.0 -e76393331427f9d53edf71b2eaedfe4efd323087c822d143c4c2e8e0971142d1 +391ed6e739a5426ff21bbd55fa2220964796adae6633f89ae0967ffb0ef8765a
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.