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

Commit 1df29508 authored by Olof Johansson's avatar Olof Johansson
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

Amlogic 64-bit DT updates for v4.14, round 2
- clock updates w/dependencies on clock tree
- GPIO names updates

* tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic

:
  ARM64: dts: meson-gxl-libretech-cc: Add GPIO lines names
  ARM64: dts: meson-gx: Add AO CEC nodes
  ARM64: dts: meson-gx: update AO clkc to new bindings
  dt-bindings: clock: gxbb-aoclk: Add CEC 32k clock
  clk: meson: gxbb: Add sd_emmc clk0 clkids
  clk: meson-gxbb: expose almost every clock in the bindings
  clk: meson8b: expose every clock in the bindings
  clk: meson: gxbb: fix protection against undefined clks
  clk: meson: meson8b: fix protection against undefined clks
  dt-bindings: clock: meson8b: describe the embedded reset controller

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c78c4ec2 47884c5c

Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt

+8 −1
Original line number Diff line number Diff line
@@ -16,18 +16,25 @@ Required Properties: 
	   mapped region.



- #clock-cells: should be 1.

- #reset-cells: should be 1.



Each clock is assigned an identifier and client nodes can use this identifier

to specify the clock which they consume. All available clocks are defined as

preprocessor macros in the dt-bindings/clock/meson8b-clkc.h header and can be

used in device tree sources.



Similarly a preprocessor macro for each reset line is defined in

dt-bindings/reset/amlogic,meson8b-clkc-reset.h (which can be used from the

device tree sources).





Example: Clock controller node:



	clkc: clock-controller@c1104000 {

		#clock-cells = <1>;

		compatible = "amlogic,meson8b-clkc";

		reg = <0xc1108000 0x4>, <0xc1104000 0x460>;

		#clock-cells = <1>;

		#reset-cells = <1>;

	};

arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -121,6 +121,13 @@ 
	};

};



&cec_AO {

	status = "okay";

	pinctrl-0 = <&ao_cec_pins>;

	pinctrl-names = "default";

	hdmi-phandle = <&hdmi_tx>;

};



&cvbs_vdac_port {

	cvbs_vdac_out: endpoint {

		remote-endpoint = <&cvbs_connector_in>;

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

+15 −5
Original line number Diff line number Diff line
@@ -367,12 +367,22 @@ 
			#size-cells = <2>;

			ranges = <0x0 0x0 0x0 0xc8100000 0x0 0x100000>;



			clkc_AO: clock-controller@040 {

				compatible = "amlogic,gx-aoclkc", "amlogic,gxbb-aoclkc";

				reg = <0x0 0x00040 0x0 0x4>;

			sysctrl_AO: sys-ctrl@0 {

				compatible = "amlogic,meson-gx-ao-sysctrl", "syscon", "simple-mfd";

				reg =  <0x0 0x0 0x0 0x100>;



				clkc_AO: clock-controller {

					compatible = "amlogic,meson-gx-aoclkc";

					#clock-cells = <1>;

					#reset-cells = <1>;

				};

			};



			cec_AO: cec@100 {

				compatible = "amlogic,meson-gx-ao-cec";

				reg = <0x0 0x00100 0x0 0x14>;

				interrupts = <GIC_SPI 199 IRQ_TYPE_EDGE_RISING>;

			};



			sec_AO: ao-secure@140 {

				compatible = "amlogic,meson-gx-ao-secure", "syscon";

arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts

+7 −0
Original line number Diff line number Diff line
@@ -171,6 +171,13 @@ 
	};

};



&cec_AO {

	status = "okay";

	pinctrl-0 = <&ao_cec_pins>;

	pinctrl-names = "default";

	hdmi-phandle = <&hdmi_tx>;

};



&ethmac {

	status = "okay";

	pinctrl-0 = <&eth_rmii_pins>;

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

+7 −0
Original line number Diff line number Diff line
@@ -151,6 +151,13 @@ 
	};

};



&cec_AO {

	status = "okay";

	pinctrl-0 = <&ao_cec_pins>;

	pinctrl-names = "default";

	hdmi-phandle = <&hdmi_tx>;

};



&cvbs_vdac_port {

	cvbs_vdac_out: endpoint {

		remote-endpoint = <&cvbs_connector_in>;