Skip to content

Commit 276d7ea

Browse files
committed
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 41bb142 + 5375986 commit 276d7ea

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

drivers/firmware/meson/meson_sm.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,4 +340,5 @@ static struct platform_driver meson_sm_driver = {
340340
},
341341
};
342342
module_platform_driver_probe(meson_sm_driver, meson_sm_probe);
343+
MODULE_DESCRIPTION("Amlogic Secure Monitor driver");
343344
MODULE_LICENSE("GPL v2");

drivers/soc/amlogic/meson-gx-socinfo.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ static const struct meson_gx_package_id {
6363
{ "962X", 0x24, 0x10, 0xf0 },
6464
{ "962E", 0x24, 0x20, 0xf0 },
6565
{ "A113X", 0x25, 0x37, 0xff },
66+
{ "A113X", 0x25, 0x43, 0xff },
6667
{ "A113D", 0x25, 0x22, 0xff },
68+
{ "S905L", 0x26, 0, 0x0 },
6769
{ "S905D2", 0x28, 0x10, 0xf0 },
6870
{ "S905Y2", 0x28, 0x30, 0xf0 },
6971
{ "S905X2", 0x28, 0x40, 0xf0 },

0 commit comments

Comments
 (0)