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

Commit 81595887 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Use spi1 instead of spi4 for k61 on mdm9650 CV2X"

parents 17c997bb 47f53cfb
Loading
Loading
Loading
Loading
+10 −5
Original line number Diff line number Diff line
@@ -84,11 +84,7 @@
	};
};

&spi_2 {
	status = "ok";
};

&spi_4 {
&spi_1 {
	status = "ok";
	/delete-property/ qcom,use-bam;

@@ -105,6 +101,10 @@
	};
};

&spi_2 {
	status = "ok";
};

&qnand_1 {
	status = "ok";
};
@@ -191,6 +191,11 @@
	};
};

/* Needed by spi_1 */
&pmd9650_l13 {
	regulator-always-on;
};

&pmd9650_gpios {
	gpio@c000 { /* GPIO 1 - MDM2AP_VDD_MIN */
		status = "ok";