Skip to contentSkip to conversation

ram: k3-ddrss: add auto-generated macros for am62a support

PATCH In review Bryan Brattlof 2 participants 2 messages Oct 24, 2022 – Dec 9, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ram: k3-ddrss: add auto-generated macros for am62a support

The new 32bit DDR controller for TI's am62a family of SoCs shares much of the same functionality with the existing 16bit (am64) and 32bit (j721e) controllers, so this patch reorganizes the existing auto-generated macros for the 16bit and 32bit controllers to make room for the macros for the am62a's controller

This patch consists mostly of header/macro renames and additions with a new Kconfig option (K3_AM62A_DDRSS) allowing us to select these new macros during compilation.

---
 drivers/ram/Kconfig                           |   10 +
 .../ram/k3-ddrss/16bit/lpddr4_16bit_obj_if.h  |   14 -
 .../k3-ddrss/16bit/lpddr4_16bit_structs_if.h  |   15 -
 .../ram/k3-ddrss/32bit/lpddr4_32bit_obj_if.h  |   14 -
 .../k3-ddrss/32bit/lpddr4_32bit_structs_if.h  |   15 -
 drivers/ram/k3-ddrss/Makefile                 |   18 +-
 .../am62a/lpddr4_address_slice_0_macros.h     |  778 ++
 .../am62a/lpddr4_address_slice_1_macros.h     |  778 ++
 .../am62a/lpddr4_address_slice_2_macros.h     |  778 ++
 .../am62a/lpddr4_am62a_ctl_regs_rw_masks.h    |   25 +
 drivers/ram/k3-ddrss/am62a/lpddr4_am62a_if.h  |  108 +
 .../ram/k3-ddrss/am62a/lpddr4_am62a_obj_if.h  |   14 +
 .../k3-ddrss/am62a/lpddr4_am62a_structs_if.h  |   15 +
 drivers/ram/k3-ddrss/am62a/lpddr4_ctl_regs.h  | 1721 ++++
 .../am62a/lpddr4_data_slice_0_macros.h        | 2292 ++++++
 .../am62a/lpddr4_data_slice_1_macros.h        | 2292 ++++++
 .../am62a/lpddr4_data_slice_2_macros.h        | 2292 ++++++
 .../am62a/lpddr4_data_slice_3_macros.h        | 2292 ++++++
 .../am62a/lpddr4_ddr_controller_macros.h      | 6560 ++++++++++++++++
 .../k3-ddrss/am62a/lpddr4_phy_core_macros.h   | 1986 +++++
 drivers/ram/k3-ddrss/am62a/lpddr4_pi_macros.h | 6892 +++++++++++++++++
 .../lpddr4_address_slice_0_macros.h           |    4 +-
 .../lpddr4_address_slice_1_macros.h           |    4 +-
 .../lpddr4_address_slice_2_macros.h           |    4 +-
 .../lpddr4_am64_ctl_regs_rw_masks.h}          |    4 +-
 .../lpddr4_am64_if.h}                         |   10 +-
 .../ram/k3-ddrss/am64/lpddr4_am64_obj_if.h    |   14 +
 .../k3-ddrss/am64/lpddr4_am64_structs_if.h    |   15 +
 .../{16bit => am64}/lpddr4_ctl_regs.h         |    4 +-
 .../lpddr4_data_slice_0_macros.h              |    4 +-
 .../lpddr4_data_slice_1_macros.h              |    4 +-
 .../lpddr4_ddr_controller_macros.h            |    4 +-
 .../{16bit => am64}/lpddr4_phy_core_macros.h  |    4 +-
 .../{16bit => am64}/lpddr4_pi_macros.h        |    4 +-
 drivers/ram/k3-ddrss/cps_drv_lpddr4.h         |    4 +-
 .../lpddr4_address_slice_0_macros.h           |    4 +-
 .../{32bit => j721e}/lpddr4_ctl_regs.h        |    4 +-
 .../lpddr4_data_slice_0_macros.h              |    4 +-
 .../lpddr4_data_slice_1_macros.h              |    4 +-
 .../lpddr4_data_slice_2_macros.h              |    4 +-
 .../lpddr4_data_slice_3_macros.h              |    4 +-
 .../lpddr4_ddr_controller_macros.h            |    4 +-
 .../lpddr4_j721e_ctl_regs_rw_masks.h}         |    4 +-
 .../lpddr4_j721e_if.h}                        |   10 +-
 .../ram/k3-ddrss/j721e/lpddr4_j721e_obj_if.h  |   14 +
 .../k3-ddrss/j721e/lpddr4_j721e_structs_if.h  |   15 +
 .../{32bit => j721e}/lpddr4_phy_core_macros.h |    4 +-
 .../{32bit => j721e}/lpddr4_pi_macros.h       |    4 +-
 drivers/ram/k3-ddrss/lpddr4.c                 |   67 +-
 drivers/ram/k3-ddrss/lpddr4.h                 |   33 +-
 drivers/ram/k3-ddrss/lpddr4_16bit.h           |   33 -
 .../k3-ddrss/lpddr4_am62a_ctl_regs_rw_masks.c | 1726 +++++
 ...asks.c => lpddr4_am64_ctl_regs_rw_masks.c} |    6 +-
 .../{lpddr4_16bit.c => lpddr4_am6x.c}         |   16 +-
 drivers/ram/k3-ddrss/lpddr4_am6x.h            |   45 +
 ...r4_16bit_sanity.h => lpddr4_am6x_sanity.h} |   20 +-
 drivers/ram/k3-ddrss/lpddr4_if.h              |   12 +-
 .../{lpddr4_32bit.c => lpddr4_j721e.c}        |    7 +-
 .../{lpddr4_32bit.h => lpddr4_j721e.h}        |   20 +-
 ...sks.c => lpddr4_j721e_ctl_regs_rw_masks.c} |    6 +-
 ...4_32bit_sanity.h => lpddr4_j721e_sanity.h} |   17 +-
 drivers/ram/k3-ddrss/lpddr4_obj_if.c          |    5 +-
 drivers/ram/k3-ddrss/lpddr4_obj_if.h          |    6 +-
 drivers/ram/k3-ddrss/lpddr4_private.h         |   60 -
 drivers/ram/k3-ddrss/lpddr4_sanity.h          |   20 +-
 drivers/ram/k3-ddrss/lpddr4_structs_if.h      |    4 +-
 66 files changed, 30830 insertions(+), 344 deletions(-)
 delete mode 100644 drivers/ram/k3-ddrss/16bit/lpddr4_16bit_obj_if.h
 delete mode 100644 drivers/ram/k3-ddrss/16bit/lpddr4_16bit_structs_if.h
 delete mode 100644 drivers/ram/k3-ddrss/32bit/lpddr4_32bit_obj_if.h
 delete mode 100644 drivers/ram/k3-ddrss/32bit/lpddr4_32bit_structs_if.h
 create mode 100644 drivers/ram/k3-ddrss/am62a/lpddr4_address_slice_0_macros.h
 create mode 100644 drivers/ram/k3-ddrss/am62a/lpddr4_address_slice_1_macros.h
 create mode 100644 drivers/ram/k3-ddrss/am62a/lpddr4_address_slice_2_macros.h
 create mode 100644 drivers/ram/k3-ddrss/am62a/lpddr4_am62a_ctl_regs_rw_masks.h
 create mode 100644 drivers/ram/k3-ddrss/am62a/lpddr4_am62a_if.h
 create mode 100644 drivers/ram/k3-ddrss/am62a/lpddr4_am62a_obj_if.h
 create mode 100644 drivers/ram/k3-ddrss/am62a/lpddr4_am62a_structs_if.h
 create mode 100644 drivers/ram/k3-ddrss/am62a/lpddr4_ctl_regs.h
 create mode 100644 drivers/ram/k3-ddrss/am62a/lpddr4_data_slice_0_macros.h
 create mode 100644 drivers/ram/k3-ddrss/am62a/lpddr4_data_slice_1_macros.h
 create mode 100644 drivers/ram/k3-ddrss/am62a/lpddr4_data_slice_2_macros.h
 create mode 100644 drivers/ram/k3-ddrss/am62a/lpddr4_data_slice_3_macros.h
 create mode 100644 drivers/ram/k3-ddrss/am62a/lpddr4_ddr_controller_macros.h
 create mode 100644 drivers/ram/k3-ddrss/am62a/lpddr4_phy_core_macros.h
 create mode 100644 drivers/ram/k3-ddrss/am62a/lpddr4_pi_macros.h
 rename drivers/ram/k3-ddrss/{16bit => am64}/lpddr4_address_slice_0_macros.h (99%)
 rename drivers/ram/k3-ddrss/{16bit => am64}/lpddr4_address_slice_1_macros.h (99%)
 rename drivers/ram/k3-ddrss/{16bit => am64}/lpddr4_address_slice_2_macros.h (99%)
 rename drivers/ram/k3-ddrss/{16bit/lpddr4_ctl_regs_rw_masks.h => am64/lpddr4_am64_ctl_regs_rw_masks.h} (82%)
 rename drivers/ram/k3-ddrss/{16bit/lpddr4_16bit_if.h => am64/lpddr4_am64_if.h} (94%)
 create mode 100644 drivers/ram/k3-ddrss/am64/lpddr4_am64_obj_if.h
 create mode 100644 drivers/ram/k3-ddrss/am64/lpddr4_am64_structs_if.h
 rename drivers/ram/k3-ddrss/{16bit => am64}/lpddr4_ctl_regs.h (99%)
 rename drivers/ram/k3-ddrss/{16bit => am64}/lpddr4_data_slice_0_macros.h (99%)
 rename drivers/ram/k3-ddrss/{16bit => am64}/lpddr4_data_slice_1_macros.h (99%)
 rename drivers/ram/k3-ddrss/{16bit => am64}/lpddr4_ddr_controller_macros.h (99%)
 rename drivers/ram/k3-ddrss/{16bit => am64}/lpddr4_phy_core_macros.h (99%)
 rename drivers/ram/k3-ddrss/{16bit => am64}/lpddr4_pi_macros.h (99%)
 rename drivers/ram/k3-ddrss/{32bit => j721e}/lpddr4_address_slice_0_macros.h (99%)
 rename drivers/ram/k3-ddrss/{32bit => j721e}/lpddr4_ctl_regs.h (99%)
 rename drivers/ram/k3-ddrss/{32bit => j721e}/lpddr4_data_slice_0_macros.h (99%)
 rename drivers/ram/k3-ddrss/{32bit => j721e}/lpddr4_data_slice_1_macros.h (99%)
 rename drivers/ram/k3-ddrss/{32bit => j721e}/lpddr4_data_slice_2_macros.h (99%)
 rename drivers/ram/k3-ddrss/{32bit => j721e}/lpddr4_data_slice_3_macros.h (99%)
 rename drivers/ram/k3-ddrss/{32bit => j721e}/lpddr4_ddr_controller_macros.h (99%)
 rename drivers/ram/k3-ddrss/{32bit/lpddr4_ctl_regs_rw_masks.h => j721e/lpddr4_j721e_ctl_regs_rw_masks.h} (82%)
 rename drivers/ram/k3-ddrss/{32bit/lpddr4_32bit_if.h => j721e/lpddr4_j721e_if.h} (93%)
 create mode 100644 drivers/ram/k3-ddrss/j721e/lpddr4_j721e_obj_if.h
 create mode 100644 drivers/ram/k3-ddrss/j721e/lpddr4_j721e_structs_if.h
 rename drivers/ram/k3-ddrss/{32bit => j721e}/lpddr4_phy_core_macros.h (99%)
 rename drivers/ram/k3-ddrss/{32bit => j721e}/lpddr4_pi_macros.h (99%)
 delete mode 100644 drivers/ram/k3-ddrss/lpddr4_16bit.h
 create mode 100644 drivers/ram/k3-ddrss/lpddr4_am62a_ctl_regs_rw_masks.c
 rename drivers/ram/k3-ddrss/{lpddr4_16bit_ctl_regs_rw_masks.c => lpddr4_am64_ctl_regs_rw_masks.c} (99%)
 rename drivers/ram/k3-ddrss/{lpddr4_16bit.c => lpddr4_am6x.c} (97%)
 create mode 100644 drivers/ram/k3-ddrss/lpddr4_am6x.h
 rename drivers/ram/k3-ddrss/{lpddr4_16bit_sanity.h => lpddr4_am6x_sanity.h} (97%)
 rename drivers/ram/k3-ddrss/{lpddr4_32bit.c => lpddr4_j721e.c} (98%)
 rename drivers/ram/k3-ddrss/{lpddr4_32bit.h => lpddr4_j721e.h} (56%)
 rename drivers/ram/k3-ddrss/{lpddr4_32bit_ctl_regs_rw_masks.c => lpddr4_j721e_ctl_regs_rw_masks.c} (99%)
 rename drivers/ram/k3-ddrss/{lpddr4_32bit_sanity.h => lpddr4_j721e_sanity.h} (96%)
 delete mode 100644 drivers/ram/k3-ddrss/lpddr4_private.h
