aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-11-30 17:20:47 -0500
committerArnd Bergmann <arnd@arndb.de>2016-11-30 17:20:47 -0500
commitec5260f26b986e4dd29494adab912cb9e7c32156 (patch)
tree4d25cd5ec0e8f83b3eaea81eca9361cb73d0b32c
parentda8cb3047ea0f68e88cbb228e741ce21123dd4fc (diff)
parent392ce382743b847eded4b40990de4e78a5eb494d (diff)
Merge tag 'zte-dt64-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt64
Pull "ZTE arm64 device tree update for 4.10" from Shawn Guo: Add clock controller device nodes, including one top clock controller, two low speed clock controllers and one audio clock controller. * tag 'zte-dt64-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: dts: zx: Add clock controller nodes
-rw-r--r--arch/arm64/boot/dts/zte/zx296718.dtsi24
1 files changed, 24 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/zte/zx296718.dtsi b/arch/arm64/boot/dts/zte/zx296718.dtsi
index a223066f24ce..7a1aed70dbc0 100644
--- a/arch/arm64/boot/dts/zte/zx296718.dtsi
+++ b/arch/arm64/boot/dts/zte/zx296718.dtsi
@@ -284,9 +284,33 @@
284 dma-requests = <32>; 284 dma-requests = <32>;
285 }; 285 };
286 286
287 lsp0crm: clock-controller@1420000 {
288 compatible = "zte,zx296718-lsp0crm";
289 reg = <0x01420000 0x1000>;
290 #clock-cells = <1>;
291 };
292
293 lsp1crm: clock-controller@1430000 {
294 compatible = "zte,zx296718-lsp1crm";
295 reg = <0x01430000 0x1000>;
296 #clock-cells = <1>;
297 };
298
299 topcrm: clock-controller@1461000 {
300 compatible = "zte,zx296718-topcrm";
301 reg = <0x01461000 0x1000>;
302 #clock-cells = <1>;
303 };
304
287 sysctrl: sysctrl@1463000 { 305 sysctrl: sysctrl@1463000 {
288 compatible = "zte,zx296718-sysctrl", "syscon"; 306 compatible = "zte,zx296718-sysctrl", "syscon";
289 reg = <0x1463000 0x1000>; 307 reg = <0x1463000 0x1000>;
290 }; 308 };
309
310 audiocrm: clock-controller@1480000 {
311 compatible = "zte,zx296718-audiocrm";
312 reg = <0x01480000 0x1000>;
313 #clock-cells = <1>;
314 };
291 }; 315 };
292}; 316};