Unverified Commit 8b86fc33 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Amlogic ARM64 DT changes for v5.19:
- DTS makefile alpsa sort
- align SPI NOR node name with dtschema
- add support for S4 power domain, gpio_intc, pinctrl
- updates and fixes for JetHub D1/H1 boards

* tag 'amlogic-arm64-dt-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: dts: meson: alpa sort the board Makefile
  arm64: dts: meson: align SPI NOR node name with dtschema
  arm64: dts: add support for S4 power domain controller
  arm64: dts: meson-s4: add gpio_intc node
  arm64: dts: meson-s4: add pinctrl node
  arm64: meson: update WiFi SDIO in dts for JetHub D1
  arm64: meson: update SDIO voltage in dts for JetHub D1
  arm64: meson: dts: update serial alias in dts for JetHub D1
  arm64: meson: add dts bluetooth node for JetHub H1

Link: https://lore.kernel.org/r/1e5179ab-2d92-0d64-c57b-e002ec2f0806@baylibre.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 97736c2e 456733fe

arch/arm64/boot/dts/amlogic/Makefile

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

dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.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-s400.dtb

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-khadas-vim3.dtb

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

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

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

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

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

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

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

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-s922x-khadas-vim3.dtb

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

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

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb
@@ -19,29 +20,29 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-p200.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-p201.dtb

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

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-meta.dtb

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

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-telos.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-hub.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-play2.dtb

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

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

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

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-s805x-p241.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-libretech-pc.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

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-jethome-jethub-j80.dtb

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-gxl-s905w-jethome-jethub-j80.dtb

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

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

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.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-gxm-khadas-vim2.dtb

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

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-minix-neo-u9h.dtb
@@ -52,15 +53,14 @@ 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-s4-s805x2-aq222.dtb

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

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

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

+12 −4
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
	model = "JetHome JetHub J100";

	aliases {

		serial0 = &uart_AO;   /* Console */

		serial1 = &uart_AO_B; /* External UART (Wireless Module) */

		serial2 = &uart_AO_B; /* External UART (Wireless Module) */

		ethernet0 = &ethmac;

	};
@@ -81,6 +81,15 @@ 
	vddio_boot: regulator-vddio_boot {

		compatible = "regulator-fixed";

		regulator-name = "VDDIO_BOOT";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vddao_3v3>;

		regulator-always-on;

	};



	vccq_1v8: regulator-vccq_1v8 {

		compatible = "regulator-fixed";

		regulator-name = "VCCQ_1V8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		vin-supply = <&vddao_3v3>;
@@ -248,8 +257,7 @@ 


	bus-width = <4>;

	cap-sd-highspeed;

	sd-uhs-sdr104;

	max-frequency = <200000000>;

	max-frequency = <50000000>;

	non-removable;

	disable-wp;
@@ -282,7 +290,7 @@ 
	mmc-pwrseq = <&emmc_pwrseq>;



	vmmc-supply = <&vcc_3v3>;

	vqmmc-supply = <&vddio_boot>;

	vqmmc-supply = <&vccq_1v8>;

};



/* UART Bluetooth */

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

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ 
	pinctrl-names = "default";

	status = "okay";



	gd25lq128: spi-flash@0 {

	gd25lq128: flash@0 {

		compatible = "jedec,spi-nor";

		#address-cells = <1>;

		#size-cells = <1>;

arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ 
	pinctrl-0 = <&nor_pins>;

	pinctrl-names = "default";



	w25q32: spi-flash@0 {

	w25q32: flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "jedec,spi-nor";

arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts

+6 −0
Original line number Diff line number Diff line
@@ -213,6 +213,12 @@ 
	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;

	pinctrl-names = "default";

	uart-has-rtscts;



	bluetooth {

		compatible = "realtek,rtl8822cs-bt";

		enable-gpios  = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;

		host-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;

       };

};



&uart_C {