drivers/ram/Kconfig +10 -0
index 86857c06272ef..bf279b79f6d1a 100644
@@ -86,6 +86,16 @@ config K3_AM64_DDRSS
 	  Enabling this config adds support for the DDR memory controller
 	  on AM642 family of SoCs.
 
+config K3_AM62A_DDRSS
+	bool "Enable AM62A DDRSS support"
+	help
+	  The AM62A DDR subsystem comprises of a DDR controller, DDR PHY and
+	  wrapper logic to integrate these blocks into once device. The DDR
+	  subsystem is used to provide an interface to external SDRAM devices
+	  which can be utilized for storing programs or any other data.
+	  Enabling this option adds support for the DDR memory controller for
+	  the AM62A family of SoCs.
+
 endchoice
 
 config IMXRT_SDRAM
drivers/ram/k3-ddrss/16bit/lpddr4_16bit_obj_if.h deleted +0 -14
deleted file mode 100644
index 6c57dd9d00c21..0000000000000
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause */
-/*
- * Cadence DDR Driver
- *
- * Copyright (C) 2012-2021 Cadence Design Systems, Inc.
- * Copyright (C) 2018-2021 Texas Instruments Incorporated - https://www.ti.com/
- */
-
-#ifndef LPDDR4_16BIT_OBJ_IF_H
-#define LPDDR4_16BIT_OBJ_IF_H
-
-#include "lpddr4_16bit_if.h"
-
-#endif  /* LPDDR4_16BIT_OBJ_IF_H */
drivers/ram/k3-ddrss/16bit/lpddr4_16bit_structs_if.h deleted +0 -15
deleted file mode 100644
index 52973484ecd34..0000000000000
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause */
-/*
- * Cadence DDR Driver
- *
- * Copyright (C) 2012-2021 Cadence Design Systems, Inc.
- * Copyright (C) 2018-2021 Texas Instruments Incorporated - https://www.ti.com/
- */
-
-#ifndef LPDDR4_16BIT_STRUCTS_IF_H
-#define LPDDR4_16BIT_STRUCTS_IF_H
-
-#include <linux/types.h>
-#include "lpddr4_16bit_if.h"
-
-#endif  /* LPDDR4_16BIT_STRUCTS_IF_H */
drivers/ram/k3-ddrss/32bit/lpddr4_32bit_obj_if.h deleted +0 -14
deleted file mode 100644
index 7fee54f00d5a0..0000000000000
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause */
-/*
- * Cadence DDR Driver
- *
- * Copyright (C) 2012-2021 Cadence Design Systems, Inc.
- * Copyright (C) 2018-2021 Texas Instruments Incorporated - https://www.ti.com/
- */
-
-#ifndef LPDDR4_32BIT_OBJ_IF_H
-#define LPDDR4_32BIT_OBJ_IF_H
-
-#include "lpddr4_32bit_if.h"
-
-#endif  /* LPDDR4_32BIT_OBJ_IF_H */
drivers/ram/k3-ddrss/32bit/lpddr4_32bit_structs_if.h deleted +0 -15
deleted file mode 100644
index 69b2a47ab3f5b..0000000000000
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause */
-/*
- * Cadence DDR Driver
- *
- * Copyright (C) 2012-2021 Cadence Design Systems, Inc.
- * Copyright (C) 2018-2021 Texas Instruments Incorporated - https://www.ti.com/
- */
-
-#ifndef LPDDR4_32BIT_STRUCTS_IF_H
-#define LPDDR4_32BIT_STRUCTS_IF_H
-
-#include <linux/types.h>
-#include "lpddr4_32bit_if.h"
-
-#endif  /* LPDDR4_32BIT_STRUCTS_IF_H */
drivers/ram/k3-ddrss/Makefile +11 -7
index 8be00118f5019..ba5d9a2f4d30a 100644
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
-# Copyright (C) 2019-2021 Texas Instruments Incorporated - http://www.ti.com/
+# Copyright (C) 2019-2022 Texas Instruments Incorporated - http://www.ti.com/
 #
 
 obj-$(CONFIG_K3_DDRSS) += k3-ddrss.o
