Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Content-Type: text/plain;
        charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.21\))
Subject: Re: [PATCH 7/9] MIPS: DTS: CI20: Enable support for WiFi / Bluetooth
From:   "H. Nikolaus Schaller" <hns@goldelico.com>
In-Reply-To: <20230604145642.200577-8-paul@crapouillou.net>
Date:   Thu, 15 Jun 2023 09:01:23 +0200
Cc:     Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
        Rob Herring <robh+dt@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Conor Dooley <conor+dt@kernel.org>, linux-mips@vger.kernel.org,
        devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
        list@opendingux.net
Content-Transfer-Encoding: quoted-printable
Message-Id: <0855AAAC-72E8-4A2D-8B30-C00986915AAB@goldelico.com>
References: <20230604145642.200577-1-paul@crapouillou.net>
 <20230604145642.200577-8-paul@crapouillou.net>
To:     Paul Cercueil <paul@crapouillou.net>
Precedence: bulk


> Am 04.06.2023 um 16:56 schrieb Paul Cercueil <paul@crapouillou.net>:
>=20
> Wire the WiFi/Bluetooth chip properly in the Device Tree.
>=20
> - Provide it with the correct regulators and clocks;
> - Change the MMC I/O bus to 1.8V which seems to be enough;
> - Change the MMC I/O bus frequency to 25 MHz as 50 MHz causes errors;
> - Fix the Bluetooth powerdown GPIO being inverted and add reset GPIO;
> - Convert host-wakeup-gpios to IRQ.
>=20
> With these changes, the WiFi works properly with the latest firmware
> provided by linux-firmware. The Bluetooth does not work very well =
here,
> as I cannot get my wireless keyboard to pair; but it does detect it, =
and
> it does see the key presses when I type the pairing code.
>=20
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
> ---
> arch/mips/boot/dts/ingenic/ci20.dts | 88 ++++++++++++++++++++++++-----
> 1 file changed, 73 insertions(+), 15 deletions(-)
>=20
> diff --git a/arch/mips/boot/dts/ingenic/ci20.dts =
b/arch/mips/boot/dts/ingenic/ci20.dts
> index bdbd064c90e1..cec0caa2350c 100644
> --- a/arch/mips/boot/dts/ingenic/ci20.dts
> +++ b/arch/mips/boot/dts/ingenic/ci20.dts
> @@ -97,10 +97,15 @@ ir: ir {
> 		gpios =3D <&gpe 3 GPIO_ACTIVE_LOW>;
> 	};
>=20
> -	wlan0_power: fixedregulator-1 {
> +	bt_power: fixedregulator-1 {
> 		compatible =3D "regulator-fixed";
>=20
> -		regulator-name =3D "wlan0_power";
> +		regulator-name =3D "bt_power";
> +		regulator-min-microvolt =3D <3300000>;
> +		regulator-max-microvolt =3D <3300000>;
> +		regulator-settling-time-us =3D <1400>;
> +
> +		vin-supply =3D <&vcc_50>;
>=20
> 		gpio =3D <&gpb 19 0>;
> 		enable-active-high;
> @@ -116,6 +121,40 @@ otg_power: fixedregulator-2 {
> 		gpio =3D <&gpf 15 0>;
> 		enable-active-high;
> 	};
> +
> +	wifi_power: fixedregulator-4 {
> +		compatible =3D "regulator-fixed";
> +
> +		regulator-name =3D "wifi_power";
> +
> +		/*
> +		 * Technically it's 5V, the WiFi chip has its own =
internal
> +		 * regulators; but the MMC/SD subsystem won't accept =
such a
> +		 * value.
> +		 */
> +		regulator-min-microvolt =3D <3300000>;
> +		regulator-max-microvolt =3D <3300000>;
> +		regulator-settling-time-us =3D <150000>;
> +
> +		vin-supply =3D <&bt_power>;
> +	};
> +
> +	vcc_33v: fixedregulator-5 {

why is this defined here? It is used earlier in [3/9] and not directly =
related to WiFi / Bluetooth

So please move into [3/9] or even before [3/9] as a separate patch.

> +		compatible =3D "regulator-fixed";
> +
> +		regulator-name =3D "vcc_33v";
> +		regulator-min-microvolt =3D <3300000>;
> +		regulator-max-microvolt =3D <3300000>;
> +		regulator-always-on;
> +	};
> +
> +	wifi_pwrseq: pwrseq {
> +		compatible =3D "mmc-pwrseq-simple";
> +		reset-gpios =3D <&gpf 7 GPIO_ACTIVE_LOW>;
> +
> +		clocks =3D <&rtc_dev>;
> +		clock-names =3D "ext_clock";
> +	};
> };
>=20
> &ext {
> @@ -161,24 +200,33 @@ &mmc0 {
> 	pinctrl-0 =3D <&pins_mmc0>;
>=20
> 	cd-gpios =3D <&gpf 20 GPIO_ACTIVE_LOW>;
> +	vmmc-supply =3D <&vcc_33v>;
> +	vqmmc-supply =3D <&vcc_33v>;
> };
>=20
> &mmc1 {
> 	status =3D "okay";
>=20
> 	bus-width =3D <4>;
> -	max-frequency =3D <50000000>;
> +	max-frequency =3D <25000000>;
> +	mmc-pwrseq =3D <&wifi_pwrseq>;
> +	vmmc-supply =3D <&wifi_power>;
> +	vqmmc-supply =3D <&wifi_io>;
> 	non-removable;
>=20
> 	pinctrl-names =3D "default";
> 	pinctrl-0 =3D <&pins_mmc1>;
>=20
> -	brcmf: wifi@1 {
> -/*		reg =3D <4>;*/
> -		compatible =3D "brcm,bcm4330-fmac";
> -		vcc-supply =3D <&wlan0_power>;
> -		device-wakeup-gpios =3D <&gpd 9 GPIO_ACTIVE_HIGH>;
> -		shutdown-gpios =3D <&gpf 7 GPIO_ACTIVE_LOW>;
> +	#address-cells =3D <1>;
> +	#size-cells =3D <0>;
> +
> +	wifi@1 {
> +		compatible =3D "brcm,bcm4329-fmac";
> +		reg =3D <1>;
> +
> +		interrupt-parent =3D <&gpd>;
> +		interrupts =3D <9 IRQ_TYPE_EDGE_FALLING>;
> +		interrupt-names =3D "host-wake";
> 	};
> };
>=20
> @@ -205,11 +253,20 @@ &uart2 {
>=20
> 	bluetooth {
> 		compatible =3D "brcm,bcm4330-bt";
> -		reset-gpios =3D <&gpf 8 GPIO_ACTIVE_HIGH>;
> -		vcc-supply =3D <&wlan0_power>;
> +
> +		vbat-supply =3D <&bt_power>;
> +		vddio-supply =3D <&wifi_io>;
> +
> +		interrupt-parent =3D <&gpf>;
> +		interrupts =3D <6 IRQ_TYPE_EDGE_RISING>;
> +		interrupt-names =3D "host-wakeup";
> +
> +		clocks =3D <&rtc_dev>;
> +		clock-names =3D "lpo";
> +
> +		reset-gpios =3D <&gpf 8 GPIO_ACTIVE_LOW>;
> 		device-wakeup-gpios =3D <&gpf 5 GPIO_ACTIVE_HIGH>;
> -		host-wakeup-gpios =3D <&gpf 6 GPIO_ACTIVE_HIGH>;
> -		shutdown-gpios =3D <&gpf 4 GPIO_ACTIVE_LOW>;
> +		shutdown-gpios =3D <&gpf 4 GPIO_ACTIVE_HIGH>;
> 	};
> };
>=20
> @@ -270,8 +327,9 @@ vcc_25: LDO5 {
> 				regulator-always-on;
> 			};
> 			wifi_io: LDO6 {
> -				regulator-min-microvolt =3D <2500000>;
> -				regulator-max-microvolt =3D <2500000>;
> +				regulator-min-microvolt =3D <1800000>;
> +				regulator-max-microvolt =3D <1800000>;
> +				regulator-settling-time-us =3D <150000>;
> 				inl-supply =3D <&vcc_33v>;
> 			};
> 			cim_io_28: LDO7 {
> --=20
> 2.39.2
>=20