]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm: dts: k3-am625: Sync with kernel v6.6-rc1
authorNishanth Menon <nm@ti.com>
Mon, 11 Sep 2023 14:02:56 +0000 (09:02 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 19 Sep 2023 13:13:19 +0000 (09:13 -0400)
Sync device tree with v6.6-rc1

Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Dhruva Gole <d-gole@ti.com>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
arch/arm/dts/k3-am62-main.dtsi
arch/arm/dts/k3-am62-mcu.dtsi
arch/arm/dts/k3-am62-verdin-dev.dtsi
arch/arm/dts/k3-am62-verdin.dtsi
arch/arm/dts/k3-am62.dtsi
arch/arm/dts/k3-am625-beagleplay.dts
arch/arm/dts/k3-am625-sk.dts

index 2488e3a537fe4d0acad4ee18fd2d77861e1b59b6..284b90c94da8a2e665d8d1dd2159a88dbb487af0 100644 (file)
                        #phy-cells = <1>;
                };
 
-               epwm_tbclk: clock@4130 {
-                       compatible = "ti,am62-epwm-tbclk", "syscon";
+               epwm_tbclk: clock-controller@4130 {
+                       compatible = "ti,am62-epwm-tbclk";
                        reg = <0x4130 0x4>;
                        #clock-cells = <1>;
                };
+
+               audio_refclk0: clock-controller@82e0 {
+                       compatible = "ti,am62-audio-refclk";
+                       reg = <0x82e0 0x4>;
+                       clocks = <&k3_clks 157 0>;
+                       assigned-clocks = <&k3_clks 157 0>;
+                       assigned-clock-parents = <&k3_clks 157 8>;
+                       #clock-cells = <0>;
+               };
+
+               audio_refclk1: clock-controller@82e4 {
+                       compatible = "ti,am62-audio-refclk";
+                       reg = <0x82e4 0x4>;
+                       clocks = <&k3_clks 157 10>;
+                       assigned-clocks = <&k3_clks 157 10>;
+                       assigned-clock-parents = <&k3_clks 157 18>;
+                       #clock-cells = <0>;
+               };
        };
 
        dmss: bus@48000000 {
        crypto: crypto@40900000 {
                compatible = "ti,am62-sa3ul";
                reg = <0x00 0x40900000 0x00 0x1200>;
-               power-domains = <&k3_pds 70 TI_SCI_PD_SHARED>;
                #address-cells = <2>;
                #size-cells = <2>;
                ranges = <0x00 0x40900000 0x00 0x40900000 0x00 0x30000>;
 
                usb0: usb@31000000 {
                        compatible = "snps,dwc3";
-                       reg =<0x00 0x31000000 0x00 0x50000>;
+                       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";
 
                usb1: usb@31100000 {
                        compatible = "snps,dwc3";
-                       reg =<0x00 0x31100000 0x00 0x50000>;
+                       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";
                };
        };
 
+       dss: dss@30200000 {
+               compatible = "ti,am625-dss";
+               reg = <0x00 0x30200000 0x00 0x1000>, /* common */
+                     <0x00 0x30202000 0x00 0x1000>, /* vidl1 */
+                     <0x00 0x30206000 0x00 0x1000>, /* vid */
+                     <0x00 0x30207000 0x00 0x1000>, /* ovr1 */
+                     <0x00 0x30208000 0x00 0x1000>, /* ovr2 */
+                     <0x00 0x3020a000 0x00 0x1000>, /* vp1: Used for OLDI */
+                     <0x00 0x3020b000 0x00 0x1000>; /* vp2: Used as DPI Out */
+               reg-names = "common", "vidl1", "vid",
+                           "ovr1", "ovr2", "vp1", "vp2";
+               power-domains = <&k3_pds 186 TI_SCI_PD_EXCLUSIVE>;
+               clocks = <&k3_clks 186 6>,
+                        <&dss_vp1_clk>,
+                        <&k3_clks 186 2>;
+               clock-names = "fck", "vp1", "vp2";
+               interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
+               status = "disabled";
+
+               dss_ports: ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+               };
+       };
+
        hwspinlock: spinlock@2a000000 {
                compatible = "ti,am64-hwspinlock";
                reg = <0x00 0x2a000000 0x00 0x1000>;
index 19fc38157d94e45f7dc19c73f3d0b77fd5bcdec4..80a3e1db26a97c0c65ce436565a2943682e00bca 100644 (file)
                /* Tightly coupled to M4F */
                status = "reserved";
        };
+
+       mcu_mcan0: can@4e08000 {
+               compatible = "bosch,m_can";
+               reg = <0x00 0x4e08000 0x00 0x200>,
+                     <0x00 0x4e00000 0x00 0x8000>;
+               reg-names = "m_can", "message_ram";
+               power-domains = <&k3_pds 188 TI_SCI_PD_EXCLUSIVE>;
+               clocks = <&k3_clks 188 6>, <&k3_clks 188 1>;
+               clock-names = "hclk", "cclk";
+               bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
+       };
+
+       mcu_mcan1: can@4e18000 {
+               compatible = "bosch,m_can";
+               reg = <0x00 0x4e18000 0x00 0x200>,
+                     <0x00 0x4e10000 0x00 0x8000>;
+               reg-names = "m_can", "message_ram";
+               power-domains = <&k3_pds 189 TI_SCI_PD_EXCLUSIVE>;
+               clocks = <&k3_clks 189 6>, <&k3_clks 189 1>;
+               clock-names = "hclk", "cclk";
+               bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
+       };
 };
