Unverified Commit 96c7f32d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ti-k3-dt-for-v5.16' of... 

Merge tag 'ti-k3-dt-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux into arm/dt

Devicetree changes for TI K3 platforms for v5.16 merge window:

* New Platforms:
  - AM654: Siemens IOT2050 PG2 boards
  - J721E: Low cost SK board
* New features:
  - mmc aliases introduced
  - AM64 ICSSG nodes, mcu pinctrl added
* Fixes:
  - Schema fixups for pcie, thermal zones
  - Fixup to include board specific property for J721e-evm and j7200-evm
  - Misc fixups including cleaning up order in Makefile

* tag 'ti-k3-dt-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux: (24 commits)
  arm64: dts: ti: k3-j721e-sk: Add DDR carveout memory nodes
  arm64: dts: ti: k3-j721e-sk: Add IPC sub-mailbox nodes
  arm64: dts: ti: Add support for J721E SK
  dt-bindings: arm: ti: Add compatible for J721E SK
  arm64: dts: ti: iot2050: Add support for product generation 2 boards
  arm64: dts: ti: iot2050: Prepare for adding 2nd-generation boards
  dt-bindings: arm: ti: Add bindings for Siemens IOT2050 PG2 boards
  arm64: dts: ti: iot2050: Add/enabled mailboxes and carve-outs for R5F cores
  arm64: dts: ti: iot2050: Disable SR2.0-only PRUs
  arm64: dts: ti: iot2050: Flip mmc device ordering on Advanced devices
  arm64: dts: ti: k3-j7200-common-proc-board: Add j7200-evm compatible
  arm64: dts: ti: k3-j721e-common-proc-board: Add j721e-evm compatible
  dt-bindings: arm: ti: Add missing compatibles for j721e/j7200 evms
  arm64: dts: ti: Makefile: Collate AM64 platforms together
  arm64: dts: ti: k3-am64-main: Add ICSSG nodes
  arm64: dts: ti: k3-am65: Relocate thermal-zones to SoC specific location
  arm64: dts: ti: ti-k3*: Introduce aliases for mmc nodes
  arm64: dts: ti: k3-am65-main: Cleanup "ranges" property in "pcie" DT node
  arm64: dts: ti: j7200-main: Add *max-virtual-functions* for pcie-ep DT node
  arm64: dts: ti: j7200-main: Fix "bus-range" upto 256 bus number for PCIe
  ...

Link: https://lore.kernel.org/r/20211012120817.beqhp4tygnf3xyi5@wireless


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 86d3858e f46d16cf

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

+13 −2
Original line number Diff line number Diff line
@@ -24,15 +24,26 @@ properties: 
          - enum:

              - ti,am654-evm

              - siemens,iot2050-basic

              - siemens,iot2050-basic-pg2

              - siemens,iot2050-advanced

              - siemens,iot2050-advanced-pg2

          - const: ti,am654



      - description: K3 J721E SoC

        items:

        oneOf:

          - const: ti,j721e

          - items:

              - enum:

                  - ti,j721e-evm

                  - ti,j721e-sk

              - const: ti,j721e



      - description: K3 J7200 SoC

        items:

        oneOf:

          - const: ti,j7200

          - items:

              - enum:

                  - ti,j7200-evm

              - const: ti,j7200



      - description: K3 AM642 SoC

arch/arm64/boot/dts/ti/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -8,12 +8,14 @@ 


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

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-pg2.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



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



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

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

