Commit b125eb0b authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Merge tag 'amlogic-dt64-2-redo' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt

arm64: dts: Amlogic updates for v4.21, round2

Highlights:
- fix IRQ trigger type
- AXG: enable GPIO IRQs, PHY IRQ, watchdog

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

:
  arm64: dts: meson: Fix IRQ trigger type for macirq
  arm64: dts: meson-axg: Enable GPIO interrupt controller
  arm64: dts: meson-axg: s400: Enable PHY interrupt
  arm64: dts: meson: add clock controller clock inputs
  dt-bindings: clk: meson: add main controller clock input
  dt-bindings: clk: meson: add ao controller clock inputs
  arm64: dts: meson-axg: remove alternate xtal
  arm64: dts: meson-axg: Enable watchdog on Meson AXG SoCs

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a323a513 8b3e6f89

Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt

+9 −1
Original line number Diff line number Diff line
@@ -11,6 +11,13 @@ Required Properties: 
	- GXM (S912) : "amlogic,meson-gxm-aoclkc"

	- AXG (A113D, A113X) : "amlogic,meson-axg-aoclkc"

	followed by the common "amlogic,meson-gx-aoclkc"

- clocks: list of clock phandle, one for each entry clock-names.

- clock-names: should contain the following:

  * "xtal"     : the platform xtal

  * "mpeg-clk" : the main clock controller mother clock (aka clk81)

  * "ext-32k-0"  : external 32kHz reference #0 if any (optional)

  * "ext-32k-1"  : external 32kHz reference #1 if any (optional - gx only)

  * "ext-32k-2"  : external 32kHz reference #2 if any (optional - gx only)



- #clock-cells: should be 1.
@@ -40,7 +47,8 @@ ao_sysctrl: sys-ctrl@0 { 
		compatible = "amlogic,meson-gxbb-aoclkc", "amlogic,meson-gx-aoclkc";

		#clock-cells = <1>;

		#reset-cells = <1>;

	};

		clocks = <&xtal>, <&clkc CLKID_CLK81>;

		clock-names = "xtal", "mpeg-clk";

	};



Example: UART controller node that consumes the clock and reset generated

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

+5 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ Required Properties: 
		"amlogic,gxbb-clkc" for GXBB SoC,

		"amlogic,gxl-clkc" for GXL and GXM SoC,

		"amlogic,axg-clkc" for AXG SoC.

- clocks : list of clock phandle, one for each entry clock-names.

- clock-names : should contain the following:

  * "xtal": the platform xtal



- #clock-cells: should be 1.
@@ -31,6 +34,8 @@ sysctrl: system-controller@0 { 
	clkc: clock-controller {

		#clock-cells = <1>;

		compatible = "amlogic,gxbb-clkc";

		clocks = <&xtal>;

		clock-names = "xtal";

	};

};

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

+2 −0
Original line number Diff line number Diff line
@@ -357,6 +357,8 @@ 
		eth_phy0: ethernet-phy@0 {

			/* Realtek RTL8211F (0x001cc916) */

			reg = <0>;

			interrupt-parent = <&gpio_intc>;

			interrupts = <98 IRQ_TYPE_LEVEL_LOW>;

			eee-broken-1000t;

		};

	};

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

+13 −10
Original line number Diff line number Diff line
@@ -53,13 +53,6 @@ 
		status = "disabled";

	};



	ao_alt_xtal: ao_alt_xtal-clk {

		compatible = "fixed-clock";

		clock-frequency = <32000000>;

		clock-output-names = "ao_alt_xtal";

		#clock-cells = <0>;

	};



	arm-pmu {

		compatible = "arm,cortex-a53-pmu";

		interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>,
@@ -173,7 +166,7 @@ 
			compatible = "amlogic,meson-axg-dwmac", "snps,dwmac";

			reg = <0x0 0xff3f0000 0x0 0x10000

			       0x0 0xff634540 0x0 0x8>;

			interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;

			interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "macirq";

			clocks = <&clkc CLKID_ETH>,

				 <&clkc CLKID_FCLK_DIV2>,
@@ -1089,6 +1082,8 @@ 
				clkc: clock-controller {

					compatible = "amlogic,axg-clkc";

					#clock-cells = <1>;

					clocks = <&xtal>;

					clock-names = "xtal";

				};

			};

		};
@@ -1334,6 +1329,8 @@ 
					compatible = "amlogic,meson-axg-aoclkc";

					#clock-cells = <1>;

					#reset-cells = <1>;

					clocks = <&xtal>, <&clkc CLKID_CLK81>;

					clock-names = "xtal", "mpeg-clk";

				};

			};
@@ -1543,12 +1540,18 @@ 
			};



			gpio_intc: interrupt-controller@f080 {

				compatible = "amlogic,meson-gpio-intc";

				compatible = "amlogic,meson-axg-gpio-intc",

					     "amlogic,meson-gpio-intc";

				reg = <0x0 0xf080 0x0 0x10>;

				interrupt-controller;

				#interrupt-cells = <2>;

				amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;

				status = "disabled";

			};



			watchdog@f0d0 {

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

				reg = <0x0 0xf0d0 0x0 0x10>;

				clocks = <&xtal>;

			};



			pwm_ab: pwm@1b000 {

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

+1 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ 
			compatible = "amlogic,meson-gx-dwmac", "amlogic,meson-gxbb-dwmac", "snps,dwmac";

			reg = <0x0 0xc9410000 0x0 0x10000

			       0x0 0xc8834540 0x0 0x4>;

			interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;

			interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "macirq";

			status = "disabled";

		};

CRA Git | Maintained and supported by SUSTech CRA and CCSE