Unverified Commit bcbe4bd3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Amlogic ARM64 DT changes for v5.15:
- nanoki-k2: enable bluetooth
- khadas vim & vim2: improve wifi

* tag 'amlogic-arm64-dt-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: dts: meson: improve gxm-khadas-vim2 wifi
  arm64: dts: meson: improve gxl-s905x-khadas-vim wifi
  arm64: dts: meson-gxbb: nanopi-k2: Enable Bluetooth

Link: https://lore.kernel.org/r/032895d9-62b6-6c9e-b04b-9c3d316f27ec@baylibre.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5f49f22d 4b526003

arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts

+12 −1
Original line number Diff line number Diff line
@@ -385,9 +385,20 @@ 


/* Bluetooth on AP6212 */

&uart_A {

	status = "disabled";

	status = "okay";

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

	pinctrl-names = "default";

	uart-has-rtscts;



	bluetooth {

		compatible = "brcm,bcm43438-bt";

		clocks = <&wifi_32k>;

		clock-names = "lpo";

		vbat-supply = <&vddio_ao3v3>;

		vddio-supply = <&vddio_ao18>;

		host-wakeup-gpios = <&gpio GPIOX_21 GPIO_ACTIVE_HIGH>;

		shutdown-gpios = <&gpio GPIOX_20 GPIO_ACTIVE_HIGH>;

	};

};



/* 40-pin CON1 */

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts

+2 −0
Original line number Diff line number Diff line
@@ -218,6 +218,8 @@ 
};



&sd_emmc_a {

	max-frequency = <100000000>;



	brcmf: wifi@1 {

		reg = <1>;

		compatible = "brcm,bcm4329-fmac";

arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts

+2 −1
Original line number Diff line number Diff line
@@ -307,7 +307,8 @@ 
	#size-cells = <0>;



	bus-width = <4>;

	max-frequency = <60000000>;

	cap-sd-highspeed;

	max-frequency = <100000000>;



	non-removable;

	disable-wp;