evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ARM: dts: msm: refactor smb138x device to its own dtsi"

Browse source
This commit is contained in:
Linux Build Service Account 2016-12-06 14:33:19 -08:00 • committed by Gerrit - the friendly Code Review server
commit ed9342445a
8 changed files with 105 additions and 326 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
arch/arm/boot/dts/qcom/msm-smb138x.dtsi Normal file
View file

@ -0,0 +1,103 @@
/* Copyright (c) 2016, 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 <dt-bindings/interrupt-controller/irq.h>
&i2c_7 {
status = "okay";
qcom,smb138x@8 {
compatible = "qcom,i2c-pmic";
reg = <0x8>;
#address-cells = <2>;
#size-cells = <0>;
interrupt-parent = <&spmi_bus>;
interrupts = <0x0 0xd1 0x0 IRQ_TYPE_LEVEL_LOW>;
interrupt_names = "smb138x";
interrupt-controller;
#interrupt-cells = <3>;
qcom,periph-map = <0x10 0x11 0x12 0x13 0x14 0x16 0x36>;
smb138x_revid: qcom,revid@100 {
compatible = "qcom,qpnp-revid";
reg = <0x100 0x100>;
};
smb138x_tadc: qcom,tadc@3600 {
compatible = "qcom,tadc";
reg = <0x3600 0x100>;
#address-cells = <1>;
#size-cells = <0>;
#io-channel-cells = <1>;
interrupts = <0x36 0x0 IRQ_TYPE_EDGE_BOTH>;
interrupt-names = "eoc";
batt_temp@0 {
reg = <0>;
qcom,rbias = <68100>;
qcom,rtherm-at-25degc = <68000>;
qcom,beta-coefficient = <3450>;
};
skin_temp@1 {
reg = <1>;
qcom,rbias = <33000>;
qcom,rtherm-at-25degc = <68000>;
qcom,beta-coefficient = <3450>;
};
die_temp@2 {
reg = <2>;
qcom,scale = <(-1032)>;
qcom,offset = <344125>;
};
batt_i@3 {
reg = <3>;
qcom,channel = <3>;
qcom,scale = <(-20000000)>;
};
batt_v@4 {
reg = <4>;
qcom,scale = <5000000>;
};
input_i@5 {
reg = <5>;
qcom,scale = <14285714>;
};
input_v@6 {
reg = <6>;
qcom,scale = <25000000>;
};
otg_i@7 {
reg = <7>;
qcom,scale = <5714286>;
};
};
smb138x_parallel_slave: qcom,smb138x-parallel-slave@1000 {
compatible = "qcom,smb138x-parallel-slave";
qcom,pmic-revid = <&smb138x_revid>;
reg = <0x1000 0x700>;
io-channels = <&smb138x_tadc 2>,
<&smb138x_tadc 12>,
<&smb138x_tadc 3>;
io-channel-names = "charger_temp",
"charger_temp_max",
"batt_i";
};
};
};

62
arch/arm/boot/dts/qcom/msm8998-cdp.dtsi
View file

@ -207,68 +207,6 @@
}; };
}; };
&i2c_7 {
status = "okay";
qcom,smb138x@8 {
compatible = "qcom,i2c-pmic";
reg = <0x8>;
#address-cells = <2>;
#size-cells = <0>;
interrupt-parent = <&spmi_bus>;
interrupts = <0x0 0xd1 0x0 IRQ_TYPE_LEVEL_LOW>;
interrupt_names = "smb138x";
interrupt-controller;
#interrupt-cells = <3>;
qcom,periph-map = <0x10 0x11 0x12 0x13 0x14 0x16 0x36>;
smb138x_tadc: qcom,tadc@3600 {
compatible = "qcom,tadc";
reg = <0x3600 0x100>;
interrupts = <0x36 0x0 IRQ_TYPE_EDGE_BOTH>;
interrupt-names = "eoc";
batt_therm {
qcom,rbias = <68100>;
qcom,rtherm-at-25degc = <68000>;
qcom,beta-coefficient = <3450>;
};
skin_temp {
qcom,rbias = <33000>;
qcom,rtherm-at-25degc = <68000>;
qcom,beta-coefficient = <3450>;
};
die_temp {
qcom,scale = <(-1032)>;
qcom,offset = <344125>;
};
batt_i {
qcom,channel = <3>;
qcom,scale = <20000000>;
};
batt_v {
qcom,scale = <5000000>;
};
input_i {
qcom,scale = <14285714>;
};
input_v {
qcom,scale = <25000000>;
};
otg_i {
qcom,scale = <5714286>;
};
};
};
};
&mdss_mdp { &mdss_mdp {
qcom,mdss-pref-prim-intf = "dsi"; qcom,mdss-pref-prim-intf = "dsi";
}; };

62
arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon-cdp.dtsi
View file

@ -205,68 +205,6 @@
}; };
}; };
&i2c_7 {
status = "okay";
qcom,smb138x@8 {
compatible = "qcom,i2c-pmic";
reg = <0x8>;
#address-cells = <2>;
#size-cells = <0>;
interrupt-parent = <&spmi_bus>;
interrupts = <0x0 0xd1 0x0 IRQ_TYPE_LEVEL_LOW>;
interrupt_names = "smb138x";
interrupt-controller;
#interrupt-cells = <3>;
qcom,periph-map = <0x10 0x11 0x12 0x13 0x14 0x16 0x36>;
smb138x_tadc: qcom,tadc@3600 {
compatible = "qcom,tadc";
reg = <0x3600 0x100>;
interrupts = <0x36 0x0 IRQ_TYPE_EDGE_BOTH>;
interrupt-names = "eoc";
batt_therm {
qcom,rbias = <68100>;
qcom,rtherm-at-25degc = <68000>;
qcom,beta-coefficient = <3450>;
};
skin_temp {
qcom,rbias = <33000>;
qcom,rtherm-at-25degc = <68000>;
qcom,beta-coefficient = <3450>;
};
die_temp {
qcom,scale = <(-1032)>;
qcom,offset = <344125>;
};
batt_i {
qcom,channel = <3>;
qcom,scale = <20000000>;
};
batt_v {
qcom,scale = <5000000>;
};
input_i {
qcom,scale = <14285714>;
};
input_v {
qcom,scale = <25000000>;
};
otg_i {
qcom,scale = <5714286>;
};
};
};
};
&mdss_mdp { &mdss_mdp {
qcom,mdss-pref-prim-intf = "dsi"; qcom,mdss-pref-prim-intf = "dsi";
}; };

90
arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon-mtp.dtsi
View file

@ -206,96 +206,6 @@
}; };
}; };
&i2c_7 {
status = "okay";
qcom,smb138x@8 {
compatible = "qcom,i2c-pmic";
reg = <0x8>;
#address-cells = <2>;
#size-cells = <0>;
interrupt-parent = <&spmi_bus>;
interrupts = <0x0 0xd1 0x0 IRQ_TYPE_LEVEL_LOW>;
interrupt_names = "smb138x";
interrupt-controller;
#interrupt-cells = <3>;
qcom,periph-map = <0x10 0x11 0x12 0x13 0x14 0x16 0x36>;
smb138x_revid: qcom,revid@100 {
compatible = "qcom,qpnp-revid";
reg = <0x100 0x100>;
};
smb138x_tadc: qcom,tadc@3600 {
compatible = "qcom,tadc";
reg = <0x3600 0x100>;
#address-cells = <1>;
#size-cells = <0>;
#io-channel-cells = <1>;
interrupts = <0x36 0x0 IRQ_TYPE_EDGE_BOTH>;
interrupt-names = "eoc";
batt_temp@0 {
reg = <0>;
qcom,rbias = <68100>;
qcom,rtherm-at-25degc = <68000>;
qcom,beta-coefficient = <3450>;
};
skin_temp@1 {
reg = <1>;
qcom,rbias = <33000>;
qcom,rtherm-at-25degc = <68000>;
qcom,beta-coefficient = <3450>;
};
die_temp@2 {
reg = <2>;
qcom,scale = <(-1032)>;
qcom,offset = <344125>;
};
batt_i@3 {
reg = <3>;
qcom,channel = <3>;
qcom,scale = <20000000>;
};
batt_v@4 {
reg = <4>;
qcom,scale = <5000000>;
};
input_i@5 {
reg = <5>;
qcom,scale = <14285714>;
};
input_v@6 {
reg = <6>;
qcom,scale = <25000000>;
};
otg_i@7 {
reg = <7>;
qcom,scale = <5714286>;
};
};
smb138x_parallel_slave: qcom,smb138x-parallel-slave@1000 {
compatible = "qcom,smb138x-parallel-slave";
qcom,pmic-revid = <&smb138x_revid>;
reg = <0x1000 0x700>;
io-channels = <&smb138x_tadc 2>,
<&smb138x_tadc 12>,
<&smb138x_tadc 3>;
io-channel-names = "charger_temp",
"charger_temp_max",
"batt_i";
};
};
};
&mdss_hdmi_tx { &mdss_hdmi_tx {
pinctrl-names = "hdmi_hpd_active", "hdmi_ddc_active", "hdmi_cec_active", pinctrl-names = "hdmi_hpd_active", "hdmi_ddc_active", "hdmi_cec_active",
"hdmi_active", "hdmi_sleep"; "hdmi_active", "hdmi_sleep";

1
arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon.dtsi
View file

@ -3087,6 +3087,7 @@
#include "msm8998-blsp.dtsi" #include "msm8998-blsp.dtsi"
#include "msm-audio.dtsi" #include "msm-audio.dtsi"
#include "msmfalcon-audio.dtsi" #include "msmfalcon-audio.dtsi"
#include "msm-smb138x.dtsi"
/* GPU overrides */ /* GPU overrides */
&msm_gpu { &msm_gpu {

90
arch/arm/boot/dts/qcom/msm8998-mtp.dtsi
View file

@ -218,96 +218,6 @@
}; };
}; };
&i2c_7 {
status = "okay";
qcom,smb138x@8 {
compatible = "qcom,i2c-pmic";
reg = <0x8>;
#address-cells = <2>;
#size-cells = <0>;
interrupt-parent = <&spmi_bus>;
interrupts = <0x0 0xd1 0x0 IRQ_TYPE_LEVEL_LOW>;
interrupt_names = "smb138x";
interrupt-controller;
#interrupt-cells = <3>;
qcom,periph-map = <0x10 0x11 0x12 0x13 0x14 0x16 0x36>;
smb138x_revid: qcom,revid@100 {
compatible = "qcom,qpnp-revid";
reg = <0x100 0x100>;
};
smb138x_tadc: qcom,tadc@3600 {
compatible = "qcom,tadc";
reg = <0x3600 0x100>;
#address-cells = <1>;
#size-cells = <0>;
#io-channel-cells = <1>;
interrupts = <0x36 0x0 IRQ_TYPE_EDGE_BOTH>;
interrupt-names = "eoc";
batt_temp@0 {
reg = <0>;
qcom,rbias = <68100>;
qcom,rtherm-at-25degc = <68000>;
qcom,beta-coefficient = <3450>;
};
skin_temp@1 {
reg = <1>;
qcom,rbias = <33000>;
qcom,rtherm-at-25degc = <68000>;
qcom,beta-coefficient = <3450>;
};
die_temp@2 {
reg = <2>;
qcom,scale = <(-1032)>;
qcom,offset = <344125>;
};
batt_i@3 {
reg = <3>;
qcom,channel = <3>;
qcom,scale = <(-20000000)>;
};
batt_v@4 {
reg = <4>;
qcom,scale = <5000000>;
};
input_i@5 {
reg = <5>;
qcom,scale = <14285714>;
};
input_v@6 {
reg = <6>;
qcom,scale = <25000000>;
};
otg_i@7 {
reg = <7>;
qcom,scale = <5714286>;
};
};
smb138x_parallel_slave: qcom,smb138x-parallel-slave@1000 {
compatible = "qcom,smb138x-parallel-slave";
qcom,pmic-revid = <&smb138x_revid>;
reg = <0x1000 0x700>;
io-channels = <&smb138x_tadc 2>,
<&smb138x_tadc 12>,
<&smb138x_tadc 3>;
io-channel-names = "charger_temp",
"charger_temp_max",
"batt_i";
};
};
};
&mdss_hdmi_tx { &mdss_hdmi_tx {
pinctrl-names = "hdmi_hpd_active", "hdmi_ddc_active", "hdmi_cec_active", pinctrl-names = "hdmi_hpd_active", "hdmi_ddc_active", "hdmi_cec_active",
"hdmi_active", "hdmi_sleep"; "hdmi_active", "hdmi_sleep";

22
arch/arm/boot/dts/qcom/msm8998-qrd.dtsi
View file

@ -360,27 +360,6 @@
qcom,5v-boost-gpio = <&tlmm 51 0>; qcom,5v-boost-gpio = <&tlmm 51 0>;
}; };
&i2c_7 {
status = "okay";
qcom,smb138x@8 {
compatible = "qcom,i2c-pmic";
reg = <0x8>;
#address-cells = <2>;
#size-cells = <0>;
interrupt-parent = <&spmi_bus>;
interrupts = <0x0 0xd1 0x0 IRQ_TYPE_LEVEL_LOW>;
interrupt_names = "smb138x";
interrupt-controller;
#interrupt-cells = <3>;
qcom,periph-map = <0x10 0x11 0x12 0x13 0x14 0x16 0x36>;
smb138x_parallel_slave: qcom,smb138x-parallel-slave@1000 {
compatible = "qcom,smb138x-parallel-slave";
reg = <0x1000 0x700>;
};
};
};
&pmi8998_haptics { &pmi8998_haptics {
status = "okay"; status = "okay";
}; };
@ -607,4 +586,3 @@
/delete-property/ qcom,us-euro-gpios; /delete-property/ qcom,us-euro-gpios;
}; };
}; };

1
arch/arm/boot/dts/qcom/msm8998.dtsi
View file

@ -3200,3 +3200,4 @@
#include "msm-rdbg.dtsi" #include "msm-rdbg.dtsi"
#include "msm8998-blsp.dtsi" #include "msm8998-blsp.dtsi"
#include "msm8998-audio.dtsi" #include "msm8998-audio.dtsi"
#include "msm-smb138x.dtsi"