Unverified Commit 3b364358 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-arm64-dt-for-v5.18' of... 

Merge tag 'amlogic-arm64-dt-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/dt

Amlogic ARM64 DT changes for v5.18:
- New Boards:
 - Amediatek X96-AIR (Amlogic S905X3)
 - CYX A95XF3-AIR (Amlogic S905X3)
 - Haochuangy H96-Max (Amlogic S905X3)
 - Amlogic AQ222 (Amlogic S4)
 - OSMC Vero 4K+ (Amlogic S905D)
- Initial support for Amlogic S4
- Support for uart_ao_b & pwm_f on G12 SoCs

* tag 'amlogic-arm64-dt-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: dts: meson: add support for OSMC Vero 4K+
  dt-bindings: arm: amlogic: add Vero 4K+ bindings
  dt-bindings: vendor-prefixes: add osmc prefix
  arm64: dts: meson-g12-common: add uart_ao_b pins muxing
  arm64: dts: meson-g12-common: add more pwm_f options
  arm64: dts: add support for S4 based Amlogic AQ222
  arm64: dts: meson: add initial device-tree for H96-Max
  dt-bindings: arm: amlogic: add H96-Max bindings
  dt-bindings: vendor-prefixes: add haochuangyi prefix
  arm64: dts: meson: add initial device-trees for A95XF3-AIR
  dt-bindings: arm: amlogic: add A95XF3-AIR bindings
  dt-bindings: vendor-prefixes: add cyx prefix
  arm64: dts: meson: add initial device-trees for X96-AIR
  dt-bindings: arm: amlogic: add X96-AIR bindings
  arm64: dts: meson: add common SM1 ac2xx dtsi
  arm64: dts: meson-sm1: add spdifin and pdifout nodes
  dt-bindings: arm: amlogic: add S4 based AQ222 bindings

Link: https://lore.kernel.org/r/a7cd9937-d441-3e1f-9709-8e80cc8814f1@baylibre.com


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

Documentation/devicetree/bindings/arm/amlogic.yaml

+12 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ properties: 
              - amlogic,p230

              - amlogic,p231

              - libretech,aml-s905d-pc

              - osmc,vero4k-plus

              - phicomm,n1

              - smartlabs,sml5442tw

              - videostrong,gxl-kii-pro
@@ -170,9 +171,14 @@ properties: 
      - description: Boards with the Amlogic Meson SM1 S905X3/D3/Y3 SoC

        items:

          - enum:

              - amediatech,x96-air

              - amediatech,x96-air-gbit

              - bananapi,bpi-m5

              - cyx,a95xf3-air

              - cyx,a95xf3-air-gbit

              - hardkernel,odroid-c4

              - hardkernel,odroid-hc4

              - haochuangyi,h96-max

              - khadas,vim3l

              - seirobotics,sei610

          - const: amlogic,sm1
@@ -183,6 +189,12 @@ properties: 
              - amlogic,ad401

          - const: amlogic,a1



      - description: Boards with the Amlogic Meson S4 S805X2 SoC

        items:

          - enum:

              - amlogic,aq222

          - const: amlogic,s4



additionalProperties: true



...

Documentation/devicetree/bindings/vendor-prefixes.yaml

+6 −0
Original line number Diff line number Diff line
@@ -285,6 +285,8 @@ patternProperties: 
    description: CUI Devices

  "^cypress,.*":

    description: Cypress Semiconductor Corporation

  "^cyx,.*":

    description: Shenzhen CYX Industrial Co., Ltd

  "^cznic,.*":

    description: CZ.NIC, z.s.p.o.

  "^dallas,.*":
@@ -491,6 +493,8 @@ patternProperties: 
    deprecated: true

  "^hannstar,.*":

    description: HannStar Display Corporation

  "^haochuangyi,.*":

    description: Shenzhen Haochuangyi Technology Co.,Ltd

  "^haoyu,.*":

    description: Haoyu Microelectronic Co. Ltd.

  "^hardkernel,.*":
@@ -896,6 +900,8 @@ patternProperties: 
    description: Ortus Technology Co., Ltd.

  "^osddisplays,.*":

    description: OSD Displays

  "^osmc,.*":

    description: Sam Nazarko Trading Ltd. (Open Source Media Centre)

  "^ouya,.*":

    description: Ouya Inc.

  "^overkiz,.*":

arch/arm64/boot/dts/amlogic/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p230.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-phicomm-n1.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-sml5442tw.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-vero4k-plus.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-p241.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-p281.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-tx3-mini.dtb
@@ -51,9 +52,15 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-libretech-pc.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-wetek-core2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-gbit.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-odroid-c4.dtb

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

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air-gbit.dtb

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