index 846caee7dfa418c90ede8bea98cbfb6034d14ed3..6701cb8974bbd7a6fba225ff6483a3003c98f2c0 100644 (file)
@@ -8,6 +8,42 @@
  * https://www.toradex.com/products/carrier-board/verdin-development-board-kit
  */
 
+/ {
+       sound {
+               compatible = "simple-audio-card";
+               simple-audio-card,bitclock-master = <&codec_dai>;
+               simple-audio-card,format = "i2s";
+               simple-audio-card,frame-master = <&codec_dai>;
+               simple-audio-card,name = "verdin-nau8822";
+               simple-audio-card,routing =
+                       "Headphones", "LHP",
+                       "Headphones", "RHP",
+                       "Speaker", "LSPK",
+                       "Speaker", "RSPK",
+                       "Line Out", "AUXOUT1",
+                       "Line Out", "AUXOUT2",
+                       "LAUX", "Line In",
+                       "RAUX", "Line In",
+                       "LMICP", "Mic In",
+                       "RMICP", "Mic In";
+               simple-audio-card,widgets =
+                       "Headphones", "Headphones",
+                       "Line Out", "Line Out",
+                       "Speaker", "Speaker",
+                       "Microphone", "Mic In",
+                       "Line", "Line In";
+
+               codec_dai: simple-audio-card,codec {
+                       clocks = <&audio_refclk1>;
+                       sound-dai = <&nau8822_1a>;
+               };
+
+               simple-audio-card,cpu {
+                       sound-dai = <&mcasp0>;
+               };
+       };
+};
+
 /* Verdin ETHs */
 &cpsw3g {
        pinctrl-names = "default";
 &main_i2c1 {
        status = "okay";
 
+       /* Audio Codec */
+       nau8822_1a: audio-codec@1a {
+               compatible = "nuvoton,nau8822";
+               reg = <0x1a>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_i2s1_mclk>;
+               #sound-dai-cells = <0>;
+       };
+
        /* IO Expander */
        gpio_expander_21: gpio@21 {
                compatible = "nxp,pcal6416";
        status = "okay";
 };
 
+/* Verdin CAN_2 */
+&mcu_mcan0 {
+       status = "okay";
+};
+
 /* Verdin UART_4 */
 &mcu_uart0 {
        status = "okay";
index 57dd061911abb4c4e25faeabffed4acd80ff07ce..40992e7e4c3084cca1226d32c5fe8ea0a66ec949 100644 (file)
@@ -19,6 +19,8 @@
        };
 
        aliases {
+               can0 = &main_mcan0;
+               can1 = &mcu_mcan0;
                ethernet0 = &cpsw_port1;
                ethernet1 = &cpsw_port2;
                i2c0 = &main_i2c0;
                >;
        };
 
+       /* Verdin CAN_2 */
+       pinctrl_mcu_mcan0: mcu-mcan0-default-pins {
+               pinctrl-single,pins = <
+                       AM62X_MCU_IOPAD(0x0038, PIN_INPUT,  0) /* (B3) MCU_MCAN0_RX */ /* SODIMM 26 */
+                       AM62X_MCU_IOPAD(0x0034, PIN_OUTPUT, 0) /* (D6) MCU_MCAN0_TX */ /* SODIMM 24 */
+               >;
+       };
+
        /* Verdin UART_4 - Reserved to Cortex-M4 */
        pinctrl_mcu_uart0: mcu-uart0-default-pins {
                pinctrl-single,pins = <
        };
 };
 
+/* VERDIN I2S_1_MCLK */
+&audio_refclk1 {
+       assigned-clock-rates = <25000000>;
+};
+
 &cpsw3g {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_rgmii1>;
        };
 };
 
