Unverified Commit 99355a23 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ti-k3-dt-for-v6.6' of... 

Merge tag 'ti-k3-dt-for-v6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/dt

TI K3 device tree updates for v6.6

New Boards:
 - TQ group's TQMaX4XxL AM64 SOM and MBaX4XxL carrier board
 - TI's AM62P5 Starter Kit (SK)

New features:
AM625:
 - Support for Display (parallel only) - hdmi+audio support for
   AM625-SK/BeaglePlay, TC358778 DPI to MIPI-DSI bridge support
   for verdin.
 - MCU MCAN support and enable of Toradex Verdin
 - Toradex Verdin Dahlia audio support
AM62A7:
 - MCU MCAN support
 - Enable USB Dual Role Device(DRD) support for AM62A7
   Starter Kit(SK).
AM64:
 - TQ group's tqma64xxl: Overlays for SD-card and wlan.
J721E:
 - Main domain CPSW9G and correponding gateway/ethernet
   switch expansion - GESI board.
J721S2/AM68:
 - New CAN instances, ehrpwm, Display (DSS) and am68-sk HDMI support
 - Main domain CPSW2G and correponding gateway/ethernet
   switch expansion - GESI board.
J784S4/AM69:
 - Boot phase tag marking in device tree
 - UFS support

Cleanups and non-urgent fixes:
 - Cosmetic style fixups around "=" and "{" whitespace usage.
 - Fixups across multiple SoCs/boards for pwm-tbclk to matchup with
   bindings
 - Serdes header file include/dt-bindings/mux/ti-serdes.h is now
   deprecated, use k3-serdes.h in soc dtsi folder.
 - All SoCs: Enable GPIO/SDHCI/OSPI/TSADC/C6/C7 DSP nodes at the
   board level.
 - Fixups for AM62: Crypto powerdomains are conditional to better
   represent control of the crypto engines by security controller.
 - Fixups for j721e: Duplicate wakeup_i2c node dropped for SoM board.
 - Fixups for j721s2/am68: pimux offsets for OSPI.
 - Fixups for j784s4/am69: Fixups for pinmux for ospi/adc interrupt
   ranges for wkup/main gpios

* tag 'ti-k3-dt-for-v6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: (68 commits)
  arm64: dts: ti: verdin-am62: Add DSI display support
  arm64: dts: ti: Add support for the AM62P5 Starter Kit
  arm64: dts: ti: Introduce AM62P5 family of SoCs
  dt-bindings: arm: ti: Add bindings for AM62P5 SoCs
  arm64: dts: ti: k3-am69-sk: Add phase tags marking
  arm64: dts: ti: k3-j784s4-evm: Add phase tags marking
  arm64: dts: ti: k3-j784s4: Add phase tags marking
  arm64: dts: ti: k3-am625-beagleplay: Add HDMI support
  arm64: dts: ti: am62x-sk: Add overlay for HDMI audio
  arm64: dts: ti: k3-am62x-sk-common: Add HDMI support
  arm64: dts: ti: k3-am62-main: Add node for DSS
  arm64: dts: ti: k3-am62x-sk-common: Update main-i2c1 frequency
  arm64: dts: ti: k3-j721e: Enable C6x DSP nodes at the board level
  arm64: dts: ti: k3-j784s4: Enable C7x DSP nodes at the board level
  arm64: dts: ti: k3-j721e: Enable C7x DSP nodes at the board level
  arm64: dts: ti: k3-*: fix fss node dtbs check warnings
  arm64: dts: ti: k3-am64: Enable TSCADC nodes at the board level
  arm64: dts: ti: k3-am65: Enable TSCADC nodes at the board level
  arm64: dts: ti: k3-j721e: Enable TSCADC nodes at the board level
  arm64: dts: ti: k3-j7200: Enable GPIO nodes at the board level
  ...

Link: https://lore.kernel.org/r/20230814160651.frxohyshd2evp2k4@expenses


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f0df584f 9e772003

Documentation/devicetree/bindings/arm/ti/k3.yaml

+13 −0
Original line number Diff line number Diff line
@@ -25,6 +25,12 @@ properties: 
              - ti,am62a7-sk

          - const: ti,am62a7



      - description: K3 AM62P5 SoC and Boards

        items:

          - enum:

              - ti,am62p5-sk

          - const: ti,am62p5



      - description: K3 AM625 SoC PHYTEC phyBOARD-Lyra

        items:

          - const: phytec,am625-phyboard-lyra-rdk
@@ -72,6 +78,13 @@ properties: 
          - const: phytec,am64-phycore-som

          - const: ti,am642



      - description: K3 AM642 SoC on TQ-Systems TQMaX4XxL SoM

        items:

          - enum:

              - tq,am642-tqma6442l-mbax4xxl # MBaX4XxL base board

          - const: tq,am642-tqma6442l

          - const: ti,am642



      - description: K3 AM654 SoC

        items:

          - enum:

Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml

+13 −1
Original line number Diff line number Diff line
@@ -66,10 +66,22 @@ patternProperties: 
required:

  - compatible

  - reg

  - power-domains

  - dmas

  - dma-names



