Skip to content

fix zero series issues #520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
CodeChenL wants to merge 6 commits into from
+56 −16
Closed

fix zero series issues #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d947eb0
pinctrl: meson-g12a: fix pwm_d_z wrong pinmux date
CodeChenL Jan 13, 2026
a085f88
arm64: dts: amlogic: fix USB DWC3 port nodes for Radxa Zero series
CodeChenL Jan 13, 2026
8af1649
arm64: dts: amlogic: radxa-zero2: lower cpu active thermal trip point
CodeChenL Jan 13, 2026
11abfc8
arm64: dts: amlogic: meson-g12b: add missing PWM pinctrl nodes
CodeChenL Jan 13, 2026
45a53fe
arm64: dts: amlogic: meson-g12b-radxa-zero2: fix gpio-line-names
CodeChenL Jan 13, 2026
c1bf489
arm64: dts: meson: radxa-zero series: enhance WiFi SDIO speed
CodeChenL Jan 15, 2026
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
5 changes: 3 additions & 2 deletions arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@
};

&dwc3 {
ports {
port {
usb_dwc2_out: endpoint@0 {
remote-endpoint = <&ucsi0_hs_in>;
};
Expand Down Expand Up @@ -423,7 +423,8 @@
bus-width = <4>;
cap-sd-highspeed;
sd-uhs-sdr50;
max-frequency = <100000000>;
sd-uhs-sdr104;
max-frequency = <200000000>;

non-removable;
disable-wp;
Expand Down
23 changes: 10 additions & 13 deletions arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@
&cpu_thermal {
trips {
cpu_active: cpu-active {
temperature = <70000>; /* millicelsius */
temperature = <60000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "active";
};
Expand Down Expand Up @@ -352,18 +352,18 @@
gpio-line-names =
/* GPIOZ */
"PIN_27", "PIN_28", "PIN_7", "PIN_11", "PIN_13", "PIN_15", "PIN_18", "PIN_40",
"", "", "", "", "", "", "", "",
"PIN_16", "PIN_22", "", "", "", "", "", "",
/* GPIOH */
"", "", "", "", "PIN_19", "PIN_21", "PIN_24", "PIN_23",
"",
/* BOOT */
"", "", "", "", "", "", "", "",
"", "", "", "", "EMMC_PWRSEQ", "", "", "",
/* GPIOC */
"", "", "", "", "", "", "SD_CD", "PIN_36",
"", "", "", "", "", "", "SD_CD", "",
/* GPIOA */
"PIN_32", "PIN_12", "PIN_35", "", "", "PIN_38", "", "",
"", "", "", "", "LED_GREEN", "PIN_31", "PIN_3", "PIN_5",
"PIN_32", "PIN_12", "PIN_35", "PIN_36", "PIN_31", "PIN_38", "", "",
"", "", "", "", "LED_GREEN", "", "PIN_3", "PIN_5",
/* GPIOX */
"", "", "", "", "", "", "SDIO_PWRSEQ", "",
"", "", "", "", "", "", "", "",
Expand Down Expand Up @@ -392,17 +392,13 @@
};
};

&dwc2 {
&dwc3 {
port {
usb_dwc2_out: endpoint {
usb_dwc2_out: endpoint@0 {
remote-endpoint = <&ucsi0_hs_in>;
};
};
};

&dwc3 {
port {
usb_dwc3_out: endpoint {
usb_dwc3_out: endpoint@1 {
remote-endpoint = <&ucsi0_ss_in>;
};
};
Expand Down Expand Up @@ -519,7 +515,8 @@

bus-width = <4>;
cap-sd-highspeed;
max-frequency = <100000000>;
sd-uhs-sdr104;
max-frequency = <200000000>;

non-removable;
disable-wp;
Expand Down
42 changes: 42 additions & 0 deletions arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,3 +197,45 @@
&npu {
power-domains = <&pwrc PWRC_G12A_NNA_ID>;
};

&periphs_pinctrl {
pwm_b_h_pins: pwm-b-h {
mux {
groups = "pwm_b_h";
function = "pwm_b";
bias-disable;
};
};

pwm_b_z_pins: pwm-b-z {
mux {
groups = "pwm_b_z";
function = "pwm_b";
bias-disable;
};
};

pwm_c_z_pins: pwm-c-z {
mux {
groups = "pwm_c_z";
function = "pwm_c";
bias-disable;
};
};

pwm_d_a_pins: pwm-d-a {
mux {
groups = "pwm_d_a";
function = "pwm_d";
bias-disable;
};
};

pwm_d_z_pins: pwm-d-z {
mux {
groups = "pwm_d_z";
function = "pwm_d";
bias-disable;
};
};
};
2 changes: 1 addition & 1 deletion drivers/pinctrl/meson/pinctrl-meson-g12a.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = {
GROUP(pwm_c_x8, 5),
GROUP(pwm_c_c, 5),
GROUP(pwm_c_z, 5),
GROUP(pwm_d_z, 4),
GROUP(pwm_d_z, 2),
GROUP(pwm_d_a, 3),
GROUP(pwm_d_x3, 4),
GROUP(pwm_d_x6, 4),
Expand Down