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

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

Merge 790aee40 on remote branch 

Change-Id: Ia2ed116acdbfcbafdfd07b8ec8b7acbc2e7069b8
parents 8334ed02 790aee40

bindings/display/msm/sde.txt

+2 −0
Original line number Diff line number Diff line
@@ -433,6 +433,8 @@ Optional properties: 
				order of <real_time>, and <non_real_time>.

- qcom,sde-qos-cpu-mask:	A u32 value indicating desired PM QoS CPU affine mask.

- qcom,sde-qos-cpu-dma-latency:	A u32 value indicating desired PM QoS CPU DMA latency in usec.

- qcom,sde-qos-cpu-irq-latency:	A u32 value indicating desired PM QoS CPU irq latency in usec

				for 120 fps based targets.

- qcom,sde-inline-rot-xin:	An integer array of xin-ids related to inline

				rotation.

- qcom,sde-inline-rot-xin-type:	A string array indicating the type of xin,

bindings/interrupt-controller/qcom,mpm.txt

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ Properties: 
		"qcom,mpm-gic-qcs405"

		"qcom,mpm-gic-trinket"

		"qcom,mpm-gic-bengal"

		"qcom,mpm-gic-scuba"



- interrupts:

	Usage: required

bindings/power/supply/qcom/qpnp-qg.txt

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ First Level Node - QGAUGE device 
- compatible

	Usage:      required

	Value type: <string>

	Definition: Should be "qcom,qpnp-qg".

	Definition: Should be "qcom,qpnp-qg" or "qcom,qpnp-qg-lite".



- qcom,pmic-revid

	Usage:      required

qcom/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
                kona-xr-overlay.dtbo \

                kona-rumi-overlay.dtbo \

                kona-qrd-overlay.dtbo \

		kona-xrfusion-overlay.dtbo \

                kona-hdk-overlay.dtbo



kona-cdp-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb
@@ -16,12 +17,14 @@ kona-mtp-ws-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb 
kona-xr-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb

kona-rumi-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb

kona-qrd-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb

kona-xrfusion-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb

kona-hdk-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb

else

dtb-$(CONFIG_ARCH_KONA) += kona-rumi.dtb \

        kona-mtp.dtb \

        kona-mtp-ws.dtb \

        kona-xr.dtb \

	kona-xrfusion.dtb \

        kona-cdp.dtb \

        kona-cdp-lcd.dtb \

        kona-qrd.dtb \
@@ -30,12 +33,14 @@ dtb-$(CONFIG_ARCH_KONA) += kona-rumi.dtb \ 
        kona-v2-mtp-ws.dtb \

        kona-v2-cdp.dtb \

        kona-v2-qrd.dtb \

	kona-v2-xrfusion.dtb \

        kona-hdk.dtb \

        kona-v2.1-mtp.dtb \

        kona-v2.1-mtp-ws.dtb \

        kona-v2.1-cdp.dtb \

        kona-v2.1-qrd.dtb \

        kona-v2.1-hdk.dtb \

	kona-v2.1-xrfusion.dtb \

        kona-v2.1-iot-rb5.dtb

endif

qcom/bengal-1gb.dts

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#include "bengal-low-ram.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Bengal 1Gb DDR SoC";

	model = "Qualcomm Technologies, Inc. Bengal 1Gb DDR HD+ SoC";

	compatible = "qcom,bengal";

	qcom,board-id = <34 0x300>;

	qcom,board-id = <0 0x303>;

};