@@ -8,10 +8,14 @@ obj-$(CONFIG_K3_DDRSS) += lpddr4_obj_if.o
 obj-$(CONFIG_K3_DDRSS) += lpddr4.o
 ccflags-$(CONFIG_K3_DDRSS) += -Idrivers/ram/k3-ddrss/
 
-obj-$(CONFIG_K3_AM64_DDRSS) += lpddr4_16bit.o
-obj-$(CONFIG_K3_AM64_DDRSS) += lpddr4_16bit_ctl_regs_rw_masks.o
-ccflags-$(CONFIG_K3_AM64_DDRSS) += -Idrivers/ram/k3-ddrss/16bit/
+obj-$(CONFIG_K3_AM62A_DDRSS) += lpddr4_am6x.o
+obj-$(CONFIG_K3_AM62A_DDRSS) += lpddr4_am62a_ctl_regs_rw_masks.o
+ccflags-$(CONFIG_K3_AM62A_DDRSS) += -Idrivers/ram/k3-ddrss/am62a/
 
-obj-$(CONFIG_K3_J721E_DDRSS) += lpddr4_32bit.o
-obj-$(CONFIG_K3_J721E_DDRSS) += lpddr4_32bit_ctl_regs_rw_masks.o
-ccflags-$(CONFIG_K3_J721E_DDRSS) += -Idrivers/ram/k3-ddrss/32bit/
+obj-$(CONFIG_K3_AM64_DDRSS) += lpddr4_am6x.o
+obj-$(CONFIG_K3_AM64_DDRSS) += lpddr4_am64_ctl_regs_rw_masks.o
+ccflags-$(CONFIG_K3_AM64_DDRSS) += -Idrivers/ram/k3-ddrss/am64/
+
+obj-$(CONFIG_K3_J721E_DDRSS) += lpddr4_j721e.o
+obj-$(CONFIG_K3_J721E_DDRSS) += lpddr4_j721e_ctl_regs_rw_masks.o
+ccflags-$(CONFIG_K3_J721E_DDRSS) += -Idrivers/ram/k3-ddrss/j721e/
drivers/ram/k3-ddrss/am62a/lpddr4_address_slice_0_macros.h new file +778 -0

