Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/arm/qcom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,8 @@ properties:
- samsung,serranove
- thwc,uf896
- thwc,ufi001c
- thwc,mf601sl-v7
- thwc,mf32-v2
Comment on lines +253 to +254

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

              - thwc,mf32-v2
              - thwc,mf601sl-v7
              - thwc,uf896
              - thwc,ufi001c

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please reorder commits so that the dt-bindings is always before the usage of the binding (i.e. first bindings then dts that uses it)

- wingtech,wt88047
- yiming,uz801-v3
- const: qcom,msm8916
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/qcom/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-msm8916-samsung-grandmax.dtb \
qcom-msm8916-samsung-heatqlte.dtb \
qcom-msm8916-samsung-serranove.dtb \
qcom-msm8916-thwc-uf896.dtb \
qcom-msm8916-thwc-ufi001c.dtb \
qcom-msm8916-thwc-mf601sl-v7.dtb \
qcom-msm8916-thwc-mf32-v2.dtb \
qcom-msm8916-yiming-uz801v3.dtb \
Comment on lines +38 to +42

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
qcom-msm8916-thwc-uf896.dtb \
qcom-msm8916-thwc-ufi001c.dtb \
qcom-msm8916-thwc-mf601sl-v7.dtb \
qcom-msm8916-thwc-mf32-v2.dtb \
qcom-msm8916-yiming-uz801v3.dtb \
qcom-msm8916-thwc-mf32-v2.dtb \
qcom-msm8916-thwc-mf601sl-v7.dtb \
qcom-msm8916-thwc-uf896.dtb \
qcom-msm8916-thwc-ufi001c.dtb \
qcom-msm8916-yiming-uz801v3.dtb \

qcom-msm8960-cdp.dtb \
qcom-msm8960-samsung-expressatt.dtb \
qcom-msm8974-lge-nexus5-hammerhead.dtb \
Expand Down
3 changes: 3 additions & 0 deletions arch/arm/boot/dts/qcom/qcom-msm8916-thwc-mf32-v2.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// SPDX-License-Identifier: GPL-2.0-only
#include "arm64/qcom/msm8916-thwc-mf32-v2.dts"
#include "qcom-msm8916-smp.dtsi"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A bit of weird without newline.

3 changes: 3 additions & 0 deletions arch/arm/boot/dts/qcom/qcom-msm8916-thwc-mf601sl-v7.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// SPDX-License-Identifier: GPL-2.0-only
#include "arm64/qcom/msm8916-thwc-mf601sl-v7.dts"
#include "qcom-msm8916-smp.dtsi"
3 changes: 3 additions & 0 deletions arch/arm/boot/dts/qcom/qcom-msm8916-thwc-uf896.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// SPDX-License-Identifier: GPL-2.0-only
#include "arm64/qcom/msm8916-thwc-uf896.dts"
#include "qcom-msm8916-smp.dtsi"
3 changes: 3 additions & 0 deletions arch/arm/boot/dts/qcom/qcom-msm8916-thwc-ufi001c.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// SPDX-License-Identifier: GPL-2.0-only
#include "arm64/qcom/msm8916-thwc-ufi001c.dts"
#include "qcom-msm8916-smp.dtsi"
3 changes: 3 additions & 0 deletions arch/arm/boot/dts/qcom/qcom-msm8916-yiming-uz801v3.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// SPDX-License-Identifier: GPL-2.0-only
#include "arm64/qcom/msm8916-yiming-uz801v3.dts"
#include "qcom-msm8916-smp.dtsi"
2 changes: 2 additions & 0 deletions arch/arm64/boot/dts/qcom/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-on7.dtb
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-thwc-mf601sl-v7.dtb
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Authorship on this commit looks weird weird...

From e0513f159f005d12f1ba91716bc4f0b405498059 Mon Sep 17 00:00:00 2001
From: Coia Prant <coiaprant@gmail.com>
Date: Sat, 15 Jun 2024 10:24:54 +0000
Subject: [PATCH] arm64: dts: qcom: msm8916-thwc-mf601xx: Add initial device
 tree
...
Signed-off-by: Yang Xiwen <forbidden405@outlook.com>
Tested-by: Coia Prant <coiaprant@gmail.com>

You're designated as an author but sob is from Yang, then there is your tested-by, which looks weird as author's testing their own patch is implied...

dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-mf32-v2.dtb
Comment on lines +65 to +66

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-thwc-mf32-v2.dtb
dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-thwc-mf601sl-v7.dtb
dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-thwc-uf896.dtb
dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-thwc-ufi001c.dtb

dtb-$(CONFIG_ARCH_QCOM) += msm8916-vivo-y21l.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt86518.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt86528.dtb
Expand Down
68 changes: 68 additions & 0 deletions arch/arm64/boot/dts/qcom/msm8916-thwc-mf32-v2.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
// SPDX-License-Identifier: GPL-2.0-only

/dts-v1/;

#include "msm8916-thwc-mf32.dtsi"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would this dtsi be used by some other device later? You may want to motivate this in the commit message.


/ {
model = "Tong Heng Wei Chuang 4G Modem Stick MF32_MB_V02";
compatible = "thwc,mf32-v2", "qcom,msm8916";
};

&leds {
led-wan-green {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sort the nodes in alphabetical order or GPIO pins.

color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_WAN;
default-state = "off";
gpios = <&tlmm 30 GPIO_ACTIVE_HIGH>;
};

led-wan-blue {
color = <LED_COLOR_ID_BLUE>;
function = LED_FUNCTION_WAN;
default-state = "on";
gpios = <&tlmm 29 GPIO_ACTIVE_HIGH>;
};

led-wan-red {
color = <LED_COLOR_ID_RED>;
function = LED_FUNCTION_WAN;
default-state = "off";
gpios = <&tlmm 28 GPIO_ACTIVE_HIGH>;
};

led-wlan {
color = <LED_COLOR_ID_BLUE>;
function = LED_FUNCTION_WLAN;
default-state = "on";
gpios = <&tlmm 27 GPIO_ACTIVE_HIGH>;
};

led-battery-1 {
color = <LED_COLOR_ID_BLUE>;
function = LED_FUNCTION_POWER;
default-state = "on";
gpios = <&tlmm 19 GPIO_ACTIVE_HIGH>;
};

led-battery-2 {
color = <LED_COLOR_ID_BLUE>;
function = LED_FUNCTION_POWER;
default-state = "on";
gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>;
};

led-battery-3 {
color = <LED_COLOR_ID_BLUE>;
function = LED_FUNCTION_POWER;
default-state = "on";
gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>;
};

led-battery-4 {
color = <LED_COLOR_ID_BLUE>;
function = LED_FUNCTION_POWER;
default-state = "on";
gpios = <&tlmm 20 GPIO_ACTIVE_HIGH>;
};
};
196 changes: 196 additions & 0 deletions arch/arm64/boot/dts/qcom/msm8916-thwc-mf32.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
// SPDX-License-Identifier: GPL-2.0-only
// A common dtsi for MF32 series LTE modem dongles.

#include "msm8916-pm8916.dtsi"

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/leds/common.h>

/ {
chassis-type = "embedded";

aliases {
mmc0 = &sdhc_1; /* eMMC */
mmc1 = &sdhc_2; /* external SD slot */
serial0 = &blsp_uart2;
};

chosen {
stdout-path = "serial0";
};

battery: battery {
compatible = "simple-battery";
voltage-min-design-microvolt = <3400000>;
voltage-max-design-microvolt = <4200000>;
energy-full-design-microwatt-hours = <7770000>;
charge-full-design-microamp-hours = <2100000>;

ocv-capacity-celsius = <25>;
ocv-capacity-table-0 = <4189000 100>, <4073000 95>,
<4044000 90>, <4039000 85>, <4032000 80>, <4025000 75>,
<4008000 70>, <3974000 65>, <3953000 60>, <3912000 55>,
<3884000 50>, <3858000 45>, <3849000 40>, <3839000 35>,
<3816000 30>, <3774000 25>, <3690000 20>, <3647000 16>,
<3611000 13>, <3539000 11>, <3477000 10>, <3421000 9>,
<3388000 8>, <3364000 7>, <3328000 6>, <3235000 5>,
<3174000 4>, <3096000 3>, <3062000 2>, <3035000 1>,
<3000000 0>;
};

gpio-keys {
compatible = "gpio-keys";

pinctrl-0 = <&button_default>;
pinctrl-names = "default";

label = "GPIO Buttons";

button-restart {
label = "Restart";
gpios = <&tlmm 34 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
};
};

leds: leds {
compatible = "gpio-leds";

pinctrl-0 = <&gpio_leds_default>;
pinctrl-names = "default";

/* LEDs are board-specific */
};
};

