Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d48614e authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'zte/soc' into next/soc

* zte/soc:
  ARM: zx: Add basic defconfig support for ZX296702
  ARM: dts: zx: add an initial zx296702 dts and doc
  clk: zx: add clock support to zx296702
  dt-bindings: Add #defines for ZTE ZX296702 clocks
parents 259f47eb 405817f6
Loading
Loading
Loading
Loading
+15 −0
Original line number Diff line number Diff line
ZTE platforms device tree bindings
---------------------------------------

-  ZX296702 board:
    Required root node properties:
      - compatible = "zte,zx296702-ad1", "zte,zx296702"

System management required properties:
      - compatible = "zte,sysctrl"

Low power management required properties:
      - compatible = "zte,zx296702-pcu"

Bus matrix required properties:
      - compatible = "zte,zx-bus-matrix"
+35 −0
Original line number Diff line number Diff line
Device Tree Clock bindings for ZTE zx296702

This binding uses the common clock binding[1].

[1] Documentation/devicetree/bindings/clock/clock-bindings.txt

Required properties:
- compatible : shall be one of the following:
	"zte,zx296702-topcrm-clk":
		zx296702 top clock selection, divider and gating

	"zte,zx296702-lsp0crpm-clk" and
	"zte,zx296702-lsp1crpm-clk":
		zx296702 device level clock selection and gating

- reg: Address and length of the register set

The clock consumer should specify the desired clock by having the clock
ID in its "clocks" phandle cell. See include/dt-bindings/clock/zx296702-clock.h
for the full list of zx296702 clock IDs.


topclk: topcrm@0x09800000 {
        compatible = "zte,zx296702-topcrm-clk";
        reg = <0x09800000 0x1000>;
        #clock-cells = <1>;
};

uart0: serial@0x09405000 {
        compatible = "zte,zx296702-uart";
        reg = <0x09405000 0x1000>;
        interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
        clocks = <&lsp1clk ZX296702_UART0_PCLK>;
        status = "disabled";
};
+1 −1
Original line number Diff line number Diff line
* ARM AMBA Primecell PL011 serial UART

Required properties:
- compatible: must be "arm,primecell", "arm,pl011"
- compatible: must be "arm,primecell", "arm,pl011", "zte,zx296702-uart"
- reg: exactly one register range with length 0x1000
- interrupts: exactly one interrupt specifier

+1 −0
Original line number Diff line number Diff line
@@ -211,3 +211,4 @@ xillybus Xillybus Ltd.
xlnx	Xilinx
zyxel	ZyXEL Communications Corp.
zarlink	Zarlink Semiconductor
zte	ZTE Corp.
+1 −0
Original line number Diff line number Diff line
@@ -660,6 +660,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
	mt6592-evb.dtb \
	mt8127-moose.dtb \
	mt8135-evbp1.dtb
dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb
endif

always		:= $(dtb-y)
Loading