Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-09-21 15:12:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

arm: dts: k3-am642: Sync with kernel v6.6-rc1

Browse source 
Sync device tree with v6.6-rc1

Signed-off-by: Nishanth Menon <nm@ti.com>
This commit is contained in:
Nishanth Menon 2023-09-11 09:44:01 -05:00 committed by Tom Rini
parent dfefb85f40
commit be226cd6ba
3 changed files with 25 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
arch/arm/dts/k3-am64-main.dtsi
View file

@ -44,11 +44,28 @@
#size-cells = <1>; #size-cells = <1>;
ranges = <0x0 0x0 0x43000000 0x20000>; ranges = <0x0 0x0 0x43000000 0x20000>;
chipid@14 {
compatible = "ti,am654-chipid";
reg = <0x00000014 0x4>;
};
serdes_ln_ctrl: mux-controller { serdes_ln_ctrl: mux-controller {
compatible = "mmio-mux"; compatible = "mmio-mux";
#mux-control-cells = <1>; #mux-control-cells = <1>;
mux-reg-masks = <0x4080 0x3>; /* SERDES0 lane0 select */ mux-reg-masks = <0x4080 0x3>; /* SERDES0 lane0 select */
}; };
phy_gmii_sel: phy@4044 {
compatible = "ti,am654-phy-gmii-sel";
reg = <0x4044 0x8>;
#phy-cells = <1>;
};
epwm_tbclk: clock-controller@4140 {
compatible = "ti,am64-epwm-tbclk";
reg = <0x4130 0x4>;
#clock-cells = <1>;
};
}; };
gic500: interrupt-controller@1800000 { gic500: interrupt-controller@1800000 {
@ -203,31 +220,6 @@
pinctrl-single,function-mask = <0xffffffff>; pinctrl-single,function-mask = <0xffffffff>;
}; };
main_conf: syscon@43000000 {
compatible = "syscon", "simple-mfd";
reg = <0x00 0x43000000 0x00 0x20000>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x00 0x00 0x43000000 0x20000>;
chipid@14 {
compatible = "ti,am654-chipid";
reg = <0x00000014 0x4>;
};
phy_gmii_sel: phy@4044 {
compatible = "ti,am654-phy-gmii-sel";
reg = <0x4044 0x8>;
#phy-cells = <1>;
};
epwm_tbclk: clock@4140 {
compatible = "ti,am64-epwm-tbclk", "syscon";
reg = <0x4130 0x4>;
#clock-cells = <1>;
};
};
main_timer0: timer@2400000 { main_timer0: timer@2400000 {
compatible = "ti,am654-timer"; compatible = "ti,am654-timer";
reg = <0x00 0x2400000 0x00 0x400>; reg = <0x00 0x2400000 0x00 0x400>;
@ -733,7 +725,7 @@
pinctrl-single,function-mask = <0x000107ff>; pinctrl-single,function-mask = <0x000107ff>;
}; };
usbss0: cdns-usb@f900000{ usbss0: cdns-usb@f900000 {
compatible = "ti,am64-usb"; compatible = "ti,am64-usb";
reg = <0x00 0xf900000 0x00 0x100>; reg = <0x00 0xf900000 0x00 0x100>;
power-domains = <&k3_pds 161 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 161 TI_SCI_PD_EXCLUSIVE>;
@ -744,7 +736,7 @@
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
ranges; ranges;
usb0: usb@f400000{ usb0: usb@f400000 {
compatible = "cdns,usb3"; compatible = "cdns,usb3";
reg = <0x00 0xf400000 0x00 0x10000>, reg = <0x00 0xf400000 0x00 0x10000>,
<0x00 0xf410000 0x00 0x10000>, <0x00 0xf410000 0x00 0x10000>,
@ -773,6 +765,7 @@
assigned-clock-parents = <&k3_clks 0 3>; assigned-clock-parents = <&k3_clks 0 3>;
assigned-clock-rates = <60000000>; assigned-clock-rates = <60000000>;
clock-names = "fck"; clock-names = "fck";
status = "disabled";
adc { adc {
#io-channel-cells = <1>; #io-channel-cells = <1>;
@ -802,6 +795,7 @@
assigned-clock-parents = <&k3_clks 75 7>; assigned-clock-parents = <&k3_clks 75 7>;
assigned-clock-rates = <166666666>; assigned-clock-rates = <166666666>;
power-domains = <&k3_pds 75 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 75 TI_SCI_PD_EXCLUSIVE>;
status = "disabled";
}; };
}; };

2
arch/arm/dts/k3-am642-evm.dts
View file

@ -10,6 +10,7 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/net/ti-dp83867.h> #include <dt-bindings/net/ti-dp83867.h>
#include "k3-am642.dtsi" #include "k3-am642.dtsi"
#include "k3-serdes.h" #include "k3-serdes.h"
/ { / {
@ -519,6 +520,7 @@
}; };
&ospi0 { &ospi0 {
status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ospi0_pins_default>; pinctrl-0 = <&ospi0_pins_default>;

6
arch/arm/dts/k3-am642-sk.dts
View file

@ -10,6 +10,7 @@
#include <dt-bindings/net/ti-dp83867.h> #include <dt-bindings/net/ti-dp83867.h>
#include <dt-bindings/leds/common.h> #include <dt-bindings/leds/common.h>
#include "k3-am642.dtsi" #include "k3-am642.dtsi"
#include "k3-serdes.h" #include "k3-serdes.h"
/ { / {
@ -512,11 +513,8 @@
}; };
}; };
&tscadc0 {
status = "disabled";
};
&ospi0 { &ospi0 {
status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ospi0_pins_default>; pinctrl-0 = <&ospi0_pins_default>;