airoha: move en7523 in dedicated subtarget
authorChristian Marangi <ansuelsmth@gmail.com>
Thu, 17 Oct 2024 13:42:51 +0000 (15:42 +0200)
committerChristian Marangi <ansuelsmth@gmail.com>
Sun, 20 Oct 2024 21:24:07 +0000 (23:24 +0200)
In preparation for EN7581 SoC support, move en7523 in dedicated
subtarget.

This is needed as EN7581 is now 64bit but en7523 is 32bit hence have
very different kernel config.

Also rename patch to a more friendly number sequence.

Link: https://github.com/openwrt/openwrt/pull/16730
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
target/linux/airoha/Makefile
target/linux/airoha/config-6.6 [deleted file]
target/linux/airoha/en7523/config-6.6 [new file with mode: 0644]
target/linux/airoha/en7523/target.mk [new file with mode: 0644]
target/linux/airoha/generic/target.mk [deleted file]
target/linux/airoha/image/Makefile
target/linux/airoha/image/en7523.mk
target/linux/airoha/patches-6.6/0005-spi-Add-support-for-the-Airoha-EN7523-SoC-SPI-contro.patch [deleted file]
target/linux/airoha/patches-6.6/300-spi-Add-support-for-the-Airoha-EN7523-SoC-SPI-contro.patch [new file with mode: 0644]

index 99ce7443ece6cda2a97d26d7b7516f69141a0716..f9ced4d45da45e211636f2742a1df985e9a803f9 100644 (file)
@@ -3,13 +3,11 @@ include $(TOPDIR)/rules.mk
 ARCH:=arm
 BOARD:=airoha
 BOARDNAME:=Airoha ARM
-CPU_TYPE:=cortex-a7
+SUBTARGETS:=en7523
 FEATURES:=dt squashfs nand ramdisk gpio source-only
 
 KERNEL_PATCHVER:=6.6
 
 include $(INCLUDE_DIR)/target.mk
 
-KERNELNAME:=Image dtbs
-
 $(eval $(call BuildTarget))
