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

Commit 806bfa99 authored by Ashwini Muduganti's avatar Ashwini Muduganti
Browse files

Merge commit '871eac76' on remote branch. 



Signed-off-by: default avatarAshwini Muduganti <amudug@codeaurora.org>

Conflicts:
	arch/arm64/boot/dts/qcom/sdmmagpie-idp.dtsi
	arch/arm64/boot/dts/qcom/sdmmagpie.dtsi

Change-Id: I1a5b6f7294546cc17b3b93792053411c24651187
Signed-off-by: default avatarAshwini Muduganti <amudug@codeaurora.org>
parents 533b2539 871eac76

AndroidKernel.mk

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ TARGET_KERNEL_CROSS_COMPILE_PREFIX := $(strip $(TARGET_KERNEL_CROSS_COMPILE_PREF 
ifeq ($(TARGET_KERNEL_CROSS_COMPILE_PREFIX),)

KERNEL_CROSS_COMPILE := arm-eabi-

else

KERNEL_CROSS_COMPILE := $(TARGET_KERNEL_CROSS_COMPILE_PREFIX)

KERNEL_CROSS_COMPILE := $(shell pwd)/$(TARGET_TOOLS_PREFIX)

endif



ifeq ($(KERNEL_LLVM_SUPPORT), true)
@@ -56,11 +56,11 @@ ifeq ($(KERNEL_LLVM_SUPPORT), true) 
    ifeq ($(shell echo $(SDCLANG_PATH) | head -c 1),/)

       KERNEL_LLVM_BIN := $(SDCLANG_PATH)/clang

    else

       KERNEL_LLVM_BIN := $(ANDROID_BUILD_TOP)/$(SDCLANG_PATH)/clang

       KERNEL_LLVM_BIN := $(shell pwd)/$(SDCLANG_PATH)/clang

    endif

    $(warning "Using sdllvm" $(KERNEL_LLVM_BIN))

  else

     KERNEL_LLVM_BIN := $(ANDROID_BUILD_TOP)/$(CLANG) #Using aosp-llvm compiler

     KERNEL_LLVM_BIN := $(shell pwd)/$(CLANG) #Using aosp-llvm compiler

    $(warning "Using aosp-llvm" $(KERNEL_LLVM_BIN))

  endif

endif

Documentation/devicetree/bindings/fb/msm-hdmi-tx.txt

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ Optional properties: 
  HDMI interface will remain powered on from LK to kernel with continuous

  display of bootup logo.

- qcom,pluggable: boolean to enable hotplug feature.

- qcom,max-pclk-frequency-khz: maximum supported pclk frequency in KHz.

- qcom,display-id: A string indicates the display ID for the controller.

		   The possible values are:

		   - "primary"

Documentation/devicetree/bindings/gpu/adreno.txt

+5 −3
Original line number Diff line number Diff line
@@ -6,8 +6,9 @@ Required properties: 
- label:		A string used as a descriptive name for the device.

- compatible:		Must be "qcom,kgsl-3d0" and "qcom,kgsl-3d"

- reg:			Specifies the register base address and size, the shader memory

			base address and size (if it exists), and the base address and size

			of the CX_DBGC block (if it exists).

			base address and size (if it exists), base address and size

			of the CX_DBGC block (if it exists), and the base address and

			size of the CX_MISC block (if it exists).

- reg-names:		Resource names used for the physical address of device registers

			and shader memory. "kgsl_3d0_reg_memory" gives the physical address

			and length of device registers while "kgsl_3d0_shader_memory" gives
@@ -15,7 +16,8 @@ Required properties: 
			specified, "qfprom_memory" gives the range for the efuse

			registers used for various configuration options. If specified,

			"kgsl_3d0_cx_dbgc_memory" gives the physical address and length

			of the CX DBGC block.

			of the CX DBGC block. If specified, "cx_misc" gives

			the physical address and length of the CX_MISC block.

- interrupts:		Interrupt mapping for GPU IRQ.

- interrupt-names:	String property to describe the name of the interrupt.

- qcom,id:		An integer used as an identification number for the device.

Documentation/devicetree/bindings/interrupt-controller/qti,pdc.txt

+5 −4
Original line number Diff line number Diff line
@@ -27,10 +27,11 @@ Properties: 
	Usage: required

	Value type: <string>

	Definition: Should contain one of -

		    "qti,pdc-sdm845",

		    "qti,pdc-sdmmagpie",

		    "qti,pdc-sm6150",

	            "qti,pdc-sm8150",

		    "qcom,pdc-sdm845",

		    "qcom,pdc-sdmmagpie",

		    "qcom,pdc-sm6150",

	            "qcom,pdc-sm8150",

		    "qcom,pdc-sdxprairie",



- reg:

	Usage: required

Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt

+3 −1
Original line number Diff line number Diff line
@@ -11,7 +11,9 @@ platforms. 
		    "qcom,msm8916-apcs-kpss-global",

		    "qcom,msm8996-apcs-hmss-global",

		    "qcom,sm8150-apcs-hmss-global",

		    "qcom,sm8150-spcs-global"

		    "qcom,sm8150-spcs-global",

		    "qcom,sdxprairie-apcs-gcc"

		    "qcom,trinket-apcs-hmss-global"

- reg:

	Usage: required

	Value type: <prop-encoded-array>