[PATCH v1 0/5] Device tree and config updates for the Librem 5 devkit
The device tree updates ensure the A53 don't get powered off and fix a DT warning. This isn't testable with the arm64 default config unless we enable the rsi wifi modules too so do this as well.
While at that include two binding file updates.
This is against next-20230809 that include David's option,gtm601 conversion.
Guido Günther (5): dt-bindings: sound: gtm601: Add description dt-bindings: mmc: Fix reference to pwr-seq-simple arm64: dts: imx8mq-librem5-devkit: Mark buck2 as always on arm64: dts: imx8mq-librem5-devkit: Drop power-supply arm64: defconfig: Enable Redpine 91X wlan driver
.../devicetree/bindings/mmc/mmc-controller.yaml | 2 +- .../devicetree/bindings/sound/option,gtm601.yaml | 6 ++++-- .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 14 +++++--------- arch/arm64/configs/defconfig | 1 + 4 files changed, 11 insertions(+), 12 deletions(-)
This allows to us to document the channel and sampling rate requirements.
Signed-off-by: Guido Günther agx@sigxcpu.org --- Documentation/devicetree/bindings/sound/option,gtm601.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/option,gtm601.yaml b/Documentation/devicetree/bindings/sound/option,gtm601.yaml index 69c2ccc79dc5..ff813d97fc59 100644 --- a/Documentation/devicetree/bindings/sound/option,gtm601.yaml +++ b/Documentation/devicetree/bindings/sound/option,gtm601.yaml @@ -16,10 +16,12 @@ description: > properties: compatible: oneOf: - - items: # 48 kHz stereo + - description: Broadmobi BM818 (48Khz stereo) + items: - const: broadmobi,bm818 - const: option,gtm601 - - const: option,gtm601 # 8 kHz mono + - description: GTM601 (8kHz mono) + const: option,gtm601
'#sound-dai-cells': const: 0
On 09/08/2023 20:50, Guido Günther wrote:
This allows to us to document the channel and sampling rate requirements.
Signed-off-by: Guido Günther agx@sigxcpu.org
Thank you!
Reviewed-by: David Heidelberg david@ixit.cz
Documentation/devicetree/bindings/sound/option,gtm601.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
On Wed, Aug 09, 2023 at 08:50:10PM +0200, Guido Günther wrote:
This allows to us to document the channel and sampling rate requirements.
Signed-off-by: Guido Günther agx@sigxcpu.org
Documentation/devicetree/bindings/sound/option,gtm601.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/option,gtm601.yaml b/Documentation/devicetree/bindings/sound/option,gtm601.yaml index 69c2ccc79dc5..ff813d97fc59 100644 --- a/Documentation/devicetree/bindings/sound/option,gtm601.yaml +++ b/Documentation/devicetree/bindings/sound/option,gtm601.yaml @@ -16,10 +16,12 @@ description: > properties: compatible: oneOf:
- items: # 48 kHz stereo
- description: Broadmobi BM818 (48Khz stereo)items: - const: broadmobi,bm818 - const: option,gtm601
- const: option,gtm601 # 8 kHz mono
- description: GTM601 (8kHz mono)const: option,gtm601
Makes little odds IMO which way it is done. Acked-by: Conor Dooley conor.dooley@microchip.com
It's a YAML file nowadays.
Signed-off-by: Guido Günther agx@sigxcpu.org --- Documentation/devicetree/bindings/mmc/mmc-controller.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/mmc/mmc-controller.yaml b/Documentation/devicetree/bindings/mmc/mmc-controller.yaml index 86c73fd825fd..58ae298cd2fc 100644 --- a/Documentation/devicetree/bindings/mmc/mmc-controller.yaml +++ b/Documentation/devicetree/bindings/mmc/mmc-controller.yaml @@ -269,7 +269,7 @@ properties: post-power-on-delay-ms: description: It was invented for MMC pwrseq-simple which could be referred to - mmc-pwrseq-simple.txt. But now it's reused as a tunable delay + mmc-pwrseq-simple.yaml. But now it's reused as a tunable delay waiting for I/O signalling and card power supply to be stable, regardless of whether pwrseq-simple is used. Default to 10ms if no available.
On Wed, 9 Aug 2023 at 20:50, Guido Günther agx@sigxcpu.org wrote:
It's a YAML file nowadays.
Signed-off-by: Guido Günther agx@sigxcpu.org
Applied for next, thanks!
Kind regards Uffe
Documentation/devicetree/bindings/mmc/mmc-controller.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/mmc/mmc-controller.yaml b/Documentation/devicetree/bindings/mmc/mmc-controller.yaml index 86c73fd825fd..58ae298cd2fc 100644 --- a/Documentation/devicetree/bindings/mmc/mmc-controller.yaml +++ b/Documentation/devicetree/bindings/mmc/mmc-controller.yaml @@ -269,7 +269,7 @@ properties: post-power-on-delay-ms: description: It was invented for MMC pwrseq-simple which could be referred to
mmc-pwrseq-simple.txt. But now it\'s reused as a tunable delay
mmc-pwrseq-simple.yaml. But now it\'s reused as a tunable delay waiting for I/O signalling and card power supply to be stable, regardless of whether pwrseq-simple is used. Default to 10ms if no available.-- 2.40.1
Otherwise the A53 cores are shut down which doesn't end well.
Reported-by: David Heidelberg david@ixit.cz Tested-by: David Heidelberg david@ixit.cz Signed-off-by: Guido Günther agx@sigxcpu.org --- arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts | 1 + 1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts b/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts index b3549eae6278..be9ef5c271df 100644 --- a/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts +++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts @@ -324,6 +324,7 @@ buck2_reg: BUCK2 { regulator-ramp-delay = <1250>; rohm,dvs-run-voltage = <1000000>; rohm,dvs-idle-voltage = <900000>; + regulator-always-on; };
buck3_reg: BUCK3 {
Use a power sequence instead. As this handles the wifi disable line rename the pincontrol accordingly. This also makes it similar to the Librem 5.
Resolves following warning:
arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dtb: mmc@30b50000: Unevaluated properties are not allowed ('power-supply' was unexpected) from schema $id: http://devicetree.org/schemas/mmc/fsl-imx-esdhc.yaml#
Reported-by: David Heidelberg david@ixit.cz Signed-off-by: Guido Günther agx@sigxcpu.org --- .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts b/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts index be9ef5c271df..244075e2a599 100644 --- a/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts +++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts @@ -231,16 +231,11 @@ vibrator { vcc-supply = <®_3v3_p>; };
- wifi_pwr_en: regulator-wifi-en { - compatible = "regulator-fixed"; + wifi_pwrseq: pwrseq { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_wifi_pwr_en>; - regulator-name = "WIFI_EN"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - gpio = <&gpio3 5 GPIO_ACTIVE_HIGH>; - enable-active-high; - regulator-always-on; + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&gpio3 5 GPIO_ACTIVE_LOW>; }; };
@@ -1032,7 +1027,7 @@ &usdhc2 { pinctrl-2 = <&pinctrl_usdhc2_200mhz>; bus-width = <4>; vmmc-supply = <®_usdhc2_vmmc>; - power-supply = <&wifi_pwr_en>; + mmc-pwrseq = <&wifi_pwrseq>; broken-cd; disable-wp; cap-sdio-irq;
-----Original Message----- From: Guido Günther agx@sigxcpu.org Sent: 2023年8月10日 2:50 To: Ulf Hansson ulf.hansson@linaro.org; Rob Herring robh+dt@kernel.org; Krzysztof Kozlowski krzysztof.kozlowski+dt@linaro.org; Conor Dooley conor+dt@kernel.org; Liam Girdwood lgirdwood@gmail.com; Mark Brown broonie@kernel.org; Shawn Guo shawnguo@kernel.org; Sascha Hauer s.hauer@pengutronix.de; Pengutronix Kernel Team kernel@pengutronix.de; Fabio Estevam festevam@gmail.com; dl-linux- imx linux-imx@nxp.com; Catalin Marinas catalin.marinas@arm.com; Will Deacon will@kernel.org; Guido Günther agx@sigxcpu.org; Peng Fan peng.fan@nxp.com; Bjorn Andersson quic_bjorande@quicinc.com; Arnd Bergmann arnd@arndb.de; Geert Uytterhoeven geert+renesas@glider.be; Konrad Dybcio konrad.dybcio@linaro.org; Nícolas F. R. A. Prado nfraprado@collabora.com; Rafał Miłecki rafal@milecki.pl; kernel@puri.sm; linux-mmc@vger.kernel.org; devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; alsa-devel@alsa- project.org; linux-arm-kernel@lists.infradead.org; David Heidelberg david@ixit.cz Subject: [PATCH v1 4/5] arm64: dts: imx8mq-librem5-devkit: Drop power- supply
Use a power sequence instead. As this handles the wifi disable line rename the pincontrol accordingly. This also makes it similar to the Librem 5.
Resolves following warning:
arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dtb: mmc@30b50000: Unevaluated properties are not allowed ('power-supply' was unexpected) from schema $id: https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdevicet ree.org%2Fschemas%2Fmmc%2Ffsl-imx- esdhc.yaml%23&data=05%7C01%7Csherry.sun%40nxp.com%7Cfefefef5326f 4205167c08db990988d7%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0 %7C638272038447289369%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLj AwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C% 7C%7C&sdata=EpcdsbWNkU0%2FuYBx9tHlw9qoSo87XneMNxOHw5Z4%2FFA %3D&reserved=0
Reported-by: David Heidelberg david@ixit.cz Signed-off-by: Guido Günther agx@sigxcpu.org
.../boot/dts/freescale/imx8mq-librem5-devkit.dts | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts b/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts index be9ef5c271df..244075e2a599 100644 --- a/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts +++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts @@ -231,16 +231,11 @@ vibrator { vcc-supply = <®_3v3_p>; };
- wifi_pwr_en: regulator-wifi-en {
compatible = "regulator-fixed";
- wifi_pwrseq: pwrseq { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_wifi_pwr_en>;
regulator-name = "WIFI_EN";regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;gpio = <&gpio3 5 GPIO_ACTIVE_HIGH>;enable-active-high;regulator-always-on;
compatible = "mmc-pwrseq-simple";reset-gpios = <&gpio3 5 GPIO_ACTIVE_LOW>;};
@@ -1032,7 +1027,7 @@ &usdhc2 { pinctrl-2 = <&pinctrl_usdhc2_200mhz>; bus-width = <4>; vmmc-supply = <®_usdhc2_vmmc>;
- power-supply = <&wifi_pwr_en>;
- mmc-pwrseq = <&wifi_pwrseq>;
Hi Guido,
Normally we should use vmmc-supply to control the M.2 pin56(W_DISABLE1#), which controls the WLAN radio power. And use the reset-gpios of mmc-pwrseq to control the M.2 pin23(SDIO_RESET#), it can independently reset the Wi-Fi radio.
Best Regards Sherry
The Librem 5 devkit has it connected via SDIO.
Signed-off-by: Guido Günther agx@sigxcpu.org --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index bf13d5c46578..21ab69a3cf4b 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -414,6 +414,7 @@ CONFIG_MWIFIEX=m CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_PCIE=m CONFIG_MT7921E=m +CONFIG_RSI_91X=m CONFIG_WL18XX=m CONFIG_WLCORE_SDIO=m CONFIG_WWAN=m
On Wed, 09 Aug 2023 20:50:09 +0200, Guido Günther wrote:
The device tree updates ensure the A53 don't get powered off and fix a DT warning. This isn't testable with the arm64 default config unless we enable the rsi wifi modules too so do this as well.
While at that include two binding file updates.
This is against next-20230809 that include David's option,gtm601 conversion.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/5] dt-bindings: sound: gtm601: Add description commit: 6870f41033d839fa72195fd2dd37f902b37ea62b
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
participants (6)
-
Conor Dooley -
David Heidelberg -
Guido Günther -
Mark Brown -
Sherry Sun -
Ulf Hansson