Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a3f8e02 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mfd: wcd9xxx: Add support to detect wcd9330 codec version"

parents f6d26061 2238405e

drivers/mfd/wcd9xxx-core.c

+6 −1
Original line number Diff line number Diff line
@@ -454,7 +454,12 @@ static const struct wcd9xxx_codec_type wcd9xxx_codecs[] = { 
	},

	{

		TOMTOM_MAJOR, cpu_to_le16(0x0), tomtom_devs,

		ARRAY_SIZE(tomtom_devs), TOMTOM_NUM_IRQS, -1,

		ARRAY_SIZE(tomtom_devs), TOMTOM_NUM_IRQS, 1,

		WCD9XXX_SLIM_SLAVE_ADDR_TYPE_TAIKO, 0x01

	},

	{

		TOMTOM_MAJOR, cpu_to_le16(0x1), tomtom_devs,

		ARRAY_SIZE(tomtom_devs), TOMTOM_NUM_IRQS, 2,

		WCD9XXX_SLIM_SLAVE_ADDR_TYPE_TAIKO, 0x01

	},

};

include/linux/mfd/wcd9xxx/core.h

+4 −0
Original line number Diff line number Diff line
@@ -44,6 +44,10 @@ 
#define TAPAN_IS_1_0(ver) \

	((ver == TAPAN_VERSION_1_0) ? 1 : 0)



#define TOMTOM_VERSION_1_0	1

#define TOMTOM_IS_1_0(ver) \

	((ver == TOMTOM_VERSION_1_0) ? 1 : 0)



enum wcd9xxx_slim_slave_addr_type {

	WCD9XXX_SLIM_SLAVE_ADDR_TYPE_TABLA,

	WCD9XXX_SLIM_SLAVE_ADDR_TYPE_TAIKO,