dtb-$(CONFIG_ARCH_MESON) += meson-s4-s805x2-aq222.dtb

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

+43 −0
Original line number Diff line number Diff line
@@ -839,6 +839,22 @@ mux { 
						};

					};



					pwm_f_z_pins: pwm-f-z {

						mux {

							groups = "pwm_f_z";

							function = "pwm_f";

							bias-disable;

						};

					};



					pwm_f_a_pins: pwm-f-a {

						mux {

							groups = "pwm_f_a";

							function = "pwm_f";

							bias-disable;

						};

					};



					pwm_f_x_pins: pwm-f-x {

						mux {

							groups = "pwm_f_x";
@@ -1881,6 +1897,33 @@ mux { 
						};

					};



					uart_ao_b_2_3_pins: uart-ao-b-2-3 {

						mux {

							groups = "uart_ao_b_tx_2",

								 "uart_ao_b_rx_3";

							function = "uart_ao_b";

							bias-disable;

						};

					};



					uart_ao_b_8_9_pins: uart-ao-b-8-9 {

						mux {

							groups = "uart_ao_b_tx_8",

								 "uart_ao_b_rx_9";

							function = "uart_ao_b";

							bias-disable;

						};

					};



					uart_ao_b_cts_rts_pins: uart-ao-b-cts-rts {

						mux {

							groups = "uart_ao_b_cts",

								 "uart_ao_b_rts";

							function = "uart_ao_b";

							bias-disable;

						};

					};



					pwm_a_e_pins: pwm-a-e {

						mux {

							groups = "pwm_a_e";

arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dts

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

/*

 * Author: Christian Hewitt <christianshewitt@gmail.com>

 */



/dts-v1/;



#include "meson-gxl-s905d.dtsi"

#include "meson-gx-p23x-q20x.dtsi"

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

#include <dt-bindings/leds/common.h>



/ {

	compatible = "osmc,vero4k-plus", "amlogic,s905d", "amlogic,meson-gxl";

	model = "OSMC Vero 4K Plus";



	gpio-keys-polled {

		compatible = "gpio-keys-polled";

		#address-cells = <1>;

		#size-cells = <0>;

		poll-interval = <20>;



		button@0 {

			label = "power";

			linux,code = <KEY_POWER>;

			gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;

		};

	};



	leds {

		compatible = "gpio-leds";



		led-standby {

			color = <LED_COLOR_ID_RED>;

			function = LED_FUNCTION_POWER;

			gpios = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_LOW>;

			default-state = "off";

			panic-indicator;

		};

	};

};



&ethmac {

	pinctrl-0 = <&eth_pins>;

	pinctrl-names = "default";



	phy-mode = "rgmii-txid";

	phy-handle = <&external_phy>;



	amlogic,tx-delay-ns = <0>;

};



&external_mdio {

	external_phy: ethernet-phy@0 {

		/* Realtek RTL8211F (0x001cc916) */

		pinctrl-0 = <&eth_phy_irq_pin>;

		pinctrl-names = "default";



		reg = <0>;

		max-speed = <1000>;



		reset-assert-us = <10000>;

		reset-deassert-us = <80000>;

		reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;



		interrupt-parent = <&gpio_intc>;

		interrupts = <25 IRQ_TYPE_LEVEL_LOW>;

	};

};



&pinctrl_periphs {

	/* Ensure the phy irq pin is properly configured as input */

	eth_phy_irq_pin: eth-phy-irq {

		mux {

			groups = "GPIOZ_15";

			function = "gpio_periphs";

			bias-disable;

			output-disable;

		};

	};

};



&sd_emmc_a {

	brcmf: wifi@1 {

		reg = <1>;

		compatible = "brcm,bcm4329-fmac";

	};

};



&uart_A {

	status = "okay";

	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;

	pinctrl-names = "default";

	uart-has-rtscts;



	bluetooth {

		compatible = "brcm,bcm43438-bt";

		shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;

		max-speed = <2000000>;

		clocks = <&wifi32k>;

		clock-names = "lpo";

	};

};



&usb {

	dr_mode = "host";

};



&usb2_phy0 {

	/* HDMI_5V also supplies the USB VBUS */

	phy-supply = <&hdmi_5v>;

};



&usb2_phy0 {

	/* HDMI_5V also supplies the USB VBUS */

	phy-supply = <&hdmi_5v>;

};