diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-03-19 11:58:54 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-19 11:58:54 +0000 |
commit | 3600b84cbd9696496d3a7862f003d839c177d088 (patch) | |
tree | 0154f76d96013f6cd9d2a8dd60e830a779959941 /target/linux | |
parent | 941ac35f771456f4ac25d88cfd459081a831bbc5 (diff) | |
download | mtk-20170518-3600b84cbd9696496d3a7862f003d839c177d088.zip mtk-20170518-3600b84cbd9696496d3a7862f003d839c177d088.tar.gz mtk-20170518-3600b84cbd9696496d3a7862f003d839c177d088.tar.bz2 |
ep93xx: moved to targets feed
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 44889
Diffstat (limited to 'target/linux')
23 files changed, 0 insertions, 6347 deletions
diff --git a/target/linux/ep93xx/Makefile b/target/linux/ep93xx/Makefile deleted file mode 100644 index 7e7422b..0000000 --- a/target/linux/ep93xx/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (C) 2009-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk - -ARCH:=arm -BOARD:=ep93xx -BOARDNAME:=Cirrus Logic EP93xx -FEATURES:=squashfs ext4 targz usb display sound -CPU_TYPE:=arm920t -MAINTAINER:=Florian Fainelli <florian@openwrt.org> - -KERNEL_PATCHVER:=3.8 - -DEVICE_TYPE:=developerboard - -include $(INCLUDE_DIR)/target.mk - -KERNELNAME:=uImage - -$(eval $(call BuildTarget)) diff --git a/target/linux/ep93xx/base-files/etc/inittab b/target/linux/ep93xx/base-files/etc/inittab deleted file mode 100644 index 9f7c0ae..0000000 --- a/target/linux/ep93xx/base-files/etc/inittab +++ /dev/null @@ -1,5 +0,0 @@ -::sysinit:/etc/init.d/rcS S boot -::shutdown:/etc/init.d/rcS K shutdown -tts/0::askfirst:/bin/ash --login -ttyAM0::askfirst:/bin/ash --login -tty1::askfirst:/bin/ash --login diff --git a/target/linux/ep93xx/base-files/lib/preinit/05_set_ether_mac_rdc b/target/linux/ep93xx/base-files/lib/preinit/05_set_ether_mac_rdc deleted file mode 100644 index 9e5d09f..0000000 --- a/target/linux/ep93xx/base-files/lib/preinit/05_set_ether_mac_rdc +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# Copyright (C) 2010 OpenWrt.org - -. /lib/functions.sh - -set_ether_mac() { - mac=$(sed -n 's/^Serial.* 000000/02/p' /proc/cpuinfo) - ifconfig eth0 hw ether $mac -} - -boot_hook_add preinit_main set_ether_mac - diff --git a/target/linux/ep93xx/config-3.10 b/target/linux/ep93xx/config-3.10 deleted file mode 100644 index a5d3b96..0000000 --- a/target/linux/ep93xx/config-3.10 +++ /dev/null @@ -1,206 +0,0 @@ -CONFIG_ALIGNMENT_TRAP=y -CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y -CONFIG_ARCH_EP93XX=y -CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y -CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y -CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y -CONFIG_ARCH_NR_GPIO=0 -CONFIG_ARCH_REQUIRE_GPIOLIB=y -# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set -# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_USES_GETTIMEOFFSET=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_ARM=y -CONFIG_ARM_AMBA=y -# CONFIG_ARM_CPU_SUSPEND is not set -CONFIG_ARM_L1_CACHE_SHIFT=5 -CONFIG_ARM_NR_BANKS=16 -CONFIG_ARM_PATCH_PHYS_VIRT=y -# CONFIG_ARM_SP805_WATCHDOG is not set -CONFIG_ARM_THUMB=y -CONFIG_ARM_VIC=y -CONFIG_ARM_VIC_NR=2 -# CONFIG_ARPD is not set -CONFIG_ATAGS=y -# CONFIG_BLK_DEV_INITRD is not set -# CONFIG_CACHE_L2X0 is not set -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_CLKDEV_LOOKUP=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_CMDLINE="console=ttyAM0,57600 init=/etc/preinit" -CONFIG_CMDLINE_FROM_BOOTLOADER=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_CPU_32v4T=y -CONFIG_CPU_ABRT_EV4T=y -CONFIG_CPU_ARM920T=y -CONFIG_CPU_CACHE_V4WT=y -CONFIG_CPU_CACHE_VIVT=y -CONFIG_CPU_COPY_V4WB=y -CONFIG_CPU_CP15=y -CONFIG_CPU_CP15_MMU=y -# CONFIG_CPU_DCACHE_WRITETHROUGH is not set -# CONFIG_CPU_ICACHE_DISABLE is not set -CONFIG_CPU_PABRT_LEGACY=y -CONFIG_CPU_TLB_V4WBI=y -CONFIG_CPU_USE_DOMAINS=y -CONFIG_CRC7=y -CONFIG_CRC_ITU_T=y -CONFIG_CRUNCH=y -CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" -# CONFIG_DEBUG_USER is not set -CONFIG_DUMMY_CONSOLE=y -# CONFIG_ENABLE_WARN_DEPRECATED is not set -CONFIG_EP93XX_EARLY_UART1=y -# CONFIG_EP93XX_EARLY_UART2 is not set -# CONFIG_EP93XX_EARLY_UART3 is not set -CONFIG_EP93XX_ETH=y -# CONFIG_EP93XX_PWM is not set -CONFIG_EP93XX_SDCE0_PHYS_OFFSET=y -# CONFIG_EP93XX_SDCE1_PHYS_OFFSET is not set -# CONFIG_EP93XX_SDCE2_PHYS_OFFSET is not set -# CONFIG_EP93XX_SDCE3_ASYNC_PHYS_OFFSET is not set -# CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET is not set -CONFIG_EP93XX_SOC_COMMON=y -CONFIG_EP93XX_WATCHDOG=y -CONFIG_FRAME_POINTER=y -CONFIG_GENERIC_ATOMIC64=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_IDLE_POLL_SETUP=y -CONFIG_GENERIC_IO=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_DEVRES=y -CONFIG_GPIO_EP93XX=y -CONFIG_GPIO_GENERIC=y -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_HAS_DMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_HAVE_ARCH_PFN_VALID=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_BPF_JIT=y -CONFIG_HAVE_CLK=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_HAVE_DEBUG_KMEMLEAK=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_DMA_ATTRS=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_HAVE_GENERIC_HARDIRQS=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_NET_DSA=y -CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_HAVE_PROC_CPU=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_UID16=y -CONFIG_HW_CONSOLE=y -CONFIG_I2C=y -CONFIG_I2C_ALGOBIT=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_CHARDEV=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_INPUT=y -# CONFIG_INPUT_MISC is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_IRQ_DOMAIN=y -CONFIG_IRQ_WORK=y -CONFIG_KTIME_SCALAR=y -CONFIG_LEDS_GPIO_REGISTER=y -CONFIG_LOG_BUF_SHIFT=16 -# CONFIG_MACH_EDB9302A is not set -# CONFIG_MACH_EDB9307A is not set -# CONFIG_MACH_EDB9315A is not set -CONFIG_MACH_SIM_ONE=y -# CONFIG_MACH_SNAPPER_CL15 is not set -# CONFIG_MACH_VISION_EP9307 is not set -CONFIG_MMC=y -CONFIG_MMC_BLOCK=y -CONFIG_MMC_SPI=y -CONFIG_MODULES_USE_ELF_REL=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -# CONFIG_MTD_CFI_GEOMETRY is not set -CONFIG_MTD_CFI_STAA=y -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_RAM=y -CONFIG_MULTI_IRQ_HANDLER=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NEED_KUSER_HELPERS=y -CONFIG_NEED_MACH_MEMORY_H=y -CONFIG_NEED_PER_CPU_KM=y -CONFIG_OLD_SIGACTION=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_PAGE_OFFSET=0xC0000000 -# CONFIG_PCI_SYSCALL is not set -CONFIG_PERF_USE_VMALLOC=y -# CONFIG_PREEMPT_RCU is not set -# CONFIG_RCU_STALL_COMMON is not set -# CONFIG_SCHED_HRTICK is not set -# CONFIG_SCSI_DMA is not set -# CONFIG_SERIAL_8250 is not set -CONFIG_SERIAL_AMBA_PL010=y -CONFIG_SERIAL_AMBA_PL010_CONSOLE=y -# CONFIG_SERIAL_AMBA_PL011 is not set -CONFIG_SPI=y -CONFIG_SPI_BITBANG=y -CONFIG_SPI_EP93XX=y -CONFIG_SPI_MASTER=y -CONFIG_SPLIT_PTLOCK_CPUS=999999 -CONFIG_SYS_SUPPORTS_APM_EMULATION=y -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TICK_CPU_ACCOUNTING=y -# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set -# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set -# CONFIG_TOUCHSCREEN_BU21013 is not set -# CONFIG_TOUCHSCREEN_DYNAPRO is not set -# CONFIG_TOUCHSCREEN_EP93XX is not set -# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set -# CONFIG_TOUCHSCREEN_MAX11801 is not set -# CONFIG_TOUCHSCREEN_PIXCIR is not set -# CONFIG_TOUCHSCREEN_ST1232 is not set -# CONFIG_TOUCHSCREEN_TSC2005 is not set -# CONFIG_TOUCHSCREEN_TSC_SERIO is not set -CONFIG_UID16=y -CONFIG_UIDGID_CONVERTED=y -CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h" -# CONFIG_USB_ARCH_HAS_EHCI is not set -# CONFIG_USB_ARCH_HAS_XHCI is not set -CONFIG_USB_SUPPORT=y -CONFIG_VECTORS_BASE=0xffff0000 -CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_VT=y -CONFIG_VT_CONSOLE=y -# CONFIG_VT_HW_CONSOLE_BINDING is not set -CONFIG_WATCHDOG_CORE=y -CONFIG_XZ_DEC_ARM=y -CONFIG_XZ_DEC_BCJ=y -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/ep93xx/config-3.14 b/target/linux/ep93xx/config-3.14 deleted file mode 100644 index f8a6829..0000000 --- a/target/linux/ep93xx/config-3.14 +++ /dev/null @@ -1,219 +0,0 @@ -CONFIG_ALIGNMENT_TRAP=y -CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y -CONFIG_ARCH_EP93XX=y -CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y -CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y -CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_ARCH_NR_GPIO=0 -CONFIG_ARCH_REQUIRE_GPIOLIB=y -# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set -# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set -CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_USES_GETTIMEOFFSET=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_ARM=y -CONFIG_ARM_AMBA=y -# CONFIG_ARM_CPU_SUSPEND is not set -CONFIG_ARM_L1_CACHE_SHIFT=5 -CONFIG_ARM_NR_BANKS=16 -CONFIG_ARM_PATCH_PHYS_VIRT=y -# CONFIG_ARM_SP805_WATCHDOG is not set -CONFIG_ARM_THUMB=y -CONFIG_ARM_VIC=y -CONFIG_ARM_VIC_NR=2 -CONFIG_ATAGS=y -# CONFIG_BLK_DEV_INITRD is not set -# CONFIG_CACHE_L2X0 is not set -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_CLKDEV_LOOKUP=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_CMDLINE="console=ttyAM0,57600 init=/etc/preinit" -CONFIG_CMDLINE_FROM_BOOTLOADER=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_CPU_32v4T=y -CONFIG_CPU_ABRT_EV4T=y -CONFIG_CPU_ARM920T=y -CONFIG_CPU_CACHE_V4WT=y -CONFIG_CPU_CACHE_VIVT=y -CONFIG_CPU_COPY_V4WB=y -CONFIG_CPU_CP15=y -CONFIG_CPU_CP15_MMU=y -# CONFIG_CPU_DCACHE_WRITETHROUGH is not set -# CONFIG_CPU_ICACHE_DISABLE is not set -CONFIG_CPU_PABRT_LEGACY=y -CONFIG_CPU_TLB_V4WBI=y -CONFIG_CPU_USE_DOMAINS=y -CONFIG_CRC7=y -CONFIG_CRC_ITU_T=y -CONFIG_CRUNCH=y -CONFIG_DEBUG_LL_INCLUDE="debug/pl01x.S" -# CONFIG_DEBUG_UART_8250 is not set -CONFIG_DEBUG_UART_PHYS=0x808c0000 -CONFIG_DEBUG_UART_PL01X=y -CONFIG_DEBUG_UART_VIRT=0xfedc0000 -# CONFIG_DEBUG_USER is not set -CONFIG_DUMMY_CONSOLE=y -# CONFIG_ENABLE_WARN_DEPRECATED is not set -CONFIG_EP93XX_ETH=y -CONFIG_EP93XX_SDCE0_PHYS_OFFSET=y -# CONFIG_EP93XX_SDCE1_PHYS_OFFSET is not set -# CONFIG_EP93XX_SDCE2_PHYS_OFFSET is not set -# CONFIG_EP93XX_SDCE3_ASYNC_PHYS_OFFSET is not set -# CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET is not set -CONFIG_EP93XX_SOC_COMMON=y -CONFIG_EP93XX_WATCHDOG=y -CONFIG_FRAME_POINTER=y -CONFIG_GENERIC_ATOMIC64=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_IDLE_POLL_SETUP=y -CONFIG_GENERIC_IO=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_SCHED_CLOCK=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_DEVRES=y -CONFIG_GPIO_EP93XX=y -CONFIG_GPIO_GENERIC=y -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_HAS_DMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_HAVE_ARCH_PFN_VALID=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_BPF_JIT=y -CONFIG_HAVE_CC_STACKPROTECTOR=y -CONFIG_HAVE_CLK=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_HAVE_DEBUG_KMEMLEAK=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_DMA_ATTRS=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_LZ4=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_NET_DSA=y -CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_HAVE_PERF_REGS=y -CONFIG_HAVE_PERF_USER_STACK_DUMP=y -CONFIG_HAVE_PROC_CPU=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_UID16=y -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_HW_CONSOLE=y -CONFIG_HZ_FIXED=0 -CONFIG_I2C=y -CONFIG_I2C_ALGOBIT=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_CHARDEV=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_INPUT=y -# CONFIG_INPUT_MISC is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_IOMMU_HELPER=y -CONFIG_IRQ_DOMAIN=y -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_IRQ_WORK=y -CONFIG_KTIME_SCALAR=y -CONFIG_LEDS_GPIO_REGISTER=y -CONFIG_LOG_BUF_SHIFT=16 -# CONFIG_MACH_EDB9302A is not set -# CONFIG_MACH_EDB9307A is not set -# CONFIG_MACH_EDB9315A is not set -CONFIG_MACH_SIM_ONE=y -# CONFIG_MACH_SNAPPER_CL15 is not set -# CONFIG_MACH_VISION_EP9307 is not set -CONFIG_MMC=y -CONFIG_MMC_BLOCK=y -CONFIG_MMC_SPI=y -CONFIG_MODULES_USE_ELF_REL=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -# CONFIG_MTD_CFI_GEOMETRY is not set -CONFIG_MTD_CFI_STAA=y -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_RAM=y -CONFIG_MULTI_IRQ_HANDLER=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NEED_KUSER_HELPERS=y -CONFIG_NEED_MACH_MEMORY_H=y -CONFIG_NEED_PER_CPU_KM=y -CONFIG_NO_BOOTMEM=y -CONFIG_OLD_SIGACTION=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_PAGE_OFFSET=0xC0000000 -# CONFIG_PCI_SYSCALL is not set -CONFIG_PERF_USE_VMALLOC=y -# CONFIG_PREEMPT_RCU is not set -# CONFIG_RCU_STALL_COMMON is not set -# CONFIG_SCHED_HRTICK is not set -# CONFIG_SCSI_DMA is not set -# CONFIG_SERIAL_8250 is not set -CONFIG_SERIAL_AMBA_PL010=y -CONFIG_SERIAL_AMBA_PL010_CONSOLE=y -# CONFIG_SERIAL_AMBA_PL011 is not set -CONFIG_SOC_BUS=y -CONFIG_SPI=y -CONFIG_SPI_BITBANG=y -CONFIG_SPI_EP93XX=y -CONFIG_SPI_MASTER=y -CONFIG_SPLIT_PTLOCK_CPUS=999999 -CONFIG_SWIOTLB=y -CONFIG_SYS_SUPPORTS_APM_EMULATION=y -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TICK_CPU_ACCOUNTING=y -# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set -# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set -# CONFIG_TOUCHSCREEN_BU21013 is not set -# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set -# CONFIG_TOUCHSCREEN_DYNAPRO is not set -# CONFIG_TOUCHSCREEN_EP93XX is not set -# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set -# CONFIG_TOUCHSCREEN_MAX11801 is not set -# CONFIG_TOUCHSCREEN_PIXCIR is not set -# CONFIG_TOUCHSCREEN_ST1232 is not set -# CONFIG_TOUCHSCREEN_TSC2005 is not set -# CONFIG_TOUCHSCREEN_TSC_SERIO is not set -CONFIG_UID16=y -CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h" -CONFIG_USB_SUPPORT=y -CONFIG_VECTORS_BASE=0xffff0000 -CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_VT=y -CONFIG_VT_CONSOLE=y -# CONFIG_VT_HW_CONSOLE_BINDING is not set -CONFIG_WATCHDOG_CORE=y -CONFIG_XZ_DEC_ARM=y -CONFIG_XZ_DEC_BCJ=y -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/ep93xx/config-3.18 b/target/linux/ep93xx/config-3.18 deleted file mode 100644 index f8a6829..0000000 --- a/target/linux/ep93xx/config-3.18 +++ /dev/null @@ -1,219 +0,0 @@ -CONFIG_ALIGNMENT_TRAP=y -CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y -CONFIG_ARCH_EP93XX=y -CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y -CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y -CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_ARCH_NR_GPIO=0 -CONFIG_ARCH_REQUIRE_GPIOLIB=y -# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set -# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set -CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_USES_GETTIMEOFFSET=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_ARM=y -CONFIG_ARM_AMBA=y -# CONFIG_ARM_CPU_SUSPEND is not set -CONFIG_ARM_L1_CACHE_SHIFT=5 -CONFIG_ARM_NR_BANKS=16 -CONFIG_ARM_PATCH_PHYS_VIRT=y -# CONFIG_ARM_SP805_WATCHDOG is not set -CONFIG_ARM_THUMB=y -CONFIG_ARM_VIC=y -CONFIG_ARM_VIC_NR=2 -CONFIG_ATAGS=y -# CONFIG_BLK_DEV_INITRD is not set -# CONFIG_CACHE_L2X0 is not set -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_CLKDEV_LOOKUP=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_CMDLINE="console=ttyAM0,57600 init=/etc/preinit" -CONFIG_CMDLINE_FROM_BOOTLOADER=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_CPU_32v4T=y -CONFIG_CPU_ABRT_EV4T=y -CONFIG_CPU_ARM920T=y -CONFIG_CPU_CACHE_V4WT=y -CONFIG_CPU_CACHE_VIVT=y -CONFIG_CPU_COPY_V4WB=y -CONFIG_CPU_CP15=y -CONFIG_CPU_CP15_MMU=y -# CONFIG_CPU_DCACHE_WRITETHROUGH is not set -# CONFIG_CPU_ICACHE_DISABLE is not set -CONFIG_CPU_PABRT_LEGACY=y -CONFIG_CPU_TLB_V4WBI=y -CONFIG_CPU_USE_DOMAINS=y -CONFIG_CRC7=y -CONFIG_CRC_ITU_T=y -CONFIG_CRUNCH=y -CONFIG_DEBUG_LL_INCLUDE="debug/pl01x.S" -# CONFIG_DEBUG_UART_8250 is not set -CONFIG_DEBUG_UART_PHYS=0x808c0000 -CONFIG_DEBUG_UART_PL01X=y -CONFIG_DEBUG_UART_VIRT=0xfedc0000 -# CONFIG_DEBUG_USER is not set -CONFIG_DUMMY_CONSOLE=y -# CONFIG_ENABLE_WARN_DEPRECATED is not set -CONFIG_EP93XX_ETH=y -CONFIG_EP93XX_SDCE0_PHYS_OFFSET=y -# CONFIG_EP93XX_SDCE1_PHYS_OFFSET is not set -# CONFIG_EP93XX_SDCE2_PHYS_OFFSET is not set -# CONFIG_EP93XX_SDCE3_ASYNC_PHYS_OFFSET is not set -# CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET is not set -CONFIG_EP93XX_SOC_COMMON=y -CONFIG_EP93XX_WATCHDOG=y -CONFIG_FRAME_POINTER=y -CONFIG_GENERIC_ATOMIC64=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_IDLE_POLL_SETUP=y -CONFIG_GENERIC_IO=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_SCHED_CLOCK=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_DEVRES=y -CONFIG_GPIO_EP93XX=y -CONFIG_GPIO_GENERIC=y -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_HAS_DMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_HAVE_ARCH_PFN_VALID=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_BPF_JIT=y -CONFIG_HAVE_CC_STACKPROTECTOR=y -CONFIG_HAVE_CLK=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_HAVE_DEBUG_KMEMLEAK=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_DMA_ATTRS=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_LZ4=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_NET_DSA=y -CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_HAVE_PERF_REGS=y -CONFIG_HAVE_PERF_USER_STACK_DUMP=y -CONFIG_HAVE_PROC_CPU=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_UID16=y -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_HW_CONSOLE=y -CONFIG_HZ_FIXED=0 -CONFIG_I2C=y -CONFIG_I2C_ALGOBIT=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_CHARDEV=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_INPUT=y -# CONFIG_INPUT_MISC is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_IOMMU_HELPER=y -CONFIG_IRQ_DOMAIN=y -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_IRQ_WORK=y -CONFIG_KTIME_SCALAR=y -CONFIG_LEDS_GPIO_REGISTER=y -CONFIG_LOG_BUF_SHIFT=16 -# CONFIG_MACH_EDB9302A is not set -# CONFIG_MACH_EDB9307A is not set -# CONFIG_MACH_EDB9315A is not set -CONFIG_MACH_SIM_ONE=y -# CONFIG_MACH_SNAPPER_CL15 is not set -# CONFIG_MACH_VISION_EP9307 is not set -CONFIG_MMC=y -CONFIG_MMC_BLOCK=y -CONFIG_MMC_SPI=y -CONFIG_MODULES_USE_ELF_REL=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -# CONFIG_MTD_CFI_GEOMETRY is not set -CONFIG_MTD_CFI_STAA=y -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_RAM=y -CONFIG_MULTI_IRQ_HANDLER=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NEED_KUSER_HELPERS=y -CONFIG_NEED_MACH_MEMORY_H=y -CONFIG_NEED_PER_CPU_KM=y -CONFIG_NO_BOOTMEM=y -CONFIG_OLD_SIGACTION=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_PAGE_OFFSET=0xC0000000 -# CONFIG_PCI_SYSCALL is not set -CONFIG_PERF_USE_VMALLOC=y -# CONFIG_PREEMPT_RCU is not set -# CONFIG_RCU_STALL_COMMON is not set -# CONFIG_SCHED_HRTICK is not set -# CONFIG_SCSI_DMA is not set -# CONFIG_SERIAL_8250 is not set -CONFIG_SERIAL_AMBA_PL010=y -CONFIG_SERIAL_AMBA_PL010_CONSOLE=y -# CONFIG_SERIAL_AMBA_PL011 is not set -CONFIG_SOC_BUS=y -CONFIG_SPI=y -CONFIG_SPI_BITBANG=y -CONFIG_SPI_EP93XX=y -CONFIG_SPI_MASTER=y -CONFIG_SPLIT_PTLOCK_CPUS=999999 -CONFIG_SWIOTLB=y -CONFIG_SYS_SUPPORTS_APM_EMULATION=y -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TICK_CPU_ACCOUNTING=y -# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set -# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set -# CONFIG_TOUCHSCREEN_BU21013 is not set -# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set -# CONFIG_TOUCHSCREEN_DYNAPRO is not set -# CONFIG_TOUCHSCREEN_EP93XX is not set -# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set -# CONFIG_TOUCHSCREEN_MAX11801 is not set -# CONFIG_TOUCHSCREEN_PIXCIR is not set -# CONFIG_TOUCHSCREEN_ST1232 is not set -# CONFIG_TOUCHSCREEN_TSC2005 is not set -# CONFIG_TOUCHSCREEN_TSC_SERIO is not set -CONFIG_UID16=y -CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h" -CONFIG_USB_SUPPORT=y -CONFIG_VECTORS_BASE=0xffff0000 -CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_VT=y -CONFIG_VT_CONSOLE=y -# CONFIG_VT_HW_CONSOLE_BINDING is not set -CONFIG_WATCHDOG_CORE=y -CONFIG_XZ_DEC_ARM=y -CONFIG_XZ_DEC_BCJ=y -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/ep93xx/config-3.8 b/target/linux/ep93xx/config-3.8 deleted file mode 100644 index dcbfc77..0000000 --- a/target/linux/ep93xx/config-3.8 +++ /dev/null @@ -1,198 +0,0 @@ -CONFIG_ALIGNMENT_TRAP=y -CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y -CONFIG_ARCH_EP93XX=y -CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y -CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y -CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y -CONFIG_ARCH_NR_GPIO=0 -CONFIG_ARCH_REQUIRE_GPIOLIB=y -# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set -# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_USES_GETTIMEOFFSET=y -# CONFIG_ARCH_VT8500_SINGLE is not set -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_ARM=y -CONFIG_ARM_AMBA=y -# CONFIG_ARM_CPU_SUSPEND is not set -CONFIG_ARM_L1_CACHE_SHIFT=5 -CONFIG_ARM_NR_BANKS=16 -CONFIG_ARM_PATCH_PHYS_VIRT=y -# CONFIG_ARM_SP805_WATCHDOG is not set -CONFIG_ARM_THUMB=y -CONFIG_ARM_VIC=y -CONFIG_ARM_VIC_NR=2 -# CONFIG_ARPD is not set -CONFIG_ATAGS=y -# CONFIG_BLK_DEV_INITRD is not set -# CONFIG_CACHE_L2X0 is not set -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_CLKDEV_LOOKUP=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_CMDLINE="console=ttyAM0,57600 init=/etc/preinit" -CONFIG_CMDLINE_FROM_BOOTLOADER=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_CPU_32v4T=y -CONFIG_CPU_ABRT_EV4T=y -CONFIG_CPU_ARM920T=y -CONFIG_CPU_CACHE_V4WT=y -CONFIG_CPU_CACHE_VIVT=y -CONFIG_CPU_COPY_V4WB=y -CONFIG_CPU_CP15=y -CONFIG_CPU_CP15_MMU=y -# CONFIG_CPU_DCACHE_WRITETHROUGH is not set -# CONFIG_CPU_ICACHE_DISABLE is not set -CONFIG_CPU_PABRT_LEGACY=y -CONFIG_CPU_TLB_V4WBI=y -CONFIG_CPU_USE_DOMAINS=y -CONFIG_CRC7=y -CONFIG_CRC_ITU_T=y -CONFIG_CRUNCH=y -CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" -# CONFIG_DEBUG_USER is not set -CONFIG_DUMMY_CONSOLE=y -# CONFIG_ENABLE_WARN_DEPRECATED is not set -CONFIG_EP93XX_EARLY_UART1=y -# CONFIG_EP93XX_EARLY_UART2 is not set -# CONFIG_EP93XX_EARLY_UART3 is not set -CONFIG_EP93XX_ETH=y -# CONFIG_EP93XX_PWM is not set -CONFIG_EP93XX_SDCE0_PHYS_OFFSET=y -# CONFIG_EP93XX_SDCE1_PHYS_OFFSET is not set -# CONFIG_EP93XX_SDCE2_PHYS_OFFSET is not set -# CONFIG_EP93XX_SDCE3_ASYNC_PHYS_OFFSET is not set -# CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET is not set -CONFIG_EP93XX_SOC_COMMON=y -CONFIG_EP93XX_WATCHDOG=y -CONFIG_FRAME_POINTER=y -CONFIG_GENERIC_ATOMIC64=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_GPIO=y -CONFIG_GENERIC_IO=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_EP93XX=y -CONFIG_GPIO_GENERIC=y -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_HAS_DMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -CONFIG_HAVE_AOUT=y -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_HAVE_ARCH_PFN_VALID=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_BPF_JIT=y -CONFIG_HAVE_CLK=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_HAVE_DEBUG_KMEMLEAK=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_DMA_ATTRS=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_HAVE_GENERIC_HARDIRQS=y -CONFIG_HAVE_IRQ_WORK=y -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_NET_DSA=y -CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_HAVE_PROC_CPU=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_UID16=y -CONFIG_HW_CONSOLE=y -CONFIG_I2C=y -CONFIG_I2C_ALGOBIT=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_CHARDEV=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_INPUT=y -# CONFIG_INPUT_MISC is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_IRQ_DOMAIN=y -CONFIG_KTIME_SCALAR=y -CONFIG_LEDS_GPIO_REGISTER=y -CONFIG_LOG_BUF_SHIFT=16 -# CONFIG_MACH_EDB9302A is not set -# CONFIG_MACH_EDB9307A is not set -# CONFIG_MACH_EDB9315A is not set -CONFIG_MACH_SIM_ONE=y -# CONFIG_MACH_SNAPPER_CL15 is not set -# CONFIG_MACH_VISION_EP9307 is not set -CONFIG_MMC=y -CONFIG_MMC_BLOCK=y -CONFIG_MMC_SPI=y -CONFIG_MODULES_USE_ELF_REL=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -# CONFIG_MTD_CFI_GEOMETRY is not set -CONFIG_MTD_CFI_STAA=y -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_RAM=y -CONFIG_MULTI_IRQ_HANDLER=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NEED_MACH_MEMORY_H=y -CONFIG_NEED_PER_CPU_KM=y -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_PAGE_OFFSET=0xC0000000 -# CONFIG_PCI_SYSCALL is not set -CONFIG_PERCPU_RWSEM=y -CONFIG_PERF_USE_VMALLOC=y -# CONFIG_PREEMPT_RCU is not set -# CONFIG_SCSI_DMA is not set -# CONFIG_SERIAL_8250 is not set -CONFIG_SERIAL_AMBA_PL010=y -CONFIG_SERIAL_AMBA_PL010_CONSOLE=y -# CONFIG_SERIAL_AMBA_PL011 is not set -CONFIG_SPI=y -CONFIG_SPI_BITBANG=y -CONFIG_SPI_EP93XX=y -CONFIG_SPI_MASTER=y -CONFIG_SPLIT_PTLOCK_CPUS=999999 -CONFIG_SYS_SUPPORTS_APM_EMULATION=y -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TICK_CPU_ACCOUNTING=y -# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set -# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set -# CONFIG_TOUCHSCREEN_BU21013 is not set -# CONFIG_TOUCHSCREEN_DYNAPRO is not set -# CONFIG_TOUCHSCREEN_EP93XX is not set -# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set -# CONFIG_TOUCHSCREEN_MAX11801 is not set -# CONFIG_TOUCHSCREEN_PIXCIR is not set -# CONFIG_TOUCHSCREEN_ST1232 is not set -# CONFIG_TOUCHSCREEN_TSC2005 is not set -# CONFIG_TOUCHSCREEN_TSC_SERIO is not set -CONFIG_UID16=y -CONFIG_UIDGID_CONVERTED=y -# CONFIG_USB_ARCH_HAS_EHCI is not set -# CONFIG_USB_ARCH_HAS_XHCI is not set -CONFIG_USB_SUPPORT=y -CONFIG_VECTORS_BASE=0xffff0000 -CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_VT=y -CONFIG_VT_CONSOLE=y -# CONFIG_VT_HW_CONSOLE_BINDING is not set -CONFIG_WATCHDOG_CORE=y -CONFIG_XZ_DEC_ARM=y -CONFIG_XZ_DEC_BCJ=y -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/ep93xx/image/Makefile b/target/linux/ep93xx/image/Makefile deleted file mode 100644 index 0d5a289..0000000 --- a/target/linux/ep93xx/image/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# -# Copyright (C) 2009-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/image.mk - -UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage -fs_squash:=squashfs-only -fs_all:=all -fs_4k:=4k -fs_64k:=64k -fs_128k:=128k - -define Image/BuildKernel - cp $(KDIR)/uImage $(UIMAGE) -ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) - cp $(KDIR)/uImage-initramfs $(UIMAGE)-initramfs -endif -endef - -define Image/Build/jffs2-64k - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=64k conv=sync -endef - -define Image/Build/jffs2-128k - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=128k conv=sync -endef - -define Image/Build/squashfs - $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=128k conv=sync -endef - -define Image/Build - $(call Image/Build/$(1),$(1)) -endef - -$(eval $(call BuildImage)) diff --git a/target/linux/ep93xx/modules.mk b/target/linux/ep93xx/modules.mk deleted file mode 100644 index 50c049d..0000000 --- a/target/linux/ep93xx/modules.mk +++ /dev/null @@ -1,103 +0,0 @@ -# -# Copyright (C) 2011-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define KernelPackage/fb-ep93xx - SUBMENU:=$(VIDEO_MENU) - TITLE:=EP93xx framebuffer support - DEPENDS:=@TARGET_ep93xx +kmod-fb +kmod-fb-cfb-fillrect \ - +kmod-fb-cfb-copyarea +kmod-fb-cfb-imgblt - KCONFIG:=CONFIG_FB_EP93XX - FILES:=$(LINUX_DIR)/drivers/video/ep93xx-fb.ko - AUTOLOAD:=$(call AutoLoad,51,ep93xx-fb) -endef - -define KernelPackage/fb-ep93xx/description - EP93xx framebuffer support -endef - -$(eval $(call KernelPackage,fb-ep93xx)) - -define KernelPackage/input-keyboard-ep93xx - SUBMENU:=$(OTHER_MENU) - TITLE:=EP93xx Matrix Keypad support - DEPENDS:=@TARGET_ep93xx +kmod-input-matrixkmap - KCONFIG:= \ - CONFIG_KEYBOARD_EP93XX \ - CONFIG_INPUT_KEYBOARD=y - FILES:=$(LINUX_DIR)/drivers/input/keyboard/ep93xx_keypad.ko - AUTOLOAD:=$(call AutoLoad,62,ep93xx_keypad) - $(call AddDepends/input) -endef - -define KernelPackage/input-keyboard-ep93xx/description - EP93xx Matrix Keypad support -endef - -$(eval $(call KernelPackage,input-keyboard-ep93xx)) - -define KernelPackage/sound-soc-ep93xx - SUBMENU:=$(SOUND_MENU) - TITLE:=EP93xx SoC sound support - DEPENDS:=@TARGET_ep93xx +kmod-sound-core +kmod-sound-soc-core - KCONFIG:=CONFIG_SND_EP93XX_SOC - FILES:=$(LINUX_DIR)/sound/soc/cirrus/snd-soc-ep93xx.ko - AUTOLOAD:=$(call AutoLoad,57,snd-soc-ep93xx) -endef - -define KernelPackage/sound-soc-ep93xx/description - EP93xx SoC sound support -endef - -$(eval $(call KernelPackage,sound-soc-ep93xx)) - -# Must be loaded prior to sound-soc-ac97 because it exports -# soc_ac97_ops -define KernelPackage/sound-soc-ep93xx-ac97 - SUBMENU:=$(SOUND_MENU) - TITLE:=EP93xx SoC AC97 support - DEPENDS:=@TARGET_ep93xx +kmod-sound-soc-core - KCONFIG:=CONFIG_SND_EP93XX_SOC_AC97 - FILES:=$(LINUX_DIR)/sound/soc/cirrus/snd-soc-ep93xx-ac97.ko - AUTOLOAD:=$(call AutoLoad,56,snd-soc-ep93xx-ac97) -endef - -define KernelPackage/sound-soc-ep93xx-ac97/description - EP93xx SoC AC97 support -endef - -$(eval $(call KernelPackage,sound-soc-ep93xx-ac97)) - -define KernelPackage/sound-soc-ep93xx-simone - SUBMENU:=$(SOUND_MENU) - TITLE:=Sim.One EP93xx Soc sound support - DEPENDS:=@TARGET_ep93xx +kmod-sound-soc-core - KCONFIG:=CONFIG_SND_EP93XX_SOC_SIMONE - FILES:=$(LINUX_DIR)/sound/soc/cirrus/snd-soc-simone.ko - AUTOLOAD:=$(call AutoLoad,59,snd-soc-ep93xx) -endef - -define KernelPackage/sound-soc-ep93xx-simone/description - SimpleMachines Sim.One sound support -endef - -$(eval $(call KernelPackage,sound-soc-ep93xx-simone)) - -define KernelPackage/touchscreen-ep93xx - SUBMENU:=$(OTHER_MENU) - TITLE:=EP93xx input touchscreen support - DEPENDS:=@TARGET_ep93xx - KCONFIG:=CONFIG_TOUCHSCREEN_EP93XX - FILES:=$(LINUX_DIR)/drivers/input/touchscreen/ep93xx_ts.ko - AUTOLOAD:=$(call AutoLoad,51,ep93xx_ts) -endef - -define KernelPackage/touchscreen-ep93xx/description - EP93xx SoC input touchscreen support -endef - -$(eval $(call KernelPackage,touchscreen-ep93xx)) - diff --git a/target/linux/ep93xx/patches-3.10/001-ep93xx_cpuinfo.patch b/target/linux/ep93xx/patches-3.10/001-ep93xx_cpuinfo.patch deleted file mode 100644 index 0183da0..0000000 --- a/target/linux/ep93xx/patches-3.10/001-ep93xx_cpuinfo.patch +++ /dev/null @@ -1,70 +0,0 @@ -This patch puts the EP93xx chip revision and unique ID into /proc/cpuinfo. -This is necessary to be able to set a unique MAC address for DHCP purposes -by adding a line to /etc/network/interfaces: - -# Generate a unique locally-assigned MAC address from the CPU serial number -pre-up ifconfig eth0 hw ether `sed -n 's/^Serial.* 000000/02/p' /proc/cpuinfo` - -It uses the chip revision reading code in the ep93xx-chip-revision patch. - -Really, this is wrong, since /proc/cpuinfo should report the revision and -serial number of the ARM920T processor, while these are the rev and serial -of the EP93xx SoC. In a future kernel (>2.6.34) there may be a new file -/proc/socinfo for this information. - - -martinwguy 14 May 2010 - ---- a/arch/arm/kernel/setup.c -+++ b/arch/arm/kernel/setup.c -@@ -56,6 +56,12 @@ - #include <asm/memblock.h> - #include <asm/virt.h> - -+#if defined(CONFIG_ARCH_EP93XX) -+#include <asm/io.h> -+#include <mach/platform.h> -+#include <mach/ep93xx-regs.h> -+#endif -+ - #include "atags.h" - - -@@ -953,9 +959,16 @@ static int c_show(struct seq_file *m, vo - } - - seq_printf(m, "Hardware\t: %s\n", machine_name); -+#if defined(CONFIG_ARCH_EP93XX) -+ seq_printf(m, "Revision\t: %04x\n", -+ ep93xx_chip_revision()); -+ seq_printf(m, "Serial\t\t: %016x\n", -+ *((unsigned int *)EP93XX_SECURITY_UNIQID)); -+#else - seq_printf(m, "Revision\t: %04x\n", system_rev); - seq_printf(m, "Serial\t\t: %08x%08x\n", - system_serial_high, system_serial_low); -+#endif - - return 0; - } ---- a/arch/arm/mach-ep93xx/soc.h -+++ b/arch/arm/mach-ep93xx/soc.h -@@ -82,8 +82,6 @@ - #define EP93XX_I2S_PHYS_BASE EP93XX_APB_PHYS(0x00020000) - #define EP93XX_I2S_BASE EP93XX_APB_IOMEM(0x00020000) - --#define EP93XX_SECURITY_BASE EP93XX_APB_IOMEM(0x00030000) -- - #define EP93XX_AAC_PHYS_BASE EP93XX_APB_PHYS(0x00080000) - #define EP93XX_AAC_BASE EP93XX_APB_IOMEM(0x00080000) - ---- a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h -+++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h -@@ -38,4 +38,8 @@ - #define EP93XX_UART3_PHYS_BASE EP93XX_APB_PHYS(0x000e0000) - #define EP93XX_UART3_BASE EP93XX_APB_IOMEM(0x000e0000) - -+#define EP93XX_SECURITY_BASE EP93XX_APB_IOMEM(0x00030000) -+#define EP93XX_SECURITY_REG(x) (EP93XX_SECURITY_BASE + (x)) -+#define EP93XX_SECURITY_UNIQID EP93XX_SECURITY_REG(0x2440) -+ - #endif diff --git a/target/linux/ep93xx/patches-3.10/003-ep93xx_touchscreen.patch b/target/linux/ep93xx/patches-3.10/003-ep93xx_touchscreen.patch deleted file mode 100644 index cbc5248..0000000 --- a/target/linux/ep93xx/patches-3.10/003-ep93xx_touchscreen.patch +++ /dev/null @@ -1,1072 +0,0 @@ ---- - arch/arm/mach-ep93xx/include/mach/hardware.h | 1 - arch/arm/mach-ep93xx/include/mach/regs_touch.h | 95 ++ - drivers/input/touchscreen/Kconfig | 5 - drivers/input/touchscreen/Makefile | 1 - drivers/input/touchscreen/ep93xx_ts.c | 1117 +++++++++++++++++++++++++ - drivers/input/touchscreen/ep93xx_ts.h | 53 + - 6 files changed, 1272 insertions(+) - ---- a/drivers/input/touchscreen/Kconfig -+++ b/drivers/input/touchscreen/Kconfig -@@ -235,6 +235,15 @@ config TOUCHSCREEN_EGALAX - To compile this driver as a module, choose M here: the - module will be called egalax_ts. - -+config TOUCHSCREEN_EP93XX -+ tristate "EP93xx Touchscreen" -+ depends on ARM && INPUT && ARCH_EP93XX -+ help -+ Say Y here to enable support for EP93xx touch screen. -+ -+ To compile this driver as a module, choose M here: -+ the module will be called ep93xx_ts. -+ - config TOUCHSCREEN_FUJITSU - tristate "Fujitsu serial touchscreen" - select SERIO ---- a/drivers/input/touchscreen/Makefile -+++ b/drivers/input/touchscreen/Makefile -@@ -29,6 +29,7 @@ obj-$(CONFIG_TOUCHSCREEN_GUNZE) += gunz - obj-$(CONFIG_TOUCHSCREEN_EETI) += eeti_ts.o - obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o - obj-$(CONFIG_TOUCHSCREEN_EGALAX) += egalax_ts.o -+obj-$(CONFIG_TOUCHSCREEN_EP93XX) += ep93xx_ts.o - obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o - obj-$(CONFIG_TOUCHSCREEN_ILI210X) += ili210x.o - obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o ---- /dev/null -+++ b/drivers/input/touchscreen/ep93xx_ts.c -@@ -0,0 +1,1022 @@ -+/* -+ * linux/drivers/input/touchscreen/ep93xx_ts.c -+ * -+ * Copyright (C) 2003-2004 Cirrus Corp. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#include <linux/module.h> -+#include <linux/types.h> -+#include <linux/delay.h> -+#include <linux/wait.h> -+#include <linux/fs.h> -+#include <linux/sched.h> -+#include <linux/poll.h> -+#include <linux/miscdevice.h> -+#include <linux/init.h> -+#include <linux/compiler.h> -+#include <linux/timer.h> -+#include <linux/interrupt.h> -+#include <linux/syscalls.h> -+#include <linux/input.h> -+#include <linux/semaphore.h> -+#include <asm/irq.h> -+#include <mach/hardware.h> -+#include <asm/io.h> -+#include "../../../arch/arm/mach-ep93xx/soc.h" -+ -+/* This stuff should be in ep93xx-regs.h */ -+#define EP93XX_TOUCHSCREEN_REG(x) (EP93XX_TOUCHSCREEN_BASE + (x)) -+/* R/W touchscreen controller setup control register. */ -+#define EP93XX_TOUCHSCREEN_SETUP EP93XX_TOUCHSCREEN_REG(0x00) -+/* R/W touchscreen controller max/min register. */ -+#define EP93XX_TOUCHSCREEN_XYMAXMIN EP93XX_TOUCHSCREEN_REG(0x04) -+/* R touchscreen controller result register. */ -+#define EP93XX_TOUCHSCREEN_XYRESULT EP93XX_TOUCHSCREEN_REG(0x08) -+/* LOCKED R/W touchscreen Switch Matrix control register. */ -+#define EP93XX_TOUCHSCREEN_DISCHARGE EP93XX_TOUCHSCREEN_REG(0x0C) -+#define EP93XX_TOUCHSCREEN_XSAMPLE EP93XX_TOUCHSCREEN_REG(0x10) -+#define EP93XX_TOUCHSCREEN_YSAMPLE EP93XX_TOUCHSCREEN_REG(0x14) -+#define EP93XX_TOUCHSCREEN_DIRECT EP93XX_TOUCHSCREEN_REG(0x18) -+#define EP93XX_TOUCHSCREEN_DETECT EP93XX_TOUCHSCREEN_REG(0x1C) -+/* NA R/W touchscreen software lock register. */ -+#define EP93XX_TOUCHSCREEN_SWLOCK EP93XX_TOUCHSCREEN_REG(0x20) -+/* R/W touchscreen setup control register #2. */ -+#define EP93XX_TOUCHSCREEN_SETUP2 EP93XX_TOUCHSCREEN_REG(0x24) -+ -+/* These are duplicated in mach-ep93xx/core.c */ -+#define EP93XX_TIMER_REG(x) (EP93XX_TIMER_BASE + (x)) -+#define EP93XX_TIMER2_LOAD EP93XX_TIMER_REG(0x20) -+#define EP93XX_TIMER2_VALUE EP93XX_TIMER_REG(0x24) -+#define EP93XX_TIMER2_CONTROL EP93XX_TIMER_REG(0x28) -+#define EP93XX_TIMER2_CLEAR EP93XX_TIMER_REG(0x2c) -+ -+/* -+ * Register bit definitions -+ */ -+#define TSSETUP_SDLY_MASK 0x000003FF -+#define TSSETUP_SDLY_SHIFT 0 -+#define TSSETUP_NSMP_4 0x00000000 -+#define TSSETUP_NSMP_8 0x00000400 -+#define TSSETUP_NSMP_16 0x00000800 -+#define TSSETUP_NSMP_32 0x00000C00 -+#define TSSETUP_NSMP_MASK 0x00000C00 -+#define TSSETUP_DEV_4 0x00000000 -+#define TSSETUP_DEV_8 0x00001000 -+#define TSSETUP_DEV_12 0x00002000 -+#define TSSETUP_DEV_16 0x00003000 -+#define TSSETUP_DEV_24 0x00004000 -+#define TSSETUP_DEV_32 0x00005000 -+#define TSSETUP_DEV_64 0x00006000 -+#define TSSETUP_DEV_128 0x00007000 -+#define TSSETUP_ENABLE 0x00008000 -+#define TSSETUP_DLY_MASK 0x03FF0000 -+#define TSSETUP_DLY_SHIFT 16 -+#define TSSETUP_TDTCT 0x80000000 -+ -+#define TSMAXMIN_XMIN_MASK 0x000000FF -+#define TSMAXMIN_XMIN_SHIFT 0 -+#define TSMAXMIN_YMIN_MASK 0x0000FF00 -+#define TSMAXMIN_YMIN_SHIFT 8 -+#define TSMAXMIN_XMAX_MASK 0x00FF0000 -+#define TSMAXMIN_XMAX_SHIFT 16 -+#define TSMAXMIN_YMAX_MASK 0xFF000000 -+#define TSMAXMIN_YMAX_SHIFT 24 -+ -+#define TSXYRESULT_X_MASK 0x00000FFF -+#define TSXYRESULT_X_SHIFT 0 -+#define TSXYRESULT_AD_MASK 0x0000FFFF -+#define TSXYRESULT_AD_SHIFT 0 -+#define TSXYRESULT_Y_MASK 0x0FFF0000 -+#define TSXYRESULT_Y_SHIFT 16 -+#define TSXYRESULT_SDR 0x80000000 -+ -+#define TSX_SAMPLE_MASK 0x00003FFF -+#define TSX_SAMPLE_SHIFT 0x00 -+#define TSY_SAMPLE_MASK 0x3FFF0000 -+#define TSY_SAMPLE_SHIFT 0x10 -+ -+#define TSSETUP2_TINT 0x00000001 -+#define TSSETUP2_NICOR 0x00000002 -+#define TSSETUP2_PINT 0x00000004 -+#define TSSETUP2_PENSTS 0x00000008 -+#define TSSETUP2_PINTEN 0x00000010 -+#define TSSETUP2_DEVINT 0x00000020 -+#define TSSETUP2_DINTEN 0x00000040 -+#define TSSETUP2_DTMEN 0x00000080 -+#define TSSETUP2_DISDEV 0x00000100 -+#define TSSETUP2_NSIGND 0x00000200 -+#define TSSETUP2_S28EN 0x00000400 -+#define TSSETUP2_RINTEN 0x00000800 -+ -+#define TSXYRESULT_SDR 0x80000000 -+ -+/* -+ * These are used as trigger levels to know when we have pen up/down. -+ * The rules: -+ * 1. TS_HEAVY_INV_PRESSURE < TS_LIGHT_INV_PRESSURE because these -+ * are Inverse pressure. -+ * 2. Any touch lighter than TS_LIGHT_INV_PRESSURE is a pen up. -+ * 3. Any touch heavier than TS_HEAVY_INV_PRESSURE is a pen down. -+ */ -+#define TS_HEAVY_INV_PRESSURE 0xFE0 /* C00 */ -+#define TS_LIGHT_INV_PRESSURE 0xFFF /* e00 */ -+ -+/* -+ * If the x, y, or inverse pressure changes more than these values -+ * between two succeeding points, the point is not reported. -+ */ -+#define TS_MAX_VALID_XY_CHANGE 0x300 -+#define TS_MAX_VALID_PRESSURE_CHANGE 0x100 -+ -+/* -+ * This is the minimum Z1 Value that is valid. -+ */ -+#define MIN_Z1_VALUE 0x50 -+ -+/* -+ * Settling delay for taking each ADC measurement. Increase this -+ * if ts is jittery. -+ */ -+#define EP93XX_TS_ADC_DELAY_USEC 2000 -+ -+/* -+ * Delay between TS points. -+ */ -+#define EP93XX_TS_PER_POINT_DELAY_USEC 10000 -+ -+/* -+ * A few more macros... -+ */ -+#define TSSETUP_DEFAULT (TSSETUP_NSMP_32 | TSSETUP_DEV_64 | \ -+ ((128<<TSSETUP_SDLY_SHIFT) & TSSETUP_SDLY_MASK) | \ -+ ((128<<TSSETUP_DLY_SHIFT) & TSSETUP_DLY_MASK)) -+ -+#define TSSETUP2_DEFAULT (TSSETUP2_NSIGND) -+ -+/* -+ * For now, we use one of the minor numbers from the local/experimental -+ * range. -+ */ -+#define EP93XX_TS_MINOR 240 -+ -+/* -+ * Static Declarations -+ */ -+static unsigned int guiLastX, guiLastY; -+static unsigned int guiLastInvPressure; -+ -+struct TouchScreenSample -+{ -+ int currentX; -+ int currentY; -+ int currentButton; -+ int currentPressure; -+ struct timeval currentTime; -+}; -+ -+/* -+ * This must match the structure in tslib. -+ */ -+struct ts_sample { -+ int x; -+ int y; -+ unsigned int pressure; -+ struct timeval tv; -+}; -+ -+static struct TouchScreenSample gSample; -+static int bFreshTouchData; -+static int bCurrentPenDown; -+ -+static DECLARE_WAIT_QUEUE_HEAD(queue); -+static DEFINE_SEMAPHORE(open_sem); -+static DEFINE_SPINLOCK(event_buffer_lock); -+static struct fasync_struct *ep93xx_fasync; -+ -+/* -+ * Typedef Declarations -+ */ -+typedef enum { -+ TS_MODE_UN_INITIALIZED, -+ TS_MODE_HARDWARE_SCAN, -+ TS_MODE_SOFT_SCAN -+} ts_mode_t; -+ -+static ts_mode_t gScanningMode; -+ -+typedef enum{ -+ TS_STATE_STOPPED = 0, -+ TS_STATE_Z1, -+ TS_STATE_Z2, -+ TS_STATE_Y, -+ TS_STATE_X, -+ TS_STATE_DONE -+} ts_states_t; -+ -+typedef struct -+{ -+ unsigned int uiX; -+ unsigned int uiY; -+ unsigned int uiZ1; -+ unsigned int uiZ2; -+ ts_states_t state; -+} ts_struct_t; -+ -+static ts_struct_t sTouch; -+ -+/* -+ * From the spec, here's how to set up the touch screen's switch registers. -+ */ -+typedef struct -+{ -+ unsigned int uiDetect; -+ unsigned int uiDischarge; -+ unsigned int uiXSample; -+ unsigned int uiYSample; -+ unsigned int uiSwitchZ1; -+ unsigned int uiSwitchZ2; -+}SwitchStructType; -+ -+/* -+ * Here's the switch settings for a 4-wire touchscreen. See the spec -+ * for how to handle a 4, 7, or 8-wire. -+ */ -+const static SwitchStructType sSwitchSettings = -+/* s28en=0 */ -+/* TSDetect TSDischarge TSXSample TSYSample SwitchZ1 SwitchZ2 */ -+ {0x00403604, 0x0007fe04, 0x00081604, 0x00104601, 0x00101601, 0x00101608}; -+ -+/* -+ * Function declarations -+ */ -+static void ep93xx_ts_set_direct(unsigned int uiADCSwitch); -+static irqreturn_t ep93xx_ts_isr(int irq, void *dev_id); -+static irqreturn_t ep93xx_timer2_isr(int irq, void *dev_id); -+static void ee93xx_ts_evt_add(int button, int dX, int dY, int Pressure); -+static ssize_t ep93xx_ts_read(struct file *filp, char *buf, -+ size_t count, loff_t *l); -+static unsigned int ep93xx_ts_poll(struct file *filp, poll_table *wait); -+static int ep93xx_ts_open(struct inode *inode, struct file *filp); -+static int ep93xx_ts_fasync(int fd, struct file *filp, int on); -+static int ep93xx_ts_release(struct inode *inode, struct file *filp); -+static ssize_t ep93xx_ts_write(struct file *file, const char *buffer, -+ size_t count, loff_t *ppos); -+static void ep93xx_ts_setup(void); -+static void ep93xx_ts_shutdown(void); -+int __init ep93xx_ts_init(void); -+void __exit ep93xx_ts_exit(void); -+static unsigned int CalculateInvPressure(void); -+static unsigned int ADCGetData(unsigned int uiSamples, unsigned int uiMaxDiff); -+static void TS_Soft_Scan_Mode(void); -+static void TS_Hardware_Scan_Mode(void); -+static void ProcessPointData(void); -+static void Set_Timer2_uSec(unsigned int Delay_mSec); -+static void Stop_Timer2(void); -+ -+/* -+ * ep93xx_ts_isr -+ */ -+static irqreturn_t ep93xx_ts_isr(int irq, void *dev_id) -+{ -+ /* -+ * Note that we don't clear the interrupt here. The interrupt -+ * gets cleared in TS_Soft_Scan_Mode when the TS ENABLE -+ * bit is cleared. -+ */ -+ -+ /* -+ * Set the ts to manual polling mode and schedule a callback. -+ * That way we can return from the isr in a reasonable amount of -+ * time and process the touch in the callback after a brief delay. -+ */ -+ TS_Soft_Scan_Mode(); -+ -+ return(IRQ_HANDLED); -+} -+ -+/* -+ * Save the current ts 'event' in an atomic fashion. -+ */ -+static void ee93xx_ts_evt_add(int buttons, int iX, int iY, int iPressure) -+{ -+ /* -+ * Note the event, but use spinlocks to keep it from getting -+ * halfway read if we get interrupted. -+ */ -+ -+ spin_lock(&event_buffer_lock); -+ -+ gSample.currentX = iX; -+ gSample.currentY = iY; -+ gSample.currentButton = buttons; -+ gSample.currentPressure = iPressure; -+ bFreshTouchData = 1; -+ do_gettimeofday(&gSample.currentTime); -+ -+ spin_unlock(&event_buffer_lock); -+ -+ kill_fasync(&ep93xx_fasync, SIGIO, POLL_IN); -+ wake_up_interruptible(&queue); -+} -+ -+ -+static ssize_t ep93xx_ts_read(struct file *filp, char *buf, size_t count, loff_t *l) -+{ -+ unsigned short data[3]; -+ struct ts_sample ts_data; -+ int iReturn = -EFAULT; -+ -+ if (!bFreshTouchData) -+ { -+ iReturn = 0; -+ } -+ else if (count == sizeof(data)) -+ { -+ spin_lock_irq(&event_buffer_lock); -+ bFreshTouchData = 0; -+ data[0] = gSample.currentX; -+ data[1] = gSample.currentY; -+ data[2] = gSample.currentButton; -+ -+ spin_unlock_irq(&event_buffer_lock); -+ -+ if (copy_to_user(buf, data, sizeof data)) -+ return -EFAULT; -+ -+ count -= sizeof(data); -+ -+ /* return the # of bytes that got read */ -+ iReturn = sizeof(data) ; -+ } -+ else if (count == sizeof(struct ts_sample) ) -+ { -+ spin_lock_irq(&event_buffer_lock); -+ bFreshTouchData = 0; -+ ts_data.x = gSample.currentX; -+ ts_data.y = gSample.currentY; -+ ts_data.pressure = gSample.currentPressure; -+ ts_data.tv = gSample.currentTime; -+ spin_unlock_irq(&event_buffer_lock); -+ -+ if (copy_to_user(buf, &ts_data, sizeof(struct ts_sample))) -+ { -+ iReturn = -EFAULT; -+ } -+ else -+ { -+ count -= sizeof(ts_data); -+ iReturn = sizeof(ts_data); -+ } -+ } -+ -+ return iReturn; -+} -+ -+static unsigned int ep93xx_ts_poll(struct file *filp, poll_table *wait) -+{ -+ poll_wait(filp, &queue, wait); -+ -+ if (bFreshTouchData) -+ { -+ return POLLIN | POLLRDNORM; -+ } -+ -+ return 0; -+} -+ -+static int ep93xx_ts_open(struct inode *inode, struct file *filp) -+{ -+ if (down_trylock(&open_sem)) -+ { -+ return -EBUSY; -+ } -+ -+ ep93xx_ts_setup(); -+ -+ return 0; -+} -+ -+/* -+ * Asynchronous I/O support. -+ */ -+static int ep93xx_ts_fasync(int fd, struct file *filp, int on) -+{ -+ int retval; -+ -+ retval = fasync_helper(fd, filp, on, &ep93xx_fasync); -+ if (retval < 0) -+ { -+ return retval; -+ } -+ -+ return 0; -+} -+ -+static int ep93xx_ts_release(struct inode *inode, struct file *filp) -+{ -+ Stop_Timer2(); -+ -+ /* -+ * Call our async I/O support to request that this file -+ * cease to be used for async I/O. -+ */ -+ ep93xx_ts_fasync(-1, filp, 0); -+ -+ ep93xx_ts_shutdown(); -+ -+ up(&open_sem); -+ -+ return 0; -+} -+ -+static ssize_t ep93xx_ts_write(struct file *file, const char *buffer, size_t count, -+ loff_t *ppos) -+{ -+ return -EINVAL; -+} -+ -+ -+static int ep93xx_ts_ioctl(struct inode *inode, struct file *file, uint command, ulong u) -+{ -+ static const int version = EV_VERSION; -+ static const u_int32_t bit =(1 << EV_ABS); -+ static const u_int32_t absbit = (1 << ABS_X) | (1 << ABS_Y) | (1 << ABS_PRESSURE); -+ int iReturn ; -+ int i = 0; -+ -+ switch(command) -+ { -+ case EVIOCGVERSION: -+ i = copy_to_user((void __user *)u, (void *)version, sizeof(version)); -+ iReturn = i ? -EFAULT : 0; -+ break; -+ -+ case EVIOCGBIT(0,sizeof(u_int32_t) * 8) : -+ i = copy_to_user((void __user *)u, (void *)bit, sizeof(bit)); -+ iReturn = i ? -EFAULT : 0; -+ break; -+ -+ case EVIOCGBIT(EV_ABS, sizeof(absbit) * 8): -+ i = copy_to_user((void __user *)u, (void *)absbit, sizeof(absbit)); -+ iReturn = i ? -EFAULT : 0; -+ break; -+ default: -+ iReturn = -1; -+ break; -+ } -+ -+ return iReturn; -+} -+ -+static struct file_operations ep93xx_ts_fops = { -+ owner: THIS_MODULE, -+ read: ep93xx_ts_read, -+ write: ep93xx_ts_write, -+ poll: ep93xx_ts_poll, -+ open: ep93xx_ts_open, -+ unlocked_ioctl: ep93xx_ts_ioctl, -+ release: ep93xx_ts_release, -+ fasync: ep93xx_ts_fasync, -+}; -+ -+static struct miscdevice ep93xx_ts_miscdev = -+{ -+ EP93XX_TS_MINOR, -+ "ep93xx_ts", -+ &ep93xx_ts_fops -+}; -+ -+void ep93xx_ts_setup(void) -+{ -+ unsigned int uiKTDIV, uiTSXYMaxMin; -+ -+ /* -+ * Set the TSEN bit in KTDIV so that we are enabling the clock -+ * for the touchscreen. -+ */ -+ uiKTDIV = __raw_readl(EP93XX_SYSCON_KEYTCHCLKDIV); -+ uiKTDIV |= EP93XX_SYSCON_KEYTCHCLKDIV_TSEN; -+ ep93xx_syscon_swlocked_write(uiKTDIV, EP93XX_SYSCON_KEYTCHCLKDIV); -+ -+ /* -+ * Program the EP93XX_TOUCHSCREEN_SETUP and TSSetup2 registers. -+ */ -+ __raw_writel(TSSETUP_DEFAULT, EP93XX_TOUCHSCREEN_SETUP); -+ __raw_writel(TSSETUP2_DEFAULT, EP93XX_TOUCHSCREEN_SETUP2); -+ -+ /* -+ * Set the the touch settings. -+ */ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiDischarge, EP93XX_TOUCHSCREEN_DIRECT); -+ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiDischarge, EP93XX_TOUCHSCREEN_DISCHARGE); -+ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiSwitchZ1, EP93XX_TOUCHSCREEN_XSAMPLE); -+ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiSwitchZ2, EP93XX_TOUCHSCREEN_YSAMPLE); -+ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiDetect, EP93XX_TOUCHSCREEN_DETECT); -+ -+ /* -+ * X,YMin set to 0x40 = have to drag that many pixels for a new irq. -+ * X,YMax set to 0x40 = 1024 pixels is the maximum movement within the -+ * time scan limit. -+ */ -+ uiTSXYMaxMin = (50 << TSMAXMIN_XMIN_SHIFT) & TSMAXMIN_XMIN_MASK; -+ uiTSXYMaxMin |= (50 << TSMAXMIN_YMIN_SHIFT) & TSMAXMIN_YMIN_MASK; -+ uiTSXYMaxMin |= (0xff << TSMAXMIN_XMAX_SHIFT) & TSMAXMIN_XMAX_MASK; -+ uiTSXYMaxMin |= (0xff << TSMAXMIN_YMAX_SHIFT) & TSMAXMIN_YMAX_MASK; -+ __raw_writel(uiTSXYMaxMin, EP93XX_TOUCHSCREEN_XYMAXMIN); -+ -+ bCurrentPenDown = 0; -+ bFreshTouchData = 0; -+ guiLastX = 0; -+ guiLastY = 0; -+ guiLastInvPressure = 0xffffff; -+ -+ /* -+ * Enable the touch screen scanning engine. -+ */ -+ TS_Hardware_Scan_Mode(); -+} -+ -+/* -+ * ep93xx_ts_shutdown -+ * -+ */ -+static void -+ep93xx_ts_shutdown(void) -+{ -+ unsigned int uiKTDIV; -+ -+ sTouch.state = TS_STATE_STOPPED; -+ Stop_Timer2(); -+ -+ /* -+ * Disable the scanning engine. -+ */ -+ __raw_writel(0, EP93XX_TOUCHSCREEN_SETUP); -+ __raw_writel(0, EP93XX_TOUCHSCREEN_SETUP2); -+ -+ /* -+ * Clear the TSEN bit in KTDIV so that we are disabling the clock -+ * for the touchscreen. -+ */ -+ uiKTDIV = __raw_readl(EP93XX_SYSCON_KEYTCHCLKDIV); -+ uiKTDIV &= ~EP93XX_SYSCON_KEYTCHCLKDIV_TSEN; -+ ep93xx_syscon_swlocked_write(uiKTDIV, EP93XX_SYSCON_KEYTCHCLKDIV); -+ -+} /* ep93xx_ts_shutdown */ -+ -+static irqreturn_t ep93xx_timer2_isr(int irq, void *dev_id) -+{ -+ switch(sTouch.state) -+ { -+ case TS_STATE_STOPPED: -+ TS_Hardware_Scan_Mode(); -+ break; -+ -+ /* -+ * Get the Z1 value for pressure measurement and set up -+ * the switch register for getting the Z2 measurement. -+ */ -+ case TS_STATE_Z1: -+ Set_Timer2_uSec(EP93XX_TS_ADC_DELAY_USEC); -+ sTouch.uiZ1 = ADCGetData(2, 200); -+ ep93xx_ts_set_direct(sSwitchSettings.uiSwitchZ2); -+ sTouch.state = TS_STATE_Z2; -+ break; -+ -+ /* -+ * Get the Z2 value for pressure measurement and set up -+ * the switch register for getting the Y measurement. -+ */ -+ case TS_STATE_Z2: -+ sTouch.uiZ2 = ADCGetData(2, 200); -+ ep93xx_ts_set_direct(sSwitchSettings.uiYSample); -+ sTouch.state = TS_STATE_Y; -+ break; -+ -+ /* -+ * Get the Y value and set up the switch register for -+ * getting the X measurement. -+ */ -+ case TS_STATE_Y: -+ sTouch.uiY = ADCGetData(4, 20); -+ ep93xx_ts_set_direct(sSwitchSettings.uiXSample); -+ sTouch.state = TS_STATE_X; -+ break; -+ -+ /* -+ * Read the X value. This is the last of the 4 adc values -+ * we need so we continue on to process the data. -+ */ -+ case TS_STATE_X: -+ Stop_Timer2(); -+ -+ sTouch.uiX = ADCGetData(4, 20); -+ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiDischarge, EP93XX_TOUCHSCREEN_DIRECT); -+ -+ sTouch.state = TS_STATE_DONE; -+ -+ /* -+ * Process this set of ADC readings. -+ */ -+ ProcessPointData(); -+ -+ break; -+ -+ /* -+ * Shouldn't get here. But if we do, we can recover... -+ */ -+ case TS_STATE_DONE: -+ TS_Hardware_Scan_Mode(); -+ break; -+ } -+ -+ /* -+ * Clear the timer2 interrupt. -+ */ -+ __raw_writel(1, EP93XX_TIMER2_CLEAR); -+ return(IRQ_HANDLED); -+} -+ -+/*--------------------------------------------------------------------- -+ * ProcessPointData -+ * -+ * This routine processes the ADC data into usable point data and then -+ * puts the driver into hw or sw scanning mode before returning. -+ * -+ * We calculate inverse pressure (lower number = more pressure) then -+ * do a hystheresis with the two pressure values 'light' and 'heavy'. -+ * -+ * If we are above the light, we have pen up. -+ * If we are below the heavy we have pen down. -+ * As long as the pressure stays below the light, pen stays down. -+ * When we get above the light again, pen goes back up. -+ * -+ */ -+static void ProcessPointData(void) -+{ -+ int bValidPoint = 0; -+ unsigned int uiXDiff, uiYDiff, uiInvPressureDiff; -+ unsigned int uiInvPressure; -+ -+ /* -+ * Calculate the current pressure. -+ */ -+ uiInvPressure = CalculateInvPressure(); -+ -+ /* -+ * If pen pressure is so light that it is greater than the 'max' setting -+ * then we consider this to be a pen up. -+ */ -+ if (uiInvPressure >= TS_LIGHT_INV_PRESSURE) -+ { -+ bCurrentPenDown = 0; -+ ee93xx_ts_evt_add(0, guiLastX, guiLastY, 0); -+ TS_Hardware_Scan_Mode(); -+ return; -+ } -+ -+ /* -+ * Hysteresis: -+ * If the pen pressure is hard enough to be less than the 'min' OR -+ * the pen is already down and is still less than the 'max'... -+ */ -+ if ((uiInvPressure < TS_HEAVY_INV_PRESSURE) || -+ (bCurrentPenDown && (uiInvPressure < TS_LIGHT_INV_PRESSURE))) -+ { -+ if (bCurrentPenDown) -+ { -+ /* -+ * If pen was previously down, check the difference between -+ * the last sample and this one... if the difference between -+ * samples is too great, ignore the sample. -+ */ -+ uiXDiff = abs(guiLastX - sTouch.uiX); -+ uiYDiff = abs(guiLastY - sTouch.uiY); -+ uiInvPressureDiff = abs(guiLastInvPressure - uiInvPressure); -+ -+ if (uiXDiff < TS_MAX_VALID_XY_CHANGE -+ && uiYDiff < TS_MAX_VALID_XY_CHANGE -+ && uiInvPressureDiff < TS_MAX_VALID_PRESSURE_CHANGE) -+ { -+ bValidPoint = 1; -+ } -+ } -+ else -+ { -+ bValidPoint = 1; -+ } -+ -+ /* -+ * If either the pen was put down or dragged make a note of it. -+ */ -+ if (bValidPoint) -+ { -+ guiLastX = sTouch.uiX; -+ guiLastY = sTouch.uiY; -+ guiLastInvPressure = uiInvPressure; -+ bCurrentPenDown = 1; -+ ee93xx_ts_evt_add(1, sTouch.uiX, sTouch.uiY, -+ 0x7000000 / uiInvPressure); -+ } -+ -+ TS_Soft_Scan_Mode(); -+ return; -+ } -+ -+ TS_Hardware_Scan_Mode(); -+} -+ -+static void ep93xx_ts_set_direct(unsigned int uiADCSwitch) -+{ -+ unsigned int uiResult; -+ -+ /* -+ * Set the switch settings in the direct register. -+ */ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(uiADCSwitch, EP93XX_TOUCHSCREEN_DIRECT); -+ -+ /* -+ * Read and throw away the first sample. -+ */ -+ do { -+ uiResult = __raw_readl(EP93XX_TOUCHSCREEN_XYRESULT); -+ } while (!(uiResult & TSXYRESULT_SDR)); -+ -+} -+ -+static unsigned int ADCGetData(unsigned int uiSamples, unsigned int uiMaxDiff) -+{ -+ unsigned int uiResult, uiValue, uiCount, uiLowest, uiHighest, uiSum, uiAve; -+ -+ do -+ { -+ /* -+ * Initialize our values. -+ */ -+ uiLowest = 0xfffffff; -+ uiHighest = 0; -+ uiSum = 0; -+ -+ for (uiCount = 0; uiCount < uiSamples; uiCount++) -+ { -+ /* -+ * Read the touch screen four more times and average. -+ */ -+ do { -+ uiResult = __raw_readl(EP93XX_TOUCHSCREEN_XYRESULT); -+ } while (!(uiResult & TSXYRESULT_SDR)); -+ -+ uiValue = (uiResult & TSXYRESULT_AD_MASK) >> TSXYRESULT_AD_SHIFT; -+ uiValue = ((uiValue >> 4) + ((1 + TSXYRESULT_X_MASK)>>1)) & TSXYRESULT_X_MASK; -+ -+ /* -+ * Add up the values. -+ */ -+ uiSum += uiValue; -+ -+ /* -+ * Get the lowest and highest values. -+ */ -+ if (uiValue < uiLowest) -+ { -+ uiLowest = uiValue; -+ } -+ if (uiValue > uiHighest) -+ { -+ uiHighest = uiValue; -+ } -+ } -+ } while ((uiHighest - uiLowest) > uiMaxDiff); -+ -+ /* -+ * Calculate the Average value. -+ */ -+ uiAve = uiSum / uiSamples; -+ -+ return uiAve; -+} -+ -+/* -+ * CalculateInvPressure -+ * -+ * Is the Touch Valid. Touch is not valid if the X or Y value is not -+ * in range and the pressure is not enough. -+ * -+ * Touch resistance can be measured by the following formula: -+ * -+ * Rx * X * Z2 -+ * Rtouch = --------- * (-- - 1) -+ * 4096 Z1 -+ * -+ * This is simplified in the ration of Rtouch to Rx. The lower the value, the -+ * higher the pressure. -+ * -+ * Z2 -+ * InvPressure = X * (-- - 1) -+ * Z1 -+ */ -+static unsigned int CalculateInvPressure(void) -+{ -+ unsigned int uiInvPressure; -+ -+ /* -+ * Check to see if the point is valid. -+ */ -+ if (sTouch.uiZ1 < MIN_Z1_VALUE) -+ { -+ uiInvPressure = 0x10000; -+ } -+ -+ /* -+ * Can omit the pressure calculation if you need to get rid of the division. -+ */ -+ else -+ { -+ uiInvPressure = ((sTouch.uiX * sTouch.uiZ2) / sTouch.uiZ1) - sTouch.uiX; -+ } -+ -+ return uiInvPressure; -+} -+ -+/* -+ * TS_Hardware_Scan_Mode -+ * -+ * Enables the ep93xx ts scanning engine so that when the pen goes down -+ * we will get an interrupt. -+ */ -+static void TS_Hardware_Scan_Mode(void) -+{ -+ unsigned int uiDevCfg; -+ -+ /* -+ * Disable the soft scanning engine. -+ */ -+ sTouch.state = TS_STATE_STOPPED; -+ Stop_Timer2(); -+ -+ /* -+ * Clear the TIN (Touchscreen INactive) bit so we can go to -+ * automatic scanning mode. -+ */ -+ uiDevCfg = __raw_readl(EP93XX_SYSCON_DEVCFG); -+ ep93xx_syscon_swlocked_write(uiDevCfg & ~EP93XX_SYSCON_DEVCFG_TIN, -+ EP93XX_SYSCON_DEVCFG); -+ -+ /* -+ * Enable the touch screen scanning state machine by setting -+ * the ENABLE bit. -+ */ -+ __raw_writel(TSSETUP_DEFAULT | TSSETUP_ENABLE, EP93XX_TOUCHSCREEN_SETUP); -+ -+ /* -+ * Set the flag to show that we are in interrupt mode. -+ */ -+ gScanningMode = TS_MODE_HARDWARE_SCAN; -+ -+ /* -+ * Initialize EP93XX_TOUCHSCREEN_SETUP2 register. -+ */ -+ __raw_writel(TSSETUP2_DEFAULT, EP93XX_TOUCHSCREEN_SETUP2); -+ -+} -+ -+/* -+ * TS_Soft_Scan_Mode -+ * -+ * Sets the touch screen to manual polling mode. -+ */ -+static void TS_Soft_Scan_Mode(void) -+{ -+ unsigned int uiDevCfg; -+ -+ if (gScanningMode != TS_MODE_SOFT_SCAN) -+ { -+ /* -+ * Disable the touch screen scanning state machine by clearing -+ * the ENABLE bit. -+ */ -+ __raw_writel(TSSETUP_DEFAULT, EP93XX_TOUCHSCREEN_SETUP); -+ -+ /* -+ * Set the TIN bit so we can do manual touchscreen polling. -+ */ -+ uiDevCfg = __raw_readl(EP93XX_SYSCON_DEVCFG); -+ ep93xx_syscon_swlocked_write(uiDevCfg | EP93XX_SYSCON_DEVCFG_TIN, -+ EP93XX_SYSCON_DEVCFG); -+ } -+ -+ /* -+ * Set the switch register up for the first ADC reading -+ */ -+ ep93xx_ts_set_direct(sSwitchSettings.uiSwitchZ1); -+ -+ /* -+ * Initialize our software state machine to know which ADC -+ * reading to take -+ */ -+ sTouch.state = TS_STATE_Z1; -+ -+ /* -+ * Set the timer so after a mSec or two settling delay it will -+ * take the first ADC reading. -+ */ -+ Set_Timer2_uSec(EP93XX_TS_PER_POINT_DELAY_USEC); -+ -+ /* -+ * Note that we are in sw scanning mode not hw scanning mode. -+ */ -+ gScanningMode = TS_MODE_SOFT_SCAN; -+ -+} -+ -+static void Set_Timer2_uSec(unsigned int uiDelay_uSec) -+{ -+ unsigned int uiClockTicks; -+ -+ /* -+ * Stop timer 2 -+ */ -+ __raw_writel(0, EP93XX_TIMER2_CONTROL); -+ -+ uiClockTicks = ((uiDelay_uSec * 508) + 999) / 1000; -+ __raw_writel(uiClockTicks, EP93XX_TIMER2_LOAD); -+ __raw_writel(uiClockTicks, EP93XX_TIMER2_VALUE); -+ -+ /* -+ * Set up Timer 2 for 508 kHz clock and periodic mode. -+ */ -+ __raw_writel(0xC8, EP93XX_TIMER2_CONTROL); -+ -+} -+ -+static void Stop_Timer2(void) -+{ -+ __raw_writel(0, EP93XX_TIMER2_CONTROL); -+} -+ -+/* -+ * Initialization and exit routines -+ */ -+int __init ep93xx_ts_init(void) -+{ -+ int retval; -+ -+ retval = request_irq(IRQ_EP93XX_TOUCH, ep93xx_ts_isr, -+ IRQF_DISABLED, "ep93xx_ts", 0); -+ if (retval) -+ { -+ printk(KERN_WARNING "ep93xx_ts: failed to get touchscreen IRQ\n"); -+ return retval; -+ } -+ -+ retval = request_irq(IRQ_EP93XX_TIMER2, ep93xx_timer2_isr, -+ IRQF_DISABLED, "ep93xx_timer2", 0); -+ if (retval) -+ { -+ printk(KERN_WARNING "ep93xx_ts: failed to get timer2 IRQ\n"); -+ free_irq(IRQ_EP93XX_TOUCH, 0); -+ return retval; -+ } -+ -+ misc_register(&ep93xx_ts_miscdev); -+ -+ sTouch.state = TS_STATE_STOPPED; -+ gScanningMode = TS_MODE_UN_INITIALIZED; -+ -+ printk(KERN_NOTICE "ep93xx touchscreen driver configured for 4-wire operation\n"); -+ -+ return 0; -+} -+ -+void __exit ep93xx_ts_exit(void) -+{ -+ Stop_Timer2(); -+ -+ free_irq(IRQ_EP93XX_TOUCH, 0); -+ free_irq(IRQ_EP93XX_TIMER2, 0); -+ -+ misc_deregister(&ep93xx_ts_miscdev); -+} -+ -+module_init(ep93xx_ts_init); -+module_exit(ep93xx_ts_exit); -+ -+MODULE_DESCRIPTION("Cirrus EP93xx touchscreen driver"); -+MODULE_SUPPORTED_DEVICE("touchscreen/ep93xx"); -+MODULE_LICENSE("GPL"); ---- a/arch/arm/mach-ep93xx/core.c -+++ b/arch/arm/mach-ep93xx/core.c -@@ -207,6 +207,7 @@ void ep93xx_syscon_swlocked_write(unsign - - spin_unlock_irqrestore(&syscon_swlock, flags); - } -+EXPORT_SYMBOL(ep93xx_syscon_swlocked_write); - - void ep93xx_devcfg_set_clear(unsigned int set_bits, unsigned int clear_bits) - { diff --git a/target/linux/ep93xx/patches-3.10/004-simone_add_mmc_spi.patch b/target/linux/ep93xx/patches-3.10/004-simone_add_mmc_spi.patch deleted file mode 100644 index 3e6b0fa..0000000 --- a/target/linux/ep93xx/patches-3.10/004-simone_add_mmc_spi.patch +++ /dev/null @@ -1,178 +0,0 @@ -This enables the mmc-over-spi driver for the Sim.One board, based on Mika's -patch, which used a GPIO for chip select in stead of the default SFRMOUT pin. -I've modified it to use the usual SFRMOUT; if you've modified your Sim.One -board to use a GPIO instead, uncomment and modify -// #define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO15 -in the source file. - -martinwguy, 14 May 2010 - -From: Mika Westerberg <mika.westerberg@iki.fi> -Date: Wed, 28 Apr 2010 08:42:46 +0300 -Subject: [PATCH] ep93xx: simone: added board specific SPI support for MMC/SD cards - -This includes setting up EGPIOs 0 and 9 for card detection and chip select -respectively. - ---- a/arch/arm/mach-ep93xx/simone.c -+++ b/arch/arm/mach-ep93xx/simone.c -@@ -20,10 +20,15 @@ - #include <linux/platform_device.h> - #include <linux/i2c.h> - #include <linux/i2c-gpio.h> -+#include <linux/gpio.h> -+#include <linux/mmc/host.h> -+#include <linux/spi/spi.h> -+#include <linux/spi/mmc_spi.h> - - #include <mach/hardware.h> - #include <linux/platform_data/video-ep93xx.h> - #include <mach/gpio-ep93xx.h> -+#include <linux/platform_data/spi-ep93xx.h> - - #include <asm/mach-types.h> - #include <asm/mach/arch.h> -@@ -40,6 +45,135 @@ static struct ep93xxfb_mach_info __initd - .flags = EP93XXFB_USE_SDCSN0 | EP93XXFB_PCLK_FALLING, - }; - -+/* -+ * GPIO lines used for MMC card detection. -+ */ -+#define MMC_CARD_DETECT_GPIO EP93XX_GPIO_LINE_EGPIO0 -+ -+/* -+ * If you have hacked your Sim.One to use a GPIO as SD card chip select -+ * (SD pin 1), uncomment the following line. -+ * The example, EGPIO15, is on TP17 near the CPU. -+ */ -+// #define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO15 -+ -+/* -+ * MMC SPI chip select GPIO handling. If you are using SFRMOUT (SFRM1) signal, -+ * you can leave these empty and pass NULL as .controller_data. -+ */ -+ -+#ifdef MMC_CHIP_SELECT_GPIO -+static int simone_mmc_spi_setup(struct spi_device *spi) -+{ -+ unsigned int gpio = MMC_CHIP_SELECT_GPIO; -+ int err; -+ -+ err = gpio_request(gpio, spi->modalias); -+ if (err) -+ return err; -+ -+ err = gpio_direction_output(gpio, 1); -+ if (err) { -+ gpio_free(gpio); -+ return err; -+ } -+ -+ return 0; -+} -+ -+static void simone_mmc_spi_cleanup(struct spi_device *spi) -+{ -+ unsigned int gpio = MMC_CHIP_SELECT_GPIO; -+ -+ gpio_set_value(gpio, 1); -+ gpio_direction_input(gpio); -+ gpio_free(gpio); -+} -+ -+static void simone_mmc_spi_cs_control(struct spi_device *spi, int value) -+{ -+ gpio_set_value(MMC_CHIP_SELECT_GPIO, value); -+} -+ -+static struct ep93xx_spi_chip_ops simone_mmc_spi_ops = { -+ .setup = simone_mmc_spi_setup, -+ .cleanup = simone_mmc_spi_cleanup, -+ .cs_control = simone_mmc_spi_cs_control, -+}; -+#endif -+ -+/* -+ * MMC card detection GPIO setup. -+ */ -+static int simone_mmc_spi_init(struct device *dev, -+ irqreturn_t (*irq_handler)(int, void *), void *mmc) -+{ -+ unsigned int gpio = MMC_CARD_DETECT_GPIO; -+ int irq, err; -+ -+ err = gpio_request(gpio, dev_name(dev)); -+ if (err) -+ return err; -+ -+ err = gpio_direction_input(gpio); -+ if (err) -+ goto fail; -+ -+ irq = gpio_to_irq(gpio); -+ if (irq < 0) -+ goto fail; -+ -+ err = request_irq(irq, irq_handler, IRQF_TRIGGER_FALLING, -+ "MMC card detect", mmc); -+ if (err) -+ goto fail; -+ -+ printk(KERN_INFO "%s: using irq %d for MMC card detection\n", -+ dev_name(dev), irq); -+ -+ return 0; -+fail: -+ gpio_free(gpio); -+ return err; -+} -+ -+static void simone_mmc_spi_exit(struct device *dev, void *mmc) -+{ -+ unsigned int gpio = MMC_CARD_DETECT_GPIO; -+ -+ free_irq(gpio_to_irq(gpio), mmc); -+ gpio_free(gpio); -+} -+ -+static struct mmc_spi_platform_data simone_mmc_spi_data = { -+ .init = simone_mmc_spi_init, -+ .exit = simone_mmc_spi_exit, -+ .detect_delay = 500, -+ .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, -+}; -+ -+static struct spi_board_info simone_spi_devices[] __initdata = { -+ { -+ .modalias = "mmc_spi", -+#ifdef MMC_CHIP_SELECT_GPIO -+ .controller_data = &simone_mmc_spi_ops, -+#endif -+ .platform_data = &simone_mmc_spi_data, -+ /* -+ * We use 10 MHz even though the maximum is 3.7 MHz. The driver -+ * will limit it automatically to max. frequency. -+ */ -+ .max_speed_hz = 10 * 1000 * 1000, -+ .bus_num = 0, -+ .chip_select = 0, -+ .mode = SPI_MODE_3, -+ }, -+}; -+ -+static struct ep93xx_spi_info simone_spi_info __initdata = { -+ .num_chipselect = ARRAY_SIZE(simone_spi_devices), -+}; -+ - static struct i2c_gpio_platform_data __initdata simone_i2c_gpio_data = { - .sda_pin = EP93XX_GPIO_LINE_EEDAT, - .sda_is_open_drain = 0, -@@ -74,6 +208,8 @@ static void __init simone_init_machine(v - ep93xx_register_fb(&simone_fb_info); - ep93xx_register_i2c(&simone_i2c_gpio_data, simone_i2c_board_info, - ARRAY_SIZE(simone_i2c_board_info)); -+ ep93xx_register_spi(&simone_spi_info, simone_spi_devices, -+ ARRAY_SIZE(simone_spi_devices)); - simone_register_audio(); - } - diff --git a/target/linux/ep93xx/patches-3.14/001-ep93xx_cpuinfo.patch b/target/linux/ep93xx/patches-3.14/001-ep93xx_cpuinfo.patch deleted file mode 100644 index 45187b3..0000000 --- a/target/linux/ep93xx/patches-3.14/001-ep93xx_cpuinfo.patch +++ /dev/null @@ -1,70 +0,0 @@ -This patch puts the EP93xx chip revision and unique ID into /proc/cpuinfo. -This is necessary to be able to set a unique MAC address for DHCP purposes -by adding a line to /etc/network/interfaces: - -# Generate a unique locally-assigned MAC address from the CPU serial number -pre-up ifconfig eth0 hw ether `sed -n 's/^Serial.* 000000/02/p' /proc/cpuinfo` - -It uses the chip revision reading code in the ep93xx-chip-revision patch. - -Really, this is wrong, since /proc/cpuinfo should report the revision and -serial number of the ARM920T processor, while these are the rev and serial -of the EP93xx SoC. In a future kernel (>2.6.34) there may be a new file -/proc/socinfo for this information. - - -martinwguy 14 May 2010 - ---- a/arch/arm/kernel/setup.c -+++ b/arch/arm/kernel/setup.c -@@ -57,6 +57,12 @@ - #include <asm/memblock.h> - #include <asm/virt.h> - -+#if defined(CONFIG_ARCH_EP93XX) -+#include <asm/io.h> -+#include <mach/platform.h> -+#include <mach/ep93xx-regs.h> -+#endif -+ - #include "atags.h" - - -@@ -1052,9 +1058,16 @@ static int c_show(struct seq_file *m, vo - } - - seq_printf(m, "Hardware\t: %s\n", machine_name); -+#if defined(CONFIG_ARCH_EP93XX) -+ seq_printf(m, "Revision\t: %04x\n", -+ ep93xx_chip_revision()); -+ seq_printf(m, "Serial\t\t: %016x\n", -+ *((unsigned int *)EP93XX_SECURITY_UNIQID)); -+#else - seq_printf(m, "Revision\t: %04x\n", system_rev); - seq_printf(m, "Serial\t\t: %08x%08x\n", - system_serial_high, system_serial_low); -+#endif - - return 0; - } ---- a/arch/arm/mach-ep93xx/soc.h -+++ b/arch/arm/mach-ep93xx/soc.h -@@ -82,8 +82,6 @@ - #define EP93XX_I2S_PHYS_BASE EP93XX_APB_PHYS(0x00020000) - #define EP93XX_I2S_BASE EP93XX_APB_IOMEM(0x00020000) - --#define EP93XX_SECURITY_BASE EP93XX_APB_IOMEM(0x00030000) -- - #define EP93XX_AAC_PHYS_BASE EP93XX_APB_PHYS(0x00080000) - #define EP93XX_AAC_BASE EP93XX_APB_IOMEM(0x00080000) - ---- a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h -+++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h -@@ -38,4 +38,8 @@ - #define EP93XX_UART3_PHYS_BASE EP93XX_APB_PHYS(0x000e0000) - #define EP93XX_UART3_BASE EP93XX_APB_IOMEM(0x000e0000) - -+#define EP93XX_SECURITY_BASE EP93XX_APB_IOMEM(0x00030000) -+#define EP93XX_SECURITY_REG(x) (EP93XX_SECURITY_BASE + (x)) -+#define EP93XX_SECURITY_UNIQID EP93XX_SECURITY_REG(0x2440) -+ - #endif diff --git a/target/linux/ep93xx/patches-3.14/003-ep93xx_touchscreen.patch b/target/linux/ep93xx/patches-3.14/003-ep93xx_touchscreen.patch deleted file mode 100644 index 830f3eb..0000000 --- a/target/linux/ep93xx/patches-3.14/003-ep93xx_touchscreen.patch +++ /dev/null @@ -1,1072 +0,0 @@ ---- - arch/arm/mach-ep93xx/include/mach/hardware.h | 1 - arch/arm/mach-ep93xx/include/mach/regs_touch.h | 95 ++ - drivers/input/touchscreen/Kconfig | 5 - drivers/input/touchscreen/Makefile | 1 - drivers/input/touchscreen/ep93xx_ts.c | 1117 +++++++++++++++++++++++++ - drivers/input/touchscreen/ep93xx_ts.h | 53 + - 6 files changed, 1272 insertions(+) - ---- a/drivers/input/touchscreen/Kconfig -+++ b/drivers/input/touchscreen/Kconfig -@@ -265,6 +265,15 @@ config TOUCHSCREEN_EGALAX - To compile this driver as a module, choose M here: the - module will be called egalax_ts. - -+config TOUCHSCREEN_EP93XX -+ tristate "EP93xx Touchscreen" -+ depends on ARM && INPUT && ARCH_EP93XX -+ help -+ Say Y here to enable support for EP93xx touch screen. -+ -+ To compile this driver as a module, choose M here: -+ the module will be called ep93xx_ts. -+ - config TOUCHSCREEN_FUJITSU - tristate "Fujitsu serial touchscreen" - select SERIO ---- a/drivers/input/touchscreen/Makefile -+++ b/drivers/input/touchscreen/Makefile -@@ -32,6 +32,7 @@ obj-$(CONFIG_TOUCHSCREEN_GUNZE) += gunz - obj-$(CONFIG_TOUCHSCREEN_EETI) += eeti_ts.o - obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o - obj-$(CONFIG_TOUCHSCREEN_EGALAX) += egalax_ts.o -+obj-$(CONFIG_TOUCHSCREEN_EP93XX) += ep93xx_ts.o - obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o - obj-$(CONFIG_TOUCHSCREEN_ILI210X) += ili210x.o - obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o ---- /dev/null -+++ b/drivers/input/touchscreen/ep93xx_ts.c -@@ -0,0 +1,1022 @@ -+/* -+ * linux/drivers/input/touchscreen/ep93xx_ts.c -+ * -+ * Copyright (C) 2003-2004 Cirrus Corp. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#include <linux/module.h> -+#include <linux/types.h> -+#include <linux/delay.h> -+#include <linux/wait.h> -+#include <linux/fs.h> -+#include <linux/sched.h> -+#include <linux/poll.h> -+#include <linux/miscdevice.h> -+#include <linux/init.h> -+#include <linux/compiler.h> -+#include <linux/timer.h> -+#include <linux/interrupt.h> -+#include <linux/syscalls.h> -+#include <linux/input.h> -+#include <linux/semaphore.h> -+#include <asm/irq.h> -+#include <mach/hardware.h> -+#include <asm/io.h> -+#include "../../../arch/arm/mach-ep93xx/soc.h" -+ -+/* This stuff should be in ep93xx-regs.h */ -+#define EP93XX_TOUCHSCREEN_REG(x) (EP93XX_TOUCHSCREEN_BASE + (x)) -+/* R/W touchscreen controller setup control register. */ -+#define EP93XX_TOUCHSCREEN_SETUP EP93XX_TOUCHSCREEN_REG(0x00) -+/* R/W touchscreen controller max/min register. */ -+#define EP93XX_TOUCHSCREEN_XYMAXMIN EP93XX_TOUCHSCREEN_REG(0x04) -+/* R touchscreen controller result register. */ -+#define EP93XX_TOUCHSCREEN_XYRESULT EP93XX_TOUCHSCREEN_REG(0x08) -+/* LOCKED R/W touchscreen Switch Matrix control register. */ -+#define EP93XX_TOUCHSCREEN_DISCHARGE EP93XX_TOUCHSCREEN_REG(0x0C) -+#define EP93XX_TOUCHSCREEN_XSAMPLE EP93XX_TOUCHSCREEN_REG(0x10) -+#define EP93XX_TOUCHSCREEN_YSAMPLE EP93XX_TOUCHSCREEN_REG(0x14) -+#define EP93XX_TOUCHSCREEN_DIRECT EP93XX_TOUCHSCREEN_REG(0x18) -+#define EP93XX_TOUCHSCREEN_DETECT EP93XX_TOUCHSCREEN_REG(0x1C) -+/* NA R/W touchscreen software lock register. */ -+#define EP93XX_TOUCHSCREEN_SWLOCK EP93XX_TOUCHSCREEN_REG(0x20) -+/* R/W touchscreen setup control register #2. */ -+#define EP93XX_TOUCHSCREEN_SETUP2 EP93XX_TOUCHSCREEN_REG(0x24) -+ -+/* These are duplicated in mach-ep93xx/core.c */ -+#define EP93XX_TIMER_REG(x) (EP93XX_TIMER_BASE + (x)) -+#define EP93XX_TIMER2_LOAD EP93XX_TIMER_REG(0x20) -+#define EP93XX_TIMER2_VALUE EP93XX_TIMER_REG(0x24) -+#define EP93XX_TIMER2_CONTROL EP93XX_TIMER_REG(0x28) -+#define EP93XX_TIMER2_CLEAR EP93XX_TIMER_REG(0x2c) -+ -+/* -+ * Register bit definitions -+ */ -+#define TSSETUP_SDLY_MASK 0x000003FF -+#define TSSETUP_SDLY_SHIFT 0 -+#define TSSETUP_NSMP_4 0x00000000 -+#define TSSETUP_NSMP_8 0x00000400 -+#define TSSETUP_NSMP_16 0x00000800 -+#define TSSETUP_NSMP_32 0x00000C00 -+#define TSSETUP_NSMP_MASK 0x00000C00 -+#define TSSETUP_DEV_4 0x00000000 -+#define TSSETUP_DEV_8 0x00001000 -+#define TSSETUP_DEV_12 0x00002000 -+#define TSSETUP_DEV_16 0x00003000 -+#define TSSETUP_DEV_24 0x00004000 -+#define TSSETUP_DEV_32 0x00005000 -+#define TSSETUP_DEV_64 0x00006000 -+#define TSSETUP_DEV_128 0x00007000 -+#define TSSETUP_ENABLE 0x00008000 -+#define TSSETUP_DLY_MASK 0x03FF0000 -+#define TSSETUP_DLY_SHIFT 16 -+#define TSSETUP_TDTCT 0x80000000 -+ -+#define TSMAXMIN_XMIN_MASK 0x000000FF -+#define TSMAXMIN_XMIN_SHIFT 0 -+#define TSMAXMIN_YMIN_MASK 0x0000FF00 -+#define TSMAXMIN_YMIN_SHIFT 8 -+#define TSMAXMIN_XMAX_MASK 0x00FF0000 -+#define TSMAXMIN_XMAX_SHIFT 16 -+#define TSMAXMIN_YMAX_MASK 0xFF000000 -+#define TSMAXMIN_YMAX_SHIFT 24 -+ -+#define TSXYRESULT_X_MASK 0x00000FFF -+#define TSXYRESULT_X_SHIFT 0 -+#define TSXYRESULT_AD_MASK 0x0000FFFF -+#define TSXYRESULT_AD_SHIFT 0 -+#define TSXYRESULT_Y_MASK 0x0FFF0000 -+#define TSXYRESULT_Y_SHIFT 16 -+#define TSXYRESULT_SDR 0x80000000 -+ -+#define TSX_SAMPLE_MASK 0x00003FFF -+#define TSX_SAMPLE_SHIFT 0x00 -+#define TSY_SAMPLE_MASK 0x3FFF0000 -+#define TSY_SAMPLE_SHIFT 0x10 -+ -+#define TSSETUP2_TINT 0x00000001 -+#define TSSETUP2_NICOR 0x00000002 -+#define TSSETUP2_PINT 0x00000004 -+#define TSSETUP2_PENSTS 0x00000008 -+#define TSSETUP2_PINTEN 0x00000010 -+#define TSSETUP2_DEVINT 0x00000020 -+#define TSSETUP2_DINTEN 0x00000040 -+#define TSSETUP2_DTMEN 0x00000080 -+#define TSSETUP2_DISDEV 0x00000100 -+#define TSSETUP2_NSIGND 0x00000200 -+#define TSSETUP2_S28EN 0x00000400 -+#define TSSETUP2_RINTEN 0x00000800 -+ -+#define TSXYRESULT_SDR 0x80000000 -+ -+/* -+ * These are used as trigger levels to know when we have pen up/down. -+ * The rules: -+ * 1. TS_HEAVY_INV_PRESSURE < TS_LIGHT_INV_PRESSURE because these -+ * are Inverse pressure. -+ * 2. Any touch lighter than TS_LIGHT_INV_PRESSURE is a pen up. -+ * 3. Any touch heavier than TS_HEAVY_INV_PRESSURE is a pen down. -+ */ -+#define TS_HEAVY_INV_PRESSURE 0xFE0 /* C00 */ -+#define TS_LIGHT_INV_PRESSURE 0xFFF /* e00 */ -+ -+/* -+ * If the x, y, or inverse pressure changes more than these values -+ * between two succeeding points, the point is not reported. -+ */ -+#define TS_MAX_VALID_XY_CHANGE 0x300 -+#define TS_MAX_VALID_PRESSURE_CHANGE 0x100 -+ -+/* -+ * This is the minimum Z1 Value that is valid. -+ */ -+#define MIN_Z1_VALUE 0x50 -+ -+/* -+ * Settling delay for taking each ADC measurement. Increase this -+ * if ts is jittery. -+ */ -+#define EP93XX_TS_ADC_DELAY_USEC 2000 -+ -+/* -+ * Delay between TS points. -+ */ -+#define EP93XX_TS_PER_POINT_DELAY_USEC 10000 -+ -+/* -+ * A few more macros... -+ */ -+#define TSSETUP_DEFAULT (TSSETUP_NSMP_32 | TSSETUP_DEV_64 | \ -+ ((128<<TSSETUP_SDLY_SHIFT) & TSSETUP_SDLY_MASK) | \ -+ ((128<<TSSETUP_DLY_SHIFT) & TSSETUP_DLY_MASK)) -+ -+#define TSSETUP2_DEFAULT (TSSETUP2_NSIGND) -+ -+/* -+ * For now, we use one of the minor numbers from the local/experimental -+ * range. -+ */ -+#define EP93XX_TS_MINOR 240 -+ -+/* -+ * Static Declarations -+ */ -+static unsigned int guiLastX, guiLastY; -+static unsigned int guiLastInvPressure; -+ -+struct TouchScreenSample -+{ -+ int currentX; -+ int currentY; -+ int currentButton; -+ int currentPressure; -+ struct timeval currentTime; -+}; -+ -+/* -+ * This must match the structure in tslib. -+ */ -+struct ts_sample { -+ int x; -+ int y; -+ unsigned int pressure; -+ struct timeval tv; -+}; -+ -+static struct TouchScreenSample gSample; -+static int bFreshTouchData; -+static int bCurrentPenDown; -+ -+static DECLARE_WAIT_QUEUE_HEAD(queue); -+static DEFINE_SEMAPHORE(open_sem); -+static DEFINE_SPINLOCK(event_buffer_lock); -+static struct fasync_struct *ep93xx_fasync; -+ -+/* -+ * Typedef Declarations -+ */ -+typedef enum { -+ TS_MODE_UN_INITIALIZED, -+ TS_MODE_HARDWARE_SCAN, -+ TS_MODE_SOFT_SCAN -+} ts_mode_t; -+ -+static ts_mode_t gScanningMode; -+ -+typedef enum{ -+ TS_STATE_STOPPED = 0, -+ TS_STATE_Z1, -+ TS_STATE_Z2, -+ TS_STATE_Y, -+ TS_STATE_X, -+ TS_STATE_DONE -+} ts_states_t; -+ -+typedef struct -+{ -+ unsigned int uiX; -+ unsigned int uiY; -+ unsigned int uiZ1; -+ unsigned int uiZ2; -+ ts_states_t state; -+} ts_struct_t; -+ -+static ts_struct_t sTouch; -+ -+/* -+ * From the spec, here's how to set up the touch screen's switch registers. -+ */ -+typedef struct -+{ -+ unsigned int uiDetect; -+ unsigned int uiDischarge; -+ unsigned int uiXSample; -+ unsigned int uiYSample; -+ unsigned int uiSwitchZ1; -+ unsigned int uiSwitchZ2; -+}SwitchStructType; -+ -+/* -+ * Here's the switch settings for a 4-wire touchscreen. See the spec -+ * for how to handle a 4, 7, or 8-wire. -+ */ -+const static SwitchStructType sSwitchSettings = -+/* s28en=0 */ -+/* TSDetect TSDischarge TSXSample TSYSample SwitchZ1 SwitchZ2 */ -+ {0x00403604, 0x0007fe04, 0x00081604, 0x00104601, 0x00101601, 0x00101608}; -+ -+/* -+ * Function declarations -+ */ -+static void ep93xx_ts_set_direct(unsigned int uiADCSwitch); -+static irqreturn_t ep93xx_ts_isr(int irq, void *dev_id); -+static irqreturn_t ep93xx_timer2_isr(int irq, void *dev_id); -+static void ee93xx_ts_evt_add(int button, int dX, int dY, int Pressure); -+static ssize_t ep93xx_ts_read(struct file *filp, char *buf, -+ size_t count, loff_t *l); -+static unsigned int ep93xx_ts_poll(struct file *filp, poll_table *wait); -+static int ep93xx_ts_open(struct inode *inode, struct file *filp); -+static int ep93xx_ts_fasync(int fd, struct file *filp, int on); -+static int ep93xx_ts_release(struct inode *inode, struct file *filp); -+static ssize_t ep93xx_ts_write(struct file *file, const char *buffer, -+ size_t count, loff_t *ppos); -+static void ep93xx_ts_setup(void); -+static void ep93xx_ts_shutdown(void); -+int __init ep93xx_ts_init(void); -+void __exit ep93xx_ts_exit(void); -+static unsigned int CalculateInvPressure(void); -+static unsigned int ADCGetData(unsigned int uiSamples, unsigned int uiMaxDiff); -+static void TS_Soft_Scan_Mode(void); -+static void TS_Hardware_Scan_Mode(void); -+static void ProcessPointData(void); -+static void Set_Timer2_uSec(unsigned int Delay_mSec); -+static void Stop_Timer2(void); -+ -+/* -+ * ep93xx_ts_isr -+ */ -+static irqreturn_t ep93xx_ts_isr(int irq, void *dev_id) -+{ -+ /* -+ * Note that we don't clear the interrupt here. The interrupt -+ * gets cleared in TS_Soft_Scan_Mode when the TS ENABLE -+ * bit is cleared. -+ */ -+ -+ /* -+ * Set the ts to manual polling mode and schedule a callback. -+ * That way we can return from the isr in a reasonable amount of -+ * time and process the touch in the callback after a brief delay. -+ */ -+ TS_Soft_Scan_Mode(); -+ -+ return(IRQ_HANDLED); -+} -+ -+/* -+ * Save the current ts 'event' in an atomic fashion. -+ */ -+static void ee93xx_ts_evt_add(int buttons, int iX, int iY, int iPressure) -+{ -+ /* -+ * Note the event, but use spinlocks to keep it from getting -+ * halfway read if we get interrupted. -+ */ -+ -+ spin_lock(&event_buffer_lock); -+ -+ gSample.currentX = iX; -+ gSample.currentY = iY; -+ gSample.currentButton = buttons; -+ gSample.currentPressure = iPressure; -+ bFreshTouchData = 1; -+ do_gettimeofday(&gSample.currentTime); -+ -+ spin_unlock(&event_buffer_lock); -+ -+ kill_fasync(&ep93xx_fasync, SIGIO, POLL_IN); -+ wake_up_interruptible(&queue); -+} -+ -+ -+static ssize_t ep93xx_ts_read(struct file *filp, char *buf, size_t count, loff_t *l) -+{ -+ unsigned short data[3]; -+ struct ts_sample ts_data; -+ int iReturn = -EFAULT; -+ -+ if (!bFreshTouchData) -+ { -+ iReturn = 0; -+ } -+ else if (count == sizeof(data)) -+ { -+ spin_lock_irq(&event_buffer_lock); -+ bFreshTouchData = 0; -+ data[0] = gSample.currentX; -+ data[1] = gSample.currentY; -+ data[2] = gSample.currentButton; -+ -+ spin_unlock_irq(&event_buffer_lock); -+ -+ if (copy_to_user(buf, data, sizeof data)) -+ return -EFAULT; -+ -+ count -= sizeof(data); -+ -+ /* return the # of bytes that got read */ -+ iReturn = sizeof(data) ; -+ } -+ else if (count == sizeof(struct ts_sample) ) -+ { -+ spin_lock_irq(&event_buffer_lock); -+ bFreshTouchData = 0; -+ ts_data.x = gSample.currentX; -+ ts_data.y = gSample.currentY; -+ ts_data.pressure = gSample.currentPressure; -+ ts_data.tv = gSample.currentTime; -+ spin_unlock_irq(&event_buffer_lock); -+ -+ if (copy_to_user(buf, &ts_data, sizeof(struct ts_sample))) -+ { -+ iReturn = -EFAULT; -+ } -+ else -+ { -+ count -= sizeof(ts_data); -+ iReturn = sizeof(ts_data); -+ } -+ } -+ -+ return iReturn; -+} -+ -+static unsigned int ep93xx_ts_poll(struct file *filp, poll_table *wait) -+{ -+ poll_wait(filp, &queue, wait); -+ -+ if (bFreshTouchData) -+ { -+ return POLLIN | POLLRDNORM; -+ } -+ -+ return 0; -+} -+ -+static int ep93xx_ts_open(struct inode *inode, struct file *filp) -+{ -+ if (down_trylock(&open_sem)) -+ { -+ return -EBUSY; -+ } -+ -+ ep93xx_ts_setup(); -+ -+ return 0; -+} -+ -+/* -+ * Asynchronous I/O support. -+ */ -+static int ep93xx_ts_fasync(int fd, struct file *filp, int on) -+{ -+ int retval; -+ -+ retval = fasync_helper(fd, filp, on, &ep93xx_fasync); -+ if (retval < 0) -+ { -+ return retval; -+ } -+ -+ return 0; -+} -+ -+static int ep93xx_ts_release(struct inode *inode, struct file *filp) -+{ -+ Stop_Timer2(); -+ -+ /* -+ * Call our async I/O support to request that this file -+ * cease to be used for async I/O. -+ */ -+ ep93xx_ts_fasync(-1, filp, 0); -+ -+ ep93xx_ts_shutdown(); -+ -+ up(&open_sem); -+ -+ return 0; -+} -+ -+static ssize_t ep93xx_ts_write(struct file *file, const char *buffer, size_t count, -+ loff_t *ppos) -+{ -+ return -EINVAL; -+} -+ -+ -+static int ep93xx_ts_ioctl(struct inode *inode, struct file *file, uint command, ulong u) -+{ -+ static const int version = EV_VERSION; -+ static const u_int32_t bit =(1 << EV_ABS); -+ static const u_int32_t absbit = (1 << ABS_X) | (1 << ABS_Y) | (1 << ABS_PRESSURE); -+ int iReturn ; -+ int i = 0; -+ -+ switch(command) -+ { -+ case EVIOCGVERSION: -+ i = copy_to_user((void __user *)u, (void *)version, sizeof(version)); -+ iReturn = i ? -EFAULT : 0; -+ break; -+ -+ case EVIOCGBIT(0,sizeof(u_int32_t) * 8) : -+ i = copy_to_user((void __user *)u, (void *)bit, sizeof(bit)); -+ iReturn = i ? -EFAULT : 0; -+ break; -+ -+ case EVIOCGBIT(EV_ABS, sizeof(absbit) * 8): -+ i = copy_to_user((void __user *)u, (void *)absbit, sizeof(absbit)); -+ iReturn = i ? -EFAULT : 0; -+ break; -+ default: -+ iReturn = -1; -+ break; -+ } -+ -+ return iReturn; -+} -+ -+static struct file_operations ep93xx_ts_fops = { -+ owner: THIS_MODULE, -+ read: ep93xx_ts_read, -+ write: ep93xx_ts_write, -+ poll: ep93xx_ts_poll, -+ open: ep93xx_ts_open, -+ unlocked_ioctl: ep93xx_ts_ioctl, -+ release: ep93xx_ts_release, -+ fasync: ep93xx_ts_fasync, -+}; -+ -+static struct miscdevice ep93xx_ts_miscdev = -+{ -+ EP93XX_TS_MINOR, -+ "ep93xx_ts", -+ &ep93xx_ts_fops -+}; -+ -+void ep93xx_ts_setup(void) -+{ -+ unsigned int uiKTDIV, uiTSXYMaxMin; -+ -+ /* -+ * Set the TSEN bit in KTDIV so that we are enabling the clock -+ * for the touchscreen. -+ */ -+ uiKTDIV = __raw_readl(EP93XX_SYSCON_KEYTCHCLKDIV); -+ uiKTDIV |= EP93XX_SYSCON_KEYTCHCLKDIV_TSEN; -+ ep93xx_syscon_swlocked_write(uiKTDIV, EP93XX_SYSCON_KEYTCHCLKDIV); -+ -+ /* -+ * Program the EP93XX_TOUCHSCREEN_SETUP and TSSetup2 registers. -+ */ -+ __raw_writel(TSSETUP_DEFAULT, EP93XX_TOUCHSCREEN_SETUP); -+ __raw_writel(TSSETUP2_DEFAULT, EP93XX_TOUCHSCREEN_SETUP2); -+ -+ /* -+ * Set the the touch settings. -+ */ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiDischarge, EP93XX_TOUCHSCREEN_DIRECT); -+ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiDischarge, EP93XX_TOUCHSCREEN_DISCHARGE); -+ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiSwitchZ1, EP93XX_TOUCHSCREEN_XSAMPLE); -+ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiSwitchZ2, EP93XX_TOUCHSCREEN_YSAMPLE); -+ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiDetect, EP93XX_TOUCHSCREEN_DETECT); -+ -+ /* -+ * X,YMin set to 0x40 = have to drag that many pixels for a new irq. -+ * X,YMax set to 0x40 = 1024 pixels is the maximum movement within the -+ * time scan limit. -+ */ -+ uiTSXYMaxMin = (50 << TSMAXMIN_XMIN_SHIFT) & TSMAXMIN_XMIN_MASK; -+ uiTSXYMaxMin |= (50 << TSMAXMIN_YMIN_SHIFT) & TSMAXMIN_YMIN_MASK; -+ uiTSXYMaxMin |= (0xff << TSMAXMIN_XMAX_SHIFT) & TSMAXMIN_XMAX_MASK; -+ uiTSXYMaxMin |= (0xff << TSMAXMIN_YMAX_SHIFT) & TSMAXMIN_YMAX_MASK; -+ __raw_writel(uiTSXYMaxMin, EP93XX_TOUCHSCREEN_XYMAXMIN); -+ -+ bCurrentPenDown = 0; -+ bFreshTouchData = 0; -+ guiLastX = 0; -+ guiLastY = 0; -+ guiLastInvPressure = 0xffffff; -+ -+ /* -+ * Enable the touch screen scanning engine. -+ */ -+ TS_Hardware_Scan_Mode(); -+} -+ -+/* -+ * ep93xx_ts_shutdown -+ * -+ */ -+static void -+ep93xx_ts_shutdown(void) -+{ -+ unsigned int uiKTDIV; -+ -+ sTouch.state = TS_STATE_STOPPED; -+ Stop_Timer2(); -+ -+ /* -+ * Disable the scanning engine. -+ */ -+ __raw_writel(0, EP93XX_TOUCHSCREEN_SETUP); -+ __raw_writel(0, EP93XX_TOUCHSCREEN_SETUP2); -+ -+ /* -+ * Clear the TSEN bit in KTDIV so that we are disabling the clock -+ * for the touchscreen. -+ */ -+ uiKTDIV = __raw_readl(EP93XX_SYSCON_KEYTCHCLKDIV); -+ uiKTDIV &= ~EP93XX_SYSCON_KEYTCHCLKDIV_TSEN; -+ ep93xx_syscon_swlocked_write(uiKTDIV, EP93XX_SYSCON_KEYTCHCLKDIV); -+ -+} /* ep93xx_ts_shutdown */ -+ -+static irqreturn_t ep93xx_timer2_isr(int irq, void *dev_id) -+{ -+ switch(sTouch.state) -+ { -+ case TS_STATE_STOPPED: -+ TS_Hardware_Scan_Mode(); -+ break; -+ -+ /* -+ * Get the Z1 value for pressure measurement and set up -+ * the switch register for getting the Z2 measurement. -+ */ -+ case TS_STATE_Z1: -+ Set_Timer2_uSec(EP93XX_TS_ADC_DELAY_USEC); -+ sTouch.uiZ1 = ADCGetData(2, 200); -+ ep93xx_ts_set_direct(sSwitchSettings.uiSwitchZ2); -+ sTouch.state = TS_STATE_Z2; -+ break; -+ -+ /* -+ * Get the Z2 value for pressure measurement and set up -+ * the switch register for getting the Y measurement. -+ */ -+ case TS_STATE_Z2: -+ sTouch.uiZ2 = ADCGetData(2, 200); -+ ep93xx_ts_set_direct(sSwitchSettings.uiYSample); -+ sTouch.state = TS_STATE_Y; -+ break; -+ -+ /* -+ * Get the Y value and set up the switch register for -+ * getting the X measurement. -+ */ -+ case TS_STATE_Y: -+ sTouch.uiY = ADCGetData(4, 20); -+ ep93xx_ts_set_direct(sSwitchSettings.uiXSample); -+ sTouch.state = TS_STATE_X; -+ break; -+ -+ /* -+ * Read the X value. This is the last of the 4 adc values -+ * we need so we continue on to process the data. -+ */ -+ case TS_STATE_X: -+ Stop_Timer2(); -+ -+ sTouch.uiX = ADCGetData(4, 20); -+ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiDischarge, EP93XX_TOUCHSCREEN_DIRECT); -+ -+ sTouch.state = TS_STATE_DONE; -+ -+ /* -+ * Process this set of ADC readings. -+ */ -+ ProcessPointData(); -+ -+ break; -+ -+ /* -+ * Shouldn't get here. But if we do, we can recover... -+ */ -+ case TS_STATE_DONE: -+ TS_Hardware_Scan_Mode(); -+ break; -+ } -+ -+ /* -+ * Clear the timer2 interrupt. -+ */ -+ __raw_writel(1, EP93XX_TIMER2_CLEAR); -+ return(IRQ_HANDLED); -+} -+ -+/*--------------------------------------------------------------------- -+ * ProcessPointData -+ * -+ * This routine processes the ADC data into usable point data and then -+ * puts the driver into hw or sw scanning mode before returning. -+ * -+ * We calculate inverse pressure (lower number = more pressure) then -+ * do a hystheresis with the two pressure values 'light' and 'heavy'. -+ * -+ * If we are above the light, we have pen up. -+ * If we are below the heavy we have pen down. -+ * As long as the pressure stays below the light, pen stays down. -+ * When we get above the light again, pen goes back up. -+ * -+ */ -+static void ProcessPointData(void) -+{ -+ int bValidPoint = 0; -+ unsigned int uiXDiff, uiYDiff, uiInvPressureDiff; -+ unsigned int uiInvPressure; -+ -+ /* -+ * Calculate the current pressure. -+ */ -+ uiInvPressure = CalculateInvPressure(); -+ -+ /* -+ * If pen pressure is so light that it is greater than the 'max' setting -+ * then we consider this to be a pen up. -+ */ -+ if (uiInvPressure >= TS_LIGHT_INV_PRESSURE) -+ { -+ bCurrentPenDown = 0; -+ ee93xx_ts_evt_add(0, guiLastX, guiLastY, 0); -+ TS_Hardware_Scan_Mode(); -+ return; -+ } -+ -+ /* -+ * Hysteresis: -+ * If the pen pressure is hard enough to be less than the 'min' OR -+ * the pen is already down and is still less than the 'max'... -+ */ -+ if ((uiInvPressure < TS_HEAVY_INV_PRESSURE) || -+ (bCurrentPenDown && (uiInvPressure < TS_LIGHT_INV_PRESSURE))) -+ { -+ if (bCurrentPenDown) -+ { -+ /* -+ * If pen was previously down, check the difference between -+ * the last sample and this one... if the difference between -+ * samples is too great, ignore the sample. -+ */ -+ uiXDiff = abs(guiLastX - sTouch.uiX); -+ uiYDiff = abs(guiLastY - sTouch.uiY); -+ uiInvPressureDiff = abs(guiLastInvPressure - uiInvPressure); -+ -+ if (uiXDiff < TS_MAX_VALID_XY_CHANGE -+ && uiYDiff < TS_MAX_VALID_XY_CHANGE -+ && uiInvPressureDiff < TS_MAX_VALID_PRESSURE_CHANGE) -+ { -+ bValidPoint = 1; -+ } -+ } -+ else -+ { -+ bValidPoint = 1; -+ } -+ -+ /* -+ * If either the pen was put down or dragged make a note of it. -+ */ -+ if (bValidPoint) -+ { -+ guiLastX = sTouch.uiX; -+ guiLastY = sTouch.uiY; -+ guiLastInvPressure = uiInvPressure; -+ bCurrentPenDown = 1; -+ ee93xx_ts_evt_add(1, sTouch.uiX, sTouch.uiY, -+ 0x7000000 / uiInvPressure); -+ } -+ -+ TS_Soft_Scan_Mode(); -+ return; -+ } -+ -+ TS_Hardware_Scan_Mode(); -+} -+ -+static void ep93xx_ts_set_direct(unsigned int uiADCSwitch) -+{ -+ unsigned int uiResult; -+ -+ /* -+ * Set the switch settings in the direct register. -+ */ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(uiADCSwitch, EP93XX_TOUCHSCREEN_DIRECT); -+ -+ /* -+ * Read and throw away the first sample. -+ */ -+ do { -+ uiResult = __raw_readl(EP93XX_TOUCHSCREEN_XYRESULT); -+ } while (!(uiResult & TSXYRESULT_SDR)); -+ -+} -+ -+static unsigned int ADCGetData(unsigned int uiSamples, unsigned int uiMaxDiff) -+{ -+ unsigned int uiResult, uiValue, uiCount, uiLowest, uiHighest, uiSum, uiAve; -+ -+ do -+ { -+ /* -+ * Initialize our values. -+ */ -+ uiLowest = 0xfffffff; -+ uiHighest = 0; -+ uiSum = 0; -+ -+ for (uiCount = 0; uiCount < uiSamples; uiCount++) -+ { -+ /* -+ * Read the touch screen four more times and average. -+ */ -+ do { -+ uiResult = __raw_readl(EP93XX_TOUCHSCREEN_XYRESULT); -+ } while (!(uiResult & TSXYRESULT_SDR)); -+ -+ uiValue = (uiResult & TSXYRESULT_AD_MASK) >> TSXYRESULT_AD_SHIFT; -+ uiValue = ((uiValue >> 4) + ((1 + TSXYRESULT_X_MASK)>>1)) & TSXYRESULT_X_MASK; -+ -+ /* -+ * Add up the values. -+ */ -+ uiSum += uiValue; -+ -+ /* -+ * Get the lowest and highest values. -+ */ -+ if (uiValue < uiLowest) -+ { -+ uiLowest = uiValue; -+ } -+ if (uiValue > uiHighest) -+ { -+ uiHighest = uiValue; -+ } -+ } -+ } while ((uiHighest - uiLowest) > uiMaxDiff); -+ -+ /* -+ * Calculate the Average value. -+ */ -+ uiAve = uiSum / uiSamples; -+ -+ return uiAve; -+} -+ -+/* -+ * CalculateInvPressure -+ * -+ * Is the Touch Valid. Touch is not valid if the X or Y value is not -+ * in range and the pressure is not enough. -+ * -+ * Touch resistance can be measured by the following formula: -+ * -+ * Rx * X * Z2 -+ * Rtouch = --------- * (-- - 1) -+ * 4096 Z1 -+ * -+ * This is simplified in the ration of Rtouch to Rx. The lower the value, the -+ * higher the pressure. -+ * -+ * Z2 -+ * InvPressure = X * (-- - 1) -+ * Z1 -+ */ -+static unsigned int CalculateInvPressure(void) -+{ -+ unsigned int uiInvPressure; -+ -+ /* -+ * Check to see if the point is valid. -+ */ -+ if (sTouch.uiZ1 < MIN_Z1_VALUE) -+ { -+ uiInvPressure = 0x10000; -+ } -+ -+ /* -+ * Can omit the pressure calculation if you need to get rid of the division. -+ */ -+ else -+ { -+ uiInvPressure = ((sTouch.uiX * sTouch.uiZ2) / sTouch.uiZ1) - sTouch.uiX; -+ } -+ -+ return uiInvPressure; -+} -+ -+/* -+ * TS_Hardware_Scan_Mode -+ * -+ * Enables the ep93xx ts scanning engine so that when the pen goes down -+ * we will get an interrupt. -+ */ -+static void TS_Hardware_Scan_Mode(void) -+{ -+ unsigned int uiDevCfg; -+ -+ /* -+ * Disable the soft scanning engine. -+ */ -+ sTouch.state = TS_STATE_STOPPED; -+ Stop_Timer2(); -+ -+ /* -+ * Clear the TIN (Touchscreen INactive) bit so we can go to -+ * automatic scanning mode. -+ */ -+ uiDevCfg = __raw_readl(EP93XX_SYSCON_DEVCFG); -+ ep93xx_syscon_swlocked_write(uiDevCfg & ~EP93XX_SYSCON_DEVCFG_TIN, -+ EP93XX_SYSCON_DEVCFG); -+ -+ /* -+ * Enable the touch screen scanning state machine by setting -+ * the ENABLE bit. -+ */ -+ __raw_writel(TSSETUP_DEFAULT | TSSETUP_ENABLE, EP93XX_TOUCHSCREEN_SETUP); -+ -+ /* -+ * Set the flag to show that we are in interrupt mode. -+ */ -+ gScanningMode = TS_MODE_HARDWARE_SCAN; -+ -+ /* -+ * Initialize EP93XX_TOUCHSCREEN_SETUP2 register. -+ */ -+ __raw_writel(TSSETUP2_DEFAULT, EP93XX_TOUCHSCREEN_SETUP2); -+ -+} -+ -+/* -+ * TS_Soft_Scan_Mode -+ * -+ * Sets the touch screen to manual polling mode. -+ */ -+static void TS_Soft_Scan_Mode(void) -+{ -+ unsigned int uiDevCfg; -+ -+ if (gScanningMode != TS_MODE_SOFT_SCAN) -+ { -+ /* -+ * Disable the touch screen scanning state machine by clearing -+ * the ENABLE bit. -+ */ -+ __raw_writel(TSSETUP_DEFAULT, EP93XX_TOUCHSCREEN_SETUP); -+ -+ /* -+ * Set the TIN bit so we can do manual touchscreen polling. -+ */ -+ uiDevCfg = __raw_readl(EP93XX_SYSCON_DEVCFG); -+ ep93xx_syscon_swlocked_write(uiDevCfg | EP93XX_SYSCON_DEVCFG_TIN, -+ EP93XX_SYSCON_DEVCFG); -+ } -+ -+ /* -+ * Set the switch register up for the first ADC reading -+ */ -+ ep93xx_ts_set_direct(sSwitchSettings.uiSwitchZ1); -+ -+ /* -+ * Initialize our software state machine to know which ADC -+ * reading to take -+ */ -+ sTouch.state = TS_STATE_Z1; -+ -+ /* -+ * Set the timer so after a mSec or two settling delay it will -+ * take the first ADC reading. -+ */ -+ Set_Timer2_uSec(EP93XX_TS_PER_POINT_DELAY_USEC); -+ -+ /* -+ * Note that we are in sw scanning mode not hw scanning mode. -+ */ -+ gScanningMode = TS_MODE_SOFT_SCAN; -+ -+} -+ -+static void Set_Timer2_uSec(unsigned int uiDelay_uSec) -+{ -+ unsigned int uiClockTicks; -+ -+ /* -+ * Stop timer 2 -+ */ -+ __raw_writel(0, EP93XX_TIMER2_CONTROL); -+ -+ uiClockTicks = ((uiDelay_uSec * 508) + 999) / 1000; -+ __raw_writel(uiClockTicks, EP93XX_TIMER2_LOAD); -+ __raw_writel(uiClockTicks, EP93XX_TIMER2_VALUE); -+ -+ /* -+ * Set up Timer 2 for 508 kHz clock and periodic mode. -+ */ -+ __raw_writel(0xC8, EP93XX_TIMER2_CONTROL); -+ -+} -+ -+static void Stop_Timer2(void) -+{ -+ __raw_writel(0, EP93XX_TIMER2_CONTROL); -+} -+ -+/* -+ * Initialization and exit routines -+ */ -+int __init ep93xx_ts_init(void) -+{ -+ int retval; -+ -+ retval = request_irq(IRQ_EP93XX_TOUCH, ep93xx_ts_isr, -+ IRQF_DISABLED, "ep93xx_ts", 0); -+ if (retval) -+ { -+ printk(KERN_WARNING "ep93xx_ts: failed to get touchscreen IRQ\n"); -+ return retval; -+ } -+ -+ retval = request_irq(IRQ_EP93XX_TIMER2, ep93xx_timer2_isr, -+ IRQF_DISABLED, "ep93xx_timer2", 0); -+ if (retval) -+ { -+ printk(KERN_WARNING "ep93xx_ts: failed to get timer2 IRQ\n"); -+ free_irq(IRQ_EP93XX_TOUCH, 0); -+ return retval; -+ } -+ -+ misc_register(&ep93xx_ts_miscdev); -+ -+ sTouch.state = TS_STATE_STOPPED; -+ gScanningMode = TS_MODE_UN_INITIALIZED; -+ -+ printk(KERN_NOTICE "ep93xx touchscreen driver configured for 4-wire operation\n"); -+ -+ return 0; -+} -+ -+void __exit ep93xx_ts_exit(void) -+{ -+ Stop_Timer2(); -+ -+ free_irq(IRQ_EP93XX_TOUCH, 0); -+ free_irq(IRQ_EP93XX_TIMER2, 0); -+ -+ misc_deregister(&ep93xx_ts_miscdev); -+} -+ -+module_init(ep93xx_ts_init); -+module_exit(ep93xx_ts_exit); -+ -+MODULE_DESCRIPTION("Cirrus EP93xx touchscreen driver"); -+MODULE_SUPPORTED_DEVICE("touchscreen/ep93xx"); -+MODULE_LICENSE("GPL"); ---- a/arch/arm/mach-ep93xx/core.c -+++ b/arch/arm/mach-ep93xx/core.c -@@ -211,6 +211,7 @@ void ep93xx_syscon_swlocked_write(unsign - - spin_unlock_irqrestore(&syscon_swlock, flags); - } -+EXPORT_SYMBOL(ep93xx_syscon_swlocked_write); - - void ep93xx_devcfg_set_clear(unsigned int set_bits, unsigned int clear_bits) - { diff --git a/target/linux/ep93xx/patches-3.14/004-simone_add_mmc_spi.patch b/target/linux/ep93xx/patches-3.14/004-simone_add_mmc_spi.patch deleted file mode 100644 index 3e6b0fa..0000000 --- a/target/linux/ep93xx/patches-3.14/004-simone_add_mmc_spi.patch +++ /dev/null @@ -1,178 +0,0 @@ -This enables the mmc-over-spi driver for the Sim.One board, based on Mika's -patch, which used a GPIO for chip select in stead of the default SFRMOUT pin. -I've modified it to use the usual SFRMOUT; if you've modified your Sim.One -board to use a GPIO instead, uncomment and modify -// #define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO15 -in the source file. - -martinwguy, 14 May 2010 - -From: Mika Westerberg <mika.westerberg@iki.fi> -Date: Wed, 28 Apr 2010 08:42:46 +0300 -Subject: [PATCH] ep93xx: simone: added board specific SPI support for MMC/SD cards - -This includes setting up EGPIOs 0 and 9 for card detection and chip select -respectively. - ---- a/arch/arm/mach-ep93xx/simone.c -+++ b/arch/arm/mach-ep93xx/simone.c -@@ -20,10 +20,15 @@ - #include <linux/platform_device.h> - #include <linux/i2c.h> - #include <linux/i2c-gpio.h> -+#include <linux/gpio.h> -+#include <linux/mmc/host.h> -+#include <linux/spi/spi.h> -+#include <linux/spi/mmc_spi.h> - - #include <mach/hardware.h> - #include <linux/platform_data/video-ep93xx.h> - #include <mach/gpio-ep93xx.h> -+#include <linux/platform_data/spi-ep93xx.h> - - #include <asm/mach-types.h> - #include <asm/mach/arch.h> -@@ -40,6 +45,135 @@ static struct ep93xxfb_mach_info __initd - .flags = EP93XXFB_USE_SDCSN0 | EP93XXFB_PCLK_FALLING, - }; - -+/* -+ * GPIO lines used for MMC card detection. -+ */ -+#define MMC_CARD_DETECT_GPIO EP93XX_GPIO_LINE_EGPIO0 -+ -+/* -+ * If you have hacked your Sim.One to use a GPIO as SD card chip select -+ * (SD pin 1), uncomment the following line. -+ * The example, EGPIO15, is on TP17 near the CPU. -+ */ -+// #define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO15 -+ -+/* -+ * MMC SPI chip select GPIO handling. If you are using SFRMOUT (SFRM1) signal, -+ * you can leave these empty and pass NULL as .controller_data. -+ */ -+ -+#ifdef MMC_CHIP_SELECT_GPIO -+static int simone_mmc_spi_setup(struct spi_device *spi) -+{ -+ unsigned int gpio = MMC_CHIP_SELECT_GPIO; -+ int err; -+ -+ err = gpio_request(gpio, spi->modalias); -+ if (err) -+ return err; -+ -+ err = gpio_direction_output(gpio, 1); -+ if (err) { -+ gpio_free(gpio); -+ return err; -+ } -+ -+ return 0; -+} -+ -+static void simone_mmc_spi_cleanup(struct spi_device *spi) -+{ -+ unsigned int gpio = MMC_CHIP_SELECT_GPIO; -+ -+ gpio_set_value(gpio, 1); -+ gpio_direction_input(gpio); -+ gpio_free(gpio); -+} -+ -+static void simone_mmc_spi_cs_control(struct spi_device *spi, int value) -+{ -+ gpio_set_value(MMC_CHIP_SELECT_GPIO, value); -+} -+ -+static struct ep93xx_spi_chip_ops simone_mmc_spi_ops = { -+ .setup = simone_mmc_spi_setup, -+ .cleanup = simone_mmc_spi_cleanup, -+ .cs_control = simone_mmc_spi_cs_control, -+}; -+#endif -+ -+/* -+ * MMC card detection GPIO setup. -+ */ -+static int simone_mmc_spi_init(struct device *dev, -+ irqreturn_t (*irq_handler)(int, void *), void *mmc) -+{ -+ unsigned int gpio = MMC_CARD_DETECT_GPIO; -+ int irq, err; -+ -+ err = gpio_request(gpio, dev_name(dev)); -+ if (err) -+ return err; -+ -+ err = gpio_direction_input(gpio); -+ if (err) -+ goto fail; -+ -+ irq = gpio_to_irq(gpio); -+ if (irq < 0) -+ goto fail; -+ -+ err = request_irq(irq, irq_handler, IRQF_TRIGGER_FALLING, -+ "MMC card detect", mmc); -+ if (err) -+ goto fail; -+ -+ printk(KERN_INFO "%s: using irq %d for MMC card detection\n", -+ dev_name(dev), irq); -+ -+ return 0; -+fail: -+ gpio_free(gpio); -+ return err; -+} -+ -+static void simone_mmc_spi_exit(struct device *dev, void *mmc) -+{ -+ unsigned int gpio = MMC_CARD_DETECT_GPIO; -+ -+ free_irq(gpio_to_irq(gpio), mmc); -+ gpio_free(gpio); -+} -+ -+static struct mmc_spi_platform_data simone_mmc_spi_data = { -+ .init = simone_mmc_spi_init, -+ .exit = simone_mmc_spi_exit, -+ .detect_delay = 500, -+ .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, -+}; -+ -+static struct spi_board_info simone_spi_devices[] __initdata = { -+ { -+ .modalias = "mmc_spi", -+#ifdef MMC_CHIP_SELECT_GPIO -+ .controller_data = &simone_mmc_spi_ops, -+#endif -+ .platform_data = &simone_mmc_spi_data, -+ /* -+ * We use 10 MHz even though the maximum is 3.7 MHz. The driver -+ * will limit it automatically to max. frequency. -+ */ -+ .max_speed_hz = 10 * 1000 * 1000, -+ .bus_num = 0, -+ .chip_select = 0, -+ .mode = SPI_MODE_3, -+ }, -+}; -+ -+static struct ep93xx_spi_info simone_spi_info __initdata = { -+ .num_chipselect = ARRAY_SIZE(simone_spi_devices), -+}; -+ - static struct i2c_gpio_platform_data __initdata simone_i2c_gpio_data = { - .sda_pin = EP93XX_GPIO_LINE_EEDAT, - .sda_is_open_drain = 0, -@@ -74,6 +208,8 @@ static void __init simone_init_machine(v - ep93xx_register_fb(&simone_fb_info); - ep93xx_register_i2c(&simone_i2c_gpio_data, simone_i2c_board_info, - ARRAY_SIZE(simone_i2c_board_info)); -+ ep93xx_register_spi(&simone_spi_info, simone_spi_devices, -+ ARRAY_SIZE(simone_spi_devices)); - simone_register_audio(); - } - diff --git a/target/linux/ep93xx/patches-3.18/001-ep93xx_cpuinfo.patch b/target/linux/ep93xx/patches-3.18/001-ep93xx_cpuinfo.patch deleted file mode 100644 index e9d87df..0000000 --- a/target/linux/ep93xx/patches-3.18/001-ep93xx_cpuinfo.patch +++ /dev/null @@ -1,70 +0,0 @@ -This patch puts the EP93xx chip revision and unique ID into /proc/cpuinfo. -This is necessary to be able to set a unique MAC address for DHCP purposes -by adding a line to /etc/network/interfaces: - -# Generate a unique locally-assigned MAC address from the CPU serial number -pre-up ifconfig eth0 hw ether `sed -n 's/^Serial.* 000000/02/p' /proc/cpuinfo` - -It uses the chip revision reading code in the ep93xx-chip-revision patch. - -Really, this is wrong, since /proc/cpuinfo should report the revision and -serial number of the ARM920T processor, while these are the rev and serial -of the EP93xx SoC. In a future kernel (>2.6.34) there may be a new file -/proc/socinfo for this information. - - -martinwguy 14 May 2010 - ---- a/arch/arm/kernel/setup.c -+++ b/arch/arm/kernel/setup.c -@@ -57,6 +57,12 @@ - #include <asm/memblock.h> - #include <asm/virt.h> - -+#if defined(CONFIG_ARCH_EP93XX) -+#include <asm/io.h> -+#include <mach/platform.h> -+#include <mach/ep93xx-regs.h> -+#endif -+ - #include "atags.h" - - -@@ -1087,9 +1093,16 @@ static int c_show(struct seq_file *m, vo - } - - seq_printf(m, "Hardware\t: %s\n", machine_name); -+#if defined(CONFIG_ARCH_EP93XX) -+ seq_printf(m, "Revision\t: %04x\n", -+ ep93xx_chip_revision()); -+ seq_printf(m, "Serial\t\t: %016x\n", -+ *((unsigned int *)EP93XX_SECURITY_UNIQID)); -+#else - seq_printf(m, "Revision\t: %04x\n", system_rev); - seq_printf(m, "Serial\t\t: %08x%08x\n", - system_serial_high, system_serial_low); -+#endif - - return 0; - } ---- a/arch/arm/mach-ep93xx/soc.h -+++ b/arch/arm/mach-ep93xx/soc.h -@@ -82,8 +82,6 @@ - #define EP93XX_I2S_PHYS_BASE EP93XX_APB_PHYS(0x00020000) - #define EP93XX_I2S_BASE EP93XX_APB_IOMEM(0x00020000) - --#define EP93XX_SECURITY_BASE EP93XX_APB_IOMEM(0x00030000) -- - #define EP93XX_AAC_PHYS_BASE EP93XX_APB_PHYS(0x00080000) - #define EP93XX_AAC_BASE EP93XX_APB_IOMEM(0x00080000) - ---- a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h -+++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h -@@ -38,4 +38,8 @@ - #define EP93XX_UART3_PHYS_BASE EP93XX_APB_PHYS(0x000e0000) - #define EP93XX_UART3_BASE EP93XX_APB_IOMEM(0x000e0000) - -+#define EP93XX_SECURITY_BASE EP93XX_APB_IOMEM(0x00030000) -+#define EP93XX_SECURITY_REG(x) (EP93XX_SECURITY_BASE + (x)) -+#define EP93XX_SECURITY_UNIQID EP93XX_SECURITY_REG(0x2440) -+ - #endif diff --git a/target/linux/ep93xx/patches-3.18/003-ep93xx_touchscreen.patch b/target/linux/ep93xx/patches-3.18/003-ep93xx_touchscreen.patch deleted file mode 100644 index e1613a0..0000000 --- a/target/linux/ep93xx/patches-3.18/003-ep93xx_touchscreen.patch +++ /dev/null @@ -1,1072 +0,0 @@ ---- - arch/arm/mach-ep93xx/include/mach/hardware.h | 1 - arch/arm/mach-ep93xx/include/mach/regs_touch.h | 95 ++ - drivers/input/touchscreen/Kconfig | 5 - drivers/input/touchscreen/Makefile | 1 - drivers/input/touchscreen/ep93xx_ts.c | 1117 +++++++++++++++++++++++++ - drivers/input/touchscreen/ep93xx_ts.h | 53 + - 6 files changed, 1272 insertions(+) - ---- a/drivers/input/touchscreen/Kconfig -+++ b/drivers/input/touchscreen/Kconfig -@@ -282,6 +282,15 @@ config TOUCHSCREEN_EGALAX - To compile this driver as a module, choose M here: the - module will be called egalax_ts. - -+config TOUCHSCREEN_EP93XX -+ tristate "EP93xx Touchscreen" -+ depends on ARM && INPUT && ARCH_EP93XX -+ help -+ Say Y here to enable support for EP93xx touch screen. -+ -+ To compile this driver as a module, choose M here: -+ the module will be called ep93xx_ts. -+ - config TOUCHSCREEN_FUJITSU - tristate "Fujitsu serial touchscreen" - select SERIO ---- a/drivers/input/touchscreen/Makefile -+++ b/drivers/input/touchscreen/Makefile -@@ -33,6 +33,7 @@ obj-$(CONFIG_TOUCHSCREEN_GUNZE) += gunz - obj-$(CONFIG_TOUCHSCREEN_EETI) += eeti_ts.o - obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o - obj-$(CONFIG_TOUCHSCREEN_EGALAX) += egalax_ts.o -+obj-$(CONFIG_TOUCHSCREEN_EP93XX) += ep93xx_ts.o - obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o - obj-$(CONFIG_TOUCHSCREEN_ILI210X) += ili210x.o - obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o ---- /dev/null -+++ b/drivers/input/touchscreen/ep93xx_ts.c -@@ -0,0 +1,1022 @@ -+/* -+ * linux/drivers/input/touchscreen/ep93xx_ts.c -+ * -+ * Copyright (C) 2003-2004 Cirrus Corp. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#include <linux/module.h> -+#include <linux/types.h> -+#include <linux/delay.h> -+#include <linux/wait.h> -+#include <linux/fs.h> -+#include <linux/sched.h> -+#include <linux/poll.h> -+#include <linux/miscdevice.h> -+#include <linux/init.h> -+#include <linux/compiler.h> -+#include <linux/timer.h> -+#include <linux/interrupt.h> -+#include <linux/syscalls.h> -+#include <linux/input.h> -+#include <linux/semaphore.h> -+#include <asm/irq.h> -+#include <mach/hardware.h> -+#include <asm/io.h> -+#include "../../../arch/arm/mach-ep93xx/soc.h" -+ -+/* This stuff should be in ep93xx-regs.h */ -+#define EP93XX_TOUCHSCREEN_REG(x) (EP93XX_TOUCHSCREEN_BASE + (x)) -+/* R/W touchscreen controller setup control register. */ -+#define EP93XX_TOUCHSCREEN_SETUP EP93XX_TOUCHSCREEN_REG(0x00) -+/* R/W touchscreen controller max/min register. */ -+#define EP93XX_TOUCHSCREEN_XYMAXMIN EP93XX_TOUCHSCREEN_REG(0x04) -+/* R touchscreen controller result register. */ -+#define EP93XX_TOUCHSCREEN_XYRESULT EP93XX_TOUCHSCREEN_REG(0x08) -+/* LOCKED R/W touchscreen Switch Matrix control register. */ -+#define EP93XX_TOUCHSCREEN_DISCHARGE EP93XX_TOUCHSCREEN_REG(0x0C) -+#define EP93XX_TOUCHSCREEN_XSAMPLE EP93XX_TOUCHSCREEN_REG(0x10) -+#define EP93XX_TOUCHSCREEN_YSAMPLE EP93XX_TOUCHSCREEN_REG(0x14) -+#define EP93XX_TOUCHSCREEN_DIRECT EP93XX_TOUCHSCREEN_REG(0x18) -+#define EP93XX_TOUCHSCREEN_DETECT EP93XX_TOUCHSCREEN_REG(0x1C) -+/* NA R/W touchscreen software lock register. */ -+#define EP93XX_TOUCHSCREEN_SWLOCK EP93XX_TOUCHSCREEN_REG(0x20) -+/* R/W touchscreen setup control register #2. */ -+#define EP93XX_TOUCHSCREEN_SETUP2 EP93XX_TOUCHSCREEN_REG(0x24) -+ -+/* These are duplicated in mach-ep93xx/core.c */ -+#define EP93XX_TIMER_REG(x) (EP93XX_TIMER_BASE + (x)) -+#define EP93XX_TIMER2_LOAD EP93XX_TIMER_REG(0x20) -+#define EP93XX_TIMER2_VALUE EP93XX_TIMER_REG(0x24) -+#define EP93XX_TIMER2_CONTROL EP93XX_TIMER_REG(0x28) -+#define EP93XX_TIMER2_CLEAR EP93XX_TIMER_REG(0x2c) -+ -+/* -+ * Register bit definitions -+ */ -+#define TSSETUP_SDLY_MASK 0x000003FF -+#define TSSETUP_SDLY_SHIFT 0 -+#define TSSETUP_NSMP_4 0x00000000 -+#define TSSETUP_NSMP_8 0x00000400 -+#define TSSETUP_NSMP_16 0x00000800 -+#define TSSETUP_NSMP_32 0x00000C00 -+#define TSSETUP_NSMP_MASK 0x00000C00 -+#define TSSETUP_DEV_4 0x00000000 -+#define TSSETUP_DEV_8 0x00001000 -+#define TSSETUP_DEV_12 0x00002000 -+#define TSSETUP_DEV_16 0x00003000 -+#define TSSETUP_DEV_24 0x00004000 -+#define TSSETUP_DEV_32 0x00005000 -+#define TSSETUP_DEV_64 0x00006000 -+#define TSSETUP_DEV_128 0x00007000 -+#define TSSETUP_ENABLE 0x00008000 -+#define TSSETUP_DLY_MASK 0x03FF0000 -+#define TSSETUP_DLY_SHIFT 16 -+#define TSSETUP_TDTCT 0x80000000 -+ -+#define TSMAXMIN_XMIN_MASK 0x000000FF -+#define TSMAXMIN_XMIN_SHIFT 0 -+#define TSMAXMIN_YMIN_MASK 0x0000FF00 -+#define TSMAXMIN_YMIN_SHIFT 8 -+#define TSMAXMIN_XMAX_MASK 0x00FF0000 -+#define TSMAXMIN_XMAX_SHIFT 16 -+#define TSMAXMIN_YMAX_MASK 0xFF000000 -+#define TSMAXMIN_YMAX_SHIFT 24 -+ -+#define TSXYRESULT_X_MASK 0x00000FFF -+#define TSXYRESULT_X_SHIFT 0 -+#define TSXYRESULT_AD_MASK 0x0000FFFF -+#define TSXYRESULT_AD_SHIFT 0 -+#define TSXYRESULT_Y_MASK 0x0FFF0000 -+#define TSXYRESULT_Y_SHIFT 16 -+#define TSXYRESULT_SDR 0x80000000 -+ -+#define TSX_SAMPLE_MASK 0x00003FFF -+#define TSX_SAMPLE_SHIFT 0x00 -+#define TSY_SAMPLE_MASK 0x3FFF0000 -+#define TSY_SAMPLE_SHIFT 0x10 -+ -+#define TSSETUP2_TINT 0x00000001 -+#define TSSETUP2_NICOR 0x00000002 -+#define TSSETUP2_PINT 0x00000004 -+#define TSSETUP2_PENSTS 0x00000008 -+#define TSSETUP2_PINTEN 0x00000010 -+#define TSSETUP2_DEVINT 0x00000020 -+#define TSSETUP2_DINTEN 0x00000040 -+#define TSSETUP2_DTMEN 0x00000080 -+#define TSSETUP2_DISDEV 0x00000100 -+#define TSSETUP2_NSIGND 0x00000200 -+#define TSSETUP2_S28EN 0x00000400 -+#define TSSETUP2_RINTEN 0x00000800 -+ -+#define TSXYRESULT_SDR 0x80000000 -+ -+/* -+ * These are used as trigger levels to know when we have pen up/down. -+ * The rules: -+ * 1. TS_HEAVY_INV_PRESSURE < TS_LIGHT_INV_PRESSURE because these -+ * are Inverse pressure. -+ * 2. Any touch lighter than TS_LIGHT_INV_PRESSURE is a pen up. -+ * 3. Any touch heavier than TS_HEAVY_INV_PRESSURE is a pen down. -+ */ -+#define TS_HEAVY_INV_PRESSURE 0xFE0 /* C00 */ -+#define TS_LIGHT_INV_PRESSURE 0xFFF /* e00 */ -+ -+/* -+ * If the x, y, or inverse pressure changes more than these values -+ * between two succeeding points, the point is not reported. -+ */ -+#define TS_MAX_VALID_XY_CHANGE 0x300 -+#define TS_MAX_VALID_PRESSURE_CHANGE 0x100 -+ -+/* -+ * This is the minimum Z1 Value that is valid. -+ */ -+#define MIN_Z1_VALUE 0x50 -+ -+/* -+ * Settling delay for taking each ADC measurement. Increase this -+ * if ts is jittery. -+ */ -+#define EP93XX_TS_ADC_DELAY_USEC 2000 -+ -+/* -+ * Delay between TS points. -+ */ -+#define EP93XX_TS_PER_POINT_DELAY_USEC 10000 -+ -+/* -+ * A few more macros... -+ */ -+#define TSSETUP_DEFAULT (TSSETUP_NSMP_32 | TSSETUP_DEV_64 | \ -+ ((128<<TSSETUP_SDLY_SHIFT) & TSSETUP_SDLY_MASK) | \ -+ ((128<<TSSETUP_DLY_SHIFT) & TSSETUP_DLY_MASK)) -+ -+#define TSSETUP2_DEFAULT (TSSETUP2_NSIGND) -+ -+/* -+ * For now, we use one of the minor numbers from the local/experimental -+ * range. -+ */ -+#define EP93XX_TS_MINOR 240 -+ -+/* -+ * Static Declarations -+ */ -+static unsigned int guiLastX, guiLastY; -+static unsigned int guiLastInvPressure; -+ -+struct TouchScreenSample -+{ -+ int currentX; -+ int currentY; -+ int currentButton; -+ int currentPressure; -+ struct timeval currentTime; -+}; -+ -+/* -+ * This must match the structure in tslib. -+ */ -+struct ts_sample { -+ int x; -+ int y; -+ unsigned int pressure; -+ struct timeval tv; -+}; -+ -+static struct TouchScreenSample gSample; -+static int bFreshTouchData; -+static int bCurrentPenDown; -+ -+static DECLARE_WAIT_QUEUE_HEAD(queue); -+static DEFINE_SEMAPHORE(open_sem); -+static DEFINE_SPINLOCK(event_buffer_lock); -+static struct fasync_struct *ep93xx_fasync; -+ -+/* -+ * Typedef Declarations -+ */ -+typedef enum { -+ TS_MODE_UN_INITIALIZED, -+ TS_MODE_HARDWARE_SCAN, -+ TS_MODE_SOFT_SCAN -+} ts_mode_t; -+ -+static ts_mode_t gScanningMode; -+ -+typedef enum{ -+ TS_STATE_STOPPED = 0, -+ TS_STATE_Z1, -+ TS_STATE_Z2, -+ TS_STATE_Y, -+ TS_STATE_X, -+ TS_STATE_DONE -+} ts_states_t; -+ -+typedef struct -+{ -+ unsigned int uiX; -+ unsigned int uiY; -+ unsigned int uiZ1; -+ unsigned int uiZ2; -+ ts_states_t state; -+} ts_struct_t; -+ -+static ts_struct_t sTouch; -+ -+/* -+ * From the spec, here's how to set up the touch screen's switch registers. -+ */ -+typedef struct -+{ -+ unsigned int uiDetect; -+ unsigned int uiDischarge; -+ unsigned int uiXSample; -+ unsigned int uiYSample; -+ unsigned int uiSwitchZ1; -+ unsigned int uiSwitchZ2; -+}SwitchStructType; -+ -+/* -+ * Here's the switch settings for a 4-wire touchscreen. See the spec -+ * for how to handle a 4, 7, or 8-wire. -+ */ -+const static SwitchStructType sSwitchSettings = -+/* s28en=0 */ -+/* TSDetect TSDischarge TSXSample TSYSample SwitchZ1 SwitchZ2 */ -+ {0x00403604, 0x0007fe04, 0x00081604, 0x00104601, 0x00101601, 0x00101608}; -+ -+/* -+ * Function declarations -+ */ -+static void ep93xx_ts_set_direct(unsigned int uiADCSwitch); -+static irqreturn_t ep93xx_ts_isr(int irq, void *dev_id); -+static irqreturn_t ep93xx_timer2_isr(int irq, void *dev_id); -+static void ee93xx_ts_evt_add(int button, int dX, int dY, int Pressure); -+static ssize_t ep93xx_ts_read(struct file *filp, char *buf, -+ size_t count, loff_t *l); -+static unsigned int ep93xx_ts_poll(struct file *filp, poll_table *wait); -+static int ep93xx_ts_open(struct inode *inode, struct file *filp); -+static int ep93xx_ts_fasync(int fd, struct file *filp, int on); -+static int ep93xx_ts_release(struct inode *inode, struct file *filp); -+static ssize_t ep93xx_ts_write(struct file *file, const char *buffer, -+ size_t count, loff_t *ppos); -+static void ep93xx_ts_setup(void); -+static void ep93xx_ts_shutdown(void); -+int __init ep93xx_ts_init(void); -+void __exit ep93xx_ts_exit(void); -+static unsigned int CalculateInvPressure(void); -+static unsigned int ADCGetData(unsigned int uiSamples, unsigned int uiMaxDiff); -+static void TS_Soft_Scan_Mode(void); -+static void TS_Hardware_Scan_Mode(void); -+static void ProcessPointData(void); -+static void Set_Timer2_uSec(unsigned int Delay_mSec); -+static void Stop_Timer2(void); -+ -+/* -+ * ep93xx_ts_isr -+ */ -+static irqreturn_t ep93xx_ts_isr(int irq, void *dev_id) -+{ -+ /* -+ * Note that we don't clear the interrupt here. The interrupt -+ * gets cleared in TS_Soft_Scan_Mode when the TS ENABLE -+ * bit is cleared. -+ */ -+ -+ /* -+ * Set the ts to manual polling mode and schedule a callback. -+ * That way we can return from the isr in a reasonable amount of -+ * time and process the touch in the callback after a brief delay. -+ */ -+ TS_Soft_Scan_Mode(); -+ -+ return(IRQ_HANDLED); -+} -+ -+/* -+ * Save the current ts 'event' in an atomic fashion. -+ */ -+static void ee93xx_ts_evt_add(int buttons, int iX, int iY, int iPressure) -+{ -+ /* -+ * Note the event, but use spinlocks to keep it from getting -+ * halfway read if we get interrupted. -+ */ -+ -+ spin_lock(&event_buffer_lock); -+ -+ gSample.currentX = iX; -+ gSample.currentY = iY; -+ gSample.currentButton = buttons; -+ gSample.currentPressure = iPressure; -+ bFreshTouchData = 1; -+ do_gettimeofday(&gSample.currentTime); -+ -+ spin_unlock(&event_buffer_lock); -+ -+ kill_fasync(&ep93xx_fasync, SIGIO, POLL_IN); -+ wake_up_interruptible(&queue); -+} -+ -+ -+static ssize_t ep93xx_ts_read(struct file *filp, char *buf, size_t count, loff_t *l) -+{ -+ unsigned short data[3]; -+ struct ts_sample ts_data; -+ int iReturn = -EFAULT; -+ -+ if (!bFreshTouchData) -+ { -+ iReturn = 0; -+ } -+ else if (count == sizeof(data)) -+ { -+ spin_lock_irq(&event_buffer_lock); -+ bFreshTouchData = 0; -+ data[0] = gSample.currentX; -+ data[1] = gSample.currentY; -+ data[2] = gSample.currentButton; -+ -+ spin_unlock_irq(&event_buffer_lock); -+ -+ if (copy_to_user(buf, data, sizeof data)) -+ return -EFAULT; -+ -+ count -= sizeof(data); -+ -+ /* return the # of bytes that got read */ -+ iReturn = sizeof(data) ; -+ } -+ else if (count == sizeof(struct ts_sample) ) -+ { -+ spin_lock_irq(&event_buffer_lock); -+ bFreshTouchData = 0; -+ ts_data.x = gSample.currentX; -+ ts_data.y = gSample.currentY; -+ ts_data.pressure = gSample.currentPressure; -+ ts_data.tv = gSample.currentTime; -+ spin_unlock_irq(&event_buffer_lock); -+ -+ if (copy_to_user(buf, &ts_data, sizeof(struct ts_sample))) -+ { -+ iReturn = -EFAULT; -+ } -+ else -+ { -+ count -= sizeof(ts_data); -+ iReturn = sizeof(ts_data); -+ } -+ } -+ -+ return iReturn; -+} -+ -+static unsigned int ep93xx_ts_poll(struct file *filp, poll_table *wait) -+{ -+ poll_wait(filp, &queue, wait); -+ -+ if (bFreshTouchData) -+ { -+ return POLLIN | POLLRDNORM; -+ } -+ -+ return 0; -+} -+ -+static int ep93xx_ts_open(struct inode *inode, struct file *filp) -+{ -+ if (down_trylock(&open_sem)) -+ { -+ return -EBUSY; -+ } -+ -+ ep93xx_ts_setup(); -+ -+ return 0; -+} -+ -+/* -+ * Asynchronous I/O support. -+ */ -+static int ep93xx_ts_fasync(int fd, struct file *filp, int on) -+{ -+ int retval; -+ -+ retval = fasync_helper(fd, filp, on, &ep93xx_fasync); -+ if (retval < 0) -+ { -+ return retval; -+ } -+ -+ return 0; -+} -+ -+static int ep93xx_ts_release(struct inode *inode, struct file *filp) -+{ -+ Stop_Timer2(); -+ -+ /* -+ * Call our async I/O support to request that this file -+ * cease to be used for async I/O. -+ */ -+ ep93xx_ts_fasync(-1, filp, 0); -+ -+ ep93xx_ts_shutdown(); -+ -+ up(&open_sem); -+ -+ return 0; -+} -+ -+static ssize_t ep93xx_ts_write(struct file *file, const char *buffer, size_t count, -+ loff_t *ppos) -+{ -+ return -EINVAL; -+} -+ -+ -+static int ep93xx_ts_ioctl(struct inode *inode, struct file *file, uint command, ulong u) -+{ -+ static const int version = EV_VERSION; -+ static const u_int32_t bit =(1 << EV_ABS); -+ static const u_int32_t absbit = (1 << ABS_X) | (1 << ABS_Y) | (1 << ABS_PRESSURE); -+ int iReturn ; -+ int i = 0; -+ -+ switch(command) -+ { -+ case EVIOCGVERSION: -+ i = copy_to_user((void __user *)u, (void *)version, sizeof(version)); -+ iReturn = i ? -EFAULT : 0; -+ break; -+ -+ case EVIOCGBIT(0,sizeof(u_int32_t) * 8) : -+ i = copy_to_user((void __user *)u, (void *)bit, sizeof(bit)); -+ iReturn = i ? -EFAULT : 0; -+ break; -+ -+ case EVIOCGBIT(EV_ABS, sizeof(absbit) * 8): -+ i = copy_to_user((void __user *)u, (void *)absbit, sizeof(absbit)); -+ iReturn = i ? -EFAULT : 0; -+ break; -+ default: -+ iReturn = -1; -+ break; -+ } -+ -+ return iReturn; -+} -+ -+static struct file_operations ep93xx_ts_fops = { -+ owner: THIS_MODULE, -+ read: ep93xx_ts_read, -+ write: ep93xx_ts_write, -+ poll: ep93xx_ts_poll, -+ open: ep93xx_ts_open, -+ unlocked_ioctl: ep93xx_ts_ioctl, -+ release: ep93xx_ts_release, -+ fasync: ep93xx_ts_fasync, -+}; -+ -+static struct miscdevice ep93xx_ts_miscdev = -+{ -+ EP93XX_TS_MINOR, -+ "ep93xx_ts", -+ &ep93xx_ts_fops -+}; -+ -+void ep93xx_ts_setup(void) -+{ -+ unsigned int uiKTDIV, uiTSXYMaxMin; -+ -+ /* -+ * Set the TSEN bit in KTDIV so that we are enabling the clock -+ * for the touchscreen. -+ */ -+ uiKTDIV = __raw_readl(EP93XX_SYSCON_KEYTCHCLKDIV); -+ uiKTDIV |= EP93XX_SYSCON_KEYTCHCLKDIV_TSEN; -+ ep93xx_syscon_swlocked_write(uiKTDIV, EP93XX_SYSCON_KEYTCHCLKDIV); -+ -+ /* -+ * Program the EP93XX_TOUCHSCREEN_SETUP and TSSetup2 registers. -+ */ -+ __raw_writel(TSSETUP_DEFAULT, EP93XX_TOUCHSCREEN_SETUP); -+ __raw_writel(TSSETUP2_DEFAULT, EP93XX_TOUCHSCREEN_SETUP2); -+ -+ /* -+ * Set the the touch settings. -+ */ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiDischarge, EP93XX_TOUCHSCREEN_DIRECT); -+ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiDischarge, EP93XX_TOUCHSCREEN_DISCHARGE); -+ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiSwitchZ1, EP93XX_TOUCHSCREEN_XSAMPLE); -+ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiSwitchZ2, EP93XX_TOUCHSCREEN_YSAMPLE); -+ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiDetect, EP93XX_TOUCHSCREEN_DETECT); -+ -+ /* -+ * X,YMin set to 0x40 = have to drag that many pixels for a new irq. -+ * X,YMax set to 0x40 = 1024 pixels is the maximum movement within the -+ * time scan limit. -+ */ -+ uiTSXYMaxMin = (50 << TSMAXMIN_XMIN_SHIFT) & TSMAXMIN_XMIN_MASK; -+ uiTSXYMaxMin |= (50 << TSMAXMIN_YMIN_SHIFT) & TSMAXMIN_YMIN_MASK; -+ uiTSXYMaxMin |= (0xff << TSMAXMIN_XMAX_SHIFT) & TSMAXMIN_XMAX_MASK; -+ uiTSXYMaxMin |= (0xff << TSMAXMIN_YMAX_SHIFT) & TSMAXMIN_YMAX_MASK; -+ __raw_writel(uiTSXYMaxMin, EP93XX_TOUCHSCREEN_XYMAXMIN); -+ -+ bCurrentPenDown = 0; -+ bFreshTouchData = 0; -+ guiLastX = 0; -+ guiLastY = 0; -+ guiLastInvPressure = 0xffffff; -+ -+ /* -+ * Enable the touch screen scanning engine. -+ */ -+ TS_Hardware_Scan_Mode(); -+} -+ -+/* -+ * ep93xx_ts_shutdown -+ * -+ */ -+static void -+ep93xx_ts_shutdown(void) -+{ -+ unsigned int uiKTDIV; -+ -+ sTouch.state = TS_STATE_STOPPED; -+ Stop_Timer2(); -+ -+ /* -+ * Disable the scanning engine. -+ */ -+ __raw_writel(0, EP93XX_TOUCHSCREEN_SETUP); -+ __raw_writel(0, EP93XX_TOUCHSCREEN_SETUP2); -+ -+ /* -+ * Clear the TSEN bit in KTDIV so that we are disabling the clock -+ * for the touchscreen. -+ */ -+ uiKTDIV = __raw_readl(EP93XX_SYSCON_KEYTCHCLKDIV); -+ uiKTDIV &= ~EP93XX_SYSCON_KEYTCHCLKDIV_TSEN; -+ ep93xx_syscon_swlocked_write(uiKTDIV, EP93XX_SYSCON_KEYTCHCLKDIV); -+ -+} /* ep93xx_ts_shutdown */ -+ -+static irqreturn_t ep93xx_timer2_isr(int irq, void *dev_id) -+{ -+ switch(sTouch.state) -+ { -+ case TS_STATE_STOPPED: -+ TS_Hardware_Scan_Mode(); -+ break; -+ -+ /* -+ * Get the Z1 value for pressure measurement and set up -+ * the switch register for getting the Z2 measurement. -+ */ -+ case TS_STATE_Z1: -+ Set_Timer2_uSec(EP93XX_TS_ADC_DELAY_USEC); -+ sTouch.uiZ1 = ADCGetData(2, 200); -+ ep93xx_ts_set_direct(sSwitchSettings.uiSwitchZ2); -+ sTouch.state = TS_STATE_Z2; -+ break; -+ -+ /* -+ * Get the Z2 value for pressure measurement and set up -+ * the switch register for getting the Y measurement. -+ */ -+ case TS_STATE_Z2: -+ sTouch.uiZ2 = ADCGetData(2, 200); -+ ep93xx_ts_set_direct(sSwitchSettings.uiYSample); -+ sTouch.state = TS_STATE_Y; -+ break; -+ -+ /* -+ * Get the Y value and set up the switch register for -+ * getting the X measurement. -+ */ -+ case TS_STATE_Y: -+ sTouch.uiY = ADCGetData(4, 20); -+ ep93xx_ts_set_direct(sSwitchSettings.uiXSample); -+ sTouch.state = TS_STATE_X; -+ break; -+ -+ /* -+ * Read the X value. This is the last of the 4 adc values -+ * we need so we continue on to process the data. -+ */ -+ case TS_STATE_X: -+ Stop_Timer2(); -+ -+ sTouch.uiX = ADCGetData(4, 20); -+ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiDischarge, EP93XX_TOUCHSCREEN_DIRECT); -+ -+ sTouch.state = TS_STATE_DONE; -+ -+ /* -+ * Process this set of ADC readings. -+ */ -+ ProcessPointData(); -+ -+ break; -+ -+ /* -+ * Shouldn't get here. But if we do, we can recover... -+ */ -+ case TS_STATE_DONE: -+ TS_Hardware_Scan_Mode(); -+ break; -+ } -+ -+ /* -+ * Clear the timer2 interrupt. -+ */ -+ __raw_writel(1, EP93XX_TIMER2_CLEAR); -+ return(IRQ_HANDLED); -+} -+ -+/*--------------------------------------------------------------------- -+ * ProcessPointData -+ * -+ * This routine processes the ADC data into usable point data and then -+ * puts the driver into hw or sw scanning mode before returning. -+ * -+ * We calculate inverse pressure (lower number = more pressure) then -+ * do a hystheresis with the two pressure values 'light' and 'heavy'. -+ * -+ * If we are above the light, we have pen up. -+ * If we are below the heavy we have pen down. -+ * As long as the pressure stays below the light, pen stays down. -+ * When we get above the light again, pen goes back up. -+ * -+ */ -+static void ProcessPointData(void) -+{ -+ int bValidPoint = 0; -+ unsigned int uiXDiff, uiYDiff, uiInvPressureDiff; -+ unsigned int uiInvPressure; -+ -+ /* -+ * Calculate the current pressure. -+ */ -+ uiInvPressure = CalculateInvPressure(); -+ -+ /* -+ * If pen pressure is so light that it is greater than the 'max' setting -+ * then we consider this to be a pen up. -+ */ -+ if (uiInvPressure >= TS_LIGHT_INV_PRESSURE) -+ { -+ bCurrentPenDown = 0; -+ ee93xx_ts_evt_add(0, guiLastX, guiLastY, 0); -+ TS_Hardware_Scan_Mode(); -+ return; -+ } -+ -+ /* -+ * Hysteresis: -+ * If the pen pressure is hard enough to be less than the 'min' OR -+ * the pen is already down and is still less than the 'max'... -+ */ -+ if ((uiInvPressure < TS_HEAVY_INV_PRESSURE) || -+ (bCurrentPenDown && (uiInvPressure < TS_LIGHT_INV_PRESSURE))) -+ { -+ if (bCurrentPenDown) -+ { -+ /* -+ * If pen was previously down, check the difference between -+ * the last sample and this one... if the difference between -+ * samples is too great, ignore the sample. -+ */ -+ uiXDiff = abs(guiLastX - sTouch.uiX); -+ uiYDiff = abs(guiLastY - sTouch.uiY); -+ uiInvPressureDiff = abs(guiLastInvPressure - uiInvPressure); -+ -+ if (uiXDiff < TS_MAX_VALID_XY_CHANGE -+ && uiYDiff < TS_MAX_VALID_XY_CHANGE -+ && uiInvPressureDiff < TS_MAX_VALID_PRESSURE_CHANGE) -+ { -+ bValidPoint = 1; -+ } -+ } -+ else -+ { -+ bValidPoint = 1; -+ } -+ -+ /* -+ * If either the pen was put down or dragged make a note of it. -+ */ -+ if (bValidPoint) -+ { -+ guiLastX = sTouch.uiX; -+ guiLastY = sTouch.uiY; -+ guiLastInvPressure = uiInvPressure; -+ bCurrentPenDown = 1; -+ ee93xx_ts_evt_add(1, sTouch.uiX, sTouch.uiY, -+ 0x7000000 / uiInvPressure); -+ } -+ -+ TS_Soft_Scan_Mode(); -+ return; -+ } -+ -+ TS_Hardware_Scan_Mode(); -+} -+ -+static void ep93xx_ts_set_direct(unsigned int uiADCSwitch) -+{ -+ unsigned int uiResult; -+ -+ /* -+ * Set the switch settings in the direct register. -+ */ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(uiADCSwitch, EP93XX_TOUCHSCREEN_DIRECT); -+ -+ /* -+ * Read and throw away the first sample. -+ */ -+ do { -+ uiResult = __raw_readl(EP93XX_TOUCHSCREEN_XYRESULT); -+ } while (!(uiResult & TSXYRESULT_SDR)); -+ -+} -+ -+static unsigned int ADCGetData(unsigned int uiSamples, unsigned int uiMaxDiff) -+{ -+ unsigned int uiResult, uiValue, uiCount, uiLowest, uiHighest, uiSum, uiAve; -+ -+ do -+ { -+ /* -+ * Initialize our values. -+ */ -+ uiLowest = 0xfffffff; -+ uiHighest = 0; -+ uiSum = 0; -+ -+ for (uiCount = 0; uiCount < uiSamples; uiCount++) -+ { -+ /* -+ * Read the touch screen four more times and average. -+ */ -+ do { -+ uiResult = __raw_readl(EP93XX_TOUCHSCREEN_XYRESULT); -+ } while (!(uiResult & TSXYRESULT_SDR)); -+ -+ uiValue = (uiResult & TSXYRESULT_AD_MASK) >> TSXYRESULT_AD_SHIFT; -+ uiValue = ((uiValue >> 4) + ((1 + TSXYRESULT_X_MASK)>>1)) & TSXYRESULT_X_MASK; -+ -+ /* -+ * Add up the values. -+ */ -+ uiSum += uiValue; -+ -+ /* -+ * Get the lowest and highest values. -+ */ -+ if (uiValue < uiLowest) -+ { -+ uiLowest = uiValue; -+ } -+ if (uiValue > uiHighest) -+ { -+ uiHighest = uiValue; -+ } -+ } -+ } while ((uiHighest - uiLowest) > uiMaxDiff); -+ -+ /* -+ * Calculate the Average value. -+ */ -+ uiAve = uiSum / uiSamples; -+ -+ return uiAve; -+} -+ -+/* -+ * CalculateInvPressure -+ * -+ * Is the Touch Valid. Touch is not valid if the X or Y value is not -+ * in range and the pressure is not enough. -+ * -+ * Touch resistance can be measured by the following formula: -+ * -+ * Rx * X * Z2 -+ * Rtouch = --------- * (-- - 1) -+ * 4096 Z1 -+ * -+ * This is simplified in the ration of Rtouch to Rx. The lower the value, the -+ * higher the pressure. -+ * -+ * Z2 -+ * InvPressure = X * (-- - 1) -+ * Z1 -+ */ -+static unsigned int CalculateInvPressure(void) -+{ -+ unsigned int uiInvPressure; -+ -+ /* -+ * Check to see if the point is valid. -+ */ -+ if (sTouch.uiZ1 < MIN_Z1_VALUE) -+ { -+ uiInvPressure = 0x10000; -+ } -+ -+ /* -+ * Can omit the pressure calculation if you need to get rid of the division. -+ */ -+ else -+ { -+ uiInvPressure = ((sTouch.uiX * sTouch.uiZ2) / sTouch.uiZ1) - sTouch.uiX; -+ } -+ -+ return uiInvPressure; -+} -+ -+/* -+ * TS_Hardware_Scan_Mode -+ * -+ * Enables the ep93xx ts scanning engine so that when the pen goes down -+ * we will get an interrupt. -+ */ -+static void TS_Hardware_Scan_Mode(void) -+{ -+ unsigned int uiDevCfg; -+ -+ /* -+ * Disable the soft scanning engine. -+ */ -+ sTouch.state = TS_STATE_STOPPED; -+ Stop_Timer2(); -+ -+ /* -+ * Clear the TIN (Touchscreen INactive) bit so we can go to -+ * automatic scanning mode. -+ */ -+ uiDevCfg = __raw_readl(EP93XX_SYSCON_DEVCFG); -+ ep93xx_syscon_swlocked_write(uiDevCfg & ~EP93XX_SYSCON_DEVCFG_TIN, -+ EP93XX_SYSCON_DEVCFG); -+ -+ /* -+ * Enable the touch screen scanning state machine by setting -+ * the ENABLE bit. -+ */ -+ __raw_writel(TSSETUP_DEFAULT | TSSETUP_ENABLE, EP93XX_TOUCHSCREEN_SETUP); -+ -+ /* -+ * Set the flag to show that we are in interrupt mode. -+ */ -+ gScanningMode = TS_MODE_HARDWARE_SCAN; -+ -+ /* -+ * Initialize EP93XX_TOUCHSCREEN_SETUP2 register. -+ */ -+ __raw_writel(TSSETUP2_DEFAULT, EP93XX_TOUCHSCREEN_SETUP2); -+ -+} -+ -+/* -+ * TS_Soft_Scan_Mode -+ * -+ * Sets the touch screen to manual polling mode. -+ */ -+static void TS_Soft_Scan_Mode(void) -+{ -+ unsigned int uiDevCfg; -+ -+ if (gScanningMode != TS_MODE_SOFT_SCAN) -+ { -+ /* -+ * Disable the touch screen scanning state machine by clearing -+ * the ENABLE bit. -+ */ -+ __raw_writel(TSSETUP_DEFAULT, EP93XX_TOUCHSCREEN_SETUP); -+ -+ /* -+ * Set the TIN bit so we can do manual touchscreen polling. -+ */ -+ uiDevCfg = __raw_readl(EP93XX_SYSCON_DEVCFG); -+ ep93xx_syscon_swlocked_write(uiDevCfg | EP93XX_SYSCON_DEVCFG_TIN, -+ EP93XX_SYSCON_DEVCFG); -+ } -+ -+ /* -+ * Set the switch register up for the first ADC reading -+ */ -+ ep93xx_ts_set_direct(sSwitchSettings.uiSwitchZ1); -+ -+ /* -+ * Initialize our software state machine to know which ADC -+ * reading to take -+ */ -+ sTouch.state = TS_STATE_Z1; -+ -+ /* -+ * Set the timer so after a mSec or two settling delay it will -+ * take the first ADC reading. -+ */ -+ Set_Timer2_uSec(EP93XX_TS_PER_POINT_DELAY_USEC); -+ -+ /* -+ * Note that we are in sw scanning mode not hw scanning mode. -+ */ -+ gScanningMode = TS_MODE_SOFT_SCAN; -+ -+} -+ -+static void Set_Timer2_uSec(unsigned int uiDelay_uSec) -+{ -+ unsigned int uiClockTicks; -+ -+ /* -+ * Stop timer 2 -+ */ -+ __raw_writel(0, EP93XX_TIMER2_CONTROL); -+ -+ uiClockTicks = ((uiDelay_uSec * 508) + 999) / 1000; -+ __raw_writel(uiClockTicks, EP93XX_TIMER2_LOAD); -+ __raw_writel(uiClockTicks, EP93XX_TIMER2_VALUE); -+ -+ /* -+ * Set up Timer 2 for 508 kHz clock and periodic mode. -+ */ -+ __raw_writel(0xC8, EP93XX_TIMER2_CONTROL); -+ -+} -+ -+static void Stop_Timer2(void) -+{ -+ __raw_writel(0, EP93XX_TIMER2_CONTROL); -+} -+ -+/* -+ * Initialization and exit routines -+ */ -+int __init ep93xx_ts_init(void) -+{ -+ int retval; -+ -+ retval = request_irq(IRQ_EP93XX_TOUCH, ep93xx_ts_isr, -+ IRQF_DISABLED, "ep93xx_ts", 0); -+ if (retval) -+ { -+ printk(KERN_WARNING "ep93xx_ts: failed to get touchscreen IRQ\n"); -+ return retval; -+ } -+ -+ retval = request_irq(IRQ_EP93XX_TIMER2, ep93xx_timer2_isr, -+ IRQF_DISABLED, "ep93xx_timer2", 0); -+ if (retval) -+ { -+ printk(KERN_WARNING "ep93xx_ts: failed to get timer2 IRQ\n"); -+ free_irq(IRQ_EP93XX_TOUCH, 0); -+ return retval; -+ } -+ -+ misc_register(&ep93xx_ts_miscdev); -+ -+ sTouch.state = TS_STATE_STOPPED; -+ gScanningMode = TS_MODE_UN_INITIALIZED; -+ -+ printk(KERN_NOTICE "ep93xx touchscreen driver configured for 4-wire operation\n"); -+ -+ return 0; -+} -+ -+void __exit ep93xx_ts_exit(void) -+{ -+ Stop_Timer2(); -+ -+ free_irq(IRQ_EP93XX_TOUCH, 0); -+ free_irq(IRQ_EP93XX_TIMER2, 0); -+ -+ misc_deregister(&ep93xx_ts_miscdev); -+} -+ -+module_init(ep93xx_ts_init); -+module_exit(ep93xx_ts_exit); -+ -+MODULE_DESCRIPTION("Cirrus EP93xx touchscreen driver"); -+MODULE_SUPPORTED_DEVICE("touchscreen/ep93xx"); -+MODULE_LICENSE("GPL"); ---- a/arch/arm/mach-ep93xx/core.c -+++ b/arch/arm/mach-ep93xx/core.c -@@ -211,6 +211,7 @@ void ep93xx_syscon_swlocked_write(unsign - - spin_unlock_irqrestore(&syscon_swlock, flags); - } -+EXPORT_SYMBOL(ep93xx_syscon_swlocked_write); - - void ep93xx_devcfg_set_clear(unsigned int set_bits, unsigned int clear_bits) - { diff --git a/target/linux/ep93xx/patches-3.18/004-simone_add_mmc_spi.patch b/target/linux/ep93xx/patches-3.18/004-simone_add_mmc_spi.patch deleted file mode 100644 index 3e6b0fa..0000000 --- a/target/linux/ep93xx/patches-3.18/004-simone_add_mmc_spi.patch +++ /dev/null @@ -1,178 +0,0 @@ -This enables the mmc-over-spi driver for the Sim.One board, based on Mika's -patch, which used a GPIO for chip select in stead of the default SFRMOUT pin. -I've modified it to use the usual SFRMOUT; if you've modified your Sim.One -board to use a GPIO instead, uncomment and modify -// #define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO15 -in the source file. - -martinwguy, 14 May 2010 - -From: Mika Westerberg <mika.westerberg@iki.fi> -Date: Wed, 28 Apr 2010 08:42:46 +0300 -Subject: [PATCH] ep93xx: simone: added board specific SPI support for MMC/SD cards - -This includes setting up EGPIOs 0 and 9 for card detection and chip select -respectively. - ---- a/arch/arm/mach-ep93xx/simone.c -+++ b/arch/arm/mach-ep93xx/simone.c -@@ -20,10 +20,15 @@ - #include <linux/platform_device.h> - #include <linux/i2c.h> - #include <linux/i2c-gpio.h> -+#include <linux/gpio.h> -+#include <linux/mmc/host.h> -+#include <linux/spi/spi.h> -+#include <linux/spi/mmc_spi.h> - - #include <mach/hardware.h> - #include <linux/platform_data/video-ep93xx.h> - #include <mach/gpio-ep93xx.h> -+#include <linux/platform_data/spi-ep93xx.h> - - #include <asm/mach-types.h> - #include <asm/mach/arch.h> -@@ -40,6 +45,135 @@ static struct ep93xxfb_mach_info __initd - .flags = EP93XXFB_USE_SDCSN0 | EP93XXFB_PCLK_FALLING, - }; - -+/* -+ * GPIO lines used for MMC card detection. -+ */ -+#define MMC_CARD_DETECT_GPIO EP93XX_GPIO_LINE_EGPIO0 -+ -+/* -+ * If you have hacked your Sim.One to use a GPIO as SD card chip select -+ * (SD pin 1), uncomment the following line. -+ * The example, EGPIO15, is on TP17 near the CPU. -+ */ -+// #define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO15 -+ -+/* -+ * MMC SPI chip select GPIO handling. If you are using SFRMOUT (SFRM1) signal, -+ * you can leave these empty and pass NULL as .controller_data. -+ */ -+ -+#ifdef MMC_CHIP_SELECT_GPIO -+static int simone_mmc_spi_setup(struct spi_device *spi) -+{ -+ unsigned int gpio = MMC_CHIP_SELECT_GPIO; -+ int err; -+ -+ err = gpio_request(gpio, spi->modalias); -+ if (err) -+ return err; -+ -+ err = gpio_direction_output(gpio, 1); -+ if (err) { -+ gpio_free(gpio); -+ return err; -+ } -+ -+ return 0; -+} -+ -+static void simone_mmc_spi_cleanup(struct spi_device *spi) -+{ -+ unsigned int gpio = MMC_CHIP_SELECT_GPIO; -+ -+ gpio_set_value(gpio, 1); -+ gpio_direction_input(gpio); -+ gpio_free(gpio); -+} -+ -+static void simone_mmc_spi_cs_control(struct spi_device *spi, int value) -+{ -+ gpio_set_value(MMC_CHIP_SELECT_GPIO, value); -+} -+ -+static struct ep93xx_spi_chip_ops simone_mmc_spi_ops = { -+ .setup = simone_mmc_spi_setup, -+ .cleanup = simone_mmc_spi_cleanup, -+ .cs_control = simone_mmc_spi_cs_control, -+}; -+#endif -+ -+/* -+ * MMC card detection GPIO setup. -+ */ -+static int simone_mmc_spi_init(struct device *dev, -+ irqreturn_t (*irq_handler)(int, void *), void *mmc) -+{ -+ unsigned int gpio = MMC_CARD_DETECT_GPIO; -+ int irq, err; -+ -+ err = gpio_request(gpio, dev_name(dev)); -+ if (err) -+ return err; -+ -+ err = gpio_direction_input(gpio); -+ if (err) -+ goto fail; -+ -+ irq = gpio_to_irq(gpio); -+ if (irq < 0) -+ goto fail; -+ -+ err = request_irq(irq, irq_handler, IRQF_TRIGGER_FALLING, -+ "MMC card detect", mmc); -+ if (err) -+ goto fail; -+ -+ printk(KERN_INFO "%s: using irq %d for MMC card detection\n", -+ dev_name(dev), irq); -+ -+ return 0; -+fail: -+ gpio_free(gpio); -+ return err; -+} -+ -+static void simone_mmc_spi_exit(struct device *dev, void *mmc) -+{ -+ unsigned int gpio = MMC_CARD_DETECT_GPIO; -+ -+ free_irq(gpio_to_irq(gpio), mmc); -+ gpio_free(gpio); -+} -+ -+static struct mmc_spi_platform_data simone_mmc_spi_data = { -+ .init = simone_mmc_spi_init, -+ .exit = simone_mmc_spi_exit, -+ .detect_delay = 500, -+ .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, -+}; -+ -+static struct spi_board_info simone_spi_devices[] __initdata = { -+ { -+ .modalias = "mmc_spi", -+#ifdef MMC_CHIP_SELECT_GPIO -+ .controller_data = &simone_mmc_spi_ops, -+#endif -+ .platform_data = &simone_mmc_spi_data, -+ /* -+ * We use 10 MHz even though the maximum is 3.7 MHz. The driver -+ * will limit it automatically to max. frequency. -+ */ -+ .max_speed_hz = 10 * 1000 * 1000, -+ .bus_num = 0, -+ .chip_select = 0, -+ .mode = SPI_MODE_3, -+ }, -+}; -+ -+static struct ep93xx_spi_info simone_spi_info __initdata = { -+ .num_chipselect = ARRAY_SIZE(simone_spi_devices), -+}; -+ - static struct i2c_gpio_platform_data __initdata simone_i2c_gpio_data = { - .sda_pin = EP93XX_GPIO_LINE_EEDAT, - .sda_is_open_drain = 0, -@@ -74,6 +208,8 @@ static void __init simone_init_machine(v - ep93xx_register_fb(&simone_fb_info); - ep93xx_register_i2c(&simone_i2c_gpio_data, simone_i2c_board_info, - ARRAY_SIZE(simone_i2c_board_info)); -+ ep93xx_register_spi(&simone_spi_info, simone_spi_devices, -+ ARRAY_SIZE(simone_spi_devices)); - simone_register_audio(); - } - diff --git a/target/linux/ep93xx/patches-3.8/001-ep93xx_cpuinfo.patch b/target/linux/ep93xx/patches-3.8/001-ep93xx_cpuinfo.patch deleted file mode 100644 index 2260641..0000000 --- a/target/linux/ep93xx/patches-3.8/001-ep93xx_cpuinfo.patch +++ /dev/null @@ -1,70 +0,0 @@ -This patch puts the EP93xx chip revision and unique ID into /proc/cpuinfo. -This is necessary to be able to set a unique MAC address for DHCP purposes -by adding a line to /etc/network/interfaces: - -# Generate a unique locally-assigned MAC address from the CPU serial number -pre-up ifconfig eth0 hw ether `sed -n 's/^Serial.* 000000/02/p' /proc/cpuinfo` - -It uses the chip revision reading code in the ep93xx-chip-revision patch. - -Really, this is wrong, since /proc/cpuinfo should report the revision and -serial number of the ARM920T processor, while these are the rev and serial -of the EP93xx SoC. In a future kernel (>2.6.34) there may be a new file -/proc/socinfo for this information. - - -martinwguy 14 May 2010 - ---- a/arch/arm/kernel/setup.c -+++ b/arch/arm/kernel/setup.c -@@ -55,6 +55,12 @@ - #include <asm/memblock.h> - #include <asm/virt.h> - -+#if defined(CONFIG_ARCH_EP93XX) -+#include <asm/io.h> -+#include <mach/platform.h> -+#include <mach/ep93xx-regs.h> -+#endif -+ - #include "atags.h" - #include "tcm.h" - -@@ -903,9 +909,16 @@ static int c_show(struct seq_file *m, vo - } - - seq_printf(m, "Hardware\t: %s\n", machine_name); -+#if defined(CONFIG_ARCH_EP93XX) -+ seq_printf(m, "Revision\t: %04x\n", -+ ep93xx_chip_revision()); -+ seq_printf(m, "Serial\t\t: %016x\n", -+ *((unsigned int *)EP93XX_SECURITY_UNIQID)); -+#else - seq_printf(m, "Revision\t: %04x\n", system_rev); - seq_printf(m, "Serial\t\t: %08x%08x\n", - system_serial_high, system_serial_low); -+#endif - - return 0; - } ---- a/arch/arm/mach-ep93xx/soc.h -+++ b/arch/arm/mach-ep93xx/soc.h -@@ -82,8 +82,6 @@ - #define EP93XX_I2S_PHYS_BASE EP93XX_APB_PHYS(0x00020000) - #define EP93XX_I2S_BASE EP93XX_APB_IOMEM(0x00020000) - --#define EP93XX_SECURITY_BASE EP93XX_APB_IOMEM(0x00030000) -- - #define EP93XX_AAC_PHYS_BASE EP93XX_APB_PHYS(0x00080000) - #define EP93XX_AAC_BASE EP93XX_APB_IOMEM(0x00080000) - ---- a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h -+++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h -@@ -38,4 +38,8 @@ - #define EP93XX_UART3_PHYS_BASE EP93XX_APB_PHYS(0x000e0000) - #define EP93XX_UART3_BASE EP93XX_APB_IOMEM(0x000e0000) - -+#define EP93XX_SECURITY_BASE EP93XX_APB_IOMEM(0x00030000) -+#define EP93XX_SECURITY_REG(x) (EP93XX_SECURITY_BASE + (x)) -+#define EP93XX_SECURITY_UNIQID EP93XX_SECURITY_REG(0x2440) -+ - #endif diff --git a/target/linux/ep93xx/patches-3.8/003-ep93xx_touchscreen.patch b/target/linux/ep93xx/patches-3.8/003-ep93xx_touchscreen.patch deleted file mode 100644 index ed6f3c3..0000000 --- a/target/linux/ep93xx/patches-3.8/003-ep93xx_touchscreen.patch +++ /dev/null @@ -1,1072 +0,0 @@ ---- - arch/arm/mach-ep93xx/include/mach/hardware.h | 1 - arch/arm/mach-ep93xx/include/mach/regs_touch.h | 95 ++ - drivers/input/touchscreen/Kconfig | 5 - drivers/input/touchscreen/Makefile | 1 - drivers/input/touchscreen/ep93xx_ts.c | 1117 +++++++++++++++++++++++++ - drivers/input/touchscreen/ep93xx_ts.h | 53 + - 6 files changed, 1272 insertions(+) - ---- a/drivers/input/touchscreen/Kconfig -+++ b/drivers/input/touchscreen/Kconfig -@@ -235,6 +235,15 @@ config TOUCHSCREEN_EGALAX - To compile this driver as a module, choose M here: the - module will be called egalax_ts. - -+config TOUCHSCREEN_EP93XX -+ tristate "EP93xx Touchscreen" -+ depends on ARM && INPUT && ARCH_EP93XX -+ help -+ Say Y here to enable support for EP93xx touch screen. -+ -+ To compile this driver as a module, choose M here: -+ the module will be called ep93xx_ts. -+ - config TOUCHSCREEN_FUJITSU - tristate "Fujitsu serial touchscreen" - select SERIO ---- a/drivers/input/touchscreen/Makefile -+++ b/drivers/input/touchscreen/Makefile -@@ -29,6 +29,7 @@ obj-$(CONFIG_TOUCHSCREEN_GUNZE) += gunz - obj-$(CONFIG_TOUCHSCREEN_EETI) += eeti_ts.o - obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o - obj-$(CONFIG_TOUCHSCREEN_EGALAX) += egalax_ts.o -+obj-$(CONFIG_TOUCHSCREEN_EP93XX) += ep93xx_ts.o - obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o - obj-$(CONFIG_TOUCHSCREEN_ILI210X) += ili210x.o - obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o ---- /dev/null -+++ b/drivers/input/touchscreen/ep93xx_ts.c -@@ -0,0 +1,1022 @@ -+/* -+ * linux/drivers/input/touchscreen/ep93xx_ts.c -+ * -+ * Copyright (C) 2003-2004 Cirrus Corp. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#include <linux/module.h> -+#include <linux/types.h> -+#include <linux/delay.h> -+#include <linux/wait.h> -+#include <linux/fs.h> -+#include <linux/sched.h> -+#include <linux/poll.h> -+#include <linux/miscdevice.h> -+#include <linux/init.h> -+#include <linux/compiler.h> -+#include <linux/timer.h> -+#include <linux/interrupt.h> -+#include <linux/syscalls.h> -+#include <linux/input.h> -+#include <linux/semaphore.h> -+#include <asm/irq.h> -+#include <mach/hardware.h> -+#include <asm/io.h> -+#include "../../../arch/arm/mach-ep93xx/soc.h" -+ -+/* This stuff should be in ep93xx-regs.h */ -+#define EP93XX_TOUCHSCREEN_REG(x) (EP93XX_TOUCHSCREEN_BASE + (x)) -+/* R/W touchscreen controller setup control register. */ -+#define EP93XX_TOUCHSCREEN_SETUP EP93XX_TOUCHSCREEN_REG(0x00) -+/* R/W touchscreen controller max/min register. */ -+#define EP93XX_TOUCHSCREEN_XYMAXMIN EP93XX_TOUCHSCREEN_REG(0x04) -+/* R touchscreen controller result register. */ -+#define EP93XX_TOUCHSCREEN_XYRESULT EP93XX_TOUCHSCREEN_REG(0x08) -+/* LOCKED R/W touchscreen Switch Matrix control register. */ -+#define EP93XX_TOUCHSCREEN_DISCHARGE EP93XX_TOUCHSCREEN_REG(0x0C) -+#define EP93XX_TOUCHSCREEN_XSAMPLE EP93XX_TOUCHSCREEN_REG(0x10) -+#define EP93XX_TOUCHSCREEN_YSAMPLE EP93XX_TOUCHSCREEN_REG(0x14) -+#define EP93XX_TOUCHSCREEN_DIRECT EP93XX_TOUCHSCREEN_REG(0x18) -+#define EP93XX_TOUCHSCREEN_DETECT EP93XX_TOUCHSCREEN_REG(0x1C) -+/* NA R/W touchscreen software lock register. */ -+#define EP93XX_TOUCHSCREEN_SWLOCK EP93XX_TOUCHSCREEN_REG(0x20) -+/* R/W touchscreen setup control register #2. */ -+#define EP93XX_TOUCHSCREEN_SETUP2 EP93XX_TOUCHSCREEN_REG(0x24) -+ -+/* These are duplicated in mach-ep93xx/core.c */ -+#define EP93XX_TIMER_REG(x) (EP93XX_TIMER_BASE + (x)) -+#define EP93XX_TIMER2_LOAD EP93XX_TIMER_REG(0x20) -+#define EP93XX_TIMER2_VALUE EP93XX_TIMER_REG(0x24) -+#define EP93XX_TIMER2_CONTROL EP93XX_TIMER_REG(0x28) -+#define EP93XX_TIMER2_CLEAR EP93XX_TIMER_REG(0x2c) -+ -+/* -+ * Register bit definitions -+ */ -+#define TSSETUP_SDLY_MASK 0x000003FF -+#define TSSETUP_SDLY_SHIFT 0 -+#define TSSETUP_NSMP_4 0x00000000 -+#define TSSETUP_NSMP_8 0x00000400 -+#define TSSETUP_NSMP_16 0x00000800 -+#define TSSETUP_NSMP_32 0x00000C00 -+#define TSSETUP_NSMP_MASK 0x00000C00 -+#define TSSETUP_DEV_4 0x00000000 -+#define TSSETUP_DEV_8 0x00001000 -+#define TSSETUP_DEV_12 0x00002000 -+#define TSSETUP_DEV_16 0x00003000 -+#define TSSETUP_DEV_24 0x00004000 -+#define TSSETUP_DEV_32 0x00005000 -+#define TSSETUP_DEV_64 0x00006000 -+#define TSSETUP_DEV_128 0x00007000 -+#define TSSETUP_ENABLE 0x00008000 -+#define TSSETUP_DLY_MASK 0x03FF0000 -+#define TSSETUP_DLY_SHIFT 16 -+#define TSSETUP_TDTCT 0x80000000 -+ -+#define TSMAXMIN_XMIN_MASK 0x000000FF -+#define TSMAXMIN_XMIN_SHIFT 0 -+#define TSMAXMIN_YMIN_MASK 0x0000FF00 -+#define TSMAXMIN_YMIN_SHIFT 8 -+#define TSMAXMIN_XMAX_MASK 0x00FF0000 -+#define TSMAXMIN_XMAX_SHIFT 16 -+#define TSMAXMIN_YMAX_MASK 0xFF000000 -+#define TSMAXMIN_YMAX_SHIFT 24 -+ -+#define TSXYRESULT_X_MASK 0x00000FFF -+#define TSXYRESULT_X_SHIFT 0 -+#define TSXYRESULT_AD_MASK 0x0000FFFF -+#define TSXYRESULT_AD_SHIFT 0 -+#define TSXYRESULT_Y_MASK 0x0FFF0000 -+#define TSXYRESULT_Y_SHIFT 16 -+#define TSXYRESULT_SDR 0x80000000 -+ -+#define TSX_SAMPLE_MASK 0x00003FFF -+#define TSX_SAMPLE_SHIFT 0x00 -+#define TSY_SAMPLE_MASK 0x3FFF0000 -+#define TSY_SAMPLE_SHIFT 0x10 -+ -+#define TSSETUP2_TINT 0x00000001 -+#define TSSETUP2_NICOR 0x00000002 -+#define TSSETUP2_PINT 0x00000004 -+#define TSSETUP2_PENSTS 0x00000008 -+#define TSSETUP2_PINTEN 0x00000010 -+#define TSSETUP2_DEVINT 0x00000020 -+#define TSSETUP2_DINTEN 0x00000040 -+#define TSSETUP2_DTMEN 0x00000080 -+#define TSSETUP2_DISDEV 0x00000100 -+#define TSSETUP2_NSIGND 0x00000200 -+#define TSSETUP2_S28EN 0x00000400 -+#define TSSETUP2_RINTEN 0x00000800 -+ -+#define TSXYRESULT_SDR 0x80000000 -+ -+/* -+ * These are used as trigger levels to know when we have pen up/down. -+ * The rules: -+ * 1. TS_HEAVY_INV_PRESSURE < TS_LIGHT_INV_PRESSURE because these -+ * are Inverse pressure. -+ * 2. Any touch lighter than TS_LIGHT_INV_PRESSURE is a pen up. -+ * 3. Any touch heavier than TS_HEAVY_INV_PRESSURE is a pen down. -+ */ -+#define TS_HEAVY_INV_PRESSURE 0xFE0 /* C00 */ -+#define TS_LIGHT_INV_PRESSURE 0xFFF /* e00 */ -+ -+/* -+ * If the x, y, or inverse pressure changes more than these values -+ * between two succeeding points, the point is not reported. -+ */ -+#define TS_MAX_VALID_XY_CHANGE 0x300 -+#define TS_MAX_VALID_PRESSURE_CHANGE 0x100 -+ -+/* -+ * This is the minimum Z1 Value that is valid. -+ */ -+#define MIN_Z1_VALUE 0x50 -+ -+/* -+ * Settling delay for taking each ADC measurement. Increase this -+ * if ts is jittery. -+ */ -+#define EP93XX_TS_ADC_DELAY_USEC 2000 -+ -+/* -+ * Delay between TS points. -+ */ -+#define EP93XX_TS_PER_POINT_DELAY_USEC 10000 -+ -+/* -+ * A few more macros... -+ */ -+#define TSSETUP_DEFAULT (TSSETUP_NSMP_32 | TSSETUP_DEV_64 | \ -+ ((128<<TSSETUP_SDLY_SHIFT) & TSSETUP_SDLY_MASK) | \ -+ ((128<<TSSETUP_DLY_SHIFT) & TSSETUP_DLY_MASK)) -+ -+#define TSSETUP2_DEFAULT (TSSETUP2_NSIGND) -+ -+/* -+ * For now, we use one of the minor numbers from the local/experimental -+ * range. -+ */ -+#define EP93XX_TS_MINOR 240 -+ -+/* -+ * Static Declarations -+ */ -+static unsigned int guiLastX, guiLastY; -+static unsigned int guiLastInvPressure; -+ -+struct TouchScreenSample -+{ -+ int currentX; -+ int currentY; -+ int currentButton; -+ int currentPressure; -+ struct timeval currentTime; -+}; -+ -+/* -+ * This must match the structure in tslib. -+ */ -+struct ts_sample { -+ int x; -+ int y; -+ unsigned int pressure; -+ struct timeval tv; -+}; -+ -+static struct TouchScreenSample gSample; -+static int bFreshTouchData; -+static int bCurrentPenDown; -+ -+static DECLARE_WAIT_QUEUE_HEAD(queue); -+static DEFINE_SEMAPHORE(open_sem); -+static DEFINE_SPINLOCK(event_buffer_lock); -+static struct fasync_struct *ep93xx_fasync; -+ -+/* -+ * Typedef Declarations -+ */ -+typedef enum { -+ TS_MODE_UN_INITIALIZED, -+ TS_MODE_HARDWARE_SCAN, -+ TS_MODE_SOFT_SCAN -+} ts_mode_t; -+ -+static ts_mode_t gScanningMode; -+ -+typedef enum{ -+ TS_STATE_STOPPED = 0, -+ TS_STATE_Z1, -+ TS_STATE_Z2, -+ TS_STATE_Y, -+ TS_STATE_X, -+ TS_STATE_DONE -+} ts_states_t; -+ -+typedef struct -+{ -+ unsigned int uiX; -+ unsigned int uiY; -+ unsigned int uiZ1; -+ unsigned int uiZ2; -+ ts_states_t state; -+} ts_struct_t; -+ -+static ts_struct_t sTouch; -+ -+/* -+ * From the spec, here's how to set up the touch screen's switch registers. -+ */ -+typedef struct -+{ -+ unsigned int uiDetect; -+ unsigned int uiDischarge; -+ unsigned int uiXSample; -+ unsigned int uiYSample; -+ unsigned int uiSwitchZ1; -+ unsigned int uiSwitchZ2; -+}SwitchStructType; -+ -+/* -+ * Here's the switch settings for a 4-wire touchscreen. See the spec -+ * for how to handle a 4, 7, or 8-wire. -+ */ -+const static SwitchStructType sSwitchSettings = -+/* s28en=0 */ -+/* TSDetect TSDischarge TSXSample TSYSample SwitchZ1 SwitchZ2 */ -+ {0x00403604, 0x0007fe04, 0x00081604, 0x00104601, 0x00101601, 0x00101608}; -+ -+/* -+ * Function declarations -+ */ -+static void ep93xx_ts_set_direct(unsigned int uiADCSwitch); -+static irqreturn_t ep93xx_ts_isr(int irq, void *dev_id); -+static irqreturn_t ep93xx_timer2_isr(int irq, void *dev_id); -+static void ee93xx_ts_evt_add(int button, int dX, int dY, int Pressure); -+static ssize_t ep93xx_ts_read(struct file *filp, char *buf, -+ size_t count, loff_t *l); -+static unsigned int ep93xx_ts_poll(struct file *filp, poll_table *wait); -+static int ep93xx_ts_open(struct inode *inode, struct file *filp); -+static int ep93xx_ts_fasync(int fd, struct file *filp, int on); -+static int ep93xx_ts_release(struct inode *inode, struct file *filp); -+static ssize_t ep93xx_ts_write(struct file *file, const char *buffer, -+ size_t count, loff_t *ppos); -+static void ep93xx_ts_setup(void); -+static void ep93xx_ts_shutdown(void); -+int __init ep93xx_ts_init(void); -+void __exit ep93xx_ts_exit(void); -+static unsigned int CalculateInvPressure(void); -+static unsigned int ADCGetData(unsigned int uiSamples, unsigned int uiMaxDiff); -+static void TS_Soft_Scan_Mode(void); -+static void TS_Hardware_Scan_Mode(void); -+static void ProcessPointData(void); -+static void Set_Timer2_uSec(unsigned int Delay_mSec); -+static void Stop_Timer2(void); -+ -+/* -+ * ep93xx_ts_isr -+ */ -+static irqreturn_t ep93xx_ts_isr(int irq, void *dev_id) -+{ -+ /* -+ * Note that we don't clear the interrupt here. The interrupt -+ * gets cleared in TS_Soft_Scan_Mode when the TS ENABLE -+ * bit is cleared. -+ */ -+ -+ /* -+ * Set the ts to manual polling mode and schedule a callback. -+ * That way we can return from the isr in a reasonable amount of -+ * time and process the touch in the callback after a brief delay. -+ */ -+ TS_Soft_Scan_Mode(); -+ -+ return(IRQ_HANDLED); -+} -+ -+/* -+ * Save the current ts 'event' in an atomic fashion. -+ */ -+static void ee93xx_ts_evt_add(int buttons, int iX, int iY, int iPressure) -+{ -+ /* -+ * Note the event, but use spinlocks to keep it from getting -+ * halfway read if we get interrupted. -+ */ -+ -+ spin_lock(&event_buffer_lock); -+ -+ gSample.currentX = iX; -+ gSample.currentY = iY; -+ gSample.currentButton = buttons; -+ gSample.currentPressure = iPressure; -+ bFreshTouchData = 1; -+ do_gettimeofday(&gSample.currentTime); -+ -+ spin_unlock(&event_buffer_lock); -+ -+ kill_fasync(&ep93xx_fasync, SIGIO, POLL_IN); -+ wake_up_interruptible(&queue); -+} -+ -+ -+static ssize_t ep93xx_ts_read(struct file *filp, char *buf, size_t count, loff_t *l) -+{ -+ unsigned short data[3]; -+ struct ts_sample ts_data; -+ int iReturn = -EFAULT; -+ -+ if (!bFreshTouchData) -+ { -+ iReturn = 0; -+ } -+ else if (count == sizeof(data)) -+ { -+ spin_lock_irq(&event_buffer_lock); -+ bFreshTouchData = 0; -+ data[0] = gSample.currentX; -+ data[1] = gSample.currentY; -+ data[2] = gSample.currentButton; -+ -+ spin_unlock_irq(&event_buffer_lock); -+ -+ if (copy_to_user(buf, data, sizeof data)) -+ return -EFAULT; -+ -+ count -= sizeof(data); -+ -+ /* return the # of bytes that got read */ -+ iReturn = sizeof(data) ; -+ } -+ else if (count == sizeof(struct ts_sample) ) -+ { -+ spin_lock_irq(&event_buffer_lock); -+ bFreshTouchData = 0; -+ ts_data.x = gSample.currentX; -+ ts_data.y = gSample.currentY; -+ ts_data.pressure = gSample.currentPressure; -+ ts_data.tv = gSample.currentTime; -+ spin_unlock_irq(&event_buffer_lock); -+ -+ if (copy_to_user(buf, &ts_data, sizeof(struct ts_sample))) -+ { -+ iReturn = -EFAULT; -+ } -+ else -+ { -+ count -= sizeof(ts_data); -+ iReturn = sizeof(ts_data); -+ } -+ } -+ -+ return iReturn; -+} -+ -+static unsigned int ep93xx_ts_poll(struct file *filp, poll_table *wait) -+{ -+ poll_wait(filp, &queue, wait); -+ -+ if (bFreshTouchData) -+ { -+ return POLLIN | POLLRDNORM; -+ } -+ -+ return 0; -+} -+ -+static int ep93xx_ts_open(struct inode *inode, struct file *filp) -+{ -+ if (down_trylock(&open_sem)) -+ { -+ return -EBUSY; -+ } -+ -+ ep93xx_ts_setup(); -+ -+ return 0; -+} -+ -+/* -+ * Asynchronous I/O support. -+ */ -+static int ep93xx_ts_fasync(int fd, struct file *filp, int on) -+{ -+ int retval; -+ -+ retval = fasync_helper(fd, filp, on, &ep93xx_fasync); -+ if (retval < 0) -+ { -+ return retval; -+ } -+ -+ return 0; -+} -+ -+static int ep93xx_ts_release(struct inode *inode, struct file *filp) -+{ -+ Stop_Timer2(); -+ -+ /* -+ * Call our async I/O support to request that this file -+ * cease to be used for async I/O. -+ */ -+ ep93xx_ts_fasync(-1, filp, 0); -+ -+ ep93xx_ts_shutdown(); -+ -+ up(&open_sem); -+ -+ return 0; -+} -+ -+static ssize_t ep93xx_ts_write(struct file *file, const char *buffer, size_t count, -+ loff_t *ppos) -+{ -+ return -EINVAL; -+} -+ -+ -+static int ep93xx_ts_ioctl(struct inode *inode, struct file *file, uint command, ulong u) -+{ -+ static const int version = EV_VERSION; -+ static const u_int32_t bit =(1 << EV_ABS); -+ static const u_int32_t absbit = (1 << ABS_X) | (1 << ABS_Y) | (1 << ABS_PRESSURE); -+ int iReturn ; -+ int i = 0; -+ -+ switch(command) -+ { -+ case EVIOCGVERSION: -+ i = copy_to_user((void __user *)u, (void *)version, sizeof(version)); -+ iReturn = i ? -EFAULT : 0; -+ break; -+ -+ case EVIOCGBIT(0,sizeof(u_int32_t) * 8) : -+ i = copy_to_user((void __user *)u, (void *)bit, sizeof(bit)); -+ iReturn = i ? -EFAULT : 0; -+ break; -+ -+ case EVIOCGBIT(EV_ABS, sizeof(absbit) * 8): -+ i = copy_to_user((void __user *)u, (void *)absbit, sizeof(absbit)); -+ iReturn = i ? -EFAULT : 0; -+ break; -+ default: -+ iReturn = -1; -+ break; -+ } -+ -+ return iReturn; -+} -+ -+static struct file_operations ep93xx_ts_fops = { -+ owner: THIS_MODULE, -+ read: ep93xx_ts_read, -+ write: ep93xx_ts_write, -+ poll: ep93xx_ts_poll, -+ open: ep93xx_ts_open, -+ unlocked_ioctl: ep93xx_ts_ioctl, -+ release: ep93xx_ts_release, -+ fasync: ep93xx_ts_fasync, -+}; -+ -+static struct miscdevice ep93xx_ts_miscdev = -+{ -+ EP93XX_TS_MINOR, -+ "ep93xx_ts", -+ &ep93xx_ts_fops -+}; -+ -+void ep93xx_ts_setup(void) -+{ -+ unsigned int uiKTDIV, uiTSXYMaxMin; -+ -+ /* -+ * Set the TSEN bit in KTDIV so that we are enabling the clock -+ * for the touchscreen. -+ */ -+ uiKTDIV = __raw_readl(EP93XX_SYSCON_KEYTCHCLKDIV); -+ uiKTDIV |= EP93XX_SYSCON_KEYTCHCLKDIV_TSEN; -+ ep93xx_syscon_swlocked_write(uiKTDIV, EP93XX_SYSCON_KEYTCHCLKDIV); -+ -+ /* -+ * Program the EP93XX_TOUCHSCREEN_SETUP and TSSetup2 registers. -+ */ -+ __raw_writel(TSSETUP_DEFAULT, EP93XX_TOUCHSCREEN_SETUP); -+ __raw_writel(TSSETUP2_DEFAULT, EP93XX_TOUCHSCREEN_SETUP2); -+ -+ /* -+ * Set the the touch settings. -+ */ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiDischarge, EP93XX_TOUCHSCREEN_DIRECT); -+ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiDischarge, EP93XX_TOUCHSCREEN_DISCHARGE); -+ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiSwitchZ1, EP93XX_TOUCHSCREEN_XSAMPLE); -+ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiSwitchZ2, EP93XX_TOUCHSCREEN_YSAMPLE); -+ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiDetect, EP93XX_TOUCHSCREEN_DETECT); -+ -+ /* -+ * X,YMin set to 0x40 = have to drag that many pixels for a new irq. -+ * X,YMax set to 0x40 = 1024 pixels is the maximum movement within the -+ * time scan limit. -+ */ -+ uiTSXYMaxMin = (50 << TSMAXMIN_XMIN_SHIFT) & TSMAXMIN_XMIN_MASK; -+ uiTSXYMaxMin |= (50 << TSMAXMIN_YMIN_SHIFT) & TSMAXMIN_YMIN_MASK; -+ uiTSXYMaxMin |= (0xff << TSMAXMIN_XMAX_SHIFT) & TSMAXMIN_XMAX_MASK; -+ uiTSXYMaxMin |= (0xff << TSMAXMIN_YMAX_SHIFT) & TSMAXMIN_YMAX_MASK; -+ __raw_writel(uiTSXYMaxMin, EP93XX_TOUCHSCREEN_XYMAXMIN); -+ -+ bCurrentPenDown = 0; -+ bFreshTouchData = 0; -+ guiLastX = 0; -+ guiLastY = 0; -+ guiLastInvPressure = 0xffffff; -+ -+ /* -+ * Enable the touch screen scanning engine. -+ */ -+ TS_Hardware_Scan_Mode(); -+} -+ -+/* -+ * ep93xx_ts_shutdown -+ * -+ */ -+static void -+ep93xx_ts_shutdown(void) -+{ -+ unsigned int uiKTDIV; -+ -+ sTouch.state = TS_STATE_STOPPED; -+ Stop_Timer2(); -+ -+ /* -+ * Disable the scanning engine. -+ */ -+ __raw_writel(0, EP93XX_TOUCHSCREEN_SETUP); -+ __raw_writel(0, EP93XX_TOUCHSCREEN_SETUP2); -+ -+ /* -+ * Clear the TSEN bit in KTDIV so that we are disabling the clock -+ * for the touchscreen. -+ */ -+ uiKTDIV = __raw_readl(EP93XX_SYSCON_KEYTCHCLKDIV); -+ uiKTDIV &= ~EP93XX_SYSCON_KEYTCHCLKDIV_TSEN; -+ ep93xx_syscon_swlocked_write(uiKTDIV, EP93XX_SYSCON_KEYTCHCLKDIV); -+ -+} /* ep93xx_ts_shutdown */ -+ -+static irqreturn_t ep93xx_timer2_isr(int irq, void *dev_id) -+{ -+ switch(sTouch.state) -+ { -+ case TS_STATE_STOPPED: -+ TS_Hardware_Scan_Mode(); -+ break; -+ -+ /* -+ * Get the Z1 value for pressure measurement and set up -+ * the switch register for getting the Z2 measurement. -+ */ -+ case TS_STATE_Z1: -+ Set_Timer2_uSec(EP93XX_TS_ADC_DELAY_USEC); -+ sTouch.uiZ1 = ADCGetData(2, 200); -+ ep93xx_ts_set_direct(sSwitchSettings.uiSwitchZ2); -+ sTouch.state = TS_STATE_Z2; -+ break; -+ -+ /* -+ * Get the Z2 value for pressure measurement and set up -+ * the switch register for getting the Y measurement. -+ */ -+ case TS_STATE_Z2: -+ sTouch.uiZ2 = ADCGetData(2, 200); -+ ep93xx_ts_set_direct(sSwitchSettings.uiYSample); -+ sTouch.state = TS_STATE_Y; -+ break; -+ -+ /* -+ * Get the Y value and set up the switch register for -+ * getting the X measurement. -+ */ -+ case TS_STATE_Y: -+ sTouch.uiY = ADCGetData(4, 20); -+ ep93xx_ts_set_direct(sSwitchSettings.uiXSample); -+ sTouch.state = TS_STATE_X; -+ break; -+ -+ /* -+ * Read the X value. This is the last of the 4 adc values -+ * we need so we continue on to process the data. -+ */ -+ case TS_STATE_X: -+ Stop_Timer2(); -+ -+ sTouch.uiX = ADCGetData(4, 20); -+ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(sSwitchSettings.uiDischarge, EP93XX_TOUCHSCREEN_DIRECT); -+ -+ sTouch.state = TS_STATE_DONE; -+ -+ /* -+ * Process this set of ADC readings. -+ */ -+ ProcessPointData(); -+ -+ break; -+ -+ /* -+ * Shouldn't get here. But if we do, we can recover... -+ */ -+ case TS_STATE_DONE: -+ TS_Hardware_Scan_Mode(); -+ break; -+ } -+ -+ /* -+ * Clear the timer2 interrupt. -+ */ -+ __raw_writel(1, EP93XX_TIMER2_CLEAR); -+ return(IRQ_HANDLED); -+} -+ -+/*--------------------------------------------------------------------- -+ * ProcessPointData -+ * -+ * This routine processes the ADC data into usable point data and then -+ * puts the driver into hw or sw scanning mode before returning. -+ * -+ * We calculate inverse pressure (lower number = more pressure) then -+ * do a hystheresis with the two pressure values 'light' and 'heavy'. -+ * -+ * If we are above the light, we have pen up. -+ * If we are below the heavy we have pen down. -+ * As long as the pressure stays below the light, pen stays down. -+ * When we get above the light again, pen goes back up. -+ * -+ */ -+static void ProcessPointData(void) -+{ -+ int bValidPoint = 0; -+ unsigned int uiXDiff, uiYDiff, uiInvPressureDiff; -+ unsigned int uiInvPressure; -+ -+ /* -+ * Calculate the current pressure. -+ */ -+ uiInvPressure = CalculateInvPressure(); -+ -+ /* -+ * If pen pressure is so light that it is greater than the 'max' setting -+ * then we consider this to be a pen up. -+ */ -+ if (uiInvPressure >= TS_LIGHT_INV_PRESSURE) -+ { -+ bCurrentPenDown = 0; -+ ee93xx_ts_evt_add(0, guiLastX, guiLastY, 0); -+ TS_Hardware_Scan_Mode(); -+ return; -+ } -+ -+ /* -+ * Hysteresis: -+ * If the pen pressure is hard enough to be less than the 'min' OR -+ * the pen is already down and is still less than the 'max'... -+ */ -+ if ((uiInvPressure < TS_HEAVY_INV_PRESSURE) || -+ (bCurrentPenDown && (uiInvPressure < TS_LIGHT_INV_PRESSURE))) -+ { -+ if (bCurrentPenDown) -+ { -+ /* -+ * If pen was previously down, check the difference between -+ * the last sample and this one... if the difference between -+ * samples is too great, ignore the sample. -+ */ -+ uiXDiff = abs(guiLastX - sTouch.uiX); -+ uiYDiff = abs(guiLastY - sTouch.uiY); -+ uiInvPressureDiff = abs(guiLastInvPressure - uiInvPressure); -+ -+ if (uiXDiff < TS_MAX_VALID_XY_CHANGE -+ && uiYDiff < TS_MAX_VALID_XY_CHANGE -+ && uiInvPressureDiff < TS_MAX_VALID_PRESSURE_CHANGE) -+ { -+ bValidPoint = 1; -+ } -+ } -+ else -+ { -+ bValidPoint = 1; -+ } -+ -+ /* -+ * If either the pen was put down or dragged make a note of it. -+ */ -+ if (bValidPoint) -+ { -+ guiLastX = sTouch.uiX; -+ guiLastY = sTouch.uiY; -+ guiLastInvPressure = uiInvPressure; -+ bCurrentPenDown = 1; -+ ee93xx_ts_evt_add(1, sTouch.uiX, sTouch.uiY, -+ 0x7000000 / uiInvPressure); -+ } -+ -+ TS_Soft_Scan_Mode(); -+ return; -+ } -+ -+ TS_Hardware_Scan_Mode(); -+} -+ -+static void ep93xx_ts_set_direct(unsigned int uiADCSwitch) -+{ -+ unsigned int uiResult; -+ -+ /* -+ * Set the switch settings in the direct register. -+ */ -+ __raw_writel(0xaa, EP93XX_TOUCHSCREEN_SWLOCK); -+ __raw_writel(uiADCSwitch, EP93XX_TOUCHSCREEN_DIRECT); -+ -+ /* -+ * Read and throw away the first sample. -+ */ -+ do { -+ uiResult = __raw_readl(EP93XX_TOUCHSCREEN_XYRESULT); -+ } while (!(uiResult & TSXYRESULT_SDR)); -+ -+} -+ -+static unsigned int ADCGetData(unsigned int uiSamples, unsigned int uiMaxDiff) -+{ -+ unsigned int uiResult, uiValue, uiCount, uiLowest, uiHighest, uiSum, uiAve; -+ -+ do -+ { -+ /* -+ * Initialize our values. -+ */ -+ uiLowest = 0xfffffff; -+ uiHighest = 0; -+ uiSum = 0; -+ -+ for (uiCount = 0; uiCount < uiSamples; uiCount++) -+ { -+ /* -+ * Read the touch screen four more times and average. -+ */ -+ do { -+ uiResult = __raw_readl(EP93XX_TOUCHSCREEN_XYRESULT); -+ } while (!(uiResult & TSXYRESULT_SDR)); -+ -+ uiValue = (uiResult & TSXYRESULT_AD_MASK) >> TSXYRESULT_AD_SHIFT; -+ uiValue = ((uiValue >> 4) + ((1 + TSXYRESULT_X_MASK)>>1)) & TSXYRESULT_X_MASK; -+ -+ /* -+ * Add up the values. -+ */ -+ uiSum += uiValue; -+ -+ /* -+ * Get the lowest and highest values. -+ */ -+ if (uiValue < uiLowest) -+ { -+ uiLowest = uiValue; -+ } -+ if (uiValue > uiHighest) -+ { -+ uiHighest = uiValue; -+ } -+ } -+ } while ((uiHighest - uiLowest) > uiMaxDiff); -+ -+ /* -+ * Calculate the Average value. -+ */ -+ uiAve = uiSum / uiSamples; -+ -+ return uiAve; -+} -+ -+/* -+ * CalculateInvPressure -+ * -+ * Is the Touch Valid. Touch is not valid if the X or Y value is not -+ * in range and the pressure is not enough. -+ * -+ * Touch resistance can be measured by the following formula: -+ * -+ * Rx * X * Z2 -+ * Rtouch = --------- * (-- - 1) -+ * 4096 Z1 -+ * -+ * This is simplified in the ration of Rtouch to Rx. The lower the value, the -+ * higher the pressure. -+ * -+ * Z2 -+ * InvPressure = X * (-- - 1) -+ * Z1 -+ */ -+static unsigned int CalculateInvPressure(void) -+{ -+ unsigned int uiInvPressure; -+ -+ /* -+ * Check to see if the point is valid. -+ */ -+ if (sTouch.uiZ1 < MIN_Z1_VALUE) -+ { -+ uiInvPressure = 0x10000; -+ } -+ -+ /* -+ * Can omit the pressure calculation if you need to get rid of the division. -+ */ -+ else -+ { -+ uiInvPressure = ((sTouch.uiX * sTouch.uiZ2) / sTouch.uiZ1) - sTouch.uiX; -+ } -+ -+ return uiInvPressure; -+} -+ -+/* -+ * TS_Hardware_Scan_Mode -+ * -+ * Enables the ep93xx ts scanning engine so that when the pen goes down -+ * we will get an interrupt. -+ */ -+static void TS_Hardware_Scan_Mode(void) -+{ -+ unsigned int uiDevCfg; -+ -+ /* -+ * Disable the soft scanning engine. -+ */ -+ sTouch.state = TS_STATE_STOPPED; -+ Stop_Timer2(); -+ -+ /* -+ * Clear the TIN (Touchscreen INactive) bit so we can go to -+ * automatic scanning mode. -+ */ -+ uiDevCfg = __raw_readl(EP93XX_SYSCON_DEVCFG); -+ ep93xx_syscon_swlocked_write(uiDevCfg & ~EP93XX_SYSCON_DEVCFG_TIN, -+ EP93XX_SYSCON_DEVCFG); -+ -+ /* -+ * Enable the touch screen scanning state machine by setting -+ * the ENABLE bit. -+ */ -+ __raw_writel(TSSETUP_DEFAULT | TSSETUP_ENABLE, EP93XX_TOUCHSCREEN_SETUP); -+ -+ /* -+ * Set the flag to show that we are in interrupt mode. -+ */ -+ gScanningMode = TS_MODE_HARDWARE_SCAN; -+ -+ /* -+ * Initialize EP93XX_TOUCHSCREEN_SETUP2 register. -+ */ -+ __raw_writel(TSSETUP2_DEFAULT, EP93XX_TOUCHSCREEN_SETUP2); -+ -+} -+ -+/* -+ * TS_Soft_Scan_Mode -+ * -+ * Sets the touch screen to manual polling mode. -+ */ -+static void TS_Soft_Scan_Mode(void) -+{ -+ unsigned int uiDevCfg; -+ -+ if (gScanningMode != TS_MODE_SOFT_SCAN) -+ { -+ /* -+ * Disable the touch screen scanning state machine by clearing -+ * the ENABLE bit. -+ */ -+ __raw_writel(TSSETUP_DEFAULT, EP93XX_TOUCHSCREEN_SETUP); -+ -+ /* -+ * Set the TIN bit so we can do manual touchscreen polling. -+ */ -+ uiDevCfg = __raw_readl(EP93XX_SYSCON_DEVCFG); -+ ep93xx_syscon_swlocked_write(uiDevCfg | EP93XX_SYSCON_DEVCFG_TIN, -+ EP93XX_SYSCON_DEVCFG); -+ } -+ -+ /* -+ * Set the switch register up for the first ADC reading -+ */ -+ ep93xx_ts_set_direct(sSwitchSettings.uiSwitchZ1); -+ -+ /* -+ * Initialize our software state machine to know which ADC -+ * reading to take -+ */ -+ sTouch.state = TS_STATE_Z1; -+ -+ /* -+ * Set the timer so after a mSec or two settling delay it will -+ * take the first ADC reading. -+ */ -+ Set_Timer2_uSec(EP93XX_TS_PER_POINT_DELAY_USEC); -+ -+ /* -+ * Note that we are in sw scanning mode not hw scanning mode. -+ */ -+ gScanningMode = TS_MODE_SOFT_SCAN; -+ -+} -+ -+static void Set_Timer2_uSec(unsigned int uiDelay_uSec) -+{ -+ unsigned int uiClockTicks; -+ -+ /* -+ * Stop timer 2 -+ */ -+ __raw_writel(0, EP93XX_TIMER2_CONTROL); -+ -+ uiClockTicks = ((uiDelay_uSec * 508) + 999) / 1000; -+ __raw_writel(uiClockTicks, EP93XX_TIMER2_LOAD); -+ __raw_writel(uiClockTicks, EP93XX_TIMER2_VALUE); -+ -+ /* -+ * Set up Timer 2 for 508 kHz clock and periodic mode. -+ */ -+ __raw_writel(0xC8, EP93XX_TIMER2_CONTROL); -+ -+} -+ -+static void Stop_Timer2(void) -+{ -+ __raw_writel(0, EP93XX_TIMER2_CONTROL); -+} -+ -+/* -+ * Initialization and exit routines -+ */ -+int __init ep93xx_ts_init(void) -+{ -+ int retval; -+ -+ retval = request_irq(IRQ_EP93XX_TOUCH, ep93xx_ts_isr, -+ IRQF_DISABLED, "ep93xx_ts", 0); -+ if (retval) -+ { -+ printk(KERN_WARNING "ep93xx_ts: failed to get touchscreen IRQ\n"); -+ return retval; -+ } -+ -+ retval = request_irq(IRQ_EP93XX_TIMER2, ep93xx_timer2_isr, -+ IRQF_DISABLED, "ep93xx_timer2", 0); -+ if (retval) -+ { -+ printk(KERN_WARNING "ep93xx_ts: failed to get timer2 IRQ\n"); -+ free_irq(IRQ_EP93XX_TOUCH, 0); -+ return retval; -+ } -+ -+ misc_register(&ep93xx_ts_miscdev); -+ -+ sTouch.state = TS_STATE_STOPPED; -+ gScanningMode = TS_MODE_UN_INITIALIZED; -+ -+ printk(KERN_NOTICE "ep93xx touchscreen driver configured for 4-wire operation\n"); -+ -+ return 0; -+} -+ -+void __exit ep93xx_ts_exit(void) -+{ -+ Stop_Timer2(); -+ -+ free_irq(IRQ_EP93XX_TOUCH, 0); -+ free_irq(IRQ_EP93XX_TIMER2, 0); -+ -+ misc_deregister(&ep93xx_ts_miscdev); -+} -+ -+module_init(ep93xx_ts_init); -+module_exit(ep93xx_ts_exit); -+ -+MODULE_DESCRIPTION("Cirrus EP93xx touchscreen driver"); -+MODULE_SUPPORTED_DEVICE("touchscreen/ep93xx"); -+MODULE_LICENSE("GPL"); ---- a/arch/arm/mach-ep93xx/core.c -+++ b/arch/arm/mach-ep93xx/core.c -@@ -205,6 +205,7 @@ void ep93xx_syscon_swlocked_write(unsign - - spin_unlock_irqrestore(&syscon_swlock, flags); - } -+EXPORT_SYMBOL(ep93xx_syscon_swlocked_write); - - void ep93xx_devcfg_set_clear(unsigned int set_bits, unsigned int clear_bits) - { diff --git a/target/linux/ep93xx/patches-3.8/004-simone_add_mmc_spi.patch b/target/linux/ep93xx/patches-3.8/004-simone_add_mmc_spi.patch deleted file mode 100644 index 26974ba..0000000 --- a/target/linux/ep93xx/patches-3.8/004-simone_add_mmc_spi.patch +++ /dev/null @@ -1,178 +0,0 @@ -This enables the mmc-over-spi driver for the Sim.One board, based on Mika's -patch, which used a GPIO for chip select in stead of the default SFRMOUT pin. -I've modified it to use the usual SFRMOUT; if you've modified your Sim.One -board to use a GPIO instead, uncomment and modify -// #define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO15 -in the source file. - -martinwguy, 14 May 2010 - -From: Mika Westerberg <mika.westerberg@iki.fi> -Date: Wed, 28 Apr 2010 08:42:46 +0300 -Subject: [PATCH] ep93xx: simone: added board specific SPI support for MMC/SD cards - -This includes setting up EGPIOs 0 and 9 for card detection and chip select -respectively. - ---- a/arch/arm/mach-ep93xx/simone.c -+++ b/arch/arm/mach-ep93xx/simone.c -@@ -20,10 +20,15 @@ - #include <linux/platform_device.h> - #include <linux/i2c.h> - #include <linux/i2c-gpio.h> -+#include <linux/gpio.h> -+#include <linux/mmc/host.h> -+#include <linux/spi/spi.h> -+#include <linux/spi/mmc_spi.h> - - #include <mach/hardware.h> - #include <linux/platform_data/video-ep93xx.h> - #include <mach/gpio-ep93xx.h> -+#include <linux/platform_data/spi-ep93xx.h> - - #include <asm/hardware/vic.h> - #include <asm/mach-types.h> -@@ -41,6 +46,135 @@ static struct ep93xxfb_mach_info __initd - .flags = EP93XXFB_USE_SDCSN0 | EP93XXFB_PCLK_FALLING, - }; - -+/* -+ * GPIO lines used for MMC card detection. -+ */ -+#define MMC_CARD_DETECT_GPIO EP93XX_GPIO_LINE_EGPIO0 -+ -+/* -+ * If you have hacked your Sim.One to use a GPIO as SD card chip select -+ * (SD pin 1), uncomment the following line. -+ * The example, EGPIO15, is on TP17 near the CPU. -+ */ -+// #define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO15 -+ -+/* -+ * MMC SPI chip select GPIO handling. If you are using SFRMOUT (SFRM1) signal, -+ * you can leave these empty and pass NULL as .controller_data. -+ */ -+ -+#ifdef MMC_CHIP_SELECT_GPIO -+static int simone_mmc_spi_setup(struct spi_device *spi) -+{ -+ unsigned int gpio = MMC_CHIP_SELECT_GPIO; -+ int err; -+ -+ err = gpio_request(gpio, spi->modalias); -+ if (err) -+ return err; -+ -+ err = gpio_direction_output(gpio, 1); -+ if (err) { -+ gpio_free(gpio); -+ return err; -+ } -+ -+ return 0; -+} -+ -+static void simone_mmc_spi_cleanup(struct spi_device *spi) -+{ -+ unsigned int gpio = MMC_CHIP_SELECT_GPIO; -+ -+ gpio_set_value(gpio, 1); -+ gpio_direction_input(gpio); -+ gpio_free(gpio); -+} -+ -+static void simone_mmc_spi_cs_control(struct spi_device *spi, int value) -+{ -+ gpio_set_value(MMC_CHIP_SELECT_GPIO, value); -+} -+ -+static struct ep93xx_spi_chip_ops simone_mmc_spi_ops = { -+ .setup = simone_mmc_spi_setup, -+ .cleanup = simone_mmc_spi_cleanup, -+ .cs_control = simone_mmc_spi_cs_control, -+}; -+#endif -+ -+/* -+ * MMC card detection GPIO setup. -+ */ -+static int simone_mmc_spi_init(struct device *dev, -+ irqreturn_t (*irq_handler)(int, void *), void *mmc) -+{ -+ unsigned int gpio = MMC_CARD_DETECT_GPIO; -+ int irq, err; -+ -+ err = gpio_request(gpio, dev_name(dev)); -+ if (err) -+ return err; -+ -+ err = gpio_direction_input(gpio); -+ if (err) -+ goto fail; -+ -+ irq = gpio_to_irq(gpio); -+ if (irq < 0) -+ goto fail; -+ -+ err = request_irq(irq, irq_handler, IRQF_TRIGGER_FALLING, -+ "MMC card detect", mmc); -+ if (err) -+ goto fail; -+ -+ printk(KERN_INFO "%s: using irq %d for MMC card detection\n", -+ dev_name(dev), irq); -+ -+ return 0; -+fail: -+ gpio_free(gpio); -+ return err; -+} -+ -+static void simone_mmc_spi_exit(struct device *dev, void *mmc) -+{ -+ unsigned int gpio = MMC_CARD_DETECT_GPIO; -+ -+ free_irq(gpio_to_irq(gpio), mmc); -+ gpio_free(gpio); -+} -+ -+static struct mmc_spi_platform_data simone_mmc_spi_data = { -+ .init = simone_mmc_spi_init, -+ .exit = simone_mmc_spi_exit, -+ .detect_delay = 500, -+ .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, -+}; -+ -+static struct spi_board_info simone_spi_devices[] __initdata = { -+ { -+ .modalias = "mmc_spi", -+#ifdef MMC_CHIP_SELECT_GPIO -+ .controller_data = &simone_mmc_spi_ops, -+#endif -+ .platform_data = &simone_mmc_spi_data, -+ /* -+ * We use 10 MHz even though the maximum is 3.7 MHz. The driver -+ * will limit it automatically to max. frequency. -+ */ -+ .max_speed_hz = 10 * 1000 * 1000, -+ .bus_num = 0, -+ .chip_select = 0, -+ .mode = SPI_MODE_3, -+ }, -+}; -+ -+static struct ep93xx_spi_info simone_spi_info __initdata = { -+ .num_chipselect = ARRAY_SIZE(simone_spi_devices), -+}; -+ - static struct i2c_gpio_platform_data __initdata simone_i2c_gpio_data = { - .sda_pin = EP93XX_GPIO_LINE_EEDAT, - .sda_is_open_drain = 0, -@@ -75,6 +209,8 @@ static void __init simone_init_machine(v - ep93xx_register_fb(&simone_fb_info); - ep93xx_register_i2c(&simone_i2c_gpio_data, simone_i2c_board_info, - ARRAY_SIZE(simone_i2c_board_info)); -+ ep93xx_register_spi(&simone_spi_info, simone_spi_devices, -+ ARRAY_SIZE(simone_spi_devices)); - simone_register_audio(); - } - diff --git a/target/linux/ep93xx/profiles/00-default.mk b/target/linux/ep93xx/profiles/00-default.mk deleted file mode 100644 index 1c43dc6..0000000 --- a/target/linux/ep93xx/profiles/00-default.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Default - NAME:=Default Profile - PACKAGES:= \ - kmod-usb-core kmod-usb-ohci -endef - -define Profile/Default/Description - Default package set compatible with most EP93xx-based boards. -endef -$(eval $(call Profile,Default)) diff --git a/target/linux/ep93xx/profiles/01-simone.mk b/target/linux/ep93xx/profiles/01-simone.mk deleted file mode 100644 index 346e551..0000000 --- a/target/linux/ep93xx/profiles/01-simone.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (C) 2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Simone - NAME:=Simplemachines Sim.One - PACKAGES:= \ - kmod-input-core \ - kmod-input-evdev \ - kmod-input-keyboard-ep93xx \ - kmod-sound-core \ - kmod-sound-soc-ep93xx \ - kmod-sound-soc-ep93xx-ac97 \ - kmod-sound-soc-ep93xx-simone -endef - -define Profile/Simone/Description - Package set compatible with the Simplemachines Sim.One board. -endef -$(eval $(call Profile,Simone)) |