Commit 981053c0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-dt64' of... 

Merge tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt

arm64: dts: amlogic updates for v5.9
- meson-gx: Switch to the meson-ee-pwrc bindings
- add Khadas MCU nodes

* tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  arm64: dts: amlogic: Add the Ethernet "timing-adjustment" clock
  arm64: dts: meson-gx: Switch to the meson-ee-pwrc bindings
  arm64: dts: meson-khadas-vim3: add Khadas MCU nodes

Link: https://lore.kernel.org/r/7h8sfif2na.fsf@baylibre.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a0660529 32b5f4b6

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

+4 −2
Original line number Diff line number Diff line
@@ -181,8 +181,10 @@ ethmac: ethernet@ff3f0000 { 
			interrupt-names = "macirq";

			clocks = <&clkc CLKID_ETH>,

				 <&clkc CLKID_FCLK_DIV2>,

				 <&clkc CLKID_MPLL2>;

			clock-names = "stmmaceth", "clkin0", "clkin1";

				 <&clkc CLKID_MPLL2>,

				 <&clkc CLKID_FCLK_DIV2>;

			clock-names = "stmmaceth", "clkin0", "clkin1",

				      "timing-adjustment";

			rx-fifo-depth = <4096>;

			tx-fifo-depth = <2048>;

			status = "disabled";

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -185,8 +185,10 @@ ethmac: ethernet@ff3f0000 { 
			interrupt-names = "macirq";

			clocks = <&clkc CLKID_ETH>,

				 <&clkc CLKID_FCLK_DIV2>,

				 <&clkc CLKID_MPLL2>;

			clock-names = "stmmaceth", "clkin0", "clkin1";

				 <&clkc CLKID_MPLL2>,

				 <&clkc CLKID_FCLK_DIV2>;

			clock-names = "stmmaceth", "clkin0", "clkin1",

				      "timing-adjustment";

			rx-fifo-depth = <4096>;

			tx-fifo-depth = <2048>;

			status = "disabled";

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

+10 −8
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/power/meson-gxbb-power.h>

#include <dt-bindings/thermal/thermal.h>



/ {
@@ -60,7 +61,7 @@ simplefb_cvbs: framebuffer-cvbs { 
			compatible = "amlogic,simple-framebuffer",

				     "simple-framebuffer";

			amlogic,pipeline = "vpu-cvbs";

			power-domains = <&pwrc_vpu>;

			power-domains = <&pwrc PWRC_GXBB_VPU_ID>;

			status = "disabled";

		};
@@ -68,7 +69,7 @@ simplefb_hdmi: framebuffer-hdmi { 
			compatible = "amlogic,simple-framebuffer",

				     "simple-framebuffer";

			amlogic,pipeline = "vpu-hdmi";

			power-domains = <&pwrc_vpu>;

			power-domains = <&pwrc PWRC_GXBB_VPU_ID>;

			status = "disabled";

		};

	};
@@ -438,12 +439,6 @@ sysctrl_AO: sys-ctrl@0 { 
				compatible = "amlogic,meson-gx-ao-sysctrl", "simple-mfd", "syscon";

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



				pwrc_vpu: power-controller-vpu {

					compatible = "amlogic,meson-gx-pwrc-vpu";

					#power-domain-cells = <0>;

					amlogic,hhi-sysctrl = <&sysctrl>;

				};



				clkc_AO: clock-controller {

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

					#clock-cells = <1>;
@@ -552,6 +547,12 @@ hiubus: bus@c883c000 { 
			sysctrl: system-controller@0 {

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

				reg = <0 0 0 0x400>;



				pwrc: power-controller {

					compatible = "amlogic,meson-gxbb-pwrc";

					#power-domain-cells = <1>;

					amlogic,ao-sysctrl = <&sysctrl_AO>;

				};

			};



			mailbox: mailbox@404 {
@@ -574,6 +575,7 @@ ethmac: ethernet@c9410000 { 
			interrupt-names = "macirq";

			rx-fifo-depth = <4096>;

			tx-fifo-depth = <2048>;

			power-domains = <&pwrc PWRC_GXBB_ETHERNET_MEM_ID>;

			status = "disabled";

		};

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

+8 −4
Original line number Diff line number Diff line
@@ -333,8 +333,9 @@ &efuse { 
&ethmac {

	clocks = <&clkc CLKID_ETH>,

		 <&clkc CLKID_FCLK_DIV2>,

		 <&clkc CLKID_MPLL2>;

	clock-names = "stmmaceth", "clkin0", "clkin1";

		 <&clkc CLKID_MPLL2>,

		 <&clkc CLKID_FCLK_DIV2>;

	clock-names = "stmmaceth", "clkin0", "clkin1", "timing-adjustment";

};



&gpio_intc {
@@ -747,7 +748,7 @@ mux { 
	};

};



&pwrc_vpu {

&pwrc {

	resets = <&reset RESET_VIU>,

		 <&reset RESET_VENC>,

		 <&reset RESET_VCBUS>,
@@ -760,6 +761,9 @@ &pwrc_vpu { 
		 <&reset RESET_VDI6>,

		 <&reset RESET_VENCL>,

		 <&reset RESET_VID_LOCK>;

	reset-names = "viu", "venc", "vcbus", "bt656",

		      "dvin", "rdma", "venci", "vencp",

		      "vdac", "vdi6", "vencl", "vid_lock";

	clocks = <&clkc CLKID_VPU>,

	         <&clkc CLKID_VAPB>;

	clock-names = "vpu", "vapb";
@@ -866,7 +870,7 @@ &uart_C { 


&vpu {

	compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu";

	power-domains = <&pwrc_vpu>;

	power-domains = <&pwrc PWRC_GXBB_VPU_ID>;

};



&vdec {

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

+8 −4
Original line number Diff line number Diff line
@@ -131,8 +131,9 @@ &efuse { 
&ethmac {

	clocks = <&clkc CLKID_ETH>,

		 <&clkc CLKID_FCLK_DIV2>,

		 <&clkc CLKID_MPLL2>;

	clock-names = "stmmaceth", "clkin0", "clkin1";

		 <&clkc CLKID_MPLL2>,

		 <&clkc CLKID_FCLK_DIV2>;

	clock-names = "stmmaceth", "clkin0", "clkin1", "timing-adjustment";



	mdio0: mdio {

		#address-cells = <1>;
@@ -782,7 +783,7 @@ external_mdio: mdio@2009087f { 
	};

};



&pwrc_vpu {

&pwrc {

	resets = <&reset RESET_VIU>,

		 <&reset RESET_VENC>,

		 <&reset RESET_VCBUS>,
@@ -795,6 +796,9 @@ &pwrc_vpu { 
		 <&reset RESET_VDI6>,

		 <&reset RESET_VENCL>,

		 <&reset RESET_VID_LOCK>;

	reset-names = "viu", "venc", "vcbus", "bt656",

		      "dvin", "rdma", "venci", "vencp",

		      "vdac", "vdi6", "vencl", "vid_lock";

	clocks = <&clkc CLKID_VPU>,

	         <&clkc CLKID_VAPB>;

	clock-names = "vpu", "vapb";
@@ -901,7 +905,7 @@ &uart_C { 


&vpu {

	compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu";

	power-domains = <&pwrc_vpu>;

	power-domains = <&pwrc PWRC_GXBB_VPU_ID>;

};



&vdec {