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

Commit f05f18fe 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: Add support for 512 MB DDR on mdmcalifornium"

parents ca644868 6f065cdc

arch/arm/boot/dts/qcom/mdmcalifornium-emmc-cdp.dts

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -18,7 +18,7 @@ 
	model = "Qualcomm Technologies, Inc. MDM CALIFORNIUM CDP (eMMC)";

	compatible = "qcom,mdmcalifornium-cdp", "qcom,mdmcalifornium",

		     "qcom,cdp";

	qcom,board-id = <1 0x00030000>;

	qcom,board-id = <1 0x00030000>, <1 0x00030100>;



	qcom,rmtfs_sharedmem@0 {

		compatible = "qcom,sharedmem-uio";

arch/arm/boot/dts/qcom/mdmcalifornium-emmc-mtp.dts

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -18,7 +18,7 @@ 
	model = "Qualcomm Technologies, Inc. MDM CALIFORNIUM MTP (eMMC)";

	compatible = "qcom,mdmcalifornium-mtp", "qcom,mdmcalifornium",

		     "qcom,mtp";

	qcom,board-id = <8 0x00030000>;

	qcom,board-id = <8 0x00030000>, <8 0x00030100>;



	qcom,rmtfs_sharedmem@0 {

		compatible = "qcom,sharedmem-uio";

arch/arm/boot/dts/qcom/mdmcalifornium-nand-cdp.dts

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
	model = "Qualcomm Technologies, Inc. MDM CALIFORNIUM CDP (NAND)";

	compatible = "qcom,mdmcalifornium-cdp", "qcom,mdmcalifornium",

		     "qcom,cdp";

	qcom,board-id = <1 0x0>;

	qcom,board-id = <1 0x0>, <1 0x100>;

};



&qnand_1 {

arch/arm/boot/dts/qcom/mdmcalifornium-nand-dualwifi-mtp.dts

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
	model = "Qualcomm Technologies, Inc. MDMCALIFORNIUM MTP - DWIFI(NAND)";

	compatible = "qcom,mdmcalifornium-mtp", "qcom,mdmcalifornium",

		     "qcom,mtp";

	qcom,board-id = <8 3>;

	qcom,board-id = <8 3>, <8 0x103>;

};



&cnss_pcie {

arch/arm/boot/dts/qcom/mdmcalifornium-nand-mtp.dts

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
	model = "Qualcomm Technologies, Inc. MDM CALIFORNIUM MTP (NAND)";

	compatible = "qcom,mdmcalifornium-mtp", "qcom,mdmcalifornium",

		     "qcom,mtp";

	qcom,board-id = <8 0>;

	qcom,board-id = <8 0>, <8 0x100>;

};



&sdhc_1 {