Unverified Commit 837be1cc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Amlogic ARM64 DT changes for v6.4:
- set of DT bindings check fixes
- adjust order of some compatibles to match dt-schema migration
- add support for BananaPi M2S variants
- gxbb-kii-pro: add audio & bluetooth support
- meson-a1: add gpio_intc node
- gxl: use gxl mdio multiplexer
- Add initial support for BPI-CM4 module with BPI-CM4IO baseboard

* tag 'amlogic-arm64-dt-for-v6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: dts: amlogic: Add initial support for BPI-CM4 module with BPI-CM4IO baseboard
  dt-bindings: arm: amlogic: Document the boards with the BPI-CM4 connected
  arm64: dts: amlogic: gxl: use gxl mdio multiplexer
  arm64: dts: meson-a1: add gpio_intc node
  arm64: dts: meson: gxbb-kii-pro: add initial audio support
  arm64: dts: meson: gxbb-kii-pro: complete the bluetooth node
  arm64: dts: meson: gxbb-kii-pro: sort and tidy the dts
  arm64: dts: meson: adjust order of some compatibles
  arm64: dts: meson: add support for BananaPi M2S variants
  dt-bindings: arm: amlogic: add support for BananaPi M2S variants
  arm64: dts: amlogic: meson-gxm-s912-libretech-pc: remove unused pinctrl-names from phy node
  arm64: dts: amlogic: meson-sm1: use correct enable-gpios
  arm64: dts: amlogic: meson-s4: fix apb4 bus node name
  arm64: dts: amlogic: meson-g12b-odroid-go-ultra: rename keypad-gpio pinctrl node
  arm64: dts: amlogic: meson-g12b-radxa-zero2: fix pwm clock names
  arm64: dts: amlogic: meson-axg-jethome-jethub-j1xx: remove invalid #gpio-cells in onewire node
  arm64: dts: amlogic: meson-gxm-s912-libretech-pc: add simple connector node in fusb302 node
  arm64: dts: amlogic: meson-sm1-bananapi: correct usb-hub hog node name

Link: https://lore.kernel.org/r/1b955bb7-1a35-8d67-beb6-dd289533ff6f@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9514e519 0262f273

Documentation/devicetree/bindings/arm/amlogic.yaml

+10 −0
Original line number Diff line number Diff line
@@ -153,17 +153,27 @@ properties: 
      - description: Boards with the Amlogic Meson G12B A311D SoC

        items:

          - enum:

              - bananapi,bpi-m2s

              - khadas,vim3

              - radxa,zero2

          - const: amlogic,a311d

          - const: amlogic,g12b



      - description: Boards using the BPI-CM4 module with Amlogic Meson G12B A311D SoC

        items:

          - enum:

              - bananapi,bpi-cm4io

          - const: bananapi,bpi-cm4

          - const: amlogic,a311d

          - const: amlogic,g12b



      - description: Boards with the Amlogic Meson G12B S922X SoC

        items:

          - enum:

              - azw,gsking-x

              - azw,gtking

              - azw,gtking-pro

              - bananapi,bpi-m2s

              - hardkernel,odroid-go-ultra

              - hardkernel,odroid-n2

              - hardkernel,odroid-n2l

arch/arm64/boot/dts/amlogic/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -8,7 +8,9 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-radxa-zero.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb

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-bananapi-cm4-cm4io.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
@@ -17,6 +19,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2l.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb

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

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

dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb

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

+10 −0
Original line number Diff line number Diff line
@@ -125,6 +125,16 @@ uart_AO_B: serial@2000 { 
				clock-names = "xtal", "pclk", "baud";

				status = "disabled";

			};



			gpio_intc: interrupt-controller@0440 {

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

					     "amlogic,meson-gpio-intc";

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

				interrupt-controller;

				#interrupt-cells = <2>;

				amlogic,channel-interrupts =

					<49 50 51 52 53 54 55 56>;

			};

		};



		gic: interrupt-controller@ff901000 {

arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ map1 { 
	onewire {

		compatible = "w1-gpio";

		gpios = <&gpio GPIOA_14 GPIO_ACTIVE_HIGH>;

		#gpio-cells = <1>;

	};

};

arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts

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

/*

 * Copyright (c) 2023 Christian Hewitt <christianshewitt@gmail.com>

 */



/dts-v1/;



#include "meson-g12b-a311d.dtsi"

#include "meson-g12b-bananapi.dtsi"



/ {

	compatible = "bananapi,bpi-m2s", "amlogic,a311d", "amlogic,g12b";

	model = "BananaPi M2S";



	aliases {

		i2c0 = &i2c1;

		i2c1 = &i2c3;

	};

};



/* Camera (CSI) bus */

&i2c1 {

	status = "okay";

	pinctrl-0 = <&i2c1_sda_h6_pins>, <&i2c1_sck_h7_pins>;

	pinctrl-names = "default";

};



/* Display (DSI) bus */

&i2c3 {

	status = "okay";

	pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;

	pinctrl-names = "default";

};



&npu {

	status = "okay";

};