+&dss {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_parallel_rgb>;
+       status = "disabled";
+};
+
+&dss_ports {
+       #address-cells = <1>;
+       #size-cells = <0>;
+
+       /* VP2: DPI Output */
+       port@1 {
+               reg = <1>;
+
+               dpi_out: endpoint {
+                       remote-endpoint = <&rgb_in>;
+               };
+       };
+};
+
 /* Verdin PWM_1, PWM_2 */
 &epwm0 {
        pinctrl-names = "default";
 
                                rgb_in: endpoint {
                                        data-lines = <18>;
+                                       remote-endpoint = <&dpi_out>;
                                };
                        };
 
        status = "disabled";
 };
 
-/* Verdin CAN_2 - Reserved to Cortex-M4 */
-
 /* Verdin SPI_1 */
 &main_spi1 {
        pinctrl-names = "default";
                "";
 };
 
+/* Verdin CAN_2 */
+&mcu_mcan0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_mcu_mcan0>;
+       status = "disabled";
+};
+
 /* Verdin UART_4 - Cortex-M4 UART */
 &mcu_uart0 {
        pinctrl-names = "default";
index 5e72c445f37a9613b81de6ca4ad54b6b66e5f0c8..11f14eef2d44affe51f1992f1aa3c648a15d16c3 100644 (file)
                };
        };
 
+       dss_vp1_clk: clock-divider-oldi {
+               compatible = "fixed-factor-clock";
+               clocks = <&k3_clks 186 0>;
+               #clock-cells = <0>;
+               clock-div = <7>;
+               clock-mult = <1>;
+       };
+
        #include "k3-am62-thermal.dtsi"
 };
 
