From patchwork Fri Jul 7 14:04:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 700778 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 04900C001DE for ; Fri, 7 Jul 2023 14:04:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231623AbjGGOEt (ORCPT ); Fri, 7 Jul 2023 10:04:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231565AbjGGOEs (ORCPT ); Fri, 7 Jul 2023 10:04:48 -0400 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 600371FEA for ; Fri, 7 Jul 2023 07:04:45 -0700 (PDT) Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-2b6f97c7115so29181071fa.2 for ; Fri, 07 Jul 2023 07:04:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688738683; x=1691330683; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yrp8wl+UMMsfs1jvuX8kePskLzEjhfOLcdCCjv/24Fs=; b=dh/zABAXgmfBtINbeAHubt+OwDStiqoiZtpcpPlQfiN+JMvejHq++/4MJF0NzMa6Ns R9gctkOnzCUbXEmytYwpVTz5+X86UHBL/qOqtlItNMI2v1zq4UE8kjZiUaN3Wex5u6u/ athNyI8ijb8lO9iNp+XvG0k166u+cGDobwtkYcLjsHkguIWgDVgSQiLRNFKyk64VSJss 0qWTkQxY4mM2eUnbhilyftrsCITH00i1kdq1/yUVl8GM53VzhxyFp9+c2XVqaTFtQD9X MRNK8P/zQOZdBBYs5h3hbpNJrKjcr6qhtgOoRcUasfoAduauRphpU7NOFtLyAJZ/ivrj bMjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688738683; x=1691330683; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yrp8wl+UMMsfs1jvuX8kePskLzEjhfOLcdCCjv/24Fs=; b=Rjnpxk8TejRAbRAT+ANcG20LH79KvumqisgMxuTs9MyqJiYhZGqoXwHyxm/xsyaRe9 KaBoCyFL7pKW9AFxdV9b8ezI/SeKs0UjBsSSpDYlWhdEg71eaLPRU7oB/G1EU5zU6aQv Ln+EzXDHxgeIzXefaOpx2hnBlxfwRvIqVqvj23wfwJLHdQqe6Cd12QhQ85EUm3WR9bVI cYp4j03BU16wynrNYieF+/c4B7YKpIwOnTWko+PSWmI5jexk5RSvClzXauPpQ0bup8j9 gjYqfqTqdhJz7zMkoDxUkXCbR6s9BfifUJKAhwGqzNsW/DpPgsUmm7/HtMgMU/aOOYuX kosg== X-Gm-Message-State: ABy/qLbsHvFTfdhWuf51w+8/6qVPoaFQv0tFeC7eSOrT5tUkfgqKMf5G AgmhtWUoJtCUbnTgxmx642gBbw== X-Google-Smtp-Source: APBJJlEAadQSl1mZnQ3nQPXS80mjFk4GuAmuVnheGqj1sTrUfPnOZEUKr/HfbJpFDZ3GOAAEpJZk/A== X-Received: by 2002:a2e:9d59:0:b0:2b6:d5af:1160 with SMTP id y25-20020a2e9d59000000b002b6d5af1160mr3628897ljj.28.1688738683616; Fri, 07 Jul 2023 07:04:43 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id u21-20020a2e8555000000b002b6cb25e3f1sm760341ljj.108.2023.07.07.07.04.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 07:04:43 -0700 (PDT) From: Ulf Hansson To: Arnd Bergmann , Olof Johansson Cc: Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 01/18] genpd: Create a new subsystem directory to host genpd providers Date: Fri, 7 Jul 2023 16:04:17 +0200 Message-Id: <20230707140434.723349-2-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707140434.723349-1-ulf.hansson@linaro.org> References: <20230707140434.723349-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org There are currently ~60 users of the genpd provider interface, which implementations are sprinkled across various subsystems. To simplify with maintenance let's create a new subsystem (drivers/genpd) and start moving the providers in there. My intention is also to host a git tree to collect and to get the patches tested/integrated through the linux-next tree. Ideally this should release some of the burden on the soc maintainers. Note that, I will of course require acks/reviews from the current platform maintainers, hence the MAINTAINERS file needs to be updated accordingly for each genpd provider that is moved into the new genpd subsystem. Signed-off-by: Ulf Hansson --- MAINTAINERS | 7 +++++++ drivers/Makefile | 1 + drivers/genpd/Makefile | 1 + 3 files changed, 9 insertions(+) create mode 100644 drivers/genpd/Makefile diff --git a/MAINTAINERS b/MAINTAINERS index 15ce1f07d9f7..588769fab516 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8663,6 +8663,13 @@ F: Documentation/devicetree/bindings/power/power?domain* F: drivers/base/power/domain*.c F: include/linux/pm_domain.h +GENERIC PM DOMAIN PROVIDERS +M: Ulf Hansson +L: linux-pm@vger.kernel.org +S: Supported +T: git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/pm.git +F: drivers/genpd/ + GENERIC RESISTIVE TOUCHSCREEN ADC DRIVER M: Eugen Hristev L: linux-input@vger.kernel.org diff --git a/drivers/Makefile b/drivers/Makefile index 7241d80a7b29..cffac5b8c092 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -45,6 +45,7 @@ obj-$(CONFIG_DMADEVICES) += dma/ # SOC specific infrastructure drivers. obj-y += soc/ +obj-$(CONFIG_PM_GENERIC_DOMAINS) += genpd/ obj-y += virtio/ obj-$(CONFIG_VDPA) += vdpa/ diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile new file mode 100644 index 000000000000..a4e40e534e6a --- /dev/null +++ b/drivers/genpd/Makefile @@ -0,0 +1 @@ +# SPDX-License-Identifier: GPL-2.0-only From patchwork Fri Jul 7 14:04:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 700301 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 284CEC001DF for ; Fri, 7 Jul 2023 14:04:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229460AbjGGOEu (ORCPT ); Fri, 7 Jul 2023 10:04:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232079AbjGGOEt (ORCPT ); Fri, 7 Jul 2023 10:04:49 -0400 Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DDE1F2108 for ; Fri, 7 Jul 2023 07:04:46 -0700 (PDT) Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2b703a0453fso30073341fa.3 for ; Fri, 07 Jul 2023 07:04:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688738685; x=1691330685; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hPh7xpb+blxJOGL61tBABmnFabAnXMzH94T37+TZKIU=; b=OYtqzWJ1PJ7FCuYSNQ+dAygCRK8lPvqtxdpNPu1QU3Rw192tE+zN3da777aLp+ruXx n3LTfqvg//u0BGWzeJgmfuadvspgJZf+2d+zzfmMEIMG+Bebbq2hSvg19s3ec6XRP4XT IV7jV5XVxnEf061w1053kPlgp5KbCwsPSCF9msjIYNJqxW61Ic2EpbNXVcExplOwEXBV GvdRlehmIDZZDLhSSBEFX/wYxLKTyOKxrh6S59XSVVUZJt8oRrrJga4W/HBkU3IELXlb obIhftvh/9H0o5Ny9Ksl5PO8i0lGhJlP7npaBa7JSV3uOIYe9aVfS6CB5+BCIBHKj55O wngA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688738685; x=1691330685; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hPh7xpb+blxJOGL61tBABmnFabAnXMzH94T37+TZKIU=; b=mFQ4D5OeL7b9ptFl7CAo+MuuOOEUJzSVUWJDINAHtGHLfhM4OegJHo2MKTjJdzcFa8 HiK/ZzJjL4AjAFMJ69fwHuYFYzQP9g9jqutbUZ8EvGmYH3hlfZw0ZuNSK8RICYEj9mD5 9GI/Z4hzPOU0KICHcCjWVIdgbc3d7PC5VM8LA101UkbTtEHnecrGL8dvy7rYYZ6axJ0i k1aph9Yym8sVYIGV2OUF6hQ/ZktPrqLThvCHS9DLSixzwxuRrhSw2zcgSaJnC9lPQ2Pt dHhbakYNJwxL8LCwG/+/dOy/qjV6+ly31lvQMt21lt/P9X0ZINoyrTY/JEJ7WQEbT/He l6ag== X-Gm-Message-State: ABy/qLYTkVse8Cpo2mfmwE1LGpdLCdnDOTmqvgczT9tp8gS3Dc8uT924 AzmXb6atvpGl/Xn+V815Q+QG7A== X-Google-Smtp-Source: APBJJlE0OVlckxhKJTRERTMlLjuSyKJAjas/JvbXx/qdJGpg6nQ4zMBGxkEoII0Gpm9P3dNltK7VnA== X-Received: by 2002:a2e:b045:0:b0:2b6:e618:b597 with SMTP id d5-20020a2eb045000000b002b6e618b597mr4795078ljl.28.1688738684950; Fri, 07 Jul 2023 07:04:44 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id u21-20020a2e8555000000b002b6cb25e3f1sm760341ljj.108.2023.07.07.07.04.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 07:04:44 -0700 (PDT) From: Ulf Hansson To: Arnd Bergmann , Olof Johansson Cc: Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andreas_F=C3=A4rber?= , Manivannan Sadhasivam , linux-actions@lists.infradead.org Subject: [PATCH 02/18] soc: actions: Move power-domain driver to the genpd dir Date: Fri, 7 Jul 2023 16:04:18 +0200 Message-Id: <20230707140434.723349-3-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707140434.723349-1-ulf.hansson@linaro.org> References: <20230707140434.723349-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Cc: "Andreas Färber" Cc: Manivannan Sadhasivam Cc: Signed-off-by: Ulf Hansson --- drivers/genpd/Makefile | 1 + drivers/genpd/actions/Makefile | 2 ++ drivers/{soc => genpd}/actions/owl-sps.c | 0 drivers/soc/actions/Makefile | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 drivers/genpd/actions/Makefile rename drivers/{soc => genpd}/actions/owl-sps.c (100%) diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index a4e40e534e6a..a2d5b2095915 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -1 +1,2 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-y += actions/ diff --git a/drivers/genpd/actions/Makefile b/drivers/genpd/actions/Makefile new file mode 100644 index 000000000000..e78c420a2454 --- /dev/null +++ b/drivers/genpd/actions/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0+ +obj-$(CONFIG_OWL_PM_DOMAINS) += owl-sps.o diff --git a/drivers/soc/actions/owl-sps.c b/drivers/genpd/actions/owl-sps.c similarity index 100% rename from drivers/soc/actions/owl-sps.c rename to drivers/genpd/actions/owl-sps.c diff --git a/drivers/soc/actions/Makefile b/drivers/soc/actions/Makefile index 4db9e7b050e5..4ac88fec2050 100644 --- a/drivers/soc/actions/Makefile +++ b/drivers/soc/actions/Makefile @@ -1,4 +1,3 @@ # SPDX-License-Identifier: GPL-2.0+ obj-$(CONFIG_OWL_PM_DOMAINS_HELPER) += owl-sps-helper.o -obj-$(CONFIG_OWL_PM_DOMAINS) += owl-sps.o From patchwork Fri Jul 7 14:04:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 700777 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 164CCEB64DA for ; Fri, 7 Jul 2023 14:04:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232079AbjGGOEv (ORCPT ); Fri, 7 Jul 2023 10:04:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232159AbjGGOEt (ORCPT ); Fri, 7 Jul 2023 10:04:49 -0400 Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3A2311B for ; Fri, 7 Jul 2023 07:04:47 -0700 (PDT) Received: by mail-lj1-x232.google.com with SMTP id 38308e7fff4ca-2b6f9edac8dso29134921fa.3 for ; Fri, 07 Jul 2023 07:04:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688738686; x=1691330686; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aeh5/DbFBerqxJsBbnsYRr6PKdng0uv/R2Q5wv9639U=; b=jGLVwn36CByMCtipg4d4XALkBRUKqWv0R6HZTUXklQUvDJCclxU+zkrJfwUnRo44Qe pW2zszr5s3fk0xHaK2wfVsPmyWtLdTYXuKiKvKMKOA06bG0PaUXzAvBNvb8+9Onh2wQ1 KXLzplmLECGVgtrwD6mmd7fkyHTUKy6kxTcK/V12edvM6fP6tTHaQ1LTTZ0h9Kroy86I jAXka0FZW5Y9jTSJ23RUg4fA6UWNK1PtrrzWg+4QF9a1d/WACYvlNPx0YM4os7nNXclf dxEhJDmLqgC5UqiNQsKWpF8Wqly/n71ODUYAKiD6dFXtmP5Hm/Md/cb1hKjYE6rZPYWQ joDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688738686; x=1691330686; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aeh5/DbFBerqxJsBbnsYRr6PKdng0uv/R2Q5wv9639U=; b=idLov6eGunsmoPzRcDiq12z4aJnbE5uikqxsIsxX/exiLudlTOSHWlrRbOmPmr7rPj nZhT4BQFBwf2QR1TsrKdT19ChvafYaVZzK87QbGbWBmFB9bhcs791V16V3+j3j+Z6B/T sC1LCMax0IJ/Wxk5/9r8FwwOuGBTy7VjBZ7CixdP0piy5YTSKT7AHlgidkeLuanISrwb T/YO7h0S3wpq/ttNIUKm1QqK8fFPbAdOSs9YPIQDs/Upj3CVXPOZQyzFXKB26aNkUrVP xbYqBV2hrENSLnuDkgyx/PMmcd9VLeSu48ftQ9wb+90D9rpNTH4SWlX6Kzu9GMNXiudr dTzw== X-Gm-Message-State: ABy/qLaC3Q+h3TmMuQKjSN3rLTiCqPw36Y9yffkwfIuGnbUiC0yW1tEj 6+PkzLqoVi48dWMwXjq6yn0vDg== X-Google-Smtp-Source: APBJJlGU4sWqpzDzusqijcw45XQ/FfxTFm8i0SwYKzBkADAqexI/4PhgDGiNTsaHIZds4E4hrP/oDg== X-Received: by 2002:a05:651c:201:b0:2b6:dbc5:5ca4 with SMTP id y1-20020a05651c020100b002b6dbc55ca4mr3496861ljn.16.1688738686129; Fri, 07 Jul 2023 07:04:46 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id u21-20020a2e8555000000b002b6cb25e3f1sm760341ljj.108.2023.07.07.07.04.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 07:04:45 -0700 (PDT) From: Ulf Hansson To: Arnd Bergmann , Olof Johansson Cc: Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , linux-amlogic@lists.infradead.org Subject: [PATCH 03/18] soc: amlogic: Move power-domain drivers to the genpd dir Date: Fri, 7 Jul 2023 16:04:19 +0200 Message-Id: <20230707140434.723349-4-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707140434.723349-1-ulf.hansson@linaro.org> References: <20230707140434.723349-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Cc: Neil Armstrong Cc: Kevin Hilman Cc: Jerome Brunet Cc: Martin Blumenstingl Cc: Signed-off-by: Ulf Hansson --- MAINTAINERS | 1 + drivers/genpd/Makefile | 1 + drivers/genpd/amlogic/Makefile | 4 ++++ drivers/{soc => genpd}/amlogic/meson-ee-pwrc.c | 0 drivers/{soc => genpd}/amlogic/meson-gx-pwrc-vpu.c | 0 drivers/{soc => genpd}/amlogic/meson-secure-pwrc.c | 0 drivers/soc/Makefile | 1 - drivers/soc/amlogic/Makefile | 3 --- 8 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 drivers/genpd/amlogic/Makefile rename drivers/{soc => genpd}/amlogic/meson-ee-pwrc.c (100%) rename drivers/{soc => genpd}/amlogic/meson-gx-pwrc-vpu.c (100%) rename drivers/{soc => genpd}/amlogic/meson-secure-pwrc.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 588769fab516..9b8c9ae2375d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1843,6 +1843,7 @@ F: Documentation/devicetree/bindings/phy/amlogic* F: arch/arm/boot/dts/amlogic/ F: arch/arm/mach-meson/ F: arch/arm64/boot/dts/amlogic/ +F: drivers/genpd/amlogic/ F: drivers/mmc/host/meson* F: drivers/phy/amlogic/ F: drivers/pinctrl/meson/ diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index a2d5b2095915..cdba3b9f0c75 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only obj-y += actions/ +obj-y += amlogic/ diff --git a/drivers/genpd/amlogic/Makefile b/drivers/genpd/amlogic/Makefile new file mode 100644 index 000000000000..3d58abd574f9 --- /dev/null +++ b/drivers/genpd/amlogic/Makefile @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_MESON_GX_PM_DOMAINS) += meson-gx-pwrc-vpu.o +obj-$(CONFIG_MESON_EE_PM_DOMAINS) += meson-ee-pwrc.o +obj-$(CONFIG_MESON_SECURE_PM_DOMAINS) += meson-secure-pwrc.o diff --git a/drivers/soc/amlogic/meson-ee-pwrc.c b/drivers/genpd/amlogic/meson-ee-pwrc.c similarity index 100% rename from drivers/soc/amlogic/meson-ee-pwrc.c rename to drivers/genpd/amlogic/meson-ee-pwrc.c diff --git a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c b/drivers/genpd/amlogic/meson-gx-pwrc-vpu.c similarity index 100% rename from drivers/soc/amlogic/meson-gx-pwrc-vpu.c rename to drivers/genpd/amlogic/meson-gx-pwrc-vpu.c diff --git a/drivers/soc/amlogic/meson-secure-pwrc.c b/drivers/genpd/amlogic/meson-secure-pwrc.c similarity index 100% rename from drivers/soc/amlogic/meson-secure-pwrc.c rename to drivers/genpd/amlogic/meson-secure-pwrc.c diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index 3b0f9fb3b5c8..dc93e1762ca7 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -23,7 +23,6 @@ obj-y += mediatek/ obj-y += microchip/ obj-y += nuvoton/ obj-y += pxa/ -obj-y += amlogic/ obj-y += qcom/ obj-y += renesas/ obj-y += rockchip/ diff --git a/drivers/soc/amlogic/Makefile b/drivers/soc/amlogic/Makefile index 7b8c5d323f5c..c25f835e6a26 100644 --- a/drivers/soc/amlogic/Makefile +++ b/drivers/soc/amlogic/Makefile @@ -2,7 +2,4 @@ obj-$(CONFIG_MESON_CANVAS) += meson-canvas.o obj-$(CONFIG_MESON_CLK_MEASURE) += meson-clk-measure.o obj-$(CONFIG_MESON_GX_SOCINFO) += meson-gx-socinfo.o -obj-$(CONFIG_MESON_GX_PM_DOMAINS) += meson-gx-pwrc-vpu.o obj-$(CONFIG_MESON_MX_SOCINFO) += meson-mx-socinfo.o -obj-$(CONFIG_MESON_EE_PM_DOMAINS) += meson-ee-pwrc.o -obj-$(CONFIG_MESON_SECURE_PM_DOMAINS) += meson-secure-pwrc.o From patchwork Fri Jul 7 14:04:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 700300 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 5FCE8C001DE for ; Fri, 7 Jul 2023 14:04:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232570AbjGGOEw (ORCPT ); Fri, 7 Jul 2023 10:04:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232277AbjGGOEu (ORCPT ); Fri, 7 Jul 2023 10:04:50 -0400 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1FE31FE8 for ; Fri, 7 Jul 2023 07:04:48 -0700 (PDT) Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-2b6f52e1c5cso30064281fa.1 for ; Fri, 07 Jul 2023 07:04:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688738687; x=1691330687; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4sXML62c+yFPRbDSYafRH6BnTPPBo1FmIeRXiEVvoz4=; b=g98aymrYA8zDV231rNQrnKVclgn0H4N2GuKBHsDELfkIsb0QnjTG+ctQIIUKnsWp4j KmOS6OWL/v9qyQ4XJd6FfjVwDiWnrqc2pKx7o5isTpnv0fAnu1u9EMhCx1rKcOai/T+A NidHb/FTvnfSgxVZkDobhZULe2O2ZFb9+zsDrGAWHovltbC/H05f3+0PZIjGEZX8JjI4 NpJOBLsouVPK1cC0stSkPj8pngbmsepUrwZF9KqXyd+tvMfPo/mXiH9KrglvOu8U0KT7 riRdun6q9E1utBztnSJHShXUjHwCMwxUVms9fnYEAWlaQh7GqRbESAqE8ssFQiHxIuBK ldNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688738687; x=1691330687; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4sXML62c+yFPRbDSYafRH6BnTPPBo1FmIeRXiEVvoz4=; b=HMWbhaHKsVMRXLVBy+w2qeEFBxH+Qx0cyQODRy7KFLUgnjaBh2rR5okzgdYqkEBQaY 39tFojyVvkj1TjkleTWFxfNQkeCJep/hRb7G9a5d+GVNfQRVHtOIC4U78Q0ga6zMmIkV yw2SVgX1Hn51sisOvHS6nLioIFJx7F2tZ89cdFLVsfZ6xWd5hZ7Z1ESbaQpGXYiFFx53 9z5+7dskSBLewjkyNlctN/czq+nI11BGneaYP0uv+iQMBwoGhWYKkB6DL55ef+nD01iQ RA20PiN4wfQXFihXbbzObl704TNNASHtiPyLskzWX8p6zyhdiTP8E9QSm0VvB/e9kbAQ TJBQ== X-Gm-Message-State: ABy/qLZvmYjBxTauO6enGjA84zUvdum9UkWvp9KN22UnyN1Wka7ABZhC sNV1/S4YrNrcw6tpZ82FenBrFQ== X-Google-Smtp-Source: APBJJlFJRHcHjPxKIKBEsHDjPcXRyoiBK2mBftJUZjn4Ch6s3fn8Za1if7mpBpiPudhx2Cm45tyKyA== X-Received: by 2002:a2e:a0d7:0:b0:2b6:e536:a2a3 with SMTP id f23-20020a2ea0d7000000b002b6e536a2a3mr4569253ljm.19.1688738687256; Fri, 07 Jul 2023 07:04:47 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id u21-20020a2e8555000000b002b6cb25e3f1sm760341ljj.108.2023.07.07.07.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 07:04:46 -0700 (PDT) From: Ulf Hansson To: Arnd Bergmann , Olof Johansson Cc: Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Hector Martin , Sven Peter , Alyssa Rosenzweig , asahi@lists.linux.dev Subject: [PATCH 04/18] soc: apple: Move power-domain driver to the genpd dir Date: Fri, 7 Jul 2023 16:04:20 +0200 Message-Id: <20230707140434.723349-5-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707140434.723349-1-ulf.hansson@linaro.org> References: <20230707140434.723349-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Cc: Hector Martin Cc: Sven Peter Cc: Alyssa Rosenzweig Cc: Signed-off-by: Ulf Hansson --- MAINTAINERS | 1 + drivers/genpd/Makefile | 1 + drivers/genpd/apple/Makefile | 2 ++ .../apple/apple-pmgr-pwrstate.c => genpd/apple/pmgr-pwrstate.c} | 0 drivers/soc/apple/Makefile | 2 -- 5 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 drivers/genpd/apple/Makefile rename drivers/{soc/apple/apple-pmgr-pwrstate.c => genpd/apple/pmgr-pwrstate.c} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 9b8c9ae2375d..98a6847c8c3b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1904,6 +1904,7 @@ F: drivers/bluetooth/hci_bcm4377.c F: drivers/clk/clk-apple-nco.c F: drivers/cpufreq/apple-soc-cpufreq.c F: drivers/dma/apple-admac.c +F: drivers/genpd/apple/ F: drivers/i2c/busses/i2c-pasemi-core.c F: drivers/i2c/busses/i2c-pasemi-platform.c F: drivers/iommu/apple-dart.c diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index cdba3b9f0c75..91d4a3808981 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only obj-y += actions/ obj-y += amlogic/ +obj-y += apple/ diff --git a/drivers/genpd/apple/Makefile b/drivers/genpd/apple/Makefile new file mode 100644 index 000000000000..53665af630be --- /dev/null +++ b/drivers/genpd/apple/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_APPLE_PMGR_PWRSTATE) += pmgr-pwrstate.o diff --git a/drivers/soc/apple/apple-pmgr-pwrstate.c b/drivers/genpd/apple/pmgr-pwrstate.c similarity index 100% rename from drivers/soc/apple/apple-pmgr-pwrstate.c rename to drivers/genpd/apple/pmgr-pwrstate.c diff --git a/drivers/soc/apple/Makefile b/drivers/soc/apple/Makefile index 20feee6f3943..302ec8184535 100644 --- a/drivers/soc/apple/Makefile +++ b/drivers/soc/apple/Makefile @@ -1,6 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_APPLE_PMGR_PWRSTATE) += apple-pmgr-pwrstate.o - obj-$(CONFIG_APPLE_MAILBOX) += apple-mailbox.o apple-mailbox-y = mailbox.o From patchwork Fri Jul 7 14:04:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 700776 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 ED7B7C001B0 for ; Fri, 7 Jul 2023 14:04:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232710AbjGGOE6 (ORCPT ); Fri, 7 Jul 2023 10:04:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232467AbjGGOEw (ORCPT ); Fri, 7 Jul 2023 10:04:52 -0400 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C2B810EA for ; Fri, 7 Jul 2023 07:04:50 -0700 (PDT) Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2b6b98ac328so29273271fa.0 for ; Fri, 07 Jul 2023 07:04:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688738688; x=1691330688; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=B37Xu/vMDheXY8lYTD8GAgDOjIWMB+sxN84zK2+50sY=; b=kawc8ItC9cmWzRfifiqLJicdU4cwbMtFuX0C94hJ6r94bmcZ3LDThbBK8XnDvkMNRw 7ph0D0wcaONyllwuoEScFdGhct+uQ6/l8hXZbyisQv0v8b9A0biQncanffq/EEdfIO/8 GarAfWrbW0fWOSbyyBtme6ocAs61DKtd/9Kpi6r+ZnodnmPAl/M/scOyA/6plRFYHsYK oYjcNGIksvPGWYJoREiqoecQB5L4vYbdFF25ooHTU2nmIzXyPijePQ0bDQy6uiJmmg5t SJqjnMHATQ9Upc6KXLxInRWu3p3NAxzV8EvrCen1ocTpiZ7phat+ymG88Hb/D+VxNGZz atBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688738688; x=1691330688; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B37Xu/vMDheXY8lYTD8GAgDOjIWMB+sxN84zK2+50sY=; b=QsbF7FvXWXC3I1KkPxsvYqwhvbklrK1TaE0tTHDH6KVhi2gW4OCgs0dTUtvGrqjvay VXaMZGO0t2c5UomFbiu+S/cn7irXMJyyhBBjp8gz+62lj/So6bM0eU2n4iN47rNilIyR ywj8noQ/u3Kh5evaYzSENqQ8EpiHCvw9S8zaH8lMGEThvnMazcigqXN9EV8K08mrFixZ n37aw5yxAOpP9tKV6KExBC6YAdNxovie2QcVTFhCCu6tWkAMVzrpswp2ZRkxZtRMqVqX WYeIqepT2yey6ZeaaB6Groe5BIX7AO8xJO0rIA77rJ5SeDaIngh7yLatqDXlfpiquPQl +Wkw== X-Gm-Message-State: ABy/qLad/Af8H+lIHefrT1wf/rdWsES0j8tVRHGaF3hERWEbxfDXYZwX 6xDpFSQK33QEJIBnZiux5ymd5A== X-Google-Smtp-Source: APBJJlFpNs0g5rZCoqmKKClxn6bLNNiD6cxfdIuVmomJm4irVq1SXMZY0nb6x1jaEozd+QSyScSGtQ== X-Received: by 2002:a2e:9c58:0:b0:2b6:e19e:b769 with SMTP id t24-20020a2e9c58000000b002b6e19eb769mr3551612ljj.49.1688738688394; Fri, 07 Jul 2023 07:04:48 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id u21-20020a2e8555000000b002b6cb25e3f1sm760341ljj.108.2023.07.07.07.04.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 07:04:47 -0700 (PDT) From: Ulf Hansson To: Arnd Bergmann , Olof Johansson Cc: Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Florian Fainelli , Ray Jui , Scott Branden , linux-mips@vger.kernel.org, linux-rpi-kernel@lists.infradead.org Subject: [PATCH 05/18] soc: bcm: Move power-domain drivers to the genpd dir Date: Fri, 7 Jul 2023 16:04:21 +0200 Message-Id: <20230707140434.723349-6-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707140434.723349-1-ulf.hansson@linaro.org> References: <20230707140434.723349-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org While moving the drivers, we end up with a directory for bcm63xx that only contains a Kconfig file, which seems a bit silly. Let's therefore also move the Kconfig options into the Kconfig file a directory above, as it allows us to drop the directory too. Cc: Florian Fainelli Cc: Ray Jui Cc: Scott Branden Cc: Cc: Signed-off-by: Ulf Hansson --- MAINTAINERS | 4 ++-- drivers/genpd/Makefile | 1 + drivers/genpd/bcm/Makefile | 5 +++++ .../{soc/bcm/bcm63xx => genpd/bcm}/bcm-pmb.c | 0 drivers/{soc => genpd}/bcm/bcm2835-power.c | 0 .../bcm/bcm63xx => genpd/bcm}/bcm63xx-power.c | 0 .../{soc => genpd}/bcm/raspberrypi-power.c | 0 drivers/soc/bcm/Kconfig | 22 ++++++++++++++++++- drivers/soc/bcm/Makefile | 3 --- drivers/soc/bcm/bcm63xx/Kconfig | 21 ------------------ drivers/soc/bcm/bcm63xx/Makefile | 3 --- 11 files changed, 29 insertions(+), 30 deletions(-) create mode 100644 drivers/genpd/bcm/Makefile rename drivers/{soc/bcm/bcm63xx => genpd/bcm}/bcm-pmb.c (100%) rename drivers/{soc => genpd}/bcm/bcm2835-power.c (100%) rename drivers/{soc/bcm/bcm63xx => genpd/bcm}/bcm63xx-power.c (100%) rename drivers/{soc => genpd}/bcm/raspberrypi-power.c (100%) delete mode 100644 drivers/soc/bcm/bcm63xx/Kconfig delete mode 100644 drivers/soc/bcm/bcm63xx/Makefile diff --git a/MAINTAINERS b/MAINTAINERS index 98a6847c8c3b..9fad7f6033f4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4007,7 +4007,7 @@ F: arch/mips/kernel/*bmips* F: drivers/irqchip/irq-bcm63* F: drivers/irqchip/irq-bcm7* F: drivers/irqchip/irq-brcmstb* -F: drivers/soc/bcm/bcm63xx +F: drivers/genpd/bcm/bcm63xx-power.c F: include/linux/bcm963xx_nvram.h F: include/linux/bcm963xx_tag.h @@ -4222,7 +4222,7 @@ R: Broadcom internal kernel review list L: linux-pm@vger.kernel.org S: Maintained T: git https://github.com/broadcom/stblinux.git -F: drivers/soc/bcm/bcm63xx/bcm-pmb.c +F: drivers/genpd/bcm/bcm-pmb.c F: include/dt-bindings/soc/bcm-pmb.h BROADCOM SPECIFIC AMBA DRIVER (BCMA) diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index 91d4a3808981..6b9e9fe907f3 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -2,3 +2,4 @@ obj-y += actions/ obj-y += amlogic/ obj-y += apple/ +obj-y += bcm/ diff --git a/drivers/genpd/bcm/Makefile b/drivers/genpd/bcm/Makefile new file mode 100644 index 000000000000..6bfbe4e4db13 --- /dev/null +++ b/drivers/genpd/bcm/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_BCM_PMB) += bcm-pmb.o +obj-$(CONFIG_BCM2835_POWER) += bcm2835-power.o +obj-$(CONFIG_BCM63XX_POWER) += bcm63xx-power.o +obj-$(CONFIG_RASPBERRYPI_POWER) += raspberrypi-power.o diff --git a/drivers/soc/bcm/bcm63xx/bcm-pmb.c b/drivers/genpd/bcm/bcm-pmb.c similarity index 100% rename from drivers/soc/bcm/bcm63xx/bcm-pmb.c rename to drivers/genpd/bcm/bcm-pmb.c diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/genpd/bcm/bcm2835-power.c similarity index 100% rename from drivers/soc/bcm/bcm2835-power.c rename to drivers/genpd/bcm/bcm2835-power.c diff --git a/drivers/soc/bcm/bcm63xx/bcm63xx-power.c b/drivers/genpd/bcm/bcm63xx-power.c similarity index 100% rename from drivers/soc/bcm/bcm63xx/bcm63xx-power.c rename to drivers/genpd/bcm/bcm63xx-power.c diff --git a/drivers/soc/bcm/raspberrypi-power.c b/drivers/genpd/bcm/raspberrypi-power.c similarity index 100% rename from drivers/soc/bcm/raspberrypi-power.c rename to drivers/genpd/bcm/raspberrypi-power.c diff --git a/drivers/soc/bcm/Kconfig b/drivers/soc/bcm/Kconfig index 24f92a6e882a..f96906795fa6 100644 --- a/drivers/soc/bcm/Kconfig +++ b/drivers/soc/bcm/Kconfig @@ -42,7 +42,27 @@ config SOC_BRCMSTB If unsure, say N. -source "drivers/soc/bcm/bcm63xx/Kconfig" +config BCM_PMB + bool "Broadcom PMB (Power Management Bus) driver" + depends on ARCH_BCMBCA || (COMPILE_TEST && OF) + default ARCH_BCMBCA + select PM_GENERIC_DOMAINS if PM + help + This enables support for the Broadcom's PMB (Power Management Bus) that + is used for disabling and enabling SoC devices. + +if SOC_BCM63XX + +config BCM63XX_POWER + bool "BCM63xx power domain driver" + depends on BMIPS_GENERIC || (COMPILE_TEST && OF) + select PM_GENERIC_DOMAINS if PM + help + This enables support for the BCM63xx power domains controller on + BCM6318, BCM6328, BCM6362 and BCM63268 SoCs. + +endif # SOC_BCM63XX + source "drivers/soc/bcm/brcmstb/Kconfig" endmenu diff --git a/drivers/soc/bcm/Makefile b/drivers/soc/bcm/Makefile index 0f0efa28d92b..32424b1032c7 100644 --- a/drivers/soc/bcm/Makefile +++ b/drivers/soc/bcm/Makefile @@ -1,5 +1,2 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_BCM2835_POWER) += bcm2835-power.o -obj-$(CONFIG_RASPBERRYPI_POWER) += raspberrypi-power.o -obj-y += bcm63xx/ obj-$(CONFIG_SOC_BRCMSTB) += brcmstb/ diff --git a/drivers/soc/bcm/bcm63xx/Kconfig b/drivers/soc/bcm/bcm63xx/Kconfig deleted file mode 100644 index 355c34482076..000000000000 --- a/drivers/soc/bcm/bcm63xx/Kconfig +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -if SOC_BCM63XX - -config BCM63XX_POWER - bool "BCM63xx power domain driver" - depends on BMIPS_GENERIC || (COMPILE_TEST && OF) - select PM_GENERIC_DOMAINS if PM - help - This enables support for the BCM63xx power domains controller on - BCM6318, BCM6328, BCM6362 and BCM63268 SoCs. - -endif # SOC_BCM63XX - -config BCM_PMB - bool "Broadcom PMB (Power Management Bus) driver" - depends on ARCH_BCMBCA || (COMPILE_TEST && OF) - default ARCH_BCMBCA - select PM_GENERIC_DOMAINS if PM - help - This enables support for the Broadcom's PMB (Power Management Bus) that - is used for disabling and enabling SoC devices. diff --git a/drivers/soc/bcm/bcm63xx/Makefile b/drivers/soc/bcm/bcm63xx/Makefile deleted file mode 100644 index 557eed3d67bd..000000000000 --- a/drivers/soc/bcm/bcm63xx/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_BCM63XX_POWER) += bcm63xx-power.o -obj-$(CONFIG_BCM_PMB) += bcm-pmb.o From patchwork Fri Jul 7 14:04:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 700299 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 4964AC001DF for ; Fri, 7 Jul 2023 14:05:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232789AbjGGOFD (ORCPT ); Fri, 7 Jul 2023 10:05:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232604AbjGGOEw (ORCPT ); Fri, 7 Jul 2023 10:04:52 -0400 Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59F0A11B for ; Fri, 7 Jul 2023 07:04:51 -0700 (PDT) Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2b69e6d324aso29518921fa.0 for ; Fri, 07 Jul 2023 07:04:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688738689; x=1691330689; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AF5D6DQXm7HmIRP9eyngZlJuQfQ9Itx50jvuqv/ykMM=; b=JMbAWi+fqDg/Evsupl0EVzPs2UcPCdo38/GO8Pg20qBSNf/atPExZKLCAnwBkE8A15 0eN5RsPtrjRsWt9jqtT9+0zbq3+x1SsOFYNYBgGsKW22XOWNjlKkRYC0Z0WSqhX1W6fG pVfjMo8zwvUcXvuhgk/5JWv2MCECN/O7LDICkaUoSijBElVdNPn8ZVPhJ7WSq5x59blX nYWDzpiX5iL/vDFWnSUxkiNFefEV4tcfqRFaXWoDDMIOxdXLGcUXqKmw96tTxlDlsjPY CmRpQdqqF++ZP1c0suy3JdKSG+OU/x1BQnUBiFpDLlex8QP4Av3aKtbnUfJbKMKLiKsA ALTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688738689; x=1691330689; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AF5D6DQXm7HmIRP9eyngZlJuQfQ9Itx50jvuqv/ykMM=; b=WVQ22hvu8zdzgCgjLuv40ehFY5nPtnkqC6I7BD1+6lrq79703+dQdCLyOxdDBQ+tjC XhSIRoKhtnB/+MA0W9EDl13+0OMfY6ZJBbnJzLYZZ5QLzxTB8wwYzrpntJlO4FspoXA+ ZFlD3umaZkjbERGJ6OKeICgXZsLQIvxJONmT24eblMkxL+Q0ZdNokmV8Z5pBfZOSSY/X X3ewH3Slr7mpVdEm+Yyftsw/kyBDKpEYqeQsmin1D+yG8EfIKRDUehT8lBGn+NCvJQ7i JQLeASJkDOWnQcuWo/sG7g2UQoomR/j1JpwcAbFpfdcXGyASoxspzGo2bJ+SLzne71x6 KLKw== X-Gm-Message-State: ABy/qLZzmtyRVdnrIL1Y6xO0xzMtiEKQ8hfXD9SzQ8OJNO1I39+YQ1wA 1MpF3ZT2PtUpGrMCoGiAqQm6qA== X-Google-Smtp-Source: APBJJlFb6SSYCwJcJTyrOC/BxJjT8XyG0bkUDGjb3F1FZA+EfYbKiuxmfkgwjvgd+gPEnXSAymZUVQ== X-Received: by 2002:a2e:b0c6:0:b0:2b6:fa3f:9230 with SMTP id g6-20020a2eb0c6000000b002b6fa3f9230mr3630259ljl.46.1688738689714; Fri, 07 Jul 2023 07:04:49 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id u21-20020a2e8555000000b002b6cb25e3f1sm760341ljj.108.2023.07.07.07.04.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 07:04:49 -0700 (PDT) From: Ulf Hansson To: Arnd Bergmann , Olof Johansson Cc: Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Shawn Guo , Sascha Hauer , Fabio Estevam , kernel@pengutronix.de, linux-imx@nxp.com Subject: [PATCH 06/18] soc: imx: Move power-domain drivers to the genpd dir Date: Fri, 7 Jul 2023 16:04:22 +0200 Message-Id: <20230707140434.723349-7-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707140434.723349-1-ulf.hansson@linaro.org> References: <20230707140434.723349-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Cc: Shawn Guo Cc: Sascha Hauer Cc: Fabio Estevam Cc: Cc: Signed-off-by: Ulf Hansson Acked-by: Shawn Guo --- drivers/genpd/imx/Makefile | 7 +++++++ drivers/{soc => genpd}/imx/gpc.c | 0 drivers/{soc => genpd}/imx/gpcv2.c | 0 drivers/{soc => genpd}/imx/imx8m-blk-ctrl.c | 0 drivers/{soc => genpd}/imx/imx8mp-blk-ctrl.c | 0 drivers/{soc => genpd}/imx/imx93-blk-ctrl.c | 0 drivers/{soc => genpd}/imx/imx93-pd.c | 0 drivers/soc/imx/Makefile | 7 +------ 8 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 drivers/genpd/imx/Makefile rename drivers/{soc => genpd}/imx/gpc.c (100%) rename drivers/{soc => genpd}/imx/gpcv2.c (100%) rename drivers/{soc => genpd}/imx/imx8m-blk-ctrl.c (100%) rename drivers/{soc => genpd}/imx/imx8mp-blk-ctrl.c (100%) rename drivers/{soc => genpd}/imx/imx93-blk-ctrl.c (100%) rename drivers/{soc => genpd}/imx/imx93-pd.c (100%) diff --git a/drivers/genpd/imx/Makefile b/drivers/genpd/imx/Makefile new file mode 100644 index 000000000000..5f012717a666 --- /dev/null +++ b/drivers/genpd/imx/Makefile @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o +obj-$(CONFIG_IMX_GPCV2_PM_DOMAINS) += gpcv2.o +obj-$(CONFIG_IMX8M_BLK_CTRL) += imx8m-blk-ctrl.o +obj-$(CONFIG_IMX8M_BLK_CTRL) += imx8mp-blk-ctrl.o +obj-$(CONFIG_SOC_IMX9) += imx93-pd.o +obj-$(CONFIG_IMX9_BLK_CTRL) += imx93-blk-ctrl.o diff --git a/drivers/soc/imx/gpc.c b/drivers/genpd/imx/gpc.c similarity index 100% rename from drivers/soc/imx/gpc.c rename to drivers/genpd/imx/gpc.c diff --git a/drivers/soc/imx/gpcv2.c b/drivers/genpd/imx/gpcv2.c similarity index 100% rename from drivers/soc/imx/gpcv2.c rename to drivers/genpd/imx/gpcv2.c diff --git a/drivers/soc/imx/imx8m-blk-ctrl.c b/drivers/genpd/imx/imx8m-blk-ctrl.c similarity index 100% rename from drivers/soc/imx/imx8m-blk-ctrl.c rename to drivers/genpd/imx/imx8m-blk-ctrl.c diff --git a/drivers/soc/imx/imx8mp-blk-ctrl.c b/drivers/genpd/imx/imx8mp-blk-ctrl.c similarity index 100% rename from drivers/soc/imx/imx8mp-blk-ctrl.c rename to drivers/genpd/imx/imx8mp-blk-ctrl.c diff --git a/drivers/soc/imx/imx93-blk-ctrl.c b/drivers/genpd/imx/imx93-blk-ctrl.c similarity index 100% rename from drivers/soc/imx/imx93-blk-ctrl.c rename to drivers/genpd/imx/imx93-blk-ctrl.c diff --git a/drivers/soc/imx/imx93-pd.c b/drivers/genpd/imx/imx93-pd.c similarity index 100% rename from drivers/soc/imx/imx93-pd.c rename to drivers/genpd/imx/imx93-pd.c diff --git a/drivers/soc/imx/Makefile b/drivers/soc/imx/Makefile index a28c44a1f16a..3ad321ca608a 100644 --- a/drivers/soc/imx/Makefile +++ b/drivers/soc/imx/Makefile @@ -2,10 +2,5 @@ ifeq ($(CONFIG_ARM),y) obj-$(CONFIG_ARCH_MXC) += soc-imx.o endif -obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o -obj-$(CONFIG_IMX_GPCV2_PM_DOMAINS) += gpcv2.o obj-$(CONFIG_SOC_IMX8M) += soc-imx8m.o -obj-$(CONFIG_IMX8M_BLK_CTRL) += imx8m-blk-ctrl.o -obj-$(CONFIG_IMX8M_BLK_CTRL) += imx8mp-blk-ctrl.o -obj-$(CONFIG_SOC_IMX9) += imx93-src.o imx93-pd.o -obj-$(CONFIG_IMX9_BLK_CTRL) += imx93-blk-ctrl.o +obj-$(CONFIG_SOC_IMX9) += imx93-src.o From patchwork Fri Jul 7 14:04:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 700775 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 8A912EB64DA for ; Fri, 7 Jul 2023 14:05:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232834AbjGGOFI (ORCPT ); Fri, 7 Jul 2023 10:05:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232698AbjGGOE5 (ORCPT ); Fri, 7 Jul 2023 10:04:57 -0400 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7506A19BD for ; Fri, 7 Jul 2023 07:04:52 -0700 (PDT) Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2b6f943383eso31018061fa.2 for ; Fri, 07 Jul 2023 07:04:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688738691; x=1691330691; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0C9FKQaL/DjhwSAwt3ArSmfw7wijMULRc04IKf+RB6c=; b=JhXWmV+T447FKYsYy6dzhvKCW6juQUSijMSScTTi/Vg7iA6f59CwmTplfO221r6YH1 Ru43D7CE7iM4eTo+xO0B6q3tnI5fQtzTwWCdmG9X6Ud2CMD1lPUyxc7LZEeQndf8oW3j TgWzcg3sttamRQvHTWcIIuC6Nj0a73F+Jb68Tz0u5Q4ETeom+/6C3osqTB0SkRIPhO14 AuVwUFy5FsIw8lGcZuQ6+CppiH2Spp3aMRTyo+z3fY0l2CPBwwdHSyk0wX8+GMLDkPCc 3UsYSKMXfe3p9LT9EOf6PF3Ji6YARY+SQ2367x6aKW9agMKORnZ/w8FgBTPMK+TKwf4y aM8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688738691; x=1691330691; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0C9FKQaL/DjhwSAwt3ArSmfw7wijMULRc04IKf+RB6c=; b=JdaeZ8NL0Mpo2dDsyshCIhozKDf61uiJ9ZB3k/oTpsgysQcm7PpEhy/82LJYUODGGQ qRr8nrB3dk4VObhZ8FeHs+/sGybX5mvgNWmM8tAaloQcDGIdYfuNRmXw7Sqx+rXzPS2e 8LZcvFg7UWMSrWtaMQEca6l+ygNsRVAs2TQoW6ndV2QD9ToGG2a/j++ChSq6nv4lSsrh ucK5llTvKvrXCcaMYNxU54XzXZEhAv4yCVghKaM3GkRNAyVdTogsAn6rm5cbQXaCKrob JcXOM43MJBKpGiHdBlhBSM31rOoQaLzb4rxgAcwmXG8/rzfo74radTjDTDf/xryKgYS4 buKQ== X-Gm-Message-State: ABy/qLZ0LlnVoMU5l1gSRqRTWt7zf1ArFfWu/GnrOHF7ti8pBbKDRAK2 dES3iSf8aUPWdfVCnnNhqg4Phg== X-Google-Smtp-Source: APBJJlHBmMeXjugK8v9YuEhL1V3jLnXeidwnEj3l3uiEN5XJ77pwCTcdYgDDx1GbKdO/iL6N2yp8wA== X-Received: by 2002:a2e:a40f:0:b0:2b6:efcf:1463 with SMTP id p15-20020a2ea40f000000b002b6efcf1463mr3811395ljn.6.1688738690802; Fri, 07 Jul 2023 07:04:50 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id u21-20020a2e8555000000b002b6cb25e3f1sm760341ljj.108.2023.07.07.07.04.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 07:04:50 -0700 (PDT) From: Ulf Hansson To: Arnd Bergmann , Olof Johansson Cc: Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Matthias Brugger , AngeloGioacchino Del Regno , linux-mediatek@lists.infradead.org Subject: [PATCH 07/18] soc: mediatek: Move power-domain drivers to the genpd dir Date: Fri, 7 Jul 2023 16:04:23 +0200 Message-Id: <20230707140434.723349-8-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707140434.723349-1-ulf.hansson@linaro.org> References: <20230707140434.723349-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Cc: Matthias Brugger Cc: AngeloGioacchino Del Regno Cc: Signed-off-by: Ulf Hansson --- drivers/genpd/Makefile | 1 + drivers/genpd/mediatek/Makefile | 3 +++ drivers/{soc => genpd}/mediatek/mt6795-pm-domains.h | 0 drivers/{soc => genpd}/mediatek/mt8167-pm-domains.h | 0 drivers/{soc => genpd}/mediatek/mt8173-pm-domains.h | 0 drivers/{soc => genpd}/mediatek/mt8183-pm-domains.h | 0 drivers/{soc => genpd}/mediatek/mt8186-pm-domains.h | 0 drivers/{soc => genpd}/mediatek/mt8188-pm-domains.h | 0 drivers/{soc => genpd}/mediatek/mt8192-pm-domains.h | 0 drivers/{soc => genpd}/mediatek/mt8195-pm-domains.h | 0 drivers/{soc => genpd}/mediatek/mtk-pm-domains.c | 0 drivers/{soc => genpd}/mediatek/mtk-pm-domains.h | 0 drivers/{soc => genpd}/mediatek/mtk-scpsys.c | 0 drivers/soc/mediatek/Makefile | 2 -- 14 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 drivers/genpd/mediatek/Makefile rename drivers/{soc => genpd}/mediatek/mt6795-pm-domains.h (100%) rename drivers/{soc => genpd}/mediatek/mt8167-pm-domains.h (100%) rename drivers/{soc => genpd}/mediatek/mt8173-pm-domains.h (100%) rename drivers/{soc => genpd}/mediatek/mt8183-pm-domains.h (100%) rename drivers/{soc => genpd}/mediatek/mt8186-pm-domains.h (100%) rename drivers/{soc => genpd}/mediatek/mt8188-pm-domains.h (100%) rename drivers/{soc => genpd}/mediatek/mt8192-pm-domains.h (100%) rename drivers/{soc => genpd}/mediatek/mt8195-pm-domains.h (100%) rename drivers/{soc => genpd}/mediatek/mtk-pm-domains.c (100%) rename drivers/{soc => genpd}/mediatek/mtk-pm-domains.h (100%) rename drivers/{soc => genpd}/mediatek/mtk-scpsys.c (100%) diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index 6b9e9fe907f3..1a0a56925756 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -3,3 +3,4 @@ obj-y += actions/ obj-y += amlogic/ obj-y += apple/ obj-y += bcm/ +obj-y += mediatek/ diff --git a/drivers/genpd/mediatek/Makefile b/drivers/genpd/mediatek/Makefile new file mode 100644 index 000000000000..8cde09e654b3 --- /dev/null +++ b/drivers/genpd/mediatek/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.o +obj-$(CONFIG_MTK_SCPSYS_PM_DOMAINS) += mtk-pm-domains.o diff --git a/drivers/soc/mediatek/mt6795-pm-domains.h b/drivers/genpd/mediatek/mt6795-pm-domains.h similarity index 100% rename from drivers/soc/mediatek/mt6795-pm-domains.h rename to drivers/genpd/mediatek/mt6795-pm-domains.h diff --git a/drivers/soc/mediatek/mt8167-pm-domains.h b/drivers/genpd/mediatek/mt8167-pm-domains.h similarity index 100% rename from drivers/soc/mediatek/mt8167-pm-domains.h rename to drivers/genpd/mediatek/mt8167-pm-domains.h diff --git a/drivers/soc/mediatek/mt8173-pm-domains.h b/drivers/genpd/mediatek/mt8173-pm-domains.h similarity index 100% rename from drivers/soc/mediatek/mt8173-pm-domains.h rename to drivers/genpd/mediatek/mt8173-pm-domains.h diff --git a/drivers/soc/mediatek/mt8183-pm-domains.h b/drivers/genpd/mediatek/mt8183-pm-domains.h similarity index 100% rename from drivers/soc/mediatek/mt8183-pm-domains.h rename to drivers/genpd/mediatek/mt8183-pm-domains.h diff --git a/drivers/soc/mediatek/mt8186-pm-domains.h b/drivers/genpd/mediatek/mt8186-pm-domains.h similarity index 100% rename from drivers/soc/mediatek/mt8186-pm-domains.h rename to drivers/genpd/mediatek/mt8186-pm-domains.h diff --git a/drivers/soc/mediatek/mt8188-pm-domains.h b/drivers/genpd/mediatek/mt8188-pm-domains.h similarity index 100% rename from drivers/soc/mediatek/mt8188-pm-domains.h rename to drivers/genpd/mediatek/mt8188-pm-domains.h diff --git a/drivers/soc/mediatek/mt8192-pm-domains.h b/drivers/genpd/mediatek/mt8192-pm-domains.h similarity index 100% rename from drivers/soc/mediatek/mt8192-pm-domains.h rename to drivers/genpd/mediatek/mt8192-pm-domains.h diff --git a/drivers/soc/mediatek/mt8195-pm-domains.h b/drivers/genpd/mediatek/mt8195-pm-domains.h similarity index 100% rename from drivers/soc/mediatek/mt8195-pm-domains.h rename to drivers/genpd/mediatek/mt8195-pm-domains.h diff --git a/drivers/soc/mediatek/mtk-pm-domains.c b/drivers/genpd/mediatek/mtk-pm-domains.c similarity index 100% rename from drivers/soc/mediatek/mtk-pm-domains.c rename to drivers/genpd/mediatek/mtk-pm-domains.c diff --git a/drivers/soc/mediatek/mtk-pm-domains.h b/drivers/genpd/mediatek/mtk-pm-domains.h similarity index 100% rename from drivers/soc/mediatek/mtk-pm-domains.h rename to drivers/genpd/mediatek/mtk-pm-domains.h diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/genpd/mediatek/mtk-scpsys.c similarity index 100% rename from drivers/soc/mediatek/mtk-scpsys.c rename to drivers/genpd/mediatek/mtk-scpsys.c diff --git a/drivers/soc/mediatek/Makefile b/drivers/soc/mediatek/Makefile index 8c0ddacbcde8..9d3ce7878c5c 100644 --- a/drivers/soc/mediatek/Makefile +++ b/drivers/soc/mediatek/Makefile @@ -4,8 +4,6 @@ obj-$(CONFIG_MTK_DEVAPC) += mtk-devapc.o obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o obj-$(CONFIG_MTK_PMIC_WRAP) += mtk-pmic-wrap.o obj-$(CONFIG_MTK_REGULATOR_COUPLER) += mtk-regulator-coupler.o -obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.o -obj-$(CONFIG_MTK_SCPSYS_PM_DOMAINS) += mtk-pm-domains.o obj-$(CONFIG_MTK_MMSYS) += mtk-mmsys.o obj-$(CONFIG_MTK_MMSYS) += mtk-mutex.o obj-$(CONFIG_MTK_SVS) += mtk-svs.o From patchwork Fri Jul 7 14:04:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 700298 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 3D3A6C001DF for ; Fri, 7 Jul 2023 14:05:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232781AbjGGOFL (ORCPT ); Fri, 7 Jul 2023 10:05:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232773AbjGGOFC (ORCPT ); Fri, 7 Jul 2023 10:05:02 -0400 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9AED2210C for ; Fri, 7 Jul 2023 07:04:53 -0700 (PDT) Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2b708e49059so26569201fa.3 for ; Fri, 07 Jul 2023 07:04:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688738692; x=1691330692; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8ewLZ7PsrVNiFdNIbfFquaT6V9xwZk4+lwOcXDJHnfw=; b=LnJEhcpAFuO7pDbjxc/tCUP9N9Zz2V0bEFLE2/ucW4oBShV+0u7o1KRGgF17LDQTbb sgFkFKP1gQ4V2YsjwM9u+R00tzKGrVzDNmKpbUSXd/A9lKR+GLgtqu7VYXSh5rvPilOM nrjml2olouJjpWQmDwNOn1I8RKBKaZSwYl2Zizf+mCRaVmYnP1OjqmkM17FxdYq4DSZ3 ojeRfm4+YTvMhdknjhdfhpFACf0644lbT889BmVF4pZbyb2vOiqmXcblCsVr9sFRxdqt BGPZlp5bOCJNU2zfB7D751GUCagakr/jVcIXjh4ACQXB7NSIhzZ+O+Qf6iGrmmRFaqtG nKzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688738692; x=1691330692; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8ewLZ7PsrVNiFdNIbfFquaT6V9xwZk4+lwOcXDJHnfw=; b=CL7a4Q3lztNakW6sxa19QBMjtmWBkYKWOOdotlmDUgMYzhBR+8AZTaG437oVPXddLK GQAIr2LIMwfBBZsKMM1Th/NFYUPn2KNjfCeCDsG5RICl7dNg3qsQoePe2Z8k2qTbHVj7 TiSh6JQ1DISgsDDO6jeWtdhXpV2UqtJ2pyh1YDEVo3/SqCUsCkKRSWuwovw/zlibvPPg +qs2JcFxZbhAdB+kGBKh7vxxvJ4KCAecU5vM2mzEoGrkE2JEQ1J/0QeGJVTxMORTXwAO YhKUKmNiH1goIKdDJgLlruDwOF/i40oA2zMOko5j3B2vGeq8nIMlCRvzoSRCW4S1PPwZ T6PA== X-Gm-Message-State: ABy/qLYaYnH1hRsKL1Mt9Lk6cY6nKDiT8ekjAmAaqgQ1zMUAlhvTNFsm kDkkBQkrHaQpcxllUvFn96cG4A== X-Google-Smtp-Source: APBJJlE8yrl9/DHLKpG1gXCDtRhglmdeTUefxOCsODcqBZDs1ZGKpyfQog45Q6+FHuTn3i4Na1vMFg== X-Received: by 2002:a2e:b0ca:0:b0:2b6:e105:6174 with SMTP id g10-20020a2eb0ca000000b002b6e1056174mr4000524ljl.47.1688738691962; Fri, 07 Jul 2023 07:04:51 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id u21-20020a2e8555000000b002b6cb25e3f1sm760341ljj.108.2023.07.07.07.04.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 07:04:51 -0700 (PDT) From: Ulf Hansson To: Arnd Bergmann , Olof Johansson Cc: Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Bjorn Andersson , Konrad Dybcio , Andy Gross , linux-arm-msm@vger.kernel.org Subject: [PATCH 08/18] soc: qcom: Move power-domain drivers to the genpd dir Date: Fri, 7 Jul 2023 16:04:24 +0200 Message-Id: <20230707140434.723349-9-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707140434.723349-1-ulf.hansson@linaro.org> References: <20230707140434.723349-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Cc: Bjorn Andersson Cc: Konrad Dybcio Cc: Andy Gross Cc: Signed-off-by: Ulf Hansson --- MAINTAINERS | 2 +- drivers/genpd/Makefile | 1 + drivers/genpd/qcom/Makefile | 4 ++++ drivers/{soc => genpd}/qcom/cpr.c | 0 drivers/{soc => genpd}/qcom/rpmhpd.c | 0 drivers/{soc => genpd}/qcom/rpmpd.c | 0 drivers/soc/qcom/Makefile | 3 --- 7 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 drivers/genpd/qcom/Makefile rename drivers/{soc => genpd}/qcom/cpr.c (100%) rename drivers/{soc => genpd}/qcom/rpmhpd.c (100%) rename drivers/{soc => genpd}/qcom/rpmpd.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 9fad7f6033f4..753eea641129 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17518,7 +17518,7 @@ L: linux-pm@vger.kernel.org L: linux-arm-msm@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml -F: drivers/soc/qcom/cpr.c +F: drivers/genpd/qcom/cpr.c QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096 M: Ilia Lin diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index 1a0a56925756..dfdea14e2a8a 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -4,3 +4,4 @@ obj-y += amlogic/ obj-y += apple/ obj-y += bcm/ obj-y += mediatek/ +obj-y += qcom/ diff --git a/drivers/genpd/qcom/Makefile b/drivers/genpd/qcom/Makefile new file mode 100644 index 000000000000..403dfc5af095 --- /dev/null +++ b/drivers/genpd/qcom/Makefile @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_QCOM_CPR) += cpr.o +obj-$(CONFIG_QCOM_RPMPD) += rpmpd.o +obj-$(CONFIG_QCOM_RPMHPD) += rpmhpd.o diff --git a/drivers/soc/qcom/cpr.c b/drivers/genpd/qcom/cpr.c similarity index 100% rename from drivers/soc/qcom/cpr.c rename to drivers/genpd/qcom/cpr.c diff --git a/drivers/soc/qcom/rpmhpd.c b/drivers/genpd/qcom/rpmhpd.c similarity index 100% rename from drivers/soc/qcom/rpmhpd.c rename to drivers/genpd/qcom/rpmhpd.c diff --git a/drivers/soc/qcom/rpmpd.c b/drivers/genpd/qcom/rpmpd.c similarity index 100% rename from drivers/soc/qcom/rpmpd.c rename to drivers/genpd/qcom/rpmpd.c diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile index 99114c71092b..f548a7150bb2 100644 --- a/drivers/soc/qcom/Makefile +++ b/drivers/soc/qcom/Makefile @@ -3,7 +3,6 @@ CFLAGS_rpmh-rsc.o := -I$(src) obj-$(CONFIG_QCOM_AOSS_QMP) += qcom_aoss.o obj-$(CONFIG_QCOM_GENI_SE) += qcom-geni-se.o obj-$(CONFIG_QCOM_COMMAND_DB) += cmd-db.o -obj-$(CONFIG_QCOM_CPR) += cpr.o obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o obj-$(CONFIG_QCOM_MDT_LOADER) += mdt_loader.o obj-$(CONFIG_QCOM_OCMEM) += ocmem.o @@ -29,8 +28,6 @@ obj-$(CONFIG_QCOM_STATS) += qcom_stats.o obj-$(CONFIG_QCOM_WCNSS_CTRL) += wcnss_ctrl.o obj-$(CONFIG_QCOM_APR) += apr.o obj-$(CONFIG_QCOM_LLCC) += llcc-qcom.o -obj-$(CONFIG_QCOM_RPMHPD) += rpmhpd.o -obj-$(CONFIG_QCOM_RPMPD) += rpmpd.o obj-$(CONFIG_QCOM_KRYO_L2_ACCESSORS) += kryo-l2-accessors.o obj-$(CONFIG_QCOM_ICC_BWMON) += icc-bwmon.o qcom_ice-objs += ice.o From patchwork Fri Jul 7 14:04:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 700774 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 C9B92C001E0 for ; Fri, 7 Jul 2023 14:05:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232888AbjGGOFM (ORCPT ); Fri, 7 Jul 2023 10:05:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232828AbjGGOFH (ORCPT ); Fri, 7 Jul 2023 10:05:07 -0400 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BCD02118 for ; Fri, 7 Jul 2023 07:04:55 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2b701e41cd3so30810231fa.3 for ; Fri, 07 Jul 2023 07:04:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688738693; x=1691330693; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ah7YGD1xyf3kSBx1jvLazId0APuOLF3pVJjrHEEu/ig=; b=WzV8wBgJnPy4qeBnOZRqGp2YKUS3RX/TdS3SRNG+atvqyPjAyGGvE9KH+3ujUeRKQz PwCa+l9PVlqNJlibhqHyhaNrb654HaZ3IwpdzdjTt1DX2owekQVypyH/NgoI59UdN3wZ ib20TKnH8DOYjEeRegiVzy1lYvG4oOxcq1442g/d3RLuHb3SO+jQEVPlTOH7w51ZpihO 55bxuuBvsxlPDZMK4bsW5jVYhKYJvLPjnYQxdHsdaeE7t2k+2gjg179zFaZOUqvm5TBH wei/1fMD0c4HJj5N+ww2Gu6z5j1tpPWMv102AmJwaxJpaCWj+yeZQXpu6SUoEMboGkW0 zs2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688738693; x=1691330693; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ah7YGD1xyf3kSBx1jvLazId0APuOLF3pVJjrHEEu/ig=; b=bAXMFImNqOszugsODcqUMv8sD5Ff3YTrPJcSKucsoHTpxZMQ+Vb99D8054g4RBPJwA KXqesWjSbAKq2MUOARV/2v+SQT4XTjd2jP/mQJP9Q+ciJpyTJJOcu5qUJiVFq51bvptE etaDq8mY6TTCg4SgHoKWBZJtM9D+JrWji3rylwyz/3b7z53kJSC7QihOqha6nwa3xE3C pixhs1j6DwN6uL2jhJ3rgnhiaJGD83bKmjgyKRtwaB6FiVc2NavqtkFQVCPgLW5Aj2XQ kXXtIB1DaGDFIYB5puZukQigAbQWJ7mvjJydOrqiWugFm+NWTADicE8DWmEzFc61IuCw f3ig== X-Gm-Message-State: ABy/qLaxSy2xvCxNW6MiEImbHDpnSVzU9KHldJ1kAP5vjW99C+kkXcCT xX0INQXS0cZHATbLfJk92E2VQzlyTs7rZ3iHAyY= X-Google-Smtp-Source: APBJJlFlxElROl8lCVcuW04EJ7Kx+bi8Prfy3SdyYewfyxMMh9NzLlD7C69u2RhV4Y5QdP1gKzLhKw== X-Received: by 2002:a2e:9c95:0:b0:2b6:c16a:db06 with SMTP id x21-20020a2e9c95000000b002b6c16adb06mr4104254lji.39.1688738693486; Fri, 07 Jul 2023 07:04:53 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id u21-20020a2e8555000000b002b6cb25e3f1sm760341ljj.108.2023.07.07.07.04.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 07:04:53 -0700 (PDT) From: Ulf Hansson To: Arnd Bergmann , Olof Johansson Cc: Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , Magnus Damm , linux-renesas-soc@vger.kernel.org Subject: [PATCH 09/18] soc: renesas: Move power-domain drivers to the genpd dir Date: Fri, 7 Jul 2023 16:04:25 +0200 Message-Id: <20230707140434.723349-10-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707140434.723349-1-ulf.hansson@linaro.org> References: <20230707140434.723349-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Cc: Geert Uytterhoeven Cc: Magnus Damm Cc: Signed-off-by: Ulf Hansson --- MAINTAINERS | 1 + drivers/genpd/Makefile | 1 + drivers/genpd/renesas/Makefile | 30 +++++++++++++++++++ drivers/{soc => genpd}/renesas/r8a7742-sysc.c | 0 drivers/{soc => genpd}/renesas/r8a7743-sysc.c | 0 drivers/{soc => genpd}/renesas/r8a7745-sysc.c | 0 .../{soc => genpd}/renesas/r8a77470-sysc.c | 0 .../{soc => genpd}/renesas/r8a774a1-sysc.c | 0 .../{soc => genpd}/renesas/r8a774b1-sysc.c | 0 .../{soc => genpd}/renesas/r8a774c0-sysc.c | 0 .../{soc => genpd}/renesas/r8a774e1-sysc.c | 0 drivers/{soc => genpd}/renesas/r8a7779-sysc.c | 0 drivers/{soc => genpd}/renesas/r8a7790-sysc.c | 0 drivers/{soc => genpd}/renesas/r8a7791-sysc.c | 0 drivers/{soc => genpd}/renesas/r8a7792-sysc.c | 0 drivers/{soc => genpd}/renesas/r8a7794-sysc.c | 0 drivers/{soc => genpd}/renesas/r8a7795-sysc.c | 0 drivers/{soc => genpd}/renesas/r8a7796-sysc.c | 0 .../{soc => genpd}/renesas/r8a77965-sysc.c | 0 .../{soc => genpd}/renesas/r8a77970-sysc.c | 0 .../{soc => genpd}/renesas/r8a77980-sysc.c | 0 .../{soc => genpd}/renesas/r8a77990-sysc.c | 0 .../{soc => genpd}/renesas/r8a77995-sysc.c | 0 .../{soc => genpd}/renesas/r8a779a0-sysc.c | 0 .../{soc => genpd}/renesas/r8a779f0-sysc.c | 0 .../{soc => genpd}/renesas/r8a779g0-sysc.c | 0 .../{soc => genpd}/renesas/rcar-gen4-sysc.c | 0 .../{soc => genpd}/renesas/rcar-gen4-sysc.h | 0 drivers/{soc => genpd}/renesas/rcar-sysc.c | 0 drivers/{soc => genpd}/renesas/rcar-sysc.h | 0 drivers/{soc => genpd}/renesas/rmobile-sysc.c | 0 drivers/soc/renesas/Makefile | 27 ----------------- 32 files changed, 32 insertions(+), 27 deletions(-) create mode 100644 drivers/genpd/renesas/Makefile rename drivers/{soc => genpd}/renesas/r8a7742-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a7743-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a7745-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a77470-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a774a1-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a774b1-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a774c0-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a774e1-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a7779-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a7790-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a7791-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a7792-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a7794-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a7795-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a7796-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a77965-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a77970-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a77980-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a77990-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a77995-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a779a0-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a779f0-sysc.c (100%) rename drivers/{soc => genpd}/renesas/r8a779g0-sysc.c (100%) rename drivers/{soc => genpd}/renesas/rcar-gen4-sysc.c (100%) rename drivers/{soc => genpd}/renesas/rcar-gen4-sysc.h (100%) rename drivers/{soc => genpd}/renesas/rcar-sysc.c (100%) rename drivers/{soc => genpd}/renesas/rcar-sysc.h (100%) rename drivers/{soc => genpd}/renesas/rmobile-sysc.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 753eea641129..cb57f5fb2cd7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2591,6 +2591,7 @@ F: arch/arm/include/debug/renesas-scif.S F: arch/arm/mach-shmobile/ F: arch/arm64/boot/dts/renesas/ F: arch/riscv/boot/dts/renesas/ +F: drivers/genpd/renesas/ F: drivers/soc/renesas/ F: include/linux/soc/renesas/ K: \brenesas, diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index dfdea14e2a8a..286598ce7620 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -5,3 +5,4 @@ obj-y += apple/ obj-y += bcm/ obj-y += mediatek/ obj-y += qcom/ +obj-y += renesas/ diff --git a/drivers/genpd/renesas/Makefile b/drivers/genpd/renesas/Makefile new file mode 100644 index 000000000000..e306e396fc8c --- /dev/null +++ b/drivers/genpd/renesas/Makefile @@ -0,0 +1,30 @@ +# SPDX-License-Identifier: GPL-2.0 +# SoC +obj-$(CONFIG_SYSC_R8A7742) += r8a7742-sysc.o +obj-$(CONFIG_SYSC_R8A7743) += r8a7743-sysc.o +obj-$(CONFIG_SYSC_R8A7745) += r8a7745-sysc.o +obj-$(CONFIG_SYSC_R8A77470) += r8a77470-sysc.o +obj-$(CONFIG_SYSC_R8A774A1) += r8a774a1-sysc.o +obj-$(CONFIG_SYSC_R8A774B1) += r8a774b1-sysc.o +obj-$(CONFIG_SYSC_R8A774C0) += r8a774c0-sysc.o +obj-$(CONFIG_SYSC_R8A774E1) += r8a774e1-sysc.o +obj-$(CONFIG_SYSC_R8A7779) += r8a7779-sysc.o +obj-$(CONFIG_SYSC_R8A7790) += r8a7790-sysc.o +obj-$(CONFIG_SYSC_R8A7791) += r8a7791-sysc.o +obj-$(CONFIG_SYSC_R8A7792) += r8a7792-sysc.o +obj-$(CONFIG_SYSC_R8A7794) += r8a7794-sysc.o +obj-$(CONFIG_SYSC_R8A7795) += r8a7795-sysc.o +obj-$(CONFIG_SYSC_R8A77960) += r8a7796-sysc.o +obj-$(CONFIG_SYSC_R8A77961) += r8a7796-sysc.o +obj-$(CONFIG_SYSC_R8A77965) += r8a77965-sysc.o +obj-$(CONFIG_SYSC_R8A77970) += r8a77970-sysc.o +obj-$(CONFIG_SYSC_R8A77980) += r8a77980-sysc.o +obj-$(CONFIG_SYSC_R8A77990) += r8a77990-sysc.o +obj-$(CONFIG_SYSC_R8A77995) += r8a77995-sysc.o +obj-$(CONFIG_SYSC_R8A779A0) += r8a779a0-sysc.o +obj-$(CONFIG_SYSC_R8A779F0) += r8a779f0-sysc.o +obj-$(CONFIG_SYSC_R8A779G0) += r8a779g0-sysc.o +# Family +obj-$(CONFIG_SYSC_RCAR) += rcar-sysc.o +obj-$(CONFIG_SYSC_RCAR_GEN4) += rcar-gen4-sysc.o +obj-$(CONFIG_SYSC_RMOBILE) += rmobile-sysc.o diff --git a/drivers/soc/renesas/r8a7742-sysc.c b/drivers/genpd/renesas/r8a7742-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a7742-sysc.c rename to drivers/genpd/renesas/r8a7742-sysc.c diff --git a/drivers/soc/renesas/r8a7743-sysc.c b/drivers/genpd/renesas/r8a7743-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a7743-sysc.c rename to drivers/genpd/renesas/r8a7743-sysc.c diff --git a/drivers/soc/renesas/r8a7745-sysc.c b/drivers/genpd/renesas/r8a7745-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a7745-sysc.c rename to drivers/genpd/renesas/r8a7745-sysc.c diff --git a/drivers/soc/renesas/r8a77470-sysc.c b/drivers/genpd/renesas/r8a77470-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a77470-sysc.c rename to drivers/genpd/renesas/r8a77470-sysc.c diff --git a/drivers/soc/renesas/r8a774a1-sysc.c b/drivers/genpd/renesas/r8a774a1-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a774a1-sysc.c rename to drivers/genpd/renesas/r8a774a1-sysc.c diff --git a/drivers/soc/renesas/r8a774b1-sysc.c b/drivers/genpd/renesas/r8a774b1-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a774b1-sysc.c rename to drivers/genpd/renesas/r8a774b1-sysc.c diff --git a/drivers/soc/renesas/r8a774c0-sysc.c b/drivers/genpd/renesas/r8a774c0-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a774c0-sysc.c rename to drivers/genpd/renesas/r8a774c0-sysc.c diff --git a/drivers/soc/renesas/r8a774e1-sysc.c b/drivers/genpd/renesas/r8a774e1-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a774e1-sysc.c rename to drivers/genpd/renesas/r8a774e1-sysc.c diff --git a/drivers/soc/renesas/r8a7779-sysc.c b/drivers/genpd/renesas/r8a7779-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a7779-sysc.c rename to drivers/genpd/renesas/r8a7779-sysc.c diff --git a/drivers/soc/renesas/r8a7790-sysc.c b/drivers/genpd/renesas/r8a7790-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a7790-sysc.c rename to drivers/genpd/renesas/r8a7790-sysc.c diff --git a/drivers/soc/renesas/r8a7791-sysc.c b/drivers/genpd/renesas/r8a7791-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a7791-sysc.c rename to drivers/genpd/renesas/r8a7791-sysc.c diff --git a/drivers/soc/renesas/r8a7792-sysc.c b/drivers/genpd/renesas/r8a7792-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a7792-sysc.c rename to drivers/genpd/renesas/r8a7792-sysc.c diff --git a/drivers/soc/renesas/r8a7794-sysc.c b/drivers/genpd/renesas/r8a7794-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a7794-sysc.c rename to drivers/genpd/renesas/r8a7794-sysc.c diff --git a/drivers/soc/renesas/r8a7795-sysc.c b/drivers/genpd/renesas/r8a7795-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a7795-sysc.c rename to drivers/genpd/renesas/r8a7795-sysc.c diff --git a/drivers/soc/renesas/r8a7796-sysc.c b/drivers/genpd/renesas/r8a7796-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a7796-sysc.c rename to drivers/genpd/renesas/r8a7796-sysc.c diff --git a/drivers/soc/renesas/r8a77965-sysc.c b/drivers/genpd/renesas/r8a77965-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a77965-sysc.c rename to drivers/genpd/renesas/r8a77965-sysc.c diff --git a/drivers/soc/renesas/r8a77970-sysc.c b/drivers/genpd/renesas/r8a77970-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a77970-sysc.c rename to drivers/genpd/renesas/r8a77970-sysc.c diff --git a/drivers/soc/renesas/r8a77980-sysc.c b/drivers/genpd/renesas/r8a77980-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a77980-sysc.c rename to drivers/genpd/renesas/r8a77980-sysc.c diff --git a/drivers/soc/renesas/r8a77990-sysc.c b/drivers/genpd/renesas/r8a77990-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a77990-sysc.c rename to drivers/genpd/renesas/r8a77990-sysc.c diff --git a/drivers/soc/renesas/r8a77995-sysc.c b/drivers/genpd/renesas/r8a77995-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a77995-sysc.c rename to drivers/genpd/renesas/r8a77995-sysc.c diff --git a/drivers/soc/renesas/r8a779a0-sysc.c b/drivers/genpd/renesas/r8a779a0-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a779a0-sysc.c rename to drivers/genpd/renesas/r8a779a0-sysc.c diff --git a/drivers/soc/renesas/r8a779f0-sysc.c b/drivers/genpd/renesas/r8a779f0-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a779f0-sysc.c rename to drivers/genpd/renesas/r8a779f0-sysc.c diff --git a/drivers/soc/renesas/r8a779g0-sysc.c b/drivers/genpd/renesas/r8a779g0-sysc.c similarity index 100% rename from drivers/soc/renesas/r8a779g0-sysc.c rename to drivers/genpd/renesas/r8a779g0-sysc.c diff --git a/drivers/soc/renesas/rcar-gen4-sysc.c b/drivers/genpd/renesas/rcar-gen4-sysc.c similarity index 100% rename from drivers/soc/renesas/rcar-gen4-sysc.c rename to drivers/genpd/renesas/rcar-gen4-sysc.c diff --git a/drivers/soc/renesas/rcar-gen4-sysc.h b/drivers/genpd/renesas/rcar-gen4-sysc.h similarity index 100% rename from drivers/soc/renesas/rcar-gen4-sysc.h rename to drivers/genpd/renesas/rcar-gen4-sysc.h diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/genpd/renesas/rcar-sysc.c similarity index 100% rename from drivers/soc/renesas/rcar-sysc.c rename to drivers/genpd/renesas/rcar-sysc.c diff --git a/drivers/soc/renesas/rcar-sysc.h b/drivers/genpd/renesas/rcar-sysc.h similarity index 100% rename from drivers/soc/renesas/rcar-sysc.h rename to drivers/genpd/renesas/rcar-sysc.h diff --git a/drivers/soc/renesas/rmobile-sysc.c b/drivers/genpd/renesas/rmobile-sysc.c similarity index 100% rename from drivers/soc/renesas/rmobile-sysc.c rename to drivers/genpd/renesas/rmobile-sysc.c diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile index 6e4e77b0afff..734f8f8cefa4 100644 --- a/drivers/soc/renesas/Makefile +++ b/drivers/soc/renesas/Makefile @@ -3,30 +3,6 @@ obj-$(CONFIG_SOC_RENESAS) += renesas-soc.o # SoC -obj-$(CONFIG_SYSC_R8A7742) += r8a7742-sysc.o -obj-$(CONFIG_SYSC_R8A7743) += r8a7743-sysc.o -obj-$(CONFIG_SYSC_R8A7745) += r8a7745-sysc.o -obj-$(CONFIG_SYSC_R8A77470) += r8a77470-sysc.o -obj-$(CONFIG_SYSC_R8A774A1) += r8a774a1-sysc.o -obj-$(CONFIG_SYSC_R8A774B1) += r8a774b1-sysc.o -obj-$(CONFIG_SYSC_R8A774C0) += r8a774c0-sysc.o -obj-$(CONFIG_SYSC_R8A774E1) += r8a774e1-sysc.o -obj-$(CONFIG_SYSC_R8A7779) += r8a7779-sysc.o -obj-$(CONFIG_SYSC_R8A7790) += r8a7790-sysc.o -obj-$(CONFIG_SYSC_R8A7791) += r8a7791-sysc.o -obj-$(CONFIG_SYSC_R8A7792) += r8a7792-sysc.o -obj-$(CONFIG_SYSC_R8A7794) += r8a7794-sysc.o -obj-$(CONFIG_SYSC_R8A7795) += r8a7795-sysc.o -obj-$(CONFIG_SYSC_R8A77960) += r8a7796-sysc.o -obj-$(CONFIG_SYSC_R8A77961) += r8a7796-sysc.o -obj-$(CONFIG_SYSC_R8A77965) += r8a77965-sysc.o -obj-$(CONFIG_SYSC_R8A77970) += r8a77970-sysc.o -obj-$(CONFIG_SYSC_R8A77980) += r8a77980-sysc.o -obj-$(CONFIG_SYSC_R8A77990) += r8a77990-sysc.o -obj-$(CONFIG_SYSC_R8A77995) += r8a77995-sysc.o -obj-$(CONFIG_SYSC_R8A779A0) += r8a779a0-sysc.o -obj-$(CONFIG_SYSC_R8A779F0) += r8a779f0-sysc.o -obj-$(CONFIG_SYSC_R8A779G0) += r8a779g0-sysc.o ifdef CONFIG_SMP obj-$(CONFIG_ARCH_R9A06G032) += r9a06g032-smp.o endif @@ -34,6 +10,3 @@ endif # Family obj-$(CONFIG_PWC_RZV2M) += pwc-rzv2m.o obj-$(CONFIG_RST_RCAR) += rcar-rst.o -obj-$(CONFIG_SYSC_RCAR) += rcar-sysc.o -obj-$(CONFIG_SYSC_RCAR_GEN4) += rcar-gen4-sysc.o -obj-$(CONFIG_SYSC_RMOBILE) += rmobile-sysc.o From patchwork Fri Jul 7 14:04:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 700297 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 617C3C001DE for ; Fri, 7 Jul 2023 14:05:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232620AbjGGOFT (ORCPT ); Fri, 7 Jul 2023 10:05:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232833AbjGGOFI (ORCPT ); Fri, 7 Jul 2023 10:05:08 -0400 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F544211D for ; Fri, 7 Jul 2023 07:04:56 -0700 (PDT) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2b69e6d324aso29520291fa.0 for ; Fri, 07 Jul 2023 07:04:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688738694; x=1691330694; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dvYXj99u7TbpJIDZNfoYyEKQkjm1mobuKtYLdIv6z2U=; b=p/oH5D8hyIf5Dkec8klXho99OyxP80D/QtgL4Gm0vWlJ1aeL+tiNklnjF0R12Qpam6 TaTTV4uQ/sj91Kzjq8BXg21nsyc6hKiIqGm6o3P5frn4qyATm+KWjfsJMJR0DrVnqmAP NVQIJrpUbuvXpoIDVMSAfjkwkSFKRKSYfrCOK23vNq69Psdl9sVmPkheppRFu+dl5ppT whl3eeKzEnDRDtzxp4Zqc09WgAJEJBCdDROwDRQfAsVFReiEY0dW6FiGQeZW7X2VWHUr +iOL5adYEiav1yk9MrfCcYU0cSUcsFsukv+ucSgLTKnfVjo7wrAZgMTj+hwJNAAO1pmy E4wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688738694; x=1691330694; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dvYXj99u7TbpJIDZNfoYyEKQkjm1mobuKtYLdIv6z2U=; b=A5AubqYfaMD4wlsv7X4SyFKejVd7r2c5NrG2bEyDOojwa+1zpI4VCbxVwTG3C6vwM0 blTWsx/MSS/gCr57hpekBviBjavu9hpjfUwmqwzFoHMeVCBFD2egrycoUOlhjTiAf0lA yLQn6PlbGlsTnuwy1rqNxnzpMvxdW4UqoVU5FLpSQBFTzV6tF62vFDTb4qUQ42Rqhjay G32fd4Pr9F2BMfpR/l5DT2TZisE2pkUGvsnDQumRifpH7H8yaWdnJKokunnIE82nc4y7 VvEO69KjYDYSqqyOUf4C3U0ExghvDNh1u/Zp1tl+bvFS79NhEuejCEVVqE5nmQEHVQNP dwLg== X-Gm-Message-State: ABy/qLYcz3pHSKSf4gccb0Xi0Hn0WlOwi+oARLi6MJA5o+l57kK6cBW/ 1DFxCaD8p6IWS/5AOUziVM9NUg== X-Google-Smtp-Source: APBJJlFZUteWbKYl1aexP46DguwGv5crahAqnytrmTR0O5/HuzUepW8m9GQt2AqtWhVNZYlKuIDy2A== X-Received: by 2002:a2e:9e58:0:b0:2b6:e12f:267 with SMTP id g24-20020a2e9e58000000b002b6e12f0267mr3598442ljk.5.1688738694744; Fri, 07 Jul 2023 07:04:54 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id u21-20020a2e8555000000b002b6cb25e3f1sm760341ljj.108.2023.07.07.07.04.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 07:04:54 -0700 (PDT) From: Ulf Hansson To: Arnd Bergmann , Olof Johansson Cc: Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Heiko Stuebner , linux-rockchip@lists.infradead.org Subject: [PATCH 10/18] soc: rockchip: Mover power-domain driver to the genpd dir Date: Fri, 7 Jul 2023 16:04:26 +0200 Message-Id: <20230707140434.723349-11-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707140434.723349-1-ulf.hansson@linaro.org> References: <20230707140434.723349-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Cc: Heiko Stuebner Cc: Signed-off-by: Ulf Hansson Acked-by: Heiko Stuebner --- drivers/genpd/Makefile | 1 + drivers/genpd/rockchip/Makefile | 2 ++ .../{soc/rockchip/pm_domains.c => genpd/rockchip/pm-domains.c} | 0 drivers/soc/rockchip/Makefile | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 drivers/genpd/rockchip/Makefile rename drivers/{soc/rockchip/pm_domains.c => genpd/rockchip/pm-domains.c} (100%) diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index 286598ce7620..c178421e0cbc 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -6,3 +6,4 @@ obj-y += bcm/ obj-y += mediatek/ obj-y += qcom/ obj-y += renesas/ +obj-y += rockchip/ diff --git a/drivers/genpd/rockchip/Makefile b/drivers/genpd/rockchip/Makefile new file mode 100644 index 000000000000..8fb9d88a3492 --- /dev/null +++ b/drivers/genpd/rockchip/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_ROCKCHIP_PM_DOMAINS) += pm-domains.o diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/genpd/rockchip/pm-domains.c similarity index 100% rename from drivers/soc/rockchip/pm_domains.c rename to drivers/genpd/rockchip/pm-domains.c diff --git a/drivers/soc/rockchip/Makefile b/drivers/soc/rockchip/Makefile index 05f31a4e743c..23d414433c8c 100644 --- a/drivers/soc/rockchip/Makefile +++ b/drivers/soc/rockchip/Makefile @@ -4,5 +4,4 @@ # obj-$(CONFIG_ROCKCHIP_GRF) += grf.o obj-$(CONFIG_ROCKCHIP_IODOMAIN) += io-domain.o -obj-$(CONFIG_ROCKCHIP_PM_DOMAINS) += pm_domains.o obj-$(CONFIG_ROCKCHIP_DTPM) += dtpm.o From patchwork Fri Jul 7 14:04:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 700773 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 A71DFC001B0 for ; Fri, 7 Jul 2023 14:05:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232978AbjGGOF3 (ORCPT ); Fri, 7 Jul 2023 10:05:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232854AbjGGOFK (ORCPT ); Fri, 7 Jul 2023 10:05:10 -0400 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36D82212C for ; Fri, 7 Jul 2023 07:04:59 -0700 (PDT) Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2b5c231c23aso31011231fa.0 for ; Fri, 07 Jul 2023 07:04:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688738697; x=1691330697; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2qyum3k4tjelZ9EZzRNlVIF22Us+iBOxD/GKR5sbt34=; b=f3RG+EafmByUgKe8RFhvUo0UapMEMxPfE1WH+JdHr4CyT3ofKlMLlN+fBgAA8In52w FUBiwolmlm+jKRRY75fobnEb/2oT3CL5ixV+f5+QuKSj1fcIRRYP2LvlR5OH6ivpXy2H wbIUSC8Lbega6GxYA0NHK+nq/5LMsvJUq+Ydamp8kaXOSRJVakkybleuhujUl8f7xExG YM9W8eAfG4hqaJVvoGNPzuMGW3rP0DHNJoAWa9N5WiD6Cd2YSaJmutUequzWeoVl1ESp YXzr94lap+QWCbAzQ8Xx+H/23zy04oMpbncsbFzU0RMtZ25orOPrGEyt7Zop37ZlkBJS xsAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688738697; x=1691330697; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2qyum3k4tjelZ9EZzRNlVIF22Us+iBOxD/GKR5sbt34=; b=iNniQIb/v7CsjHsxzT38qycRXXiKdM4vFAJDghcAsuwCVTh3Wri0xGzJJ/L0oimTzU YkO0ishFai001R9oulOvYcT3fFWU2NzgnQmqaGgPO4UWWDo77ffjMvzB05mdADBgK9d9 YY2M1IqwgHYHPs71FPKzhSAt40tItXBFzpXQ6Azl3f9swafggvpchDrIOWDBk8OrAjWn o1FpC0Rv+G5Es5Nk8UCoI2CDec8yHMj/oD9xSfHnjdyM8pmBkBYUdwkeL652qpYZmfL6 mu6hle5ivybq7wFtZh23AbpjsvvbuWPczEDB1HEz/YvRxaeGHBye6q69jFCtV83dv9kw zRdg== X-Gm-Message-State: ABy/qLZbbCsaux9BXnzH83U4oeNaPocHJ2Y9C/AySDMGOJAdpsR8KtKm F1X/X5oiCFAdsZ9/hW4VO1R3vg== X-Google-Smtp-Source: APBJJlEIR/ULGxuj2SzHUNnMAJkyr9wn+Mq7Vhm89E5STBrFYsy5xjKKlWzX/dG7nKg7feP+/lEDDw== X-Received: by 2002:a2e:80c4:0:b0:2b6:9b2e:e352 with SMTP id r4-20020a2e80c4000000b002b69b2ee352mr4154824ljg.9.1688738697355; Fri, 07 Jul 2023 07:04:57 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id u21-20020a2e8555000000b002b6cb25e3f1sm760341ljj.108.2023.07.07.07.04.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 07:04:55 -0700 (PDT) From: Ulf Hansson To: Arnd Bergmann , Olof Johansson Cc: Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , Alim Akhtar , linux-samsung-soc@vger.kernel.org Subject: [PATCH 11/18] soc: samsung: Move power-domain driver to the genpd dir Date: Fri, 7 Jul 2023 16:04:27 +0200 Message-Id: <20230707140434.723349-12-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707140434.723349-1-ulf.hansson@linaro.org> References: <20230707140434.723349-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Cc: Krzysztof Kozlowski Cc: Alim Akhtar Cc: Signed-off-by: Ulf Hansson Reviewed-by: Krzysztof Kozlowski --- drivers/genpd/Makefile | 1 + drivers/genpd/samsung/Makefile | 2 ++ .../samsung/pm_domains.c => genpd/samsung/exynos-pm-domains.c} | 0 drivers/soc/samsung/Makefile | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 drivers/genpd/samsung/Makefile rename drivers/{soc/samsung/pm_domains.c => genpd/samsung/exynos-pm-domains.c} (100%) diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index c178421e0cbc..1cf0ff26a44f 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -7,3 +7,4 @@ obj-y += mediatek/ obj-y += qcom/ obj-y += renesas/ obj-y += rockchip/ +obj-y += samsung/ diff --git a/drivers/genpd/samsung/Makefile b/drivers/genpd/samsung/Makefile new file mode 100644 index 000000000000..397aa5908c1d --- /dev/null +++ b/drivers/genpd/samsung/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_EXYNOS_PM_DOMAINS) += exynos-pm-domains.o diff --git a/drivers/soc/samsung/pm_domains.c b/drivers/genpd/samsung/exynos-pm-domains.c similarity index 100% rename from drivers/soc/samsung/pm_domains.c rename to drivers/genpd/samsung/exynos-pm-domains.c diff --git a/drivers/soc/samsung/Makefile b/drivers/soc/samsung/Makefile index d35270fc6b2b..248a33d7754a 100644 --- a/drivers/soc/samsung/Makefile +++ b/drivers/soc/samsung/Makefile @@ -10,7 +10,6 @@ obj-$(CONFIG_EXYNOS_PMU) += exynos-pmu.o obj-$(CONFIG_EXYNOS_PMU_ARM_DRIVERS) += exynos3250-pmu.o exynos4-pmu.o \ exynos5250-pmu.o exynos5420-pmu.o -obj-$(CONFIG_EXYNOS_PM_DOMAINS) += pm_domains.o obj-$(CONFIG_EXYNOS_REGULATOR_COUPLER) += exynos-regulator-coupler.o obj-$(CONFIG_SAMSUNG_PM_CHECK) += s3c-pm-check.o From patchwork Fri Jul 7 14:04:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 700296 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 1BD45C001B0 for ; Fri, 7 Jul 2023 14:05:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232927AbjGGOFh (ORCPT ); Fri, 7 Jul 2023 10:05:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232926AbjGGOFS (ORCPT ); Fri, 7 Jul 2023 10:05:18 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69F2326A9 for ; Fri, 7 Jul 2023 07:05:01 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-4fa48b5dc2eso3094707e87.1 for ; Fri, 07 Jul 2023 07:05:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688738699; x=1691330699; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+XnY/GyZrUw9Juk0p/ED/bwiocbQW9F5IpBV8vKRnmU=; b=VHFOyK/HJt+DaBJz+gKOwdykaUd1K+cMEkPJhCGUPohGBYJbxIBfscKSR1zUp6BUFq nuuS6Oz+VGmHbCBf/n5rUKnHU99v2RiEQg0YDIyNwi1ZcvWap6njv2k7WYkIFJ6uLu/D SrFAMwH4IW0d53TU+GR5Saqym2m6qKdgZmvt1O37f08PoOwDmo+GIXTB4oTvIme0pxMJ mbMM5cZpsFuhdWYLGXIQoCrHoXlkAAYUOec31+PVPzDzKL40DdBT05eJ5S2jUj36G3wZ VUkNGsysQ/qdV8UVy/g8jV5PwVOtJkaXj6CFYQgByFB+UEKnfbqIkX0OIvAy4wxOAGln ahAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688738699; x=1691330699; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+XnY/GyZrUw9Juk0p/ED/bwiocbQW9F5IpBV8vKRnmU=; b=hpYTkczKY++bCHvpWogU3h76CZgiiklBx5A0T8MZ00D36cWXhg2HZi9EMNY/qKBv8x zAPu8gJkRDHEskLzCN+W6NQGoSeg8OOb8/I62ujrllHH+2m+FahXretG4bhVgejVtni8 EVAJpLXCoGCNlCws1CTPrnOh6wKhGQiCKSfQycMN8pOdxDS9PuEEl6qjyqk/sQ59HyvQ lUruhzAqmlTUvi6+z6StTAOSN6uZR9tAVndQC9YlgagLgN8K96uLG4f0Pu77vw8fRxMp f8ZSEL1965ZV7hCRgj8a+dg7L36i8Fb3TOIIdbGar6C+MOFY4J4mvmdkjH7CgQMDUBgx uOXQ== X-Gm-Message-State: ABy/qLYDEHpivAIUMk084l0cHTsaKS/LfTEMUhivifcRC9juVWS7K4Nm V00A9MymTJdD24+xX0ab+dwGrQ== X-Google-Smtp-Source: APBJJlG1uhr1Kp4j3/QpQGrtS7yfv8aAwoixL3g207ucHUtsAlZFcafYpRhe3bV7T8aJdLCnhuUCBA== X-Received: by 2002:a2e:9658:0:b0:2b5:68ad:291f with SMTP id z24-20020a2e9658000000b002b568ad291fmr3768161ljh.19.1688738699706; Fri, 07 Jul 2023 07:04:59 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id u21-20020a2e8555000000b002b6cb25e3f1sm760341ljj.108.2023.07.07.07.04.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 07:04:58 -0700 (PDT) From: Ulf Hansson To: Arnd Bergmann , Olof Johansson Cc: Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Walker Chen , Conor Dooley Subject: [PATCH 12/18] soc: starfive: Move the power-domain driver to the genpd dir Date: Fri, 7 Jul 2023 16:04:28 +0200 Message-Id: <20230707140434.723349-13-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707140434.723349-1-ulf.hansson@linaro.org> References: <20230707140434.723349-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Cc: Walker Chen Cc: Conor Dooley Signed-off-by: Ulf Hansson --- MAINTAINERS | 2 +- drivers/genpd/Makefile | 1 + drivers/genpd/starfive/Makefile | 2 ++ .../{soc/starfive/jh71xx_pmu.c => genpd/starfive/jh71xx-pmu.c} | 0 drivers/soc/starfive/Makefile | 3 --- 5 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 drivers/genpd/starfive/Makefile rename drivers/{soc/starfive/jh71xx_pmu.c => genpd/starfive/jh71xx-pmu.c} (100%) delete mode 100644 drivers/soc/starfive/Makefile diff --git a/MAINTAINERS b/MAINTAINERS index cb57f5fb2cd7..9e580df3e5db 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -20311,7 +20311,7 @@ STARFIVE JH71XX PMU CONTROLLER DRIVER M: Walker Chen S: Supported F: Documentation/devicetree/bindings/power/starfive* -F: drivers/soc/starfive/jh71xx_pmu.c +F: drivers/genpd/starfive/jh71xx-pmu.c F: include/dt-bindings/power/starfive,jh7110-pmu.h STARFIVE JH7110 TDM DRIVER diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index 1cf0ff26a44f..baf2021235a7 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -8,3 +8,4 @@ obj-y += qcom/ obj-y += renesas/ obj-y += rockchip/ obj-y += samsung/ +obj-y += starfive/ diff --git a/drivers/genpd/starfive/Makefile b/drivers/genpd/starfive/Makefile new file mode 100644 index 000000000000..975bba2a29a9 --- /dev/null +++ b/drivers/genpd/starfive/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_JH71XX_PMU) += jh71xx-pmu.o diff --git a/drivers/soc/starfive/jh71xx_pmu.c b/drivers/genpd/starfive/jh71xx-pmu.c similarity index 100% rename from drivers/soc/starfive/jh71xx_pmu.c rename to drivers/genpd/starfive/jh71xx-pmu.c diff --git a/drivers/soc/starfive/Makefile b/drivers/soc/starfive/Makefile deleted file mode 100644 index 13b589d6b5f3..000000000000 --- a/drivers/soc/starfive/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 - -obj-$(CONFIG_JH71XX_PMU) += jh71xx_pmu.o From patchwork Fri Jul 7 14:04:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 700772 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 3B562EB64DA for ; Fri, 7 Jul 2023 14:05:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232849AbjGGOFl (ORCPT ); Fri, 7 Jul 2023 10:05:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232969AbjGGOF3 (ORCPT ); Fri, 7 Jul 2023 10:05:29 -0400 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DC6D2703 for ; Fri, 7 Jul 2023 07:05:04 -0700 (PDT) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2b6ef64342aso30705551fa.3 for ; Fri, 07 Jul 2023 07:05:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688738702; x=1691330702; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C42FrWKbauKrpHyGQL85ov8a9IzG5rtXeIwWVhxtqVk=; b=MCu7vlROYZ/xIKEYZmjZztxNMAhryMpK0Unegzg8Q/0Z0ijMjupo0Vj5o5KA/+OE+J XFiVISB2r8qtP8rYoLnpVNxW8FXFTbJfkeKDW9l4Dkb8UUmR5LqMhAVeRaF7AumW79Jb RXVGTkN9yite37tYrCtpU9vqK64UbqszV80El/ekskzn9wowhvbQmaraxzrrfeJcOMlN hOZiVmq/6FjsdDG1LrZM3sauPgkivdWBYOgFZ46y9Gn/mF11V9jQc3tGfUG7Y2KYnKc9 +nKM1MJF6h60t4rdpGe8CblT4AZ4UOXr7xH/DPGqRF9fgG8WLARufHtNFBcF8EHyUcjx h+1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688738702; x=1691330702; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C42FrWKbauKrpHyGQL85ov8a9IzG5rtXeIwWVhxtqVk=; b=J361laQeRznp3AjTlKQ9DBKjY/j4kaOi0e4uB5Cu+1sUtmbvdwzLu/8hBPg1fiml4h hn2FIQ+zAxzs0Vd3cPK8wRQkfXKEdGdjYSFyF+JyQyPXz7BaBV7t7aPQhF0oJ+08ski9 vjmOrQb5kD5I57Ekv5enkCkwal15RrBGcaBAbJyARGXT2cwRwbZjTcoEj8IAK04ME80a mfs4JinOBLdKKez9kWAurn2xdUUDWu4ZAZM05cdRfiwnT+95i1FYEA7X86yGjXaNgIwK kPGSz3fK/wJrS+h7z+YlYb1pvl+0oKOhsVQ61gAfoWK6k642AdMR0jzr7CBa9a2gYCvZ 0zew== X-Gm-Message-State: ABy/qLbToPxkYx3a9nT7a0hUdjtk8WguGxqC71A0OsuXZyUpgFSQVcRA QNH3UrQxFFm50Yjak0KxEpsUxg== X-Google-Smtp-Source: APBJJlGEv/lo3wa1G7PQ6zQPPu2YP1CoXxXtYuj6YVBRNt0l/8ADVQL/9ApsIP43zURVV2GBgM+6Zw== X-Received: by 2002:a2e:99c9:0:b0:2b6:ed7e:5a74 with SMTP id l9-20020a2e99c9000000b002b6ed7e5a74mr3830249ljj.36.1688738702659; Fri, 07 Jul 2023 07:05:02 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id u21-20020a2e8555000000b002b6cb25e3f1sm760341ljj.108.2023.07.07.07.04.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 07:05:00 -0700 (PDT) From: Ulf Hansson To: Arnd Bergmann , Olof Johansson Cc: Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , linux-sunxi@lists.linux.dev Subject: [PATCH 13/18] soc: sunxi: Move power-domain driver to the genpd dir Date: Fri, 7 Jul 2023 16:04:29 +0200 Message-Id: <20230707140434.723349-14-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707140434.723349-1-ulf.hansson@linaro.org> References: <20230707140434.723349-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Cc: Chen-Yu Tsai Cc: Jernej Skrabec Cc: Samuel Holland Cc: Signed-off-by: Ulf Hansson --- drivers/genpd/Makefile | 1 + drivers/genpd/sunxi/Makefile | 2 ++ drivers/{soc => genpd}/sunxi/sun20i-ppu.c | 0 drivers/soc/sunxi/Makefile | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 drivers/genpd/sunxi/Makefile rename drivers/{soc => genpd}/sunxi/sun20i-ppu.c (100%) diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index baf2021235a7..76f2a411e6bc 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -9,3 +9,4 @@ obj-y += renesas/ obj-y += rockchip/ obj-y += samsung/ obj-y += starfive/ +obj-y += sunxi/ diff --git a/drivers/genpd/sunxi/Makefile b/drivers/genpd/sunxi/Makefile new file mode 100644 index 000000000000..ec1d7a2fb21d --- /dev/null +++ b/drivers/genpd/sunxi/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_SUN20I_PPU) += sun20i-ppu.o diff --git a/drivers/soc/sunxi/sun20i-ppu.c b/drivers/genpd/sunxi/sun20i-ppu.c similarity index 100% rename from drivers/soc/sunxi/sun20i-ppu.c rename to drivers/genpd/sunxi/sun20i-ppu.c diff --git a/drivers/soc/sunxi/Makefile b/drivers/soc/sunxi/Makefile index 90ff2ebe7655..549159571d4f 100644 --- a/drivers/soc/sunxi/Makefile +++ b/drivers/soc/sunxi/Makefile @@ -1,4 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_SUNXI_MBUS) += sunxi_mbus.o obj-$(CONFIG_SUNXI_SRAM) += sunxi_sram.o -obj-$(CONFIG_SUN20I_PPU) += sun20i-ppu.o From patchwork Fri Jul 7 14:04:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 700295 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 DA8F1C001E0 for ; Fri, 7 Jul 2023 14:05:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232906AbjGGOFr (ORCPT ); Fri, 7 Jul 2023 10:05:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232992AbjGGOFa (ORCPT ); Fri, 7 Jul 2023 10:05:30 -0400 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DB522717 for ; Fri, 7 Jul 2023 07:05:06 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2b6f97c7115so29186901fa.2 for ; Fri, 07 Jul 2023 07:05:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688738705; x=1691330705; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kubpqVY+wfLhuDXukhvTufqnNdzOkNaWWajItyQMxWM=; b=Yup815+bfBG+qKfdbmDkUR3hKM6OAuBkkeYgoD2wvVs9x5tdisLBsy8u2bqr4f0DSn 2hpXqIDKiEHwTBDti5FM+cY06+KHs3ahD0ERG7JtxSrdcFY/d1TdG5zS2+1q6NZ2XDRa nhT9l5Q5vWWicaDnhDKsO2gN6hgk+R07ln21n95e+IJM3QzONtlULjHog3dTjn/IcVoS vueGTxyyKt5sKLmjkgv9J4FeijJ1//uc5tuUiHMULMUC6h/huzNPmq9niLaBJRCgKDM3 jBbufA5CCrqoJ06HpRS+dZycpRG2yg5STU724HPnDQgmA5NRhs4uY1pYfC5uX+WNnLKX DoYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688738705; x=1691330705; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kubpqVY+wfLhuDXukhvTufqnNdzOkNaWWajItyQMxWM=; b=LVkVyTKtPpbpmntGnRJTnytyAkQa/1KH7jlOozIaHxxUG7IQIMyHxEx+5VGQZ9AMHT /32sBNiaVyXwW9bOZZG/V/hFp8la3Wt6P2qP7qjdhQshEoFwnXMwqADgwfPWV8mGWwyx IRP/1bUjuEmWeQ7bcttOvaS80PGgXX8y6KOjP3HNPbIxuxQchYQ9DsrVrnaf6lG2TB29 weeo1TAXcZvsvovk1fTU8Rls/i0gQeZ2HEAMaxUZxG+bEIcOg+yvDFfW56JSjdT07u6K DtyRQbif8kR6V/jBUELPTVm2r/cb847C0m5ANqZe2tyATXGMdodDAe+M+t5hY6++n1zx haNQ== X-Gm-Message-State: ABy/qLY7cqEynPoei4JjnxKAKf4JKNm6p2fI/7un1FHlSB+hflGgOzH3 9oeVRIhUivuo0z4Kst093xD5CQ== X-Google-Smtp-Source: APBJJlF67NbLX0eb6y4ugssNq0/Qewc5uDxjKQNtG/3DMiEh/RVTtC8ZQ2+0X4TTuC06eW+jJBdiPw== X-Received: by 2002:a2e:8745:0:b0:2b3:4ea3:d020 with SMTP id q5-20020a2e8745000000b002b34ea3d020mr3841130ljj.17.1688738704915; Fri, 07 Jul 2023 07:05:04 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id u21-20020a2e8555000000b002b6cb25e3f1sm760341ljj.108.2023.07.07.07.05.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 07:05:03 -0700 (PDT) From: Ulf Hansson To: Arnd Bergmann , Olof Johansson Cc: Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Thierry Reding , Jonathan Hunter , Mikko Perttunen , linux-tegra@vger.kernel.org Subject: [PATCH 14/18] soc: tegra: Move powergate-bpmp driver to the genpd dir Date: Fri, 7 Jul 2023 16:04:30 +0200 Message-Id: <20230707140434.723349-15-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707140434.723349-1-ulf.hansson@linaro.org> References: <20230707140434.723349-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Let's moves the powergate-bpmp driver, while we leave the pmc driver in the soc directory. To move the latter, we first need to split it up in a few pieces so the genpd parts can be moved alone. Cc: Thierry Reding Cc: Jonathan Hunter Cc: Mikko Perttunen Cc: Signed-off-by: Ulf Hansson Acked-by: Thierry Reding --- drivers/genpd/Makefile | 1 + drivers/genpd/tegra/Makefile | 2 ++ drivers/{soc => genpd}/tegra/powergate-bpmp.c | 0 drivers/soc/tegra/Makefile | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 drivers/genpd/tegra/Makefile rename drivers/{soc => genpd}/tegra/powergate-bpmp.c (100%) diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index 76f2a411e6bc..e6f34d82e6a8 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -10,3 +10,4 @@ obj-y += rockchip/ obj-y += samsung/ obj-y += starfive/ obj-y += sunxi/ +obj-y += tegra/ diff --git a/drivers/genpd/tegra/Makefile b/drivers/genpd/tegra/Makefile new file mode 100644 index 000000000000..ec8acfd2c77c --- /dev/null +++ b/drivers/genpd/tegra/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_SOC_TEGRA_POWERGATE_BPMP) += powergate-bpmp.o diff --git a/drivers/soc/tegra/powergate-bpmp.c b/drivers/genpd/tegra/powergate-bpmp.c similarity index 100% rename from drivers/soc/tegra/powergate-bpmp.c rename to drivers/genpd/tegra/powergate-bpmp.c diff --git a/drivers/soc/tegra/Makefile b/drivers/soc/tegra/Makefile index d722f512dc9d..01059619e764 100644 --- a/drivers/soc/tegra/Makefile +++ b/drivers/soc/tegra/Makefile @@ -5,7 +5,6 @@ obj-y += cbb/ obj-y += common.o obj-$(CONFIG_SOC_TEGRA_FLOWCTRL) += flowctrl.o obj-$(CONFIG_SOC_TEGRA_PMC) += pmc.o -obj-$(CONFIG_SOC_TEGRA_POWERGATE_BPMP) += powergate-bpmp.o obj-$(CONFIG_SOC_TEGRA20_VOLTAGE_COUPLER) += regulators-tegra20.o obj-$(CONFIG_SOC_TEGRA30_VOLTAGE_COUPLER) += regulators-tegra30.o obj-$(CONFIG_ARCH_TEGRA_186_SOC) += ari-tegra186.o From patchwork Fri Jul 7 14:04:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 700771 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 439BDC001B0 for ; Fri, 7 Jul 2023 14:05:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232905AbjGGOFs (ORCPT ); Fri, 7 Jul 2023 10:05:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233004AbjGGOFb (ORCPT ); Fri, 7 Jul 2023 10:05:31 -0400 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B82432108 for ; Fri, 7 Jul 2023 07:05:08 -0700 (PDT) Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2b6f9edac8dso29140761fa.3 for ; Fri, 07 Jul 2023 07:05:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688738706; x=1691330706; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VApuNv7K0akCAqJYRY7aWjKx21v5ANKMyMqi/O1A0MY=; b=bMtfuXHQAOZjenwNznuGxZ1Ud/AreXxB8SuCW8AVQEiSEQBdTQ7NPapmusVTdtPXvZ V6QPEua25XqtQYjmtpkLMOt73d1/7FQVlFhZjL6wkBkrha5fBIfxWIga2h550Lo/SlkK SVOY8GKTIytJAWijHSstTiEE55AQ3BvbheXQioapE06YLb/cGydYXuEjWOBppcVK1CMS UqilY6jq3uzFjA0aINhfjPR4A0lS/hlD8PaFu93Z2po2ISZxBEwmZPIza4FlruOp8GFn AnOwHW0FUQtR3rCGr0sRxJAJ70ejgUkT6R0cc6ZG0AoiL4+40FMu7MB0COlOTU/i741M OREg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688738706; x=1691330706; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VApuNv7K0akCAqJYRY7aWjKx21v5ANKMyMqi/O1A0MY=; b=ig/KRONPmdz3fVZV1eh3QrnLwEm+86++WT+G6NoIHsWjdKlqUiSuM/aJo03+44ygzW de+yOp5puBSA/OftfObokh2TR4ESCZ5OLzizs1FZLTAki5qZ2oxIFu2LfY7CYACAnIkn XdXrx3lxEp8ixmwfiqZx2kgr6O0aws64G609tCFyEKbbX/EC3xVq4HZvsdkb8aBKbT9j WRuUx0bCAGZLtksWX/5TixpCZEUGB+VNgt+g69L55voWmmrlAo40h65FuOh5mRhO+EEm Gvzo7pgs+SB/Wn8JfR4lqJfLDoA7hilBkR+2Nr2QU0s0PwaYih6uk2Njd/BU8wbFsFQx Q2tA== X-Gm-Message-State: ABy/qLbUYs1RHxXXUOunwLBOXFhOKBTJeJUESz0saYuiLYKpZ8Hf7RCy 2pB2IFMWMawtqMiY70DOjB3FiA== X-Google-Smtp-Source: APBJJlFVYwF1JmN9UgPPIHu7IqhkYo85p/SkhH0GI8LAixeD+mcBM5zYy2/oHzF5Oduq7ge5pzX8eg== X-Received: by 2002:a2e:854d:0:b0:2b6:ef2b:da5e with SMTP id u13-20020a2e854d000000b002b6ef2bda5emr3821401ljj.49.1688738706796; Fri, 07 Jul 2023 07:05:06 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id u21-20020a2e8555000000b002b6cb25e3f1sm760341ljj.108.2023.07.07.07.05.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 07:05:05 -0700 (PDT) From: Ulf Hansson To: Arnd Bergmann , Olof Johansson Cc: Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Nishanth Menon , Santosh Shilimkar , Tero Kristo Subject: [PATCH 15/18] soc: ti: Mover power-domain drivers to the genpd dir Date: Fri, 7 Jul 2023 16:04:31 +0200 Message-Id: <20230707140434.723349-16-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707140434.723349-1-ulf.hansson@linaro.org> References: <20230707140434.723349-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Cc: Nishanth Menon Cc: Santosh Shilimkar Cc: Tero Kristo Signed-off-by: Ulf Hansson --- MAINTAINERS | 3 ++- drivers/genpd/Makefile | 1 + drivers/genpd/ti/Makefile | 3 +++ drivers/{soc => genpd}/ti/omap_prm.c | 0 drivers/{soc => genpd}/ti/ti_sci_pm_domains.c | 0 drivers/soc/ti/Makefile | 2 -- 6 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 drivers/genpd/ti/Makefile rename drivers/{soc => genpd}/ti/omap_prm.c (100%) rename drivers/{soc => genpd}/ti/ti_sci_pm_domains.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 9e580df3e5db..3cf16ffac892 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21101,7 +21101,7 @@ F: drivers/irqchip/irq-ti-sci-inta.c F: drivers/irqchip/irq-ti-sci-intr.c F: drivers/reset/reset-ti-sci.c F: drivers/soc/ti/ti_sci_inta_msi.c -F: drivers/soc/ti/ti_sci_pm_domains.c +F: drivers/genpd/ti/ti_sci_pm_domains.c F: include/dt-bindings/soc/ti,sci_pm_domain.h F: include/linux/soc/ti/ti_sci_inta_msi.h F: include/linux/soc/ti/ti_sci_protocol.h @@ -21335,6 +21335,7 @@ L: linux-kernel@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git +F: drivers/genpd/ti/omap_prm.c F: drivers/soc/ti/* TI LM49xxx FAMILY ASoC CODEC DRIVERS diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index e6f34d82e6a8..193892189f0d 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -11,3 +11,4 @@ obj-y += samsung/ obj-y += starfive/ obj-y += sunxi/ obj-y += tegra/ +obj-y += ti/ diff --git a/drivers/genpd/ti/Makefile b/drivers/genpd/ti/Makefile new file mode 100644 index 000000000000..69580afbb436 --- /dev/null +++ b/drivers/genpd/ti/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_ARCH_OMAP2PLUS) += omap_prm.o +obj-$(CONFIG_TI_SCI_PM_DOMAINS) += ti_sci_pm_domains.o diff --git a/drivers/soc/ti/omap_prm.c b/drivers/genpd/ti/omap_prm.c similarity index 100% rename from drivers/soc/ti/omap_prm.c rename to drivers/genpd/ti/omap_prm.c diff --git a/drivers/soc/ti/ti_sci_pm_domains.c b/drivers/genpd/ti/ti_sci_pm_domains.c similarity index 100% rename from drivers/soc/ti/ti_sci_pm_domains.c rename to drivers/genpd/ti/ti_sci_pm_domains.c diff --git a/drivers/soc/ti/Makefile b/drivers/soc/ti/Makefile index cc3c972fad2e..cb800a745e66 100644 --- a/drivers/soc/ti/Makefile +++ b/drivers/soc/ti/Makefile @@ -6,9 +6,7 @@ obj-$(CONFIG_KEYSTONE_NAVIGATOR_QMSS) += knav_qmss.o knav_qmss-y := knav_qmss_queue.o knav_qmss_acc.o obj-$(CONFIG_KEYSTONE_NAVIGATOR_DMA) += knav_dma.o obj-$(CONFIG_AMX3_PM) += pm33xx.o -obj-$(CONFIG_ARCH_OMAP2PLUS) += omap_prm.o obj-$(CONFIG_WKUP_M3_IPC) += wkup_m3_ipc.o -obj-$(CONFIG_TI_SCI_PM_DOMAINS) += ti_sci_pm_domains.o obj-$(CONFIG_TI_SCI_INTA_MSI_DOMAIN) += ti_sci_inta_msi.o obj-$(CONFIG_TI_K3_RINGACC) += k3-ringacc.o obj-$(CONFIG_TI_K3_SOCINFO) += k3-socinfo.o From patchwork Fri Jul 7 14:04:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 700294 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 50310C001DE for ; Fri, 7 Jul 2023 14:05:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232829AbjGGOFv (ORCPT ); Fri, 7 Jul 2023 10:05:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232897AbjGGOFh (ORCPT ); Fri, 7 Jul 2023 10:05:37 -0400 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6EA32727 for ; Fri, 7 Jul 2023 07:05:09 -0700 (PDT) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2b6b98ac328so29278231fa.0 for ; Fri, 07 Jul 2023 07:05:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688738708; x=1691330708; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=je6bX0AG52q7DCDonA0DGTjDfx3q/PN/GS0L63XBpKE=; b=rqys2j0Brupq2w6GZ7RSuJyTRxQkePn2AmvkLBcbNlhauUH8on92zHFWGuTWw7bJqV sTT8Y1aS1ldnXlEoEHbJDr879g9eKyrS3xqY/aGRAznAnzGRhxCBITnVLOQK94T+o0PW NXXzY11KmEIuAVTVBj3XQtCiof2eZmVLL69RNGnbI6s/XbSYRxGhmLVJZdtVNGyqV/Ne OqOWktaQPHnaC9rs8U+TEZ1abQNIWYqlrbAfa933ZCBHISyQYdWeSvzyYyJyWk4kQOt8 Sa/XNWyw7URYvfS6+GqzVmroDCq2suM5Y6XvQ9Rl46rd67XAKlva79Wbl3g/tlYRZPOc 6BVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688738708; x=1691330708; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=je6bX0AG52q7DCDonA0DGTjDfx3q/PN/GS0L63XBpKE=; b=X9/fLdQhvh7Cjg30E7NM+tHGFN+YGjprb0uwEBA+4Z56jePd8BAzqWMji1tZoV0tzb Bfnz05Be/Lb0vPo5JAAFSSjdi1YN9Hl1m2/Tg4kDeMouuHVJyhgFUoKEht2bfbKkmgy1 HO3LXjTqNtl9XxDEksSrOjhT9XBZXDd9hznlctZjaIABrweUXjqxiXjvcoud7/4tI5MJ 5EG1I5Qn4wLy5h/YIc6vKSqHGDftwcBM0DxCminNdN+D2505oZLjZmmtwb01TzNgyNW2 wTKONcdd0o5rRiDOGyDWP9jbNuA6yyZpZpvthVHohuordReL4JDrpEDxvSllGW4t4RG7 WTAQ== X-Gm-Message-State: ABy/qLZMaV3b0GKrtN/sF6TkaUQY1NCTE+Jv+CXGL4yduPREnwmx5ROy 3a1A7/qcSI2l9aPySLbYC7DoBw== X-Google-Smtp-Source: APBJJlFywF6ogRXpPhtF1mvvSGVdfjDZgUL+OgdGxg7RXiaHc/cGdKtCfKzjx55QKt1N+wmABJ9csA== X-Received: by 2002:a2e:9a84:0:b0:2b7:1dd:b416 with SMTP id p4-20020a2e9a84000000b002b701ddb416mr3804478lji.15.1688738707990; Fri, 07 Jul 2023 07:05:07 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id u21-20020a2e8555000000b002b6cb25e3f1sm760341ljj.108.2023.07.07.07.05.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 07:05:07 -0700 (PDT) From: Ulf Hansson To: Arnd Bergmann , Olof Johansson Cc: Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Michal Simek Subject: [PATCH 16/18] soc: xilinx: Move power-domain driver to the genpd dir Date: Fri, 7 Jul 2023 16:04:32 +0200 Message-Id: <20230707140434.723349-17-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707140434.723349-1-ulf.hansson@linaro.org> References: <20230707140434.723349-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Cc: Michal Simek Signed-off-by: Ulf Hansson --- drivers/genpd/Makefile | 1 + drivers/genpd/xilinx/Makefile | 2 ++ .../zynqmp_pm_domains.c => genpd/xilinx/zynqmp-pm-domains.c} | 0 drivers/soc/xilinx/Makefile | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 drivers/genpd/xilinx/Makefile rename drivers/{soc/xilinx/zynqmp_pm_domains.c => genpd/xilinx/zynqmp-pm-domains.c} (100%) diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index 193892189f0d..efd955f586e9 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -12,3 +12,4 @@ obj-y += starfive/ obj-y += sunxi/ obj-y += tegra/ obj-y += ti/ +obj-y += xilinx/ diff --git a/drivers/genpd/xilinx/Makefile b/drivers/genpd/xilinx/Makefile new file mode 100644 index 000000000000..a706ab699cfa --- /dev/null +++ b/drivers/genpd/xilinx/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_ZYNQMP_PM_DOMAINS) += zynqmp-pm-domains.o diff --git a/drivers/soc/xilinx/zynqmp_pm_domains.c b/drivers/genpd/xilinx/zynqmp-pm-domains.c similarity index 100% rename from drivers/soc/xilinx/zynqmp_pm_domains.c rename to drivers/genpd/xilinx/zynqmp-pm-domains.c diff --git a/drivers/soc/xilinx/Makefile b/drivers/soc/xilinx/Makefile index 41e585bc9c67..33d94395fd87 100644 --- a/drivers/soc/xilinx/Makefile +++ b/drivers/soc/xilinx/Makefile @@ -1,4 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_ZYNQMP_POWER) += zynqmp_power.o -obj-$(CONFIG_ZYNQMP_PM_DOMAINS) += zynqmp_pm_domains.o obj-$(CONFIG_XLNX_EVENT_MANAGER) += xlnx_event_manager.o From patchwork Fri Jul 7 14:04:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 700770 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 C07CEEB64DA for ; Fri, 7 Jul 2023 14:06:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233101AbjGGOGB (ORCPT ); Fri, 7 Jul 2023 10:06:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232838AbjGGOFi (ORCPT ); Fri, 7 Jul 2023 10:05:38 -0400 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 791822738 for ; Fri, 7 Jul 2023 07:05:11 -0700 (PDT) Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2b5c231c23aso31015271fa.0 for ; Fri, 07 Jul 2023 07:05:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688738709; x=1691330709; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I8/R65mfXAHzbxX/Yt/oiagP1RewF0H/jSZoqHRKyvw=; b=tunTCtuJSMkrNfKB7zXRqYFc3dBg13wFN2619YM1UDWrcOwMNMMdemELKhSYM1ulK0 BLiUHkr/mQebq+CTZqrW33MHDNPalSMa2wmE+IxEX1wIzViVba2hqUA35D0qDtAboKk/ 1tCUcEnOgxhjruhHhF284mKTZzLUh7FNzFH9CFLl5SgVWJuEWn6DpaUPVkq2PIkOkIUM NUEa5FG7BYycAF0tolipgMQEph6v5kUBmy47MXRV3KkIBs/vfJd5XJiz2NKj1rEWwNe4 TUcaskBDiN0U4vhPwa8kZ4Ac0gNdgFsZO+kLgJlmqV6QEIp/+0PLibvM42dnJwqtdsU8 GI/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688738709; x=1691330709; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I8/R65mfXAHzbxX/Yt/oiagP1RewF0H/jSZoqHRKyvw=; b=VYnKNESI6MxCXWf8VCe1JfuE5JTETiN/rXWSimh4rzYb/Rx4ffqgtmEUVQGe+5Ru3E 2iwEStalfO7HYaMNulWw4Wfr1iR4NNKPhd0qzbAeYaHkwQtPVzQFNUoW+Tk2BT2OwNOl i94NJ/v2OdvM+XmYVrQ4kAvgtRoKN5o5JEmMXZDQIzDXMUdc7Y1ckQtJZ0jBNnHYpR06 0SdAX/eMw1PsTRKnvd7Jl1GXDZs0JohvVKIS2kskcpZb6ewyCHSAAW/jQG5CKuOnRKoO cX07WisGH/cz6BDKXutR6Q/cUVcp+EdQhTS9+K5mLsP78SQaTMfL++uCia9YZc5KudyL Ce8Q== X-Gm-Message-State: ABy/qLbpYnE7WEsug3IT/EaE+xo4WjouIPSxmpPBAvSavApV4YmBp5zx Ue/WdW29se6aBfU+0RZKE+R6HQ== X-Google-Smtp-Source: APBJJlHpl8BDqdizNvRgFYh8xGJqPB5RsiI6fTOozpyN+ToBWQzqKLiwu+M08DljZ9h1vz5AHVd/pw== X-Received: by 2002:a2e:3e1a:0:b0:2b6:df15:f6ad with SMTP id l26-20020a2e3e1a000000b002b6df15f6admr4230300lja.18.1688738709123; Fri, 07 Jul 2023 07:05:09 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id u21-20020a2e8555000000b002b6cb25e3f1sm760341ljj.108.2023.07.07.07.05.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 07:05:08 -0700 (PDT) From: Ulf Hansson To: Arnd Bergmann , Olof Johansson Cc: Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Linus Walleij Subject: [PATCH 17/18] ARM: ux500: Convert power-domain code into a regular platform driver Date: Fri, 7 Jul 2023 16:04:33 +0200 Message-Id: <20230707140434.723349-18-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707140434.723349-1-ulf.hansson@linaro.org> References: <20230707140434.723349-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org To make the code more standalone and moveable, let's convert it into a platform driver. Cc: Linus Walleij Signed-off-by: Ulf Hansson --- arch/arm/mach-ux500/cpu-db8500.c | 5 ----- arch/arm/mach-ux500/pm_domains.c | 25 ++++++++++++++++++++----- arch/arm/mach-ux500/pm_domains.h | 17 ----------------- 3 files changed, 20 insertions(+), 27 deletions(-) delete mode 100644 arch/arm/mach-ux500/pm_domains.h diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 7cc0dd8ed991..b1a70f203372 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -26,8 +26,6 @@ #include #include -#include "pm_domains.h" - static int __init ux500_l2x0_unlock(void) { int i; @@ -115,9 +113,6 @@ static const struct of_device_id u8500_local_bus_nodes[] = { static void __init u8500_init_machine(void) { - /* Initialize ux500 power domains */ - ux500_pm_domains_init(); - of_platform_populate(NULL, u8500_local_bus_nodes, NULL, NULL); } diff --git a/arch/arm/mach-ux500/pm_domains.c b/arch/arm/mach-ux500/pm_domains.c index 427b9ac4af6c..3d4f111ed156 100644 --- a/arch/arm/mach-ux500/pm_domains.c +++ b/arch/arm/mach-ux500/pm_domains.c @@ -6,6 +6,9 @@ * * Implements PM domains using the generic PM domain for ux500. */ +#include +#include +#include #include #include #include @@ -13,7 +16,6 @@ #include #include -#include "pm_domains.h" static int pd_power_off(struct generic_pm_domain *domain) { @@ -49,18 +51,17 @@ static struct generic_pm_domain *ux500_pm_domains[NR_DOMAINS] = { [DOMAIN_VAPE] = &ux500_pm_domain_vape, }; -static const struct of_device_id ux500_pm_domain_matches[] __initconst = { +static const struct of_device_id ux500_pm_domain_matches[] = { { .compatible = "stericsson,ux500-pm-domains", }, { }, }; -int __init ux500_pm_domains_init(void) +static int ux500_pm_domains_probe(struct platform_device *pdev) { - struct device_node *np; + struct device_node *np = pdev->dev.of_node; struct genpd_onecell_data *genpd_data; int i; - np = of_find_matching_node(NULL, ux500_pm_domain_matches); if (!np) return -ENODEV; @@ -77,3 +78,17 @@ int __init ux500_pm_domains_init(void) of_genpd_add_provider_onecell(np, genpd_data); return 0; } + +static struct platform_driver ux500_pm_domains_driver = { + .probe = ux500_pm_domains_probe, + .driver = { + .name = "ux500_pm_domains", + .of_match_table = ux500_pm_domain_matches, + }, +}; + +static int __init ux500_pm_domains_init(void) +{ + return platform_driver_register(&ux500_pm_domains_driver); +} +arch_initcall(ux500_pm_domains_init); diff --git a/arch/arm/mach-ux500/pm_domains.h b/arch/arm/mach-ux500/pm_domains.h deleted file mode 100644 index 33c55f2c6b3c..000000000000 --- a/arch/arm/mach-ux500/pm_domains.h +++ /dev/null @@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (C) 2014 Linaro Ltd. - * - * Author: Ulf Hansson - */ - -#ifndef __MACH_UX500_PM_DOMAINS_H -#define __MACH_UX500_PM_DOMAINS_H - -#ifdef CONFIG_PM_GENERIC_DOMAINS -extern int __init ux500_pm_domains_init(void); -#else -static inline int ux500_pm_domains_init(void) { return 0; } -#endif - -#endif From patchwork Fri Jul 7 14:04:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 700293 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 2AEB5C001DE for ; Fri, 7 Jul 2023 14:06:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233035AbjGGOGD (ORCPT ); Fri, 7 Jul 2023 10:06:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232947AbjGGOFj (ORCPT ); Fri, 7 Jul 2023 10:05:39 -0400 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A629273D for ; Fri, 7 Jul 2023 07:05:12 -0700 (PDT) Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-4fa48b5dc2eso3095102e87.1 for ; Fri, 07 Jul 2023 07:05:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688738710; x=1691330710; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NDGJ4Rdnalj6TqDKeki2lXBkMtKfcEDmiGvYuLXTlyU=; b=zJEtOhTvr8IllxLtfLNdI3yUT/E73+PntZtuCWGUUchHKZgSYD+qEtQXCLvwzveqMW ZyAOjZTv8zOcIQUh5z4XAYMD6Yym0d0VmIqGe8KkeF7X4ldg8qbSBKqY4Elp4FcAjBgG 4s+W28dTDXf7uNACg9wDlnX86NTuRwM9w2KFwAXEVKo1PROcScXrRGxFEkVuia+qAdyi mmMqcvMSZfdyPxB7tir7/NRQGpAyBzcvw8E0RqkLloFAcju6EJ8uwHFUzPb8yAGNpz++ 1dpz89dt0adj2uRATINhATo6vgof3bo6Eu0KWrjlMZl3DOG++mmT65hRZrjfSsRzR/xL lgUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688738710; x=1691330710; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NDGJ4Rdnalj6TqDKeki2lXBkMtKfcEDmiGvYuLXTlyU=; b=PL0Q+FRwktepRaRwT9Gazs5u6Vk21dfpD+nNzvomzB9KlLrcH8eL2KoiJZeGZ0X+Dq nBW9UU5czC3cLK6siu7TpCB/QoU6M5n17KEGnjxmnAUFPY25ERbf+/Jc7WBtOSwzqyl6 lY6zflqtlArYQFcunuB0U7/nVmIsZkuXiiYqHZttMcVyoa6NNNFr6jJWn05wZM7vGvc3 aPmPb5YETIUCFZL17+xSupCM90pfq9YUR0GQDU6ixWeRKPL2RLbh3cD1V+VRUFJDllHb isH6gdHw7/ZNdEgxT+qNsQz6nSMHEjM5vgN3TzP7xd+P5Uenzc9kXh5+X8F/mr6GBvai lOiA== X-Gm-Message-State: ABy/qLa1B4MxFuCCkDIy97qe+FDXNsJ/MQzEVdBvwlRyIGO+qEku4mfb rNtqHeyTK/78O/Pz6FVrmrlCIg== X-Google-Smtp-Source: APBJJlEzYGXiYkpimLJdVvfFtEAfokJSPAH7vL71Isu/R6lRimZa+x/dK5wbVNgi11PgJpFopZ7Rgw== X-Received: by 2002:a2e:800a:0:b0:2b6:a76b:c39e with SMTP id j10-20020a2e800a000000b002b6a76bc39emr3365228ljg.35.1688738710333; Fri, 07 Jul 2023 07:05:10 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id u21-20020a2e8555000000b002b6cb25e3f1sm760341ljj.108.2023.07.07.07.05.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 07:05:09 -0700 (PDT) From: Ulf Hansson To: Arnd Bergmann , Olof Johansson Cc: Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Linus Walleij Subject: [PATCH 18/18] ARM: ux500: Move power-domain driver to the genpd dir Date: Fri, 7 Jul 2023 16:04:34 +0200 Message-Id: <20230707140434.723349-19-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707140434.723349-1-ulf.hansson@linaro.org> References: <20230707140434.723349-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Cc: Linus Walleij Signed-off-by: Ulf Hansson --- MAINTAINERS | 1 + arch/arm/mach-ux500/Makefile | 1 - drivers/genpd/Makefile | 1 + drivers/genpd/st/Makefile | 2 ++ .../pm_domains.c => drivers/genpd/st/ste-ux500-pm-domain.c | 0 5 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 drivers/genpd/st/Makefile rename arch/arm/mach-ux500/pm_domains.c => drivers/genpd/st/ste-ux500-pm-domain.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 3cf16ffac892..f9820072848d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2419,6 +2419,7 @@ F: arch/arm/mach-ux500/ F: drivers/clk/clk-nomadik.c F: drivers/clocksource/clksrc-dbx500-prcmu.c F: drivers/dma/ste_dma40* +F: drivers/genpd/st/ste-ux500-pm-domain.c F: drivers/hwspinlock/u8500_hsem.c F: drivers/i2c/busses/i2c-nomadik.c F: drivers/iio/adc/ab8500-gpadc.c diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index 5e903241bded..270e5676fa02 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile @@ -6,4 +6,3 @@ obj-y := pm.o obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o obj-$(CONFIG_SMP) += platsmp.o -obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index efd955f586e9..c429485c13f6 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -8,6 +8,7 @@ obj-y += qcom/ obj-y += renesas/ obj-y += rockchip/ obj-y += samsung/ +obj-y += st/ obj-y += starfive/ obj-y += sunxi/ obj-y += tegra/ diff --git a/drivers/genpd/st/Makefile b/drivers/genpd/st/Makefile new file mode 100644 index 000000000000..8fa5f9855460 --- /dev/null +++ b/drivers/genpd/st/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_ARCH_U8500) += ste-ux500-pm-domain.o diff --git a/arch/arm/mach-ux500/pm_domains.c b/drivers/genpd/st/ste-ux500-pm-domain.c similarity index 100% rename from arch/arm/mach-ux500/pm_domains.c rename to drivers/genpd/st/ste-ux500-pm-domain.c