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

Commit 31e688a3 authored by edwardkao(153792)'s avatar edwardkao(153792) Committed by Gerrit Code Review
Browse files

Merge "Revert "Revert "Modify chip ID for PN553 A0""" into 8901-fp3-q-mp-release

parents f5c93c8b 525f088a

drivers/nfc/nq-nci.c

+1 −0
Original line number Diff line number Diff line
@@ -846,6 +846,7 @@ static int nfcc_hw_check(struct i2c_client *client, struct nqx_dev *nqx_dev) 
		dev_dbg(&client->dev,

		"%s: ## NFCC == NQ220 ##\n", __func__);

		break;

	case NFCC_PN553_A0:

	case NFCC_NQ_310:

		dev_dbg(&client->dev,

		"%s: ## NFCC == NQ310 ##\n", __func__);

drivers/nfc/nq-nci.h

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ enum nfcc_initial_core_reset_ntf { 
enum nfcc_chip_variant {

	NFCC_NQ_210			= 0x48,	/**< NFCC NQ210 */

	NFCC_NQ_220			= 0x58,	/**< NFCC NQ220 */

	NFCC_NQ_310			= 0x40,	/**< NFCC NQ310 */

	NFCC_PN553_A0			= 0x40,	/**< NFCC PN553_A0 */

	NFCC_NQ_310			= 0x41,	/**< NFCC NQ310 */

	NFCC_NQ_330			= 0x51,	/**< NFCC NQ330 */

	NFCC_SN100_A			= 0xa3,	/**< NFCC SN100_A */

	NFCC_SN100_B			= 0xa4,	/**< NFCC SN100_B */