From patchwork Sat Mar 23 12:12:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangyu Chen X-Patchwork-Id: 782120 Received: from out203-205-251-36.mail.qq.com (out203-205-251-36.mail.qq.com [203.205.251.36]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AF5E2C157; Sat, 23 Mar 2024 12:17:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=203.205.251.36 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711196282; cv=none; b=lEQhrXHNAt9GHawDU2KytLtxzOHqH+Squ0V72rpALjTAjmF9GnTvqKl+5+z5Zd5uhKhukKkkQD5dEEP5THfyvkutimJG8kArat6/f2n7VFLoXzTYdQdsv3P49S3CclL7paomlkJ0426ZDTN1OmS9L9IV03DjXG/sJOp4Pe8fCMc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711196282; c=relaxed/simple; bh=N+hdJ/K/367z9AduiEVjZAfGxfY8hfBNcT/rU+ctJoA=; h=Message-ID:From:To:Cc:Subject:Date:In-Reply-To:References: MIME-Version; b=jXaiGDSCZROPlS4mayt1EqtaGtjfHpNQWCi4pYp5Y+iFYd9ue5MaAIi0stQjkgQCUZQBj02pecsN4IHMad7mgGd73SvfACXoGdG0JFrGVQHrkFDSlAuI7KmNMoD93PsgzitwBMnymXx9WzcaiPz9Z/FroEuygzn/q5Kfh51sxYw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cyyself.name; spf=none smtp.mailfrom=cyyself.name; dkim=pass (1024-bit key) header.d=qq.com header.i=@qq.com header.b=upNpY1qV; arc=none smtp.client-ip=203.205.251.36 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cyyself.name Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=cyyself.name Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=qq.com header.i=@qq.com header.b="upNpY1qV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1711195967; bh=rcU9GmGkfYObnRvy+6sIXXI4nFg1KITAK23jcYZUxzQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=upNpY1qVU9E881cMsUqmNFhtpMVIzGT5sbW6liaSbvAbFCDUTz5hRpZzKYPUwolaz U0LqrL11TJofbymw0ovMkhodQrp5Q7D6ZGDx9ha6nKo5ffbALzfETU/gp4f1vCFc4r 9ByU/kyaKswTp/c/WNcxQkO7Q7zaPyS8xgVm91Vw= Received: from cyy-pc.lan ([240e:379:225d:8e00:b91:b2e7:7c69:8554]) by newxmesmtplogicsvrsza7-0.qq.com (NewEsmtp) with SMTP id 32594C7F; Sat, 23 Mar 2024 20:12:37 +0800 X-QQ-mid: xmsmtpt1711195964t53j80xve Message-ID: X-QQ-XMAILINFO: NQR8mRxMnur94KfB+7w3r13yNMBf1WJ7kj32mtd7jCEliNb7/euZWq5fEPspM/ 7TdDQRfBiBNk9WayPerDVe2Hmu/scyD0G2qiwwJjiKgfIryT91tvfSHEfpzY02Foj3/4Q1Xt2oP1 xPyqUfsYilHzBhwJ3iXI3rJdNfO3AybJ8f6L4nqoBokQj2esnVr4/rtc0C1kwbqXfXELl4POVOpy Whfci+FqD4C0FfMK24Ngm674JLXuxd7YD8M5C0zsndswPzr+HPU7vxhI6+Mldg42t1RArrZHapqX 21hk4R+0cDdFNBa5tAh4LZgPVvbRw3RIiQ6HvOmP7bbEwGCst1noIA63vjX5lJE892Ac2Yrz/hta FgHsIkGgEqdJO8JD/nLus+uN2HlQiLk/9ISlQS2NTw3EEN8JDGcwDZT9gf7vmdiMWD30OeSigLsA a3wVS9Paf/EDjVj2MbVXQ0/P/nU6XDpQ9/fXkUBfOUYcZzshR9Xy5gLSiT3Q3uNF780qaKzxikDZ 26u0GyxTqZeAxr8idi9Y/pmNaKhAQlSRrjvwIEXGADSrtZ87OxMe+4KoCHWEQU7lk2ealsV1xoed dYOl7eFHw8YQfC+TGQTA5Clf4sOEZexhANKhSCL1QC/Gd3XSxtHeWY4rdrxDFTk4I2pxWcg7rBLn yFcumffRcVdPggT4amgdA6/QPQhBkvLH9bjbngW6HyPh/BKAVmaCkNqphIbYdZkxAQpY2dsYfWJ9 Pf44XsB3PrFh186BMZ7sL/mRLJrLq+bO6oaMgT1Aby2Xt3nWch8aVyF+fEBjuKEqTkHc+aGIDxnH dtKqOSMN1oPs0JXs1gqOdyjsVJJZqOWdLI2fqkAazCWBXQkEVUBb8vR7WnbO3fU+0YYawyO0g2Qk ZMhYxyhGA//ynLtCnC+wSFW8d3+LXejtMcyosUVjUKxem2K+r1S5EfzQ1ubnIOK/QG5AhNVYZ/h8 MzLp3LrrVAzvAhznNkGb50ofLv3P/24EfQEiZzIfIThSm2JC9OtnI6sSxs/PjUPLyZNYTkhXe35X /NBP7bc7g32EO+0KxKI19Y48lebMDjfN1fbHdu2z1WjpmekcoGwFztLKUda2I= X-QQ-XMRINFO: Mp0Kj//9VHAxr69bL5MkOOs= From: Yangyu Chen To: linux-riscv@lists.infradead.org Cc: Conor Dooley , Damien Le Moal , Rob Herring , Krzysztof Kozlowski , Paul Walmsley , Palmer Dabbelt , Albert Ou , Guo Ren , Michael Turquette , Stephen Boyd , Linus Walleij , Philipp Zabel , linux-gpio@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Yangyu Chen , Rob Herring Subject: [PATCH v6 03/11] dt-bindings: timer: Add Canaan K230 CLINT Date: Sat, 23 Mar 2024 20:12:15 +0800 X-OQ-MSGID: <20240323121223.1729328-3-cyy@cyyself.name> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add compatible string for Canaan K230 CLINT. Signed-off-by: Yangyu Chen Acked-by: Rob Herring Reviewed-by: Guo Ren --- Documentation/devicetree/bindings/timer/sifive,clint.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/timer/sifive,clint.yaml b/Documentation/devicetree/bindings/timer/sifive,clint.yaml index fced6f2d8ecb..06c67f20ad3c 100644 --- a/Documentation/devicetree/bindings/timer/sifive,clint.yaml +++ b/Documentation/devicetree/bindings/timer/sifive,clint.yaml @@ -38,6 +38,7 @@ properties: - items: - enum: - allwinner,sun20i-d1-clint + - canaan,k230-clint - sophgo,cv1800b-clint - sophgo,cv1812h-clint - thead,th1520-clint From patchwork Sat Mar 23 12:12:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangyu Chen X-Patchwork-Id: 782124 Received: from out203-205-221-231.mail.qq.com (out203-205-221-231.mail.qq.com [203.205.221.231]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 76558DF53; Sat, 23 Mar 2024 12:12:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=203.205.221.231 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711195980; cv=none; b=WFdkJJmSwg3htmv0YDmWtOa7MuZi4IiH/ysiJ3TIsibA6Er7BCDqZuRDMue9KPes143BHCHIdF13RpunMueoKPqthIRg0I5nr10NOeUfLb/5E8L1RJxllSoFPTMlskfdFWmtt2X7cVnUZIPag4mMvjNuXUl3757oW/Cj1q3lRFk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711195980; c=relaxed/simple; bh=Y1c/TKrZBe7md/0bMLeqRF8QhF8uFJReg5l0Llwn/wE=; h=Message-ID:From:To:Cc:Subject:Date:In-Reply-To:References: MIME-Version; b=qvZrO3LO+Cvm0WDhJAJoKpPdydi0V2/orkmENP9L843OBxOYh3aD/F9q9F9vYCvNzIKtA7vn0aHIM08tWx1lS7+J2i2QwjY+HAOZtzD0FPUzqYfuuD0AVex2h+3UMThH7jLqFEufH+esi2QT8tgY2Z72JwOp1WyjDUfKuBJQsFc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cyyself.name; spf=none smtp.mailfrom=cyyself.name; dkim=pass (1024-bit key) header.d=qq.com header.i=@qq.com header.b=oe4YdMEb; arc=none smtp.client-ip=203.205.221.231 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cyyself.name Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=cyyself.name Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=qq.com header.i=@qq.com header.b="oe4YdMEb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1711195974; bh=gxGEA1zI0RM+I3kpAeG2Tfht93lBnbsfTrZDhfruV3g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oe4YdMEbiQc5uV1LuUQYsbJVkr5lPskAeflh8ityfnCtIngSgyiEaKLj5Kqt+Talt lXPKXc02rRHlbeD42KK4JUcBBSIOVjm4EbKVkdwgYQ4fIM8ngLK8sMmoaS9zsMDR/4 jLvgI3P98KYVK7Ix8a6/DRehhEl+gpmnnnKgZNVI= Received: from cyy-pc.lan ([240e:379:225d:8e00:b91:b2e7:7c69:8554]) by newxmesmtplogicsvrsza7-0.qq.com (NewEsmtp) with SMTP id 32594C7F; Sat, 23 Mar 2024 20:12:37 +0800 X-QQ-mid: xmsmtpt1711195971tonyfvaik Message-ID: X-QQ-XMAILINFO: OZZSS56D9fAj61jTOe54p85UExhdidaDwwLUsRR7zkr0fCV9v9nd4Trhy5U/Eq 1eGcetKRrVcRFO3+d6O2nKFy0N+YEo+zNX6QYJ9ZnWgZssmh5u3xAzfOpfnwl5RlmroYW/yhSJQF 60LUYBoW8b1fsDq42tXjLPaPVF3KU733xftgU82ZlqdK/QNHwp46Q/cUoF631vOe4FALQHsuJxOj Kd1q/A7swXqYqLzBNXSFYlqHEwHkBqF+0ynNFjt0tA78iN2l6c5bw/5p0SMQVBTKlDJ5XJSp4zdd i6MME9fypgZoQSnjtt9ArlyqC0/c+Ke+rdEyX95i/Q0m6Dbx1hJsmufb/4NbOzCdPH8kjj5OQIo0 KDihCCiVpuhO7G0PHq1W/LaODrU286x8Q42G0aUSZ/tscaeJDOXpthYPQ6Ju8+kQaNSxHXQr/Xbd swEIP1S7J8Cy9cVGrW0Vx34ggJZU+5w6sJwFChIKmu5A2yNySFrBVYMKPMFmVytPKOYIlsYuEbTP BkgJPEWvBnquRl2rhj+whKTWlFhApb1wAl2g6AlN9U4BalBUrLG6AV0r01mHxSGdFPuTmx3/WAc+ CAq2HW+hHmvDRZgspEjF2nftibfTjBFrzVgIbKaZckhv79V+fyqW/r3qjHHpNywIcl7WQbOjB5PJ kJlopcwYbeHjoD1Iwe3ejXaG9gSJQ+SmH7iFrV0xdV7TcewDi7TVaRtROP4HRsRyPyvaUVKfi3VA jXjqpDEzfHu5J8RCUEap75d8GL98b+tc9PWaIZrbEeP4TfCzDL+otr85+ZL4ZDW9NLvT+3QVT0I8 Uhl2/ctTuQx2Sbpa8iFNo1XRhF+qVYJ/l/TTH0YsDq3rrvayLu9mIrvGoJahhQEm8aW/whfM5Z7w JK8hRtfdweSf1DRhyYdiOUEVeOP1T+nOJCebiWLRaJCW301V9TOVa+fLf//rZ+j7PdJ7nHpkmklD JXGBfoM7Rc816OezvwWbabQUKZ4GTKd+zu9J4Sb9u6BAGRipM3Rx6pkgIoQwJe0FY2kcxA2B3LK9 otE2bCORE/acVXNzm4Bf1QM6wX2MXg82fHmFKZSA== X-QQ-XMRINFO: MSVp+SPm3vtS1Vd6Y4Mggwc= From: Yangyu Chen To: linux-riscv@lists.infradead.org Cc: Conor Dooley , Damien Le Moal , Rob Herring , Krzysztof Kozlowski , Paul Walmsley , Palmer Dabbelt , Albert Ou , Guo Ren , Michael Turquette , Stephen Boyd , Linus Walleij , Philipp Zabel , linux-gpio@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Yangyu Chen Subject: [PATCH v6 06/11] soc: canaan: Deprecate SOC_CANAAN and use SOC_CANAAN_K210 for K210 Date: Sat, 23 Mar 2024 20:12:18 +0800 X-OQ-MSGID: <20240323121223.1729328-6-cyy@cyyself.name> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Since SOC_FOO should be deprecated from patch [1], and cleanup for other SoCs is already on the mailing list [2,3,4], we remove the use of SOC_CANAAN and use ARCH_CANAAN for SoCs vendored by Canaan instead from now on. Thus, we should also change the Makefile here to use ARCH_CANAAN. Then, since we have introduced SOC_CANAAN_K210 for K210-specific drivers, we should replace its drivers depends on SOC_CANAAN_K210 and default select when it has the symbol SOC_CANAAN_K210. [1] https://lore.kernel.org/linux-riscv/20221121221414.109965-1-conor@kernel.org/ [2] https://lore.kernel.org/linux-riscv/20240305-praying-clad-c4fbcaa7ed0a@spud/ [3] https://lore.kernel.org/linux-riscv/20240305-fled-undrilled-41dc0c46bb29@spud/ [4] https://lore.kernel.org/linux-riscv/20240305-stress-earflap-d7ddb8655a4d@spud/ Signed-off-by: Yangyu Chen --- drivers/soc/Makefile | 2 +- drivers/soc/canaan/Kconfig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index ba8f5b5460e1..fb2bd31387d0 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -7,7 +7,7 @@ obj-y += apple/ obj-y += aspeed/ obj-$(CONFIG_ARCH_AT91) += atmel/ obj-y += bcm/ -obj-$(CONFIG_SOC_CANAAN) += canaan/ +obj-$(CONFIG_ARCH_CANAAN) += canaan/ obj-$(CONFIG_ARCH_DOVE) += dove/ obj-$(CONFIG_MACH_DOVE) += dove/ obj-y += fsl/ diff --git a/drivers/soc/canaan/Kconfig b/drivers/soc/canaan/Kconfig index 43ced2bf8444..3121d351fea6 100644 --- a/drivers/soc/canaan/Kconfig +++ b/drivers/soc/canaan/Kconfig @@ -2,9 +2,9 @@ config SOC_K210_SYSCTL bool "Canaan Kendryte K210 SoC system controller" - depends on RISCV && SOC_CANAAN && OF + depends on RISCV && SOC_CANAAN_K210 && OF depends on COMMON_CLK_K210 - default SOC_CANAAN + default SOC_CANAAN_K210 select PM select MFD_SYSCON help From patchwork Sat Mar 23 12:12:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangyu Chen X-Patchwork-Id: 782123 Received: from out203-205-251-80.mail.qq.com (out203-205-251-80.mail.qq.com [203.205.251.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 84ECD3E48F; Sat, 23 Mar 2024 12:13:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=203.205.251.80 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711195989; cv=none; b=hM4NCaWkQxd9sa9h2PtsYZk+vPeyL47LNp6C4KKR8dymx5O9GXPykzIljK6Y9N6oKSD+6oFgneHIhix291+T/Ur8jnGp8zJrxWDZomKjrQuUMW5yYUOOhsTbSc9mEsWx3R9wWZFukFxgs0gQYFShCJXlTFXuaI3goUmqk9iq5X0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711195989; c=relaxed/simple; bh=fL44BHoWJuapWxF1vtqLCKXKI7WigSwRHJtvP3wbc2Y=; h=Message-ID:From:To:Cc:Subject:Date:In-Reply-To:References: MIME-Version; b=opX+MwARtRk3sNJtncAqNmLw4erWNrtj4zPyuX/c8Cy5riaKfMQ2v+2iqowUgwW1WFg4Tp9SjrzKfdCoigESO+vsdRaPFT3XFbTZi6SvxwUqClGdoaJhZzWJtWs8QJDa2wMp0ufe7beObiZxyfcVg2gO4vRgcLqJe7mMVVYtb/s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cyyself.name; spf=none smtp.mailfrom=cyyself.name; dkim=pass (1024-bit key) header.d=qq.com header.i=@qq.com header.b=MKC5HAdf; arc=none smtp.client-ip=203.205.251.80 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cyyself.name Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=cyyself.name Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=qq.com header.i=@qq.com header.b="MKC5HAdf" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1711195979; bh=egExra67k3YChMagH1xWaPLg0q0pmTviVHV20R/fW7o=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MKC5HAdfQsc2nrepUgBhWJnE/tL7b02SiKi0mo9FTAxMctQZDX15Oh9wuiLxzK/ZI sdHiO4O/+7ma8K/3AOKHVgDP8i+XKoqKVwI/Fk7iMjMykn6Q9tyCWFfcn+7+a7ZzCD 93Uy3Tcxn42zE+6HWaBphoMX8QzW46XbWWQULazs= Received: from cyy-pc.lan ([240e:379:225d:8e00:b91:b2e7:7c69:8554]) by newxmesmtplogicsvrsza7-0.qq.com (NewEsmtp) with SMTP id 32594C7F; Sat, 23 Mar 2024 20:12:37 +0800 X-QQ-mid: xmsmtpt1711195976tu1lz28yh Message-ID: X-QQ-XMAILINFO: NkHKfw09D6j8RA6sM/aK2Q/rOau4mOSO9cg/EhJ5mg7yFfp/oYnklKbxnc9Xml RjF3T8lkX7vUn4LpjxulPMX3NLCENF6YShfieexD96piot1adQWkeEPkyG3XfvcwnTNUaKAOH1/1 cx4UGxRRe81wnfHJRJ5f/Iy1UQjpbnm/7am6aYwJdwUKfhE/LEa/cTNPrRKuFRRO1kxiJWfczI5D gP0XOQi9rHQXYiKTNrV62ln2IMuxkcLRafx5D8gw5dPhv50XDJk+ZX+qAVTmWBck/JIPQ1vUDsNN NaioEnqxq7csmhAzj6pK/E69MaKzrTVWtRwyI6Q+4AwECqjDDOLNgGEnAJOrS+/dKBKdqsxIaCPW tGf9NpWIYJ5cvo4JLK0Z620dhFZJiwnlpvF2MQOIJi0nWW5DazXZ9KLpf3AjrdiklumLHAFf6glf cyq8Cs8AWYbN3vd3c1/VcL8R9cVIokV1K1qb7g24/sfedFuQZg1C6yypM+b38LnxwZ9TBgyXQu6e j5paGDvYab9rBBSDO1eElUcjmeEdTZdJw4gVyyQCiQ+vzw6G7+9hq5pq5iEkT/lGeW0cNWFYikeF 1/80kIa/gJ+eoja4LHpO9fMYmFbwwUZXnufVOMrLi3Ht9L5sBLsXG417r6IBA/KTEEQ/zNWwz+WJ Mdys69aenjTnGvwWnAj7WXHFV/6ANDvaA21AobrgaO0ypImlPNtUUVH0gJ2mbWy5h1z0SK9HrL0+ H81Uv462A15s2nrEzwu+7bl+VeoG16V2qiX9YKrcjIIQuTKfOLXWkbTgxyyrAKGOSlArDsUMFCd4 JLgbLfdZilP/dHZ6WXTWCETd3/aky0wnbK8PX9YKb7x/N+A7X27eUcejnsdoZK+jIpjRCw19OfLs z0TSnieQZqyxk2aFqraahR5yYgwhSHPQfjwvy9eUARMmf7WoOJEbchDQBdJzynHCXqMyeQQGhu5l 6phj/wkl1FvQ2+ATXBIvoCVERXC7jHPbYXWRGKbwsRtxSeufy8F3jCPq2WVk5L7H7LtPFQhe//ls wpn3a9uzeRtVTQR8HS1pSuw18uPfAklNhF6+sWXqrxIbGenBOGFXGRiJ9Yjnk= X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= From: Yangyu Chen To: linux-riscv@lists.infradead.org Cc: Conor Dooley , Damien Le Moal , Rob Herring , Krzysztof Kozlowski , Paul Walmsley , Palmer Dabbelt , Albert Ou , Guo Ren , Michael Turquette , Stephen Boyd , Linus Walleij , Philipp Zabel , linux-gpio@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Yangyu Chen Subject: [PATCH v6 08/11] pinctrl: k210: Deprecate SOC_CANAAN and use SOC_CANAAN_K210 Date: Sat, 23 Mar 2024 20:12:20 +0800 X-OQ-MSGID: <20240323121223.1729328-8-cyy@cyyself.name> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Since SOC_FOO should be deprecated from patch [1], and cleanup for other SoCs is already on the mailing list [2,3,4], we remove the use of SOC_CANAAN and introduced SOC_CANAAN_K210 for K210-specific drivers, Thus, we replace its drivers depends on SOC_CANAAN_K210 and default select when it has the symbol SOC_CANAAN_K210. [1] https://lore.kernel.org/linux-riscv/20221121221414.109965-1-conor@kernel.org/ [2] https://lore.kernel.org/linux-riscv/20240305-praying-clad-c4fbcaa7ed0a@spud/ [3] https://lore.kernel.org/linux-riscv/20240305-fled-undrilled-41dc0c46bb29@spud/ [4] https://lore.kernel.org/linux-riscv/20240305-stress-earflap-d7ddb8655a4d@spud/ Signed-off-by: Yangyu Chen Acked-by: Linus Walleij --- drivers/pinctrl/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index d45657aa986a..1be05efccc29 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -235,13 +235,13 @@ config PINCTRL_INGENIC config PINCTRL_K210 bool "Pinctrl driver for the Canaan Kendryte K210 SoC" - depends on RISCV && SOC_CANAAN && OF + depends on RISCV && SOC_CANAAN_K210 && OF select GENERIC_PINMUX_FUNCTIONS select GENERIC_PINCONF select GPIOLIB select OF_GPIO select REGMAP_MMIO - default SOC_CANAAN + default SOC_CANAAN_K210 help Add support for the Canaan Kendryte K210 RISC-V SOC Field Programmable IO Array (FPIOA) controller. From patchwork Sat Mar 23 12:12:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangyu Chen X-Patchwork-Id: 782121 Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 94770F9EC; Sat, 23 Mar 2024 12:16:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=162.62.57.210 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711196195; cv=none; b=W0jNwPFfabX3NsERgXRMebG1DMF8Bhi4F4rOs9gV/5n1U9xO27f6yTDQO0r4wKh8xehGGvcDuU/WaDeGtjv5ersc53W/yDPgh4Bvk6MJPWKv+NAyYxmNWclIcTlsQEfJ23PqpHlXXJMt421kXAnSWVURFJJpQJ7bQf5eO3cOnZ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711196195; c=relaxed/simple; bh=VY/sGrXKFyoKGGx/9bHqzS7Eglr7oAp1+7lX9qZ4AZg=; h=Message-ID:From:To:Cc:Subject:Date:In-Reply-To:References: MIME-Version; b=QhqIgGIBPsosZ9rRtDIHKGf2jN6RS4J11qf911HEZXFHfuzzh5p/MWdMEX5/jcIdOZQr5tLCjdHMGAmF+6bfbMKX2jqDcZXedYFx7z7BiiKr0vYzuoRVLxQ/vivN9DzXn+BeDBefV7uzqMdNw2KqnJlwA/n19TU/kOmS+99c6z4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cyyself.name; spf=none smtp.mailfrom=cyyself.name; dkim=pass (1024-bit key) header.d=qq.com header.i=@qq.com header.b=a8s4ZS8k; arc=none smtp.client-ip=162.62.57.210 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cyyself.name Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=cyyself.name Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=qq.com header.i=@qq.com header.b="a8s4ZS8k" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1711196180; bh=prkqax1s/YPOiuAZGsCqzxUs5Mq7p8+18pkZu3zCxio=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=a8s4ZS8kCinMQEBfC4n1k5obHtzBvp5gzvBzqed8Nnssq0rwTndxYacsxzyXUW+st wHy/n0YQL4EP9q9C4S3jic7TMRZVRnccfac6+vjlcNQmI83SmVI6clLZHHivyscsTF Uh2cxZ7phT1z2gGyrjbwNwt1nItJTSmEhLK81N9E= Received: from cyy-pc.lan ([240e:379:225d:8e00:b91:b2e7:7c69:8554]) by newxmesmtplogicsvrsza7-0.qq.com (NewEsmtp) with SMTP id 32594C7F; Sat, 23 Mar 2024 20:12:37 +0800 X-QQ-mid: xmsmtpt1711195978tnmlc3wz9 Message-ID: X-QQ-XMAILINFO: OakVxA/3u/8RJY9aJxFZniVxmyjuv+LnRwH4BurKFJB3iN1qA6IOmp0/dMwmGq INFrrIaazWaGFoEuymArxkohE6PFoK5yiXKOvxcdoT8D5n8yfqfYPpSw9lGIHfmkVheMdL2z5pt0 9vYFjBFTEAEY+EHInLHRem7AesRCeGKMrAqbPsGPm+TSdIzUg3V1oZdW8RxDYENgg9ZXCa172B0X Gz9E7NicSdmTzdY63OFO0IpMvqmIYKgU9zdp4rBlsI8Qk/KLBkv1h9B5kv6aQ0SaKP5741c6C4S5 E3Iq2mOMUkKqWKHwYZg1gor5WBdZu8ZVnBQIzqYtoov5VFQ1c4HmlJyPm4UFb2WFhUi9aAnPuFSp KN0SpzT/ThmgnQAyKWIeXWocwRzmbCywWu44Xz2K5uVNTvecAfNCJU9ix6OL6tYUK2q8HpbX83GH gViqq84mYBnl+Bm363O6gQC4zoWydpo4DkEn6LOkYviXPxA0Qqzb5pDTPrbkf992jDcYTam1oAfe foBX6gMtX3rrhkDzUaSe+VaPutNlIArRzaZxkQIAB/FSiabGD46XrQw4k69xJjbq5eZNwBxgLPuJ hH51Kge4KnM0dXNQ9backIuoneNkl4OOY2aq7RtHibNy6QPDNJTXz0Gu77EOm9hmlK+b35BpZ5Ju x3CIFB8ZFxyg7XWghwzcbFwhZP4nB02cDxH6ykrVePXY3xsCOsCJWqt6eZaw42KDtBfc3+WSjkhA EiEgZyMUFMOxicnQKkk76Q1Sp7AaqA7KL68slHTRz+1Mcgr5EfjPVjhAKaZNl5v8zOg9KpT4dUGJ y2qv4l97K1/Y6Yi59CMw/oJp1UGHwgv1aFrDOoGJCC8A+0WvSw8fqjjIWHvaAup+IBbPXpKov/sj WKND29wrN3sXj/qLz8nerguDF8O3J7BK6292HjwkRrqMI43CiUABAbmOkDEV20yniYCkedSicui7 4tIllPcH6NX0I8haL2cqKlQGACvNOVHe3nC6DzRoUjkkQbXcCz797BdLeuxoyVKqfKc4azC6aRlf 0ZPUJNzOvSY7aatIEhBh2IOxOy3OZPVkBVmsCYLPt0JNw1gx6P5OrZEaBgF2+9awiLpvTbWWx00E pnjcW2v7rt+3Y9oUA= X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Yangyu Chen To: linux-riscv@lists.infradead.org Cc: Conor Dooley , Damien Le Moal , Rob Herring , Krzysztof Kozlowski , Paul Walmsley , Palmer Dabbelt , Albert Ou , Guo Ren , Michael Turquette , Stephen Boyd , Linus Walleij , Philipp Zabel , linux-gpio@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Yangyu Chen Subject: [PATCH v6 09/11] reset: k210: Deprecate SOC_CANAAN and use SOC_CANAAN_K210 Date: Sat, 23 Mar 2024 20:12:21 +0800 X-OQ-MSGID: <20240323121223.1729328-9-cyy@cyyself.name> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Since SOC_FOO should be deprecated from patch [1], and cleanup for other SoCs is already on the mailing list [2,3,4,5], we remove the use of SOC_CANAAN and introduced SOC_CANAAN_K210 for K210-specific drivers, Thus, we replace its drivers depends on SOC_CANAAN_K210 and default select when it has the symbol SOC_CANAAN_K210. [1] https://lore.kernel.org/linux-riscv/20221121221414.109965-1-conor@kernel.org/ [2] https://lore.kernel.org/linux-riscv/20240305-praying-clad-c4fbcaa7ed0a@spud/ [3] https://lore.kernel.org/linux-riscv/20240305-fled-undrilled-41dc0c46bb29@spud/ [4] https://lore.kernel.org/linux-riscv/20240305-stress-earflap-d7ddb8655a4d@spud/ [5] https://lore.kernel.org/linux-riscv/20240305-praying-clad-c4fbcaa7ed0a@spud/ Signed-off-by: Yangyu Chen --- drivers/reset/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index 85b27c42cf65..7112f5932609 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -103,9 +103,9 @@ config RESET_INTEL_GW config RESET_K210 bool "Reset controller driver for Canaan Kendryte K210 SoC" - depends on (SOC_CANAAN || COMPILE_TEST) && OF + depends on (SOC_CANAAN_K210 || COMPILE_TEST) && OF select MFD_SYSCON - default SOC_CANAAN + default SOC_CANAAN_K210 help Support for the Canaan Kendryte K210 RISC-V SoC reset controller. Say Y if you want to control reset signals provided by this From patchwork Sat Mar 23 12:12:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangyu Chen X-Patchwork-Id: 782122 Received: from out203-205-221-209.mail.qq.com (out203-205-221-209.mail.qq.com [203.205.221.209]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3AC9F18057; Sat, 23 Mar 2024 12:13:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=203.205.221.209 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711195996; cv=none; b=KVDRLM1WbRQUchNwGs92rYfkilERQdDg1fMrRKz22bHHIKRFc8SUjiIDl/y3m0AcKYld+cjn0VRV3JZGPGIGpEG89lnF24DNgcHFfzniDR8JygTzJuCzEoO+kQ+xXH4ljrWI/pyWoRvSaVzfeIEADr2lwWZqYNQXtU/TV2rgft8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711195996; c=relaxed/simple; bh=ltIIjFq44lCINtdu+jtCNpd5iuP8k5qJZbXbXOcOLIs=; h=Message-ID:From:To:Cc:Subject:Date:In-Reply-To:References: MIME-Version; b=G33RXr/PhdOWfOcAnUfdrKqm+F9c9+Fav5RcUWUg/zEMVOVyCx7/mHTyI8d74FMzt/T7f7V0nERUwdy0OONJJXt6w1Pg1I9wO+UO/T2utsnTnoNS0JpQI02aDmallbrRE3fAgCHnDG1XNYDRx9WhTaxwnmdlh3b8WamAspYGjXs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cyyself.name; spf=none smtp.mailfrom=cyyself.name; dkim=pass (1024-bit key) header.d=qq.com header.i=@qq.com header.b=VEe9MiCE; arc=none smtp.client-ip=203.205.221.209 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cyyself.name Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=cyyself.name Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=qq.com header.i=@qq.com header.b="VEe9MiCE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1711195987; bh=zZkfplMllcGZXaAHOpijHZhZw8UR9G8J39uQSbllctQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VEe9MiCEtSL6XIltfGKIjLdJxBdxoTn2ftxcoAjvNgs8mgWi6Hc4ZFvXfxk4qV78v LMkqn9i5HrQSj9zqCSt4l3lCB1FeeNK+Jnl+q6QmuLUd0QeYaRynuZGVq6CL/Xo5EZ 0LwnexVF/dJ2+3cU7B8emJDUWlk4Wc9DSjJZJwy0= Received: from cyy-pc.lan ([240e:379:225d:8e00:b91:b2e7:7c69:8554]) by newxmesmtplogicsvrsza7-0.qq.com (NewEsmtp) with SMTP id 32594C7F; Sat, 23 Mar 2024 20:12:37 +0800 X-QQ-mid: xmsmtpt1711195983tnrpaiiik Message-ID: X-QQ-XMAILINFO: MR/iVh5QLeiexUNVyYWNTlxWuqPcHDTGFQ3bWaqzeOLy8Zyn+2kMxyOmMrE2U2 rhfI7jZQWix3KgacKtk28pjhwFUQiLgDzU5037aHSyAs3/RXqBbGThIBIbA/eGmP6hZW5fA4wjlM PpH3YVcID2ZBakBIwLuuzMIuRXsdSOhoL5pnk1VRRrpdZHPDs9ZPKgIVpfiUKKu08OHqweEWQcB9 Lq4Q/nSvRQoCXqrv3KO2Mp3h601TscUSkhdj9bOjQ9piDqkZXasTuxgbJrIm9veGmTtvT19fKi3P c1BwQevO35E6KGoeX/mTpfBkgIPiRqw79j2iOLtEU3WRGDBTOvspZ2sQYxJkGvkuu4BctknDajTO wvl+Khec4apVpV3fLqLJZAL/D8LhjN53S8qhS00UJqLmu58Qlx8jprnY8Fdme51PgvDw15VtoK3a Vmvt29QUZpVkqDQ7lAJ6AyeiomaUCN/yxQPgSQ1KiNPOes4Je3sHfJFyT+QVPeYKUofZztCEJY94 yAOmAUUVFzVBU9h1VmqgIPWZ7kNT8U/cZ94jqXGhiUZncNpFZNjqilFKkVOmdgBvLMA4MkNItQLW pVKpZq/abV/uyxTK5H8b4IpcH9+nYJ4Dt6vD24GXkmvZfaLXkYjAWlyNIi8J8/FaPPGkVD3FpGj2 wmxXzV/cBctc3lEyzcuTZHxdRjNzehljX0fewMO8WN/qcyMqBRybfRlNUF9zs0Pl57OeMm4Akifi RK1h54ASYwhVV48x3tfgcW6ub21X+xz2uhhNemVFgmk6zxASYR1TWYYn0+rI7YQLb5mmQSXWzCTN dlKa+ZC+qMmMBQJa7lDKmsRDxzSV1m0aaKcVMaMVPmCU7KUl/fYKvlCrAiPO4m3fuhLXBngJiBOq lKoKaYv7t4vvlRQf8AOyjfB1cEljZwGMzu4IR9tIj29vrCi3cQaFoc1UVAkGtRY5tFgTZuyFG8Vp lSqT3o+LCj5LY/WC9Ak0M73eRjjQkb3ObLk+Z0zU4TG/EFMqxFVbC0A72qNhar5/TyLolEi2TZMm r2+9PEpn35jlVcVI6AUQ6CioywxOo= X-QQ-XMRINFO: Mp0Kj//9VHAxr69bL5MkOOs= From: Yangyu Chen To: linux-riscv@lists.infradead.org Cc: Conor Dooley , Damien Le Moal , Rob Herring , Krzysztof Kozlowski , Paul Walmsley , Palmer Dabbelt , Albert Ou , Guo Ren , Michael Turquette , Stephen Boyd , Linus Walleij , Philipp Zabel , linux-gpio@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Yangyu Chen , Conor Dooley Subject: [PATCH v6 11/11] riscv: config: enable ARCH_CANAAN in defconfig Date: Sat, 23 Mar 2024 20:12:23 +0800 X-OQ-MSGID: <20240323121223.1729328-11-cyy@cyyself.name> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Since K230 has been supported, allow ARCH_CANAAN to be selected to build dt and drivers for it in defconfig. Signed-off-by: Yangyu Chen Reviewed-by: Conor Dooley Reviewed-by: Guo Ren --- arch/riscv/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig index eaf34e871e30..1d5524cdd47d 100644 --- a/arch/riscv/configs/defconfig +++ b/arch/riscv/configs/defconfig @@ -33,6 +33,7 @@ CONFIG_SOC_STARFIVE=y CONFIG_ARCH_SUNXI=y CONFIG_ARCH_THEAD=y CONFIG_SOC_VIRT=y +CONFIG_ARCH_CANAAN=y CONFIG_SMP=y CONFIG_HOTPLUG_CPU=y CONFIG_PM=y