diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-13 12:18:00 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-13 12:17:59 -0800 |
| commit | 127197b2bf1b06c05ef9f7dffabf5d1331ed672d (patch) | |
| tree | 24e282ad29c8aefb715c170adb50aa31249a6d8b /arch | |
| parent | 6243ed9ad2f0045bbe72886583447bd56da6526c (diff) | |
| parent | 688a4e14e194a18d1b4a59c49c03132027f1ec77 (diff) | |
Merge "ARM: dts: msm: rename battery profile used for msm8998 QRD"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/qcom/fg-gen3-batterydata-qrd-skuk-4v4-3000mah.dtsi (renamed from arch/arm/boot/dts/qcom/batterydata-qrd-skuk-4v4-3000mah.dtsi) | 0 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8998-qrd-skuk.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8998-qrd-vr1.dtsi | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/qcom/batterydata-qrd-skuk-4v4-3000mah.dtsi b/arch/arm/boot/dts/qcom/fg-gen3-batterydata-qrd-skuk-4v4-3000mah.dtsi index ba3b33361ba1..ba3b33361ba1 100644 --- a/arch/arm/boot/dts/qcom/batterydata-qrd-skuk-4v4-3000mah.dtsi +++ b/arch/arm/boot/dts/qcom/fg-gen3-batterydata-qrd-skuk-4v4-3000mah.dtsi diff --git a/arch/arm/boot/dts/qcom/msm8998-qrd-skuk.dtsi b/arch/arm/boot/dts/qcom/msm8998-qrd-skuk.dtsi index f60fd10b92f8..dcd84e79ba1b 100644 --- a/arch/arm/boot/dts/qcom/msm8998-qrd-skuk.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998-qrd-skuk.dtsi @@ -243,8 +243,7 @@ /{ qrd_batterydata: qcom,battery-data { qcom,batt-id-range-pct = <15>; - - #include "batterydata-qrd-skuk-4v4-3000mah.dtsi" + #include "fg-gen3-batterydata-qrd-skuk-4v4-3000mah.dtsi" }; }; diff --git a/arch/arm/boot/dts/qcom/msm8998-qrd-vr1.dtsi b/arch/arm/boot/dts/qcom/msm8998-qrd-vr1.dtsi index bd9d8147dd82..2d1616412caa 100644 --- a/arch/arm/boot/dts/qcom/msm8998-qrd-vr1.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998-qrd-vr1.dtsi @@ -159,8 +159,7 @@ /{ qrd_batterydata: qcom,battery-data { qcom,batt-id-range-pct = <15>; - - #include "batterydata-qrd-skuk-4v4-3000mah.dtsi" + #include "fg-gen3-batterydata-qrd-skuk-4v4-3000mah.dtsi" }; }; |