From: "J. Neuschäfer" <j.ne@xxxxxxxxxx>
The Reference Design Boards (RDB) don't have the same relevance they had
then the MPC831x platform was new; if any work is done today, then
likely based on used production boards, which are more readily available
than NXP's discontinued devboards.
To further reduce the focus on RDBs, add DT compatible strings for all
four MPC8314/5 variants.
Signed-off-by: J. Neuschäfer <j.ne@xxxxxxxxxx>
---
arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 2 +-
arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 2 +-
arch/powerpc/configs/mpc83xx_defconfig | 2 +-
arch/powerpc/configs/ppc6xx_defconfig | 2 +-
arch/powerpc/platforms/83xx/Kconfig | 6 +++---
arch/powerpc/platforms/83xx/Makefile | 2 +-
.../platforms/83xx/{mpc831x_rdb.c => mpc831x.c} | 21 ++++++++++++++-------
7 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
index 16a42e2267fbe092ea2344f50548101bc1e344ce..38a4d1ceff6a9ea75d9d8a313adbd2e5e5c9ac67 100644
--- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
@@ -12,7 +12,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
CONFIG_PPC_83xx=y
-CONFIG_MPC831x_RDB=y
+CONFIG_MPC831x=y
CONFIG_PCI=y
CONFIG_NET=y
CONFIG_PACKET=y
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
index 80d40ae668eb6f1ae10bc0c1100d904946496112..788189a182458c92a62235c10fb3d21a87f4296b 100644
--- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
@@ -12,7 +12,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
CONFIG_PPC_83xx=y
-CONFIG_MPC831x_RDB=y
+CONFIG_MPC831x=y
CONFIG_PCI=y
CONFIG_NET=y
CONFIG_PACKET=y
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig
index 83c4710017e949c358f3ba8b73f5c1873cfd10f8..4af5e3e8c5a7f44f5e97b8fb4cdf691686f8967b 100644
--- a/arch/powerpc/configs/mpc83xx_defconfig
+++ b/arch/powerpc/configs/mpc83xx_defconfig
@@ -9,7 +9,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
CONFIG_PPC_83xx=y
-CONFIG_MPC831x_RDB=y
+CONFIG_MPC831x=y
CONFIG_MPC832x_RDB=y
CONFIG_MPC834x_ITX=y
CONFIG_MPC836x_RDK=y
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index ca0c90e9583790cbca15ba956b371b8b0cb63c47..7e56dc497a48289614c8d01cc51be6d1edad7846 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -40,7 +40,7 @@ CONFIG_PPC_82xx=y
CONFIG_EP8248E=y
CONFIG_MGCOGE=y
CONFIG_PPC_83xx=y
-CONFIG_MPC831x_RDB=y
+CONFIG_MPC831x=y
CONFIG_MPC832x_RDB=y
CONFIG_MPC834x_ITX=y
CONFIG_MPC836x_RDK=y
diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index d355ad40995fdc0fc3b4355126c65c761c21c296..944ec44a1fa6044b03ac71c295e891cd411ce444 100644
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -18,12 +18,12 @@ config MPC830x_RDB
help
This option enables support for the MPC8308 RDB and MPC8308 P1M boards.
-config MPC831x_RDB
- bool "Freescale MPC831x RDB"
+config MPC831x
+ bool "Freescale MPC831x boards"
select DEFAULT_UIMAGE
select PPC_MPC831x
help
- This option enables support for the MPC8313 RDB and MPC8315 RDB boards.
+ This option enables support for all MPC831x-based boards.
config MPC832x_RDB
bool "Freescale MPC832x RDB"
diff --git a/arch/powerpc/platforms/83xx/Makefile b/arch/powerpc/platforms/83xx/Makefile
index 6fc3dba943dade4f63da090b520b0c35bb46a091..92fb0b34913e1113d3e6eac49acbb1c32fb06ab7 100644
--- a/arch/powerpc/platforms/83xx/Makefile
+++ b/arch/powerpc/platforms/83xx/Makefile
@@ -6,7 +6,7 @@ obj-y := misc.o
obj-$(CONFIG_SUSPEND) += suspend.o suspend-asm.o
obj-$(CONFIG_MCU_MPC8349EMITX) += mcu_mpc8349emitx.o
obj-$(CONFIG_MPC830x_RDB) += mpc830x_rdb.o
-obj-$(CONFIG_MPC831x_RDB) += mpc831x_rdb.o
+obj-$(CONFIG_MPC831x) += mpc831x.o
obj-$(CONFIG_MPC832x_RDB) += mpc832x_rdb.o
obj-$(CONFIG_MPC834x_ITX) += mpc834x_itx.o
obj-$(CONFIG_MPC836x_RDK) += mpc836x_rdk.o
diff --git a/arch/powerpc/platforms/83xx/mpc831x_rdb.c b/arch/powerpc/platforms/83xx/mpc831x.c
similarity index 65%
rename from arch/powerpc/platforms/83xx/mpc831x_rdb.c
rename to arch/powerpc/platforms/83xx/mpc831x.c
index 5c39966762e4264d2ef91b2c4ef75fdf2c2c5d65..7250fc11c7ee80b266f39d0b3aebb0deb777c129 100644
--- a/arch/powerpc/platforms/83xx/mpc831x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc831x.c
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * arch/powerpc/platforms/83xx/mpc831x_rdb.c
+ * arch/powerpc/platforms/83xx/mpc831x.c
*
- * Description: MPC831x RDB board specific routines.
+ * Description: MPC831x board specific routines.
* This file is based on mpc834x_sys.c
* Author: Lo Wlison <r43300@xxxxxxxxxxxxx>
*
@@ -22,24 +22,31 @@
/*
* Setup the architecture
*/
-static void __init mpc831x_rdb_setup_arch(void)
+static void __init mpc831x_setup_arch(void)
{
mpc83xx_setup_arch();
mpc831x_usb_cfg();
}
static const char *board[] __initdata = {
+ /* Reference design boards */
"MPC8313ERDB",
"fsl,mpc8315erdb",
+
+ /* Generic chip compatibles */
+ "fsl,mpc8315e",
+ "fsl,mpc8315",
+ "fsl,mpc8314e",
+ "fsl,mpc8314",
NULL
};
-machine_device_initcall(mpc831x_rdb, mpc83xx_declare_of_platform_devices);
+machine_device_initcall(mpc831x, mpc83xx_declare_of_platform_devices);
-define_machine(mpc831x_rdb) {
- .name = "MPC831x RDB",
+define_machine(mpc831x) {
+ .name = "MPC831x",
.compatibles = board,
- .setup_arch = mpc831x_rdb_setup_arch,
+ .setup_arch = mpc831x_setup_arch,
.discover_phbs = mpc83xx_setup_pci,
.init_IRQ = mpc83xx_ipic_init_IRQ,
.get_irq = ipic_get_irq,
--
2.45.2
