From patchwork Mon Sep 26 18:18:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 12989233 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 60139C32771 for ; Mon, 26 Sep 2022 18:20:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4IDGJiOTRYC1r9FPAUCD0gwda6sVcmBR3eusm4sD1Ao=; b=FTdYTU1LzmDGfG 2iNRLtIGPaJGaOclJmUSYhgxxeLttXc+FdNVTf9V5ho1KT4qEInYFduTtz262ed1iFgtdk3pggox6 f97gTIzUBce4y6I7wq8qXIYhhoYm9ewVwBUOC/gQr6JbTvtDcPW5lr9rgnqD1B3g2lPt6xz+A1BNI TgyXltHssl4zQREnQse/HMvhto5QA87zRlvp77NtsPRebgNX0Hp3F1CDm1n8WskYckhrm+X8Vwapt u7OOumbgiIUixUiLFzcmNwoziGOZ63XUjr420Yb1IgNEbBqOzg9zlrx5NGMEGM9DUOPB6aVPdnXgy pBA9pVV1vPCCrUDKpflg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ocshJ-006FRf-Hy; Mon, 26 Sep 2022 18:19:17 +0000 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ocsgz-006FMq-12 for linux-arm-kernel@lists.infradead.org; Mon, 26 Sep 2022 18:18:58 +0000 Received: by mail-pj1-x1034.google.com with SMTP id q15-20020a17090a304f00b002002ac83485so7794733pjl.0 for ; Mon, 26 Sep 2022 11:18:54 -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=sOua1pY21Fv96aW7PrqBiYaJcs7gq7YxISSZUAc8EdI=; b=kjmkfPAt0Ldb3kCH6Yy627NqbCxAlubd0uia6q14J2OjHUm+b5V/OKWYaeR40shCYw bBdnojc5UaDQ0/H7vxZwcXUNrbQTF973LhAUDwAoD7hboV1z5FtvlWNqO9xU4VbVW4Jz soyMTVCUrcQhmcb2iKs7B/Ebg+Lfa/8kZgzazWk6Gz54hKdnguR7TWrJumBSjO2fFDSq gb75osepy7K4kuQwOcBFaryGpVGCbU2abfq0ztoN2zh129iidfp/nQpP3781Ovy0/hNs CY4Jk8RYRUPBfQrqOGGxBJZ8nkQj4qDuJYVQwcI2d0jVcED/q2dP2XSR5wkaDBcDPx25 DhMQ== 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=sOua1pY21Fv96aW7PrqBiYaJcs7gq7YxISSZUAc8EdI=; b=AB1ZjzYQHf00p3WN9mBGBTc+Jw/GGhQ/gibSJZMWhuspL5Q+7Yaqt7F9tZRw7iOrm9 ij8MkvOLoRSny61XQPZ6gePNFz7zTfwMwQYemSn9/EKfG2pIzxIBasHlSbgOhlYRbmiU +kKriGoQMyyovNi/hcYP+zSrnfcbjc91idJW9lfB8oOqpBVWO1XLreibG6H9HVsAjkRx lwzmdpeemxyewMz9Z5thMYsaOUX66pq+6zwh3NkXf6UUAMLl3sYurEmYNyc0Xwr7yD1A NNAuXn2anG7wYDpy/yAQNfVMiqVFXI/WAdN8JAgJ9fdark6rS1Adu43aWP/IsmfdovQ/ yS3A== X-Gm-Message-State: ACrzQf2N1Nvs+e2AxggPSr0nIFSoe4y/0gjIi7au2do5Ph+5hJ0CJJYN 6YMqcikwzJt66lqbsQeBESuTag== X-Google-Smtp-Source: AMsMyM64SABO96G27AS3aWnCUnQpn/3RgqTRcJiZhmQYLLesTVTJaim/CtVlQE3CoaXbAN8KoEgu5A== X-Received: by 2002:a17:902:e5c3:b0:176:d1b9:ee33 with SMTP id u3-20020a170902e5c300b00176d1b9ee33mr23499484plf.122.1664216334097; Mon, 26 Sep 2022 11:18:54 -0700 (PDT) Received: from localhost ([76.146.1.42]) by smtp.gmail.com with ESMTPSA id y129-20020a62ce87000000b005480167b921sm13039838pfg.172.2022.09.26.11.18.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 11:18:53 -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 2/3] dma/ti: convert k3-udma to module Date: Mon, 26 Sep 2022 11:18:47 -0700 Message-Id: <20220926181848.2917639-3-khilman@baylibre.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220926181848.2917639-1-khilman@baylibre.com> References: <20220926181848.2917639-1-khilman@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220926_111857_121128_E048C4BA X-CRM114-Status: GOOD ( 19.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 shoul should nave no functional change. Signed-off-by: Kevin Hilman Acked-by: Peter Ujfalusi --- 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"