Unverified Commit 4f34ebad authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ti-driver-soc-fixes-for-v5.17' of... 

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

SoC: Keystone driver update for v5.17

* k3-socinfo: Add entry for J721S2 SoC family
* Misc fixups for tisci, pruss, knav_dma

* tag 'ti-driver-soc-fixes-for-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux:
  soc: ti: knav_dma: Fix NULL vs IS_ERR() checking in dma_init
  soc: ti: k3-socinfo: Add entry for J721S2 SoC family
  firmware: ti_sci: rm: remove unneeded semicolon
  soc: ti: pruss: fix referenced node in error message

Link: https://lore.kernel.org/r/20211217154921.cagzppcensxx6wm4@pension


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5a177994 1bb0b8b1

drivers/firmware/ti_sci.c

+1 −1
Original line number Diff line number Diff line
@@ -1759,7 +1759,7 @@ static int ti_sci_get_resource_range(const struct ti_sci_handle *handle, 
		desc->num = resp->range_num;

		desc->start_sec = resp->range_start_sec;

		desc->num_sec = resp->range_num_sec;

	};

	}



fail:

	ti_sci_put_one_xfer(&info->minfo, xfer);

drivers/soc/ti/k3-socinfo.c

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ static const struct k3_soc_id { 
	{ 0xBB5A, "AM65X" },

	{ 0xBB64, "J721E" },

	{ 0xBB6D, "J7200" },

	{ 0xBB38, "AM64X" }

	{ 0xBB38, "AM64X" },

	{ 0xBB75, "J721S2"},

};



static int

drivers/soc/ti/knav_dma.c

+10 −10
Original line number Diff line number Diff line
@@ -646,31 +646,31 @@ static int dma_init(struct device_node *cloud, struct device_node *dma_node) 
	}



	dma->reg_global	 = pktdma_get_regs(dma, node, 0, &size);

	if (!dma->reg_global)

		return -ENODEV;

	if (IS_ERR(dma->reg_global))

		return PTR_ERR(dma->reg_global);

	if (size < sizeof(struct reg_global)) {

		dev_err(kdev->dev, "bad size %pa for global regs\n", &size);

		return -ENODEV;

	}



	dma->reg_tx_chan = pktdma_get_regs(dma, node, 1, &size);

	if (!dma->reg_tx_chan)

		return -ENODEV;

	if (IS_ERR(dma->reg_tx_chan))

		return PTR_ERR(dma->reg_tx_chan);



	max_tx_chan = size / sizeof(struct reg_chan);

	dma->reg_rx_chan = pktdma_get_regs(dma, node, 2, &size);

	if (!dma->reg_rx_chan)

		return -ENODEV;

	if (IS_ERR(dma->reg_rx_chan))

		return PTR_ERR(dma->reg_rx_chan);



	max_rx_chan = size / sizeof(struct reg_chan);

	dma->reg_tx_sched = pktdma_get_regs(dma, node, 3, &size);

	if (!dma->reg_tx_sched)

		return -ENODEV;

	if (IS_ERR(dma->reg_tx_sched))

		return PTR_ERR(dma->reg_tx_sched);



	max_tx_sched = size / sizeof(struct reg_tx_sched);

	dma->reg_rx_flow = pktdma_get_regs(dma, node, 4, &size);

	if (!dma->reg_rx_flow)

		return -ENODEV;

	if (IS_ERR(dma->reg_rx_flow))

		return PTR_ERR(dma->reg_rx_flow);



	max_rx_flow = size / sizeof(struct reg_rx_flow);

	dma->rx_priority = DMA_PRIO_DEFAULT;

drivers/soc/ti/pruss.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static int pruss_clk_init(struct pruss *pruss, struct device_node *cfg_node) 


	clks_np = of_get_child_by_name(cfg_node, "clocks");

	if (!clks_np) {

		dev_err(dev, "%pOF is missing its 'clocks' node\n", clks_np);

		dev_err(dev, "%pOF is missing its 'clocks' node\n", cfg_node);

		return -ENODEV;

	}