+280 −0
Original line number Diff line number Diff line
@@ -973,4 +973,284 @@ ecap2: pwm@23120000 { 
		clocks = <&k3_clks 53 0>;

		clock-names = "fck";

	};



	icssg0: icssg@30000000 {

		compatible = "ti,am642-icssg";

		reg = <0x00 0x30000000 0x00 0x80000>;

		power-domains = <&k3_pds 81 TI_SCI_PD_EXCLUSIVE>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0x0 0x00 0x30000000 0x80000>;



		icssg0_mem: memories@0 {

			reg = <0x0 0x2000>,

			      <0x2000 0x2000>,

			      <0x10000 0x10000>;

			reg-names = "dram0", "dram1", "shrdram2";

		};



		icssg0_cfg: cfg@26000 {

			compatible = "ti,pruss-cfg", "syscon";

			reg = <0x26000 0x200>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0x26000 0x2000>;



			clocks {

				#address-cells = <1>;

				#size-cells = <0>;



				icssg0_coreclk_mux: coreclk-mux@3c {

					reg = <0x3c>;

					#clock-cells = <0>;

					clocks = <&k3_clks 81 0>,  /* icssg0_core_clk */

						 <&k3_clks 81 20>; /* icssg0_iclk */

					assigned-clocks = <&icssg0_coreclk_mux>;

					assigned-clock-parents = <&k3_clks 81 20>;

				};



				icssg0_iepclk_mux: iepclk-mux@30 {

					reg = <0x30>;

					#clock-cells = <0>;

					clocks = <&k3_clks 81 3>,	/* icssg0_iep_clk */

						 <&icssg0_coreclk_mux>;	/* icssg0_coreclk_mux */

					assigned-clocks = <&icssg0_iepclk_mux>;

					assigned-clock-parents = <&icssg0_coreclk_mux>;

				};

			};

		};



		icssg0_mii_rt: mii-rt@32000 {

			compatible = "ti,pruss-mii", "syscon";

			reg = <0x32000 0x100>;

		};



		icssg0_mii_g_rt: mii-g-rt@33000 {

			compatible = "ti,pruss-mii-g", "syscon";

			reg = <0x33000 0x1000>;

		};



		icssg0_intc: interrupt-controller@20000 {

			compatible = "ti,icssg-intc";

			reg = <0x20000 0x2000>;

			interrupt-controller;

			#interrupt-cells = <3>;

			interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "host_intr0", "host_intr1",

					  "host_intr2", "host_intr3",

					  "host_intr4", "host_intr5",

					  "host_intr6", "host_intr7";

		};



		pru0_0: pru@34000 {

			compatible = "ti,am642-pru";

			reg = <0x34000 0x3000>,

			      <0x22000 0x100>,

			      <0x22400 0x100>;

			reg-names = "iram", "control", "debug";

			firmware-name = "am64x-pru0_0-fw";

		};



		rtu0_0: rtu@4000 {

			compatible = "ti,am642-rtu";

			reg = <0x4000 0x2000>,

			      <0x23000 0x100>,

			      <0x23400 0x100>;

			reg-names = "iram", "control", "debug";

			firmware-name = "am64x-rtu0_0-fw";

		};



		tx_pru0_0: txpru@a000 {

			compatible = "ti,am642-tx-pru";

			reg = <0xa000 0x1800>,

			      <0x25000 0x100>,

			      <0x25400 0x100>;

			reg-names = "iram", "control", "debug";

			firmware-name = "am64x-txpru0_0-fw";

		};



		pru0_1: pru@38000 {

			compatible = "ti,am642-pru";

			reg = <0x38000 0x3000>,

			      <0x24000 0x100>,

			      <0x24400 0x100>;

			reg-names = "iram", "control", "debug";

			firmware-name = "am64x-pru0_1-fw";

		};



		rtu0_1: rtu@6000 {

			compatible = "ti,am642-rtu";

			reg = <0x6000 0x2000>,

			      <0x23800 0x100>,

			      <0x23c00 0x100>;

			reg-names = "iram", "control", "debug";

			firmware-name = "am64x-rtu0_1-fw";

		};



		tx_pru0_1: txpru@c000 {

			compatible = "ti,am642-tx-pru";

			reg = <0xc000 0x1800>,

			      <0x25800 0x100>,

			      <0x25c00 0x100>;

			reg-names = "iram", "control", "debug";

			firmware-name = "am64x-txpru0_1-fw";

		};



		icssg0_mdio: mdio@32400 {

			compatible = "ti,davinci_mdio";

			reg = <0x32400 0x100>;

			clocks = <&k3_clks 62 3>;

			clock-names = "fck";

			#address-cells = <1>;

			#size-cells = <0>;

			bus_freq = <1000000>;

		};

	};



	icssg1: icssg@30080000 {

		compatible = "ti,am642-icssg";

		reg = <0x00 0x30080000 0x00 0x80000>;

		power-domains = <&k3_pds 82 TI_SCI_PD_EXCLUSIVE>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0x0 0x00 0x30080000 0x80000>;



		icssg1_mem: memories@0 {

			reg = <0x0 0x2000>,

			      <0x2000 0x2000>,

			      <0x10000 0x10000>;

			reg-names = "dram0", "dram1", "shrdram2";

		};



		icssg1_cfg: cfg@26000 {

			compatible = "ti,pruss-cfg", "syscon";

			reg = <0x26000 0x200>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0x26000 0x2000>;



			clocks {

				#address-cells = <1>;

				#size-cells = <0>;



				icssg1_coreclk_mux: coreclk-mux@3c {

					reg = <0x3c>;

					#clock-cells = <0>;

					clocks = <&k3_clks 82 0>,   /* icssg1_core_clk */

						 <&k3_clks 82 20>;  /* icssg1_iclk */

					assigned-clocks = <&icssg1_coreclk_mux>;

					assigned-clock-parents = <&k3_clks 82 20>;

				};



				icssg1_iepclk_mux: iepclk-mux@30 {

					reg = <0x30>;

					#clock-cells = <0>;

					clocks = <&k3_clks 82 3>,	/* icssg1_iep_clk */

						 <&icssg1_coreclk_mux>;	/* icssg1_coreclk_mux */

					assigned-clocks = <&icssg1_iepclk_mux>;

					assigned-clock-parents = <&icssg1_coreclk_mux>;

				};

			};

		};



		icssg1_mii_rt: mii-rt@32000 {

			compatible = "ti,pruss-mii", "syscon";

			reg = <0x32000 0x100>;

		};



		icssg1_mii_g_rt: mii-g-rt@33000 {

			compatible = "ti,pruss-mii-g", "syscon";

			reg = <0x33000 0x1000>;

		};



		icssg1_intc: interrupt-controller@20000 {

			compatible = "ti,icssg-intc";

			reg = <0x20000 0x2000>;

			interrupt-controller;

			#interrupt-cells = <3>;

			interrupts = <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "host_intr0", "host_intr1",

					  "host_intr2", "host_intr3",

					  "host_intr4", "host_intr5",

					  "host_intr6", "host_intr7";

		};



		pru1_0: pru@34000 {

			compatible = "ti,am642-pru";

			reg = <0x34000 0x4000>,

			      <0x22000 0x100>,

			      <0x22400 0x100>;

			reg-names = "iram", "control", "debug";

			firmware-name = "am64x-pru1_0-fw";

		};



		rtu1_0: rtu@4000 {

			compatible = "ti,am642-rtu";

			reg = <0x4000 0x2000>,

			      <0x23000 0x100>,

			      <0x23400 0x100>;

			reg-names = "iram", "control", "debug";

			firmware-name = "am64x-rtu1_0-fw";

		};



		tx_pru1_0: txpru@a000 {

			compatible = "ti,am642-tx-pru";

			reg = <0xa000 0x1800>,

			      <0x25000 0x100>,

			      <0x25400 0x100>;

			reg-names = "iram", "control", "debug";

			firmware-name = "am64x-txpru1_0-fw";

		};



		pru1_1: pru@38000 {

			compatible = "ti,am642-pru";

			reg = <0x38000 0x4000>,

			      <0x24000 0x100>,

			      <0x24400 0x100>;

			reg-names = "iram", "control", "debug";

			firmware-name = "am64x-pru1_1-fw";

		};



		rtu1_1: rtu@6000 {

			compatible = "ti,am642-rtu";

			reg = <0x6000 0x2000>,

			      <0x23800 0x100>,

			      <0x23c00 0x100>;

			reg-names = "iram", "control", "debug";

			firmware-name = "am64x-rtu1_1-fw";

		};



		tx_pru1_1: txpru@c000 {

			compatible = "ti,am642-tx-pru";

			reg = <0xc000 0x1800>,

			      <0x25800 0x100>,

			      <0x25c00 0x100>;

			reg-names = "iram", "control", "debug";

			firmware-name = "am64x-txpru1_1-fw";

		};



		icssg1_mdio: mdio@32400 {

			compatible = "ti,davinci_mdio";

			reg = <0x32400 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			clocks = <&k3_clks 82 0>;

			clock-names = "fck";

			bus_freq = <1000000>;

		};

	};

};

arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -97,4 +97,12 @@ mcu_gpio0: gpio@4201000 { 
		clocks = <&k3_clks 79 0>;

		clock-names = "gpio";

	};



	mcu_pmx0: pinctrl@4084000 {

		compatible = "pinctrl-single";

		reg = <0x00 0x4084000 0x00 0x84>;

		#pinctrl-cells = <1>;

		pinctrl-single,register-width = <32>;

		pinctrl-single,function-mask = <0xffffffff>;

	};

};

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

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ aliases { 
		serial8 = &main_uart6;

		ethernet0 = &cpsw_port1;

		ethernet1 = &cpsw_port2;

		mmc0 = &sdhci0;

		mmc1 = &sdhci1;

	};



	chosen { };