diff options
| author | Arnd Bergmann | 2016-07-07 15:11:44 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2016-07-07 15:11:44 +0200 |
| commit | d561e2f1af05606124a3ab3291d9b4af671f0148 (patch) | |
| tree | 0463db5426a1325c227f3be8dbede7a36d939214 | |
| parent | Merge tag 'mvebu-dt64-4.8-1' of git://git.infradead.org/linux-mvebu into next... (diff) | |
| parent | ARM64: DTS: meson-gxbb: switch ethernet to real clock (diff) | |
| download | kernel-qcow2-linux-d561e2f1af05606124a3ab3291d9b4af671f0148.tar.gz kernel-qcow2-linux-d561e2f1af05606124a3ab3291d9b4af671f0148.tar.xz kernel-qcow2-linux-d561e2f1af05606124a3ab3291d9b4af671f0148.zip | |
Merge tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt64
Merge "Amlogic 64-bit DT updates" from Kevin Hilman:
- add RNG and new clock driver support
* tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
ARM64: DTS: meson-gxbb: switch ethernet to real clock
arm64: dts: gxbb clock controller
ARM64: dts: meson-gxbb: Add Hardware Random Generator node
dt-bindings: hwrng: Add Amlogic Meson Hardware Random Generator bindings
| -rw-r--r-- | Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt | 14 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 14 |
2 files changed, 27 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt b/Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt new file mode 100644 index 000000000000..202f2d09a23f --- /dev/null +++ b/Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt @@ -0,0 +1,14 @@ +Amlogic Meson Random number generator +===================================== + +Required properties: + +- compatible : should be "amlogic,meson-rng" +- reg : Specifies base physical address and size of the registers. + +Example: + +rng { + compatible = "amlogic,meson-rng"; + reg = <0x0 0xc8834000 0x0 0x4>; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index 063e3b679207..35c8b2beb05c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -45,6 +45,7 @@ #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/gpio/meson-gxbb-gpio.h> #include <dt-bindings/reset/amlogic,meson-gxbb-reset.h> +#include <dt-bindings/clock/gxbb-clkc.h> / { compatible = "amlogic,meson-gxbb"; @@ -221,6 +222,11 @@ #size-cells = <2>; ranges = <0x0 0x0 0x0 0xc8834000 0x0 0x2000>; + rng { + compatible = "amlogic,meson-rng"; + reg = <0x0 0x0 0x0 0x4>; + }; + pinctrl_periphs: pinctrl@4b0 { compatible = "amlogic,meson-gxbb-periphs-pinctrl"; #address-cells = <2>; @@ -310,6 +316,12 @@ #address-cells = <2>; #size-cells = <2>; ranges = <0x0 0x0 0x0 0xc883c000 0x0 0x2000>; + + clkc: clock-controller@0 { + compatible = "amlogic,gxbb-clkc"; + #clock-cells = <1>; + reg = <0x0 0x0 0x0 0x3db>; + }; }; apb: apb@d0000000 { @@ -326,7 +338,7 @@ 0x0 0xc8834540 0x0 0x4>; interrupts = <0 8 1>; interrupt-names = "macirq"; - clocks = <&xtal>; + clocks = <&clkc CLKID_ETH>; clock-names = "stmmaceth"; phy-mode = "rgmii"; status = "disabled"; |