kernel: align mpfs_defconfig

- Remove redundant switches
- Stop overwriting device-tree
- Regenerate gpio patch
- Remove QSPI specific DT information

Signed-off-by: Lars Randers <lranders@mail.dk>
main
Lars Randers 4 days ago
parent dc24ad0b35
commit 8e1194cec1

@ -11,26 +11,11 @@ if [ ! -f ./.patched ] ; then
git am ../patches/linux/0008-Add-wireless-regdb-regulatory-database-file.patch
git am ../patches/linux/0011-can-mpfs_can-add-registration-string.patch
git am ../patches/linux/0012-gpio-gpio-mpfs-add-registration-string.patch
git am ../patches/linux/0013-riscv-dts-microchip-remove-qspi-node-specifics.patch
fi
touch .patched
fi
if [ -f arch/riscv/configs/mpfs_defconfig ] ; then
# cp -v ../patches/linux/Makefile arch/riscv/boot/dts/microchip/Makefile
cp -v ../device-tree/src/riscv/microchip/mpfs-beaglev-fire.dts arch/riscv/boot/dts/microchip/
cp -v ../device-tree/src/riscv/microchip/mpfs-beaglev-fire-fabric.dtsi arch/riscv/boot/dts/microchip/
cp -v ../device-tree/src/riscv/microchip/mpfs-beaglev-fire-pinmux.dtsi arch/riscv/boot/dts/microchip/
#echo "************************************"
#git diff arch/riscv/boot/dts/microchip/ > log.txt ; cat log.txt ; rm log.txt
#echo "************************************"
#echo "Current Device Tree Changes (5 second wait)"
#sleep 5
#else
# cp -v ../patches/linux/mainline/Makefile arch/riscv/boot/dts/microchip/Makefile
# cp -v ../patches/linux/mainline/dts/mpfs-beaglev-fire.dts arch/riscv/boot/dts/microchip/
# cp -v ../patches/linux/mainline/dts/mpfs-beaglev-fire-fabric.dtsi arch/riscv/boot/dts/microchip/
fi
echo "make ARCH=riscv CROSS_COMPILE=${CC} clean"
make ARCH=riscv CROSS_COMPILE=${CC} clean
@ -43,20 +28,6 @@ if [ -f arch/riscv/configs/mpfs_defconfig ] ; then
./scripts/config --set-str CONFIG_LOCALVERSION "-$(date +%Y%m%d)"
./scripts/config --module CONFIG_IKHEADERS
#6.1 to 6.6 switches
./scripts/config --disable CONFIG_FW_LOADER_DEBUG
./scripts/config --disable CONFIG_FW_CACHE
./scripts/config --enable CONFIG_MFD_SYSCON
./scripts/config --enable CONFIG_POLARFIRE_SOC_SYS_CTRL
./scripts/config --enable CONFIG_POLARFIRE_SOC_GENERIC_SERVICE
./scripts/config --enable CONFIG_POLARFIRE_SOC_MAILBOX
./scripts/config --enable CONFIG_POLARFIRE_SOC_AUTO_UPDATE
./scripts/config --enable CONFIG_HW_RANDOM_POLARFIRE_SOC
./scripts/config --enable CONFIG_OF_OVERLAY
./scripts/config --disable CONFIG_MODULE_DECOMPRESS
#enable CONFIG_DYNAMIC_FTRACE
./scripts/config --enable CONFIG_FUNCTION_TRACER
./scripts/config --enable CONFIG_DYNAMIC_FTRACE
@ -80,10 +51,6 @@ if [ -f arch/riscv/configs/mpfs_defconfig ] ; then
./scripts/config --enable CONFIG_CRYPTO_SHA512
./scripts/config --enable CONFIG_CRYPTO_SHA1
./scripts/config --enable CONFIG_SENSORS_POLARFIRE_SOC_TVS
./scripts/config --module CONFIG_CAN
./scripts/config --module CONFIG_CAN_POLARFIRE_SOC
#non-workable on RevA
./scripts/config --disable CONFIG_VIDEO_IMX219
@ -211,15 +178,6 @@ tar --create --gzip --file "../${KERNEL_UTS}-modules.tar.gz" ./*
cd "${wdir}/linux/" || exit
rm -rf "${wdir}/deploy/tmp" || true
if [ -f arch/riscv/configs/mpfs_defconfig ] ; then
cp -v ./.config ../patches/linux/mpfs_defconfig
cp -v ./arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts ../patches/linux/dts/mpfs-beaglev-fire.dts
cp -v ./arch/riscv/boot/dts/microchip/mpfs-beaglev-fire-fabric.dtsi ../patches/linux/dts/mpfs-beaglev-fire-fabric.dtsi
else
cp -v ./.config ../patches/linux/mainline/defconfig
cp -v ./arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts ../patches/linux/mainline/dts/mpfs-beaglev-fire.dts
cp -v ./arch/riscv/boot/dts/microchip/mpfs-beaglev-fire-fabric.dtsi ../patches/linux/mainline/dts/mpfs-beaglev-fire-fabric.dtsi
fi
if [ ! -d ../deploy/input/ ] ; then
mkdir -p ../deploy/input/ || true
fi

@ -1,25 +1,26 @@
From 6759b8dc43985a2d6083835931257f3229b240f4 Mon Sep 17 00:00:00 2001
From 70de29171b31c1fa3c2ee0e8f21940f2dc3e8a9e Mon Sep 17 00:00:00 2001
From: Lars Randers <lranders@mail.dk>
Date: Mon, 28 Oct 2024 11:55:28 +0000
Date: Wed, 16 Jul 2025 20:11:52 +0000
Subject: [PATCH] gpio: gpio-mpfs: add registration string
Signed-off-by: Lars Randers <lranders@mail.dk>
---
drivers/gpio/gpio-mpfs.c | 1 +
1 file changed, 1 insertion(+)
drivers/gpio/gpio-mpfs.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpio/gpio-mpfs.c b/drivers/gpio/gpio-mpfs.c
index d7168aa04..abf3e4151 100644
index 8b5a6d76c..98d520144 100644
--- a/drivers/gpio/gpio-mpfs.c
+++ b/drivers/gpio/gpio-mpfs.c
@@ -332,6 +332,7 @@ static int mpfs_gpio_probe(struct platform_device *pdev)
@@ -278,6 +278,8 @@ static int mpfs_gpio_probe(struct platform_device *pdev)
girq->default_type = IRQ_TYPE_NONE;
}
platform_set_drvdata(pdev, mpfs_gpio);
+ dev_info(dev, "Registered MPFS GPIO controller\n");
+
return devm_gpiochip_add_data(dev, &mpfs_gpio->gc, mpfs_gpio);
}
+ dev_info(&pdev->dev, "Registered MPFS GPIO controller\n");
return 0;
cleanup_clock:
--
2.39.2

@ -0,0 +1,109 @@
From 8f80b9238215d56fa031d559ca70b68df1f09b3b Mon Sep 17 00:00:00 2001
From: Lars Randers <lranders@mail.dk>
Date: Wed, 23 Jul 2025 10:52:55 +0000
Subject: [PATCH] riscv: dts: microchip: remove qspi node specifics
- Will be brought in via overlay
Signed-off-by: Lars Randers <lranders@mail.dk>
---
.../boot/dts/microchip/mpfs-beaglev-fire.dts | 76 -------------------
1 file changed, 76 deletions(-)
diff --git a/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts b/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts
index e80c6d8c7..99a8d353f 100644
--- a/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts
+++ b/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts
@@ -31,7 +31,6 @@ aliases {
serial3 = &mmuart3;
serial4 = &mmuart4;
mmc0 = &mmc;
- mmc1 = &sdmmc;
};
chosen {
@@ -272,81 +271,6 @@ &gpio1 {
status = "okay";
};
-&qspi {
- status = "okay";
- cs-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>, <&gpio0 12 GPIO_ACTIVE_LOW>;
- num-cs = <2>;
-
- adc@0 {
- compatible = "microchip,mcp3464r";
- reg = <0>; /* CE0 */
- spi-cpol;
- spi-cpha;
- spi-max-frequency = <5000000>;
- microchip,hw-device-address = <1>;
- #address-cells = <1>;
- #size-cells = <0>;
- status = "okay";
-
- channel@0 {
- /* CH0 to AGND */
- reg = <0>;
- label = "CH0";
- };
-
- channel@1 {
- /* CH1 to AGND */
- reg = <1>;
- label = "CH1";
- };
-
- channel@2 {
- /* CH2 to AGND */
- reg = <2>;
- label = "CH2";
- };
-
- channel@3 {
- /* CH3 to AGND */
- reg = <3>;
- label = "CH3";
- };
-
- channel@4 {
- /* CH4 to AGND */
- reg = <4>;
- label = "CH4";
- };
-
- channel@5 {
- /* CH5 to AGND */
- reg = <5>;
- label = "CH5";
- };
-
- channel@6 {
- /* CH6 to AGND */
- reg = <6>;
- label = "CH6";
- };
-
- channel@7 {
- /* CH7 is connected to AGND */
- reg = <7>;
- label = "CH7";
- };
- };
-
- sdmmc: mmc@1 {
- compatible = "mmc-spi-slot";
- reg = <1>;
- gpios = <&gpio2 31 1>;
- voltage-ranges = <3300 3300>;
- spi-max-frequency = <5000000>;
- disable-wp;
- };
-};
-
&syscontroller {
microchip,bitstream-flash = <&sys_ctrl_flash>;
--
2.39.2

@ -232,7 +232,7 @@ CONFIG_ADVISE_SYSCALLS=y
CONFIG_MEMBARRIER=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_SELFTEST is not set
# CONFIG_KALLSYMS_ALL is not set
CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_BASE_RELATIVE=y
CONFIG_ARCH_HAS_MEMBARRIER_CALLBACKS=y
CONFIG_KCMP=y
@ -296,8 +296,7 @@ CONFIG_AS_HAS_OPTION_ARCH=y
#
# SoC selection
#
CONFIG_ARCH_MICROCHIP_POLARFIRE=y
CONFIG_SOC_MICROCHIP_POLARFIRE=y
CONFIG_ARCH_MICROCHIP=y
# CONFIG_ARCH_RENESAS is not set
# CONFIG_SOC_SIFIVE is not set
# CONFIG_SOC_STARFIVE is not set
@ -317,7 +316,7 @@ CONFIG_SOC_MICROCHIP_POLARFIRE=y
#
# Platform type
#
# CONFIG_NONPORTABLE is not set
CONFIG_NONPORTABLE=y
CONFIG_ARCH_RV64I=y
# CONFIG_CMODEL_MEDLOW is not set
CONFIG_CMODEL_MEDANY=y
@ -337,13 +336,14 @@ CONFIG_RISCV_ISA_V=y
CONFIG_RISCV_ISA_V_DEFAULT_ENABLE=y
CONFIG_TOOLCHAIN_HAS_ZBB=y
CONFIG_RISCV_ISA_ZBB=y
CONFIG_RISCV_ISA_ZICBOM=y
# CONFIG_RISCV_ISA_ZICBOM is not set
CONFIG_RISCV_ISA_ZICBOZ=y
CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE=y
CONFIG_TOOLCHAIN_NEEDS_EXPLICIT_ZICSR_ZIFENCEI=y
CONFIG_FPU=y
CONFIG_IRQ_STACKS=y
CONFIG_THREAD_SIZE_ORDER=2
CONFIG_RISCV_SLOW_UNALIGNED_ACCESS=y
# end of Platform type
#
@ -374,15 +374,12 @@ CONFIG_CMDLINE="root=/dev/mmcblk0p3 ro rootfstype=ext4 rootwait console=ttyS0,11
# CONFIG_CMDLINE_FALLBACK is not set
# CONFIG_CMDLINE_EXTEND is not set
CONFIG_CMDLINE_FORCE=y
CONFIG_EFI_STUB=y
CONFIG_EFI=y
CONFIG_EFI=n
CONFIG_CC_HAVE_STACKPROTECTOR_TLS=y
CONFIG_STACKPROTECTOR_PER_TASK=y
CONFIG_RISCV_ISA_FALLBACK=y
# end of Boot options
CONFIG_PORTABLE=y
#
# Power management options
#
@ -525,7 +522,7 @@ CONFIG_FUNCTION_ALIGNMENT=0
# end of General architecture-dependent options
CONFIG_RT_MUTEXES=y
CONFIG_BASE_SMALL=0
# CONFIG_BASE_SMALL is not set
CONFIG_MODULES=y
# CONFIG_MODULE_DEBUG is not set
CONFIG_MODULE_FORCE_LOAD=y
@ -1692,17 +1689,17 @@ CONFIG_SIFIVE_CCACHE=y
#
# EFI (Extensible Firmware Interface) Support
#
CONFIG_EFI_ESRT=y
CONFIG_EFI_PARAMS_FROM_FDT=y
CONFIG_EFI_RUNTIME_WRAPPERS=y
CONFIG_EFI_GENERIC_STUB=y
# CONFIG_EFI_ESRT is not set
# CONFIG_EFI_PARAMS_FROM_FDT is not set
# CONFIG_EFI_RUNTIME_WRAPPERS is not set
# CONFIG_EFI_GENERIC_STUB is not set
# CONFIG_EFI_ZBOOT is not set
CONFIG_EFI_BOOTLOADER_CONTROL=m
CONFIG_EFI_CAPSULE_LOADER=m
# CONFIG_EFI_BOOTLOADER_CONTROL is not set
# CONFIG_EFI_CAPSULE_LOADER is not set
# CONFIG_EFI_TEST is not set
CONFIG_RESET_ATTACK_MITIGATION=y
# CONFIG_RESET_ATTACK_MITIGATION is not set
# CONFIG_EFI_DISABLE_PCI_DMA is not set
CONFIG_EFI_EARLYCON=y
# CONFIG_EFI_EARLYCON is not set
# CONFIG_EFI_DISABLE_RUNTIME is not set
# CONFIG_EFI_COCO_SECRET is not set
# end of EFI (Extensible Firmware Interface) Support
@ -2978,6 +2975,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_FSL_LINFLEXUART is not set
# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
# CONFIG_SERIAL_SPRD is not set
CONFIG_SERIAL_MICROCHIP_COREUART=y
# end of Serial drivers
CONFIG_SERIAL_MCTRL_GPIO=y
@ -3508,7 +3506,8 @@ CONFIG_SENSORS_POLARFIRE_SOC_TVS=y
# CONFIG_SENSORS_W83627HF is not set
# CONFIG_SENSORS_W83627EHF is not set
# CONFIG_THERMAL is not set
# CONFIG_WATCHDOG is not set
CONFIG_WATCHDOG=y
CONFIG_MPFS_WATCHDOG=y
CONFIG_SSB_POSSIBLE=y
# CONFIG_SSB is not set
CONFIG_BCMA_POSSIBLE=y
@ -4233,7 +4232,8 @@ CONFIG_USB_MUSB_POLARFIRE_SOC=y
#
# MUSB DMA mode
#
CONFIG_MUSB_PIO_ONLY=y
# CONFIG_MUSB_PIO_ONLY is not set
CONFIG_USB_INVENTRA_DMA=y
# CONFIG_USB_DWC3 is not set
# CONFIG_USB_DWC2 is not set
# CONFIG_USB_CHIPIDEA is not set
@ -4796,7 +4796,7 @@ CONFIG_MAILBOX=y
# CONFIG_MAILBOX_TEST is not set
CONFIG_POLARFIRE_SOC_MAILBOX=y
CONFIG_MIV_IHC=y
# CONFIG_MCHP_SBI_IPC_MBOX is not set
CONFIG_MCHP_SBI_IPC_MBOX=y
CONFIG_IOMMU_SUPPORT=y
#
@ -4813,6 +4813,7 @@ CONFIG_IOMMU_SUPPORT=y
CONFIG_REMOTEPROC=y
CONFIG_REMOTEPROC_CDEV=y
CONFIG_MIV_REMOTEPROC=y
CONFIG_MCHP_IPC_SBI_REMOTEPROC=y
# end of Remoteproc drivers
#
@ -4864,7 +4865,7 @@ CONFIG_RPMSG_VIRTIO=y
# end of Enable LiteX SoC Builder specific drivers
CONFIG_POLARFIRE_SOC_SYS_CTRL=y
CONFIG_POLARFIRE_SOC_GENERIC_SERVICE=y
CONFIG_POLARFIRE_SOC_GENERIC_SERVICE=m
CONFIG_POLARFIRE_SOC_SYSCONS=y
# CONFIG_WPCM450_SOC is not set
@ -5729,7 +5730,7 @@ CONFIG_HUGETLB_PAGE=y
CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y
CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
CONFIG_CONFIGFS_FS=y
CONFIG_EFIVAR_FS=m
# CONFIG_EFIVAR_FS is not set
# end of Pseudo filesystems
CONFIG_MISC_FILESYSTEMS=y
@ -6310,7 +6311,7 @@ CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y
CONFIG_DMA_NONCOHERENT_MMAP=y
CONFIG_DMA_COHERENT_POOL=y
CONFIG_DMA_GLOBAL_POOL=y
CONFIG_DMA_DIRECT_REMAP=y
# CONFIG_DMA_DIRECT_REMAP is not set
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
CONFIG_SGL_ALLOC=y
@ -6595,7 +6596,7 @@ CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT=y
# CONFIG_RV is not set
# CONFIG_SAMPLES is not set
CONFIG_STRICT_DEVMEM=y
# CONFIG_IO_STRICT_DEVMEM is not set
CONFIG_IO_STRICT_DEVMEM=y
#
# riscv Debugging

Loading…
Cancel
Save