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

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

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

TI K3 device tree updates for v6.3

New features:
J784S4 SoC and EVM support
AM68 and AM69 StarterKit, phyBOARD-Electra-AM642, Siemens IoT2050 M.2
AM62A7 SK additional peripherals
AM62 SK USB support

Non critical fixes
AM62:
McSPI Clock ID fixes
MMC TAP value updates
J7200:
pinmux range update
All:
Cache DT node fixes

Cleanups:
Reorder dts Makefile entries alphabetically

* tag 'ti-k3-dt-for-v6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: (25 commits)
  arm64: dts: ti: Makefile: Rearrange entries alphabetically
  arch: arm64: dts: Add support for AM69 Starter Kit
  dt-bindings: arm: ti: Add binding for AM69 Starter Kit
  arm64: dts: ti: iot2050: Add support for M.2 variant
  dt-bindings: arm: ti: Add binding for Siemens IOT2050 M.2 variant
  arm64: dts: ti: iot2050: Add layout of OSPI flash
  arm64: dts: ti: k3-j7200: Fix wakeup pinmux range
  arm64: dts: ti: k3-am68-sk: Add support for AM68 SK base board
  arm64: dts: ti: Add initial support for AM68 SK System on Module
  dt-bindings: arm: ti: Add binding for AM68 SK
  arm64: dts: Update cache properties for ti
  arm64: dts: ti: Add support for phyBOARD-Electra-AM642
  dt-bindings: arm: ti: Add bindings for PHYTEC AM64x based hardware
  arm64: dts: ti: k3-am62a7-sk: Enable USB1 node
  arm64: dts: ti: k3-am62a7-sk: Enable ethernet port
  arm64: dts: ti: k3-am62a-main: Add more peripheral nodes
  arm64: dts: ti: k3-am62a-mcu: Add MCU domain peripherals
  arm64: dts: ti: Add support for J784S4 EVM board
  arm64: dts: ti: Add initial support for J784S4 SoC
  dt-bindings: pinctrl: k3: Introduce pinmux definitions for J784s4
  ...

Link: https://lore.kernel.org/r/642cf238-43e5-d6fa-68b5-a9dfbc0277bf@ti.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3e47c0df 47d72bbb

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

+15 −0
Original line number Diff line number Diff line
@@ -38,10 +38,17 @@ properties: 
              - ti,am642-sk

          - const: ti,am642



      - description: K3 AM642 SoC PHYTEC phyBOARD-Electra

        items:

          - const: phytec,am642-phyboard-electra-rdk

          - const: phytec,am64-phycore-som

          - const: ti,am642



      - description: K3 AM654 SoC

        items:

          - enum:

              - siemens,iot2050-advanced

              - siemens,iot2050-advanced-m2

              - siemens,iot2050-advanced-pg2

              - siemens,iot2050-basic

              - siemens,iot2050-basic-pg2
@@ -69,9 +76,17 @@ properties: 
      - description: K3 J721s2 SoC

        items:

          - enum:

              - ti,am68-sk

              - ti,j721s2-evm

          - const: ti,j721s2



      - description: K3 J784s4 SoC

        items:

          - enum:

              - ti,am69-sk

              - ti,j784s4-evm

          - const: ti,j784s4



additionalProperties: true



...

arch/arm64/boot/dts/ti/Makefile

+27 −8
Original line number Diff line number Diff line
@@ -5,24 +5,43 @@ 
#

# Copyright (C) 2016-2021 Texas Instruments Incorporated - https://www.ti.com/

#

# Entries are grouped as per SoC present on the board. Groups are sorted

# alphabetically.



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

# Boards with AM62x SoC

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



# Boards with AM62Ax SoC

dtb-$(CONFIG_ARCH_K3) += k3-am62a7-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



# Boards with AM65x SoC

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



# Boards with J7200 SoC

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



# Boards with J721e SoC

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

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

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



dtb-$(CONFIG_ARCH_K3) += k3-j7200-common-proc-board.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-am642-evm.dtb

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



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

# Boards with J784s4 SoC

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

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



dtb-$(CONFIG_ARCH_K3) += k3-am62a7-sk.dtb
 
# Enable support for device-tree overlays

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

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

+73 −25
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ 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";

	};
@@ -424,7 +424,7 @@ 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";

	};
@@ -435,7 +435,7 @@ 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";

	};
@@ -501,8 +501,10 @@ sdhci0: mmc@fa10000 { 
		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";

	};
@@ -514,17 +516,17 @@ 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";
@@ -538,21 +540,67 @@ 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 {

		compatible = "simple-bus";

		reg = <0x00 0x0fc00000 0x00 0x70000>;

arch/arm64/boot/dts/ti/k3-am625-sk.dts

+27 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ aliases { 
		spi0 = &ospi0;

		ethernet0 = &cpsw_port1;

		ethernet1 = &cpsw_port2;

		usb0 = &usb0;

		usb1 = &usb1;

	};



	chosen {
@@ -284,6 +286,12 @@ main_gpio1_ioexp_intr_pins_default: main-gpio1-ioexp-intr-pins-default { 
			AM62X_IOPAD(0x01d4, PIN_INPUT, 7) /* (B15) UART0_RTSn.GPIO1_23 */

		>;

	};



	main_usb1_pins_default: main-usb1-pins-default {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x0258, PIN_OUTPUT, 0) /* (F18) USB1_DRVVBUS */

		>;

	};

};



&wkup_uart0 {
@@ -464,3 +472,22 @@ partition@3fc0000 { 
		};

	};

};



&usbss0 {

	status = "okay";

	ti,vbus-divider;

};



&usbss1 {

	status = "okay";

};



&usb0 {

	dr_mode = "peripheral";

};



&usb1 {

	dr_mode = "host";

	pinctrl-names = "default";

	pinctrl-0 = <&main_usb1_pins_default>;

};

arch/arm64/boot/dts/ti/k3-am625.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ opp-1250000000 { 


	L2_0: l2-cache0 {

		compatible = "cache";

		cache-unified;

		cache-level = <2>;

		cache-size = <0x40000>;

		cache-line-size = <64>;