diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-09-17 12:55:21 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-09-17 12:55:21 -0700 |
| commit | d55e3c1811bf73c3a48a30ea1947a0bd0acf232c (patch) | |
| tree | 76a8276fc02abde5fe221e1615930a0294a437de | |
| parent | dfddfc4288e692a30a6b14a540f5beb9536486bd (diff) | |
| parent | 3a0e69971aad35fef44816656c642d8e195b6d65 (diff) | |
Merge "ARM: dts: msm: Update qcom,msm-id format for samarium"
| -rw-r--r-- | arch/arm/boot/dts/msmsamarium-cdp-interposer.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/msmsamarium-cdp.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/msmsamarium-rumi.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/msmsamarium-sim.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/msmsamarium.dtsi | 1 |
5 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/msmsamarium-cdp-interposer.dts b/arch/arm/boot/dts/msmsamarium-cdp-interposer.dts index c0b6f727a1f..a6de8b75b97 100644 --- a/arch/arm/boot/dts/msmsamarium-cdp-interposer.dts +++ b/arch/arm/boot/dts/msmsamarium-cdp-interposer.dts @@ -17,9 +17,9 @@ / { - model = "Qualcomm MSM 8974Pro-ac SAMARIUM Interposer CDP"; + model = "Qualcomm MSM 8974Pro-ac SAMARIUM Interposer CDP / MTP"; compatible = "qcom,msm8974-cdp", "qcom,msm8974", "qcom,cdp"; - qcom,msm-id = <195 1 8>; + qcom,board-id = <1 8>, <8 8>; }; &pma8084_l3 { diff --git a/arch/arm/boot/dts/msmsamarium-cdp.dts b/arch/arm/boot/dts/msmsamarium-cdp.dts index 8cbf24a8556..45e45309be4 100644 --- a/arch/arm/boot/dts/msmsamarium-cdp.dts +++ b/arch/arm/boot/dts/msmsamarium-cdp.dts @@ -18,6 +18,6 @@ / { model = "Qualcomm MSM SAMARIUM CDP"; compatible = "qcom,msmsamarium-cdp", "qcom,msmsamarium", "qcom,cdp"; - qcom,msm-id = <195 1 0>; + qcom,board-id = <1 0>; }; diff --git a/arch/arm/boot/dts/msmsamarium-rumi.dts b/arch/arm/boot/dts/msmsamarium-rumi.dts index c0d48c083b1..982e344608c 100644 --- a/arch/arm/boot/dts/msmsamarium-rumi.dts +++ b/arch/arm/boot/dts/msmsamarium-rumi.dts @@ -17,7 +17,7 @@ / { model = "Qualcomm MSM SAMARIUM RUMI"; compatible = "qcom,msmsamarium-rumi", "qcom,msmsamarium", "qcom,rumi"; - qcom,msm-id = <195 15 0>; + qcom,board-id = <15 0>; }; &blsp1_uart2{ diff --git a/arch/arm/boot/dts/msmsamarium-sim.dts b/arch/arm/boot/dts/msmsamarium-sim.dts index 2f6f3672fba..8b8ab78f121 100644 --- a/arch/arm/boot/dts/msmsamarium-sim.dts +++ b/arch/arm/boot/dts/msmsamarium-sim.dts @@ -18,7 +18,7 @@ / { model = "Qualcomm MSM SAMARIUM SIM"; compatible = "qcom,msmsamarium-sim", "qcom,msmsamarium", "qcom,sim"; - qcom,msm-id = <195 16 0>; + qcom,board-id = <16 0>; }; &blsp1_uart2{ diff --git a/arch/arm/boot/dts/msmsamarium.dtsi b/arch/arm/boot/dts/msmsamarium.dtsi index 5a156c8b700..d6c7e30b85a 100644 --- a/arch/arm/boot/dts/msmsamarium.dtsi +++ b/arch/arm/boot/dts/msmsamarium.dtsi @@ -15,6 +15,7 @@ / { model = "Qualcomm MSM SAMARIUM"; compatible = "qcom,msmsamarium"; + qcom,msm-id = <195 0>; interrupt-parent = <&intc>; soc: soc { }; aliases { |