kevin/linux
1
Fork 0
Code

Amlogic drivers changes for v6.11:

Browse Source 
- Add S905L & A113X SoC IDs
 - add missing MODULE_DESCRIPTION() macro for meson_sm driver
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmaCabgACgkQd9zb2sjI
 SdG6iRAAoDFDUuHa6wp4F/l4B2T1LV+KT5r4bmmP/PyXAl6Tt2pXXUMXxxgidED2
 dGw3Rn4VD5oZaKIIeJSgCr7/LBuJ44eh+XEIESeSXMslnE5MgOK7+fziJIjc5BiZ
 +4PJSe1xHd/rqflvuQqoIRgyDfTVkmWJcCPeZI3JOjrOdR+S2y3pCq407lo4J8SJ
 JKkgH9vCxt0cuz6EUgt+TiVPohTDf2S4reanT7Nr5XlCMD9JvOLDlpToQ/oNWY2b
 jBF4NVEJLUeX+s/W3qtEfX4Jg7lX+UvTflPX9y8VLciNpwqGV/2LcP1RfAMChupS
 v7NrPqz2Fetn2uN8U4DJKDAVS/AdruR+Ct53GPXd5I/jquTgzjOzWNhmvvseHv8j
 JQKUtMMX9E53yF+Xnn7j1A/FA0evNvaptxxjNLL1a4mJWALutKCFSpddS13Ddfzb
 XKXATotwzFEyo9clzsSvN0Z2DSiy8ze4Q98k9SddqWgic+WCm5aO2U/1UZDvTJcg
 NsulG4dgzXLGkPyZgqCloDY4dfBYqiROBe38eilLoclJXNrIsnvpqNc+/vf1wDBp
 o+Kvt5EJ0ybrwUBKvW4HXsVw8n99/jjT777P0kJZUxcfVQj9GvYHdeqId2rvdfbQ
 hiYf2r8Msh8vIrV2iWg1n+ZWZ8ibrcgRS0+tfkQW2D7bFZPmqH4=
 =l2SM
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmaCs8EACgkQYKtH/8kJ
 UifgsQ/+KIEX75iw0AB3hlIbqx2ZQ7Y8Lbt3L3x3uBJpV5drAh138Ub5OEF/TWyb
 mHZxoJOuZhUJM2Y1gvQwtVP9PhXpbP9W0/5bBJBcjcIQtiaKn7JvGSV5ugTDabeq
 s22mM9lvoHPhaKk+BeJSsM8axXjEf8ALUdXHz6EowyxpAqQPgGlDRCtb+FKfvoDJ
 /1o9haga14IsWJVBrn8bm00MvZG+Pvx+hgOWQX/uz1YupA37xa2lXJEvAKfrGyar
 MmruSA+Fnh/HVtizNL7faNOwZ/YvonMcWOmH0JV5Mx177woYC66G7FB1nYVQMlZL
 ur1O5rXYQyVPVe7I0s/jtggD/6Fp95dYewCU9NG9oej3/WokXJpvH+QDhG2IRYGF
 P8OnoK6p1C33q/x5HQTHkao3Up4lkClPtPXPUdNXCUaQvIaiclsx02/9qy7KrpC8
 EuyCcN3zS92Ge0EHcLnq0tr2ewNJb1MJ1RL96V0yfwA5HVth4mVlwRTKsJ6ekvJ/
 RdXak3xVotc5tmlPWT75kzm8B94McipwkhN90potAOjSzqapinQ1ss21svyZiLQm
 nq+Fo/aMhv4cdyII6djG0eT2k/vTezjypI9Zj/g7MVp0iNM8G7A2NAhDvQWgOF5i
 a9QGgf+YzGwE5Mw6phOEqu6SkjUgMDH7XFwSGCRZaCWC9eT9nfU=
 =839V
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2024-07-01 15:48:46 +02:00
commit 276d7eab38
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/firmware/meson/meson_sm.c
View File

@ -340,4 +340,5 @@ static struct platform_driver meson_sm_driver = {
}, },
}; };
module_platform_driver_probe(meson_sm_driver, meson_sm_probe); module_platform_driver_probe(meson_sm_driver, meson_sm_probe);
MODULE_DESCRIPTION("Amlogic Secure Monitor driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");

2
drivers/soc/amlogic/meson-gx-socinfo.c
View File

@ -63,7 +63,9 @@ static const struct meson_gx_package_id {
{ "962X", 0x24, 0x10, 0xf0 }, { "962X", 0x24, 0x10, 0xf0 },
{ "962E", 0x24, 0x20, 0xf0 }, { "962E", 0x24, 0x20, 0xf0 },
{ "A113X", 0x25, 0x37, 0xff }, { "A113X", 0x25, 0x37, 0xff },
{ "A113X", 0x25, 0x43, 0xff },
{ "A113D", 0x25, 0x22, 0xff }, { "A113D", 0x25, 0x22, 0xff },
{ "S905L", 0x26, 0, 0x0 },
{ "S905D2", 0x28, 0x10, 0xf0 }, { "S905D2", 0x28, 0x10, 0xf0 },
{ "S905Y2", 0x28, 0x30, 0xf0 }, { "S905Y2", 0x28, 0x30, 0xf0 },
{ "S905X2", 0x28, 0x40, 0xf0 }, { "S905X2", 0x28, 0x40, 0xf0 },