TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #392 from BU-Automation/topc/ok/fix-model

Browse Source 
arm64: dts: : k3-am623-pfc: update model strings for PFC300 and PFC400
This commit is contained in:
Oleg KARFICH
2025-11-27 08:42:10 +01:00
committed by GitHub Enterprise
parent 12bea14158 8c50523c43
commit e86ede0ad3
9 changed files with 394 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm64/boot/dts/ti/k3-am623-pfc-750-8302.dts
+24 -26
View File
@@ -14,7 +14,7 @@
#include "k3-am623-pfc-rtc.dtsi"
/ {
model = "WAGO PFC300 750-8302";
model = "PFC300-750-8302";
compatible = "ti,am623-pfc", "ti,am625";
aliases {
@@ -22,25 +22,25 @@
ethernet1 = &cpsw_port2;
};
cpus {
cpu-map {
cluster0 {
/delete-node/ core2;
/delete-node/ core3;
};
};
cpus {
cpu-map {
cluster0 {
/delete-node/ core2;
/delete-node/ core3;
};
};
cpu@0 {
cpu-supply = <&buck1_30_reg>;
};
cpu@0 {
cpu-supply = <&buck1_30_reg>;
};
cpu@1 {
cpu-supply = <&buck1_30_reg>;
};
cpu@1 {
cpu-supply = <&buck1_30_reg>;
};
/delete-node/ cpu@2;
/delete-node/ cpu@3;
};
/delete-node/ cpu@2;
/delete-node/ cpu@3;
};
memory@80000000 {
device_type = "memory";
@@ -103,14 +103,14 @@
vdd_mmc1: regulator-3 {
compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&vdd_sd_dv_pins_default>;
pinctrl-names = "default";
pinctrl-0 = <&vdd_sd_dv_pins_default>;
regulator-name = "vdd_mmc1";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-boot-on;
vin-supply = <&vcc_3v3_sys>;
gpio = <&main_gpio0 31 GPIO_ACTIVE_LOW>;
gpio = <&main_gpio0 31 GPIO_ACTIVE_HIGH>;
enable-active-high;
startup-delay-us = <5000>;
};
@@ -231,7 +231,7 @@
&wsysinit {
status = "okay";
board,variant = "pfc300";
board,variant = "pfc300";
};
&oms {
@@ -320,9 +320,7 @@
&sdhci1 { /* SD */
status = "okay";
vmmc-supply = <&vdd_mmc1>;
cap-sd-highspeed;
no-1-8-v;
};
@@ -351,9 +349,9 @@
&cpsw3g_mdio {
status = "okay";
reset-gpios = <&main_gpio1 9 GPIO_ACTIVE_LOW>;
reset-delay-us = <10>;
reset-post-delay-us = <10000>;
reset-gpios = <&main_gpio1 9 GPIO_ACTIVE_LOW>;
reset-delay-us = <10>;
reset-post-delay-us = <10000>;
cpsw3g_phy0: ethernet-phy@0 {
// ADIN1300
arch/arm64/boot/dts/ti/k3-am623-pfc-750-830x-common.dtsi
+1 -1
View File
@@ -2,7 +2,7 @@
&main_i2c0 {
#include "k3-am623-pfc-750-830x-leds.dtsi"
#include "k3-am623-pfc-750-830x-leds.dtsi"
tps65219_30: pmic@30 {
compatible = "ti,tps65219";
arch/arm64/boot/dts/ti/k3-am623-pfc-750-830x-leds.dtsi
+111 -111
View File
@@ -1,143 +1,143 @@
// SPDX-License-Identifier: GPL-2.0
led_bar60: pca9552@60 {
compatible = "nxp,pca9552";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x60>;
compatible = "nxp,pca9552";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x60>;
lb60_0: sys-red@0 {
label = "sys-red";
reg = <0>;
linux,default-trigger = "timer";
};
lb60_0: sys-red@0 {
label = "sys-red";
reg = <0>;
linux,default-trigger = "timer";
};
lb60_1: sys-green@1 {
label = "sys-green";
reg = <1>;
linux,default-trigger = "timer";
};
lb60_1: sys-green@1 {
label = "sys-green";
reg = <1>;
linux,default-trigger = "timer";
};
lb60_2: run-red@2 {
label = "run-red";
reg = <2>;
};
lb60_2: run-red@2 {
label = "run-red";
reg = <2>;
};
lb60_3: run-green@3 {
label = "run-green";
reg = <3>;
};
lb60_3: run-green@3 {
label = "run-green";
reg = <3>;
};
lb60_4: io-red@4 {
label = "io-red";
reg = <4>;
};
lb60_4: io-red@4 {
label = "io-red";
reg = <4>;
};
lb60_5: io-green@5 {
label = "io-green";
reg = <5>;
};
lb60_5: io-green@5 {
label = "io-green";
reg = <5>;
};
lb60_6: ms-red@6 {
label = "ms-red";
reg = <6>;
};
lb60_6: ms-red@6 {
label = "ms-red";
reg = <6>;
};
lb60_7: ms-green@7 {
label = "ms-green";
reg = <7>;
};
lb60_7: ms-green@7 {
label = "ms-green";
reg = <7>;
};
lb60_8: ns-red@8 {
label = "ns-red";
reg = <8>;
};
lb60_8: ns-red@8 {
label = "ns-red";
reg = <8>;
};
lb60_9: ns-green@9 {
label = "ns-green";
reg = <9>;
};
lb60_9: ns-green@9 {
label = "ns-green";
reg = <9>;
};
lb60_10: usr_r@10 {
label = "trm-red";
reg = <10>;
};
lb60_10: usr_r@10 {
label = "trm-red";
reg = <10>;
};
lb60_11: usr_g@11 {
label = "trm-green";
reg = <11>;
};
lb60_11: usr_g@11 {
label = "trm-green";
reg = <11>;
};
lb60_15: sys-over-red@15 {
label = "sys-over-red";
reg = <15>;
linux,default-trigger = "default-on";
};
lb60_15: sys-overwrite@15 {
label = "sys-overwrite";
reg = <15>;
linux,default-trigger = "default-on";
};
};
led_bar61: pca9552@61 {
compatible = "nxp,pca9552";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x61>;
compatible = "nxp,pca9552";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x61>;
lb61_0: u6-red@0 {
label = "u6-red";
reg = <0>;
};
lb61_0: u6-red@0 {
label = "u6-red";
reg = <0>;
};
lb61_1: u6-green@1 {
label = "u6-green";
reg = <1>;
};
lb61_1: u6-green@1 {
label = "u6-green";
reg = <1>;
};
lb61_2: u5-red@2 {
label = "u5-red";
reg = <2>;
};
lb61_2: u5-red@2 {
label = "u5-red";
reg = <2>;
};
lb61_3: u5-green@3 {
label = "u5-green";
reg = <3>;
};
lb61_3: u5-green@3 {
label = "u5-green";
reg = <3>;
};
lb61_4: u4-red@4 {
label = "u4-red";
reg = <4>;
};
lb61_4: u4-red@4 {
label = "u4-red";
reg = <4>;
};
lb61_5: u4-green@5 {
label = "u4-green";
reg = <5>;
};
lb61_5: u4-green@5 {
label = "u4-green";
reg = <5>;
};
lb61_6: u3-red@6 {
label = "u3-red";
reg = <6>;
};
lb61_6: u3-red@6 {
label = "u3-red";
reg = <6>;
};
lb61_7: u3-green@7 {
label = "u3-green";
reg = <7>;
};
lb61_7: u3-green@7 {
label = "u3-green";
reg = <7>;
};
lb61_8: u2-red@8 {
label = "u2-red";
reg = <8>;
};
lb61_8: u2-red@8 {
label = "u2-red";
reg = <8>;
};
lb61_9: u2-green@9 {
label = "u2-green";
reg = <9>;
};
lb61_9: u2-green@9 {
label = "u2-green";
reg = <9>;
};
lb61_10: u1-red@10 {
label = "u1-red";
reg = <10>;
};
lb61_10: u1-red@10 {
label = "u1-red";
reg = <10>;
};
lb61_11: u1-green@11 {
label = "u1-green";
reg = <11>;
};
lb61_11: u1-green@11 {
label = "u1-green";
reg = <11>;
};
};
arch/arm64/boot/dts/ti/k3-am623-pfc-750-8400.dts
+1 -1
View File
@@ -13,5 +13,5 @@
&wsysinit {
status = "okay";
board,variant = "pfc400";
board,variant = "pfc400";
};
arch/arm64/boot/dts/ti/k3-am623-pfc-750-84xx-baseboard.dtsi
+16 -16
View File
@@ -7,23 +7,23 @@
*/
&main_pmx0 {
main_ksz9477_pins: main-ksz9477-pins {
main_ksz9477_pins: main-ksz9477-pins {
pinctrl-single,pins = <
AM62X_IOPAD(0x01a0, PIN_OUTPUT, 7) /* (E18) MCASP0_AXR0.GPIO1_10 nRST-RGMII2 / nRST-ETHSW (BB) */
AM62X_IOPAD(0x0034, PIN_INPUT, 7) /* (H21) OSPI0_CSn2.GPIO0_13 nINT-RGMII2 / nINT-ETHSW(BB) */
>;
};
};
};
&mcu_spi0 {
ksz9477@0 {
compatible = "microchip,ksz9477";
pinctrl-names = "default";
pinctrl-0 = <&main_ksz9477_pins>;
pinctrl-names = "default";
pinctrl-0 = <&main_ksz9477_pins>;
reg = <0>;
spi-max-frequency = <1000000>;
reset-gpios = <&main_gpio1 10 GPIO_ACTIVE_LOW>;
reset-gpios = <&main_gpio1 10 GPIO_ACTIVE_LOW>;
dsa,member = <0 0>;
@@ -65,19 +65,19 @@
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&cpsw3g>; /* &eth0 */
phy-mode = "rgmii-txid";
reg = <5>;
label = "cpu";
ethernet = <&cpsw3g>; /* &eth0 */
phy-mode = "rgmii-txid";
tx-internal-delay-ps = <2000>;
fixed-link {
speed = <1000>;
full-duplex;
};
};
};
};
fixed-link {
speed = <1000>;
full-duplex;
};
};
};
};
};
&main_i2c1 {
arch/arm64/boot/dts/ti/k3-am623-pfc-750-84xx-interaction.dtsi
+177 -90
View File
@@ -27,114 +27,201 @@
pagesize = <16>;
};
/*
* NXP PCA9552BS
* 16-Bit I²C-Bus LED Driver
*/
led_bar60: pca9552@60 {
compatible = "nxp,pca9552";
/*
* NXP PCA9552BS
* 16-Bit I²C-Bus LED Driver
*/
led_bar60: pca9552@60 {
compatible = "nxp,pca9552";
pinctrl-names = "default";
pinctrl-0 = <&led_reset_pins_default>;
#address-cells = <1>;
#size-cells = <0>;
reg = <0x60>;
#address-cells = <1>;
#size-cells = <0>;
reg = <0x60>;
lb60_0: sys-red@0 {
label = "sys-red";
reg = <0>;
linux,default-trigger = "timer";
};
lb60_0: sys-red@0 {
label = "sys-red";
reg = <0>;
linux,default-trigger = "timer";
};
lb60_1: sys-green@1 {
label = "sys-green";
reg = <1>;
linux,default-trigger = "timer";
};
lb60_1: sys-green@1 {
label = "sys-green";
reg = <1>;
linux,default-trigger = "timer";
};
lb60_2: sys-blue@2 {
label = "sys-blue";
reg = <2>;
};
lb60_2: sys-blue@2 {
label = "sys-blue";
reg = <2>;
};
lb60_3: run-red@3 {
label = "run-red";
reg = <3>;
};
lb60_3: run-red@3 {
label = "run-red";
reg = <3>;
};
lb60_4: run-green@4 {
label = "run-green";
reg = <4>;
};
lb60_4: run-green@4 {
label = "run-green";
reg = <4>;
};
lb60_5: run-blue@5 {
label = "run-blue";
reg = <5>;
};
lb60_5: run-blue@5 {
label = "run-blue";
reg = <5>;
};
lb60_6: io-red@6 {
label = "io-red";
reg = <6>;
};
lb60_6: io-red@6 {
label = "io-red";
reg = <6>;
};
lb60_7: io-green@7 {
label = "io-green";
reg = <7>;
};
lb60_7: io-green@7 {
label = "io-green";
reg = <7>;
};
lb60_8: io-blue@8 {
label = "io-blue";
reg = <8>;
};
lb60_8: io-blue@8 {
label = "io-blue";
reg = <8>;
};
lb60_9: ms-red@9 {
label = "ms-red";
reg = <9>;
};
lb60_9: eb-red@9 {
label = "eb-red";
reg = <9>;
};
lb60_10: ms-green@10 {
label = "ms-green";
reg = <10>;
};
lb60_10: eb-green@10 {
label = "eb-green";
reg = <10>;
};
lb60_11: ms-blue@11 {
label = "ms-blue";
reg = <11>;
};
lb60_11: eb-blue@11 {
label = "eb-blue";
reg = <11>;
};
lb60_12: usr_r@12 {
label = "trm-red";
reg = <12>;
};
lb60_12: u1-red@12 {
label = "u1-red";
reg = <12>;
};
lb60_13: usr_g@13 {
label = "trm-green";
reg = <13>;
};
lb60_13: u1-green@13 {
label = "u1-green";
reg = <13>;
};
lb60_14: usr_b@14 {
label = "trm-blue";
reg = <14>;
};
lb60_14: u1-blue@14 {
label = "u1-blue";
reg = <14>;
};
lb60_15: sys-over-red@15 {
label = "sys-over-red";
reg = <15>;
linux,default-trigger = "default-on";
};
};
lb60_15: sys-overwrite@15 {
label = "sys-overwrite";
reg = <15>;
linux,default-trigger = "default-on";
};
};
/*
* Dynamic NFC/RFID tag IC with 4-Kbit EEPROM
*
* This driver is not yet upstream but there is a kernel driver available at:
*
* https://github.com/2pecshy/eeprom-ST25DV-linux-driver/tree/master
*
*/
st25dv04k: st25dv04k@53 {
status = "okay";
compatible = "st25dv,st25dv04k";
reg = <0x53>;
};
/*
* NXP PCA9552BS
* 16-Bit I²C-Bus LED Driver
*/
led_bar61: pca9552@61 {
compatible = "nxp,pca9552";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x61>;
lb61_0: u2-red@0 {
label = "u2-red";
reg = <0>;
};
lb61_1: u2-green@1 {
label = "u2-green";
reg = <1>;
};
lb61_2: u2-blue@2 {
label = "u2-blue";
reg = <2>;
};
lb61_3: u3-red@3 {
label = "u3-red";
reg = <3>;
};
lb61_4: u3-green@4 {
label = "u3-green";
reg = <4>;
};
lb61_5: u3-blue@5 {
label = "u3-blue";
reg = <5>;
};
lb61_6: u4-red@6 {
label = "u4-red";
reg = <6>;
};
lb61_7: u4-green@7 {
label = "u4-green";
reg = <7>;
};
lb61_8: u4-blue@8 {
label = "u4-blue";
reg = <8>;
};
lb61_9: u5-red@9 {
label = "u5-red";
reg = <9>;
};
lb61_10: u5-green@10 {
label = "u5-green";
reg = <10>;
};
lb61_11: u5-blue@11 {
label = "u5-blue";
reg = <11>;
};
lb61_12: u6_r@12 {
label = "u6-red";
reg = <12>;
};
lb61_13: u6_g@13 {
label = "u6-green";
reg = <13>;
};
lb61_14: u6_b@14 {
label = "u6-blue";
reg = <14>;
};
};
/*
* Dynamic NFC/RFID tag IC with 4-Kbit EEPROM
*
* This driver is not yet upstream but there is a kernel driver available at:
*
* https://github.com/2pecshy/eeprom-ST25DV-linux-driver/tree/master
*
*/
st25dv04k: st25dv04k@53 {
status = "okay";
compatible = "st25dv,st25dv04k";
reg = <0x53>;
};
};
arch/arm64/boot/dts/ti/k3-am623-pfc-750-84xx-kbus.dtsi
+1 -1
View File
@@ -71,7 +71,7 @@
};
&main_i2c1 {
eeprom_hw_id_kbus: at24c02@50 {
eeprom_hw_id_lb: at24c02@50 {
status = "disabled";
compatible = "atmel,24c02";
reg = <0x50>;
arch/arm64/boot/dts/ti/k3-am623-pfc-750-84xx-wosm.dtsi
+53 -38
View File
@@ -10,7 +10,7 @@
#include "k3-am623-pfc-tpm.dtsi"
/ {
model = "WAGO PFC400 750-8400";
model = "PFC400-750-8400";
compatible = "ti,am623-pfc", "ti,am625";
aliases {
@@ -18,23 +18,23 @@
ethernet0 = &cpsw_port2;
};
cpus {
cpu@0 {
cpu-supply = <&buck1_30_reg>;
};
cpus {
cpu@0 {
cpu-supply = <&buck1_30_reg>;
};
cpu@1 {
cpu-supply = <&buck1_30_reg>;
};
cpu@1 {
cpu-supply = <&buck1_30_reg>;
};
cpu@2 {
cpu-supply = <&buck1_30_reg>;
};
cpu@2 {
cpu-supply = <&buck1_30_reg>;
};
cpu@3 {
cpu-supply = <&buck1_30_reg>;
};
};
cpu@3 {
cpu-supply = <&buck1_30_reg>;
};
};
memory@80000000 {
device_type = "memory";
@@ -53,6 +53,21 @@
regulator-always-on;
regulator-boot-on;
};
ldo1_sd_1v8_reg: ldo1-sd-1v8-reg {
/* Output VLDO1 of tps65219 */
compatible = "regulator-gpio";
regulator-name = "VDDSHV_SD_1V8_IO_PMIC_GPIO";
pinctrl-names = "default";
pinctrl-0 = <&mcu_sd_vsel_pin>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
regulator-boot-on;
vin-supply = <&vcc_5v0>;
gpios = <&mcu_gpio0 10 GPIO_ACTIVE_HIGH>;
states = <1800000 0x0>,
<3300000 0x1>;
};
};
&mcu_pmx0 {
@@ -64,6 +79,12 @@
AM64X_MCU_IOPAD(0x010, PIN_OUTPUT, 0) /* (C9) MCU_SPI0_D1 MOSI */
>;
};
mcu_sd_vsel_pin: mcu-sd-vsel-pins {
pinctrl-single,pins = <
AM64X_MCU_IOPAD(0x028, PIN_OUTPUT, 7) /* (C5) WKUP_UART0_TXD.MCU_GPIO0_10 */
>;
};
};
&main_pmx0 {
@@ -147,11 +168,11 @@
pinctrl-0 = <&ospi0_pins_default>;
status = "okay";
/* Everspin Tech. EM008LXO
* Order-No EM008LXOAB320IS1R
*/
/* Everspin Tech. EM008LXO
* Order-No EM008LXOAB320IS1R
*/
mram: mram@0 {
pinctrl-names = "default";
pinctrl-names = "default";
pinctrl-0 = <&mram_irq_pins_default>;
interrupt-parent = <&main_gpio0>;
@@ -162,7 +183,7 @@
spi-tx-bus-width = <8>;
spi-rx-bus-width = <8>;
spi-max-frequency = <200000000>;
m25p,fast-read;
m25p,fast-read;
cdns,tshsl-ns = <60>;
cdns,tsd2d-ns = <60>;
@@ -182,7 +203,7 @@
pagesize = <16>;
};
tps65219: pmic@30 {
tps65219_30: pmic@30 {
compatible = "ti,tps65219";
reg = <0x30>;
system-power-controller;
@@ -201,16 +222,16 @@
interrupt-parent = <&main_gpio0>;
interrupts = <68 IRQ_TYPE_EDGE_FALLING>;
/* NOTICE:
*
* We could use "tps65219-gpio" here with GPO1 (EN-DCDC-1V8)
* and GPO2 (CARRIER_PWR_EN for SD-Card and I2C1 devices) enabled,
* but will skip it for now and trust the bootloader or TPS-NVM for the
* correct settings correctly.
*
* For now we declare vcc_1v8_sys as being fixed.
*
*/
/* NOTICE:
*
* We could use "tps65219-gpio" here with GPO1 (EN-DCDC-1V8)
* and GPO2 (CARRIER_PWR_EN for SD-Card and I2C1 devices) enabled,
* but will skip it for now and trust the bootloader or TPS-NVM for the
* correct settings correctly.
*
* For now we declare vcc_1v8_sys as being fixed.
*
*/
regulators {
buck1_30_reg: buck1 {
regulator-name = "VDD_CORE";
@@ -236,12 +257,6 @@
regulator-always-on;
};
ldo1_30_sd_1v8_reg: ldo1 {
regulator-name = "VDDSHV_SD_1V8_IO_PMIC";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
ldo2_30_reg: ldo2 {
regulator-name = "VDDAR_CORE";
regulator-min-microvolt = <850000>;
@@ -281,7 +296,7 @@
status = "okay";
vmmc-supply = <&vcc_3v3_sys>;
vqmmc-supply = <&ldo1_30_sd_1v8_reg>;
vqmmc-supply = <&ldo1_sd_1v8_reg>;
};
&cpsw3g {
arch/arm64/boot/dts/ti/k3-am623-pfc-750-8xxx-common.dtsi
+10 -14
View File
@@ -9,7 +9,6 @@
#include <dt-bindings/leds/common.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/net/ti-dp83867.h>
#include "k3-am625.dtsi"
/ {
@@ -25,7 +24,6 @@
watchdog0 = &main_rti0;
watchdog1 = &watchdog_ext;
watchdog2 = &main_rti1;
eeprom_typelabel = &eeprom_type_label;
};
opp-table {
@@ -309,16 +307,14 @@
};
};
&sdhci0 {
/* eMMC */
&sdhci0 { /* eMMC */
pinctrl-names = "default";
pinctrl-0 = <&main_mmc0_pins_default>;
ti,driver-strength-ohm = <33>;
disable-wp;
};
&sdhci1 {
/* SD */
&sdhci1 { /* SD */
pinctrl-names = "default";
pinctrl-0 = <&main_mmc1_pins_default>;
ti,driver-strength-ohm = <33>;
@@ -336,24 +332,24 @@
* This system watchdog is reserved for internal use and is not user-configurable.
* It must not be modified or deleted to ensure consistent behavior!
*/
&main_rti1 { // watchdog@e010000
timeout-sec = <120>;
&main_rti1 { // watchdog@e010000
timeout-sec = <120>;
};
/*
* AM6232 does not have main_rti2, main_rti3, and main_rti15
* https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1218039/am623-stuck-in-sd-card-after-boot-up
*/
&main_rti2 { // watchdog@e020000
status = "disabled";
&main_rti2 { // watchdog@e020000
status = "disabled";
};
&main_rti3 { // watchdog@e030000
status = "disabled";
&main_rti3 { // watchdog@e030000
status = "disabled";
};
&main_rti15 { // watchdog@e0f0000
status = "disabled";
&main_rti15 { // watchdog@e0f0000
status = "disabled";
};
&usbss0 {