From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [PATCH 09/17] ti: keystone: dma: Migrate to Kconfig
Date: Sun, 12 Sep 2021 20:32:25 -0400 [thread overview]
Message-ID: <20210913003233.4125-9-trini@konsulko.com> (raw)
In-Reply-To: <20210913003233.4125-1-trini@konsulko.com>
Move the main option for handling drivers/dma/keystone_nav* to Kconfig,
and enable it by default. All of the sub-symbols are not configurable,
so remove them from the CONFIG namespace.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
drivers/dma/Kconfig | 8 +++++++
drivers/dma/keystone_nav.c | 30 +++++++++++++--------------
drivers/dma/keystone_nav_cfg.c | 24 ++++++++++-----------
include/configs/ti_armv7_keystone2.h | 31 ----------------------------
4 files changed, 34 insertions(+), 59 deletions(-)
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index bbeec794df96..9cacea88d0cb 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -53,6 +53,14 @@ config TI_EDMA3
This driver support data transfer between memory
regions.
+config TI_KSNAV
+ bool "TI Keystone Navigator DMA driver"
+ depends on ARCH_KEYSTONE
+ default y
+ select DMA_LEGACY
+ help
+ Enable the Keystone Navigator driver for Keystone 2 platforms.
+
config APBH_DMA
bool "Support APBH DMA"
depends on MX23 || MX28 || MX6 || MX7 || IMX8 || IMX8M
diff --git a/drivers/dma/keystone_nav.c b/drivers/dma/keystone_nav.c
index 443e4b23669a..9a5ba79f3fe5 100644
--- a/drivers/dma/keystone_nav.c
+++ b/drivers/dma/keystone_nav.c
@@ -11,20 +11,20 @@
#include <linux/delay.h>
struct qm_config qm_memmap = {
- .stat_cfg = CONFIG_KSNAV_QM_QUEUE_STATUS_BASE,
- .queue = (void *)CONFIG_KSNAV_QM_MANAGER_QUEUES_BASE,
- .mngr_vbusm = CONFIG_KSNAV_QM_BASE_ADDRESS,
- .i_lram = CONFIG_KSNAV_QM_LINK_RAM_BASE,
- .proxy = (void *)CONFIG_KSNAV_QM_MANAGER_Q_PROXY_BASE,
- .status_ram = CONFIG_KSNAV_QM_STATUS_RAM_BASE,
- .mngr_cfg = (void *)CONFIG_KSNAV_QM_CONF_BASE,
- .intd_cfg = CONFIG_KSNAV_QM_INTD_CONF_BASE,
- .desc_mem = (void *)CONFIG_KSNAV_QM_DESC_SETUP_BASE,
- .region_num = CONFIG_KSNAV_QM_REGION_NUM,
- .pdsp_cmd = CONFIG_KSNAV_QM_PDSP1_CMD_BASE,
- .pdsp_ctl = CONFIG_KSNAV_QM_PDSP1_CTRL_BASE,
- .pdsp_iram = CONFIG_KSNAV_QM_PDSP1_IRAM_BASE,
- .qpool_num = CONFIG_KSNAV_QM_QPOOL_NUM,
+ .stat_cfg = KS2_QM_QUEUE_STATUS_BASE,
+ .queue = (void *)KS2_QM_MANAGER_QUEUES_BASE,
+ .mngr_vbusm = KS2_QM_BASE_ADDRESS,
+ .i_lram = KS2_QM_LINK_RAM_BASE,
+ .proxy = (void *)KS2_QM_MANAGER_Q_PROXY_BASE,
+ .status_ram = KS2_QM_STATUS_RAM_BASE,
+ .mngr_cfg = (void *)KS2_QM_CONF_BASE,
+ .intd_cfg = KS2_QM_INTD_CONF_BASE,
+ .desc_mem = (void *)KS2_QM_DESC_SETUP_BASE,
+ .region_num = KS2_QM_REGION_NUM,
+ .pdsp_cmd = KS2_QM_PDSP1_CMD_BASE,
+ .pdsp_ctl = KS2_QM_PDSP1_CTRL_BASE,
+ .pdsp_iram = KS2_QM_PDSP1_IRAM_BASE,
+ .qpool_num = KS2_QM_QPOOL_NUM,
};
/*
@@ -252,7 +252,7 @@ int ksnav_init(struct pktdma_cfg *pktdma, struct rx_buff_desc *rx_buffers)
writel(0, &pktdma->global->emulation_control);
/* Set QM base address, only for K2x devices */
- writel(CONFIG_KSNAV_QM_BASE_ADDRESS, &pktdma->global->qm_base_addr[0]);
+ writel(KS2_QM_BASE_ADDRESS, &pktdma->global->qm_base_addr[0]);
/* Enable all channels. The current state isn't important */
for (j = 0; j < pktdma->tx_ch_num; j++) {
diff --git a/drivers/dma/keystone_nav_cfg.c b/drivers/dma/keystone_nav_cfg.c
index 9a64801cf9b2..301419b6fdac 100644
--- a/drivers/dma/keystone_nav_cfg.c
+++ b/drivers/dma/keystone_nav_cfg.c
@@ -8,19 +8,17 @@
#include <asm/ti-common/keystone_nav.h>
-#ifdef CONFIG_KSNAV_PKTDMA_NETCP
/* NETCP Pktdma */
struct pktdma_cfg netcp_pktdma = {
- .global = (void *)CONFIG_KSNAV_NETCP_PDMA_CTRL_BASE,
- .tx_ch = (void *)CONFIG_KSNAV_NETCP_PDMA_TX_BASE,
- .tx_ch_num = CONFIG_KSNAV_NETCP_PDMA_TX_CH_NUM,
- .rx_ch = (void *)CONFIG_KSNAV_NETCP_PDMA_RX_BASE,
- .rx_ch_num = CONFIG_KSNAV_NETCP_PDMA_RX_CH_NUM,
- .tx_sched = (u32 *)CONFIG_KSNAV_NETCP_PDMA_SCHED_BASE,
- .rx_flows = (void *)CONFIG_KSNAV_NETCP_PDMA_RX_FLOW_BASE,
- .rx_flow_num = CONFIG_KSNAV_NETCP_PDMA_RX_FLOW_NUM,
- .rx_free_q = CONFIG_KSNAV_NETCP_PDMA_RX_FREE_QUEUE,
- .rx_rcv_q = CONFIG_KSNAV_NETCP_PDMA_RX_RCV_QUEUE,
- .tx_snd_q = CONFIG_KSNAV_NETCP_PDMA_TX_SND_QUEUE,
+ .global = (void *)KS2_NETCP_PDMA_CTRL_BASE,
+ .tx_ch = (void *)KS2_NETCP_PDMA_TX_BASE,
+ .tx_ch_num = KS2_NETCP_PDMA_TX_CH_NUM,
+ .rx_ch = (void *)KS2_NETCP_PDMA_RX_BASE,
+ .rx_ch_num = KS2_NETCP_PDMA_RX_CH_NUM,
+ .tx_sched = (u32 *)KS2_NETCP_PDMA_SCHED_BASE,
+ .rx_flows = (void *)KS2_NETCP_PDMA_RX_FLOW_BASE,
+ .rx_flow_num = KS2_NETCP_PDMA_RX_FLOW_NUM,
+ .rx_free_q = KS2_NETCP_PDMA_RX_FREE_QUEUE,
+ .rx_rcv_q = KS2_NETCP_PDMA_RX_RCV_QUEUE,
+ .tx_snd_q = KS2_NETCP_PDMA_TX_SND_QUEUE,
};
-#endif
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 512be7d328ea..e8d99600def0 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -70,37 +70,6 @@
#define CONFIG_SYS_SGMII_LINERATE_MHZ 1250
#define CONFIG_SYS_SGMII_RATESCALE 2
-/* Keyston Navigator Configuration */
-#define CONFIG_TI_KSNAV
-#define CONFIG_KSNAV_QM_BASE_ADDRESS KS2_QM_BASE_ADDRESS
-#define CONFIG_KSNAV_QM_CONF_BASE KS2_QM_CONF_BASE
-#define CONFIG_KSNAV_QM_DESC_SETUP_BASE KS2_QM_DESC_SETUP_BASE
-#define CONFIG_KSNAV_QM_STATUS_RAM_BASE KS2_QM_STATUS_RAM_BASE
-#define CONFIG_KSNAV_QM_INTD_CONF_BASE KS2_QM_INTD_CONF_BASE
-#define CONFIG_KSNAV_QM_PDSP1_CMD_BASE KS2_QM_PDSP1_CMD_BASE
-#define CONFIG_KSNAV_QM_PDSP1_CTRL_BASE KS2_QM_PDSP1_CTRL_BASE
-#define CONFIG_KSNAV_QM_PDSP1_IRAM_BASE KS2_QM_PDSP1_IRAM_BASE
-#define CONFIG_KSNAV_QM_MANAGER_QUEUES_BASE KS2_QM_MANAGER_QUEUES_BASE
-#define CONFIG_KSNAV_QM_MANAGER_Q_PROXY_BASE KS2_QM_MANAGER_Q_PROXY_BASE
-#define CONFIG_KSNAV_QM_QUEUE_STATUS_BASE KS2_QM_QUEUE_STATUS_BASE
-#define CONFIG_KSNAV_QM_LINK_RAM_BASE KS2_QM_LINK_RAM_BASE
-#define CONFIG_KSNAV_QM_REGION_NUM KS2_QM_REGION_NUM
-#define CONFIG_KSNAV_QM_QPOOL_NUM KS2_QM_QPOOL_NUM
-
-/* NETCP pktdma */
-#define CONFIG_KSNAV_PKTDMA_NETCP
-#define CONFIG_KSNAV_NETCP_PDMA_CTRL_BASE KS2_NETCP_PDMA_CTRL_BASE
-#define CONFIG_KSNAV_NETCP_PDMA_TX_BASE KS2_NETCP_PDMA_TX_BASE
-#define CONFIG_KSNAV_NETCP_PDMA_TX_CH_NUM KS2_NETCP_PDMA_TX_CH_NUM
-#define CONFIG_KSNAV_NETCP_PDMA_RX_BASE KS2_NETCP_PDMA_RX_BASE
-#define CONFIG_KSNAV_NETCP_PDMA_RX_CH_NUM KS2_NETCP_PDMA_RX_CH_NUM
-#define CONFIG_KSNAV_NETCP_PDMA_SCHED_BASE KS2_NETCP_PDMA_SCHED_BASE
-#define CONFIG_KSNAV_NETCP_PDMA_RX_FLOW_BASE KS2_NETCP_PDMA_RX_FLOW_BASE
-#define CONFIG_KSNAV_NETCP_PDMA_RX_FLOW_NUM KS2_NETCP_PDMA_RX_FLOW_NUM
-#define CONFIG_KSNAV_NETCP_PDMA_RX_FREE_QUEUE KS2_NETCP_PDMA_RX_FREE_QUEUE
-#define CONFIG_KSNAV_NETCP_PDMA_RX_RCV_QUEUE KS2_NETCP_PDMA_RX_RCV_QUEUE
-#define CONFIG_KSNAV_NETCP_PDMA_TX_SND_QUEUE KS2_NETCP_PDMA_TX_SND_QUEUE
-
/* Keystone net */
#define CONFIG_KSNET_MAC_ID_BASE KS2_MAC_ID_BASE_ADDR
#define CONFIG_KSNET_NETCP_BASE KS2_NETCP_BASE
--
2.17.1
next prev parent reply other threads:[~2021-09-13 0:34 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-13 0:32 [PATCH 01/17] am335x_guardian: Enable SPL_OF_CONTROL Tom Rini
2021-09-13 0:32 ` [PATCH 02/17] am335x_boneblack_vboot: " Tom Rini
2021-09-13 0:32 ` [PATCH 03/17] am335x: Remove legacy non-DM_USB code Tom Rini
2021-09-13 0:32 ` [PATCH 04/17] keystone2: Move CONFIG_AEMIF_CNTRL_BASE out of CONFIG namespace Tom Rini
2021-09-28 23:20 ` Tom Rini
2021-09-13 0:32 ` [PATCH 05/17] usb: phy: ti: Remove non-DM PHY code Tom Rini
2021-09-28 23:20 ` Tom Rini
2021-09-13 0:32 ` [PATCH 06/17] Convert CONFIG_USB_XHCI_OMAP to Kconfig Tom Rini
2021-09-28 23:20 ` Tom Rini
2021-09-13 0:32 ` [PATCH 07/17] compulab: Clean up some unused symbols Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 08/17] ti: keystone: Clean up or migrate some NAND related options Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` Tom Rini [this message]
2021-09-28 23:21 ` [PATCH 09/17] ti: keystone: dma: Migrate to Kconfig Tom Rini
2021-09-13 0:32 ` [PATCH 10/17] omapl138_lcdk: Stop using CONFIG_MACH_OMAPL138_LCDK Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 11/17] usb: ehci-omap: Drop non-DM_USB legacy code Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 12/17] Convert CONFIG_OMAP_EHCI_PHY1_RESET_GPIO et al to Kconfig Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 13/17] am3517_evm: Remove unused comments/code Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 14/17] omap3_logic: " Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 15/17] omap4_panda: " Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 16/17] ti: keystone: Move away from CONFIG_SOC_KEYSTONE Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 17/17] ti: keystone: Migrate CONFIG_SOC_K2* to Kconfig Tom Rini
2021-09-28 23:21 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210913003233.4125-9-trini@konsulko.com \
--to=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox