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

Commit 04f784df 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: enable UFS and UFS PHY in msmcobalt rumi platform"

parents f99d7ad5 856fa969

Documentation/devicetree/bindings/arm/msm/msm.txt

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ compatible = "qcom,msm8996-fluid" 
compatible = "qcom,msm8996-liquid"

compatible = "qcom,msm8996-mtp"

compatible = "qcom,msmcobalt-sim"

compatible = "qcom,msmcobalt-rumi"

compatible = "qcom,msm8952-rumi"

compatible = "qcom,msm8952-sim"

compatible = "qcom,msm8952-qrd"

arch/arm/boot/dts/qcom/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \ 
	apq8096-v2-dragonboard.dtb \

	apq8096-v3-dragonboard.dtb



dtb-$(CONFIG_ARCH_MSMCOBALT) += msmcobalt-sim.dtb

dtb-$(CONFIG_ARCH_MSMCOBALT) += msmcobalt-sim.dtb \

	msmcobalt-rumi.dtb



dtb-$(CONFIG_ARCH_MDM9640) += mdm9640-sim.dtb \

	mdm9640-rumi.dtb \

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

0 → 100644
+24 −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/;

/memreserve/ 0x90000000 0x00000100;



#include "msmcobalt.dtsi"

#include "msmcobalt-rumi.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM COBALT RUMI";

	compatible = "qcom,msmcobalt-rumi", "qcom,msmcobalt", "qcom,rumi";

	qcom,board-id = <15 0>;

};

arch/arm/boot/dts/qcom/msmcobalt-rumi.dtsi

0 → 100644
+25 −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.

 */



&uartblsp2dm1 {

	status = "ok";

};



&ufsphy1 {

	compatible = "qcom,ufs-phy-qrbtc-v2";

	reg = <0x1da7000 0x11100>;

	status = "ok";

};



&ufs1 {

	status = "ok";

};