On 20:55-20230406, Sjoerd Simons wrote:
> Update the am62 and am625 device-trees from linux v6.3-rc5 This needed the
> following
> tweaks to the u-boot specific dtsi as well:
> - Switch tick-timer to the main_timer as it's now defined in the main dtsi
> - Add mdio pins to the cpsw3g pinctrl. It moved to a subnode in the
> linux dtsi that u-boot doesn't use/support
>
> Signed-off-by: Sjoerd Simons <sjo...@collabora.com>
>
> ---
>
> Changes in v2:
> - Update dts sync to v6.3-rc5
Reviewed-by: Nishanth Menon <n...@ti.com>
Note to self: I think we should probably refactor r5-sk.dtsi to make the
common pieces to be included from a common soc-r5.dtsi.
>
> arch/arm/dts/k3-am62-main.dtsi | 259 ++++++++++++++++++++++++---
> arch/arm/dts/k3-am62-mcu.dtsi | 49 +++++
> arch/arm/dts/k3-am62-wakeup.dtsi | 4 +-
> arch/arm/dts/k3-am625-r5-sk.dts | 2 +-
> arch/arm/dts/k3-am625-sk-u-boot.dtsi | 8 +-
> arch/arm/dts/k3-am625-sk.dts | 95 +++++-----
> arch/arm/dts/k3-am625.dtsi | 52 ++++++
> 7 files changed, 381 insertions(+), 88 deletions(-)
>
> diff --git a/arch/arm/dts/k3-am62-main.dtsi b/arch/arm/dts/k3-am62-main.dtsi
> index 4a42f1b2e31..ea683fd77d6 100644
> --- a/arch/arm/dts/k3-am62-main.dtsi
> +++ b/arch/arm/dts/k3-am62-main.dtsi
> @@ -54,6 +54,12 @@
> reg = <0x4044 0x8>;
> #phy-cells = <1>;
> };
> +
> + epwm_tbclk: clock@4130 {
> + compatible = "ti,am62-epwm-tbclk", "syscon";
> + reg = <0x4130 0x4>;
> + #clock-cells = <1>;
> + };
> };
>
> dmss: bus@48000000 {
> @@ -144,8 +150,8 @@
> compatible = "ti,k2g-sci";
> ti,host-id = <12>;
> mbox-names = "rx", "tx";
> - mboxes= <&secure_proxy_main 12>,
> - <&secure_proxy_main 13>;
> + mboxes = <&secure_proxy_main 12>,
> + <&secure_proxy_main 13>;
> reg-names = "debug_messages";
> reg = <0x00 0x44043000 0x00 0xfe0>;
>
> @@ -186,6 +192,102 @@
> pinctrl-single,function-mask = <0xffffffff>;
> };
>
> + main_timer0: timer@2400000 {
> + compatible = "ti,am654-timer";
> + reg = <0x00 0x2400000 0x00 0x400>;
> + interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&k3_clks 36 2>;
> + clock-names = "fck";
> + assigned-clocks = <&k3_clks 36 2>;
> + assigned-clock-parents = <&k3_clks 36 3>;
> + power-domains = <&k3_pds 36 TI_SCI_PD_EXCLUSIVE>;
> + ti,timer-pwm;
> + };
> +
> + main_timer1: timer@2410000 {
> + compatible = "ti,am654-timer";
> + reg = <0x00 0x2410000 0x00 0x400>;
> + interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&k3_clks 37 2>;
> + clock-names = "fck";
> + assigned-clocks = <&k3_clks 37 2>;
> + assigned-clock-parents = <&k3_clks 37 3>;
> + power-domains = <&k3_pds 37 TI_SCI_PD_EXCLUSIVE>;
> + ti,timer-pwm;
> + };
> +
> + main_timer2: timer@2420000 {
> + compatible = "ti,am654-timer";
> + reg = <0x00 0x2420000 0x00 0x400>;
> + interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&k3_clks 38 2>;
> + clock-names = "fck";
> + assigned-clocks = <&k3_clks 38 2>;
> + assigned-clock-parents = <&k3_clks 38 3>;
> + power-domains = <&k3_pds 38 TI_SCI_PD_EXCLUSIVE>;
> + ti,timer-pwm;
> + };
> +
> + main_timer3: timer@2430000 {
> + compatible = "ti,am654-timer";
> + reg = <0x00 0x2430000 0x00 0x400>;
> + interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&k3_clks 39 2>;
> + clock-names = "fck";
> + assigned-clocks = <&k3_clks 39 2>;
> + assigned-clock-parents = <&k3_clks 39 3>;
> + power-domains = <&k3_pds 39 TI_SCI_PD_EXCLUSIVE>;
> + ti,timer-pwm;
> + };
> +
> + main_timer4: timer@2440000 {
> + compatible = "ti,am654-timer";
> + reg = <0x00 0x2440000 0x00 0x400>;
> + interrupts = <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&k3_clks 40 2>;
> + clock-names = "fck";
> + assigned-clocks = <&k3_clks 40 2>;
> + assigned-clock-parents = <&k3_clks 40 3>;
> + power-domains = <&k3_pds 40 TI_SCI_PD_EXCLUSIVE>;
> + ti,timer-pwm;
> + };
> +
> + main_timer5: timer@2450000 {
> + compatible = "ti,am654-timer";
> + reg = <0x00 0x2450000 0x00 0x400>;
> + interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&k3_clks 41 2>;
> + clock-names = "fck";
> + assigned-clocks = <&k3_clks 41 2>;
> + assigned-clock-parents = <&k3_clks 41 3>;
> + power-domains = <&k3_pds 41 TI_SCI_PD_EXCLUSIVE>;
> + ti,timer-pwm;
> + };
> +
> + main_timer6: timer@2460000 {
> + compatible = "ti,am654-timer";
> + reg = <0x00 0x2460000 0x00 0x400>;
> + interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&k3_clks 42 2>;
> + clock-names = "fck";
> + assigned-clocks = <&k3_clks 42 2>;
> + assigned-clock-parents = <&k3_clks 42 3>;
> + power-domains = <&k3_pds 42 TI_SCI_PD_EXCLUSIVE>;
> + ti,timer-pwm;
> + };
> +
> + main_timer7: timer@2470000 {
> + compatible = "ti,am654-timer";
> + reg = <0x00 0x2470000 0x00 0x400>;
> + interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&k3_clks 43 2>;
> + clock-names = "fck";
> + assigned-clocks = <&k3_clks 43 2>;
> + assigned-clock-parents = <&k3_clks 43 3>;
> + power-domains = <&k3_pds 43 TI_SCI_PD_EXCLUSIVE>;
> + ti,timer-pwm;
> + };
> +
> main_uart0: serial@2800000 {
> compatible = "ti,am64-uart", "ti,am654-uart";
> reg = <0x00 0x02800000 0x00 0x100>;
> @@ -193,6 +295,7 @@
> power-domains = <&k3_pds 146 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 146 0>;
> clock-names = "fclk";
> + status = "disabled";
> };
>
> main_uart1: serial@2810000 {
> @@ -202,6 +305,7 @@
> power-domains = <&k3_pds 152 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 152 0>;
> clock-names = "fclk";
> + status = "disabled";
> };
>
> main_uart2: serial@2820000 {
> @@ -211,6 +315,7 @@
> power-domains = <&k3_pds 153 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 153 0>;
> clock-names = "fclk";
> + status = "disabled";
> };
>
> main_uart3: serial@2830000 {
> @@ -220,6 +325,7 @@
> power-domains = <&k3_pds 154 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 154 0>;
> clock-names = "fclk";
> + status = "disabled";
> };
>
> main_uart4: serial@2840000 {
> @@ -229,6 +335,7 @@
> power-domains = <&k3_pds 155 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 155 0>;
> clock-names = "fclk";
> + status = "disabled";
> };
>
> main_uart5: serial@2850000 {
> @@ -238,6 +345,7 @@
> power-domains = <&k3_pds 156 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 156 0>;
> clock-names = "fclk";
> + status = "disabled";
> };
>
> main_uart6: serial@2860000 {
> @@ -247,6 +355,7 @@
> power-domains = <&k3_pds 158 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 158 0>;
> clock-names = "fclk";
> + status = "disabled";
> };
>
> main_i2c0: i2c@20000000 {
> @@ -258,6 +367,7 @@
> power-domains = <&k3_pds 102 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 102 2>;
> clock-names = "fck";
> + status = "disabled";
> };
>
> main_i2c1: i2c@20010000 {
> @@ -269,6 +379,7 @@
> power-domains = <&k3_pds 103 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 103 2>;
> clock-names = "fck";
> + status = "disabled";
> };
>
> main_i2c2: i2c@20020000 {
> @@ -280,6 +391,7 @@
> power-domains = <&k3_pds 104 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 104 2>;
> clock-names = "fck";
> + status = "disabled";
> };
>
> main_i2c3: i2c@20030000 {
> @@ -291,6 +403,7 @@
> power-domains = <&k3_pds 105 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 105 2>;
> clock-names = "fck";
> + status = "disabled";
> };
>
> main_spi0: spi@20100000 {
> @@ -300,7 +413,8 @@
> #address-cells = <1>;
> #size-cells = <0>;
> power-domains = <&k3_pds 141 TI_SCI_PD_EXCLUSIVE>;
> - clocks = <&k3_clks 172 0>;
> + clocks = <&k3_clks 141 0>;
> + status = "disabled";
> };
>
> main_spi1: spi@20110000 {
> @@ -310,7 +424,8 @@
> #address-cells = <1>;
> #size-cells = <0>;
> power-domains = <&k3_pds 142 TI_SCI_PD_EXCLUSIVE>;
> - clocks = <&k3_clks 173 0>;
> + clocks = <&k3_clks 142 0>;
> + status = "disabled";
> };
>
> main_spi2: spi@20120000 {
> @@ -320,7 +435,8 @@
> #address-cells = <1>;
> #size-cells = <0>;
> power-domains = <&k3_pds 143 TI_SCI_PD_EXCLUSIVE>;
> - clocks = <&k3_clks 174 0>;
> + clocks = <&k3_clks 143 0>;
> + status = "disabled";
> };
>
> main_gpio_intr: interrupt-controller@a00000 {
> @@ -385,8 +501,11 @@
> ti,clkbuf-sel = <0x7>;
> ti,otap-del-sel-legacy = <0x0>;
> ti,otap-del-sel-mmc-hs = <0x0>;
> - ti,otap-del-sel-ddr52 = <0x9>;
> - ti,otap-del-sel-hs200 = <0x6>;
> + ti,otap-del-sel-ddr52 = <0x5>;
> + ti,otap-del-sel-hs200 = <0x5>;
> + ti,itap-del-sel-legacy = <0xa>;
> + ti,itap-del-sel-mmc-hs = <0x1>;
> + status = "disabled";
> };
>
> sdhci1: mmc@fa00000 {
> @@ -397,19 +516,20 @@
> clocks = <&k3_clks 58 5>, <&k3_clks 58 6>;
> clock-names = "clk_ahb", "clk_xin";
> ti,trm-icp = <0x2>;
> - ti,otap-del-sel-legacy = <0x0>;
> + ti,otap-del-sel-legacy = <0x8>;
> ti,otap-del-sel-sd-hs = <0x0>;
> - ti,otap-del-sel-sdr12 = <0xf>;
> - ti,otap-del-sel-sdr25 = <0xf>;
> - ti,otap-del-sel-sdr50 = <0xc>;
> - ti,otap-del-sel-sdr104 = <0x6>;
> - ti,otap-del-sel-ddr50 = <0x9>;
> - ti,itap-del-sel-legacy = <0x0>;
> - ti,itap-del-sel-sd-hs = <0x0>;
> - ti,itap-del-sel-sdr12 = <0x0>;
> - ti,itap-del-sel-sdr25 = <0x0>;
> + ti,otap-del-sel-sdr12 = <0x0>;
> + ti,otap-del-sel-sdr25 = <0x0>;
> + ti,otap-del-sel-sdr50 = <0x8>;
> + ti,otap-del-sel-sdr104 = <0x7>;
> + ti,otap-del-sel-ddr50 = <0x4>;
> + ti,itap-del-sel-legacy = <0xa>;
> + ti,itap-del-sel-sd-hs = <0x1>;
> + ti,itap-del-sel-sdr12 = <0xa>;
> + ti,itap-del-sel-sdr25 = <0x1>;
> ti,clkbuf-sel = <0x7>;
> bus-width = <4>;
> + status = "disabled";
> };
>
> sdhci2: mmc@fa20000 {
> @@ -420,18 +540,65 @@
> clocks = <&k3_clks 184 5>, <&k3_clks 184 6>;
> clock-names = "clk_ahb", "clk_xin";
> ti,trm-icp = <0x2>;
> - ti,otap-del-sel-legacy = <0x0>;
> + ti,otap-del-sel-legacy = <0x8>;
> ti,otap-del-sel-sd-hs = <0x0>;
> - ti,otap-del-sel-sdr12 = <0xf>;
> - ti,otap-del-sel-sdr25 = <0xf>;
> - ti,otap-del-sel-sdr50 = <0xc>;
> - ti,otap-del-sel-sdr104 = <0x6>;
> - ti,otap-del-sel-ddr50 = <0x9>;
> - ti,itap-del-sel-legacy = <0x0>;
> - ti,itap-del-sel-sd-hs = <0x0>;
> - ti,itap-del-sel-sdr12 = <0x0>;
> - ti,itap-del-sel-sdr25 = <0x0>;
> + ti,otap-del-sel-sdr12 = <0x0>;
> + ti,otap-del-sel-sdr25 = <0x0>;
> + ti,otap-del-sel-sdr50 = <0x8>;
> + ti,otap-del-sel-sdr104 = <0x7>;
> + ti,otap-del-sel-ddr50 = <0x8>;
> + ti,itap-del-sel-legacy = <0xa>;
> + ti,itap-del-sel-sd-hs = <0xa>;
> + ti,itap-del-sel-sdr12 = <0xa>;
> + ti,itap-del-sel-sdr25 = <0x1>;
> ti,clkbuf-sel = <0x7>;
> + status = "disabled";
> + };
> +
> + usbss0: dwc3-usb@f900000 {
> + compatible = "ti,am62-usb";
> + reg = <0x00 0x0f900000 0x00 0x800>;
> + clocks = <&k3_clks 161 3>;
> + clock-names = "ref";
> + ti,syscon-phy-pll-refclk = <&wkup_conf 0x4008>;
> + #address-cells = <2>;
> + #size-cells = <2>;
> + power-domains = <&k3_pds 178 TI_SCI_PD_EXCLUSIVE>;
> + ranges;
> + status = "disabled";
> +
> + usb0: usb@31000000 {
> + compatible = "snps,dwc3";
> + reg =<0x00 0x31000000 0x00 0x50000>;
> + interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>, /*
> irq.0 */
> + <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>; /*
> irq.0 */
> + interrupt-names = "host", "peripheral";
> + maximum-speed = "high-speed";
> + dr_mode = "otg";
> + };
> + };
> +
> + usbss1: dwc3-usb@f910000 {
> + compatible = "ti,am62-usb";
> + reg = <0x00 0x0f910000 0x00 0x800>;
> + clocks = <&k3_clks 162 3>;
> + clock-names = "ref";
> + ti,syscon-phy-pll-refclk = <&wkup_conf 0x4018>;
> + #address-cells = <2>;
> + #size-cells = <2>;
> + power-domains = <&k3_pds 179 TI_SCI_PD_EXCLUSIVE>;
> + ranges;
> + status = "disabled";
> +
> + usb1: usb@31100000 {
> + compatible = "snps,dwc3";
> + reg =<0x00 0x31100000 0x00 0x50000>;
> + interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>, /*
> irq.0 */
> + <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>; /*
> irq.0 */
> + interrupt-names = "host", "peripheral";
> + maximum-speed = "high-speed";
> + dr_mode = "otg";
> + };
> };
>
> fss: bus@fc00000 {
> @@ -456,6 +623,7 @@
> power-domains = <&k3_pds 75 TI_SCI_PD_EXCLUSIVE>;
> #address-cells = <1>;
> #size-cells = <0>;
> + status = "disabled";
> };
> };
>
> @@ -514,12 +682,13 @@
> clocks = <&k3_clks 13 0>;
> clock-names = "fck";
> bus_freq = <1000000>;
> + status = "disabled";
> };
>
> cpts@3d000 {
> compatible = "ti,j721e-cpts";
> reg = <0x00 0x3d000 0x00 0x400>;
> - clocks = <&k3_clks 13 1>;
> + clocks = <&k3_clks 13 3>;
> clock-names = "cpts";
> interrupts-extended = <&gic500 GIC_SPI 102
> IRQ_TYPE_LEVEL_HIGH>;
> interrupt-names = "cpts";
> @@ -551,6 +720,7 @@
> power-domains = <&k3_pds 51 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 51 0>;
> clock-names = "fck";
> + status = "disabled";
> };
>
> ecap1: pwm@23110000 {
> @@ -560,6 +730,7 @@
> power-domains = <&k3_pds 52 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 52 0>;
> clock-names = "fck";
> + status = "disabled";
> };
>
> ecap2: pwm@23120000 {
> @@ -569,6 +740,7 @@
> power-domains = <&k3_pds 53 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 53 0>;
> clock-names = "fck";
> + status = "disabled";
> };
>
> main_mcan0: can@20701000 {
> @@ -583,5 +755,36 @@
> <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
> interrupt-names = "int0", "int1";
> bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
> + status = "disabled";
> + };
> +
> + epwm0: pwm@23000000 {
> + compatible = "ti,am64-epwm", "ti,am3352-ehrpwm";
> + #pwm-cells = <3>;
> + reg = <0x00 0x23000000 0x00 0x100>;
> + power-domains = <&k3_pds 86 TI_SCI_PD_EXCLUSIVE>;
> + clocks = <&epwm_tbclk 0>, <&k3_clks 86 0>;
> + clock-names = "tbclk", "fck";
> + status = "disabled";
> + };
> +
> + epwm1: pwm@23010000 {
> + compatible = "ti,am64-epwm", "ti,am3352-ehrpwm";
> + #pwm-cells = <3>;
> + reg = <0x00 0x23010000 0x00 0x100>;
> + power-domains = <&k3_pds 87 TI_SCI_PD_EXCLUSIVE>;
> + clocks = <&epwm_tbclk 1>, <&k3_clks 87 0>;
> + clock-names = "tbclk", "fck";
> + status = "disabled";
> + };
> +
> + epwm2: pwm@23020000 {
> + compatible = "ti,am64-epwm", "ti,am3352-ehrpwm";
> + #pwm-cells = <3>;
> + reg = <0x00 0x23020000 0x00 0x100>;
> + power-domains = <&k3_pds 88 TI_SCI_PD_EXCLUSIVE>;
> + clocks = <&epwm_tbclk 2>, <&k3_clks 88 0>;
> + clock-names = "tbclk", "fck";
> + status = "disabled";
> };
> };
> diff --git a/arch/arm/dts/k3-am62-mcu.dtsi b/arch/arm/dts/k3-am62-mcu.dtsi
> index f56c803560f..a427231527c 100644
> --- a/arch/arm/dts/k3-am62-mcu.dtsi
> +++ b/arch/arm/dts/k3-am62-mcu.dtsi
> @@ -14,6 +14,51 @@
> pinctrl-single,function-mask = <0xffffffff>;
> };
>
> + /*
> + * The MCU domain timer interrupts are routed only to the ESM module,
> + * and not currently available for Linux. The MCU domain timers are
> + * of limited use without interrupts, and likely reserved by the ESM.
> + */
> + mcu_timer0: timer@4800000 {
> + compatible = "ti,am654-timer";
> + reg = <0x00 0x4800000 0x00 0x400>;
> + clocks = <&k3_clks 35 2>;
> + clock-names = "fck";
> + power-domains = <&k3_pds 35 TI_SCI_PD_EXCLUSIVE>;
> + ti,timer-pwm;
> + status = "reserved";
> + };
> +
> + mcu_timer1: timer@4810000 {
> + compatible = "ti,am654-timer";
> + reg = <0x00 0x4810000 0x00 0x400>;
> + clocks = <&k3_clks 48 2>;
> + clock-names = "fck";
> + power-domains = <&k3_pds 48 TI_SCI_PD_EXCLUSIVE>;
> + ti,timer-pwm;
> + status = "reserved";
> + };
> +
> + mcu_timer2: timer@4820000 {
> + compatible = "ti,am654-timer";
> + reg = <0x00 0x4820000 0x00 0x400>;
> + clocks = <&k3_clks 49 2>;
> + clock-names = "fck";
> + power-domains = <&k3_pds 49 TI_SCI_PD_EXCLUSIVE>;
> + ti,timer-pwm;
> + status = "reserved";
> + };
> +
> + mcu_timer3: timer@4830000 {
> + compatible = "ti,am654-timer";
> + reg = <0x00 0x4830000 0x00 0x400>;
> + clocks = <&k3_clks 50 2>;
> + clock-names = "fck";
> + power-domains = <&k3_pds 50 TI_SCI_PD_EXCLUSIVE>;
> + ti,timer-pwm;
> + status = "reserved";
> + };
> +
> mcu_uart0: serial@4a00000 {
> compatible = "ti,am64-uart", "ti,am654-uart";
> reg = <0x00 0x04a00000 0x00 0x100>;
> @@ -21,6 +66,7 @@
> power-domains = <&k3_pds 149 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 149 0>;
> clock-names = "fclk";
> + status = "disabled";
> };
>
> mcu_i2c0: i2c@4900000 {
> @@ -32,6 +78,7 @@
> power-domains = <&k3_pds 106 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 106 2>;
> clock-names = "fck";
> + status = "disabled";
> };
>
> mcu_spi0: spi@4b00000 {
> @@ -42,6 +89,7 @@
> #size-cells = <0>;
> power-domains = <&k3_pds 147 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 147 0>;
> + status = "disabled";
> };
>
> mcu_spi1: spi@4b10000 {
> @@ -52,6 +100,7 @@
> #size-cells = <0>;
> power-domains = <&k3_pds 148 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 148 0>;
> + status = "disabled";
> };
>
> mcu_gpio_intr: interrupt-controller@4210000 {
> diff --git a/arch/arm/dts/k3-am62-wakeup.dtsi
> b/arch/arm/dts/k3-am62-wakeup.dtsi
> index 4090134676c..38dced6b4fe 100644
> --- a/arch/arm/dts/k3-am62-wakeup.dtsi
> +++ b/arch/arm/dts/k3-am62-wakeup.dtsi
> @@ -26,16 +26,18 @@
> power-domains = <&k3_pds 114 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 114 0>;
> clock-names = "fclk";
> + status = "disabled";
> };
>
> wkup_i2c0: i2c@2b200000 {
> compatible = "ti,am64-i2c", "ti,omap4-i2c";
> - reg = <0x00 0x02b200000 0x00 0x100>;
> + reg = <0x00 0x2b200000 0x00 0x100>;
> interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
> #address-cells = <1>;
> #size-cells = <0>;
> power-domains = <&k3_pds 107 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 107 4>;
> clock-names = "fck";
> + status = "disabled";
> };
> };
> diff --git a/arch/arm/dts/k3-am625-r5-sk.dts b/arch/arm/dts/k3-am625-r5-sk.dts
> index dad46704a2d..59ce1a1d70e 100644
> --- a/arch/arm/dts/k3-am625-r5-sk.dts
> +++ b/arch/arm/dts/k3-am625-r5-sk.dts
> @@ -20,7 +20,7 @@
>
> chosen {
> stdout-path = "serial2:115200n8";
> - tick-timer = &timer1;
> + tick-timer = &main_timer0;
> };
>
> memory@80000000 {
> diff --git a/arch/arm/dts/k3-am625-sk-u-boot.dtsi
> b/arch/arm/dts/k3-am625-sk-u-boot.dtsi
> index 249155733a2..0def84b4cf0 100644
> --- a/arch/arm/dts/k3-am625-sk-u-boot.dtsi
> +++ b/arch/arm/dts/k3-am625-sk-u-boot.dtsi
> @@ -7,7 +7,7 @@
> / {
> chosen {
> stdout-path = "serial2:115200n8";
> - tick-timer = &timer1;
> + tick-timer = &main_timer0;
> };
>
> aliases {
> @@ -22,10 +22,7 @@
> &cbass_main{
> bootph-pre-ram;
>
> - timer1: timer@2400000 {
> - compatible = "ti,omap5430-timer";
> - reg = <0x00 0x2400000 0x00 0x80>;
> - ti,timer-alwon;
> + timer@2400000 {
> clock-frequency = <25000000>;
> bootph-pre-ram;
> };
> @@ -133,6 +130,7 @@
> reg-names = "cpsw_nuss", "mac_efuse";
> /delete-property/ ranges;
> bootph-pre-ram;
> + pinctrl-0 = <&main_mdio1_pins_default &main_rgmii1_pins_default>;
>
> cpsw-phy-sel@04044 {
> compatible = "ti,am64-phy-gmii-sel";
> diff --git a/arch/arm/dts/k3-am625-sk.dts b/arch/arm/dts/k3-am625-sk.dts
> index af5617ff44d..6bc7d63cf52 100644
> --- a/arch/arm/dts/k3-am625-sk.dts
> +++ b/arch/arm/dts/k3-am625-sk.dts
> @@ -13,7 +13,7 @@
> #include "k3-am625.dtsi"
>
> / {
> - compatible = "ti,am625-sk", "ti,am625";
> + compatible = "ti,am625-sk", "ti,am625";
> model = "Texas Instruments AM625 SK";
>
> aliases {
> @@ -24,6 +24,8 @@
> spi0 = &ospi0;
> ethernet0 = &cpsw_port1;
> ethernet1 = &cpsw_port2;
> + usb0 = &usb0;
> + usb1 = &usb1;
> };
>
> chosen {
> @@ -31,6 +33,15 @@
> bootargs = "console=ttyS2,115200n8
> earlycon=ns16550a,mmio32,0x02800000";
> };
>
> + opp-table {
> + /* Add 1.4GHz OPP for am625-sk board. Requires VDD_CORE to be
> at 0.85V */
> + opp-1400000000 {
> + opp-hz = /bits/ 64 <1400000000>;
> + opp-supported-hw = <0x01 0x0004>;
> + clock-latency-ns = <6000000>;
> + };
> + };
> +
> memory@80000000 {
> device_type = "memory";
> /* 2G RAM */
> @@ -275,6 +286,12 @@
> AM62X_IOPAD(0x01d4, PIN_INPUT, 7) /* (B15)
> UART0_RTSn.GPIO1_23 */
> >;
> };
> +
> + main_usb1_pins_default: main-usb1-pins-default {
> + pinctrl-single,pins = <
> + AM62X_IOPAD(0x0258, PIN_OUTPUT, 0) /* (F18)
> USB1_DRVVBUS */
> + >;
> + };
> };
>
> &wkup_uart0 {
> @@ -282,11 +299,8 @@
> status = "reserved";
> };
>
> -&mcu_uart0 {
> - status = "disabled";
> -};
> -
> &main_uart0 {
> + status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&main_uart0_pins_default>;
> };
> @@ -296,42 +310,16 @@
> status = "reserved";
> };
>
> -&main_uart2 {
> - status = "disabled";
> -};
> -
> -&main_uart3 {
> - status = "disabled";
> -};
> -
> -&main_uart4 {
> - status = "disabled";
> -};
> -
> -&main_uart5 {
> - status = "disabled";
> -};
> -
> -&main_uart6 {
> - status = "disabled";
> -};
> -
> -&mcu_i2c0 {
> - status = "disabled";
> -};
> -
> -&wkup_i2c0 {
> - status = "disabled";
> -};
> -
> &main_i2c0 {
> - status = "disabled";
> + status = "okay";
> + pinctrl-names = "default";
> pinctrl-0 = <&main_i2c0_pins_default>;
> clock-frequency = <400000>;
> };
>
> &main_i2c1 {
> - status = "disabled";
> + status = "okay";
> + pinctrl-names = "default";
> pinctrl-0 = <&main_i2c1_pins_default>;
> clock-frequency = <400000>;
>
> @@ -363,15 +351,8 @@
> };
> };
>
> -&main_i2c2 {
> - status = "disabled";
> -};
> -
> -&main_i2c3 {
> - status = "disabled";
> -};
> -
> &sdhci0 {
> + status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&main_mmc0_pins_default>;
> ti,driver-strength-ohm = <50>;
> @@ -380,6 +361,7 @@
>
> &sdhci1 {
> /* SD/MMC */
> + status = "okay";
> vmmc-supply = <&vdd_mmc1>;
> vqmmc-supply = <&vdd_sd_dv>;
> pinctrl-names = "default";
> @@ -390,8 +372,7 @@
>
> &cpsw3g {
> pinctrl-names = "default";
> - pinctrl-0 = <&main_mdio1_pins_default
> - &main_rgmii1_pins_default
> + pinctrl-0 = <&main_rgmii1_pins_default
> &main_rgmii2_pins_default>;
> };
>
> @@ -406,6 +387,10 @@
> };
>
> &cpsw3g_mdio {
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&main_mdio1_pins_default>;
> +
> cpsw3g_phy0: ethernet-phy@0 {
> reg = <0>;
> ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
> @@ -429,6 +414,7 @@
> };
>
> &ospi0 {
> + status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&ospi0_pins_default>;
>
> @@ -487,18 +473,21 @@
> };
> };
>
> -&ecap0 {
> - status = "disabled";
> +&usbss0 {
> + status = "okay";
> + ti,vbus-divider;
> };
>
> -&ecap1 {
> - status = "disabled";
> +&usbss1 {
> + status = "okay";
> };
>
> -&ecap2 {
> - status = "disabled";
> +&usb0 {
> + dr_mode = "peripheral";
> };
>
> -&main_mcan0 {
> - status = "disabled";
> +&usb1 {
> + dr_mode = "host";
> + pinctrl-names = "default";
> + pinctrl-0 = <&main_usb1_pins_default>;
> };
> diff --git a/arch/arm/dts/k3-am625.dtsi b/arch/arm/dts/k3-am625.dtsi
> index 887f31c23fe..acc7f8ab642 100644
> --- a/arch/arm/dts/k3-am625.dtsi
> +++ b/arch/arm/dts/k3-am625.dtsi
> @@ -48,6 +48,8 @@
> d-cache-line-size = <64>;
> d-cache-sets = <128>;
> next-level-cache = <&L2_0>;
> + operating-points-v2 = <&a53_opp_table>;
> + clocks = <&k3_clks 135 0>;
> };
>
> cpu1: cpu@1 {
> @@ -62,6 +64,8 @@
> d-cache-line-size = <64>;
> d-cache-sets = <128>;
> next-level-cache = <&L2_0>;
> + operating-points-v2 = <&a53_opp_table>;
> + clocks = <&k3_clks 136 0>;
> };
>
> cpu2: cpu@2 {
> @@ -76,6 +80,8 @@
> d-cache-line-size = <64>;
> d-cache-sets = <128>;
> next-level-cache = <&L2_0>;
> + operating-points-v2 = <&a53_opp_table>;
> + clocks = <&k3_clks 137 0>;
> };
>
> cpu3: cpu@3 {
> @@ -90,11 +96,57 @@
> d-cache-line-size = <64>;
> d-cache-sets = <128>;
> next-level-cache = <&L2_0>;
> + operating-points-v2 = <&a53_opp_table>;
> + clocks = <&k3_clks 138 0>;
> + };
> + };
> +
> + a53_opp_table: opp-table {
> + compatible = "operating-points-v2-ti-cpu";
> + opp-shared;
> + syscon = <&wkup_conf>;
> +
> + opp-200000000 {
> + opp-hz = /bits/ 64 <200000000>;
> + opp-supported-hw = <0x01 0x0007>;
> + clock-latency-ns = <6000000>;
> + };
> +
> + opp-400000000 {
> + opp-hz = /bits/ 64 <400000000>;
> + opp-supported-hw = <0x01 0x0007>;
> + clock-latency-ns = <6000000>;
> + };
> +
> + opp-600000000 {
> + opp-hz = /bits/ 64 <600000000>;
> + opp-supported-hw = <0x01 0x0007>;
> + clock-latency-ns = <6000000>;
> + };
> +
> + opp-800000000 {
> + opp-hz = /bits/ 64 <800000000>;
> + opp-supported-hw = <0x01 0x0007>;
> + clock-latency-ns = <6000000>;
> + };
> +
> + opp-1000000000 {
> + opp-hz = /bits/ 64 <1000000000>;
> + opp-supported-hw = <0x01 0x0006>;
> + clock-latency-ns = <6000000>;
> + };
> +
> + opp-1250000000 {
> + opp-hz = /bits/ 64 <1250000000>;
> + opp-supported-hw = <0x01 0x0004>;
> + clock-latency-ns = <6000000>;
> + opp-suspend;
> };
> };
>
> L2_0: l2-cache0 {
> compatible = "cache";
> + cache-unified;
> cache-level = <2>;
> cache-size = <0x40000>;
> cache-line-size = <64>;
> --
> 2.40.0
>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5
849D 1736 249D
