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

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

Merge edb41e10 on remote branch 

Change-Id: I76fb44ec7d8e8671f96097f3abd9baac26d25715
parents b14a76df edb41e10

bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ nintendo Nintendo 
nlt	NLT Technologies, Ltd.

nokia	Nokia

nordic	Nordic Semiconductor

novatek	Novatek Microelectronics Corporation

nutsboard	NutsBoard

nuvoton	Nuvoton Technology Corporation

nvd	New Vision Display

qcom/lagoon-audio-overlay.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ 
&lagoon_snd {

	qcom,model = "lito-lagoonmtp-snd-card";

	qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>;

	qcom,wcn-btfm = <0>;

	qcom,wcn-btfm = <1>;

	qcom,ext-disp-audio-rx = <0>;

	qcom,audio-routing =

		"AMIC1", "MIC BIAS1",

qcom/lagoon-gpu.dtsi

+1 −17
Original line number Diff line number Diff line
@@ -15,27 +15,11 @@ 
		operating-points-v2 = <&gpu_opp_table>;

	};



	ddr_bw_opp_table: ddr-bw-opp-table {

		compatible = "operating-points-v2";

		BW_OPP_ENTRY( 200, 4); /*  762 MB/s */

		BW_OPP_ENTRY( 300, 4); /* 1144 MB/s */

		BW_OPP_ENTRY( 451, 4); /* 1720 MB/s */

		BW_OPP_ENTRY( 547, 4); /* 2086 MB/s */

		BW_OPP_ENTRY( 681, 4); /* 2597 MB/s */

		BW_OPP_ENTRY( 768, 4); /* 2929 MB/s */

		BW_OPP_ENTRY(1017, 4); /* 3879 MB/s */

		BW_OPP_ENTRY(1353, 4); /* 5161 MB/s */

		BW_OPP_ENTRY(1555, 4); /* 5931 MB/s */

		BW_OPP_ENTRY(1804, 4); /* 6881 MB/s */

		BW_OPP_ENTRY(2092, 4); /* 7980 MB/s */

	};





	gpubw: qcom,gpubw {

		compatible = "qcom,devbw";

		governor = "bw_vbif";

		qcom,src-dst-ports = <26 512>;

		operating-points-v2 = <&ddr_bw_opp_table>;

		operating-points-v2 = <&suspendable_ddr_bw_opp_table>;

	};



	gpu_opp_table: gpu-opp-table {

qcom/lagoon-mtp-usbc.dtsi

+1 −1
Original line number Diff line number Diff line 
#include "lagoon-audio-overlay.dtsi"

#include "lagoon-mtp.dtsi"



&soc {

qcom/lagoon-pinctrl.dtsi

+3 −3
Original line number Diff line number Diff line 
&soc {

	tlmm: pinctrl@f000000 {

	tlmm: pinctrl@f100000 {

		compatible = "qcom,lagoon-pinctrl";

		reg = <0x0f000000 0x1000000>;

		reg = <0x0f100000 0x300000>;

		interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;

		gpio-controller;

		#gpio-cells = <2>;
@@ -176,7 +176,7 @@ 
			qupv3_se9_2uart_active: qupv3_se9_2uart_active {

				mux {

					pins = "gpio25", "gpio26";

					function = "qup13";

					function = "qup13_f2";

				};



				config {