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

Commit f51ec01c 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: Add QPIC support for sdxpoorwills"

parents 65b5137e 61f1d32e

Documentation/devicetree/bindings/mtd/msm_qpic_nand.txt

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ Required properties: 
  defined.

- qcom,reg-adjustment-offset : Specify the base adjustment offset value for the

  version registers

- qcom,qpic-clk-rpmh: Indicates whether QPIC clock is RPMH controlled clock or

  not.



MTD flash partition layout for NAND devices -
@@ -53,6 +55,7 @@ Examples: 
		qcom,msm-bus,num-cases = <1>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,vectors-KBps = <91 512 0 0>,

		qcom,qpic-clk-rpmh;

	};



       qcom,mtd-partitions {

arch/arm/boot/dts/qcom/sdxpoorwills-cdp.dts

+3 −0
Original line number Diff line number Diff line
@@ -29,3 +29,6 @@ 
	status = "ok";

};



&qnand_1 {

	status = "ok";

};

arch/arm/boot/dts/qcom/sdxpoorwills-mtp.dts

+3 −0
Original line number Diff line number Diff line
@@ -29,3 +29,6 @@ 
	status = "ok";

};



&qnand_1 {

	status = "ok";

};

arch/arm/boot/dts/qcom/sdxpoorwills-rumi.dts

+4 −0
Original line number Diff line number Diff line
@@ -68,3 +68,7 @@ 
&usb3_qmp_phy {

	status = "disabled";

};



&qnand_1 {

	status = "ok";

};

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

+28 −0
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ 
		};

	};



	aliases {

		qpic_nand1 = &qnand_1;

	};



	soc: soc { };

};
@@ -194,6 +198,30 @@ 
		status = "ok";

	};



	qnand_1: nand@1b00000 {

		compatible = "qcom,msm-nand";

		reg = < 0x01b00000 0x10000>,

			<0x01b04000 0x1a000>;

		reg-names = "nand_phys",

			"bam_phys";

		qcom,reg-adjustment-offset = <0x4000>;

		qcom,qpic-clk-rpmh;



		interrupts = <0 135 0>;

		interrupt-names = "bam_irq";



		qcom,msm-bus,name = "qpic_nand";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-paths = <1>;



		qcom,msm-bus,vectors-KBps =

			<91 512 0 0>,

			/* Voting for max b/w on PNOC bus for now */

			<91 512 400000 400000>;



		status = "disabled";

	};



	qcom,msm-imem@8600000 {

		compatible = "qcom,msm-imem";

		reg = <0x8600000 0x1000>; /* Address and size of IMEM */