diff for duplicates of <m24lz0d5l5.fsf@baylibre.com> diff --git a/a/content_digest b/N1/content_digest index 0c3f019..09b2053 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "From\0khilman@baylibre.com (Kevin Hilman)\0" "Subject\0[PATCH 1/3] ARM64: dts: meson-gx: Finally move common nodes to GX dtsi\0" "Date\0Fri, 10 Mar 2017 16:23:18 -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" @@ -174,4 +174,4 @@ "> \tcompatible = \"amlogic,meson-gxl-vpu\", \"amlogic,meson-gx-vpu\";\n" > }; -78744a3bc440c0767d201d41265d8c3d4921f09c86383462629bfea07ebcd7ad +d27c351089179b4098a49feaed755cc32283b6c4e87c011a5f7c3bf1425d02ce
diff --git a/a/1.txt b/N2/1.txt index 61bc3a4..84d3df5 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -23,7 +23,7 @@ Kevin > status = "disabled"; > }; > -> + spifc: spi at 8c80 { +> + spifc: spi@8c80 { > + compatible = "amlogic,meson-gxbb-spifc"; > + reg = <0x0 0x08c80 0x0 0x80>; > + #address-cells = <1>; @@ -31,28 +31,28 @@ Kevin > + status = "disabled"; > + }; > + -> watchdog at 98d0 { +> watchdog@98d0 { > compatible = "amlogic,meson-gx-wdt", "amlogic,meson-gxbb-wdt"; > reg = <0x0 0x098d0 0x0 0x10>; > @@ -342,6 +350,13 @@ > #size-cells = <2>; > ranges = <0x0 0x0 0x0 0xc8100000 0x0 0x100000>; > -> + clkc_AO: clock-controller at 040 { +> + clkc_AO: clock-controller@040 { > + compatible = "amlogic,gx-aoclkc", "amlogic,gxbb-aoclkc"; > + reg = <0x0 0x00040 0x0 0x4>; > + #clock-cells = <1>; > + #reset-cells = <1>; > + }; > + -> uart_AO: serial at 4c0 { +> uart_AO: serial@4c0 { > compatible = "amlogic,meson-uart"; > reg = <0x0 0x004c0 0x0 0x14>; > @@ -358,6 +373,15 @@ > status = "disabled"; > }; > -> + i2c_AO: i2c at 500 { +> + i2c_AO: i2c@500 { > + compatible = "amlogic,meson-gx-i2c", "amlogic,meson-gxbb-i2c"; > + reg = <0x0 0x500 0x0 0x20>; > + interrupts = <GIC_SPI 195 IRQ_TYPE_EDGE_RISING>; @@ -61,7 +61,7 @@ Kevin > + status = "disabled"; > + }; > + -> pwm_AO_ab: pwm at 550 { +> pwm_AO_ab: pwm@550 { > compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm"; > reg = <0x0 0x00550 0x0 0x10>; > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -73,7 +73,7 @@ Kevin > }; > > -&cbus { -> - spifc: spi at 8c80 { +> - spifc: spi@8c80 { > - compatible = "amlogic,meson-gxbb-spifc"; > - reg = <0x0 0x08c80 0x0 0x80>; > - #address-cells = <1>; @@ -91,21 +91,21 @@ Kevin > }; > }; > - -> - clkc_AO: clock-controller at 040 { +> - clkc_AO: clock-controller@040 { > - compatible = "amlogic,gxbb-aoclkc"; > - reg = <0x0 0x00040 0x0 0x4>; > - #clock-cells = <1>; > - #reset-cells = <1>; > - }; > - -> - pwm_ab_AO: pwm at 550 { +> - pwm_ab_AO: pwm@550 { > - compatible = "amlogic,meson-gxbb-pwm"; > - reg = <0x0 0x0550 0x0 0x10>; > - #pwm-cells = <3>; > - status = "disabled"; > - }; > - -> - i2c_AO: i2c at 500 { +> - i2c_AO: i2c@500 { > - compatible = "amlogic,meson-gxbb-i2c"; > - reg = <0x0 0x500 0x0 0x20>; > - interrupts = <GIC_SPI 195 IRQ_TYPE_EDGE_RISING>; diff --git a/a/content_digest b/N2/content_digest index 0c3f019..a63e7ae 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-2-git-send-email-narmstrong@baylibre.com\0" - "From\0khilman@baylibre.com (Kevin Hilman)\0" - "Subject\0[PATCH 1/3] ARM64: dts: meson-gx: Finally move common nodes to GX dtsi\0" + "From\0Kevin Hilman <khilman@baylibre.com>\0" + "Subject\0Re: [PATCH 1/3] ARM64: dts: meson-gx: Finally move common nodes to GX dtsi\0" "Date\0Fri, 10 Mar 2017 16:23:18 -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" @@ -31,7 +36,7 @@ "> \t\t\t\tstatus = \"disabled\";\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\treg = <0x0 0x08c80 0x0 0x80>;\n" "> +\t\t\t\t#address-cells = <1>;\n" @@ -39,28 +44,28 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\twatchdog at 98d0 {\n" + "> \t\t\twatchdog@98d0 {\n" "> \t\t\t\tcompatible = \"amlogic,meson-gx-wdt\", \"amlogic,meson-gxbb-wdt\";\n" "> \t\t\t\treg = <0x0 0x098d0 0x0 0x10>;\n" "> @@ -342,6 +350,13 @@\n" "> \t\t\t#size-cells = <2>;\n" "> \t\t\tranges = <0x0 0x0 0x0 0xc8100000 0x0 0x100000>;\n" "> \n" - "> +\t\t\tclkc_AO: clock-controller at 040 {\n" + "> +\t\t\tclkc_AO: clock-controller@040 {\n" "> +\t\t\t\tcompatible = \"amlogic,gx-aoclkc\", \"amlogic,gxbb-aoclkc\";\n" "> +\t\t\t\treg = <0x0 0x00040 0x0 0x4>;\n" "> +\t\t\t\t#clock-cells = <1>;\n" "> +\t\t\t\t#reset-cells = <1>;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tuart_AO: serial at 4c0 {\n" + "> \t\t\tuart_AO: serial@4c0 {\n" "> \t\t\t\tcompatible = \"amlogic,meson-uart\";\n" "> \t\t\t\treg = <0x0 0x004c0 0x0 0x14>;\n" "> @@ -358,6 +373,15 @@\n" "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\ti2c_AO: i2c at 500 {\n" + "> +\t\t\ti2c_AO: i2c@500 {\n" "> +\t\t\t\tcompatible = \"amlogic,meson-gx-i2c\", \"amlogic,meson-gxbb-i2c\";\n" "> +\t\t\t\treg = <0x0 0x500 0x0 0x20>;\n" "> +\t\t\t\tinterrupts = <GIC_SPI 195 IRQ_TYPE_EDGE_RISING>;\n" @@ -69,7 +74,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tpwm_AO_ab: pwm at 550 {\n" + "> \t\t\tpwm_AO_ab: pwm@550 {\n" "> \t\t\t\tcompatible = \"amlogic,meson-gx-pwm\", \"amlogic,meson-gxbb-pwm\";\n" "> \t\t\t\treg = <0x0 0x00550 0x0 0x10>;\n" "> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi\n" @@ -81,7 +86,7 @@ "> };\n" "> \n" "> -&cbus {\n" - "> -\tspifc: spi at 8c80 {\n" + "> -\tspifc: spi@8c80 {\n" "> -\t\tcompatible = \"amlogic,meson-gxbb-spifc\";\n" "> -\t\treg = <0x0 0x08c80 0x0 0x80>;\n" "> -\t\t#address-cells = <1>;\n" @@ -99,21 +104,21 @@ "> \t\t};\n" "> \t};\n" "> -\n" - "> -\tclkc_AO: clock-controller at 040 {\n" + "> -\tclkc_AO: clock-controller@040 {\n" "> -\t\tcompatible = \"amlogic,gxbb-aoclkc\";\n" "> -\t\treg = <0x0 0x00040 0x0 0x4>;\n" "> -\t\t#clock-cells = <1>;\n" "> -\t\t#reset-cells = <1>;\n" "> -\t};\n" "> -\n" - "> -\tpwm_ab_AO: pwm at 550 {\n" + "> -\tpwm_ab_AO: pwm@550 {\n" "> -\t\tcompatible = \"amlogic,meson-gxbb-pwm\";\n" "> -\t\treg = <0x0 0x0550 0x0 0x10>;\n" "> -\t\t#pwm-cells = <3>;\n" "> -\t\tstatus = \"disabled\";\n" "> -\t};\n" "> -\n" - "> -\ti2c_AO: i2c at 500 {\n" + "> -\ti2c_AO: i2c@500 {\n" "> -\t\tcompatible = \"amlogic,meson-gxbb-i2c\";\n" "> -\t\treg = <0x0 0x500 0x0 0x20>;\n" "> -\t\tinterrupts = <GIC_SPI 195 IRQ_TYPE_EDGE_RISING>;\n" @@ -174,4 +179,4 @@ "> \tcompatible = \"amlogic,meson-gxl-vpu\", \"amlogic,meson-gx-vpu\";\n" > }; -78744a3bc440c0767d201d41265d8c3d4921f09c86383462629bfea07ebcd7ad +a0b1cf0a660cf0349f7491fcc088375c03aefab1b0650133d8275b8fa292d192
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.