diff for duplicates of <53D8D6EF.8010503@suse.de> diff --git a/a/1.txt b/N1/1.txt index 207ddd2..3d19510 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -65,8 +65,8 @@ Am 30.07.2014 10:07, schrieb Thomas Abraham: > #address-cells = <1>; > #size-cells = <0>; > -> - cpu@900 { -> + cpu0: cpu@900 { +> - cpu at 900 { +> + cpu0: cpu at 900 { > device_type = "cpu"; > compatible = "arm,cortex-a9"; > reg = <0x900>; @@ -87,7 +87,7 @@ Nit: Here you left-align the columns ... > + >; > }; > -> cpu@901 { +> cpu at 901 { > diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts > index d0de1f5..3b12a97 100644 > --- a/arch/arm/boot/dts/exynos5250-arndale.dts @@ -133,8 +133,8 @@ Nit: Here you left-align the columns ... > #address-cells = <1>; > #size-cells = <0>; > -> - cpu@0 { -> + cpu0: cpu@0 { +> - cpu at 0 { +> + cpu0: cpu at 0 { > device_type = "cpu"; > compatible = "arm,cortex-a15"; > reg = <0>; @@ -166,7 +166,7 @@ Nit: Here you left-align the columns ... > + >; > }; -> cpu@1 { +> cpu at 1 { > device_type = "cpu"; > diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi > index cb2b70e..3154b4c 100644 @@ -201,7 +201,7 @@ Nit: Here you left-align the columns ... > + >; > }; > -> cpu1: cpu@1 { +> cpu1: cpu at 1 { > @@ -69,6 +87,7 @@ > reg = <0x1>; > clock-frequency = <1800000000>; @@ -209,7 +209,7 @@ Nit: Here you left-align the columns ... > + clock-latency = <140000>; > }; > -> cpu2: cpu@2 { +> cpu2: cpu at 2 { > @@ -77,6 +96,7 @@ > reg = <0x2>; > clock-frequency = <1800000000>; @@ -217,7 +217,7 @@ Nit: Here you left-align the columns ... > + clock-latency = <140000>; > }; > -> cpu3: cpu@3 { +> cpu3: cpu at 3 { > @@ -85,14 +105,29 @@ > reg = <0x3>; > clock-frequency = <1800000000>; @@ -225,7 +225,7 @@ Nit: Here you left-align the columns ... > + clock-latency = <140000>; > }; > -> cpu4: cpu@100 { +> cpu4: cpu at 100 { > device_type = "cpu"; > compatible = "arm,cortex-a7"; > reg = <0x100>; @@ -250,7 +250,7 @@ Dito. > + >; > }; > -> cpu5: cpu@101 { +> cpu5: cpu at 101 { > @@ -101,6 +136,7 @@ > reg = <0x101>; > clock-frequency = <1000000000>; @@ -258,7 +258,7 @@ Dito. > + clock-latency = <140000>; > }; > -> cpu6: cpu@102 { +> cpu6: cpu at 102 { > @@ -109,6 +145,7 @@ > reg = <0x102>; > clock-frequency = <1000000000>; @@ -266,7 +266,7 @@ Dito. > + clock-latency = <140000>; > }; > -> cpu7: cpu@103 { +> cpu7: cpu at 103 { > @@ -117,6 +154,7 @@ > reg = <0x103>; > clock-frequency = <1000000000>; @@ -279,12 +279,12 @@ Dito. Since I don't really care which template you choose and can't judge most numbers, FWIW -Reviewed-by: Andreas Färber <afaerber@suse.de> +Reviewed-by: Andreas F?rber <afaerber@suse.de> Thanks for resolving the conflict, Andreas -- -SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany -GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg +SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany +GF: Jeff Hawn, Jennifer Guild, Felix Imend?rffer; HRB 16746 AG N?rnberg diff --git a/a/content_digest b/N1/content_digest index d74b543..fe83555 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,22 +1,9 @@ "ref\01406707663-16656-1-git-send-email-thomas.ab@samsung.com\0" "ref\01406707663-16656-4-git-send-email-thomas.ab@samsung.com\0" - "From\0Andreas F\303\244rber <afaerber@suse.de>\0" - "Subject\0Re: [PATCH v9 3/6] ARM: dts: Exynos: add CPU OPP and regulator supply property\0" + "From\0afaerber@suse.de (Andreas F\303\244rber)\0" + "Subject\0[PATCH v9 3/6] ARM: dts: Exynos: add CPU OPP and regulator supply property\0" "Date\0Wed, 30 Jul 2014 13:28:47 +0200\0" - "To\0Thomas Abraham <thomas.ab@samsung.com>" - linux-pm@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" - "Cc\0linux-samsung-soc@vger.kernel.org" - mturquette@linaro.org - kgene.kim@samsung.com - t.figa@samsung.com - l.majewski@samsung.com - viresh.kumar@linaro.org - heiko@sntech.de - cw00.choi@samsung.com - Doug Anderson <dianders@chromium.org> - Javier Martinez Canillas <javier.martinez@collabora.co.uk> - " Sachin Kamat <sachin.kamat@linaro.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Am 30.07.2014 10:07, schrieb Thomas Abraham:\n" @@ -86,8 +73,8 @@ "> \t\t#address-cells = <1>;\n" "> \t\t#size-cells = <0>;\n" "> \n" - "> -\t\tcpu@900 {\n" - "> +\t\tcpu0: cpu@900 {\n" + "> -\t\tcpu at 900 {\n" + "> +\t\tcpu0: cpu at 900 {\n" "> \t\t\tdevice_type = \"cpu\";\n" "> \t\t\tcompatible = \"arm,cortex-a9\";\n" "> \t\t\treg = <0x900>;\n" @@ -108,7 +95,7 @@ "> +\t\t\t>;\n" "> \t\t};\n" "> \n" - "> \t\tcpu@901 {\n" + "> \t\tcpu at 901 {\n" "> diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts\n" "> index d0de1f5..3b12a97 100644\n" "> --- a/arch/arm/boot/dts/exynos5250-arndale.dts\n" @@ -154,8 +141,8 @@ "> \t\t#address-cells = <1>;\n" "> \t\t#size-cells = <0>;\n" "> \n" - "> -\t\tcpu@0 {\n" - "> +\t\tcpu0: cpu@0 {\n" + "> -\t\tcpu at 0 {\n" + "> +\t\tcpu0: cpu at 0 {\n" "> \t\t\tdevice_type = \"cpu\";\n" "> \t\t\tcompatible = \"arm,cortex-a15\";\n" "> \t\t\treg = <0>;\n" @@ -187,7 +174,7 @@ "\n" "> +\t\t\t>;\n" "> \t\t};\n" - "> \t\tcpu@1 {\n" + "> \t\tcpu at 1 {\n" "> \t\t\tdevice_type = \"cpu\";\n" "> diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi\n" "> index cb2b70e..3154b4c 100644\n" @@ -222,7 +209,7 @@ "> +\t\t\t>;\n" "> \t\t};\n" "> \n" - "> \t\tcpu1: cpu@1 {\n" + "> \t\tcpu1: cpu at 1 {\n" "> @@ -69,6 +87,7 @@\n" "> \t\t\treg = <0x1>;\n" "> \t\t\tclock-frequency = <1800000000>;\n" @@ -230,7 +217,7 @@ "> +\t\t\tclock-latency = <140000>;\n" "> \t\t};\n" "> \n" - "> \t\tcpu2: cpu@2 {\n" + "> \t\tcpu2: cpu at 2 {\n" "> @@ -77,6 +96,7 @@\n" "> \t\t\treg = <0x2>;\n" "> \t\t\tclock-frequency = <1800000000>;\n" @@ -238,7 +225,7 @@ "> +\t\t\tclock-latency = <140000>;\n" "> \t\t};\n" "> \n" - "> \t\tcpu3: cpu@3 {\n" + "> \t\tcpu3: cpu at 3 {\n" "> @@ -85,14 +105,29 @@\n" "> \t\t\treg = <0x3>;\n" "> \t\t\tclock-frequency = <1800000000>;\n" @@ -246,7 +233,7 @@ "> +\t\t\tclock-latency = <140000>;\n" "> \t\t};\n" "> \n" - "> \t\tcpu4: cpu@100 {\n" + "> \t\tcpu4: cpu at 100 {\n" "> \t\t\tdevice_type = \"cpu\";\n" "> \t\t\tcompatible = \"arm,cortex-a7\";\n" "> \t\t\treg = <0x100>;\n" @@ -271,7 +258,7 @@ "> +\t\t\t>;\n" "> \t\t};\n" "> \n" - "> \t\tcpu5: cpu@101 {\n" + "> \t\tcpu5: cpu at 101 {\n" "> @@ -101,6 +136,7 @@\n" "> \t\t\treg = <0x101>;\n" "> \t\t\tclock-frequency = <1000000000>;\n" @@ -279,7 +266,7 @@ "> +\t\t\tclock-latency = <140000>;\n" "> \t\t};\n" "> \n" - "> \t\tcpu6: cpu@102 {\n" + "> \t\tcpu6: cpu at 102 {\n" "> @@ -109,6 +145,7 @@\n" "> \t\t\treg = <0x102>;\n" "> \t\t\tclock-frequency = <1000000000>;\n" @@ -287,7 +274,7 @@ "> +\t\t\tclock-latency = <140000>;\n" "> \t\t};\n" "> \n" - "> \t\tcpu7: cpu@103 {\n" + "> \t\tcpu7: cpu at 103 {\n" "> @@ -117,6 +154,7 @@\n" "> \t\t\treg = <0x103>;\n" "> \t\t\tclock-frequency = <1000000000>;\n" @@ -300,14 +287,14 @@ "Since I don't really care which template you choose and can't judge most\n" "numbers, FWIW\n" "\n" - "Reviewed-by: Andreas F\303\244rber <afaerber@suse.de>\n" + "Reviewed-by: Andreas F?rber <afaerber@suse.de>\n" "\n" "Thanks for resolving the conflict,\n" "\n" "Andreas\n" "\n" "-- \n" - "SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N\303\274rnberg, Germany\n" - "GF: Jeff Hawn, Jennifer Guild, Felix Imend\303\266rffer; HRB 16746 AG N\303\274rnberg" + "SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany\n" + GF: Jeff Hawn, Jennifer Guild, Felix Imend?rffer; HRB 16746 AG N?rnberg -01435eceae92417bde6df576de46d228a850325b8683cf3a092cbc31f15f5911 +4b838f48c2043350d3102921211c91627106efd5903b1a6f30dcf2261ca8aac3
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.