Unverified Commit 9514e519 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Amlogic ARM DT changes for v6.4:
- adjust order of some compatibles
- meson8: add the xtal_32k_out pin
- meson8: add the SDXC_A pins
- mxiii-plus: Enable Bluetooth and WiFi support

* tag 'amlogic-arm-dt-for-v6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  ARM: dts: meson8m2: mxiii-plus: Enable Bluetooth and WiFi support
  ARM: dts: meson8: add the SDXC_A pins
  ARM: dts: meson8: add the xtal_32k_out pin
  arm: dts: meson: adjust order of some compatibles

Link: https://lore.kernel.org/r/eb1f32f8-822d-9cfc-fca6-9e044bf4a5ab@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 03216cdb 8446b84c

arch/arm/boot/dts/meson8.dtsi

+17 −0
Original line number Diff line number Diff line
@@ -506,6 +506,15 @@ mux { 
			};

		};



		sdxc_a_pins: sdxc-a {

			mux {

				groups = "sdxc_d0_a", "sdxc_d13_a",

					 "sdxc_clk_a", "sdxc_cmd_a";

				function = "sdxc_a";

				bias-pull-up;

			};

		};



		sdxc_b_pins: sdxc-b {

			mux {

				groups = "sdxc_d0_b", "sdxc_d13_b",
@@ -568,6 +577,14 @@ mux { 
				bias-disable;

			};

		};



		xtal_32k_out_pins: xtal-32k-out {

			mux {

				groups = "xtal_32k_out";

				function = "xtal";

				bias-disable;

			};

		};

	};

};

arch/arm/boot/dts/meson8b.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -580,8 +580,8 @@ &ethmac { 
};



&gpio_intc {

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

		     "amlogic,meson8b-gpio-intc";

	compatible = "amlogic,meson8b-gpio-intc",

		     "amlogic,meson-gpio-intc";

	status = "okay";

};

arch/arm/boot/dts/meson8m2-mxiii-plus.dts

+47 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ aliases { 
		ethernet0 = &ethmac;

		i2c0 = &i2c_AO;

		serial0 = &uart_AO;

		serial1 = &uart_A;

		mmc0 = &sd_card_slot;

	};
@@ -45,12 +44,32 @@ button-function { 
		};

	};



	sdio_pwrseq: sdio-pwrseq {

		compatible = "mmc-pwrseq-simple";



		pinctrl-0 = <&xtal_32k_out_pins>;

		pinctrl-names = "default";



		reset-gpios = <&gpio GPIOX_11 GPIO_ACTIVE_LOW>,

			      <&gpio_ao GPIOAO_6 GPIO_ACTIVE_LOW>;



		clocks = <&xtal_32k_out>;

		clock-names = "ext_clock";

	};



	vcc_3v3: regulator-vcc3v3 {

		compatible = "regulator-fixed";

		regulator-name = "VCC3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	xtal_32k_out: xtal-32k-out-clk {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <32768>;

		clock-output-names = "xtal_32k_out";

	};

};



&cpu0 {
@@ -192,6 +211,27 @@ &saradc { 
	vref-supply = <&vddio_ao1v8>;

};



/* SDIO wifi */

&sdhc {

	status = "okay";



	pinctrl-0 = <&sdxc_a_pins>;

	pinctrl-names = "default";



	bus-width = <4>;

	max-frequency = <50000000>;



	disable-wp;

	non-removable;

	cap-mmc-highspeed;

	cap-sd-highspeed;



	mmc-pwrseq = <&sdio_pwrseq>;



	vmmc-supply = <&vcc_3v3>;

	vqmmc-supply = <&vcc_3v3>;

};



&sdio {

	status = "okay";
@@ -222,6 +262,12 @@ &uart_A { 
	pinctrl-0 = <&uart_a1_pins>, <&uart_a1_cts_rts_pins>;

	pinctrl-names = "default";

	uart-has-rtscts;



	bluetooth {

		compatible = "brcm,bcm20702a1";

		shutdown-gpios = <&gpio GPIOX_20 GPIO_ACTIVE_HIGH>;

		max-speed = <2000000>;

	};

};



&uart_AO {