&bam_dmux {
status = "okay";
};

&bam_dmux_dma {
status = "okay";
};

&blsp_uart2 {
status = "okay";
};

/* Remove &dsi_phy0 from clocks to make sure that gcc probes with display disabled */
&gcc {
clocks = <&xo_board>, <&sleep_clk>, <0>, <0>, <0>, <0>, <0>;
};

&mba_mem {
status = "okay";
};

&mpss {
pinctrl-0 = <&sim_ctrl_default>;
pinctrl-names = "default";

status = "okay";
};

&mpss_mem {
reg = <0x00 0x86800000 0x00 0x5500000>;
status = "okay";
};

&pm8916_bms {
monitored-battery = <&battery>;
power-supplies = <&pm8916_charger>;

status = "okay";
};

&pm8916_charger {
qcom,fast-charge-safe-current = <700000>;
qcom,fast-charge-safe-voltage = <4200000>;

monitored-battery = <&battery>;

status = "okay";
};

&sdhc_1 {
status = "okay";
};

&sdhc_2 {
status = "okay";
};

&usb {
extcon = <&pm8916_charger>;
usb-role-switch;

status = "okay";
};

&usb_hs_phy {
extcon = <&pm8916_charger>;
};

&venus {
status = "okay";
};

&venus_mem {
status = "okay";
};

&wcnss {
status = "okay";
};

&wcnss_iris {
compatible = "qcom,wcn3620";
};

&wcnss_mem {
status = "okay";
};

&tlmm {
button_default: button-default-state {
function = "gpio";
drive-strength = <2>;
pins = "gpio34";
bias-pull-up;
};

gpio_leds_default: gpio-leds-default-state {
function = "gpio";
drive-strength = <2>;
pins = "gpio19", "gpio20", "gpio21", "gpio22", "gpio27",
"gpio28", "gpio29", "gpio30";
bias-disable;
};

/* This selects the external SIM card slot by default */
sim_ctrl_default: sim-ctrl-default-state {
esim-sel-pins {
function = "gpio";
drive-strength = <2>;
pins = "gpio50", "gpio51";
bias-disable;
output-low;
};

sim-en-pins {
function = "gpio";
drive-strength = <2>;
pins = "gpio24";
bias-disable;
output-low;
};

sim-sel-pins {
function = "gpio";
drive-strength = <2>;
pins = "gpio49";
bias-disable;
output-high;
};
};
};
68 changes: 68 additions & 0 deletions arch/arm64/boot/dts/qcom/msm8916-thwc-mf601sl-v7.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
// SPDX-License-Identifier: GPL-2.0-only

/dts-v1/;

#include "msm8916-thwc-mf601xx.dtsi"

/ {
model = "Tong Heng Wei Chuang 4G Modem Stick MF601SL_CT_V07";
compatible = "thwc,mf601sl-v7", "qcom,msm8916";
};

&leds {
led-wan-green {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sort.

color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_WAN;
default-state = "off";
gpios = <&tlmm 116 GPIO_ACTIVE_HIGH>;
};

led-wan-red {
color = <LED_COLOR_ID_RED>;
function = LED_FUNCTION_WAN;
default-state = "on";
gpios = <&tlmm 115 GPIO_ACTIVE_HIGH>;
};

led-battery-green {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_POWER;
default-state = "on";
gpios = <&tlmm 112 GPIO_ACTIVE_HIGH>;
};

led-battery-red {
color = <LED_COLOR_ID_RED>;
function = LED_FUNCTION_POWER;
default-state = "off";
gpios = <&tlmm 110 GPIO_ACTIVE_HIGH>;
};

led-message-green {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_INDICATOR;
default-state = "off";
gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>;
};

led-message-red {
color = <LED_COLOR_ID_RED>;
function = LED_FUNCTION_INDICATOR;
default-state = "on";
gpios = <&tlmm 121 GPIO_ACTIVE_HIGH>;
};

led-wifi-green {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_WLAN;
default-state = "off";
gpios = <&tlmm 120 GPIO_ACTIVE_HIGH>;
};

led-wifi-red {
color = <LED_COLOR_ID_RED>;
function = LED_FUNCTION_WLAN;
default-state = "on";
gpios = <&tlmm 119 GPIO_ACTIVE_HIGH>;
};
};
Loading