Commit ed9add2b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-fixes-6.13-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull SoC fixes from Arnd Bergmann:
 "Two last minute fixes: one build issue on TI soc drivers, and a
  regression in the renesas reset controller driver"

* tag 'soc-fixes-6.13-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  soc: ti: pruss: Fix pruss APIs
  reset: rzg2l-usbphy-ctrl: Assign proper of node to the allocated device
parents 775a15ea 352bba6c

drivers/reset/reset-rzg2l-usbphy-ctrl.c

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ static int rzg2l_usbphy_ctrl_probe(struct platform_device *pdev) 
	vdev->dev.parent = dev;

	priv->vdev = vdev;



	device_set_of_node_from_dev(&vdev->dev, dev);

	error = platform_device_add(vdev);

	if (error)

		goto err_device_put;

include/linux/pruss_driver.h

+6 −6
Original line number Diff line number Diff line
@@ -144,32 +144,32 @@ static inline int pruss_release_mem_region(struct pruss *pruss, 
static inline int pruss_cfg_get_gpmux(struct pruss *pruss,

				      enum pruss_pru_id pru_id, u8 *mux)

{

	return ERR_PTR(-EOPNOTSUPP);

	return -EOPNOTSUPP;

}



static inline int pruss_cfg_set_gpmux(struct pruss *pruss,

				      enum pruss_pru_id pru_id, u8 mux)

{

	return ERR_PTR(-EOPNOTSUPP);

	return -EOPNOTSUPP;

}



static inline int pruss_cfg_gpimode(struct pruss *pruss,

				    enum pruss_pru_id pru_id,

				    enum pruss_gpi_mode mode)

{

	return ERR_PTR(-EOPNOTSUPP);

	return -EOPNOTSUPP;

}



static inline int pruss_cfg_miirt_enable(struct pruss *pruss, bool enable)

{

	return ERR_PTR(-EOPNOTSUPP);

	return -EOPNOTSUPP;

}



static inline int pruss_cfg_xfr_enable(struct pruss *pruss,

				       enum pru_type pru_type,

				       bool enable);

				       bool enable)

{

	return ERR_PTR(-EOPNOTSUPP);

	return -EOPNOTSUPP;

}



#endif /* CONFIG_TI_PRUSS */