778 lines not on this page · raw message

drivers/ram/k3-ddrss/am62a/lpddr4_address_slice_1_macros.h new file +778 -0

778 lines not on this page · raw message

drivers/ram/k3-ddrss/am62a/lpddr4_address_slice_2_macros.h new file +778 -0

778 lines not on this page · raw message

drivers/ram/k3-ddrss/am62a/lpddr4_am62a_ctl_regs_rw_masks.h new file +25 -0
new file mode 100644
index 0000000000000..22384a1b742fb
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+/*
+ * Cadence DDR Driver
+ *
+ * Copyright (C) 2012-2022 Cadence Design Systems, Inc.
+ * Copyright (C) 2018-2022 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+#ifndef LPDDR4_RW_MASKS_H_
+#define LPDDR4_RW_MASKS_H_
+
+#include <stdint.h>
+
+extern u32 g_lpddr4_ddr_controller_rw_mask[435];
+extern u32 g_lpddr4_pi_rw_mask[424];
+extern u32 g_lpddr4_data_slice_0_rw_mask[137];
+extern u32 g_lpddr4_data_slice_1_rw_mask[137];
+extern u32 g_lpddr4_data_slice_2_rw_mask[137];
+extern u32 g_lpddr4_data_slice_3_rw_mask[137];
+extern u32 g_lpddr4_address_slice_0_rw_mask[49];
+extern u32 g_lpddr4_address_slice_1_rw_mask[49];
+extern u32 g_lpddr4_address_slice_2_rw_mask[49];
+extern u32 g_lpddr4_phy_core_rw_mask[132];
+
+#endif /* LPDDR4_RW_MASKS_H_ */
drivers/ram/k3-ddrss/am62a/lpddr4_am62a_if.h new file +108 -0

