tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'amlogic-drivers-for-v6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/drivers

Amlogic drivers changes for v6.11:
- Add S905L & A113X SoC IDs
- add missing MODULE_DESCRIPTION() macro for meson_sm driver

* tag 'amlogic-drivers-for-v6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
firmware: meson_sm: add missing MODULE_DESCRIPTION() macro
soc: amlogic: meson-gx-socinfo: add new A113X SoC id
soc: amlogic: meson-gx-socinfo: Add S905L ID

Link: https://lore.kernel.org/r/35093904-c4a8-432d-b010-a994fc1ee536@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 276d7eab 41bb142a

+3
+1
drivers/firmware/meson/meson_sm.c
··· 340 340 }, 341 341 }; 342 342 module_platform_driver_probe(meson_sm_driver, meson_sm_probe); 343 + MODULE_DESCRIPTION("Amlogic Secure Monitor driver"); 343 344 MODULE_LICENSE("GPL v2");
+2
drivers/soc/amlogic/meson-gx-socinfo.c
··· 63 63 { "962X", 0x24, 0x10, 0xf0 }, 64 64 { "962E", 0x24, 0x20, 0xf0 }, 65 65 { "A113X", 0x25, 0x37, 0xff }, 66 + { "A113X", 0x25, 0x43, 0xff }, 66 67 { "A113D", 0x25, 0x22, 0xff }, 68 + { "S905L", 0x26, 0, 0x0 }, 67 69 { "S905D2", 0x28, 0x10, 0xf0 }, 68 70 { "S905Y2", 0x28, 0x30, 0xf0 }, 69 71 { "S905X2", 0x28, 0x40, 0xf0 },