From patchwork Thu Sep 29 23:48:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 611706 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 E9DC4C4321E for ; Thu, 29 Sep 2022 23:48:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229790AbiI2Xs2 (ORCPT ); Thu, 29 Sep 2022 19:48:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229783AbiI2Xs1 (ORCPT ); Thu, 29 Sep 2022 19:48:27 -0400 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08D911FBCA3 for ; Thu, 29 Sep 2022 16:48:26 -0700 (PDT) Received: by mail-pj1-x102b.google.com with SMTP id c6-20020a17090a4d0600b0020958fcd9acso1498401pjg.4 for ; Thu, 29 Sep 2022 16:48:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=47vGPfHQ5SpOiUOWbCFeWpSRlTRaxQq1Ffs8KOXZab8=; b=Tcw6vcE1W9xd1zM11+UsgwQbqzbllS19xXqy5HRhsIP51Jw6vFXxPm2Z+L5U+CUy7L R4tj5NbrZiKLiycxqvvk04LT1z84WX+JTEc6VfkECGAhrafsz6Fy9ImRsIr5f+wImeMb HBnV9ZG1mLZYKGfa7U6RxgqI/yHa7eJrmVRigTc636CE+hmhGMUJHKUzO9E5PjiY403J huY5QWheHjV/z0oRVbZFVtqJu+178ql0Atxbj3d2axcd397Fx4mtAqGeDWvHDNh1DQ4+ tu7oOHzZ69mqHvR17NCPYg5+dQn80HqlH46vC/cgdzQO/izk237bnD4v4l237C1TyWGp 606w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=47vGPfHQ5SpOiUOWbCFeWpSRlTRaxQq1Ffs8KOXZab8=; b=WBlALsIT6kxnpOUB/pORMKQDx7Usw+pQN6YgAQyAuelOMSicJfLVngfXAOFzsp0nRe uLWIi4Pct/Px0yTPodAhc2vnaIahfp6XIBG9r0YDx4gN0TBFrAvz8tSEeNirPhZBoUeR 9CCP+/RywNRq3Whom//7z6IcIFxiUumWu94kmIcDJx+YRSt9KIvlL4ZIR4VoDXt+uNTh pNb38owKHspkLhDrXIkicZs2PjB5shv16Wl+u6Gfj453b1Vyjzdkwp7WCqtPpaIl7e0o ayj1/zC0Hn5lUc0KkLc5t57QSEA3CDoxbG6vEYCGsmgG4qUrV/QrT0Eep0++l7ZPzZTz 5D+A== X-Gm-Message-State: ACrzQf2A6nPUoKLuv56VR1Y//RLeJy/pzHOj0crMm4bF9iP6lSDzUzzd jShCMppdeP3q9ptM9LwPL4ZYSQ== X-Google-Smtp-Source: AMsMyM7Ow0uJaIea8+NKspCt4hxki3jkwPJmYa3/6FznNa3iKWL1vFC/8gPgZU2fksAK/oBo4uGg3w== X-Received: by 2002:a17:903:1c2:b0:178:3c7e:34f5 with SMTP id e2-20020a17090301c200b001783c7e34f5mr6032146plh.105.1664495305487; Thu, 29 Sep 2022 16:48:25 -0700 (PDT) Received: from localhost ([75.172.140.17]) by smtp.gmail.com with ESMTPSA id i3-20020a626d03000000b0052dfe83e19csm275681pfc.16.2022.09.29.16.48.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 16:48:24 -0700 (PDT) From: Kevin Hilman To: Peter Ujfalusi , dmaengine@vger.kernel.org Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Nicolas Frayer Subject: [PATCH v3 2/3] dmaengine: ti: convert k3-udma to module Date: Thu, 29 Sep 2022 16:48:19 -0700 Message-Id: <20220929234820.940048-3-khilman@baylibre.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220929234820.940048-1-khilman@baylibre.com> References: <20220929234820.940048-1-khilman@baylibre.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Currently k3-udma driver is built as separate platform drivers with a shared probe and identical code path, just differnet platform data. To enable to build as module, convert the separate platform driver into a single module_platform_driver with the data selection done via compatible string and of_match. The separate of_match tables are also combined into a single table to avoid the multiple calls to of_match_node() Since all modern TI platforms using this are DT enabled, the removal of separate platform_drivers should have no functional change. Acked-by: Peter Ujfalusi Signed-off-by: Kevin Hilman --- drivers/dma/ti/Kconfig | 4 ++-- drivers/dma/ti/k3-udma-glue.c | 5 ++++- drivers/dma/ti/k3-udma.c | 40 +++++------------------------------ 3 files changed, 11 insertions(+), 38 deletions(-) diff --git a/drivers/dma/ti/Kconfig b/drivers/dma/ti/Kconfig index 79618fac119a..f196be3b222f 100644 --- a/drivers/dma/ti/Kconfig +++ b/drivers/dma/ti/Kconfig @@ -35,7 +35,7 @@ config DMA_OMAP DMA engine is found on OMAP and DRA7xx parts. config TI_K3_UDMA - bool "Texas Instruments UDMA support" + tristate "Texas Instruments UDMA support" depends on ARCH_K3 depends on TI_SCI_PROTOCOL depends on TI_SCI_INTA_IRQCHIP @@ -48,7 +48,7 @@ config TI_K3_UDMA DMA engine is used in AM65x and j721e. config TI_K3_UDMA_GLUE_LAYER - bool "Texas Instruments UDMA Glue layer for non DMAengine users" + tristate "Texas Instruments UDMA Glue layer for non DMAengine users" depends on ARCH_K3 depends on TI_K3_UDMA help diff --git a/drivers/dma/ti/k3-udma-glue.c b/drivers/dma/ti/k3-udma-glue.c index 4fdd9f06b723..c29de4695ae7 100644 --- a/drivers/dma/ti/k3-udma-glue.c +++ b/drivers/dma/ti/k3-udma-glue.c @@ -6,6 +6,7 @@ * */ +#include #include #include #include @@ -1433,4 +1434,6 @@ static int __init k3_udma_glue_class_init(void) { return class_register(&k3_udma_glue_devclass); } -arch_initcall(k3_udma_glue_class_init); + +module_init(k3_udma_glue_class_init); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index 2f0d2c68c93c..7239ff31c8c5 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include @@ -4318,18 +4319,10 @@ static const struct of_device_id udma_of_match[] = { .compatible = "ti,j721e-navss-mcu-udmap", .data = &j721e_mcu_data, }, - { /* Sentinel */ }, -}; - -static const struct of_device_id bcdma_of_match[] = { { .compatible = "ti,am64-dmss-bcdma", .data = &am64_bcdma_data, }, - { /* Sentinel */ }, -}; - -static const struct of_device_id pktdma_of_match[] = { { .compatible = "ti,am64-dmss-pktdma", .data = &am64_pktdma_data, @@ -5254,14 +5247,9 @@ static int udma_probe(struct platform_device *pdev) return -ENOMEM; match = of_match_node(udma_of_match, dev->of_node); - if (!match) - match = of_match_node(bcdma_of_match, dev->of_node); if (!match) { - match = of_match_node(pktdma_of_match, dev->of_node); - if (!match) { - dev_err(dev, "No compatible match found\n"); - return -ENODEV; - } + dev_err(dev, "No compatible match found\n"); + return -ENODEV; } ud->match_data = match->data; @@ -5494,27 +5482,9 @@ static struct platform_driver udma_driver = { }, .probe = udma_probe, }; -builtin_platform_driver(udma_driver); -static struct platform_driver bcdma_driver = { - .driver = { - .name = "ti-bcdma", - .of_match_table = bcdma_of_match, - .suppress_bind_attrs = true, - }, - .probe = udma_probe, -}; -builtin_platform_driver(bcdma_driver); - -static struct platform_driver pktdma_driver = { - .driver = { - .name = "ti-pktdma", - .of_match_table = pktdma_of_match, - .suppress_bind_attrs = true, - }, - .probe = udma_probe, -}; -builtin_platform_driver(pktdma_driver); +module_platform_driver(udma_driver); +MODULE_LICENSE("GPL v2"); /* Private interfaces to UDMA */ #include "k3-udma-private.c"