From patchwork Sun Jun 4 14:56:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 103026 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2188251vqr; Sun, 4 Jun 2023 08:16:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4indOWgaH+WgSyF/+9oOhJaCL0U0/r43K3urho6O9vQYm/6A57z9fWHJq4msc+eaCjRxQj X-Received: by 2002:a17:90a:1a0c:b0:259:154f:88b3 with SMTP id 12-20020a17090a1a0c00b00259154f88b3mr3250265pjk.24.1685891775777; Sun, 04 Jun 2023 08:16:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685891775; cv=none; d=google.com; s=arc-20160816; b=nbr6sUTUh/VtVkVoyF/3EFnJ2dVj4zEFIxjPwCmcqo2TW7Vq/Uykfm/8zYgqFqDE3r 80e5aHOhgIEc2zvGY20062dozMB5EYA+5EGZvefICkAR9/w26XSDbmPbHFfFfjvZp1TO Brur1pxwsO1bG2r8/3QFi7vzuohv9s9MMYoAoWj8SvDXNDQ4G43WY25kTyE7MIoXfAbT BPGFbEO3JX9BiOAFEl4YAI91nQweXatJ4LyXBy1rJdm4yPa2OiShVmzRCK7Hdv+IY7n/ rVOziSha+hMERW9TJI+cSV/CtPHp5D2kTyi8TnT+q1mRfNLvvDJN+IurnWuISL1lEZz5 4N4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ifqQeQGnnzV13/cFXnaYHZyXnfxZDj76WFVwrDE4Edg=; b=K/HZTyvKoKI/sQxgXedS5kC1+mW3jwBXBYLXXqeemfFmFoAmYVmWuo8ygEHeqB3LTd 2BDJ4TPrkEQ88llyPGkXxNXVLgO+RXLlojn6pG1Xn01Jf+oCjXMxejEoKk+PLkMnTBWs uHgGRSZvXlVErW6UzOcKxFCyN9ACQcGv6UAR04uRz/yAP8F0SNt1R1H4EnXOvwBq84k8 MH2CfVV4FKfZrCrR58Z2z8a+1W4WAtQSQrZvIB8CpDNTcx+w9MVr1kemzxtTu4eiM75O R3DjOFALeFgyLjuekEoC5j4EmVhy+nwkTECmIrFXs0E8AEpSyWF+AYVnNL3PONFc12ZH ri6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=oO7orWjt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j20-20020a637a54000000b0053efd7561e1si2331442pgn.287.2023.06.04.08.16.02; Sun, 04 Jun 2023 08:16:15 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=oO7orWjt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232125AbjFDO5G (ORCPT + 99 others); Sun, 4 Jun 2023 10:57:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232287AbjFDO5D (ORCPT ); Sun, 4 Jun 2023 10:57:03 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D735BE3; Sun, 4 Jun 2023 07:56:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1685890610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ifqQeQGnnzV13/cFXnaYHZyXnfxZDj76WFVwrDE4Edg=; b=oO7orWjt7QQ63CskpU2DxU6A80UhBTRt3YqOrZqqOtMJPOhN+vR8wV4Kcf8/9T/OIDzcV/ b0Gj4AkMcjnnf27WBNY8lJhZFpHahKJgpqZ7xm8IFrB/HZJdAVKC030nq2qkzwcBYTxtCt TqulaHg+Dv8DYvR/YJSMwiWhQucNQFY= From: Paul Cercueil To: Thomas Bogendoerfer , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: "H . Nikolaus Schaller" , linux-mips@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, list@opendingux.net, Paul Cercueil Subject: [PATCH 1/9] MIPS: DTS: CI20: Fix regulators Date: Sun, 4 Jun 2023 16:56:34 +0200 Message-Id: <20230604145642.200577-2-paul@crapouillou.net> In-Reply-To: <20230604145642.200577-1-paul@crapouillou.net> References: <20230604145642.200577-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam: Yes X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767785654394286541?= X-GMAIL-MSGID: =?utf-8?q?1767785654394286541?= The regulators don't have any "reg" property, and therefore shouldn't use an unit address in their node names. They also don't need to specify the GPIO_ACTIVE_LOW flag, which will be ignored anyway, as they are active-high. Signed-off-by: Paul Cercueil --- arch/mips/boot/dts/ingenic/ci20.dts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts index 239c4537484d..e76953dce2e7 100644 --- a/arch/mips/boot/dts/ingenic/ci20.dts +++ b/arch/mips/boot/dts/ingenic/ci20.dts @@ -67,14 +67,14 @@ led-3 { }; }; - eth0_power: fixedregulator@0 { + eth0_power: fixedregulator-0 { compatible = "regulator-fixed"; regulator-name = "eth0_power"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpio = <&gpb 25 GPIO_ACTIVE_LOW>; + gpio = <&gpb 25 0>; enable-active-high; }; @@ -97,23 +97,23 @@ ir: ir { gpios = <&gpe 3 GPIO_ACTIVE_LOW>; }; - wlan0_power: fixedregulator@1 { + wlan0_power: fixedregulator-1 { compatible = "regulator-fixed"; regulator-name = "wlan0_power"; - gpio = <&gpb 19 GPIO_ACTIVE_LOW>; + gpio = <&gpb 19 0>; enable-active-high; }; - otg_power: fixedregulator@2 { + otg_power: fixedregulator-2 { compatible = "regulator-fixed"; regulator-name = "otg_power"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&gpf 15 GPIO_ACTIVE_LOW>; + gpio = <&gpf 15 0>; enable-active-high; }; }; From patchwork Sun Jun 4 14:56:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 103023 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2185333vqr; Sun, 4 Jun 2023 08:10:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ762QonranVaIQFB3eaxHUhSx7pzZB6EXDhRnuCWDwGhIsTg4lMLe5JzVVtzXVDkHw76OJ5 X-Received: by 2002:a05:6a20:918f:b0:111:1bc4:cf0a with SMTP id v15-20020a056a20918f00b001111bc4cf0amr2316453pzd.52.1685891420124; Sun, 04 Jun 2023 08:10:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685891420; cv=none; d=google.com; s=arc-20160816; b=PNVmCqze+pPG16mSodcfQ/Z/98IHjUayOq6bJscuQV/Qxhcc/4NRdg4Soa/ikRlccY Ye7ZFH9nGhMBKbWSQslejY3k+2F+GQdtYQhKts093MCyD9me+BoIcuwekFwArkNh+EIU feMHoseUkP/b3xuDDenkHNMG1R6FqMVmwHxqt5wECsD3cTrUlsYGH9hEdSJIGx88mcGW wichxJqtSCKJLJFkHTSmq1oCRnFoqJAKWaf3Lq8Igl7hPmemcVV1/H7iCnnoXfPjcjbZ U0D6X37+st7q2zjKy7TbqCY89zN9d0eZj38kjn+3GNZulK6UBNIGrvF97IA1+B44Dscf m0Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bLUXA4878g/UvHVxmBNWXjGexK/P7B7yeTnDxDXg25A=; b=icAytFqCFqfGem7nH7ZrYZ79EeUNhe9bqMcB6tVVsTDV1AP9ASDrH7/nFlIOKZCZeh MbSgy+p+aDMekUIAliYb/oYkoPawuwvs9Cu+MnDh4UHadv9crxbkSuVydJg469vQ8YP5 YYCw6tLgL1zzF4d7AsDxvmyKTb4UsO3el/NEszsmPfoGEaPu89iVWpx8ejkfMuvjqI// 3FqBmpTnNxLFGqijL9dQ+Vs36uCS1uCd5F4s5PjP5VoBvEIeJYLhuePy1eAvjQI+zSuc VgQU+h0waMPD/WEaR9jJCwDQuq6a9Rafs6HA+Cft72ZQWpMUGEGLFH+zn1wE5B5F01++ EzBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=Qb9FfZl3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s190-20020a625ec7000000b0063b1fbbb8c5si3926919pfb.131.2023.06.04.08.10.05; Sun, 04 Jun 2023 08:10:20 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=Qb9FfZl3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231725AbjFDO5V (ORCPT + 99 others); Sun, 4 Jun 2023 10:57:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232390AbjFDO5O (ORCPT ); Sun, 4 Jun 2023 10:57:14 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6AFCF13A; Sun, 4 Jun 2023 07:57:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1685890612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bLUXA4878g/UvHVxmBNWXjGexK/P7B7yeTnDxDXg25A=; b=Qb9FfZl3AuPSaZOXRVqRm58S2lAknvCcydsyRNW9As6fkwTqqcnQ/I6+tmKFPmjEUGh/bo N6gtrqRr4mYjbXAEAnnRaope/woG5vjsNxyZZumWEHybiKPqZ0bqYMH1wMfawf8TKZ/BgC DBS8wXDhVAmc8uAUptU5H0Euw3E4NUY= From: Paul Cercueil To: Thomas Bogendoerfer , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: "H . Nikolaus Schaller" , linux-mips@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, list@opendingux.net, Paul Cercueil Subject: [PATCH 2/9] MIPS: DTS: CI20: Fix ACT8600 regulator node names Date: Sun, 4 Jun 2023 16:56:35 +0200 Message-Id: <20230604145642.200577-3-paul@crapouillou.net> In-Reply-To: <20230604145642.200577-1-paul@crapouillou.net> References: <20230604145642.200577-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam: Yes X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767785281498179392?= X-GMAIL-MSGID: =?utf-8?q?1767785281498179392?= The Device Tree was using invalid node names for the ACT8600 regulators. To be fair, it is not the original committer's fault, as the documentation did gives invalid names as well. In theory, the fix should have been to modify the driver to accept the alternative names. However, even though the act8865 driver spits warnings, the kernel seemed to work fine with what is currently supported upstream. For that reason, I think it is okay to just update the DTS. I removed the "regulator-name" too, since they really didn't bring any information. The node names are enough. Fixes: 73f2b940474d ("MIPS: CI20: DTS: Add I2C nodes") Signed-off-by: Paul Cercueil --- arch/mips/boot/dts/ingenic/ci20.dts | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts index e76953dce2e7..5361606c5e13 100644 --- a/arch/mips/boot/dts/ingenic/ci20.dts +++ b/arch/mips/boot/dts/ingenic/ci20.dts @@ -237,59 +237,49 @@ &i2c0 { act8600: act8600@5a { compatible = "active-semi,act8600"; reg = <0x5a>; - status = "okay"; regulators { - vddcore: SUDCDC1 { - regulator-name = "DCDC_REG1"; + vddcore: DCDC1 { regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; regulator-always-on; }; - vddmem: SUDCDC2 { - regulator-name = "DCDC_REG2"; + vddmem: DCDC2 { regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; regulator-always-on; }; - vcc_33: SUDCDC3 { - regulator-name = "DCDC_REG3"; + vcc_33: DCDC3 { regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - vcc_50: SUDCDC4 { - regulator-name = "SUDCDC_REG4"; + vcc_50: SUDCDC_REG4 { regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; regulator-always-on; }; - vcc_25: LDO_REG5 { - regulator-name = "LDO_REG5"; + vcc_25: LDO5 { regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; regulator-always-on; }; - wifi_io: LDO_REG6 { - regulator-name = "LDO_REG6"; + wifi_io: LDO6 { regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; regulator-always-on; }; - vcc_28: LDO_REG7 { - regulator-name = "LDO_REG7"; + cim_io_28: LDO7 { regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; regulator-always-on; }; - vcc_15: LDO_REG8 { - regulator-name = "LDO_REG8"; + cim_io_15: LDO8 { regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; regulator-always-on; }; vrtc_18: LDO_REG9 { - regulator-name = "LDO_REG9"; /* Despite the datasheet stating 3.3V * for REG9 and the driver expecting that, * REG9 outputs 1.8V. @@ -303,7 +293,6 @@ vrtc_18: LDO_REG9 { regulator-always-on; }; vcc_11: LDO_REG10 { - regulator-name = "LDO_REG10"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; regulator-always-on; From patchwork Sun Jun 4 14:56:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 103027 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2188331vqr; Sun, 4 Jun 2023 08:16:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4VfOoP8ULlkfdx9dsVYmk5ovsTfhvysiwWwxSa1goyFPfuIv3pv6JFvEKNNMlyKpvMnWGa X-Received: by 2002:a05:6a20:4308:b0:111:d03c:2bf9 with SMTP id h8-20020a056a20430800b00111d03c2bf9mr1742715pzk.12.1685891785009; Sun, 04 Jun 2023 08:16:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685891784; cv=none; d=google.com; s=arc-20160816; b=WrtsjQ4DeOXfC/gJR58oWnHAJNon4tRT0P2dTRo7TdigUtjj1JD3+d8DuqfNsouU/H xJR3BbEMNzhRpSEZFRjfOMzYDq074s/+2duvz2jKO6pt2fWYzPZXrdDRWRfaapyGPQHo dTEaH8xETjoG6j44v1GMRz4XMMoWkBYuSAVAYVijEgGMRb/1V6awVfHZ2zLeIKHfp32r OMYp167aeEQU1MNCoqfRDu6fCDoOPKI6txCHhy8TdKb0n2ucUvHcZ9RI13PNO15ugY7w QA2kv2ADQTG7WBE7e3NhTtpcpLvUG9dAuqZB2ARvjMXhn4uGcDYjyZG62Tex7wWxHB9n rX3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=3W42Iugh4TAiPO2bdw35V8IEIqh0OS862BtDx0iobKk=; b=IZ4w8GQdwtnJBe98W8mxIn8ba42Jwzd4ETmC/Wnpm4M1ACo8FJ02dOrmUGpJfcxhXr dn6wQqOsn44gQ11Yo28s69d12E4wGNPy7TPUGRGyc1QMNgfRF3jqvIv0GtQ7NSVzGEGD KBQFJtSjdAZPXTu7OOVxa3zC/xFxZhYDe9vrh0oNt20wAmlASNYAjxFR2OvwRxJmUotz ZE1gbiaAnmDwvGP2UxUt7CYpxYMo3nB9jlvSBf1ERmNs8tFsty3Uip4LLTN0Mi2XYrnn epmo0qgOvNNgvqPhZKXviycnKzk2lTMNk1RaasD0+QgeCsv0u0DKjBu4M52oLWnBngub eaEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=Sofx6Vb5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s28-20020a63525c000000b00534897a49a6si4046181pgl.294.2023.06.04.08.16.10; Sun, 04 Jun 2023 08:16:24 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=Sofx6Vb5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231614AbjFDO5f (ORCPT + 99 others); Sun, 4 Jun 2023 10:57:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232419AbjFDO53 (ORCPT ); Sun, 4 Jun 2023 10:57:29 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07B5CE5B; Sun, 4 Jun 2023 07:57:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1685890613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3W42Iugh4TAiPO2bdw35V8IEIqh0OS862BtDx0iobKk=; b=Sofx6Vb5UaCNOwpRNr+JjJpNtP+MI8al3NNmxo3Xs8O/Wi6bXmkfZH7wZMOO4YQsxk700Q DymLE5SdAG9zRUIUrJXGqwmeOWbejbvOADDxKS2z7fXm5xPbUxZqgFGysPULDoupIG31t6 9wegeyQSoo5rD1/DVCjTS6ilJZefBmw= From: Paul Cercueil To: Thomas Bogendoerfer , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: "H . Nikolaus Schaller" , linux-mips@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, list@opendingux.net, Paul Cercueil Subject: [PATCH 3/9] MIPS: DTS: CI20: Add parent supplies to ACT8600 regulators Date: Sun, 4 Jun 2023 16:56:36 +0200 Message-Id: <20230604145642.200577-4-paul@crapouillou.net> In-Reply-To: <20230604145642.200577-1-paul@crapouillou.net> References: <20230604145642.200577-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam: Yes X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767785664075251578?= X-GMAIL-MSGID: =?utf-8?q?1767785664075251578?= Provide parent regulators to the ACT8600 regulators that need one. Signed-off-by: Paul Cercueil --- arch/mips/boot/dts/ingenic/ci20.dts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts index 5361606c5e13..662796acda41 100644 --- a/arch/mips/boot/dts/ingenic/ci20.dts +++ b/arch/mips/boot/dts/ingenic/ci20.dts @@ -242,16 +242,19 @@ regulators { vddcore: DCDC1 { regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; + vp1-supply = <&vcc_33v>; regulator-always-on; }; vddmem: DCDC2 { regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; + vp2-supply = <&vcc_33v>; regulator-always-on; }; vcc_33: DCDC3 { regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + vp3-supply = <&vcc_33v>; regulator-always-on; }; vcc_50: SUDCDC_REG4 { @@ -262,21 +265,25 @@ vcc_50: SUDCDC_REG4 { vcc_25: LDO5 { regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; + inl-supply = <&vcc_33v>; regulator-always-on; }; wifi_io: LDO6 { regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; + inl-supply = <&vcc_33v>; regulator-always-on; }; cim_io_28: LDO7 { regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; + inl-supply = <&vcc_33v>; regulator-always-on; }; cim_io_15: LDO8 { regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; + inl-supply = <&vcc_33v>; regulator-always-on; }; vrtc_18: LDO_REG9 { From patchwork Sun Jun 4 14:56:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 103019 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2179675vqr; Sun, 4 Jun 2023 08:01:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ78ufH3YCBYVAa39T4rL587N2RhB3tbJXkkJqcl/Zpfp4sC+2eVXbMx1XPTykDnQrtU1Ba6 X-Received: by 2002:a05:6a20:394:b0:10f:1f0:9b43 with SMTP id 20-20020a056a20039400b0010f01f09b43mr3850074pzt.6.1685890896740; Sun, 04 Jun 2023 08:01:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685890896; cv=none; d=google.com; s=arc-20160816; b=FFFvmbM5IFvIzyL20tOlxfkcAm9/Mw+3u5s79vGI9nXL3i3nhj74jJjU6qZSHOldF+ 7GN+9CbPDZCbqDfpE+Z20jWmTCNtEk+faNvlbQwPHLWYMbkDtLSDAzygAIaDwUPd7Bqd 8Mlrcz7tX+XJx+K0DFGj3IyyLyadvbLiDtrvHJhIQWJ2vI+upOzRjmh0gMfetgTb+vM2 Ayy1BgyyK8lLjiJY/VOuU1sgTiyVkOxVDf531/RoNrExd30PDFilmXQliKjIgSWh+Sv0 rhtSd4mp37JuN8PfGn1KD25F1sDCIKzDZ6ZkwYmkrVvjXzaOWW28EZHZke7ZaVSUe++P m4yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=R034GfN4U7HHrFGjYKI1LuV6Myfk+MiHIp4yvLQp6ls=; b=flpnLxzvOlbP7TsUMXp+vH5DgvgY3kDbeeB/7La16r3dnCqBNa6BazJnUFKYRtlqbR XeCSH4BD/gy2FZLWhiu3t6Svp0k9V4K99Dkbcm14cPRzPG89rnk1/4bmZ9RSH3fNxJU7 es/nPQE3CrtREcwwuc3wXt+47H+QPM62WrWc61a3H/a1MoPsBZWGNU0gVKHc5n1p8byW mgfo2iBO97uuSOAGZa18gbRYYrp0d2eTL1l7nGDTcQGkN2RGGNWlpR5Ma+YzXX2uPrFu jyIWX/S65IvWQ5XqIVuMXwsP76i3YVA7N7mhkUhOlmmcKgPDniJmS3XdKpTuGs/Z5XTb 5hBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=EJiormvb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j13-20020a633c0d000000b0051b7b83d6b1si4236069pga.241.2023.06.04.08.01.24; Sun, 04 Jun 2023 08:01:36 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=EJiormvb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232154AbjFDO5r (ORCPT + 99 others); Sun, 4 Jun 2023 10:57:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232103AbjFDO5q (ORCPT ); Sun, 4 Jun 2023 10:57:46 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 962FACD; Sun, 4 Jun 2023 07:57:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1685890614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R034GfN4U7HHrFGjYKI1LuV6Myfk+MiHIp4yvLQp6ls=; b=EJiormvbwoebR/mX4UcvHhjtLJwqS77vQhF7PmPNrqIrX/nyHVfm3pUrkK47P24iAf2IV7 eb6/Z3f4XdMOcCMzAGUCCtjEhPcMN/u+J4eHUDzBorECQLhEweUG7f7GN/yg/FOlYkGxDv QEwqMim+Y+fECntkiYfJ1+ajeOdV/pY= From: Paul Cercueil To: Thomas Bogendoerfer , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: "H . Nikolaus Schaller" , linux-mips@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, list@opendingux.net, Paul Cercueil Subject: [PATCH 4/9] MIPS: DTS: CI20: Do not force-enable CIM and WiFi regulators Date: Sun, 4 Jun 2023 16:56:37 +0200 Message-Id: <20230604145642.200577-5-paul@crapouillou.net> In-Reply-To: <20230604145642.200577-1-paul@crapouillou.net> References: <20230604145642.200577-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam: Yes X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767784732659990151?= X-GMAIL-MSGID: =?utf-8?q?1767784732659990151?= These regulators should be enabled by their respective drivers. Signed-off-by: Paul Cercueil --- arch/mips/boot/dts/ingenic/ci20.dts | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts index 662796acda41..7f6e7a4e3915 100644 --- a/arch/mips/boot/dts/ingenic/ci20.dts +++ b/arch/mips/boot/dts/ingenic/ci20.dts @@ -272,19 +272,16 @@ wifi_io: LDO6 { regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; inl-supply = <&vcc_33v>; - regulator-always-on; }; cim_io_28: LDO7 { regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; inl-supply = <&vcc_33v>; - regulator-always-on; }; cim_io_15: LDO8 { regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; inl-supply = <&vcc_33v>; - regulator-always-on; }; vrtc_18: LDO_REG9 { /* Despite the datasheet stating 3.3V From patchwork Sun Jun 4 14:56:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 103022 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2182679vqr; Sun, 4 Jun 2023 08:05:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4ZlZZeTOcp1FSXYrNvaMbeaKC1QHotGCgSWqA0j7/5+Hd8Irt2YSqtswOxgXIkgkXuCRWZ X-Received: by 2002:a05:6a20:26a8:b0:10f:8b61:197c with SMTP id h40-20020a056a2026a800b0010f8b61197cmr1177067pze.54.1685891137517; Sun, 04 Jun 2023 08:05:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685891137; cv=none; d=google.com; s=arc-20160816; b=UgcelBLxJEVwpsnfXBpOSOZvtwyLydDhX2oJjsxLXu+FlHukaHot2g8S/KqvEm8n0p YVJVToVlrIP7pdvUN9AfSTQhYJl8jM15klmwPQMTMW0VATjli7/ByI0uJLY4P6g2Zo9y Pa86f3BWaAIlVdM2pei4nBv+CRf3b1UvGEAnlNCrmMjziqD8dLbsevTaA7bzROpd/ebL rf6jCuIhyDorlp8f8sHUg/5cZTehY+xF5HWZpVGkwQAxJwPNiGeb3tfmMAutCmEteURz r//IpwgAV1OIcJDhhWEhDQ85Fbag1QkF2AHq4pqd1MgQRnVvqZp6faYtrei8kzNPtmkL W/Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5dcl1shcrAojKzd131V73MzqhBaxqhbqibIw8HMNAPE=; b=iuOagWgSlZk2FUGgLfB/+5UDAwTMXLFWPBTpGxuvapmPFg2oOdutFV7DP0NawqM/Qu ljHKRRk6XERP3iTnDRtJY/CnqznEMZrkotlzZ/BTcQsLGQSfhVm+3zI+TF8QSM0KQakZ cV1D6At3nPiciH3bOhg+Fa3uUoD+fxERc95+9fHgnjdpj+rby7HmcQhDpVu/tHbbVh0j dctRfvDY27E3z3AYSmdYQvPZ0tZ7yq8rxxr+zyQnz58zIE4YJeGLVEcUKMwOfBaCITGL 8MVjg2fS2SY3e1EmBYi2T+yy7Mz5LA8kwv/J1DYu/c5AAhxkH0C2Lk7s4ugYMZyjHC0d EhIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=UltWcevn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b27-20020a63931b000000b0053eedcc504esi4081809pge.373.2023.06.04.08.05.23; Sun, 04 Jun 2023 08:05:37 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=UltWcevn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231819AbjFDO6F (ORCPT + 99 others); Sun, 4 Jun 2023 10:58:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232390AbjFDO6D (ORCPT ); Sun, 4 Jun 2023 10:58:03 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE49D19A; Sun, 4 Jun 2023 07:57:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1685890615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5dcl1shcrAojKzd131V73MzqhBaxqhbqibIw8HMNAPE=; b=UltWcevn+WWtJ/4rTe2B+ZKReRzfBIZgSQL7eJyrzY3zMQReebbCKDsByDC2BaUfLmhLZQ op2iyF6BUPJHrU/AF+2pq/K13SX2LAGFfexmkONEpsDEkBLIfg6VIhNZhoP1uN1+rdVg6j OpOEhGGgVHCfmNqnaq2NHDrUaTJtK98= From: Paul Cercueil To: Thomas Bogendoerfer , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: "H . Nikolaus Schaller" , linux-mips@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, list@opendingux.net, Paul Cercueil Subject: [PATCH 5/9] MIPS: DTS: CI20: Misc. cleanups Date: Sun, 4 Jun 2023 16:56:38 +0200 Message-Id: <20230604145642.200577-6-paul@crapouillou.net> In-Reply-To: <20230604145642.200577-1-paul@crapouillou.net> References: <20230604145642.200577-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam: Yes X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767784985275486784?= X-GMAIL-MSGID: =?utf-8?q?1767784985275486784?= - Use the standard "ecc-engine" property instead of the custom "ingenic,bch-controller" to get a handle to the BCH controller. - Respect cell sizes in the Ethernet controller node. - Use proper macro for interrupt type instead of hardcoding magic values. Signed-off-by: Paul Cercueil --- arch/mips/boot/dts/ingenic/ci20.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts index 7f6e7a4e3915..b7dbafa1f85d 100644 --- a/arch/mips/boot/dts/ingenic/ci20.dts +++ b/arch/mips/boot/dts/ingenic/ci20.dts @@ -356,7 +356,7 @@ nandc: nand-controller@1 { #address-cells = <1>; #size-cells = <0>; - ingenic,bch-controller = <&bch>; + ecc-engine = <&bch>; ingenic,nemc-tAS = <10>; ingenic,nemc-tAH = <5>; @@ -422,8 +422,8 @@ dm9000@6 { pinctrl-names = "default"; pinctrl-0 = <&pins_nemc_cs6>; - reg = <6 0 1 /* addr */ - 6 2 1>; /* data */ + reg = <6 0 1>, /* addr */ + <6 2 1>; /* data */ ingenic,nemc-tAS = <15>; ingenic,nemc-tAH = <10>; @@ -435,7 +435,7 @@ dm9000@6 { vcc-supply = <ð0_power>; interrupt-parent = <&gpe>; - interrupts = <19 4>; + interrupts = <19 IRQ_TYPE_EDGE_RISING>; nvmem-cells = <ð0_addr>; nvmem-cell-names = "mac-address"; From patchwork Sun Jun 4 14:56:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 103024 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2187395vqr; Sun, 4 Jun 2023 08:14:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7UWXH4dNv4YktIaGwmJZHMi+cFB6U2wlvQUznl9Iqo76kZSKKaP0KTJ/F0E2Ke4QmasruF X-Received: by 2002:a05:6a00:22c5:b0:659:ae1c:c9e2 with SMTP id f5-20020a056a0022c500b00659ae1cc9e2mr446125pfj.17.1685891676888; Sun, 04 Jun 2023 08:14:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685891676; cv=none; d=google.com; s=arc-20160816; b=tDxb536GKZPqPTZC6tT+6knKP00qyr/6Tvqse2RgyoRA6rMxZ+pMBDAcmoWCvIH5co tyuBm2cVY7owWPtgEVLvrsafYa2hy0Rg3UwFTbxiIb93s+OrjszTWa7uKfZra7ckI0to rOu4G1puFwNiZUv0i5mbxkw4pYGu76qC5cPYflatFb2TZAfclK9OMxHfS5v7D425JhAu PiZzR1FsZft5L2mH2sTQKhQGGUB8vUBLYmkMxgOKPtpuoMfONZXgAkJ4C199PfJQKgFc oJbdbE94BsvxycqUf6LMHllRwwCUj1eFGCHE4+iDBB4qMuYWUSLRr35mY2tcl+hbNoLW R60g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dxdaZYpsh0LWTwoNnhJ3KSRH4Xn+PKI7zDErKH1NAn4=; b=bxwnany5latMH6PFqdrwHY2slb9oJoVe1CpHrwvt+u/ZE5UXrfXqPngomus687CV2g rd1On0zTdhPgIjygkf0iPgDcXcAPVyNTC4fBeo20LKr17WTPIhxpNIFt8sEaa3Nhtyf1 mwRLzppUOt6pWN64NcExb6VNUnpmr64Pp0K/oURc/Lc+p+WACaQArmdbLFWsoRiRIKOW 0DnomnvUuy0JgB9EZ9qoTJh9hsELuHhYyLuTCHPReV6Emqw1RTvcHrYwo81i7ZsvdxQ6 jZZeeR9o+KJualQg3qEd3Rpih9SBNKUdwnM1l0k/nKrfXaRvXDfmg0yxTUikH7YV1bUZ CQzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=KJwxIzN+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z2-20020aa79482000000b0064378fd1d54si3893836pfk.258.2023.06.04.08.14.22; Sun, 04 Jun 2023 08:14:36 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=KJwxIzN+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231364AbjFDO6W (ORCPT + 99 others); Sun, 4 Jun 2023 10:58:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229806AbjFDO6R (ORCPT ); Sun, 4 Jun 2023 10:58:17 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2A0E1B1; Sun, 4 Jun 2023 07:58:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1685890617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dxdaZYpsh0LWTwoNnhJ3KSRH4Xn+PKI7zDErKH1NAn4=; b=KJwxIzN+abhzTB0FcY+2sgcOJlie3P3sZhcpZ+osNAXkIhLe4iFSQcJF3I33Tfz1pVTS4X V94SLH0XNQTnNpERzkPXha+nEBvGiYFmXHELAlpRyL6fDZ0E5a6pJzuFUA24LotyNVZqM0 VEPsB2xwAMQ0UbwCHEv83N4eoXqX/hI= From: Paul Cercueil To: Thomas Bogendoerfer , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: "H . Nikolaus Schaller" , linux-mips@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, list@opendingux.net, Paul Cercueil Subject: [PATCH 6/9] MIPS: DTS: CI20: Parent MSCMUX clock to MPLL Date: Sun, 4 Jun 2023 16:56:39 +0200 Message-Id: <20230604145642.200577-7-paul@crapouillou.net> In-Reply-To: <20230604145642.200577-1-paul@crapouillou.net> References: <20230604145642.200577-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam: Yes X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767785550887713768?= X-GMAIL-MSGID: =?utf-8?q?1767785550887713768?= This makes it possible to clock the SD cards much higher, as the MPLL is running at 1.2 GHz by default. The previous parent was the EXT clock, which caused the SD cards to be clocked at 24 MHz maximum. Signed-off-by: Paul Cercueil --- arch/mips/boot/dts/ingenic/ci20.dts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts index b7dbafa1f85d..bdbd064c90e1 100644 --- a/arch/mips/boot/dts/ingenic/ci20.dts +++ b/arch/mips/boot/dts/ingenic/ci20.dts @@ -129,10 +129,11 @@ &cgu { */ assigned-clocks = <&cgu JZ4780_CLK_OTGPHY>, <&cgu JZ4780_CLK_RTC>, <&cgu JZ4780_CLK_SSIPLL>, <&cgu JZ4780_CLK_SSI>, - <&cgu JZ4780_CLK_HDMI>; + <&cgu JZ4780_CLK_HDMI>, <&cgu JZ4780_CLK_MSCMUX>; assigned-clock-parents = <0>, <&cgu JZ4780_CLK_RTCLK>, <&cgu JZ4780_CLK_MPLL>, - <&cgu JZ4780_CLK_SSIPLL>; + <&cgu JZ4780_CLK_SSIPLL>, + <0>, <&cgu JZ4780_CLK_MPLL>; assigned-clock-rates = <48000000>, <0>, <54000000>, <0>, <27000000>; }; From patchwork Sun Jun 4 14:56:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 103020 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2180476vqr; Sun, 4 Jun 2023 08:02:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7VkzebHR/v3NxyCmoQ/nLH5sTZ22zndy0dwjz1phYyz6UspvZ9IxMtCCrgu6MWkVrWEg5c X-Received: by 2002:a17:902:d506:b0:1b0:663e:4b3f with SMTP id b6-20020a170902d50600b001b0663e4b3fmr2573363plg.37.1685890959573; Sun, 04 Jun 2023 08:02:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685890959; cv=none; d=google.com; s=arc-20160816; b=GdhGeNySeCGBMpaYspBTeS42W2+fEVmlnCDrkoUHaSeACgdJ+qshugGp5OqU60MfiT L5N4Xi1fvmNGMoe9qtyp/i87DEmopweJPQqeS8vyKvcz6c8cfz/vP++lPraOzaHX/AT5 8w4/fGRvENB6iZuF2SRU23/xRyES1ML4tFgUvdDIkOXUtcg34vQIpO7BR2uiUhfEroGz Kbusm9ygusct9oXvsmW+BqQtiTsCZcjmvlsaNOCIEP7J/TtxmZWB56RX6dmrktoU9ydo M9cp9YtjATFO4kaGORUrypDfalEoTFEooCetdIBKltr2uSchmIzWhaCOj5t2ty58ro4F IyWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+2jQ731Zfcr8a7AriSnn5w2+57JydZlg6MzkdjZ40CI=; b=cNKF3KwIKf5nlbblrJsYyhbE9mW9/2Qh4PN75Zu0jH8mixHf0kJ0RFMpn5eVqzIPBO uHjnuBzQNRva7Z+74FGkEWApUvIcrkorkEJIgPV9cvofIqGHf7Ob7GFZoHVXdXpAZFuG qF0+MYGKeyC5DkkFbHJ8TQpbPPwQgCgkVR3iPaGUih6G+B7d4Bx/K+neOJkZE/HYcL9T YjObRvWFw8uuY8I12Hs7KV3oO3runfAcyw3nTkhn4k/lXK7r9OZ3LlageuSrirRf8s2X 7rxTWX8+dh0jkmj/bnbgjJLDleA1yuyOA0+bf7GDOdsUe82PmbycnzO/hHANUTKlYKuj IEuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b="Jwl6/7my"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jj3-20020a170903048300b001b038b44ec6si4005508plb.10.2023.06.04.08.02.22; Sun, 04 Jun 2023 08:02:39 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b="Jwl6/7my"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232455AbjFDO6e (ORCPT + 99 others); Sun, 4 Jun 2023 10:58:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232454AbjFDO6a (ORCPT ); Sun, 4 Jun 2023 10:58:30 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB594CA; Sun, 4 Jun 2023 07:58:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1685890619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+2jQ731Zfcr8a7AriSnn5w2+57JydZlg6MzkdjZ40CI=; b=Jwl6/7myr8aKTNwezlStlFEL8GK3I+qfNOu1sSjs6aGROjoJYuhMQxDqHY0Ly7XDOHL7MU Cw+5mMygNzVK62UL9OifymYfro4F3nkgEpuT74S2dpVU+uZpCwlSUVzP57EsMcCH5nJfXL socd+iReEqn4vKXO5/dJuMk42Xv/OaU= From: Paul Cercueil To: Thomas Bogendoerfer , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: "H . Nikolaus Schaller" , linux-mips@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, list@opendingux.net, Paul Cercueil Subject: [PATCH 7/9] MIPS: DTS: CI20: Enable support for WiFi / Bluetooth Date: Sun, 4 Jun 2023 16:56:40 +0200 Message-Id: <20230604145642.200577-8-paul@crapouillou.net> In-Reply-To: <20230604145642.200577-1-paul@crapouillou.net> References: <20230604145642.200577-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam: Yes X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767784798847913731?= X-GMAIL-MSGID: =?utf-8?q?1767784798847913731?= Wire the WiFi/Bluetooth chip properly in the Device Tree. - 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. 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. Signed-off-by: Paul Cercueil --- arch/mips/boot/dts/ingenic/ci20.dts | 88 ++++++++++++++++++++++++----- 1 file changed, 73 insertions(+), 15 deletions(-) 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 = <&gpe 3 GPIO_ACTIVE_LOW>; }; - wlan0_power: fixedregulator-1 { + bt_power: fixedregulator-1 { compatible = "regulator-fixed"; - regulator-name = "wlan0_power"; + regulator-name = "bt_power"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-settling-time-us = <1400>; + + vin-supply = <&vcc_50>; gpio = <&gpb 19 0>; enable-active-high; @@ -116,6 +121,40 @@ otg_power: fixedregulator-2 { gpio = <&gpf 15 0>; enable-active-high; }; + + wifi_power: fixedregulator-4 { + compatible = "regulator-fixed"; + + regulator-name = "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 = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-settling-time-us = <150000>; + + vin-supply = <&bt_power>; + }; + + vcc_33v: fixedregulator-5 { + compatible = "regulator-fixed"; + + regulator-name = "vcc_33v"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + wifi_pwrseq: pwrseq { + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&gpf 7 GPIO_ACTIVE_LOW>; + + clocks = <&rtc_dev>; + clock-names = "ext_clock"; + }; }; &ext { @@ -161,24 +200,33 @@ &mmc0 { pinctrl-0 = <&pins_mmc0>; cd-gpios = <&gpf 20 GPIO_ACTIVE_LOW>; + vmmc-supply = <&vcc_33v>; + vqmmc-supply = <&vcc_33v>; }; &mmc1 { status = "okay"; bus-width = <4>; - max-frequency = <50000000>; + max-frequency = <25000000>; + mmc-pwrseq = <&wifi_pwrseq>; + vmmc-supply = <&wifi_power>; + vqmmc-supply = <&wifi_io>; non-removable; pinctrl-names = "default"; pinctrl-0 = <&pins_mmc1>; - brcmf: wifi@1 { -/* reg = <4>;*/ - compatible = "brcm,bcm4330-fmac"; - vcc-supply = <&wlan0_power>; - device-wakeup-gpios = <&gpd 9 GPIO_ACTIVE_HIGH>; - shutdown-gpios = <&gpf 7 GPIO_ACTIVE_LOW>; + #address-cells = <1>; + #size-cells = <0>; + + wifi@1 { + compatible = "brcm,bcm4329-fmac"; + reg = <1>; + + interrupt-parent = <&gpd>; + interrupts = <9 IRQ_TYPE_EDGE_FALLING>; + interrupt-names = "host-wake"; }; }; @@ -205,11 +253,20 @@ &uart2 { bluetooth { compatible = "brcm,bcm4330-bt"; - reset-gpios = <&gpf 8 GPIO_ACTIVE_HIGH>; - vcc-supply = <&wlan0_power>; + + vbat-supply = <&bt_power>; + vddio-supply = <&wifi_io>; + + interrupt-parent = <&gpf>; + interrupts = <6 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "host-wakeup"; + + clocks = <&rtc_dev>; + clock-names = "lpo"; + + reset-gpios = <&gpf 8 GPIO_ACTIVE_LOW>; device-wakeup-gpios = <&gpf 5 GPIO_ACTIVE_HIGH>; - host-wakeup-gpios = <&gpf 6 GPIO_ACTIVE_HIGH>; - shutdown-gpios = <&gpf 4 GPIO_ACTIVE_LOW>; + shutdown-gpios = <&gpf 4 GPIO_ACTIVE_HIGH>; }; }; @@ -270,8 +327,9 @@ vcc_25: LDO5 { regulator-always-on; }; wifi_io: LDO6 { - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <2500000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-settling-time-us = <150000>; inl-supply = <&vcc_33v>; }; cim_io_28: LDO7 { From patchwork Sun Jun 4 14:56:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 103025 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2187540vqr; Sun, 4 Jun 2023 08:14:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6c5J++WQnPGUB6dFPCEhXws4d9Ju+aIfYmRf85HGOTfkw5hc9Blx5WKUgEU+WZzi7eKsvU X-Received: by 2002:a05:6a20:3d83:b0:eb:e2eb:d7ec with SMTP id s3-20020a056a203d8300b000ebe2ebd7ecmr2225833pzi.17.1685891695248; Sun, 04 Jun 2023 08:14:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685891695; cv=none; d=google.com; s=arc-20160816; b=JclBIGzuXHGmmRhadVUMfrIfYr7YbxkccNtde1nqrtOMcJw+AeEdAqO69eGGtXrCn8 k3NKuGs9s5/RedLQYxUrWKBVXFPUeamp7Qv6fKArh/Ud28KxzlUK3iSm7N3cpR8alAvH Qgb1L3QHscxInD0xJe4j1toJZ/X/N9IDIysqUdt/HTie/lurL6KRhrGpKocWBcZZWViT c3xnaobf384UtkE812b0kdjJ01QKivwwwdzbNTe8yZ9IRDW0V0MwLIYF5N0ZOZ5ohl2G FwuZUbIggKlrPsXWSoeHPzO+H2kY3NG6k98cDlKwMyxX4/tBnRRN9s+yADOnySsurdeB 1d1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dVImeO1XVqTkL5Otvte5tgGHohVx0ERvyfohvDmX6WE=; b=Rmv4GjJPd21PfaIBFzTeHkwtfnYRDiT4QArza3+Yvybf3tw8GGthJTJ6evexCkffEg Y69U0oDOlIsJVl70fnED5WahSnA8v4k2mmfgc0jb7j9XwgMjBqdrwvfJdCe2tc4bT1r9 CpW6vd+Zed1YAiAaAAznqSSfrVh/j0kqWsCcXoxOwDT2kbEkkVCTfOC+wiXLjh9L1+5u o/1oeFZAz6lr3zeNFX4zbEBKj6f9KrxZw0M+YGzld05VS7SG14rgAkDrYKwTbzPwwt7b 1sRBYLspCQm8ro4aIsO6rsqOl6bseVz9wNgAOa39rAiTbWRTfC4TJkRcI8XGafW8WRSv GQxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=IoMBMgd9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j20-20020a637a54000000b0053efd7561e1si2331442pgn.287.2023.06.04.08.14.42; Sun, 04 Jun 2023 08:14:55 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=IoMBMgd9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231313AbjFDO6q (ORCPT + 99 others); Sun, 4 Jun 2023 10:58:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232440AbjFDO6m (ORCPT ); Sun, 4 Jun 2023 10:58:42 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 099D81A8; Sun, 4 Jun 2023 07:58:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1685890620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dVImeO1XVqTkL5Otvte5tgGHohVx0ERvyfohvDmX6WE=; b=IoMBMgd9Mjj45rZ2k/pAunZXsBZY0EQgs5Mye4CFj7M76hp/xJ8+GWyXpNOgtTy+zyNOww dAD9yoIbsus6Si99JwR4w5lQcLlwPgriQB8a/nE1O6oQ+YhqilhlOelhGhyWpRg42uwFXs yu0ic8gfWYzNm6F5l6tM1KvSIufs4ug= From: Paul Cercueil To: Thomas Bogendoerfer , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: "H . Nikolaus Schaller" , linux-mips@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, list@opendingux.net, Paul Cercueil Subject: [PATCH 8/9] MIPS: configs: CI20: Regenerate defconfig Date: Sun, 4 Jun 2023 16:56:41 +0200 Message-Id: <20230604145642.200577-9-paul@crapouillou.net> In-Reply-To: <20230604145642.200577-1-paul@crapouillou.net> References: <20230604145642.200577-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam: Yes X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767785570104323999?= X-GMAIL-MSGID: =?utf-8?q?1767785570104323999?= Just a "make ci20_defconfig menuconfig savedefconfig" Without changing anything in the menuconfig. No functional change. Signed-off-by: Paul Cercueil --- arch/mips/configs/ci20_defconfig | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/arch/mips/configs/ci20_defconfig b/arch/mips/configs/ci20_defconfig index 11f08b6a3013..a161387f8fce 100644 --- a/arch/mips/configs/ci20_defconfig +++ b/arch/mips/configs/ci20_defconfig @@ -19,19 +19,19 @@ CONFIG_USER_NS=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_KALLSYMS_ALL=y CONFIG_EMBEDDED=y -# CONFIG_VM_EVENT_COUNTERS is not set -# CONFIG_COMPAT_BRK is not set -CONFIG_SLAB=y CONFIG_MACH_INGENIC_SOC=y CONFIG_JZ4780_CI20=y CONFIG_HIGHMEM=y CONFIG_HZ_100=y -# CONFIG_SECCOMP is not set # CONFIG_SUSPEND is not set +# CONFIG_SECCOMP is not set CONFIG_MODULES=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_SLAB=y +# CONFIG_COMPAT_BRK is not set # CONFIG_COMPACTION is not set CONFIG_CMA=y +# CONFIG_VM_EVENT_COUNTERS is not set CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -71,7 +71,6 @@ CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL=y # CONFIG_WLAN is not set CONFIG_KEYBOARD_GPIO=m # CONFIG_INPUT_MOUSE is not set -CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_LEGACY_PTY_COUNT=2 CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y @@ -99,13 +98,12 @@ CONFIG_IR_GPIO_CIR=m CONFIG_IR_GPIO_TX=m CONFIG_MEDIA_SUPPORT=m CONFIG_DRM=m +CONFIG_DRM_DISPLAY_CONNECTOR=m CONFIG_DRM_INGENIC=m CONFIG_DRM_INGENIC_DW_HDMI=m -CONFIG_DRM_DISPLAY_CONNECTOR=m -# CONFIG_VGA_CONSOLE is not set CONFIG_FB=y +# CONFIG_VGA_CONSOLE is not set CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_HID is not set CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_DWC2=y @@ -125,7 +123,6 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_CPU=y CONFIG_LEDS_TRIGGER_ACTIVITY=y -CONFIG_LEDS_TRIGGER_GPIO=y CONFIG_LEDS_TRIGGER_DEFAULT_ON=y CONFIG_LEDS_TRIGGER_TRANSIENT=y CONFIG_LEDS_TRIGGER_CAMERA=m @@ -144,7 +141,6 @@ CONFIG_JZ4780_NEMC=y CONFIG_PWM=y CONFIG_PWM_JZ4740=m CONFIG_NVMEM_JZ4780_EFUSE=y -CONFIG_JZ4770_PHY=y CONFIG_EXT4_FS=y # CONFIG_DNOTIFY is not set CONFIG_AUTOFS_FS=y @@ -157,7 +153,6 @@ CONFIG_CONFIGFS_FS=y CONFIG_UBIFS_FS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y -CONFIG_NLS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_737=y CONFIG_NLS_CODEPAGE_775=y @@ -206,7 +201,6 @@ CONFIG_DEBUG_FS=y CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=10 # CONFIG_SCHED_DEBUG is not set -# CONFIG_DEBUG_PREEMPT is not set CONFIG_STACKTRACE=y # CONFIG_FTRACE is not set CONFIG_CMDLINE_BOOL=y From patchwork Sun Jun 4 14:56:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 103021 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2181310vqr; Sun, 4 Jun 2023 08:03:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5+MjtNoTC7Xuye+XlzAicL8oqp63mkvlKoYy7QB+y6W3klOGVX8Vv4vPf3q6M6vm1VgONZ X-Received: by 2002:a17:902:c94b:b0:1af:b3b6:4947 with SMTP id i11-20020a170902c94b00b001afb3b64947mr2428753pla.24.1685891022034; Sun, 04 Jun 2023 08:03:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685891022; cv=none; d=google.com; s=arc-20160816; b=Zt3Z+USFGaWarN+Q94XsXkq8bTfeNK8CPD3KcLINWAvee8SArZ1KR/l1rUuWLYUt0z 7O4IwrG/jxF2NxvSj863RHcG+ma+L6KXWNO0BDObeB5CdEuN9UInZmtW4t3wYohT+O9p sT9suhrAvsMZKQfrfVnKuAYOIRfquZd3QjNwf5UHs9A7bEjNuhjiArR7COd8GKYdzrhc spUE2p0bLtI+0sC3Ourphn1v5pTaF1UpvLNHCqq2yI9luQLI68pu9ipwBXs0KpsAP5bz TbIVbMPOPvnGA8qTjPreCepGu32Xa+3DbT97vhotuA5TjWEZBbaW+0tO91PiZm2M9KAY lSaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=aB3s9QvJ9+7W3dD1Je2JBtOaU9cq6G9le6qbeprpRwY=; b=uuuDwMhGtdmFrF6zt/VlgOyKGWn6rnp/YAezb8a5K3AgmIrpLZxT9XnuWtds8RxPgs pjdWLvxgT/ovkQp7hgCe0Ms49tVGAS7vUiosUXj636fYyfD1FQdUGL19JO1NZ+I6piFP rXbCL09MtBeQC6BC06CnrdnQTODnTdfjSth49mwl6Ilo9gEAdPImfSO6ajgiFXEs3zDH 9x9wHhia/LWMcenG7FsHRqhaT5E6rH48bPDP5/7nittg8kLdlq9wTqveFhDtG14ADuBr +ijcaocZPkZs1NpmFpvCTzWwO/0wC29HLKYzoyipJItxweC+BhrRCZPdIV+KfqvcE7b5 TZ4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=UybgA70a; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k186-20020a6384c3000000b00542aab0e4fdsi3774603pgd.129.2023.06.04.08.03.27; Sun, 04 Jun 2023 08:03:42 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=UybgA70a; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232469AbjFDO7A (ORCPT + 99 others); Sun, 4 Jun 2023 10:59:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230070AbjFDO66 (ORCPT ); Sun, 4 Jun 2023 10:58:58 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41A9A1B4; Sun, 4 Jun 2023 07:58:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1685890621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aB3s9QvJ9+7W3dD1Je2JBtOaU9cq6G9le6qbeprpRwY=; b=UybgA70aecJvDAhIR9l2pj2aX89XNtZBpO+L7iEjkgjmLJHR67GQanX2Yrwc7+k/ANSqKH UgxO9WamlpN05iZANjv8tpNx6ZrzZgblJK6nytJJPQ1EsXGqsM9JQ+vPrU3h1/shMzwxQ7 rp+jCV4tSop2ENSzmckhGcIBKAWMvfU= From: Paul Cercueil To: Thomas Bogendoerfer , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: "H . Nikolaus Schaller" , linux-mips@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, list@opendingux.net, Paul Cercueil Subject: [PATCH 9/9] MIPS: configs: CI20: Enable WiFi / Bluetooth Date: Sun, 4 Jun 2023 16:56:42 +0200 Message-Id: <20230604145642.200577-10-paul@crapouillou.net> In-Reply-To: <20230604145642.200577-1-paul@crapouillou.net> References: <20230604145642.200577-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam: Yes X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767784864416715128?= X-GMAIL-MSGID: =?utf-8?q?1767784864416715128?= Enable the required drivers for the WiFi / Bluetooth functionality. I enabled WEXT compatibility as well since the CI20 is typically used with a very old userspace. Signed-off-by: Paul Cercueil --- arch/mips/configs/ci20_defconfig | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/arch/mips/configs/ci20_defconfig b/arch/mips/configs/ci20_defconfig index a161387f8fce..920b27977dac 100644 --- a/arch/mips/configs/ci20_defconfig +++ b/arch/mips/configs/ci20_defconfig @@ -40,7 +40,12 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set -# CONFIG_WIRELESS is not set +CONFIG_BT=m +# CONFIG_BT_LE is not set +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_BCM=y +CONFIG_CFG80211=m +CONFIG_CFG80211_WEXT=y CONFIG_DEVTMPFS=y CONFIG_FW_LOADER=m # CONFIG_ALLOW_DEV_COREDUMP is not set @@ -68,7 +73,25 @@ CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL=y # CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_WIZNET is not set -# CONFIG_WLAN is not set +# CONFIG_WLAN_VENDOR_ADMTEK is not set +# CONFIG_WLAN_VENDOR_ATH is not set +# CONFIG_WLAN_VENDOR_ATMEL is not set +CONFIG_BRCMFMAC=m +# CONFIG_WLAN_VENDOR_CISCO is not set +# CONFIG_WLAN_VENDOR_INTEL is not set +# CONFIG_WLAN_VENDOR_INTERSIL is not set +# CONFIG_WLAN_VENDOR_MARVELL is not set +# CONFIG_WLAN_VENDOR_MEDIATEK is not set +# CONFIG_WLAN_VENDOR_MICROCHIP is not set +# CONFIG_WLAN_VENDOR_PURELIFI is not set +# CONFIG_WLAN_VENDOR_RALINK is not set +# CONFIG_WLAN_VENDOR_REALTEK is not set +# CONFIG_WLAN_VENDOR_RSI is not set +# CONFIG_WLAN_VENDOR_SILABS is not set +# CONFIG_WLAN_VENDOR_ST is not set +# CONFIG_WLAN_VENDOR_TI is not set +# CONFIG_WLAN_VENDOR_ZYDAS is not set +# CONFIG_WLAN_VENDOR_QUANTENNA is not set CONFIG_KEYBOARD_GPIO=m # CONFIG_INPUT_MOUSE is not set CONFIG_LEGACY_PTY_COUNT=2 @@ -78,6 +101,7 @@ CONFIG_SERIAL_8250_NR_UARTS=5 CONFIG_SERIAL_8250_RUNTIME_UARTS=5 CONFIG_SERIAL_8250_INGENIC=y CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SERIAL_DEV_BUS=y CONFIG_I2C=y CONFIG_I2C_JZ4780=y CONFIG_SPI=y @@ -191,6 +215,7 @@ CONFIG_NLS_ISO8859_15=y CONFIG_NLS_KOI8_R=y CONFIG_NLS_KOI8_U=y CONFIG_NLS_UTF8=y +# CONFIG_CRYPTO_AES is not set CONFIG_DMA_CMA=y CONFIG_CMA_SIZE_MBYTES=32 CONFIG_PRINTK_TIME=y