From bb306432fe778481cd3be8a1374b957eeb678435 Mon Sep 17 00:00:00 2001 From: florian Date: Mon, 1 Nov 2010 13:09:34 +0000 Subject: [ep93xx] add support for 2.6.36 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23760 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ep93xx/config-2.6.36 | 215 ++++ .../ep93xx/patches-2.6.36/001-ep93xx_cpuinfo.patch | 59 ++ .../patches-2.6.36/002-mmc_spi_fix_sdhc.patch | 74 ++ .../patches-2.6.36/003-ep93xx_touchscreen.patch | 1060 ++++++++++++++++++++ .../patches-2.6.36/004-simone_add_mmc_spi.patch | 179 ++++ 5 files changed, 1587 insertions(+) create mode 100644 target/linux/ep93xx/config-2.6.36 create mode 100644 target/linux/ep93xx/patches-2.6.36/001-ep93xx_cpuinfo.patch create mode 100644 target/linux/ep93xx/patches-2.6.36/002-mmc_spi_fix_sdhc.patch create mode 100644 target/linux/ep93xx/patches-2.6.36/003-ep93xx_touchscreen.patch create mode 100644 target/linux/ep93xx/patches-2.6.36/004-simone_add_mmc_spi.patch (limited to 'target/linux') diff --git a/target/linux/ep93xx/config-2.6.36 b/target/linux/ep93xx/config-2.6.36 new file mode 100644 index 000000000..76394a563 --- /dev/null +++ b/target/linux/ep93xx/config-2.6.36 @@ -0,0 +1,215 @@ +CONFIG_AEABI=y +CONFIG_ALIGNMENT_TRAP=y +# CONFIG_ARCH_CNS3XXX is not set +CONFIG_ARCH_EP93XX=y +CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y +# CONFIG_ARCH_LPC32XX is not set +# CONFIG_ARCH_NUC93X is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +# CONFIG_ARCH_S5P6440 is not set +# CONFIG_ARCH_S5P6442 is not set +# CONFIG_ARCH_S5PC100 is not set +# CONFIG_ARCH_S5PV210 is not set +# CONFIG_ARCH_S5PV310 is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_ARCH_SHMOBILE is not set +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_ARCH_TEGRA is not set +CONFIG_ARCH_USES_GETTIMEOFFSET=y +# CONFIG_ARCH_VEXPRESS is not set +CONFIG_ARM=y +CONFIG_ARM_AMBA=y +CONFIG_ARM_L1_CACHE_SHIFT=5 +# 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_AUTO_ZRELADDR is not set +# CONFIG_BLK_DEV_INITRD is not set +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_CC_STACKPROTECTOR is not set +CONFIG_CMDLINE="console=ttyAM0,57600 init=/etc/preinit" +CONFIG_COMMON_CLKDEV=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_CRC7=y +CONFIG_CRC_ITU_T=y +CONFIG_CRUNCH=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_ARC4=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=y +CONFIG_CRYPTO_PCBC=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_USER=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_DEPRECATED_PARAM_STRUCT is not set +CONFIG_DNOTIFY=y +CONFIG_DUMMY_CONSOLE=y +CONFIG_ELF_CORE=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_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_WATCHDOG=y +CONFIG_FB=y +# CONFIG_FB_ARMCLCD is not set +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_EP93XX=y +# CONFIG_FB_SM7XX is not set +# CONFIG_FIRMWARE_EDID is not set +CONFIG_FONTS=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +CONFIG_FONT_8x16=y +CONFIG_FONT_8x8=y +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_SUN8x16 is not set +CONFIG_FORCE_MAX_ZONEORDER=11 +# CONFIG_FPE_FASTFPE is not set +CONFIG_FPE_NWFPE=y +CONFIG_FPE_NWFPE_XP=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FRAME_POINTER=y +# CONFIG_FW_LOADER is not set +CONFIG_GENERIC_ATOMIC64=y +CONFIG_GENERIC_FIND_LAST_BIT=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_GPIOLIB=y +# CONFIG_GPIO_PL061 is not set +# CONFIG_HAMRADIO is not set +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_HAS_DMA=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAVE_AOUT=y +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_HAVE_IDE=y +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HAVE_PROC_CPU=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=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_INOTIFY_USER=y +CONFIG_INPUT=y +# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_LEDS_GPIO is not set +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_CLUT224=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=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_MFD_T7L66XB is not set +# CONFIG_MISC_DEVICES is not set +CONFIG_MMC=y +CONFIG_MMC_BLOCK=y +CONFIG_MMC_SPI=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_NEED_DMA_MAP_STATE=y +CONFIG_OABI_COMPAT=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_PAGE_OFFSET=0xC0000000 +# CONFIG_PCI_SYSCALL is not set +CONFIG_PERF_USE_VMALLOC=y +# CONFIG_PLAT_SPEAR is not set +# CONFIG_SCSI_DMA is not set +# CONFIG_SDIO_UART 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_SPARSE_IRQ is not set +CONFIG_SPI=y +CONFIG_SPI_BITBANG=y +CONFIG_SPI_EP93XX=y +# CONFIG_SPI_GPIO is not set +CONFIG_SPI_MASTER=y +# CONFIG_SPI_PL022 is not set +CONFIG_SPLIT_PTLOCK_CPUS=999999 +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +# CONFIG_TOUCHSCREEN_DYNAPRO is not set +CONFIG_TOUCHSCREEN_EP93XX=y +# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set +CONFIG_UID16=y +# CONFIG_USB_ARCH_HAS_EHCI 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_ZBOOT_ROM_BSS=0x0 +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/ep93xx/patches-2.6.36/001-ep93xx_cpuinfo.patch b/target/linux/ep93xx/patches-2.6.36/001-ep93xx_cpuinfo.patch new file mode 100644 index 000000000..171787e87 --- /dev/null +++ b/target/linux/ep93xx/patches-2.6.36/001-ep93xx_cpuinfo.patch @@ -0,0 +1,59 @@ +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 +@@ -47,6 +47,12 @@ + #include + #include + ++#if defined(CONFIG_ARCH_EP93XX) ++#include ++#include ++#include ++#endif ++ + #if defined(CONFIG_DEPRECATED_PARAM_STRUCT) + #include "compat.h" + #endif +@@ -953,9 +959,16 @@ static int c_show(struct seq_file *m, vo + seq_puts(m, "\n"); + + 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/include/mach/ep93xx-regs.h ++++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h +@@ -97,6 +97,8 @@ + #define EP93XX_I2S_BASE EP93XX_APB_IOMEM(0x00020000) + + #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) + + #define EP93XX_GPIO_BASE EP93XX_APB_IOMEM(0x00040000) + #define EP93XX_GPIO_REG(x) (EP93XX_GPIO_BASE + (x)) diff --git a/target/linux/ep93xx/patches-2.6.36/002-mmc_spi_fix_sdhc.patch b/target/linux/ep93xx/patches-2.6.36/002-mmc_spi_fix_sdhc.patch new file mode 100644 index 000000000..4c12b8518 --- /dev/null +++ b/target/linux/ep93xx/patches-2.6.36/002-mmc_spi_fix_sdhc.patch @@ -0,0 +1,74 @@ +This patch makes SDHC cards work with the mmc_spi driver. + +The problem is that they fail when reading the last block of the card using +a multi-block read. This is because on SDHC the multiple block read has to be +stopped with an explicit STOP command, which needs to be sent to the card +while the incoming transfer is in progress. +The 2.6.3[45] mmc-spi driver sends it after the last block transfer, so the +SDHC card continues reading past the end of the card. +This patch works around this by using single-block reads if we're reading the +last blocks of the card. + -martinwguy, 14 May 2010 + +Date: Thu, 29 Apr 2010 21:30:36 +0300 +From: Mika Westerberg +To: Martin Guy + +On Wed, Apr 21, 2010 at 02:10:08AM +0100, Martin Guy wrote: +> +> the SDHC cards I have don't work at all, spewing tons of: +> mmcblk0: error -38 sending status comand +> mmcblk0: error -38 sending read/write command, response 0x4, card status 0xff04 +> end_request: I/O error, dev mmcblk0, sector 7744509 + +I bought today a new 4GB SDHC card and with that I get similar +errors that you are getting. I hacked around quick fix which seems +to work in my case. I'm wondering whether you could check if it +helps with your SDHC card as well? + +This problem is easy to reproduce, just read last sector of the +card (I wrote simple C program but running fdisk -l does the same). + +Patch is below. + +Thanks, +MW + +From: Mika Westerberg +Date: Thu, 29 Apr 2010 21:14:32 +0300 +Subject: [PATCH] mmc_block: use single block reads for last block on SPI + +Some SD-cards fail when doing multiblock read for last block with SPI host. Real +reason is not known but as workaround we can perform this last read using +multiple single block reads. + +Signed-off-by: Mika Westerberg +--- + drivers/mmc/card/block.c | 19 +++++++++++++++++++ + 1 files changed, 19 insertions(+), 0 deletions(-) + +--- a/drivers/mmc/card/block.c ++++ b/drivers/mmc/card/block.c +@@ -351,6 +351,22 @@ static int mmc_blk_issue_rw_rq(struct mm + if (brq.data.blocks > card->host->max_blk_count) + brq.data.blocks = card->host->max_blk_count; + ++ if (mmc_host_is_spi(card->host)) { ++ /* ++ * Some SD-cards fail when we are reading last block ++ * with multiblock read. In these cases we automatically ++ * use single block reads. This only happens on SPI ++ * hosts. ++ */ ++ if (rq_data_dir(req) == READ && brq.data.blocks > 1) { ++ sector_t s = blk_rq_pos(req) + brq.data.blocks; ++ ++ if (s >= get_capacity(md->disk)) { ++ disable_multi = 1; ++ } ++ } ++ } ++ + /* + * After a read error, we redo the request one sector at a time + * in order to accurately determine which sectors can be read diff --git a/target/linux/ep93xx/patches-2.6.36/003-ep93xx_touchscreen.patch b/target/linux/ep93xx/patches-2.6.36/003-ep93xx_touchscreen.patch new file mode 100644 index 000000000..fa8be2148 --- /dev/null +++ b/target/linux/ep93xx/patches-2.6.36/003-ep93xx_touchscreen.patch @@ -0,0 +1,1060 @@ +--- + 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 +@@ -153,6 +153,15 @@ config TOUCHSCREEN_EETI + To compile this driver as a module, choose M here: the + module will be called eeti_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 +@@ -21,6 +21,7 @@ obj-$(CONFIG_TOUCHSCREEN_HAMPSHIRE) += h + obj-$(CONFIG_TOUCHSCREEN_GUNZE) += gunze.o + obj-$(CONFIG_TOUCHSCREEN_EETI) += eeti_ts.o + obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o ++obj-$(CONFIG_TOUCHSCREEN_EP93XX) += ep93xx_ts.o + obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o + obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o + obj-$(CONFIG_TOUCHSCREEN_MC13783) += mc13783_ts.o +--- /dev/null ++++ b/drivers/input/touchscreen/ep93xx_ts.c +@@ -0,0 +1,1020 @@ ++/* ++ * 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 ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* 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<= 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"); diff --git a/target/linux/ep93xx/patches-2.6.36/004-simone_add_mmc_spi.patch b/target/linux/ep93xx/patches-2.6.36/004-simone_add_mmc_spi.patch new file mode 100644 index 000000000..52199baef --- /dev/null +++ b/target/linux/ep93xx/patches-2.6.36/004-simone_add_mmc_spi.patch @@ -0,0 +1,179 @@ +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 +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 +@@ -18,12 +18,16 @@ + #include + #include + #include ++#include + #include ++#include ++#include + #include + #include + + #include + #include ++#include + + #include + #include +@@ -38,6 +42,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, +@@ -61,6 +194,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)); + } + + MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board") -- cgit v1.2.3