Unverified Commit af3c6847 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

TI K3 device tree updates for v6.5

New Boards:
phyBOARD-Lyra-AM625 Board support
Toradex Verdin AM62 COM, carrier and dev boards

New features:
Across K3 SoCs:
 - Error Signaling Module(ESM) and Secproxy IPC modules
 - On board I2C EEPROM
 - Voltage Temp Monitoring (VTM) module
 - DM timers (GP Timers)
J784s4:
 - R5 and C7x DSP remoteproc, ADC, QSPI
AM69:
 - Addition of more peripherals: CPSW, eMMC, UARTs, I2C et al
J721s2:
 - USB, Serdes, OSPI, PCIe
AM62a:
- Watchdog
J721e:
- HyperFlash/HyperBus
AM62:
- Type-C USB0 port

Cleanups and non-urgent fixes
Particularly large set of cleanups to get rid of dtbs_check errors and
dtc warnings:
 - Addition of missing pinmux and uart nodes for AM64, AM62x, AM62A,
   J721e, J7200 that are used by bootloader
 - Split Pinmux regions/range to avoid holes for J721s2, J7200, J784s4
 - Drop bootargs and unneeded aliases across all K3 SoCs
 - Move aliases to board dts files from SoC dtsi files
 - Move to generic node name for can, rtc nodes on am65
 - s/-pins-default/default-pins/ to match upcoming pinctrl.yaml update
 - Fix pinctrl phandle references to use <> as separator where multiple
   entries are present

* tag 'ti-k3-dt-for-v6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: (153 commits)
  arm64: dts: ti: Unify pin group node names for make dtbs checks
  arm64: dts: ti: add verdin am62 yavia
  arm64: dts: ti: add verdin am62 dahlia
  arm64: dts: ti: add verdin am62
  dt-bindings: arm: ti: add toradex,verdin-am62 et al.
  arm64: dts: ti: Add basic support for phyBOARD-Lyra-AM625
  dt-bindings: arm: ti: Add bindings for PHYTEC AM62x based hardware
  arm64: dts: ti: k3-j7200-mcu-wakeup: Remove 0x unit address prefix from nodename
  arm64: dts: ti: k3-j721e-som-p0: Enable wakeup_i2c0 and eeprom
  arm64: dts: ti: k3-am64: Add ESM support
  arm64: dts: ti: k3-am62: Add ESM support
  arm64: dts: ti: k3-j7200: Add ESM support
  arm64: dts: ti: k3-j721e: Add ESM support
  dt-bindings: misc: esm: Add ESM support for TI K3 devices
  arm64: dts: ti: k3-j721s2-som-p0: Enable wakeup_i2c0 and eeprom
  arm64: dts: ti: k3-j721s2-common-proc-board: Add uart pinmux
  arm64: dts: ti: k3-am68-sk-som: Enable wakeup_i2c0 and eeprom
  arm64: dts: ti: k3-am68-sk-base-board: Add uart pinmux
  arm64: dts: ti: k3-am68-sk-base-board: Add pinmux for RPi Header
  arm64: dts: ti: k3-j721s2: Fix wkup pinmux range
  ...

Link: https://lore.kernel.org/r/7fe0c6de-cb99-9c89-8583-b3855fde16f8@ti.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5e64ee42 a4956811

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

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

          - const: ti,am62a7



      - description: K3 AM625 SoC PHYTEC phyBOARD-Lyra

        items:

          - const: phytec,am625-phyboard-lyra-rdk

          - const: phytec,am62-phycore-som

          - const: ti,am625



      - description: K3 AM625 SoC

        items:

          - enum:
@@ -33,6 +39,26 @@ properties: 
              - ti,am62-lp-sk

          - const: ti,am625



      - description: K3 AM62x SoC Toradex Verdin Modules and Carrier Boards

        items:

          - enum:

              - toradex,verdin-am62-nonwifi-dahlia # Verdin AM62 Module on Dahlia

              - toradex,verdin-am62-nonwifi-dev    # Verdin AM62 Module on Verdin Development Board

              - toradex,verdin-am62-nonwifi-yavia  # Verdin AM62 Module on Yavia

          - const: toradex,verdin-am62-nonwifi     # Verdin AM62 Module without Wi-Fi / BT

          - const: toradex,verdin-am62             # Verdin AM62 Module

          - const: ti,am625



      - description: K3 AM62x SoC Toradex Verdin Modules and Carrier Boards with Wi-Fi / BT

        items:

          - enum:

              - toradex,verdin-am62-wifi-dahlia # Verdin AM62 Wi-Fi / BT Module on Dahlia

              - toradex,verdin-am62-wifi-dev    # Verdin AM62 Wi-Fi / BT M. on Verdin Development B.

              - toradex,verdin-am62-wifi-yavia  # Verdin AM62 Wi-Fi / BT Module on Yavia

          - const: toradex,verdin-am62-wifi     # Verdin AM62 Wi-Fi / BT Module

          - const: toradex,verdin-am62          # Verdin AM62 Module

          - const: ti,am625



      - description: K3 AM642 SoC

        items:

          - enum:

