On 25/10/2023 10:37, Stefan Hansson wrote:
> According to the dts from the kernel source code released by Samsung,
> matissewifi and matisselte only have minor differences in hardware, so
> use a shared dtsi to reduce duplicated code. Additionally, this should
> make adding support for matisse3g easier should someone want to do that
> at a later point.
>
> As such, add a common device tree for all matisse devices by Samsung
> based on the matissewifi dts. Support for matisselte will be introduced
> in a later patch in this series and will use the common dtsi as well.
>
> Signed-off-by: Stefan Hansson <newbyte@xxxxxxxxxxxxxxxx>
> ---
...
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts b/arch/arm/boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi
> similarity index 90%
> copy from arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts
> copy to arch/arm/boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi
> index f516e0426bb9..11fec4e963b7 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi
> @@ -1,10 +1,9 @@
> // SPDX-License-Identifier: BSD-3-Clause
> /*
> * Copyright (c) 2022, Matti Lehtimäki <matti.lehtimaki@xxxxxxxxx>
> + * Copyright (c) 2023, Stefan Hansson <newbyte@xxxxxxxxxxxxxxxx>
Removing lines is not a much of a copyrightable change.
> */
>
> -/dts-v1/;
> -
> #include <dt-bindings/input/input.h>
> #include "qcom-msm8226.dtsi"
> #include "qcom-pm8226.dtsi"
> @@ -13,10 +12,6 @@
> /delete-node/ &smem_region;
>
> / {
> - model = "Samsung Galaxy Tab 4 10.1";
> - compatible = "samsung,matisse-wifi", "qcom,apq8026";
> - chassis-type = "tablet";
> -
> aliases {
> mmc0 = &sdhc_1; /* SDC1 eMMC slot */
> mmc1 = &sdhc_2; /* SDC2 SD card slot */
> @@ -137,8 +132,8 @@ reg_tsp_1p8v: regulator-tsp-1p8v {
> gpio = <&tlmm 31 GPIO_ACTIVE_HIGH>;
> enable-active-high;
>
> - pinctrl-names = "default";
> pinctrl-0 = <&tsp_en_default_state>;
> + pinctrl-names = "default";
That's an unexpected change.
> };
>
> reg_tsp_3p3v: regulator-tsp-3p3v {
> @@ -147,11 +142,11 @@ reg_tsp_3p3v: regulator-tsp-3p3v {
> regulator-min-microvolt = <3300000>;
> regulator-max-microvolt = <3300000>;
>
> - gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>;
> + /* GPIO is board-specific */
> enable-active-high;
Then regulator as well. Move it to board.
>
> - pinctrl-names = "default";
> pinctrl-0 = <&tsp_en1_default_state>;
> + pinctrl-names = "default";
> };
>
> reserved-memory {
> @@ -223,26 +218,6 @@ &adsp {
> status = "okay";
> };
>
> -&blsp1_i2c2 {
> - status = "okay";
> -
> - accelerometer@1d {
> - compatible = "st,lis2hh12";
> - reg = <0x1d>;
> -
> - interrupt-parent = <&tlmm>;
> - interrupts = <54 IRQ_TYPE_LEVEL_HIGH>;
> -
> - pinctrl-names = "default";
> - pinctrl-0 = <&accel_int_default_state>;
> -
> - st,drdy-int-pin = <1>;
> -
> - vdd-supply = <&pm8226_l19>;
> - vddio-supply = <&pm8226_lvs1>;
> - };
> -};
> -
> &blsp1_i2c4 {
> status = "okay";
>
> @@ -253,28 +228,8 @@ muic: usb-switch@25 {
> interrupt-parent = <&tlmm>;
> interrupts = <67 IRQ_TYPE_EDGE_FALLING>;
>
> - pinctrl-names = "default";
> pinctrl-0 = <&muic_int_default_state>;
> - };
> -};
> -
> -&blsp1_i2c5 {
> - status = "okay";
> -
> - touchscreen@4a {
> - compatible = "atmel,maxtouch";
> - reg = <0x4a>;
> -
> - interrupt-parent = <&tlmm>;
> - interrupts = <17 IRQ_TYPE_LEVEL_LOW>;
> -
> pinctrl-names = "default";
> - pinctrl-0 = <&tsp_int_rst_default_state>;
> -
> - reset-gpios = <&pm8226_gpios 6 GPIO_ACTIVE_LOW>;
> -
> - vdd-supply = <®_tsp_1p8v>;
> - vdda-supply = <®_tsp_3p3v>;
> };
> };
>
> @@ -287,9 +242,9 @@ pm8226_s3: s3 {
> regulator-max-microvolt = <1300000>;
> };
>
> + /* Upper voltage constraint is board-specific */
> pm8226_s4: s4 {
> regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <1800000>;
Then keep here widest constraints. IOW, this should be changed not in
this patch, but your next one.
> };
>
> pm8226_s5: s5 {
> @@ -307,9 +262,9 @@ pm8226_l2: l2 {
> regulator-max-microvolt = <1200000>;
> };
>
> + /* Upper voltage constraint is board-specific */
> pm8226_l3: l3 {
> regulator-min-microvolt = <750000>;
> - regulator-max-microvolt = <1337500>;
Ditto
> regulator-always-on;
> };
>
> @@ -493,7 +448,7 @@ tsp_en_default_state: tsp-en-default-state {
> };
>
> tsp_en1_default_state: tsp-en1-default-state {
> - pins = "gpio73";
> + /* pins is board-specific */
Then node is board specific as well.
Best regards,
Krzysztof
