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

Commit 0b40333f 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 SDCC core for mdmcalifornium"

parents 689cef5f 1907227c

arch/arm/boot/dts/qcom/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ dtb-$(CONFIG_ARCH_MDMCALIFORNIUM) += mdmcalifornium-sim.dtb \ 
	mdmcalifornium-rumi.dtb \

	mdmcalifornium-emmc-cdp.dtb \

	mdmcalifornium-nand-cdp.dtb \

	mdmcalifornium-mtp.dtb

	mdmcalifornium-emmc-mtp.dtb \

	mdmcalifornium-nand-mtp.dtb



dtb-$(CONFIG_ARCH_MSM8937) += msm8937-rumi.dtb \

	msm8937-pmi8950-cdp.dtb \

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

+18 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include "mdmcalifornium-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MDM CALIFORNIUM CDP";

	model = "Qualcomm Technologies, Inc. MDM CALIFORNIUM CDP (eMMC)";

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

		     "qcom,cdp";

	qcom,board-id = <1 0x00030000>;
@@ -27,3 +27,20 @@ 
		qcom,client-id = <0x00000001>;

	};

};



&sdhc_1 {

	vdd-io-supply = <&pmdcalifornium_l6>;

	qcom,vdd-io-voltage-level = <1800000 1800000>;

	qcom,vdd-io-current-level = <100 200000>;



	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;



	qcom,bus-width = <8>;

	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000>;

	qcom,bus-speed-mode = "HS200_1p8v", "DDR_1p8v";

	qcom,nonremovable;



	status = "ok";

};

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

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2015, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



/dts-v1/;



#include "mdmcalifornium-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MDM CALIFORNIUM MTP (eMMC)";

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

		     "qcom,mtp";

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



	qcom,rmtfs_sharedmem@0 {

		compatible = "qcom,sharedmem-uio";

		reg = <0x0 0x00100000>;

		reg-names = "rmtfs";

		qcom,client-id = <0x00000001>;

	};

};



&sdhc_1 {

	vdd-io-supply = <&pmdcalifornium_l6>;

	qcom,vdd-io-voltage-level = <1800000 1800000>;

	qcom,vdd-io-current-level = <100 200000>;



	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;



	qcom,bus-width = <8>;

	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000>;

	qcom,bus-speed-mode = "HS200_1p8v", "DDR_1p8v";

	qcom,nonremovable;



	status = "ok";

};

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

+16 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include "mdmcalifornium-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MDM CALIFORNIUM CDP";

	model = "Qualcomm Technologies, Inc. MDM CALIFORNIUM CDP (NAND)";

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

		     "qcom,cdp";

	qcom,board-id = <1 0x0>;
@@ -24,3 +24,18 @@ 
&qnand_1 {

	status = "ok";

};



&sdhc_1 {

	vdd-io-supply = <&pmdcalifornium_l7>;

	qcom,vdd-io-voltage-level = <1800000 2848000>;

	qcom,vdd-io-current-level = <200 10000>;



	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;



	qcom,bus-width = <4>;

	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000 200000000>;



	status = "ok";

};

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

+16 −1
Original line number Diff line number Diff line
@@ -15,8 +15,23 @@ 
#include "mdmcalifornium-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MDM CALIFORNIUM MTP";

	model = "Qualcomm Technologies, Inc. MDM CALIFORNIUM MTP (NAND)";

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

		     "qcom,mtp";

	qcom,board-id = <8 0>;

};



&sdhc_1 {

	vdd-io-supply = <&pmdcalifornium_l7>;

	qcom,vdd-io-voltage-level = <1800000 2848000>;

	qcom,vdd-io-current-level = <200 10000>;



	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;



	qcom,bus-width = <4>;

	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000 200000000>;



	status = "ok";

};