allOf:

  - if:

      properties:

        compatible:

          contains:

            const: ti,am62-sa3ul

    then:

      properties:

        power-domains: false

    else:

      required:

        - power-domains



additionalProperties: false



examples:

Documentation/devicetree/bindings/soc/ti/k3-ringacc.yaml

+7 −2
Original line number Diff line number Diff line
@@ -34,18 +34,22 @@ properties: 
      - const: ti,am654-navss-ringacc



  reg:

    minItems: 4

    items:

      - description: real time registers regions

      - description: fifos registers regions

      - description: proxy gcfg registers regions

      - description: proxy target registers regions

      - description: configuration registers region



  reg-names:

    minItems: 4

    items:

      - const: rt

      - const: fifos

      - const: proxy_gcfg

      - const: proxy_target

      - const: cfg



  msi-parent: true
@@ -80,8 +84,9 @@ examples: 
            reg = <0x0 0x3c000000 0x0 0x400000>,

                  <0x0 0x38000000 0x0 0x400000>,

                  <0x0 0x31120000 0x0 0x100>,

                  <0x0 0x33000000 0x0 0x40000>;

            reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target";

                  <0x0 0x33000000 0x0 0x40000>,

                  <0x0 0x31080000 0x0 0x40000>;

                  reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target", "cfg";

            ti,num-rings = <818>;

            ti,sci-rm-range-gp-rings = <0x2>; /* GP ring range */

            ti,sci = <&dmsc>;

arch/arm64/boot/dts/ti/Makefile

+19 −0
Original line number Diff line number Diff line
@@ -19,14 +19,27 @@ dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-dahlia.dtb 
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-dev.dtb

dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-yavia.dtb

dtb-$(CONFIG_ARCH_K3) += k3-am62-lp-sk.dtb

dtb-$(CONFIG_ARCH_K3) += k3-am62x-sk-hdmi-audio.dtbo



# Boards with AM62Ax SoC

dtb-$(CONFIG_ARCH_K3) += k3-am62a7-sk.dtb



# Boards with AM62Px SoC

dtb-$(CONFIG_ARCH_K3) += k3-am62p5-sk.dtb



# Boards with AM64x SoC

dtb-$(CONFIG_ARCH_K3) += k3-am642-evm.dtb

dtb-$(CONFIG_ARCH_K3) += k3-am642-phyboard-electra-rdk.dtb

dtb-$(CONFIG_ARCH_K3) += k3-am642-sk.dtb

dtb-$(CONFIG_ARCH_K3) += k3-am642-tqma64xxl-mbax4xxl.dtb



k3-am642-tqma64xxl-mbax4xxl-sdcard-dtbs := \

	k3-am642-tqma64xxl-mbax4xxl.dtb k3-am64-tqma64xxl-mbax4xxl-sdcard.dtbo

k3-am642-tqma64xxl-mbax4xxl-wlan-dtbs := \

	k3-am642-tqma64xxl-mbax4xxl.dtb k3-am64-tqma64xxl-mbax4xxl-wlan.dtbo



dtb-$(CONFIG_ARCH_K3) += k3-am642-tqma64xxl-mbax4xxl-sdcard.dtb

dtb-$(CONFIG_ARCH_K3) += k3-am642-tqma64xxl-mbax4xxl-wlan.dtb



# Boards with AM65x SoC

k3-am654-gp-evm-dtbs := k3-am654-base-board.dtb k3-am654-base-board-rocktech-rk101-panel.dtbo
@@ -46,15 +59,21 @@ dtb-$(CONFIG_ARCH_K3) += k3-j7200-evm.dtb 
k3-j721e-evm-dtbs := k3-j721e-common-proc-board.dtb k3-j721e-evm-quad-port-eth-exp.dtbo

dtb-$(CONFIG_ARCH_K3) += k3-j721e-beagleboneai64.dtb

dtb-$(CONFIG_ARCH_K3) += k3-j721e-evm.dtb

dtb-$(CONFIG_ARCH_K3) += k3-j721e-evm-gesi-exp-board.dtbo

dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk.dtb



# Boards with J721s2 SoC

dtb-$(CONFIG_ARCH_K3) += k3-am68-sk-base-board.dtb

dtb-$(CONFIG_ARCH_K3) += k3-j721s2-common-proc-board.dtb

dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm-gesi-exp-board.dtbo



# Boards with J784s4 SoC

dtb-$(CONFIG_ARCH_K3) += k3-am69-sk.dtb

dtb-$(CONFIG_ARCH_K3) += k3-j784s4-evm.dtb



# Enable support for device-tree overlays

DTC_FLAGS_k3-am625-sk += -@

DTC_FLAGS_k3-am62-lp-sk += -@

DTC_FLAGS_k3-am6548-iot2050-advanced-m2 += -@

DTC_FLAGS_k3-j721e-common-proc-board += -@

DTC_FLAGS_k3-j721s2-common-proc-board += -@

arch/arm64/boot/dts/ti/k3-am62-main.dtsi

+47 −5
Original line number Diff line number Diff line
@@ -55,11 +55,29 @@ 
			#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 {
@@ -174,7 +192,6 @@ 
	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>;
@@ -718,6 +735,31 @@ 
		};

	};



	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>;