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

Commit 0ab92bdd authored by Venkatesh Yadav Abbarapu's avatar Venkatesh Yadav Abbarapu Committed by Joonwoo Park
Browse files

ARM: dts: msm: Add foundry id support for mdm9630 v2 



Update the format for the property qcom,msm-id with foundry id. Foundry id
is used to differentiate MSM's manufactured at different foundries.
This can be used as a unique identifier to differentiate peripherals if
required.

CRs-Fixed: 657272
Change-Id: I8a5281e62078e169e6a8bda144508135f3b3cb9b
Signed-off-by: default avatarVenkatesh Yadav Abbarapu <quicvenkat@codeaurora.org>
Signed-off-by: default avatarJoonwoo Park <joonwoop@codeaurora.org>
parent 1ec33670

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

+19 −11
Original line number Diff line number Diff line 
* MSM-ID



The qcom,msm-id entry specifies the MSM chipset, platform and hardware revision.

It can optionally be an array of these to indicate multiple hardware that use

the same device tree.  It is expected that the bootloader will use this

information at boot-up to decide which device tree to use when given multiple

device trees, some of which may not be compatible with the actual hardware.  It

is the bootloader's responsibility to pass the correct device tree to the kernel.

The qcom,msm-id entry specifies the MSM chipset, platform, hardware revision

and optional manufactured foundry.  It can optionally be an array of these to

indicate multiple hardware that use the same device tree.  It is expected that

the bootloader will use this information at boot-up to decide which device tree

to use when given multiple device trees, some of which may not be compatible

with the actual hardware.  It is the bootloader's responsibility to pass the

correct device tree to the kernel.



Format:



It is expected that the qcom,msm-id entry be at the top level of the device

tree structure.  The format can take one of the two forms below:



   qcom,msm-id = <chipset_id, platform_id, rev_id> [, <c2, p2, r2> ...]

   qcom,msm-id = <chipset_id, rev_id> [, <c2, r2> ...]

   qcom,msm-id = <chipset_foundry_id, platform_id, rev_id> [, <c2, p2, r2> ...]

   qcom,msm-id = <chipset_foundry_id, rev_id> [, <c2, r2> ...]



If the second format is used one must also define the board-id.



The "chipset_foundry_id" consists of three fields as below:



   bits 0-15  = The unique MSM chipset id.

   bits 16-23 = The optional foundry id. If bootloader doesn't find a device

		tree which has exact matching foundry-id with hardware it

		chooses the device tree with foundry-id = 0.

   bits 24-31 = Reserved.



Example:

   qcom,msm-id = <126 15 0>;

   qcom,msm-id = <0x1007e 15 0>;



   qcom,board-id= <15 2>;

   qcom,msm-id = <126 0>;

   qcom,msm-id = <0x1007e 0>;

arch/arm/boot/dts/qcom/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -124,7 +124,11 @@ dtb-$(CONFIG_ARCH_MDM9630) += mdm9630-sim.dtb \ 
	mdm9630-v1-cdp.dtb \

	mdm9630-v1-mtp.dtb \

	mdm9630-v2-cdp.dtb \

	mdm9630-v2-mtp.dtb

	mdm9630-v2-mtp.dtb \

	mdm9630-v2-tsmc-cdp.dtb \

	mdm9630-v2-gf-cdp.dtb  \

	mdm9630-v2-tsmc-mtp.dtb \

	mdm9630-v2-gf-mtp.dtb

dtb-$(CONFIG_ARCH_MSMZIRC) += msmzirc-sim.dtb \

	msmzirc-rumi.dtb \

	msmzirc-cdp.dtb \

arch/arm/boot/dts/qcom/mdm9630-v2-gf-cdp.dts

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 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 "mdm9630-v2-gf.dtsi"

#include "mdm9630-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MDM 9630 v2 CDP";

	compatible = "qcom,mdm9630-cdp", "qcom,mdm9630", "qcom,cdp";

	qcom,board-id = <1 0>;

};

arch/arm/boot/dts/qcom/mdm9630-v2-gf-mtp.dts

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 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 "mdm9630-v2-gf.dtsi"

#include "mdm9630-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MDM 9630 v2 MTP";

	compatible = "qcom,mdm9630-mtp", "qcom,mdm9630", "qcom,mtp";

	qcom,board-id = <7 0>;

};

arch/arm/boot/dts/qcom/mdm9630-v2-gf.dtsi

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

 */



#include "mdm9630-v2.dtsi"



/ {

	qcom,msm-id = <0x100bb 0x20000>, <0x100e3 0x20000>, <0x100e4 0x20000>,

		      <0x100e5 0x20000>, <0x100e6 0x20000>, <0x100e7 0x20000>;

};