From 584a849bc7e2f9622f43d767792979626953bcac Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 15 Aug 2023 14:08:03 -0500
Subject: [PATCH] mainline: linux: spi up: microchip-corespi 20108000.spi:
 Registered SPI controller 0

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 04_build_linux.sh                | 11 ++++++++++-
 build_linux_menuconfig.sh        | 19 +++++++++++++++++++
 patches/linux/mainline/defconfig |  8 ++++----
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/04_build_linux.sh b/04_build_linux.sh
index bb31501..92a491d 100755
--- a/04_build_linux.sh
+++ b/04_build_linux.sh
@@ -32,6 +32,7 @@ fi
 make ARCH=riscv CROSS_COMPILE=${CC} clean
 
 if [ -f arch/riscv/configs/mpfs_defconfig ] ; then
+	echo "make ARCH=riscv CROSS_COMPILE=${CC} mpfs_defconfig"
 	make ARCH=riscv CROSS_COMPILE=${CC} mpfs_defconfig
 
 	#
@@ -121,16 +122,24 @@ if [ -f arch/riscv/configs/mpfs_defconfig ] ; then
 
 	#./scripts/config --disable CONFIG_VMAP_STACK
 	#./scripts/config --disable CONFIG_SMP
+	echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig"
+	make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig
 else
+	echo "make ARCH=riscv CROSS_COMPILE=${CC} defconfig"
 	make ARCH=riscv CROSS_COMPILE=${CC} defconfig
 
-	#./scripts/config --enable 
 	./scripts/config --enable CONFIG_PCIE_MICROCHIP_HOST
 	./scripts/config --enable CONFIG_OF_OVERLAY
 	./scripts/config --enable CONFIG_I2C
 	./scripts/config --enable CONFIG_EEPROM_AT24
 	./scripts/config --enable CONFIG_I2C_MICROCHIP_CORE
 
+	./scripts/config --enable CONFIG_SPI_MICROCHIP_CORE
+	./scripts/config --enable CONFIG_SPI_MICROCHIP_CORE_QSPI
+	./scripts/config --module CONFIG_SPI_SPIDEV
+	./scripts/config --enable CONFIG_GPIO_SYSFS
+
+	echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig"
 	make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig
 fi
 
diff --git a/build_linux_menuconfig.sh b/build_linux_menuconfig.sh
index 008feb9..e88c0e3 100755
--- a/build_linux_menuconfig.sh
+++ b/build_linux_menuconfig.sh
@@ -32,6 +32,7 @@ fi
 make ARCH=riscv CROSS_COMPILE=${CC} clean
 
 if [ -f arch/riscv/configs/mpfs_defconfig ] ; then
+	echo "make ARCH=riscv CROSS_COMPILE=${CC} mpfs_defconfig"
 	make ARCH=riscv CROSS_COMPILE=${CC} mpfs_defconfig
 
 	#
@@ -121,10 +122,28 @@ if [ -f arch/riscv/configs/mpfs_defconfig ] ; then
 
 	#./scripts/config --disable CONFIG_VMAP_STACK
 	#./scripts/config --disable CONFIG_SMP
+	echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig"
+	make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig
 else
+	echo "make ARCH=riscv CROSS_COMPILE=${CC} defconfig"
 	make ARCH=riscv CROSS_COMPILE=${CC} defconfig
+
+	./scripts/config --enable CONFIG_PCIE_MICROCHIP_HOST
+	./scripts/config --enable CONFIG_OF_OVERLAY
+	./scripts/config --enable CONFIG_I2C
+	./scripts/config --enable CONFIG_EEPROM_AT24
+	./scripts/config --enable CONFIG_I2C_MICROCHIP_CORE
+
+	./scripts/config --enable CONFIG_SPI_MICROCHIP_CORE
+	./scripts/config --enable CONFIG_SPI_MICROCHIP_CORE_QSPI
+	./scripts/config --module CONFIG_SPI_SPIDEV
+	./scripts/config --enable CONFIG_GPIO_SYSFS
+
+	echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig"
+	make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig
 fi
 
+echo "make ARCH=riscv CROSS_COMPILE=${CC} menuconfig"
 make ARCH=riscv CROSS_COMPILE=${CC} menuconfig
 
 echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} Image modules dtbs"
diff --git a/patches/linux/mainline/defconfig b/patches/linux/mainline/defconfig
index ce43f44..f15ae11 100644
--- a/patches/linux/mainline/defconfig
+++ b/patches/linux/mainline/defconfig
@@ -2360,8 +2360,8 @@ CONFIG_SPI_MASTER=y
 # CONFIG_SPI_DESIGNWARE is not set
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_FSL_SPI is not set
-# CONFIG_SPI_MICROCHIP_CORE is not set
-# CONFIG_SPI_MICROCHIP_CORE_QSPI is not set
+CONFIG_SPI_MICROCHIP_CORE=y
+CONFIG_SPI_MICROCHIP_CORE_QSPI=y
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PCI1XXXX is not set
 # CONFIG_SPI_PXA2XX is not set
@@ -2387,7 +2387,7 @@ CONFIG_SPI_SUN6I=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_SPIDEV is not set
+CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_LOOPBACK_TEST is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_SLAVE is not set
@@ -2465,7 +2465,7 @@ CONFIG_OF_GPIO=y
 CONFIG_GPIO_ACPI=y
 CONFIG_GPIOLIB_IRQCHIP=y
 # CONFIG_DEBUG_GPIO is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_GENERIC=y