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

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