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

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

Merge 4c9e8a52 on remote branch 

Change-Id: I980a04e77d72ff32694e10248a90b5388631e172
parents 00da8d6b 4c9e8a52

qcom/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
                sdm660-cdp-external-codec-overlay.dtbo \

                sdm660-cdp-internal-codec-overlay.dtbo \

                sdm660-qrd-external-codec-overlay.dtbo \

                sdm660-qrd-dsi-rm67195-amoled-overlay.dtbo \

                sdm660-rcm-external-codec-overlay.dtbo \

                sdm660-rcm-internal-codec-overlay.dtbo \

                sda660-mtp-external-codec-overlay.dtbo \
@@ -369,6 +370,8 @@ sdm660-cdp-internal-codec-overlay.dtbo-base := sdm660-pm660l.dtb 


sdm660-qrd-external-codec-overlay.dtbo-base := sdm660-pm660l.dtb



sdm660-qrd-dsi-rm67195-amoled-overlay.dtbo-base := sdm660-pm660a.dtb



sdm660-rcm-external-codec-overlay.dtbo-base := sdm660-pm660l.dtb



sdm660-rcm-internal-codec-overlay.dtbo-base := sdm660-pm660l.dtb
@@ -407,7 +410,8 @@ sdm660-internal-codec-cdp.dtb \ 
        sdm660-pm660a-headset-jacktype-no-cdp.dtb \

        sdm660-pm660a-headset-jacktype-no-rcm.dtb \

        sdm660-usbc-audio-mtp.dtb \

        sdm660-usbc-audio-rcm.dtb

        sdm660-usbc-audio-rcm.dtb \

	sdm660-qrd-dsi-rm67195-amoled.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

qcom/kona-sde.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
		qcom,sde-wb-xin-id = <6>;

		qcom,sde-wb-id = <2>;

		qcom,sde-wb-clk-ctrl = <0x2bc 16>;

		qcom,sde-wb-clk-status = <0x3bc 20>;



		qcom,sde-intf-off = <0x6b000 0x6b800

					0x6c000 0x6c800>;
@@ -405,6 +406,8 @@ 
		qcom,widebus-enable;

		qcom,dsc-feature-enable;

		qcom,fec-feature-enable;

		qcom,max-dp-dsc-blks = <2>;

		qcom,max-dp-dsc-input-width-pixs = <2048>;



		qcom,ctrl-supply-entries {

			#address-cells = <1>;

qcom/kona-v2.1-iot-rb5.dtsi

+46 −0
Original line number Diff line number Diff line
@@ -393,6 +393,36 @@ 
	};



	#include "smb1390.dtsi"



	fsa4480: fsa4480@43 {

		status = "disabled";

	};



	redriver: redriver@1c {

		compatible = "onnn,redriver";

		reg = <0x1c>;

		extcon = <&pm8150b_pdphy>, <&pm8150b_pdphy>;

		eq = /bits/ 8 <

				/* Parameters for USB */

				0x4 0x4 0x4 0x4

				/* Parameters for DP */

				0x6 0x4 0x4 0x6>;

		flat-gain = /bits/ 8 <

				/* Parameters for USB */

				0x3 0x1 0x1 0x3

				/* Parameters for DP */

				0x2 0x1 0x1 0x2>;

		output-comp = /bits/ 8 <

				/* Parameters for USB */

				0x3 0x3 0x3 0x3

				/* Parameters for DP */

				0x3 0x3 0x3 0x3>;

		loss-match = /bits/ 8 <

				/* Parameters for USB */

				0x1 0x3 0x3 0x1

				/* Parameters for DP */

				0x3 0x3 0x3 0x3>;

	};

};



&qupv3_se4_i2c {
@@ -425,3 +455,19 @@ 
		status = "okay";

	};

};



&q6core {

	kona_snd: sound {

		/delete-property/ fsa4480-i2c-handle;

	};

};



&sde_dp {

	qcom,dp-aux-switch = <&redriver>;

	qcom,aux-en-gpio = <&tlmm 69 0>;

	qcom,aux-sel-gpio = <&tlmm 71 0>;



	qcom,max-hdisplay = <1920>;

	qcom,max-vdisplay = <1080>;

	qcom,max-pclk-frequency-khz = <187500>;

};

qcom/kona.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -2582,6 +2582,7 @@ 
		reg = <0x177004 0x4>;

		regulator-name = "ufs_phy_gdsc";

		qcom,retain-regs;

		qcom,gds-timeout = <500>;

	};



	usb30_prim_gdsc: qcom,gdsc@10f004 {

qcom/scuba-iot-rb1.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ 
	};

};



&qupv3_se0_4uart {

	status = "ok";

};



&pm2250_qg {

	qcom,battery-data = <&scuba_batterydata>;

	qcom,qg-iterm-ma = <150>;