Merge "DOWNSTREAM commit 'e06159259a375bd501c3147d8488751fc8dbe76e' AU408... (b048651c) · Commits · e / devices / android_kernel_xiaomi_sm6125

AndroidKernel.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -187,9 +187,11 @@ $(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT)
		echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) oldconfig; fi

		.PHONY: kerneltags
		kerneltags: $(KERNEL_OUT) $(KERNEL_CONFIG)
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) tags

		.PHONY: kernelconfig
		kernelconfig: $(KERNEL_OUT) $(KERNEL_CONFIG)
		env KCONFIG_NOTIMESTAMP=true \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) menuconfig

Documentation/devicetree/bindings/arm/msm/memory-offline.txt

+24 −4

Original line number	Diff line number	Diff line
		@@ -16,9 +16,28 @@ see the memory hotplug documentation (Documentation/memory-hotplug.txt).
		Required properties:
		- compatible: "qcom,mem-offline"
		- granule: The minimum granule size in mega-bytes for memory onlining/offlining.
		- mem-percent: Percentage of the DDR which will support being onlined/offlined.
		The system will round down the value to align with the minimum offlinable
		granule size supported by DDR.
		- offline-sizes: Array of offlinable memory region sizes to apply to targets
		based on their DDR size.

		Each entry in the array is a pair of sizes, where the first size in the
		pair is the minimum amount of DDR required in the system in bytes, and
		the second item in the pair is the size of the offlinable region in
		bytes which will be applied to the system.

		The offlinable memory region size from the entry where the minimum amount
		of DDR required in the system is closest, but not greater, than the
		amount of DDR in the system will be applied.
		If there are no entries with a minimum amount of DDR required that is less
		than the amount of DDR in the system then no offlinable region will be
		created.

		For example, in the following configuration:
		offline-sizes = <0x1 0x40000000 0x0 0x40000000>,
		<0x1 0xc0000000 0x0 0x80000000>;
		On a 4GB target no offlinable region will be created.
		On a 6GB target a 1GB offlinable region will be created.
		On an 8GB target a 2GB offlinable region will be created.
		On a 12GB target a 2GB offlinable region will be created.
		- mboxes: Reference to the mailbox used by the driver to make requests to
		online/offline memory.

		@@ -26,6 +45,7 @@ Example:
		mem-offline {
		compatible = "qcom,mem-offline";
		granule = <512>;
		mem-percent = "35";
		offline-sizes = <0x1 0x40000000 0x0 0x40000000>,
		<0x1 0xc0000000 0x0 0x80000000>;
		mboxes = <&qmp_aop 0>;
		};

Documentation/devicetree/bindings/arm/msm/msm.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,9 @@ Generic board variants:
		- QRD device:
		compatible = "qcom,qrd"

		- HDK device:
		compatible = "qcom,hdk"

		- ADP device:
		compatible = "qcom,adp"

		@@ -152,9 +155,11 @@ compatible = "qcom,sm8150-rumi"
		compatible = "qcom,sm8150-mtp"
		compatible = "qcom,sm8150-cdp"
		compatible = "qcom,sm8150-qrd"
		compatible = "qcom,sm8150-hdk"
		compatible = "qcom,sm8150p-cdp"
		compatible = "qcom,sm8150p-mtp"
		compatible = "qcom,sm8150p-qrd"
		compatible = "qcom,sm8150p-hdk"
		compatible = "qcom,sdmshrike-rumi"
		compatible = "qcom,sdmshrike-mtp"
		compatible = "qcom,sdmshrike-cdp"
		@@ -188,3 +193,4 @@ compatible = "qcom,sdmmagpiep-idp"
		compatible = "qcom,sdmmagpiep"
		compatible = "qcom,sdmmagpiep-qrd"
		compatible = "qcom,trinket-rumi"
		compatible = "qcom,trinket-idp"

Documentation/devicetree/bindings/batterydata/batterydata.txt

+18 −5

Original line number	Diff line number	Diff line
		@@ -120,12 +120,25 @@ Profile data node optional properties:
		The threshold values in range should be in ascending
		and shouldn't overlap. It support 8 ranges at max.
		- qcom,jeita-soft-thresholds: A tuple entry to specify ADC code for battery's soft JEITA
		threshold.
		<SOFT_COLD_ADC_CODE, SOFT_HOT_ADC_CODE>.
		threshold. <SOFT_COLD_ADC_CODE, SOFT_HOT_ADC_CODE>.
		- qcom,jeita-hard-thresholds: A tuple entry to specify ADC code for battery's hard JEITA
		threshold.
		<HARD_COLD_ADC_CODE, HARD_HOT_ADC_CODE>.

		threshold. <HARD_COLD_ADC_CODE, HARD_HOT_ADC_CODE>.
		- qcom,jeita-soft-hys-thresholds: A tuple entry to specify ADC code for battery's soft JEITA
		threshold with hysteresis adjustment.
		<SOFT_COLD_ADC_CODE, SOFT_HOT_ADC_CODE>.
		These "hysteresis" values should be specified if
		"qcom,jeita-soft-thresholds" are specified. Without which SW JEITA
		compensation won't function properly.
		- qcom,jeita-soft-fcc-ua: A tuple entry to specify the values of Fast
		charging current (in uA) that needs to be applied during
		soft JEITA conditions (cool/warm).
		Element 0 - FCC value for soft cool.
		Element 1 - FCC value for soft warm.
		- qcom,jeita-soft-fv-uv: A tuple entry to specify the values of Float
		voltage (in uV) that needs to be applied during soft
		JEITA conditions (cool/warm).
		Element 0 - FV value for soft cool.
		Element 1 - FV value for soft warm.
		Profile data node required subnodes:
		- qcom,fcc-temp-lut : An 1-dimensional lookup table node that encodes
		temperature to fcc lookup. The units for this lookup

Documentation/devicetree/bindings/bus/mhi.txt

+0 −7

Original line number	Diff line number	Diff line
		@@ -19,13 +19,6 @@ Main node properties:
		Value type: <u32>
		Definition: Maximum timeout in ms wait for state and cmd completion

		- mhi,time-sync
		Usage: optional
		Value type: <bool>
		Definition: Set true, if the external device support MHI get time
		feature for time synchronization between host processor and
		external modem.

		- mhi,use-bb
		Usage: optional
		Value type: <bool>