108 lines not on this page · raw message

drivers/ram/k3-ddrss/am62a/lpddr4_am62a_obj_if.h new file +14 -0
new file mode 100644
index 0000000000000..4c41863c5b805
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+/*
+ * Cadence DDR Driver
+ *
+ * Copyright (C) 2012-2022 Cadence Design Systems, Inc.
+ * Copyright (C) 2018-2022 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+#ifndef LPDDR4_AM62A_OBJ_IF_H
+#define LPDDR4_AM62A_OBJ_IF_H
+
+#include "lpddr4_am62a_if.h"
+
+#endif  /* LPDDR4_AM62A_OBJ_IF_H */
drivers/ram/k3-ddrss/am62a/lpddr4_am62a_structs_if.h new file +15 -0
new file mode 100644
index 0000000000000..ab2b1f1a0f468
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+/*
+ * Cadence DDR Driver
+ *
+ * Copyright (C) 2012-2022 Cadence Design Systems, Inc.
+ * Copyright (C) 2018-2022 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+#ifndef LPDDR4_AM62A_STRUCTS_IF_H
+#define LPDDR4_AM62A_STRUCTS_IF_H
+
+#include <linux/types.h>
+#include "lpddr4_am62a_if.h"
+
+#endif  /* LPDDR4_AM62A_STRUCTS_IF_H */
drivers/ram/k3-ddrss/am62a/lpddr4_ctl_regs.h new file +1721 -0

403 lines not on this page · raw message

drivers/ram/k3-ddrss/am62a/lpddr4_data_slice_0_macros.h new file +2292 -0

2,292 lines not on this page · raw message

drivers/ram/k3-ddrss/am62a/lpddr4_data_slice_1_macros.h new file +2292 -0

2,292 lines not on this page · raw message

drivers/ram/k3-ddrss/am62a/lpddr4_data_slice_2_macros.h new file +2292 -0

2,292 lines not on this page · raw message

drivers/ram/k3-ddrss/am62a/lpddr4_data_slice_3_macros.h new file +2292 -0

2,292 lines not on this page · raw message

drivers/ram/k3-ddrss/am62a/lpddr4_ddr_controller_macros.h new file +6560 -0

6,560 lines not on this page · raw message

drivers/ram/k3-ddrss/am62a/lpddr4_phy_core_macros.h new file +1986 -0

1,986 lines not on this page · raw message

drivers/ram/k3-ddrss/am62a/lpddr4_pi_macros.h new file +6892 -0

6,892 lines not on this page · raw message

