arm: dts: k3-am62: Bump dtsi from linux v6.5-rc1
authorNishanth Menon <nm@ti.com>
Thu, 27 Jul 2023 09:03:31 +0000 (04:03 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 28 Jul 2023 14:10:57 +0000 (10:10 -0400)
Update the am62 and am625 device-trees from linux v6.5-rc1. 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
- Secure proxies are defined in SoC dtsi
- Drop duplicate nodes - u-boot.dtsi is includes in r5-sk, no need for
  either the definitions from main.dtsi OR duplication from u-boot.dtsi

Reviewed-by: Roger Quadros <rogerq@kernel.org>
Reviewed-by: Maxime Ripard <mripard@kernel.org>
Tested-by: Maxime Ripard <mripard@kernel.org>
Cc: Francesco Dolcini <francesco@dolcini.it>
Cc: Sjoerd Simons <sjoerd@collabora.com>
Cc: Wadim Egorov <w.egorov@phytec.de>
Signed-off-by: Nishanth Menon <nm@ti.com>
arch/arm/dts/k3-am62-main.dtsi
arch/arm/dts/k3-am62-mcu.dtsi
arch/arm/dts/k3-am62-thermal.dtsi [new file with mode: 0644]
arch/arm/dts/k3-am62-wakeup.dtsi
arch/arm/dts/k3-am62.dtsi
arch/arm/dts/k3-am625-r5-sk.dts
arch/arm/dts/k3-am625-sk-u-boot.dtsi
arch/arm/dts/k3-am625-sk.dts
arch/arm/dts/k3-am625.dtsi
arch/arm/dts/k3-am62x-sk-common.dtsi [new file with mode: 0644]
arch/arm/dts/k3-pinctrl.h [new file with mode: 0644]

index 4a42f1b..2488e3a 100644 (file)
                        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 {
                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>;
 
                dma-names = "tx", "rx1", "rx2";
        };
 
+       secure_proxy_sa3: mailbox@43600000 {
+               compatible = "ti,am654-secure-proxy";
+               #mbox-cells = <1>;
+               reg-names = "target_data", "rt", "scfg";
+               reg = <0x00 0x43600000 0x00 0x10000>,
+                     <0x00 0x44880000 0x00 0x20000>,
+                     <0x00 0x44860000 0x00 0x20000>;
+               /*
+                * Marked Disabled:
+                * Node is incomplete as it is meant for bootloaders and
+                * firmware on non-MPU processors
+                */
+               status = "disabled";
+       };
+
        main_pmx0: pinctrl@f4000 {
                compatible = "pinctrl-single";
                reg = <0x00 0xf4000 0x00 0x2ac>;
                pinctrl-single,function-mask = <0xffffffff>;
        };
 
+       main_esm: esm@420000 {
+               compatible = "ti,j721e-esm";
+               reg = <0x00 0x420000 0x00 0x1000>;
+               ti,esm-pins = <160>, <161>, <162>, <163>, <177>, <178>;
+       };
+
+       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>;
                power-domains = <&k3_pds 146 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 146 0>;
                clock-names = "fclk";
+               status = "disabled";
        };
 
        main_uart1: serial@2810000 {
                power-domains = <&k3_pds 152 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 152 0>;
                clock-names = "fclk";
+               status = "disabled";
        };
 
        main_uart2: serial@2820000 {
                power-domains = <&k3_pds 153 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 153 0>;
                clock-names = "fclk";
+               status = "disabled";
        };
 
        main_uart3: serial@2830000 {
                power-domains = <&k3_pds 154 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 154 0>;
                clock-names = "fclk";
+               status = "disabled";
        };
 
        main_uart4: serial@2840000 {
                power-domains = <&k3_pds 155 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 155 0>;
                clock-names = "fclk";
+               status = "disabled";
        };
 
        main_uart5: serial@2850000 {
                power-domains = <&k3_pds 156 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 156 0>;
                clock-names = "fclk";
+               status = "disabled";
        };
 
        main_uart6: serial@2860000 {
                power-domains = <&k3_pds 158 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 158 0>;
                clock-names = "fclk";
+               status = "disabled";
        };
 
        main_i2c0: i2c@20000000 {
                power-domains = <&k3_pds 102 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 102 2>;
                clock-names = "fck";
+               status = "disabled";
        };
 
        main_i2c1: i2c@20010000 {
                power-domains = <&k3_pds 103 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 103 2>;
                clock-names = "fck";
+               status = "disabled";
        };
 
        main_i2c2: i2c@20020000 {
                power-domains = <&k3_pds 104 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 104 2>;
                clock-names = "fck";
+               status = "disabled";
        };
 
        main_i2c3: i2c@20030000 {
                power-domains = <&k3_pds 105 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 105 2>;
                clock-names = "fck";
+               status = "disabled";
        };
 
        main_spi0: spi@20100000 {
                #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 {
                #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 {
                #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 {
                             <193>, <194>, <195>;
                interrupt-controller;
                #interrupt-cells = <2>;
-               ti,ngpio = <87>;
+               ti,ngpio = <92>;
                ti,davinci-gpio-unbanked = <0>;
                power-domains = <&k3_pds 77 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 77 0>;
                             <183>, <184>, <185>;
                interrupt-controller;
                #interrupt-cells = <2>;
-               ti,ngpio = <88>;
+               ti,ngpio = <52>;
                ti,davinci-gpio-unbanked = <0>;
                power-domains = <&k3_pds 78 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 78 0>;
                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 {
                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 {
                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 {
                        power-domains = <&k3_pds 75 TI_SCI_PD_EXCLUSIVE>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       status = "disabled";
                };
        };
 
                        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";
                power-domains = <&k3_pds 51 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 51 0>;
                clock-names = "fck";
+               status = "disabled";
        };
 
        ecap1: pwm@23110000 {
                power-domains = <&k3_pds 52 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 52 0>;
                clock-names = "fck";
+               status = "disabled";
        };
 
        ecap2: pwm@23120000 {
                power-domains = <&k3_pds 53 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 53 0>;
                clock-names = "fck";
+               status = "disabled";
        };
 
        main_mcan0: can@20701000 {
                             <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
+       };
+
+       main_rti0: watchdog@e000000 {
+               compatible = "ti,j7-rti-wdt";
+               reg = <0x00 0x0e000000 0x00 0x100>;
+               clocks = <&k3_clks 125 0>;
+               power-domains = <&k3_pds 125 TI_SCI_PD_EXCLUSIVE>;
+               assigned-clocks = <&k3_clks 125 0>;
+               assigned-clock-parents = <&k3_clks 125 2>;
+       };
+
+       main_rti1: watchdog@e010000 {
+               compatible = "ti,j7-rti-wdt";
+               reg = <0x00 0x0e010000 0x00 0x100>;
+               clocks = <&k3_clks 126 0>;
+               power-domains = <&k3_pds 126 TI_SCI_PD_EXCLUSIVE>;
+               assigned-clocks = <&k3_clks 126 0>;
+               assigned-clock-parents = <&k3_clks 126 2>;
+       };
+
+       main_rti2: watchdog@e020000 {
+               compatible = "ti,j7-rti-wdt";
+               reg = <0x00 0x0e020000 0x00 0x100>;
+               clocks = <&k3_clks 127 0>;
+               power-domains = <&k3_pds 127 TI_SCI_PD_EXCLUSIVE>;
+               assigned-clocks = <&k3_clks 127 0>;
+               assigned-clock-parents = <&k3_clks 127 2>;
+       };
+
+       main_rti3: watchdog@e030000 {
+               compatible = "ti,j7-rti-wdt";
+               reg = <0x00 0x0e030000 0x00 0x100>;
+               clocks = <&k3_clks 128 0>;
+               power-domains = <&k3_pds 128 TI_SCI_PD_EXCLUSIVE>;
+               assigned-clocks = <&k3_clks 128 0>;
+               assigned-clock-parents = <&k3_clks 128 2>;
+       };
+
+       main_rti15: watchdog@e0f0000 {
+               compatible = "ti,j7-rti-wdt";
+               reg = <0x00 0x0e0f0000 0x00 0x100>;
+               clocks = <&k3_clks 130 0>;
+               power-domains = <&k3_pds 130 TI_SCI_PD_EXCLUSIVE>;
+               assigned-clocks = <&k3_clks 130 0>;
+               assigned-clock-parents = <&k3_clks 130 2>;
+       };
+
+       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";
+       };
+
+       mcasp0: audio-controller@2b00000 {
+               compatible = "ti,am33xx-mcasp-audio";
+               reg = <0x00 0x02b00000 0x00 0x2000>,
+                     <0x00 0x02b08000 0x00 0x400>;
+               reg-names = "mpu", "dat";
+               interrupts = <GIC_SPI 236 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 235 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "tx", "rx";
+
+               dmas = <&main_bcdma 0 0xc500 0>, <&main_bcdma 0 0x4500 0>;
+               dma-names = "tx", "rx";
+
+               clocks = <&k3_clks 190 0>;
+               clock-names = "fck";
+               assigned-clocks = <&k3_clks 190 0>;
+               assigned-clock-parents = <&k3_clks 190 2>;
+               power-domains = <&k3_pds 190 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
+       };
+
+       mcasp1: audio-controller@2b10000 {
+               compatible = "ti,am33xx-mcasp-audio";
+               reg = <0x00 0x02b10000 0x00 0x2000>,
+                     <0x00 0x02b18000 0x00 0x400>;
+               reg-names = "mpu", "dat";
+               interrupts = <GIC_SPI 238 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 237 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "tx", "rx";
+
+               dmas = <&main_bcdma 0 0xc501 0>, <&main_bcdma 0 0x4501 0>;
+               dma-names = "tx", "rx";
+
+               clocks = <&k3_clks 191 0>;
+               clock-names = "fck";
+               assigned-clocks = <&k3_clks 191 0>;
+               assigned-clock-parents = <&k3_clks 191 2>;
+               power-domains = <&k3_pds 191 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
+       };
+
+       mcasp2: audio-controller@2b20000 {
+               compatible = "ti,am33xx-mcasp-audio";
+               reg = <0x00 0x02b20000 0x00 0x2000>,
+                     <0x00 0x02b28000 0x00 0x400>;
+               reg-names = "mpu", "dat";
+               interrupts = <GIC_SPI 240 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 239 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "tx", "rx";
+
+               dmas = <&main_bcdma 0 0xc502 0>, <&main_bcdma 0 0x4502 0>;
+               dma-names = "tx", "rx";
+
+               clocks = <&k3_clks 192 0>;
+               clock-names = "fck";
+               assigned-clocks = <&k3_clks 192 0>;
+               assigned-clock-parents = <&k3_clks 192 2>;
+               power-domains = <&k3_pds 192 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 };
index f56c803..19fc381 100644 (file)
                pinctrl-single,function-mask = <0xffffffff>;
        };
 
