Unverified Commit 249d30b5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-drivers-for-v6.12' of... 

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

Amlogic drivers changes for v6.12:
- Support new Amlogic SoCs in meson-gx-ao-secure & meson-gx-socinfo

* tag 'amlogic-drivers-for-v6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  soc: amlogic: meson-gx-socinfo: add new SoCs id
  dt-bindings: arm: amlogic: meson-gx-ao-secure: support more SoCs

Link: https://lore.kernel.org/r/577ad7fe-19b1-468a-b994-573855493fd7@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6d674804 009ff80b

Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml

+12 −4
Original line number Diff line number Diff line
@@ -25,10 +25,18 @@ select: 


properties:

  compatible:

    items:

    oneOf:

      - items:

          - const: amlogic,meson-gx-ao-secure

          - const: syscon

      - items:

          - enum:

              - amlogic,a4-ao-secure

              - amlogic,c3-ao-secure

              - amlogic,s4-ao-secure

              - amlogic,t7-ao-secure

          - const: amlogic,meson-gx-ao-secure

          - const: syscon



  reg:

    maxItems: 1

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

+10 −0
Original line number Diff line number Diff line
@@ -41,6 +41,11 @@ static const struct meson_gx_soc_id { 
	{ "G12B", 0x29 },

	{ "SM1", 0x2b },

	{ "A1", 0x2c },

	{ "T7", 0x36 },

	{ "S4", 0x37 },

	{ "A5", 0x3c },

	{ "C3", 0x3d },

	{ "A4", 0x40 },

};



static const struct meson_gx_package_id {
@@ -76,6 +81,11 @@ static const struct meson_gx_package_id { 
	{ "S905X3", 0x2b, 0x10, 0x3f },

	{ "S905D3", 0x2b, 0x30, 0x3f },

	{ "A113L", 0x2c, 0x0, 0xf8 },

	{ "S805X2", 0x37, 0x2, 0xf },

	{ "C308L", 0x3d, 0x1, 0xf },

	{ "A311D2", 0x36, 0x1, 0xf },

	{ "A113X2", 0x3c, 0x1, 0xf },

	{ "A113L2", 0x40, 0x1, 0xf },

};



static inline unsigned int socinfo_to_major(u32 socinfo)