diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-08-14 19:26:20 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-08-14 19:26:27 +0300 |
| commit | 93e0acaec320e5323fe269deb93365f4f4a8d731 (patch) | |
| tree | 148e7061f147ae1d5051fda3b80279b4ab9afa8c /drivers/soc/ti/k3-socinfo.c | |
| parent | f15897c25f8e8d35bce445d80f48e481329151ab (diff) | |
| parent | 443012dd31e5939cb53bc9c5713d32d87321b0d8 (diff) | |
| download | linux-93e0acaec320e5323fe269deb93365f4f4a8d731.tar.xz | |
Merge tag 'ti-driver-soc-for-v6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/drivers
TI SoC driver updates for v6.6
- Generic fixups: Explicitly include correct DT include.
- omap_prm: Cosmetic fixups for using devm_ api for ioremap_resource
- ti_sci: Documentation fixups, Using system_state to determine if
polling is needed.
- k3-ringcc: Documentation fixups, cleanup of log messages, using
devm_ to handle ioremap_resource.
- k3-socinfo: Add AM62PX detection.
* tag 'ti-driver-soc-for-v6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux:
soc: ti: k3-socinfo.c: Add JTAG ID for AM62PX
soc: ti: Use devm_platform_ioremap_resource_byname simplify logic
soc: ti: k3-ringacc: remove non-fatal probe deferral log
soc: ti: Explicitly include correct DT includes
soc: ti: omap-prm: Use devm_platform_get_and_ioremap_resource()
soc: ti: k3-ringacc: Fixup documentation errors
firmware: ti_sci: Fixup documentation errors
firmware: ti_sci: Use system_state to determine polling
Link: https://lore.kernel.org/r/20230814160633.my3xbk5k2pxkvjyi@degrease
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/soc/ti/k3-socinfo.c')
| -rw-r--r-- | drivers/soc/ti/k3-socinfo.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/soc/ti/k3-socinfo.c b/drivers/soc/ti/k3-socinfo.c index ad97e08a25f6..6ea9b8c7d335 100644 --- a/drivers/soc/ti/k3-socinfo.c +++ b/drivers/soc/ti/k3-socinfo.c @@ -45,6 +45,7 @@ static const struct k3_soc_id { { 0xBB7E, "AM62X" }, { 0xBB80, "J784S4" }, { 0xBB8D, "AM62AX" }, + { 0xBB9D, "AM62PX" }, }; static int |