summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-10-20 00:52:53 +0300
committerArnd Bergmann <arnd@arndb.de>2017-10-20 01:38:09 +0300
commit4167ca1e85e3f01f5583e9f8d60ab67935db4534 (patch)
treecdde9ca4cae6315b8d391d7ef2ebcc165b1c605d /Documentation
parentd2b85241a9f51c93aa8a29fc859dedee1fbb347f (diff)
parenta7ab4cb46902cd481d7def6869cf38a1e157f829 (diff)
downloadlinux-4167ca1e85e3f01f5583e9f8d60ab67935db4534.tar.xz
Merge tag 'hisi-arm64-dt-for-4.15' of git://github.com/hisilicon/linux-hisi into next/soc
ARM64: DT: Hisilicon SoC DT updates for 4.15 - Add CoreSight related nodes for hi6220 - Add GPIO line names for hikey960 - Rectify the GPIO line names of the Poplar board to keep consistency - Add thermal sensor binding doc and dt nodes for hi3660 * tag 'hisi-arm64-dt-for-4.15' of git://github.com/hisilicon/linux-hisi: arm64: dts: Register Hi3660's thermal sensor dt-bindings: Document the hi3660 thermal sensor binding arm64: dts: hisilicon: Standardize Poplar GPIO line names arm64: dts: hikey960: Update HiKey960 with GPIO line names arm64: dts: hi6220: add coresight dt nodes
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/thermal/hisilicon-thermal.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/thermal/hisilicon-thermal.txt b/Documentation/devicetree/bindings/thermal/hisilicon-thermal.txt
index d48fc5280d5a..cef716a236f1 100644
--- a/Documentation/devicetree/bindings/thermal/hisilicon-thermal.txt
+++ b/Documentation/devicetree/bindings/thermal/hisilicon-thermal.txt
@@ -13,6 +13,7 @@
Example :
+for Hi6220:
tsensor: tsensor@0,f7030700 {
compatible = "hisilicon,tsensor";
reg = <0x0 0xf7030700 0x0 0x1000>;
@@ -21,3 +22,11 @@ Example :
clock-names = "thermal_clk";
#thermal-sensor-cells = <1>;
}
+
+for Hi3660:
+ tsensor: tsensor@fff30000 {
+ compatible = "hisilicon,hi3660-tsensor";
+ reg = <0x0 0xfff30000 0x0 0x1000>;
+ interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
+ #thermal-sensor-cells = <1>;
+ };