Unverified Commit 57af7d51 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-arm64-dt-for-v6.6' of... 

Merge tag 'amlogic-arm64-dt-for-v6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/dt

Amlogic ARM64 DT changes for v6.6:
- Add initial support for A311D2
- Add AN400 board
- Add gpio_intc, power domain for C3 SoC
- Again some DT bindings fixes & cleanups

* tag 'amlogic-arm64-dt-for-v6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: dts: amlogic: drop cooling-[min|max]-state from pwm-fan
  arm64: dts: amlogic: meson-g12-common: change aobus-pinctrl node name
  arm64: dts: amlogic: meson-g12b-odroid-n2: fix usb hub hog name
  arm64: dts: amlogic: drop redundant status=okay in sound nodes
  arm64: dts: amlogic: meson-g12b-bananapi: switch to enable-gpios
  arm64: dts: add support for C3 power domain controller
  arm64: dts: Add gpio_intc node and pinctrl node for Amlogic C3 SoCs
  arm64: dts: add board AN400
  dt-bindings: arm: amlogic: add board AN400
  arm64: dts: amlogic: minor whitespace cleanup around '='
  arm64: dts: amlogic-t7-a311d2-khadas-vim4: add initial device-tree
  dt-bindings: arm: amlogic: add Amlogic A311D2 bindings

Link: https://lore.kernel.org/r/d5f95654-ebcd-bd37-02f9-840e50b17e44@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2fec3234 cf4befdc

Documentation/devicetree/bindings/arm/amlogic.yaml

+8 −0
Original line number Diff line number Diff line
@@ -218,6 +218,14 @@ properties: 
              - amlogic,aq222

          - const: amlogic,s4



      - description: Boards with the Amlogic T7 A311D2 SoC

        items:

          - enum:

              - amlogic,an400

              - khadas,vim4

          - const: amlogic,a311d2

          - const: amlogic,t7



additionalProperties: true



...

arch/arm64/boot/dts/amlogic/Makefile

+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

dtb-$(CONFIG_ARCH_MESON) += amlogic-c3-c302x-aw409.dtb

dtb-$(CONFIG_ARCH_MESON) += amlogic-t7-a311d2-an400.dtb

dtb-$(CONFIG_ARCH_MESON) += amlogic-t7-a311d2-khadas-vim4.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-a1-ad401.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j100.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j110-rev-2.dtb

arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi

+35 −0
Original line number Diff line number Diff line
@@ -47,6 +47,15 @@ xtal: xtal-clk { 
		#clock-cells = <0>;

	};



	sm: secure-monitor {

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



		pwrc: power-controller {

			compatible = "amlogic,c3-pwrc";

			#power-domain-cells = <1>;

		};

	};



	soc {

		compatible = "simple-bus";

		#address-cells = <2>;
@@ -72,6 +81,32 @@ apb4: bus@fe000000 { 
			#size-cells = <2>;

			ranges = <0x0 0x0 0x0 0xfe000000 0x0 0x480000>;



			periphs_pinctrl: pinctrl@4000 {

				compatible = "amlogic,c3-periphs-pinctrl";

				#address-cells = <2>;

				#size-cells = <2>;

				ranges;



				gpio: bank@4000 {

					reg = <0x0 0x4000 0x0 0x004c>,

					      <0x0 0x4100 0x0 0x01de>;

					reg-names = "mux", "gpio";

					gpio-controller;

					#gpio-cells = <2>;

					gpio-ranges = <&periphs_pinctrl 0 0 55>;

				};

			};



			gpio_intc: interrupt-controller@4080 {

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

					     "amlogic,c3-gpio-intc";

				reg = <0x0 0x4080 0x0 0x0020>;

				interrupt-controller;

				#interrupt-cells = <2>;

				amlogic,channel-interrupts =

					<10 11 12 13 14 15 16 17 18 19 20 21>;

			};



			uart_b: serial@7a000 {

				compatible = "amlogic,meson-s4-uart",

					   "amlogic,meson-ao-uart";

arch/arm64/boot/dts/amlogic/amlogic-t7-a311d2-an400.dts

0 → 100644
+39 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * Copyright (c) 2023 Amlogic, Inc. All rights reserved.

 */



/dts-v1/;



#include "amlogic-t7.dtsi"



/ {

	model = "Amlogic A311D2 AN400 Development Board";

	compatible = "amlogic,an400", "amlogic,a311d2", "amlogic,t7";

	interrupt-parent = <&gic>;

	#address-cells = <2>;

	#size-cells = <2>;



	aliases {

		serial0 = &uart_a;

	};



	memory@0 {

		device_type = "memory";

		reg = <0x00000000 0x00000000 0x00000000 0xE0000000

			0x00000001 0x00000000 0x00000000 0x20000000>;

	};



	xtal: xtal-clk {

		compatible = "fixed-clock";

		clock-frequency = <24000000>;

		clock-output-names = "xtal";

		#clock-cells = <0>;

	};

};



&uart_a {

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

	clock-names = "xtal", "pclk", "baud";

	status = "okay";

};

arch/arm64/boot/dts/amlogic/amlogic-t7-a311d2-khadas-vim4.dts

0 → 100644
+54 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * Copyright (c) 2022 Wesion, Inc. All rights reserved.

 */



/dts-v1/;



#include "amlogic-t7.dtsi"



/ {

	model = "Khadas vim4";

	compatible = "khadas,vim4", "amlogic,a311d2", "amlogic,t7";



	aliases {

		serial0 = &uart_a;

	};



	memory@0 {

		device_type = "memory";

		reg = <0x0 0x0 0x2 0x0>; /* 8 GB */

	};



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		/* 3 MiB reserved for ARM Trusted Firmware (BL31) */

		secmon_reserved: secmon@5000000 {

			reg = <0x0 0x05000000 0x0 0x300000>;

			no-map;

		};



		/* 32 MiB reserved for ARM Trusted Firmware (BL32) */

		secmon_reserved_bl32: secmon@5300000 {

			reg = <0x0 0x05300000 0x0 0x2000000>;

			no-map;

		};

	};



	xtal: xtal-clk {

		compatible = "fixed-clock";

		clock-frequency = <24000000>;

		clock-output-names = "xtal";

		#clock-cells = <0>;

	};



};



&uart_a {

	status = "okay";

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

	clock-names = "xtal", "pclk", "baud";

};