msm: 8974: Add qcom,msm-id entry to MSM8974-sim/rumi device trees
The qcom,msm-id entry specifies the MSM chipset, platform and
hardware revision. This is used by the Android dtbtool utility
to generate a table of device tree used in the boot.img.
The qcom,msm-id syntax is:
qcom,msm-id = <chipset_id, platform_id, rev_id> [, <...>];
The entry can optionally be an array with variable number of
triplets indicating the device tree supports more than one
chipset/platform/hardware rev.
Note that the id's are hardware ID's reported by the hardware
and not commonly used literal ID's. E.g. MSM8974's chipset ID
is 126, not 8974.
Change-Id: If65b40d6e947504cb4b07a36aa895f8ec6f9d300
Signed-off-by: David Ng <dave@codeaurora.org>
diff --git a/Documentation/devicetree/bindings/arm/msm/msm-id.txt b/Documentation/devicetree/bindings/arm/msm/msm-id.txt
new file mode 100644
index 0000000..b8c71d76
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/msm/msm-id.txt
@@ -0,0 +1,18 @@
+* 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.
+
+Format:
+
+It is expected that the qcom,msm-id entry be at the top level of the device
+tree structure. The format of the entry is:
+
+ qcom,msm-id = <chipset_id, platform_id, rev_id> [, <c2, p2, r2> ...]
+
+Example:
+ qcom,msm-id = <126 15 0>;
diff --git a/arch/arm/boot/dts/msm8974-rumi.dts b/arch/arm/boot/dts/msm8974-rumi.dts
index 4bfc3a9..1706327 100644
--- a/arch/arm/boot/dts/msm8974-rumi.dts
+++ b/arch/arm/boot/dts/msm8974-rumi.dts
@@ -17,6 +17,7 @@
/ {
model = "Qualcomm MSM 8974 RUMI";
compatible = "qcom,msm8974-rumi", "qcom,msm8974";
+ qcom,msm-id = <126 15 0>;
timer {
clock-frequency = <5000000>;
diff --git a/arch/arm/boot/dts/msm8974-sim.dts b/arch/arm/boot/dts/msm8974-sim.dts
index 57a40b2..885453c 100644
--- a/arch/arm/boot/dts/msm8974-sim.dts
+++ b/arch/arm/boot/dts/msm8974-sim.dts
@@ -18,6 +18,7 @@
/ {
model = "Qualcomm MSM 8974 Simulator";
compatible = "qcom,msm8974-sim", "qcom,msm8974";
+ qcom,msm-id = <126 16 0>;
qcom,mdss_dsi@fd922800 {
qcom,mdss_dsi_sim_video {