Commit aa1e345a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-dt64' of... 

Merge tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt

arm64: dts: amlogic updates for v5.13
- new boards: MeCool KII & KIII, Minix NEO U9-H
- used fixed index for MMC devices

* tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  arm64: dts: meson: add initial device-tree for MeCool KIII Pro
  arm64: dts: meson: add initial device-tree for MeCool KII Pro
  dt-bindings: arm: amlogic: add MeCool KII/KIII Pro bindings
  arm64: dts: amlogic: Assign a fixed index to mmc devices
  arm64: dts: meson: add initial device-tree for Minix NEO U9-H
  dt-bindings: arm: amlogic: add support for the Minix NEO U9-H

Link: https://lore.kernel.org/r/7h5z10mjpp.fsf@baylibre.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4b8cf906 727d93ed

Documentation/devicetree/bindings/arm/amlogic.yaml

+3 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ properties: 
              - libretech,aml-s905d-pc

              - phicomm,n1

              - smartlabs,sml5442tw

              - videostrong,gxl-kii-pro

          - const: amlogic,s905d

          - const: amlogic,meson-gxl
@@ -120,8 +121,10 @@ properties: 
              - khadas,vim2

              - kingnovel,r-box-pro

              - libretech,aml-s912-pc

              - minix,neo-u9h

              - nexbox,a1

              - tronsmart,vega-s96

              - videostrong,gxm-kiii-pro

              - wetek,core2

          - const: amlogic,s912

          - const: amlogic,meson-gxm

arch/arm64/boot/dts/amlogic/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-mecool-kii-pro.dtb

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
@@ -38,6 +39,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-p281.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-tx3-mini.dtb

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

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-khadas-vim2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-mecool-kiii-pro.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-minix-neo-u9h.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-nexbox-a1.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb

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

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,12 @@ / { 
	#address-cells = <2>;

	#size-cells = <2>;



	aliases {

		mmc0 = &sd_emmc_b; /* SD card */

		mmc1 = &sd_emmc_c; /* eMMC */

		mmc2 = &sd_emmc_a; /* SDIO */

	};



	chosen {

		#address-cells = <2>;

		#size-cells = <2>;

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

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ / { 
	#address-cells = <2>;

	#size-cells = <2>;



	aliases {

		mmc0 = &sd_emmc_b; /* SD card */

		mmc1 = &sd_emmc_c; /* eMMC */

		mmc2 = &sd_emmc_a; /* SDIO */

	};



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dts

0 → 100644
+86 −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 = "videostrong,gxl-kii-pro", "amlogic,s905d", "amlogic,meson-gxl";

	model = "MeCool KII Pro";



	adc-keys {

		compatible = "adc-keys";

		io-channels = <&saradc 0>;

		io-channel-names = "buttons";

		keyup-threshold-microvolt = <1710000>;



		button-function {

			label = "Update";

			linux,code = <KEY_VENDOR>;

			press-threshold-microvolt = <10000>;

		};

	};



	gpio-keys-polled {

		compatible = "gpio-keys-polled";

		#address-cells = <1>;

		#size-cells = <0>;

		poll-interval = <100>;



		button@0 {

			label = "power";

			linux,code = <KEY_POWER>;

			gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;

		};

	};



	leds {

		compatible = "gpio-leds";



		blue {

			color = <LED_COLOR_ID_BLUE>;

			function = LED_FUNCTION_POWER;

			gpios = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>;

			default-state = "on";

			panic-indicator;

		};

	};

};



&ethmac {

	phy-mode = "rmii";

	phy-handle = <&internal_phy>;

};



&ir {

	linux,rc-map-name = "rc-mecool-kii-pro";

};



&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";

	};

};