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

This project is archived. Its data is read-only.

Commit 0427eb1f authored Jun 16, 2014 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Jun 16, 2014

Merge "ARM: dts: msm: Configure wakeup byte for HSUART in apq8084"

parents f3406196 46f34539

arch/arm/boot/dts/qcom/apq8084-cdp.dtsi

+2 −6

Original line number	Diff line number	Diff line
		@@ -149,13 +149,9 @@
		};

		&uart6 {
		qcom,inject-rx-on-wakeup;
		qcom,rx-char-to-inject = <0xfd>;
		status = "ok";
		qcom,tx-gpio = <&msmgpio 43 0x00>;
		qcom,rx-gpio = <&msmgpio 44 0x00>;
		qcom,cts-gpio = <&msmgpio 45 0x00>;
		qcom,rfr-gpio = <&msmgpio 46 0x00>;
		qcom,inject-rx-on-wakeup = <1>;
		qcom,rx-char-to-inject = <0xFD>;
		};

		&blsp2_uart1 {

arch/arm/boot/dts/qcom/apq8084-liquid.dtsi

+6 −0

Original line number	Diff line number	Diff line
		@@ -191,6 +191,12 @@
		qcom,dsi-pref-prim-pan = <&dsi_dual_jdi_video_1>;
		};

		&uart6 {
		qcom,inject-rx-on-wakeup;
		qcom,rx-char-to-inject = <0xfd>;
		status = "ok";
		};

		&blsp2_uart1 {
		status = "ok";
		};

arch/arm/boot/dts/qcom/apq8084-mtp.dtsi

+6 −0

Original line number	Diff line number	Diff line
		@@ -183,6 +183,12 @@
		status = "ok";
		};

		&uart6 {
		qcom,inject-rx-on-wakeup;
		qcom,rx-char-to-inject = <0xfd>;
		status = "ok";
		};

		&ufsphy1 {
		status = "ok";
		};

arch/arm/boot/dts/qcom/apq8084.dtsi

+6 −0

Original line number	Diff line number	Diff line
		@@ -261,6 +261,11 @@
		1 &intc 0 238 0
		2 &msmgpio 44 0>;

		qcom,tx-gpio = <&msmgpio 43 0x00>;
		qcom,rx-gpio = <&msmgpio 44 0x00>;
		qcom,cts-gpio = <&msmgpio 45 0x00>;
		qcom,rfr-gpio = <&msmgpio 46 0x00>;

		qcom,bam-tx-ep-pipe-index = <10>;
		qcom,bam-rx-ep-pipe-index = <11>;
		qcom,msm-bus,name = "uart6";
		@@ -269,6 +274,7 @@
		qcom,msm-bus,vectors-KBps =
		<86 512 0 0>,
		<86 512 500 800>;
		status = "disabled";
		};

		blsp2_uart4: uart@f9961000 { /* BLSP2 UART4 */