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

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

Merge 221f4a66 on remote branch 

Change-Id: I0f3bb7c2a1ccfc9090aeaf77ff8e39d63390ed16
parents 5157c58e 221f4a66

bindings/power/reset/qcom,dload-mode.yaml

+12 −0
Original line number Diff line number Diff line
@@ -16,6 +16,18 @@ properties: 
  compatible:

    items:

      - const: qcom,dload-mode

  reg:

    Value type: <prop-encoded-array>

    Definition: The base address and size for reading the proper configuration

                related information.



  reg-names:

    Value type: string

    Definition: The reg name for reading the configurations.



  qcom,boot-config-shift:

    Value type: <prop-encoded-array>

    Definition: The range of bits from low to high.



required:

  - compatible

qcom/blair-pinctrl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ 
			qupv3_se7_i2c_active: qupv3_se7_i2c_active {

				mux {

					pins = "gpio27", "gpio28";

					function = "qup11";

					function = "qup11_f1";

				};



				config {

qcom/sdxlemur-qcn9000.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,11 @@ 
};



&soc {

	/* If QCN9000 is connected, LPM modes are disabled */

	qcom,lpm-levels {

		status = "disabled";

	};



	wifi0: qcom,cnss-qcn9000@a0000000 {

		status = "disabled";

		compatible = "qcom,cnss-qcn9000";

qcom/sdxlemur-v2.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -173,3 +173,8 @@ 
&pil_modem {

	qcom,vdd_mss-uV-uA = <RPMH_REGULATOR_LEVEL_NOM_L1 100000>;

};





&dload_mode {

	qcom,boot-config-shift = <1 4>;

};

qcom/sdxlemur.dtsi

+6 −3
Original line number Diff line number Diff line
@@ -196,8 +196,11 @@ 
		};

	};



	dload_mode {

	dload_mode: dload_mode {

		compatible = "qcom,dload-mode";

		reg = <0x786070 0x4>;

		reg-names = "boot-config";

		qcom,boot-config-shift = <1 3>;

	};



	dcc: dcc_v2@117f000 {
@@ -977,7 +980,7 @@ 


			qcom,pcie-vendor-id = /bits/ 16 <0x17cb>;

			qcom,pcie-device-id = /bits/ 16 <0x0308>;

			qcom,pcie-link-speed = <4>;

			qcom,pcie-link-speed = <3>;

			qcom,pcie-phy-ver = <7>;

			qcom,pcie-active-config;

			qcom,pcie-aggregated-irq;
@@ -1141,7 +1144,7 @@ 
			qcom,mhi-ep-msi = <0>;

			qcom,mhi-version = <0x1000000>;

			qcom,use-ipa-software-channel;

			interrupts = <0 145 0>;

			interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "mhi-device-inta";

			qcom,mhi-ifc-id = <0x030817cb>;

			qcom,mhi-interrupt;