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

Commit 6a5177b7 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of kernel.lnx.4.4-170412. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
2032093   I738d60ea3385c296187a9cc8afe8134feb8c615f   smb138x: introduce support for smb1355
2021480   Id86296aed878499e24f9c3eb6e032239e2f02e40   qcom: smblib: Show correct charging status
2031826   I457ed82e0d6cbf34bf490c50caeeddaac3970080   ARM: dts: msm: Enable wakeup capability of SPMI interrup
2029003   Ia6877204f89865fe9629d1a404e1603422d99d2c   msm: ipa: rmnet_ipa: stop TX queue on ap suspend
2031123   I94650d2f937416aff33a82073c4db76fab0d0e96   soc: qcom: glink: Get additional reference in glink open
2031705   Ib11fd15c6c49353950c0892b45d0eec1fbc33f46   soc: qcom: glink_smem_native_xport: Check smem item in n
2028536   I530913c84f2c3e678e83144ac474195184f4dd3b   cfg80211: Add Fast Initial Link Setup (FILS) auth algs
2032093   I60429c6462a2faa70df71d3440afe696a13fcab0   qpnp-revid: add smb1355 definitions
2013769   I30953d2730f7be7ee9daa7347c77b1c217f72a0b   ASoC: wcd: fix pop noise at start of recording on msm899
1102401   Ib52f884133cdf6e0ec95f49095c14f7d005a5356   sound: usb: Add support for parsing AudioControl intf fo
1102401   I26a41bf05e66116511c1b5cf9629a4a9f9c49ab0   sound: usb: Populate tunnel mode response struct for BAD
1102401   I726bbb735708fe8e395011c7228a73d5f65c092d   sound: usb: Add support for parsing AudioStreaming intf
2028536   Icc8bbdf3530c46048239ca88bfcb8b100a7f0822   cfg80211: Rename SAE_DATA to more generic AUTH_DATA

Change-Id: Ief02cecc84c3866f4438c5096b53123c30afe20d
CRs-Fixed: 2031123, 1102401, 2032093, 2013769, 2031705, 2021480, 2029003, 2031826, 2028536
parents a71f0d5b 9898f867

Documentation/devicetree/bindings/power/supply/qcom/smb138x-charger.txt

+5 −3
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ Charger specific properties: 
  Definition: String which indicates the charging mode. Can be one of the

	      following:

              Standalone/Parallel Master	- "qcom,smb138x-charger"

	      Parallel Slave			- "qcom,smb138x-parallel-slave"

	      smb138x Parallel Slave		- "qcom,smb138x-parallel-slave"

	      smb1355 Parallel Slave		- "qcom,smb1355-parallel-slave",



- qcom,pmic-revid

  Usage:      required
@@ -35,7 +36,8 @@ Charger specific properties: 
  Usage:      optional

  Value type: <u32>

  Definition: Specifies parallel charging mode. If not specified, MID-MID

	      option is selected by default.

	      option is selected by default. Note that smb1355 can only

	      run in MID-MID configuration.



- qcom,suspend-input

  Usage:      optional
@@ -125,7 +127,7 @@ Example 
=======



smb138x_charger: qcom,smb138x-charger {

	compatible = "qcom,qpnp-smb138x-charger";

	compatible = "qcom,smb138x-charger";

	#address-cells = <1>;

	#size-cells = <1>;

arch/arm/boot/dts/qcom/sdm630.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -1993,7 +1993,6 @@ 
		interrupt-controller;

		#interrupt-cells = <4>;

		cell-index = <0>;

		qcom,not-wakeup; /* Needed until Full-boot-chain enabled */

		status = "ok";

	};

drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c

+19 −10
Original line number Diff line number Diff line
@@ -2365,32 +2365,41 @@ static int rmnet_ipa_ap_suspend(struct device *dev) 
{

	struct net_device *netdev = IPA_NETDEV();

	struct ipa3_wwan_private *wwan_ptr;

	int ret;



	IPAWANDBG("Enter...\n");



	IPAWANDBG_LOW("Enter...\n");

	if (netdev == NULL) {

		IPAWANERR("netdev is NULL.\n");

		return 0;

		ret = 0;

		goto bail;

	}



	netif_tx_lock_bh(netdev);

	wwan_ptr = netdev_priv(netdev);

	if (wwan_ptr == NULL) {

		IPAWANERR("wwan_ptr is NULL.\n");

		return 0;

		ret = 0;

		goto unlock_and_bail;

	}



	/* Do not allow A7 to suspend in case there are oustanding packets */

	if (atomic_read(&wwan_ptr->outstanding_pkts) != 0) {

		IPAWANDBG("Outstanding packets, postponing AP suspend.\n");

		return -EAGAIN;

		ret = -EAGAIN;

		goto unlock_and_bail;

	}



	/* Make sure that there is no Tx operation ongoing */

	netif_tx_lock_bh(netdev);

	netif_stop_queue(netdev);

	ipa_rm_release_resource(IPA_RM_RESOURCE_WWAN_0_PROD);

	netif_tx_unlock_bh(netdev);

	IPAWANDBG_LOW("Exit\n");

	ret = 0;



	return 0;

unlock_and_bail:

	netif_tx_unlock_bh(netdev);

bail:

	IPAWANDBG("Exit with %d\n", ret);

	return ret;

}



/**
@@ -2407,10 +2416,10 @@ static int rmnet_ipa_ap_resume(struct device *dev) 
{

	struct net_device *netdev = IPA_NETDEV();



	IPAWANDBG_LOW("Enter...\n");

	IPAWANDBG("Enter...\n");

	if (netdev)

		netif_wake_queue(netdev);

	IPAWANDBG_LOW("Exit\n");

	IPAWANDBG("Exit\n");



	return 0;

}

drivers/power/supply/qcom/smb-lib.c

+13 −0
Original line number Diff line number Diff line
@@ -1532,6 +1532,19 @@ int smblib_get_prop_batt_status(struct smb_charger *chg, 
		break;

	}



	if (val->intval != POWER_SUPPLY_STATUS_CHARGING)

		return 0;



	rc = smblib_read(chg, BATTERY_CHARGER_STATUS_2_REG, &stat);

	if (rc < 0) {

		smblib_err(chg, "Couldn't read BATTERY_CHARGER_STATUS_2 rc=%d\n",

				rc);

			return rc;

		}



	if (stat & (BAT_TEMP_STATUS_TOO_HOT_BIT | BAT_TEMP_STATUS_TOO_COLD_BIT))

		val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;



	return 0;

}

drivers/power/supply/qcom/smb-reg.h

+10 −0
Original line number Diff line number Diff line
@@ -1025,4 +1025,14 @@ enum { 
/* CHGR FREQ Peripheral registers */

#define FREQ_CLK_DIV_REG			(CHGR_FREQ_BASE + 0x50)



/* SMB1355 specific registers */

#define SMB1355_TEMP_COMP_STATUS_REG		(MISC_BASE + 0x07)

#define SKIN_TEMP_RST_HOT_BIT			BIT(6)

#define SKIN_TEMP_UB_HOT_BIT			BIT(5)

#define SKIN_TEMP_LB_HOT_BIT			BIT(4)

#define DIE_TEMP_TSD_HOT_BIT			BIT(3)

#define DIE_TEMP_RST_HOT_BIT			BIT(2)

#define DIE_TEMP_UB_HOT_BIT			BIT(1)

#define DIE_TEMP_LB_HOT_BIT			BIT(0)



#endif /* __SMB2_CHARGER_REG_H */