Unverified Commit 62fcbc5c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ti-driver-soc-for-v5.20' of... 

Merge tag 'ti-driver-soc-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into arm/drivers

TI Driver updates for v5.20

* pruss: Enable support for AM62, bindings cleanups
* wkup_m3_ipc: cosmetic cleanup

* tag 'ti-driver-soc-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux:
  soc: ti: pruss: Enable support for PRUSS-M subsystem on K3 AM62x SoCs
  dt-bindings: soc: ti: pruss: Update bindings for K3 AM62x SoCs
  dt-bindings: soc: ti: pruss: Re-arrange "compatible" in alphabetic order
  soc: ti: wkup_m3_ipc: Remove unneeded semicolon

Link: https://lore.kernel.org/r/20220708232655.reqjdbib52ejdja4@unadvised


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f10c00ae f16afe23

Documentation/devicetree/bindings/soc/ti/ti,pruss.yaml

+3 −2
Original line number Diff line number Diff line
@@ -65,10 +65,11 @@ properties: 
      - ti,am4376-pruss0 # for AM437x SoC family and PRUSS unit 0

      - ti,am4376-pruss1 # for AM437x SoC family and PRUSS unit 1

      - ti,am5728-pruss  # for AM57xx SoC family

      - ti,k2g-pruss     # for 66AK2G SoC family

      - ti,am625-pruss   # for K3 AM62x SoC family

      - ti,am642-icssg   # for K3 AM64x SoC family

      - ti,am654-icssg   # for K3 AM65x SoC family

      - ti,j721e-icssg   # for K3 J721E SoC family

      - ti,am642-icssg   # for K3 AM64x SoC family

      - ti,k2g-pruss     # for 66AK2G SoC family



  reg:

    maxItems: 1

drivers/soc/ti/pruss.c

+1 −0
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ static const struct of_device_id pruss_of_match[] = { 
	{ .compatible = "ti,am654-icssg", .data = &am65x_j721e_pruss_data, },

	{ .compatible = "ti,j721e-icssg", .data = &am65x_j721e_pruss_data, },

	{ .compatible = "ti,am642-icssg", .data = &am65x_j721e_pruss_data, },

	{ .compatible = "ti,am625-pruss", .data = &am65x_j721e_pruss_data, },

	{},

};

MODULE_DEVICE_TABLE(of, pruss_of_match);

drivers/soc/ti/wkup_m3_ipc.c

+1 −1
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ static int wkup_m3_ipc_probe(struct platform_device *pdev) 
				      &m3_ipc->sd_fw_name);

	if (ret) {

		dev_dbg(dev, "Voltage scaling data blob not provided from DT.\n");

	};

	}



	/*

	 * Wait for firmware loading completion in a thread so we