mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-03 21:09:42 +02:00
omap24xx: Update to 2.6.38. Remove 2.6.37 files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26244 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mb
parent
7e17f34e6d
commit
0521bd84db
@ -12,7 +12,7 @@ BOARDNAME:=TI OMAP-24xx
|
||||
MAINTAINER:=Michael Buesch <mb@bu3sch.de>
|
||||
FEATURES:=targz squashfs jffs2 usb usbgadget display gpio audio
|
||||
|
||||
LINUX_VERSION:=2.6.38-rc8
|
||||
LINUX_VERSION:=2.6.38
|
||||
|
||||
define Target/Description
|
||||
TI OMAP-24xx
|
||||
|
||||
@ -1,618 +0,0 @@
|
||||
# CONFIG_AD7476 is not set
|
||||
# CONFIG_AD799X is not set
|
||||
# CONFIG_ADIS16209 is not set
|
||||
# CONFIG_ADIS16220 is not set
|
||||
# CONFIG_ADIS16240 is not set
|
||||
# CONFIG_ADIS16260 is not set
|
||||
# CONFIG_ADIS16300 is not set
|
||||
# CONFIG_ADIS16350 is not set
|
||||
# CONFIG_ADIS16400 is not set
|
||||
CONFIG_ALIGNMENT_TRAP=y
|
||||
# CONFIG_APM_EMULATION is not set
|
||||
CONFIG_ARCH_HAS_CPUFREQ=y
|
||||
CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
|
||||
CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
|
||||
CONFIG_ARCH_OMAP=y
|
||||
# CONFIG_ARCH_OMAP1 is not set
|
||||
CONFIG_ARCH_OMAP2=y
|
||||
CONFIG_ARCH_OMAP2420=y
|
||||
# CONFIG_ARCH_OMAP2430 is not set
|
||||
CONFIG_ARCH_OMAP2PLUS=y
|
||||
CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
|
||||
# CONFIG_ARCH_OMAP3 is not set
|
||||
# CONFIG_ARCH_OMAP4 is not set
|
||||
CONFIG_ARCH_OMAP_OTG=y
|
||||
CONFIG_ARCH_REQUIRE_GPIOLIB=y
|
||||
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
|
||||
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
CONFIG_ARCH_SUSPEND_POSSIBLE=y
|
||||
# CONFIG_ARCH_USES_GETTIMEOFFSET is not set
|
||||
CONFIG_ARM=y
|
||||
CONFIG_ARM_DMA_MEM_BUFFERABLE=y
|
||||
CONFIG_ARM_ERRATA_411920=y
|
||||
CONFIG_ARM_L1_CACHE_SHIFT=5
|
||||
CONFIG_ARM_THUMB=y
|
||||
CONFIG_ARM_UNWIND=y
|
||||
# CONFIG_ARPD is not set
|
||||
CONFIG_ATAGS_PROC=y
|
||||
CONFIG_BINFMT_MISC=y
|
||||
CONFIG_BKL=y
|
||||
# CONFIG_BLK_DEV_INITRD is not set
|
||||
CONFIG_BLK_DEV_LOOP=y
|
||||
CONFIG_BLK_DEV_RAM=y
|
||||
CONFIG_BLK_DEV_RAM_COUNT=16
|
||||
CONFIG_BLK_DEV_RAM_SIZE=4096
|
||||
CONFIG_BLK_DEV_SD=y
|
||||
CONFIG_BRIDGE=m
|
||||
# CONFIG_BSD_PROCESS_ACCT is not set
|
||||
CONFIG_BT=m
|
||||
CONFIG_BT_BNEP=m
|
||||
# CONFIG_BT_BNEP_MC_FILTER is not set
|
||||
# CONFIG_BT_BNEP_PROTO_FILTER is not set
|
||||
CONFIG_BT_HCIH4P=m
|
||||
CONFIG_BT_HCIUART=m
|
||||
CONFIG_BT_HIDP=m
|
||||
CONFIG_BT_L2CAP=m
|
||||
CONFIG_BT_RFCOMM=m
|
||||
CONFIG_BT_SCO=m
|
||||
CONFIG_CBUS=y
|
||||
CONFIG_CBUS_RETU=y
|
||||
CONFIG_CBUS_RETU_HEADSET=y
|
||||
CONFIG_CBUS_RETU_POWERBUTTON=y
|
||||
CONFIG_CBUS_RETU_RTC=y
|
||||
CONFIG_CBUS_RETU_USER=y
|
||||
CONFIG_CBUS_RETU_USER_DEBUG=y
|
||||
CONFIG_CBUS_RETU_WDT=y
|
||||
CONFIG_CBUS_TAHVO=y
|
||||
# CONFIG_CBUS_TAHVO_USB is not set
|
||||
CONFIG_CBUS_TAHVO_USER=y
|
||||
CONFIG_CBUS_TAHVO_USER_DEBUG=y
|
||||
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
||||
CONFIG_CMDLINE="root=/dev/mmcblk0p1 rootfstype=ext4,ext3,ext2,squashfs,jffs2 console=tty0 console=ttyO2,115200n8 earlyprintk"
|
||||
CONFIG_CMDLINE_FORCE=y
|
||||
CONFIG_COMMON_CLKDEV=y
|
||||
CONFIG_CONSOLE_TRANSLATIONS=y
|
||||
CONFIG_CPU_32v6=y
|
||||
# CONFIG_CPU_32v6K is not set
|
||||
CONFIG_CPU_ABRT_EV6=y
|
||||
# CONFIG_CPU_BPREDICT_DISABLE is not set
|
||||
CONFIG_CPU_CACHE_V6=y
|
||||
CONFIG_CPU_CACHE_VIPT=y
|
||||
CONFIG_CPU_COPY_V6=y
|
||||
CONFIG_CPU_CP15=y
|
||||
CONFIG_CPU_CP15_MMU=y
|
||||
CONFIG_CPU_FREQ=y
|
||||
# CONFIG_CPU_FREQ_DEBUG is not set
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
|
||||
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
|
||||
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
|
||||
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
|
||||
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
|
||||
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
|
||||
CONFIG_CPU_FREQ_GOV_USERSPACE=y
|
||||
CONFIG_CPU_FREQ_STAT=y
|
||||
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
|
||||
CONFIG_CPU_FREQ_TABLE=y
|
||||
CONFIG_CPU_HAS_ASID=y
|
||||
CONFIG_CPU_HAS_PMU=y
|
||||
# CONFIG_CPU_ICACHE_DISABLE is not set
|
||||
CONFIG_CPU_IDLE=y
|
||||
CONFIG_CPU_IDLE_GOV_LADDER=y
|
||||
CONFIG_CPU_IDLE_GOV_MENU=y
|
||||
CONFIG_CPU_PABRT_V6=y
|
||||
CONFIG_CPU_TLB_V6=y
|
||||
CONFIG_CPU_V6=y
|
||||
CONFIG_CRC16=y
|
||||
CONFIG_CRC7=y
|
||||
CONFIG_CRC_CCITT=y
|
||||
CONFIG_CRC_ITU_T=y
|
||||
CONFIG_CRYPTO_AEAD2=y
|
||||
CONFIG_CRYPTO_AES=y
|
||||
CONFIG_CRYPTO_ANSI_CPRNG=y
|
||||
CONFIG_CRYPTO_ARC4=y
|
||||
CONFIG_CRYPTO_BLKCIPHER=y
|
||||
CONFIG_CRYPTO_BLKCIPHER2=y
|
||||
CONFIG_CRYPTO_CBC=m
|
||||
CONFIG_CRYPTO_DES=m
|
||||
# CONFIG_CRYPTO_DEV_OMAP_AES is not set
|
||||
CONFIG_CRYPTO_DEV_OMAP_SHAM=y
|
||||
CONFIG_CRYPTO_ECB=y
|
||||
CONFIG_CRYPTO_HASH=y
|
||||
CONFIG_CRYPTO_HASH2=y
|
||||
CONFIG_CRYPTO_HW=y
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_MANAGER2=y
|
||||
CONFIG_CRYPTO_MD5=y
|
||||
CONFIG_CRYPTO_RNG=y
|
||||
CONFIG_CRYPTO_RNG2=y
|
||||
CONFIG_CRYPTO_SHA1=y
|
||||
CONFIG_CRYPTO_WORKQUEUE=y
|
||||
# CONFIG_CRYPTO_ZLIB is not set
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
CONFIG_DEBUG_ERRORS=y
|
||||
# CONFIG_DEBUG_FS is not set
|
||||
CONFIG_DEBUG_KERNEL=y
|
||||
CONFIG_DEBUG_USER=y
|
||||
CONFIG_DECOMPRESS_LZMA=y
|
||||
CONFIG_DEFAULT_CFQ=y
|
||||
CONFIG_DEFAULT_IOSCHED="cfq"
|
||||
CONFIG_DEFAULT_TCP_CONG="cubic"
|
||||
CONFIG_DEVKMEM=y
|
||||
CONFIG_DEVTMPFS=y
|
||||
CONFIG_DEVTMPFS_MOUNT=y
|
||||
CONFIG_DNOTIFY=y
|
||||
CONFIG_DNS_RESOLVER=y
|
||||
CONFIG_DUMMY_CONSOLE=y
|
||||
# CONFIG_ECRYPT_FS is not set
|
||||
CONFIG_ENABLE_MUST_CHECK=y
|
||||
CONFIG_EXPORTFS=m
|
||||
CONFIG_EXT4_FS=y
|
||||
CONFIG_FAT_FS=y
|
||||
CONFIG_FB=y
|
||||
CONFIG_FB_CFB_COPYAREA=y
|
||||
CONFIG_FB_CFB_FILLRECT=y
|
||||
CONFIG_FB_CFB_IMAGEBLIT=y
|
||||
CONFIG_FB_OMAP=y
|
||||
# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
|
||||
CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2
|
||||
CONFIG_FB_OMAP_LCDC_BLIZZARD=y
|
||||
CONFIG_FB_OMAP_LCDC_EXTERNAL=y
|
||||
# CONFIG_FB_OMAP_LCDC_HWA742 is not set
|
||||
CONFIG_FB_OMAP_LCD_MIPID=y
|
||||
# CONFIG_FB_OMAP_MANUAL_UPDATE is not set
|
||||
# CONFIG_FB_SM7XX is not set
|
||||
# CONFIG_FIRMWARE_EDID is not set
|
||||
CONFIG_FIRMWARE_IN_KERNEL=y
|
||||
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_FRAMEBUFFER_CONSOLE=y
|
||||
# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
|
||||
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
|
||||
CONFIG_FREEZER=y
|
||||
CONFIG_FS_POSIX_ACL=y
|
||||
CONFIG_GENERIC_ACL=y
|
||||
CONFIG_GENERIC_ATOMIC64=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
|
||||
CONFIG_GENERIC_FIND_LAST_BIT=y
|
||||
CONFIG_GENERIC_GPIO=y
|
||||
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
|
||||
CONFIG_GPIOLIB=y
|
||||
CONFIG_GPIO_SYSFS=y
|
||||
# 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_DYNAMIC_FTRACE=y
|
||||
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
|
||||
CONFIG_HAVE_FUNCTION_TRACER=y
|
||||
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
|
||||
# CONFIG_HAVE_GENERIC_HARDIRQS is not set
|
||||
CONFIG_HAVE_IDE=y
|
||||
CONFIG_HAVE_IRQ_WORK=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_MTD_OTP=y
|
||||
CONFIG_HAVE_OPROFILE=y
|
||||
CONFIG_HAVE_PERF_EVENTS=y
|
||||
CONFIG_HAVE_PROC_CPU=y
|
||||
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
|
||||
CONFIG_HID=y
|
||||
CONFIG_HID_APPLE=m
|
||||
CONFIG_HID_SUPPORT=y
|
||||
CONFIG_HID_WACOM=m
|
||||
# CONFIG_HID_WACOM_POWER_SUPPLY is not set
|
||||
CONFIG_HWMON=m
|
||||
# CONFIG_HWMON_DEBUG_CHIP is not set
|
||||
CONFIG_HW_CONSOLE=y
|
||||
CONFIG_HW_RANDOM=y
|
||||
CONFIG_HW_RANDOM_OMAP=y
|
||||
CONFIG_HZ=128
|
||||
CONFIG_I2C=y
|
||||
CONFIG_I2C_BOARDINFO=y
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_COMPAT=y
|
||||
CONFIG_I2C_HELPER_AUTO=y
|
||||
CONFIG_I2C_OMAP=y
|
||||
CONFIG_IIO=y
|
||||
# CONFIG_IIO_RING_BUFFER is not set
|
||||
# CONFIG_IIO_TRIGGER is not set
|
||||
CONFIG_INET6_XFRM_MODE_BEET=m
|
||||
CONFIG_INET6_XFRM_MODE_TRANSPORT=m
|
||||
CONFIG_INET6_XFRM_MODE_TUNNEL=m
|
||||
CONFIG_INET_DIAG=y
|
||||
CONFIG_INET_TCP_DIAG=y
|
||||
CONFIG_INET_TUNNEL=m
|
||||
# CONFIG_INLINE_READ_UNLOCK is not set
|
||||
# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
|
||||
# CONFIG_INLINE_SPIN_UNLOCK is not set
|
||||
# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
|
||||
# CONFIG_INLINE_WRITE_UNLOCK is not set
|
||||
# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
|
||||
CONFIG_INOTIFY_USER=y
|
||||
CONFIG_INPUT=y
|
||||
CONFIG_INPUT_EVDEV=y
|
||||
# CONFIG_INPUT_GPIO_BUTTONS is not set
|
||||
CONFIG_INPUT_JOYSTICK=y
|
||||
CONFIG_INPUT_KEYBOARD=y
|
||||
CONFIG_INPUT_MOUSE=y
|
||||
CONFIG_INPUT_MOUSEDEV=y
|
||||
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
|
||||
CONFIG_INPUT_MOUSEDEV_SCREEN_X=800
|
||||
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
|
||||
CONFIG_INPUT_TABLET=y
|
||||
CONFIG_INPUT_TOUCHSCREEN=y
|
||||
CONFIG_IOSCHED_CFQ=y
|
||||
# CONFIG_IOSCHED_DEADLINE is not set
|
||||
CONFIG_IPV6=y
|
||||
CONFIG_IPV6_MIP6=m
|
||||
CONFIG_IPV6_PRIVACY=y
|
||||
CONFIG_IPV6_ROUTER_PREF=y
|
||||
CONFIG_IPV6_SIT=m
|
||||
# CONFIG_IP_ADVANCED_ROUTER is not set
|
||||
# CONFIG_IP_MROUTE is not set
|
||||
CONFIG_IR_CORE=m
|
||||
CONFIG_IR_LIRC_CODEC=m
|
||||
CONFIG_IR_RC5_SZ_DECODER=m
|
||||
# CONFIG_ISDN is not set
|
||||
# CONFIG_ISP1301_OMAP is not set
|
||||
CONFIG_JBD2=y
|
||||
CONFIG_JFFS2_LZO=y
|
||||
CONFIG_JFFS2_ZLIB=y
|
||||
# CONFIG_JOYSTICK_A3D is not set
|
||||
# CONFIG_JOYSTICK_ADI is not set
|
||||
# CONFIG_JOYSTICK_ANALOG is not set
|
||||
# CONFIG_JOYSTICK_COBRA is not set
|
||||
# CONFIG_JOYSTICK_GF2K is not set
|
||||
# CONFIG_JOYSTICK_GRIP is not set
|
||||
# CONFIG_JOYSTICK_GRIP_MP is not set
|
||||
# CONFIG_JOYSTICK_GUILLEMOT is not set
|
||||
# CONFIG_JOYSTICK_IFORCE is not set
|
||||
# CONFIG_JOYSTICK_INTERACT is not set
|
||||
# CONFIG_JOYSTICK_JOYDUMP is not set
|
||||
# CONFIG_JOYSTICK_MAGELLAN is not set
|
||||
# CONFIG_JOYSTICK_SIDEWINDER is not set
|
||||
# CONFIG_JOYSTICK_SPACEBALL is not set
|
||||
# CONFIG_JOYSTICK_SPACEORB is not set
|
||||
# CONFIG_JOYSTICK_STINGER is not set
|
||||
# CONFIG_JOYSTICK_TMDC is not set
|
||||
# CONFIG_JOYSTICK_TWIDJOY is not set
|
||||
# CONFIG_JOYSTICK_WARRIOR is not set
|
||||
# CONFIG_JOYSTICK_XPAD is not set
|
||||
# CONFIG_JOYSTICK_ZHENHUA is not set
|
||||
CONFIG_KALLSYMS=y
|
||||
CONFIG_KEXEC=y
|
||||
# CONFIG_KEYBOARD_GPIO is not set
|
||||
CONFIG_KEYBOARD_LM8323=y
|
||||
# CONFIG_KEYBOARD_OMAP is not set
|
||||
CONFIG_KEYS=y
|
||||
# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
|
||||
# CONFIG_KXSD9 is not set
|
||||
CONFIG_LEDS=y
|
||||
# CONFIG_LEDS_GPIO is not set
|
||||
# CONFIG_LEDS_REGULATOR is not set
|
||||
CONFIG_LEDS_TRIGGER_BACKLIGHT=y
|
||||
CONFIG_LEDS_TRIGGER_GPIO=y
|
||||
CONFIG_LIRC=m
|
||||
# CONFIG_LIS3L02DQ is not set
|
||||
CONFIG_LLC=m
|
||||
CONFIG_LOCKD=m
|
||||
CONFIG_LOCK_KERNEL=y
|
||||
CONFIG_LOG_BUF_SHIFT=18
|
||||
CONFIG_LZO_COMPRESS=y
|
||||
CONFIG_LZO_DECOMPRESS=y
|
||||
CONFIG_MACH_NOKIA_N800=y
|
||||
CONFIG_MACH_NOKIA_N810=y
|
||||
CONFIG_MACH_NOKIA_N810_WIMAX=y
|
||||
CONFIG_MACH_NOKIA_N8X0=y
|
||||
CONFIG_MACH_NOKIA_N8X0_LCD=y
|
||||
CONFIG_MACH_NOKIA_N8X0_USB=y
|
||||
CONFIG_MACH_NO_WESTBRIDGE=y
|
||||
CONFIG_MACH_OMAP2_TUSB6010=y
|
||||
# CONFIG_MACH_OMAP_APOLLON is not set
|
||||
# CONFIG_MACH_OMAP_GENERIC is not set
|
||||
# CONFIG_MACH_OMAP_H4 is not set
|
||||
CONFIG_MACVLAN=m
|
||||
CONFIG_MAC_PARTITION=y
|
||||
# CONFIG_MAX1363 is not set
|
||||
CONFIG_MEDIA_ATTACH=y
|
||||
CONFIG_MEDIA_SUPPORT=m
|
||||
CONFIG_MEDIA_TUNER=m
|
||||
CONFIG_MEDIA_TUNER_MC44S803=m
|
||||
CONFIG_MEDIA_TUNER_MT20XX=m
|
||||
CONFIG_MEDIA_TUNER_SIMPLE=m
|
||||
CONFIG_MEDIA_TUNER_TDA18271=m
|
||||
CONFIG_MEDIA_TUNER_TDA827X=m
|
||||
CONFIG_MEDIA_TUNER_TDA8290=m
|
||||
CONFIG_MEDIA_TUNER_TDA9887=m
|
||||
CONFIG_MEDIA_TUNER_TEA5761=m
|
||||
CONFIG_MEDIA_TUNER_TEA5767=m
|
||||
CONFIG_MEDIA_TUNER_XC2028=m
|
||||
CONFIG_MEDIA_TUNER_XC5000=m
|
||||
CONFIG_MENELAUS=y
|
||||
# CONFIG_MFD_T7L66XB is not set
|
||||
# CONFIG_MISC_DEVICES is not set
|
||||
CONFIG_MMC=y
|
||||
CONFIG_MMC_BLOCK=y
|
||||
CONFIG_MMC_OMAP=y
|
||||
CONFIG_MMC_SDHCI=y
|
||||
CONFIG_MMC_SDHCI_PLTFM=y
|
||||
CONFIG_MMC_SPI=y
|
||||
CONFIG_MMC_UNSAFE_RESUME=y
|
||||
# CONFIG_MOUSE_BCM5974 is not set
|
||||
# CONFIG_MOUSE_GPIO is not set
|
||||
CONFIG_MOUSE_PS2=y
|
||||
CONFIG_MOUSE_PS2_ALPS=y
|
||||
# CONFIG_MOUSE_PS2_ELANTECH is not set
|
||||
CONFIG_MOUSE_PS2_LOGIPS2PP=y
|
||||
CONFIG_MOUSE_PS2_SYNAPTICS=y
|
||||
# CONFIG_MOUSE_PS2_TOUCHKIT is not set
|
||||
CONFIG_MOUSE_PS2_TRACKPOINT=y
|
||||
# CONFIG_MOUSE_SERIAL is not set
|
||||
# CONFIG_MOUSE_VSXXXAA is not set
|
||||
CONFIG_MSDOS_FS=y
|
||||
CONFIG_MTD_BLOCK2MTD=y
|
||||
# CONFIG_MTD_CFI is not set
|
||||
CONFIG_MTD_CMDLINE_PARTS=y
|
||||
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
|
||||
CONFIG_MTD_ONENAND=y
|
||||
# CONFIG_MTD_ONENAND_2X_PROGRAM is not set
|
||||
# CONFIG_MTD_ONENAND_GENERIC is not set
|
||||
CONFIG_MTD_ONENAND_OMAP2=y
|
||||
CONFIG_MTD_ONENAND_OTP=y
|
||||
# CONFIG_MTD_ONENAND_SIM is not set
|
||||
# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
|
||||
# CONFIG_MTD_ROOTFS_ROOT_DEV is not set
|
||||
# CONFIG_MTD_ROOTFS_SPLIT is not set
|
||||
# CONFIG_MUSB_PIO_ONLY is not set
|
||||
# CONFIG_N810BM is not set
|
||||
CONFIG_NAMESPACES=y
|
||||
CONFIG_NEED_DMA_MAP_STATE=y
|
||||
CONFIG_NEED_PER_CPU_KM=y
|
||||
CONFIG_NETDEV_10000=y
|
||||
# CONFIG_NET_NS is not set
|
||||
# CONFIG_NET_SCHED is not set
|
||||
CONFIG_NFSD=m
|
||||
CONFIG_NFSD_DEPRECATED=y
|
||||
CONFIG_NFSD_V2_ACL=y
|
||||
CONFIG_NFSD_V3_ACL=y
|
||||
CONFIG_NFSD_V4=y
|
||||
CONFIG_NFS_ACL_SUPPORT=m
|
||||
CONFIG_NFS_FS=m
|
||||
CONFIG_NFS_USE_KERNEL_DNS=y
|
||||
# CONFIG_NFS_USE_LEGACY_DNS is not set
|
||||
# CONFIG_NFS_USE_NEW_IDMAPPER is not set
|
||||
CONFIG_NFS_V3_ACL=y
|
||||
CONFIG_NFS_V4=y
|
||||
CONFIG_NFS_V4_1=y
|
||||
CONFIG_NLS=y
|
||||
CONFIG_NOP_USB_XCEIV=m
|
||||
CONFIG_NO_HZ=y
|
||||
# CONFIG_OMAP2_DSS is not set
|
||||
CONFIG_OMAP_32K_TIMER=y
|
||||
CONFIG_OMAP_32K_TIMER_HZ=128
|
||||
CONFIG_OMAP_BOOT_REASON=y
|
||||
CONFIG_OMAP_BOOT_TAG=y
|
||||
CONFIG_OMAP_COMPONENT_VERSION=y
|
||||
CONFIG_OMAP_DM_TIMER=y
|
||||
CONFIG_OMAP_GPIO_SWITCH=y
|
||||
CONFIG_OMAP_MBOX_FWK=y
|
||||
CONFIG_OMAP_MBOX_KFIFO_SIZE=256
|
||||
CONFIG_OMAP_MCBSP=y
|
||||
# CONFIG_OMAP_MPU_TIMER is not set
|
||||
CONFIG_OMAP_MUX=y
|
||||
# CONFIG_OMAP_MUX_DEBUG is not set
|
||||
CONFIG_OMAP_MUX_WARNINGS=y
|
||||
CONFIG_OMAP_PACKAGE_ZAC=y
|
||||
# CONFIG_OMAP_PM_NONE is not set
|
||||
CONFIG_OMAP_PM_NOOP=y
|
||||
CONFIG_OMAP_RESET_CLOCKS=y
|
||||
CONFIG_OMAP_WATCHDOG=y
|
||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
||||
CONFIG_PAGE_OFFSET=0xC0000000
|
||||
# CONFIG_PCI_SYSCALL is not set
|
||||
CONFIG_PERF_USE_VMALLOC=y
|
||||
CONFIG_PM=y
|
||||
# CONFIG_PM_DEBUG is not set
|
||||
CONFIG_PM_OPS=y
|
||||
CONFIG_PM_RUNTIME=y
|
||||
CONFIG_PM_SLEEP=y
|
||||
CONFIG_PNFS_FILE_LAYOUT=m
|
||||
CONFIG_POSIX_MQUEUE=y
|
||||
CONFIG_POSIX_MQUEUE_SYSCTL=y
|
||||
CONFIG_PPP=m
|
||||
CONFIG_PPP_ASYNC=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_PPP_DEFLATE=m
|
||||
CONFIG_PPP_MPPE=m
|
||||
# CONFIG_PPP_MULTILINK is not set
|
||||
CONFIG_PPP_SYNC_TTY=m
|
||||
CONFIG_PREEMPT=y
|
||||
# CONFIG_PREEMPT_NONE is not set
|
||||
# CONFIG_PREEMPT_RCU is not set
|
||||
CONFIG_PRINTK_TIME=y
|
||||
CONFIG_PROC_PAGE_MONITOR=y
|
||||
# CONFIG_QUOTACTL is not set
|
||||
CONFIG_REGULATOR=y
|
||||
# CONFIG_REGULATOR_AD5398 is not set
|
||||
# CONFIG_REGULATOR_DEBUG is not set
|
||||
# CONFIG_REGULATOR_DUMMY is not set
|
||||
# CONFIG_REGULATOR_ISL6271A is not set
|
||||
# CONFIG_REGULATOR_LP3971 is not set
|
||||
# CONFIG_REGULATOR_LP3972 is not set
|
||||
# CONFIG_REGULATOR_MAX1586 is not set
|
||||
# CONFIG_REGULATOR_MAX8649 is not set
|
||||
# CONFIG_REGULATOR_MAX8660 is not set
|
||||
# CONFIG_REGULATOR_MAX8952 is not set
|
||||
# CONFIG_REGULATOR_TPS65023 is not set
|
||||
# CONFIG_REGULATOR_TPS6507X is not set
|
||||
# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
|
||||
CONFIG_RPCSEC_GSS_KRB5=m
|
||||
CONFIG_SCSI=y
|
||||
# CONFIG_SCSI_LOWLEVEL is not set
|
||||
# CONFIG_SDIO_UART is not set
|
||||
# CONFIG_SENSORS_AK8975 is not set
|
||||
# CONFIG_SENSORS_HMC5843 is not set
|
||||
# CONFIG_SENSORS_ISL29018 is not set
|
||||
CONFIG_SENSORS_LM75=m
|
||||
CONFIG_SENSORS_TSL2563=m
|
||||
CONFIG_SERIAL_8250_NR_UARTS=4
|
||||
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
|
||||
CONFIG_SERIAL_OMAP=y
|
||||
CONFIG_SERIAL_OMAP_CONSOLE=y
|
||||
CONFIG_SERIO=y
|
||||
CONFIG_SERIO_LIBPS2=y
|
||||
# CONFIG_SERIO_RAW is not set
|
||||
CONFIG_SERIO_SERPORT=y
|
||||
# CONFIG_SLAB is not set
|
||||
CONFIG_SLHC=m
|
||||
CONFIG_SLUB=y
|
||||
CONFIG_SND=m
|
||||
CONFIG_SND_ARM=y
|
||||
# CONFIG_SND_EMU10K1_SEQ is not set
|
||||
CONFIG_SND_JACK=y
|
||||
CONFIG_SND_MIXER_OSS=m
|
||||
CONFIG_SND_OMAP_SOC=m
|
||||
CONFIG_SND_OMAP_SOC_MCBSP=m
|
||||
CONFIG_SND_OMAP_SOC_N810=m
|
||||
# CONFIG_SND_OPL3_LIB_SEQ is not set
|
||||
# CONFIG_SND_OPL4_LIB_SEQ is not set
|
||||
CONFIG_SND_PCM=m
|
||||
CONFIG_SND_PCM_OSS=m
|
||||
# CONFIG_SND_RAWMIDI_SEQ is not set
|
||||
# CONFIG_SND_SBAWE_SEQ is not set
|
||||
CONFIG_SND_SOC=m
|
||||
# CONFIG_SND_SOC_ALL_CODECS is not set
|
||||
CONFIG_SND_SOC_I2C_AND_SPI=m
|
||||
CONFIG_SND_SOC_TLV320AIC3X=m
|
||||
CONFIG_SND_SPI=y
|
||||
CONFIG_SND_SUPPORT_OLD_API=y
|
||||
CONFIG_SND_TIMER=m
|
||||
CONFIG_SOUND=m
|
||||
CONFIG_SOUND_OSS_CORE=y
|
||||
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
|
||||
CONFIG_SPI=y
|
||||
# CONFIG_SPI_BITBANG is not set
|
||||
# CONFIG_SPI_GPIO is not set
|
||||
CONFIG_SPI_MASTER=y
|
||||
CONFIG_SPI_OMAP24XX=y
|
||||
CONFIG_STP=m
|
||||
# CONFIG_STRIP_ASM_SYMS is not set
|
||||
CONFIG_SUNRPC=m
|
||||
CONFIG_SUNRPC_GSS=m
|
||||
CONFIG_SUSPEND=y
|
||||
CONFIG_SUSPEND_FREEZER=y
|
||||
CONFIG_SUSPEND_NVS=y
|
||||
# CONFIG_SYN_COOKIES is not set
|
||||
# CONFIG_SYSCTL_SYSCALL is not set
|
||||
# CONFIG_SYSCTL_SYSCALL_CHECK is not set
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
# CONFIG_TABLET_USB_ACECAD is not set
|
||||
# CONFIG_TABLET_USB_AIPTEK is not set
|
||||
# CONFIG_TABLET_USB_GTCO is not set
|
||||
# CONFIG_TABLET_USB_HANWANG is not set
|
||||
# CONFIG_TABLET_USB_KBTAB is not set
|
||||
# CONFIG_TABLET_USB_WACOM is not set
|
||||
# CONFIG_TCP_CONG_ADVANCED is not set
|
||||
CONFIG_TCP_CONG_CUBIC=y
|
||||
# CONFIG_TEST_LIST_SORT is not set
|
||||
# CONFIG_TINY_PREEMPT_RCU is not set
|
||||
CONFIG_TMPFS_POSIX_ACL=y
|
||||
# CONFIG_TOUCHSCREEN_DYNAPRO is not set
|
||||
# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
|
||||
CONFIG_TOUCHSCREEN_TSC2005=y
|
||||
CONFIG_TUN=m
|
||||
CONFIG_UACCESS_WITH_MEMCPY=y
|
||||
CONFIG_UID16=y
|
||||
CONFIG_USB=m
|
||||
# CONFIG_USB_ARCH_HAS_EHCI is not set
|
||||
# CONFIG_USB_AUDIO is not set
|
||||
# CONFIG_USB_CDC_COMPOSITE is not set
|
||||
CONFIG_USB_ETH=m
|
||||
# CONFIG_USB_ETH_EEM is not set
|
||||
# CONFIG_USB_ETH_RNDIS is not set
|
||||
# CONFIG_USB_FILE_STORAGE is not set
|
||||
# CONFIG_USB_FUNCTIONFS is not set
|
||||
CONFIG_USB_GADGET=m
|
||||
# CONFIG_USB_GADGETFS is not set
|
||||
# CONFIG_USB_GADGET_DEBUG_FILES is not set
|
||||
CONFIG_USB_GADGET_DUALSPEED=y
|
||||
# CONFIG_USB_GADGET_DUMMY_HCD is not set
|
||||
# CONFIG_USB_GADGET_M66592 is not set
|
||||
CONFIG_USB_GADGET_MUSB_HDRC=y
|
||||
# CONFIG_USB_GADGET_OMAP is not set
|
||||
# CONFIG_USB_GADGET_R8A66597 is not set
|
||||
CONFIG_USB_GADGET_SELECTED=y
|
||||
CONFIG_USB_GADGET_VBUS_DRAW=100
|
||||
CONFIG_USB_GSPCA=m
|
||||
# CONFIG_USB_G_DBGP is not set
|
||||
# CONFIG_USB_G_HID is not set
|
||||
# CONFIG_USB_G_PRINTER is not set
|
||||
# CONFIG_USB_G_SERIAL is not set
|
||||
# CONFIG_USB_G_WEBCAM is not set
|
||||
CONFIG_USB_HID=m
|
||||
# CONFIG_USB_INVENTRA_DMA is not set
|
||||
# CONFIG_USB_MIDI_GADGET is not set
|
||||
# CONFIG_USB_MUSB_AM35X is not set
|
||||
CONFIG_USB_MUSB_DEBUG=y
|
||||
CONFIG_USB_MUSB_HDRC=m
|
||||
CONFIG_USB_MUSB_HDRC_HCD=y
|
||||
# CONFIG_USB_MUSB_HOST is not set
|
||||
CONFIG_USB_MUSB_OTG=y
|
||||
# CONFIG_USB_MUSB_PERIPHERAL is not set
|
||||
CONFIG_USB_OTG=y
|
||||
CONFIG_USB_OTG_UTILS=y
|
||||
# CONFIG_USB_PWC is not set
|
||||
CONFIG_USB_SERIAL=m
|
||||
CONFIG_USB_SUPPORT=y
|
||||
# CONFIG_USB_TI_CPPI_DMA is not set
|
||||
# CONFIG_USB_TUSB6010 is not set
|
||||
CONFIG_USB_USBNET=m
|
||||
# CONFIG_USB_ZERO is not set
|
||||
# CONFIG_USER_NS is not set
|
||||
CONFIG_V4L_USB_DRIVERS=y
|
||||
CONFIG_VECTORS_BASE=0xffff0000
|
||||
CONFIG_VFAT_FS=y
|
||||
CONFIG_VFP=y
|
||||
CONFIG_VIDEO_ALLOW_V4L1=y
|
||||
CONFIG_VIDEO_CAPTURE_DRIVERS=y
|
||||
# CONFIG_VIDEO_CPIA2 is not set
|
||||
CONFIG_VIDEO_DEV=m
|
||||
CONFIG_VIDEO_IR=m
|
||||
CONFIG_VIDEO_IR_I2C=m
|
||||
CONFIG_VIDEO_MEDIA=m
|
||||
# CONFIG_VIDEO_OMAP2 is not set
|
||||
# CONFIG_VIDEO_OMAP2_VOUT is not set
|
||||
CONFIG_VIDEO_TCM825X=m
|
||||
CONFIG_VIDEO_V4L1=m
|
||||
CONFIG_VIDEO_V4L2=m
|
||||
CONFIG_VIDEO_V4L2_COMMON=m
|
||||
CONFIG_VLAN_8021Q=m
|
||||
CONFIG_VT=y
|
||||
CONFIG_VT_CONSOLE=y
|
||||
# CONFIG_VT_HW_CONSOLE_BINDING is not set
|
||||
CONFIG_WATCHDOG_NOWAYOUT=y
|
||||
# CONFIG_ZBOOT_ROM is not set
|
||||
CONFIG_ZBOOT_ROM_BSS=0x10200000
|
||||
CONFIG_ZBOOT_ROM_TEXT=0x10C08000
|
||||
CONFIG_ZONE_DMA_FLAG=0
|
||||
@ -1,355 +0,0 @@
|
||||
---
|
||||
arch/arm/boot/compressed/lib1funcs.S | 348 +++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 348 insertions(+)
|
||||
|
||||
--- /dev/null
|
||||
+++ linux-2.6.35/arch/arm/boot/compressed/lib1funcs.S
|
||||
@@ -0,0 +1,348 @@
|
||||
+/*
|
||||
+ * linux/arch/arm/lib/lib1funcs.S: Optimized ARM division routines
|
||||
+ *
|
||||
+ * Author: Nicolas Pitre <nico@fluxnic.net>
|
||||
+ * - contributed to gcc-3.4 on Sep 30, 2003
|
||||
+ * - adapted for the Linux kernel on Oct 2, 2003
|
||||
+ */
|
||||
+
|
||||
+/* Copyright 1995, 1996, 1998, 1999, 2000, 2003 Free Software Foundation, Inc.
|
||||
+
|
||||
+This file is free software; you can redistribute it and/or modify it
|
||||
+under the terms of the GNU General Public License as published by the
|
||||
+Free Software Foundation; either version 2, or (at your option) any
|
||||
+later version.
|
||||
+
|
||||
+In addition to the permissions in the GNU General Public License, the
|
||||
+Free Software Foundation gives you unlimited permission to link the
|
||||
+compiled version of this file into combinations with other programs,
|
||||
+and to distribute those combinations without any restriction coming
|
||||
+from the use of this file. (The General Public License restrictions
|
||||
+do apply in other respects; for example, they cover modification of
|
||||
+the file, and distribution when not linked into a combine
|
||||
+executable.)
|
||||
+
|
||||
+This file is distributed in the hope that it will be useful, but
|
||||
+WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+General Public License for more details.
|
||||
+
|
||||
+You should have received a copy of the GNU General Public License
|
||||
+along with this program; see the file COPYING. If not, write to
|
||||
+the Free Software Foundation, 59 Temple Place - Suite 330,
|
||||
+Boston, MA 02111-1307, USA. */
|
||||
+
|
||||
+
|
||||
+#include <linux/linkage.h>
|
||||
+#include <asm/assembler.h>
|
||||
+
|
||||
+
|
||||
+.macro ARM_DIV_BODY dividend, divisor, result, curbit
|
||||
+
|
||||
+#if __LINUX_ARM_ARCH__ >= 5
|
||||
+
|
||||
+ clz \curbit, \divisor
|
||||
+ clz \result, \dividend
|
||||
+ sub \result, \curbit, \result
|
||||
+ mov \curbit, #1
|
||||
+ mov \divisor, \divisor, lsl \result
|
||||
+ mov \curbit, \curbit, lsl \result
|
||||
+ mov \result, #0
|
||||
+
|
||||
+#else
|
||||
+
|
||||
+ @ Initially shift the divisor left 3 bits if possible,
|
||||
+ @ set curbit accordingly. This allows for curbit to be located
|
||||
+ @ at the left end of each 4 bit nibbles in the division loop
|
||||
+ @ to save one loop in most cases.
|
||||
+ tst \divisor, #0xe0000000
|
||||
+ moveq \divisor, \divisor, lsl #3
|
||||
+ moveq \curbit, #8
|
||||
+ movne \curbit, #1
|
||||
+
|
||||
+ @ Unless the divisor is very big, shift it up in multiples of
|
||||
+ @ four bits, since this is the amount of unwinding in the main
|
||||
+ @ division loop. Continue shifting until the divisor is
|
||||
+ @ larger than the dividend.
|
||||
+1: cmp \divisor, #0x10000000
|
||||
+ cmplo \divisor, \dividend
|
||||
+ movlo \divisor, \divisor, lsl #4
|
||||
+ movlo \curbit, \curbit, lsl #4
|
||||
+ blo 1b
|
||||
+
|
||||
+ @ For very big divisors, we must shift it a bit at a time, or
|
||||
+ @ we will be in danger of overflowing.
|
||||
+1: cmp \divisor, #0x80000000
|
||||
+ cmplo \divisor, \dividend
|
||||
+ movlo \divisor, \divisor, lsl #1
|
||||
+ movlo \curbit, \curbit, lsl #1
|
||||
+ blo 1b
|
||||
+
|
||||
+ mov \result, #0
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
+ @ Division loop
|
||||
+1: cmp \dividend, \divisor
|
||||
+ subhs \dividend, \dividend, \divisor
|
||||
+ orrhs \result, \result, \curbit
|
||||
+ cmp \dividend, \divisor, lsr #1
|
||||
+ subhs \dividend, \dividend, \divisor, lsr #1
|
||||
+ orrhs \result, \result, \curbit, lsr #1
|
||||
+ cmp \dividend, \divisor, lsr #2
|
||||
+ subhs \dividend, \dividend, \divisor, lsr #2
|
||||
+ orrhs \result, \result, \curbit, lsr #2
|
||||
+ cmp \dividend, \divisor, lsr #3
|
||||
+ subhs \dividend, \dividend, \divisor, lsr #3
|
||||
+ orrhs \result, \result, \curbit, lsr #3
|
||||
+ cmp \dividend, #0 @ Early termination?
|
||||
+ movnes \curbit, \curbit, lsr #4 @ No, any more bits to do?
|
||||
+ movne \divisor, \divisor, lsr #4
|
||||
+ bne 1b
|
||||
+
|
||||
+.endm
|
||||
+
|
||||
+
|
||||
+.macro ARM_DIV2_ORDER divisor, order
|
||||
+
|
||||
+#if __LINUX_ARM_ARCH__ >= 5
|
||||
+
|
||||
+ clz \order, \divisor
|
||||
+ rsb \order, \order, #31
|
||||
+
|
||||
+#else
|
||||
+
|
||||
+ cmp \divisor, #(1 << 16)
|
||||
+ movhs \divisor, \divisor, lsr #16
|
||||
+ movhs \order, #16
|
||||
+ movlo \order, #0
|
||||
+
|
||||
+ cmp \divisor, #(1 << 8)
|
||||
+ movhs \divisor, \divisor, lsr #8
|
||||
+ addhs \order, \order, #8
|
||||
+
|
||||
+ cmp \divisor, #(1 << 4)
|
||||
+ movhs \divisor, \divisor, lsr #4
|
||||
+ addhs \order, \order, #4
|
||||
+
|
||||
+ cmp \divisor, #(1 << 2)
|
||||
+ addhi \order, \order, #3
|
||||
+ addls \order, \order, \divisor, lsr #1
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
+.endm
|
||||
+
|
||||
+
|
||||
+.macro ARM_MOD_BODY dividend, divisor, order, spare
|
||||
+
|
||||
+#if __LINUX_ARM_ARCH__ >= 5
|
||||
+
|
||||
+ clz \order, \divisor
|
||||
+ clz \spare, \dividend
|
||||
+ sub \order, \order, \spare
|
||||
+ mov \divisor, \divisor, lsl \order
|
||||
+
|
||||
+#else
|
||||
+
|
||||
+ mov \order, #0
|
||||
+
|
||||
+ @ Unless the divisor is very big, shift it up in multiples of
|
||||
+ @ four bits, since this is the amount of unwinding in the main
|
||||
+ @ division loop. Continue shifting until the divisor is
|
||||
+ @ larger than the dividend.
|
||||
+1: cmp \divisor, #0x10000000
|
||||
+ cmplo \divisor, \dividend
|
||||
+ movlo \divisor, \divisor, lsl #4
|
||||
+ addlo \order, \order, #4
|
||||
+ blo 1b
|
||||
+
|
||||
+ @ For very big divisors, we must shift it a bit at a time, or
|
||||
+ @ we will be in danger of overflowing.
|
||||
+1: cmp \divisor, #0x80000000
|
||||
+ cmplo \divisor, \dividend
|
||||
+ movlo \divisor, \divisor, lsl #1
|
||||
+ addlo \order, \order, #1
|
||||
+ blo 1b
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
+ @ Perform all needed substractions to keep only the reminder.
|
||||
+ @ Do comparisons in batch of 4 first.
|
||||
+ subs \order, \order, #3 @ yes, 3 is intended here
|
||||
+ blt 2f
|
||||
+
|
||||
+1: cmp \dividend, \divisor
|
||||
+ subhs \dividend, \dividend, \divisor
|
||||
+ cmp \dividend, \divisor, lsr #1
|
||||
+ subhs \dividend, \dividend, \divisor, lsr #1
|
||||
+ cmp \dividend, \divisor, lsr #2
|
||||
+ subhs \dividend, \dividend, \divisor, lsr #2
|
||||
+ cmp \dividend, \divisor, lsr #3
|
||||
+ subhs \dividend, \dividend, \divisor, lsr #3
|
||||
+ cmp \dividend, #1
|
||||
+ mov \divisor, \divisor, lsr #4
|
||||
+ subges \order, \order, #4
|
||||
+ bge 1b
|
||||
+
|
||||
+ tst \order, #3
|
||||
+ teqne \dividend, #0
|
||||
+ beq 5f
|
||||
+
|
||||
+ @ Either 1, 2 or 3 comparison/substractions are left.
|
||||
+2: cmn \order, #2
|
||||
+ blt 4f
|
||||
+ beq 3f
|
||||
+ cmp \dividend, \divisor
|
||||
+ subhs \dividend, \dividend, \divisor
|
||||
+ mov \divisor, \divisor, lsr #1
|
||||
+3: cmp \dividend, \divisor
|
||||
+ subhs \dividend, \dividend, \divisor
|
||||
+ mov \divisor, \divisor, lsr #1
|
||||
+4: cmp \dividend, \divisor
|
||||
+ subhs \dividend, \dividend, \divisor
|
||||
+5:
|
||||
+.endm
|
||||
+
|
||||
+
|
||||
+ENTRY(__udivsi3)
|
||||
+ENTRY(__aeabi_uidiv)
|
||||
+
|
||||
+ subs r2, r1, #1
|
||||
+ moveq pc, lr
|
||||
+ bcc Ldiv0
|
||||
+ cmp r0, r1
|
||||
+ bls 11f
|
||||
+ tst r1, r2
|
||||
+ beq 12f
|
||||
+
|
||||
+ ARM_DIV_BODY r0, r1, r2, r3
|
||||
+
|
||||
+ mov r0, r2
|
||||
+ mov pc, lr
|
||||
+
|
||||
+11: moveq r0, #1
|
||||
+ movne r0, #0
|
||||
+ mov pc, lr
|
||||
+
|
||||
+12: ARM_DIV2_ORDER r1, r2
|
||||
+
|
||||
+ mov r0, r0, lsr r2
|
||||
+ mov pc, lr
|
||||
+
|
||||
+ENDPROC(__udivsi3)
|
||||
+ENDPROC(__aeabi_uidiv)
|
||||
+
|
||||
+ENTRY(__umodsi3)
|
||||
+
|
||||
+ subs r2, r1, #1 @ compare divisor with 1
|
||||
+ bcc Ldiv0
|
||||
+ cmpne r0, r1 @ compare dividend with divisor
|
||||
+ moveq r0, #0
|
||||
+ tsthi r1, r2 @ see if divisor is power of 2
|
||||
+ andeq r0, r0, r2
|
||||
+ movls pc, lr
|
||||
+
|
||||
+ ARM_MOD_BODY r0, r1, r2, r3
|
||||
+
|
||||
+ mov pc, lr
|
||||
+
|
||||
+ENDPROC(__umodsi3)
|
||||
+
|
||||
+ENTRY(__divsi3)
|
||||
+ENTRY(__aeabi_idiv)
|
||||
+
|
||||
+ cmp r1, #0
|
||||
+ eor ip, r0, r1 @ save the sign of the result.
|
||||
+ beq Ldiv0
|
||||
+ rsbmi r1, r1, #0 @ loops below use unsigned.
|
||||
+ subs r2, r1, #1 @ division by 1 or -1 ?
|
||||
+ beq 10f
|
||||
+ movs r3, r0
|
||||
+ rsbmi r3, r0, #0 @ positive dividend value
|
||||
+ cmp r3, r1
|
||||
+ bls 11f
|
||||
+ tst r1, r2 @ divisor is power of 2 ?
|
||||
+ beq 12f
|
||||
+
|
||||
+ ARM_DIV_BODY r3, r1, r0, r2
|
||||
+
|
||||
+ cmp ip, #0
|
||||
+ rsbmi r0, r0, #0
|
||||
+ mov pc, lr
|
||||
+
|
||||
+10: teq ip, r0 @ same sign ?
|
||||
+ rsbmi r0, r0, #0
|
||||
+ mov pc, lr
|
||||
+
|
||||
+11: movlo r0, #0
|
||||
+ moveq r0, ip, asr #31
|
||||
+ orreq r0, r0, #1
|
||||
+ mov pc, lr
|
||||
+
|
||||
+12: ARM_DIV2_ORDER r1, r2
|
||||
+
|
||||
+ cmp ip, #0
|
||||
+ mov r0, r3, lsr r2
|
||||
+ rsbmi r0, r0, #0
|
||||
+ mov pc, lr
|
||||
+
|
||||
+ENDPROC(__divsi3)
|
||||
+ENDPROC(__aeabi_idiv)
|
||||
+
|
||||
+ENTRY(__modsi3)
|
||||
+
|
||||
+ cmp r1, #0
|
||||
+ beq Ldiv0
|
||||
+ rsbmi r1, r1, #0 @ loops below use unsigned.
|
||||
+ movs ip, r0 @ preserve sign of dividend
|
||||
+ rsbmi r0, r0, #0 @ if negative make positive
|
||||
+ subs r2, r1, #1 @ compare divisor with 1
|
||||
+ cmpne r0, r1 @ compare dividend with divisor
|
||||
+ moveq r0, #0
|
||||
+ tsthi r1, r2 @ see if divisor is power of 2
|
||||
+ andeq r0, r0, r2
|
||||
+ bls 10f
|
||||
+
|
||||
+ ARM_MOD_BODY r0, r1, r2, r3
|
||||
+
|
||||
+10: cmp ip, #0
|
||||
+ rsbmi r0, r0, #0
|
||||
+ mov pc, lr
|
||||
+
|
||||
+ENDPROC(__modsi3)
|
||||
+
|
||||
+#ifdef CONFIG_AEABI
|
||||
+
|
||||
+ENTRY(__aeabi_uidivmod)
|
||||
+
|
||||
+ stmfd sp!, {r0, r1, ip, lr}
|
||||
+ bl __aeabi_uidiv
|
||||
+ ldmfd sp!, {r1, r2, ip, lr}
|
||||
+ mul r3, r0, r2
|
||||
+ sub r1, r1, r3
|
||||
+ mov pc, lr
|
||||
+
|
||||
+ENDPROC(__aeabi_uidivmod)
|
||||
+
|
||||
+ENTRY(__aeabi_idivmod)
|
||||
+
|
||||
+ stmfd sp!, {r0, r1, ip, lr}
|
||||
+ bl __aeabi_idiv
|
||||
+ ldmfd sp!, {r1, r2, ip, lr}
|
||||
+ mul r3, r0, r2
|
||||
+ sub r1, r1, r3
|
||||
+ mov pc, lr
|
||||
+
|
||||
+ENDPROC(__aeabi_idivmod)
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
+Ldiv0:
|
||||
+
|
||||
+ str lr, [sp, #-8]!
|
||||
+ bl __div0
|
||||
+ mov r0, #0 @ About as wrong as it could be.
|
||||
+ ldr pc, [sp], #8
|
||||
+
|
||||
+
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,857 +0,0 @@
|
||||
---
|
||||
arch/arm/mach-omap1/board-nokia770.c | 16 +
|
||||
arch/arm/mach-omap2/Kconfig | 10
|
||||
arch/arm/mach-omap2/Makefile | 2
|
||||
arch/arm/mach-omap2/board-n8x0-lcd.c | 127 ++++++++++++
|
||||
arch/arm/mach-omap2/board-n8x0-usb.c | 175 +++++++++++++++++
|
||||
arch/arm/mach-omap2/board-n8x0.c | 355 ++++++++++++++++++++++++++---------
|
||||
arch/arm/mach-omap2/control.c | 2
|
||||
arch/arm/mach-omap2/serial.c | 8
|
||||
8 files changed, 608 insertions(+), 87 deletions(-)
|
||||
|
||||
Index: linux-2.6.37/arch/arm/mach-omap1/board-nokia770.c
|
||||
===================================================================
|
||||
--- linux-2.6.37.orig/arch/arm/mach-omap1/board-nokia770.c 2011-01-05 01:50:19.000000000 +0100
|
||||
+++ linux-2.6.37/arch/arm/mach-omap1/board-nokia770.c 2011-01-28 18:09:59.378233620 +0100
|
||||
@@ -36,6 +36,7 @@
|
||||
#include <plat/lcd_mipid.h>
|
||||
#include <plat/mmc.h>
|
||||
#include <plat/clock.h>
|
||||
+#include <plat/cbus.h>
|
||||
|
||||
#define ADS7846_PENDOWN_GPIO 15
|
||||
|
||||
@@ -95,8 +96,23 @@
|
||||
.resource = nokia770_kp_resources,
|
||||
};
|
||||
|
||||
+static struct cbus_host_platform_data nokia770_cbus_data = {
|
||||
+ .clk_gpio = OMAP_MPUIO(11),
|
||||
+ .dat_gpio = OMAP_MPUIO(10),
|
||||
+ .sel_gpio = OMAP_MPUIO(9),
|
||||
+};
|
||||
+
|
||||
+static struct platform_device nokia770_cbus_device = {
|
||||
+ .name = "cbus",
|
||||
+ .id = -1,
|
||||
+ .dev = {
|
||||
+ .platform_data = &nokia770_cbus_data,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
static struct platform_device *nokia770_devices[] __initdata = {
|
||||
&nokia770_kp_device,
|
||||
+ &nokia770_cbus_device,
|
||||
};
|
||||
|
||||
static void mipid_shutdown(struct mipid_platform_data *pdata)
|
||||
Index: linux-2.6.37/arch/arm/mach-omap2/board-n8x0.c
|
||||
===================================================================
|
||||
--- linux-2.6.37.orig/arch/arm/mach-omap2/board-n8x0.c 2011-01-05 01:50:19.000000000 +0100
|
||||
+++ linux-2.6.37/arch/arm/mach-omap2/board-n8x0.c 2011-01-28 18:13:25.864968462 +0100
|
||||
@@ -18,9 +18,13 @@
|
||||
#include <linux/io.h>
|
||||
#include <linux/stddef.h>
|
||||
#include <linux/i2c.h>
|
||||
+#include <linux/platform_device.h>
|
||||
#include <linux/spi/spi.h>
|
||||
+#include <linux/spi/tsc2005.h>
|
||||
+#include <linux/input.h>
|
||||
#include <linux/usb/musb.h>
|
||||
#include <sound/tlv320aic3x.h>
|
||||
+#include <linux/i2c/lm8323.h>
|
||||
|
||||
#include <asm/mach/arch.h>
|
||||
#include <asm/mach-types.h>
|
||||
@@ -33,6 +37,8 @@
|
||||
#include <plat/onenand.h>
|
||||
#include <plat/mmc.h>
|
||||
#include <plat/serial.h>
|
||||
+#include <plat/cbus.h>
|
||||
+#include <plat/gpio-switch.h>
|
||||
|
||||
#include "mux.h"
|
||||
|
||||
@@ -40,109 +46,162 @@
|
||||
static int slot2_cover_open;
|
||||
static struct device *mmc_device;
|
||||
|
||||
-#define TUSB6010_ASYNC_CS 1
|
||||
-#define TUSB6010_SYNC_CS 4
|
||||
-#define TUSB6010_GPIO_INT 58
|
||||
-#define TUSB6010_GPIO_ENABLE 0
|
||||
-#define TUSB6010_DMACHAN 0x3f
|
||||
+#define RX51_TSC2005_RESET_GPIO 94
|
||||
+#define RX51_TSC2005_IRQ_GPIO 106
|
||||
+#define OMAP_TAG_NOKIA_BT 0x4e01
|
||||
+
|
||||
+/* We map the FN key as LALT to workaround an X keycode problem.
|
||||
+ * The XKB map needs to be adjusted to support this. */
|
||||
+#define MAP_FN_AS_LEFTALT
|
||||
+
|
||||
+static s16 rx44_keymap[LM8323_KEYMAP_SIZE] = {
|
||||
+ [0x01] = KEY_Q,
|
||||
+ [0x02] = KEY_K,
|
||||
+ [0x03] = KEY_O,
|
||||
+ [0x04] = KEY_P,
|
||||
+ [0x05] = KEY_BACKSPACE,
|
||||
+ [0x06] = KEY_A,
|
||||
+ [0x07] = KEY_S,
|
||||
+ [0x08] = KEY_D,
|
||||
+ [0x09] = KEY_F,
|
||||
+ [0x0a] = KEY_G,
|
||||
+ [0x0b] = KEY_H,
|
||||
+ [0x0c] = KEY_J,
|
||||
+
|
||||
+ [0x11] = KEY_W,
|
||||
+ [0x12] = KEY_F4,
|
||||
+ [0x13] = KEY_L,
|
||||
+ [0x14] = KEY_APOSTROPHE,
|
||||
+ [0x16] = KEY_Z,
|
||||
+ [0x17] = KEY_X,
|
||||
+ [0x18] = KEY_C,
|
||||
+ [0x19] = KEY_V,
|
||||
+ [0x1a] = KEY_B,
|
||||
+ [0x1b] = KEY_N,
|
||||
+ [0x1c] = KEY_LEFTSHIFT, /* Actually, this is both shift keys */
|
||||
+ [0x1f] = KEY_F7,
|
||||
+
|
||||
+ [0x21] = KEY_E,
|
||||
+ [0x22] = KEY_SEMICOLON,
|
||||
+ [0x23] = KEY_MINUS,
|
||||
+ [0x24] = KEY_EQUAL,
|
||||
+#ifdef MAP_FN_AS_LEFTALT
|
||||
+ [0x2b] = KEY_LEFTALT,
|
||||
+#else
|
||||
+ [0x2b] = KEY_FN,
|
||||
+#endif
|
||||
+ [0x2c] = KEY_M,
|
||||
+ [0x2f] = KEY_F8,
|
||||
|
||||
-#if defined(CONFIG_USB_TUSB6010) || \
|
||||
- defined(CONFIG_USB_TUSB6010_MODULE)
|
||||
-/*
|
||||
- * Enable or disable power to TUSB6010. When enabling, turn on 3.3 V and
|
||||
- * 1.5 V voltage regulators of PM companion chip. Companion chip will then
|
||||
- * provide then PGOOD signal to TUSB6010 which will release it from reset.
|
||||
- */
|
||||
-static int tusb_set_power(int state)
|
||||
-{
|
||||
- int i, retval = 0;
|
||||
+ [0x31] = KEY_R,
|
||||
+ [0x32] = KEY_RIGHTCTRL,
|
||||
+ [0x34] = KEY_SPACE,
|
||||
+ [0x35] = KEY_COMMA,
|
||||
+ [0x37] = KEY_UP,
|
||||
+ [0x3c] = KEY_COMPOSE,
|
||||
+ [0x3f] = KEY_F6,
|
||||
+
|
||||
+ [0x41] = KEY_T,
|
||||
+ [0x44] = KEY_DOT,
|
||||
+ [0x46] = KEY_RIGHT,
|
||||
+ [0x4f] = KEY_F5,
|
||||
+ [0x51] = KEY_Y,
|
||||
+ [0x53] = KEY_DOWN,
|
||||
+ [0x55] = KEY_ENTER,
|
||||
+ [0x5f] = KEY_ESC,
|
||||
+
|
||||
+ [0x61] = KEY_U,
|
||||
+ [0x64] = KEY_LEFT,
|
||||
+
|
||||
+ [0x71] = KEY_I,
|
||||
+ [0x75] = KEY_KPENTER,
|
||||
+};
|
||||
+
|
||||
+static struct lm8323_platform_data lm8323_pdata = {
|
||||
+ .repeat = 0, /* Repeat is handled in userspace for now. */
|
||||
+ .keymap = rx44_keymap,
|
||||
+ .size_x = 8,
|
||||
+ .size_y = 12,
|
||||
+ .debounce_time = 12,
|
||||
+ .active_time = 500,
|
||||
+
|
||||
+ .name = "Internal keyboard",
|
||||
+ .pwm_names[0] = "n810::keyboard",
|
||||
+ .pwm_names[1] = "n810::cover",
|
||||
+ //.pwm1_name = "n810::keyboard",
|
||||
+ //.pwm2_name = "n810::cover",
|
||||
+};
|
||||
+
|
||||
+struct omap_bluetooth_config {
|
||||
+ u8 chip_type;
|
||||
+ u8 bt_wakeup_gpio;
|
||||
+ u8 host_wakeup_gpio;
|
||||
+ u8 reset_gpio;
|
||||
+ u8 bt_uart;
|
||||
+ u8 bd_addr[6];
|
||||
+ u8 bt_sysclk;
|
||||
+};
|
||||
+
|
||||
+static struct platform_device n8x0_bt_device = {
|
||||
+ .name = "hci_h4p",
|
||||
+ .id = -1,
|
||||
+ .num_resources = 0,
|
||||
+};
|
||||
+
|
||||
+void __init n8x0_bt_init(void)
|
||||
+{
|
||||
+ const struct omap_bluetooth_config *bt_config;
|
||||
+
|
||||
+ bt_config = (void *) omap_get_config(OMAP_TAG_NOKIA_BT,
|
||||
+ struct omap_bluetooth_config);
|
||||
+ n8x0_bt_device.dev.platform_data = (void *) bt_config;
|
||||
+ if (platform_device_register(&n8x0_bt_device) < 0)
|
||||
+ BUG();
|
||||
+}
|
||||
|
||||
- if (state) {
|
||||
- gpio_set_value(TUSB6010_GPIO_ENABLE, 1);
|
||||
- msleep(1);
|
||||
+static struct omap2_mcspi_device_config mipid_mcspi_config = {
|
||||
+ .turbo_mode = 0,
|
||||
+ .single_channel = 1,
|
||||
+};
|
||||
|
||||
- /* Wait until TUSB6010 pulls INT pin down */
|
||||
- i = 100;
|
||||
- while (i && gpio_get_value(TUSB6010_GPIO_INT)) {
|
||||
- msleep(1);
|
||||
- i--;
|
||||
- }
|
||||
+static int slot1_cover_open;
|
||||
+static int slot2_cover_open;
|
||||
+static struct device *mmc_device;
|
||||
|
||||
- if (!i) {
|
||||
- printk(KERN_ERR "tusb: powerup failed\n");
|
||||
- retval = -ENODEV;
|
||||
- }
|
||||
- } else {
|
||||
- gpio_set_value(TUSB6010_GPIO_ENABLE, 0);
|
||||
- msleep(10);
|
||||
- }
|
||||
|
||||
- return retval;
|
||||
-}
|
||||
-
|
||||
-static struct musb_hdrc_config musb_config = {
|
||||
- .multipoint = 1,
|
||||
- .dyn_fifo = 1,
|
||||
- .num_eps = 16,
|
||||
- .ram_bits = 12,
|
||||
+static struct omap2_mcspi_device_config p54spi_mcspi_config = {
|
||||
+ .turbo_mode = 0,
|
||||
+ .single_channel = 1,
|
||||
};
|
||||
|
||||
-static struct musb_hdrc_platform_data tusb_data = {
|
||||
-#if defined(CONFIG_USB_MUSB_OTG)
|
||||
- .mode = MUSB_OTG,
|
||||
-#elif defined(CONFIG_USB_MUSB_PERIPHERAL)
|
||||
- .mode = MUSB_PERIPHERAL,
|
||||
-#else /* defined(CONFIG_USB_MUSB_HOST) */
|
||||
- .mode = MUSB_HOST,
|
||||
+#ifdef CONFIG_MACH_NOKIA_N8X0_LCD
|
||||
+extern struct mipid_platform_data n8x0_mipid_platform_data;
|
||||
#endif
|
||||
- .set_power = tusb_set_power,
|
||||
- .min_power = 25, /* x2 = 50 mA drawn from VBUS as peripheral */
|
||||
- .power = 100, /* Max 100 mA VBUS for host mode */
|
||||
- .config = &musb_config,
|
||||
-};
|
||||
|
||||
-static void __init n8x0_usb_init(void)
|
||||
+#ifdef CONFIG_TOUCHSCREEN_TSC2005
|
||||
+static struct tsc2005_platform_data tsc2005_config;
|
||||
+static void rx51_tsc2005_set_reset(bool enable)
|
||||
{
|
||||
- int ret = 0;
|
||||
- static char announce[] __initdata = KERN_INFO "TUSB 6010\n";
|
||||
-
|
||||
- /* PM companion chip power control pin */
|
||||
- ret = gpio_request(TUSB6010_GPIO_ENABLE, "TUSB6010 enable");
|
||||
- if (ret != 0) {
|
||||
- printk(KERN_ERR "Could not get TUSB power GPIO%i\n",
|
||||
- TUSB6010_GPIO_ENABLE);
|
||||
- return;
|
||||
- }
|
||||
- gpio_direction_output(TUSB6010_GPIO_ENABLE, 0);
|
||||
-
|
||||
- tusb_set_power(0);
|
||||
-
|
||||
- ret = tusb6010_setup_interface(&tusb_data, TUSB6010_REFCLK_19, 2,
|
||||
- TUSB6010_ASYNC_CS, TUSB6010_SYNC_CS,
|
||||
- TUSB6010_GPIO_INT, TUSB6010_DMACHAN);
|
||||
- if (ret != 0)
|
||||
- goto err;
|
||||
-
|
||||
- printk(announce);
|
||||
-
|
||||
- return;
|
||||
-
|
||||
-err:
|
||||
- gpio_free(TUSB6010_GPIO_ENABLE);
|
||||
+ gpio_set_value(RX51_TSC2005_RESET_GPIO, enable);
|
||||
}
|
||||
-#else
|
||||
-
|
||||
-static void __init n8x0_usb_init(void) {}
|
||||
-
|
||||
-#endif /*CONFIG_USB_TUSB6010 */
|
||||
-
|
||||
|
||||
-static struct omap2_mcspi_device_config p54spi_mcspi_config = {
|
||||
+static struct omap2_mcspi_device_config tsc2005_mcspi_config = {
|
||||
.turbo_mode = 0,
|
||||
.single_channel = 1,
|
||||
};
|
||||
+#endif
|
||||
|
||||
static struct spi_board_info n800_spi_board_info[] __initdata = {
|
||||
+#ifdef CONFIG_MACH_NOKIA_N8X0_LCD
|
||||
+ {
|
||||
+ .modalias = "lcd_mipid",
|
||||
+ .bus_num = 1,
|
||||
+ .chip_select = 1,
|
||||
+ .max_speed_hz = 4000000,
|
||||
+ .controller_data= &mipid_mcspi_config,
|
||||
+ .platform_data = &n8x0_mipid_platform_data,
|
||||
+ },
|
||||
+#endif
|
||||
{
|
||||
.modalias = "p54spi",
|
||||
.bus_num = 2,
|
||||
@@ -150,8 +209,60 @@
|
||||
.max_speed_hz = 48000000,
|
||||
.controller_data = &p54spi_mcspi_config,
|
||||
},
|
||||
+ {
|
||||
+ .modalias = "tsc2005",
|
||||
+ .bus_num = 1,
|
||||
+ .chip_select = 0,
|
||||
+ .irq = OMAP_GPIO_IRQ(RX51_TSC2005_IRQ_GPIO),
|
||||
+ .max_speed_hz = 6000000,
|
||||
+ .controller_data = &tsc2005_mcspi_config,
|
||||
+ .platform_data = &tsc2005_config,
|
||||
+ },
|
||||
};
|
||||
|
||||
+static void __init tsc2005_set_config(void)
|
||||
+{
|
||||
+ const struct omap_lcd_config *conf;
|
||||
+
|
||||
+ conf = omap_get_config(OMAP_TAG_LCD, struct omap_lcd_config);
|
||||
+ if (conf != NULL) {
|
||||
+#ifdef CONFIG_TOUCHSCREEN_TSC2005
|
||||
+ if (strcmp(conf->panel_name, "lph8923") == 0) {
|
||||
+ tsc2005_config.ts_x_plate_ohm = 180;
|
||||
+ tsc2005_config.ts_hw_avg = 0;
|
||||
+ tsc2005_config.ts_ignore_last = 0;
|
||||
+ tsc2005_config.ts_touch_pressure = 1500;
|
||||
+ tsc2005_config.ts_stab_time = 100;
|
||||
+ tsc2005_config.ts_pressure_max = 2048;
|
||||
+ tsc2005_config.ts_pressure_fudge = 2;
|
||||
+ tsc2005_config.ts_x_max = 4096;
|
||||
+ tsc2005_config.ts_x_fudge = 4;
|
||||
+ tsc2005_config.ts_y_max = 4096;
|
||||
+ tsc2005_config.ts_y_fudge = 7;
|
||||
+ tsc2005_config.set_reset = rx51_tsc2005_set_reset;
|
||||
+ } else if (strcmp(conf->panel_name, "ls041y3") == 0) {
|
||||
+ tsc2005_config.ts_x_plate_ohm = 280;
|
||||
+ tsc2005_config.ts_hw_avg = 0;
|
||||
+ tsc2005_config.ts_ignore_last = 0;
|
||||
+ tsc2005_config.ts_touch_pressure = 1500;
|
||||
+ tsc2005_config.ts_stab_time = 1000;
|
||||
+ tsc2005_config.ts_pressure_max = 2048;
|
||||
+ tsc2005_config.ts_pressure_fudge = 2;
|
||||
+ tsc2005_config.ts_x_max = 4096;
|
||||
+ tsc2005_config.ts_x_fudge = 4;
|
||||
+ tsc2005_config.ts_y_max = 4096;
|
||||
+ tsc2005_config.ts_y_fudge = 7;
|
||||
+ tsc2005_config.set_reset = rx51_tsc2005_set_reset;
|
||||
+ } else {
|
||||
+ printk(KERN_ERR "Unknown panel type, set default "
|
||||
+ "touchscreen configuration\n");
|
||||
+ tsc2005_config.ts_x_plate_ohm = 200;
|
||||
+ tsc2005_config.ts_stab_time = 100;
|
||||
+ }
|
||||
+#endif
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
#if defined(CONFIG_MTD_ONENAND_OMAP2) || \
|
||||
defined(CONFIG_MTD_ONENAND_OMAP2_MODULE)
|
||||
|
||||
@@ -184,6 +295,20 @@
|
||||
},
|
||||
};
|
||||
|
||||
+static struct cbus_host_platform_data n8x0_cbus_data = {
|
||||
+ .clk_gpio = 66,
|
||||
+ .dat_gpio = 65,
|
||||
+ .sel_gpio = 64,
|
||||
+};
|
||||
+
|
||||
+static struct platform_device n8x0_cbus_device = {
|
||||
+ .name = "cbus",
|
||||
+ .id = -1,
|
||||
+ .dev = {
|
||||
+ .platform_data = &n8x0_cbus_data,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
static struct omap_onenand_platform_data board_onenand_data = {
|
||||
.cs = 0,
|
||||
.gpio_irq = 26,
|
||||
@@ -626,6 +751,11 @@
|
||||
|
||||
static struct i2c_board_info n810_i2c_board_info_2[] __initdata = {
|
||||
{
|
||||
+ I2C_BOARD_INFO("lm8323", 0x45),
|
||||
+ .irq = OMAP_GPIO_IRQ(109),
|
||||
+ .platform_data = &lm8323_pdata,
|
||||
+ },
|
||||
+ {
|
||||
I2C_BOARD_INFO("tlv320aic3x", 0x18),
|
||||
.platform_data = &n810_aic33_data,
|
||||
},
|
||||
@@ -657,10 +787,62 @@
|
||||
#define board_mux NULL
|
||||
#endif
|
||||
|
||||
+#ifdef CONFIG_MACH_NOKIA_N8X0_LCD
|
||||
+extern void n8x0_mipid_init(void);
|
||||
+extern void n8x0_blizzard_init(void);
|
||||
+#else
|
||||
+#define n8x0_mipid_init() 0
|
||||
+#define n8x0_blizzard_init() 0
|
||||
+#endif
|
||||
+
|
||||
+extern void n8x0_usb_init(void);
|
||||
+
|
||||
+static struct omap_gpio_switch n8x0_gpio_switches[] __initdata = {
|
||||
+ {
|
||||
+ .name = "headphone",
|
||||
+ .gpio = -1,
|
||||
+ .debounce_rising = 200,
|
||||
+ .debounce_falling = 200,
|
||||
+ }, {
|
||||
+ .name = "cam_act",
|
||||
+ .gpio = -1,
|
||||
+ .debounce_rising = 200,
|
||||
+ .debounce_falling = 200,
|
||||
+ }, {
|
||||
+ .name = "cam_turn",
|
||||
+ .gpio = -1,
|
||||
+ .debounce_rising = 100,
|
||||
+ .debounce_falling = 100,
|
||||
+ }, {
|
||||
+ .name = "slide",
|
||||
+ .gpio = -1,
|
||||
+ .debounce_rising = 200,
|
||||
+ .debounce_falling = 200,
|
||||
+ }, {
|
||||
+ .name = "kb_lock",
|
||||
+ .gpio = -1,
|
||||
+ .debounce_rising = 200,
|
||||
+ .debounce_falling = 200,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static void __init n8x0_gpio_switches_init(void)
|
||||
+{
|
||||
+ /* The switches are actually registered through ATAG mechanism.
|
||||
+ * This just updates the parameters (thus .gpio is -1) */
|
||||
+ omap_register_gpio_switches(n8x0_gpio_switches,
|
||||
+ ARRAY_SIZE(n8x0_gpio_switches));
|
||||
+}
|
||||
+
|
||||
static void __init n8x0_init_machine(void)
|
||||
{
|
||||
omap2420_mux_init(board_mux, OMAP_PACKAGE_ZAC);
|
||||
+ n8x0_gpio_switches_init();
|
||||
+ platform_device_register(&n8x0_cbus_device);
|
||||
+ n8x0_bt_init();
|
||||
+
|
||||
/* FIXME: add n810 spi devices */
|
||||
+ tsc2005_set_config();
|
||||
spi_register_board_info(n800_spi_board_info,
|
||||
ARRAY_SIZE(n800_spi_board_info));
|
||||
omap_register_i2c_bus(1, 400, n8x0_i2c_board_info_1,
|
||||
@@ -671,6 +853,10 @@
|
||||
ARRAY_SIZE(n810_i2c_board_info_2));
|
||||
|
||||
omap_serial_init();
|
||||
+
|
||||
+ n8x0_mipid_init();
|
||||
+ n8x0_blizzard_init();
|
||||
+
|
||||
n8x0_onenand_init();
|
||||
n8x0_mmc_init();
|
||||
n8x0_usb_init();
|
||||
Index: linux-2.6.37/arch/arm/mach-omap2/board-n8x0-lcd.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.37/arch/arm/mach-omap2/board-n8x0-lcd.c 2011-01-28 18:10:37.941647955 +0100
|
||||
@@ -0,0 +1,127 @@
|
||||
+/*
|
||||
+ * linux/arch/arm/mach-omap2/board-n8x0.c
|
||||
+ *
|
||||
+ * Copyright (C) 2005-2009 Nokia Corporation
|
||||
+ * Author: Juha Yrjola <juha.yrjola@nokia.com>
|
||||
+ *
|
||||
+ * Modified from mach-omap2/board-generic.c
|
||||
+ *
|
||||
+ * 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/clk.h>
|
||||
+#include <linux/delay.h>
|
||||
+#include <linux/gpio.h>
|
||||
+#include <linux/omapfb.h>
|
||||
+
|
||||
+#include <plat/lcd_mipid.h>
|
||||
+#include <plat/blizzard.h>
|
||||
+
|
||||
+#include <../drivers/cbus/tahvo.h>
|
||||
+
|
||||
+#define N8X0_BLIZZARD_POWERDOWN_GPIO 15
|
||||
+
|
||||
+// MIPID LCD Panel
|
||||
+
|
||||
+static void mipid_shutdown(struct mipid_platform_data *pdata)
|
||||
+{
|
||||
+ if (pdata->nreset_gpio != -1) {
|
||||
+ pr_info("shutdown LCD\n");
|
||||
+ gpio_set_value(pdata->nreset_gpio, 0);
|
||||
+ msleep(120);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+struct mipid_platform_data n8x0_mipid_platform_data = {
|
||||
+ .shutdown = mipid_shutdown,
|
||||
+};
|
||||
+
|
||||
+void __init n8x0_mipid_init(void)
|
||||
+{
|
||||
+ const struct omap_lcd_config *conf;
|
||||
+
|
||||
+ conf = omap_get_config(OMAP_TAG_LCD, struct omap_lcd_config);
|
||||
+ if (conf != NULL) {
|
||||
+ n8x0_mipid_platform_data.nreset_gpio = conf->nreset_gpio;
|
||||
+ n8x0_mipid_platform_data.data_lines = conf->data_lines;
|
||||
+ printk(KERN_INFO "N8x0 MIPID config loaded");
|
||||
+ }
|
||||
+ else
|
||||
+ printk(KERN_INFO "N8x0 MIPID config not provided");
|
||||
+}
|
||||
+
|
||||
+
|
||||
+// Epson Blizzard LCD Controller
|
||||
+
|
||||
+static struct {
|
||||
+ struct clk *sys_ck;
|
||||
+} blizzard;
|
||||
+
|
||||
+static int blizzard_get_clocks(void)
|
||||
+{
|
||||
+ blizzard.sys_ck = clk_get(0, "osc_ck");
|
||||
+ if (IS_ERR(blizzard.sys_ck)) {
|
||||
+ printk(KERN_ERR "can't get Blizzard clock\n");
|
||||
+ return PTR_ERR(blizzard.sys_ck);
|
||||
+ }
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static unsigned long blizzard_get_clock_rate(struct device *dev)
|
||||
+{
|
||||
+ return clk_get_rate(blizzard.sys_ck);
|
||||
+}
|
||||
+
|
||||
+static void blizzard_enable_clocks(int enable)
|
||||
+{
|
||||
+ if (enable)
|
||||
+ clk_enable(blizzard.sys_ck);
|
||||
+ else
|
||||
+ clk_disable(blizzard.sys_ck);
|
||||
+}
|
||||
+
|
||||
+static void blizzard_power_up(struct device *dev)
|
||||
+{
|
||||
+ /* Vcore to 1.475V */
|
||||
+ tahvo_set_clear_reg_bits(0x07, 0, 0xf);
|
||||
+ msleep(10);
|
||||
+
|
||||
+ blizzard_enable_clocks(1);
|
||||
+ gpio_set_value(N8X0_BLIZZARD_POWERDOWN_GPIO, 1);
|
||||
+}
|
||||
+
|
||||
+static void blizzard_power_down(struct device *dev)
|
||||
+{
|
||||
+ gpio_set_value(N8X0_BLIZZARD_POWERDOWN_GPIO, 0);
|
||||
+ blizzard_enable_clocks(0);
|
||||
+
|
||||
+ /* Vcore to 1.005V */
|
||||
+ tahvo_set_clear_reg_bits(0x07, 0xf, 0);
|
||||
+}
|
||||
+
|
||||
+static struct blizzard_platform_data n8x0_blizzard_data = {
|
||||
+ .power_up = blizzard_power_up,
|
||||
+ .power_down = blizzard_power_down,
|
||||
+ .get_clock_rate = blizzard_get_clock_rate,
|
||||
+ .te_connected = 1,
|
||||
+};
|
||||
+
|
||||
+void __init n8x0_blizzard_init(void)
|
||||
+{
|
||||
+ int r;
|
||||
+
|
||||
+ r = gpio_request(N8X0_BLIZZARD_POWERDOWN_GPIO, "Blizzard pd");
|
||||
+ if (r < 0)
|
||||
+ {
|
||||
+ printk(KERN_ERR "Can't get N8x0 Blizzard powerdown GPIO %d\n", N8X0_BLIZZARD_POWERDOWN_GPIO);
|
||||
+ return;
|
||||
+ }
|
||||
+ gpio_direction_output(N8X0_BLIZZARD_POWERDOWN_GPIO, 1);
|
||||
+
|
||||
+ blizzard_get_clocks();
|
||||
+ omapfb_set_ctrl_platform_data(&n8x0_blizzard_data);
|
||||
+
|
||||
+ printk(KERN_INFO "N8x0 Blizzard initialized");
|
||||
+}
|
||||
Index: linux-2.6.37/arch/arm/mach-omap2/board-n8x0-usb.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.37/arch/arm/mach-omap2/board-n8x0-usb.c 2011-01-28 18:09:59.378233620 +0100
|
||||
@@ -0,0 +1,175 @@
|
||||
+/*
|
||||
+ * linux/arch/arm/mach-omap2/board-n8x0-usb.c
|
||||
+ *
|
||||
+ * Copyright (C) 2006 Nokia Corporation
|
||||
+ * Author: Juha Yrjola
|
||||
+ *
|
||||
+ * 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/types.h>
|
||||
+#include <linux/delay.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+#include <linux/clk.h>
|
||||
+#include <linux/err.h>
|
||||
+#include <linux/gpio.h>
|
||||
+#include <linux/usb/musb.h>
|
||||
+
|
||||
+#include <plat/gpmc.h>
|
||||
+
|
||||
+#define TUSB_ASYNC_CS 1
|
||||
+#define TUSB_SYNC_CS 4
|
||||
+#define GPIO_TUSB_INT 58
|
||||
+#define GPIO_TUSB_ENABLE 0
|
||||
+
|
||||
+static int tusb_set_power(int state);
|
||||
+static int tusb_set_clock(struct clk *osc_ck, int state);
|
||||
+
|
||||
+#if defined(CONFIG_USB_MUSB_OTG)
|
||||
+# define BOARD_MODE MUSB_OTG
|
||||
+#elif defined(CONFIG_USB_MUSB_PERIPHERAL)
|
||||
+# define BOARD_MODE MUSB_PERIPHERAL
|
||||
+#else /* defined(CONFIG_USB_MUSB_HOST) */
|
||||
+# define BOARD_MODE MUSB_HOST
|
||||
+#endif
|
||||
+
|
||||
+static struct musb_hdrc_eps_bits musb_eps[] = {
|
||||
+ { "ep1_tx", 5, },
|
||||
+ { "ep1_rx", 5, },
|
||||
+ { "ep2_tx", 5, },
|
||||
+ { "ep2_rx", 5, },
|
||||
+ { "ep3_tx", 3, },
|
||||
+ { "ep3_rx", 3, },
|
||||
+ { "ep4_tx", 3, },
|
||||
+ { "ep4_rx", 3, },
|
||||
+ { "ep5_tx", 2, },
|
||||
+ { "ep5_rx", 2, },
|
||||
+ { "ep6_tx", 2, },
|
||||
+ { "ep6_rx", 2, },
|
||||
+ { "ep7_tx", 2, },
|
||||
+ { "ep7_rx", 2, },
|
||||
+ { "ep8_tx", 2, },
|
||||
+ { "ep8_rx", 2, },
|
||||
+ { "ep9_tx", 2, },
|
||||
+ { "ep9_rx", 2, },
|
||||
+ { "ep10_tx", 2, },
|
||||
+ { "ep10_rx", 2, },
|
||||
+ { "ep11_tx", 2, },
|
||||
+ { "ep11_rx", 2, },
|
||||
+ { "ep12_tx", 2, },
|
||||
+ { "ep12_rx", 2, },
|
||||
+ { "ep13_tx", 2, },
|
||||
+ { "ep13_rx", 2, },
|
||||
+ { "ep14_tx", 2, },
|
||||
+ { "ep14_rx", 2, },
|
||||
+ { "ep15_tx", 2, },
|
||||
+ { "ep15_rx", 2, },
|
||||
+};
|
||||
+
|
||||
+static struct musb_hdrc_config musb_config = {
|
||||
+ .multipoint = 1,
|
||||
+ .dyn_fifo = 1,
|
||||
+ .soft_con = 1,
|
||||
+ .dma = 1,
|
||||
+ .num_eps = 16,
|
||||
+ .dma_channels = 7,
|
||||
+ .ram_bits = 12,
|
||||
+ .eps_bits = musb_eps,
|
||||
+};
|
||||
+
|
||||
+static struct musb_hdrc_platform_data tusb_data = {
|
||||
+ .mode = BOARD_MODE,
|
||||
+ .set_power = tusb_set_power,
|
||||
+ .set_clock = tusb_set_clock,
|
||||
+ .min_power = 25, /* x2 = 50 mA drawn from VBUS as peripheral */
|
||||
+ .power = 100, /* Max 100 mA VBUS for host mode */
|
||||
+ .clock = "osc_ck",
|
||||
+ .config = &musb_config,
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * Enable or disable power to TUSB6010. When enabling, turn on 3.3 V and
|
||||
+ * 1.5 V voltage regulators of PM companion chip. Companion chip will then
|
||||
+ * provide then PGOOD signal to TUSB6010 which will release it from reset.
|
||||
+ */
|
||||
+static int tusb_set_power(int state)
|
||||
+{
|
||||
+ int i, retval = 0;
|
||||
+
|
||||
+ if (state) {
|
||||
+ gpio_set_value(GPIO_TUSB_ENABLE, 1);
|
||||
+ msleep(1);
|
||||
+
|
||||
+ /* Wait until TUSB6010 pulls INT pin down */
|
||||
+ i = 100;
|
||||
+ while (i && gpio_get_value(GPIO_TUSB_INT)) {
|
||||
+ msleep(1);
|
||||
+ i--;
|
||||
+ }
|
||||
+
|
||||
+ if (!i) {
|
||||
+ printk(KERN_ERR "tusb: powerup failed\n");
|
||||
+ retval = -ENODEV;
|
||||
+ }
|
||||
+ } else {
|
||||
+ gpio_set_value(GPIO_TUSB_ENABLE, 0);
|
||||
+ msleep(10);
|
||||
+ }
|
||||
+
|
||||
+ return retval;
|
||||
+}
|
||||
+
|
||||
+static int osc_ck_on;
|
||||
+
|
||||
+static int tusb_set_clock(struct clk *osc_ck, int state)
|
||||
+{
|
||||
+ if (state) {
|
||||
+ if (osc_ck_on > 0)
|
||||
+ return -ENODEV;
|
||||
+
|
||||
+ //omap2_block_sleep();
|
||||
+ clk_enable(osc_ck);
|
||||
+ osc_ck_on = 1;
|
||||
+ } else {
|
||||
+ if (osc_ck_on == 0)
|
||||
+ return -ENODEV;
|
||||
+
|
||||
+ clk_disable(osc_ck);
|
||||
+ osc_ck_on = 0;
|
||||
+ //omap2_allow_sleep();
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+void __init n8x0_usb_init(void)
|
||||
+{
|
||||
+ int ret = 0;
|
||||
+ static char announce[] __initdata = KERN_INFO "TUSB 6010\n";
|
||||
+
|
||||
+ /* PM companion chip power control pin */
|
||||
+ ret = gpio_request(GPIO_TUSB_ENABLE, "TUSB6010 enable");
|
||||
+ if (ret != 0) {
|
||||
+ printk(KERN_ERR "Could not get TUSB power GPIO%i\n",
|
||||
+ GPIO_TUSB_ENABLE);
|
||||
+ return;
|
||||
+ }
|
||||
+ gpio_direction_output(GPIO_TUSB_ENABLE, 0);
|
||||
+
|
||||
+ tusb_set_power(0);
|
||||
+
|
||||
+ ret = tusb6010_setup_interface(&tusb_data, TUSB6010_REFCLK_19, 2,
|
||||
+ TUSB_ASYNC_CS, TUSB_SYNC_CS,
|
||||
+ GPIO_TUSB_INT, 0x3f);
|
||||
+ if (ret != 0)
|
||||
+ goto err;
|
||||
+
|
||||
+ printk(announce);
|
||||
+
|
||||
+ return;
|
||||
+
|
||||
+err:
|
||||
+ gpio_free(GPIO_TUSB_ENABLE);
|
||||
+}
|
||||
Index: linux-2.6.37/arch/arm/mach-omap2/control.c
|
||||
===================================================================
|
||||
--- linux-2.6.37.orig/arch/arm/mach-omap2/control.c 2011-01-05 01:50:19.000000000 +0100
|
||||
+++ linux-2.6.37/arch/arm/mach-omap2/control.c 2011-01-28 18:09:59.378233620 +0100
|
||||
@@ -172,6 +172,7 @@
|
||||
return __raw_readw(OMAP_CTRL_REGADDR(offset));
|
||||
}
|
||||
|
||||
+EXPORT_SYMBOL_GPL(omap_ctrl_readl);
|
||||
u32 omap_ctrl_readl(u16 offset)
|
||||
{
|
||||
return __raw_readl(OMAP_CTRL_REGADDR(offset));
|
||||
@@ -187,6 +188,7 @@
|
||||
__raw_writew(val, OMAP_CTRL_REGADDR(offset));
|
||||
}
|
||||
|
||||
+EXPORT_SYMBOL_GPL(omap_ctrl_writel);
|
||||
void omap_ctrl_writel(u32 val, u16 offset)
|
||||
{
|
||||
__raw_writel(val, OMAP_CTRL_REGADDR(offset));
|
||||
Index: linux-2.6.37/arch/arm/mach-omap2/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.37.orig/arch/arm/mach-omap2/Kconfig 2011-01-05 01:50:19.000000000 +0100
|
||||
+++ linux-2.6.37/arch/arm/mach-omap2/Kconfig 2011-01-28 18:09:59.378233620 +0100
|
||||
@@ -210,6 +210,16 @@
|
||||
select MACH_NOKIA_N810
|
||||
select MACH_NOKIA_N810_WIMAX
|
||||
|
||||
+config MACH_NOKIA_N8X0_LCD
|
||||
+ bool
|
||||
+ depends on MACH_NOKIA_N8X0 && FB_OMAP_LCDC_BLIZZARD && FB_OMAP_LCD_MIPID
|
||||
+ default y
|
||||
+
|
||||
+config MACH_NOKIA_N8X0_USB
|
||||
+ bool
|
||||
+ depends on MACH_NOKIA_N8X0 && MACH_OMAP2_TUSB6010
|
||||
+ default y
|
||||
+
|
||||
config MACH_NOKIA_RX51
|
||||
bool "Nokia RX-51 board"
|
||||
depends on ARCH_OMAP3
|
||||
Index: linux-2.6.37/arch/arm/mach-omap2/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.37.orig/arch/arm/mach-omap2/Makefile 2011-01-05 01:50:19.000000000 +0100
|
||||
+++ linux-2.6.37/arch/arm/mach-omap2/Makefile 2011-01-28 18:09:59.378233620 +0100
|
||||
@@ -139,6 +139,8 @@
|
||||
hsmmc.o \
|
||||
board-flash.o
|
||||
obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o
|
||||
+obj-$(CONFIG_MACH_NOKIA_N8X0_LCD) += board-n8x0-lcd.o
|
||||
+obj-$(CONFIG_MACH_NOKIA_N8X0_USB) += board-n8x0-usb.o
|
||||
obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \
|
||||
board-rx51-sdram.o \
|
||||
board-rx51-peripherals.o \
|
||||
@ -1,100 +0,0 @@
|
||||
---
|
||||
arch/arm/mach-omap2/board-n8x0.c | 73 +++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 73 insertions(+)
|
||||
|
||||
Index: linux-2.6.37/arch/arm/mach-omap2/board-n8x0.c
|
||||
===================================================================
|
||||
--- linux-2.6.37.orig/arch/arm/mach-omap2/board-n8x0.c 2011-01-27 14:17:29.132000007 +0100
|
||||
+++ linux-2.6.37/arch/arm/mach-omap2/board-n8x0.c 2011-01-27 14:17:32.763000006 +0100
|
||||
@@ -789,6 +789,77 @@
|
||||
|
||||
extern void n8x0_usb_init(void);
|
||||
|
||||
+struct gpio_switch_input_dev {
|
||||
+ struct input_dev *idev;
|
||||
+ unsigned int swcode;
|
||||
+};
|
||||
+
|
||||
+static struct gpio_switch_input_dev *slide_input;
|
||||
+static struct gpio_switch_input_dev *kblock_input;
|
||||
+
|
||||
+static void n8x0_gpio_switch_input_notify(struct gpio_switch_input_dev *gdev,
|
||||
+ int state)
|
||||
+{
|
||||
+ if (gdev) {
|
||||
+ input_report_switch(gdev->idev, gdev->swcode, state);
|
||||
+ input_sync(gdev->idev);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void n8x0_slide_notify(void *data, int state)
|
||||
+{
|
||||
+ n8x0_gpio_switch_input_notify(slide_input, state);
|
||||
+}
|
||||
+
|
||||
+static void n8x0_kb_lock_notify(void *data, int state)
|
||||
+{
|
||||
+ n8x0_gpio_switch_input_notify(kblock_input, state);
|
||||
+}
|
||||
+
|
||||
+static struct gpio_switch_input_dev * __init gpioswitch_input_init(
|
||||
+ const char *name,
|
||||
+ unsigned int swcode)
|
||||
+{
|
||||
+ struct gpio_switch_input_dev *gdev;
|
||||
+ int err;
|
||||
+
|
||||
+ gdev = kzalloc(sizeof(*gdev), GFP_KERNEL);
|
||||
+ if (!gdev)
|
||||
+ goto error;
|
||||
+ gdev->swcode = swcode;
|
||||
+
|
||||
+ gdev->idev = input_allocate_device();
|
||||
+ if (!gdev->idev)
|
||||
+ goto err_free;
|
||||
+
|
||||
+ gdev->idev->evbit[0] = BIT_MASK(EV_SW);
|
||||
+ gdev->idev->swbit[BIT_WORD(swcode)] = BIT_MASK(swcode);
|
||||
+ gdev->idev->name = name;
|
||||
+
|
||||
+ err = input_register_device(gdev->idev);
|
||||
+ if (err)
|
||||
+ goto err_free_idev;
|
||||
+
|
||||
+ return gdev;
|
||||
+
|
||||
+err_free_idev:
|
||||
+ input_free_device(gdev->idev);
|
||||
+err_free:
|
||||
+ kfree(gdev);
|
||||
+error:
|
||||
+ return NULL;
|
||||
+}
|
||||
+
|
||||
+static int __init n8x0_gpio_switches_input_init(void)
|
||||
+{
|
||||
+ slide_input = gpioswitch_input_init("slide", SW_KEYPAD_SLIDE);
|
||||
+ kblock_input = gpioswitch_input_init("kb_lock", SW_LID);
|
||||
+ if (WARN_ON(!slide_input || !kblock_input))
|
||||
+ return -ENODEV;
|
||||
+ return 0;
|
||||
+}
|
||||
+late_initcall(n8x0_gpio_switches_input_init);
|
||||
+
|
||||
static struct omap_gpio_switch n8x0_gpio_switches[] __initdata = {
|
||||
{
|
||||
.name = "headphone",
|
||||
@@ -810,11 +881,13 @@
|
||||
.gpio = -1,
|
||||
.debounce_rising = 200,
|
||||
.debounce_falling = 200,
|
||||
+ .notify = n8x0_slide_notify,
|
||||
}, {
|
||||
.name = "kb_lock",
|
||||
.gpio = -1,
|
||||
.debounce_rising = 200,
|
||||
.debounce_falling = 200,
|
||||
+ .notify = n8x0_kb_lock_notify,
|
||||
},
|
||||
};
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,325 +0,0 @@
|
||||
---
|
||||
drivers/cbus/Kconfig | 8 +++
|
||||
drivers/cbus/retu-user.c | 117 +++++++++++++++++++++++++++++++++++++++++++++-
|
||||
drivers/cbus/tahvo-user.c | 75 +++++++++++++++++++++++++++++
|
||||
3 files changed, 198 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: linux-2.6.37/drivers/cbus/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.37.orig/drivers/cbus/Kconfig 2011-02-05 20:01:30.636705379 +0100
|
||||
+++ linux-2.6.37/drivers/cbus/Kconfig 2011-02-05 20:56:11.593025426 +0100
|
||||
@@ -28,6 +28,10 @@
|
||||
If you want support for Tahvo's user space read/write etc. functions,
|
||||
you should say Y here.
|
||||
|
||||
+config CBUS_TAHVO_USER_DEBUG
|
||||
+ depends on CBUS_TAHVO_USER
|
||||
+ bool "Enable Tahvo user space interface debugging"
|
||||
+
|
||||
config CBUS_TAHVO_USB
|
||||
depends on CBUS_TAHVO && USB
|
||||
tristate "Support for Tahvo USB transceiver"
|
||||
@@ -56,6 +60,10 @@
|
||||
If you want support for Retu's user space read/write etc. functions,
|
||||
you should say Y here.
|
||||
|
||||
+config CBUS_RETU_USER_DEBUG
|
||||
+ depends on CBUS_RETU_USER
|
||||
+ bool "Enable Retu user space interface debugging"
|
||||
+
|
||||
config CBUS_RETU_POWERBUTTON
|
||||
depends on CBUS_RETU
|
||||
bool "Support for Retu power button"
|
||||
Index: linux-2.6.37/drivers/cbus/retu-user.c
|
||||
===================================================================
|
||||
--- linux-2.6.37.orig/drivers/cbus/retu-user.c 2011-02-05 20:01:30.637705440 +0100
|
||||
+++ linux-2.6.37/drivers/cbus/retu-user.c 2011-02-05 20:56:42.584938988 +0100
|
||||
@@ -46,6 +46,12 @@
|
||||
|
||||
#define PFX "retu-user: "
|
||||
|
||||
+#ifdef CONFIG_CBUS_RETU_USER_DEBUG
|
||||
+# define dprintk(fmt, x...) printk(KERN_DEBUG PFX fmt, x)
|
||||
+#else
|
||||
+# define dprintk(fmt, x...) do { } while (0)
|
||||
+#endif
|
||||
+
|
||||
/* Bitmap for marking the interrupt sources as having the handlers */
|
||||
static u32 retu_irq_bits;
|
||||
|
||||
@@ -105,6 +111,93 @@
|
||||
3
|
||||
};
|
||||
|
||||
+#ifdef CONFIG_CBUS_RETU_USER_DEBUG
|
||||
+static const char * reg_access_text(unsigned int reg)
|
||||
+{
|
||||
+ if (WARN_ON(reg >= ARRAY_SIZE(retu_access_bits)))
|
||||
+ return "X";
|
||||
+ switch (retu_access_bits[reg]) {
|
||||
+ case READ_ONLY:
|
||||
+ return "R";
|
||||
+ case WRITE_ONLY:
|
||||
+ return "W";
|
||||
+ case READ_WRITE:
|
||||
+ return "RW";
|
||||
+ case TOGGLE:
|
||||
+ return "T";
|
||||
+ }
|
||||
+ return "X";
|
||||
+}
|
||||
+
|
||||
+static const char * reg_name(unsigned int reg)
|
||||
+{
|
||||
+ static const char *names[] = {
|
||||
+ [RETU_REG_ASICR] = "ASIC ID & revision",
|
||||
+ [RETU_REG_IDR] = "Interrupt ID",
|
||||
+ [RETU_REG_IMR] = "Interrupt mask",
|
||||
+ [RETU_REG_RTCDSR] = "RTC seconds register",
|
||||
+ [RETU_REG_RTCHMR] = "RTC hours and minutes register",
|
||||
+ [RETU_REG_RTCHMAR] = "hours and minutes alarm and time set register",
|
||||
+ [RETU_REG_RTCCALR] = "RTC calibration register",
|
||||
+ [RETU_REG_ADCR] = "ADC result",
|
||||
+ [RETU_REG_ADCSCR] = "ADC sample ctrl",
|
||||
+ [RETU_REG_CC1] = "Common control register 1",
|
||||
+ [RETU_REG_CC2] = "Common control register 2",
|
||||
+ [RETU_REG_CTRL_CLR] = "Regulator clear register",
|
||||
+ [RETU_REG_CTRL_SET] = "Regulator set register",
|
||||
+ [RETU_REG_STATUS] = "Status register",
|
||||
+ [RETU_REG_WATCHDOG] = "Watchdog register",
|
||||
+ [RETU_REG_AUDTXR] = "Audio Codec Tx register",
|
||||
+ };
|
||||
+ const char *name;
|
||||
+
|
||||
+ if (reg >= ARRAY_SIZE(names))
|
||||
+ return "";
|
||||
+ name = names[reg];
|
||||
+ if (!name)
|
||||
+ return "";
|
||||
+ return name;
|
||||
+}
|
||||
+
|
||||
+static const char * adc_chan_name(unsigned int chan)
|
||||
+{
|
||||
+ static const char *names[] = {
|
||||
+ [0x05] = "Headset hook detect",
|
||||
+ };
|
||||
+ const char *name;
|
||||
+
|
||||
+ if (chan >= ARRAY_SIZE(names))
|
||||
+ return "";
|
||||
+ name = names[chan];
|
||||
+ if (!name)
|
||||
+ return "";
|
||||
+ return name;
|
||||
+}
|
||||
+
|
||||
+static const char * retu_irq_name(unsigned int id)
|
||||
+{
|
||||
+ static const char *names[] = {
|
||||
+ [RETU_INT_PWR] = "Power",
|
||||
+ [RETU_INT_CHAR] = "Char",
|
||||
+ [RETU_INT_RTCS] = "RTCS",
|
||||
+ [RETU_INT_RTCM] = "RTCM",
|
||||
+ [RETU_INT_RTCD] = "RTCD",
|
||||
+ [RETU_INT_RTCA] = "RTCA",
|
||||
+ [RETU_INT_HOOK] = "Hook",
|
||||
+ [RETU_INT_HEAD] = "Head",
|
||||
+ [RETU_INT_ADCS] = "ADC timer",
|
||||
+ };
|
||||
+ const char *name;
|
||||
+
|
||||
+ if (id >= ARRAY_SIZE(names))
|
||||
+ return "";
|
||||
+ name = names[id];
|
||||
+ if (!name)
|
||||
+ return "";
|
||||
+ return name;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
* The handler for all RETU interrupts.
|
||||
*
|
||||
@@ -157,6 +250,8 @@
|
||||
/* Mark that this interrupt has a handler */
|
||||
retu_irq_bits |= 1 << id;
|
||||
|
||||
+ dprintk("Subscribed to IRQ %d (%s)\n", id, retu_irq_name(id));
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -216,6 +311,10 @@
|
||||
|
||||
/* Generate new value */
|
||||
tmp = (tmp & ~MASK(field)) | (value & MASK(field));
|
||||
+
|
||||
+ dprintk("{WRITE %s} 0x%02X(%s) <= msk 0x%04X, val 0x%04X ==> res 0x%04X\n",
|
||||
+ reg_name(reg), reg, reg_access_text(reg), MASK(field), value, tmp);
|
||||
+
|
||||
/* Write data to RETU */
|
||||
retu_write_reg(reg, tmp);
|
||||
spin_unlock_irqrestore(&retu_lock, flags);
|
||||
@@ -244,6 +343,9 @@
|
||||
/* Read the register */
|
||||
value = retu_read_reg(reg) & mask;
|
||||
|
||||
+ dprintk("{READ %s} 0x%02X(%s) <= msk 0x%04X ==> res 0x%04X\n",
|
||||
+ reg_name(reg), reg, reg_access_text(reg), mask, value);
|
||||
+
|
||||
/* Right justify value */
|
||||
while (!(mask & 1)) {
|
||||
value = value >> 1;
|
||||
@@ -273,7 +375,7 @@
|
||||
static long retu_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
struct retu_tahvo_write_parms par;
|
||||
- int ret;
|
||||
+ int ret, result;
|
||||
|
||||
switch (cmd) {
|
||||
case URT_IOCT_IRQ_SUBSCR:
|
||||
@@ -290,7 +392,15 @@
|
||||
printk(KERN_ERR "copy_to_user failed: %d\n", ret);
|
||||
break;
|
||||
case RETU_IOCH_ADC_READ:
|
||||
- return retu_read_adc(arg);
|
||||
+ result = retu_read_adc(arg);
|
||||
+ if (result >= 0) {
|
||||
+ dprintk("{READ-ADC %s} chan 0x%02lX ==> result 0x%04X\n",
|
||||
+ adc_chan_name(arg), arg, result);
|
||||
+ } else {
|
||||
+ dprintk("{READ-ADC %s} chan 0x%02lX ==> failed %d\n",
|
||||
+ adc_chan_name(arg), arg, result);
|
||||
+ }
|
||||
+ return result;
|
||||
default:
|
||||
return -ENOIOCTLCMD;
|
||||
}
|
||||
@@ -332,6 +442,8 @@
|
||||
list_move(&irq->node, &retu_irqs_reserve);
|
||||
spin_unlock_irqrestore(&retu_irqs_lock, flags);
|
||||
|
||||
+ dprintk("{IRQ %s} %d delivered\n", retu_irq_name(irq_id), (int)irq_id);
|
||||
+
|
||||
ret = copy_to_user(buf + i * sizeof(irq_id), &irq_id,
|
||||
sizeof(irq_id));
|
||||
if (ret)
|
||||
Index: linux-2.6.37/drivers/cbus/tahvo-user.c
|
||||
===================================================================
|
||||
--- linux-2.6.37.orig/drivers/cbus/tahvo-user.c 2011-02-05 20:01:30.638705501 +0100
|
||||
+++ linux-2.6.37/drivers/cbus/tahvo-user.c 2011-02-05 20:57:03.817249794 +0100
|
||||
@@ -46,6 +46,12 @@
|
||||
|
||||
#define PFX "tahvo-user: "
|
||||
|
||||
+#ifdef CONFIG_CBUS_TAHVO_USER_DEBUG
|
||||
+# define dprintk(fmt, x...) printk(KERN_DEBUG PFX fmt, x)
|
||||
+#else
|
||||
+# define dprintk(fmt, x...) do { } while (0)
|
||||
+#endif
|
||||
+
|
||||
/* Bitmap for marking the interrupt sources as having the handlers */
|
||||
static u32 tahvo_irq_bits;
|
||||
|
||||
@@ -87,6 +93,60 @@
|
||||
1
|
||||
};
|
||||
|
||||
+#ifdef CONFIG_CBUS_TAHVO_USER_DEBUG
|
||||
+static const char * reg_access_text(unsigned int reg)
|
||||
+{
|
||||
+ if (WARN_ON(reg >= ARRAY_SIZE(tahvo_access_bits)))
|
||||
+ return "X";
|
||||
+ switch (tahvo_access_bits[reg]) {
|
||||
+ case READ_ONLY:
|
||||
+ return "R";
|
||||
+ case WRITE_ONLY:
|
||||
+ return "W";
|
||||
+ case READ_WRITE:
|
||||
+ return "RW";
|
||||
+ case TOGGLE:
|
||||
+ return "T";
|
||||
+ }
|
||||
+ return "X";
|
||||
+}
|
||||
+
|
||||
+static const char * reg_name(unsigned int reg)
|
||||
+{
|
||||
+ static const char *names[] = {
|
||||
+ [TAHVO_REG_ASICR] = "ASIC ID & revision",
|
||||
+ [TAHVO_REG_IDR] = "Interrupt ID",
|
||||
+ [TAHVO_REG_IDSR] = "Interrupt status",
|
||||
+ [TAHVO_REG_IMR] = "Interrupt mask",
|
||||
+ [TAHVO_REG_LEDPWMR] = "LED PWM",
|
||||
+ [TAHVO_REG_USBR] = "USB control",
|
||||
+ };
|
||||
+ const char *name;
|
||||
+
|
||||
+ if (reg >= ARRAY_SIZE(names))
|
||||
+ return "";
|
||||
+ name = names[reg];
|
||||
+ if (!name)
|
||||
+ return "";
|
||||
+ return name;
|
||||
+}
|
||||
+
|
||||
+static const char * tahvo_irq_name(unsigned int id)
|
||||
+{
|
||||
+ static const char *names[] = {
|
||||
+ [TAHVO_INT_VBUSON] = "VBUSON",
|
||||
+ };
|
||||
+ const char *name;
|
||||
+
|
||||
+ if (id >= ARRAY_SIZE(names))
|
||||
+ return "";
|
||||
+ name = names[id];
|
||||
+ if (!name)
|
||||
+ return "";
|
||||
+ return name;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
* The handler for all TAHVO interrupts.
|
||||
*
|
||||
@@ -142,6 +202,8 @@
|
||||
/* Mark that this interrupt has a handler */
|
||||
tahvo_irq_bits |= 1 << id;
|
||||
|
||||
+ dprintk("Subscribed to IRQ %d (%s)\n", id, tahvo_irq_name(id));
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -200,6 +262,10 @@
|
||||
}
|
||||
/* Generate a new value */
|
||||
tmp = (tmp & ~MASK(field)) | (value & MASK(field));
|
||||
+
|
||||
+ dprintk("{WRITE %s} 0x%02X(%s) <= msk 0x%04X, val 0x%04X ==> res 0x%04X\n",
|
||||
+ reg_name(reg), reg, reg_access_text(reg), MASK(field), value, tmp);
|
||||
+
|
||||
/* Write data to TAHVO */
|
||||
tahvo_write_reg(reg, tmp);
|
||||
spin_unlock_irqrestore(&tahvo_lock, flags);
|
||||
@@ -228,6 +294,9 @@
|
||||
/* Read the register */
|
||||
value = tahvo_read_reg(reg) & mask;
|
||||
|
||||
+ dprintk("{READ %s} 0x%02X(%s) <= msk 0x%04X ==> res 0x%04X\n",
|
||||
+ reg_name(reg), reg, reg_access_text(reg), mask, value);
|
||||
+
|
||||
/* Right justify value */
|
||||
while (!(mask & 1)) {
|
||||
value = value >> 1;
|
||||
@@ -314,6 +383,8 @@
|
||||
list_move(&irq->node, &tahvo_irqs_reserve);
|
||||
spin_unlock_irqrestore(&tahvo_irqs_lock, flags);
|
||||
|
||||
+ dprintk("{IRQ %s} %d delivered\n", tahvo_irq_name(irq_id), (int)irq_id);
|
||||
+
|
||||
ret = copy_to_user(buf + i * sizeof(irq_id), &irq_id,
|
||||
sizeof(irq_id));
|
||||
if (ret)
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,196 +0,0 @@
|
||||
Index: linux-2.6.37-rc1/drivers/video/omap/dispc.c
|
||||
===================================================================
|
||||
--- linux-2.6.37-rc1.orig/drivers/video/omap/dispc.c 2010-11-01 12:54:12.000000000 +0100
|
||||
+++ linux-2.6.37-rc1/drivers/video/omap/dispc.c 2010-11-05 17:04:58.562000054 +0100
|
||||
@@ -190,6 +190,11 @@
|
||||
struct omapfb_color_key color_key;
|
||||
} dispc;
|
||||
|
||||
+struct platform_device omapdss_device = {
|
||||
+ .name = "omapdss",
|
||||
+ .id = -1,
|
||||
+};
|
||||
+
|
||||
static void enable_lcd_clocks(int enable);
|
||||
|
||||
static void inline dispc_write_reg(int idx, u32 val)
|
||||
@@ -916,20 +921,20 @@
|
||||
|
||||
static int get_dss_clocks(void)
|
||||
{
|
||||
- dispc.dss_ick = clk_get(&dispc.fbdev->dssdev->dev, "ick");
|
||||
+ dispc.dss_ick = clk_get(&omapdss_device.dev, "ick");
|
||||
if (IS_ERR(dispc.dss_ick)) {
|
||||
dev_err(dispc.fbdev->dev, "can't get ick\n");
|
||||
return PTR_ERR(dispc.dss_ick);
|
||||
}
|
||||
|
||||
- dispc.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss1_fck");
|
||||
+ dispc.dss1_fck = clk_get(&omapdss_device.dev, "dss1_fck");
|
||||
if (IS_ERR(dispc.dss1_fck)) {
|
||||
dev_err(dispc.fbdev->dev, "can't get dss1_fck\n");
|
||||
clk_put(dispc.dss_ick);
|
||||
return PTR_ERR(dispc.dss1_fck);
|
||||
}
|
||||
|
||||
- dispc.dss_54m_fck = clk_get(&dispc.fbdev->dssdev->dev, "tv_fck");
|
||||
+ dispc.dss_54m_fck = clk_get(&omapdss_device.dev, "tv_fck");
|
||||
if (IS_ERR(dispc.dss_54m_fck)) {
|
||||
dev_err(dispc.fbdev->dev, "can't get tv_fck\n");
|
||||
clk_put(dispc.dss_ick);
|
||||
@@ -1381,6 +1386,12 @@
|
||||
int skip_init = 0;
|
||||
int i;
|
||||
|
||||
+ r = platform_device_register(&omapdss_device);
|
||||
+ if (r) {
|
||||
+ dev_err(fbdev->dev, "can't register omapdss device\n");
|
||||
+ return r;
|
||||
+ }
|
||||
+
|
||||
memset(&dispc, 0, sizeof(dispc));
|
||||
|
||||
dispc.base = ioremap(DISPC_BASE, SZ_1K);
|
||||
@@ -1524,6 +1535,7 @@
|
||||
free_irq(INT_24XX_DSS_IRQ, dispc.fbdev);
|
||||
put_dss_clocks();
|
||||
iounmap(dispc.base);
|
||||
+ platform_device_unregister(&omapdss_device);
|
||||
}
|
||||
|
||||
const struct lcd_ctrl omap2_int_ctrl = {
|
||||
Index: linux-2.6.37-rc1/drivers/video/omap/lcd_htcherald.c
|
||||
===================================================================
|
||||
--- linux-2.6.37-rc1.orig/drivers/video/omap/lcd_htcherald.c 2010-11-01 12:54:12.000000000 +0100
|
||||
+++ linux-2.6.37-rc1/drivers/video/omap/lcd_htcherald.c 2010-11-05 17:04:58.562000054 +0100
|
||||
@@ -115,12 +115,12 @@
|
||||
},
|
||||
};
|
||||
|
||||
-static int __init htcherald_panel_drv_init(void)
|
||||
+static int htcherald_panel_drv_init(void)
|
||||
{
|
||||
return platform_driver_register(&htcherald_panel_driver);
|
||||
}
|
||||
|
||||
-static void __exit htcherald_panel_drv_cleanup(void)
|
||||
+static void htcherald_panel_drv_cleanup(void)
|
||||
{
|
||||
platform_driver_unregister(&htcherald_panel_driver);
|
||||
}
|
||||
Index: linux-2.6.37-rc1/drivers/video/omap/lcd_mipid.c
|
||||
===================================================================
|
||||
--- linux-2.6.37-rc1.orig/drivers/video/omap/lcd_mipid.c 2010-11-01 12:54:12.000000000 +0100
|
||||
+++ linux-2.6.37-rc1/drivers/video/omap/lcd_mipid.c 2010-11-05 17:04:58.563000039 +0100
|
||||
@@ -551,9 +551,9 @@
|
||||
md->esd_check = ls041y3_esd_check;
|
||||
break;
|
||||
default:
|
||||
- md->panel.name = "unknown";
|
||||
- dev_err(&md->spi->dev, "invalid display ID\n");
|
||||
- return -ENODEV;
|
||||
+ dev_err(&md->spi->dev, "FIXME: LCD panel detection failed! ID: %02x%02x%02x\n", display_id[0], display_id[1], display_id[2]);
|
||||
+ md->panel.name = "ls041y3";
|
||||
+ md->esd_check = ls041y3_esd_check;
|
||||
}
|
||||
|
||||
md->revision = display_id[1];
|
||||
Index: linux-2.6.37-rc1/drivers/video/omap/omapfb.h
|
||||
===================================================================
|
||||
--- linux-2.6.37-rc1.orig/drivers/video/omap/omapfb.h 2010-11-01 12:54:12.000000000 +0100
|
||||
+++ linux-2.6.37-rc1/drivers/video/omap/omapfb.h 2010-11-05 17:04:58.563000039 +0100
|
||||
@@ -203,8 +203,6 @@
|
||||
|
||||
struct omapfb_mem_desc mem_desc;
|
||||
struct fb_info *fb_info[OMAPFB_PLANE_NUM];
|
||||
-
|
||||
- struct platform_device *dssdev; /* dummy dev for clocks */
|
||||
};
|
||||
|
||||
#ifdef CONFIG_ARCH_OMAP1
|
||||
@@ -226,4 +224,6 @@
|
||||
void (*callback)(void *),
|
||||
void *callback_data);
|
||||
|
||||
+extern struct platform_device omapdss_device;
|
||||
+
|
||||
#endif /* __OMAPFB_H */
|
||||
Index: linux-2.6.37-rc1/drivers/video/omap/omapfb_main.c
|
||||
===================================================================
|
||||
--- linux-2.6.37-rc1.orig/drivers/video/omap/omapfb_main.c 2010-11-01 12:54:12.000000000 +0100
|
||||
+++ linux-2.6.37-rc1/drivers/video/omap/omapfb_main.c 2010-11-05 17:04:58.563000039 +0100
|
||||
@@ -84,19 +84,6 @@
|
||||
{ 1 << OMAPFB_COLOR_YUY422, "YUY422", },
|
||||
};
|
||||
|
||||
-static void omapdss_release(struct device *dev)
|
||||
-{
|
||||
-}
|
||||
-
|
||||
-/* dummy device for clocks */
|
||||
-static struct platform_device omapdss_device = {
|
||||
- .name = "omapdss",
|
||||
- .id = -1,
|
||||
- .dev = {
|
||||
- .release = omapdss_release,
|
||||
- },
|
||||
-};
|
||||
-
|
||||
/*
|
||||
* ---------------------------------------------------------------------------
|
||||
* LCD panel
|
||||
@@ -1715,7 +1702,6 @@
|
||||
|
||||
fbdev->dev = &pdev->dev;
|
||||
fbdev->panel = panel;
|
||||
- fbdev->dssdev = &omapdss_device;
|
||||
platform_set_drvdata(pdev, fbdev);
|
||||
|
||||
mutex_init(&fbdev->rqueue_mutex);
|
||||
@@ -1830,16 +1816,8 @@
|
||||
|
||||
static int omapfb_probe(struct platform_device *pdev)
|
||||
{
|
||||
- int r;
|
||||
-
|
||||
BUG_ON(fbdev_pdev != NULL);
|
||||
|
||||
- r = platform_device_register(&omapdss_device);
|
||||
- if (r) {
|
||||
- dev_err(&pdev->dev, "can't register omapdss device\n");
|
||||
- return r;
|
||||
- }
|
||||
-
|
||||
/* Delay actual initialization until the LCD is registered */
|
||||
fbdev_pdev = pdev;
|
||||
if (fbdev_panel != NULL)
|
||||
@@ -1867,9 +1845,6 @@
|
||||
fbdev->state = OMAPFB_DISABLED;
|
||||
omapfb_free_resources(fbdev, saved_state);
|
||||
|
||||
- platform_device_unregister(&omapdss_device);
|
||||
- fbdev->dssdev = NULL;
|
||||
-
|
||||
return 0;
|
||||
}
|
||||
|
||||
Index: linux-2.6.37-rc1/drivers/video/omap/rfbi.c
|
||||
===================================================================
|
||||
--- linux-2.6.37-rc1.orig/drivers/video/omap/rfbi.c 2010-11-01 12:54:12.000000000 +0100
|
||||
+++ linux-2.6.37-rc1/drivers/video/omap/rfbi.c 2010-11-05 17:04:58.563000039 +0100
|
||||
@@ -84,13 +84,13 @@
|
||||
|
||||
static int rfbi_get_clocks(void)
|
||||
{
|
||||
- rfbi.dss_ick = clk_get(&rfbi.fbdev->dssdev->dev, "ick");
|
||||
+ rfbi.dss_ick = clk_get(&omapdss_device.dev, "ick");
|
||||
if (IS_ERR(rfbi.dss_ick)) {
|
||||
dev_err(rfbi.fbdev->dev, "can't get ick\n");
|
||||
return PTR_ERR(rfbi.dss_ick);
|
||||
}
|
||||
|
||||
- rfbi.dss1_fck = clk_get(&rfbi.fbdev->dssdev->dev, "dss1_fck");
|
||||
+ rfbi.dss1_fck = clk_get(&omapdss_device.dev, "dss1_fck");
|
||||
if (IS_ERR(rfbi.dss1_fck)) {
|
||||
dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n");
|
||||
clk_put(rfbi.dss_ick);
|
||||
@ -1,31 +0,0 @@
|
||||
---
|
||||
drivers/input/evdev.c | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
--- linux-2.6.36-rc4.orig/drivers/input/evdev.c
|
||||
+++ linux-2.6.36-rc4/drivers/input/evdev.c
|
||||
@@ -76,7 +76,7 @@ static void evdev_event(struct input_han
|
||||
unsigned int type, unsigned int code, int value)
|
||||
{
|
||||
struct evdev *evdev = handle->private;
|
||||
- struct evdev_client *client;
|
||||
+ struct evdev_client *client, *c;
|
||||
struct input_event event;
|
||||
|
||||
do_gettimeofday(&event.time);
|
||||
@@ -87,9 +87,13 @@ static void evdev_event(struct input_han
|
||||
rcu_read_lock();
|
||||
|
||||
client = rcu_dereference(evdev->grab);
|
||||
- if (client)
|
||||
+ if (client) {
|
||||
evdev_pass_event(client, &event);
|
||||
- else
|
||||
+ /* Also pass events to clients that did not grab the device. */
|
||||
+ list_for_each_entry_rcu(c, &evdev->client_list, node)
|
||||
+ if (c != client)
|
||||
+ evdev_pass_event(c, &event);
|
||||
+ } else
|
||||
list_for_each_entry_rcu(client, &evdev->client_list, node)
|
||||
evdev_pass_event(client, &event);
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
---
|
||||
lib/decompress_unlzo.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
Index: linux-2.6.37/lib/decompress_unlzo.c
|
||||
===================================================================
|
||||
--- linux-2.6.37.orig/lib/decompress_unlzo.c 2011-01-27 14:17:20.745000007 +0100
|
||||
+++ linux-2.6.37/lib/decompress_unlzo.c 2011-01-27 14:17:56.557000007 +0100
|
||||
@@ -51,6 +51,10 @@
|
||||
#define LZO_BLOCK_SIZE (256*1024l)
|
||||
#define HEADER_HAS_FILTER 0x00000800L
|
||||
|
||||
+#ifndef INIT
|
||||
+#define INIT /* nothing */
|
||||
+#endif
|
||||
+
|
||||
STATIC inline int INIT parse_header(u8 *input, u8 *skip)
|
||||
{
|
||||
int l;
|
||||
@ -1,70 +0,0 @@
|
||||
---
|
||||
drivers/mmc/core/core.c | 5 +++--
|
||||
drivers/mmc/host/omap.c | 7 +++++--
|
||||
include/linux/mmc/host.h | 2 ++
|
||||
3 files changed, 10 insertions(+), 4 deletions(-)
|
||||
|
||||
Index: linux-2.6.37/drivers/mmc/host/omap.c
|
||||
===================================================================
|
||||
--- linux-2.6.37.orig/drivers/mmc/host/omap.c 2011-01-27 14:16:57.305000007 +0100
|
||||
+++ linux-2.6.37/drivers/mmc/host/omap.c 2011-01-27 14:17:59.807000006 +0100
|
||||
@@ -387,7 +387,7 @@
|
||||
|
||||
mod_timer(&host->cmd_abort_timer, jiffies + HZ/2);
|
||||
|
||||
- OMAP_MMC_WRITE(host, CTO, 200);
|
||||
+// OMAP_MMC_WRITE(host, CTO, 200);
|
||||
OMAP_MMC_WRITE(host, ARGL, cmd->arg & 0xffff);
|
||||
OMAP_MMC_WRITE(host, ARGH, cmd->arg >> 16);
|
||||
OMAP_MMC_WRITE(host, IE,
|
||||
@@ -1454,6 +1454,7 @@
|
||||
host->dma_ch = -1;
|
||||
|
||||
host->irq = irq;
|
||||
+ host->reg_shift = (cpu_is_omap7xx() ? 1 : 2);
|
||||
host->phys_base = host->mem_res->start;
|
||||
host->virt_base = ioremap(res->start, res->end - res->start + 1);
|
||||
if (!host->virt_base)
|
||||
@@ -1493,7 +1494,9 @@
|
||||
}
|
||||
}
|
||||
|
||||
- host->reg_shift = (cpu_is_omap7xx() ? 1 : 2);
|
||||
+ /* Make sure the detect workqueue was run at least once. */
|
||||
+ printk(KERN_INFO "OMAP-mmc: waiting for cards...\n");
|
||||
+ mmc_flush_scheduled_work();
|
||||
|
||||
return 0;
|
||||
|
||||
Index: linux-2.6.37/drivers/mmc/core/core.c
|
||||
===================================================================
|
||||
--- linux-2.6.37.orig/drivers/mmc/core/core.c 2011-01-27 14:16:57.297000007 +0100
|
||||
+++ linux-2.6.37/drivers/mmc/core/core.c 2011-01-27 14:17:59.807000006 +0100
|
||||
@@ -74,12 +74,13 @@
|
||||
}
|
||||
|
||||
/*
|
||||
- * Internal function. Flush all scheduled work from the MMC work queue.
|
||||
+ * Flush all scheduled work from the MMC work queue.
|
||||
*/
|
||||
-static void mmc_flush_scheduled_work(void)
|
||||
+void mmc_flush_scheduled_work(void)
|
||||
{
|
||||
flush_workqueue(workqueue);
|
||||
}
|
||||
+EXPORT_SYMBOL(mmc_flush_scheduled_work);
|
||||
|
||||
/**
|
||||
* mmc_request_done - finish processing an MMC request
|
||||
Index: linux-2.6.37/include/linux/mmc/host.h
|
||||
===================================================================
|
||||
--- linux-2.6.37.orig/include/linux/mmc/host.h 2011-01-27 14:16:57.292000007 +0100
|
||||
+++ linux-2.6.37/include/linux/mmc/host.h 2011-01-27 14:17:59.807000006 +0100
|
||||
@@ -307,5 +307,7 @@
|
||||
return !(host->caps & MMC_CAP_NONREMOVABLE) && mmc_assume_removable;
|
||||
}
|
||||
|
||||
+void mmc_flush_scheduled_work(void);
|
||||
+
|
||||
#endif
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
---
|
||||
arch/arm/mach-omap2/board-n8x0-lcd.c | 18 ++++++++++++++++++
|
||||
1 file changed, 18 insertions(+)
|
||||
|
||||
Index: linux-2.6.37-rc1/arch/arm/mach-omap2/board-n8x0-lcd.c
|
||||
===================================================================
|
||||
--- linux-2.6.37-rc1.orig/arch/arm/mach-omap2/board-n8x0-lcd.c 2010-11-05 17:02:04.318000134 +0100
|
||||
+++ linux-2.6.37-rc1/arch/arm/mach-omap2/board-n8x0-lcd.c 2010-11-05 17:07:32.261000002 +0100
|
||||
@@ -34,8 +34,26 @@
|
||||
}
|
||||
}
|
||||
|
||||
+static int n8x0_get_backlight_level(struct mipid_platform_data *pdata)
|
||||
+{
|
||||
+ return tahvo_get_backlight_level();
|
||||
+}
|
||||
+
|
||||
+static int n8x0_get_max_backlight_level(struct mipid_platform_data *pdata)
|
||||
+{
|
||||
+ return tahvo_get_max_backlight_level();
|
||||
+}
|
||||
+
|
||||
+static void n8x0_set_backlight_level(struct mipid_platform_data *pdata, int level)
|
||||
+{
|
||||
+ tahvo_set_backlight_level(level);
|
||||
+}
|
||||
+
|
||||
struct mipid_platform_data n8x0_mipid_platform_data = {
|
||||
.shutdown = mipid_shutdown,
|
||||
+ .get_bklight_level = n8x0_get_backlight_level,
|
||||
+ .set_bklight_level = n8x0_set_backlight_level,
|
||||
+ .get_bklight_max = n8x0_get_max_backlight_level,
|
||||
};
|
||||
|
||||
void __init n8x0_mipid_init(void)
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user