Commit ec5260f2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'zte-dt64-4.10' of...

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
parents da8cb304 392ce382
Loading
Loading
Loading
Loading
+24 −0
Original line number Diff line number Diff line
@@ -284,9 +284,33 @@ dma: dma-controller@1460000 {
			dma-requests = <32>;
		};

		lsp0crm: clock-controller@1420000 {
			compatible = "zte,zx296718-lsp0crm";
			reg = <0x01420000 0x1000>;
			#clock-cells = <1>;
		};

		lsp1crm: clock-controller@1430000 {
			compatible = "zte,zx296718-lsp1crm";
			reg = <0x01430000 0x1000>;
			#clock-cells = <1>;
		};

		topcrm: clock-controller@1461000 {
			compatible = "zte,zx296718-topcrm";
			reg = <0x01461000 0x1000>;
			#clock-cells = <1>;
		};

		sysctrl: sysctrl@1463000 {
			compatible = "zte,zx296718-sysctrl", "syscon";
			reg = <0x1463000 0x1000>;
		};

		audiocrm: clock-controller@1480000 {
			compatible = "zte,zx296718-audiocrm";
			reg = <0x01480000 0x1000>;
			#clock-cells = <1>;
		};
	};
};