diff for duplicates of <m2zigsbqyy.fsf@baylibre.com> diff --git a/a/content_digest b/N1/content_digest index 964c15b..1d349b7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "From\0khilman@baylibre.com (Kevin Hilman)\0" "Subject\0[PATCH 3/3] ARM64: dts: meson-gx: Prepend GX generic compatible like other nodes\0" "Date\0Fri, 10 Mar 2017 16:24:21 -0800\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Neil Armstrong <narmstrong@baylibre.com> writes:\n" @@ -93,4 +93,4 @@ "> \t\t\t\tinterrupts = <GIC_SPI 196 IRQ_TYPE_EDGE_RISING>;\n" "> \t\t\t\tstatus = \"disabled\";" -30bc84168d96e881d5a2820e582fadcc45323a1ca22c3736d3268bb682db7b9c +def2c9dc162b734c556788d8fbd0618c4642586653e63f119aa0c1534a40f00e
diff --git a/a/1.txt b/N2/1.txt index 575ba63..9925817 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -18,7 +18,7 @@ Kevin > @@ -233,7 +233,7 @@ > }; > -> i2c_A: i2c at 8500 { +> i2c_A: i2c@8500 { > - compatible = "amlogic,meson-gxbb-i2c"; > + compatible = "amlogic,meson-gx-i2c", "amlogic,meson-gxbb-i2c"; > reg = <0x0 0x08500 0x0 0x20>; @@ -27,7 +27,7 @@ Kevin > @@ -279,7 +279,7 @@ > }; > -> i2c_B: i2c at 87c0 { +> i2c_B: i2c@87c0 { > - compatible = "amlogic,meson-gxbb-i2c"; > + compatible = "amlogic,meson-gx-i2c", "amlogic,meson-gxbb-i2c"; > reg = <0x0 0x087c0 0x0 0x20>; @@ -36,7 +36,7 @@ Kevin > @@ -288,7 +288,7 @@ > }; > -> i2c_C: i2c at 87e0 { +> i2c_C: i2c@87e0 { > - compatible = "amlogic,meson-gxbb-i2c"; > + compatible = "amlogic,meson-gx-i2c", "amlogic,meson-gxbb-i2c"; > reg = <0x0 0x087e0 0x0 0x20>; @@ -45,7 +45,7 @@ Kevin > @@ -297,7 +297,7 @@ > }; > -> spifc: spi at 8c80 { +> spifc: spi@8c80 { > - compatible = "amlogic,meson-gxbb-spifc"; > + compatible = "amlogic,meson-gx-spifc", "amlogic,meson-gxbb-spifc"; > reg = <0x0 0x08c80 0x0 0x80>; @@ -54,7 +54,7 @@ Kevin > @@ -325,7 +325,7 @@ > }; > -> sram: sram at c8000000 { +> sram: sram@c8000000 { > - compatible = "amlogic,meson-gxbb-sram", "mmio-sram"; > + compatible = "amlogic,meson-gx-sram", "amlogic,meson-gxbb-sram", "mmio-sram"; > reg = <0x0 0xc8000000 0x0 0x14000>; @@ -63,13 +63,13 @@ Kevin > @@ -333,12 +333,12 @@ > ranges = <0 0x0 0xc8000000 0x14000>; > -> cpu_scp_lpri: scp-shmem at 0 { +> cpu_scp_lpri: scp-shmem@0 { > - compatible = "amlogic,meson-gxbb-scp-shmem"; > + compatible = "amlogic,meson-gx-scp-shmem", "amlogic,meson-gxbb-scp-shmem"; > reg = <0x13000 0x400>; > }; > -> cpu_scp_hpri: scp-shmem at 200 { +> cpu_scp_hpri: scp-shmem@200 { > - compatible = "amlogic,meson-gxbb-scp-shmem"; > + compatible = "amlogic,meson-gx-scp-shmem", "amlogic,meson-gxbb-scp-shmem"; > reg = <0x13400 0x400>; @@ -78,7 +78,7 @@ Kevin > @@ -390,7 +390,7 @@ > }; > -> ir: ir at 580 { +> ir: ir@580 { > - compatible = "amlogic,meson-gxbb-ir"; > + compatible = "amlogic,meson-gx-ir", "amlogic,meson-gxbb-ir"; > reg = <0x0 0x00580 0x0 0x40>; diff --git a/a/content_digest b/N2/content_digest index 964c15b..77b2f30 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,14 @@ "ref\01489055948-10656-1-git-send-email-narmstrong@baylibre.com\0" "ref\01489055948-10656-4-git-send-email-narmstrong@baylibre.com\0" - "From\0khilman@baylibre.com (Kevin Hilman)\0" - "Subject\0[PATCH 3/3] ARM64: dts: meson-gx: Prepend GX generic compatible like other nodes\0" + "From\0Kevin Hilman <khilman@baylibre.com>\0" + "Subject\0Re: [PATCH 3/3] ARM64: dts: meson-gx: Prepend GX generic compatible like other nodes\0" "Date\0Fri, 10 Mar 2017 16:24:21 -0800\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0Neil Armstrong <narmstrong@baylibre.com>\0" + "Cc\0carlo@caione.org" + linux-amlogic@lists.infradead.org + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + " devicetree@vger.kernel.org\0" "\00:1\0" "b\0" "Neil Armstrong <narmstrong@baylibre.com> writes:\n" @@ -26,7 +31,7 @@ "> @@ -233,7 +233,7 @@\n" "> \t\t\t};\n" "> \n" - "> \t\t\ti2c_A: i2c at 8500 {\n" + "> \t\t\ti2c_A: i2c@8500 {\n" "> -\t\t\t\tcompatible = \"amlogic,meson-gxbb-i2c\";\n" "> +\t\t\t\tcompatible = \"amlogic,meson-gx-i2c\", \"amlogic,meson-gxbb-i2c\";\n" "> \t\t\t\treg = <0x0 0x08500 0x0 0x20>;\n" @@ -35,7 +40,7 @@ "> @@ -279,7 +279,7 @@\n" "> \t\t\t};\n" "> \n" - "> \t\t\ti2c_B: i2c at 87c0 {\n" + "> \t\t\ti2c_B: i2c@87c0 {\n" "> -\t\t\t\tcompatible = \"amlogic,meson-gxbb-i2c\";\n" "> +\t\t\t\tcompatible = \"amlogic,meson-gx-i2c\", \"amlogic,meson-gxbb-i2c\";\n" "> \t\t\t\treg = <0x0 0x087c0 0x0 0x20>;\n" @@ -44,7 +49,7 @@ "> @@ -288,7 +288,7 @@\n" "> \t\t\t};\n" "> \n" - "> \t\t\ti2c_C: i2c at 87e0 {\n" + "> \t\t\ti2c_C: i2c@87e0 {\n" "> -\t\t\t\tcompatible = \"amlogic,meson-gxbb-i2c\";\n" "> +\t\t\t\tcompatible = \"amlogic,meson-gx-i2c\", \"amlogic,meson-gxbb-i2c\";\n" "> \t\t\t\treg = <0x0 0x087e0 0x0 0x20>;\n" @@ -53,7 +58,7 @@ "> @@ -297,7 +297,7 @@\n" "> \t\t\t};\n" "> \n" - "> \t\t\tspifc: spi at 8c80 {\n" + "> \t\t\tspifc: spi@8c80 {\n" "> -\t\t\t\tcompatible = \"amlogic,meson-gxbb-spifc\";\n" "> +\t\t\t\tcompatible = \"amlogic,meson-gx-spifc\", \"amlogic,meson-gxbb-spifc\";\n" "> \t\t\t\treg = <0x0 0x08c80 0x0 0x80>;\n" @@ -62,7 +67,7 @@ "> @@ -325,7 +325,7 @@\n" "> \t\t};\n" "> \n" - "> \t\tsram: sram at c8000000 {\n" + "> \t\tsram: sram@c8000000 {\n" "> -\t\t\tcompatible = \"amlogic,meson-gxbb-sram\", \"mmio-sram\";\n" "> +\t\t\tcompatible = \"amlogic,meson-gx-sram\", \"amlogic,meson-gxbb-sram\", \"mmio-sram\";\n" "> \t\t\treg = <0x0 0xc8000000 0x0 0x14000>;\n" @@ -71,13 +76,13 @@ "> @@ -333,12 +333,12 @@\n" "> \t\t\tranges = <0 0x0 0xc8000000 0x14000>;\n" "> \n" - "> \t\t\tcpu_scp_lpri: scp-shmem at 0 {\n" + "> \t\t\tcpu_scp_lpri: scp-shmem@0 {\n" "> -\t\t\t\tcompatible = \"amlogic,meson-gxbb-scp-shmem\";\n" "> +\t\t\t\tcompatible = \"amlogic,meson-gx-scp-shmem\", \"amlogic,meson-gxbb-scp-shmem\";\n" "> \t\t\t\treg = <0x13000 0x400>;\n" "> \t\t\t};\n" "> \n" - "> \t\t\tcpu_scp_hpri: scp-shmem at 200 {\n" + "> \t\t\tcpu_scp_hpri: scp-shmem@200 {\n" "> -\t\t\t\tcompatible = \"amlogic,meson-gxbb-scp-shmem\";\n" "> +\t\t\t\tcompatible = \"amlogic,meson-gx-scp-shmem\", \"amlogic,meson-gxbb-scp-shmem\";\n" "> \t\t\t\treg = <0x13400 0x400>;\n" @@ -86,11 +91,11 @@ "> @@ -390,7 +390,7 @@\n" "> \t\t\t};\n" "> \n" - "> \t\t\tir: ir at 580 {\n" + "> \t\t\tir: ir@580 {\n" "> -\t\t\t\tcompatible = \"amlogic,meson-gxbb-ir\";\n" "> +\t\t\t\tcompatible = \"amlogic,meson-gx-ir\", \"amlogic,meson-gxbb-ir\";\n" "> \t\t\t\treg = <0x0 0x00580 0x0 0x40>;\n" "> \t\t\t\tinterrupts = <GIC_SPI 196 IRQ_TYPE_EDGE_RISING>;\n" "> \t\t\t\tstatus = \"disabled\";" -30bc84168d96e881d5a2820e582fadcc45323a1ca22c3736d3268bb682db7b9c +d5a07592a7fcac4e0ec185aa7bcb78ed13fbc8e543fba701dd00111eb701dbab
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.