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

Commit 68f569f1 authored by Divya Sharma's avatar Divya Sharma
Browse files

Merge commit '784378b9' into HEAD 



Change-Id: I3afe6f251a3a9e9b2b8ff977177725fed4ffada7
Signed-off-by: default avatarDivya Sharma <divyash@codeaurora.org>
parents 61dc9210 784378b9

AndroidKernel.mk

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ $(warning Forcing kernel header generation only for '$(TARGET_KERNEL_HEADER_ARCH 
KERNEL_HEADER_ARCH := $(TARGET_KERNEL_HEADER_ARCH)

endif



ifeq ($(shell echo $(KERNEL_DEFCONFIG) | grep vendor),)

KERNEL_DEFCONFIG := vendor/$(KERNEL_DEFCONFIG)

endif



KERNEL_HEADER_DEFCONFIG := $(strip $(KERNEL_HEADER_DEFCONFIG))

ifeq ($(KERNEL_HEADER_DEFCONFIG),)

KERNEL_HEADER_DEFCONFIG := $(KERNEL_DEFCONFIG)

Documentation/devicetree/bindings/bus/mhi.txt

+11 −5
Original line number Diff line number Diff line
@@ -76,9 +76,15 @@ mhi channel node properties: 
- mhi,ee

  Usage: required

  Value type: <u32>

  Definition: Channel execution enviornment as defined by enum MHI_EE

	1 = Bootloader stage

	2 = AMSS mode

  Definition: Channel execution enviornment (EE) mask as defined by enum

	mhi_ch_ee_mask

		BIT(0) = Channel supported in PBL EE

		BIT(1) = Channel supported in SBL EE

		BIT(2) = Channel supported in AMSS EE

		BIT(3) = Channel supported in RDDM EE

		BIT(4) = Channel supported in WFW EE

		BIT(5) = Channel supported in PTHRU EE

		BIT(6) = Channel supported in EDL EE



- mhi,pollcfg

  Usage: optional
@@ -223,7 +229,7 @@ mhi_controller { 
		mhi,chan-dir = <1>;

		mhi,data-type = <0>;

		mhi,doorbell-mode = <2>;

		mhi,ee = <2>;

		mhi,ee = <0x4>;

	};



	mhi_chan@1 {
@@ -234,7 +240,7 @@ mhi_controller { 
		mhi,chan-dir = <2>;

		mhi,data-type = <0>;

		mhi,doorbell-mode = <2>;

		mhi,ee = <2>;

		mhi,ee = <0x4>;

	};



	mhi_event@0 {

Documentation/devicetree/bindings/clock/qcom,dispcc.txt

+5 −2
Original line number Diff line number Diff line
@@ -2,8 +2,11 @@ Qualcomm Technologies, Inc. Display Clock & Reset Controller Binding 
--------------------------------------------------------------------



Required properties :

- compatible : Shall contain "qcom,dispcc-sm8150" or "qcom,dispcc-sm8150-v2" or

				"qcom,dispcc-sm6150".

- compatible : Shall contain one of the following:

		"qcom,dispcc-sm8150",

		"qcom,dispcc-sm8150-v2",

		"qcom,dispcc-sm6150",

		"qcom,dispcc-sdmmagpie".

- reg : Shall contain base register location and length.

- reg-names: Address name. Must be "cc_base".

- vdd_mm-supply: phandle to the MM_CX rail that needs to be voted on behalf

Documentation/devicetree/bindings/clock/qcom,npucc.txt

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ Qualcomm Technologies, Inc. NPU Clock & Reset Controller Binding 
----------------------------------------------------------------



Required properties :

- compatible : must contain "qcom,npucc-sm8150" or "qcom,npucc-sm8150-v2".

- compatible : must contain "qcom,npucc-sm8150" or "qcom,npucc-sm8150-v2"

		or "qcom,npucc-sdmmagpie".

- reg : shall contain base register location and length.

- reg-names: names of registers listed in the same order as in

	     the reg property.

Documentation/devicetree/bindings/display/msm/sde.txt

+3 −3
Original line number Diff line number Diff line
@@ -101,8 +101,6 @@ Optional properties: 
- qcom,sde-dsc-size:		A u32 value indicates the address range for each dsc.

- qcom,sde-cdm-size:		A u32 value indicates the address range for each cdm.

- qcom,sde-pp-size:		A u32 value indicates the address range for each pingpong.

- qcom,sde-te-source:		Array of GPIO sources indicating which pingpong TE is

				sourced to which panel TE gpio.

- qcom,sde-wb-size:		A u32 value indicates the address range for each writeback.

- qcom,sde-len:			A u32 entry for SDE address range.

- qcom,sde-intf-max-prefetch-lines:	Array of u32 values for max prefetch lines on
@@ -142,6 +140,8 @@ Optional properties: 
				feature is available or not.

- qcom,sde-has-idle-pc:		Boolean property to indicate if target has idle

				power collapse feature available or not.

- qcom,fullsize-va-map:		Boolean property to indicate smmu mapping range

				for mdp should be full range (4GB).

- qcom,sde-has-mixer-gc:	Boolean property to indicate if mixer has gamma correction

				feature available or not.

- qcom,sde-has-dest-scaler: 	Boolean property to indicate if destination scaler
@@ -537,7 +537,6 @@ Example: 
    qcom,sde-pp-off = <0x00071000 0x00071800

			  0x00072000 0x00072800>;

    qcom,sde-pp-slave = <0x0 0x0 0x0 0x0>;

    qcom,sde-te-source = <0x0 0x1 0x0 0x0>;

    qcom,sde-cdm-off = <0x0007a200>;

    qcom,sde-dsc-off = <0x00081000 0x00081400>;

    qcom,sde-intf-max-prefetch-lines = <0x15 0x15 0x15 0x15>;
@@ -605,6 +604,7 @@ Example: 
    qcom,sde-highest-bank-bit = <15>;

    qcom,sde-has-mixer-gc;

    qcom,sde-has-idle-pc;

    qcom,fullsize-va-map;

    qcom,sde-has-dest-scaler;

    qcom,sde-max-dest-scaler-input-linewidth = <2048>;

    qcom,sde-max-dest-scaler-output-linewidth = <2560>;