From patchwork Mon Oct 26 18:30:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 285558 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,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=ham 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 E78B2C4363A for ; Mon, 26 Oct 2020 18:30:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8D79420874 for ; Mon, 26 Oct 2020 18:30:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="2UIP3cPC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1789810AbgJZSa2 (ORCPT ); Mon, 26 Oct 2020 14:30:28 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:40482 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1789809AbgJZSa1 (ORCPT ); Mon, 26 Oct 2020 14:30:27 -0400 Received: by mail-pf1-f193.google.com with SMTP id w21so6651358pfc.7 for ; Mon, 26 Oct 2020 11:30:27 -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=fSQHUJ/cezeyAnWXh/h5WrMWdNpl91ULGWEEotC0Dgo=; b=2UIP3cPCw6Hc3jcW+egG7F4RZ5irvtAQIrqLQgWGCzZtkbcLjj6k6+wzjQdS5XmxDb C9I8uKhNq6yw1jwDi4l2jW2QZpwO0+dAXTnHHxa9qGOkmFvuXCLe0fm1RxhFznb/UjUW GolC4jF5QuJgESoXXE200wm6pxAE9NKe8HHrS9sHzy+LIwygJz6GJKUskcfxpn+qEyVy 8u5ZhlqWNYqp7Iv4leOtKdKqz8JM/l1RRzicOva138HDA8m5tEu51NtFeLo9W1SenKhw zuK6cmr8QlQOEeneLlBCzgK6wBSYH6tneb+3yBeyLe7JKcPYofhGO+zbYakpJrIat9vZ 9b7g== 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=fSQHUJ/cezeyAnWXh/h5WrMWdNpl91ULGWEEotC0Dgo=; b=VWD4Gf1CGnVCf8flDzaXaZNDsVLiHSiHPMO6La18d0jVqnwtiP6AG1ECfDmxDS491J s9yIDS8cbK2GXclckNdBkzYGkDx0DKtH8oW6Q6pp3i+Mse+5umEfZupHIBAJ5Qma8m8/ OljrPTwyti0x7MrVwz/r8Hrj/JRv5kjy1c/dyxdcqYEc81IulriI+44Q9EUAz1zC0PyF 5kqI7hiL9eNebq0nt58TGXH7f0iYfOHqzfalAqSJM7Iwocs86qdjZ8ptx9ybZ8IkEcrb B/PLvQUxPC9Lk8N6O0cVW2cuRyt1j75qiv5gWdcVp5AoJdphHjbQnutuDknbcCzrKOH2 m1GQ== X-Gm-Message-State: AOAM530sxpGSrnMdoIQKeRfxDDUqIWkkxOmKcBUeu2VkJf5h44T1cTNQ RgFDZ4enlV9BIiJntHuEAGTlKA== X-Google-Smtp-Source: ABdhPJzSjPWf5q+++eSm/0qDyUZrYilOwMm/Z1O1Lk6ijvCPvo38iO5R5v7Tpy7C286Y/M6YoXfM0Q== X-Received: by 2002:a63:3d8b:: with SMTP id k133mr17632971pga.413.1603737026494; Mon, 26 Oct 2020 11:30:26 -0700 (PDT) Received: from localhost (c-71-197-186-152.hsd1.wa.comcast.net. [71.197.186.152]) by smtp.gmail.com with ESMTPSA id o65sm11632576pga.42.2020.10.26.11.30.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 11:30:25 -0700 (PDT) From: Kevin Hilman To: linux-amlogic@lists.infradead.org, linux-gpio@vger.kernel.org Cc: Linus Walleij , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2] pinctrl/meson: enable building as modules Date: Mon, 26 Oct 2020 11:30:25 -0700 Message-Id: <20201026183025.31768-1-khilman@baylibre.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Enable pinctrl drivers for 64-bit Amlogic SoCs to be built as modules. The default is still built-in, this only adds the option of building as modules. Signed-off-by: Kevin Hilman --- drivers/pinctrl/meson/Kconfig | 17 +++++++++-------- drivers/pinctrl/meson/pinctrl-meson-a1.c | 4 +++- drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 3 +++ drivers/pinctrl/meson/pinctrl-meson-axg.c | 4 +++- drivers/pinctrl/meson/pinctrl-meson-g12a.c | 4 +++- drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 4 +++- drivers/pinctrl/meson/pinctrl-meson-gxl.c | 4 +++- drivers/pinctrl/meson/pinctrl-meson.c | 8 ++++++++ drivers/pinctrl/meson/pinctrl-meson.h | 1 + drivers/pinctrl/meson/pinctrl-meson8-pmx.c | 2 ++ 10 files changed, 38 insertions(+), 13 deletions(-) diff --git a/drivers/pinctrl/meson/Kconfig b/drivers/pinctrl/meson/Kconfig index 3cb119105ddb..b2855e341a75 100644 --- a/drivers/pinctrl/meson/Kconfig +++ b/drivers/pinctrl/meson/Kconfig @@ -1,8 +1,9 @@ # SPDX-License-Identifier: GPL-2.0-only menuconfig PINCTRL_MESON - bool "Amlogic SoC pinctrl drivers" + tristate "Amlogic SoC pinctrl drivers" depends on ARCH_MESON depends on OF + default y select PINMUX select PINCONF select GENERIC_PINCONF @@ -25,37 +26,37 @@ config PINCTRL_MESON8B default y config PINCTRL_MESON_GXBB - bool "Meson gxbb SoC pinctrl driver" + tristate "Meson gxbb SoC pinctrl driver" depends on ARM64 select PINCTRL_MESON8_PMX default y config PINCTRL_MESON_GXL - bool "Meson gxl SoC pinctrl driver" + tristate "Meson gxl SoC pinctrl driver" depends on ARM64 select PINCTRL_MESON8_PMX default y config PINCTRL_MESON8_PMX - bool + tristate config PINCTRL_MESON_AXG - bool "Meson axg Soc pinctrl driver" + tristate "Meson axg Soc pinctrl driver" depends on ARM64 select PINCTRL_MESON_AXG_PMX default y config PINCTRL_MESON_AXG_PMX - bool + tristate config PINCTRL_MESON_G12A - bool "Meson g12a Soc pinctrl driver" + tristate "Meson g12a Soc pinctrl driver" depends on ARM64 select PINCTRL_MESON_AXG_PMX default y config PINCTRL_MESON_A1 - bool "Meson a1 Soc pinctrl driver" + tristate "Meson a1 Soc pinctrl driver" depends on ARM64 select PINCTRL_MESON_AXG_PMX default y diff --git a/drivers/pinctrl/meson/pinctrl-meson-a1.c b/drivers/pinctrl/meson/pinctrl-meson-a1.c index 8abf750eac7e..79f5d753d7e1 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-a1.c +++ b/drivers/pinctrl/meson/pinctrl-meson-a1.c @@ -925,6 +925,7 @@ static const struct of_device_id meson_a1_pinctrl_dt_match[] = { }, { }, }; +MODULE_DEVICE_TABLE(of, meson_a1_pinctrl_dt_match); static struct platform_driver meson_a1_pinctrl_driver = { .probe = meson_pinctrl_probe, @@ -934,4 +935,5 @@ static struct platform_driver meson_a1_pinctrl_driver = { }, }; -builtin_platform_driver(meson_a1_pinctrl_driver); +module_platform_driver(meson_a1_pinctrl_driver); +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c index e8931d9cf863..80c43683c789 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c +++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c @@ -116,3 +116,6 @@ const struct pinmux_ops meson_axg_pmx_ops = { .get_function_groups = meson_pmx_get_groups, .gpio_request_enable = meson_axg_pmx_request_gpio, }; +EXPORT_SYMBOL_GPL(meson_axg_pmx_ops); + +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c index 072765db93d7..7bfecdfba177 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-axg.c +++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c @@ -1080,6 +1080,7 @@ static const struct of_device_id meson_axg_pinctrl_dt_match[] = { }, { }, }; +MODULE_DEVICE_TABLE(of, meson_axg_pinctrl_dt_match); static struct platform_driver meson_axg_pinctrl_driver = { .probe = meson_pinctrl_probe, @@ -1089,4 +1090,5 @@ static struct platform_driver meson_axg_pinctrl_driver = { }, }; -builtin_platform_driver(meson_axg_pinctrl_driver); +module_platform_driver(meson_axg_pinctrl_driver); +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c index 41850e3c0091..cd9656b13836 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c +++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c @@ -1410,6 +1410,7 @@ static const struct of_device_id meson_g12a_pinctrl_dt_match[] = { }, { }, }; +MODULE_DEVICE_TABLE(of, meson_g12a_pinctrl_dt_match); static struct platform_driver meson_g12a_pinctrl_driver = { .probe = meson_pinctrl_probe, @@ -1419,4 +1420,5 @@ static struct platform_driver meson_g12a_pinctrl_driver = { }, }; -builtin_platform_driver(meson_g12a_pinctrl_driver); +module_platform_driver(meson_g12a_pinctrl_driver); +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c index d130c635f74b..f51fc3939252 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c @@ -900,6 +900,7 @@ static const struct of_device_id meson_gxbb_pinctrl_dt_match[] = { }, { }, }; +MODULE_DEVICE_TABLE(of, meson_gxbb_pinctrl_dt_match); static struct platform_driver meson_gxbb_pinctrl_driver = { .probe = meson_pinctrl_probe, @@ -908,4 +909,5 @@ static struct platform_driver meson_gxbb_pinctrl_driver = { .of_match_table = meson_gxbb_pinctrl_dt_match, }, }; -builtin_platform_driver(meson_gxbb_pinctrl_driver); +module_platform_driver(meson_gxbb_pinctrl_driver); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c index 32552d795bb2..51408996255b 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c @@ -861,6 +861,7 @@ static const struct of_device_id meson_gxl_pinctrl_dt_match[] = { }, { }, }; +MODULE_DEVICE_TABLE(of, meson_gxl_pinctrl_dt_match); static struct platform_driver meson_gxl_pinctrl_driver = { .probe = meson_pinctrl_probe, @@ -869,4 +870,5 @@ static struct platform_driver meson_gxl_pinctrl_driver = { .of_match_table = meson_gxl_pinctrl_dt_match, }, }; -builtin_platform_driver(meson_gxl_pinctrl_driver); +module_platform_driver(meson_gxl_pinctrl_driver); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index 20683cd072bb..49851444a6e3 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -152,6 +152,7 @@ int meson_pmx_get_funcs_count(struct pinctrl_dev *pcdev) return pc->data->num_funcs; } +EXPORT_SYMBOL_GPL(meson_pmx_get_funcs_count); const char *meson_pmx_get_func_name(struct pinctrl_dev *pcdev, unsigned selector) @@ -160,6 +161,7 @@ const char *meson_pmx_get_func_name(struct pinctrl_dev *pcdev, return pc->data->funcs[selector].name; } +EXPORT_SYMBOL_GPL(meson_pmx_get_func_name); int meson_pmx_get_groups(struct pinctrl_dev *pcdev, unsigned selector, const char * const **groups, @@ -172,6 +174,7 @@ int meson_pmx_get_groups(struct pinctrl_dev *pcdev, unsigned selector, return 0; } +EXPORT_SYMBOL_GPL(meson_pmx_get_groups); static int meson_pinconf_set_gpio_bit(struct meson_pinctrl *pc, unsigned int pin, @@ -723,6 +726,7 @@ int meson8_aobus_parse_dt_extra(struct meson_pinctrl *pc) return 0; } +EXPORT_SYMBOL_GPL(meson8_aobus_parse_dt_extra); int meson_a1_parse_dt_extra(struct meson_pinctrl *pc) { @@ -732,6 +736,7 @@ int meson_a1_parse_dt_extra(struct meson_pinctrl *pc) return 0; } +EXPORT_SYMBOL_GPL(meson_a1_parse_dt_extra); int meson_pinctrl_probe(struct platform_device *pdev) { @@ -766,3 +771,6 @@ int meson_pinctrl_probe(struct platform_device *pdev) return meson_gpiolib_register(pc); } +EXPORT_SYMBOL_GPL(meson_pinctrl_probe); + +MODULE_LICENSE("GPL v2"); diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h index f8b0ff9d419a..ff5372e0a475 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.h +++ b/drivers/pinctrl/meson/pinctrl-meson.h @@ -10,6 +10,7 @@ #include #include #include +#include struct meson_pinctrl; diff --git a/drivers/pinctrl/meson/pinctrl-meson8-pmx.c b/drivers/pinctrl/meson/pinctrl-meson8-pmx.c index 66a908f9f13d..f767b6923f9f 100644 --- a/drivers/pinctrl/meson/pinctrl-meson8-pmx.c +++ b/drivers/pinctrl/meson/pinctrl-meson8-pmx.c @@ -100,3 +100,5 @@ const struct pinmux_ops meson8_pmx_ops = { .get_function_groups = meson_pmx_get_groups, .gpio_request_enable = meson8_pmx_request_gpio, }; +EXPORT_SYMBOL_GPL(meson8_pmx_ops); +MODULE_LICENSE("GPL v2");