domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mediatek: dts: bring mt7988a.dtsi closer to upstream

Browse Source 
In preparation of using the upstream mt7988a.dtsi when switching
to Linux 6.12 prepare by bringing our downstream version closer to
what went upstream.
 * rename 'xphy' -> 'xsphy'
 * rename 'uart[012]' -> 'serial[012]'
 * only list pinctrl settings directly used in mt7988a.dtsi there,
   leave it to boards to define all additional pinctrl settings
   they need.
 * move fan and thermal-zone to board level

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
2025-05-08 17:48:27 +01:00
parent a387c62114
commit b992aa119c
9 changed files with 544 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
target/linux/mediatek/dts/mt7988a-arcadyan-mozart.dts
View File

@@ -11,7 +11,7 @@
model = "MediaTek / Arcadyan - Mozart";
aliases {
serial0 = &uart0;
serial0 = &serial0;
led-boot = &led_status_blue;
led-failsafe = &led_status_red;
led-running = &led_status_green;
@@ -59,26 +59,16 @@
gpios = <&pio 13 GPIO_ACTIVE_LOW>;
};
};
};
&pio {
mdio0_pins: mdio0-pins {
mux {
function = "eth";
groups = "mdc_mdio0";
};
fan: pwm-fan {
compatible = "pwm-fan";
#cooling-cells = <2>;
#thermal-sensor-cells = <1>;
/* cooling level (0, 1, 2) : (0% duty, 50% duty, 100% duty) */
cooling-levels = <0 128 255>;
pwms = <&pwm 1 40000 0>;
conf {
groups = "mdc_mdio0";
drive-strength = <MTK_DRIVE_10mA>;
};
};
spic_pins: spi1-pins {
mux {
function = "spi";
groups = "spi1";
};
status = "okay";
};
};
@@ -173,12 +163,7 @@
};
};
&uart1 {
status = "okay";
};
&fan {
pwms = <&pwm 1 40000 0>;
&serial1 {
status = "okay";
};
@@ -189,7 +174,7 @@
&spi1 {
pinctrl-names = "default";
/* pin shared with snfi */
pinctrl-0 = <&spic_pins>;
pinctrl-0 = <&spi1_pins>;
status = "disabled";
};

150
target/linux/mediatek/dts/mt7988a-smartrg-mt-stuart.dtsi
View File

@@ -14,7 +14,7 @@
/ {
aliases {
serial0 = &uart0;
serial0 = &serial0;
label-mac-device = &gmac1;
led-boot = &led_sys_green;
led-failsafe = &led_sys_blue;
@@ -23,7 +23,7 @@
};
chosen {
stdout-path = &uart0;
stdout-path = &serial0;
bootargs = "console=ttyS0,115200n1 loglevel=8 pci=pcie_bus_perf root=PARTLABEL=rootfs";
};
@@ -129,6 +129,32 @@
gpios = <&pio 63 GPIO_ACTIVE_HIGH>;
};
};
fan: pwm-fan {
compatible = "pwm-fan";
#cooling-cells = <2>;
#thermal-sensor-cells = <1>;
pwms = <&pwm 0 40000 0>;
/**
* set fan speed
*
* 0 = off
* 61 = 24% duty cycle
* 77 = 30% duty cycle
* 102 = 40% duty cycle
* 128 - 50% duty cycle
* 255 = 100% duty cycle
*/
cooling-levels = <61 77 102 128>;
interrupt-parent = <&pio>;
interrupts = <21 IRQ_TYPE_EDGE_FALLING>;
pulses-per-revolution = <2>;
status = "okay";
};
};
&cpu0 {
@@ -226,28 +252,6 @@
status = "okay";
};
&fan {
pwms = <&pwm 0 40000 0>;
/**
* set fan speed
*
* 0 = off
* 61 = 24% duty cycle
* 77 = 30% duty cycle
* 102 = 40% duty cycle
* 128 - 50% duty cycle
* 255 = 100% duty cycle
*/
cooling-levels = <61 77 102 128>;
interrupt-parent = <&pio>;
interrupts = <21 IRQ_TYPE_EDGE_FALLING>;
pulses-per-revolution = <2>;
status = "okay";
};
&gmac0 {
nvmem-cells = <&macaddr 1>;
nvmem-cell-names = "mac-address";
@@ -286,11 +290,13 @@
&gsw_phy1_led0 {
status = "okay";
function = LED_FUNCTION_LAN;
color = <LED_COLOR_ID_GREEN>;
};
&gsw_phy1_led1 {
status = "okay";
function = LED_FUNCTION_LAN;
color = <LED_COLOR_ID_AMBER>;
};
@@ -301,11 +307,13 @@
&gsw_phy2_led0 {
status = "okay";
function = LED_FUNCTION_LAN;
color = <LED_COLOR_ID_GREEN>;
};
&gsw_phy2_led1 {
status = "okay";
function = LED_FUNCTION_LAN;
color = <LED_COLOR_ID_AMBER>;
};
@@ -316,11 +324,13 @@
&gsw_phy3_led0 {
status = "okay";
function = LED_FUNCTION_LAN;
color = <LED_COLOR_ID_GREEN>;
};
&gsw_phy3_led1 {
status = "okay";
function = LED_FUNCTION_LAN;
color = <LED_COLOR_ID_AMBER>;
};
@@ -603,6 +613,81 @@
mediatek,pull-down-adv = <0>; /* bias-disable */
};
gbe1_led0_pins: gbe1-led0-pins {
mux {
function = "led";
groups = "gbe1_led0";
};
};
gbe2_led0_pins: gbe2-led0-pins {
mux {
function = "led";
groups = "gbe2_led0";
};
};
gbe3_led0_pins: gbe3-led0-pins {
mux {
function = "led";
groups = "gbe3_led0";
};
};
gbe1_led1_pins: gbe1-led1-pins {
mux {
function = "led";
groups = "gbe1_led1";
};
};
gbe2_led1_pins: gbe2-led1-pins {
mux {
function = "led";
groups = "gbe2_led1";
};
};
gbe3_led1_pins: gbe3-led1-pins {
mux {
function = "led";
groups = "gbe3_led1";
};
};
i2c0_pins: i2c0-g0-pins {
mux {
function = "i2c";
groups = "i2c0_1";
};
};
i2c1_pins: i2c1-g0-pins {
mux {
function = "i2c";
groups = "i2c1_0";
};
};
mdio0_pins: mdio0-pins {
mux {
function = "eth";
groups = "mdc_mdio0";
};
conf {
groups = "mdc_mdio0";
drive-strength = <MTK_DRIVE_8mA>;
};
};
mmc0_pins_emmc_51: mmc0-emmc-51-pins {
mux {
function = "flash";
groups = "emmc_51";
};
};
pcie0_1_pins: pcie0-pins-g1 {
mux {
function = "pcie";
@@ -617,6 +702,13 @@
};
};
spi0_flash_pins: spi0-flash-pins {
mux {
function = "spi";
groups = "spi0", "spi0_wp_hold";
};
};
sfp_i2c_pins: sfp-i2c-pins {
conf-scl {
pins = "LED_A";
@@ -643,6 +735,8 @@
groups = "uart2";
};
};
};
&pwm {
@@ -700,11 +794,11 @@
status = "okay";
};
&uart0 {
&serial0 {
status = "okay";
};
&uart1 {
&serial1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins>;
status = "okay";
@@ -712,7 +806,7 @@
/* Airoha AG3352 GPS */
};
&uart2 {
&serial2 {
pinctrl-names = "default";
pinctrl-0 = <&uart2_pins>;
status = "okay";
@@ -724,6 +818,6 @@
status = "okay";
};
&xphy {
&xsphy {
status = "okay";
};

4
target/linux/mediatek/dts/mt7988d-asus-zenwifi-bt8.dts
View File

@@ -21,8 +21,8 @@
compatible = "u-boot-dont-touch-spi-nand";
reg = <0>;
spi-max-frequency = <52000000>;
spi-tx-buswidth = <4>;
spi-rx-buswidth = <4>;
spi-tx-bus-width = <4>;
spi-rx-bus-width = <4>;
partitions {
compatible = "fixed-partitions";

37
target/linux/mediatek/dts/mt7988d-asus-zenwifi-bt8.dtsi
View File

@@ -78,7 +78,7 @@
/ {
aliases {
serial0 = &uart0;
serial0 = &serial0;
label-mac-device = &gmac0;
led-boot = &led_status_green;
led-failsafe = &led_status_red;
@@ -189,11 +189,6 @@
status = "okay";
};
&int_2p5g_phy {
pinctrl-names = "i2p5gbe-led";
pinctrl-0 = <&i2p5gbe_led0_pins>;
};
&gmac2 {
phy-mode = "2500base-x";
phy = <&phy5>;
@@ -307,6 +302,32 @@
mediatek,pull-down-adv = <0>; /* bias-disable */
};
mdio0_pins: mdio0-pins {
mux {
function = "eth";
groups = "mdc_mdio0";
};
conf {
groups = "mdc_mdio0";
drive-strength = <MTK_DRIVE_8mA>;
};
};
i2c0_pins: i2c0-g0-pins {
mux {
function = "i2c";
groups = "i2c0_1";
};
};
spi0_flash_pins: spi0-flash-pins {
mux {
function = "spi";
groups = "spi0", "spi0_wp_hold";
};
};
pcie0_1_pins: pcie0-pins-g1 {
mux {
function = "pcie";
@@ -352,7 +373,7 @@
status = "okay";
};
&uart0 {
&serial0 {
status = "okay";
};
@@ -360,7 +381,7 @@
status = "okay";
};
&xphy {
&xsphy {
status = "okay";
};

12
target/linux/mediatek/dts/mt7988d-smartrg-SDG-8733A.dts
View File

@@ -88,6 +88,13 @@
};
&pio {
i2p5gbe_led0_pins: 2p5gbe-led0-pins {
mux {
function = "led";
groups = "2p5gbe_led0";
};
};
pcie3_1_pins: pcie3-pins-g1 {
mux {
function = "pcie";
@@ -129,6 +136,7 @@
&i2p5gbe_led0 {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_LAN;
status = "okay";
};
@@ -148,10 +156,10 @@
status = "disabled";
};
&uart1 {
&serial1 {
status = "disabled";
};
&xphy {
&xsphy {
status = "disabled";
};