From patchwork Mon Oct 19 14:48:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 11844577 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B17ACC433DF for ; Mon, 19 Oct 2020 14:49:52 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 256B22224D for ; Mon, 19 Oct 2020 14:49:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Hoj/lab+"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="B0exkIpg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 256B22224D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=vrIGVIwHT43mMkYRcYlQ/iqJtnODFLAvTXJ9knwCRwk=; b=Hoj/lab+V3GdmUiUpzv5MEbUIp Rr06y2WT7PYUL3K8I8PkNm/Imifcx3aE6vOYcg4EU8pPgs8F495/ssaOjOpSR5DRyiQXLCC2cPIZd qV3BHg6f2VHMMBlTJBgfjbmJUg+OE2bNBPRtFafvNeotU2M1UMsj4EPndxSqaSU1QmpLoBMlmPF9H ib3kNzHDyponp1x94xXkv8ERdZF4kKh5n+4tZsMkTcu2e3oyvQQuSfa20PmZmHIjvRPyUW2bW80/x SeRCZ0NOFjrjjx5rvZGPOAwTZ1PD1l3LGrXDMXVbThCL/Z6cT5X+Ct79mjeHedGmtuYuWvlJJAAS2 +8/iQrsQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUWSU-0005pX-3Z; Mon, 19 Oct 2020 14:48:22 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUWSN-0005nf-HM for linux-arm-kernel@lists.infradead.org; Mon, 19 Oct 2020 14:48:17 +0000 Received: by mail-wr1-x441.google.com with SMTP id x7so48782wrl.3 for ; Mon, 19 Oct 2020 07:48:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IByM6fAwfV36/UB3A2tjIml0N5VQ5jxPxkeC7coc2Zo=; b=B0exkIpg0jMlPZlUstcDD5IUDvafjKZ0dLq9ENV4r1ik//YotB6f5RDT3Zlsrq3ksL Cy0Ah3L2cdAUA/f7e0k39eR40fAnLIkY6l5PzanT45X0tYhCkVaN1YtmcnsYMP3XAs7c mSxsP7lSE/RsvWRc3LjojkCUZXMUNqvOwLD0YVyG7neHJz1HSKSD9dFdN8xE1k//L63T ckutiqsTzwdREsi+ewYourmbEmfPMLTc2n3lKA+xiTH8Z4fP8V7Z3SovGtrd31G4I1gH K2EiQxzBLgl7qUUWMrq8wN6A5/8nuazOrZ4hkwUPhoNyFrgx/DiMTClXCwTsRK+6NFq5 2WzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IByM6fAwfV36/UB3A2tjIml0N5VQ5jxPxkeC7coc2Zo=; b=ueF8B/tqtPMaYNBnH7DKVUNmL0w1i6Bh44qQZLVd2j5NuRbcITQal0Ti09NlrlbI5I 2Ndcz+1vsFclM+HqwDbRKaMyrqiFkRAuUAjOPFLyxGTWtrYtAa3HqeDKrcTaVpLiLE3b TK9XogQidNzXDNtHb+MEq/U3we1ftBiDSe5z7CBfCL1PfYkZ2Z6dFpgqZSbF8o5m/EU1 Ok3m+l6PIGeORBsZqPzf8q8yPDTGUFICxC2CuGauLCbifw4GSVgvuEFMGBV0aEaBRV9X c3bQftPB6+dNL2+fCwGqvv11CUIIMhSR0njiwVNaP1pQNcGt5MkGQm7ra6Ql3oMsnOJM ivmA== X-Gm-Message-State: AOAM533UINrmn4bREPDUUPc/IoqsYZai7C0HNUurLzeZVJvmE4+7bG04 AW0EQkMK1kQIwV9FixuJIv/zIg== X-Google-Smtp-Source: ABdhPJyV1Y3VAHw8VVM4EZvMv63AARzDLXjLHn4YWRX67f3y+tTQEujcWlBoxLgd5gIIkgCKnNmQbg== X-Received: by 2002:a5d:4c4b:: with SMTP id n11mr19735303wrt.171.1603118894402; Mon, 19 Oct 2020 07:48:14 -0700 (PDT) Received: from bojack.baylibre.local (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id v6sm334971wmj.6.2020.10.19.07.48.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Oct 2020 07:48:13 -0700 (PDT) From: Neil Armstrong To: p.zabel@pengutronix.de Subject: [PATCH v2] reset: meson: make it possible to build as a module Date: Mon, 19 Oct 2020 16:48:09 +0200 Message-Id: <20201019144809.943608-1-narmstrong@baylibre.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201019_104815_607264_EDBFA561 X-CRM114-Status: GOOD ( 18.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, Kevin Hilman , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In order to reduce the kernel Image size on multi-platform distributions, make it possible to build the reset controller driver as a module. This partially reverts 8290924e ("reset: meson: make it explicitly non-modular") Signed-off-by: Neil Armstrong Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Reviewed-by: Martin Blumenstingl --- Changes since v1 at [1]: - Fix Kconfig depends - Add missing MODULE_DEVICE_TABLE - Add kevin's review & test tags [1] http://lore.kernel.org/r/20201013133943.412119-1-narmstrong@baylibre.com drivers/reset/Kconfig | 3 ++- drivers/reset/reset-meson.c | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index d9efbfd29646..9a36111cfd2c 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -94,7 +94,8 @@ config RESET_LPC18XX This enables the reset controller driver for NXP LPC18xx/43xx SoCs. config RESET_MESON - bool "Meson Reset Driver" if COMPILE_TEST + tristate "Meson Reset Driver" + depends on ARCH_MESON || COMPILE_TEST default ARCH_MESON help This enables the reset driver for Amlogic Meson SoCs. diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c index 94d7ba88d7d2..c9bc325ad65a 100644 --- a/drivers/reset/reset-meson.c +++ b/drivers/reset/reset-meson.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -104,6 +105,7 @@ static const struct of_device_id meson_reset_dt_ids[] = { { .compatible = "amlogic,meson-a1-reset", .data = &meson_a1_param}, { /* sentinel */ }, }; +MODULE_DEVICE_TABLE(of, meson_reset_dt_ids); static int meson_reset_probe(struct platform_device *pdev) { @@ -142,4 +144,8 @@ static struct platform_driver meson_reset_driver = { .of_match_table = meson_reset_dt_ids, }, }; -builtin_platform_driver(meson_reset_driver); +module_platform_driver(meson_reset_driver); + +MODULE_DESCRIPTION("Amlogic Meson Reset Controller driver"); +MODULE_AUTHOR("Neil Armstrong "); +MODULE_LICENSE("Dual BSD/GPL");