+       mcu_esm: esm@4100000 {
+               compatible = "ti,j721e-esm";
+               reg = <0x00 0x4100000 0x00 0x1000>;
+               ti,esm-pins = <0>, <1>, <2>, <85>;
+       };
+
+       /*
+        * 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 +72,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 +84,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 +95,7 @@
                #size-cells = <0>;
                power-domains = <&k3_pds 147 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 147 0>;
+               status = "disabled";
        };
 
        mcu_spi1: spi@4b10000 {
                #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 {
                clocks = <&k3_clks 79 0>;
                clock-names = "gpio";
        };
+
+       mcu_rti0: watchdog@4880000 {
+               compatible = "ti,j7-rti-wdt";
+               reg = <0x00 0x04880000 0x00 0x100>;
+               clocks = <&k3_clks 131 0>;
+               power-domains = <&k3_pds 131 TI_SCI_PD_EXCLUSIVE>;
+               assigned-clocks = <&k3_clks 131 0>;
+               assigned-clock-parents = <&k3_clks 131 2>;
+               /* Tightly coupled to M4F */
+               status = "reserved";
+       };
 };
diff --git a/arch/arm/dts/k3-am62-thermal.dtsi b/arch/arm/dts/k3-am62-thermal.dtsi
new file mode 100644 (file)
index 0000000..a358757
--- /dev/null
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <dt-bindings/thermal/thermal.h>
+
+thermal_zones: thermal-zones {
+       main0_thermal: main0-thermal {
+               polling-delay-passive = <250>;  /* milliSeconds */
+               polling-delay = <500>;          /* milliSeconds */
+               thermal-sensors = <&wkup_vtm0 0>;
+
+               trips {
+                       main0_crit: main0-crit {
+                               temperature = <105000>; /* milliCelsius */
+                               hysteresis = <2000>;    /* milliCelsius */
+                               type = "critical";
+                       };
+               };
+       };
+
+       main1_thermal: main1-thermal {
+               polling-delay-passive = <250>;  /* milliSeconds */
+               polling-delay = <500>;          /* milliSeconds */
+               thermal-sensors = <&wkup_vtm0 1>;
+
+               trips {
+                       main1_crit: main1-crit {
+                               temperature = <105000>; /* milliCelsius */
+                               hysteresis = <2000>;    /* milliCelsius */
+                               type = "critical";
+                       };
+               };
+       };
+};
index 4090134..eae0528 100644 (file)
                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";
+       };
+
+       wkup_rtc0: rtc@2b1f0000 {
+               compatible = "ti,am62-rtc";
+               reg = <0x00 0x2b1f0000 0x00 0x100>;
+               interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&k3_clks 117 6> , <&k3_clks 117 0>;
+               clock-names = "vbus", "osc32k";
+               power-domains = <&k3_pds 117 TI_SCI_PD_EXCLUSIVE>;
+               wakeup-source;
+       };
+
+       wkup_rti0: watchdog@2b000000 {
+               compatible = "ti,j7-rti-wdt";
+               reg = <0x00 0x2b000000 0x00 0x100>;
+               clocks = <&k3_clks 132 0>;
+               power-domains = <&k3_pds 132 TI_SCI_PD_EXCLUSIVE>;
+               assigned-clocks = <&k3_clks 132 0>;
+               assigned-clock-parents = <&k3_clks 132 2>;
+               /* Used by DM firmware */
+               status = "reserved";
+       };
+
+       wkup_vtm0: temperature-sensor@b00000 {
+               compatible = "ti,j7200-vtm";
+               reg = <0x00 0xb00000 0x00 0x400>,
+                     <0x00 0xb01000 0x00 0x400>;
+               power-domains = <&k3_pds 95 TI_SCI_PD_EXCLUSIVE>;
+               #thermal-sensor-cells = <1>;
        };
 };
