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

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

Merge tag 'amlogic-dt64-2' of... 

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
parents 0df88121 f3abd629

Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
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>;

};

arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi

+13 −1
Original line number Diff line number Diff line
@@ -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";