History

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

Linus Torvalds committed 1 year ago

Commit ed9add22 parents 775a15e 352bba62 files · +7 −6Browse files

Unified · Split

2 files
  1. drivers/reset/reset-rzg2l-usbphy-ctrl.c +1 −0
  2. include/linux/pruss_driver.h +6 −6
drivers/reset/reset-rzg2l-usbphy-ctrl.c+1−0
@@ -176,6 +176,7 @@ static int rzg2l_usbphy_ctrl_probe(struct platform_device *pdev) · 175 unmodified lines
176 vdev->dev.parent = dev;176 vdev->dev.parent = dev;
177 priv->vdev = vdev;177 priv->vdev = vdev;
178 178
179 device_set_of_node_from_dev(&vdev->dev, dev);
179 error = platform_device_add(vdev);180 error = platform_device_add(vdev);
180 if (error)181 if (error)
181 goto err_device_put;182 goto err_device_put;
include/linux/pruss_driver.h+6−6
@@ -144,32 +144,32 @@ static inline int pruss_release_mem_region(struct pruss *pruss, · 143 unmodified lines
144static inline int pruss_cfg_get_gpmux(struct pruss *pruss,144static inline int pruss_cfg_get_gpmux(struct pruss *pruss,
145 enum pruss_pru_id pru_id, u8 *mux)145 enum pruss_pru_id pru_id, u8 *mux)
146{146{
147 return ERR_PTR(-EOPNOTSUPP);147 return -EOPNOTSUPP;
148}148}
149 149
150static inline int pruss_cfg_set_gpmux(struct pruss *pruss,150static inline int pruss_cfg_set_gpmux(struct pruss *pruss,
151 enum pruss_pru_id pru_id, u8 mux)151 enum pruss_pru_id pru_id, u8 mux)
152{152{
153 return ERR_PTR(-EOPNOTSUPP);153 return -EOPNOTSUPP;
154}154}
155 155
156static inline int pruss_cfg_gpimode(struct pruss *pruss,156static inline int pruss_cfg_gpimode(struct pruss *pruss,
157 enum pruss_pru_id pru_id,157 enum pruss_pru_id pru_id,
158 enum pruss_gpi_mode mode)158 enum pruss_gpi_mode mode)
159{159{
160 return ERR_PTR(-EOPNOTSUPP);160 return -EOPNOTSUPP;
161}161}
162 162
163static inline int pruss_cfg_miirt_enable(struct pruss *pruss, bool enable)163static inline int pruss_cfg_miirt_enable(struct pruss *pruss, bool enable)
164{164{
165 return ERR_PTR(-EOPNOTSUPP);165 return -EOPNOTSUPP;
166}166}
167 167
168static inline int pruss_cfg_xfr_enable(struct pruss *pruss,168static inline int pruss_cfg_xfr_enable(struct pruss *pruss,
169 enum pru_type pru_type,169 enum pru_type pru_type,
170 bool enable);170 bool enable)
171{171{
172 return ERR_PTR(-EOPNOTSUPP);172 return -EOPNOTSUPP;
173}173}
174 174
175#endif /* CONFIG_TI_PRUSS */175#endif /* CONFIG_TI_PRUSS */