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

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

Promotion of kernel.lnx.4.4-170515. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
2046997   Id1b019a5eb1c6a71d4b5e6e854e642411714a900   defconfig: msm: remove dcc config for perf on sdm660
2047756   Ieefef23fe14676007580c524268ef2a228d38059   defconfig: msmcortex: Cleanup
2046321   I57f903f95f290627d676afd567a6e6d21decf4a3   clk: Move vdd voting before set rate and parent
2043268   Ib88eee21df012089d41c4e78a161ddc6767e1bd4   sound: usb: Add default branches for BADD 3.0 devices
2046553   I9d1ad61f75f553bf527906715699817236f44b01   ARM: dts: msm: Update charging ESR timer value to 96 for
2042543   I01a1133bf5c20db38fd73bea8d86ff53d312f42c   msm: camera: isp: Fix excessive logging in w+t
2046859   I59f5d93a5e9360628d8004508162dcdb42f6520d   usb: gadget: f_cdev: Increase number of driver instances
2011945   I0e55efb7863b75bd584843c3fc920c845996eb5c   mmc: mmc: Fix mmc_partial_init for HS400 mode
2043689   I7febdb0e0f499846cfcf8836ea35c8547a5074fb   media: dvb-core: Fix coding errors in broadcast drivers
2046016   I67f9616d9bee8cf07cbe81468ebf174d2599f4c5   dma-mapping: Always remap on dma buffer free
2045870   I73b11f7a3a4346fc0118a51032148fad75db40eb   ARM: dts: msm: Update the virtual corner for SDM630
2044958   I31974f7d68b435bbef329278cedbd726ada02e3f   qpnp-smb2: Add software based glitch filter for OTG dete
2041927   I6f66066adc8d53e3615df50ac49dd313f6d7ea8e   scsi: ufs: Initialize cmd_id and check lrbp->cmd NULL

Change-Id: I204d2e7e1133a9805df71a159edd214223575e1c
CRs-Fixed: 2046997, 2044958, 2046859, 2047756, 2011945, 2043689, 2046553, 2043268, 2042543, 2041927, 2045870, 2046321, 2046016
parents f6567ee2 75a9d0fe

Documentation/devicetree/bindings/power/supply/qcom/qpnp-smb2.txt

+6 −0
Original line number Diff line number Diff line
@@ -181,6 +181,12 @@ Charger specific properties: 
  Definition: Specifies the maximum charger buck/boost switching frequency in

		 KHz. It overrides the max frequency defined for the charger.



- qcom,otg-deglitch-time-ms

  Usage:      optional

  Value type: <u32>

  Definition: Specifies the deglitch interval for OTG detection.

		If the value is not present, 50 msec is used as default.



=============================================

Second Level Nodes - SMB2 Charger Peripherals

=============================================

arch/arm/boot/dts/qcom/msm-pm660.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -547,6 +547,7 @@ 
			qcom,rradc-base = <0x4500>;

			qcom,fg-esr-timer-awake = <96>;

			qcom,fg-esr-timer-asleep = <256>;

			qcom,fg-esr-timer-charging = <96>;

			qcom,cycle-counter-en;

			status = "okay";

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

+1 −1
Original line number Diff line number Diff line
@@ -1323,7 +1323,7 @@ 
			<  1670400000 0x04040057 0x08450045 0x2 6 >,

			<  1881600000 0x04040062 0x094e004e 0x2 7 >,

			<  2016000000 0x04040069 0x0a540054 0x2 8 >,

			<  2150400000 0x04040070 0x0b590059 0x2 8 >,

			<  2150400000 0x04040070 0x0b590059 0x2 9 >,

			<  2208000000 0x04040073 0x0b5c005c 0x3 10 >;



		qcom,perfcl-speedbin2-v0 =

arch/arm/configs/msmcortex_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -224,7 +224,6 @@ CONFIG_ZRAM=y 
CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_UID_CPUTIME=y

CONFIG_MSM_ULTRASOUND=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y
@@ -294,7 +293,6 @@ CONFIG_PINCTRL_SDM660=y 
CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y

CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_SMBCHARGER=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_MSM_BCL_CTL=y

arch/arm/mm/dma-mapping.c

+1 −1
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ static void __free_from_contiguous(struct device *dev, struct page *page, 
	if (PageHighMem(page))

		__dma_free_remap(cpu_addr, size, true);

	else

		__dma_remap(page, size, PAGE_KERNEL, false);

		__dma_remap(page, size, PAGE_KERNEL, true);

	dma_release_from_contiguous(dev, page, size >> PAGE_SHIFT);

}