index 589bf998bc5281bf564135b147ffef0810976585..7cfdf562b53bfe53502f70b24e8afd1899cf4859 100644 (file)
@@ -14,7 +14,7 @@
 #include "k3-am625.dtsi"
 
 / {
-       compatible =  "beagle,am625-beagleplay", "ti,am625";
+       compatible = "beagle,am625-beagleplay", "ti,am625";
        model = "BeagleBoard.org BeaglePlay";
 
        aliases {
 
        };
 
+       hdmi0: connector-hdmi {
+               compatible = "hdmi-connector";
+               label = "hdmi";
+               type = "a";
+               port {
+                       hdmi_connector_in: endpoint {
+                               remote-endpoint = <&it66121_out>;
+                       };
+               };
+       };
+
+       sound {
+               compatible = "simple-audio-card";
+               simple-audio-card,name = "it66121 HDMI";
+               simple-audio-card,format = "i2s";
+               simple-audio-card,bitclock-master = <&hdmi_dailink_master>;
+               simple-audio-card,frame-master = <&hdmi_dailink_master>;
+
+               hdmi_dailink_master: simple-audio-card,cpu {
+                       sound-dai = <&mcasp1>;
+                       system-clock-direction-out;
+               };
+
+               simple-audio-card,codec {
+                       sound-dai = <&it66121>;
+               };
+       };
+
        /* Workaround for errata i2329 - just use mdio bitbang */
        mdio0: mdio {
                compatible = "virtual,mdio-gpio";
                        AM62X_IOPAD(0x01f4, PIN_INPUT_PULLUP, 0) /* (D16) EXTINTn */
                >;
        };
+
+       hdmi_gpio_pins_default: hdmi-gpio-default-pins {
+               pinctrl-single,pins = <
+                       AM62X_IOPAD(0x0094, PIN_INPUT_PULLUP | PIN_DEBOUNCE_CONF6, 7) /* (N20) GPMC0_BE1n.GPIO0_36 */
+                       AM62X_IOPAD(0x0054, PIN_OUTPUT_PULLUP, 7) /* (P21) GPMC0_AD6.GPIO0_21 */
+               >;
+       };
+
+       mcasp_hdmi_pins_default: mcasp-hdmi-default-pins {
+               pinctrl-single,pins = <
+                       AM62X_IOPAD(0x0090, PIN_INPUT, 2) /* (M24) GPMC0_BE0n_CLE.MCASP1_ACLKX */
+                       AM62X_IOPAD(0x0098, PIN_INPUT, 2) /* (U23) GPMC0_WAIT0.MCASP1_AFSX */
+                       AM62X_IOPAD(0x008c, PIN_OUTPUT, 2) /* (L25) GPMC0_WEn.MCASP1_AXR0 */
+                       AM62X_IOPAD(0x0088, PIN_INPUT, 2) /* (L24) GPMC0_OEn_REn.MCASP1_AXR1 */
+                       AM62X_IOPAD(0x0084, PIN_INPUT, 2) /* (L23) GPMC0_ADVn_ALE.MCASP1_AXR2 */
+                       AM62X_IOPAD(0x007c, PIN_INPUT, 2) /* (P25) GPMC0_CLK.MCASP1_AXR3 */
+               >;
+       };
+
+       dss0_pins_default: dss0-default-pins {
+               pinctrl-single,pins = <
+                       AM62X_IOPAD(0x0100, PIN_OUTPUT, 0) /* (AC25) VOUT0_VSYNC */
+                       AM62X_IOPAD(0x00f8, PIN_OUTPUT, 0) /* (AB24) VOUT0_HSYNC */
+                       AM62X_IOPAD(0x0104, PIN_OUTPUT, 0) /* (AC24) VOUT0_PCLK */
+                       AM62X_IOPAD(0x00fc, PIN_OUTPUT, 0) /* (Y20) VOUT0_DE */
+                       AM62X_IOPAD(0x00b8, PIN_OUTPUT, 0) /* (U22) VOUT0_DATA0 */
+                       AM62X_IOPAD(0x00bc, PIN_OUTPUT, 0) /* (V24) VOUT0_DATA1 */
+                       AM62X_IOPAD(0x00c0, PIN_OUTPUT, 0) /* (W25) VOUT0_DATA2 */
+                       AM62X_IOPAD(0x00c4, PIN_OUTPUT, 0) /* (W24) VOUT0_DATA3 */
+                       AM62X_IOPAD(0x00c8, PIN_OUTPUT, 0) /* (Y25) VOUT0_DATA4 */
+                       AM62X_IOPAD(0x00cc, PIN_OUTPUT, 0) /* (Y24) VOUT0_DATA5 */
+                       AM62X_IOPAD(0x00d0, PIN_OUTPUT, 0) /* (Y23) VOUT0_DATA6 */
+                       AM62X_IOPAD(0x00d4, PIN_OUTPUT, 0) /* (AA25) VOUT0_DATA7 */
+                       AM62X_IOPAD(0x00d8, PIN_OUTPUT, 0) /* (V21) VOUT0_DATA8 */
+                       AM62X_IOPAD(0x00dc, PIN_OUTPUT, 0) /* (W21) VOUT0_DATA9 */
+                       AM62X_IOPAD(0x00e0, PIN_OUTPUT, 0) /* (V20) VOUT0_DATA10 */
+                       AM62X_IOPAD(0x00e4, PIN_OUTPUT, 0) /* (AA23) VOUT0_DATA11 */
+                       AM62X_IOPAD(0x00e8, PIN_OUTPUT, 0) /* (AB25) VOUT0_DATA12 */
+                       AM62X_IOPAD(0x00ec, PIN_OUTPUT, 0) /* (AA24) VOUT0_DATA13 */
+                       AM62X_IOPAD(0x00f0, PIN_OUTPUT, 0) /* (Y22) VOUT0_DATA14 */
+                       AM62X_IOPAD(0x00f4, PIN_OUTPUT, 0) /* (AA21) VOUT0_DATA15 */
+                       AM62X_IOPAD(0x005c, PIN_OUTPUT, 1) /* (R24) GPMC0_AD8.VOUT0_DATA16 */
+                       AM62X_IOPAD(0x0060, PIN_OUTPUT, 1) /* (R25) GPMC0_AD9.VOUT0_DATA17 */
+                       AM62X_IOPAD(0x0064, PIN_OUTPUT, 1) /* (T25) GPMC0_AD10.VOUT0_DATA18 */
+                       AM62X_IOPAD(0x0068, PIN_OUTPUT, 1) /* (R21) GPMC0_AD11.VOUT0_DATA19 */
+                       AM62X_IOPAD(0x006c, PIN_OUTPUT, 1) /* (T22) GPMC0_AD12.VOUT0_DATA20 */
+                       AM62X_IOPAD(0x0070, PIN_OUTPUT, 1) /* (T24) GPMC0_AD13.VOUT0_DATA21 */
+                       AM62X_IOPAD(0x0074, PIN_OUTPUT, 1) /* (U25) GPMC0_AD14.VOUT0_DATA22 */
+                       AM62X_IOPAD(0x0078, PIN_OUTPUT, 1) /* (U24) GPMC0_AD15.VOUT0_DATA23 */
+               >;
+       };
 };
 
 &mcu_pmx0 {
                >;
        };
 
