Merge "wcnss: Fix getting iris id wrong for wcn3610 card" (5343c516) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/wireless/wcnss/wcnss_vreg.c

+7 −5

Original line number	Diff line number	Diff line
		/* Copyright (c) 2011-2015, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2011-2015, 2017 The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -39,6 +39,7 @@ static int is_power_on;

		#define PRONTO_IRIS_REG_READ_OFFSET 0x1134
		#define PRONTO_IRIS_REG_CHIP_ID 0x04
		#define PRONTO_IRIS_REG_CHIP_ID_MASK 0xffff
		/* IRIS card chip ID's */
		#define WCN3660 0x0200
		#define WCN3660A 0x0300
		@@ -124,13 +125,13 @@ int xo_auto_detect(u32 reg)
		int wcnss_get_iris_name(char *iris_name)
		{
		struct wcnss_wlan_config *cfg = NULL;
		int iris_id;
		u32 iris_id;

		cfg = wcnss_get_wlan_config();

		if (cfg) {
		iris_id = cfg->iris_id;
		iris_id = iris_id >> 16;
		iris_id = PRONTO_IRIS_REG_CHIP_ID_MASK & (iris_id >> 16);
		} else {
		return 1;
		}
		@@ -167,8 +168,9 @@ EXPORT_SYMBOL(wcnss_get_iris_name);

		int validate_iris_chip_id(u32 reg)
		{
		int iris_id;
		iris_id = reg >> 16;
		u32 iris_id;

		iris_id = PRONTO_IRIS_REG_CHIP_ID_MASK & (reg >> 16);

		switch (iris_id) {
		case WCN3660:

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ struct wcnss_wlan_config {
		int is_pronto_vadc;
		int is_pronto_v3;
		void __iomem *msm_wcnss_base;
		int iris_id;
		unsigned int iris_id;
		int vbatt;
		struct vregs_level pronto_vlevel[PRONTO_REGULATORS];
		struct vregs_level iris_vlevel[IRIS_REGULATORS];