qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-18 18:06:17 +02:00
Code
25040fe2c0
openwrt-xburst/target/linux/at91/patches-2.6.22/000-at91.patch

9933 lines
265 KiB
Diff
Raw Normal View History

Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
diff -urN linux-2.6.22-rc5/arch/arm/boot/compressed/head-at91rm9200.S linux-2.6.22-rc5.new/arch/arm/boot/compressed/head-at91rm9200.S
--- linux-2.6.22-rc5/arch/arm/boot/compressed/head-at91rm9200.S 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/boot/compressed/head-at91rm9200.S 2007-07-29 05:23:04.000000000 +0200
@@ -73,6 +73,12 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
cmp r7, r3
beq 99f
+ @ Promwad Chub : 1181
+ mov r3, #(MACH_TYPE_CHUB & 0xff)
+ orr r3, r3, #(MACH_TYPE_CHUB & 0xff00)
+ cmp r7, r3
+ beq 99f
+
@ Unknown board, use the AT91RM9200DK board
@ mov r7, #MACH_TYPE_AT91RM9200
mov r7, #(MACH_TYPE_AT91RM9200DK & 0xff)
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22-rc5.new/arch/arm/configs/at91sam9260ek_defconfig
--- linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/configs/at91sam9260ek_defconfig 2007-07-29 05:23:04.000000000 +0200
@@ -1,18 +1,24 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19-rc6
-# Fri Nov 17 18:42:21 2006
+# Linux kernel version: 2.6.21
+# Mon May 7 11:42:02 2007
#
CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
# CONFIG_GENERIC_TIME is not set
CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
CONFIG_GENERIC_HARDIRQS=y
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
CONFIG_HARDIRQS_SW_RESEND=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
CONFIG_VECTORS_BASE=0xffff0000
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -31,13 +37,16 @@
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_POSIX_MQUEUE is not set
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set
# CONFIG_UTS_NS is not set
# CONFIG_AUDIT is not set
# CONFIG_IKCONFIG is not set
+CONFIG_SYSFS_DEPRECATED=y
# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
@@ -76,7 +85,9 @@
# Block layer
#
CONFIG_BLOCK=y
+# CONFIG_LBD is not set
# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
#
# IO Schedulers
@@ -110,10 +121,12 @@
# CONFIG_ARCH_IMX is not set
# CONFIG_ARCH_IOP32X is not set
# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
# CONFIG_ARCH_IXP4XX is not set
# CONFIG_ARCH_IXP2000 is not set
# CONFIG_ARCH_IXP23XX is not set
# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_NS9XXX is not set
# CONFIG_ARCH_PNX4008 is not set
# CONFIG_ARCH_PXA is not set
# CONFIG_ARCH_RPC is not set
@@ -129,21 +142,29 @@
# CONFIG_ARCH_AT91RM9200 is not set
CONFIG_ARCH_AT91SAM9260=y
# CONFIG_ARCH_AT91SAM9261 is not set
+# CONFIG_ARCH_AT91SAM9263 is not set
+
+#
+# AT91SAM9260 Variants
+#
+# CONFIG_ARCH_AT91SAM9260_SAM9XE is not set
#
-# AT91SAM9260 Board Type
+# AT91SAM9260 / AT91SAM9XE Board Type
#
CONFIG_MACH_AT91SAM9260EK=y
#
# AT91 Board Options
#
+# CONFIG_MTD_AT91_DATAFLASH_CARD is not set
# CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set
#
# AT91 Feature Selections
#
# CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
+# CONFIG_ATMEL_TCLIB is not set
#
# Processor Type
@@ -166,6 +187,7 @@
# CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+# CONFIG_OUTER_CACHE is not set
#
# Bus support
@@ -193,6 +215,7 @@
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPLIT_PTLOCK_CPUS=4096
# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
# CONFIG_LEDS is not set
CONFIG_ALIGNMENT_TRAP=y
@@ -203,6 +226,7 @@
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
#
# Floating point emulation
@@ -228,7 +252,6 @@
# Power management options
#
# CONFIG_PM is not set
-# CONFIG_APM is not set
#
# Networking
@@ -242,9 +265,6 @@
CONFIG_PACKET=y
# CONFIG_PACKET_MMAP is not set
CONFIG_UNIX=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFRM_SUB_POLICY is not set
# CONFIG_NET_KEY is not set
CONFIG_INET=y
# CONFIG_IP_MULTICAST is not set
@@ -263,14 +283,15 @@
# CONFIG_INET_IPCOMP is not set
# CONFIG_INET_XFRM_TUNNEL is not set
# CONFIG_INET_TUNNEL is not set
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
CONFIG_INET_DIAG=y
CONFIG_INET_TCP_DIAG=y
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_TCP_CONG_CUBIC=y
CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
# CONFIG_IPV6 is not set
# CONFIG_INET6_XFRM_TUNNEL is not set
# CONFIG_INET6_TUNNEL is not set
@@ -328,6 +349,7 @@
CONFIG_PREVENT_FIRMWARE_BUILD=y
# CONFIG_FW_LOADER is not set
# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
#
@@ -348,6 +370,7 @@
#
# Plug and Play support
#
+# CONFIG_PNPACPI is not set
#
# Block devices
@@ -360,7 +383,6 @@
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=8192
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
@@ -369,6 +391,7 @@
#
# CONFIG_RAID_ATTRS is not set
CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
# CONFIG_SCSI_NETLINK is not set
CONFIG_SCSI_PROC_FS=y
@@ -388,6 +411,7 @@
CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
#
# SCSI Transports
@@ -405,6 +429,11 @@
# CONFIG_SCSI_DEBUG is not set
#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
+
+#
# Multi-device support (RAID and LVM)
#
# CONFIG_MD is not set
@@ -425,7 +454,51 @@
#
# Network device support
#
-# CONFIG_NETDEVICES is not set
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+CONFIG_MACB=y
+# CONFIG_SMC91X is not set
+# CONFIG_DM9000 is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
@@ -517,10 +590,6 @@
# CONFIG_NVRAM is not set
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
-
-#
-# Ftape, the floppy tape device driver
-#
# CONFIG_RAW_DRIVER is not set
#
@@ -553,7 +622,11 @@
#
# Misc devices
#
-# CONFIG_TIFM_CORE is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
#
# LED devices
@@ -582,7 +655,7 @@
#
# Graphics support
#
-# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
# CONFIG_FB is not set
#
@@ -590,7 +663,6 @@
#
# CONFIG_VGA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
#
# Sound
@@ -598,6 +670,12 @@
# CONFIG_SOUND is not set
#
+# HID Devices
+#
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+
+#
# USB support
#
CONFIG_USB_ARCH_HAS_HCD=y
@@ -610,7 +688,6 @@
# Miscellaneous USB options
#
CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_OTG is not set
@@ -619,7 +696,8 @@
#
# CONFIG_USB_ISP116X_HCD is not set
CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
# CONFIG_USB_SL811_HCD is not set
@@ -671,6 +749,7 @@
# CONFIG_USB_ATI_REMOTE2 is not set
# CONFIG_USB_KEYSPAN_REMOTE is not set
# CONFIG_USB_APPLETOUCH is not set
+# CONFIG_USB_GTCO is not set
#
# USB Imaging devices
@@ -708,6 +787,7 @@
# CONFIG_USB_RIO500 is not set
# CONFIG_USB_LEGOTOWER is not set
# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
# CONFIG_USB_LED is not set
# CONFIG_USB_CYPRESS_CY7C63 is not set
# CONFIG_USB_CYTHERM is not set
@@ -717,6 +797,7 @@
# CONFIG_USB_APPLEDISPLAY is not set
# CONFIG_USB_LD is not set
# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
# CONFIG_USB_TEST is not set
#
@@ -889,6 +970,11 @@
# CONFIG_NLS_UTF8 is not set
#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
# Profiling support
#
# CONFIG_PROFILING is not set
@@ -900,28 +986,30 @@
CONFIG_ENABLE_MUST_CHECK=y
# CONFIG_MAGIC_SYSRQ is not set
# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
CONFIG_LOG_BUF_SHIFT=14
CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
# CONFIG_DEBUG_SLAB is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RWSEMS is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_KOBJECT is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_FS is not set
# CONFIG_DEBUG_VM is not set
# CONFIG_DEBUG_LIST is not set
CONFIG_FRAME_POINTER=y
CONFIG_FORCED_INLINING=y
-# CONFIG_HEADERS_CHECK is not set
# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_ERRORS is not set
CONFIG_DEBUG_LL=y
@@ -941,9 +1029,12 @@
#
# Library routines
#
+CONFIG_BITREVERSE=y
# CONFIG_CRC_CCITT is not set
# CONFIG_CRC16 is not set
CONFIG_CRC32=y
# CONFIG_LIBCRC32C is not set
CONFIG_ZLIB_INFLATE=y
CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22-rc5.new/arch/arm/configs/at91sam9261ek_defconfig
--- linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/configs/at91sam9261ek_defconfig 2007-07-29 05:23:04.000000000 +0200
@@ -1,18 +1,24 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19-rc6
-# Fri Nov 17 18:00:38 2006
+# Linux kernel version: 2.6.21
+# Mon May 7 11:42:30 2007
#
CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
# CONFIG_GENERIC_TIME is not set
CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
CONFIG_GENERIC_HARDIRQS=y
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
CONFIG_HARDIRQS_SW_RESEND=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
CONFIG_VECTORS_BASE=0xffff0000
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -31,13 +37,16 @@
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_POSIX_MQUEUE is not set
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set
# CONFIG_UTS_NS is not set
# CONFIG_AUDIT is not set
# CONFIG_IKCONFIG is not set
+CONFIG_SYSFS_DEPRECATED=y
# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
@@ -76,7 +85,9 @@
# Block layer
#
CONFIG_BLOCK=y
+# CONFIG_LBD is not set
# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
#
# IO Schedulers
@@ -110,10 +121,12 @@
# CONFIG_ARCH_IMX is not set
# CONFIG_ARCH_IOP32X is not set
# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
# CONFIG_ARCH_IXP4XX is not set
# CONFIG_ARCH_IXP2000 is not set
# CONFIG_ARCH_IXP23XX is not set
# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_NS9XXX is not set
# CONFIG_ARCH_PNX4008 is not set
# CONFIG_ARCH_PXA is not set
# CONFIG_ARCH_RPC is not set
@@ -129,6 +142,7 @@
# CONFIG_ARCH_AT91RM9200 is not set
# CONFIG_ARCH_AT91SAM9260 is not set
CONFIG_ARCH_AT91SAM9261=y
+# CONFIG_ARCH_AT91SAM9263 is not set
#
# AT91SAM9261 Board Type
@@ -138,12 +152,14 @@
#
# AT91 Board Options
#
+# CONFIG_MTD_AT91_DATAFLASH_CARD is not set
# CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set
#
# AT91 Feature Selections
#
# CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
+# CONFIG_ATMEL_TCLIB is not set
#
# Processor Type
@@ -166,6 +182,7 @@
# CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+# CONFIG_OUTER_CACHE is not set
#
# Bus support
@@ -193,6 +210,7 @@
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPLIT_PTLOCK_CPUS=4096
# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
# CONFIG_LEDS is not set
CONFIG_ALIGNMENT_TRAP=y
@@ -203,6 +221,7 @@
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
#
# Floating point emulation
@@ -228,7 +247,6 @@
# Power management options
#
# CONFIG_PM is not set
-# CONFIG_APM is not set
#
# Networking
@@ -245,6 +263,7 @@
CONFIG_XFRM=y
# CONFIG_XFRM_USER is not set
# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
# CONFIG_NET_KEY is not set
CONFIG_INET=y
# CONFIG_IP_MULTICAST is not set
@@ -271,6 +290,7 @@
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_TCP_CONG_CUBIC=y
CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
# CONFIG_IPV6 is not set
# CONFIG_INET6_XFRM_TUNNEL is not set
# CONFIG_INET6_TUNNEL is not set
@@ -328,6 +348,7 @@
CONFIG_PREVENT_FIRMWARE_BUILD=y
# CONFIG_FW_LOADER is not set
# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
#
@@ -350,6 +371,7 @@
# User Modules And Translation Layers
#
# CONFIG_MTD_CHAR is not set
+CONFIG_MTD_BLKDEVS=y
CONFIG_MTD_BLOCK=y
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
@@ -386,6 +408,8 @@
#
# Self-contained MTD device drivers
#
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
# CONFIG_MTD_SLRAM is not set
# CONFIG_MTD_PHRAM is not set
# CONFIG_MTD_MTDRAM is not set
@@ -422,6 +446,7 @@
#
# Plug and Play support
#
+# CONFIG_PNPACPI is not set
#
# Block devices
@@ -434,7 +459,6 @@
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=8192
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
@@ -443,6 +467,7 @@
#
# CONFIG_RAID_ATTRS is not set
CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
# CONFIG_SCSI_NETLINK is not set
CONFIG_SCSI_PROC_FS=y
@@ -462,6 +487,7 @@
CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
#
# SCSI Transports
@@ -479,6 +505,11 @@
# CONFIG_SCSI_DEBUG is not set
#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
+
+#
# Multi-device support (RAID and LVM)
#
# CONFIG_MD is not set
@@ -575,7 +606,16 @@
# CONFIG_INPUT_KEYBOARD is not set
# CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=y
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_UCB1400 is not set
# CONFIG_INPUT_MISC is not set
#
@@ -634,10 +674,6 @@
# CONFIG_NVRAM is not set
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
-
-#
-# Ftape, the floppy tape device driver
-#
# CONFIG_RAW_DRIVER is not set
#
@@ -662,6 +698,7 @@
# I2C Hardware Bus support
#
CONFIG_I2C_AT91=y
+CONFIG_I2C_AT91_CLOCKRATE=100000
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_STUB is not set
@@ -686,8 +723,20 @@
#
# SPI support
#
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_ATMEL=y
+# CONFIG_SPI_BITBANG is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_AT25 is not set
#
# Dallas's 1-wire bus
@@ -703,7 +752,11 @@
#
# Misc devices
#
-# CONFIG_TIFM_CORE is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
#
# LED devices
@@ -732,7 +785,7 @@
#
# Graphics support
#
-# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
# CONFIG_FB is not set
#
@@ -740,7 +793,6 @@
#
# CONFIG_VGA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
#
# Sound
@@ -748,6 +800,12 @@
# CONFIG_SOUND is not set
#
+# HID Devices
+#
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+
+#
# USB support
#
CONFIG_USB_ARCH_HAS_HCD=y
@@ -760,7 +818,6 @@
# Miscellaneous USB options
#
CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_OTG is not set
@@ -769,7 +826,8 @@
#
# CONFIG_USB_ISP116X_HCD is not set
CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
# CONFIG_USB_SL811_HCD is not set
@@ -821,6 +879,7 @@
# CONFIG_USB_ATI_REMOTE2 is not set
# CONFIG_USB_KEYSPAN_REMOTE is not set
# CONFIG_USB_APPLETOUCH is not set
+# CONFIG_USB_GTCO is not set
#
# USB Imaging devices
@@ -858,6 +917,7 @@
# CONFIG_USB_RIO500 is not set
# CONFIG_USB_LEGOTOWER is not set
# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
# CONFIG_USB_LED is not set
# CONFIG_USB_CYPRESS_CY7C63 is not set
# CONFIG_USB_CYTHERM is not set
@@ -867,6 +927,7 @@
# CONFIG_USB_APPLEDISPLAY is not set
# CONFIG_USB_LD is not set
# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
# CONFIG_USB_TEST is not set
#
@@ -903,7 +964,6 @@
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC_BLOCK=y
CONFIG_MMC_AT91=m
-# CONFIG_MMC_TIFM_SD is not set
#
# Real Time Clock
@@ -973,7 +1033,6 @@
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
# CONFIG_JFFS2_FS is not set
CONFIG_CRAMFS=y
# CONFIG_VXFS_FS is not set
@@ -1045,6 +1104,11 @@
# CONFIG_NLS_UTF8 is not set
#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
# Profiling support
#
# CONFIG_PROFILING is not set
@@ -1056,28 +1120,30 @@
CONFIG_ENABLE_MUST_CHECK=y
# CONFIG_MAGIC_SYSRQ is not set
# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
CONFIG_LOG_BUF_SHIFT=14
CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
# CONFIG_DEBUG_SLAB is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RWSEMS is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_KOBJECT is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_FS is not set
# CONFIG_DEBUG_VM is not set
# CONFIG_DEBUG_LIST is not set
CONFIG_FRAME_POINTER=y
CONFIG_FORCED_INLINING=y
-# CONFIG_HEADERS_CHECK is not set
# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_ERRORS is not set
CONFIG_DEBUG_LL=y
@@ -1097,9 +1163,12 @@
#
# Library routines
#
+CONFIG_BITREVERSE=y
# CONFIG_CRC_CCITT is not set
# CONFIG_CRC16 is not set
CONFIG_CRC32=y
# CONFIG_LIBCRC32C is not set
CONFIG_ZLIB_INFLATE=y
CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22-rc5.new/arch/arm/configs/at91sam9263ek_defconfig
--- linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/configs/at91sam9263ek_defconfig 2007-07-29 05:23:04.000000000 +0200
@@ -1,11 +1,14 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-rc1
-# Mon Jan 8 16:06:54 2007
+# Linux kernel version: 2.6.21
+# Mon May 7 11:42:49 2007
#
CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
# CONFIG_GENERIC_TIME is not set
CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
CONFIG_GENERIC_HARDIRQS=y
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
CONFIG_HARDIRQS_SW_RESEND=y
@@ -15,6 +18,7 @@
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
CONFIG_VECTORS_BASE=0xffff0000
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -33,6 +37,7 @@
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_POSIX_MQUEUE is not set
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set
@@ -41,6 +46,7 @@
# CONFIG_IKCONFIG is not set
CONFIG_SYSFS_DEPRECATED=y
# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
@@ -120,6 +126,7 @@
# CONFIG_ARCH_IXP2000 is not set
# CONFIG_ARCH_IXP23XX is not set
# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_NS9XXX is not set
# CONFIG_ARCH_PNX4008 is not set
# CONFIG_ARCH_PXA is not set
# CONFIG_ARCH_RPC is not set
@@ -152,6 +159,7 @@
# AT91 Feature Selections
#
# CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
+# CONFIG_ATMEL_TCLIB is not set
#
# Processor Type
@@ -174,6 +182,7 @@
# CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+# CONFIG_OUTER_CACHE is not set
#
# Bus support
@@ -201,6 +210,7 @@
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPLIT_PTLOCK_CPUS=4096
# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
# CONFIG_LEDS is not set
CONFIG_ALIGNMENT_TRAP=y
@@ -211,6 +221,7 @@
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
#
# Floating point emulation
@@ -236,7 +247,6 @@
# Power management options
#
# CONFIG_PM is not set
-# CONFIG_APM is not set
#
# Networking
@@ -333,6 +343,7 @@
CONFIG_PREVENT_FIRMWARE_BUILD=y
# CONFIG_FW_LOADER is not set
# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
#
@@ -430,6 +441,7 @@
#
# Plug and Play support
#
+# CONFIG_PNPACPI is not set
#
# Block devices
@@ -443,7 +455,6 @@
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=8192
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
@@ -531,6 +542,7 @@
#
CONFIG_NET_ETHERNET=y
CONFIG_MII=y
+CONFIG_MACB=y
# CONFIG_SMC91X is not set
# CONFIG_DM9000 is not set
@@ -685,6 +697,7 @@
# I2C Hardware Bus support
#
CONFIG_I2C_AT91=y
+CONFIG_I2C_AT91_CLOCKRATE=100000
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_STUB is not set
@@ -722,6 +735,7 @@
#
# SPI Protocol Masters
#
+# CONFIG_SPI_AT25 is not set
#
# Dallas's 1-wire bus
@@ -737,7 +751,11 @@
#
# Misc devices
#
-# CONFIG_TIFM_CORE is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
#
# LED devices
@@ -766,15 +784,23 @@
#
# Graphics support
#
-# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
# CONFIG_FB_CFB_FILLRECT is not set
# CONFIG_FB_CFB_COPYAREA is not set
# CONFIG_FB_CFB_IMAGEBLIT is not set
+# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_S1D15605 is not set
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_VIRTUAL is not set
@@ -789,7 +815,6 @@
# Logo configuration
#
# CONFIG_LOGO is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
#
# Sound
@@ -800,6 +825,7 @@
# HID Devices
#
CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
#
# USB support
@@ -814,9 +840,7 @@
# Miscellaneous USB options
#
CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_MULTITHREAD_PROBE is not set
# CONFIG_USB_OTG is not set
#
@@ -824,7 +848,8 @@
#
# CONFIG_USB_ISP116X_HCD is not set
CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
# CONFIG_USB_SL811_HCD is not set
@@ -877,6 +902,7 @@
# CONFIG_USB_ATI_REMOTE2 is not set
# CONFIG_USB_KEYSPAN_REMOTE is not set
# CONFIG_USB_APPLETOUCH is not set
+# CONFIG_USB_GTCO is not set
#
# USB Imaging devices
@@ -914,6 +940,7 @@
# CONFIG_USB_RIO500 is not set
# CONFIG_USB_LEGOTOWER is not set
# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
# CONFIG_USB_LED is not set
# CONFIG_USB_CYPRESS_CY7C63 is not set
# CONFIG_USB_CYTHERM is not set
@@ -923,6 +950,7 @@
# CONFIG_USB_APPLEDISPLAY is not set
# CONFIG_USB_LD is not set
# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
# CONFIG_USB_TEST is not set
#
@@ -959,7 +987,6 @@
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC_BLOCK=y
CONFIG_MMC_AT91=m
-# CONFIG_MMC_TIFM_SD is not set
#
# Real Time Clock
@@ -1136,15 +1163,16 @@
# CONFIG_DEBUG_FS is not set
# CONFIG_HEADERS_CHECK is not set
CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
CONFIG_LOG_BUF_SHIFT=14
CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
# CONFIG_DEBUG_SLAB is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RWSEMS is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_KOBJECT is not set
@@ -1155,6 +1183,7 @@
CONFIG_FRAME_POINTER=y
CONFIG_FORCED_INLINING=y
# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_ERRORS is not set
CONFIG_DEBUG_LL=y
@@ -1180,5 +1209,7 @@
CONFIG_CRC32=y
# CONFIG_LIBCRC32C is not set
CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
diff -urN linux-2.6.22-rc5/arch/arm/configs/cam60_defconfig linux-2.6.22-rc5.new/arch/arm/configs/cam60_defconfig
--- linux-2.6.22-rc5/arch/arm/configs/cam60_defconfig 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.22-rc5.new/arch/arm/configs/cam60_defconfig 2007-07-29 05:23:04.000000000 +0200
@@ -0,0 +1,954 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.20
+# Tue May 1 21:06:33 2007
+#
+CONFIG_ARM=y
+# CONFIG_GENERIC_TIME is not set
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_KMOD is not set
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+CONFIG_ARCH_AT91=y
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+
+#
+# Atmel AT91 System-on-Chip
+#
+# CONFIG_ARCH_AT91RM9200 is not set
+CONFIG_ARCH_AT91SAM9260=y
+# CONFIG_ARCH_AT91SAM9261 is not set
+# CONFIG_ARCH_AT91SAM9263 is not set
+
+#
+# AT91SAM9260 Board Type
+#
+# CONFIG_MACH_AT91SAM9260EK is not set
+CONFIG_MACH_CAM60=y
+
+#
+# AT91 Board Options
+#
+
+#
+# AT91 Feature Selections
+#
+# CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5TJ=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+# CONFIG_ARM_THUMB is not set
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+# CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
+CONFIG_HZ=100
+# CONFIG_AEABI is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+# CONFIG_LEDS is not set
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x22000000
+CONFIG_ZBOOT_ROM_BSS=0x20004000
+# CONFIG_ZBOOT_ROM is not set
+CONFIG_CMDLINE="console=ttyS0,115200 noinitrd root=/dev/mtdblock3 rootfstype=jffs2 mem=64M"
+# CONFIG_XIP_KERNEL is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+# CONFIG_VFP is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
+
+#
+# Power management options
+#
+# CONFIG_PM is not set
+# CONFIG_APM is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_DATAFLASH=y
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_NETLINK is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+CONFIG_MACB=y
+# CONFIG_SMC91X is not set
+# CONFIG_DM9000 is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_ATMEL=y
+CONFIG_SERIAL_ATMEL_CONSOLE=y
+# CONFIG_SERIAL_ATMEL_TTYAT is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# SPI support
+#
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_ATMEL=y
+# CONFIG_SPI_BITBANG is not set
+
+#
+# SPI Protocol Masters
+#
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
+
+#
+# Misc devices
+#
+# CONFIG_TIFM_CORE is not set
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# HID Devices
+#
+# CONFIG_HID is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# Real Time Clock
+#
+CONFIG_RTC_LIB=y
+# CONFIG_RTC_CLASS is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=y
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+# CONFIG_MSDOS_FS is not set
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_CRAMFS=y
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+CONFIG_NLS_CODEPAGE_850=y
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FRAME_POINTER=y
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_DEBUG_USER=y
+# CONFIG_DEBUG_ERRORS is not set
+CONFIG_DEBUG_LL=y
+# CONFIG_DEBUG_ICEDCC is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_IOMAP_COPY=y
diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.new/arch/arm/configs/kb9202_defconfig
--- linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/configs/kb9202_defconfig 2007-07-29 05:23:04.000000000 +0200
@@ -1,19 +1,31 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.13-rc2
-# Sun Aug 14 19:26:59 2005
+# Linux kernel version: 2.6.21
+# Mon May 7 11:43:14 2007
#
CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+# CONFIG_GENERIC_TIME is not set
CONFIG_MMU=y
-CONFIG_UID16=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#
# Code maturity level options
#
-# CONFIG_EXPERIMENTAL is not set
-CONFIG_CLEAN_COMPILE=y
+CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_INIT_ENV_ARG_LIMIT=32
@@ -21,54 +33,103 @@
# General setup
#
CONFIG_LOCALVERSION=""
-# CONFIG_SWAP is not set
-# CONFIG_SYSVIPC is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+CONFIG_AUDIT=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
-# CONFIG_AUDIT is not set
-CONFIG_HOTPLUG=y
-# CONFIG_KOBJECT_UEVENT is not set
-# CONFIG_IKCONFIG is not set
# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_KALLSYMS_EXTRA_PASS=y
+CONFIG_HOTPLUG=y
CONFIG_PRINTK=y
CONFIG_BUG=y
+CONFIG_ELF_CORE=y
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SHMEM=y
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
#
# Loadable module support
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
-CONFIG_OBSOLETE_MODPARM=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
CONFIG_KMOD=y
#
+# Block layer
+#
+CONFIG_BLOCK=y
+CONFIG_LBD=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+
+#
# System Type
#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+CONFIG_ARCH_AT91=y
# CONFIG_ARCH_CLPS7500 is not set
# CONFIG_ARCH_CLPS711X is not set
# CONFIG_ARCH_CO285 is not set
# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
# CONFIG_ARCH_IXP4XX is not set
# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_PNX4008 is not set
# CONFIG_ARCH_PXA is not set
# CONFIG_ARCH_RPC is not set
# CONFIG_ARCH_SA1100 is not set
@@ -76,34 +137,52 @@
# CONFIG_ARCH_SHARK is not set
# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_AAEC2000 is not set
-CONFIG_ARCH_AT91=y
+
+#
+# Atmel AT91 System-on-Chip
+#
CONFIG_ARCH_AT91RM9200=y
+# CONFIG_ARCH_AT91SAM9260 is not set
+# CONFIG_ARCH_AT91SAM9261 is not set
+# CONFIG_ARCH_AT91SAM9263 is not set
#
-# AT91RM9200 Implementations
+# AT91RM9200 Board Type
#
+# CONFIG_MACH_ONEARM is not set
# CONFIG_ARCH_AT91RM9200DK is not set
# CONFIG_MACH_AT91RM9200EK is not set
# CONFIG_MACH_CSB337 is not set
# CONFIG_MACH_CSB637 is not set
# CONFIG_MACH_CARMEVA is not set
+# CONFIG_MACH_ATEB9200 is not set
CONFIG_MACH_KB9200=y
+# CONFIG_MACH_KAFA is not set
+# CONFIG_MACH_CHUB is not set
+
+#
+# AT91 Board Options
+#
+
+#
+# AT91 Feature Selections
+#
+# CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
+# CONFIG_ATMEL_TCLIB is not set
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM920T=y
-CONFIG_CPU_32v4=y
+CONFIG_CPU_32v4T=y
CONFIG_CPU_ABRT_EV4T=y
CONFIG_CPU_CACHE_V4WT=y
CONFIG_CPU_CACHE_VIVT=y
CONFIG_CPU_COPY_V4WB=y
CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
#
# Processor Features
@@ -112,24 +191,44 @@
# CONFIG_CPU_ICACHE_DISABLE is not set
# CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_OUTER_CACHE is not set
#
# Bus support
#
-CONFIG_ISA_DMA_API=y
#
# PCCARD (PCMCIA/CardBus) support
#
-# CONFIG_PCCARD is not set
+CONFIG_PCCARD=m
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+
+#
+# PC-card bridges
+#
+# CONFIG_AT91_CF is not set
#
# Kernel Features
#
+# CONFIG_PREEMPT is not set
# CONFIG_NO_IDLE_HZ is not set
+CONFIG_HZ=100
+# CONFIG_AEABI is not set
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
# CONFIG_LEDS is not set
CONFIG_ALIGNMENT_TRAP=y
@@ -138,8 +237,10 @@
#
CONFIG_ZBOOT_ROM_TEXT=0x10000000
CONFIG_ZBOOT_ROM_BSS=0x20040000
-CONFIG_ZBOOT_ROM=y
-CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/ram rw initrd=0x20210000,654933"
+# CONFIG_ZBOOT_ROM is not set
+CONFIG_CMDLINE="noinitrd root=/dev/mtdblock0 rootfstype=jffs2 mem=64M"
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
#
# Floating point emulation
@@ -150,6 +251,7 @@
#
CONFIG_FPE_NWFPE=y
# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
#
# Userspace binary formats
@@ -165,6 +267,96 @@
# CONFIG_PM is not set
#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
# Device Drivers
#
@@ -173,13 +365,95 @@
#
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
-CONFIG_DEBUG_DRIVER=y
+CONFIG_FW_LOADER=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
#
# Memory Technology Devices (MTD)
#
-# CONFIG_MTD is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+CONFIG_MTD_NAND_AT91=y
+# CONFIG_MTD_NAND_NANDSIM is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
#
# Parallel port support
@@ -189,6 +463,7 @@
#
# Plug and Play support
#
+# CONFIG_PNPACPI is not set
#
# Block devices
@@ -196,28 +471,27 @@
# CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-CONFIG_BLK_DEV_NBD=y
+# CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_UB is not set
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
+CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
#
-# IO Schedulers
+# ATA/ATAPI/MFM/RLL support
#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_IDE is not set
#
# SCSI device support
#
+# CONFIG_RAID_ATTRS is not set
CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
CONFIG_SCSI_PROC_FS=y
#
@@ -233,97 +507,61 @@
#
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
#
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+# CONFIG_SCSI_SCAN_ASYNC is not set
#
-# SCSI Transport Attributes
+# SCSI Transports
#
-# CONFIG_SCSI_SPI_ATTRS is not set
+CONFIG_SCSI_SPI_ATTRS=m
# CONFIG_SCSI_FC_ATTRS is not set
# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
#
# SCSI low-level drivers
#
-# CONFIG_SCSI_SATA is not set
+# CONFIG_ISCSI_TCP is not set
# CONFIG_SCSI_DEBUG is not set
#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-
-#
-# Fusion MPT device support
+# PCMCIA SCSI adapter support
#
-# CONFIG_FUSION is not set
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
#
-# IEEE 1394 (FireWire) support
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
#
+# CONFIG_ATA is not set
#
-# I2O device support
+# Multi-device support (RAID and LVM)
#
+# CONFIG_MD is not set
#
-# Networking support
+# Fusion MPT device support
#
-CONFIG_NET=y
+# CONFIG_FUSION is not set
#
-# Networking options
+# IEEE 1394 (FireWire) support
#
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_UNIX=y
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-# CONFIG_IP_PNP_BOOTP is not set
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_MROUTE is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_TUNNEL is not set
-# CONFIG_IP_TCPDIAG is not set
-# CONFIG_IP_TCPDIAG_IPV6 is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
-# CONFIG_IPV6 is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
#
-# QoS and/or fair queueing
+# I2O device support
#
-# CONFIG_NET_SCHED is not set
-# CONFIG_NET_CLS_ROUTE is not set
#
-# Network testing
+# Network device support
#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
CONFIG_NETDEVICES=y
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
@@ -331,6 +569,11 @@
# CONFIG_TUN is not set
#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
# Ethernet (10 or 100Mbit)
#
CONFIG_NET_ETHERNET=y
@@ -357,11 +600,20 @@
# CONFIG_NET_RADIO is not set
#
+# PCMCIA network device support
+#
+# CONFIG_NET_PCMCIA is not set
+
+#
# Wan interfaces
#
# CONFIG_WAN is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
#
# ISDN subsystem
@@ -372,6 +624,7 @@
# Input device support
#
CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
#
# Userland interfaces
@@ -397,9 +650,7 @@
#
# Hardware I/O ports
#
-CONFIG_SERIO=y
-# CONFIG_SERIO_SERPORT is not set
-# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO is not set
# CONFIG_GAMEPORT is not set
#
@@ -408,6 +659,7 @@
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
# CONFIG_SERIAL_NONSTANDARD is not set
#
@@ -420,11 +672,11 @@
#
CONFIG_SERIAL_ATMEL=y
CONFIG_SERIAL_ATMEL_CONSOLE=y
+# CONFIG_SERIAL_ATMEL_TTYAT is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_LEGACY_PTYS is not set
#
# IPMI
@@ -435,21 +687,23 @@
# Watchdog Cards
#
# CONFIG_WATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
# CONFIG_NVRAM is not set
-# CONFIG_RTC is not set
-# CONFIG_AT91RM9200_RTC is not set
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
#
-# Ftape, the floppy tape device driver
+# PCMCIA character devices
#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
# CONFIG_RAW_DRIVER is not set
#
# TPM devices
#
-# CONFIG_AT91_SPI is not set
+# CONFIG_TCG_TPM is not set
#
# I2C support
@@ -457,10 +711,50 @@
# CONFIG_I2C is not set
#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_VT1211 is not set
+CONFIG_HWMON_DEBUG_CHIP=y
+
+#
# Misc devices
#
#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
# Multimedia devices
#
# CONFIG_VIDEO_DEV is not set
@@ -469,17 +763,57 @@
# Digital Video Broadcasting Devices
#
# CONFIG_DVB is not set
+# CONFIG_USB_DABUSB is not set
#
# Graphics support
#
-# CONFIG_FB is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_KB920x=y
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_S1D15605=y
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_VIRTUAL is not set
#
# Console display driver support
#
# CONFIG_VGA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+# CONFIG_FONT_8x16 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+CONFIG_FONT_MINI_4x6=y
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+
+#
+# Logo configuration
+#
+# CONFIG_LOGO is not set
#
# Sound
@@ -487,82 +821,98 @@
# CONFIG_SOUND is not set
#
+# HID Devices
+#
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+
+#
# USB support
#
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_ARCH_HAS_EHCI is not set
CONFIG_USB=y
-CONFIG_USB_DEBUG=y
+# CONFIG_USB_DEBUG is not set
#
# Miscellaneous USB options
#
CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
#
# USB Host Controller Drivers
#
# CONFIG_USB_ISP116X_HCD is not set
CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
# CONFIG_USB_SL811_HCD is not set
#
# USB Device Class drivers
#
-# CONFIG_USB_BLUETOOTH_TTY is not set
# CONFIG_USB_ACM is not set
# CONFIG_USB_PRINTER is not set
#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
#
CONFIG_USB_STORAGE=y
-CONFIG_USB_STORAGE_DEBUG=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
# CONFIG_USB_STORAGE_FREECOM is not set
# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+CONFIG_USB_LIBUSUAL=y
#
# USB Input Devices
#
-# CONFIG_USB_HID is not set
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
# CONFIG_USB_AIPTEK is not set
# CONFIG_USB_WACOM is not set
# CONFIG_USB_ACECAD is not set
# CONFIG_USB_KBTAB is not set
# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_MTOUCH is not set
-# CONFIG_USB_ITMTOUCH is not set
-# CONFIG_USB_EGALAX is not set
+# CONFIG_USB_TOUCHSCREEN is not set
+# CONFIG_USB_YEALINK is not set
# CONFIG_USB_XPAD is not set
# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_ATI_REMOTE2 is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
+# CONFIG_USB_GTCO is not set
#
# USB Imaging devices
#
+# CONFIG_USB_MDC800 is not set
# CONFIG_USB_MICROTEK is not set
#
-# USB Multimedia devices
-#
-# CONFIG_USB_DABUSB is not set
-
-#
-# Video4Linux support is needed for USB Multimedia device support
-#
-
-#
# USB Network Adapters
#
+# CONFIG_USB_CATC is not set
# CONFIG_USB_KAWETH is not set
# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
# CONFIG_USB_USBNET is not set
# CONFIG_USB_MON is not set
@@ -580,12 +930,23 @@
#
# CONFIG_USB_EMI62 is not set
# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGETKIT is not set
-# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_PHIDGET is not set
# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
#
# USB DSL modem support
@@ -599,36 +960,51 @@
#
# MMC/SD Card support
#
-# CONFIG_MMC is not set
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_AT91=y
+
+#
+# Real Time Clock
+#
+CONFIG_RTC_LIB=y
+# CONFIG_RTC_CLASS is not set
#
# File systems
#
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
-# CONFIG_EXT2_FS_POSIX_ACL is not set
-# CONFIG_EXT2_FS_SECURITY is not set
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
# CONFIG_EXT2_FS_XIP is not set
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_XATTR=y
-# CONFIG_EXT3_FS_POSIX_ACL is not set
-# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+# CONFIG_EXT4DEV_FS is not set
CONFIG_JBD=y
# CONFIG_JBD_DEBUG is not set
CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
-
-#
-# XFS support
-#
+CONFIG_FS_POSIX_ACL=y
# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_ROMFS_FS is not set
-# CONFIG_QUOTA is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_QUOTA=y
+# CONFIG_QFMT_V1 is not set
+CONFIG_QFMT_V2=y
+CONFIG_QUOTACTL=y
CONFIG_DNOTIFY=y
-CONFIG_AUTOFS_FS=y
+# CONFIG_AUTOFS_FS is not set
CONFIG_AUTOFS4_FS=y
+# CONFIG_FUSE_FS is not set
#
# CD-ROM/DVD Filesystems
@@ -643,25 +1019,40 @@
CONFIG_MSDOS_FS=y
CONFIG_VFAT_FS=y
CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
# CONFIG_NTFS_FS is not set
#
# Pseudo filesystems
#
CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
CONFIG_SYSFS=y
-CONFIG_DEVPTS_FS_XATTR=y
-# CONFIG_DEVPTS_FS_SECURITY is not set
CONFIG_TMPFS=y
-# CONFIG_TMPFS_XATTR is not set
+# CONFIG_TMPFS_POSIX_ACL is not set
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
+CONFIG_CONFIGFS_FS=y
#
# Miscellaneous filesystems
#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
# CONFIG_CRAMFS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
@@ -675,16 +1066,23 @@
CONFIG_NFS_FS=y
CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_DIRECTIO is not set
# CONFIG_NFSD is not set
CONFIG_ROOT_NFS=y
CONFIG_LOCKD=y
CONFIG_LOCKD_V4=y
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_RPCSEC_GSS_KRB5=y
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
# CONFIG_SMB_FS is not set
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
#
# Partition Types
@@ -734,26 +1132,51 @@
# CONFIG_NLS_ISO8859_15 is not set
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
+CONFIG_NLS_UTF8=y
+
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
#
# Kernel hacking
#
# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
CONFIG_DEBUG_KERNEL=y
-# CONFIG_MAGIC_SYSRQ is not set
-CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_LOG_BUF_SHIFT=17
+CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+CONFIG_DEBUG_SPINLOCK=y
+# CONFIG_DEBUG_MUTEXES is not set
+CONFIG_DEBUG_SPINLOCK_SLEEP=y
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_KOBJECT is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
CONFIG_FRAME_POINTER=y
-CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_ERRORS=y
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_DEBUG_USER is not set
+# CONFIG_DEBUG_ERRORS is not set
CONFIG_DEBUG_LL=y
# CONFIG_DEBUG_ICEDCC is not set
@@ -766,7 +1189,43 @@
#
# Cryptographic options
#
-# CONFIG_CRYPTO is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_HMAC=m
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_ECB is not set
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_TEST is not set
#
# Hardware crypto devices
@@ -775,6 +1234,14 @@
#
# Library routines
#
+CONFIG_BITREVERSE=y
# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
CONFIG_CRC32=y
# CONFIG_LIBCRC32C is not set
+CONFIG_AUDIT_GENERIC=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91rm9200.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91rm9200.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/at91rm9200.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91rm9200.c 2007-07-29 05:23:04.000000000 +0200
@@ -267,6 +267,33 @@
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
/* --------------------------------------------------------------------
+ * Timer/Counter library initialization
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ * -------------------------------------------------------------------- */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#ifdef CONFIG_ATMEL_TCLIB
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#include "tclib.h"
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+static struct atmel_tcblock at91rm9200_tcblocks[] = {
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ [0] = {
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ .physaddr = AT91RM9200_BASE_TCB0,
+ .irq = { AT91RM9200_ID_TC0, AT91RM9200_ID_TC1, AT91RM9200_ID_TC2 },
+ .clk = { &tc0_clk, &tc1_clk, &tc2_clk },
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ },
+ [1] = {
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ .physaddr = AT91RM9200_BASE_TCB1,
+ .irq = { AT91RM9200_ID_TC3, AT91RM9200_ID_TC4, AT91RM9200_ID_TC5 },
+ .clk = { &tc3_clk, &tc4_clk, &tc5_clk },
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ },
+};
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#define at91rm9200_tc_init() atmel_tc_init(at91rm9200_tcblocks, ARRAY_SIZE(at91rm9200_tcblocks))
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+#else
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#define at91rm9200_tc_init() do {} while(0)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+#endif
+
+
+/* --------------------------------------------------------------------
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
* AT91RM9200 processor initialization
* -------------------------------------------------------------------- */
void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks)
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
@@ -288,6 +315,9 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
/* Initialize GPIO subsystem */
at91_gpio_init(at91rm9200_gpio, banks);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ /* Initialize the Timer/Counter blocks */
+ at91rm9200_tc_init();
}
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
@@ -301,28 +331,28 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = {
7, /* Advanced Interrupt Controller (FIQ) */
7, /* System Peripherals */
- 0, /* Parallel IO Controller A */
- 0, /* Parallel IO Controller B */
- 0, /* Parallel IO Controller C */
- 0, /* Parallel IO Controller D */
- 6, /* USART 0 */
- 6, /* USART 1 */
- 6, /* USART 2 */
- 6, /* USART 3 */
+ 1, /* Parallel IO Controller A */
+ 1, /* Parallel IO Controller B */
+ 1, /* Parallel IO Controller C */
+ 1, /* Parallel IO Controller D */
+ 5, /* USART 0 */
+ 5, /* USART 1 */
+ 5, /* USART 2 */
+ 5, /* USART 3 */
0, /* Multimedia Card Interface */
- 4, /* USB Device Port */
- 0, /* Two-Wire Interface */
- 6, /* Serial Peripheral Interface */
- 5, /* Serial Synchronous Controller 0 */
- 5, /* Serial Synchronous Controller 1 */
- 5, /* Serial Synchronous Controller 2 */
+ 2, /* USB Device Port */
+ 6, /* Two-Wire Interface */
+ 5, /* Serial Peripheral Interface */
+ 4, /* Serial Synchronous Controller 0 */
+ 4, /* Serial Synchronous Controller 1 */
+ 4, /* Serial Synchronous Controller 2 */
0, /* Timer Counter 0 */
0, /* Timer Counter 1 */
0, /* Timer Counter 2 */
0, /* Timer Counter 3 */
0, /* Timer Counter 4 */
0, /* Timer Counter 5 */
- 3, /* USB Host port */
+ 2, /* USB Host port */
3, /* Ethernet MAC */
0, /* Advanced Interrupt Controller (IRQ0) */
0, /* Advanced Interrupt Controller (IRQ1) */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91rm9200_devices.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91rm9200_devices.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/at91rm9200_devices.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91rm9200_devices.c 2007-07-29 05:23:04.000000000 +0200
@@ -477,7 +477,18 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
* SPI
* -------------------------------------------------------------------- */
-#if defined(CONFIG_SPI_AT91) || defined(CONFIG_SPI_AT91_MODULE) || defined(CONFIG_AT91_SPI) || defined(CONFIG_AT91_SPI_MODULE)
+#if defined(CONFIG_AT91_SPI) || defined(CONFIG_AT91_SPI_MODULE) /* legacy SPI driver */
+#define SPI_DEVNAME "at91_spi"
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#elif defined(CONFIG_SPI_AT91) || defined(CONFIG_SPI_AT91_MODULE) /* SPI bitbanging driver */
+#define SPI_DEVNAME "at91_spi"
+
+#elif defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE) /* new SPI driver */
+#define SPI_DEVNAME "atmel_spi"
+
+#endif
+
+#ifdef SPI_DEVNAME
static u64 spi_dmamask = 0xffffffffUL;
static struct resource spi_resources[] = {
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
@@ -494,7 +505,7 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
};
static struct platform_device at91rm9200_spi_device = {
- .name = "at91_spi",
+ .name = SPI_DEVNAME,
.id = 0,
.dev = {
.dma_mask = &spi_dmamask,
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
@@ -603,6 +614,32 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
#endif
+#if defined(CONFIG_NEW_LEDS)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+static struct platform_device at91_leds = {
+ .name = "at91_leds",
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ .id = -1,
+};
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ if (!nr)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ return;
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ at91_leds.dev.platform_data = leds;
+
+ for ( ; nr; nr--, leds++) {
+ leds->index = nr; /* first record stores number of leds */
+ at91_set_gpio_output(leds->gpio, (leds->flags & 1) == 0);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ }
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ platform_device_register(&at91_leds);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+#else
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr) {}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+#endif
+
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
/* --------------------------------------------------------------------
* UART
* -------------------------------------------------------------------- */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9260.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9260.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9260.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9260.c 2007-07-29 05:23:04.000000000 +0200
@@ -269,6 +269,33 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
/* --------------------------------------------------------------------
+ * Timer/Counter library initialization
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ * -------------------------------------------------------------------- */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#ifdef CONFIG_ATMEL_TCLIB
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#include "tclib.h"
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+static struct atmel_tcblock at91sam9260_tcblocks[] = {
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ [0] = {
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ .physaddr = AT91SAM9260_BASE_TCB0,
+ .irq = { AT91SAM9260_ID_TC0, AT91SAM9260_ID_TC1, AT91SAM9260_ID_TC2 },
+ .clk = { &tc0_clk, &tc1_clk, &tc2_clk },
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ },
+ [1] = {
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ .physaddr = AT91SAM9260_BASE_TCB1,
+ .irq = { AT91SAM9260_ID_TC3, AT91SAM9260_ID_TC4, AT91SAM9260_ID_TC5 },
+ .clk = { &tc3_clk, &tc4_clk, &tc5_clk },
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ },
+};
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#define at91sam9260_tc_init() atmel_tc_init(at91sam9260_tcblocks, ARRAY_SIZE(at91sam9260_tcblocks))
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+#else
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#define at91sam9260_tc_init() do {} while(0)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+#endif
+
+
+/* --------------------------------------------------------------------
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
* AT91SAM9260 processor initialization
* -------------------------------------------------------------------- */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
@@ -315,6 +342,9 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
/* Register GPIO subsystem */
at91_gpio_init(at91sam9260_gpio, 3);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ /* Initialize the Timer/Counter blocks */
+ at91sam9260_tc_init();
}
/* --------------------------------------------------------------------
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
@@ -327,30 +357,30 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = {
7, /* Advanced Interrupt Controller */
7, /* System Peripherals */
- 0, /* Parallel IO Controller A */
- 0, /* Parallel IO Controller B */
- 0, /* Parallel IO Controller C */
+ 1, /* Parallel IO Controller A */
+ 1, /* Parallel IO Controller B */
+ 1, /* Parallel IO Controller C */
0, /* Analog-to-Digital Converter */
- 6, /* USART 0 */
- 6, /* USART 1 */
- 6, /* USART 2 */
+ 5, /* USART 0 */
+ 5, /* USART 1 */
+ 5, /* USART 2 */
0, /* Multimedia Card Interface */
- 4, /* USB Device Port */
- 0, /* Two-Wire Interface */
- 6, /* Serial Peripheral Interface 0 */
- 6, /* Serial Peripheral Interface 1 */
+ 2, /* USB Device Port */
+ 6, /* Two-Wire Interface */
+ 5, /* Serial Peripheral Interface 0 */
+ 5, /* Serial Peripheral Interface 1 */
5, /* Serial Synchronous Controller */
0,
0,
0, /* Timer Counter 0 */
0, /* Timer Counter 1 */
0, /* Timer Counter 2 */
- 3, /* USB Host port */
+ 2, /* USB Host port */
3, /* Ethernet */
0, /* Image Sensor Interface */
- 6, /* USART 3 */
- 6, /* USART 4 */
- 6, /* USART 5 */
+ 5, /* USART 3 */
+ 5, /* USART 4 */
+ 5, /* USART 5 */
0, /* Timer Counter 3 */
0, /* Timer Counter 4 */
0, /* Timer Counter 5 */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9260_devices.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9260_devices.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9260_devices.c 2007-07-29 05:23:04.000000000 +0200
@@ -524,6 +524,32 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
#endif
+#if defined(CONFIG_NEW_LEDS)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+static struct platform_device at91_leds = {
+ .name = "at91_leds",
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ .id = -1,
+};
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ if (!nr)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ return;
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ at91_leds.dev.platform_data = leds;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ for ( ; nr; nr--, leds++) {
+ leds->index = nr; /* first record stores number of leds */
+ at91_set_gpio_output(leds->gpio, (leds->flags & 1) == 0);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ }
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ platform_device_register(&at91_leds);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+#else
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr) {}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+#endif
+
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
/* --------------------------------------------------------------------
* UART
* -------------------------------------------------------------------- */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9261.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9261.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9261.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9261.c 2007-07-29 05:23:04.000000000 +0200
@@ -247,6 +247,28 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
/* --------------------------------------------------------------------
+ * Timer/Counter library initialization
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ * -------------------------------------------------------------------- */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#ifdef CONFIG_ATMEL_TCLIB
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#include "tclib.h"
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+static struct atmel_tcblock at91sam9261_tcblocks[] = {
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ [0] = {
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ .physaddr = AT91SAM9261_BASE_TCB0,
+ .irq = { AT91SAM9261_ID_TC0, AT91SAM9261_ID_TC1, AT91SAM9261_ID_TC2 },
+ .clk = { &tc0_clk, &tc1_clk, &tc2_clk },
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+};
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#define at91sam9261_tc_init() atmel_tc_init(at91sam9261_tcblocks, ARRAY_SIZE(at91sam9261_tcblocks))
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#else
+#define at91sam9261_tc_init() do {} while(0)
+#endif
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
+/* --------------------------------------------------------------------
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
* AT91SAM9261 processor initialization
* -------------------------------------------------------------------- */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
@@ -267,6 +289,9 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
/* Register GPIO subsystem */
at91_gpio_init(at91sam9261_gpio, 3);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ /* Initialize the Timer/Counter blocks */
+ at91sam9261_tc_init();
}
/* --------------------------------------------------------------------
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
@@ -279,25 +304,25 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = {
7, /* Advanced Interrupt Controller */
7, /* System Peripherals */
- 0, /* Parallel IO Controller A */
- 0, /* Parallel IO Controller B */
- 0, /* Parallel IO Controller C */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
- 0,
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
- 6, /* USART 0 */
- 6, /* USART 1 */
- 6, /* USART 2 */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ 1, /* Parallel IO Controller A */
+ 1, /* Parallel IO Controller B */
+ 1, /* Parallel IO Controller C */
+ 0,
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ 5, /* USART 0 */
+ 5, /* USART 1 */
+ 5, /* USART 2 */
0, /* Multimedia Card Interface */
- 4, /* USB Device Port */
- 0, /* Two-Wire Interface */
- 6, /* Serial Peripheral Interface 0 */
- 6, /* Serial Peripheral Interface 1 */
- 5, /* Serial Synchronous Controller 0 */
- 5, /* Serial Synchronous Controller 1 */
- 5, /* Serial Synchronous Controller 2 */
+ 2, /* USB Device Port */
+ 6, /* Two-Wire Interface */
+ 5, /* Serial Peripheral Interface 0 */
+ 5, /* Serial Peripheral Interface 1 */
+ 4, /* Serial Synchronous Controller 0 */
+ 4, /* Serial Synchronous Controller 1 */
+ 4, /* Serial Synchronous Controller 2 */
0, /* Timer Counter 0 */
0, /* Timer Counter 1 */
0, /* Timer Counter 2 */
- 3, /* USB Host port */
+ 2, /* USB Host port */
3, /* LCD Controller */
0,
0,
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9261_devices.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9261_devices.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9261_devices.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9261_devices.c 2007-07-29 05:23:04.000000000 +0200
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
@@ -14,6 +14,9 @@
#include <asm/mach/map.h>
#include <linux/platform_device.h>
+#include <linux/fb.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#include <video/atmel_lcdc.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
@@ -522,6 +525,32 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
#endif
+#if defined(CONFIG_NEW_LEDS)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+static struct platform_device at91_leds = {
+ .name = "at91_leds",
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ .id = -1,
+};
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ if (!nr)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ return;
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ at91_leds.dev.platform_data = leds;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ for ( ; nr; nr--, leds++) {
+ leds->index = nr; /* first record stores number of leds */
+ at91_set_gpio_output(leds->gpio, (leds->flags & 1) == 0);
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ platform_device_register(&at91_leds);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+#else
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr) {}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+#endif
+
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
/* --------------------------------------------------------------------
* UART
* -------------------------------------------------------------------- */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9263.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9263.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9263.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9263.c 2007-07-29 05:23:04.000000000 +0200
@@ -273,6 +273,28 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
/* --------------------------------------------------------------------
+ * Timer/Counter library initialization
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ * -------------------------------------------------------------------- */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#ifdef CONFIG_ATMEL_TCLIB
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#include "tclib.h"
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+static struct atmel_tcblock at91sam9263_tcblocks[] = {
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ [0] = {
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ .physaddr = AT91SAM9263_BASE_TCB0,
+ .irq = { AT91SAM9263_ID_TCB, AT91SAM9263_ID_TCB, AT91SAM9263_ID_TCB },
+ .clk = { &tcb_clk, &tcb_clk, &tcb_clk },
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+};
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#define at91sam9263_tc_init() atmel_tc_init(at91sam9263_tcblocks, ARRAY_SIZE(at91sam9263_tcblocks))
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+#else
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#define at91sam9263_tc_init() do {} while(0)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+#endif
+
+
+/* --------------------------------------------------------------------
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
* AT91SAM9263 processor initialization
* -------------------------------------------------------------------- */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
@@ -292,6 +314,9 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
/* Register GPIO subsystem */
at91_gpio_init(at91sam9263_gpio, 5);
+
+ /* Initialize the Timer/Counter blocks */
+ at91sam9263_tc_init();
}
/* --------------------------------------------------------------------
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
@@ -304,34 +329,34 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = {
7, /* Advanced Interrupt Controller (FIQ) */
7, /* System Peripherals */
- 0, /* Parallel IO Controller A */
- 0, /* Parallel IO Controller B */
- 0, /* Parallel IO Controller C, D and E */
+ 1, /* Parallel IO Controller A */
+ 1, /* Parallel IO Controller B */
+ 1, /* Parallel IO Controller C, D and E */
0,
0,
- 6, /* USART 0 */
- 6, /* USART 1 */
- 6, /* USART 2 */
+ 5, /* USART 0 */
+ 5, /* USART 1 */
+ 5, /* USART 2 */
0, /* Multimedia Card Interface 0 */
0, /* Multimedia Card Interface 1 */
- 4, /* CAN */
- 0, /* Two-Wire Interface */
- 6, /* Serial Peripheral Interface 0 */
- 6, /* Serial Peripheral Interface 1 */
- 5, /* Serial Synchronous Controller 0 */
- 5, /* Serial Synchronous Controller 1 */
- 6, /* AC97 Controller */
+ 3, /* CAN */
+ 6, /* Two-Wire Interface */
+ 5, /* Serial Peripheral Interface 0 */
+ 5, /* Serial Peripheral Interface 1 */
+ 4, /* Serial Synchronous Controller 0 */
+ 4, /* Serial Synchronous Controller 1 */
+ 5, /* AC97 Controller */
0, /* Timer Counter 0, 1 and 2 */
0, /* Pulse Width Modulation Controller */
3, /* Ethernet */
0,
0, /* 2D Graphic Engine */
- 3, /* USB Device Port */
+ 2, /* USB Device Port */
0, /* Image Sensor Interface */
3, /* LDC Controller */
0, /* DMA Controller */
0,
- 3, /* USB Host port */
+ 2, /* USB Host port */
0, /* Advanced Interrupt Controller (IRQ0) */
0, /* Advanced Interrupt Controller (IRQ1) */
};
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9263_devices.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9263_devices.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9263_devices.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9263_devices.c 2007-07-29 05:23:04.000000000 +0200
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
@@ -13,6 +13,9 @@
#include <asm/mach/map.h>
#include <linux/platform_device.h>
+#include <linux/fb.h>
+
+#include <video/atmel_lcdc.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
@@ -625,6 +628,56 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
/* --------------------------------------------------------------------
+ * Image Sensor Interface
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ * -------------------------------------------------------------------- */
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#if defined(CONFIG_VIDEO_AT91_ISI) || defined(CONFIG_VIDEO_AT91_ISI_MODULE)
+
+struct resource isi_resources[] = {
+ [0] = {
+ .start = AT91SAM9263_BASE_ISI,
+ .end = AT91SAM9263_BASE_ISI + SZ_16K - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+ .start = AT91SAM9263_ID_ISI,
+ .end = AT91SAM9263_ID_ISI,
+ .flags = IORESOURCE_IRQ,
+ },
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+};
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+static struct platform_device at91sam9263_isi_device = {
+ .name = "at91_isi",
+ .id = -1,
+ .resource = isi_resources,
+ .num_resources = ARRAY_SIZE(isi_resources),
+};
+
+void __init at91_add_device_isi(void)
+{
+ at91_set_A_periph(AT91_PIN_PE0, 0); /* ISI_D0 */
+ at91_set_A_periph(AT91_PIN_PE1, 0); /* ISI_D1 */
+ at91_set_A_periph(AT91_PIN_PE2, 0); /* ISI_D2 */
+ at91_set_A_periph(AT91_PIN_PE3, 0); /* ISI_D3 */
+ at91_set_A_periph(AT91_PIN_PE4, 0); /* ISI_D4 */
+ at91_set_A_periph(AT91_PIN_PE5, 0); /* ISI_D5 */
+ at91_set_A_periph(AT91_PIN_PE6, 0); /* ISI_D6 */
+ at91_set_A_periph(AT91_PIN_PE7, 0); /* ISI_D7 */
+ at91_set_A_periph(AT91_PIN_PE8, 0); /* ISI_PCK */
+ at91_set_A_periph(AT91_PIN_PE9, 0); /* ISI_HSYNC */
+ at91_set_A_periph(AT91_PIN_PE10, 0); /* ISI_VSYNC */
+ at91_set_B_periph(AT91_PIN_PE11, 0); /* ISI_MCK (PCK3) */
+ at91_set_B_periph(AT91_PIN_PE12, 0); /* ISI_PD8 */
+ at91_set_B_periph(AT91_PIN_PE13, 0); /* ISI_PD9 */
+ at91_set_B_periph(AT91_PIN_PE14, 0); /* ISI_PD10 */
+ at91_set_B_periph(AT91_PIN_PE15, 0); /* ISI_PD11 */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+#else
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+void __init at91_add_device_isi(void) {}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+#endif
+
+
+/* --------------------------------------------------------------------
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
* LCD Controller
* -------------------------------------------------------------------- */
@@ -715,6 +768,32 @@
#endif
+#if defined(CONFIG_NEW_LEDS)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct platform_device at91_leds = {
+ .name = "at91_leds",
+ .id = -1,
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+};
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (!nr)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ return;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ at91_leds.dev.platform_data = leds;
+
+ for ( ; nr; nr--, leds++) {
+ leds->index = nr; /* first record stores number of leds */
+ at91_set_gpio_output(leds->gpio, (leds->flags & 1) == 0);
+ }
+
+ platform_device_register(&at91_leds);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+#else
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr) {}
+#endif
+
+
/* --------------------------------------------------------------------
* UART
* -------------------------------------------------------------------- */
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9rl.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9rl.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9rl.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9rl.c 2007-07-29 05:23:04.000000000 +0200
@@ -246,6 +246,28 @@
/* --------------------------------------------------------------------
+ * Timer/Counter library initialization
+ * -------------------------------------------------------------------- */
+#ifdef CONFIG_ATMEL_TCLIB
+
+#include "tclib.h"
+
+static struct atmel_tcblock at91sam9rl_tcblocks[] = {
+ [0] = {
+ .physaddr = AT91SAM9RL_BASE_TCB0,
+ .irq = { AT91SAM9RL_ID_TC0, AT91SAM9RL_ID_TC1, AT91SAM9RL_ID_TC2 },
+ .clk = { &tc0_clk, &tc1_clk, &tc2_clk },
+ }
+};
+
+#define at91sam9rl_tc_init() atmel_tc_init(at91sam9rl_tcblocks, ARRAY_SIZE(at91sam9rl_tcblocks))
+
+#else
+#define at91sam9rl_tc_init() do {} while(0)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+#endif
+
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+/* --------------------------------------------------------------------
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
* AT91SAM9RL processor initialization
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
* -------------------------------------------------------------------- */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
@@ -284,6 +306,9 @@
/* Register GPIO subsystem */
at91_gpio_init(at91sam9rl_gpio, 4);
+
+ /* Initialize the Timer/Counter blocks */
+ at91sam9rl_tc_init();
}
/* --------------------------------------------------------------------
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9rl_devices.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9rl_devices.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9rl_devices.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9rl_devices.c 2007-07-29 05:23:04.000000000 +0200
@@ -370,6 +370,32 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
#endif
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+#if defined(CONFIG_NEW_LEDS)
+
+static struct platform_device at91_leds = {
+ .name = "at91_leds",
+ .id = -1,
+};
+
+void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr)
+{
+ if (!nr)
+ return;
+
+ at91_leds.dev.platform_data = leds;
+
+ for ( ; nr; nr--, leds++) {
+ leds->index = nr; /* first record stores number of leds */
+ at91_set_gpio_output(leds->gpio, (leds->flags & 1) == 0);
+ }
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ platform_device_register(&at91_leds);
+}
+#else
+void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr) {}
+#endif
+
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
/* --------------------------------------------------------------------
* UART
* -------------------------------------------------------------------- */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-cam60.c linux-2.6.22-rc5.new/arch/arm/mach-at91/board-cam60.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/board-cam60.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/board-cam60.c 2007-07-29 05:23:04.000000000 +0200
@@ -0,0 +1,148 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * KwikByte CAM60
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ *
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * based on board-sam9260ek.c
+ * Copyright (C) 2005 SAN People
+ * Copyright (C) 2006 Atmel
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ *
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * This program 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 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/mm.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+#include <linux/module.h>
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <linux/platform_device.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/flash.h>
+
+#include <asm/hardware.h>
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+#include <asm/irq.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <asm/mach/irq.h>
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <asm/arch/board.h>
+#include <asm/arch/gpio.h>
+#include <asm/arch/at91sam926x_mc.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include "generic.h"
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Serial port configuration.
+ * 0 .. 5 = USART0 .. USART5
+ * 6 = DBGU
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct at91_uart_config __initdata cam60_uart_config = {
+ .console_tty = 0, /* ttyS0 */
+ .nr_tty = 1,
+ .tty_map = { 6, -1, -1, -1, -1, -1, -1 } /* ttyS0, ..., ttyS6 */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+};
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __init cam60_map_io(void)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Initialize processor: 10 MHz crystal */
+ at91sam9260_initialize(10000000);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Setup the serial ports and console */
+ at91_init_serial(&cam60_uart_config);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __init cam60_init_irq(void)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ at91sam9260_init_interrupts(NULL);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * SPI devices.
+ */
+#if defined(CONFIG_MTD_DATAFLASH)
+static struct mtd_partition __initdata cam60_spi_partitions[] = {
+ {
+ .name = "BOOT1",
+ .offset = 0,
+ .size = 4 * 1056,
+ },
+ {
+ .name = "BOOT2",
+ .offset = MTDPART_OFS_NXTBLK,
+ .size = 256 * 1056,
+ },
+ {
+ .name = "kernel",
+ .offset = MTDPART_OFS_NXTBLK,
+ .size = 2222 * 1056,
+ },
+ {
+ .name = "file system",
+ .offset = MTDPART_OFS_NXTBLK,
+ .size = MTDPART_SIZ_FULL,
+ },
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+};
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct flash_platform_data __initdata cam60_spi_flash_platform_data = {
+ .name = "spi_flash",
+ .parts = cam60_spi_partitions,
+ .nr_parts = ARRAY_SIZE(cam60_spi_partitions)
+};
+#endif
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct spi_board_info cam60_spi_devices[] = {
+#if defined(CONFIG_MTD_DATAFLASH)
+ { /* DataFlash chip */
+ .modalias = "mtd_dataflash",
+ .chip_select = 0,
+ .max_speed_hz = 15 * 1000 * 1000,
+ .bus_num = 0,
+ .platform_data = &cam60_spi_flash_platform_data
+ },
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#endif
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+};
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * MACB Ethernet device
+ */
+static struct __initdata at91_eth_data cam60_macb_data = {
+ .phy_irq_pin = AT91_PIN_PB5,
+ .is_rmii = 0,
+};
+
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __init cam60_board_init(void)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Serial */
+ at91_add_device_serial();
+ /* SPI */
+ at91_add_device_spi(cam60_spi_devices, ARRAY_SIZE(cam60_spi_devices));
+ /* Ethernet */
+ at91_add_device_eth(&cam60_macb_data);
+}
+
+MACHINE_START(CAM60, "KwikByte CAM60")
+ /* Maintainer: KwikByte */
+ .phys_io = AT91_BASE_SYS,
+ .io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
+ .boot_params = AT91_SDRAM_BASE + 0x100,
+ .timer = &at91sam926x_timer,
+ .map_io = cam60_map_io,
+ .init_irq = cam60_init_irq,
+ .init_machine = cam60_board_init,
+MACHINE_END
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-chub.c linux-2.6.22-rc5.new/arch/arm/mach-at91/board-chub.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/board-chub.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/board-chub.c 2007-07-29 05:23:04.000000000 +0200
@@ -0,0 +1,132 @@
+/*
+ * linux/arch/arm/mach-at91/board-chub.c
+ *
+ * Copyright (C) 2005 SAN People, adapted for Promwad Chub board
+ * by Kuten Ivan
+ *
+ * This program 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 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <asm/hardware.h>
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+#include <asm/irq.h>
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/irq.h>
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <asm/arch/board.h>
+#include <asm/arch/gpio.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include "generic.h"
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * Serial port configuration.
+ * 0 .. 3 = USART0 .. USART3
+ * 4 = DBGU
+ */
+static struct at91_uart_config __initdata chub_uart_config = {
+ .console_tty = 0, /* ttyS0 */
+ .nr_tty = 5,
+ .tty_map = { 4, 0, 1, 2, 3 } /* ttyS0, ..., ttyS4 */
+};
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __init chub_init_irq(void)
+{
+ at91rm9200_init_interrupts(NULL);
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __init chub_map_io(void)
+{
+ /* Initialize clocks: 18.432 MHz crystal */
+ at91rm9200_initialize(18432000, AT91RM9200_PQFP);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Setup the serial ports and console */
+ at91_init_serial(&chub_uart_config);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct at91_eth_data __initdata chub_eth_data = {
+ .phy_irq_pin = AT91_PIN_PB29,
+ .is_rmii = 0,
+};
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct mtd_partition __initdata chub_nand_partition[] = {
+ {
+ .name = "NAND Partition 1",
+ .offset = 0,
+ .size = MTDPART_SIZ_FULL,
+ },
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+};
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ *num_partitions = ARRAY_SIZE(chub_nand_partition);
+ return chub_nand_partition;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct at91_nand_data __initdata chub_nand_data = {
+ .ale = 22,
+ .cle = 21,
+ .enable_pin = AT91_PIN_PA27,
+ .partition_info = nand_partitions,
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+};
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct spi_board_info chub_spi_devices[] = {
+ { /* DataFlash chip */
+ .modalias = "mtd_dataflash",
+ .chip_select = 0,
+ .max_speed_hz = 15 * 1000 * 1000,
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ },
+};
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __init chub_board_init(void)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Serial */
+ at91_add_device_serial();
+ /* I2C */
+ at91_add_device_i2c();
+ /* Ethernet */
+ at91_add_device_eth(&chub_eth_data);
+ /* SPI */
+ at91_add_device_spi(chub_spi_devices, ARRAY_SIZE(chub_spi_devices));
+ /* NAND Flash */
+ at91_add_device_nand(&chub_nand_data);
+ /* Disable write protect for NAND */
+ at91_set_gpio_output(AT91_PIN_PB7, 1);
+ /* Power enable for 3x RS-232 and 1x RS-485 */
+ at91_set_gpio_output(AT91_PIN_PB9, 1);
+ /* Disable write protect for FRAM */
+ at91_set_gpio_output(AT91_PIN_PA21, 1);
+ /* Disable write protect for Dataflash */
+ at91_set_gpio_output(AT91_PIN_PA19, 1);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+MACHINE_START(CHUB, "Promwad Chub")
+ /* Maintainer: Ivan Kuten AT Promwad DOT com */
+ .phys_io = AT91_BASE_SYS,
+ .io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
+ .boot_params = AT91_SDRAM_BASE + 0x100,
+ .timer = &at91rm9200_timer,
+ .map_io = chub_map_io,
+ .init_irq = chub_init_irq,
+ .init_machine = chub_board_init,
+MACHINE_END
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-csb337.c linux-2.6.22-rc5.new/arch/arm/mach-at91/board-csb337.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/board-csb337.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/board-csb337.c 2007-07-29 05:23:04.000000000 +0200
@@ -24,6 +24,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
+#include <linux/interrupt.h>
#include <linux/mtd/physmap.h>
#include <asm/hardware.h>
@@ -59,6 +60,7 @@
/* Setup the LEDs */
at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
+ at91_set_gpio_output(AT91_PIN_PB2, 1); /* third (unused) LED */
/* Setup the serial ports and console */
at91_init_serial(&csb337_uart_config);
@@ -149,6 +151,55 @@
.num_resources = ARRAY_SIZE(csb_flash_resources),
};
+static struct at91_gpio_led csb337_leds[] = {
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ {
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ .name = "led0",
+ .gpio = AT91_PIN_PB0,
+ .trigger = "heartbeat",
+ },
+ {
+ .name = "led1",
+ .gpio = AT91_PIN_PB1,
+ .trigger = "timer",
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ },
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ {
+ .name = "led2",
+ .gpio = AT91_PIN_PB2,
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+};
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#if defined(CONFIG_CSB300_WAKE_SW0) || defined(CONFIG_CSB300_WAKE_SW1)
+static irqreturn_t switch_irq_handler(int irq, void *context)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return IRQ_HANDLED;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static inline void __init switch_irq_setup(int irq, char *name, unsigned long mode)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ int res;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ res = request_irq(irq, switch_irq_handler, IRQF_SAMPLE_RANDOM | mode, name, NULL);
+ if (res == 0)
+ enable_irq_wake(irq);
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __init csb300_switches(void)
+{
+#ifdef CONFIG_CSB300_WAKE_SW0
+ at91_set_A_periph(AT91_PIN_PB29, 1); /* IRQ0 */
+ switch_irq_setup(AT91RM9200_ID_IRQ0, "csb300_sw0", IRQF_TRIGGER_FALLING);
+#endif
+#ifdef CONFIG_CSB300_WAKE_SW1
+ at91_set_gpio_input(AT91_PIN_PB28, 1);
+ at91_set_deglitch(AT91_PIN_PB28, 1);
+ switch_irq_setup(AT91_PIN_PB28, "csb300_sw1", IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING);
+#endif
+ /* there's also SW2 at PA21, GPIO or TIOA2 */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+#else
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __init csb300_switches(void) {}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+#endif
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
static void __init csb337_board_init(void)
{
/* Serial */
@@ -168,8 +219,12 @@
at91_add_device_spi(csb337_spi_devices, ARRAY_SIZE(csb337_spi_devices));
/* MMC */
at91_add_device_mmc(0, &csb337_mmc_data);
+ /* LEDS */
+ at91_gpio_leds(csb337_leds, ARRAY_SIZE(csb337_leds));
/* NOR flash */
platform_device_register(&csb_flash);
+ /* Switches on CSB300 */
+ csb300_switches();
}
MACHINE_START(CSB337, "Cogent CSB337")
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-dk.c linux-2.6.22-rc5.new/arch/arm/mach-at91/board-dk.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/board-dk.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/board-dk.c 2007-07-29 05:23:04.000000000 +0200
@@ -73,6 +73,185 @@
at91rm9200_init_interrupts(NULL);
}
+#if defined(CONFIG_FB_S1D13XXX) || defined(CONFIG_FB_S1D13XXX_MODULE)
+#include <video/s1d13xxxfb.h>
+#include <asm/arch/ics1523.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* EPSON S1D13806 FB */
+#define AT91_FB_REG_BASE 0x30000000L
+#define AT91_FB_REG_SIZE 0x200
+#define AT91_FB_VMEM_BASE 0x30200000L
+#define AT91_FB_VMEM_SIZE 0x140000L
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __init dk_init_video(void)
+{
+ /* NWAIT Signal */
+ at91_set_A_periph(AT91_PIN_PC6, 0);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Initialization of the Static Memory Controller for Chip Select 2 */
+ at91_sys_write(AT91_SMC_CSR(2), AT91_SMC_DBW_16 /* 16 bit */
+ | AT91_SMC_WSEN | AT91_SMC_NWS_(4) /* wait states */
+ | AT91_SMC_TDF_(1) /* float time */
+ );
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ at91_ics1523_init();
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* CRT: (active) 640x480 60Hz (PCLK=CLKI=25.175MHz)
+ Memory: Embedded SDRAM (MCLK=CLKI3=50.000MHz) (BUSCLK=60.000MHz) */
+static const struct s1d13xxxfb_regval dk_s1dfb_initregs[] = {
+ {S1DREG_MISC, 0x00}, /* Enable Memory/Register select bit */
+ {S1DREG_COM_DISP_MODE, 0x00}, /* disable display output */
+ {S1DREG_GPIO_CNF0, 0x00},
+ {S1DREG_GPIO_CNF1, 0x00},
+ {S1DREG_GPIO_CTL0, 0x08},
+ {S1DREG_GPIO_CTL1, 0x00},
+ {S1DREG_CLK_CNF, 0x01}, /* no divide, MCLK source is CLKI3 0x02*/
+ {S1DREG_LCD_CLK_CNF, 0x00},
+ {S1DREG_CRT_CLK_CNF, 0x00},
+ {S1DREG_MPLUG_CLK_CNF, 0x00},
+ {S1DREG_CPU2MEM_WST_SEL, 0x01}, /* 2*period(MCLK) - 4ns > period(BCLK) */
+ {S1DREG_SDRAM_REF_RATE, 0x03}, /* 32768 <= MCLK <= 50000 (MHz) */
+ {S1DREG_SDRAM_TC0, 0x00}, /* MCLK source freq (MHz): */
+ {S1DREG_SDRAM_TC1, 0x01}, /* 42 <= MCLK <= 50 */
+ {S1DREG_MEM_CNF, 0x80}, /* SDRAM Initialization - needed before mem access */
+ {S1DREG_PANEL_TYPE, 0x25}, /* std TFT 16bit, 8bit SCP format 2, single passive LCD */
+ {S1DREG_MOD_RATE, 0x00}, /* toggle every FPFRAME */
+ {S1DREG_LCD_DISP_HWIDTH, 0x4F}, /* 680 pix */
+ {S1DREG_LCD_NDISP_HPER, 0x12}, /* 152 pix */
+ {S1DREG_TFT_FPLINE_START, 0x01}, /* 13 pix */
+ {S1DREG_TFT_FPLINE_PWIDTH, 0x0B}, /* 96 pix */
+ {S1DREG_LCD_DISP_VHEIGHT0, 0xDF},
+ {S1DREG_LCD_DISP_VHEIGHT1, 0x01}, /* 480 lines */
+ {S1DREG_LCD_NDISP_VPER, 0x2C}, /* 44 lines */
+ {S1DREG_TFT_FPFRAME_START, 0x0A}, /* 10 lines */
+ {S1DREG_TFT_FPFRAME_PWIDTH, 0x01}, /* 2 lines */
+ {S1DREG_LCD_DISP_MODE, 0x05}, /* 16 bpp */
+ {S1DREG_LCD_MISC, 0x00}, /* dithering enabled, dual panel buffer enabled */
+ {S1DREG_LCD_DISP_START0, 0x00},
+ {S1DREG_LCD_DISP_START1, 0xC8},
+ {S1DREG_LCD_DISP_START2, 0x00},
+ {S1DREG_LCD_MEM_OFF0, 0x80},
+ {S1DREG_LCD_MEM_OFF1, 0x02},
+ {S1DREG_LCD_PIX_PAN, 0x00},
+ {S1DREG_LCD_DISP_FIFO_HTC, 0x3B},
+ {S1DREG_LCD_DISP_FIFO_LTC, 0x3C},
+ {S1DREG_CRT_DISP_HWIDTH, 0x4F}, /* 680 pix */
+ {S1DREG_CRT_NDISP_HPER, 0x13}, /* 160 pix */
+ {S1DREG_CRT_HRTC_START, 0x01}, /* 13 pix */
+ {S1DREG_CRT_HRTC_PWIDTH, 0x0B}, /* 96 pix */
+ {S1DREG_CRT_DISP_VHEIGHT0, 0xDF},
+ {S1DREG_CRT_DISP_VHEIGHT1, 0x01}, /* 480 lines */
+ {S1DREG_CRT_NDISP_VPER, 0x2B}, /* 44 lines */
+ {S1DREG_CRT_VRTC_START, 0x09}, /* 10 lines */
+ {S1DREG_CRT_VRTC_PWIDTH, 0x01}, /* 2 lines */
+ {S1DREG_TV_OUT_CTL, 0x10},
+ {S1DREG_CRT_DISP_MODE, 0x05}, /* 16 bpp */
+ {S1DREG_CRT_DISP_START0, 0x00},
+ {S1DREG_CRT_DISP_START1, 0x00},
+ {S1DREG_CRT_DISP_START2, 0x00},
+ {S1DREG_CRT_MEM_OFF0, 0x80},
+ {S1DREG_CRT_MEM_OFF1, 0x02},
+ {S1DREG_CRT_PIX_PAN, 0x00},
+ {S1DREG_CRT_DISP_FIFO_HTC, 0x3B},
+ {S1DREG_CRT_DISP_FIFO_LTC, 0x3C},
+ {S1DREG_LCD_CUR_CTL, 0x00}, /* inactive */
+ {S1DREG_LCD_CUR_START, 0x01},
+ {S1DREG_LCD_CUR_XPOS0, 0x00},
+ {S1DREG_LCD_CUR_XPOS1, 0x00},
+ {S1DREG_LCD_CUR_YPOS0, 0x00},
+ {S1DREG_LCD_CUR_YPOS1, 0x00},
+ {S1DREG_LCD_CUR_BCTL0, 0x00},
+ {S1DREG_LCD_CUR_GCTL0, 0x00},
+ {S1DREG_LCD_CUR_RCTL0, 0x00},
+ {S1DREG_LCD_CUR_BCTL1, 0x1F},
+ {S1DREG_LCD_CUR_GCTL1, 0x3F},
+ {S1DREG_LCD_CUR_RCTL1, 0x1F},
+ {S1DREG_LCD_CUR_FIFO_HTC, 0x00},
+ {S1DREG_CRT_CUR_CTL, 0x00}, /* inactive */
+ {S1DREG_CRT_CUR_START, 0x01},
+ {S1DREG_CRT_CUR_XPOS0, 0x00},
+ {S1DREG_CRT_CUR_XPOS1, 0x00},
+ {S1DREG_CRT_CUR_YPOS0, 0x00},
+ {S1DREG_CRT_CUR_YPOS1, 0x00},
+ {S1DREG_CRT_CUR_BCTL0, 0x00},
+ {S1DREG_CRT_CUR_GCTL0, 0x00},
+ {S1DREG_CRT_CUR_RCTL0, 0x00},
+ {S1DREG_CRT_CUR_BCTL1, 0x1F},
+ {S1DREG_CRT_CUR_GCTL1, 0x3F},
+ {S1DREG_CRT_CUR_RCTL1, 0x1F},
+ {S1DREG_CRT_CUR_FIFO_HTC, 0x00},
+ {S1DREG_BBLT_CTL0, 0x00},
+ {S1DREG_BBLT_CTL0, 0x00},
+ {S1DREG_BBLT_CC_EXP, 0x00},
+ {S1DREG_BBLT_OP, 0x00},
+ {S1DREG_BBLT_SRC_START0, 0x00},
+ {S1DREG_BBLT_SRC_START1, 0x00},
+ {S1DREG_BBLT_SRC_START2, 0x00},
+ {S1DREG_BBLT_DST_START0, 0x00},
+ {S1DREG_BBLT_DST_START1, 0x00},
+ {S1DREG_BBLT_DST_START2, 0x00},
+ {S1DREG_BBLT_MEM_OFF0, 0x00},
+ {S1DREG_BBLT_MEM_OFF1, 0x00},
+ {S1DREG_BBLT_WIDTH0, 0x00},
+ {S1DREG_BBLT_WIDTH1, 0x00},
+ {S1DREG_BBLT_HEIGHT0, 0x00},
+ {S1DREG_BBLT_HEIGHT1, 0x00},
+ {S1DREG_BBLT_BGC0, 0x00},
+ {S1DREG_BBLT_BGC1, 0x00},
+ {S1DREG_BBLT_FGC0, 0x00},
+ {S1DREG_BBLT_FGC1, 0x00},
+ {S1DREG_LKUP_MODE, 0x00}, /* LCD LUT r | LCD and CRT/TV LUT w */
+ {S1DREG_LKUP_ADDR, 0x00},
+ {S1DREG_PS_CNF, 0x00}, /* Power Save disable */
+ {S1DREG_PS_STATUS, 0x02}, /* LCD Panel down, mem up */
+ {S1DREG_CPU2MEM_WDOGT, 0x00},
+ {S1DREG_COM_DISP_MODE, 0x02}, /* enable CRT display output */
+};
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct s1d13xxxfb_pdata dk_s1dfb_pdata = {
+ .initregs = dk_s1dfb_initregs,
+ .initregssize = ARRAY_SIZE(dk_s1dfb_initregs),
+ .platform_init_video = dk_init_video,
+};
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static u64 s1dfb_dmamask = 0xffffffffUL;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct resource dk_s1dfb_resource[] = {
+ [0] = { /* video mem */
+ .name = "s1d13806 memory",
+ .start = AT91_FB_VMEM_BASE,
+ .end = AT91_FB_VMEM_BASE + AT91_FB_VMEM_SIZE -1,
+ .flags = IORESOURCE_MEM,
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ },
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ [1] = { /* video registers */
+ .name = "s1d13806 registers",
+ .start = AT91_FB_REG_BASE,
+ .end = AT91_FB_REG_BASE + AT91_FB_REG_SIZE -1,
+ .flags = IORESOURCE_MEM,
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ },
+};
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct platform_device dk_s1dfb_device = {
+ .name = "s1d13806fb",
+ .id = -1,
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ .dev = {
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ .dma_mask = &s1dfb_dmamask,
+ .coherent_dma_mask = 0xffffffff,
+ .platform_data = &dk_s1dfb_pdata,
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ },
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ .resource = dk_s1dfb_resource,
+ .num_resources = ARRAY_SIZE(dk_s1dfb_resource),
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+};
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __init dk_add_device_video(void)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ platform_device_register(&dk_s1dfb_device);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+#else
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __init dk_add_device_video(void) {}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+#endif
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
static struct at91_eth_data __initdata dk_eth_data = {
.phy_irq_pin = AT91_PIN_PC4,
.is_rmii = 1,
@@ -151,7 +330,7 @@
#define DK_FLASH_SIZE 0x200000
static struct physmap_flash_data dk_flash_data = {
- .width = 2,
+ .width = 2,
};
static struct resource dk_flash_resource = {
@@ -170,6 +349,13 @@
.num_resources = 1,
};
+static struct at91_gpio_led dk_leds[] = {
+ {
+ .name = "led0",
+ .gpio = AT91_PIN_PB2,
+ .trigger = "timer",
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+};
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
static void __init dk_board_init(void)
{
@@ -200,8 +386,10 @@
at91_add_device_nand(&dk_nand_data);
/* NOR Flash */
platform_device_register(&dk_flash);
+ /* LEDs */
+ at91_gpio_leds(dk_leds, ARRAY_SIZE(dk_leds));
/* VGA */
-// dk_add_device_video();
+ dk_add_device_video();
}
MACHINE_START(AT91RM9200DK, "Atmel AT91RM9200-DK")
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-ek.c linux-2.6.22-rc5.new/arch/arm/mach-at91/board-ek.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/board-ek.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/board-ek.c 2007-07-29 05:23:04.000000000 +0200
@@ -73,6 +73,187 @@
at91rm9200_init_interrupts(NULL);
}
+#if defined(CONFIG_FB_S1D13XXX) || defined(CONFIG_FB_S1D13XXX_MODULE)
+#include <video/s1d13xxxfb.h>
+#include <asm/arch/ics1523.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* EPSON S1D13806 FB */
+#define AT91_FB_REG_BASE 0x40000000L
+#define AT91_FB_REG_SIZE 0x200
+#define AT91_FB_VMEM_BASE 0x40200000L
+#define AT91_FB_VMEM_SIZE 0x140000L
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __init ek_init_video(void)
+{
+ /* NWAIT Signal */
+ at91_set_A_periph(AT91_PIN_PC6, 0);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Initialization of the Static Memory Controller for Chip Select 3 */
+ at91_sys_write(AT91_SMC_CSR(3), AT91_SMC_DBW_16 /* 16 bit */
+ | AT91_SMC_WSEN | AT91_SMC_NWS_(5) /* wait states */
+ | AT91_SMC_TDF_(1) /* float time */
+ );
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ at91_ics1523_init();
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* CRT: (active) 640x480 60Hz (PCLK=CLKI=25.175MHz)
+ Memory: Embedded SDRAM (MCLK=CLKI3=50.000MHz) (BUSCLK=60.000MHz) */
+static const struct s1d13xxxfb_regval ek_s1dfb_initregs[] = {
+ {S1DREG_MISC, 0x00}, /* Enable Memory/Register select bit */
+ {S1DREG_COM_DISP_MODE, 0x00}, /* disable display output */
+ {S1DREG_GPIO_CNF0, 0xFF}, // 0x00
+ {S1DREG_GPIO_CNF1, 0x1F}, // 0x08
+ {S1DREG_GPIO_CTL0, 0x00},
+ {S1DREG_GPIO_CTL1, 0x00},
+ {S1DREG_CLK_CNF, 0x01}, /* no divide, MCLK source is CLKI3 0x02*/
+ {S1DREG_LCD_CLK_CNF, 0x00},
+ {S1DREG_CRT_CLK_CNF, 0x00},
+ {S1DREG_MPLUG_CLK_CNF, 0x00},
+ {S1DREG_CPU2MEM_WST_SEL, 0x01}, /* 2*period(MCLK) - 4ns > period(BCLK) */
+ {S1DREG_SDRAM_REF_RATE, 0x03}, /* 32768 <= MCLK <= 50000 (MHz) */
+ {S1DREG_SDRAM_TC0, 0x00}, /* MCLK source freq (MHz): */
+ {S1DREG_SDRAM_TC1, 0x01}, /* 42 <= MCLK <= 50 */
+ {S1DREG_MEM_CNF, 0x80}, /* SDRAM Initialization - needed before mem access */
+ {S1DREG_PANEL_TYPE, 0x25}, /* std TFT 16bit, 8bit SCP format 2, single passive LCD */
+ {S1DREG_MOD_RATE, 0x00}, /* toggle every FPFRAME */
+ {S1DREG_LCD_DISP_HWIDTH, 0x4F}, /* 680 pix */
+ {S1DREG_LCD_NDISP_HPER, 0x12}, /* 152 pix */
+ {S1DREG_TFT_FPLINE_START, 0x01}, /* 13 pix */
+ {S1DREG_TFT_FPLINE_PWIDTH, 0x0B}, /* 96 pix */
+ {S1DREG_LCD_DISP_VHEIGHT0, 0xDF},
+ {S1DREG_LCD_DISP_VHEIGHT1, 0x01}, /* 480 lines */
+ {S1DREG_LCD_NDISP_VPER, 0x2C}, /* 44 lines */
+ {S1DREG_TFT_FPFRAME_START, 0x0A}, /* 10 lines */
+ {S1DREG_TFT_FPFRAME_PWIDTH, 0x01}, /* 2 lines */
+ {S1DREG_LCD_DISP_MODE, 0x05}, /* 16 bpp */
+ {S1DREG_LCD_MISC, 0x00}, /* dithering enabled, dual panel buffer enabled */
+ {S1DREG_LCD_DISP_START0, 0x00},
+ {S1DREG_LCD_DISP_START1, 0xC8},
+ {S1DREG_LCD_DISP_START2, 0x00},
+ {S1DREG_LCD_MEM_OFF0, 0x80},
+ {S1DREG_LCD_MEM_OFF1, 0x02},
+ {S1DREG_LCD_PIX_PAN, 0x00},
+ {S1DREG_LCD_DISP_FIFO_HTC, 0x3B},
+ {S1DREG_LCD_DISP_FIFO_LTC, 0x3C},
+ {S1DREG_CRT_DISP_HWIDTH, 0x4F}, /* 680 pix */
+ {S1DREG_CRT_NDISP_HPER, 0x13}, /* 160 pix */
+ {S1DREG_CRT_HRTC_START, 0x01}, /* 13 pix */
+ {S1DREG_CRT_HRTC_PWIDTH, 0x0B}, /* 96 pix */
+ {S1DREG_CRT_DISP_VHEIGHT0, 0xDF},
+ {S1DREG_CRT_DISP_VHEIGHT1, 0x01}, /* 480 lines */
+ {S1DREG_CRT_NDISP_VPER, 0x2B}, /* 44 lines */
+ {S1DREG_CRT_VRTC_START, 0x09}, /* 10 lines */
+ {S1DREG_CRT_VRTC_PWIDTH, 0x01}, /* 2 lines */
+ {S1DREG_TV_OUT_CTL, 0x10},
+ {0x005E, 0x9F},
+ {0x005F, 0x00},
+ {S1DREG_CRT_DISP_MODE, 0x05}, /* 16 bpp */
+ {S1DREG_CRT_DISP_START0, 0x00},
+ {S1DREG_CRT_DISP_START1, 0x00},
+ {S1DREG_CRT_DISP_START2, 0x00},
+ {S1DREG_CRT_MEM_OFF0, 0x80},
+ {S1DREG_CRT_MEM_OFF1, 0x02},
+ {S1DREG_CRT_PIX_PAN, 0x00},
+ {S1DREG_CRT_DISP_FIFO_HTC, 0x3B},
+ {S1DREG_CRT_DISP_FIFO_LTC, 0x3C},
+ {S1DREG_LCD_CUR_CTL, 0x00}, /* inactive */
+ {S1DREG_LCD_CUR_START, 0x01},
+ {S1DREG_LCD_CUR_XPOS0, 0x00},
+ {S1DREG_LCD_CUR_XPOS1, 0x00},
+ {S1DREG_LCD_CUR_YPOS0, 0x00},
+ {S1DREG_LCD_CUR_YPOS1, 0x00},
+ {S1DREG_LCD_CUR_BCTL0, 0x00},
+ {S1DREG_LCD_CUR_GCTL0, 0x00},
+ {S1DREG_LCD_CUR_RCTL0, 0x00},
+ {S1DREG_LCD_CUR_BCTL1, 0x1F},
+ {S1DREG_LCD_CUR_GCTL1, 0x3F},
+ {S1DREG_LCD_CUR_RCTL1, 0x1F},
+ {S1DREG_LCD_CUR_FIFO_HTC, 0x00},
+ {S1DREG_CRT_CUR_CTL, 0x00}, /* inactive */
+ {S1DREG_CRT_CUR_START, 0x01},
+ {S1DREG_CRT_CUR_XPOS0, 0x00},
+ {S1DREG_CRT_CUR_XPOS1, 0x00},
+ {S1DREG_CRT_CUR_YPOS0, 0x00},
+ {S1DREG_CRT_CUR_YPOS1, 0x00},
+ {S1DREG_CRT_CUR_BCTL0, 0x00},
+ {S1DREG_CRT_CUR_GCTL0, 0x00},
+ {S1DREG_CRT_CUR_RCTL0, 0x00},
+ {S1DREG_CRT_CUR_BCTL1, 0x1F},
+ {S1DREG_CRT_CUR_GCTL1, 0x3F},
+ {S1DREG_CRT_CUR_RCTL1, 0x1F},
+ {S1DREG_CRT_CUR_FIFO_HTC, 0x00},
+ {S1DREG_BBLT_CTL0, 0x00},
+ {S1DREG_BBLT_CTL0, 0x00},
+ {S1DREG_BBLT_CC_EXP, 0x00},
+ {S1DREG_BBLT_OP, 0x00},
+ {S1DREG_BBLT_SRC_START0, 0x00},
+ {S1DREG_BBLT_SRC_START1, 0x00},
+ {S1DREG_BBLT_SRC_START2, 0x00},
+ {S1DREG_BBLT_DST_START0, 0x00},
+ {S1DREG_BBLT_DST_START1, 0x00},
+ {S1DREG_BBLT_DST_START2, 0x00},
+ {S1DREG_BBLT_MEM_OFF0, 0x00},
+ {S1DREG_BBLT_MEM_OFF1, 0x00},
+ {S1DREG_BBLT_WIDTH0, 0x00},
+ {S1DREG_BBLT_WIDTH1, 0x00},
+ {S1DREG_BBLT_HEIGHT0, 0x00},
+ {S1DREG_BBLT_HEIGHT1, 0x00},
+ {S1DREG_BBLT_BGC0, 0x00},
+ {S1DREG_BBLT_BGC1, 0x00},
+ {S1DREG_BBLT_FGC0, 0x00},
+ {S1DREG_BBLT_FGC1, 0x00},
+ {S1DREG_LKUP_MODE, 0x00}, /* LCD LUT r | LCD and CRT/TV LUT w */
+ {S1DREG_LKUP_ADDR, 0x00},
+ {S1DREG_PS_CNF, 0x10}, /* Power Save disable */
+ {S1DREG_PS_STATUS, 0x02}, /* LCD Panel down, mem up */
+ {S1DREG_CPU2MEM_WDOGT, 0x00},
+ {S1DREG_COM_DISP_MODE, 0x02}, /* enable CRT display output */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+};
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct s1d13xxxfb_pdata ek_s1dfb_pdata = {
+ .initregs = ek_s1dfb_initregs,
+ .initregssize = ARRAY_SIZE(ek_s1dfb_initregs),
+ .platform_init_video = ek_init_video,
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+};
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static u64 s1dfb_dmamask = 0xffffffffUL;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct resource ek_s1dfb_resource[] = {
+ [0] = { /* video mem */
+ .name = "s1d13806 memory",
+ .start = AT91_FB_VMEM_BASE,
+ .end = AT91_FB_VMEM_BASE + AT91_FB_VMEM_SIZE -1,
+ .flags = IORESOURCE_MEM,
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ },
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ [1] = { /* video registers */
+ .name = "s1d13806 registers",
+ .start = AT91_FB_REG_BASE,
+ .end = AT91_FB_REG_BASE + AT91_FB_REG_SIZE -1,
+ .flags = IORESOURCE_MEM,
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ },
+};
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct platform_device ek_s1dfb_device = {
+ .name = "s1d13806fb",
+ .id = -1,
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ .dev = {
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ .dma_mask = &s1dfb_dmamask,
+ .coherent_dma_mask = 0xffffffff,
+ .platform_data = &ek_s1dfb_pdata,
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ },
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ .resource = ek_s1dfb_resource,
+ .num_resources = ARRAY_SIZE(ek_s1dfb_resource),
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+};
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __init ek_add_device_video(void)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ platform_device_register(&ek_s1dfb_device);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#else
+static void __init ek_add_device_video(void) {}
+#endif
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
static struct at91_eth_data __initdata ek_eth_data = {
.phy_irq_pin = AT91_PIN_PC4,
.is_rmii = 1,
@@ -113,7 +294,7 @@
#define EK_FLASH_SIZE 0x200000
static struct physmap_flash_data ek_flash_data = {
- .width = 2,
+ .width = 2,
};
static struct resource ek_flash_resource = {
@@ -132,6 +313,18 @@
.num_resources = 1,
};
+static struct at91_gpio_led ek_leds[] = {
+ {
+ .name = "led0",
+ .gpio = AT91_PIN_PB1,
+ .trigger = "heartbeat",
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ },
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ {
+ .name = "led1",
+ .gpio = AT91_PIN_PB2,
+ .trigger = "timer",
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+};
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
static void __init ek_board_init(void)
{
@@ -158,8 +351,10 @@
#endif
/* NOR Flash */
platform_device_register(&ek_flash);
+ /* LEDs */
+ at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
/* VGA */
-// ek_add_device_video();
+ ek_add_device_video();
}
MACHINE_START(AT91RM9200EK, "Atmel AT91RM9200-EK")
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-kb9202.c linux-2.6.22-rc5.new/arch/arm/mach-at91/board-kb9202.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/board-kb9202.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/board-kb9202.c 2007-07-29 05:23:04.000000000 +0200
@@ -37,6 +37,8 @@
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
+#include <asm/arch/at91rm9200_mc.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
#include "generic.h"
@@ -111,6 +113,48 @@
.partition_info = nand_partitions,
};
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#if defined(CONFIG_FB_S1D15605)
+#warning "Rather pass reset pin via platform_data"
+static struct resource kb9202_lcd_resources[] = {
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ [0] = {
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ .start = AT91_CHIPSELECT_2,
+ .end = AT91_CHIPSELECT_2 + 0x200FF,
+ .flags = IORESOURCE_MEM
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ },
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ [1] = { /* reset pin */
+ .start = AT91_PIN_PC22,
+ .end = AT91_PIN_PC22,
+ .flags = IORESOURCE_MEM
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ },
+};
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct platform_device kb9202_lcd_device = {
+ .name = "s1d15605fb",
+ .id = 0,
+ .num_resources = ARRAY_SIZE(kb9202_lcd_resources),
+ .resource = kb9202_lcd_resources,
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+};
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __init kb9202_add_device_lcd(void)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* In case the boot loader did not set the chip select mode and timing */
+ at91_sys_write(AT91_SMC_CSR(2),
+ AT91_SMC_WSEN | AT91_SMC_NWS_(18) | AT91_SMC_TDF_(1) | AT91_SMC_DBW_8 |
+ AT91_SMC_RWSETUP_(1) | AT91_SMC_RWHOLD_(1));
+
+ /* Backlight pin = output, off */
+ at91_set_gpio_output(AT91_PIN_PC23, 0);
+
+ /* Reset pin = output, in reset */
+ at91_set_gpio_output(AT91_PIN_PC22, 0);
+
+ platform_device_register(&kb9202_lcd_device);
+}
+#else
+static void __init kb9202_add_device_lcd(void) {}
+#endif
+
static void __init kb9202_board_init(void)
{
/* Serial */
@@ -129,6 +173,8 @@
at91_add_device_spi(NULL, 0);
/* NAND */
at91_add_device_nand(&kb9202_nand_data);
+ /* LCD */
+ kb9202_add_device_lcd();
}
MACHINE_START(KB9200, "KB920x")
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-sam9261ek.c linux-2.6.22-rc5.new/arch/arm/mach-at91/board-sam9261ek.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/board-sam9261ek.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/board-sam9261ek.c 2007-07-29 05:23:04.000000000 +0200
@@ -27,6 +27,9 @@
#include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
#include <linux/dm9000.h>
+#include <linux/fb.h>
+
+#include <video/atmel_lcdc.h>
#include <asm/hardware.h>
#include <asm/setup.h>
@@ -251,6 +254,7 @@
.bus_num = 0,
.platform_data = &ads_info,
.irq = AT91SAM9261_ID_IRQ0,
+ .controller_data = AT91_PIN_PA28, /* CS pin */
},
#endif
#if defined(CONFIG_MTD_AT91_DATAFLASH_CARD)
@@ -271,6 +275,65 @@
};
+/*
+ * LCD Controller
+ */
+#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)
+static struct fb_videomode at91_tft_vga_modes[] = {
+ {
+ .name = "TX09D50VM1CCA @ 60",
+ .refresh = 60,
+ .xres = 240, .yres = 320,
+ .pixclock = KHZ2PICOS(4965),
+
+ .left_margin = 1, .right_margin = 33,
+ .upper_margin = 1, .lower_margin = 0,
+ .hsync_len = 5, .vsync_len = 1,
+
+ .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+ .vmode = FB_VMODE_NONINTERLACED,
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ },
+};
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct fb_monspecs at91fb_default_monspecs = {
+ .manufacturer = "HIT",
+ .monitor = "TX09D50VM1CCA",
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ .modedb = at91_tft_vga_modes,
+ .modedb_len = ARRAY_SIZE(at91_tft_vga_modes),
+ .hfmin = 15000,
+ .hfmax = 64000,
+ .vfmin = 50,
+ .vfmax = 150,
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+};
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define AT91SAM9261_DEFAULT_LCDCON2 (ATMEL_LCDC_MEMOR_LITTLE \
+ | ATMEL_LCDC_DISTYPE_TFT \
+ | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE)
+
+static void at91_lcdc_power_control(int on)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (on)
+ at91_set_gpio_value(AT91_PIN_PA12, 0); /* power up */
+ else
+ at91_set_gpio_value(AT91_PIN_PA12, 1); /* power down */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* Driver datas */
+static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
+ .default_bpp = 16,
+ .default_dmacon = ATMEL_LCDC_DMAEN,
+ .default_lcdcon2 = AT91SAM9261_DEFAULT_LCDCON2,
+ .default_monspecs = &at91fb_default_monspecs,
+ .atmel_lcdfb_power_control = at91_lcdc_power_control,
+ .guard_time = 1,
+};
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#else
+static struct atmel_lcdfb_info __initdata ek_lcdc_data;
+#endif
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
static void __init ek_board_init(void)
{
/* Serial */
@@ -296,6 +359,8 @@
/* MMC */
at91_add_device_mmc(0, &ek_mmc_data);
#endif
+ /* LCD Controller */
+ at91_add_device_lcdc(&ek_lcdc_data);
}
MACHINE_START(AT91SAM9261EK, "Atmel AT91SAM9261-EK")
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-sam9263ek.c linux-2.6.22-rc5.new/arch/arm/mach-at91/board-sam9263ek.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/board-sam9263ek.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/board-sam9263ek.c 2007-07-29 05:23:04.000000000 +0200
@@ -26,6 +26,9 @@
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
+#include <linux/fb.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <video/atmel_lcdc.h>
#include <asm/hardware.h>
#include <asm/setup.h>
@@ -202,6 +205,65 @@
/*
+ * LCD Controller
+ */
+#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)
+static struct fb_videomode at91_tft_vga_modes[] = {
+ {
+ .name = "TX09D50VM1CCA @ 60",
+ .refresh = 60,
+ .xres = 240, .yres = 320,
+ .pixclock = KHZ2PICOS(4965),
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ .left_margin = 1, .right_margin = 33,
+ .upper_margin = 1, .lower_margin = 0,
+ .hsync_len = 5, .vsync_len = 1,
+
+ .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+ .vmode = FB_VMODE_NONINTERLACED,
+ },
+};
+
+static struct fb_monspecs at91fb_default_monspecs = {
+ .manufacturer = "HIT",
+ .monitor = "TX09D70VM1CCA",
+
+ .modedb = at91_tft_vga_modes,
+ .modedb_len = ARRAY_SIZE(at91_tft_vga_modes),
+ .hfmin = 15000,
+ .hfmax = 64000,
+ .vfmin = 50,
+ .vfmax = 150,
+};
+
+#define AT91SAM9263_DEFAULT_LCDCON2 (ATMEL_LCDC_MEMOR_LITTLE \
+ | ATMEL_LCDC_DISTYPE_TFT \
+ | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE)
+
+static void at91_lcdc_power_control(int on)
+{
+ if (on)
+ at91_set_gpio_value(AT91_PIN_PD12, 0); /* power up */
+ else
+ at91_set_gpio_value(AT91_PIN_PD12, 1); /* power down */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+
+/* Driver datas */
+static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
+ .default_bpp = 16,
+ .default_dmacon = ATMEL_LCDC_DMAEN,
+ .default_lcdcon2 = AT91SAM9263_DEFAULT_LCDCON2,
+ .default_monspecs = &at91fb_default_monspecs,
+ .atmel_lcdfb_power_control = at91_lcdc_power_control,
+ .guard_time = 1,
+};
+
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+#else
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct atmel_lcdfb_info __initdata ek_lcdc_data;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+#endif
+
+
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
* AC97
*/
static struct atmel_ac97_data ek_ac97_data = {
@@ -230,6 +292,8 @@
at91_add_device_nand(&ek_nand_data);
/* I2C */
at91_add_device_i2c();
+ /* LCD Controller */
+ at91_add_device_lcdc(&ek_lcdc_data);
/* AC97 */
at91_add_device_ac97(&ek_ac97_data);
}
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/clock.c linux-2.6.22-rc5.new/arch/arm/mach-at91/clock.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/clock.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/clock.c 2007-07-29 05:23:04.000000000 +0200
@@ -32,6 +32,7 @@
#include <asm/arch/cpu.h>
#include "clock.h"
+#include "generic.h"
/*
@@ -254,6 +255,23 @@
/*------------------------------------------------------------------------*/
+#ifdef CONFIG_PM
+
+int clk_must_disable(struct clk *clk)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (!at91_suspend_entering_slow_clock())
+ return 0;
+
+ while (clk->parent)
+ clk = clk->parent;
+ return clk != &clk32k;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+EXPORT_SYMBOL(clk_must_disable);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#endif
+
+/*------------------------------------------------------------------------*/
+
#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
/*
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/generic.h linux-2.6.22-rc5.new/arch/arm/mach-at91/generic.h
--- linux-2.6.22-rc5/arch/arm/mach-at91/generic.h 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/generic.h 2007-07-29 05:23:04.000000000 +0200
@@ -36,6 +36,7 @@
/* Power Management */
extern void at91_irq_suspend(void);
extern void at91_irq_resume(void);
+extern int at91_suspend_entering_slow_clock(void);
/* GPIO */
#define AT91RM9200_PQFP 3 /* AT91RM9200 PQFP package has 3 banks */
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/ics1523.c linux-2.6.22-rc5.new/arch/arm/mach-at91/ics1523.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/ics1523.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/ics1523.c 2007-07-29 05:23:04.000000000 +0200
@@ -0,0 +1,207 @@
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * arch/arm/mach-at91rm9200/ics1523.c
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ *
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Copyright (C) 2003 ATMEL Rousset
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ *
+ * This program 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 of the License, or
+ * (at your option) any later version.
+ *
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ * This program 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; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ */
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#include <asm/hardware.h>
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <asm/io.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/init.h>
+
+#include <asm/arch/ics1523.h>
+#include <asm/arch/at91_twi.h>
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#include <asm/arch/gpio.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* TWI Errors */
+#define AT91_TWI_ERROR (AT91_TWI_NACK | AT91_TWI_UNRE | AT91_TWI_OVRE)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __iomem *twi_base;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define at91_twi_read(reg) __raw_readl(twi_base + (reg))
+#define at91_twi_write(reg, val) __raw_writel((val), twi_base + (reg))
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* -----------------------------------------------------------------------------
+ * Initialization of TWI CLOCK
+ * ----------------------------------------------------------------------------- */
+
+static void at91_ics1523_SetTwiClock(unsigned int mck_khz)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ int sclock;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Here, CKDIV = 1 and CHDIV = CLDIV ==> CLDIV = CHDIV = 1/4*((Fmclk/FTWI) -6) */
+ sclock = (10*mck_khz / ICS_TRANSFER_RATE);
+ if (sclock % 10 >= 5)
+ sclock = (sclock /10) - 5;
+ else
+ sclock = (sclock /10)- 6;
+ sclock = (sclock + (4 - sclock %4)) >> 2; /* div 4 */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ at91_twi_write(AT91_TWI_CWGR, 0x00010000 | sclock | (sclock << 8));
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* -----------------------------------------------------------------------------
+ * Read a byte with TWI Interface from the Clock Generator ICS1523
+ * ----------------------------------------------------------------------------- */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int at91_ics1523_ReadByte(unsigned char reg_address, unsigned char *data_in)
+{
+ int Status, nb_trial;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ at91_twi_write(AT91_TWI_MMR, AT91_TWI_MREAD | AT91_TWI_IADRSZ_1 | ((ICS_ADDR << 16) & AT91_TWI_DADR));
+ at91_twi_write(AT91_TWI_IADR, reg_address);
+ at91_twi_write(AT91_TWI_CR, AT91_TWI_START | AT91_TWI_STOP);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Program temporizing period (300us) */
+ udelay(300);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Wait TXcomplete ... */
+ nb_trial = 0;
+ Status = at91_twi_read(AT91_TWI_SR);
+ while (!(Status & AT91_TWI_TXCOMP) && (nb_trial < 10)) {
+ nb_trial++;
+ Status = at91_twi_read(AT91_TWI_SR);
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (Status & AT91_TWI_TXCOMP) {
+ *data_in = (unsigned char) at91_twi_read(AT91_TWI_RHR);
+ return ICS1523_ACCESS_OK;
+ }
+ else
+ return ICS1523_ACCESS_ERROR;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* -----------------------------------------------------------------------------
+ * Write a byte with TWI Interface to the Clock Generator ICS1523
+ * ----------------------------------------------------------------------------- */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int at91_ics1523_WriteByte(unsigned char reg_address, unsigned char data_out)
+{
+ int Status, nb_trial;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ at91_twi_write(AT91_TWI_MMR, AT91_TWI_IADRSZ_1 | ((ICS_ADDR << 16) & AT91_TWI_DADR));
+ at91_twi_write(AT91_TWI_IADR, reg_address);
+ at91_twi_write(AT91_TWI_THR, data_out);
+ at91_twi_write(AT91_TWI_CR, AT91_TWI_START | AT91_TWI_STOP);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Program temporizing period (300us) */
+ udelay(300);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ nb_trial = 0;
+ Status = at91_twi_read(AT91_TWI_SR);
+ while (!(Status & AT91_TWI_TXCOMP) && (nb_trial < 10)) {
+ nb_trial++;
+ if (Status & AT91_TWI_ERROR) {
+ /* If Underrun OR NACK - Start again */
+ at91_twi_write(AT91_TWI_CR, AT91_TWI_START | AT91_TWI_STOP);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Program temporizing period (300us) */
+ udelay(300);
+ }
+ Status = at91_twi_read(AT91_TWI_SR);
+ };
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (Status & AT91_TWI_TXCOMP)
+ return ICS1523_ACCESS_OK;
+ else
+ return ICS1523_ACCESS_ERROR;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* -----------------------------------------------------------------------------
+ * Initialization of the Clock Generator ICS1523
+ * ----------------------------------------------------------------------------- */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+int at91_ics1523_init(void)
+{
+ int nb_trial;
+ int ack = ICS1523_ACCESS_OK;
+ unsigned int status = 0xffffffff;
+ struct clk *twi_clk;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Map in TWI peripheral */
+ twi_base = ioremap(AT91RM9200_BASE_TWI, SZ_16K);
+ if (!twi_base)
+ return -ENOMEM;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* pins used for TWI interface */
+ at91_set_A_periph(AT91_PIN_PA25, 0); /* TWD */
+ at91_set_multi_drive(AT91_PIN_PA25, 1);
+ at91_set_A_periph(AT91_PIN_PA26, 0); /* TWCK */
+ at91_set_multi_drive(AT91_PIN_PA26, 1);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Enable the TWI clock */
+ twi_clk = clk_get(NULL, "twi_clk");
+ if (IS_ERR(twi_clk))
+ return ICS1523_ACCESS_ERROR;
+ clk_enable(twi_clk);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Disable interrupts */
+ at91_twi_write(AT91_TWI_IDR, -1);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Reset peripheral */
+ at91_twi_write(AT91_TWI_CR, AT91_TWI_SWRST);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Set Master mode */
+ at91_twi_write(AT91_TWI_CR, AT91_TWI_MSEN);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Set TWI Clock Waveform Generator Register */
+ at91_ics1523_SetTwiClock(60000); /* MCK in KHz = 60000 KHz */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* ICS1523 Initialisation */
+ ack |= at91_ics1523_WriteByte ((unsigned char) ICS_ICR, (unsigned char) 0);
+ ack |= at91_ics1523_WriteByte ((unsigned char) ICS_OE, (unsigned char) (ICS_OEF | ICS_OET2 | ICS_OETCK));
+ ack |= at91_ics1523_WriteByte ((unsigned char) ICS_OD, (unsigned char) (ICS_INSEL | 0x7F));
+ ack |= at91_ics1523_WriteByte ((unsigned char) ICS_DPAO, (unsigned char) 0);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ nb_trial = 0;
+ do {
+ nb_trial++;
+ ack |= at91_ics1523_WriteByte ((unsigned char) ICS_ICR, (unsigned char) (ICS_ENDLS | ICS_ENPLS | ICS_PDEN /*| ICS_FUNCSEL*/));
+ ack |= at91_ics1523_WriteByte ((unsigned char) ICS_LCR, (unsigned char) (ICS_PSD | ICS_PFD));
+ ack |= at91_ics1523_WriteByte ((unsigned char) ICS_FD0, (unsigned char) 0x39) ; /* 0x7A */
+ ack |= at91_ics1523_WriteByte ((unsigned char) ICS_FD1, (unsigned char) 0x00);
+ ack |= at91_ics1523_WriteByte ((unsigned char) ICS_SWRST, (unsigned char) (ICS_PLLR));
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Program 1ms temporizing period */
+ mdelay(1);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ at91_ics1523_ReadByte ((unsigned char) ICS_SR, (char *)&status);
+ } while (!((unsigned int) status & (unsigned int) ICS_PLLLOCK) && (nb_trial < 10));
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ ack |= at91_ics1523_WriteByte ((unsigned char) ICS_DPAC, (unsigned char) 0x03) ; /* 0x01 */
+ ack |= at91_ics1523_WriteByte ((unsigned char) ICS_SWRST, (unsigned char) (ICS_DPAR));
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Program 1ms temporizing period */
+ mdelay(1);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ ack |= at91_ics1523_WriteByte ((unsigned char) ICS_DPAO, (unsigned char) 0x00);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Program 1ms temporizing period */
+ mdelay(1);
+
+ /* All done - cleanup */
+ iounmap(twi_base);
+ clk_disable(twi_clk);
+ clk_put(twi_clk);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return ack;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/Kconfig linux-2.6.22-rc5.new/arch/arm/mach-at91/Kconfig
--- linux-2.6.22-rc5/arch/arm/mach-at91/Kconfig 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/Kconfig 2007-07-29 05:23:04.000000000 +0200
@@ -97,6 +97,12 @@
help
Select this if you are using Sperry-Sun's KAFA board.
+config MACH_CHUB
+ bool "Promwad Chub board"
+ depends on ARCH_AT91RM9200
+ help
+ Select this if you are using Promwad's Chub board.
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
endif
# ----------------------------------------------------------
@@ -121,6 +127,13 @@
Select this if you are using Atmel's AT91SAM9260-EK or AT91SAM9XE Evaluation Kit
<http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3933>
+config MACH_CAM60
+ bool "KwikByte CAM60 board"
+ depends on ARCH_AT91SAM9260
+ help
+ Select this if you are using KwikByte's CAM60 board based on the Atmel AT91SAM9260.
+ <http://www.kwikbyte.com>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
endif
# ----------------------------------------------------------
@@ -184,6 +197,20 @@
On AT91SAM926x boards both types of NAND flash can be present
(8 and 16 bit data bus width).
+config CSB300_WAKE_SW0
+ bool "CSB300 SW0 irq0 wakeup"
+ depends on MACH_CSB337 && PM
+ help
+ If you have a CSB300 connected to your CSB337, this lets
+ SW0 serve as a wakeup button. It uses IRQ0.
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+config CSB300_WAKE_SW1
+ bool "CSB300 SW1 gpio wakeup"
+ depends on MACH_CSB337 && PM
+ help
+ If you have a CSB300 connected to your CSB337, this lets
+ SW1 serve as a wakeup button. It uses GPIO.
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
# ----------------------------------------------------------
comment "AT91 Feature Selections"
@@ -194,6 +221,20 @@
Select this if you need to program one or more of the PCK0..PCK3
programmable clock outputs.
+config ATMEL_TCLIB
+ bool "Timer/Counter Library"
+ help
+ Select this if you want a library to allocate the Timer/Counter
+ blocks found on many Atmel processors. This facilitates using
+ these modules despite processor differences.
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+config AT91_SLOW_CLOCK
+ bool "Suspend-to-RAM uses slow clock mode (EXPERIMENTAL)"
+ depends on PM && EXPERIMENTAL
+ help
+ Select this if you wish to put the CPU into slow clock mode
+ while in the "Suspend to RAM" state, to save more power.
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
endmenu
endif
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/Makefile linux-2.6.22-rc5.new/arch/arm/mach-at91/Makefile
--- linux-2.6.22-rc5/arch/arm/mach-at91/Makefile 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/Makefile 2007-07-29 05:23:04.000000000 +0200
@@ -8,6 +8,8 @@
obj- :=
obj-$(CONFIG_PM) += pm.o
+obj-$(CONFIG_AT91_SLOW_CLOCK) += pm_slowclock.o
+obj-$(CONFIG_ATMEL_TCLIB) += tclib.o
# CPU-specific support
obj-$(CONFIG_ARCH_AT91RM9200) += at91rm9200.o at91rm9200_time.o at91rm9200_devices.o
@@ -26,10 +28,12 @@
obj-$(CONFIG_MACH_KB9200) += board-kb9202.o
obj-$(CONFIG_MACH_ATEB9200) += board-eb9200.o
obj-$(CONFIG_MACH_KAFA) += board-kafa.o
+obj-$(CONFIG_MACH_CHUB) += board-chub.o
obj-$(CONFIG_MACH_PICOTUX2XX) += board-picotux200.o
# AT91SAM9260 board-specific support
obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o
+obj-$(CONFIG_MACH_CAM60) += board-cam60.o
# AT91SAM9261 board-specific support
obj-$(CONFIG_MACH_AT91SAM9261EK) += board-sam9261ek.o
@@ -51,7 +55,7 @@
obj-$(CONFIG_LEDS) += $(led-y)
# VGA support
-#obj-$(CONFIG_FB_S1D13XXX) += ics1523.o
+obj-$(CONFIG_FB_S1D13XXX) += ics1523.o
ifeq ($(CONFIG_PM_DEBUG),y)
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/pm.c linux-2.6.22-rc5.new/arch/arm/mach-at91/pm.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/pm.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/pm.c 2007-07-29 05:23:04.000000000 +0200
@@ -63,6 +63,7 @@
* Verify that all the clocks are correct before entering
* slow-clock mode.
*/
+#warning "SAM9260 only has 3 programmable clocks."
static int at91_pm_verify_clocks(void)
{
unsigned long scsr;
@@ -103,20 +104,15 @@
}
/*
- * Call this from platform driver suspend() to see how deeply to suspend.
+ * This is called from clk_must_disable(), to see how deeply to suspend.
* For example, some controllers (like OHCI) need one of the PLL clocks
* in order to act as a wakeup source, and those are not available when
* going into slow clock mode.
- *
- * REVISIT: generalize as clk_will_be_available(clk)? Other platforms have
- * the very same problem (but not using at91 main_clk), and it'd be better
- * to add one generic API rather than lots of platform-specific ones.
*/
int at91_suspend_entering_slow_clock(void)
{
return (target_state == PM_SUSPEND_MEM);
}
-EXPORT_SYMBOL(at91_suspend_entering_slow_clock);
static void (*slow_clock)(void);
@@ -205,16 +201,23 @@
.enter = at91_pm_enter,
};
+#ifdef CONFIG_AT91_SLOW_CLOCK
+extern void at91rm9200_slow_clock(void);
+extern u32 at91rm9200_slow_clock_sz;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+#endif
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
static int __init at91_pm_init(void)
{
- printk("AT91: Power Management\n");
-
-#ifdef CONFIG_AT91_PM_SLOW_CLOCK
- /* REVISIT allocations of SRAM should be dynamically managed.
+#ifdef CONFIG_AT91_SLOW_CLOCK
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ /*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * REVISIT allocations of SRAM should be dynamically managed.
* FIQ handlers and other components will want SRAM/TCM too...
*/
- slow_clock = (void *) (AT91_VA_BASE_SRAM + (3 * SZ_4K));
+ slow_clock = (void *) (AT91_IO_VIRT_BASE - AT91RM9200_SRAM_SIZE + (3 * SZ_4K));
memcpy(slow_clock, at91rm9200_slow_clock, at91rm9200_slow_clock_sz);
+ printk("AT91: Power Management (with slow clock mode)\n");
+#else
+ printk("AT91: Power Management\n");
#endif
/* Disable SDRAM low-power mode. Cannot be used with self-refresh. */
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/pm.c.orig linux-2.6.22-rc5.new/arch/arm/mach-at91/pm.c.orig
--- linux-2.6.22-rc5/arch/arm/mach-at91/pm.c.orig 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/pm.c.orig 2007-06-17 04:09:12.000000000 +0200
@@ -0,0 +1,227 @@
+/*
+ * arch/arm/mach-at91/pm.c
+ * AT91 Power Management
+ *
+ * Copyright (C) 2005 David Brownell
+ *
+ * This program 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 of the License, or
+ * (at your option) any later version.
+ */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <linux/pm.h>
+#include <linux/sched.h>
+#include <linux/proc_fs.h>
+#include <linux/pm.h>
+#include <linux/interrupt.h>
+#include <linux/sysfs.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/atomic.h>
+#include <asm/mach/time.h>
+#include <asm/mach/irq.h>
+#include <asm/mach-types.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <asm/arch/at91_pmc.h>
+#include <asm/arch/at91rm9200_mc.h>
+#include <asm/arch/gpio.h>
+#include <asm/arch/cpu.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include "generic.h"
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int at91_pm_valid_state(suspend_state_t state)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ switch (state) {
+ case PM_SUSPEND_ON:
+ case PM_SUSPEND_STANDBY:
+ case PM_SUSPEND_MEM:
+ return 1;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+ default:
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return 0;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ }
+}
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static suspend_state_t target_state;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Called after processes are frozen, but before we shutdown devices.
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int at91_pm_prepare(suspend_state_t state)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ target_state = state;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ return 0;
+}
+
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Verify that all the clocks are correct before entering
+ * slow-clock mode.
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int at91_pm_verify_clocks(void)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ unsigned long scsr;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ int i;
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ scsr = at91_sys_read(AT91_PMC_SCSR);
+
+ /* USB must not be using PLLB */
+ if (cpu_is_at91rm9200()) {
+ if ((scsr & (AT91RM9200_PMC_UHP | AT91RM9200_PMC_UDP)) != 0) {
+ pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n");
+ return 0;
+ }
+ } else if (cpu_is_at91sam9260() || cpu_is_at91sam9261() || cpu_is_at91sam9263()) {
+ if ((scsr & (AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP)) != 0) {
+ pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n");
+ return 0;
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ }
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
+ /* PCK0..PCK3 must be disabled, or configured to use clk32k */
+ for (i = 0; i < 4; i++) {
+ u32 css;
+
+ if ((scsr & (AT91_PMC_PCK0 << i)) == 0)
+ continue;
+
+ css = at91_sys_read(AT91_PMC_PCKR(i)) & AT91_PMC_CSS;
+ if (css != AT91_PMC_CSS_SLOW) {
+ pr_debug("AT91: PM - Suspend-to-RAM with PCK%d src %d\n", i, css);
+ return 0;
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ }
+#endif
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return 1;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Call this from platform driver suspend() to see how deeply to suspend.
+ * For example, some controllers (like OHCI) need one of the PLL clocks
+ * in order to act as a wakeup source, and those are not available when
+ * going into slow clock mode.
+ *
+ * REVISIT: generalize as clk_will_be_available(clk)? Other platforms have
+ * the very same problem (but not using at91 main_clk), and it'd be better
+ * to add one generic API rather than lots of platform-specific ones.
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+int at91_suspend_entering_slow_clock(void)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return (target_state == PM_SUSPEND_MEM);
+}
+EXPORT_SYMBOL(at91_suspend_entering_slow_clock);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void (*slow_clock)(void);
+
+
+static int at91_pm_enter(suspend_state_t state)
+{
+ at91_gpio_suspend();
+ at91_irq_suspend();
+
+ pr_debug("AT91: PM - wake mask %08x, pm state %d\n",
+ /* remember all the always-wake irqs */
+ (at91_sys_read(AT91_PMC_PCSR)
+ | (1 << AT91_ID_FIQ)
+ | (1 << AT91_ID_SYS)
+ | (at91_extern_irq))
+ & at91_sys_read(AT91_AIC_IMR),
+ state);
+
+ switch (state) {
+ /*
+ * Suspend-to-RAM is like STANDBY plus slow clock mode, so
+ * drivers must suspend more deeply: only the master clock
+ * controller may be using the main oscillator.
+ */
+ case PM_SUSPEND_MEM:
+ /*
+ * Ensure that clocks are in a valid state.
+ */
+ if (!at91_pm_verify_clocks())
+ goto error;
+
+ /*
+ * Enter slow clock mode by switching over to clk32k and
+ * turning off the main oscillator; reverse on wakeup.
+ */
+ if (slow_clock) {
+ slow_clock();
+ break;
+ } else {
+ /* DEVELOPMENT ONLY */
+ pr_info("AT91: PM - no slow clock mode yet ...\n");
+ /* FALLTHROUGH leaving master clock alone */
+ }
+
+ /*
+ * STANDBY mode has *all* drivers suspended; ignores irqs not
+ * marked as 'wakeup' event sources; and reduces DRAM power.
+ * But otherwise it's identical to PM_SUSPEND_ON: cpu idle, and
+ * nothing fancy done with main or cpu clocks.
+ */
+ case PM_SUSPEND_STANDBY:
+ /*
+ * NOTE: the Wait-for-Interrupt instruction needs to be
+ * in icache so the SDRAM stays in self-refresh mode until
+ * the wakeup IRQ occurs.
+ */
+ asm("b 1f; .align 5; 1:");
+ asm("mcr p15, 0, r0, c7, c10, 4"); /* drain write buffer */
+ at91_sys_write(AT91_SDRAMC_SRR, 1); /* self-refresh mode */
+ /* fall though to next state */
+
+ case PM_SUSPEND_ON:
+ asm("mcr p15, 0, r0, c7, c0, 4"); /* wait for interrupt */
+ break;
+
+ default:
+ pr_debug("AT91: PM - bogus suspend state %d\n", state);
+ goto error;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ }
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+
+ pr_debug("AT91: PM - wakeup %08x\n",
+ at91_sys_read(AT91_AIC_IPR) & at91_sys_read(AT91_AIC_IMR));
+
+error:
+ target_state = PM_SUSPEND_ON;
+ at91_irq_resume();
+ at91_gpio_resume();
+ return 0;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct pm_ops at91_pm_ops ={
+ .valid = at91_pm_valid_state,
+ .prepare = at91_pm_prepare,
+ .enter = at91_pm_enter,
+};
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int __init at91_pm_init(void)
+{
+ printk("AT91: Power Management\n");
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#ifdef CONFIG_AT91_PM_SLOW_CLOCK
+ /* REVISIT allocations of SRAM should be dynamically managed.
+ * FIQ handlers and other components will want SRAM/TCM too...
+ */
+ slow_clock = (void *) (AT91_VA_BASE_SRAM + (3 * SZ_4K));
+ memcpy(slow_clock, at91rm9200_slow_clock, at91rm9200_slow_clock_sz);
+#endif
+
+ /* Disable SDRAM low-power mode. Cannot be used with self-refresh. */
+ at91_sys_write(AT91_SDRAMC_LPR, 0);
+
+ pm_set_ops(&at91_pm_ops);
+
+ return 0;
+}
+arch_initcall(at91_pm_init);
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/pm_slowclock.S linux-2.6.22-rc5.new/arch/arm/mach-at91/pm_slowclock.S
--- linux-2.6.22-rc5/arch/arm/mach-at91/pm_slowclock.S 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/pm_slowclock.S 2007-07-29 05:23:04.000000000 +0200
@@ -0,0 +1,172 @@
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * arch/arm/mach-at91/pm_slow_clock.S
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ *
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Copyright (C) 2006 Savin Zlobec
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ *
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * 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.
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ *
+ */
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <linux/linkage.h>
+#include <asm/hardware.h>
+#include <asm/arch/at91_pmc.h>
+#include <asm/arch/at91rm9200_mc.h>
+
+#define MCKRDY_TIMEOUT 1000
+#define MOSCRDY_TIMEOUT 1000
+#define PLLALOCK_TIMEOUT 1000
+
+ .macro wait_mckrdy
+ mov r2, #MCKRDY_TIMEOUT
+1: sub r2, r2, #1
+ cmp r2, #0
+ beq 2f
+ ldr r3, [r1, #AT91_PMC_SR]
+ tst r3, #AT91_PMC_MCKRDY
+ beq 1b
+2:
+ .endm
+
+ .macro wait_moscrdy
+ mov r2, #MOSCRDY_TIMEOUT
+1: sub r2, r2, #1
+ cmp r2, #0
+ beq 2f
+ ldr r3, [r1, #AT91_PMC_SR]
+ tst r3, #AT91_PMC_MOSCS
+ beq 1b
+2:
+ .endm
+
+ .macro wait_pllalock
+ mov r2, #PLLALOCK_TIMEOUT
+1: sub r2, r2, #1
+ cmp r2, #0
+ beq 2f
+ ldr r3, [r1, #AT91_PMC_SR]
+ tst r3, #AT91_PMC_LOCKA
+ beq 1b
+2:
+ .endm
+
+ .macro wait_plladis
+ mov r2, #PLLALOCK_TIMEOUT
+1: sub r2, r2, #1
+ cmp r2, #0
+ beq 2f
+ ldr r3, [r1, #AT91_PMC_SR]
+ tst r3, #AT91_PMC_LOCKA
+ bne 1b
+2:
+ .endm
+
+ .text
+
+ENTRY(at91rm9200_slow_clock)
+
+ ldr r1, .at91_va_base_sys
+
+ /* Put SDRAM in self refresh mode */
+
+ b 1f
+ .align 5
+1: mcr p15, 0, r0, c7, c10, 4
+ mov r2, #1
+ str r2, [r1, #AT91_SDRAMC_SRR]
+
+ /* Save Master clock setting */
+
+ ldr r2, [r1, #AT91_PMC_MCKR]
+ str r2, .saved_mckr
+
+ /*
+ * Set the Master clock source to slow clock
+ *
+ * First set the CSS field, wait for MCKRDY
+ * and than set the PRES and MDIV fields.
+ *
+ * See eratta #2[78] for details.
+ */
+
+ bic r2, r2, #3
+ str r2, [r1, #AT91_PMC_MCKR]
+
+ wait_mckrdy
+
+ mov r2, #0
+ str r2, [r1, #AT91_PMC_MCKR]
+
+ /* Save PLLA setting and disable it */
+
+ ldr r2, [r1, #AT91_CKGR_PLLAR]
+ str r2, .saved_pllar
+
+ mov r2, #0
+ str r2, [r1, #AT91_CKGR_PLLAR]
+
+ wait_plladis
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Turn off the main oscillator */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ ldr r2, [r1, #AT91_CKGR_MOR]
+ bic r2, r2, #AT91_PMC_MOSCEN
+ str r2, [r1, #AT91_CKGR_MOR]
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Wait for interrupt */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ mcr p15, 0, r0, c7, c0, 4
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Turn on the main oscillator */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ ldr r2, [r1, #AT91_CKGR_MOR]
+ orr r2, r2, #AT91_PMC_MOSCEN
+ str r2, [r1, #AT91_CKGR_MOR]
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ wait_moscrdy
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Restore PLLA setting */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ ldr r2, .saved_pllar
+ str r2, [r1, #AT91_CKGR_PLLAR]
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ wait_pllalock
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /*
+ * Restore master clock setting
+ *
+ * First set PRES if it was not 0,
+ * than set CSS and MDIV fields.
+ * After every change wait for
+ * MCKRDY.
+ *
+ * See eratta #2[78] for details.
+ */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ ldr r2, .saved_mckr
+ tst r2, #0x1C
+ beq 2f
+ and r2, r2, #0x1C
+ str r2, [r1, #AT91_PMC_MCKR]
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ wait_mckrdy
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+2: ldr r2, .saved_mckr
+ str r2, [r1, #AT91_PMC_MCKR]
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ wait_mckrdy
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ mov pc, lr
+
+.saved_mckr:
+ .word 0
+
+.saved_pllar:
+ .word 0
+
+.at91_va_base_sys:
+ .word AT91_VA_BASE_SYS
+
+ENTRY(at91rm9200_slow_clock_sz)
+ .word .-at91rm9200_slow_clock
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/tclib.c linux-2.6.22-rc5.new/arch/arm/mach-at91/tclib.c
--- linux-2.6.22-rc5/arch/arm/mach-at91/tclib.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/tclib.c 2007-07-29 05:23:04.000000000 +0200
@@ -0,0 +1,17 @@
+#include <linux/clk.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+
+#include "tclib.h"
+
+static struct atmel_tcblock *blocks;
+static int nblocks;
+
+/*
+ * Called from the processor-specific init to register the TC Blocks.
+ */
+void __init atmel_tc_init(struct atmel_tcblock *tcblocks, int n)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ blocks = tcblocks;
+ nblocks = n;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/tclib.h linux-2.6.22-rc5.new/arch/arm/mach-at91/tclib.h
--- linux-2.6.22-rc5/arch/arm/mach-at91/tclib.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.22-rc5.new/arch/arm/mach-at91/tclib.h 2007-07-29 05:23:04.000000000 +0200
@@ -0,0 +1,11 @@
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define TC_PER_TCB 3
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+struct atmel_tcblock {
+ u32 physaddr;
+ void __iomem *ioaddr;
+ struct clk *clk[TC_PER_TCB];
+ int irq[TC_PER_TCB];
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+};
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+extern void __init atmel_tc_init(struct atmel_tcblock *tcblocks, int n);
diff -urN -x CVS linux-2.6.22-rc1/include/asm-arm/arch-at91/at91_mci.h linux-2.6-stable/include/asm-arm/arch-at91/at91_mci.h
--- linux-2.6.22-rc1/include/asm-arm/arch-at91/at91_mci.h Thu Apr 26 05:08:32 2007
+++ linux-2.6-stable/include/asm-arm/arch-at91/at91_mci.h Tue May 8 12:13:31 2007
@@ -26,6 +26,9 @@
#define AT91_MCI_MR 0x04 /* Mode Register */
#define AT91_MCI_CLKDIV (0xff << 0) /* Clock Divider */
#define AT91_MCI_PWSDIV (7 << 8) /* Power Saving Divider */
+#define AT91_MCI_RDPROOF (1 << 11) /* Read Proof Enable [SAM926[03] only] */
+#define AT91_MCI_WRPROOF (1 << 12) /* Write Proof Enable [SAM926[03] only] */
+#define AT91_MCI_PDCFBYTE (1 << 13) /* PDC Force Byte Transfer [SAM926[03] only] */
#define AT91_MCI_PDCPADV (1 << 14) /* PDC Padding Value */
#define AT91_MCI_PDCMODE (1 << 15) /* PDC-orientated Mode */
#define AT91_MCI_BLKLEN (0xfff << 18) /* Data Block Length */
diff -urN -x CVS linux-2.6.22-rc1/include/asm-arm/arch-at91/at91_pmc.h linux-2.6-stable/include/asm-arm/arch-at91/at91_pmc.h
--- linux-2.6.22-rc1/include/asm-arm/arch-at91/at91_pmc.h Thu Apr 26 05:08:32 2007
+++ linux-2.6-stable/include/asm-arm/arch-at91/at91_pmc.h Fri May 11 16:45:00 2007
@@ -37,7 +37,9 @@
#define AT91_PMC_PCDR (AT91_PMC + 0x14) /* Peripheral Clock Disable Register */
#define AT91_PMC_PCSR (AT91_PMC + 0x18) /* Peripheral Clock Status Register */
-#define AT91_CKGR_MOR (AT91_PMC + 0x20) /* Main Oscillator Register */
+#define AT91_CKGR_UCKR (AT91_PMC + 0x1C) /* UTMI Clock Register [SAM9RL only] */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define AT91_CKGR_MOR (AT91_PMC + 0x20) /* Main Oscillator Register [not on SAM9RL] */
#define AT91_PMC_MOSCEN (1 << 0) /* Main Oscillator Enable */
#define AT91_PMC_OSCBYPASS (1 << 1) /* Oscillator Bypass [AT91SAM926x only] */
#define AT91_PMC_OSCOUNT (0xff << 8) /* Main Oscillator Start-up Time */
diff -urN -x CVS linux-2.6.22-rc1/include/asm-arm/arch-at91/at91sam9260_matrix.h linux-2.6-stable/include/asm-arm/arch-at91/at91sam9260_matrix.h
--- linux-2.6.22-rc1/include/asm-arm/arch-at91/at91sam9260_matrix.h Thu Apr 26 05:08:32 2007
+++ linux-2.6-stable/include/asm-arm/arch-at91/at91sam9260_matrix.h Fri May 11 16:20:33 2007
@@ -67,7 +67,7 @@
#define AT91_MATRIX_CS4A (1 << 4) /* Chip Select 4 Assignment */
#define AT91_MATRIX_CS4A_SMC (0 << 4)
#define AT91_MATRIX_CS4A_SMC_CF1 (1 << 4)
-#define AT91_MATRIX_CS5A (1 << 5 ) /* Chip Select 5 Assignment */
+#define AT91_MATRIX_CS5A (1 << 5) /* Chip Select 5 Assignment */
#define AT91_MATRIX_CS5A_SMC (0 << 5)
#define AT91_MATRIX_CS5A_SMC_CF2 (1 << 5)
#define AT91_MATRIX_DBPUC (1 << 8) /* Data Bus Pull-up Configuration */
diff -urN -x CVS linux-2.6.22-rc1/include/asm-arm/arch-at91/board.h linux-2.6-stable/include/asm-arm/arch-at91/board.h
--- linux-2.6.22-rc1/include/asm-arm/arch-at91/board.h Thu May 17 12:13:17 2007
+++ linux-2.6-stable/include/asm-arm/arch-at91/board.h Thu May 10 12:21:10 2007
@@ -124,9 +124,21 @@
};
extern void __init at91_add_device_ac97(struct atmel_ac97_data *data);
+ /* ISI */
+extern void __init at91_add_device_isi(void);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
/* LEDs */
extern u8 at91_leds_cpu;
extern u8 at91_leds_timer;
extern void __init at91_init_leds(u8 cpu_led, u8 timer_led);
+struct at91_gpio_led {
+ u8 index; /* index of LED */
+ char* name; /* name of LED */
+ u8 gpio; /* AT91_PIN_xx */
+ u8 flags; /* 1=active-high */
+ char* trigger; /* default trigger */
+};
+extern void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
#endif
diff -urN -x CVS linux-2.6.22-rc1/include/asm-arm/arch-at91/ics1523.h linux-2.6-stable/include/asm-arm/arch-at91/ics1523.h
--- linux-2.6.22-rc1/include/asm-arm/arch-at91/ics1523.h Thu Jan 1 02:00:00 1970
+++ linux-2.6-stable/include/asm-arm/arch-at91/ics1523.h Mon May 14 13:49:47 2007
@@ -0,0 +1,154 @@
+//*----------------------------------------------------------------------------
+//* ATMEL Microcontroller Software Support - ROUSSET -
+//*----------------------------------------------------------------------------
+//* The software is delivered "AS IS" without warranty or condition of any
+//* kind, either express, implied or statutory. This includes without
+//* limitation any warranty or condition with respect to merchantability or
+//* fitness for any particular purpose, or against the infringements of
+//* intellectual property rights of others.
+//*----------------------------------------------------------------------------
+//* File Name : ics1523.h
+//* Object : Clock Generator Prototyping File.
+//*
+//* 1.0 08/28/02 ED : Creation
+//* 1.2 13/01/03 FB : Update on lib V3
+//*----------------------------------------------------------------------------
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#ifndef ics1523_h
+#define ics1523_h
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*-------------------------------------------*/
+/* ICS1523 TWI Serial Clock Definition */
+/*-------------------------------------------*/
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define ICS_MIN_CLOCK 100 /* Min Frequency Access Clock KHz */
+#define ICS_MAX_CLOCK 400 /* Max Frequency Access Clock KHz */
+#define ICS_TRANSFER_RATE ICS_MAX_CLOCK /* Transfer speed to apply */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define ICS_WRITE_CLK_PNB 30 /* TWCK Clock Periods required to write */
+#define ICS_READ_CLK_PNB 40 /* TWCK Clock Periods required to read */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*-------------------------------------------*/
+/* ICS1523 Write Operation Definition */
+/*-------------------------------------------*/
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define ICS1523_ACCESS_OK 0 /* OK */
+#define ICS1523_ACCESS_ERROR -1 /* NOK */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*-------------------------------------------*/
+/* ICS1523 Device Addresses Definition */
+/*-------------------------------------------*/
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define ICS_ADDR 0x26 /* Device Address */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*--------------------------------------------------*/
+/* ICS1523 Registers Internal Addresses Definition */
+/*--------------------------------------------------*/
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define ICS_ICR 0x0 /* Input Control Register */
+#define ICS_LCR 0x1 /* Loop Control Register */
+#define ICS_FD0 0x2 /* PLL FeedBack Divider LSBs */
+#define ICS_FD1 0x3 /* PLL FeedBack Divider MSBs */
+#define ICS_DPAO 0x4 /* Dynamic Phase Aligner Offset */
+#define ICS_DPAC 0x5 /* Dynamic Phase Aligner Resolution */
+#define ICS_OE 0x6 /* Output Enables Register */
+#define ICS_OD 0x7 /* Osc Divider Register */
+#define ICS_SWRST 0x8 /* DPA & PLL Reset Register */
+#define ICS_VID 0x10 /* Chip Version Register */
+#define ICS_RID 0x11 /* Chip Revision Register */
+#define ICS_SR 0x12 /* Status Register */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*------------------------------------------------------*/
+/* ICS1523 Input Control Register Bits Definition */
+/*------------------------------------------------------*/
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define ICS_PDEN 0x1 /* Phase Detector Enable */
+#define ICS_PDPOL 0x2 /* Phase Detector Enable Polarity */
+#define ICS_REFPOL 0x4 /* External Reference Polarity */
+#define ICS_FBKPOL 0x8 /* External Feedback Polarity */
+#define ICS_FBKSEL 0x10 /* External Feedback Select */
+#define ICS_FUNCSEL 0x20 /* Function Out Select */
+#define ICS_ENPLS 0x40 /* Enable PLL Lock/Ref Status Output */
+#define ICS_ENDLS 0x80 /* Enable DPA Lock/Ref Status Output */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*-----------------------------------------------------*/
+/* ICS1523 Loop Control Register Bits Definition */
+/*-----------------------------------------------------*/
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define ICS_PFD 0x7 /* Phase Detector Gain */
+#define ICS_PSD 0x30 /* Post-Scaler Divider */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*----------------------------------------------------*/
+/* ICS1523 PLL FeedBack Divider LSBs Definition */
+/*----------------------------------------------------*/
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define ICS_FBDL 0xFF /* PLL FeedBack Divider LSBs */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*----------------------------------------------------*/
+/* ICS1523 PLL FeedBack Divider MSBs Definition */
+/*----------------------------------------------------*/
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define ICS_FBDM 0xF /* PLL FeedBack Divider MSBs */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*------------------------------------------------------------*/
+/* ICS1523 Dynamic Phase Aligner Offset Bits Definition */
+/*------------------------------------------------------------*/
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define ICS_DPAOS 0x2F /* Dynamic Phase Aligner Offset */
+#define ICS_FILSEL 0x80 /* Loop Filter Select */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*----------------------------------------------------------------*/
+/* ICS1523 Dynamic Phase Aligner Resolution Bits Definition */
+/*----------------------------------------------------------------*/
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define ICS_DPARES 0x3 /* Dynamic Phase Aligner Resolution */
+#define ICS_MMREV 0xFC /* Metal Mask Revision Number */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*-------------------------------------------------------*/
+/* ICS1523 Output Enables Register Bits Definition */
+/*-------------------------------------------------------*/
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define ICS_OEPCK 0x1 /* Output Enable for PECL PCLK Outputs */
+#define ICS_OETCK 0x2 /* Output Enable for STTL CLK Output */
+#define ICS_OEP2 0x4 /* Output Enable for PECL CLK/2 Outputs */
+#define ICS_OET2 0x8 /* Output Enable for STTL CLK/2 Output */
+#define ICS_OEF 0x10 /* Output Enable for STTL FUNC Output */
+#define ICS_CLK2INV 0x20 /* CLK/2 Invert */
+#define ICS_OSCL 0xC0 /* SSTL Clock Scaler */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*----------------------------------------------------*/
+/* ICS1523 Osc Divider Register Bits Definition */
+/*----------------------------------------------------*/
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define ICS_OSCDIV 0x7F /* Oscillator Divider Modulus */
+#define ICS_INSEL 0x80 /* Input Select */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*---------------------------------------------------*/
+/* ICS1523 DPA & PLL Reset Register Definition */
+/*---------------------------------------------------*/
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define ICS_DPAR 0x0A /* DPA Reset Command */
+#define ICS_PLLR 0x50 /* PLL Reset Command */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*------------------------------------------------*/
+/* ICS1523 Chip Version Register Definition */
+/*------------------------------------------------*/
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define ICS_CHIPV 0xFF /* Chip Version */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*-------------------------------------------------*/
+/* ICS1523 Chip Revision Register Definition */
+/*-------------------------------------------------*/
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define ICS_CHIPR 0xFF /* Chip Revision */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*------------------------------------------*/
+/* ICS1523 Status Register Definition */
+/*------------------------------------------*/
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define ICS_DPALOCK 0x1 /* DPA Lock Status */
+#define ICS_PLLLOCK 0x2 /* PLL Lock Status */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+int at91_ics1523_init(void);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#endif /* ics1523_h */
diff -urN -x CVS linux-2.6.22-rc1/include/asm-arm/arch-at91/spi.h linux-2.6-stable/include/asm-arm/arch-at91/spi.h
--- linux-2.6.22-rc1/include/asm-arm/arch-at91/spi.h Thu Jan 1 02:00:00 1970
+++ linux-2.6-stable/include/asm-arm/arch-at91/spi.h Mon May 14 13:49:47 2007
@@ -0,0 +1,54 @@
+/*
+ * Serial Peripheral Interface (SPI) driver for the Atmel AT91RM9200
+ *
+ * (c) SAN People (Pty) Ltd
+ *
+ * This program 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 of the License, or (at your option) any later version.
+ */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#ifndef AT91_LEGACY_SPI_H
+#define AT91_LEGACY_SPI_H
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define SPI_MAJOR 153 /* registered device number */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define DEFAULT_SPI_CLK 6000000
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* Maximum number of buffers in a single SPI transfer.
+ * DataFlash uses maximum of 2
+ * spidev interface supports up to 8.
+ */
+#define MAX_SPI_TRANSFERS 8
+#define NR_SPI_DEVICES 4 /* number of devices on SPI bus */
+
+/*
+ * Describes the buffers for a SPI transfer.
+ * A transmit & receive buffer must be specified for each transfer
+ */
+struct spi_transfer_list {
+ void* tx[MAX_SPI_TRANSFERS]; /* transmit */
+ int txlen[MAX_SPI_TRANSFERS];
+ void* rx[MAX_SPI_TRANSFERS]; /* receive */
+ int rxlen[MAX_SPI_TRANSFERS];
+ int nr_transfers; /* number of transfers */
+ int curr; /* current transfer */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+};
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+struct spi_local {
+ unsigned int pcs; /* Peripheral Chip Select value */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ struct spi_transfer_list *xfers; /* current transfer list */
+ dma_addr_t tx, rx; /* DMA address for current transfer */
+ dma_addr_t txnext, rxnext; /* DMA address for next transfer */
+};
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* Exported functions */
+extern void spi_access_bus(short device);
+extern void spi_release_bus(short device);
+extern int spi_transfer(struct spi_transfer_list* list);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#endif
diff -urN -x CVS linux-2.6.22-rc1/include/linux/clk.h linux-2.6-stable/include/linux/clk.h
--- linux-2.6.22-rc1/include/linux/clk.h Thu Apr 26 05:08:32 2007
+++ linux-2.6-stable/include/linux/clk.h Tue May 8 12:13:31 2007
@@ -121,4 +121,24 @@
*/
struct clk *clk_get_parent(struct clk *clk);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/**
+ * clk_must_disable - report whether a clock's users must disable it
+ * @clk: one node in the clock tree
+ *
+ * This routine returns true only if the upcoming system state requires
+ * disabling the specified clock.
+ *
+ * It's common for platform power states to constrain certain clocks (and
+ * their descendants) to be unavailable, while other states allow that
+ * clock to be active. A platform's power states often include an "all on"
+ * mode; system wide sleep states like "standby" or "suspend-to-RAM"; and
+ * operating states which sacrifice functionality for lower power usage.
+ *
+ * The constraint value is commonly tested in device driver suspend(), to
+ * leave clocks active if they are needed for features like wakeup events.
+ * On platforms that support reduced functionality operating states, the
+ * constraint may also need to be tested during resume() and probe() calls.
+ */
+int clk_must_disable(struct clk *clk);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
#endif
diff -urN -x CVS linux-2.6.22-rc1/include/linux/i2c-id.h linux-2.6-stable/include/linux/i2c-id.h
--- linux-2.6.22-rc1/include/linux/i2c-id.h Thu May 17 12:13:23 2007
+++ linux-2.6-stable/include/linux/i2c-id.h Mon May 14 10:18:35 2007
@@ -203,6 +203,7 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
/* --- PCA 9564 based algorithms */
#define I2C_HW_A_ISA 0x1a0000 /* generic ISA Bus interface card */
+#define I2C_HW_A_PLAT 0x1a0001 /* generic platform_bus interface */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
/* --- ACPI Embedded controller algorithms */
#define I2C_HW_ACPI_EC 0x1f0000
diff -urN -x CVS linux-2.6.22-rc1/sound/soc/at91/eti_b1_wm8731.c linux-2.6-stable/sound/soc/at91/eti_b1_wm8731.c
--- linux-2.6.22-rc1/sound/soc/at91/eti_b1_wm8731.c Thu May 17 12:13:36 2007
+++ linux-2.6-stable/sound/soc/at91/eti_b1_wm8731.c Mon May 14 10:19:04 2007
@@ -34,8 +34,7 @@
#include <sound/soc.h>
#include <sound/soc-dapm.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
-#include <asm/arch/hardware.h>
-#include <asm/arch/at91_pio.h>
+#include <asm/hardware.h>
#include <asm/arch/gpio.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
#include "../codecs/wm8731.h"
@@ -48,13 +47,6 @@
#define DBG(x...)
#endif
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
-#define AT91_PIO_TF1 (1 << (AT91_PIN_PB6 - PIN_BASE) % 32)
-#define AT91_PIO_TK1 (1 << (AT91_PIN_PB7 - PIN_BASE) % 32)
-#define AT91_PIO_TD1 (1 << (AT91_PIN_PB8 - PIN_BASE) % 32)
-#define AT91_PIO_RD1 (1 << (AT91_PIN_PB9 - PIN_BASE) % 32)
-#define AT91_PIO_RK1 (1 << (AT91_PIN_PB10 - PIN_BASE) % 32)
-#define AT91_PIO_RF1 (1 << (AT91_PIN_PB11 - PIN_BASE) % 32)
-
static struct clk *pck1_clk;
static struct clk *pllb_clk;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
@@ -277,7 +269,6 @@
static int __init eti_b1_init(void)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
int ret;
- u32 ssc_pio_lines;
struct at91_ssc_periph *ssc = eti_b1_dai.cpu_dai->private_data;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
if (!request_mem_region(AT91RM9200_BASE_SSC1, SZ_16K, "soc-audio")) {
@@ -311,19 +302,12 @@
goto fail_io_unmap;
}
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
- ssc_pio_lines = AT91_PIO_TF1 | AT91_PIO_TK1 | AT91_PIO_TD1
- | AT91_PIO_RD1 /* | AT91_PIO_RK1 */ | AT91_PIO_RF1;
-
- /* Reset all PIO registers and assign lines to peripheral A */
- at91_sys_write(AT91_PIOB + PIO_PDR, ssc_pio_lines);
- at91_sys_write(AT91_PIOB + PIO_ODR, ssc_pio_lines);
- at91_sys_write(AT91_PIOB + PIO_IFDR, ssc_pio_lines);
- at91_sys_write(AT91_PIOB + PIO_CODR, ssc_pio_lines);
- at91_sys_write(AT91_PIOB + PIO_IDR, ssc_pio_lines);
- at91_sys_write(AT91_PIOB + PIO_MDDR, ssc_pio_lines);
- at91_sys_write(AT91_PIOB + PIO_PUDR, ssc_pio_lines);
- at91_sys_write(AT91_PIOB + PIO_ASR, ssc_pio_lines);
- at91_sys_write(AT91_PIOB + PIO_OWDR, ssc_pio_lines);
+ at91_set_A_periph(AT91_PIN_PB6, 0); /* TF1 */
+ at91_set_A_periph(AT91_PIN_PB7, 0); /* TK1 */
+ at91_set_A_periph(AT91_PIN_PB8, 0); /* TD1 */
+ at91_set_A_periph(AT91_PIN_PB9, 0); /* RD1 */
+/* at91_set_A_periph(AT91_PIN_PB10, 0);*/ /* RK1 */
+ at91_set_A_periph(AT91_PIN_PB11, 0); /* RF1 */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
/*
* Set PCK1 parent to PLLB and its rate to 12 Mhz.
diff -urN linux-2.6.22-rc5/drivers/char/at91_spi.c linux-2.6.22-rc5.new/drivers/char/at91_spi.c
--- linux-2.6.22-rc5/drivers/char/at91_spi.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.22-rc5.new/drivers/char/at91_spi.c 2007-07-29 05:55:39.000000000 +0200
@@ -0,0 +1,336 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Serial Peripheral Interface (SPI) driver for the Atmel AT91RM9200 (Thunder)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ *
+ * Copyright (C) SAN People (Pty) Ltd
+ *
+ * This program 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 of the License, or (at your option) any later version.
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
+#include <linux/init.h>
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <linux/dma-mapping.h>
+#include <linux/module.h>
+#include <linux/sched.h>
+#include <linux/completion.h>
+#include <linux/interrupt.h>
+#include <linux/clk.h>
+#include <linux/platform_device.h>
+#include <linux/atmel_pdc.h>
+#include <asm/io.h>
+#include <asm/semaphore.h>
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <asm/arch/at91_spi.h>
+#include <asm/arch/board.h>
+#include <asm/arch/spi.h>
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#undef DEBUG_SPI
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct spi_local spi_dev[NR_SPI_DEVICES]; /* state of the SPI devices */
+static int spi_enabled = 0;
+static struct semaphore spi_lock; /* protect access to SPI bus */
+static int current_device = -1; /* currently selected SPI device */
+static struct clk *spi_clk; /* SPI clock */
+static void __iomem *spi_base; /* SPI peripheral base-address */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+DECLARE_COMPLETION(transfer_complete);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define at91_spi_read(reg) __raw_readl(spi_base + (reg))
+#define at91_spi_write(reg, val) __raw_writel((val), spi_base + (reg))
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
+
+/* ......................................................................... */
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * Access and enable the SPI bus.
+ * This MUST be called before any transfers are performed.
+ */
+void spi_access_bus(short device)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Ensure that requested device is valid */
+ if ((device < 0) || (device >= NR_SPI_DEVICES))
+ panic("at91_spi: spi_access_bus called with invalid device");
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (spi_enabled == 0) {
+ clk_enable(spi_clk); /* Enable Peripheral clock */
+ at91_spi_write(AT91_SPI_CR, AT91_SPI_SPIEN); /* Enable SPI */
+#ifdef DEBUG_SPI
+ printk("SPI on\n");
+#endif
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ }
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ spi_enabled++;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Lock the SPI bus */
+ down(&spi_lock);
+ current_device = device;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Configure SPI bus for device */
+ at91_spi_write(AT91_SPI_MR, AT91_SPI_MSTR | AT91_SPI_MODFDIS | (spi_dev[device].pcs << 16));
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * Relinquish control of the SPI bus.
+ */
+void spi_release_bus(short device)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (device != current_device)
+ panic("at91_spi: spi_release called with invalid device");
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Release the SPI bus */
+ current_device = -1;
+ up(&spi_lock);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ spi_enabled--;
+ if (spi_enabled == 0) {
+ at91_spi_write(AT91_SPI_CR, AT91_SPI_SPIDIS); /* Disable SPI */
+ clk_disable(spi_clk); /* Disable Peripheral clock */
+#ifdef DEBUG_SPI
+ printk("SPI off\n");
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#endif
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ }
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * Perform a data transfer over the SPI bus
+ */
+int spi_transfer(struct spi_transfer_list* list)
+{
+ struct spi_local *device = (struct spi_local *) &spi_dev[current_device];
+ int tx_size;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (!list)
+ panic("at91_spi: spi_transfer called with NULL transfer list");
+ if (current_device == -1)
+ panic("at91_spi: spi_transfer called without acquiring bus");
+
+#ifdef DEBUG_SPI
+ printk("SPI transfer start [%i]\n", list->nr_transfers);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#endif
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* If we are in 16-bit mode, we need to modify what we pass to the PDC */
+ tx_size = (at91_spi_read(AT91_SPI_CSR(current_device)) & AT91_SPI_BITS_16) ? 2 : 1;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Store transfer list */
+ device->xfers = list;
+ list->curr = 0;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Assume there must be at least one transfer */
+ device->tx = dma_map_single(NULL, list->tx[0], list->txlen[0], DMA_TO_DEVICE);
+ device->rx = dma_map_single(NULL, list->rx[0], list->rxlen[0], DMA_FROM_DEVICE);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Program PDC registers */
+ at91_spi_write(ATMEL_PDC_TPR, device->tx);
+ at91_spi_write(ATMEL_PDC_RPR, device->rx);
+ at91_spi_write(ATMEL_PDC_TCR, list->txlen[0] / tx_size);
+ at91_spi_write(ATMEL_PDC_RCR, list->rxlen[0] / tx_size);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Is there a second transfer? */
+ if (list->nr_transfers > 1) {
+ device->txnext = dma_map_single(NULL, list->tx[1], list->txlen[1], DMA_TO_DEVICE);
+ device->rxnext = dma_map_single(NULL, list->rx[1], list->rxlen[1], DMA_FROM_DEVICE);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Program Next PDC registers */
+ at91_spi_write(ATMEL_PDC_TNPR, device->txnext);
+ at91_spi_write(ATMEL_PDC_RNPR, device->rxnext);
+ at91_spi_write(ATMEL_PDC_TNCR, list->txlen[1] / tx_size);
+ at91_spi_write(ATMEL_PDC_RNCR, list->rxlen[1] / tx_size);
+ }
+ else {
+ device->txnext = 0;
+ device->rxnext = 0;
+ at91_spi_write(ATMEL_PDC_TNCR, 0);
+ at91_spi_write(ATMEL_PDC_RNCR, 0);
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ // TODO: If we are doing consecutive transfers (at high speed, or
+ // small buffers), then it might be worth modifying the 'Delay between
+ // Consecutive Transfers' in the CSR registers.
+ // This is an issue if we cannot chain the next buffer fast enough
+ // in the interrupt handler.
+
+ /* Enable transmitter and receiver */
+ at91_spi_write(ATMEL_PDC_PTCR, ATMEL_PDC_RXTEN | ATMEL_PDC_TXTEN);
+
+ at91_spi_write(AT91_SPI_IER, AT91_SPI_ENDRX); /* enable buffer complete interrupt */
+ wait_for_completion(&transfer_complete);
+
+#ifdef DEBUG_SPI
+ printk("SPI transfer end\n");
+#endif
+
+ return 0;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+/* ......................................................................... */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Handle interrupts from the SPI controller.
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static irqreturn_t at91spi_interrupt(int irq, void *dev_id)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ unsigned int status;
+ struct spi_local *device = (struct spi_local *) &spi_dev[current_device];
+ struct spi_transfer_list *list = device->xfers;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#ifdef DEBUG_SPI
+ printk("SPI interrupt %i\n", current_device);
+#endif
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (!list)
+ panic("at91_spi: spi_interrupt with a NULL transfer list");
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ status = at91_spi_read(AT91_SPI_SR) & at91_spi_read(AT91_SPI_IMR); /* read status */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ dma_unmap_single(NULL, device->tx, list->txlen[list->curr], DMA_TO_DEVICE);
+ dma_unmap_single(NULL, device->rx, list->rxlen[list->curr], DMA_FROM_DEVICE);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ device->tx = device->txnext; /* move next transfer to current transfer */
+ device->rx = device->rxnext;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ list->curr = list->curr + 1;
+ if (list->curr == list->nr_transfers) { /* all transfers complete */
+ at91_spi_write(AT91_SPI_IDR, AT91_SPI_ENDRX); /* disable interrupt */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Disable transmitter and receiver */
+ at91_spi_write(ATMEL_PDC_PTCR, ATMEL_PDC_RXTDIS | ATMEL_PDC_TXTDIS);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ device->xfers = NULL;
+ complete(&transfer_complete);
+ }
+ else if (list->curr+1 == list->nr_transfers) { /* no more next transfers */
+ device->txnext = 0;
+ device->rxnext = 0;
+ at91_spi_write(ATMEL_PDC_TNCR, 0);
+ at91_spi_write(ATMEL_PDC_RNCR, 0);
+ }
+ else {
+ int i = (list->curr)+1;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* If we are in 16-bit mode, we need to modify what we pass to the PDC */
+ int tx_size = (at91_spi_read(AT91_SPI_CSR(current_device)) & AT91_SPI_BITS_16) ? 2 : 1;
+
+ device->txnext = dma_map_single(NULL, list->tx[i], list->txlen[i], DMA_TO_DEVICE);
+ device->rxnext = dma_map_single(NULL, list->rx[i], list->rxlen[i], DMA_FROM_DEVICE);
+ at91_spi_write(ATMEL_PDC_TNPR, device->txnext);
+ at91_spi_write(ATMEL_PDC_RNPR, device->rxnext);
+ at91_spi_write(ATMEL_PDC_TNCR, list->txlen[i] / tx_size);
+ at91_spi_write(ATMEL_PDC_RNCR, list->rxlen[i] / tx_size);
+ }
+ return IRQ_HANDLED;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+/* ......................................................................... */
+
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Initialize the SPI controller
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int __init at91spi_probe(struct platform_device *pdev)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ int i;
+ unsigned long scbr;
+ struct resource *res;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ init_MUTEX(&spi_lock);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res)
+ return -ENXIO;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (!request_mem_region(res->start, res->end - res->start + 1, "at91_spi"))
+ return -EBUSY;
+
+ spi_base = ioremap(res->start, res->end - res->start + 1);
+ if (!spi_base) {
+ release_mem_region(res->start, res->end - res->start + 1);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ return -ENOMEM;
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ spi_clk = clk_get(NULL, "spi_clk");
+ if (IS_ERR(spi_clk)) {
+ printk(KERN_ERR "at91_spi: no clock defined\n");
+ iounmap(spi_base);
+ release_mem_region(res->start, res->end - res->start + 1);
+ return -ENODEV;
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ at91_spi_write(AT91_SPI_CR, AT91_SPI_SWRST); /* software reset of SPI controller */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /*
+ * Calculate the correct SPI baud-rate divisor.
+ */
+ scbr = clk_get_rate(spi_clk) / (2 * DEFAULT_SPI_CLK);
+ scbr = scbr + 1; /* round up */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ printk(KERN_INFO "at91_spi: Baud rate set to %ld\n", clk_get_rate(spi_clk) / (2 * scbr));
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Set Chip Select registers to good defaults */
+ for (i = 0; i < 4; i++) {
+ at91_spi_write(AT91_SPI_CSR(i), AT91_SPI_CPOL | AT91_SPI_BITS_8 | (16 << 16) | (scbr << 8));
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ }
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ at91_spi_write(ATMEL_PDC_PTCR, ATMEL_PDC_RXTDIS | ATMEL_PDC_TXTDIS);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ memset(&spi_dev, 0, sizeof(spi_dev));
+ spi_dev[0].pcs = 0xE;
+ spi_dev[1].pcs = 0xD;
+ spi_dev[2].pcs = 0xB;
+ spi_dev[3].pcs = 0x7;
+
+ if (request_irq(AT91RM9200_ID_SPI, at91spi_interrupt, 0, "spi", NULL)) {
+ clk_put(spi_clk);
+ iounmap(spi_base);
+ release_mem_region(res->start, res->end - res->start + 1);
+ return -EBUSY;
+ }
+
+ at91_spi_write(AT91_SPI_CR, AT91_SPI_SPIEN); /* Enable SPI */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ return 0;
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int __devexit at91spi_remove(struct platform_device *pdev)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ struct resource *res;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ at91_spi_write(AT91_SPI_CR, AT91_SPI_SPIDIS); /* Disable SPI */
+ clk_put(spi_clk);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ iounmap(spi_base);
+ release_mem_region(res->start, res->end - res->start + 1);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ free_irq(AT91RM9200_ID_SPI, 0);
+ return 0;
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct platform_driver at91spi_driver = {
+ .probe = at91spi_probe,
+ .remove = __devexit_p(at91spi_remove),
+ .driver = {
+ .name = "at91_spi",
+ .owner = THIS_MODULE,
+ },
+};
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int __init at91spi_init(void)
+{
+ return platform_driver_register(&at91spi_driver);
+}
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __exit at91spi_exit(void)
+{
+ platform_driver_unregister(&at91spi_driver);
+}
+
+EXPORT_SYMBOL(spi_access_bus);
+EXPORT_SYMBOL(spi_release_bus);
+EXPORT_SYMBOL(spi_transfer);
+
+module_init(at91spi_init);
+module_exit(at91spi_exit);
+
+MODULE_LICENSE("GPL")
+MODULE_AUTHOR("Andrew Victor")
+MODULE_DESCRIPTION("SPI driver for Atmel AT91RM9200")
diff -urN linux-2.6.22-rc5/drivers/char/at91_spidev.c linux-2.6.22-rc5.new/drivers/char/at91_spidev.c
--- linux-2.6.22-rc5/drivers/char/at91_spidev.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.22-rc5.new/drivers/char/at91_spidev.c 2007-07-29 05:55:39.000000000 +0200
@@ -0,0 +1,236 @@
+/*
+ * User-space interface to the SPI bus on Atmel AT91RM9200
+ *
+ * Copyright (C) 2003 SAN People (Pty) Ltd
+ *
+ * Based on SPI driver by Rick Bronson
+ *
+ * This program 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 of the License, or (at your option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/highmem.h>
+#include <linux/pagemap.h>
+#include <asm/arch/spi.h>
+
+#ifdef CONFIG_DEVFS_FS
+#include <linux/devfs_fs_kernel.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+#endif
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#undef DEBUG_SPIDEV
+
+/* ......................................................................... */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Read or Write to SPI bus.
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static ssize_t spidev_rd_wr(struct file *file, char *buf, size_t count, loff_t *offset)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ unsigned int spi_device = (unsigned int) file->private_data;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ struct mm_struct * mm;
+ struct page ** maplist;
+ struct spi_transfer_list* list;
+ int pgcount;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ unsigned int ofs, pagelen;
+ int res, i, err;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (!count) {
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ return 0;
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ list = kmalloc(sizeof(struct spi_transfer_list), GFP_KERNEL);
+ if (!list) {
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ return -ENOMEM;
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ mm = current->mm;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ pgcount = ((unsigned long)buf+count+PAGE_SIZE-1)/PAGE_SIZE - (unsigned long)buf/PAGE_SIZE;
+
+ if (pgcount >= MAX_SPI_TRANSFERS) {
+ kfree(list);
+ return -EFBIG;
+ }
+
+ maplist = kmalloc (pgcount * sizeof (struct page *), GFP_KERNEL);
+
+ if (!maplist) {
+ kfree(list);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ return -ENOMEM;
+ }
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ flush_cache_all();
+ down_read(&mm->mmap_sem);
+ err= get_user_pages(current, mm, (unsigned long)buf, pgcount, 1, 0, maplist, NULL);
+ up_read(&mm->mmap_sem);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (err < 0) {
+ kfree(list);
+ kfree(maplist);
+ return err;
+ }
+ pgcount = err;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#ifdef DEBUG_SPIDEV
+ printk("spidev_rd_rw: %i %i\n", count, pgcount);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#endif
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Set default return value = transfer length */
+ res = count;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /*
+ * At this point, the virtual area buf[0] .. buf[count-1] will have
+ * corresponding pages mapped in the physical memory and locked until
+ * we unmap the kiobuf. The pages cannot be swapped out or moved
+ * around.
+ */
+ ofs = (unsigned long) buf & (PAGE_SIZE -1);
+ pagelen = PAGE_SIZE - ofs;
+ if (count < pagelen)
+ pagelen = count;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ for (i = 0; i < pgcount; i++) {
+ flush_dcache_page(maplist[i]);
+
+ list->tx[i] = list->rx[i] = page_address(maplist[i]) + ofs;
+ list->txlen[i] = list->rxlen[i] = pagelen;
+
+#ifdef DEBUG_SPIDEV
+ printk(" %i: %x (%i)\n", i, list->tx[i], list->txlen[i]);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#endif
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ ofs = 0; /* all subsequent transfers start at beginning of a page */
+ count = count - pagelen;
+ pagelen = (count < PAGE_SIZE) ? count : PAGE_SIZE;
+ }
+ list->nr_transfers = pgcount;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Perform transfer on SPI bus */
+ spi_access_bus(spi_device);
+ spi_transfer(list);
+ spi_release_bus(spi_device);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ while (pgcount--) {
+ page_cache_release (maplist[pgcount]);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ }
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ flush_cache_all();
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ kfree(maplist);
+ kfree(list);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ return res;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int spidev_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+{
+ int spi_device = MINOR(inode->i_rdev);
+
+ if (spi_device >= NR_SPI_DEVICES)
+ return -ENODEV;
+
+ // TODO: This interface can be used to configure the SPI bus.
+ // Configurable options could include: Speed, Clock Polarity, Clock Phase
+
+ switch(cmd) {
+ default:
+ return -ENOIOCTLCMD;
+ }
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Open the SPI device
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int spidev_open(struct inode *inode, struct file *file)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ unsigned int spi_device = MINOR(inode->i_rdev);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (spi_device >= NR_SPI_DEVICES)
+ return -ENODEV;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /*
+ * 'private_data' is actually a pointer, but we overload it with the
+ * value we want to store.
+ */
+ file->private_data = (void *)spi_device;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return 0;
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * Close the SPI device
+ */
+static int spidev_close(struct inode *inode, struct file *file)
+{
+ return 0;
+}
+
+/* ......................................................................... */
+
+static struct file_operations spidev_fops = {
+ .owner = THIS_MODULE,
+ .llseek = no_llseek,
+ .read = spidev_rd_wr,
+ .write = (int (*) (struct file *file, const char *buf, size_t count, loff_t *offset))spidev_rd_wr,
+ .ioctl = spidev_ioctl,
+ .open = spidev_open,
+ .release = spidev_close,
+};
+
+/*
+ * Install the SPI /dev interface driver
+ */
+static int __init at91_spidev_init(void)
+{
+#ifdef CONFIG_DEVFS_FS
+ int i;
+#endif
+
+ if (register_chrdev(SPI_MAJOR, "spi", &spidev_fops)) {
+ printk(KERN_ERR "at91_spidev: Unable to get major %d for SPI bus\n", SPI_MAJOR);
+ return -EIO;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ }
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#ifdef CONFIG_DEVFS_FS
+ devfs_mk_dir("spi");
+ for (i = 0; i < NR_SPI_DEVICES; i++) {
+ devfs_mk_cdev(MKDEV(SPI_MAJOR, i), S_IFCHR | S_IRUSR | S_IWUSR, "spi/%d",i);
+ }
+#endif
+ printk(KERN_INFO "AT91 SPI driver loaded\n");
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return 0;
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * Remove the SPI /dev interface driver
+ */
+static void __exit at91_spidev_exit(void)
+{
+#ifdef CONFIG_DEVFS_FS
+ int i;
+ for (i = 0; i < NR_SPI_DEVICES; i++) {
+ devfs_remove("spi/%d", i);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ devfs_remove("spi");
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#endif
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+
+ if (unregister_chrdev(SPI_MAJOR, "spi")) {
+ printk(KERN_ERR "at91_spidev: Unable to release major %d for SPI bus\n", SPI_MAJOR);
+ return;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ }
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+module_init(at91_spidev_init);
+module_exit(at91_spidev_exit);
+
+MODULE_LICENSE("GPL")
+MODULE_AUTHOR("Andrew Victor")
+MODULE_DESCRIPTION("SPI /dev interface for Atmel AT91RM9200")
diff -urN linux-2.6.22-rc5/drivers/char/Kconfig linux-2.6.22-rc5.new/drivers/char/Kconfig
--- linux-2.6.22-rc5/drivers/char/Kconfig 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/drivers/char/Kconfig 2007-07-29 05:55:39.000000000 +0200
@@ -1083,5 +1083,21 @@
source "drivers/s390/char/Kconfig"
+config AT91_SPI
+ bool "SPI driver (legacy) for AT91RM9200 processors"
+ depends on ARCH_AT91RM9200
+ default y
+ help
+ The SPI driver gives access to this serial bus on the AT91RM9200
+ processor.
+
+config AT91_SPIDEV
+ bool "SPI device interface (legacy) for AT91RM9200 processors"
+ depends on ARCH_AT91RM9200 && AT91_SPI
+ default n
+ help
+ The SPI driver gives user mode access to this serial
+ bus on the AT91RM9200 processor.
+
endmenu
diff -urN linux-2.6.22-rc5/drivers/char/Makefile linux-2.6.22-rc5.new/drivers/char/Makefile
--- linux-2.6.22-rc5/drivers/char/Makefile 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/drivers/char/Makefile 2007-07-29 05:55:39.000000000 +0200
@@ -93,6 +93,8 @@
obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.o
obj-$(CONFIG_GPIO_TB0219) += tb0219.o
obj-$(CONFIG_TELCLOCK) += tlclk.o
+obj-$(CONFIG_AT91_SPI) += at91_spi.o
+obj-$(CONFIG_AT91_SPIDEV) += at91_spidev.o
obj-$(CONFIG_WATCHDOG) += watchdog/
obj-$(CONFIG_MWAVE) += mwave/
diff -urN linux-2.6.22-rc5/drivers/i2c/busses/i2c-at91.c linux-2.6.22-rc5.new/drivers/i2c/busses/i2c-at91.c
--- linux-2.6.22-rc5/drivers/i2c/busses/i2c-at91.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/drivers/i2c/busses/i2c-at91.c 2007-07-29 05:55:39.000000000 +0200
@@ -31,8 +31,11 @@
#include <asm/arch/board.h>
#include <asm/arch/cpu.h>
-#define TWI_CLOCK 100000 /* Hz. max 400 Kbits/sec */
+/* Clockrate is configurable - max 400 Kbits/sec */
+static unsigned int clockrate = CONFIG_I2C_AT91_CLOCKRATE;
+module_param(clockrate, uint, 0);
+MODULE_PARM_DESC(clockrate, "The TWI clockrate");
static struct clk *twi_clk;
static void __iomem *twi_base;
@@ -53,7 +56,7 @@
at91_twi_write(AT91_TWI_CR, AT91_TWI_MSEN); /* Set Master mode */
/* Calcuate clock dividers */
- cdiv = (clk_get_rate(twi_clk) / (2 * TWI_CLOCK)) - 3;
+ cdiv = (clk_get_rate(twi_clk) / (2 * clockrate)) - 3;
cdiv = cdiv + 1; /* round up */
ckdiv = 0;
while (cdiv > 255) {
@@ -61,11 +64,12 @@
cdiv = cdiv >> 1;
}
- if (cpu_is_at91rm9200()) { /* AT91RM9200 Errata #22 */
- if (ckdiv > 5) {
- printk(KERN_ERR "AT91 I2C: Invalid TWI_CLOCK value!\n");
- ckdiv = 5;
- }
+ if (cpu_is_at91rm9200() && (ckdiv > 5)) { /* AT91RM9200 Errata #22 */
+ printk(KERN_ERR "AT91 I2C: Invalid TWI clockrate!\n");
+ ckdiv = 5;
+ } else if (ckdiv > 7) {
+ printk(KERN_ERR "AT91 I2C: Invalid TWI clockrate!\n");
+ ckdiv = 7;
}
at91_twi_write(AT91_TWI_CWGR, (ckdiv << 16) | (cdiv << 8) | cdiv);
diff -urN linux-2.6.22-rc5/drivers/i2c/busses/i2c-pca.c linux-2.6.22-rc5.new/drivers/i2c/busses/i2c-pca.c
--- linux-2.6.22-rc5/drivers/i2c/busses/i2c-pca.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.22-rc5.new/drivers/i2c/busses/i2c-pca.c 2007-07-29 05:55:39.000000000 +0200
@@ -0,0 +1,213 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Platform driver for PCA9564 I2C bus controller.
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ *
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * (C) 2006 Andrew Victor
+ *
+ * Based on i2c-pca-isa.c driver for PCA9564 on ISA boards
+ * Copyright (C) 2004 Arcom Control Systems
+ *
+ * This program 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 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ */
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/wait.h>
+#include <linux/platform_device.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <linux/i2c.h>
+#include <linux/i2c-algo-pca.h>
+
+#include <asm/io.h>
+
+#include "../algos/i2c-algo-pca.h"
+
+#define PCA_OWN_ADDRESS 0x55 /* our address for slave mode */
+#define PCA_CLOCK I2C_PCA_CON_59kHz
+
+//#define REG_SHIFT 2
+#define REG_SHIFT 0
+
+//#define DEBUG_IO
+
+#define PCA_IO_SIZE 4
+
+static void __iomem *base_addr;
+static int irq;
+static wait_queue_head_t pca_wait;
+
+static int pca_getown(struct i2c_algo_pca_data *adap)
+{
+ return PCA_OWN_ADDRESS;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int pca_getclock(struct i2c_algo_pca_data *adap)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return PCA_CLOCK;
+}
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void pca_writebyte(struct i2c_algo_pca_data *adap, int reg, int val)
+{
+#ifdef DEBUG_IO
+ static char *names[] = { "T/O", "DAT", "ADR", "CON" };
+ printk("*** write %s at %#lx <= %#04x\n", names[reg], (unsigned long) base_addr+reg, val);
+#endif
+ udelay(1);
+ outb(val, base_addr + (reg << REG_SHIFT));
+}
+
+static int pca_readbyte(struct i2c_algo_pca_data *adap, int reg)
+{
+ int res;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ udelay(1);
+ res = inb(base_addr + (reg << REG_SHIFT));
+#ifdef DEBUG_IO
+ {
+ static char *names[] = { "STA", "DAT", "ADR", "CON" };
+ printk("*** read %s => %#04x\n", names[reg], res);
+ }
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#endif
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return res;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int pca_waitforinterrupt(struct i2c_algo_pca_data *adap)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ int ret = 0;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (irq > -1) {
+ ret = wait_event_interruptible(pca_wait,
+ pca_readbyte(adap, I2C_PCA_CON) & I2C_PCA_CON_SI);
+ } else {
+ while ((pca_readbyte(adap, I2C_PCA_CON) & I2C_PCA_CON_SI) == 0)
+ udelay(100);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ }
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return ret;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static irqreturn_t pca_handler(int this_irq, void *dev_id)
+{
+ wake_up_interruptible(&pca_wait);
+ return IRQ_HANDLED;
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct i2c_algo_pca_data pca_i2c_data = {
+ .get_own = pca_getown,
+ .get_clock = pca_getclock,
+ .write_byte = pca_writebyte,
+ .read_byte = pca_readbyte,
+ .wait_for_interrupt = pca_waitforinterrupt,
+};
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct i2c_adapter pca_i2c_ops = {
+ .owner = THIS_MODULE,
+ .id = I2C_HW_A_PLAT,
+ .algo_data = &pca_i2c_data,
+ .name = "PCA9564",
+ .class = I2C_CLASS_HWMON,
+};
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int __devinit pca_i2c_probe(struct platform_device *pdev)
+{
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ struct resource *res;
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+
+ init_waitqueue_head(&pca_wait);
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (!res)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ return -ENODEV;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (!request_mem_region(res->start, PCA_IO_SIZE, "PCA9564"))
+ return -ENXIO;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ base_addr = ioremap(res->start, PCA_IO_SIZE);
+ if (base_addr == NULL)
+ goto out_region;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ irq = platform_get_irq(pdev, 0);
+ if (irq > -1) {
+ if (request_irq(irq, pca_handler, 0, "pca9564", NULL) < 0) {
+ printk(KERN_ERR "i2c-pca: Request irq%d failed\n", irq);
+ goto out_remap;
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ }
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* set up the driverfs linkage to our parent device */
+ pca_i2c_ops.dev.parent = &pdev->dev;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (i2c_pca_add_bus(&pca_i2c_ops) < 0) {
+ printk(KERN_ERR "i2c-pca: Failed to add i2c bus\n");
+ goto out_irq;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ }
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+
+ return 0;
+
+ out_irq:
+ if (irq > -1)
+ free_irq(irq, &pca_i2c_ops);
+
+ out_remap:
+ iounmap(base_addr);
+
+ out_region:
+ release_mem_region(res->start, PCA_IO_SIZE);
+ return -ENODEV;
+}
+
+static int __devexit pca_i2c_remove(struct platform_device *pdev)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ struct resource *res;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ i2c_del_adapter(&pca_i2c_ops);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (irq > 0)
+ free_irq(irq, NULL);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ iounmap(base_addr);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ release_mem_region(res->start, PCA_IO_SIZE);
+
+ return 0;
+}
+
+static struct platform_driver pca_i2c_driver = {
+ .probe = pca_i2c_probe,
+ .remove = __devexit_p(pca_i2c_remove),
+ .driver = {
+ .name = "pca9564",
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init pca_i2c_init(void)
+{
+ return platform_driver_register(&pca_i2c_driver);
+}
+
+static void __exit pca_i2c_exit(void)
+{
+ platform_driver_unregister(&pca_i2c_driver);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+module_init(pca_i2c_init);
+module_exit(pca_i2c_exit);
+
+MODULE_AUTHOR("Andrew Victor");
+MODULE_DESCRIPTION("PCA9564 platform driver");
+MODULE_LICENSE("GPL");
diff -urN linux-2.6.22-rc5/drivers/i2c/busses/Kconfig linux-2.6.22-rc5.new/drivers/i2c/busses/Kconfig
--- linux-2.6.22-rc5/drivers/i2c/busses/Kconfig 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/drivers/i2c/busses/Kconfig 2007-07-29 05:55:39.000000000 +0200
@@ -80,6 +80,14 @@
This supports the use of the I2C interface on Atmel AT91
processors.
+config I2C_AT91_CLOCKRATE
+ prompt "Atmel AT91 I2C/TWI clock-rate"
+ depends on I2C_AT91
+ int
+ default 100000
+ help
+ Set the AT91 I2C/TWI clock-rate.
+
config I2C_AU1550
tristate "Au1550/Au1200 SMBus interface"
depends on SOC_AU1550 || SOC_AU1200
@@ -598,6 +606,14 @@
This driver can also be built as a module. If so, the module
will be called i2c-voodoo3.
+config I2C_PCA
+ tristate "PCA9564"
+ depends on I2C
+ select I2C_ALGOPCA
+ help
+ This driver support the Philips PCA 9564 Parallel bus to I2C
+ bus controller.
+
config I2C_PCA_ISA
tristate "PCA9564 on an ISA bus"
depends on ISA
diff -urN linux-2.6.22-rc5/drivers/i2c/busses/Makefile linux-2.6.22-rc5.new/drivers/i2c/busses/Makefile
--- linux-2.6.22-rc5/drivers/i2c/busses/Makefile 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/drivers/i2c/busses/Makefile 2007-07-29 05:55:39.000000000 +0200
@@ -30,6 +30,7 @@
obj-$(CONFIG_I2C_PARPORT) += i2c-parport.o
obj-$(CONFIG_I2C_PARPORT_LIGHT) += i2c-parport-light.o
obj-$(CONFIG_I2C_PASEMI) += i2c-pasemi.o
+obj-$(CONFIG_I2C_PCA) += i2c-pca.o
obj-$(CONFIG_I2C_PCA_ISA) += i2c-pca-isa.o
obj-$(CONFIG_I2C_PIIX4) += i2c-piix4.o
obj-$(CONFIG_I2C_PNX) += i2c-pnx.o
diff -urN linux-2.6.22-rc5/drivers/leds/Kconfig linux-2.6.22-rc5.new/drivers/leds/Kconfig
--- linux-2.6.22-rc5/drivers/leds/Kconfig 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/drivers/leds/Kconfig 2007-07-29 05:55:39.000000000 +0200
@@ -77,6 +77,13 @@
This option enables support for the Soekris net4801 and net4826 error
LED.
+config LEDS_AT91
+ tristate "LED support using AT91 GPIOs"
+ depends on LEDS_CLASS && ARCH_AT91 && !LEDS
+ help
+ This option enables support for LEDs connected to GPIO lines
+ on AT91-based boards.
+
config LEDS_WRAP
tristate "LED Support for the WRAP series LEDs"
depends on LEDS_CLASS && SCx200_GPIO
diff -urN linux-2.6.22-rc5/drivers/leds/leds-at91.c linux-2.6.22-rc5.new/drivers/leds/leds-at91.c
--- linux-2.6.22-rc5/drivers/leds/leds-at91.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.22-rc5.new/drivers/leds/leds-at91.c 2007-07-29 05:55:39.000000000 +0200
@@ -0,0 +1,140 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * AT91 GPIO based LED driver
+ *
+ * Copyright (C) 2006 David Brownell
+ *
+ * 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.
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/leds.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <asm/arch/board.h>
+#include <asm/arch/gpio.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static LIST_HEAD(at91_led_list); /* list of AT91 LEDs */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+struct at91_led {
+ struct led_classdev cdev;
+ struct list_head list;
+ struct at91_gpio_led *led_data;
+};
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Change the state of the LED.
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void at91_led_set(struct led_classdev *cdev, enum led_brightness value)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ struct at91_led *led = container_of(cdev, struct at91_led, cdev);
+ short active = (value == LED_OFF);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (led->led_data->flags & 1) /* active high/low? */
+ active = !active;
+ at91_set_gpio_value(led->led_data->gpio, active);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int __devexit at91_led_remove(struct platform_device *pdev)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ struct at91_led *led;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ list_for_each_entry (led, &at91_led_list, list)
+ led_classdev_unregister(&led->cdev);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#warning "Free allocated memory"
+ // TODO: Free memory. kfree(led);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return 0;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int __init at91_led_probe(struct platform_device *pdev)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ int status = 0;
+ struct at91_gpio_led *pdata = pdev->dev.platform_data;
+ unsigned nr_leds;
+ struct at91_led *led;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (!pdata)
+ return -ENODEV;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ nr_leds = pdata->index; /* first index stores number of LEDs */
+
+ while (nr_leds--) {
+ led = kzalloc(sizeof(struct at91_led), GFP_KERNEL);
+ if (!led) {
+ dev_err(&pdev->dev, "No memory for device\n");
+ status = -ENOMEM;
+ goto cleanup;
+ }
+ led->led_data = pdata;
+ led->cdev.name = pdata->name;
+ led->cdev.brightness_set = at91_led_set,
+ led->cdev.default_trigger = pdata->trigger;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ status = led_classdev_register(&pdev->dev, &led->cdev);
+ if (status < 0) {
+ dev_err(&pdev->dev, "led_classdev_register failed - %d\n", status);
+cleanup:
+ at91_led_remove(pdev);
+ break;
+ }
+ list_add(&led->list, &at91_led_list);
+ pdata++;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ }
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return status;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#ifdef CONFIG_PM
+static int at91_led_suspend(struct platform_device *dev, pm_message_t state)
+{
+ struct at91_led *led;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ list_for_each_entry (led, &at91_led_list, list)
+ led_classdev_suspend(&led->cdev);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return 0;
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int at91_led_resume(struct platform_device *dev)
+{
+ struct at91_led *led;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ list_for_each_entry (led, &at91_led_list, list)
+ led_classdev_resume(&led->cdev);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return 0;
+}
+#else
+#define at91_led_suspend NULL
+#define at91_led_resume NULL
+#endif
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct platform_driver at91_led_driver = {
+ .probe = at91_led_probe,
+ .remove = __devexit_p(at91_led_remove),
+ .suspend = at91_led_suspend,
+ .resume = at91_led_resume,
+ .driver = {
+ .name = "at91_leds",
+ .owner = THIS_MODULE,
+ },
+};
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int __init at91_led_init(void)
+{
+ return platform_driver_register(&at91_led_driver);
+}
+module_init(at91_led_init);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __exit at91_led_exit(void)
+{
+ platform_driver_unregister(&at91_led_driver);
+}
+module_exit(at91_led_exit);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+MODULE_DESCRIPTION("AT91 GPIO LED driver");
+MODULE_AUTHOR("David Brownell");
+MODULE_LICENSE("GPL");
diff -urN linux-2.6.22-rc5/drivers/leds/Makefile linux-2.6.22-rc5.new/drivers/leds/Makefile
--- linux-2.6.22-rc5/drivers/leds/Makefile 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/drivers/leds/Makefile 2007-07-29 05:55:39.000000000 +0200
@@ -16,6 +16,7 @@
obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o
obj-$(CONFIG_LEDS_H1940) += leds-h1940.o
obj-$(CONFIG_LEDS_COBALT) += leds-cobalt.o
+obj-$(CONFIG_LEDS_AT91) += leds-at91.o
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
# LED Triggers
obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
diff -urN linux-2.6.22-rc5/drivers/mmc/host/at91_mci.c linux-2.6.22-rc5.new/drivers/mmc/host/at91_mci.c
--- linux-2.6.22-rc5/drivers/mmc/host/at91_mci.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/drivers/mmc/host/at91_mci.c 2007-07-29 05:57:56.000000000 +0200
@@ -85,7 +85,7 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
#define AT91_MCI_ERRORS (AT91_MCI_RINDE | AT91_MCI_RDIRE | AT91_MCI_RCRCE \
| AT91_MCI_RENDE | AT91_MCI_RTOE | AT91_MCI_DCRCE \
- | AT91_MCI_DTOE | AT91_MCI_OVRE | AT91_MCI_UNRE)
+ | AT91_MCI_DTOE | AT91_MCI_OVRE | AT91_MCI_UNRE)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
#define at91_mci_read(host, reg) __raw_readl((host)->baseaddr + (reg))
#define at91_mci_write(host, reg, val) __raw_writel((val), (host)->baseaddr + (reg))
@@ -560,9 +560,7 @@
pr_debug("Status = %08X [%08X %08X %08X %08X]\n",
status, cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]);
- if (status & (AT91_MCI_RINDE | AT91_MCI_RDIRE | AT91_MCI_RCRCE |
- AT91_MCI_RENDE | AT91_MCI_RTOE | AT91_MCI_DCRCE |
- AT91_MCI_DTOE | AT91_MCI_OVRE | AT91_MCI_UNRE)) {
+ if (status & AT91_MCI_ERRORS) {
if ((status & AT91_MCI_RCRCE) && !(mmc_resp_type(cmd) & MMC_RSP_CRC)) {
cmd->error = MMC_ERR_NONE;
}
@@ -663,15 +661,15 @@
int_status = at91_mci_read(host, AT91_MCI_SR);
int_mask = at91_mci_read(host, AT91_MCI_IMR);
-
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
pr_debug("MCI irq: status = %08X, %08X, %08X\n", int_status, int_mask,
int_status & int_mask);
-
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
int_status = int_status & int_mask;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
if (int_status & AT91_MCI_ERRORS) {
completed = 1;
-
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
if (int_status & AT91_MCI_UNRE)
pr_debug("MMC: Underrun error\n");
if (int_status & AT91_MCI_OVRE)
@@ -819,7 +817,7 @@
mmc->f_min = 375000;
mmc->f_max = 25000000;
mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
- mmc->caps = MMC_CAP_BYTEBLOCK;
+ mmc->caps = MMC_CAP_BYTEBLOCK | MMC_CAP_MULTIWRITE;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
mmc->max_blk_size = 4095;
mmc->max_blk_count = mmc->max_req_size;
@@ -893,6 +891,8 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
mmc_add_host(mmc);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ device_init_wakeup(&pdev->dev, 1);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
/*
* monitor card insertion/removal if we can
*/
@@ -922,6 +922,8 @@
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
host = mmc_priv(mmc);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ device_init_wakeup(&pdev->dev, 0);
+
if (host->present != -1) {
free_irq(host->board->det_pin, host);
cancel_delayed_work(&host->mmc->detect);
@@ -949,8 +951,12 @@
static int at91_mci_suspend(struct platform_device *pdev, pm_message_t state)
{
struct mmc_host *mmc = platform_get_drvdata(pdev);
+ struct at91mci_host *host = mmc_priv(mmc);
int ret = 0;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (device_may_wakeup(&pdev->dev))
+ enable_irq_wake(host->board->det_pin);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
if (mmc)
ret = mmc_suspend_host(mmc, state);
@@ -960,8 +966,12 @@
static int at91_mci_resume(struct platform_device *pdev)
{
struct mmc_host *mmc = platform_get_drvdata(pdev);
+ struct at91mci_host *host = mmc_priv(mmc);
int ret = 0;
+ if (device_may_wakeup(&pdev->dev))
+ disable_irq_wake(host->board->det_pin);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
if (mmc)
ret = mmc_resume_host(mmc);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
diff -urN linux-2.6.22-rc5/drivers/mtd/devices/at91_dataflash.c linux-2.6.22-rc5.new/drivers/mtd/devices/at91_dataflash.c
--- linux-2.6.22-rc5/drivers/mtd/devices/at91_dataflash.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.22-rc5.new/drivers/mtd/devices/at91_dataflash.c 2007-07-29 05:55:39.000000000 +0200
@@ -0,0 +1,667 @@
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Atmel DataFlash driver for Atmel AT91RM9200 (Thunder)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ *
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Copyright (C) SAN People (Pty) Ltd
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ *
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * This program 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 of the License, or (at your option) any later version.
+*/
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/pci.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <asm/arch/spi.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#undef DEBUG_DATAFLASH
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define DATAFLASH_MAX_DEVICES 4 /* max number of dataflash devices */
+#undef DATAFLASH_ALWAYS_ADD_DEVICE /* always add whole device when using partitions? */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define OP_READ_CONTINUOUS 0xE8
+#define OP_READ_PAGE 0xD2
+#define OP_READ_BUFFER1 0xD4
+#define OP_READ_BUFFER2 0xD6
+#define OP_READ_STATUS 0xD7
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define OP_ERASE_PAGE 0x81
+#define OP_ERASE_BLOCK 0x50
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define OP_TRANSFER_BUF1 0x53
+#define OP_TRANSFER_BUF2 0x55
+#define OP_COMPARE_BUF1 0x60
+#define OP_COMPARE_BUF2 0x61
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define OP_PROGRAM_VIA_BUF1 0x82
+#define OP_PROGRAM_VIA_BUF2 0x85
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+struct dataflash_local
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ int spi; /* SPI chip-select number */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ unsigned int page_size; /* number of bytes per page */
+ unsigned short page_offset; /* page offset in flash address */
+};
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* Detected DataFlash devices */
+static struct mtd_info* mtd_devices[DATAFLASH_MAX_DEVICES];
+static int nr_devices = 0;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* ......................................................................... */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#ifdef CONFIG_MTD_PARTITIONS
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct mtd_partition static_partitions_2M[] =
+{
+ {
+ .name = "bootloader",
+ .offset = 0,
+ .size = 1 * 32 * 8 * 528, /* 1st sector = 32 blocks * 8 pages * 528 bytes */
+ .mask_flags = MTD_WRITEABLE, /* read-only */
+ },
+ {
+ .name = "kernel",
+ .offset = MTDPART_OFS_NXTBLK,
+ .size = 6 * 32 * 8 * 528, /* 6 sectors */
+ },
+ {
+ .name = "filesystem",
+ .offset = MTDPART_OFS_NXTBLK,
+ .size = MTDPART_SIZ_FULL, /* rest = 9 sectors */
+ }
+};
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct mtd_partition static_partitions_4M[] =
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ {
+ .name = "bootloader",
+ .offset = 0,
+ .size = 1 * 64 * 8 * 528, /* 1st sector = 64 blocks * 8 pages * 528 bytes */
+ .mask_flags = MTD_WRITEABLE, /* read-only */
+ },
+ {
+ .name = "kernel",
+ .offset = MTDPART_OFS_NXTBLK,
+ .size = 4 * 64 * 8 * 528, /* 4 sectors */
+ },
+ {
+ .name = "filesystem",
+ .offset = MTDPART_OFS_NXTBLK,
+ .size = MTDPART_SIZ_FULL, /* rest = 11 sectors */
+ }
+};
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#if defined(CONFIG_MACH_KAFA)
+static struct mtd_partition static_partitions_8M[] =
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ {
+ name: "romboot",
+ offset: 0,
+ size: 16 * 1056, /* 160 Kb */
+ mask_flags: MTD_WRITEABLE, /* read-only */
+ },
+ {
+ name: "uboot",
+ offset: MTDPART_OFS_APPEND, /* Sperry, NXTBLK is broken */
+ size: 128 * 1056, /* 1 MB */
+ },
+ {
+ name: "kernel",
+ offset: MTDPART_OFS_APPEND, /* Sperry, NXTBLK is broken */
+ size: 1024 * 1056, /* 1 MB */
+ },
+ {
+ name: "filesystem",
+ offset: MTDPART_OFS_APPEND, /* Sperry, NXTBLK is broken */
+ size: MTDPART_SIZ_FULL,
+ }
+};
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#elif defined(CONFIG_MACH_MULTMDP)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct mtd_partition static_partitions_8M[] =
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ {
+ .name = "bootloader",
+ .offset = 0,
+ .size = 12 * 1056, /* 1st sector = 32 blocks * 8 pages * 1056 bytes */
+ .mask_flags = MTD_WRITEABLE, /* read-only */
+ },
+ {
+ .name = "configuration",
+ .offset = MTDPART_OFS_NXTBLK,
+ .size = 20 * 1056,
+ },
+ {
+ .name = "kernel",
+ .offset = MTDPART_OFS_NXTBLK,
+ .size = 1520 * 1056,
+ },
+ {
+ .name = "filesystem",
+ .offset = MTDPART_OFS_NXTBLK,
+ .size = MTDPART_SIZ_FULL,
+ }
+};
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#else
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct mtd_partition static_partitions_8M[] =
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ {
+ .name = "bootloader",
+ .offset = 0,
+ .size = 1 * 32 * 8 * 1056, /* 1st sector = 32 blocks * 8 pages * 1056 bytes */
+ .mask_flags = MTD_WRITEABLE, /* read-only */
+ },
+ {
+ .name = "kernel",
+ .offset = MTDPART_OFS_NXTBLK,
+ .size = 5 * 32 * 8 * 1056, /* 5 sectors */
+ },
+ {
+ .name = "filesystem",
+ .offset = MTDPART_OFS_NXTBLK,
+ .size = MTDPART_SIZ_FULL, /* rest = 26 sectors */
+ }
+};
+#endif
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static const char *part_probes[] = { "cmdlinepart", NULL, };
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#endif
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* ......................................................................... */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* Allocate a single SPI transfer descriptor. We're assuming that if multiple
+ SPI transfers occur at the same time, spi_access_bus() will serialize them.
+ If this is not valid, then either (i) each dataflash 'priv' structure
+ needs it's own transfer descriptor, (ii) we lock this one, or (iii) use
+ another mechanism. */
+static struct spi_transfer_list* spi_transfer_desc;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * Perform a SPI transfer to access the DataFlash device.
+ */
+static int do_spi_transfer(int nr, char* tx, int tx_len, char* rx, int rx_len,
+ char* txnext, int txnext_len, char* rxnext, int rxnext_len)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ struct spi_transfer_list* list = spi_transfer_desc;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ list->tx[0] = tx; list->txlen[0] = tx_len;
+ list->rx[0] = rx; list->rxlen[0] = rx_len;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ list->tx[1] = txnext; list->txlen[1] = txnext_len;
+ list->rx[1] = rxnext; list->rxlen[1] = rxnext_len;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ list->nr_transfers = nr;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return spi_transfer(list);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* ......................................................................... */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Poll the DataFlash device until it is READY.
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void at91_dataflash_waitready(void)
+{
+ char* command = kmalloc(2, GFP_KERNEL);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (!command)
+ return;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ do {
+ command[0] = OP_READ_STATUS;
+ command[1] = 0;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ do_spi_transfer(1, command, 2, command, 2, NULL, 0, NULL, 0);
+ } while ((command[1] & 0x80) == 0);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ kfree(command);
+}
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * Return the status of the DataFlash device.
+ */
+static unsigned short at91_dataflash_status(void)
+{
+ unsigned short status;
+ char* command = kmalloc(2, GFP_KERNEL);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (!command)
+ return 0;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ command[0] = OP_READ_STATUS;
+ command[1] = 0;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ do_spi_transfer(1, command, 2, command, 2, NULL, 0, NULL, 0);
+ status = command[1];
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ kfree(command);
+ return status;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* ......................................................................... */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * Erase blocks of flash.
+ */
+static int at91_dataflash_erase(struct mtd_info *mtd, struct erase_info *instr)
+{
+ struct dataflash_local *priv = (struct dataflash_local *) mtd->priv;
+ unsigned int pageaddr;
+ char* command;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#ifdef DEBUG_DATAFLASH
+ printk("dataflash_erase: addr=%i len=%i\n", instr->addr, instr->len);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#endif
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Sanity checks */
+ if (instr->addr + instr->len > mtd->size)
+ return -EINVAL;
+ if ((instr->len % mtd->erasesize != 0) || (instr->len % priv->page_size != 0))
+ return -EINVAL;
+ if ((instr->addr % priv->page_size) != 0)
+ return -EINVAL;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ command = kmalloc(4, GFP_KERNEL);
+ if (!command)
+ return -ENOMEM;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ while (instr->len > 0) {
+ /* Calculate flash page address */
+ pageaddr = (instr->addr / priv->page_size) << priv->page_offset;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ command[0] = OP_ERASE_PAGE;
+ command[1] = (pageaddr & 0x00FF0000) >> 16;
+ command[2] = (pageaddr & 0x0000FF00) >> 8;
+ command[3] = 0;
+#ifdef DEBUG_DATAFLASH
+ printk("ERASE: (%x) %x %x %x [%i]\n", command[0], command[1], command[2], command[3], pageaddr);
+#endif
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Send command to SPI device */
+ spi_access_bus(priv->spi);
+ do_spi_transfer(1, command, 4, command, 4, NULL, 0, NULL, 0);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ at91_dataflash_waitready(); /* poll status until ready */
+ spi_release_bus(priv->spi);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ instr->addr += priv->page_size; /* next page */
+ instr->len -= priv->page_size;
+ }
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ kfree(command);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Inform MTD subsystem that erase is complete */
+ instr->state = MTD_ERASE_DONE;
+ if (instr->callback)
+ instr->callback(instr);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return 0;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * Read from the DataFlash device.
+ * from : Start offset in flash device
+ * len : Amount to read
+ * retlen : About of data actually read
+ * buf : Buffer containing the data
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int at91_dataflash_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ struct dataflash_local *priv = (struct dataflash_local *) mtd->priv;
+ unsigned int addr;
+ char* command;
+
+#ifdef DEBUG_DATAFLASH
+ printk("dataflash_read: %lli .. %lli\n", from, from+len);
+#endif
+
+ *retlen = 0;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Sanity checks */
+ if (!len)
+ return 0;
+ if (from + len > mtd->size)
+ return -EINVAL;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Calculate flash page/byte address */
+ addr = (((unsigned)from / priv->page_size) << priv->page_offset) + ((unsigned)from % priv->page_size);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ command = kmalloc(8, GFP_KERNEL);
+ if (!command)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ return -ENOMEM;
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ command[0] = OP_READ_CONTINUOUS;
+ command[1] = (addr & 0x00FF0000) >> 16;
+ command[2] = (addr & 0x0000FF00) >> 8;
+ command[3] = (addr & 0x000000FF);
+#ifdef DEBUG_DATAFLASH
+ printk("READ: (%x) %x %x %x\n", command[0], command[1], command[2], command[3]);
+#endif
+
+ /* Send command to SPI device */
+ spi_access_bus(priv->spi);
+ do_spi_transfer(2, command, 8, command, 8, buf, len, buf, len);
+ spi_release_bus(priv->spi);
+
+ *retlen = len;
+ kfree(command);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ return 0;
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * Write to the DataFlash device.
+ * to : Start offset in flash device
+ * len : Amount to write
+ * retlen : Amount of data actually written
+ * buf : Buffer containing the data
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int at91_dataflash_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ struct dataflash_local *priv = (struct dataflash_local *) mtd->priv;
+ unsigned int pageaddr, addr, offset, writelen;
+ size_t remaining;
+ u_char *writebuf;
+ unsigned short status;
+ int res = 0;
+ char* command;
+ char* tmpbuf = NULL;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#ifdef DEBUG_DATAFLASH
+ printk("dataflash_write: %lli .. %lli\n", to, to+len);
+#endif
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ *retlen = 0;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Sanity checks */
+ if (!len)
+ return 0;
+ if (to + len > mtd->size)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ return -EINVAL;
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ command = kmalloc(4, GFP_KERNEL);
+ if (!command)
+ return -ENOMEM;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ pageaddr = ((unsigned)to / priv->page_size);
+ offset = ((unsigned)to % priv->page_size);
+ if (offset + len > priv->page_size)
+ writelen = priv->page_size - offset;
+ else
+ writelen = len;
+ writebuf = (u_char *)buf;
+ remaining = len;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Allocate temporary buffer */
+ tmpbuf = kmalloc(priv->page_size, GFP_KERNEL);
+ if (!tmpbuf) {
+ kfree(command);
+ return -ENOMEM;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ }
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Gain access to the SPI bus */
+ spi_access_bus(priv->spi);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ while (remaining > 0) {
+#ifdef DEBUG_DATAFLASH
+ printk("write @ %i:%i len=%i\n", pageaddr, offset, writelen);
+#endif
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* (1) Transfer to Buffer1 */
+ if (writelen != priv->page_size) {
+ addr = pageaddr << priv->page_offset;
+ command[0] = OP_TRANSFER_BUF1;
+ command[1] = (addr & 0x00FF0000) >> 16;
+ command[2] = (addr & 0x0000FF00) >> 8;
+ command[3] = 0;
+#ifdef DEBUG_DATAFLASH
+ printk("TRANSFER: (%x) %x %x %x\n", command[0], command[1], command[2], command[3]);
+#endif
+ do_spi_transfer(1, command, 4, command, 4, NULL, 0, NULL, 0);
+ at91_dataflash_waitready();
+ }
+
+ /* (2) Program via Buffer1 */
+ addr = (pageaddr << priv->page_offset) + offset;
+ command[0] = OP_PROGRAM_VIA_BUF1;
+ command[1] = (addr & 0x00FF0000) >> 16;
+ command[2] = (addr & 0x0000FF00) >> 8;
+ command[3] = (addr & 0x000000FF);
+#ifdef DEBUG_DATAFLASH
+ printk("PROGRAM: (%x) %x %x %x\n", command[0], command[1], command[2], command[3]);
+#endif
+ do_spi_transfer(2, command, 4, command, 4, writebuf, writelen, tmpbuf, writelen);
+ at91_dataflash_waitready();
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* (3) Compare to Buffer1 */
+ addr = pageaddr << priv->page_offset;
+ command[0] = OP_COMPARE_BUF1;
+ command[1] = (addr & 0x00FF0000) >> 16;
+ command[2] = (addr & 0x0000FF00) >> 8;
+ command[3] = 0;
+#ifdef DEBUG_DATAFLASH
+ printk("COMPARE: (%x) %x %x %x\n", command[0], command[1], command[2], command[3]);
+#endif
+ do_spi_transfer(1, command, 4, command, 4, NULL, 0, NULL, 0);
+ at91_dataflash_waitready();
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Get result of the compare operation */
+ status = at91_dataflash_status();
+ if ((status & 0x40) == 1) {
+ printk("at91_dataflash: Write error on page %i\n", pageaddr);
+ remaining = 0;
+ res = -EIO;
+ }
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ remaining = remaining - writelen;
+ pageaddr++;
+ offset = 0;
+ writebuf += writelen;
+ *retlen += writelen;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (remaining > priv->page_size)
+ writelen = priv->page_size;
+ else
+ writelen = remaining;
+ }
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Release SPI bus */
+ spi_release_bus(priv->spi);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ kfree(tmpbuf);
+ kfree(command);
+ return res;
+}
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* ......................................................................... */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * Initialize and register DataFlash device with MTD subsystem.
+ */
+static int __init add_dataflash(int channel, char *name, int IDsize,
+ int nr_pages, int pagesize, int pageoffset)
+{
+ struct mtd_info *device;
+ struct dataflash_local *priv;
+#ifdef CONFIG_MTD_PARTITIONS
+ struct mtd_partition *mtd_parts = 0;
+ int mtd_parts_nr = 0;
+#endif
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (nr_devices >= DATAFLASH_MAX_DEVICES) {
+ printk(KERN_ERR "at91_dataflash: Too many devices detected\n");
+ return 0;
+ }
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ device = kmalloc(sizeof(struct mtd_info) + strlen(name) + 8, GFP_KERNEL);
+ if (!device)
+ return -ENOMEM;
+ memset(device, 0, sizeof(struct mtd_info));
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ device->name = (char *)&device[1];
+ sprintf(device->name, "%s.spi%d", name, channel);
+ device->size = nr_pages * pagesize;
+ device->erasesize = pagesize;
+ device->writesize = pagesize;
+ device->owner = THIS_MODULE;
+ device->type = MTD_DATAFLASH;
+ device->flags = MTD_WRITEABLE;
+ device->erase = at91_dataflash_erase;
+ device->read = at91_dataflash_read;
+ device->write = at91_dataflash_write;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ priv = (struct dataflash_local *) kmalloc(sizeof(struct dataflash_local), GFP_KERNEL);
+ if (!priv) {
+ kfree(device);
+ return -ENOMEM;
+ }
+ memset(priv, 0, sizeof(struct dataflash_local));
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ priv->spi = channel;
+ priv->page_size = pagesize;
+ priv->page_offset = pageoffset;
+ device->priv = priv;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ mtd_devices[nr_devices] = device;
+ nr_devices++;
+ printk("at91_dataflash: %s detected [spi%i] (%i bytes)\n", name, channel, device->size);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#ifdef CONFIG_MTD_PARTITIONS
+#ifdef CONFIG_MTD_CMDLINE_PARTS
+ mtd_parts_nr = parse_mtd_partitions(device, part_probes, &mtd_parts, 0);
+#endif
+ if (mtd_parts_nr <= 0) {
+ switch (IDsize) {
+ case SZ_2M:
+ mtd_parts = static_partitions_2M;
+ mtd_parts_nr = ARRAY_SIZE(static_partitions_2M);
+ break;
+ case SZ_4M:
+ mtd_parts = static_partitions_4M;
+ mtd_parts_nr = ARRAY_SIZE(static_partitions_4M);
+ break;
+ case SZ_8M:
+ mtd_parts = static_partitions_8M;
+ mtd_parts_nr = ARRAY_SIZE(static_partitions_8M);
+ break;
+ }
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ }
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (mtd_parts_nr > 0) {
+#ifdef DATAFLASH_ALWAYS_ADD_DEVICE
+ add_mtd_device(device);
+#endif
+ return add_mtd_partitions(device, mtd_parts, mtd_parts_nr);
+ }
+#endif
+ return add_mtd_device(device); /* add whole device */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * Detect and initialize DataFlash device connected to specified SPI channel.
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ *
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Device Density ID code Nr Pages Page Size Page offset
+ * AT45DB011B 1Mbit (128K) xx0011xx (0x0c) 512 264 9
+ * AT45DB021B 2Mbit (256K) xx0101xx (0x14) 1025 264 9
+ * AT45DB041B 4Mbit (512K) xx0111xx (0x1c) 2048 264 9
+ * AT45DB081B 8Mbit (1M) xx1001xx (0x24) 4096 264 9
+ * AT45DB0161B 16Mbit (2M) xx1011xx (0x2c) 4096 528 10
+ * AT45DB0321B 32Mbit (4M) xx1101xx (0x34) 8192 528 10
+ * AT45DB0642 64Mbit (8M) xx1111xx (0x3c) 8192 1056 11
+ * AT45DB1282 128Mbit (16M) xx0100xx (0x10) 16384 1056 11
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int __init at91_dataflash_detect(int channel)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ int res = 0;
+ unsigned short status;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ spi_access_bus(channel);
+ status = at91_dataflash_status();
+ spi_release_bus(channel);
+ if (status != 0xff) { /* no dataflash device there */
+ switch (status & 0x3c) {
+ case 0x0c: /* 0 0 1 1 */
+ res = add_dataflash(channel, "AT45DB011B", SZ_128K, 512, 264, 9);
+ break;
+ case 0x14: /* 0 1 0 1 */
+ res = add_dataflash(channel, "AT45DB021B", SZ_256K, 1025, 264, 9);
+ break;
+ case 0x1c: /* 0 1 1 1 */
+ res = add_dataflash(channel, "AT45DB041B", SZ_512K, 2048, 264, 9);
+ break;
+ case 0x24: /* 1 0 0 1 */
+ res = add_dataflash(channel, "AT45DB081B", SZ_1M, 4096, 264, 9);
+ break;
+ case 0x2c: /* 1 0 1 1 */
+ res = add_dataflash(channel, "AT45DB161B", SZ_2M, 4096, 528, 10);
+ break;
+ case 0x34: /* 1 1 0 1 */
+ res = add_dataflash(channel, "AT45DB321B", SZ_4M, 8192, 528, 10);
+ break;
+ case 0x3c: /* 1 1 1 1 */
+ res = add_dataflash(channel, "AT45DB642", SZ_8M, 8192, 1056, 11);
+ break;
+// Currently unsupported since Atmel removed the "Main Memory Program via Buffer" commands.
+// case 0x10: /* 0 1 0 0 */
+// res = add_dataflash(channel, "AT45DB1282", SZ_16M, 16384, 1056, 11);
+// break;
+ default:
+ printk(KERN_ERR "at91_dataflash: Unknown device (%x)\n", status & 0x3c);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ }
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return res;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int __init at91_dataflash_init(void)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ spi_transfer_desc = kmalloc(sizeof(struct spi_transfer_list), GFP_KERNEL);
+ if (!spi_transfer_desc)
+ return -ENOMEM;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* DataFlash (SPI chip select 0) */
+ at91_dataflash_detect(0);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#ifdef CONFIG_MTD_AT91_DATAFLASH_CARD
+ /* DataFlash card (SPI chip select 3) */
+ at91_dataflash_detect(3);
+#endif
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return 0;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __exit at91_dataflash_exit(void)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ int i;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ for (i = 0; i < DATAFLASH_MAX_DEVICES; i++) {
+ if (mtd_devices[i]) {
+#ifdef CONFIG_MTD_PARTITIONS
+ del_mtd_partitions(mtd_devices[i]);
+#else
+ del_mtd_device(mtd_devices[i]);
+#endif
+ kfree(mtd_devices[i]->priv);
+ kfree(mtd_devices[i]);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ }
+ }
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ nr_devices = 0;
+ kfree(spi_transfer_desc);
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+module_init(at91_dataflash_init);
+module_exit(at91_dataflash_exit);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Andrew Victor");
+MODULE_DESCRIPTION("DataFlash driver for Atmel AT91RM9200");
diff -urN linux-2.6.22-rc5/drivers/mtd/devices/Kconfig linux-2.6.22-rc5.new/drivers/mtd/devices/Kconfig
--- linux-2.6.22-rc5/drivers/mtd/devices/Kconfig 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/drivers/mtd/devices/Kconfig 2007-07-29 05:55:39.000000000 +0200
@@ -269,5 +269,11 @@
LinuxBIOS or if you need to recover a DiskOnChip Millennium on which
you have managed to wipe the first block.
-endmenu
+config MTD_AT91_DATAFLASH
+ tristate "AT91RM9200 DataFlash AT45DBxxx (legacy driver)"
+ depends on MTD && ARCH_AT91RM9200 && AT91_SPI
+ help
+ This enables access to the DataFlash (AT45DBxxx) on the AT91RM9200.
+ If you have such a board, say 'Y'.
+endmenu
diff -urN linux-2.6.22-rc5/drivers/mtd/devices/Makefile linux-2.6.22-rc5.new/drivers/mtd/devices/Makefile
--- linux-2.6.22-rc5/drivers/mtd/devices/Makefile 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/drivers/mtd/devices/Makefile 2007-07-29 05:55:39.000000000 +0200
@@ -18,3 +18,4 @@
obj-$(CONFIG_MTD_DATAFLASH) += mtd_dataflash.o
obj-$(CONFIG_MTD_DATAFLASH26) += at91_dataflash26.o
obj-$(CONFIG_MTD_M25P80) += m25p80.o
+obj-$(CONFIG_MTD_AT91_DATAFLASH)+= at91_dataflash.o
diff -urN linux-2.6.22-rc5/drivers/net/arm/at91_ether.c linux-2.6.22-rc5.new/drivers/net/arm/at91_ether.c
--- linux-2.6.22-rc5/drivers/net/arm/at91_ether.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/drivers/net/arm/at91_ether.c 2007-07-29 05:55:39.000000000 +0200
@@ -894,6 +894,7 @@
skb_reserve(skb, 2);
memcpy(skb_put(skb, pktlen), p_recv, pktlen);
+ skb->dev = dev;
skb->protocol = eth_type_trans(skb, dev);
dev->last_rx = jiffies;
lp->stats.rx_bytes += pktlen;
@@ -978,14 +979,22 @@
struct net_device *dev;
struct at91_private *lp;
unsigned int val;
- int res;
+ struct resource *res;
+ int ret;
dev = alloc_etherdev(sizeof(struct at91_private));
if (!dev)
return -ENOMEM;
- dev->base_addr = AT91_VA_BASE_EMAC;
- dev->irq = AT91RM9200_ID_EMAC;
+ /* Get I/O base address and IRQ */
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res) {
+ free_netdev(dev);
+ return -ENODEV;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ }
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ dev->base_addr = res->start;
+ dev->irq = platform_get_irq(pdev, 0);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
SET_MODULE_OWNER(dev);
/* Install the interrupt handler */
@@ -1058,12 +1067,12 @@
lp->phy_address = phy_address; /* MDI address of PHY */
/* Register the network interface */
- res = register_netdev(dev);
- if (res) {
+ ret = register_netdev(dev);
+ if (ret) {
free_irq(dev->irq, dev);
free_netdev(dev);
dma_free_coherent(NULL, sizeof(struct recv_desc_bufs), lp->dlist, (dma_addr_t)lp->dlist_phys);
- return res;
+ return ret;
}
/* Determine current link speed */
diff -urN linux-2.6.22-rc5/drivers/serial/atmel_serial.c linux-2.6.22-rc5.new/drivers/serial/atmel_serial.c
--- linux-2.6.22-rc5/drivers/serial/atmel_serial.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/drivers/serial/atmel_serial.c 2007-07-29 05:55:39.000000000 +0200
@@ -7,6 +7,8 @@
* Based on drivers/char/serial_sa1100.c, by Deep Blue Solutions Ltd.
* Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
*
+ * DMA support added by Chip Coldwell.
+ *
* This program 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 of the License, or
@@ -33,6 +35,7 @@
#include <linux/sysrq.h>
#include <linux/tty_flip.h>
#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
#include <linux/atmel_pdc.h>
#include <asm/io.h>
@@ -47,6 +50,11 @@
#include "atmel_serial.h"
+#define SUPPORT_PDC
+#define PDC_BUFFER_SIZE (L1_CACHE_BYTES << 3)
+#warning "Revisit"
+#define PDC_RX_TIMEOUT (3 * 10) /* 3 bytes */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
#if defined(CONFIG_SERIAL_ATMEL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
#define SUPPORT_SYSRQ
#endif
@@ -107,6 +115,13 @@
static int (*atmel_open_hook)(struct uart_port *);
static void (*atmel_close_hook)(struct uart_port *);
+struct atmel_dma_buffer {
+ unsigned char *buf;
+ dma_addr_t dma_addr;
+ size_t dma_size;
+ unsigned int ofs;
+};
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
/*
* We wrap our port structure around the generic uart_port.
*/
@@ -114,10 +129,20 @@
struct uart_port uart; /* uart */
struct clk *clk; /* uart clock */
unsigned short suspended; /* is port suspended? */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ short use_dma_rx; /* enable PDC receiver */
+ short pdc_rx_idx; /* current PDC RX buffer */
+ struct atmel_dma_buffer pdc_rx[2]; /* PDC receier */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ short use_dma_tx; /* enable PDC transmitter */
+ struct atmel_dma_buffer pdc_tx; /* PDC transmitter */
};
static struct atmel_uart_port atmel_ports[ATMEL_MAX_UART];
+#define PDC_RX_BUF(port) &(port)->pdc_rx[(port)->pdc_rx_idx]
+#define PDC_RX_SWITCH(port) (port)->pdc_rx_idx = !(port)->pdc_rx_idx
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
#ifdef SUPPORT_SYSRQ
static struct console atmel_console;
#endif
@@ -205,7 +230,12 @@
{
struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
- UART_PUT_IDR(port, ATMEL_US_TXRDY);
+ if (atmel_port->use_dma_tx) {
+ UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS); /* disable PDC transmit */
+ UART_PUT_IDR(port, ATMEL_US_ENDTX | ATMEL_US_TXBUFE);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ }
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ else
+ UART_PUT_IDR(port, ATMEL_US_TXRDY);
}
/*
@@ -215,7 +245,17 @@
{
struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
- UART_PUT_IER(port, ATMEL_US_TXRDY);
+ if (atmel_port->use_dma_tx) {
+ if (UART_GET_PTSR(port) & ATMEL_PDC_TXTEN)
+ /* The transmitter is already running. Yes, we
+ really need this.*/
+ return;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ UART_PUT_IER(port, ATMEL_US_ENDTX | ATMEL_US_TXBUFE);
+ UART_PUT_PTCR(port, ATMEL_PDC_TXTEN); /* re-enable PDC transmit */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ }
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ else
+ UART_PUT_IER(port, ATMEL_US_TXRDY);
}
/*
@@ -225,7 +265,12 @@
{
struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
- UART_PUT_IDR(port, ATMEL_US_RXRDY);
+ if (atmel_port->use_dma_rx) {
+ UART_PUT_PTCR(port, ATMEL_PDC_RXTDIS); /* disable PDC receive */
+ UART_PUT_IDR(port, ATMEL_US_ENDRX | ATMEL_US_TIMEOUT);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ }
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ else
+ UART_PUT_IDR(port, ATMEL_US_RXRDY);
}
/*
@@ -248,6 +293,134 @@
}
/*
+ * Receive data via the PDC. A buffer has been fulled.
+ */
+static void atmel_pdc_endrx(struct uart_port *port)
+{
+ struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
+ struct tty_struct *tty = port->info->tty;
+ struct atmel_dma_buffer *pdc = PDC_RX_BUF(atmel_port);
+ unsigned int count;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ count = pdc->dma_size - pdc->ofs;
+ if (likely(count > 0)) {
+ dma_sync_single_for_cpu(port->dev, pdc->dma_addr, pdc->dma_size, DMA_FROM_DEVICE);
+ tty_insert_flip_string(tty, pdc->buf + pdc->ofs, count);
+ tty_flip_buffer_push(tty);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ port->icount.rx += count;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Set this buffer as the next receive buffer */
+ pdc->ofs = 0;
+ UART_PUT_RNPR(port, pdc->dma_addr);
+ UART_PUT_RNCR(port, pdc->dma_size);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* Switch to next buffer */
+ PDC_RX_SWITCH(atmel_port); /* next PDC buffer */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * Receive data via the PDC. At least one byte was received, but the
+ * buffer was not full when the inter-character timeout expired.
+ */
+static void atmel_pdc_timeout(struct uart_port *port)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
+ struct tty_struct *tty = port->info->tty;
+ struct atmel_dma_buffer *pdc = PDC_RX_BUF(atmel_port);
+ /* unsigned */ int ofs, count;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ ofs = UART_GET_RPR(port) - pdc->dma_addr; /* current DMA adress */
+ count = ofs - pdc->ofs;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (likely(count > 0)) {
+ dma_sync_single_for_cpu(port->dev, pdc->dma_addr, pdc->dma_size, DMA_FROM_DEVICE);
+ tty_insert_flip_string(tty, pdc->buf + pdc->ofs, count);
+ tty_flip_buffer_push(tty);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ pdc->ofs = ofs;
+ port->icount.rx += count;
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* reset the UART timeout */
+ UART_PUT_CR(port, ATMEL_US_STTTO);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * Deal with parity, framing and overrun errors.
+ */
+static void atmel_pdc_rxerr(struct uart_port *port, unsigned int status)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* clear error */
+ UART_PUT_CR(port, ATMEL_US_RSTSTA);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (status & ATMEL_US_RXBRK) {
+ status &= ~(ATMEL_US_PARE | ATMEL_US_FRAME); /* ignore side-effect */
+ port->icount.brk++;
+ }
+ if (status & ATMEL_US_PARE)
+ port->icount.parity++;
+ if (status & ATMEL_US_FRAME)
+ port->icount.frame++;
+ if (status & ATMEL_US_OVRE)
+ port->icount.overrun++;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * A transmission via the PDC is complete.
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void atmel_pdc_endtx(struct uart_port *port)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
+ struct circ_buf *xmit = &port->info->xmit;
+ struct atmel_dma_buffer *pdc = &atmel_port->pdc_tx;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ xmit->tail += pdc->ofs;
+ if (xmit->tail >= SERIAL_XMIT_SIZE)
+ xmit->tail -= SERIAL_XMIT_SIZE;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ port->icount.tx += pdc->ofs;
+ pdc->ofs = 0;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+ uart_write_wakeup(port);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * The PDC transmitter is idle, so either start the next transfer or
+ * disable the transmitter.
+ */
+static void atmel_pdc_txbufe(struct uart_port *port)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
+ struct circ_buf *xmit = &port->info->xmit;
+ struct atmel_dma_buffer *pdc = &atmel_port->pdc_tx;
+ int count;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (!uart_circ_empty(xmit)) {
+ /* more to transmit - setup next transfer */
+ UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS); /* disable PDC transmit */
+ dma_sync_single_for_device(port->dev, pdc->dma_addr, pdc->dma_size, DMA_TO_DEVICE);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (xmit->tail < xmit->head)
+ count = xmit->head - xmit->tail;
+ else
+ count = SERIAL_XMIT_SIZE - xmit->tail;
+ pdc->ofs = count;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ UART_PUT_TPR(port, pdc->dma_addr + xmit->tail);
+ UART_PUT_TCR(port, count);
+ UART_PUT_PTCR(port, ATMEL_PDC_TXTEN); /* re-enable PDC transmit */
+ }
+ else {
+ /* nothing left to transmit - disable the transmitter */
+ UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS); /* disable PDC transmit */
+ UART_PUT_IDR(port, ATMEL_US_ENDTX | ATMEL_US_TXBUFE);
+ }
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
* Characters received (called from interrupt handler)
*/
static void atmel_rx_chars(struct uart_port *port)
@@ -349,6 +522,14 @@
status = UART_GET_CSR(port);
pending = status & UART_GET_IMR(port);
while (pending) {
+ /* PDC receive */
+ if (pending & ATMEL_US_ENDRX)
+ atmel_pdc_endrx(port);
+ if (pending & ATMEL_US_TIMEOUT)
+ atmel_pdc_timeout(port);
+ if (atmel_port->use_dma_rx && pending & (ATMEL_US_RXBRK | ATMEL_US_OVRE | ATMEL_US_FRAME | ATMEL_US_PARE))
+ atmel_pdc_rxerr(port, pending);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
/* Interrupt receive */
if (pending & ATMEL_US_RXRDY)
atmel_rx_chars(port);
@@ -363,6 +544,12 @@
if (pending & (ATMEL_US_RIIC | ATMEL_US_DSRIC | ATMEL_US_DCDIC | ATMEL_US_CTSIC))
wake_up_interruptible(&port->info->delta_msr_wait);
+ /* PDC transmit */
+ if (pending & ATMEL_US_ENDTX)
+ atmel_pdc_endtx(port);
+ if (pending & ATMEL_US_TXBUFE)
+ atmel_pdc_txbufe(port);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
/* Interrupt transmit */
if (pending & ATMEL_US_TXRDY)
atmel_tx_chars(port);
@@ -401,6 +588,47 @@
}
/*
+ * Initialize DMA (if necessary)
+ */
+ if (atmel_port->use_dma_rx) {
+ int i;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ for (i = 0; i < 2; i++) {
+ struct atmel_dma_buffer *pdc = &atmel_port->pdc_rx[i];
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ pdc->buf = kmalloc(PDC_BUFFER_SIZE, GFP_KERNEL);
+ if (pdc->buf == NULL) {
+ if (i != 0) {
+ dma_unmap_single(port->dev, atmel_port->pdc_rx[0].dma_addr, PDC_BUFFER_SIZE, DMA_FROM_DEVICE);
+ kfree(atmel_port->pdc_rx[0].buf);
+ }
+ free_irq(port->irq, port);
+ return -ENOMEM;
+ }
+ pdc->dma_addr = dma_map_single(port->dev, pdc->buf, PDC_BUFFER_SIZE, DMA_FROM_DEVICE);
+ pdc->dma_size = PDC_BUFFER_SIZE;
+ pdc->ofs = 0;
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ atmel_port->pdc_rx_idx = 0;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ UART_PUT_RPR(port, atmel_port->pdc_rx[0].dma_addr);
+ UART_PUT_RCR(port, PDC_BUFFER_SIZE);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ UART_PUT_RNPR(port, atmel_port->pdc_rx[1].dma_addr);
+ UART_PUT_RNCR(port, PDC_BUFFER_SIZE);
+ }
+ if (atmel_port->use_dma_tx) {
+ struct atmel_dma_buffer *pdc = &atmel_port->pdc_tx;
+ struct circ_buf *xmit = &port->info->xmit;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ pdc->buf = xmit->buf;
+ pdc->dma_addr = dma_map_single(port->dev, pdc->buf, SERIAL_XMIT_SIZE, DMA_TO_DEVICE);
+ pdc->dma_size = SERIAL_XMIT_SIZE;
+ pdc->ofs = 0;
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /*
* If there is a specific "open" function (to register
* control line interrupts)
*/
@@ -418,7 +646,15 @@
UART_PUT_CR(port, ATMEL_US_RSTSTA | ATMEL_US_RSTRX);
UART_PUT_CR(port, ATMEL_US_TXEN | ATMEL_US_RXEN); /* enable xmit & rcvr */
- UART_PUT_IER(port, ATMEL_US_RXRDY); /* enable receive only */
+ if (atmel_port->use_dma_rx) {
+ UART_PUT_RTOR(port, PDC_RX_TIMEOUT); /* set UART timeout */
+ UART_PUT_CR(port, ATMEL_US_STTTO);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ UART_PUT_IER(port, ATMEL_US_ENDRX | ATMEL_US_TIMEOUT);
+ UART_PUT_PTCR(port, ATMEL_PDC_RXTEN); /* enable PDC controller */
+ }
+ else
+ UART_PUT_IER(port, ATMEL_US_RXRDY); /* enable receive only */
return 0;
}
@@ -431,6 +667,31 @@
struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
/*
+ * Ensure everything is stopped.
+ */
+ atmel_stop_rx(port);
+ atmel_stop_tx(port);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /*
+ * Shut-down the DMA.
+ */
+ if (atmel_port->use_dma_rx) {
+ int i;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ for (i = 0; i < 2; i++) {
+ struct atmel_dma_buffer *pdc = &atmel_port->pdc_rx[i];
+
+ dma_unmap_single(port->dev, pdc->dma_addr, pdc->dma_size, DMA_FROM_DEVICE);
+ kfree(pdc->buf);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ }
+ }
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (atmel_port->use_dma_tx) {
+ struct atmel_dma_buffer *pdc = &atmel_port->pdc_tx;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ dma_unmap_single(port->dev, pdc->dma_addr, pdc->dma_size, DMA_TO_DEVICE);
+ }
+
+ /*
* Disable all interrupts, port and break condition.
*/
UART_PUT_CR(port, ATMEL_US_RSTSTA);
@@ -481,6 +742,7 @@
*/
static void atmel_set_termios(struct uart_port *port, struct ktermios * termios, struct ktermios * old)
{
+ struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
unsigned long flags;
unsigned int mode, imr, quot, baud;
@@ -490,7 +752,7 @@
baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
quot = uart_get_divisor(port, baud);
- if (quot > 65535) { /* BRGR is 16-bit, so switch to slower clock */
+ if (quot > 65535) { /* BRGR is 16-bit, so switch to slower clock */
quot /= 8;
mode |= ATMEL_US_USCLKS_MCK_DIV8;
}
@@ -539,6 +801,9 @@
if (termios->c_iflag & (BRKINT | PARMRK))
port->read_status_mask |= ATMEL_US_RXBRK;
+ if (atmel_port->use_dma_rx) /* need to enable error interrupts */
+ UART_PUT_IER(port, port->read_status_mask);
+
/*
* Characters to ignore
*/
@@ -717,6 +982,13 @@
clk_enable(atmel_port->clk);
port->uartclk = clk_get_rate(atmel_port->clk);
}
+
+#ifdef SUPPORT_PDC
+ atmel_port->use_dma_rx = data->use_dma_rx;
+ atmel_port->use_dma_tx = data->use_dma_tx;
+ if (atmel_port->use_dma_tx)
+ port->fifosize = PDC_BUFFER_SIZE;
+#endif
}
/*
@@ -893,7 +1165,8 @@
struct uart_port *port = platform_get_drvdata(pdev);
struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
- if (device_may_wakeup(&pdev->dev) && !at91_suspend_entering_slow_clock())
+ if (device_may_wakeup(&pdev->dev)
+ && !clk_must_disable(atmel_port->clk))
enable_irq_wake(port->irq);
else {
uart_suspend_port(&atmel_uart, port);
diff -urN linux-2.6.22-rc5/drivers/spi/Kconfig linux-2.6.22-rc5.new/drivers/spi/Kconfig
--- linux-2.6.22-rc5/drivers/spi/Kconfig 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/drivers/spi/Kconfig 2007-07-29 05:55:39.000000000 +0200
@@ -55,6 +55,7 @@
config SPI_ATMEL
tristate "Atmel SPI Controller"
depends on (ARCH_AT91 || AVR32) && SPI_MASTER
+ select SPI_AT91_MANUAL_CS if ARCH_AT91RM9200
help
This selects a driver for the Atmel SPI Controller, present on
many AT32 (AVR32) and AT91 (ARM) chips.
@@ -100,6 +101,24 @@
inexpensive battery powered microcontroller evaluation board.
This same cable can be used to flash new firmware.
+config SPI_AT91
+ tristate "AT91RM9200 Bitbang SPI Master"
+ depends on SPI_MASTER && ARCH_AT91RM9200 && !SPI_ATMEL && EXPERIMENTAL
+ select SPI_BITBANG
+ select SPI_AT91_MANUAL_CS
+ help
+ This is dumb PIO bitbanging driver for the Atmel AT91RM9200.
+ The SPI_ATMEL driver will be its replacement, using the native
+ SPI hardware and its DMA controller.
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+config SPI_AT91_MANUAL_CS
+ bool
+ depends on ARCH_AT91RM9200
+ help
+ Works around an AT91RM9200 problem whereby the SPI chip-select
+ will be wrongly disabled. The workaround uses those pins as
+ GPIOs instead of letting the SPI controller manage them.
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
config SPI_IMX
tristate "Freescale iMX SPI controller"
depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
diff -urN linux-2.6.22-rc5/drivers/spi/Makefile linux-2.6.22-rc5.new/drivers/spi/Makefile
--- linux-2.6.22-rc5/drivers/spi/Makefile 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/drivers/spi/Makefile 2007-07-29 05:55:39.000000000 +0200
@@ -23,6 +23,7 @@
obj-$(CONFIG_SPI_MPC83xx) += spi_mpc83xx.o
obj-$(CONFIG_SPI_S3C24XX_GPIO) += spi_s3c24xx_gpio.o
obj-$(CONFIG_SPI_S3C24XX) += spi_s3c24xx.o
+obj-$(CONFIG_SPI_AT91) += spi_at91_bitbang.o
# ... add above this line ...
# SPI protocol drivers (device/link on bus)
diff -urN linux-2.6.22-rc5/drivers/spi/spi_at91_bitbang.c linux-2.6.22-rc5.new/drivers/spi/spi_at91_bitbang.c
--- linux-2.6.22-rc5/drivers/spi/spi_at91_bitbang.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.22-rc5.new/drivers/spi/spi_at91_bitbang.c 2007-07-29 05:55:39.000000000 +0200
@@ -0,0 +1,207 @@
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * at91_spi.c - at91 SPI driver (BOOTSTRAP/BITBANG VERSION)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ *
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Copyright (C) 2006 David Brownell
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ *
+ * This program 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 of the License, or
+ * (at your option) any later version.
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ *
+ * This program 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; if not, write to the Free Software
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#include <linux/kernel.h>
+#include <linux/init.h>
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <linux/platform_device.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_bitbang.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+#include <asm/arch/gpio.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * FIXME this bitbanging version is just to help bootstrap systems until
+ * there's a native SPI+IRQ+DMA controller driver ... such a driver should
+ * be a drop-in replacement for this one, and much faster.
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ *
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * remember:
+ *
+ * - other at91 parts (like at91sam9) have multiple controllers
+ * and different pin muxing; this version is at91rm9200 specfic.
+ *
+ * - at91sam9261 SPI0 pins are directly muxed with MMC/SD pins.
+ *
+ * - rm9200 spi chipselects drop wrongly, so the native driver
+ * will need to use gpios much like this does.
+ *
+ * - real hardware only allows 8..16 bits per word, while this
+ * bitbanger allows 1..32 (incompatible superset).
+ *
+ * - this disregards clock parameters. with inlined gpio calls,
+ * gcc 3.4.4 produces about 1.5 mbit/sec, more than 2x faster
+ * than using the subroutined veresion from txrx_word().
+ *
+ * - suspend/resume and <linux/clk.h> support is missing ...
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ */
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define spi_miso_bit AT91_PIN_PA0
+#define spi_mosi_bit AT91_PIN_PA1
+#define spi_sck_bit AT91_PIN_PA2
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+struct at91_spi {
+ struct spi_bitbang bitbang;
+ struct platform_device *pdev;
+};
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*----------------------------------------------------------------------*/
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static inline void setsck(struct spi_device *spi, int is_on)
+{
+ at91_set_gpio_value(spi_sck_bit, is_on);
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static inline void setmosi(struct spi_device *spi, int is_on)
+{
+ at91_set_gpio_value(spi_mosi_bit, is_on);
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static inline int getmiso(struct spi_device *spi)
+{
+ return at91_get_gpio_value(spi_miso_bit);
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void at91_spi_chipselect(struct spi_device *spi, int is_active)
+{
+ unsigned long cs = (unsigned long) spi->controller_data;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* set default clock polarity */
+ if (is_active)
+ setsck(spi, spi->mode & SPI_CPOL);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* only support active-low (default) */
+ at91_set_gpio_value(cs, !is_active);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * NOTE: this is "as fast as we can"; it should be a function of
+ * the device clock ...
+ */
+#define spidelay(X) do{} while(0)
+
+#define EXPAND_BITBANG_TXRX
+#include <linux/spi/spi_bitbang.h>
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static u32 at91_spi_txrx_word_mode0(struct spi_device *spi,
+ unsigned nsecs, u32 word, u8 bits)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, 8);
+}
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static u32 at91_spi_txrx_word_mode1(struct spi_device *spi,
+ unsigned nsecs, u32 word, u8 bits)
+{
+ return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, 8);
+}
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static u32 at91_spi_txrx_word_mode2(struct spi_device *spi,
+ unsigned nsecs, u32 word, u8 bits)
+{
+ return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, 8);
+}
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static u32 at91_spi_txrx_word_mode3(struct spi_device *spi,
+ unsigned nsecs, u32 word, u8 bits)
+{
+ return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, 8);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*----------------------------------------------------------------------*/
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int __init at91_spi_probe(struct platform_device *pdev)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ int status;
+ struct spi_master *master;
+ struct at91_spi *at91_spi;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (pdev->id != 0) /* SPI0 bus */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ return -EINVAL;
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ master = spi_alloc_master(&pdev->dev, sizeof *at91_spi);
+ if (!master)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ return -ENOMEM;
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ at91_spi = spi_master_get_devdata(master);
+ at91_spi->pdev = pdev;
+ platform_set_drvdata(pdev, at91_spi);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* SPI and bitbang hookup */
+ master->bus_num = 0;
+ master->num_chipselect = 4;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ at91_spi->bitbang.master = spi_master_get(master);
+ at91_spi->bitbang.chipselect = at91_spi_chipselect;
+ at91_spi->bitbang.txrx_word[SPI_MODE_0] = at91_spi_txrx_word_mode0;
+ at91_spi->bitbang.txrx_word[SPI_MODE_1] = at91_spi_txrx_word_mode1;
+ at91_spi->bitbang.txrx_word[SPI_MODE_2] = at91_spi_txrx_word_mode2;
+ at91_spi->bitbang.txrx_word[SPI_MODE_3] = at91_spi_txrx_word_mode3;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ status = spi_bitbang_start(&at91_spi->bitbang);
+ if (status < 0)
+ (void) spi_master_put(at91_spi->bitbang.master);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return status;
+}
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int __exit at91_spi_remove(struct platform_device *pdev)
+{
+ struct at91_spi *at91_spi = platform_get_drvdata(pdev);
+ int status;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* stop() unregisters child devices too */
+ status = spi_bitbang_stop(&at91_spi->bitbang);
+ (void) spi_master_put(at91_spi->bitbang.master);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ platform_set_drvdata(pdev, NULL);
+ return status;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct platform_driver at91_spi_driver = {
+ .probe = at91_spi_probe,
+ .remove = __exit_p(at91_spi_remove),
+ .driver = {
+ .name = "at91_spi",
+ .owner = THIS_MODULE,
+ },
+};
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int __init at91_spi_init(void)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ at91_set_gpio_output(spi_sck_bit, 0);
+ at91_set_gpio_output(spi_mosi_bit, 0);
+ at91_set_gpio_input(spi_miso_bit, 1 /* pullup */);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* register driver */
+ return platform_driver_register(&at91_spi_driver);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __exit at91_spi_exit(void)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ platform_driver_unregister(&at91_spi_driver);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+device_initcall(at91_spi_init);
+module_exit(at91_spi_exit);
+
+MODULE_ALIAS("at91_spi.0");
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+MODULE_DESCRIPTION("AT91 SPI support (BOOTSTRAP/BITBANG VERSION)");
+MODULE_AUTHOR("David Brownell");
+MODULE_LICENSE("GPL");
diff -urN linux-2.6.22-rc5/drivers/usb/gadget/at91_udc.c linux-2.6.22-rc5.new/drivers/usb/gadget/at91_udc.c
--- linux-2.6.22-rc5/drivers/usb/gadget/at91_udc.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/drivers/usb/gadget/at91_udc.c 2007-07-29 05:55:39.000000000 +0200
@@ -1803,7 +1803,7 @@
*/
if ((!udc->suspended && udc->addr)
|| !wake
- || at91_suspend_entering_slow_clock()) {
+ || clk_must_disable(udc->fclk)) {
pullup(udc, 0);
wake = 0;
} else
diff -urN linux-2.6.22-rc5/drivers/usb/host/ohci-at91.c linux-2.6.22-rc5.new/drivers/usb/host/ohci-at91.c
--- linux-2.6.22-rc5/drivers/usb/host/ohci-at91.c 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/drivers/usb/host/ohci-at91.c 2007-07-29 05:55:39.000000000 +0200
@@ -299,7 +299,7 @@
*
* REVISIT: some boards will be able to turn VBUS off...
*/
- if (at91_suspend_entering_slow_clock()) {
+ if (clk_must_disable(fclk)) {
ohci_usb_reset (ohci);
at91_stop_clock();
}
diff -urN linux-2.6.22-rc5/drivers/video/backlight/kb920x_bl.c linux-2.6.22-rc5.new/drivers/video/backlight/kb920x_bl.c
--- linux-2.6.22-rc5/drivers/video/backlight/kb920x_bl.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.22-rc5.new/drivers/video/backlight/kb920x_bl.c 2007-07-29 05:55:39.000000000 +0200
@@ -0,0 +1,164 @@
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Backlight Driver for KB9202
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ *
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Copyright (c) 2006 KwikByte
+ *
+ * Based on Sharp's Corgi Backlight Driver
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/spinlock.h>
+#include <linux/fb.h>
+#include <linux/backlight.h>
+
+#include <asm/arch/gpio.h>
+
+/* The backlight is on(1)/off(0) */
+#define KB9202_DEFAULT_INTENSITY 1
+#define KB9202_MAX_INTENSITY 1
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int kb9202bl_suspended;
+static int current_intensity = 0;
+static DEFINE_SPINLOCK(bl_lock);
+
+static int kb9202bl_set_intensity(struct backlight_device *bd)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ unsigned long flags;
+ int intensity = bd->props.brightness;
+
+ if (bd->props.power != FB_BLANK_UNBLANK)
+ intensity = 0;
+ if (bd->props.fb_blank != FB_BLANK_UNBLANK)
+ intensity = 0;
+ if (kb9202bl_suspended)
+ intensity = 0;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if ((!current_intensity) && (bd->props.power == FB_BLANK_UNBLANK))
+ intensity = 1;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ spin_lock_irqsave(&bl_lock, flags);
+ if (intensity)
+ gpio_set_value(AT91_PIN_PC23, 1);
+ else
+ gpio_set_value(AT91_PIN_PC23, 0);
+ spin_unlock_irqrestore(&bl_lock, flags);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ current_intensity = intensity;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return 0;
+}
+
+static int kb9202bl_get_intensity(struct backlight_device *bd)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return current_intensity;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct backlight_ops kb9202bl_ops = {
+ .get_brightness = kb9202bl_get_intensity,
+ .update_status = kb9202bl_set_intensity,
+};
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int __init kb9202bl_probe(struct platform_device *pdev)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ struct backlight_device *bd;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ bd = backlight_device_register ("kb9202-bl", &pdev->dev, NULL, &kb9202bl_ops);
+ if (IS_ERR(bd))
+ return PTR_ERR(bd);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ platform_set_drvdata(pdev, bd);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ bd->props.max_brightness = KB9202_MAX_INTENSITY;
+ bd->props.brightness = KB9202_DEFAULT_INTENSITY;
+ (void) kb9202bl_set_intensity(bd);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return 0;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int kb9202bl_remove(struct platform_device *pdev)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ struct backlight_device *bd = platform_get_drvdata(pdev);
+
+ bd->props.brightness = 0;
+ bd->props.power = 0;
+ (void) kb9202bl_set_intensity(bd);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ backlight_device_unregister(bd);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return 0;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#ifdef CONFIG_PM
+static int kb9202bl_suspend(struct platform_device *dev, pm_message_t state)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ struct backlight_device *bd = platform_get_drvdata(pdev);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ kb9202bl_suspended = 1;
+ (void) kb9202bl_set_intensity(bd);
+ return 0;
+}
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int kb9202bl_resume(struct platform_device *dev)
+{
+ struct backlight_device *bd = platform_get_drvdata(pdev);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ kb9202bl_suspended = 0;
+ (void) kb9202bl_set_intensity(bd);
+ return 0;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#else
+#define kb9202bl_suspend NULL
+#define kb9202bl_resume NULL
+#endif
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct platform_driver kb9202bl_driver = {
+ .probe = kb9202bl_probe,
+ .remove = kb9202bl_remove,
+ .suspend = kb9202bl_suspend,
+ .resume = kb9202bl_resume,
+ .driver = {
+ .name = "kb9202-bl",
+ .owner = THIS_MODULE,
+ },
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+};
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct platform_device *kb9202bl_device;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int __init kb9202bl_init(void)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ int ret;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ ret = platform_driver_register(&kb9202bl_driver);
+ if (!ret) {
+ kb9202bl_device = platform_device_alloc("kb9202-bl", -1);
+ if (!kb9202bl_device)
+ return -ENOMEM;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ ret = platform_device_add(kb9202bl_device);
+ if (ret) {
+ platform_device_put(kb9202bl_device);
+ platform_driver_unregister(&kb9202bl_driver);
+ }
+ }
+ return ret;
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __exit kb9202bl_exit(void)
+{
+ platform_device_unregister(kb9202bl_device);
+ platform_driver_unregister(&kb9202bl_driver);
+}
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+module_init(kb9202bl_init);
+module_exit(kb9202bl_exit);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+MODULE_AUTHOR("KwikByte <kb9200_dev@kwikbyte.com>");
+MODULE_DESCRIPTION("KB9202 Backlight Driver");
+MODULE_LICENSE("GPL");
diff -urN linux-2.6.22-rc5/drivers/video/backlight/Kconfig linux-2.6.22-rc5.new/drivers/video/backlight/Kconfig
--- linux-2.6.22-rc5/drivers/video/backlight/Kconfig 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/drivers/video/backlight/Kconfig 2007-07-29 05:55:39.000000000 +0200
@@ -71,3 +71,11 @@
help
If you have a Intel LE80578 (Carillo Ranch) say Y to enable the
backlight driver.
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+config BACKLIGHT_KB920x
+ tristate "KwikByte KB9202 Backlight Driver"
+ depends on BACKLIGHT_CLASS_DEVICE && MACH_KB9200
+ default y
+ help
+ If you have a KwikByte KB9202 board, say Y to enable the
+ backlight driver.
diff -urN linux-2.6.22-rc5/drivers/video/backlight/Makefile linux-2.6.22-rc5.new/drivers/video/backlight/Makefile
--- linux-2.6.22-rc5/drivers/video/backlight/Makefile 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/drivers/video/backlight/Makefile 2007-07-29 05:55:39.000000000 +0200
@@ -7,3 +7,4 @@
obj-$(CONFIG_BACKLIGHT_LOCOMO) += locomolcd.o
obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o
+obj-$(CONFIG_BACKLIGHT_KB920x) += kb920x_bl.o
diff -urN linux-2.6.22-rc5/drivers/video/Kconfig linux-2.6.22-rc5.new/drivers/video/Kconfig
--- linux-2.6.22-rc5/drivers/video/Kconfig 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/drivers/video/Kconfig 2007-07-29 05:55:39.000000000 +0200
@@ -822,6 +822,17 @@
framebuffer. Product specs at
<http://www.erd.epson.com/vdc/html/products.htm>.
+config FB_S1D15605
+ tristate "Epson S1D15605 framebuffer support"
+ depends on FB
+ default m if MACH_KB9200
+ select FB_CFB_FILLRECT
+ select FB_CFB_COPYAREA
+ select FB_CFB_IMAGEBLIT
+ help
+ Build in support for the S1D15605 Epson Research 128x64
+ LCD controller as a framebuffer.
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
config FB_S1D13XXX
tristate "Epson S1D13XXX framebuffer support"
depends on FB
@@ -835,7 +846,7 @@
config FB_ATMEL
tristate "AT91/AT32 LCD Controller support"
- depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || AVR32)
+ depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || AVR32)
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
diff -urN linux-2.6.22-rc5/drivers/video/Makefile linux-2.6.22-rc5.new/drivers/video/Makefile
--- linux-2.6.22-rc5/drivers/video/Makefile 2007-06-17 04:09:12.000000000 +0200
+++ linux-2.6.22-rc5.new/drivers/video/Makefile 2007-07-29 05:55:39.000000000 +0200
@@ -87,7 +87,8 @@
obj-$(CONFIG_FB_SA1100) += sa1100fb.o
obj-$(CONFIG_FB_HIT) += hitfb.o
obj-$(CONFIG_FB_EPSON1355) += epson1355fb.o
-obj-$(CONFIG_FB_ATMEL) += atmel_lcdfb.o
+obj-$(CONFIG_FB_S1D15605) += s1d15605fb.o
+obj-$(CONFIG_FB_ATMEL) += atmel_lcdfb.o
obj-$(CONFIG_FB_PVR2) += pvr2fb.o
obj-$(CONFIG_FB_VOODOO1) += sstfb.o
obj-$(CONFIG_FB_ARMCLCD) += amba-clcd.o
diff -urN linux-2.6.22-rc5/drivers/video/s1d15605fb.c linux-2.6.22-rc5.new/drivers/video/s1d15605fb.c
--- linux-2.6.22-rc5/drivers/video/s1d15605fb.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.22-rc5.new/drivers/video/s1d15605fb.c 2007-07-29 05:55:39.000000000 +0200
@@ -0,0 +1,659 @@
+/*
+ * drivers/video/s1d15605.c
+ *
+ * Adapted from several sources including:
+ * 1) Driver for AT91 LCD Controller
+ * Copyright (C) 2006 Atmel
+ *
+ * 2) Copyright (C) 2005 S. Kevin Hester
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of this archive for
+ * more details.
+ *
+ * This is a basic framebuffer driver for the Optrex F-51320 128x64 mono LCD
+ * display. This display uses a clone of the common Epson SED 1531 display
+ * controller.
+ *
+ * I've heavily borrowed code from the vfb.c driver.
+ *
+ * This program 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 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#ifdef DEBUG
+#define MSG(string, args...) printk("s1d15605fb:" string, ##args)
+#else
+#define MSG(string, args...)
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+#endif
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
+#include <linux/interrupt.h>
+#include <linux/clk.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/delay.h>
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <asm/uaccess.h>
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#include <asm/arch/board.h>
+#include <asm/arch/gpio.h>
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#ifdef CONFIG_PMAC_BACKLIGHT
+#include <asm/backlight.h>
+#endif
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define VIDEOWIDTH 128
+#define VIDEOHEIGHT 64
+#define VIDEODEPTH 1 /* bits/pixel */
+#define VIDEOWIDTH_BYTES ((VIDEOWIDTH * VIDEODEPTH) / 8)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* The number of bytes that actually go to the device */
+#define ACTUALVIDEOMEMSIZE (VIDEOWIDTH_BYTES * VIDEOHEIGHT)
+#define VIDEOMEMSIZE PAGE_SIZE
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct fb_var_screeninfo s1d15605_default __initdata = {
+ .xres = VIDEOWIDTH,
+ .yres = VIDEOHEIGHT,
+ .xres_virtual = VIDEOWIDTH,
+ .yres_virtual = VIDEOHEIGHT,
+ .bits_per_pixel = VIDEODEPTH,
+ .red = { 0, 1, 0 },
+ .green = { 0, 1, 0 },
+ .blue = { 0, 1, 0 },
+ .activate = FB_ACTIVATE_NOW,
+ .pixclock = 20000,
+ .vmode = FB_VMODE_NONINTERLACED,
+};
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct fb_fix_screeninfo s1d15605_fix __initdata = {
+ .id = "s1d15605",
+ .type = FB_TYPE_PACKED_PIXELS,
+ .visual = FB_VISUAL_MONO10,
+ .xpanstep = 0,
+ .ypanstep = 0,
+ .ywrapstep = 0,
+ .accel = FB_ACCEL_NONE,
+};
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+struct s1d15605fb_info {
+ struct fb_info *info;
+ char *mmio;
+ unsigned long reset_pin;
+ struct platform_device *pdev;
+};
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * LCD device interface
+ */
+#define RESET_DISPLAY 0xE2
+#define LCD_BIAS_1_9 0xA2
+#define ADC_SELECT_REVERSE 0xA1
+#define COMMON_OUTPUT_NORMAL 0xC0
+#define V5_RESISTOR_RATIO 0x26
+#define ELECTRONIC_VOLUME_SET 0x81
+#define ELECTRONIC_VOLUME_INIT 0x20
+#define POWER_CONTROL_SET 0x28
+#define VOLTAGE_REGULATOR 0x02
+#define VOLTAGE_FOLLOWER 0x01
+#define BOOSTER_CIRCUIT 0x04
+#define DISPLAY_ON 0xAF
+#define START_LINE_SET 0x40
+#define PAGE_ADDRESS_SET 0xB0
+#define COLUMN_ADDRESS_HIGH 0x10
+#define COLUMN_ADDRESS_LOW 0x00
+#define RESISTOR_RATIO_START 0x20
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define NUM_OF_PAGES 8
+#define NUM_OF_COLUMNS 128
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#define WRITE_COMMAND(x) __raw_writeb((x), (sinfo)->mmio)
+#define READ_COMMAND __raw_readb((sinfo)->mmio)
+#define WRITE_DATA(x) __raw_writeb((x), (sinfo)->mmio + (0x10000))
+#define READ_DATA __raw_readb((sinfo)->mmio + (0x10000))
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * s1d15605fb_resize_framebuffer
+ *
+ * Free allocated space if different. Allocate on new of changed.
+ * Returns -ENOMEM if the new framebuffer can not be allocated,
+ * zero on success.
+ */
+static int s1d15605fb_resize_framebuffer(struct s1d15605fb_info *sinfo)
+{
+ struct fb_info *info = sinfo->info;
+ struct fb_fix_screeninfo *fix = &info->fix;
+ struct fb_var_screeninfo *var = &info->var;
+ unsigned int new_size;
+ void *new_vaddr;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ new_size = ((var->xres_virtual * var->yres_virtual * var->bits_per_pixel) / 8);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ MSG("%s: x (%d) y (%d) bpp (%d): new size 0x%08x\n", __FUNCTION__,
+ var->xres_virtual, var->yres_virtual, var->bits_per_pixel, new_size);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (new_size == fix->smem_len)
+ return 0;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (fix->smem_len) {
+ kfree(info->screen_base);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ }
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ new_vaddr = kmalloc(new_size, GFP_KERNEL);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (!new_vaddr) {
+ fix->smem_len = 0;
+ return -ENOMEM;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+ }
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ info->screen_base = new_vaddr;
+ fix->smem_start = (unsigned)new_vaddr;
+ fix->smem_len = new_size;
+ fix->line_length = (var->xres_virtual * var->bits_per_pixel) / 8;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ dev_info(info->device,
+ "%luKiB frame buffer at %08lx (mapped at %p)\n",
+ (unsigned long)info->fix.smem_len / 1024,
+ (unsigned long)info->fix.smem_start,
+ info->screen_base);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
+ return 0;
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+}
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * The s1d15605 seems to be divided into eight 128 pixel wide pages (from top to
+ * bottom) each page seems to be eight pixels high, where these eight pixels are
+ * one byte
+ */
+static void s1d15605_update(struct fb_info *info)
+{
+ struct s1d15605fb_info *sinfo = info->par;
+ int page, i, row, colmask;
+ u8 retVal, *rowPtr;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ WRITE_COMMAND(START_LINE_SET);
+ for (page = 0; page < NUM_OF_PAGES; ++page) {
+ WRITE_COMMAND(PAGE_ADDRESS_SET + page);
+ WRITE_COMMAND(COLUMN_ADDRESS_HIGH);
+ WRITE_COMMAND(COLUMN_ADDRESS_LOW);
+
+ for (i = 0; i < NUM_OF_COLUMNS; ++i)
+ {
+ /* point of opportunity: optimization */
+ colmask = (1 << (i & 0x7));
+ rowPtr = (u8*)(info->screen_base);
+ rowPtr += (VIDEOWIDTH_BYTES * 8 * page);
+ rowPtr += (i >> 3);
+ retVal = 0;
+ for (row = 0; row < 8; ++row)
+ {
+ retVal = (retVal >> 1) | (((*rowPtr) & colmask) ? 0x80 : 0);
+ rowPtr += VIDEOWIDTH_BYTES;
+ }
+ WRITE_DATA(retVal);
+ }
+ }
+
+ WRITE_COMMAND(DISPLAY_ON);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * Setting the video mode has been split into two parts.
+ * First part, xxxfb_check_var, must not write anything
+ * to hardware, it should only verify and adjust var.
+ * This means it doesn't alter par but it does use hardware
+ * data from it to check this var.
+ */
+static int s1d15605_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /*
+ * Some very basic checks
+ */
+ if (!var->xres)
+ var->xres = 1;
+ if (!var->yres)
+ var->yres = 1;
+ if (var->xres > var->xres_virtual)
+ var->xres_virtual = var->xres;
+ if (var->yres > var->yres_virtual)
+ var->yres_virtual = var->yres;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if(var->bits_per_pixel > VIDEODEPTH)
+ return -EINVAL;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /*
+ * Memory limit
+ */
+ if (((var->yres_virtual * var->bits_per_pixel * var->yres_virtual) >> 3) >
+ ACTUALVIDEOMEMSIZE)
+ return -ENOMEM;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /*
+ * Now that we checked it we alter var. The reason being is that the video
+ * mode passed in might not work but slight changes to it might make it
+ * work. This way we let the user know what is acceptable.
+ */
+ switch (var->bits_per_pixel) {
+ case 1:
+ var->red.offset = var->green.offset = var->blue.offset = 0;
+ var->red.length = var->green.length = var->blue.length
+ = var->bits_per_pixel;
+ break;
+ default:
+ return -EINVAL;
+ }
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ var->xoffset = var->yoffset = 0;
+ var->red.msb_right = var->green.msb_right = var->blue.msb_right =
+ var->transp.msb_right = 0;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
+ return 0;
+}
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * This routine actually sets the video mode. It's in here where we
+ * the hardware state info->par and fix which can be affected by the
+ * change in par. For this driver it doesn't do much.
+ */
+static int s1d15605_set_par(struct fb_info *info)
+{
+ int ret;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ MSG("%s:\n", __func__);
+ MSG(" * resolution: %ux%u (%ux%u virtual)\n",
+ info->var.xres, info->var.yres,
+ info->var.xres_virtual, info->var.yres_virtual);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ ret = s1d15605fb_resize_framebuffer(info->par);
+
+ info->fix.visual = FB_VISUAL_MONO10;
+ return ret;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+ * Set a single color register. The values supplied are already
+ * rounded down to the hardware's capabilities (according to the
+ * entries in the var structure). Return != 0 for invalid regno.
+ */
+static int s1d15605_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
+ u_int transp, struct fb_info *info)
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+{
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (regno > 1) /* no. of hw registers - we only do mono now */
+ return 1;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return 0;
+}
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
+
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Currently, the routine will simply shut-off the backlight and prevent
+ * updates/refreshes. Modify according to application.
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ *
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * 0 unblank, 1 blank, 2 no vsync, 3 no hsync, 4 off
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int s1d15605_blank(int blank, struct fb_info *info)
+{
+#ifdef CONFIG_PMAC_BACKLIGHT
+ if (blank)
+ pmac_backlight->props.power = FB_BLANK_POWERDOWN;
+ else
+ pmac_backlight->props.power = FB_BLANK_UNBLANK;
+ backlight_update_status(pmac_backlight);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+#endif
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return 1;
+}
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Pan or Wrap the Display
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ *
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/*
+static int s1d15605_pan_display(struct fb_var_screeninfo *var,
+ struct fb_info *info)
+{
+ if (var->vmode & FB_VMODE_YWRAP) {
+ if (var->yoffset < 0
+ || var->yoffset >= info->var.yres_virtual
+ || var->xoffset)
+ return -EINVAL;
+ } else {
+ if (var->xoffset + var->xres > info->var.xres_virtual ||
+ var->yoffset + var->yres > info->var.yres_virtual)
+ return -EINVAL;
+ }
+ info->var.xoffset = var->xoffset;
+ info->var.yoffset = var->yoffset;
+ if (var->vmode & FB_VMODE_YWRAP)
+ info->var.vmode |= FB_VMODE_YWRAP;
+ else
+ info->var.vmode &= ~FB_VMODE_YWRAP;
+ return 0;
+}
+*/
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void s1d15605_copyarea(struct fb_info *info, const struct fb_copyarea *region)
+{
+ cfb_copyarea(info, region);
+ s1d15605_update(info);
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void s1d15605_fillrect (struct fb_info *info, const struct fb_fillrect *rect)
+{
+ cfb_fillrect(info, rect);
+ s1d15605_update(info);
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void s1d15605_imageblit(struct fb_info *p, const struct fb_image *image)
+{
+ cfb_imageblit(p, image);
+ s1d15605_update(p);
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
+/*
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ * Write the users data to our framebuffer, and then trigger a psuedo DMA
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+ */
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static ssize_t s1d15605_write(struct file *file, const char *buf,
+ size_t count, loff_t *ppos)
+{
+ unsigned long p = *ppos;
+ struct inode *inode = file->f_dentry->d_inode;
+ int fbidx = iminor(inode);
+ struct fb_info *info = registered_fb[fbidx];
+ int err;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (p > info->fix.smem_len)
+ return -ENOSPC;
+ if (count >= info->fix.smem_len)
+ count = info->fix.smem_len;
+ err = 0;
+ if (count + p > info->fix.smem_len) {
+ count = info->fix.smem_len - p;
+ err = -ENOSPC;
+ }
+ if (count) {
+ char *base_addr;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ base_addr = info->screen_base;
+ count -= copy_from_user(base_addr+p, buf, count);
+ *ppos += count;
+ err = -EFAULT;
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ s1d15605_update(info);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (count)
+ return count;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return err;
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#ifdef USE_PRIVATE_VMA_FXS
+static void s1d15605_vma_open(struct vm_area_struct *vma)
+{
+ // FIXME - store stats in the device data via vm_private_data
+}
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void s1d15605_vma_close(struct vm_area_struct *vma)
+{
+ // FIXME - store stats in the device data via vm_private_data
+}
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct page *s1d15605_vma_nopage(struct vm_area_struct *vma,
+ unsigned long address, int *type)
+{
+ struct page *page;
+ struct fb_info *info = vma->vm_private_data;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ page = virt_to_page(info->screen_base);
+ get_page(page);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ // FIXME - now someone has a link to our page, start periodically blitting
+ // latest updates to the actual device.
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return page;
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct vm_operations_struct s1d15605_vm_ops = {
+ .open = s1d15605_vma_open,
+ .close = s1d15605_vma_close,
+ .nopage = s1d15605_vma_nopage
+};
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+/* We don't do much here - because we have special vm_ops */
+static int s1d15605_mmap(struct fb_info *info, struct vm_area_struct *vma)
+{
+ vma->vm_ops = &s1d15605_vm_ops;
+ vma->vm_flags |= VM_RESERVED;
+ vma->vm_private_data = info;
+ s1d15605_vma_open(vma);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return 0;
+}
+#endif /* USE_PRIVATE_VMA_FXS */
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct fb_ops s1d15605fb_ops = {
+ .owner = THIS_MODULE,
+ .fb_check_var = s1d15605_check_var,
+ .fb_set_par = s1d15605_set_par,
+ .fb_setcolreg = s1d15605_setcolreg,
+ .fb_blank = s1d15605_blank,
+// .fb_pan_display = s1d15605_pan_display,
+ .fb_fillrect = s1d15605_fillrect,
+ .fb_copyarea = s1d15605_copyarea,
+ .fb_imageblit = s1d15605_imageblit,
+ .fb_write = s1d15605_write,
+#ifdef USE_PRIVATE_VMA_FXS
+ .fb_mmap = s1d15605_mmap,
+#endif
+};
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void s1d15605_device_init(struct s1d15605fb_info *sinfo) {
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ char value;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* release the reset line by reading the device - proto hardware */
+ value = READ_COMMAND;
+ value = READ_COMMAND;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+#ifdef CONFIG_MACH_KB9200
+ /* new boards have dedicated reset line */
+ gpio_set_value(sinfo->reset_pin, 1);
+#endif
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ /* initialize the device within 5ms */
+ WRITE_COMMAND(RESET_DISPLAY);
+ WRITE_COMMAND(LCD_BIAS_1_9);
+ WRITE_COMMAND(ADC_SELECT_REVERSE);
+ WRITE_COMMAND(COMMON_OUTPUT_NORMAL);
+ WRITE_COMMAND(V5_RESISTOR_RATIO);
+ WRITE_COMMAND(ELECTRONIC_VOLUME_SET);
+ WRITE_COMMAND(ELECTRONIC_VOLUME_INIT);
+ WRITE_COMMAND(POWER_CONTROL_SET | VOLTAGE_REGULATOR | VOLTAGE_FOLLOWER | BOOSTER_CIRCUIT);
+ WRITE_COMMAND(DISPLAY_ON);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ WRITE_COMMAND(RESISTOR_RATIO_START + 4);
+ WRITE_COMMAND(ELECTRONIC_VOLUME_SET);
+ WRITE_COMMAND(0x33);
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int s1d15605fb_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct fb_info *info;
+ struct s1d15605fb_info *sinfo;
+ int ret;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ MSG("%s\n", __func__);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (!(info = framebuffer_alloc(sizeof(struct s1d15605fb_info), dev))) {
+ dev_err(dev, "Cannot allocate framebuffer struct\n");
+ return -ENOMEM;
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ sinfo = info->par;
+ sinfo->info = info;
+ sinfo->pdev = pdev;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (pdev->num_resources < 2) {
+ dev_err(dev, "Resources unusable\n");
+ ret = -ENODEV;
+ goto free_info;
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ info->fbops = &s1d15605fb_ops;
+ strcpy(info->fix.id, pdev->name);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ info->fix.mmio_start = pdev->resource[0].start;
+ info->fix.mmio_len = pdev->resource[0].end - pdev->resource[0].start + 1;
+ sinfo->reset_pin = pdev->resource[1].start;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ ret = s1d15605fb_resize_framebuffer(sinfo);
+ if (ret < 0) {
+ dev_err(dev, "Cannot resize framebuffer: %d\n", ret);
+ goto free_fb;
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (!request_mem_region(info->fix.mmio_start,
+ info->fix.mmio_len, pdev->name)) {
+ ret = -EBUSY;
+ goto free_fb;
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ sinfo->mmio = ioremap(info->fix.mmio_start, info->fix.mmio_len);
+ if (!sinfo->mmio) {
+ dev_err(dev, "Cannot map LCD memory region\n");
+ goto release_mem;
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ s1d15605_device_init(sinfo);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ ret = fb_find_mode(&info->var, info, NULL, NULL, 0, NULL, 1);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (!ret || (ret == 4))
+ info->var = s1d15605_default;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ info->fix = s1d15605_fix;
+ info->flags = FBINFO_FLAG_DEFAULT |
+/* FBINFO_HWACCEL_YPAN | */
+ FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ ret = register_framebuffer(info);
+ if (ret < 0) {
+ dev_err(dev, "Failed to register framebuffer device: %d\n", ret);
+ goto unmap_mmio;
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ dev_set_drvdata(dev, info);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ memset(info->screen_base, 0, info->fix.smem_len);
+ info->var.activate |= FB_ACTIVATE_NOW;
+ ret = fb_set_var(info, &info->var);
+ if (ret) {
+ dev_warn(dev, "Unable to set display parameters\n");
+ }
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ info->var.activate &= ~(FB_ACTIVATE_FORCE | FB_ACTIVATE_NOW);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ dev_dbg(dev, "%s SUCCESS\n", __func__);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ dev_info(dev, "Driver $Revision: 1.1 $\n");
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ return 0;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+unmap_mmio:
+ iounmap(sinfo->mmio);
+release_mem:
+ release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
+free_fb:
+ kfree(info->screen_base);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+free_info:
+ framebuffer_release(info);
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ dev_dbg(dev, "%s FAILED\n", __func__);
+ return ret;
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+}
+
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int s1d15605fb_remove(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct fb_info *info = dev_get_drvdata(dev);
+ struct s1d15605fb_info *sinfo = info->par;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ if (!sinfo)
+ return 0;
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ unregister_framebuffer(info);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ iounmap(sinfo->mmio);
+ release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ kfree(info->screen_base);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+ dev_set_drvdata(dev, NULL);
+ framebuffer_release(info);
+ return 0;
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static struct platform_driver s1d15605fb_driver = {
+ .probe = s1d15605fb_probe,
+ .remove = s1d15605fb_remove,
+ .driver = {
+ .name = "s1d15605fb",
+ .owner = THIS_MODULE,
+ },
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+};
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static int __init s1d15605fb_init(void)
+{
+ return platform_driver_register(&s1d15605fb_driver);
+}
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+static void __exit s1d15605fb_exit(void)
+{
+ platform_driver_unregister(&s1d15605fb_driver);
+}
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+module_init(s1d15605fb_init);
+module_exit(s1d15605fb_exit);
Added initial support for at91 plaform (HCG) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-03-04 19:29:44 +02:00
+
First patches to get to .21 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-05-28 16:00:05 +03:00
+
Prepare for 2.6.22.1 kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-07-29 07:26:11 +03:00
+MODULE_AUTHOR("KwikByte");
+MODULE_DESCRIPTION("Epson S1D15605 LCD Controller framebuffer driver");
+MODULE_LICENSE("GPL");
Copy Permalink