drivers/ram/k3-ddrss/am64/lpddr4_address_slice_0_macros.h renamed from drivers/ram/k3-ddrss/16bit/lpddr4_address_slice_0_macros.h +2 -2
similarity index 99%
rename from drivers/ram/k3-ddrss/16bit/lpddr4_address_slice_0_macros.h
rename to drivers/ram/k3-ddrss/am64/lpddr4_address_slice_0_macros.h
index f22a20a07c0b8..e233c5b1a30de 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/am64/lpddr4_address_slice_1_macros.h renamed from drivers/ram/k3-ddrss/16bit/lpddr4_address_slice_1_macros.h +2 -2
similarity index 99%
rename from drivers/ram/k3-ddrss/16bit/lpddr4_address_slice_1_macros.h
rename to drivers/ram/k3-ddrss/am64/lpddr4_address_slice_1_macros.h
index df5ab95166995..8d5196a6ce03c 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/am64/lpddr4_address_slice_2_macros.h renamed from drivers/ram/k3-ddrss/16bit/lpddr4_address_slice_2_macros.h +2 -2
similarity index 99%
rename from drivers/ram/k3-ddrss/16bit/lpddr4_address_slice_2_macros.h
rename to drivers/ram/k3-ddrss/am64/lpddr4_address_slice_2_macros.h
index 924013e355df3..5e781e6815356 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/am64/lpddr4_am64_ctl_regs_rw_masks.h renamed from drivers/ram/k3-ddrss/16bit/lpddr4_ctl_regs_rw_masks.h +2 -2
similarity index 82%
rename from drivers/ram/k3-ddrss/16bit/lpddr4_ctl_regs_rw_masks.h
rename to drivers/ram/k3-ddrss/am64/lpddr4_am64_ctl_regs_rw_masks.h
index d46b77b23f347..9ea46fe48a4ee 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/am64/lpddr4_am64_if.h renamed from drivers/ram/k3-ddrss/16bit/lpddr4_16bit_if.h +5 -5
similarity index 94%
rename from drivers/ram/k3-ddrss/16bit/lpddr4_16bit_if.h
rename to drivers/ram/k3-ddrss/am64/lpddr4_am64_if.h
index 94202c9d94b00..4db31259523f1 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/am64/lpddr4_am64_obj_if.h new file +14 -0
new file mode 100644
index 0000000000000..e2a23c3637d8b

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/am64/lpddr4_am64_structs_if.h new file +15 -0
new file mode 100644
index 0000000000000..53b76f0888cf9

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/am64/lpddr4_ctl_regs.h renamed from drivers/ram/k3-ddrss/16bit/lpddr4_ctl_regs.h +2 -2
similarity index 99%
rename from drivers/ram/k3-ddrss/16bit/lpddr4_ctl_regs.h
rename to drivers/ram/k3-ddrss/am64/lpddr4_ctl_regs.h
index 21e96c9a90448..bd29fad185632 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/am64/lpddr4_data_slice_0_macros.h renamed from drivers/ram/k3-ddrss/16bit/lpddr4_data_slice_0_macros.h +2 -2
similarity index 99%
rename from drivers/ram/k3-ddrss/16bit/lpddr4_data_slice_0_macros.h
rename to drivers/ram/k3-ddrss/am64/lpddr4_data_slice_0_macros.h
index d3bf24e677bfa..c7358586c5b3b 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/am64/lpddr4_data_slice_1_macros.h renamed from drivers/ram/k3-ddrss/16bit/lpddr4_data_slice_1_macros.h +2 -2
similarity index 99%
rename from drivers/ram/k3-ddrss/16bit/lpddr4_data_slice_1_macros.h
rename to drivers/ram/k3-ddrss/am64/lpddr4_data_slice_1_macros.h
index d60bb6afe8287..bf919afeea5dd 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/am64/lpddr4_ddr_controller_macros.h renamed from drivers/ram/k3-ddrss/16bit/lpddr4_ddr_controller_macros.h +2 -2
similarity index 99%
rename from drivers/ram/k3-ddrss/16bit/lpddr4_ddr_controller_macros.h
rename to drivers/ram/k3-ddrss/am64/lpddr4_ddr_controller_macros.h
index 3df803e9ef780..b006526808754 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/am64/lpddr4_phy_core_macros.h renamed from drivers/ram/k3-ddrss/16bit/lpddr4_phy_core_macros.h +2 -2
similarity index 99%
rename from drivers/ram/k3-ddrss/16bit/lpddr4_phy_core_macros.h
rename to drivers/ram/k3-ddrss/am64/lpddr4_phy_core_macros.h
index dcfd7d9e8600f..1cf952913e166 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/am64/lpddr4_pi_macros.h renamed from drivers/ram/k3-ddrss/16bit/lpddr4_pi_macros.h +2 -2
similarity index 99%
rename from drivers/ram/k3-ddrss/16bit/lpddr4_pi_macros.h
rename to drivers/ram/k3-ddrss/am64/lpddr4_pi_macros.h
index 9aa281af2193c..9c240d3a79d04 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/cps_drv_lpddr4.h +2 -2
index 298aa5e6cb8b2..94a16199c5ab9 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/j721e/lpddr4_address_slice_0_macros.h renamed from drivers/ram/k3-ddrss/32bit/lpddr4_address_slice_0_macros.h +2 -2
similarity index 99%
rename from drivers/ram/k3-ddrss/32bit/lpddr4_address_slice_0_macros.h
rename to drivers/ram/k3-ddrss/j721e/lpddr4_address_slice_0_macros.h
index 58ba340e7874b..7fd3f1a8ac691 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/j721e/lpddr4_ctl_regs.h renamed from drivers/ram/k3-ddrss/32bit/lpddr4_ctl_regs.h +2 -2
similarity index 99%
rename from drivers/ram/k3-ddrss/32bit/lpddr4_ctl_regs.h
rename to drivers/ram/k3-ddrss/j721e/lpddr4_ctl_regs.h
index 4113608434c3c..9363035d29bef 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/j721e/lpddr4_data_slice_0_macros.h renamed from drivers/ram/k3-ddrss/32bit/lpddr4_data_slice_0_macros.h +2 -2
similarity index 99%
rename from drivers/ram/k3-ddrss/32bit/lpddr4_data_slice_0_macros.h
rename to drivers/ram/k3-ddrss/j721e/lpddr4_data_slice_0_macros.h
index ad45dd98d7939..73c027b3382e6 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/j721e/lpddr4_data_slice_1_macros.h renamed from drivers/ram/k3-ddrss/32bit/lpddr4_data_slice_1_macros.h +2 -2
similarity index 99%
rename from drivers/ram/k3-ddrss/32bit/lpddr4_data_slice_1_macros.h
rename to drivers/ram/k3-ddrss/j721e/lpddr4_data_slice_1_macros.h
index 5385e1e87b1e2..c1999750a2d71 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/j721e/lpddr4_data_slice_2_macros.h renamed from drivers/ram/k3-ddrss/32bit/lpddr4_data_slice_2_macros.h +2 -2
similarity index 99%
rename from drivers/ram/k3-ddrss/32bit/lpddr4_data_slice_2_macros.h
rename to drivers/ram/k3-ddrss/j721e/lpddr4_data_slice_2_macros.h
index f6edad4eab9e4..ff534b007b660 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/j721e/lpddr4_data_slice_3_macros.h renamed from drivers/ram/k3-ddrss/32bit/lpddr4_data_slice_3_macros.h +2 -2
similarity index 99%
rename from drivers/ram/k3-ddrss/32bit/lpddr4_data_slice_3_macros.h
rename to drivers/ram/k3-ddrss/j721e/lpddr4_data_slice_3_macros.h
index 73e5f71df9729..800c2a8e40752 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/j721e/lpddr4_ddr_controller_macros.h renamed from drivers/ram/k3-ddrss/32bit/lpddr4_ddr_controller_macros.h +2 -2
similarity index 99%
rename from drivers/ram/k3-ddrss/32bit/lpddr4_ddr_controller_macros.h
rename to drivers/ram/k3-ddrss/j721e/lpddr4_ddr_controller_macros.h
index 4e33d04d1c289..f0a4fa00c7471 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/j721e/lpddr4_j721e_ctl_regs_rw_masks.h renamed from drivers/ram/k3-ddrss/32bit/lpddr4_ctl_regs_rw_masks.h +2 -2
similarity index 82%
rename from drivers/ram/k3-ddrss/32bit/lpddr4_ctl_regs_rw_masks.h
rename to drivers/ram/k3-ddrss/j721e/lpddr4_j721e_ctl_regs_rw_masks.h
index 71122946b447f..f760ed84200ce 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/j721e/lpddr4_j721e_if.h renamed from drivers/ram/k3-ddrss/32bit/lpddr4_32bit_if.h +5 -5
similarity index 93%
rename from drivers/ram/k3-ddrss/32bit/lpddr4_32bit_if.h
rename to drivers/ram/k3-ddrss/j721e/lpddr4_j721e_if.h
index f14ca245ee933..3d738c5763db5 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/j721e/lpddr4_j721e_obj_if.h new file +14 -0
new file mode 100644
index 0000000000000..8b38cebb0f6ed

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/j721e/lpddr4_j721e_structs_if.h new file +15 -0
new file mode 100644
index 0000000000000..c877195281747

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/j721e/lpddr4_phy_core_macros.h renamed from drivers/ram/k3-ddrss/32bit/lpddr4_phy_core_macros.h +2 -2
similarity index 99%
rename from drivers/ram/k3-ddrss/32bit/lpddr4_phy_core_macros.h
rename to drivers/ram/k3-ddrss/j721e/lpddr4_phy_core_macros.h
index d8c7a5222e568..d1a9e74a47a5c 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/j721e/lpddr4_pi_macros.h renamed from drivers/ram/k3-ddrss/32bit/lpddr4_pi_macros.h +2 -2
similarity index 99%
rename from drivers/ram/k3-ddrss/32bit/lpddr4_pi_macros.h
rename to drivers/ram/k3-ddrss/j721e/lpddr4_pi_macros.h
index 7f1754a499f3c..8e428cb8486ff 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/lpddr4.c +28 -39

