From patchwork Wed Feb 15 17:31:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H. Nikolaus Schaller" X-Patchwork-Id: 653801 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20C82C636CC for ; Wed, 15 Feb 2023 17:35:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229981AbjBORfE (ORCPT ); Wed, 15 Feb 2023 12:35:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229756AbjBORfD (ORCPT ); Wed, 15 Feb 2023 12:35:03 -0500 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.82]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89D882D49 for ; Wed, 15 Feb 2023 09:35:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676482320; cv=none; d=strato.com; s=strato-dkim-0002; b=HQvqT92bUalYDEXcdWaXhiyY/rvg7K6sYAq3GVh1o6qml7ccm1TDu4Fkgts0OKwncU iNcLQpB83UwJj7eMv4smMaZPsipNrCyaQVxvPKAr4l3JtpbcnrELKVIegvvGpXf36+yz 2DWVq0EblirVEPw5LNMm/2O8ts7IfttqQBUKtY2dsZqIxBAhJOoe5SyeD3Iy8vtMN4ji 4nwDBCDgBBezsvOiRXrlDiN5unaVC4bNvZJvU2I3HTwa4itX2CAiVJqIB01Jh6t6+pHu Vun2RCCOwEtRp2AdJ7xtlfAiZKEPVfbI9u0ZA0VLIWqAU5TKisiZQ8tn0unMY6ZIz0xj D4WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1676482320; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=POPnc3DgxELJpdHFCNQYcK/7farU8e90UR7vp24J0Pg=; b=TAmr9DJ/o8yHciZS3o5KhVX84JFKJaPtcukPskoj7HXZdZETNrZeDBtNzTQGmtQtOb KH84QspR2JVoQkgdd9w3FL4pSQHrKmDjU9rWKAs5gALevIo7Ze7giJYrlHaWU3hzVMnR Z7mkmuAL5mRvjRhG3vWC0uf7MTH/SwjT4fiujRhTY0AB0oL21uPiB/XclnRYw+Zz+w/4 yDIxiNQ9c0NuFZbbPZBLt6GHI2vDvRL+GGgMbClB4SDeJywIE2oyeYzg0MjpTw8C2+UJ cZJ5t9B06+AkUjSDQ46VkXuSFjiKrGnFNKpGUNoqH6HS5p5wHdzOp5pTqZUZz5DL+O8h hJIA== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1676482320; s=strato-dkim-0002; d=goldelico.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=POPnc3DgxELJpdHFCNQYcK/7farU8e90UR7vp24J0Pg=; b=tFwpzl5lxKyU4IxiJvVMotxkgk3/0CIATG7/ooLO/fwa0cAleNrsK6cS8xrNIehBa7 egEYhBlVTMdy7u8twWdXBwvtnSSSZoTCFSSF4K0+bGIiib6FUykjs0ElCe32aM9c7Ugm rKptTEv6qpb0byvfBTADkx4qOfma2p70+vI9nWLoVEI1Xx9UGo81KdVx6H2yu9YqbNqv 9E2TINqxDnZmyYk7TVFz5OODD1qg+UhI2f8SZPJqGEbuw7eirrY4WGeDFElzXj4LN1C+ W80+0M7vf90rlD45xFD32BZ3AwpjjQofr30xMlzccCAz2DH+Twoe5V2ZMRlcTdJwlL3u pv8A== X-RZG-AUTH: ":JGIXVUS7cutRB/49FwqZ7WcJeFKiMhflhwDubTJ9o1iTDUhfN4hi3qVZrWLJ" Received: from iMac.fritz.box by smtp.strato.de (RZmta 49.3.0 DYNA|AUTH) with ESMTPSA id 326d57z1FHW0ZCP (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Wed, 15 Feb 2023 18:32:00 +0100 (CET) From: "H. Nikolaus Schaller" To: Paul Cercueil , Rob Herring , Krzysztof Kozlowski , Thomas Bogendoerfer , Arnd Bergmann , Srinivas Kandagatla , =?utf-8?b?UmFmYcWC?= =?utf-8?b?IE1pxYJlY2tp?= , Andrew Morton , Kees Cook , Matthias Brugger Cc: riccardo Mottola , paul@boddie.org.uk, linux-mips@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, letux-kernel@openphoenux.org, kernel@pyra-handheld.com, "H. Nikolaus Schaller" Subject: [RFC 1/3] MIPS: DTS: jz4780: add #clock-cells to rtc_dev Date: Wed, 15 Feb 2023 18:31:56 +0100 Message-Id: <77bcc96a2b81e42b32d48a041d7fac31e7240e56.1676482318.git.hns@goldelico.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This makes the driver present the clk32k signal if requested. It is needed to clock the PMU of the BCM4330 WiFi and Bluetooth module of the CI20 board. Signed-off-by: H. Nikolaus Schaller Reviewed-by: Paul Cercueil --- arch/mips/boot/dts/ingenic/jz4780.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/mips/boot/dts/ingenic/jz4780.dtsi b/arch/mips/boot/dts/ingenic/jz4780.dtsi index c182a656d63bc..18affff85ce38 100644 --- a/arch/mips/boot/dts/ingenic/jz4780.dtsi +++ b/arch/mips/boot/dts/ingenic/jz4780.dtsi @@ -155,6 +155,8 @@ rtc_dev: rtc@10003000 { clocks = <&cgu JZ4780_CLK_RTCLK>; clock-names = "rtc"; + + #clock-cells = <0>; }; pinctrl: pin-controller@10010000 { From patchwork Wed Feb 15 17:31:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H. Nikolaus Schaller" X-Patchwork-Id: 653803 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47475C636CC for ; Wed, 15 Feb 2023 17:32:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229917AbjBORcW (ORCPT ); Wed, 15 Feb 2023 12:32:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229797AbjBORcV (ORCPT ); Wed, 15 Feb 2023 12:32:21 -0500 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86C5244A3; Wed, 15 Feb 2023 09:32:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676482321; cv=none; d=strato.com; s=strato-dkim-0002; b=eoe67TwneMl/5/Tr/xoBlxst7yXuwE1u+Ibt8IaToVhkSnpCfVYUVDzgEy0WdBO1ls Q1rmxrK9PbbIJN5IPyQ9JvokvVTelcDeMvch0NljASk7jINp7mCH7NZjAVIliZChl+dv jyqpcVe0qAQcwIdG9csoIbj1S34efdiB48odYfGwbi2SgVQjpsV9+dS8pwhHI4XlurCi wKUUUESrrZqJRffTDg1d1XdRkEVA77/RyyrD6fL0/nbkJ9fdFUnhV1HTgQKo/u5RsMb4 9bUUFIx6zolQUQnw8q7QmCiGYTQKWZ607AbDc35HrnT9CUJer6bv+/TYIwgHf5mhBiM1 Sszw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1676482321; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=XW0+Qgb0myceiEMjaao1wM/4c+vauOGDaJPcYXWeNpY=; b=to/2qoEPvVNMKm4lNj1Y0CHDXtYUr8VjJgHJlDP8maxS2DCIEezZNM0O+BPx10Wg5W 7cQTyymIN6wTCWa/ri5Ww+mL8Z/zJ9BSkwq1OV708Kb9DoMGmjIVQn4+JH1pcTwRt/NW Se5fKO34E7WAoWEQV7qKjaYfFh4DlzBYqSLf9NH1kvUq6PEbMkYz49h3mqeCP3gJ8J3P r+rPAqIZjdW0GJzTButZE6PSXjy+HKzDLNebfIYo/MIwdxjz3T9xz9l3xT+FFSHswii6 qB8M3/UwmUlzM5QQ+d/evsYtMFP3q3RaWy5AJfdEw+TsCjaN3Vjq9Uqm++Y4xhgcMs0P XSgA== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1676482321; s=strato-dkim-0002; d=goldelico.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=XW0+Qgb0myceiEMjaao1wM/4c+vauOGDaJPcYXWeNpY=; b=EjjNBSCLDRCmFyY86H/68RbYMcYvBVCt+di/I/VNDo+ZdiU620ACs2N4rEDsifyHDb kN25Zj9L9v5EL6mQnb5QDgrW0m7F/O3GTogiUKOijZHOePqUuNK+2fEOjy3SvA/kA471 7qE9m7jNKA4z+F3wW0tiQFB8whNpMRxEe22LNBt6rcDq4JXVLRJC7HAwPXN8EpYDPGyW 7Bj++hieGlPS6zXRgG8SR5G2fnKE7U69szhN2GaNFsjuIbHikA00SnJ2H4ADXvUlTr+Z Q0yFjYotT/YlJXDfO2lkavL2j9mzvQw6CbxW3ilZIfTta+XKwA3kCulLV1RAtYdLz1QO s48Q== X-RZG-AUTH: ":JGIXVUS7cutRB/49FwqZ7WcJeFKiMhflhwDubTJ9o1iTDUhfN4hi3qVZrWLJ" Received: from iMac.fritz.box by smtp.strato.de (RZmta 49.3.0 DYNA|AUTH) with ESMTPSA id 326d57z1FHW0ZCQ (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Wed, 15 Feb 2023 18:32:00 +0100 (CET) From: "H. Nikolaus Schaller" To: Paul Cercueil , Rob Herring , Krzysztof Kozlowski , Thomas Bogendoerfer , Arnd Bergmann , Srinivas Kandagatla , =?utf-8?b?UmFmYcWC?= =?utf-8?b?IE1pxYJlY2tp?= , Andrew Morton , Kees Cook , Matthias Brugger Cc: riccardo Mottola , paul@boddie.org.uk, linux-mips@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, letux-kernel@openphoenux.org, kernel@pyra-handheld.com, "H. Nikolaus Schaller" Subject: [RFC 2/3] MIPS: DTS: CI20: fixes for WiFi/Bluetooth Date: Wed, 15 Feb 2023 18:31:57 +0100 Message-Id: <142872751b252b6028ea574593d53110d6e0c4a5.1676482318.git.hns@goldelico.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org CI20 has a BCM4330 based WiFi and Bluetooth module. - add proper power supply regulators - fix polarity of some GPIOs - add a simple pwrseq node for WiFi - reduce max-frequency for WiFi since 50 MHz seems not to work - add fixed regulators to activate the BT_WAKE and WL_WAKE gpios before the chip is powered up. This can not be done by the driver since it is not loaded if compiled as kernel module before the WiFi/BT module responds. - add clock chain from the external i2c rtc through the clk32k to the WiFi and Bluetooth module. Signed-off-by: H. Nikolaus Schaller --- arch/mips/boot/dts/ingenic/ci20.dts | 77 ++++++++++++++++++++++++----- 1 file changed, 65 insertions(+), 12 deletions(-) diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts index 8f21d2304737c..139507d8c26e3 100644 --- a/arch/mips/boot/dts/ingenic/ci20.dts +++ b/arch/mips/boot/dts/ingenic/ci20.dts @@ -97,13 +97,45 @@ ir: ir { gpios = <&gpe 3 GPIO_ACTIVE_LOW>; }; + /* WORKAROUND: Keeping WLAN wake high before power on. No simple driver fix */ + wlan0_wake: fixedregulator@4 { + compatible = "regulator-fixed"; + regulator-name = "wlan0_wake"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpd 9 GPIO_ACTIVE_HIGH>;/* WL_WAKE */ + enable-active-high; + regulator-always-on; + }; + + /* WORKAROUND: Keeping BT wake high before power on. No simple driver fix */ + bt_wake: fixedregulator@7 { + compatible = "regulator-fixed"; + regulator-name = "bt_wake"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpf 5 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + wlan0_pwrseq: wlan0_pwrseq { + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&gpf 7 GPIO_ACTIVE_LOW>; + clocks = <&rtc_dev>; + clock-names = "clk32k"; + post-power-on-delay-ms = <150>; + }; + wlan0_power: fixedregulator@1 { compatible = "regulator-fixed"; regulator-name = "wlan0_power"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; - gpio = <&gpb 19 GPIO_ACTIVE_LOW>; + gpio = <&gpb 19 GPIO_ACTIVE_HIGH>; enable-active-high; + regulator-always-on; }; otg_power: fixedregulator@2 { @@ -159,6 +191,9 @@ &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&pins_mmc0>; + vmmc-supply = <&vcc_33>; + vqmmc-supply = <&vcc_33>; /* VDDIOMSC */ + cd-gpios = <&gpf 20 GPIO_ACTIVE_LOW>; }; @@ -166,21 +201,34 @@ &mmc1 { status = "okay"; bus-width = <4>; - max-frequency = <50000000>; + max-frequency = <25000000>; non-removable; pinctrl-names = "default"; pinctrl-0 = <&pins_mmc1>; + vmmc-supply = <&wlan0_power>; + vqmmc-supply = <&wlan0_io>; + + mmc-pwrseq = <&wlan0_pwrseq>; + + #address-cells = <1>; + #size-cells = <0>; + brcmf: wifi@1 { -/* reg = <4>;*/ + reg = <1>; compatible = "brcm,bcm4330-fmac"; vcc-supply = <&wlan0_power>; - device-wakeup-gpios = <&gpd 9 GPIO_ACTIVE_HIGH>; - shutdown-gpios = <&gpf 7 GPIO_ACTIVE_LOW>; }; }; +&rtc_dev { + clocks = <&ext_rtc 0>, <&ext_rtc 0>; + clock-names = "rtc", "clk32k"; + + system-power-controller; +}; + &uart0 { status = "okay"; @@ -204,11 +252,16 @@ &uart2 { bluetooth { compatible = "brcm,bcm4330-bt"; - reset-gpios = <&gpf 8 GPIO_ACTIVE_HIGH>; - vcc-supply = <&wlan0_power>; - device-wakeup-gpios = <&gpf 5 GPIO_ACTIVE_HIGH>; - host-wakeup-gpios = <&gpf 6 GPIO_ACTIVE_HIGH>; - shutdown-gpios = <&gpf 4 GPIO_ACTIVE_LOW>; + vbat-supply = <&wlan0_power &bt_wake>; + vddio-supply = <&wlan0_power>; + max-speed = <115200>; /* stay with default data rate */ + brcm,bt-pcm-int-params = [01 02 00 01 01]; + shutdown-gpios = <&gpf 4 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpf 8 GPIO_ACTIVE_LOW>; + interrupt-parent = <&gpf>; + interrupts = <6 IRQ_TYPE_EDGE_FALLING>; + clocks = <&rtc_dev>; + clock-names = "clk32k"; }; }; @@ -270,7 +323,7 @@ vcc_25: LDO_REG5 { regulator-max-microvolt = <2500000>; regulator-always-on; }; - wifi_io: LDO_REG6 { + wlan0_io: LDO_REG6 { regulator-name = "LDO_REG6"; regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; @@ -344,7 +397,7 @@ &i2c4 { clock-frequency = <400000>; - rtc@51 { + ext_rtc: rtc@51 { compatible = "nxp,pcf8563"; reg = <0x51>;