diff for duplicates of <1497260414.3086.9.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index 236e10d..c2d9077 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,10 +12,10 @@ Looks Good Acked-by: Jerome Brunet <jbrunet@baylibre.com> > --- -> ?arch/arm64/boot/dts/amlogic/meson-gx.dtsi???| 12 +++++------- -> ?arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 25 +++++++++++++++++++++++++ -> ?arch/arm64/boot/dts/amlogic/meson-gxl.dtsi??| 25 +++++++++++++++++++++++++ -> ?3 files changed, 55 insertions(+), 7 deletions(-) +> arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 12 +++++------- +> arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 25 +++++++++++++++++++++++++ +> arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 25 +++++++++++++++++++++++++ +> 3 files changed, 55 insertions(+), 7 deletions(-) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi > b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -23,69 +23,69 @@ Acked-by: Jerome Brunet <jbrunet@baylibre.com> > --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi > @@ -225,7 +225,7 @@ -> ? }; -> ? -> ? uart_A: serial at 84c0 { +> }; +> +> uart_A: serial@84c0 { > - compatible = "amlogic,meson-uart"; > + compatible = "amlogic,meson-gx-uart"; -> ? reg = <0x0 0x84c0 0x0 0x14>; -> ? interrupts = <GIC_SPI 26 +> reg = <0x0 0x84c0 0x0 0x14>; +> interrupts = <GIC_SPI 26 > IRQ_TYPE_EDGE_RISING>; -> ? clocks = <&xtal>; +> clocks = <&xtal>; > @@ -233,7 +233,7 @@ -> ? }; -> ? -> ? uart_B: serial at 84dc { +> }; +> +> uart_B: serial@84dc { > - compatible = "amlogic,meson-uart"; > + compatible = "amlogic,meson-gx-uart"; -> ? reg = <0x0 0x84dc 0x0 0x14>; -> ? interrupts = <GIC_SPI 75 +> reg = <0x0 0x84dc 0x0 0x14>; +> interrupts = <GIC_SPI 75 > IRQ_TYPE_EDGE_RISING>; -> ? clocks = <&xtal>; +> clocks = <&xtal>; > @@ -279,7 +279,7 @@ -> ? }; -> ? -> ? uart_C: serial at 8700 { +> }; +> +> uart_C: serial@8700 { > - compatible = "amlogic,meson-uart"; > + compatible = "amlogic,meson-gx-uart"; -> ? reg = <0x0 0x8700 0x0 0x14>; -> ? interrupts = <GIC_SPI 93 +> reg = <0x0 0x8700 0x0 0x14>; +> interrupts = <GIC_SPI 93 > IRQ_TYPE_EDGE_RISING>; -> ? clocks = <&xtal>; +> clocks = <&xtal>; > @@ -366,18 +366,16 @@ -> ? }; -> ? -> ? uart_AO: serial at 4c0 { +> }; +> +> uart_AO: serial@4c0 { > - compatible = "amlogic,meson-uart"; > + compatible = "amlogic,meson-gx-uart", > "amlogic,meson-ao-uart"; -> ? reg = <0x0 0x004c0 0x0 0x14>; -> ? interrupts = <GIC_SPI 193 +> reg = <0x0 0x004c0 0x0 0x14>; +> interrupts = <GIC_SPI 193 > IRQ_TYPE_EDGE_RISING>; > - clocks = <&xtal>; -> ? status = "disabled"; -> ? }; -> ? -> ? uart_AO_B: serial at 4e0 { +> status = "disabled"; +> }; +> +> uart_AO_B: serial@4e0 { > - compatible = "amlogic,meson-uart"; > + compatible = "amlogic,meson-gx-uart", > "amlogic,meson-ao-uart"; -> ? reg = <0x0 0x004e0 0x0 0x14>; -> ? interrupts = <GIC_SPI 197 +> reg = <0x0 0x004e0 0x0 0x14>; +> interrupts = <GIC_SPI 197 > IRQ_TYPE_EDGE_RISING>; > - clocks = <&xtal>; -> ? status = "disabled"; -> ? }; -> ? +> status = "disabled"; +> }; +> > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > index dbd300f..1ae8da7 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > @@ -675,6 +675,31 @@ -> ? clocks = <&clkc CLKID_SPI>; -> ?}; -> ? +> clocks = <&clkc CLKID_SPI>; +> }; +> > +&uart_A { > + clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>; > + clock-names = "xtal", "pclk", "baud"; @@ -111,18 +111,18 @@ Acked-by: Jerome Brunet <jbrunet@baylibre.com> > + clock-names = "xtal", "core", "baud"; > +}; > + -> ?&vpu { -> ? compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu"; -> ?}; +> &vpu { +> compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu"; +> }; > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi > b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi > index 4dfc22b..0c601f8 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi > @@ -616,6 +616,31 @@ -> ? clocks = <&clkc CLKID_SPI>; -> ?}; -> ? +> clocks = <&clkc CLKID_SPI>; +> }; +> > +&uart_A { > + clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>; > + clock-names = "xtal", "core", "baud"; @@ -148,6 +148,6 @@ Acked-by: Jerome Brunet <jbrunet@baylibre.com> > + clock-names = "xtal", "core", "baud"; > +}; > + -> ?&vpu { -> ? compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu"; -> ?}; +> &vpu { +> compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu"; +> }; diff --git a/a/content_digest b/N1/content_digest index 31192f2..781d84d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,17 @@ "ref\01497001756-942-1-git-send-email-narmstrong@baylibre.com\0" "ref\01497001756-942-4-git-send-email-narmstrong@baylibre.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH v4 3/7] ARM64: dts: meson-gx: use stable UART bindings with correct gate clock\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH v4 3/7] ARM64: dts: meson-gx: use stable UART bindings with correct gate clock\0" "Date\0Mon, 12 Jun 2017 11:40:14 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0Neil Armstrong <narmstrong@baylibre.com>" + gregkh@linuxfoundation.org + " khilman@baylibre.com\0" + "Cc\0Helmut Klein <hgkr.klein@gmail.com>" + linux-serial@vger.kernel.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" "On Fri, 2017-06-09 at 11:49 +0200, Neil Armstrong wrote:\n" @@ -20,10 +28,10 @@ "Acked-by: Jerome Brunet <jbrunet@baylibre.com>\n" "\n" "> ---\n" - "> ?arch/arm64/boot/dts/amlogic/meson-gx.dtsi???| 12 +++++-------\n" - "> ?arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 25 +++++++++++++++++++++++++\n" - "> ?arch/arm64/boot/dts/amlogic/meson-gxl.dtsi??| 25 +++++++++++++++++++++++++\n" - "> ?3 files changed, 55 insertions(+), 7 deletions(-)\n" + "> \302\240arch/arm64/boot/dts/amlogic/meson-gx.dtsi\302\240\302\240\302\240| 12 +++++-------\n" + "> \302\240arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 25 +++++++++++++++++++++++++\n" + "> \302\240arch/arm64/boot/dts/amlogic/meson-gxl.dtsi\302\240\302\240| 25 +++++++++++++++++++++++++\n" + "> \302\2403 files changed, 55 insertions(+), 7 deletions(-)\n" "> \n" "> diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi\n" "> b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi\n" @@ -31,69 +39,69 @@ "> --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi\n" "> +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi\n" "> @@ -225,7 +225,7 @@\n" - "> ?\t\t\t};\n" - "> ?\n" - "> ?\t\t\tuart_A: serial at 84c0 {\n" + "> \302\240\t\t\t};\n" + "> \302\240\n" + "> \302\240\t\t\tuart_A: serial@84c0 {\n" "> -\t\t\t\tcompatible = \"amlogic,meson-uart\";\n" "> +\t\t\t\tcompatible = \"amlogic,meson-gx-uart\";\n" - "> ?\t\t\t\treg = <0x0 0x84c0 0x0 0x14>;\n" - "> ?\t\t\t\tinterrupts = <GIC_SPI 26\n" + "> \302\240\t\t\t\treg = <0x0 0x84c0 0x0 0x14>;\n" + "> \302\240\t\t\t\tinterrupts = <GIC_SPI 26\n" "> IRQ_TYPE_EDGE_RISING>;\n" - "> ?\t\t\t\tclocks = <&xtal>;\n" + "> \302\240\t\t\t\tclocks = <&xtal>;\n" "> @@ -233,7 +233,7 @@\n" - "> ?\t\t\t};\n" - "> ?\n" - "> ?\t\t\tuart_B: serial at 84dc {\n" + "> \302\240\t\t\t};\n" + "> \302\240\n" + "> \302\240\t\t\tuart_B: serial@84dc {\n" "> -\t\t\t\tcompatible = \"amlogic,meson-uart\";\n" "> +\t\t\t\tcompatible = \"amlogic,meson-gx-uart\";\n" - "> ?\t\t\t\treg = <0x0 0x84dc 0x0 0x14>;\n" - "> ?\t\t\t\tinterrupts = <GIC_SPI 75\n" + "> \302\240\t\t\t\treg = <0x0 0x84dc 0x0 0x14>;\n" + "> \302\240\t\t\t\tinterrupts = <GIC_SPI 75\n" "> IRQ_TYPE_EDGE_RISING>;\n" - "> ?\t\t\t\tclocks = <&xtal>;\n" + "> \302\240\t\t\t\tclocks = <&xtal>;\n" "> @@ -279,7 +279,7 @@\n" - "> ?\t\t\t};\n" - "> ?\n" - "> ?\t\t\tuart_C: serial at 8700 {\n" + "> \302\240\t\t\t};\n" + "> \302\240\n" + "> \302\240\t\t\tuart_C: serial@8700 {\n" "> -\t\t\t\tcompatible = \"amlogic,meson-uart\";\n" "> +\t\t\t\tcompatible = \"amlogic,meson-gx-uart\";\n" - "> ?\t\t\t\treg = <0x0 0x8700 0x0 0x14>;\n" - "> ?\t\t\t\tinterrupts = <GIC_SPI 93\n" + "> \302\240\t\t\t\treg = <0x0 0x8700 0x0 0x14>;\n" + "> \302\240\t\t\t\tinterrupts = <GIC_SPI 93\n" "> IRQ_TYPE_EDGE_RISING>;\n" - "> ?\t\t\t\tclocks = <&xtal>;\n" + "> \302\240\t\t\t\tclocks = <&xtal>;\n" "> @@ -366,18 +366,16 @@\n" - "> ?\t\t\t};\n" - "> ?\n" - "> ?\t\t\tuart_AO: serial at 4c0 {\n" + "> \302\240\t\t\t};\n" + "> \302\240\n" + "> \302\240\t\t\tuart_AO: serial@4c0 {\n" "> -\t\t\t\tcompatible = \"amlogic,meson-uart\";\n" "> +\t\t\t\tcompatible = \"amlogic,meson-gx-uart\",\n" "> \"amlogic,meson-ao-uart\";\n" - "> ?\t\t\t\treg = <0x0 0x004c0 0x0 0x14>;\n" - "> ?\t\t\t\tinterrupts = <GIC_SPI 193\n" + "> \302\240\t\t\t\treg = <0x0 0x004c0 0x0 0x14>;\n" + "> \302\240\t\t\t\tinterrupts = <GIC_SPI 193\n" "> IRQ_TYPE_EDGE_RISING>;\n" "> -\t\t\t\tclocks = <&xtal>;\n" - "> ?\t\t\t\tstatus = \"disabled\";\n" - "> ?\t\t\t};\n" - "> ?\n" - "> ?\t\t\tuart_AO_B: serial at 4e0 {\n" + "> \302\240\t\t\t\tstatus = \"disabled\";\n" + "> \302\240\t\t\t};\n" + "> \302\240\n" + "> \302\240\t\t\tuart_AO_B: serial@4e0 {\n" "> -\t\t\t\tcompatible = \"amlogic,meson-uart\";\n" "> +\t\t\t\tcompatible = \"amlogic,meson-gx-uart\",\n" "> \"amlogic,meson-ao-uart\";\n" - "> ?\t\t\t\treg = <0x0 0x004e0 0x0 0x14>;\n" - "> ?\t\t\t\tinterrupts = <GIC_SPI 197\n" + "> \302\240\t\t\t\treg = <0x0 0x004e0 0x0 0x14>;\n" + "> \302\240\t\t\t\tinterrupts = <GIC_SPI 197\n" "> IRQ_TYPE_EDGE_RISING>;\n" "> -\t\t\t\tclocks = <&xtal>;\n" - "> ?\t\t\t\tstatus = \"disabled\";\n" - "> ?\t\t\t};\n" - "> ?\n" + "> \302\240\t\t\t\tstatus = \"disabled\";\n" + "> \302\240\t\t\t};\n" + "> \302\240\n" "> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi\n" "> b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi\n" "> index dbd300f..1ae8da7 100644\n" "> --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi\n" "> +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi\n" "> @@ -675,6 +675,31 @@\n" - "> ?\tclocks = <&clkc CLKID_SPI>;\n" - "> ?};\n" - "> ?\n" + "> \302\240\tclocks = <&clkc CLKID_SPI>;\n" + "> \302\240};\n" + "> \302\240\n" "> +&uart_A {\n" "> +\tclocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>;\n" "> +\tclock-names = \"xtal\", \"pclk\", \"baud\";\n" @@ -119,18 +127,18 @@ "> +\tclock-names = \"xtal\", \"core\", \"baud\";\n" "> +};\n" "> +\n" - "> ?&vpu {\n" - "> ?\tcompatible = \"amlogic,meson-gxbb-vpu\", \"amlogic,meson-gx-vpu\";\n" - "> ?};\n" + "> \302\240&vpu {\n" + "> \302\240\tcompatible = \"amlogic,meson-gxbb-vpu\", \"amlogic,meson-gx-vpu\";\n" + "> \302\240};\n" "> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi\n" "> b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi\n" "> index 4dfc22b..0c601f8 100644\n" "> --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi\n" "> +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi\n" "> @@ -616,6 +616,31 @@\n" - "> ?\tclocks = <&clkc CLKID_SPI>;\n" - "> ?};\n" - "> ?\n" + "> \302\240\tclocks = <&clkc CLKID_SPI>;\n" + "> \302\240};\n" + "> \302\240\n" "> +&uart_A {\n" "> +\tclocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>;\n" "> +\tclock-names = \"xtal\", \"core\", \"baud\";\n" @@ -156,8 +164,8 @@ "> +\tclock-names = \"xtal\", \"core\", \"baud\";\n" "> +};\n" "> +\n" - "> ?&vpu {\n" - "> ?\tcompatible = \"amlogic,meson-gxl-vpu\", \"amlogic,meson-gx-vpu\";\n" - > ?}; + "> \302\240&vpu {\n" + "> \302\240\tcompatible = \"amlogic,meson-gxl-vpu\", \"amlogic,meson-gx-vpu\";\n" + "> \302\240};" -bce24cd0b746b23c0aa8b999860fb342799b0dbcb9ce9e32b29556c17c03e41d +ec0f4bdffa10295367cabbec8043d979982dc9177010ec52cd025bc4621ed2cb
diff --git a/a/content_digest b/N2/content_digest index 31192f2..3c531d3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,7 @@ "From\0jbrunet@baylibre.com (Jerome Brunet)\0" "Subject\0[PATCH v4 3/7] ARM64: dts: meson-gx: use stable UART bindings with correct gate clock\0" "Date\0Mon, 12 Jun 2017 11:40:14 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Fri, 2017-06-09 at 11:49 +0200, Neil Armstrong wrote:\n" @@ -160,4 +160,4 @@ "> ?\tcompatible = \"amlogic,meson-gxl-vpu\", \"amlogic,meson-gx-vpu\";\n" > ?}; -bce24cd0b746b23c0aa8b999860fb342799b0dbcb9ce9e32b29556c17c03e41d +3d54cddf7849f2a300cbf343262a3b266f400144aa70c586031868996aed4fc4
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.