index 37fcbe7..5e72c44 100644 (file)
@@ -8,9 +8,10 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <dt-bindings/pinctrl/k3.h>
 #include <dt-bindings/soc/ti,sci_pm_domain.h>
 
+#include "k3-pinctrl.h"
+
 / {
        model = "Texas Instruments K3 AM625 SoC";
        compatible = "ti,am625";
@@ -80,6 +81,7 @@
                         <0x00 0x04000000 0x00 0x04000000 0x00 0x01ff1400>,
 
                         /* Wakeup Domain Range */
+                        <0x00 0x00b00000 0x00 0x00b00000 0x00 0x00002400>, /* VTM */
                         <0x00 0x2b000000 0x00 0x2b000000 0x00 0x00300400>,
                         <0x00 0x43000000 0x00 0x43000000 0x00 0x00020000>;
 
                        ranges = <0x00 0x04000000 0x00 0x04000000 0x00 0x01ff1400>; /* Peripheral window */
                };
 
-               cbass_wakeup: bus@2b000000 {
+               cbass_wakeup: bus@b00000 {
                        compatible = "simple-bus";
                        #address-cells = <2>;
                        #size-cells = <2>;
-                       ranges = <0x00 0x2b000000 0x00 0x2b000000 0x00 0x00300400>, /* Peripheral Window */
+                       ranges = <0x00 0x00b00000 0x00 0x00b00000 0x00 0x00002400>, /* VTM */
+                                <0x00 0x2b000000 0x00 0x2b000000 0x00 0x00300400>, /* Peripheral Window */
                                 <0x00 0x43000000 0x00 0x43000000 0x00 0x00020000>;
                };
        };
+
+       #include "k3-am62-thermal.dtsi"
 };
 
 /* Now include the peripherals for each bus segments */
index 3ec5bad..bf21922 100644 (file)
@@ -9,7 +9,6 @@
 #include "k3-am62-ddr.dtsi"
 
 #include "k3-am625-sk-u-boot.dtsi"
