diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-02-28 15:38:51 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-02-28 15:38:51 +0300 |
| commit | 254a1864e4d0f82ee9ce2b4eaf469bfd176ac7a2 (patch) | |
| tree | dd0b9e69ada4e4d2e78cd671ecdc8ba91154d1e9 /include/linux | |
| parent | 345932db14e3614002af72c1f3aed0fb6fb8bea4 (diff) | |
| parent | c65d68e7e95a39da31d64d67d5bea6550b91fb43 (diff) | |
| download | linux-254a1864e4d0f82ee9ce2b4eaf469bfd176ac7a2.tar.xz | |
Merge tag 'ti-driver-soc-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into arm/drivers
TI Driver updates for v5.18
* Fixups for k3-ringacc, smartreflex, tisci, wkup_m3_ipc
* Device detection for am62x.
* tag 'ti-driver-soc-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux:
soc: ti: k3-socinfo: Add AM62x JTAG ID
soc: ti: wkup_m3_ipc: Fix IRQ check in wkup_m3_ipc_probe
firmware: ti_sci: inproper error handling of ti_sci_probe
firmware: ti_sci: Fix compilation failure when CONFIG_TI_SCI_PROTOCOL is not defined
soc: ti: smartreflex: Use platform_get_irq_optional() to get the interrupt
soc: ti: k3-ringacc: Use devm_bitmap_zalloc() when applicable
Link: https://lore.kernel.org/r/20220228120655.wobd72acngl2bz6k@ecard
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/soc/ti/ti_sci_protocol.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/soc/ti/ti_sci_protocol.h b/include/linux/soc/ti/ti_sci_protocol.h index 0aad7009b50e..bd0d11af76c5 100644 --- a/include/linux/soc/ti/ti_sci_protocol.h +++ b/include/linux/soc/ti/ti_sci_protocol.h @@ -645,7 +645,7 @@ devm_ti_sci_get_of_resource(const struct ti_sci_handle *handle, static inline struct ti_sci_resource * devm_ti_sci_get_resource(const struct ti_sci_handle *handle, struct device *dev, - u32 dev_id, u32 sub_type); + u32 dev_id, u32 sub_type) { return ERR_PTR(-EINVAL); } |