Documentation/devicetree/bindings/misc/ti,j721e-esm.yaml

0 → 100644
+53 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

# Copyright (C) 2022 Texas Instruments Incorporated

%YAML 1.2

---

$id: http://devicetree.org/schemas/misc/ti,j721e-esm.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Texas Instruments K3 ESM



maintainers:

  - Neha Malcom Francis <n-francis@ti.com>



description:

  The ESM (Error Signaling Module) is an IP block on TI K3 devices

  that allows handling of safety events somewhat similar to what interrupt

  controller would do. The safety signals have their separate paths within

  the SoC, and they are handled by the ESM, which routes them to the proper

  destination, which can be system reset, interrupt controller, etc. In the

  simplest configuration the signals are just routed to reset the SoC.



properties:

  compatible:

    const: ti,j721e-esm



  reg:

    maxItems: 1



  ti,esm-pins:

    $ref: /schemas/types.yaml#/definitions/uint32-array

    description:

      integer array of ESM interrupt pins to route to external event pin

      which can be used to reset the SoC.

    minItems: 1

    maxItems: 255



required:

  - compatible

  - reg

  - ti,esm-pins



additionalProperties: false



examples:

  - |

    bus {

        #address-cells = <2>;

        #size-cells = <2>;

        esm@700000 {

            compatible = "ti,j721e-esm";

            reg = <0x0 0x700000 0x0 0x1000>;

            ti,esm-pins = <344>, <345>;

        };

    };

arch/arm64/boot/dts/ti/Makefile

+9 −0
Original line number Diff line number Diff line
@@ -10,7 +10,14 @@ 


# Boards with AM62x SoC

dtb-$(CONFIG_ARCH_K3) += k3-am625-beagleplay.dtb

dtb-$(CONFIG_ARCH_K3) += k3-am625-phyboard-lyra-rdk.dtb

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

dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-nonwifi-dahlia.dtb

dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-nonwifi-dev.dtb

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

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



# Boards with AM62Ax SoC
@@ -22,12 +29,14 @@ dtb-$(CONFIG_ARCH_K3) += k3-am642-phyboard-electra-rdk.dtb 
dtb-$(CONFIG_ARCH_K3) += k3-am642-sk.dtb



# Boards with AM65x SoC

k3-am654-gp-evm-dtbs := k3-am654-base-board.dtb k3-am654-base-board-rocktech-rk101-panel.dtbo

dtb-$(CONFIG_ARCH_K3) += k3-am6528-iot2050-basic.dtb

dtb-$(CONFIG_ARCH_K3) += k3-am6528-iot2050-basic-pg2.dtb

dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced.dtb

dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced-m2.dtb

dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced-pg2.dtb

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

dtb-$(CONFIG_ARCH_K3) += k3-am654-gp-evm.dtb



# Boards with J7200 SoC

k3-j7200-evm-dtbs := k3-j7200-common-proc-board.dtb k3-j7200-evm-quad-port-eth-exp.dtbo

arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts

+3 −3
Original line number Diff line number Diff line
@@ -73,19 +73,19 @@ 
};



&main_pmx0 {

	vddshv_sdio_pins_default: vddshv-sdio-pins-default {

	vddshv_sdio_pins_default: vddshv-sdio-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x07c, PIN_OUTPUT, 7) /* (M19) 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) /* (C13) UART0_RTSn.GPIO1_23 */

		>;

	};



	pmic_irq_pins_default: pmic-irq-pins-default {

	pmic_irq_pins_default: pmic-irq-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x01f4, PIN_INPUT, 0) /* (B16) EXTINTn */

		>;

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

+21 −0
Original line number Diff line number Diff line
@@ -184,6 +184,21 @@ 
		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>;
@@ -192,6 +207,12 @@ 
		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>;