diff --git a/target/linux/airoha/config-6.6 b/target/linux/airoha/config-6.6
deleted file mode 100644 (file)
index ce93f7d..0000000
+++ /dev/null
@@ -1,303 +0,0 @@
-CONFIG_ALIGNMENT_TRAP=y
-CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_ARCH_AIROHA=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_KEEP_MEMBLOCK=y
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-CONFIG_ARCH_MULTIPLATFORM=y
-CONFIG_ARCH_MULTI_V6_V7=y
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
-CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_STACKWALK=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM=y
-CONFIG_ARM_AMBA=y
-CONFIG_ARM_ARCH_TIMER=y
-CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
-CONFIG_ARM_CPU_SUSPEND=y
-CONFIG_ARM_GIC=y
-CONFIG_ARM_GIC_V3=y
-CONFIG_ARM_GIC_V3_ITS=y
-CONFIG_ARM_GIC_V3_ITS_PCI=y
-CONFIG_ARM_HAS_GROUP_RELOCS=y
-CONFIG_ARM_HEAVY_MB=y
-# CONFIG_ARM_HIGHBANK_CPUIDLE is not set
-CONFIG_ARM_L1_CACHE_SHIFT=6
-CONFIG_ARM_L1_CACHE_SHIFT_6=y
-CONFIG_ARM_PATCH_IDIV=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_ARM_PSCI=y
-CONFIG_ARM_PSCI_FW=y
-# CONFIG_ARM_SMMU is not set
-CONFIG_ARM_THUMB=y
-CONFIG_ARM_UNWIND=y
-CONFIG_ARM_VIRT_EXT=y
-CONFIG_ATAGS=y
-CONFIG_AUTO_ZRELADDR=y
-CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_PM=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_CACHE_L2X0=y
-CONFIG_CC_HAVE_STACKPROTECTOR_TLS=y
-CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
-CONFIG_CC_NO_ARRAY_BOUNDS=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_CMDLINE="rootfstype=squashfs,jffs2"
-CONFIG_CMDLINE_FROM_BOOTLOADER=y
-CONFIG_COMMON_CLK=y
-CONFIG_COMMON_CLK_EN7523=y
-CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_CONTEXT_TRACKING=y
-CONFIG_CONTEXT_TRACKING_IDLE=y
-CONFIG_CPU_32v6K=y
-CONFIG_CPU_32v7=y
-CONFIG_CPU_ABRT_EV7=y
-CONFIG_CPU_CACHE_V7=y
-CONFIG_CPU_CACHE_VIPT=y
-CONFIG_CPU_COPY_V6=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-CONFIG_CPU_HAS_ASID=y
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_CPU_MITIGATIONS=y
-CONFIG_CPU_PABRT_V7=y
-CONFIG_CPU_PM=y
-CONFIG_CPU_RMAP=y
-CONFIG_CPU_SPECTRE=y
-CONFIG_CPU_THUMB_CAPABLE=y
-CONFIG_CPU_TLB_V7=y
-CONFIG_CPU_V7=y
-CONFIG_CRC16=y
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_HASH_INFO=y
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
-CONFIG_CRYPTO_LIB_GF128MUL=y
-CONFIG_CRYPTO_LIB_SHA1=y
-CONFIG_CRYPTO_LIB_UTILS=y
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_ZSTD=y
-CONFIG_CURRENT_POINTER_IN_TPIDRURO=y
-CONFIG_DCACHE_WORD_ACCESS=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
-CONFIG_DEBUG_MISC=y
-CONFIG_DMA_OPS=y
-CONFIG_DTC=y
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-CONFIG_EXCLUSIVE_SYSTEM_RAM=y
-CONFIG_FIXED_PHY=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_FS_IOMAP=y
-CONFIG_FUNCTION_ALIGNMENT=0
-CONFIG_FWNODE_MDIO=y
-CONFIG_FW_LOADER_PAGED_BUF=y
-CONFIG_FW_LOADER_SYSFS=y
-CONFIG_GCC10_NO_ARRAY_BOUNDS=y
-CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_GENERIC_ARCH_TOPOLOGY=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_GENERIC_EARLY_IOREMAP=y
-CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_GENERIC_IDLE_POLL_SETUP=y
-CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
-CONFIG_GENERIC_IRQ_MIGRATION=y
-CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
-CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_PHY=y
-CONFIG_GENERIC_PINCONF=y
-CONFIG_GENERIC_PINCTRL_GROUPS=y
-CONFIG_GENERIC_PINMUX_FUNCTIONS=y
-CONFIG_GENERIC_SCHED_CLOCK=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_VDSO_32=y
-CONFIG_GPIOLIB_IRQCHIP=y
-CONFIG_GPIO_CDEV=y
-CONFIG_GPIO_EN7523=y
-CONFIG_GPIO_GENERIC=y
-# CONFIG_HARDEN_BRANCH_HISTORY is not set
-# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAVE_SMP=y
-CONFIG_HOTPLUG_CORE_SYNC=y
-CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
-CONFIG_HOTPLUG_CPU=y
-CONFIG_HW_RANDOM=y
-CONFIG_HZ_FIXED=0
-CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_IOMMUFD is not set
-# CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
-# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
-CONFIG_IOMMU_SUPPORT=y
-CONFIG_IRQCHIP=y
-CONFIG_IRQSTACKS=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_IRQ_TIME_ACCOUNTING=y
-CONFIG_IRQ_WORK=y
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
-CONFIG_LIBFDT=y
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_MDIO_BUS=y
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_DEVRES=y
-CONFIG_MFD_SYSCON=y
-CONFIG_MIGHT_HAVE_CACHE_L2X0=y
-CONFIG_MIGRATION=y
-CONFIG_MMU_LAZY_TLB_REFCOUNT=y
-CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_MTD_NAND_CORE=y
-CONFIG_MTD_NAND_ECC=y
-CONFIG_MTD_NAND_ECC_SW_HAMMING=y
-CONFIG_MTD_SPI_NAND=y
-CONFIG_MTD_SPI_NOR=y
-CONFIG_MTD_SPLIT_FIRMWARE=y
-CONFIG_MTD_SPLIT_FIT_FW=y
-CONFIG_MTD_UBI=y
-CONFIG_MTD_UBI_BEB_LIMIT=20
-CONFIG_MTD_UBI_BLOCK=y
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SRCU_NMI_SAFE=y
-CONFIG_NET_EGRESS=y
-CONFIG_NET_FLOW_LIMIT=y
-CONFIG_NET_INGRESS=y
-CONFIG_NET_SELFTESTS=y
-CONFIG_NET_XGRESS=y
-CONFIG_NLS=y
-CONFIG_NO_HZ_COMMON=y
-CONFIG_NO_HZ_IDLE=y
-CONFIG_NR_CPUS=2
-CONFIG_NVMEM=y
-CONFIG_NVMEM_LAYOUTS=y
-CONFIG_NVMEM_SYSFS=y
-CONFIG_OF=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_KOBJ=y
-CONFIG_OF_MDIO=y
-CONFIG_OLD_SIGACTION=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_OUTER_CACHE=y
-CONFIG_OUTER_CACHE_SYNC=y
-CONFIG_PADATA=y
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PAGE_POOL=y
-CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
-CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
-CONFIG_PARTITION_PERCPU=y
-CONFIG_PCI=y
-CONFIG_PCIEAER=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCIE_MEDIATEK=y
-CONFIG_PCIE_PME=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_DOMAINS_GENERIC=y
-CONFIG_PCI_MSI=y
-CONFIG_PERF_USE_VMALLOC=y
-CONFIG_PGTABLE_LEVELS=2
-CONFIG_PHYLIB=y
-CONFIG_PHYLIB_LEDS=y
-CONFIG_PINCTRL=y
-CONFIG_PM=y
-CONFIG_PM_CLK=y
-CONFIG_PREEMPT_NONE_BUILD=y
-CONFIG_PTP_1588_CLOCK_OPTIONAL=y
-CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
-CONFIG_RANDSTRUCT_NONE=y
-CONFIG_RAS=y
-CONFIG_RATIONAL=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_MMIO=y
-CONFIG_RESET_CONTROLLER=y
-CONFIG_RFS_ACCEL=y
-CONFIG_RPS=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_SCSI=y
-CONFIG_SCSI_COMMON=y
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_FSL=y
-# CONFIG_SERIAL_8250_SHARE_IRQ is not set
-CONFIG_SERIAL_MCTRL_GPIO=y
-CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SGL_ALLOC=y
-CONFIG_SG_POOL=y
-CONFIG_SMP=y
-CONFIG_SMP_ON_UP=y
-CONFIG_SOCK_RX_QUEUE_MAPPING=y
-CONFIG_SOFTIRQ_ON_OWN_STACK=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_SPI=y
-CONFIG_SPI_AIROHA_EN7523=y
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_MEM=y
-CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-CONFIG_STACKTRACE=y
-# CONFIG_SWAP is not set
-CONFIG_SWPHY=y
-CONFIG_SWP_EMULATE=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_THREAD_INFO_IN_TASK=y
-CONFIG_TICK_CPU_ACCOUNTING=y
-CONFIG_TIMER_OF=y
-CONFIG_TIMER_PROBE=y
-CONFIG_TREE_RCU=y
-CONFIG_TREE_SRCU=y
-CONFIG_UBIFS_FS=y
-CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
-CONFIG_UNWINDER_ARM=y
-CONFIG_USB=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_XHCI_HCD=y
-# CONFIG_USB_XHCI_PLATFORM is not set
-CONFIG_USE_OF=y
-# CONFIG_VFP is not set
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_XPS=y
-CONFIG_XXHASH=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_BCJ=y
-CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_ZBOOT_ROM_TEXT=0
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZSTD_COMMON=y
-CONFIG_ZSTD_COMPRESS=y
-CONFIG_ZSTD_DECOMPRESS=y
diff --git a/target/linux/airoha/en7523/config-6.6 b/target/linux/airoha/en7523/config-6.6
new file mode 100644 (file)
index 0000000..ce93f7d
--- /dev/null
@@ -0,0 +1,303 @@
+CONFIG_ALIGNMENT_TRAP=y
+CONFIG_ARCH_32BIT_OFF_T=y
+CONFIG_ARCH_AIROHA=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_ARCH_MULTIPLATFORM=y
+CONFIG_ARCH_MULTI_V6_V7=y
+CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_STACKWALK=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARM=y
+CONFIG_ARM_AMBA=y
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_ARM_GIC=y
+CONFIG_ARM_GIC_V3=y
+CONFIG_ARM_GIC_V3_ITS=y
+CONFIG_ARM_GIC_V3_ITS_PCI=y
+CONFIG_ARM_HAS_GROUP_RELOCS=y
+CONFIG_ARM_HEAVY_MB=y
+# CONFIG_ARM_HIGHBANK_CPUIDLE is not set
+CONFIG_ARM_L1_CACHE_SHIFT=6
+CONFIG_ARM_L1_CACHE_SHIFT_6=y
+CONFIG_ARM_PATCH_IDIV=y
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_ARM_PSCI=y
+CONFIG_ARM_PSCI_FW=y
+# CONFIG_ARM_SMMU is not set
+CONFIG_ARM_THUMB=y
+CONFIG_ARM_UNWIND=y
+CONFIG_ARM_VIRT_EXT=y
+CONFIG_ATAGS=y
+CONFIG_AUTO_ZRELADDR=y
+CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_PM=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_CACHE_L2X0=y
+CONFIG_CC_HAVE_STACKPROTECTOR_TLS=y
+CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
+CONFIG_CC_NO_ARRAY_BOUNDS=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_CMDLINE="rootfstype=squashfs,jffs2"
+CONFIG_CMDLINE_FROM_BOOTLOADER=y
+CONFIG_COMMON_CLK=y
+CONFIG_COMMON_CLK_EN7523=y
+CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_CONTEXT_TRACKING=y
+CONFIG_CONTEXT_TRACKING_IDLE=y
+CONFIG_CPU_32v6K=y
+CONFIG_CPU_32v7=y
+CONFIG_CPU_ABRT_EV7=y
+CONFIG_CPU_CACHE_V7=y
+CONFIG_CPU_CACHE_VIPT=y
+CONFIG_CPU_COPY_V6=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_HAS_ASID=y
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_CPU_MITIGATIONS=y
+CONFIG_CPU_PABRT_V7=y
+CONFIG_CPU_PM=y
+CONFIG_CPU_RMAP=y
+CONFIG_CPU_SPECTRE=y
+CONFIG_CPU_THUMB_CAPABLE=y
+CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_V7=y
+CONFIG_CRC16=y
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_HASH_INFO=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_GF128MUL=y
+CONFIG_CRYPTO_LIB_SHA1=y
+CONFIG_CRYPTO_LIB_UTILS=y
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_ZSTD=y
+CONFIG_CURRENT_POINTER_IN_TPIDRURO=y
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
+CONFIG_DEBUG_MISC=y
+CONFIG_DMA_OPS=y
+CONFIG_DTC=y
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+CONFIG_EXCLUSIVE_SYSTEM_RAM=y
+CONFIG_FIXED_PHY=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_FS_IOMAP=y
+CONFIG_FUNCTION_ALIGNMENT=0
+CONFIG_FWNODE_MDIO=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_FW_LOADER_SYSFS=y
+CONFIG_GCC10_NO_ARRAY_BOUNDS=y
+CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_GENERIC_ARCH_TOPOLOGY=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_GENERIC_EARLY_IOREMAP=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_IDLE_POLL_SETUP=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_PHY=y
+CONFIG_GENERIC_PINCONF=y
+CONFIG_GENERIC_PINCTRL_GROUPS=y
+CONFIG_GENERIC_PINMUX_FUNCTIONS=y
+CONFIG_GENERIC_SCHED_CLOCK=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_VDSO_32=y
+CONFIG_GPIOLIB_IRQCHIP=y
+CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_EN7523=y
+CONFIG_GPIO_GENERIC=y
+# CONFIG_HARDEN_BRANCH_HISTORY is not set
+# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_HAS_DMA=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAVE_SMP=y
+CONFIG_HOTPLUG_CORE_SYNC=y
+CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
+CONFIG_HOTPLUG_CPU=y
+CONFIG_HW_RANDOM=y
+CONFIG_HZ_FIXED=0
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_IOMMUFD is not set
+# CONFIG_IOMMU_DEBUGFS is not set
+# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
+# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
+CONFIG_IOMMU_SUPPORT=y
+CONFIG_IRQCHIP=y
+CONFIG_IRQSTACKS=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_IRQ_WORK=y
+# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+CONFIG_LIBFDT=y
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_MDIO_BUS=y
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_DEVRES=y
+CONFIG_MFD_SYSCON=y
+CONFIG_MIGHT_HAVE_CACHE_L2X0=y
+CONFIG_MIGRATION=y
+CONFIG_MMU_LAZY_TLB_REFCOUNT=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_MTD_NAND_CORE=y
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+CONFIG_MTD_SPI_NAND=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_MTD_SPLIT_FIRMWARE=y
+CONFIG_MTD_SPLIT_FIT_FW=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BEB_LIMIT=20
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SRCU_NMI_SAFE=y
+CONFIG_NET_EGRESS=y
+CONFIG_NET_FLOW_LIMIT=y
+CONFIG_NET_INGRESS=y
+CONFIG_NET_SELFTESTS=y
+CONFIG_NET_XGRESS=y
+CONFIG_NLS=y
+CONFIG_NO_HZ_COMMON=y
+CONFIG_NO_HZ_IDLE=y
+CONFIG_NR_CPUS=2
+CONFIG_NVMEM=y
+CONFIG_NVMEM_LAYOUTS=y
+CONFIG_NVMEM_SYSFS=y
+CONFIG_OF=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_GPIO=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_KOBJ=y
+CONFIG_OF_MDIO=y
+CONFIG_OLD_SIGACTION=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_OUTER_CACHE=y
+CONFIG_OUTER_CACHE_SYNC=y
+CONFIG_PADATA=y
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_PAGE_POOL=y
+CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
+CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
+CONFIG_PARTITION_PERCPU=y
+CONFIG_PCI=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIE_MEDIATEK=y
+CONFIG_PCIE_PME=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_DOMAINS_GENERIC=y
+CONFIG_PCI_MSI=y
+CONFIG_PERF_USE_VMALLOC=y
+CONFIG_PGTABLE_LEVELS=2
+CONFIG_PHYLIB=y
+CONFIG_PHYLIB_LEDS=y
+CONFIG_PINCTRL=y
+CONFIG_PM=y
+CONFIG_PM_CLK=y
+CONFIG_PREEMPT_NONE_BUILD=y
+CONFIG_PTP_1588_CLOCK_OPTIONAL=y
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+CONFIG_RANDSTRUCT_NONE=y
+CONFIG_RAS=y
+CONFIG_RATIONAL=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_MMIO=y
+CONFIG_RESET_CONTROLLER=y
+CONFIG_RFS_ACCEL=y
+CONFIG_RPS=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_SCSI=y
+CONFIG_SCSI_COMMON=y
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_FSL=y
+# CONFIG_SERIAL_8250_SHARE_IRQ is not set
+CONFIG_SERIAL_MCTRL_GPIO=y
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_SGL_ALLOC=y
+CONFIG_SG_POOL=y
+CONFIG_SMP=y
+CONFIG_SMP_ON_UP=y
+CONFIG_SOCK_RX_QUEUE_MAPPING=y
+CONFIG_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_SPI=y
+CONFIG_SPI_AIROHA_EN7523=y
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+CONFIG_STACKTRACE=y
+# CONFIG_SWAP is not set
+CONFIG_SWPHY=y
+CONFIG_SWP_EMULATE=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_THREAD_INFO_IN_TASK=y
+CONFIG_TICK_CPU_ACCOUNTING=y
+CONFIG_TIMER_OF=y
+CONFIG_TIMER_PROBE=y
+CONFIG_TREE_RCU=y
+CONFIG_TREE_SRCU=y
+CONFIG_UBIFS_FS=y
+CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
+CONFIG_UNWINDER_ARM=y
+CONFIG_USB=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_XHCI_HCD=y
+# CONFIG_USB_XHCI_PLATFORM is not set
+CONFIG_USE_OF=y
+# CONFIG_VFP is not set
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_XPS=y
+CONFIG_XXHASH=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_ZBOOT_ROM_BSS=0
+CONFIG_ZBOOT_ROM_TEXT=0
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZSTD_COMMON=y
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
diff --git a/target/linux/airoha/en7523/target.mk b/target/linux/airoha/en7523/target.mk
new file mode 100644 (file)
index 0000000..eec7bb4
--- /dev/null
@@ -0,0 +1,6 @@
+ARCH:=arm
+SUBTARGET:=en7523
+BOARDNAME:=EN7523
+CPU_TYPE:=cortex-a7
+KERNELNAME:=Image dtbs
+FEATURES+=source-only
\ No newline at end of file
diff --git a/target/linux/airoha/generic/target.mk b/target/linux/airoha/generic/target.mk
deleted file mode 100644 (file)
index f5cb1fb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-BOARDNAME:=Generic
index c6def5ad653b6a83521a62f586b3e2e19c6ebfc8..dd5878bfe15ba9f34cfb04132bc0ff542f356d7d 100644 (file)
@@ -1,12 +1,6 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-KERNEL_LOADADDR := 0x80208000
-
-define Target/Description
-       Build firmware images for Airoha EN7523 ARM based boards.
-endef
-
 # default all platform image(fit) build
 define Device/Default
   PROFILES = Default $$(DEVICE_NAME)
