| Message ID | 20230223153655.262783-6-bryan.odonoghue@linaro.org (mailing list archive) |
|---|---|
| State | Handled Elsewhere, archived |
| Headers | show |
| Series | Add MSM8939 SoC support with two devices | expand |
On Thu, Feb 23, 2023 at 03:36:55PM +0000, Bryan O'Donoghue wrote: > Add a basic booting DTS for the Sony Xperia M4 Aqua aka "tulip". > > Tulip is paired with: > > - wcn3660 > - smb1360 battery charger > - 720p Truly NT35521 Panel > > Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > --- > arch/arm64/boot/dts/qcom/Makefile | 1 + > .../qcom/msm8939-sony-xperia-kanuti-tulip.dts | 457 ++++++++++++++++++ > 2 files changed, 458 insertions(+) > create mode 100644 arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts > > diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile > index 2983e83a19061..81a38d46deba5 100644 > --- a/arch/arm64/boot/dts/qcom/Makefile > +++ b/arch/arm64/boot/dts/qcom/Makefile > @@ -29,6 +29,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-serranove.dtb > dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-uf896.dtb > dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-ufi001c.dtb > dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt88047.dtb > +dtb-$(CONFIG_ARCH_QCOM) += msm8939-sony-xperia-kanuti-tulip.dtb > dtb-$(CONFIG_ARCH_QCOM) += msm8953-motorola-potter.dtb > dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-daisy.dtb > dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-mido.dtb > diff --git a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts > new file mode 100644 > index 0000000000000..c646fada11a5a > --- /dev/null > +++ b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts > @@ -0,0 +1,457 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (c) 2015, The Linux Foundation. All rights reserved. > + * Copyright (c) 2022-2023, Bryan O'Donoghue. > + * > + */ > + > +/dts-v1/; > + > +#include "msm8939.dtsi" > +#include "msm8939-pm8916.dtsi" > +#include <dt-bindings/arm/qcom,ids.h> > +#include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/pinctrl/qcom,pmic-gpio.h> > + > +/ { > + model = "Sony Xperia M4 Aqua"; > + compatible = "sony,kanuti-tulip", "qcom,msm8939"; > + > + qcom,board-id = <8 0>; Could use QCOM_BOARD_ID_MTP instead of 8 for more clarity here. > [...] > +&dsi0 { > + status = "okay"; > + > + panel@0 { > + compatible = "sony,tulip-truly-nt35521"; > + reg = <0>; > + positive5-supply = <&vreg_positive5_reg>; > + negative5-supply = <&vreg_negative5_reg>; > + reset-gpios = <&tlmm 25 GPIO_ACTIVE_LOW>; > + enable-gpios = <&tlmm 10 GPIO_ACTIVE_LOW>; Have you tested this? While this matches the (likely incorrect) bindings, as far as I can tell the Linux tulip-truly-nt35521 driver wants "backlight-gpios" instead of "enable-gpios". And it's not an optional GPIO so I don't quite understand how the existing driver could probe successfully with what you have here. > + > + ports { > + port { > + panel_in: endpoint { > + remote-endpoint = <&dsi0_out>; > + }; > + }; > + }; > + > + }; > +}; > + > [...] > +&tlmm { > + ak8963_default: ak8963-default-state { > + pins = "gpio69"; > + function = "gpio"; > + bias-pull-up; > + drive-strength = <6>; > + }; > + > + ak8963_sleep: ak8963-sleep-state { > + pins = "gpio69"; > + function = "gpio"; > + bias-pull-down; > + drive-strength = <2>; > + }; > + > + /* Ambient light and proximity sensor apds9930 and apds9900 */ > + apds99xx_default: apds99xx-default-state { > + pins = "gpio113"; > + function = "gpio"; > + bias-pull-up; > + drive-strength = <6>; > + }; > + > + apds99xx_sleep: apds99xx-sleep-state { > + pins = "gpio113"; > + function = "gpio"; > + bias-pull-down; > + drive-strength = <2>; > + }; > + > + cam_sensor_flash_default: cam-sensor-flash-default-state { > + pins = "gpio98", "gpio97"; > + function = "gpio"; > + bias-disable; > + drive-strength = <2>; > + }; > + > + cci1_default: cci1-default-state { > + pins = "gpio31", "gpio32"; > + function = "cci_i2c"; > + bias-disable; > + drive-strength = <2>; > + }; > + > + cdc_ext_spk_pa_active: cdc-ext-spk-pa-on-state { > + pins = "gpio0"; > + function = "gpio"; > + drive-strength = <8>; > + output-low; > + }; > + > + cdc_ext_spk_pa_sus: cdc-ext-spk-pa-off-state { > + pins = "gpio0"; > + function = "gpio"; > + bias-disable; > + drive-strength = <2>; > + }; > + > + cdc_slim_lines_act: lines-on-state { > + pins = "gpio63"; > + function = "cdc_pdm0"; > + drive-strength = <8>; > + output-high; > + }; > + > + cdc_slim_lines_sus: lines-off-state { > + pins = "gpio63"; > + function = "cdc_pdm0"; > + bias-disable; > + drive-strength = <2>; > + }; > + > + cross_conn_det_act: lines-on-state { > + pins = "gpio120"; > + function = "gpio"; > + bias-pull-down; > + drive-strength = <8>; > + output-low; > + }; > + > + cross_conn_det_sus: lines-off-state { > + pins = "gpio120"; > + function = "gpio"; > + bias-pull-down; > + drive-strength = <2>; > + }; > + > + ext_buck_vsel: vsel0-state { > + pins = "gpio111"; > + function = "gpio"; > + drive-strength = <2>; > + }; > + > + ext_cdc_tlmm_lines_act: tlmm-lines-on-state { > + pins = "gpio116", "gpio112", "gpio117", "gpio118", "gpio119"; > + function = "gpio"; > + bias-disable; > + drive-strength = <8>; > + }; > + > + ext_cdc_tlmm_lines_sus: tlmm-lines-off-state { > + pins = "gpio116", "gpio112", "gpio117", "gpio118", "gpio119"; > + function = "gpio"; > + bias-disable; > + drive-strength = <2>; > + }; > + > + gpio_key_suspend: gpio-key-suspend-state { > + pins = "gpio107", "gpio108", "gpio109"; > + function = "gpio"; > + bias-pull-up; > + drive-strength = <2>; > + }; > + > + negative5_reg_default: negative5-reg-default-state { > + pins = "gpio17"; > + function = "gpio"; > + output-low; > + }; > + > + positive5_reg_default: positive5-reg-default-state { > + pins = "gpio114"; > + function = "gpio"; > + output-low; > + }; > + > + /* Gyroscope and accelerometer sensor combo */ > + mpu6050_default: mpu6050-default-state { > + pins = "gpio115"; > + function = "gpio"; > + bias-pull-up; > + drive-strength = <6>; > + }; > + > + mpu6050_sleep: mpu6050-sleep-state { > + pins = "gpio115"; > + function = "gpio"; > + bias-pull-down; > + drive-strength = <2>; > + }; > + > + nfc_disable_active: nfc-disable-active-state { > + pins = "gpio20"; > + function = "gpio"; > + bias-pull-up; > + drive-strength = <6>; > + }; > + > + nfc_disable_suspend: nfc-disable-suspend-state { > + pins = "gpio20"; > + function = "gpio"; > + bias-disable; > + drive-strength = <6>; > + }; > + > + nfc_int_active: nfc-int-active-state { > + pins = "gpio21"; > + function = "gpio"; > + bias-pull-up; > + drive-strength = <6>; > + }; > + > + nfc_int_suspend: nfc-int-suspend-state { > + pins = "gpio21"; > + function = "gpio"; > + bias-pull-up; > + drive-strength = <6>; > + }; > + > + nt35521_te_default: nt35521-te-default-state { > + pins = "gpio24"; > + function = "gpio"; > + bias-pull-down; > + drive-strength = <6>; > + }; > + > + nt35521_backlight: nt35521-backlight-default-state { > + pins = "gpio10"; > + function = "gpio"; > + bias-pull-down; > + drive-strength = <6>; > + }; > + > + smb_int: smb-int-default-state { > + pins = "gpio62"; > + function = "gpio"; > + bias-pull-up; > + drive-strength = <2>; > + }; > + > + ts_int_active: ts-int-active-state { > + pins = "gpio13"; > + function = "gpio"; > + bias-pull-up; > + drive-strength = <16>; > + }; > + > + ts_int_suspend: ts-int-suspend-state { > + pins = "gpio13"; > + function = "gpio"; > + bias-pull-down; > + drive-strength = <2>; > + }; > + > + ts_reset_active: ts-reset-active-state { > + pins = "gpio12"; > + function = "gpio"; > + bias-pull-up; > + drive-strength = <16>; > + }; > + > + ts_reset_suspend: ts-reset-suspend-state { > + pins = "gpio12"; > + function = "gpio"; > + bias-pull-down; > + drive-strength = <2>; > + }; > + > + ts_release: ts-release-default-state { > + pins = "gpio13", "gpio12"; > + function = "gpio"; > + bias-pull-down; > + drive-strength = <2>; > + }; > + There are *a lot* of unused pinctrl entries here. If you don't reference them anywhere (by referencing them via label) they just waste space in the device tree. The GPIOs will still remain unconfigured. Please save them locally for later usage and only keep the used entries. This will ease review of upcoming patches since these are better understandable together with the actual device node making use of them. Thanks, Stephan
On 06/03/2023 16:14, Stephan Gerhold wrote: > There are*a lot* of unused pinctrl entries here. If you don't reference > them anywhere (by referencing them via label) they just waste space in > the device tree. The GPIOs will still remain unconfigured. > > Please save them locally for later usage and only keep the used entries. > This will ease review of upcoming patches since these are better > understandable together with the actual device node making use of them. TBH, I really would have rather received this comment @ version 1, before doing all the work to sanitise the incoming downstream DTS. But sure, no problem, I'll drop. --- bod
On Thu 2023-02-23 15:36:55, Bryan O'Donoghue wrote: > Add a basic booting DTS for the Sony Xperia M4 Aqua aka "tulip". > > Tulip is paired with: > > - wcn3660 > - smb1360 battery charger > - 720p Truly NT35521 Panel > > Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Congrats on getting this to work. Please Cc: phone-devel@vger for phone related stuff. Thanks, Pavel
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 2983e83a19061..81a38d46deba5 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -29,6 +29,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-serranove.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-uf896.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-ufi001c.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt88047.dtb +dtb-$(CONFIG_ARCH_QCOM) += msm8939-sony-xperia-kanuti-tulip.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8953-motorola-potter.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-daisy.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-mido.dtb diff --git a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts new file mode 100644 index 0000000000000..c646fada11a5a --- /dev/null +++ b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts @@ -0,0 +1,457 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2015, The Linux Foundation. All rights reserved. + * Copyright (c) 2022-2023, Bryan O'Donoghue. + * + */ + +/dts-v1/; + +#include "msm8939.dtsi" +#include "msm8939-pm8916.dtsi" +#include <dt-bindings/arm/qcom,ids.h> +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/pinctrl/qcom,pmic-gpio.h> + +/ { + model = "Sony Xperia M4 Aqua"; + compatible = "sony,kanuti-tulip", "qcom,msm8939"; + + qcom,board-id = <8 0>; + qcom,msm-id = <QCOM_ID_MSM8939 0>, <QCOM_ID_MSM8939 0x30000>; + + aliases { + mmc0 = &sdhc_1; /* SDC1 eMMC slot */ + mmc1 = &sdhc_2; /* SDC2 SD card slot */ + serial0 = &blsp1_uart2; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + vreg_negative5_reg: negative5-regulator { + compatible = "regulator-fixed"; + pinctrl-0 = <&negative5_reg_default>; + pinctrl-names = "default"; + regulator-name = "negative5_reg"; + gpio = <&tlmm 17 GPIO_ACTIVE_LOW>; + startup-delay-us = <0>; + }; + + vreg_positive5_reg: positive5-regulator { + compatible = "regulator-fixed"; + pinctrl-0 = <&positive5_reg_default>; + pinctrl-names = "default"; + regulator-name = "positive5_reg"; + gpio = <&tlmm 114 GPIO_ACTIVE_LOW>; + startup-delay-us = <0>; + }; + + usb_id: usb-id { + compatible = "linux,extcon-usb-gpio"; + id-gpio = <&tlmm 110 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&usb_id_default>; + pinctrl-names = "default"; + }; +}; + +&dsi0 { + status = "okay"; + + panel@0 { + compatible = "sony,tulip-truly-nt35521"; + reg = <0>; + positive5-supply = <&vreg_positive5_reg>; + negative5-supply = <&vreg_negative5_reg>; + reset-gpios = <&tlmm 25 GPIO_ACTIVE_LOW>; + enable-gpios = <&tlmm 10 GPIO_ACTIVE_LOW>; + + ports { + port { + panel_in: endpoint { + remote-endpoint = <&dsi0_out>; + }; + }; + }; + + }; +}; + +&dsi0_out { + remote-endpoint = <&panel_in>; + data-lanes = <0 1 2 3>; +}; + +&dsi_phy0 { + qcom,dsi-phy-regulator-ldo-mode; + status = "okay"; +}; + +&mdss { + status = "okay"; +}; + +&tlmm { + ak8963_default: ak8963-default-state { + pins = "gpio69"; + function = "gpio"; + bias-pull-up; + drive-strength = <6>; + }; + + ak8963_sleep: ak8963-sleep-state { + pins = "gpio69"; + function = "gpio"; + bias-pull-down; + drive-strength = <2>; + }; + + /* Ambient light and proximity sensor apds9930 and apds9900 */ + apds99xx_default: apds99xx-default-state { + pins = "gpio113"; + function = "gpio"; + bias-pull-up; + drive-strength = <6>; + }; + + apds99xx_sleep: apds99xx-sleep-state { + pins = "gpio113"; + function = "gpio"; + bias-pull-down; + drive-strength = <2>; + }; + + cam_sensor_flash_default: cam-sensor-flash-default-state { + pins = "gpio98", "gpio97"; + function = "gpio"; + bias-disable; + drive-strength = <2>; + }; + + cci1_default: cci1-default-state { + pins = "gpio31", "gpio32"; + function = "cci_i2c"; + bias-disable; + drive-strength = <2>; + }; + + cdc_ext_spk_pa_active: cdc-ext-spk-pa-on-state { + pins = "gpio0"; + function = "gpio"; + drive-strength = <8>; + output-low; + }; + + cdc_ext_spk_pa_sus: cdc-ext-spk-pa-off-state { + pins = "gpio0"; + function = "gpio"; + bias-disable; + drive-strength = <2>; + }; + + cdc_slim_lines_act: lines-on-state { + pins = "gpio63"; + function = "cdc_pdm0"; + drive-strength = <8>; + output-high; + }; + + cdc_slim_lines_sus: lines-off-state { + pins = "gpio63"; + function = "cdc_pdm0"; + bias-disable; + drive-strength = <2>; + }; + + cross_conn_det_act: lines-on-state { + pins = "gpio120"; + function = "gpio"; + bias-pull-down; + drive-strength = <8>; + output-low; + }; + + cross_conn_det_sus: lines-off-state { + pins = "gpio120"; + function = "gpio"; + bias-pull-down; + drive-strength = <2>; + }; + + ext_buck_vsel: vsel0-state { + pins = "gpio111"; + function = "gpio"; + drive-strength = <2>; + }; + + ext_cdc_tlmm_lines_act: tlmm-lines-on-state { + pins = "gpio116", "gpio112", "gpio117", "gpio118", "gpio119"; + function = "gpio"; + bias-disable; + drive-strength = <8>; + }; + + ext_cdc_tlmm_lines_sus: tlmm-lines-off-state { + pins = "gpio116", "gpio112", "gpio117", "gpio118", "gpio119"; + function = "gpio"; + bias-disable; + drive-strength = <2>; + }; + + gpio_key_suspend: gpio-key-suspend-state { + pins = "gpio107", "gpio108", "gpio109"; + function = "gpio"; + bias-pull-up; + drive-strength = <2>; + }; + + negative5_reg_default: negative5-reg-default-state { + pins = "gpio17"; + function = "gpio"; + output-low; + }; + + positive5_reg_default: positive5-reg-default-state { + pins = "gpio114"; + function = "gpio"; + output-low; + }; + + /* Gyroscope and accelerometer sensor combo */ + mpu6050_default: mpu6050-default-state { + pins = "gpio115"; + function = "gpio"; + bias-pull-up; + drive-strength = <6>; + }; + + mpu6050_sleep: mpu6050-sleep-state { + pins = "gpio115"; + function = "gpio"; + bias-pull-down; + drive-strength = <2>; + }; + + nfc_disable_active: nfc-disable-active-state { + pins = "gpio20"; + function = "gpio"; + bias-pull-up; + drive-strength = <6>; + }; + + nfc_disable_suspend: nfc-disable-suspend-state { + pins = "gpio20"; + function = "gpio"; + bias-disable; + drive-strength = <6>; + }; + + nfc_int_active: nfc-int-active-state { + pins = "gpio21"; + function = "gpio"; + bias-pull-up; + drive-strength = <6>; + }; + + nfc_int_suspend: nfc-int-suspend-state { + pins = "gpio21"; + function = "gpio"; + bias-pull-up; + drive-strength = <6>; + }; + + nt35521_te_default: nt35521-te-default-state { + pins = "gpio24"; + function = "gpio"; + bias-pull-down; + drive-strength = <6>; + }; + + nt35521_backlight: nt35521-backlight-default-state { + pins = "gpio10"; + function = "gpio"; + bias-pull-down; + drive-strength = <6>; + }; + + smb_int: smb-int-default-state { + pins = "gpio62"; + function = "gpio"; + bias-pull-up; + drive-strength = <2>; + }; + + ts_int_active: ts-int-active-state { + pins = "gpio13"; + function = "gpio"; + bias-pull-up; + drive-strength = <16>; + }; + + ts_int_suspend: ts-int-suspend-state { + pins = "gpio13"; + function = "gpio"; + bias-pull-down; + drive-strength = <2>; + }; + + ts_reset_active: ts-reset-active-state { + pins = "gpio12"; + function = "gpio"; + bias-pull-up; + drive-strength = <16>; + }; + + ts_reset_suspend: ts-reset-suspend-state { + pins = "gpio12"; + function = "gpio"; + bias-pull-down; + drive-strength = <2>; + }; + + ts_release: ts-release-default-state { + pins = "gpio13", "gpio12"; + function = "gpio"; + bias-pull-down; + drive-strength = <2>; + }; + + usb_id_default: usb-id-default-state { + pins = "gpio110"; + function = "gpio"; + bias-pull-up; + drive-strength = <8>; + }; +}; + +&pronto { + status = "okay"; + + iris { + compatible = "qcom,wcn3660"; + }; +}; + +&smd_rpm_regulators { + vdd_l1_l2_l3-supply = <&pm8916_s3>; + vdd_l4_l5_l6-supply = <&pm8916_s4>; + vdd_l7-supply = <&pm8916_s4>; + + pm8916_s3: s3 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1300000>; + }; + + pm8916_s4: s4 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2100000>; + }; + + pm8916_l2: l2 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + }; + + pm8916_l4: l4 { + regulator-min-microvolt = <2050000>; + regulator-max-microvolt = <2050000>; + }; + + pm8916_l5: l5 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8916_l6: l6 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + pm8916_l7: l7 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8916_l8: l8 { + regulator-min-microvolt = <2850000>; + regulator-max-microvolt = <2900000>; + }; + + pm8916_l9: l9 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + pm8916_l10: l10 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + pm8916_l11: l11 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-system-load = <200000>; + regulator-allow-set-load; + }; + + pm8916_l12: l12 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + }; + + pm8916_l13: l13 { + regulator-min-microvolt = <3075000>; + regulator-max-microvolt = <3075000>; + }; + + pm8916_l14: l14 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + }; + + pm8916_l15: l15 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + }; + + pm8916_l16: l16 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + }; + + pm8916_l17: l17 { + regulator-min-microvolt = <2850000>; + regulator-max-microvolt = <2850000>; + }; + + pm8916_l18: l18 { + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <2700000>; + }; +}; + +&sdhc_1 { + pinctrl-0 = <&sdc1_default_state>; + pinctrl-1 = <&sdc1_sleep_state>; + pinctrl-names = "default", "sleep"; + status = "okay"; +}; + +&sdhc_2 { + pinctrl-0 = <&sdc2_default_state>; + pinctrl-1 = <&sdc2_sleep_state>; + pinctrl-names = "default", "sleep"; + cd-gpios = <&tlmm 38 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&usb { + extcon = <&usb_id>, <&usb_id>; + status = "okay"; +}; + +&usb_hs_phy { + extcon = <&usb_id>; +};