-       gbe_pmx_obsclk: gbe-pmx-clk-default {
+       gbe_pmx_obsclk: gbe-pmx-obsclk-default-pins {
                pinctrl-single,pins = <
                        AM62X_MCU_IOPAD(0x0004, PIN_OUTPUT, 1) /* (B8) MCU_SPI0_CS1.MCU_OBSCLK0 */
                >;
        pinctrl-0 = <&i2c2_1v8_pins_default>;
        clock-frequency = <100000>;
        status = "okay";
+
+       it66121: bridge-hdmi@4c {
+               compatible = "ite,it66121";
+               reg = <0x4c>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&hdmi_gpio_pins_default>;
+               vcn33-supply = <&vdd_3v3>;
+               vcn18-supply = <&buck2_reg>;
+               vrf12-supply = <&buck3_reg>;
+               reset-gpios = <&main_gpio0 21 GPIO_ACTIVE_LOW>;
+               interrupt-parent = <&main_gpio0>;
+               interrupts = <36 IRQ_TYPE_EDGE_FALLING>;
+               #sound-dai-cells = <0>;
+
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@0 {
+                               reg = <0>;
+
+                               it66121_in: endpoint {
+                                       bus-width = <24>;
+                                       remote-endpoint = <&dpi1_out>;
+                               };
+                       };
+
+                       port@1 {
+                               reg = <1>;
+
+                               it66121_out: endpoint {
+                                       remote-endpoint = <&hdmi_connector_in>;
+                               };
+                       };
+               };
+       };
 };
 
 &main_i2c3 {
        pinctrl-0 = <&wifi_debug_uart_pins_default>;
        status = "okay";
 };
+
+&dss {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&dss0_pins_default>;
+};
+
+&dss_ports {
+       /* VP2: DPI Output */
+       port@1 {
+               reg = <1>;
+
+               dpi1_out: endpoint {
+                       remote-endpoint = <&it66121_in>;
+               };
+       };
+};
+
+&mcasp1 {
+       status = "okay";
+       #sound-dai-cells = <0>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&mcasp_hdmi_pins_default>;
+       auxclk-fs-ratio = <2177>;
+       op-mode = <0>;          /* MCASP_IIS_MODE */
+       tdm-slots = <2>;
+       serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
+              1 0 0 0
+              0 0 0 0
+              0 0 0 0
+              0 0 0 0
+       >;
+       tx-num-evt = <32>;
+       rx-num-evt = <32>;
+};
index 3f9ef4053aa61e98d268538b8954fe56589bee52..7c98c1b855d13b321e9f501ec7cdc2785b7806bc 100644 (file)
        pinctrl-names = "default";
        pinctrl-0 = <&ospi0_pins_default>;
 
-       flash@0{
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0x0>;
                spi-tx-bus-width = <8>;