@@ -22,16 +16,10 @@ define Device/Default
        pad-rootfs | append-metadata
 endef
 
+include $(SUBTARGET).mk
+
 define Image/Build
        $(call Image/Build/$(1),$(1))
 endef
 
-define Device/airoha_en7523-evb
-  DEVICE_VENDOR := Airoha
-  DEVICE_MODEL := EN7523 Evaluation Board
-  DEVICE_DTS := en7523-evb
-  DEVICE_DTS_DIR := ../dts
-endef
-TARGET_DEVICES += airoha_en7523-evb
-
 $(eval $(call BuildImage))
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..aca37a9923a00815c3aa3880bbf0cdc9ac63dce5 100644 (file)
@@ -0,0 +1,13 @@
+KERNEL_LOADADDR := 0x80208000
+
+define Target/Description
+       Build firmware images for Airoha EN7523 ARM based boards.
+endef
+
+define Device/airoha_en7523-evb
+  DEVICE_VENDOR := Airoha
+  DEVICE_MODEL := EN7523 Evaluation Board
+  DEVICE_DTS := en7523-evb
+  DEVICE_DTS_DIR := ../dts
+endef
+TARGET_DEVICES += airoha_en7523-evb
\ No newline at end of file
diff --git a/target/linux/airoha/patches-6.6/0005-spi-Add-support-for-the-Airoha-EN7523-SoC-SPI-contro.patch b/target/linux/airoha/patches-6.6/0005-spi-Add-support-for-the-Airoha-EN7523-SoC-SPI-contro.patch
deleted file mode 100644 (file)
index 30ba1ab..0000000
+++ /dev/null
@@ -1,341 +0,0 @@
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -353,6 +353,12 @@ config SPI_DLN2
-        This driver can also be built as a module.  If so, the module
-        will be called spi-dln2.
-+config SPI_AIROHA_EN7523
-+      bool "Airoha EN7523 SPI controller support"
-+      depends on ARCH_AIROHA
-+      help
-+        This enables SPI controller support for the Airoha EN7523 SoC.
-+
- config SPI_EP93XX
-       tristate "Cirrus Logic EP93xx SPI controller"
-       depends on ARCH_EP93XX || COMPILE_TEST
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -50,6 +50,7 @@ obj-$(CONFIG_SPI_DW_BT1)             += spi-dw-bt1.
- obj-$(CONFIG_SPI_DW_MMIO)             += spi-dw-mmio.o
- obj-$(CONFIG_SPI_DW_PCI)              += spi-dw-pci.o
- obj-$(CONFIG_SPI_EP93XX)              += spi-ep93xx.o
-+obj-$(CONFIG_SPI_AIROHA_EN7523)               += spi-en7523.o
- obj-$(CONFIG_SPI_FALCON)              += spi-falcon.o
- obj-$(CONFIG_SPI_FSI)                 += spi-fsi.o
- obj-$(CONFIG_SPI_FSL_CPM)             += spi-fsl-cpm.o
---- /dev/null
-+++ b/drivers/spi/spi-en7523.c
-@@ -0,0 +1,313 @@
-+// SPDX-License-Identifier: GPL-2.0
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/mod_devicetable.h>
-+#include <linux/spi/spi.h>
-+
-+
-+#define ENSPI_READ_IDLE_EN                    0x0004
-+#define ENSPI_MTX_MODE_TOG                    0x0014
-+#define ENSPI_RDCTL_FSM                               0x0018
-+#define ENSPI_MANUAL_EN                               0x0020
-+#define ENSPI_MANUAL_OPFIFO_EMPTY             0x0024
-+#define ENSPI_MANUAL_OPFIFO_WDATA             0x0028
-+#define ENSPI_MANUAL_OPFIFO_FULL              0x002C
-+#define ENSPI_MANUAL_OPFIFO_WR                        0x0030
-+#define ENSPI_MANUAL_DFIFO_FULL                       0x0034
-+#define ENSPI_MANUAL_DFIFO_WDATA              0x0038
-+#define ENSPI_MANUAL_DFIFO_EMPTY              0x003C
-+#define ENSPI_MANUAL_DFIFO_RD                 0x0040
-+#define ENSPI_MANUAL_DFIFO_RDATA              0x0044
-+#define ENSPI_IER                             0x0090
-+#define ENSPI_NFI2SPI_EN                      0x0130
-+
-+// TODO not in spi block
-+#define ENSPI_CLOCK_DIVIDER                   ((void __iomem *)0x1fa201c4)
-+
-+#define       OP_CSH                                  0x00
-+#define       OP_CSL                                  0x01
-+#define       OP_CK                                   0x02
-+#define       OP_OUTS                                 0x08
-+#define       OP_OUTD                                 0x09
-+#define       OP_OUTQ                                 0x0A
-+#define       OP_INS                                  0x0C
-+#define       OP_INS0                                 0x0D
-+#define       OP_IND                                  0x0E
-+#define       OP_INQ                                  0x0F
-+#define       OP_OS2IS                                0x10
-+#define       OP_OS2ID                                0x11
-+#define       OP_OS2IQ                                0x12
-+#define       OP_OD2IS                                0x13
-+#define       OP_OD2ID                                0x14
-+#define       OP_OD2IQ                                0x15
-+#define       OP_OQ2IS                                0x16
-+#define       OP_OQ2ID                                0x17
-+#define       OP_OQ2IQ                                0x18
-+#define       OP_OSNIS                                0x19
-+#define       OP_ODNID                                0x1A
-+
-+#define MATRIX_MODE_AUTO              1
-+#define   CONF_MTX_MODE_AUTO          0
-+#define   MANUALEN_AUTO                       0
-+#define MATRIX_MODE_MANUAL            0
-+#define   CONF_MTX_MODE_MANUAL                9
-+#define   MANUALEN_MANUAL             1
-+
-+#define _ENSPI_MAX_XFER                       0x1ff
-+
-+#define REG(x)                        (iobase + x)
-+
-+
-+static void __iomem *iobase;
-+
-+
-+static void opfifo_write(u32 cmd, u32 len)
-+{
-+      u32 tmp = ((cmd & 0x1f) << 9) | (len & 0x1ff);
-+
-+      writel(tmp, REG(ENSPI_MANUAL_OPFIFO_WDATA));
-+
-+      /* Wait for room in OPFIFO */
-+      while (readl(REG(ENSPI_MANUAL_OPFIFO_FULL)))
-+              ;
-+
-+      /* Shift command into OPFIFO */
-+      writel(1, REG(ENSPI_MANUAL_OPFIFO_WR));
-+
-+      /* Wait for command to finish */
-+      while (!readl(REG(ENSPI_MANUAL_OPFIFO_EMPTY)))
-+              ;
-+}
-+
-+static void set_cs(int state)
-+{
-+      if (state)
-+              opfifo_write(OP_CSH, 1);
-+      else
-+              opfifo_write(OP_CSL, 1);
-+}
-+
-+static void manual_begin_cmd(void)
-+{
-+      /* Disable read idle state */
-+      writel(0, REG(ENSPI_READ_IDLE_EN));
-+
-+      /* Wait for FSM to reach idle state */
-+      while (readl(REG(ENSPI_RDCTL_FSM)))
-+              ;
-+
-+      /* Set SPI core to manual mode */
-+      writel(CONF_MTX_MODE_MANUAL, REG(ENSPI_MTX_MODE_TOG));
-+      writel(MANUALEN_MANUAL, REG(ENSPI_MANUAL_EN));
-+}
-+
-+static void manual_end_cmd(void)
-+{
-+      /* Set SPI core to auto mode */
-+      writel(CONF_MTX_MODE_AUTO, REG(ENSPI_MTX_MODE_TOG));
-+      writel(MANUALEN_AUTO, REG(ENSPI_MANUAL_EN));
-+
-+      /* Enable read idle state */
-+      writel(1, REG(ENSPI_READ_IDLE_EN));
-+}
-+
-+static void dfifo_read(u8 *buf, int len)
-+{
-+      int i;
-+
-+      for (i = 0; i < len; i++) {
-+              /* Wait for requested data to show up in DFIFO */
-+              while (readl(REG(ENSPI_MANUAL_DFIFO_EMPTY)))
-+                      ;
-+              buf[i] = readl(REG(ENSPI_MANUAL_DFIFO_RDATA));
-+              /* Queue up next byte */
-+              writel(1, REG(ENSPI_MANUAL_DFIFO_RD));
-+      }
-+}
-+
-+static void dfifo_write(const u8 *buf, int len)
-+{
-+      int i;
-+
-+      for (i = 0; i < len; i++) {
-+              /* Wait for room in DFIFO */
-+              while (readl(REG(ENSPI_MANUAL_DFIFO_FULL)))
-+                      ;
-+              writel(buf[i], REG(ENSPI_MANUAL_DFIFO_WDATA));
-+      }
-+}
-+
-+#if 0
-+static void set_spi_clock_speed(int freq_mhz)
-+{
-+      u32 tmp, val;
-+
-+      tmp = readl(ENSPI_CLOCK_DIVIDER);
-+      tmp &= 0xffff0000;
-+      writel(tmp, ENSPI_CLOCK_DIVIDER);
-+
-+      val = (400 / (freq_mhz * 2));
-+      tmp |= (val << 8) | 1;
-+      writel(tmp, ENSPI_CLOCK_DIVIDER);
-+}
-+#endif
-+
-+static void init_hw(void)
-+{
-+      /* Disable manual/auto mode clash interrupt */
-+      writel(0, REG(ENSPI_IER));
-+
-+      // TODO via clk framework
-+      // set_spi_clock_speed(50);
-+
-+      /* Disable DMA */
-+      writel(0, REG(ENSPI_NFI2SPI_EN));
-+}
-+
-+static int xfer_read(struct spi_transfer *xfer)
-+{
-+      int opcode;
-+      uint8_t *buf = xfer->rx_buf;
-+
-+      switch (xfer->rx_nbits) {
-+      case SPI_NBITS_SINGLE:
-+              opcode = OP_INS;
-+              break;
-+      case SPI_NBITS_DUAL:
-+              opcode = OP_IND;
-+              break;
-+      case SPI_NBITS_QUAD:
-+              opcode = OP_INQ;
-+              break;
-+      }
-+
-+      opfifo_write(opcode, xfer->len);
-+      dfifo_read(buf, xfer->len);
-+
-+      return xfer->len;
-+}
-+
-+static int xfer_write(struct spi_transfer *xfer, int next_xfer_is_rx)
-+{
-+      int opcode;
-+      const uint8_t *buf = xfer->tx_buf;
-+
-+      if (next_xfer_is_rx) {
-+              /* need to use Ox2Ix opcode to set the core to input afterwards */
-+              switch (xfer->tx_nbits) {
-+              case SPI_NBITS_SINGLE:
-+                      opcode = OP_OS2IS;
-+                      break;
-+              case SPI_NBITS_DUAL:
-+                      opcode = OP_OS2ID;
-+                      break;
-+              case SPI_NBITS_QUAD:
-+                      opcode = OP_OS2IQ;
-+                      break;
-+              }
-+      } else {
-+              switch (xfer->tx_nbits) {
-+              case SPI_NBITS_SINGLE:
-+                      opcode = OP_OUTS;
-+                      break;
-+              case SPI_NBITS_DUAL:
-+                      opcode = OP_OUTD;
-+                      break;
-+              case SPI_NBITS_QUAD:
-+                      opcode = OP_OUTQ;
-+                      break;
-+              }
-+      }
-+
-+      opfifo_write(opcode, xfer->len);
-+      dfifo_write(buf, xfer->len);
-+
-+      return xfer->len;
-+}
-+
-+size_t max_transfer_size(struct spi_device *spi)
-+{
-+      return _ENSPI_MAX_XFER;
-+}
-+
-+int transfer_one_message(struct spi_controller *ctrl, struct spi_message *msg)
-+{
-+      struct spi_transfer *xfer;
-+      int next_xfer_is_rx = 0;
-+
-+      manual_begin_cmd();
-+      set_cs(0);
-+      list_for_each_entry(xfer, &msg->transfers, transfer_list) {
-+              if (xfer->tx_buf) {
-+                      if (!list_is_last(&xfer->transfer_list, &msg->transfers)
-+                          && list_next_entry(xfer, transfer_list)->rx_buf != NULL)
-+                              next_xfer_is_rx = 1;
-+                      else
-+                              next_xfer_is_rx = 0;
-+                      msg->actual_length += xfer_write(xfer, next_xfer_is_rx);
-+              } else if (xfer->rx_buf) {
-+                      msg->actual_length += xfer_read(xfer);
-+              }
-+      }
-+      set_cs(1);
-+      manual_end_cmd();
-+
-+      msg->status = 0;
-+      spi_finalize_current_message(ctrl);
-+
-+      return 0;
-+}
-+
-+static int spi_probe(struct platform_device *pdev)
-+{
-+      struct spi_controller *ctrl;
-+      int err;
-+
-+      ctrl = devm_spi_alloc_master(&pdev->dev, 0);
-+      if (!ctrl) {
-+              dev_err(&pdev->dev, "Error allocating SPI controller\n");
-+              return -ENOMEM;
-+      }
-+
-+      iobase = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
-+      if (IS_ERR(iobase)) {
-+              dev_err(&pdev->dev, "Could not map SPI register address");
-+              return -ENOMEM;
-+      }
-+
-+      init_hw();
-+
-+      ctrl->dev.of_node = pdev->dev.of_node;
-+      ctrl->flags = SPI_CONTROLLER_HALF_DUPLEX;
-+      ctrl->mode_bits = SPI_RX_DUAL | SPI_TX_DUAL;
-+      ctrl->max_transfer_size = max_transfer_size;
-+      ctrl->transfer_one_message = transfer_one_message;
-+      err = devm_spi_register_controller(&pdev->dev, ctrl);
-+      if (err) {
-+              dev_err(&pdev->dev, "Could not register SPI controller\n");
-+              return -ENODEV;
-+      }
-+
-+      return 0;
-+}
-+
-+static const struct of_device_id spi_of_ids[] = {
-+      { .compatible = "airoha,en7523-spi" },
-+      { /* sentinel */ }
-+};
-+MODULE_DEVICE_TABLE(of, spi_of_ids);
-+
-+static struct platform_driver spi_driver = {
-+      .probe = spi_probe,
-+      .driver = {
-+              .name = "airoha-en7523-spi",
-+              .of_match_table = spi_of_ids,
-+      },
-+};
-+
-+module_platform_driver(spi_driver);
-+
-+MODULE_LICENSE("GPL v2");
-+MODULE_AUTHOR("Bert Vermeulen <bert@biot.com>");
-+MODULE_DESCRIPTION("Airoha EN7523 SPI driver");
diff --git a/target/linux/airoha/patches-6.6/300-spi-Add-support-for-the-Airoha-EN7523-SoC-SPI-contro.patch b/target/linux/airoha/patches-6.6/300-spi-Add-support-for-the-Airoha-EN7523-SoC-SPI-contro.patch
new file mode 100644 (file)
index 0000000..30ba1ab
--- /dev/null
@@ -0,0 +1,341 @@
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -353,6 +353,12 @@ config SPI_DLN2
+        This driver can also be built as a module.  If so, the module
+        will be called spi-dln2.
++config SPI_AIROHA_EN7523
++      bool "Airoha EN7523 SPI controller support"
++      depends on ARCH_AIROHA
++      help
++        This enables SPI controller support for the Airoha EN7523 SoC.
++
+ config SPI_EP93XX
+       tristate "Cirrus Logic EP93xx SPI controller"
+       depends on ARCH_EP93XX || COMPILE_TEST
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
+@@ -50,6 +50,7 @@ obj-$(CONFIG_SPI_DW_BT1)             += spi-dw-bt1.
+ obj-$(CONFIG_SPI_DW_MMIO)             += spi-dw-mmio.o
+ obj-$(CONFIG_SPI_DW_PCI)              += spi-dw-pci.o
+ obj-$(CONFIG_SPI_EP93XX)              += spi-ep93xx.o
++obj-$(CONFIG_SPI_AIROHA_EN7523)               += spi-en7523.o
+ obj-$(CONFIG_SPI_FALCON)              += spi-falcon.o
+ obj-$(CONFIG_SPI_FSI)                 += spi-fsi.o
+ obj-$(CONFIG_SPI_FSL_CPM)             += spi-fsl-cpm.o
+--- /dev/null
++++ b/drivers/spi/spi-en7523.c
+@@ -0,0 +1,313 @@
++// SPDX-License-Identifier: GPL-2.0
++
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/mod_devicetable.h>
++#include <linux/spi/spi.h>
++
++
++#define ENSPI_READ_IDLE_EN                    0x0004
++#define ENSPI_MTX_MODE_TOG                    0x0014
++#define ENSPI_RDCTL_FSM                               0x0018
++#define ENSPI_MANUAL_EN                               0x0020
++#define ENSPI_MANUAL_OPFIFO_EMPTY             0x0024
++#define ENSPI_MANUAL_OPFIFO_WDATA             0x0028
++#define ENSPI_MANUAL_OPFIFO_FULL              0x002C
++#define ENSPI_MANUAL_OPFIFO_WR                        0x0030
++#define ENSPI_MANUAL_DFIFO_FULL                       0x0034
++#define ENSPI_MANUAL_DFIFO_WDATA              0x0038
++#define ENSPI_MANUAL_DFIFO_EMPTY              0x003C
++#define ENSPI_MANUAL_DFIFO_RD                 0x0040
++#define ENSPI_MANUAL_DFIFO_RDATA              0x0044
++#define ENSPI_IER                             0x0090
++#define ENSPI_NFI2SPI_EN                      0x0130
++
++// TODO not in spi block
++#define ENSPI_CLOCK_DIVIDER                   ((void __iomem *)0x1fa201c4)
++
++#define       OP_CSH                                  0x00
++#define       OP_CSL                                  0x01
++#define       OP_CK                                   0x02
++#define       OP_OUTS                                 0x08
++#define       OP_OUTD                                 0x09
++#define       OP_OUTQ                                 0x0A
++#define       OP_INS                                  0x0C
++#define       OP_INS0                                 0x0D
++#define       OP_IND                                  0x0E
++#define       OP_INQ                                  0x0F
++#define       OP_OS2IS                                0x10
++#define       OP_OS2ID                                0x11
++#define       OP_OS2IQ                                0x12
++#define       OP_OD2IS                                0x13
++#define       OP_OD2ID                                0x14
++#define       OP_OD2IQ                                0x15
++#define       OP_OQ2IS                                0x16
++#define       OP_OQ2ID                                0x17
++#define       OP_OQ2IQ                                0x18
++#define       OP_OSNIS                                0x19
++#define       OP_ODNID                                0x1A
++
++#define MATRIX_MODE_AUTO              1
++#define   CONF_MTX_MODE_AUTO          0
++#define   MANUALEN_AUTO                       0
++#define MATRIX_MODE_MANUAL            0
++#define   CONF_MTX_MODE_MANUAL                9
++#define   MANUALEN_MANUAL             1
++
++#define _ENSPI_MAX_XFER                       0x1ff
++
++#define REG(x)                        (iobase + x)
++
++
++static void __iomem *iobase;
++
++
++static void opfifo_write(u32 cmd, u32 len)
++{
++      u32 tmp = ((cmd & 0x1f) << 9) | (len & 0x1ff);
++
++      writel(tmp, REG(ENSPI_MANUAL_OPFIFO_WDATA));
++
++      /* Wait for room in OPFIFO */
++      while (readl(REG(ENSPI_MANUAL_OPFIFO_FULL)))
++              ;
++
++      /* Shift command into OPFIFO */
++      writel(1, REG(ENSPI_MANUAL_OPFIFO_WR));
++
++      /* Wait for command to finish */
++      while (!readl(REG(ENSPI_MANUAL_OPFIFO_EMPTY)))
++              ;
++}
++
++static void set_cs(int state)
++{
++      if (state)
++              opfifo_write(OP_CSH, 1);
++      else
++              opfifo_write(OP_CSL, 1);
++}
++
++static void manual_begin_cmd(void)
++{
++      /* Disable read idle state */
++      writel(0, REG(ENSPI_READ_IDLE_EN));
++
++      /* Wait for FSM to reach idle state */
++      while (readl(REG(ENSPI_RDCTL_FSM)))
++              ;
++
++      /* Set SPI core to manual mode */
++      writel(CONF_MTX_MODE_MANUAL, REG(ENSPI_MTX_MODE_TOG));
++      writel(MANUALEN_MANUAL, REG(ENSPI_MANUAL_EN));
++}
++
++static void manual_end_cmd(void)
++{
++      /* Set SPI core to auto mode */
++      writel(CONF_MTX_MODE_AUTO, REG(ENSPI_MTX_MODE_TOG));
++      writel(MANUALEN_AUTO, REG(ENSPI_MANUAL_EN));
++
++      /* Enable read idle state */
++      writel(1, REG(ENSPI_READ_IDLE_EN));
++}
++
++static void dfifo_read(u8 *buf, int len)
++{
++      int i;
++
++      for (i = 0; i < len; i++) {
++              /* Wait for requested data to show up in DFIFO */
++              while (readl(REG(ENSPI_MANUAL_DFIFO_EMPTY)))
++                      ;
++              buf[i] = readl(REG(ENSPI_MANUAL_DFIFO_RDATA));
++              /* Queue up next byte */
++              writel(1, REG(ENSPI_MANUAL_DFIFO_RD));
++      }
++}
++
++static void dfifo_write(const u8 *buf, int len)
++{
++      int i;
++
++      for (i = 0; i < len; i++) {
++              /* Wait for room in DFIFO */
++              while (readl(REG(ENSPI_MANUAL_DFIFO_FULL)))
++                      ;
++              writel(buf[i], REG(ENSPI_MANUAL_DFIFO_WDATA));
++      }
++}
++
++#if 0
++static void set_spi_clock_speed(int freq_mhz)
++{
++      u32 tmp, val;
++
++      tmp = readl(ENSPI_CLOCK_DIVIDER);
++      tmp &= 0xffff0000;
++      writel(tmp, ENSPI_CLOCK_DIVIDER);
++
++      val = (400 / (freq_mhz * 2));
++      tmp |= (val << 8) | 1;
++      writel(tmp, ENSPI_CLOCK_DIVIDER);
++}
++#endif
++
++static void init_hw(void)
++{
++      /* Disable manual/auto mode clash interrupt */
++      writel(0, REG(ENSPI_IER));
++
++      // TODO via clk framework
++      // set_spi_clock_speed(50);
++
++      /* Disable DMA */
++      writel(0, REG(ENSPI_NFI2SPI_EN));
++}
++
++static int xfer_read(struct spi_transfer *xfer)
++{
++      int opcode;
++      uint8_t *buf = xfer->rx_buf;
++
++      switch (xfer->rx_nbits) {
++      case SPI_NBITS_SINGLE:
++              opcode = OP_INS;
++              break;
++      case SPI_NBITS_DUAL:
++              opcode = OP_IND;
++              break;
++      case SPI_NBITS_QUAD:
++              opcode = OP_INQ;
++              break;
++      }
++
++      opfifo_write(opcode, xfer->len);
++      dfifo_read(buf, xfer->len);
++
++      return xfer->len;
++}
++
++static int xfer_write(struct spi_transfer *xfer, int next_xfer_is_rx)
++{
++      int opcode;
++      const uint8_t *buf = xfer->tx_buf;
++
++      if (next_xfer_is_rx) {
++              /* need to use Ox2Ix opcode to set the core to input afterwards */
++              switch (xfer->tx_nbits) {
++              case SPI_NBITS_SINGLE:
++                      opcode = OP_OS2IS;
++                      break;
++              case SPI_NBITS_DUAL:
++                      opcode = OP_OS2ID;
++                      break;
++              case SPI_NBITS_QUAD:
++                      opcode = OP_OS2IQ;
++                      break;
++              }
++      } else {
++              switch (xfer->tx_nbits) {
++              case SPI_NBITS_SINGLE:
++                      opcode = OP_OUTS;
++                      break;
++              case SPI_NBITS_DUAL:
++                      opcode = OP_OUTD;
++                      break;
++              case SPI_NBITS_QUAD:
++                      opcode = OP_OUTQ;
++                      break;
++              }
++      }
++
++      opfifo_write(opcode, xfer->len);
++      dfifo_write(buf, xfer->len);
++
++      return xfer->len;
++}
++
++size_t max_transfer_size(struct spi_device *spi)
++{
++      return _ENSPI_MAX_XFER;
++}
++
++int transfer_one_message(struct spi_controller *ctrl, struct spi_message *msg)
++{
++      struct spi_transfer *xfer;
++      int next_xfer_is_rx = 0;
++
++      manual_begin_cmd();
++      set_cs(0);
++      list_for_each_entry(xfer, &msg->transfers, transfer_list) {
++              if (xfer->tx_buf) {
++                      if (!list_is_last(&xfer->transfer_list, &msg->transfers)
++                          && list_next_entry(xfer, transfer_list)->rx_buf != NULL)
++                              next_xfer_is_rx = 1;
++                      else
++                              next_xfer_is_rx = 0;
++                      msg->actual_length += xfer_write(xfer, next_xfer_is_rx);
++              } else if (xfer->rx_buf) {
++                      msg->actual_length += xfer_read(xfer);
++              }
++      }
++      set_cs(1);
++      manual_end_cmd();
++
++      msg->status = 0;
++      spi_finalize_current_message(ctrl);
++
++      return 0;
++}
++
++static int spi_probe(struct platform_device *pdev)
++{
++      struct spi_controller *ctrl;
++      int err;
++
++      ctrl = devm_spi_alloc_master(&pdev->dev, 0);
++      if (!ctrl) {
++              dev_err(&pdev->dev, "Error allocating SPI controller\n");
++              return -ENOMEM;
++      }
++
++      iobase = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
++      if (IS_ERR(iobase)) {
++              dev_err(&pdev->dev, "Could not map SPI register address");
++              return -ENOMEM;
++      }
++
++      init_hw();
++
++      ctrl->dev.of_node = pdev->dev.of_node;
++      ctrl->flags = SPI_CONTROLLER_HALF_DUPLEX;
++      ctrl->mode_bits = SPI_RX_DUAL | SPI_TX_DUAL;
++      ctrl->max_transfer_size = max_transfer_size;
++      ctrl->transfer_one_message = transfer_one_message;
++      err = devm_spi_register_controller(&pdev->dev, ctrl);
++      if (err) {
++              dev_err(&pdev->dev, "Could not register SPI controller\n");
++              return -ENODEV;
++      }
++
++      return 0;
++}
++
++static const struct of_device_id spi_of_ids[] = {
++      { .compatible = "airoha,en7523-spi" },
++      { /* sentinel */ }
++};
++MODULE_DEVICE_TABLE(of, spi_of_ids);
++
++static struct platform_driver spi_driver = {
++      .probe = spi_probe,
++      .driver = {
++              .name = "airoha-en7523-spi",
++              .of_match_table = spi_of_ids,
++      },
++};
++
++module_platform_driver(spi_driver);
++
++MODULE_LICENSE("GPL v2");
++MODULE_AUTHOR("Bert Vermeulen <bert@biot.com>");
++MODULE_DESCRIPTION("Airoha EN7523 SPI driver");