67 lines not on this page · raw message

drivers/ram/k3-ddrss/lpddr4.h +16 -17
index 5b77ea9e6e940..0fcd6d78ef800 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/lpddr4_16bit.h deleted +0 -33
deleted file mode 100644
index d663389e6083a..0000000000000

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/lpddr4_am62a_ctl_regs_rw_masks.c new file +1726 -0

1,726 lines not on this page · raw message

drivers/ram/k3-ddrss/lpddr4_am64_ctl_regs_rw_masks.c renamed from drivers/ram/k3-ddrss/lpddr4_16bit_ctl_regs_rw_masks.c +3 -3
similarity index 99%
rename from drivers/ram/k3-ddrss/lpddr4_16bit_ctl_regs_rw_masks.c
rename to drivers/ram/k3-ddrss/lpddr4_am64_ctl_regs_rw_masks.c
index 09b0e3c5a00c7..249b56db65f10 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/lpddr4_am6x.c renamed from drivers/ram/k3-ddrss/lpddr4_16bit.c +9 -7
similarity index 97%
rename from drivers/ram/k3-ddrss/lpddr4_16bit.c
rename to drivers/ram/k3-ddrss/lpddr4_am6x.c
index b749b7489732f..8ccc1f1aff1a1 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/lpddr4_am6x.h new file +45 -0

