Commit 424adc17 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'amlogic-drivers' of... 

Merge tag 'amlogic-drivers' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/drivers

soc: Amlogic updates for v5.2
- socinfo: support new SoCs / packages

* tag 'amlogic-drivers' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic

:
  meson-gx-socinfo: add missing of_node_put after of_device_is_available
  soc: amlogic: gx-socinfo: Add new SoC IDs and Packages IDs
  soc: amlogic: gx-socinfo: Add mask for each SoC packages

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 79a3aaa7 fdda0a6a

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

+27 −16
Original line number Diff line number Diff line
@@ -37,26 +37,34 @@ static const struct meson_gx_soc_id { 
	{ "AXG", 0x25 },

	{ "GXLX", 0x26 },

	{ "TXHD", 0x27 },

	{ "G12A", 0x28 },

	{ "G12B", 0x29 },

};



static const struct meson_gx_package_id {

	const char *name;

	unsigned int major_id;

	unsigned int pack_id;

	unsigned int pack_mask;

} soc_packages[] = {

	{ "S905", 0x1f, 0 },

	{ "S905H", 0x1f, 0x13 },

	{ "S905M", 0x1f, 0x20 },

	{ "S905D", 0x21, 0 },

	{ "S905X", 0x21, 0x80 },

	{ "S905W", 0x21, 0xa0 },

	{ "S905L", 0x21, 0xc0 },

	{ "S905M2", 0x21, 0xe0 },

	{ "S912", 0x22, 0 },

	{ "962X", 0x24, 0x10 },

	{ "962E", 0x24, 0x20 },

	{ "A113X", 0x25, 0x37 },

	{ "A113D", 0x25, 0x22 },

	{ "S905", 0x1f, 0, 0x20 }, /* pack_id != 0x20 */

	{ "S905H", 0x1f, 0x3, 0xf }, /* pack_id & 0xf == 0x3 */

	{ "S905M", 0x1f, 0x20, 0xf0 }, /* pack_id == 0x20 */

	{ "S905D", 0x21, 0, 0xf0 },

	{ "S905X", 0x21, 0x80, 0xf0 },

	{ "S905W", 0x21, 0xa0, 0xf0 },

	{ "S905L", 0x21, 0xc0, 0xf0 },

	{ "S905M2", 0x21, 0xe0, 0xf0 },

	{ "S805X", 0x21, 0x30, 0xf0 },

	{ "S805Y", 0x21, 0xb0, 0xf0 },

	{ "S912", 0x22, 0, 0x0 }, /* Only S912 is known for GXM */

	{ "962X", 0x24, 0x10, 0xf0 },

	{ "962E", 0x24, 0x20, 0xf0 },

	{ "A113X", 0x25, 0x37, 0xff },

	{ "A113D", 0x25, 0x22, 0xff },

	{ "S905D2", 0x28, 0x10, 0xf0 },

	{ "S905X2", 0x28, 0x40, 0xf0 },

	{ "S922X", 0x29, 0x40, 0xf0 },

};



static inline unsigned int socinfo_to_major(u32 socinfo)
@@ -81,13 +89,14 @@ static inline unsigned int socinfo_to_misc(u32 socinfo) 


static const char *socinfo_to_package_id(u32 socinfo)

{

	unsigned int pack = socinfo_to_pack(socinfo) & 0xf0;

	unsigned int pack = socinfo_to_pack(socinfo);

	unsigned int major = socinfo_to_major(socinfo);

	int i;



	for (i = 0 ; i < ARRAY_SIZE(soc_packages) ; ++i) {

		if (soc_packages[i].major_id == major &&

		    soc_packages[i].pack_id == pack)

		    soc_packages[i].pack_id ==

				(pack & soc_packages[i].pack_mask))

			return soc_packages[i].name;

	}
@@ -123,8 +132,10 @@ static int __init meson_gx_socinfo_init(void) 
		return -ENODEV;



	/* check if interface is enabled */

	if (!of_device_is_available(np))

	if (!of_device_is_available(np)) {

		of_node_put(np);

		return -ENODEV;

	}



	/* check if chip-id is available */

	if (!of_property_read_bool(np, "amlogic,has-chip-id"))

CRA Git | Maintained and supported by SUSTech CRA and CCSE