Unverified Commit 24ae5d24 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Amlogic ARM64 DT changes for v6.10:
- New Boards:
  - MNT Reform 2 CM4 adapter with a BPI-CM4 Module
  - AV400 (Amlogic A5)
  - BA400 (Amlogic A4)
- Initial Amlogic A4 & A5 support
- MIPI DSI support for G12A, G12B & SM1 SoCs
- Overlay for Khadas TS050 panel for the Khadas VIM3/VIM3L
- Amlogic T7 reset controller

* tag 'amlogic-arm64-dt-for-v6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: dts: amlogic: Add Amlogic T7 reset controller
  arm64: dts: add support for A5 based Amlogic AV400
  arm64: dts: add support for A4 based Amlogic BA400
  dt-bindings: serial: amlogic,meson-uart: Add compatible string for A4
  dt-bindings: arm: amlogic: add A5 support
  dt-bindings: arm: amlogic: add A4 support
  arm64: dts: meson: fix S4 power-controller node
  arm64: dts: amlogic: meson-g12b-bananapi-cm4: add support for MNT Reform2 with CM4 adaper
  arm64: meson: khadas-vim3l: add TS050 DSI panel overlay
  arm64: meson: g12-common: add the MIPI DSI nodes
  dt-bindings: arm: amlogic: Document the MNT Reform 2 CM4 adapter with a BPI-CM4 Module

Link: https://lore.kernel.org/r/6030a450-fb4e-4e27-a5c3-6f4e0f326d9a@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fec50db7 a42f2e9b

Documentation/devicetree/bindings/arm/amlogic.yaml

+13 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ properties: 
        items:

          - enum:

              - bananapi,bpi-cm4io

              - mntre,reform2-cm4

          - const: bananapi,bpi-cm4

          - const: amlogic,a311d

          - const: amlogic,g12b
@@ -201,6 +202,18 @@ properties: 
              - amlogic,ad402

          - const: amlogic,a1



      - description: Boards with the Amlogic A4 A113L2 SoC

        items:

          - enum:

              - amlogic,ba400

          - const: amlogic,a4



      - description: Boards with the Amlogic A5 A113X2 SoC

        items:

          - enum:

              - amlogic,av400

          - const: amlogic,a5



      - description: Boards with the Amlogic C3 C302X/C308L SoC

        items:

          - enum:

Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml

+3 −1
Original line number Diff line number Diff line
@@ -54,7 +54,9 @@ properties: 
          - const: amlogic,meson-gx-uart

      - description: UART controller on S4 compatible SoCs

        items:

          - const: amlogic,t7-uart

          - enum:

              - amlogic,a4-uart

              - amlogic,t7-uart

          - const: amlogic,meson-s4-uart



  reg:

arch/arm64/boot/dts/amlogic/Makefile

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

dtb-$(CONFIG_ARCH_MESON) += amlogic-a4-a113l2-ba400.dtb

dtb-$(CONFIG_ARCH_MESON) += amlogic-a5-a113x2-av400.dtb

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
@@ -16,7 +18,9 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-bananapi-m2s.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3-ts050.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-bananapi-cm4-cm4io.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-bananapi-cm4-mnt-reform2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb
@@ -76,6 +80,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-sm1-bananapi-m2-pro.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-bananapi-m5.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-h96-max.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l-ts050.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-s905d3-libretech-cc.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-c4.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-hc4.dtb
@@ -86,3 +91,5 @@ dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air.dtb 
# Overlays

meson-g12a-fbx8am-brcm-dtbs	:= meson-g12a-fbx8am.dtb meson-g12a-fbx8am-brcm.dtbo

meson-g12a-fbx8am-realtek-dtbs	:= meson-g12a-fbx8am.dtb meson-g12a-fbx8am-realtek.dtbo

meson-g12b-a311d-khadas-vim3-ts050-dtbs := meson-g12b-a311d-khadas-vim3.dtb meson-khadas-vim3-ts050.dtbo

meson-sm1-khadas-vim3l-ts050-dtbs	:= meson-sm1-khadas-vim3l.dtb meson-khadas-vim3-ts050.dtbo

arch/arm64/boot/dts/amlogic/amlogic-a4-a113l2-ba400.dts

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

/*

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

 */



/dts-v1/;



#include "amlogic-a4.dtsi"



/ {

	model = "Amlogic A113L2 ba400 Development Board";

	compatible = "amlogic,ba400", "amlogic,a4";

	interrupt-parent = <&gic>;

	#address-cells = <2>;

	#size-cells = <2>;



	aliases {

		serial0 = &uart_b;

	};



	memory@0 {

		device_type = "memory";

		reg = <0x0 0x0 0x0 0x40000000>;

	};



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		/* 10 MiB reserved for ARM Trusted Firmware */

		secmon_reserved: secmon@5000000 {

			compatible = "shared-dma-pool";

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

			no-map;

		};

	};

};



&uart_b {

	status = "okay";

};

arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi

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

/*

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

 */



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

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

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

/ {

	timer {

		compatible = "arm,armv8-timer";

		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;

	};



	psci {

		compatible = "arm,psci-1.0";

		method = "smc";

	};



	xtal: xtal-clk {

		compatible = "fixed-clock";

		clock-frequency = <24000000>;

		clock-output-names = "xtal";

		#clock-cells = <0>;

	};



	soc {

		compatible = "simple-bus";

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		gic: interrupt-controller@fff01000 {

			compatible = "arm,gic-400";

			reg = <0x0 0xfff01000 0 0x1000>,

			      <0x0 0xfff02000 0 0x2000>,

			      <0x0 0xfff04000 0 0x2000>,

			      <0x0 0xfff06000 0 0x2000>;

			#interrupt-cells = <3>;

			#address-cells = <0>;

			interrupt-controller;

			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;

		};



		apb: bus@fe000000 {

			compatible = "simple-bus";

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

			#address-cells = <2>;

			#size-cells = <2>;

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



			uart_b: serial@7a000 {

				compatible = "amlogic,a4-uart",

					     "amlogic,meson-s4-uart";

				reg = <0x0 0x7a000 0x0 0x18>;

				interrupts = <GIC_SPI 169 IRQ_TYPE_EDGE_RISING>;

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

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

				status = "disabled";

			};

		};

	};

};