45 lines not on this page · raw message

drivers/ram/k3-ddrss/lpddr4_am6x_sanity.h renamed from drivers/ram/k3-ddrss/lpddr4_16bit_sanity.h +8 -12
similarity index 97%
rename from drivers/ram/k3-ddrss/lpddr4_16bit_sanity.h
rename to drivers/ram/k3-ddrss/lpddr4_am6x_sanity.h
index fde05cea1f164..18762cbb28805 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/lpddr4_if.h +8 -4
index 7562989d99821..1d8bcf7d38b18 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/lpddr4_j721e.c renamed from drivers/ram/k3-ddrss/lpddr4_32bit.c +2 -5
similarity index 98%
rename from drivers/ram/k3-ddrss/lpddr4_32bit.c
rename to drivers/ram/k3-ddrss/lpddr4_j721e.c
index ab2e44891d9ed..5db7e5c2287f7 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/lpddr4_j721e.h renamed from drivers/ram/k3-ddrss/lpddr4_32bit.h +7 -13
similarity index 56%
rename from drivers/ram/k3-ddrss/lpddr4_32bit.h
rename to drivers/ram/k3-ddrss/lpddr4_j721e.h
index 1f7fe658af849..f115af778578b 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/lpddr4_j721e_ctl_regs_rw_masks.c renamed from drivers/ram/k3-ddrss/lpddr4_32bit_ctl_regs_rw_masks.c +3 -3
similarity index 99%
rename from drivers/ram/k3-ddrss/lpddr4_32bit_ctl_regs_rw_masks.c
rename to drivers/ram/k3-ddrss/lpddr4_j721e_ctl_regs_rw_masks.c
index 70f0ef5942a79..24394747da29a 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/lpddr4_j721e_sanity.h renamed from drivers/ram/k3-ddrss/lpddr4_32bit_sanity.h +5 -12
similarity index 96%
rename from drivers/ram/k3-ddrss/lpddr4_32bit_sanity.h
rename to drivers/ram/k3-ddrss/lpddr4_j721e_sanity.h
index 334eecc8aaa73..174002f12010c 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/lpddr4_obj_if.c +3 -2
index 370242f5bd23e..63b259c33d4c9 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/lpddr4_obj_if.h +4 -2
index d538e61b7478a..b1bbb5cc1a7d3 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/lpddr4_private.h deleted +0 -60

60 lines not on this page · raw message

drivers/ram/k3-ddrss/lpddr4_sanity.h +7 -13
index 750e00d3f5ced..d5e61ff5ea84c 100644

Lines of this file are not shown. View the raw message.

drivers/ram/k3-ddrss/lpddr4_structs_if.h +2 -2
index f2f1210c3c4e2..b09e708de426c 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.38.1

Part of the diff is not shown here. View the raw message.

#1 lore raw
Quoted 11 lines · Bryan Brattlof

The new 32bit DDR controller for TI's am62a family of SoCs shares much of the same functionality with the existing 16bit (am64) and 32bit (j721e) controllers, so this patch reorganizes the existing auto-generated macros for the 16bit and 32bit controllers to make room for the macros for the am62a's controller

This patch consists mostly of header/macro renames and additions with a new Kconfig option (K3_AM62A_DDRSS) allowing us to select these new macros during compilation.

Applied to u-boot/next, thanks!

Signature · 1 line
Tom