On Wed, Dec 28, 2016 at 12:12:47PM +0100, Marek Szyprowski wrote: > There are no Exynos4212 based boards in mainline, so there is no need to > keep additional files for SoCs, which are never used. This patch removes > support for Exynos4212 SoCs and moves previously shared Exynos4412 > definitions to a single file to simplify future maintenance. > > Signed-off-by: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> If resend will happen, then in subject: s/dst/dts/ > --- > arch/arm/boot/dts/exynos4212.dtsi | 133 ---- > arch/arm/boot/dts/exynos4412-pinctrl.dtsi | 993 ++++++++++++++++++++++++++++++ > arch/arm/boot/dts/exynos4412.dtsi | 578 ++++++++++++++++- > arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 984 ----------------------------- Change around pinctrl looks like rename. Please format the patch with apropriate -M (and if needed -B) so no one would have to review the same code. Actually -B should not be needed. It is weird that rename was not detected here. > arch/arm/boot/dts/exynos4x12.dtsi | 594 ------------------ > 5 files changed, 1567 insertions(+), 1715 deletions(-) > delete mode 100644 arch/arm/boot/dts/exynos4212.dtsi > create mode 100644 arch/arm/boot/dts/exynos4412-pinctrl.dtsi > delete mode 100644 arch/arm/boot/dts/exynos4x12-pinctrl.dtsi > delete mode 100644 arch/arm/boot/dts/exynos4x12.dtsi > > diff --git a/arch/arm/boot/dts/exynos4212.dtsi b/arch/arm/boot/dts/exynos4212.dtsi > deleted file mode 100644 > index 538901123d37..000000000000 > --- a/arch/arm/boot/dts/exynos4212.dtsi > +++ /dev/null > @@ -1,133 +0,0 @@ > -/* > - * Samsung's Exynos4212 SoC device tree source > - * > - * Copyright (c) 2012 Samsung Electronics Co., Ltd. > - * http://www.samsung.com > - * > - * Samsung's Exynos4212 SoC device nodes are listed in this file. Exynos4212 > - * based board files can include this file and provide values for board specfic > - * bindings. > - * > - * Note: This file does not include device nodes for all the controllers in > - * Exynos4212 SoC. As device tree coverage for Exynos4212 increases, additional > - * nodes can be added to this file. > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation. > -*/ > - > -#include "exynos4x12.dtsi" > - > -/ { > - compatible = "samsung,exynos4212", "samsung,exynos4"; > - > - cpus { > - #address-cells = <1>; > - #size-cells = <0>; > - > - cpu0: cpu@A00 { > - device_type = "cpu"; > - compatible = "arm,cortex-a9"; > - reg = <0xA00>; > - clocks = <&clock CLK_ARM_CLK>; > - clock-names = "cpu"; > - operating-points-v2 = <&cpu0_opp_table>; > - cooling-min-level = <13>; > - cooling-max-level = <7>; > - #cooling-cells = <2>; /* min followed by max */ > - }; > - > - cpu@A01 { > - device_type = "cpu"; > - compatible = "arm,cortex-a9"; > - reg = <0xA01>; > - operating-points-v2 = <&cpu0_opp_table>; > - }; > - }; > - > - cpu0_opp_table: opp_table0 { > - compatible = "operating-points-v2"; > - opp-shared; > - > - opp00 { > - opp-hz = /bits/ 64 <200000000>; > - opp-microvolt = <900000>; > - clock-latency-ns = <200000>; > - }; > - opp01 { > - opp-hz = /bits/ 64 <300000000>; > - opp-microvolt = <900000>; > - clock-latency-ns = <200000>; > - }; > - opp02 { > - opp-hz = /bits/ 64 <400000000>; > - opp-microvolt = <925000>; > - clock-latency-ns = <200000>; > - }; > - opp03 { > - opp-hz = /bits/ 64 <500000000>; > - opp-microvolt = <950000>; > - clock-latency-ns = <200000>; > - }; > - opp04 { > - opp-hz = /bits/ 64 <600000000>; > - opp-microvolt = <975000>; > - clock-latency-ns = <200000>; > - }; > - opp05 { > - opp-hz = /bits/ 64 <700000000>; > - opp-microvolt = <987500>; > - clock-latency-ns = <200000>; > - }; > - opp06 { > - opp-hz = /bits/ 64 <800000000>; > - opp-microvolt = <1000000>; > - clock-latency-ns = <200000>; > - }; > - opp07 { > - opp-hz = /bits/ 64 <900000000>; > - opp-microvolt = <1037500>; > - clock-latency-ns = <200000>; > - }; > - opp08 { > - opp-hz = /bits/ 64 <1000000000>; > - opp-microvolt = <1087500>; > - clock-latency-ns = <200000>; > - }; > - opp09 { > - opp-hz = /bits/ 64 <1100000000>; > - opp-microvolt = <1137500>; > - clock-latency-ns = <200000>; > - }; > - opp10 { > - opp-hz = /bits/ 64 <1200000000>; > - opp-microvolt = <1187500>; > - clock-latency-ns = <200000>; > - }; > - opp11 { > - opp-hz = /bits/ 64 <1300000000>; > - opp-microvolt = <1250000>; > - clock-latency-ns = <200000>; > - }; > - opp12 { > - opp-hz = /bits/ 64 <1400000000>; > - opp-microvolt = <1287500>; > - clock-latency-ns = <200000>; > - }; > - opp13 { > - opp-hz = /bits/ 64 <1500000000>; > - opp-microvolt = <1350000>; > - clock-latency-ns = <200000>; > - turbo-mode; > - }; > - }; > -}; > - > -&combiner { > - samsung,combiner-nr = <18>; > -}; > - > -&gic { > - cpu-offset = <0x8000>; > -}; > diff --git a/arch/arm/boot/dts/exynos4412-pinctrl.dtsi b/arch/arm/boot/dts/exynos4412-pinctrl.dtsi > new file mode 100644 > index 000000000000..e6b9ccfab20e > --- /dev/null > +++ b/arch/arm/boot/dts/exynos4412-pinctrl.dtsi > @@ -0,0 +1,993 @@ > +/* > + * Samsung's Exynos4x12 SoCs pin-mux and pin-config device tree source Exynos4412 > + * > + * Copyright (c) 2012 Samsung Electronics Co., Ltd. > + * http://www.samsung.com > + * > + * Samsung's Exynos4x12 SoCs pin-mux and pin-config optiosn are listed as device Ditto Did you check if output DTBs of Exynos4412 (or decompiled DTSes) are equal? Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html