-#include "k3-am625-sk-binman.dtsi"
 
 / {
        aliases {
                serial3 = &main_uart1;
        };
 
-       chosen {
-               stdout-path = "serial2:115200n8";
-               tick-timer = &timer1;
-       };
-
-       memory@80000000 {
-               device_type = "memory";
-               /* 2G RAM */
-               reg = <0x00000000 0x80000000 0x00000000 0x80000000>;
-
-               bootph-pre-ram;
-       };
-
-       reserved-memory {
-               #address-cells = <2>;
-               #size-cells = <2>;
-               ranges;
-
-               secure_ddr: optee@9e800000 {
-                       reg = <0x00 0x9e800000 0x00 0x01800000>; /* for OP-TEE */
-                       alignment = <0x1000>;
-                       no-map;
-               };
-       };
-
        a53_0: a53@0 {
                compatible = "ti,am654-rproc";
                reg = <0x00 0x00a90000 0x00 0x10>;
        ti,secure-host;
 };
 
-&cbass_mcu {
-       mcu_esm: esm@4100000 {
-               compatible = "ti,j721e-esm";
-               reg = <0x0 0x4100000 0x0 0x1000>;
-               ti,esm-pins = <0>, <1>, <2>, <85>;
-               bootph-pre-ram;
-       };
+&mcu_esm {
+       bootph-pre-ram;
 };
 
-&cbass_main {
-       sa3_secproxy: secproxy@44880000 {
-               bootph-pre-ram;
-               compatible = "ti,am654-secure-proxy";
-               #mbox-cells = <1>;
-               reg-names = "rt", "scfg", "target_data";
-               reg = <0x00 0x44880000 0x00 0x20000>,
-                     <0x0 0x44860000 0x0 0x20000>,
-                     <0x0 0x43600000 0x0 0x10000>;
-       };
+&secure_proxy_sa3 {
+       bootph-pre-ram;
+       /* We require this for boot handshake */
+       status = "okay";
+};
+
+&main_esm {
+       bootph-pre-ram;
+};
 
+&cbass_main {
        sysctrler: sysctrler {
                compatible = "ti,am654-system-controller";
-               mboxes= <&secure_proxy_main 1>, <&secure_proxy_main 0>, <&sa3_secproxy 0>;
+               mboxes= <&secure_proxy_main 1>, <&secure_proxy_main 0>, <&secure_proxy_sa3 0>;
                mbox-names = "tx", "rx", "boot_notify";
                bootph-pre-ram;
        };
-
-       main_esm: esm@420000 {
-               compatible = "ti,j721e-esm";
-               reg = <0x0 0x420000 0x0 0x1000>;
-               ti,esm-pins = <160>, <161>, <162>, <163>, <177>, <178>;
-               bootph-pre-ram;
-       };
 };
 
-&mcu_pmx0 {
+&wkup_uart0_pins_default {
        bootph-pre-ram;
-       wkup_uart0_pins_default: wkup-uart0-pins-default {
-               pinctrl-single,pins = <
-                       AM62X_MCU_IOPAD(0x02c, PIN_INPUT, 0) /* (C6) WKUP_UART0_CTSn */
-                       AM62X_MCU_IOPAD(0x030, PIN_OUTPUT, 0) /* (A4) WKUP_UART0_RTSn */
-                       AM62X_MCU_IOPAD(0x024, PIN_INPUT, 0) /* (B4) WKUP_UART0_RXD */
-                       AM62X_MCU_IOPAD(0x028, PIN_OUTPUT, 0) /* (C5) WKUP_UART0_TXD */
-               >;
-               bootph-pre-ram;
-       };
 };
 
-&main_pmx0 {
+&main_uart1_pins_default {
        bootph-pre-ram;
-       main_uart1_pins_default: main-uart1-pins-default {
-               pinctrl-single,pins = <
-                       AM62X_IOPAD(0x194, PIN_INPUT, 2) /* (B19) MCASP0_AXR3.UART1_CTSn */
-                       AM62X_IOPAD(0x198, PIN_OUTPUT, 2) /* (A19) MCASP0_AXR2.UART1_RTSn */
-                       AM62X_IOPAD(0x1ac, PIN_INPUT, 2) /* (E19) MCASP0_AFSR.UART1_RXD */
-                       AM62X_IOPAD(0x1b0, PIN_OUTPUT, 2) /* (A20) MCASP0_ACLKR.UART1_TXD */
-               >;
-               bootph-pre-ram;
-       };
 };
 
 /* WKUP UART0 is used for DM firmware logs */
 &wkup_uart0 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&wkup_uart0_pins_default>;
-       status = "okay";
        bootph-pre-ram;
 };
 
 /* Main UART1 is used for TIFS firmware logs */
 &main_uart1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&main_uart1_pins_default>;
-       status = "okay";
        bootph-pre-ram;
 };
 
index a60c37f..c1685bc 100644 (file)
@@ -9,7 +9,7 @@
 / {
        chosen {
                stdout-path = "serial2:115200n8";
-               tick-timer = &timer1;
+               tick-timer = &main_timer0;
        };
 
        aliases {
        };
 };
 
-&cbass_main{
+&cbass_main {
        bootph-pre-ram;
+};
 
-       timer1: timer@2400000 {
-               compatible = "ti,omap5430-timer";
-               reg = <0x00 0x2400000 0x00 0x80>;
-               ti,timer-alwon;
-               clock-frequency = <25000000>;
-               bootph-pre-ram;
-       };
+&main_timer0 {
+       clock-frequency = <25000000>;
+       bootph-pre-ram;
 };
 
 &dmss {
        bootph-pre-ram;
 };
 
-&main_uart1 {
-       bootph-pre-ram;
-};
-
 &cbass_mcu {
        bootph-pre-ram;
 };
        bootph-pre-ram;
 };
 
-&wkup_uart0 {
-       bootph-pre-ram;
-};
-
 &sdhci1 {
        bootph-pre-ram;
 };
 };
 
 &cpsw3g {
-       reg = <0x0 0x8000000 0x0 0x200000>,
-             <0x0 0x43000200 0x0 0x8>;
-       reg-names = "cpsw_nuss", "mac_efuse";
-       /delete-property/ ranges;
        bootph-pre-ram;
-
-       cpsw-phy-sel@04044 {
-               compatible = "ti,am64-phy-gmii-sel";
-               reg = <0x0 0x00104044 0x0 0x8>;
-               bootph-pre-ram;
-       };
 };
 
 &cpsw_port1 {
index af5617f..3f9ef40 100644 (file)
@@ -7,28 +7,19 @@
 
 /dts-v1/;
 
-#include <dt-bindings/leds/common.h>
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/net/ti-dp83867.h>
-#include "k3-am625.dtsi"
+#include "k3-am62x-sk-common.dtsi"
 
 / {
-       compatible =  "ti,am625-sk", "ti,am625";
+       compatible = "ti,am625-sk", "ti,am625";
        model = "Texas Instruments AM625 SK";
 
-       aliases {
-               serial2 = &main_uart0;
-               mmc0 = &sdhci0;
-               mmc1 = &sdhci1;
-               mmc2 = &sdhci2;
-               spi0 = &ospi0;
-               ethernet0 = &cpsw_port1;
-               ethernet1 = &cpsw_port2;
-       };
-
-       chosen {
-               stdout-path = "serial2:115200n8";
-               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 {
 
        };
 
-       reserved-memory {
-               #address-cells = <2>;
-               #size-cells = <2>;
-               ranges;
-
-               ramoops@9ca00000 {
-                       compatible = "ramoops";
-                       reg = <0x00 0x9ca00000 0x00 0x00100000>;
-                       record-size = <0x8000>;
-                       console-size = <0x8000>;
-                       ftrace-size = <0x00>;
-                       pmsg-size = <0x8000>;
-               };
-
-               secure_tfa_ddr: tfa@9e780000 {
-                       reg = <0x00 0x9e780000 0x00 0x80000>;
-                       alignment = <0x1000>;
-                       no-map;
-               };
-
-               secure_ddr: optee@9e800000 {
-                       reg = <0x00 0x9e800000 0x00 0x01800000>; /* for OP-TEE */
-                       alignment = <0x1000>;
-                       no-map;
-               };
-
-               wkup_r5fss0_core0_dma_memory_region: r5f-dma-memory@9db00000 {
-                       compatible = "shared-dma-pool";
-                       reg = <0x00 0x9db00000 0x00 0xc00000>;
-                       no-map;
-               };
-       };
-
        vmain_pd: regulator-0 {
                /* TPS65988 PD CONTROLLER OUTPUT */
                compatible = "regulator-fixed";
                         <3300000 0x1>;
        };
 
-       leds {
-               compatible = "gpio-leds";
-               pinctrl-names = "default";
-               pinctrl-0 = <&usr_led_pins_default>;
-
-               led-0 {
-                       label = "am62-sk:green:heartbeat";
-                       gpios = <&main_gpio1 49 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "heartbeat";
-                       function = LED_FUNCTION_HEARTBEAT;
-                       default-state = "off";
-               };
+       vcc_1v8: regulator-5 {
+               /* output of TPS6282518DMQ */
+               compatible = "regulator-fixed";
+               regulator-name = "vcc_1v8";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               vin-supply = <&vcc_3v3_sys>;
+               regulator-always-on;
+               regulator-boot-on;
        };
 };
 
 &main_pmx0 {
-       main_uart0_pins_default: main-uart0-pins-default {
-               pinctrl-single,pins = <
-                       AM62X_IOPAD(0x1c8, PIN_INPUT, 0) /* (D14) UART0_RXD */
-                       AM62X_IOPAD(0x1cc, PIN_OUTPUT, 0) /* (E14) UART0_TXD */
-               >;
-       };
-
-       main_i2c0_pins_default: main-i2c0-pins-default {
-               pinctrl-single,pins = <
-                       AM62X_IOPAD(0x1e0, PIN_INPUT_PULLUP, 0) /* (B16) I2C0_SCL */
-                       AM62X_IOPAD(0x1e4, PIN_INPUT_PULLUP, 0) /* (A16) I2C0_SDA */
-               >;
-       };
-
-       main_i2c1_pins_default: main-i2c1-pins-default {
-               pinctrl-single,pins = <
-                       AM62X_IOPAD(0x1e8, PIN_INPUT_PULLUP, 0) /* (B17) I2C1_SCL */
-                       AM62X_IOPAD(0x1ec, PIN_INPUT_PULLUP, 0) /* (A17) I2C1_SDA */
-               >;
-       };
-
-       main_i2c2_pins_default: main-i2c2-pins-default {
-               pinctrl-single,pins = <
-                       AM62X_IOPAD(0x0b0, PIN_INPUT_PULLUP, 1) /* (K22) GPMC0_CSn2.I2C2_SCL */
-                       AM62X_IOPAD(0x0b4, PIN_INPUT_PULLUP, 1) /* (K24) GPMC0_CSn3.I2C2_SDA */
-               >;
-       };
-
-       main_mmc0_pins_default: main-mmc0-pins-default {
-               pinctrl-single,pins = <
-                       AM62X_IOPAD(0x220, PIN_INPUT, 0) /* (Y3) MMC0_CMD */
-                       AM62X_IOPAD(0x218, PIN_INPUT, 0) /* (AB1) MMC0_CLK */
-                       AM62X_IOPAD(0x214, PIN_INPUT, 0) /* (AA2) MMC0_DAT0 */
-                       AM62X_IOPAD(0x210, PIN_INPUT, 0) /* (AA1) MMC0_DAT1 */
-                       AM62X_IOPAD(0x20c, PIN_INPUT, 0) /* (AA3) MMC0_DAT2 */
-                       AM62X_IOPAD(0x208, PIN_INPUT, 0) /* (Y4) MMC0_DAT3 */
-                       AM62X_IOPAD(0x204, PIN_INPUT, 0) /* (AB2) MMC0_DAT4 */
-                       AM62X_IOPAD(0x200, PIN_INPUT, 0) /* (AC1) MMC0_DAT5 */
-                       AM62X_IOPAD(0x1fc, PIN_INPUT, 0) /* (AD2) MMC0_DAT6 */
-                       AM62X_IOPAD(0x1f8, PIN_INPUT, 0) /* (AC2) MMC0_DAT7 */
-               >;
-       };
-
-       main_mmc1_pins_default: main-mmc1-pins-default {
-               pinctrl-single,pins = <
-                       AM62X_IOPAD(0x23c, PIN_INPUT, 0) /* (A21) MMC1_CMD */
-                       AM62X_IOPAD(0x234, PIN_INPUT, 0) /* (B22) MMC1_CLK */
-                       AM62X_IOPAD(0x230, PIN_INPUT, 0) /* (A22) MMC1_DAT0 */
-                       AM62X_IOPAD(0x22c, PIN_INPUT, 0) /* (B21) MMC1_DAT1 */
-                       AM62X_IOPAD(0x228, PIN_INPUT, 0) /* (C21) MMC1_DAT2 */
-                       AM62X_IOPAD(0x224, PIN_INPUT, 0) /* (D22) MMC1_DAT3 */
-                       AM62X_IOPAD(0x240, PIN_INPUT, 0) /* (D17) MMC1_SDCD */
-               >;
-       };
-
-       usr_led_pins_default: usr-led-pins-default {
-               pinctrl-single,pins = <
-                       AM62X_IOPAD(0x244, PIN_OUTPUT, 7) /* (C17) MMC1_SDWP.GPIO1_49 */
-               >;
-       };
-
-       main_mdio1_pins_default: main-mdio1-pins-default {
-               pinctrl-single,pins = <
-                       AM62X_IOPAD(0x160, PIN_OUTPUT, 0) /* (AD24) MDIO0_MDC */
-                       AM62X_IOPAD(0x15c, PIN_INPUT, 0) /* (AB22) MDIO0_MDIO */
-               >;
-       };
-
-       main_rgmii1_pins_default: main-rgmii1-pins-default {
-               pinctrl-single,pins = <
-                       AM62X_IOPAD(0x14c, PIN_INPUT, 0) /* (AB17) RGMII1_RD0 */
-                       AM62X_IOPAD(0x150, PIN_INPUT, 0) /* (AC17) RGMII1_RD1 */
-                       AM62X_IOPAD(0x154, PIN_INPUT, 0) /* (AB16) RGMII1_RD2 */
-                       AM62X_IOPAD(0x158, PIN_INPUT, 0) /* (AA15) RGMII1_RD3 */
-                       AM62X_IOPAD(0x148, PIN_INPUT, 0) /* (AD17) RGMII1_RXC */
-                       AM62X_IOPAD(0x144, PIN_INPUT, 0) /* (AE17) RGMII1_RX_CTL */
-                       AM62X_IOPAD(0x134, PIN_OUTPUT, 0) /* (AE20) RGMII1_TD0 */
-                       AM62X_IOPAD(0x138, PIN_OUTPUT, 0) /* (AD20) RGMII1_TD1 */
-                       AM62X_IOPAD(0x13c, PIN_OUTPUT, 0) /* (AE18) RGMII1_TD2 */
-                       AM62X_IOPAD(0x140, PIN_OUTPUT, 0) /* (AD18) RGMII1_TD3 */
-                       AM62X_IOPAD(0x130, PIN_OUTPUT, 0) /* (AE19) RGMII1_TXC */
-                       AM62X_IOPAD(0x12c, PIN_OUTPUT, 0) /* (AD19) RGMII1_TX_CTL */
-               >;
-       };
-
-       main_rgmii2_pins_default: main-rgmii2-pins-default {
+       main_rgmii2_pins_default: main-rgmii2-default-pins {
                pinctrl-single,pins = <
                        AM62X_IOPAD(0x184, PIN_INPUT, 0) /* (AE23) RGMII2_RD0 */
                        AM62X_IOPAD(0x188, PIN_INPUT, 0) /* (AB20) RGMII2_RD1 */
                >;
        };
 
-       ospi0_pins_default: ospi0-pins-default {
+       ospi0_pins_default: ospi0-default-pins {
                pinctrl-single,pins = <
                        AM62X_IOPAD(0x000, PIN_OUTPUT, 0) /* (H24) OSPI0_CLK */
                        AM62X_IOPAD(0x02c, PIN_OUTPUT, 0) /* (F23) OSPI0_CSn0 */
                >;
        };
 
-       vdd_sd_dv_pins_default: vdd-sd-dv-pins-default {
+       vdd_sd_dv_pins_default: vdd-sd-dv-default-pins {
                pinctrl-single,pins = <
                        AM62X_IOPAD(0x07c, PIN_OUTPUT, 7) /* (P25) GPMC0_CLK.GPIO0_31 */
                >;
        };
 
-       main_gpio1_ioexp_intr_pins_default: main-gpio1-ioexp-intr-pins-default {
+       main_gpio1_ioexp_intr_pins_default: main-gpio1-ioexp-intr-default-pins {
                pinctrl-single,pins = <
                        AM62X_IOPAD(0x01d4, PIN_INPUT, 7) /* (B15) UART0_RTSn.GPIO1_23 */
                >;
        };
 };
 
-&wkup_uart0 {
-       /* WKUP UART0 is used by DM firmware */
-       status = "reserved";
-};
-
-&mcu_uart0 {
-       status = "disabled";
-};
-
-&main_uart0 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&main_uart0_pins_default>;
-};
-
-&main_uart1 {
-       /* Main UART1 is used by TIFS firmware */
-       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";
-       pinctrl-0 = <&main_i2c0_pins_default>;
-       clock-frequency = <400000>;
-};
-
 &main_i2c1 {
-       status = "disabled";
-       pinctrl-0 = <&main_i2c1_pins_default>;
-       clock-frequency = <400000>;
-
        exp1: gpio@22 {
                compatible = "ti,tca6424";
                reg = <0x22>;
                                   "UART1_FET_BUF_EN", "WL_LT_EN",
                                   "GPIO_HDMI_RSTn", "CSI_GPIO1",
                                   "CSI_GPIO2", "PRU_3V3_EN",
-                                  "HDMI_INTn", "TEST_GPIO2",
+                                  "HDMI_INTn", "PD_I2C_IRQ",
                                   "MCASP1_FET_EN", "MCASP1_BUF_BT_EN",
                                   "MCASP1_FET_SEL", "UART1_FET_SEL",
                                   "TSINT#", "IO_EXP_TEST_LED";
        };
 };
 
-&main_i2c2 {
-       status = "disabled";
-};
-
-&main_i2c3 {
-       status = "disabled";
-};
-
-&sdhci0 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&main_mmc0_pins_default>;
-       ti,driver-strength-ohm = <50>;
-       disable-wp;
-};
-
 &sdhci1 {
-       /* SD/MMC */
        vmmc-supply = <&vdd_mmc1>;
        vqmmc-supply = <&vdd_sd_dv>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&main_mmc1_pins_default>;
-       ti,driver-strength-ohm = <50>;
-       disable-wp;
 };
 
 &cpsw3g {
        pinctrl-names = "default";
-       pinctrl-0 = <&main_mdio1_pins_default
-                    &main_rgmii1_pins_default
-                    &main_rgmii2_pins_default>;
-};
-
-&cpsw_port1 {
-       phy-mode = "rgmii-rxid";
-       phy-handle = <&cpsw3g_phy0>;
+       pinctrl-0 = <&main_rgmii1_pins_default>, <&main_rgmii2_pins_default>;
 };
 
 &cpsw_port2 {
 };
 
 &cpsw3g_mdio {
-       cpsw3g_phy0: ethernet-phy@0 {
-               reg = <0>;
-               ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
-               ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
-               ti,min-output-impedance;
-       };
-
        cpsw3g_phy1: ethernet-phy@1 {
                reg = <1>;
                ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
 };
 
 &ospi0 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&ospi0_pins_default>;
 
        };
 };
 
-&ecap0 {
-       status = "disabled";
-};
-
-&ecap1 {
-       status = "disabled";
-};
-
-&ecap2 {
-       status = "disabled";
-};
-
-&main_mcan0 {
-       status = "disabled";
+&tlv320aic3106 {
+       DVDD-supply = <&vcc_1v8>;
 };
index 887f31c..4193c2b 100644 (file)
@@ -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 {
                        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-size = <0x80000>;
                cache-line-size = <64>;
                cache-sets = <512>;
        };
diff --git a/arch/arm/dts/k3-am62x-sk-common.dtsi b/arch/arm/dts/k3-am62x-sk-common.dtsi
new file mode 100644 (file)
index 0000000..34c8ffc
--- /dev/null
@@ -0,0 +1,412 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Common dtsi for AM62x SK and derivatives
+ *
+ * Copyright (C) 2021-2023 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+#include <dt-bindings/leds/common.h>
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/net/ti-dp83867.h>
+#include "k3-am625.dtsi"
+
+/ {
+       aliases {
+               serial2 = &main_uart0;
+               mmc0 = &sdhci0;
+               mmc1 = &sdhci1;
+               mmc2 = &sdhci2;
+               spi0 = &ospi0;
+               ethernet0 = &cpsw_port1;
+               ethernet1 = &cpsw_port2;
+               usb0 = &usb0;
+               usb1 = &usb1;
+       };
+
+       chosen {
+               stdout-path = "serial2:115200n8";
+       };
+
+       memory@80000000 {
+               device_type = "memory";
+               /* 2G RAM */
+               reg = <0x00000000 0x80000000 0x00000000 0x80000000>;
+       };
+
+       reserved-memory {
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+
+               ramoops@9ca00000 {
+                       compatible = "ramoops";
+                       reg = <0x00 0x9ca00000 0x00 0x00100000>;
+                       record-size = <0x8000>;
+                       console-size = <0x8000>;
+                       ftrace-size = <0x00>;
+                       pmsg-size = <0x8000>;
+               };
+
+               secure_tfa_ddr: tfa@9e780000 {
+                       reg = <0x00 0x9e780000 0x00 0x80000>;
+                       alignment = <0x1000>;
+                       no-map;
+               };
+
+               secure_ddr: optee@9e800000 {
+                       reg = <0x00 0x9e800000 0x00 0x01800000>; /* for OP-TEE */
+                       alignment = <0x1000>;
+                       no-map;
+               };
+
+               wkup_r5fss0_core0_dma_memory_region: r5f-dma-memory@9db00000 {
+                       compatible = "shared-dma-pool";
+                       reg = <0x00 0x9db00000 0x00 0xc00000>;
+                       no-map;
+               };
+       };
+
+       leds {
+               compatible = "gpio-leds";
+               pinctrl-names = "default";
+               pinctrl-0 = <&usr_led_pins_default>;
+
+               led-0 {
+                       label = "am62-sk:green:heartbeat";
+                       gpios = <&main_gpio1 49 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "heartbeat";
+                       function = LED_FUNCTION_HEARTBEAT;
+                       default-state = "off";
+               };
+       };
+
+       tlv320_mclk: clk-0 {
+               #clock-cells = <0>;
+               compatible = "fixed-clock";
+               clock-frequency = <12288000>;
+       };
+
+       codec_audio: sound {
+               compatible = "simple-audio-card";
+               simple-audio-card,name = "AM62x-SKEVM";
+               simple-audio-card,widgets =
+                       "Headphone",    "Headphone Jack",
+                       "Line",         "Line In",
+                       "Microphone",   "Microphone Jack";
+               simple-audio-card,routing =
+                       "Headphone Jack",       "HPLOUT",
+                       "Headphone Jack",       "HPROUT",
+                       "LINE1L",               "Line In",
+                       "LINE1R",               "Line In",
+                       "MIC3R",                "Microphone Jack",
+                       "Microphone Jack",      "Mic Bias";
+               simple-audio-card,format = "dsp_b";
+               simple-audio-card,bitclock-master = <&sound_master>;
+               simple-audio-card,frame-master = <&sound_master>;
+               simple-audio-card,bitclock-inversion;
+
+               simple-audio-card,cpu {
+                       sound-dai = <&mcasp1>;
+               };
+
+               sound_master: simple-audio-card,codec {
+                       sound-dai = <&tlv320aic3106>;
+                       clocks = <&tlv320_mclk>;
+               };
+       };
+};
+
+&main_pmx0 {
+       /* First pad number is ALW package and second is AMC package */
+       main_uart0_pins_default: main-uart0-default-pins {
+               pinctrl-single,pins = <
+                       AM62X_IOPAD(0x1c8, PIN_INPUT, 0) /* (D14/A13) UART0_RXD */
+                       AM62X_IOPAD(0x1cc, PIN_OUTPUT, 0) /* (E14/E11) UART0_TXD */
+               >;
+       };
+
+       main_uart1_pins_default: main-uart1-default-pins {
+               pinctrl-single,pins = <
+                       AM62X_IOPAD(0x194, PIN_INPUT, 2) /* (B19/B18) MCASP0_AXR3.UART1_CTSn */
+                       AM62X_IOPAD(0x198, PIN_OUTPUT, 2) /* (A19/B17) MCASP0_AXR2.UART1_RTSn */
+                       AM62X_IOPAD(0x1ac, PIN_INPUT, 2) /* (E19/D15) MCASP0_AFSR.UART1_RXD */
+                       AM62X_IOPAD(0x1b0, PIN_OUTPUT, 2) /* (A20/D16) MCASP0_ACLKR.UART1_TXD */
+               >;
+       };
+
+       main_i2c0_pins_default: main-i2c0-default-pins {
+               pinctrl-single,pins = <
+                       AM62X_IOPAD(0x1e0, PIN_INPUT_PULLUP, 0) /* (B16/E12) I2C0_SCL */
+                       AM62X_IOPAD(0x1e4, PIN_INPUT_PULLUP, 0) /* (A16/D14) I2C0_SDA */
+               >;
+       };
+
+       main_i2c1_pins_default: main-i2c1-default-pins {
+               pinctrl-single,pins = <
+                       AM62X_IOPAD(0x1e8, PIN_INPUT_PULLUP, 0) /* (B17/A17) I2C1_SCL */
+                       AM62X_IOPAD(0x1ec, PIN_INPUT_PULLUP, 0) /* (A17/A16) I2C1_SDA */
+               >;
+       };
+
+       main_i2c2_pins_default: main-i2c2-default-pins {
+               pinctrl-single,pins = <
+                       AM62X_IOPAD(0x0b0, PIN_INPUT_PULLUP, 1) /* (K22/H18) GPMC0_CSn2.I2C2_SCL */
+                       AM62X_IOPAD(0x0b4, PIN_INPUT_PULLUP, 1) /* (K24/H19) GPMC0_CSn3.I2C2_SDA */
+               >;
+       };
+
+       main_mmc0_pins_default: main-mmc0-default-pins {
+               pinctrl-single,pins = <
+                       AM62X_IOPAD(0x220, PIN_INPUT, 0) /* (Y3/V3) MMC0_CMD */
+                       AM62X_IOPAD(0x218, PIN_INPUT, 0) /* (AB1/Y1) MMC0_CLK */
+                       AM62X_IOPAD(0x214, PIN_INPUT, 0) /* (AA2/V2) MMC0_DAT0 */
+                       AM62X_IOPAD(0x210, PIN_INPUT, 0) /* (AA1/V1) MMC0_DAT1 */
+                       AM62X_IOPAD(0x20c, PIN_INPUT, 0) /* (AA3/W2) MMC0_DAT2 */
+                       AM62X_IOPAD(0x208, PIN_INPUT, 0) /* (Y4/W1) MMC0_DAT3 */
+                       AM62X_IOPAD(0x204, PIN_INPUT, 0) /* (AB2/Y2) MMC0_DAT4 */
+                       AM62X_IOPAD(0x200, PIN_INPUT, 0) /* (AC1/W3) MMC0_DAT5 */
+                       AM62X_IOPAD(0x1fc, PIN_INPUT, 0) /* (AD2/W4) MMC0_DAT6 */
+                       AM62X_IOPAD(0x1f8, PIN_INPUT, 0) /* (AC2/V4) MMC0_DAT7 */
+               >;
+       };
+
+       main_mmc1_pins_default: main-mmc1-default-pins {
+               pinctrl-single,pins = <
+                       AM62X_IOPAD(0x23c, PIN_INPUT, 0) /* (A21/C18) MMC1_CMD */
+                       AM62X_IOPAD(0x234, PIN_INPUT, 0) /* (B22/A20) MMC1_CLK */
+                       AM62X_IOPAD(0x230, PIN_INPUT, 0) /* (A22/A19) MMC1_DAT0 */
+                       AM62X_IOPAD(0x22c, PIN_INPUT, 0) /* (B21/B19) MMC1_DAT1 */
+                       AM62X_IOPAD(0x228, PIN_INPUT, 0) /* (C21/B20) MMC1_DAT2 */
+                       AM62X_IOPAD(0x224, PIN_INPUT, 0) /* (D22/C19) MMC1_DAT3 */
+                       AM62X_IOPAD(0x240, PIN_INPUT, 0) /* (D17/C15) MMC1_SDCD */
+               >;
+       };
+
+       usr_led_pins_default: usr-led-default-pins {
+               pinctrl-single,pins = <
+                       AM62X_IOPAD(0x244, PIN_OUTPUT, 7) /* (C17/B15) MMC1_SDWP.GPIO1_49 */
+               >;
+       };
+
+       main_mdio1_pins_default: main-mdio1-default-pins {
+               pinctrl-single,pins = <
+                       AM62X_IOPAD(0x160, PIN_OUTPUT, 0) /* (AD24/V17) MDIO0_MDC */
+                       AM62X_IOPAD(0x15c, PIN_INPUT, 0) /* (AB22/U16) MDIO0_MDIO */
+               >;
+       };
+
+       main_rgmii1_pins_default: main-rgmii1-default-pins {
+               pinctrl-single,pins = <
+                       AM62X_IOPAD(0x14c, PIN_INPUT, 0) /* (AB17/W15) RGMII1_RD0 */
+                       AM62X_IOPAD(0x150, PIN_INPUT, 0) /* (AC17/Y16) RGMII1_RD1 */
+                       AM62X_IOPAD(0x154, PIN_INPUT, 0) /* (AB16/AA17) RGMII1_RD2 */
+                       AM62X_IOPAD(0x158, PIN_INPUT, 0) /* (AA15/Y15) RGMII1_RD3 */
+                       AM62X_IOPAD(0x148, PIN_INPUT, 0) /* (AD17/AA16) RGMII1_RXC */
+                       AM62X_IOPAD(0x144, PIN_INPUT, 0) /* (AE17/W14) RGMII1_RX_CTL */
+                       AM62X_IOPAD(0x134, PIN_OUTPUT, 0) /* (AE20/U14) RGMII1_TD0 */
+                       AM62X_IOPAD(0x138, PIN_OUTPUT, 0) /* (AD20/AA19) RGMII1_TD1 */
+                       AM62X_IOPAD(0x13c, PIN_OUTPUT, 0) /* (AE18/Y17) RGMII1_TD2 */
+                       AM62X_IOPAD(0x140, PIN_OUTPUT, 0) /* (AD18/AA18) RGMII1_TD3 */
+                       AM62X_IOPAD(0x130, PIN_OUTPUT, 0) /* (AE19/W16) RGMII1_TXC */
+                       AM62X_IOPAD(0x12c, PIN_OUTPUT, 0) /* (AD19/V15) RGMII1_TX_CTL */
+               >;
+       };
+
+       main_usb1_pins_default: main-usb1-default-pins {
+               pinctrl-single,pins = <
+                       AM62X_IOPAD(0x0258, PIN_OUTPUT, 0) /* (F18/E16) USB1_DRVVBUS */
+               >;
+       };
+
+       main_mcasp1_pins_default: main-mcasp1-default-pins {
+               pinctrl-single,pins = <
+                       AM62X_IOPAD(0x090, PIN_INPUT, 2) /* (M24/K17) GPMC0_BE0N_CLE.MCASP1_ACLKX */
+                       AM62X_IOPAD(0x098, PIN_INPUT, 2) /* (U23/P21) GPMC0_WAIT0.MCASP1_AFSX */
+                       AM62X_IOPAD(0x08c, PIN_OUTPUT, 2) /* (L25/J17) GPMC0_WEN.MCASP1_AXR0 */
+                       AM62X_IOPAD(0x084, PIN_INPUT, 2) /* (L23/K20) GPMC0_ADVN_ALE.MCASP1_AXR2 */
+               >;
+       };
+};
+
+&mcu_pmx0 {
+       wkup_uart0_pins_default: wkup-uart0-default-pins {
+               pinctrl-single,pins = <
+                       AM62X_MCU_IOPAD(0x02c, PIN_INPUT, 0) /* (C6/A7) WKUP_UART0_CTSn */
+                       AM62X_MCU_IOPAD(0x030, PIN_OUTPUT, 0) /* (A4/B4) WKUP_UART0_RTSn */
+                       AM62X_MCU_IOPAD(0x024, PIN_INPUT, 0) /* (B4/B5) WKUP_UART0_RXD */
+                       AM62X_MCU_IOPAD(0x028, PIN_OUTPUT, 0) /* (C5/C6) WKUP_UART0_TXD */
+               >;
+       };
+};
+
+&wkup_uart0 {
+       /* WKUP UART0 is used by DM firmware */
+       status = "reserved";
+       pinctrl-names = "default";
+       pinctrl-0 = <&wkup_uart0_pins_default>;
+};
+
+&main_uart0 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&main_uart0_pins_default>;
+};
+
+&main_uart1 {
+       /* Main UART1 is used by TIFS firmware */
+       status = "reserved";
+       pinctrl-names = "default";
+       pinctrl-0 = <&main_uart1_pins_default>;
+};
+
+&main_i2c0 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&main_i2c0_pins_default>;
+       clock-frequency = <400000>;
+
+       eeprom@51 {
+               /* AT24C512C-MAHM-T or M24512-DFMC6TG */
+               compatible = "atmel,24c512";
+               reg = <0x51>;
+       };
+
+       typec_pd0: tps6598x@3f {
+               compatible = "ti,tps6598x";
+               reg = <0x3f>;
+
+               connector {
+                       compatible = "usb-c-connector";
+                       label = "USB-C";
+                       self-powered;
+                       data-role = "dual";
+                       power-role = "sink";
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       usb_con_hs: endpoint {
+                                               remote-endpoint = <&usb0_hs_ep>;
+                                       };
+                               };
+                       };
+               };
+       };
+};
+
+&main_i2c1 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&main_i2c1_pins_default>;
+       clock-frequency = <400000>;
+
+       tlv320aic3106: audio-codec@1b {
+               #sound-dai-cells = <0>;
+               compatible = "ti,tlv320aic3106";
+               reg = <0x1b>;
+               ai3x-micbias-vg = <1>;  /* 2.0V */
+
+               /* Regulators */
+               AVDD-supply = <&vcc_3v3_sys>;
+               IOVDD-supply = <&vcc_3v3_sys>;
+               DRVDD-supply = <&vcc_3v3_sys>;
+       };
+};
+
+&sdhci0 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&main_mmc0_pins_default>;
+       ti,driver-strength-ohm = <50>;
+       disable-wp;
+};
+
+&sdhci1 {
+       /* SD/MMC */
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&main_mmc1_pins_default>;
+       ti,driver-strength-ohm = <50>;
+       disable-wp;
+};
+
+&cpsw3g {
+       pinctrl-names = "default";
+       pinctrl-0 = <&main_rgmii1_pins_default>;
+};
+
+&cpsw_port1 {
+       phy-mode = "rgmii-rxid";
+       phy-handle = <&cpsw3g_phy0>;
+};
+
+&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>;
+               ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
+               ti,min-output-impedance;
+       };
+};
+
+&mailbox0_cluster0 {
+       mbox_m4_0: mbox-m4-0 {
+               ti,mbox-rx = <0 0 0>;
+               ti,mbox-tx = <1 0 0>;
+       };
+};
+
+&usbss0 {
+       status = "okay";
+       ti,vbus-divider;
+};
+
+&usbss1 {
+       status = "okay";
+       ti,vbus-divider;
+};
+
+&usb0 {
+       #address-cells = <1>;
+       #size-cells = <0>;
+       usb-role-switch;
+
+       port@0 {
+               reg = <0>;
+               usb0_hs_ep: endpoint {
+                   remote-endpoint = <&usb_con_hs>;
+              };
+       };
+};
+
+&usb1 {
+       dr_mode = "host";
+       pinctrl-names = "default";
+       pinctrl-0 = <&main_usb1_pins_default>;
+};
+
+&mcasp1 {
+       status = "okay";
+       #sound-dai-cells = <0>;
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&main_mcasp1_pins_default>;
+
+       op-mode = <0>;          /* MCASP_IIS_MODE */
+       tdm-slots = <2>;
+
+       serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
+              1 0 2 0
+              0 0 0 0
+              0 0 0 0
+              0 0 0 0
+       >;
+       tx-num-evt = <32>;
+       rx-num-evt = <32>;
+};
diff --git a/arch/arm/dts/k3-pinctrl.h b/arch/arm/dts/k3-pinctrl.h
new file mode 100644 (file)
index 0000000..c97548a
--- /dev/null
@@ -0,0 +1,53 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * This header provides constants for pinctrl bindings for TI's K3 SoC
+ * family.
+ *
+ * Copyright (C) 2018-2023 Texas Instruments Incorporated - https://www.ti.com/
+ */
+#ifndef DTS_ARM64_TI_K3_PINCTRL_H
+#define DTS_ARM64_TI_K3_PINCTRL_H
+
+#define PULLUDEN_SHIFT         (16)
+#define PULLTYPESEL_SHIFT      (17)
+#define RXACTIVE_SHIFT         (18)
+
+#define PULL_DISABLE           (1 << PULLUDEN_SHIFT)
+#define PULL_ENABLE            (0 << PULLUDEN_SHIFT)
+
+#define PULL_UP                        (1 << PULLTYPESEL_SHIFT | PULL_ENABLE)
+#define PULL_DOWN              (0 << PULLTYPESEL_SHIFT | PULL_ENABLE)
+
+#define INPUT_EN               (1 << RXACTIVE_SHIFT)
+#define INPUT_DISABLE          (0 << RXACTIVE_SHIFT)
+
+/* Only these macros are expected be used directly in device tree files */
+#define PIN_OUTPUT             (INPUT_DISABLE | PULL_DISABLE)
+#define PIN_OUTPUT_PULLUP      (INPUT_DISABLE | PULL_UP)
+#define PIN_OUTPUT_PULLDOWN    (INPUT_DISABLE | PULL_DOWN)
+#define PIN_INPUT              (INPUT_EN | PULL_DISABLE)
+#define PIN_INPUT_PULLUP       (INPUT_EN | PULL_UP)
+#define PIN_INPUT_PULLDOWN     (INPUT_EN | PULL_DOWN)
+
+#define AM62AX_IOPAD(pa, val, muxmode)         (((pa) & 0x1fff)) ((val) | (muxmode))
+#define AM62AX_MCU_IOPAD(pa, val, muxmode)     (((pa) & 0x1fff)) ((val) | (muxmode))
+
+#define AM62X_IOPAD(pa, val, muxmode)          (((pa) & 0x1fff)) ((val) | (muxmode))
+#define AM62X_MCU_IOPAD(pa, val, muxmode)      (((pa) & 0x1fff)) ((val) | (muxmode))
+
+#define AM64X_IOPAD(pa, val, muxmode)          (((pa) & 0x1fff)) ((val) | (muxmode))
+#define AM64X_MCU_IOPAD(pa, val, muxmode)      (((pa) & 0x1fff)) ((val) | (muxmode))
+
+#define AM65X_IOPAD(pa, val, muxmode)          (((pa) & 0x1fff)) ((val) | (muxmode))
+#define AM65X_WKUP_IOPAD(pa, val, muxmode)     (((pa) & 0x1fff)) ((val) | (muxmode))
+
+#define J721E_IOPAD(pa, val, muxmode)          (((pa) & 0x1fff)) ((val) | (muxmode))
+#define J721E_WKUP_IOPAD(pa, val, muxmode)     (((pa) & 0x1fff)) ((val) | (muxmode))
+
+#define J721S2_IOPAD(pa, val, muxmode)         (((pa) & 0x1fff)) ((val) | (muxmode))
+#define J721S2_WKUP_IOPAD(pa, val, muxmode)    (((pa) & 0x1fff)) ((val) | (muxmode))
+
+#define J784S4_IOPAD(pa, val, muxmode)         (((pa) & 0x1fff)) ((val) | (muxmode))
+#define J784S4_WKUP_IOPAD(pa, val, muxmode)    (((pa) & 0x1fff)) ((val) | (muxmode))
+
+#endif