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

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

Merge 858e0035 on remote branch 

Change-Id: I799983ef8c7aaef334da5ae17f65ce00c316aee9
parents 6ff409d3 858e0035

bindings/spi/spi_qsd.txt

+7 −1
Original line number Diff line number Diff line
@@ -36,7 +36,13 @@ Optional properties: 
 - qcom,rt-priority : whether spi message queue is set to run as a realtime task.

  With this spi transaction message pump with high (realtime) priority to reduce

  the transfer latency on the bus by minimising the delay between a transfer request

 - qcom,shared : whether this qup is shared with other ee's

 - qcom,shared : whether this qup is shared with other ee's and client driver is not

   in control of the spi driver get_sync/put_sync_suspend. Spi driver will

   take care of resources management like clock, gpios and bam for EE switching.

 - qcom,shared_ee : whether this qup is used by other ee's and client driver is in

   control of the spi driver get_sync/put_sync_suspend. Resources management

   of clock, gpios and bam for EE switching will be taken care when client calls spi

   get_sync/put_sync_suspend APIs.



Optional properties which are required for support of BAM-mode:

- qcom,ver-reg-exists : Boolean. When present, allows driver to verify if HW

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

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ 


&pm8150b_charger {

	qcom,batteryless-platform;

	qcom,lpd-disable;

};



&qupv3_se0_spi {

qcom/kona-xrfusion-ult.dtsi

+11 −11
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ 
};



&kona_snd {

	qcom,model = "kona-xrfusion-ult-snd-card";

	qcom,model = "kona-xrfusionult-snd-card";

	qcom,mi2s-audio-intf = <0>;

	qcom,audio-routing =

		"AMIC1", "MIC BIAS1",
@@ -249,24 +249,24 @@ 
		"MIC BIAS3", "Analog Mic3",

		"AMIC4", "MIC BIAS4",

		"MIC BIAS4", "Analog Mic4",

		"AMIC5", "MIC BIAS5",

		"MIC BIAS5", "Analog Mic5",

		"AMIC5", "MIC BIAS4",

		"MIC BIAS4", "Analog Mic5",

		"DMIC1", "MIC BIAS1",

		"MIC BIAS1", "Digital Mic1",

		"MIC BIAS1", "Digital Mic0",

		"DMIC2", "MIC BIAS1",

		"MIC BIAS1", "Digital Mic2",

		"MIC BIAS1", "Digital Mic1",

		"DMIC3", "MIC BIAS1",

		"MIC BIAS1", "Digital Mic3",

		"MIC BIAS1", "Digital Mic2",

		"DMIC4", "MIC BIAS1",

		"MIC BIAS1", "Digital Mic4",

		"MIC BIAS1", "Digital Mic3",

		"DMIC5", "MIC BIAS3",

		"MIC BIAS3", "Digital Mic5",

		"MIC BIAS3", "Digital Mic4",

		"DMIC6", "MIC BIAS3",

		"MIC BIAS3", "Digital Mic6",

		"MIC BIAS3", "Digital Mic5",

		"DMIC7", "MIC BIAS4",

		"MIC BIAS4", "Digital Mic7",

		"MIC BIAS4", "Digital Mic6",

		"DMIC8", "MIC BIAS4",

		"MIC BIAS4", "Digital Mic8",

		"MIC BIAS4", "Digital Mic7",

		"IN1_HPHL", "HPHL_OUT",

		"IN2_HPHR", "HPHR_OUT",

		"IN3_AUX", "AUX_OUT",

qcom/lito-qupv3.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
			<MSM_BUS_MASTER_QUP_0 MSM_BUS_SLAVE_EBI_CH0>;

		iommus = <&apps_smmu 0x4e3 0x0>;

		qcom,iommu-dma-addr-pool = <0x40000000 0xc0000000>;

		qcom,iommu-dma = "atomic";

		qcom,iommu-dma = "fastmap";

	};



	/* Debug UART Instance for RUMI platform */
@@ -307,7 +307,7 @@ 
			<MSM_BUS_MASTER_QUP_1 MSM_BUS_SLAVE_EBI_CH0>;

		iommus = <&apps_smmu 0x023 0x0>;

		qcom,iommu-dma-addr-pool = <0x40000000 0xc0000000>;

		qcom,iommu-dma = "atomic";

		qcom,iommu-dma = "fastmap";

	};



	/* 2-wire UART */

qcom/lito.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -2125,7 +2125,7 @@ 
		#mbox-cells = <2>;

	};



	cache-controller@9200000 {

	llcc: cache-controller@9200000 {

		compatible = "qcom,llcc-v1";

		reg = <0x9200000 0xd0000> , <0x9600000 0x50000>;

		reg-names = "llcc_base", "llcc_broadcast_base";