diff options
99 files changed, 9465 insertions, 1132 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 77cbfb1a696c..ee86be031af3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4127,6 +4127,69 @@ S: Maintained | |||
| 4127 | F: drivers/video/riva/ | 4127 | F: drivers/video/riva/ |
| 4128 | F: drivers/video/nvidia/ | 4128 | F: drivers/video/nvidia/ |
| 4129 | 4129 | ||
| 4130 | OMAP SUPPORT | ||
| 4131 | P: Tony Lindgren <tony@atomide.com> | ||
| 4132 | M: tony@atomide.com | ||
| 4133 | L: linux-omap@vger.kernel.org | ||
| 4134 | W: http://www.muru.com/linux/omap/ | ||
| 4135 | W: http://linux.omap.com/ | ||
| 4136 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git | ||
| 4137 | S: Maintained | ||
| 4138 | F: arch/arm/*omap* | ||
| 4139 | |||
| 4140 | OMAP CLOCK FRAMEWORK SUPPORT | ||
| 4141 | P: Paul Walmsley | ||
| 4142 | M: paul@pwsan.com | ||
| 4143 | L: linux-omap@vger.kernel.org | ||
| 4144 | S: Maintained | ||
| 4145 | F: arch/arm/*omap*/*clock* | ||
| 4146 | |||
| 4147 | OMAP POWER MANAGEMENT SUPPORT | ||
| 4148 | P: Kevin Hilman | ||
| 4149 | M: khilman@deeprootsystems.com | ||
| 4150 | L: linux-omap@vger.kernel.org | ||
| 4151 | S: Maintained | ||
| 4152 | F: arch/arm/*omap*/*pm* | ||
| 4153 | |||
| 4154 | OMAP AUDIO SUPPORT | ||
| 4155 | P: Jarkko Nikula | ||
| 4156 | M: jhnikula@gmail.com | ||
| 4157 | L: alsa-devel@alsa-project.org (subscribers-only) | ||
| 4158 | L: linux-omap@vger.kernel.org | ||
| 4159 | S: Maintained | ||
| 4160 | F: sound/soc/omap/ | ||
| 4161 | |||
| 4162 | OMAP FRAMEBUFFER SUPPORT | ||
| 4163 | P: Imre Deak | ||
| 4164 | M: imre.deak@nokia.com | ||
| 4165 | L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) | ||
| 4166 | L: linux-omap@vger.kernel.org | ||
| 4167 | S: Maintained | ||
| 4168 | F: drivers/video/omap/ | ||
| 4169 | |||
| 4170 | OMAP MMC SUPPORT | ||
| 4171 | P: Jarkko Lavinen | ||
| 4172 | M: jarkko.lavinen@nokia.com | ||
| 4173 | L: linux-kernel@vger.kernel.org | ||
| 4174 | L: linux-omap@vger.kernel.org | ||
| 4175 | S: Maintained | ||
| 4176 | F: drivers/mmc/host/*omap* | ||
| 4177 | |||
| 4178 | OMAP RANDOM NUMBER GENERATOR SUPPORT | ||
| 4179 | P: Deepak Saxena | ||
| 4180 | M: dsaxena@plexity.net | ||
| 4181 | S: Maintained | ||
| 4182 | F: drivers/char/hw_random/omap-rng.c | ||
| 4183 | |||
| 4184 | OMAP USB SUPPORT | ||
| 4185 | P: Felipe Balbi | ||
| 4186 | M: felipe.balbi@nokia.com | ||
| 4187 | P: David Brownell | ||
| 4188 | M: dbrownell@users.sourceforge.net | ||
| 4189 | L: linux-usb@vger.kernel.org | ||
| 4190 | L: linux-omap@vger.kernel.org | ||
| 4191 | S: Maintained | ||
| 4192 | |||
| 4130 | OMFS FILESYSTEM | 4193 | OMFS FILESYSTEM |
| 4131 | P: Bob Copeland | 4194 | P: Bob Copeland |
| 4132 | M: me@bobcopeland.com | 4195 | M: me@bobcopeland.com |
| @@ -5515,20 +5578,6 @@ F: drivers/misc/tifm* | |||
| 5515 | F: drivers/mmc/host/tifm_sd.c | 5578 | F: drivers/mmc/host/tifm_sd.c |
| 5516 | F: include/linux/tifm.h | 5579 | F: include/linux/tifm.h |
| 5517 | 5580 | ||
| 5518 | TI OMAP MMC INTERFACE DRIVER | ||
| 5519 | P: Carlos Aguiar, Anderson Briglia and Syed Khasim | ||
| 5520 | M: linux-omap@vger.kernel.org | ||
| 5521 | W: http://linux.omap.com | ||
| 5522 | W: http://www.muru.com/linux/omap/ | ||
| 5523 | S: Maintained | ||
| 5524 | F: drivers/mmc/host/omap.c | ||
| 5525 | |||
| 5526 | TI OMAP RANDOM NUMBER GENERATOR SUPPORT | ||
| 5527 | P: Deepak Saxena | ||
| 5528 | M: dsaxena@plexity.net | ||
| 5529 | S: Maintained | ||
| 5530 | F: drivers/char/hw_random/omap-rng.c | ||
| 5531 | |||
| 5532 | TIPC NETWORK LAYER | 5581 | TIPC NETWORK LAYER |
| 5533 | P: Per Liden | 5582 | P: Per Liden |
| 5534 | M: per.liden@ericsson.com | 5583 | M: per.liden@ericsson.com |
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index b6b9f6ee467b..e8ab87750e9b 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -138,6 +138,7 @@ machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx | |||
| 138 | machine-$(CONFIG_ARCH_OMAP1) := omap1 | 138 | machine-$(CONFIG_ARCH_OMAP1) := omap1 |
| 139 | machine-$(CONFIG_ARCH_OMAP2) := omap2 | 139 | machine-$(CONFIG_ARCH_OMAP2) := omap2 |
| 140 | machine-$(CONFIG_ARCH_OMAP3) := omap2 | 140 | machine-$(CONFIG_ARCH_OMAP3) := omap2 |
| 141 | machine-$(CONFIG_ARCH_OMAP4) := omap2 | ||
| 141 | machine-$(CONFIG_ARCH_ORION5X) := orion5x | 142 | machine-$(CONFIG_ARCH_ORION5X) := orion5x |
| 142 | machine-$(CONFIG_ARCH_PNX4008) := pnx4008 | 143 | machine-$(CONFIG_ARCH_PNX4008) := pnx4008 |
| 143 | machine-$(CONFIG_ARCH_PXA) := pxa | 144 | machine-$(CONFIG_ARCH_PXA) := pxa |
diff --git a/arch/arm/configs/omap3_evm_defconfig b/arch/arm/configs/omap3_evm_defconfig new file mode 100644 index 000000000000..28be17fbc157 --- /dev/null +++ b/arch/arm/configs/omap3_evm_defconfig | |||
| @@ -0,0 +1,1528 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.30-rc5 | ||
| 4 | # Mon May 18 14:01:52 2009 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 16 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 17 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 18 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 19 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 20 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 23 | CONFIG_GENERIC_HWEIGHT=y | ||
| 24 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 25 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
| 26 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 27 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 28 | |||
| 29 | # | ||
| 30 | # General setup | ||
| 31 | # | ||
| 32 | CONFIG_EXPERIMENTAL=y | ||
| 33 | CONFIG_BROKEN_ON_SMP=y | ||
| 34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 35 | CONFIG_LOCALVERSION="" | ||
| 36 | CONFIG_LOCALVERSION_AUTO=y | ||
| 37 | CONFIG_SWAP=y | ||
| 38 | CONFIG_SYSVIPC=y | ||
| 39 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 40 | # CONFIG_POSIX_MQUEUE is not set | ||
| 41 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 42 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 43 | # CONFIG_TASKSTATS is not set | ||
| 44 | # CONFIG_AUDIT is not set | ||
| 45 | |||
| 46 | # | ||
| 47 | # RCU Subsystem | ||
| 48 | # | ||
| 49 | CONFIG_CLASSIC_RCU=y | ||
| 50 | # CONFIG_TREE_RCU is not set | ||
| 51 | # CONFIG_PREEMPT_RCU is not set | ||
| 52 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 53 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 54 | # CONFIG_IKCONFIG is not set | ||
| 55 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 56 | CONFIG_GROUP_SCHED=y | ||
| 57 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 58 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 59 | CONFIG_USER_SCHED=y | ||
| 60 | # CONFIG_CGROUP_SCHED is not set | ||
| 61 | # CONFIG_CGROUPS is not set | ||
| 62 | CONFIG_SYSFS_DEPRECATED=y | ||
| 63 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 64 | # CONFIG_RELAY is not set | ||
| 65 | # CONFIG_NAMESPACES is not set | ||
| 66 | CONFIG_BLK_DEV_INITRD=y | ||
| 67 | CONFIG_INITRAMFS_SOURCE="" | ||
| 68 | CONFIG_RD_GZIP=y | ||
| 69 | # CONFIG_RD_BZIP2 is not set | ||
| 70 | # CONFIG_RD_LZMA is not set | ||
| 71 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 72 | CONFIG_SYSCTL=y | ||
| 73 | CONFIG_ANON_INODES=y | ||
| 74 | CONFIG_EMBEDDED=y | ||
| 75 | CONFIG_UID16=y | ||
| 76 | # CONFIG_SYSCTL_SYSCALL is not set | ||
| 77 | CONFIG_KALLSYMS=y | ||
| 78 | # CONFIG_KALLSYMS_ALL is not set | ||
| 79 | CONFIG_KALLSYMS_EXTRA_PASS=y | ||
| 80 | # CONFIG_STRIP_ASM_SYMS is not set | ||
| 81 | CONFIG_HOTPLUG=y | ||
| 82 | CONFIG_PRINTK=y | ||
| 83 | CONFIG_BUG=y | ||
| 84 | CONFIG_ELF_CORE=y | ||
| 85 | CONFIG_BASE_FULL=y | ||
| 86 | CONFIG_FUTEX=y | ||
| 87 | CONFIG_EPOLL=y | ||
| 88 | CONFIG_SIGNALFD=y | ||
| 89 | CONFIG_TIMERFD=y | ||
| 90 | CONFIG_EVENTFD=y | ||
| 91 | CONFIG_SHMEM=y | ||
| 92 | CONFIG_AIO=y | ||
| 93 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 94 | CONFIG_COMPAT_BRK=y | ||
| 95 | CONFIG_SLAB=y | ||
| 96 | # CONFIG_SLUB is not set | ||
| 97 | # CONFIG_SLOB is not set | ||
| 98 | # CONFIG_PROFILING is not set | ||
| 99 | # CONFIG_MARKERS is not set | ||
| 100 | CONFIG_HAVE_OPROFILE=y | ||
| 101 | # CONFIG_KPROBES is not set | ||
| 102 | CONFIG_HAVE_KPROBES=y | ||
| 103 | CONFIG_HAVE_KRETPROBES=y | ||
| 104 | CONFIG_HAVE_CLK=y | ||
| 105 | # CONFIG_SLOW_WORK is not set | ||
| 106 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
| 107 | CONFIG_SLABINFO=y | ||
| 108 | CONFIG_RT_MUTEXES=y | ||
| 109 | CONFIG_BASE_SMALL=0 | ||
| 110 | CONFIG_MODULES=y | ||
| 111 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 112 | CONFIG_MODULE_UNLOAD=y | ||
| 113 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 114 | CONFIG_MODVERSIONS=y | ||
| 115 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 116 | CONFIG_BLOCK=y | ||
| 117 | # CONFIG_LBD is not set | ||
| 118 | # CONFIG_BLK_DEV_BSG is not set | ||
| 119 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 120 | |||
| 121 | # | ||
| 122 | # IO Schedulers | ||
| 123 | # | ||
| 124 | CONFIG_IOSCHED_NOOP=y | ||
| 125 | CONFIG_IOSCHED_AS=y | ||
| 126 | CONFIG_IOSCHED_DEADLINE=y | ||
| 127 | CONFIG_IOSCHED_CFQ=y | ||
| 128 | CONFIG_DEFAULT_AS=y | ||
| 129 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 130 | # CONFIG_DEFAULT_CFQ is not set | ||
| 131 | # CONFIG_DEFAULT_NOOP is not set | ||
| 132 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 133 | CONFIG_FREEZER=y | ||
| 134 | |||
| 135 | # | ||
| 136 | # System Type | ||
| 137 | # | ||
| 138 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 139 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 140 | # CONFIG_ARCH_REALVIEW is not set | ||
| 141 | # CONFIG_ARCH_VERSATILE is not set | ||
| 142 | # CONFIG_ARCH_AT91 is not set | ||
| 143 | # CONFIG_ARCH_CLPS711X is not set | ||
| 144 | # CONFIG_ARCH_EBSA110 is not set | ||
| 145 | # CONFIG_ARCH_EP93XX is not set | ||
| 146 | # CONFIG_ARCH_GEMINI is not set | ||
| 147 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 148 | # CONFIG_ARCH_NETX is not set | ||
| 149 | # CONFIG_ARCH_H720X is not set | ||
| 150 | # CONFIG_ARCH_IMX is not set | ||
| 151 | # CONFIG_ARCH_IOP13XX is not set | ||
| 152 | # CONFIG_ARCH_IOP32X is not set | ||
| 153 | # CONFIG_ARCH_IOP33X is not set | ||
| 154 | # CONFIG_ARCH_IXP23XX is not set | ||
| 155 | # CONFIG_ARCH_IXP2000 is not set | ||
| 156 | # CONFIG_ARCH_IXP4XX is not set | ||
| 157 | # CONFIG_ARCH_L7200 is not set | ||
| 158 | # CONFIG_ARCH_KIRKWOOD is not set | ||
| 159 | # CONFIG_ARCH_KS8695 is not set | ||
| 160 | # CONFIG_ARCH_NS9XXX is not set | ||
| 161 | # CONFIG_ARCH_LOKI is not set | ||
| 162 | # CONFIG_ARCH_MV78XX0 is not set | ||
| 163 | # CONFIG_ARCH_MXC is not set | ||
| 164 | # CONFIG_ARCH_ORION5X is not set | ||
| 165 | # CONFIG_ARCH_PNX4008 is not set | ||
| 166 | # CONFIG_ARCH_PXA is not set | ||
| 167 | # CONFIG_ARCH_MMP is not set | ||
| 168 | # CONFIG_ARCH_RPC is not set | ||
| 169 | # CONFIG_ARCH_SA1100 is not set | ||
| 170 | # CONFIG_ARCH_S3C2410 is not set | ||
| 171 | # CONFIG_ARCH_S3C64XX is not set | ||
| 172 | # CONFIG_ARCH_SHARK is not set | ||
| 173 | # CONFIG_ARCH_LH7A40X is not set | ||
| 174 | # CONFIG_ARCH_DAVINCI is not set | ||
| 175 | CONFIG_ARCH_OMAP=y | ||
| 176 | # CONFIG_ARCH_MSM is not set | ||
| 177 | # CONFIG_ARCH_W90X900 is not set | ||
| 178 | |||
| 179 | # | ||
| 180 | # TI OMAP Implementations | ||
| 181 | # | ||
| 182 | CONFIG_ARCH_OMAP_OTG=y | ||
| 183 | # CONFIG_ARCH_OMAP1 is not set | ||
| 184 | # CONFIG_ARCH_OMAP2 is not set | ||
| 185 | CONFIG_ARCH_OMAP3=y | ||
| 186 | |||
| 187 | # | ||
| 188 | # OMAP Feature Selections | ||
| 189 | # | ||
| 190 | # CONFIG_OMAP_DEBUG_POWERDOMAIN is not set | ||
| 191 | # CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set | ||
| 192 | CONFIG_OMAP_RESET_CLOCKS=y | ||
| 193 | CONFIG_OMAP_MUX=y | ||
| 194 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
| 195 | CONFIG_OMAP_MUX_WARNINGS=y | ||
| 196 | # CONFIG_OMAP_MCBSP is not set | ||
| 197 | # CONFIG_OMAP_MBOX_FWK is not set | ||
| 198 | # CONFIG_OMAP_MPU_TIMER is not set | ||
| 199 | CONFIG_OMAP_32K_TIMER=y | ||
| 200 | CONFIG_OMAP_32K_TIMER_HZ=128 | ||
| 201 | CONFIG_OMAP_DM_TIMER=y | ||
| 202 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
| 203 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
| 204 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
| 205 | CONFIG_OMAP_SERIAL_WAKE=y | ||
| 206 | CONFIG_ARCH_OMAP34XX=y | ||
| 207 | CONFIG_ARCH_OMAP3430=y | ||
| 208 | |||
| 209 | # | ||
| 210 | # OMAP Board Type | ||
| 211 | # | ||
| 212 | # CONFIG_MACH_OMAP3_BEAGLE is not set | ||
| 213 | # CONFIG_MACH_OMAP_LDP is not set | ||
| 214 | # CONFIG_MACH_OVERO is not set | ||
| 215 | CONFIG_MACH_OMAP3EVM=y | ||
| 216 | # CONFIG_MACH_OMAP3_PANDORA is not set | ||
| 217 | # CONFIG_MACH_OMAP_3430SDP is not set | ||
| 218 | # CONFIG_MACH_NOKIA_RX51 is not set | ||
| 219 | |||
| 220 | # | ||
| 221 | # Processor Type | ||
| 222 | # | ||
| 223 | CONFIG_CPU_32=y | ||
| 224 | CONFIG_CPU_32v6K=y | ||
| 225 | CONFIG_CPU_V7=y | ||
| 226 | CONFIG_CPU_32v7=y | ||
| 227 | CONFIG_CPU_ABRT_EV7=y | ||
| 228 | CONFIG_CPU_PABRT_IFAR=y | ||
| 229 | CONFIG_CPU_CACHE_V7=y | ||
| 230 | CONFIG_CPU_CACHE_VIPT=y | ||
| 231 | CONFIG_CPU_COPY_V6=y | ||
| 232 | CONFIG_CPU_TLB_V7=y | ||
| 233 | CONFIG_CPU_HAS_ASID=y | ||
| 234 | CONFIG_CPU_CP15=y | ||
| 235 | CONFIG_CPU_CP15_MMU=y | ||
| 236 | |||
| 237 | # | ||
| 238 | # Processor Features | ||
| 239 | # | ||
| 240 | CONFIG_ARM_THUMB=y | ||
| 241 | # CONFIG_ARM_THUMBEE is not set | ||
| 242 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 243 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 244 | # CONFIG_CPU_BPREDICT_DISABLE is not set | ||
| 245 | CONFIG_HAS_TLS_REG=y | ||
| 246 | # CONFIG_OUTER_CACHE is not set | ||
| 247 | # CONFIG_ARM_ERRATA_430973 is not set | ||
| 248 | # CONFIG_ARM_ERRATA_458693 is not set | ||
| 249 | # CONFIG_ARM_ERRATA_460075 is not set | ||
| 250 | CONFIG_COMMON_CLKDEV=y | ||
| 251 | |||
| 252 | # | ||
| 253 | # Bus support | ||
| 254 | # | ||
| 255 | # CONFIG_PCI_SYSCALL is not set | ||
| 256 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 257 | # CONFIG_PCCARD is not set | ||
| 258 | |||
| 259 | # | ||
| 260 | # Kernel Features | ||
| 261 | # | ||
| 262 | CONFIG_TICK_ONESHOT=y | ||
| 263 | CONFIG_NO_HZ=y | ||
| 264 | CONFIG_HIGH_RES_TIMERS=y | ||
| 265 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 266 | CONFIG_VMSPLIT_3G=y | ||
| 267 | # CONFIG_VMSPLIT_2G is not set | ||
| 268 | # CONFIG_VMSPLIT_1G is not set | ||
| 269 | CONFIG_PAGE_OFFSET=0xC0000000 | ||
| 270 | # CONFIG_PREEMPT is not set | ||
| 271 | CONFIG_HZ=128 | ||
| 272 | CONFIG_AEABI=y | ||
| 273 | CONFIG_OABI_COMPAT=y | ||
| 274 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y | ||
| 275 | # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set | ||
| 276 | # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set | ||
| 277 | # CONFIG_HIGHMEM is not set | ||
| 278 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 279 | CONFIG_FLATMEM_MANUAL=y | ||
| 280 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 281 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 282 | CONFIG_FLATMEM=y | ||
| 283 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 284 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 285 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 286 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 287 | CONFIG_ZONE_DMA_FLAG=0 | ||
| 288 | CONFIG_VIRT_TO_BUS=y | ||
| 289 | CONFIG_UNEVICTABLE_LRU=y | ||
| 290 | CONFIG_HAVE_MLOCK=y | ||
| 291 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
| 292 | # CONFIG_LEDS is not set | ||
| 293 | CONFIG_ALIGNMENT_TRAP=y | ||
| 294 | |||
| 295 | # | ||
| 296 | # Boot options | ||
| 297 | # | ||
| 298 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 299 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 300 | CONFIG_CMDLINE="root=/dev/nfs nfsroot=192.168.0.1:/home/user/buildroot ip=192.168.0.2:192.168.0.1:192.168.0.1:255.255.255.0:tgt:eth0:off rw console=ttyS2,115200n8" | ||
| 301 | # CONFIG_XIP_KERNEL is not set | ||
| 302 | # CONFIG_KEXEC is not set | ||
| 303 | |||
| 304 | # | ||
| 305 | # CPU Power Management | ||
| 306 | # | ||
| 307 | # CONFIG_CPU_FREQ is not set | ||
| 308 | # CONFIG_CPU_IDLE is not set | ||
| 309 | |||
| 310 | # | ||
| 311 | # Floating point emulation | ||
| 312 | # | ||
| 313 | |||
| 314 | # | ||
| 315 | # At least one emulation must be selected | ||
| 316 | # | ||
| 317 | CONFIG_FPE_NWFPE=y | ||
| 318 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 319 | # CONFIG_FPE_FASTFPE is not set | ||
| 320 | CONFIG_VFP=y | ||
| 321 | CONFIG_VFPv3=y | ||
| 322 | CONFIG_NEON=y | ||
| 323 | |||
| 324 | # | ||
| 325 | # Userspace binary formats | ||
| 326 | # | ||
| 327 | CONFIG_BINFMT_ELF=y | ||
| 328 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 329 | CONFIG_HAVE_AOUT=y | ||
| 330 | # CONFIG_BINFMT_AOUT is not set | ||
| 331 | CONFIG_BINFMT_MISC=y | ||
| 332 | |||
| 333 | # | ||
| 334 | # Power management options | ||
| 335 | # | ||
| 336 | CONFIG_PM=y | ||
| 337 | # CONFIG_PM_DEBUG is not set | ||
| 338 | CONFIG_PM_SLEEP=y | ||
| 339 | CONFIG_SUSPEND=y | ||
| 340 | CONFIG_SUSPEND_FREEZER=y | ||
| 341 | # CONFIG_APM_EMULATION is not set | ||
| 342 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 343 | CONFIG_NET=y | ||
| 344 | |||
| 345 | # | ||
| 346 | # Networking options | ||
| 347 | # | ||
| 348 | CONFIG_PACKET=y | ||
| 349 | # CONFIG_PACKET_MMAP is not set | ||
| 350 | CONFIG_UNIX=y | ||
| 351 | CONFIG_XFRM=y | ||
| 352 | # CONFIG_XFRM_USER is not set | ||
| 353 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 354 | # CONFIG_XFRM_MIGRATE is not set | ||
| 355 | # CONFIG_XFRM_STATISTICS is not set | ||
| 356 | CONFIG_NET_KEY=y | ||
| 357 | # CONFIG_NET_KEY_MIGRATE is not set | ||
| 358 | CONFIG_INET=y | ||
| 359 | # CONFIG_IP_MULTICAST is not set | ||
| 360 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 361 | CONFIG_IP_FIB_HASH=y | ||
| 362 | CONFIG_IP_PNP=y | ||
| 363 | CONFIG_IP_PNP_DHCP=y | ||
| 364 | CONFIG_IP_PNP_BOOTP=y | ||
| 365 | CONFIG_IP_PNP_RARP=y | ||
| 366 | # CONFIG_NET_IPIP is not set | ||
| 367 | # CONFIG_NET_IPGRE is not set | ||
| 368 | # CONFIG_ARPD is not set | ||
| 369 | # CONFIG_SYN_COOKIES is not set | ||
| 370 | # CONFIG_INET_AH is not set | ||
| 371 | # CONFIG_INET_ESP is not set | ||
| 372 | # CONFIG_INET_IPCOMP is not set | ||
| 373 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 374 | # CONFIG_INET_TUNNEL is not set | ||
| 375 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 376 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 377 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 378 | # CONFIG_INET_LRO is not set | ||
| 379 | CONFIG_INET_DIAG=y | ||
| 380 | CONFIG_INET_TCP_DIAG=y | ||
| 381 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 382 | CONFIG_TCP_CONG_CUBIC=y | ||
| 383 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 384 | # CONFIG_TCP_MD5SIG is not set | ||
| 385 | # CONFIG_IPV6 is not set | ||
| 386 | # CONFIG_NETWORK_SECMARK is not set | ||
| 387 | # CONFIG_NETFILTER is not set | ||
| 388 | # CONFIG_IP_DCCP is not set | ||
| 389 | # CONFIG_IP_SCTP is not set | ||
| 390 | # CONFIG_TIPC is not set | ||
| 391 | # CONFIG_ATM is not set | ||
| 392 | # CONFIG_BRIDGE is not set | ||
| 393 | # CONFIG_NET_DSA is not set | ||
| 394 | # CONFIG_VLAN_8021Q is not set | ||
| 395 | # CONFIG_DECNET is not set | ||
| 396 | # CONFIG_LLC2 is not set | ||
| 397 | # CONFIG_IPX is not set | ||
| 398 | # CONFIG_ATALK is not set | ||
| 399 | # CONFIG_X25 is not set | ||
| 400 | # CONFIG_LAPB is not set | ||
| 401 | # CONFIG_ECONET is not set | ||
| 402 | # CONFIG_WAN_ROUTER is not set | ||
| 403 | # CONFIG_PHONET is not set | ||
| 404 | # CONFIG_NET_SCHED is not set | ||
| 405 | # CONFIG_DCB is not set | ||
| 406 | |||
| 407 | # | ||
| 408 | # Network testing | ||
| 409 | # | ||
| 410 | # CONFIG_NET_PKTGEN is not set | ||
| 411 | # CONFIG_HAMRADIO is not set | ||
| 412 | # CONFIG_CAN is not set | ||
| 413 | # CONFIG_IRDA is not set | ||
| 414 | # CONFIG_BT is not set | ||
| 415 | # CONFIG_AF_RXRPC is not set | ||
| 416 | CONFIG_WIRELESS=y | ||
| 417 | # CONFIG_CFG80211 is not set | ||
| 418 | # CONFIG_WIRELESS_OLD_REGULATORY is not set | ||
| 419 | # CONFIG_WIRELESS_EXT is not set | ||
| 420 | # CONFIG_LIB80211 is not set | ||
| 421 | # CONFIG_MAC80211 is not set | ||
| 422 | # CONFIG_WIMAX is not set | ||
| 423 | # CONFIG_RFKILL is not set | ||
| 424 | # CONFIG_NET_9P is not set | ||
| 425 | |||
| 426 | # | ||
| 427 | # Device Drivers | ||
| 428 | # | ||
| 429 | |||
| 430 | # | ||
| 431 | # Generic Driver Options | ||
| 432 | # | ||
| 433 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 434 | CONFIG_STANDALONE=y | ||
| 435 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 436 | # CONFIG_FW_LOADER is not set | ||
| 437 | # CONFIG_DEBUG_DRIVER is not set | ||
| 438 | # CONFIG_DEBUG_DEVRES is not set | ||
| 439 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 440 | # CONFIG_CONNECTOR is not set | ||
| 441 | CONFIG_MTD=y | ||
| 442 | # CONFIG_MTD_DEBUG is not set | ||
| 443 | CONFIG_MTD_CONCAT=y | ||
| 444 | CONFIG_MTD_PARTITIONS=y | ||
| 445 | # CONFIG_MTD_TESTS is not set | ||
| 446 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 447 | CONFIG_MTD_CMDLINE_PARTS=y | ||
| 448 | # CONFIG_MTD_AFS_PARTS is not set | ||
| 449 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 450 | |||
| 451 | # | ||
| 452 | # User Modules And Translation Layers | ||
| 453 | # | ||
| 454 | CONFIG_MTD_CHAR=y | ||
| 455 | CONFIG_MTD_BLKDEVS=y | ||
| 456 | CONFIG_MTD_BLOCK=y | ||
| 457 | # CONFIG_FTL is not set | ||
| 458 | # CONFIG_NFTL is not set | ||
| 459 | # CONFIG_INFTL is not set | ||
| 460 | # CONFIG_RFD_FTL is not set | ||
| 461 | # CONFIG_SSFDC is not set | ||
| 462 | # CONFIG_MTD_OOPS is not set | ||
| 463 | |||
| 464 | # | ||
| 465 | # RAM/ROM/Flash chip drivers | ||
| 466 | # | ||
| 467 | CONFIG_MTD_CFI=y | ||
| 468 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 469 | CONFIG_MTD_GEN_PROBE=y | ||
| 470 | # CONFIG_MTD_CFI_ADV_OPTIONS is not set | ||
| 471 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 472 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 473 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 474 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 475 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 476 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 477 | CONFIG_MTD_CFI_I1=y | ||
| 478 | CONFIG_MTD_CFI_I2=y | ||
| 479 | # CONFIG_MTD_CFI_I4 is not set | ||
| 480 | # CONFIG_MTD_CFI_I8 is not set | ||
| 481 | CONFIG_MTD_CFI_INTELEXT=y | ||
| 482 | # CONFIG_MTD_CFI_AMDSTD is not set | ||
| 483 | # CONFIG_MTD_CFI_STAA is not set | ||
| 484 | CONFIG_MTD_CFI_UTIL=y | ||
| 485 | # CONFIG_MTD_RAM is not set | ||
| 486 | # CONFIG_MTD_ROM is not set | ||
| 487 | # CONFIG_MTD_ABSENT is not set | ||
| 488 | |||
| 489 | # | ||
| 490 | # Mapping drivers for chip access | ||
| 491 | # | ||
| 492 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 493 | # CONFIG_MTD_PHYSMAP is not set | ||
| 494 | # CONFIG_MTD_ARM_INTEGRATOR is not set | ||
| 495 | # CONFIG_MTD_OMAP_NOR is not set | ||
| 496 | # CONFIG_MTD_PLATRAM is not set | ||
| 497 | |||
| 498 | # | ||
| 499 | # Self-contained MTD device drivers | ||
| 500 | # | ||
| 501 | # CONFIG_MTD_DATAFLASH is not set | ||
| 502 | # CONFIG_MTD_M25P80 is not set | ||
| 503 | # CONFIG_MTD_SLRAM is not set | ||
| 504 | # CONFIG_MTD_PHRAM is not set | ||
| 505 | # CONFIG_MTD_MTDRAM is not set | ||
| 506 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 507 | |||
| 508 | # | ||
| 509 | # Disk-On-Chip Device Drivers | ||
| 510 | # | ||
| 511 | # CONFIG_MTD_DOC2000 is not set | ||
| 512 | # CONFIG_MTD_DOC2001 is not set | ||
| 513 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 514 | CONFIG_MTD_NAND=y | ||
| 515 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set | ||
| 516 | # CONFIG_MTD_NAND_ECC_SMC is not set | ||
| 517 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | ||
| 518 | # CONFIG_MTD_NAND_GPIO is not set | ||
| 519 | CONFIG_MTD_NAND_IDS=y | ||
| 520 | # CONFIG_MTD_NAND_DISKONCHIP is not set | ||
| 521 | # CONFIG_MTD_NAND_NANDSIM is not set | ||
| 522 | # CONFIG_MTD_NAND_PLATFORM is not set | ||
| 523 | # CONFIG_MTD_ALAUDA is not set | ||
| 524 | CONFIG_MTD_ONENAND=y | ||
| 525 | CONFIG_MTD_ONENAND_VERIFY_WRITE=y | ||
| 526 | # CONFIG_MTD_ONENAND_GENERIC is not set | ||
| 527 | CONFIG_MTD_ONENAND_OMAP2=y | ||
| 528 | # CONFIG_MTD_ONENAND_OTP is not set | ||
| 529 | # CONFIG_MTD_ONENAND_2X_PROGRAM is not set | ||
| 530 | # CONFIG_MTD_ONENAND_SIM is not set | ||
| 531 | |||
| 532 | # | ||
| 533 | # LPDDR flash memory drivers | ||
| 534 | # | ||
| 535 | # CONFIG_MTD_LPDDR is not set | ||
| 536 | |||
| 537 | # | ||
| 538 | # UBI - Unsorted block images | ||
| 539 | # | ||
| 540 | # CONFIG_MTD_UBI is not set | ||
| 541 | # CONFIG_PARPORT is not set | ||
| 542 | CONFIG_BLK_DEV=y | ||
| 543 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 544 | CONFIG_BLK_DEV_LOOP=y | ||
| 545 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 546 | # CONFIG_BLK_DEV_NBD is not set | ||
| 547 | # CONFIG_BLK_DEV_UB is not set | ||
| 548 | CONFIG_BLK_DEV_RAM=y | ||
| 549 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 550 | CONFIG_BLK_DEV_RAM_SIZE=16384 | ||
| 551 | # CONFIG_BLK_DEV_XIP is not set | ||
| 552 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 553 | # CONFIG_ATA_OVER_ETH is not set | ||
| 554 | # CONFIG_MISC_DEVICES is not set | ||
| 555 | CONFIG_HAVE_IDE=y | ||
| 556 | # CONFIG_IDE is not set | ||
| 557 | |||
| 558 | # | ||
| 559 | # SCSI device support | ||
| 560 | # | ||
| 561 | # CONFIG_RAID_ATTRS is not set | ||
| 562 | CONFIG_SCSI=y | ||
| 563 | CONFIG_SCSI_DMA=y | ||
| 564 | # CONFIG_SCSI_TGT is not set | ||
| 565 | # CONFIG_SCSI_NETLINK is not set | ||
| 566 | CONFIG_SCSI_PROC_FS=y | ||
| 567 | |||
| 568 | # | ||
| 569 | # SCSI support type (disk, tape, CD-ROM) | ||
| 570 | # | ||
| 571 | CONFIG_BLK_DEV_SD=y | ||
| 572 | # CONFIG_CHR_DEV_ST is not set | ||
| 573 | # CONFIG_CHR_DEV_OSST is not set | ||
| 574 | # CONFIG_BLK_DEV_SR is not set | ||
| 575 | # CONFIG_CHR_DEV_SG is not set | ||
| 576 | # CONFIG_CHR_DEV_SCH is not set | ||
| 577 | |||
| 578 | # | ||
| 579 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 580 | # | ||
| 581 | # CONFIG_SCSI_MULTI_LUN is not set | ||
| 582 | # CONFIG_SCSI_CONSTANTS is not set | ||
| 583 | # CONFIG_SCSI_LOGGING is not set | ||
| 584 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 585 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 586 | |||
| 587 | # | ||
| 588 | # SCSI Transports | ||
| 589 | # | ||
| 590 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 591 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 592 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 593 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 594 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 595 | CONFIG_SCSI_LOWLEVEL=y | ||
| 596 | # CONFIG_ISCSI_TCP is not set | ||
| 597 | # CONFIG_LIBFC is not set | ||
| 598 | # CONFIG_LIBFCOE is not set | ||
| 599 | # CONFIG_SCSI_DEBUG is not set | ||
| 600 | # CONFIG_SCSI_DH is not set | ||
| 601 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
| 602 | # CONFIG_ATA is not set | ||
| 603 | # CONFIG_MD is not set | ||
| 604 | CONFIG_NETDEVICES=y | ||
| 605 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
| 606 | # CONFIG_DUMMY is not set | ||
| 607 | # CONFIG_BONDING is not set | ||
| 608 | # CONFIG_MACVLAN is not set | ||
| 609 | # CONFIG_EQUALIZER is not set | ||
| 610 | # CONFIG_TUN is not set | ||
| 611 | # CONFIG_VETH is not set | ||
| 612 | # CONFIG_PHYLIB is not set | ||
| 613 | CONFIG_NET_ETHERNET=y | ||
| 614 | CONFIG_MII=y | ||
| 615 | # CONFIG_AX88796 is not set | ||
| 616 | # CONFIG_SMC91X is not set | ||
| 617 | # CONFIG_DM9000 is not set | ||
| 618 | # CONFIG_ENC28J60 is not set | ||
| 619 | # CONFIG_ETHOC is not set | ||
| 620 | CONFIG_SMC911X=y | ||
| 621 | # CONFIG_SMSC911X is not set | ||
| 622 | # CONFIG_DNET is not set | ||
| 623 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 624 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 625 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 626 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 627 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 628 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 629 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 630 | # CONFIG_B44 is not set | ||
| 631 | # CONFIG_NETDEV_1000 is not set | ||
| 632 | # CONFIG_NETDEV_10000 is not set | ||
| 633 | |||
| 634 | # | ||
| 635 | # Wireless LAN | ||
| 636 | # | ||
| 637 | # CONFIG_WLAN_PRE80211 is not set | ||
| 638 | # CONFIG_WLAN_80211 is not set | ||
| 639 | |||
| 640 | # | ||
| 641 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 642 | # | ||
| 643 | |||
| 644 | # | ||
| 645 | # USB Network Adapters | ||
| 646 | # | ||
| 647 | # CONFIG_USB_CATC is not set | ||
| 648 | # CONFIG_USB_KAWETH is not set | ||
| 649 | # CONFIG_USB_PEGASUS is not set | ||
| 650 | # CONFIG_USB_RTL8150 is not set | ||
| 651 | # CONFIG_USB_USBNET is not set | ||
| 652 | # CONFIG_WAN is not set | ||
| 653 | # CONFIG_PPP is not set | ||
| 654 | # CONFIG_SLIP is not set | ||
| 655 | # CONFIG_NETCONSOLE is not set | ||
| 656 | # CONFIG_NETPOLL is not set | ||
| 657 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 658 | # CONFIG_ISDN is not set | ||
| 659 | |||
| 660 | # | ||
| 661 | # Input device support | ||
| 662 | # | ||
| 663 | CONFIG_INPUT=y | ||
| 664 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 665 | # CONFIG_INPUT_POLLDEV is not set | ||
| 666 | |||
| 667 | # | ||
| 668 | # Userland interfaces | ||
| 669 | # | ||
| 670 | # CONFIG_INPUT_MOUSEDEV is not set | ||
| 671 | # CONFIG_INPUT_JOYDEV is not set | ||
| 672 | CONFIG_INPUT_EVDEV=y | ||
| 673 | # CONFIG_INPUT_EVBUG is not set | ||
| 674 | |||
| 675 | # | ||
| 676 | # Input Device Drivers | ||
| 677 | # | ||
| 678 | CONFIG_INPUT_KEYBOARD=y | ||
| 679 | # CONFIG_KEYBOARD_ATKBD is not set | ||
| 680 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
| 681 | # CONFIG_KEYBOARD_LKKBD is not set | ||
| 682 | # CONFIG_KEYBOARD_XTKBD is not set | ||
| 683 | # CONFIG_KEYBOARD_NEWTON is not set | ||
| 684 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 685 | # CONFIG_KEYBOARD_GPIO is not set | ||
| 686 | # CONFIG_INPUT_MOUSE is not set | ||
| 687 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 688 | # CONFIG_INPUT_TABLET is not set | ||
| 689 | CONFIG_INPUT_TOUCHSCREEN=y | ||
| 690 | CONFIG_TOUCHSCREEN_ADS7846=y | ||
| 691 | # CONFIG_TOUCHSCREEN_AD7877 is not set | ||
| 692 | # CONFIG_TOUCHSCREEN_AD7879_I2C is not set | ||
| 693 | # CONFIG_TOUCHSCREEN_AD7879_SPI is not set | ||
| 694 | # CONFIG_TOUCHSCREEN_AD7879 is not set | ||
| 695 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
| 696 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
| 697 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
| 698 | # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set | ||
| 699 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
| 700 | # CONFIG_TOUCHSCREEN_INEXIO is not set | ||
| 701 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
| 702 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
| 703 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
| 704 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
| 705 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | ||
| 706 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set | ||
| 707 | # CONFIG_TOUCHSCREEN_TSC2007 is not set | ||
| 708 | # CONFIG_INPUT_MISC is not set | ||
| 709 | |||
| 710 | # | ||
| 711 | # Hardware I/O ports | ||
| 712 | # | ||
| 713 | # CONFIG_SERIO is not set | ||
| 714 | # CONFIG_GAMEPORT is not set | ||
| 715 | |||
| 716 | # | ||
| 717 | # Character devices | ||
| 718 | # | ||
| 719 | CONFIG_VT=y | ||
| 720 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 721 | CONFIG_VT_CONSOLE=y | ||
| 722 | CONFIG_HW_CONSOLE=y | ||
| 723 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 724 | CONFIG_DEVKMEM=y | ||
| 725 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 726 | |||
| 727 | # | ||
| 728 | # Serial drivers | ||
| 729 | # | ||
| 730 | CONFIG_SERIAL_8250=y | ||
| 731 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 732 | CONFIG_SERIAL_8250_NR_UARTS=32 | ||
| 733 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 734 | CONFIG_SERIAL_8250_EXTENDED=y | ||
| 735 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
| 736 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
| 737 | CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
| 738 | CONFIG_SERIAL_8250_RSA=y | ||
| 739 | |||
| 740 | # | ||
| 741 | # Non-8250 serial port support | ||
| 742 | # | ||
| 743 | # CONFIG_SERIAL_MAX3100 is not set | ||
| 744 | CONFIG_SERIAL_CORE=y | ||
| 745 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 746 | CONFIG_UNIX98_PTYS=y | ||
| 747 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 748 | # CONFIG_LEGACY_PTYS is not set | ||
| 749 | # CONFIG_IPMI_HANDLER is not set | ||
| 750 | CONFIG_HW_RANDOM=y | ||
| 751 | # CONFIG_HW_RANDOM_TIMERIOMEM is not set | ||
| 752 | # CONFIG_R3964 is not set | ||
| 753 | # CONFIG_RAW_DRIVER is not set | ||
| 754 | # CONFIG_TCG_TPM is not set | ||
| 755 | CONFIG_I2C=y | ||
| 756 | CONFIG_I2C_BOARDINFO=y | ||
| 757 | CONFIG_I2C_CHARDEV=y | ||
| 758 | CONFIG_I2C_HELPER_AUTO=y | ||
| 759 | |||
| 760 | # | ||
| 761 | # I2C Hardware Bus support | ||
| 762 | # | ||
| 763 | |||
| 764 | # | ||
| 765 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 766 | # | ||
| 767 | # CONFIG_I2C_GPIO is not set | ||
| 768 | # CONFIG_I2C_OCORES is not set | ||
| 769 | CONFIG_I2C_OMAP=y | ||
| 770 | # CONFIG_I2C_SIMTEC is not set | ||
| 771 | |||
| 772 | # | ||
| 773 | # External I2C/SMBus adapter drivers | ||
| 774 | # | ||
| 775 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 776 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 777 | # CONFIG_I2C_TINY_USB is not set | ||
| 778 | |||
| 779 | # | ||
| 780 | # Other I2C/SMBus bus drivers | ||
| 781 | # | ||
| 782 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 783 | # CONFIG_I2C_STUB is not set | ||
| 784 | |||
| 785 | # | ||
| 786 | # Miscellaneous I2C Chip support | ||
| 787 | # | ||
| 788 | # CONFIG_DS1682 is not set | ||
| 789 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 790 | # CONFIG_PCF8575 is not set | ||
| 791 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 792 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 793 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 794 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 795 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 796 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 797 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 798 | CONFIG_SPI=y | ||
| 799 | # CONFIG_SPI_DEBUG is not set | ||
| 800 | CONFIG_SPI_MASTER=y | ||
| 801 | |||
| 802 | # | ||
| 803 | # SPI Master Controller Drivers | ||
| 804 | # | ||
| 805 | # CONFIG_SPI_BITBANG is not set | ||
| 806 | # CONFIG_SPI_GPIO is not set | ||
| 807 | CONFIG_SPI_OMAP24XX=y | ||
| 808 | |||
| 809 | # | ||
| 810 | # SPI Protocol Masters | ||
| 811 | # | ||
| 812 | # CONFIG_SPI_SPIDEV is not set | ||
| 813 | # CONFIG_SPI_TLE62X0 is not set | ||
| 814 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
| 815 | CONFIG_GPIOLIB=y | ||
| 816 | # CONFIG_DEBUG_GPIO is not set | ||
| 817 | # CONFIG_GPIO_SYSFS is not set | ||
| 818 | |||
| 819 | # | ||
| 820 | # Memory mapped GPIO expanders: | ||
| 821 | # | ||
| 822 | |||
| 823 | # | ||
| 824 | # I2C GPIO expanders: | ||
| 825 | # | ||
| 826 | # CONFIG_GPIO_MAX732X is not set | ||
| 827 | # CONFIG_GPIO_PCA953X is not set | ||
| 828 | # CONFIG_GPIO_PCF857X is not set | ||
| 829 | CONFIG_GPIO_TWL4030=y | ||
| 830 | |||
| 831 | # | ||
| 832 | # PCI GPIO expanders: | ||
| 833 | # | ||
| 834 | |||
| 835 | # | ||
| 836 | # SPI GPIO expanders: | ||
| 837 | # | ||
| 838 | # CONFIG_GPIO_MAX7301 is not set | ||
| 839 | # CONFIG_GPIO_MCP23S08 is not set | ||
| 840 | # CONFIG_W1 is not set | ||
| 841 | # CONFIG_POWER_SUPPLY is not set | ||
| 842 | # CONFIG_HWMON is not set | ||
| 843 | # CONFIG_THERMAL is not set | ||
| 844 | # CONFIG_THERMAL_HWMON is not set | ||
| 845 | CONFIG_WATCHDOG=y | ||
| 846 | CONFIG_WATCHDOG_NOWAYOUT=y | ||
| 847 | |||
| 848 | # | ||
| 849 | # Watchdog Device Drivers | ||
| 850 | # | ||
| 851 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 852 | CONFIG_OMAP_WATCHDOG=y | ||
| 853 | |||
| 854 | # | ||
| 855 | # USB-based Watchdog Cards | ||
| 856 | # | ||
| 857 | # CONFIG_USBPCWATCHDOG is not set | ||
| 858 | CONFIG_SSB_POSSIBLE=y | ||
| 859 | |||
| 860 | # | ||
| 861 | # Sonics Silicon Backplane | ||
| 862 | # | ||
| 863 | # CONFIG_SSB is not set | ||
| 864 | |||
| 865 | # | ||
| 866 | # Multifunction device drivers | ||
| 867 | # | ||
| 868 | # CONFIG_MFD_CORE is not set | ||
| 869 | # CONFIG_MFD_SM501 is not set | ||
| 870 | # CONFIG_MFD_ASIC3 is not set | ||
| 871 | # CONFIG_HTC_EGPIO is not set | ||
| 872 | # CONFIG_HTC_PASIC3 is not set | ||
| 873 | # CONFIG_TPS65010 is not set | ||
| 874 | CONFIG_TWL4030_CORE=y | ||
| 875 | # CONFIG_MFD_TMIO is not set | ||
| 876 | # CONFIG_MFD_T7L66XB is not set | ||
| 877 | # CONFIG_MFD_TC6387XB is not set | ||
| 878 | # CONFIG_MFD_TC6393XB is not set | ||
| 879 | # CONFIG_PMIC_DA903X is not set | ||
| 880 | # CONFIG_MFD_WM8400 is not set | ||
| 881 | # CONFIG_MFD_WM8350_I2C is not set | ||
| 882 | # CONFIG_MFD_PCF50633 is not set | ||
| 883 | |||
| 884 | # | ||
| 885 | # Multimedia devices | ||
| 886 | # | ||
| 887 | |||
| 888 | # | ||
| 889 | # Multimedia core support | ||
| 890 | # | ||
| 891 | # CONFIG_VIDEO_DEV is not set | ||
| 892 | # CONFIG_DVB_CORE is not set | ||
| 893 | # CONFIG_VIDEO_MEDIA is not set | ||
| 894 | |||
| 895 | # | ||
| 896 | # Multimedia drivers | ||
| 897 | # | ||
| 898 | CONFIG_DAB=y | ||
| 899 | # CONFIG_USB_DABUSB is not set | ||
| 900 | |||
| 901 | # | ||
| 902 | # Graphics support | ||
| 903 | # | ||
| 904 | # CONFIG_VGASTATE is not set | ||
| 905 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 906 | # CONFIG_FB is not set | ||
| 907 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 908 | |||
| 909 | # | ||
| 910 | # Display device support | ||
| 911 | # | ||
| 912 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 913 | |||
| 914 | # | ||
| 915 | # Console display driver support | ||
| 916 | # | ||
| 917 | # CONFIG_VGA_CONSOLE is not set | ||
| 918 | CONFIG_DUMMY_CONSOLE=y | ||
| 919 | # CONFIG_SOUND is not set | ||
| 920 | CONFIG_HID_SUPPORT=y | ||
| 921 | CONFIG_HID=y | ||
| 922 | # CONFIG_HID_DEBUG is not set | ||
| 923 | # CONFIG_HIDRAW is not set | ||
| 924 | |||
| 925 | # | ||
| 926 | # USB Input Devices | ||
| 927 | # | ||
| 928 | CONFIG_USB_HID=y | ||
| 929 | # CONFIG_HID_PID is not set | ||
| 930 | # CONFIG_USB_HIDDEV is not set | ||
| 931 | |||
| 932 | # | ||
| 933 | # Special HID drivers | ||
| 934 | # | ||
| 935 | # CONFIG_HID_A4TECH is not set | ||
| 936 | # CONFIG_HID_APPLE is not set | ||
| 937 | # CONFIG_HID_BELKIN is not set | ||
| 938 | # CONFIG_HID_CHERRY is not set | ||
| 939 | # CONFIG_HID_CHICONY is not set | ||
| 940 | # CONFIG_HID_CYPRESS is not set | ||
| 941 | # CONFIG_DRAGONRISE_FF is not set | ||
| 942 | # CONFIG_HID_EZKEY is not set | ||
| 943 | # CONFIG_HID_KYE is not set | ||
| 944 | # CONFIG_HID_GYRATION is not set | ||
| 945 | # CONFIG_HID_KENSINGTON is not set | ||
| 946 | # CONFIG_HID_LOGITECH is not set | ||
| 947 | # CONFIG_HID_MICROSOFT is not set | ||
| 948 | # CONFIG_HID_MONTEREY is not set | ||
| 949 | # CONFIG_HID_NTRIG is not set | ||
| 950 | # CONFIG_HID_PANTHERLORD is not set | ||
| 951 | # CONFIG_HID_PETALYNX is not set | ||
| 952 | # CONFIG_HID_SAMSUNG is not set | ||
| 953 | # CONFIG_HID_SONY is not set | ||
| 954 | # CONFIG_HID_SUNPLUS is not set | ||
| 955 | # CONFIG_GREENASIA_FF is not set | ||
| 956 | # CONFIG_HID_TOPSEED is not set | ||
| 957 | # CONFIG_THRUSTMASTER_FF is not set | ||
| 958 | # CONFIG_ZEROPLUS_FF is not set | ||
| 959 | CONFIG_USB_SUPPORT=y | ||
| 960 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 961 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 962 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 963 | CONFIG_USB=y | ||
| 964 | # CONFIG_USB_DEBUG is not set | ||
| 965 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | ||
| 966 | |||
| 967 | # | ||
| 968 | # Miscellaneous USB options | ||
| 969 | # | ||
| 970 | CONFIG_USB_DEVICEFS=y | ||
| 971 | # CONFIG_USB_DEVICE_CLASS is not set | ||
| 972 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 973 | CONFIG_USB_SUSPEND=y | ||
| 974 | CONFIG_USB_OTG=y | ||
| 975 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 976 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 977 | CONFIG_USB_MON=y | ||
| 978 | # CONFIG_USB_WUSB is not set | ||
| 979 | # CONFIG_USB_WUSB_CBAF is not set | ||
| 980 | |||
| 981 | # | ||
| 982 | # USB Host Controller Drivers | ||
| 983 | # | ||
| 984 | # CONFIG_USB_C67X00_HCD is not set | ||
| 985 | # CONFIG_USB_OXU210HP_HCD is not set | ||
| 986 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 987 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 988 | # CONFIG_USB_OHCI_HCD is not set | ||
| 989 | # CONFIG_USB_SL811_HCD is not set | ||
| 990 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 991 | # CONFIG_USB_HWA_HCD is not set | ||
| 992 | CONFIG_USB_MUSB_HDRC=y | ||
| 993 | CONFIG_USB_MUSB_SOC=y | ||
| 994 | |||
| 995 | # | ||
| 996 | # OMAP 343x high speed USB support | ||
| 997 | # | ||
| 998 | # CONFIG_USB_MUSB_HOST is not set | ||
| 999 | # CONFIG_USB_MUSB_PERIPHERAL is not set | ||
| 1000 | CONFIG_USB_MUSB_OTG=y | ||
| 1001 | CONFIG_USB_GADGET_MUSB_HDRC=y | ||
| 1002 | CONFIG_USB_MUSB_HDRC_HCD=y | ||
| 1003 | # CONFIG_MUSB_PIO_ONLY is not set | ||
| 1004 | CONFIG_USB_INVENTRA_DMA=y | ||
| 1005 | # CONFIG_USB_TI_CPPI_DMA is not set | ||
| 1006 | # CONFIG_USB_MUSB_DEBUG is not set | ||
| 1007 | |||
| 1008 | # | ||
| 1009 | # USB Device Class drivers | ||
| 1010 | # | ||
| 1011 | # CONFIG_USB_ACM is not set | ||
| 1012 | # CONFIG_USB_PRINTER is not set | ||
| 1013 | # CONFIG_USB_WDM is not set | ||
| 1014 | # CONFIG_USB_TMC is not set | ||
| 1015 | |||
| 1016 | # | ||
| 1017 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may | ||
| 1018 | # | ||
| 1019 | |||
| 1020 | # | ||
| 1021 | # also be needed; see USB_STORAGE Help for more info | ||
| 1022 | # | ||
| 1023 | CONFIG_USB_STORAGE=y | ||
| 1024 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
| 1025 | # CONFIG_USB_STORAGE_DATAFAB is not set | ||
| 1026 | # CONFIG_USB_STORAGE_FREECOM is not set | ||
| 1027 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
| 1028 | # CONFIG_USB_STORAGE_USBAT is not set | ||
| 1029 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
| 1030 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
| 1031 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
| 1032 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 1033 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1034 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 1035 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1036 | # CONFIG_USB_LIBUSUAL is not set | ||
| 1037 | |||
| 1038 | # | ||
| 1039 | # USB Imaging devices | ||
| 1040 | # | ||
| 1041 | # CONFIG_USB_MDC800 is not set | ||
| 1042 | # CONFIG_USB_MICROTEK is not set | ||
| 1043 | |||
| 1044 | # | ||
| 1045 | # USB port drivers | ||
| 1046 | # | ||
| 1047 | # CONFIG_USB_SERIAL is not set | ||
| 1048 | |||
| 1049 | # | ||
| 1050 | # USB Miscellaneous drivers | ||
| 1051 | # | ||
| 1052 | # CONFIG_USB_EMI62 is not set | ||
| 1053 | # CONFIG_USB_EMI26 is not set | ||
| 1054 | # CONFIG_USB_ADUTUX is not set | ||
| 1055 | # CONFIG_USB_SEVSEG is not set | ||
| 1056 | # CONFIG_USB_RIO500 is not set | ||
| 1057 | # CONFIG_USB_LEGOTOWER is not set | ||
| 1058 | # CONFIG_USB_LCD is not set | ||
| 1059 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1060 | # CONFIG_USB_LED is not set | ||
| 1061 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 1062 | # CONFIG_USB_CYTHERM is not set | ||
| 1063 | # CONFIG_USB_IDMOUSE is not set | ||
| 1064 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 1065 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 1066 | # CONFIG_USB_LD is not set | ||
| 1067 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1068 | # CONFIG_USB_IOWARRIOR is not set | ||
| 1069 | CONFIG_USB_TEST=y | ||
| 1070 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1071 | # CONFIG_USB_VST is not set | ||
| 1072 | CONFIG_USB_GADGET=y | ||
| 1073 | # CONFIG_USB_GADGET_DEBUG is not set | ||
| 1074 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | ||
| 1075 | CONFIG_USB_GADGET_VBUS_DRAW=2 | ||
| 1076 | CONFIG_USB_GADGET_SELECTED=y | ||
| 1077 | # CONFIG_USB_GADGET_AT91 is not set | ||
| 1078 | # CONFIG_USB_GADGET_ATMEL_USBA is not set | ||
| 1079 | # CONFIG_USB_GADGET_FSL_USB2 is not set | ||
| 1080 | # CONFIG_USB_GADGET_LH7A40X is not set | ||
| 1081 | # CONFIG_USB_GADGET_OMAP is not set | ||
| 1082 | # CONFIG_USB_GADGET_PXA25X is not set | ||
| 1083 | # CONFIG_USB_GADGET_PXA27X is not set | ||
| 1084 | # CONFIG_USB_GADGET_S3C2410 is not set | ||
| 1085 | # CONFIG_USB_GADGET_IMX is not set | ||
| 1086 | # CONFIG_USB_GADGET_M66592 is not set | ||
| 1087 | # CONFIG_USB_GADGET_AMD5536UDC is not set | ||
| 1088 | # CONFIG_USB_GADGET_FSL_QE is not set | ||
| 1089 | # CONFIG_USB_GADGET_CI13XXX is not set | ||
| 1090 | # CONFIG_USB_GADGET_NET2280 is not set | ||
| 1091 | # CONFIG_USB_GADGET_GOKU is not set | ||
| 1092 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | ||
| 1093 | CONFIG_USB_GADGET_DUALSPEED=y | ||
| 1094 | CONFIG_USB_ZERO=m | ||
| 1095 | # CONFIG_USB_ZERO_HNPTEST is not set | ||
| 1096 | # CONFIG_USB_ETH is not set | ||
| 1097 | # CONFIG_USB_GADGETFS is not set | ||
| 1098 | # CONFIG_USB_FILE_STORAGE is not set | ||
| 1099 | # CONFIG_USB_G_SERIAL is not set | ||
| 1100 | # CONFIG_USB_MIDI_GADGET is not set | ||
| 1101 | # CONFIG_USB_G_PRINTER is not set | ||
| 1102 | # CONFIG_USB_CDC_COMPOSITE is not set | ||
| 1103 | |||
| 1104 | # | ||
| 1105 | # OTG and related infrastructure | ||
| 1106 | # | ||
| 1107 | CONFIG_USB_OTG_UTILS=y | ||
| 1108 | # CONFIG_USB_GPIO_VBUS is not set | ||
| 1109 | # CONFIG_ISP1301_OMAP is not set | ||
| 1110 | CONFIG_TWL4030_USB=y | ||
| 1111 | # CONFIG_NOP_USB_XCEIV is not set | ||
| 1112 | CONFIG_MMC=y | ||
| 1113 | # CONFIG_MMC_DEBUG is not set | ||
| 1114 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 1115 | |||
| 1116 | # | ||
| 1117 | # MMC/SD/SDIO Card Drivers | ||
| 1118 | # | ||
| 1119 | CONFIG_MMC_BLOCK=y | ||
| 1120 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 1121 | # CONFIG_SDIO_UART is not set | ||
| 1122 | # CONFIG_MMC_TEST is not set | ||
| 1123 | |||
| 1124 | # | ||
| 1125 | # MMC/SD/SDIO Host Controller Drivers | ||
| 1126 | # | ||
| 1127 | # CONFIG_MMC_SDHCI is not set | ||
| 1128 | # CONFIG_MMC_OMAP is not set | ||
| 1129 | CONFIG_MMC_OMAP_HS=m | ||
| 1130 | # CONFIG_MMC_SPI is not set | ||
| 1131 | # CONFIG_MEMSTICK is not set | ||
| 1132 | # CONFIG_ACCESSIBILITY is not set | ||
| 1133 | # CONFIG_NEW_LEDS is not set | ||
| 1134 | CONFIG_RTC_LIB=y | ||
| 1135 | # CONFIG_RTC_CLASS is not set | ||
| 1136 | # CONFIG_DMADEVICES is not set | ||
| 1137 | # CONFIG_AUXDISPLAY is not set | ||
| 1138 | CONFIG_REGULATOR=y | ||
| 1139 | # CONFIG_REGULATOR_DEBUG is not set | ||
| 1140 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set | ||
| 1141 | # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set | ||
| 1142 | # CONFIG_REGULATOR_BQ24022 is not set | ||
| 1143 | CONFIG_REGULATOR_TWL4030=y | ||
| 1144 | # CONFIG_UIO is not set | ||
| 1145 | # CONFIG_STAGING is not set | ||
| 1146 | |||
| 1147 | # | ||
| 1148 | # File systems | ||
| 1149 | # | ||
| 1150 | CONFIG_EXT2_FS=y | ||
| 1151 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 1152 | # CONFIG_EXT2_FS_XIP is not set | ||
| 1153 | CONFIG_EXT3_FS=y | ||
| 1154 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| 1155 | # CONFIG_EXT3_FS_XATTR is not set | ||
| 1156 | # CONFIG_EXT4_FS is not set | ||
| 1157 | CONFIG_JBD=y | ||
| 1158 | # CONFIG_REISERFS_FS is not set | ||
| 1159 | # CONFIG_JFS_FS is not set | ||
| 1160 | # CONFIG_FS_POSIX_ACL is not set | ||
| 1161 | CONFIG_FILE_LOCKING=y | ||
| 1162 | # CONFIG_XFS_FS is not set | ||
| 1163 | # CONFIG_OCFS2_FS is not set | ||
| 1164 | # CONFIG_BTRFS_FS is not set | ||
| 1165 | CONFIG_DNOTIFY=y | ||
| 1166 | CONFIG_INOTIFY=y | ||
| 1167 | CONFIG_INOTIFY_USER=y | ||
| 1168 | CONFIG_QUOTA=y | ||
| 1169 | # CONFIG_QUOTA_NETLINK_INTERFACE is not set | ||
| 1170 | CONFIG_PRINT_QUOTA_WARNING=y | ||
| 1171 | CONFIG_QUOTA_TREE=y | ||
| 1172 | # CONFIG_QFMT_V1 is not set | ||
| 1173 | CONFIG_QFMT_V2=y | ||
| 1174 | CONFIG_QUOTACTL=y | ||
| 1175 | # CONFIG_AUTOFS_FS is not set | ||
| 1176 | # CONFIG_AUTOFS4_FS is not set | ||
| 1177 | # CONFIG_FUSE_FS is not set | ||
| 1178 | |||
| 1179 | # | ||
| 1180 | # Caches | ||
| 1181 | # | ||
| 1182 | # CONFIG_FSCACHE is not set | ||
| 1183 | |||
| 1184 | # | ||
| 1185 | # CD-ROM/DVD Filesystems | ||
| 1186 | # | ||
| 1187 | # CONFIG_ISO9660_FS is not set | ||
| 1188 | # CONFIG_UDF_FS is not set | ||
| 1189 | |||
| 1190 | # | ||
| 1191 | # DOS/FAT/NT Filesystems | ||
| 1192 | # | ||
| 1193 | CONFIG_FAT_FS=y | ||
| 1194 | CONFIG_MSDOS_FS=y | ||
| 1195 | CONFIG_VFAT_FS=y | ||
| 1196 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 1197 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 1198 | # CONFIG_NTFS_FS is not set | ||
| 1199 | |||
| 1200 | # | ||
| 1201 | # Pseudo filesystems | ||
| 1202 | # | ||
| 1203 | CONFIG_PROC_FS=y | ||
| 1204 | CONFIG_PROC_SYSCTL=y | ||
| 1205 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 1206 | CONFIG_SYSFS=y | ||
| 1207 | CONFIG_TMPFS=y | ||
| 1208 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 1209 | # CONFIG_HUGETLB_PAGE is not set | ||
| 1210 | # CONFIG_CONFIGFS_FS is not set | ||
| 1211 | CONFIG_MISC_FILESYSTEMS=y | ||
| 1212 | # CONFIG_ADFS_FS is not set | ||
| 1213 | # CONFIG_AFFS_FS is not set | ||
| 1214 | # CONFIG_HFS_FS is not set | ||
| 1215 | # CONFIG_HFSPLUS_FS is not set | ||
| 1216 | # CONFIG_BEFS_FS is not set | ||
| 1217 | # CONFIG_BFS_FS is not set | ||
| 1218 | # CONFIG_EFS_FS is not set | ||
| 1219 | CONFIG_JFFS2_FS=y | ||
| 1220 | CONFIG_JFFS2_FS_DEBUG=0 | ||
| 1221 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
| 1222 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
| 1223 | # CONFIG_JFFS2_SUMMARY is not set | ||
| 1224 | # CONFIG_JFFS2_FS_XATTR is not set | ||
| 1225 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y | ||
| 1226 | CONFIG_JFFS2_ZLIB=y | ||
| 1227 | # CONFIG_JFFS2_LZO is not set | ||
| 1228 | CONFIG_JFFS2_RTIME=y | ||
| 1229 | # CONFIG_JFFS2_RUBIN is not set | ||
| 1230 | # CONFIG_JFFS2_CMODE_NONE is not set | ||
| 1231 | CONFIG_JFFS2_CMODE_PRIORITY=y | ||
| 1232 | # CONFIG_JFFS2_CMODE_SIZE is not set | ||
| 1233 | # CONFIG_JFFS2_CMODE_FAVOURLZO is not set | ||
| 1234 | # CONFIG_CRAMFS is not set | ||
| 1235 | # CONFIG_SQUASHFS is not set | ||
| 1236 | # CONFIG_VXFS_FS is not set | ||
| 1237 | # CONFIG_MINIX_FS is not set | ||
| 1238 | # CONFIG_OMFS_FS is not set | ||
| 1239 | # CONFIG_HPFS_FS is not set | ||
| 1240 | # CONFIG_QNX4FS_FS is not set | ||
| 1241 | # CONFIG_ROMFS_FS is not set | ||
| 1242 | # CONFIG_SYSV_FS is not set | ||
| 1243 | # CONFIG_UFS_FS is not set | ||
| 1244 | # CONFIG_NILFS2_FS is not set | ||
| 1245 | CONFIG_NETWORK_FILESYSTEMS=y | ||
| 1246 | CONFIG_NFS_FS=y | ||
| 1247 | CONFIG_NFS_V3=y | ||
| 1248 | # CONFIG_NFS_V3_ACL is not set | ||
| 1249 | CONFIG_NFS_V4=y | ||
| 1250 | CONFIG_ROOT_NFS=y | ||
| 1251 | # CONFIG_NFSD is not set | ||
| 1252 | CONFIG_LOCKD=y | ||
| 1253 | CONFIG_LOCKD_V4=y | ||
| 1254 | CONFIG_NFS_COMMON=y | ||
| 1255 | CONFIG_SUNRPC=y | ||
| 1256 | CONFIG_SUNRPC_GSS=y | ||
| 1257 | CONFIG_RPCSEC_GSS_KRB5=y | ||
| 1258 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1259 | # CONFIG_SMB_FS is not set | ||
| 1260 | # CONFIG_CIFS is not set | ||
| 1261 | # CONFIG_NCP_FS is not set | ||
| 1262 | # CONFIG_CODA_FS is not set | ||
| 1263 | # CONFIG_AFS_FS is not set | ||
| 1264 | |||
| 1265 | # | ||
| 1266 | # Partition Types | ||
| 1267 | # | ||
| 1268 | CONFIG_PARTITION_ADVANCED=y | ||
| 1269 | # CONFIG_ACORN_PARTITION is not set | ||
| 1270 | # CONFIG_OSF_PARTITION is not set | ||
| 1271 | # CONFIG_AMIGA_PARTITION is not set | ||
| 1272 | # CONFIG_ATARI_PARTITION is not set | ||
| 1273 | # CONFIG_MAC_PARTITION is not set | ||
| 1274 | CONFIG_MSDOS_PARTITION=y | ||
| 1275 | # CONFIG_BSD_DISKLABEL is not set | ||
| 1276 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 1277 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 1278 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 1279 | # CONFIG_LDM_PARTITION is not set | ||
| 1280 | # CONFIG_SGI_PARTITION is not set | ||
| 1281 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 1282 | # CONFIG_SUN_PARTITION is not set | ||
| 1283 | # CONFIG_KARMA_PARTITION is not set | ||
| 1284 | # CONFIG_EFI_PARTITION is not set | ||
| 1285 | # CONFIG_SYSV68_PARTITION is not set | ||
| 1286 | CONFIG_NLS=y | ||
| 1287 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 1288 | CONFIG_NLS_CODEPAGE_437=y | ||
| 1289 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 1290 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 1291 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 1292 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 1293 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 1294 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 1295 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 1296 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 1297 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 1298 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 1299 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 1300 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 1301 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 1302 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 1303 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 1304 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 1305 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 1306 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 1307 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 1308 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 1309 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 1310 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 1311 | # CONFIG_NLS_ASCII is not set | ||
| 1312 | CONFIG_NLS_ISO8859_1=y | ||
| 1313 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 1314 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1315 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1316 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 1317 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1318 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1319 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1320 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1321 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1322 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 1323 | # CONFIG_NLS_KOI8_R is not set | ||
| 1324 | # CONFIG_NLS_KOI8_U is not set | ||
| 1325 | # CONFIG_NLS_UTF8 is not set | ||
| 1326 | # CONFIG_DLM is not set | ||
| 1327 | |||
| 1328 | # | ||
| 1329 | # Kernel hacking | ||
| 1330 | # | ||
| 1331 | # CONFIG_PRINTK_TIME is not set | ||
| 1332 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1333 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1334 | CONFIG_FRAME_WARN=1024 | ||
| 1335 | CONFIG_MAGIC_SYSRQ=y | ||
| 1336 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1337 | # CONFIG_DEBUG_FS is not set | ||
| 1338 | # CONFIG_HEADERS_CHECK is not set | ||
| 1339 | CONFIG_DEBUG_KERNEL=y | ||
| 1340 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1341 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 1342 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1343 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1344 | CONFIG_DETECT_HUNG_TASK=y | ||
| 1345 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
| 1346 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
| 1347 | # CONFIG_SCHED_DEBUG is not set | ||
| 1348 | # CONFIG_SCHEDSTATS is not set | ||
| 1349 | # CONFIG_TIMER_STATS is not set | ||
| 1350 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1351 | # CONFIG_DEBUG_SLAB is not set | ||
| 1352 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1353 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1354 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 1355 | CONFIG_DEBUG_MUTEXES=y | ||
| 1356 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1357 | # CONFIG_PROVE_LOCKING is not set | ||
| 1358 | # CONFIG_LOCK_STAT is not set | ||
| 1359 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1360 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1361 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 1362 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 1363 | CONFIG_DEBUG_INFO=y | ||
| 1364 | # CONFIG_DEBUG_VM is not set | ||
| 1365 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1366 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1367 | # CONFIG_DEBUG_LIST is not set | ||
| 1368 | # CONFIG_DEBUG_SG is not set | ||
| 1369 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
| 1370 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 1371 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1372 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1373 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1374 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 1375 | # CONFIG_FAULT_INJECTION is not set | ||
| 1376 | # CONFIG_LATENCYTOP is not set | ||
| 1377 | # CONFIG_PAGE_POISONING is not set | ||
| 1378 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
| 1379 | CONFIG_TRACING_SUPPORT=y | ||
| 1380 | |||
| 1381 | # | ||
| 1382 | # Tracers | ||
| 1383 | # | ||
| 1384 | # CONFIG_FUNCTION_TRACER is not set | ||
| 1385 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 1386 | # CONFIG_SCHED_TRACER is not set | ||
| 1387 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1388 | # CONFIG_EVENT_TRACER is not set | ||
| 1389 | # CONFIG_BOOT_TRACER is not set | ||
| 1390 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
| 1391 | # CONFIG_STACK_TRACER is not set | ||
| 1392 | # CONFIG_KMEMTRACE is not set | ||
| 1393 | # CONFIG_WORKQUEUE_TRACER is not set | ||
| 1394 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 1395 | # CONFIG_SAMPLES is not set | ||
| 1396 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1397 | # CONFIG_KGDB is not set | ||
| 1398 | CONFIG_ARM_UNWIND=y | ||
| 1399 | # CONFIG_DEBUG_USER is not set | ||
| 1400 | # CONFIG_DEBUG_ERRORS is not set | ||
| 1401 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
| 1402 | CONFIG_DEBUG_LL=y | ||
| 1403 | # CONFIG_DEBUG_ICEDCC is not set | ||
| 1404 | |||
| 1405 | # | ||
| 1406 | # Security options | ||
| 1407 | # | ||
| 1408 | # CONFIG_KEYS is not set | ||
| 1409 | # CONFIG_SECURITY is not set | ||
| 1410 | # CONFIG_SECURITYFS is not set | ||
| 1411 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1412 | CONFIG_CRYPTO=y | ||
| 1413 | |||
| 1414 | # | ||
| 1415 | # Crypto core or helper | ||
| 1416 | # | ||
| 1417 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1418 | CONFIG_CRYPTO_ALGAPI=y | ||
| 1419 | CONFIG_CRYPTO_ALGAPI2=y | ||
| 1420 | CONFIG_CRYPTO_AEAD2=y | ||
| 1421 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 1422 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
| 1423 | CONFIG_CRYPTO_HASH=y | ||
| 1424 | CONFIG_CRYPTO_HASH2=y | ||
| 1425 | CONFIG_CRYPTO_RNG2=y | ||
| 1426 | CONFIG_CRYPTO_PCOMP=y | ||
| 1427 | CONFIG_CRYPTO_MANAGER=y | ||
| 1428 | CONFIG_CRYPTO_MANAGER2=y | ||
| 1429 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1430 | # CONFIG_CRYPTO_NULL is not set | ||
| 1431 | CONFIG_CRYPTO_WORKQUEUE=y | ||
| 1432 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1433 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1434 | # CONFIG_CRYPTO_TEST is not set | ||
| 1435 | |||
| 1436 | # | ||
| 1437 | # Authenticated Encryption with Associated Data | ||
| 1438 | # | ||
| 1439 | # CONFIG_CRYPTO_CCM is not set | ||
| 1440 | # CONFIG_CRYPTO_GCM is not set | ||
| 1441 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1442 | |||
| 1443 | # | ||
| 1444 | # Block modes | ||
| 1445 | # | ||
| 1446 | CONFIG_CRYPTO_CBC=y | ||
| 1447 | # CONFIG_CRYPTO_CTR is not set | ||
| 1448 | # CONFIG_CRYPTO_CTS is not set | ||
| 1449 | CONFIG_CRYPTO_ECB=m | ||
| 1450 | # CONFIG_CRYPTO_LRW is not set | ||
| 1451 | CONFIG_CRYPTO_PCBC=m | ||
| 1452 | # CONFIG_CRYPTO_XTS is not set | ||
| 1453 | |||
| 1454 | # | ||
| 1455 | # Hash modes | ||
| 1456 | # | ||
| 1457 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1458 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1459 | |||
| 1460 | # | ||
| 1461 | # Digest | ||
| 1462 | # | ||
| 1463 | CONFIG_CRYPTO_CRC32C=y | ||
| 1464 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1465 | CONFIG_CRYPTO_MD5=y | ||
| 1466 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1467 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1468 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1469 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1470 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1471 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 1472 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1473 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1474 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1475 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1476 | |||
| 1477 | # | ||
| 1478 | # Ciphers | ||
| 1479 | # | ||
| 1480 | # CONFIG_CRYPTO_AES is not set | ||
| 1481 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1482 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1483 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1484 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1485 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1486 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1487 | CONFIG_CRYPTO_DES=y | ||
| 1488 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1489 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1490 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 1491 | # CONFIG_CRYPTO_SEED is not set | ||
| 1492 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1493 | # CONFIG_CRYPTO_TEA is not set | ||
| 1494 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1495 | |||
| 1496 | # | ||
| 1497 | # Compression | ||
| 1498 | # | ||
| 1499 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1500 | # CONFIG_CRYPTO_ZLIB is not set | ||
| 1501 | # CONFIG_CRYPTO_LZO is not set | ||
| 1502 | |||
| 1503 | # | ||
| 1504 | # Random Number Generation | ||
| 1505 | # | ||
| 1506 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1507 | CONFIG_CRYPTO_HW=y | ||
| 1508 | # CONFIG_BINARY_PRINTF is not set | ||
| 1509 | |||
| 1510 | # | ||
| 1511 | # Library routines | ||
| 1512 | # | ||
| 1513 | CONFIG_BITREVERSE=y | ||
| 1514 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 1515 | CONFIG_CRC_CCITT=y | ||
| 1516 | # CONFIG_CRC16 is not set | ||
| 1517 | # CONFIG_CRC_T10DIF is not set | ||
| 1518 | # CONFIG_CRC_ITU_T is not set | ||
| 1519 | CONFIG_CRC32=y | ||
| 1520 | # CONFIG_CRC7 is not set | ||
| 1521 | CONFIG_LIBCRC32C=y | ||
| 1522 | CONFIG_ZLIB_INFLATE=y | ||
| 1523 | CONFIG_ZLIB_DEFLATE=y | ||
| 1524 | CONFIG_DECOMPRESS_GZIP=y | ||
| 1525 | CONFIG_HAS_IOMEM=y | ||
| 1526 | CONFIG_HAS_IOPORT=y | ||
| 1527 | CONFIG_HAS_DMA=y | ||
| 1528 | CONFIG_NLATTR=y | ||
diff --git a/arch/arm/configs/omap_4430sdp_defconfig b/arch/arm/configs/omap_4430sdp_defconfig new file mode 100644 index 000000000000..67a3a770cc2f --- /dev/null +++ b/arch/arm/configs/omap_4430sdp_defconfig | |||
| @@ -0,0 +1,806 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.29 | ||
| 4 | # Fri April 19 19:58:24 20089 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 16 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 17 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 18 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 19 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 20 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 23 | CONFIG_GENERIC_HWEIGHT=y | ||
| 24 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 25 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
| 26 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 27 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 28 | |||
| 29 | # | ||
| 30 | # General setup | ||
| 31 | # | ||
| 32 | CONFIG_EXPERIMENTAL=y | ||
| 33 | CONFIG_BROKEN_ON_SMP=y | ||
| 34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 35 | CONFIG_LOCALVERSION="" | ||
| 36 | CONFIG_LOCALVERSION_AUTO=y | ||
| 37 | CONFIG_SWAP=y | ||
| 38 | CONFIG_SYSVIPC=y | ||
| 39 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 40 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 41 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 42 | |||
| 43 | # | ||
| 44 | # RCU Subsystem | ||
| 45 | # | ||
| 46 | CONFIG_CLASSIC_RCU=y | ||
| 47 | # CONFIG_TREE_RCU is not set | ||
| 48 | # CONFIG_PREEMPT_RCU is not set | ||
| 49 | # CONFIG_TREE_RCU_TRACE is not set | ||
| 50 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
| 51 | # CONFIG_IKCONFIG is not set | ||
| 52 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 53 | CONFIG_GROUP_SCHED=y | ||
| 54 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 55 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 56 | CONFIG_USER_SCHED=y | ||
| 57 | # CONFIG_CGROUP_SCHED is not set | ||
| 58 | # CONFIG_CGROUPS is not set | ||
| 59 | CONFIG_SYSFS_DEPRECATED=y | ||
| 60 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 61 | # CONFIG_RELAY is not set | ||
| 62 | # CONFIG_NAMESPACES is not set | ||
| 63 | CONFIG_BLK_DEV_INITRD=y | ||
| 64 | CONFIG_INITRAMFS_SOURCE="" | ||
| 65 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 66 | CONFIG_SYSCTL=y | ||
| 67 | CONFIG_ANON_INODES=y | ||
| 68 | CONFIG_EMBEDDED=y | ||
| 69 | CONFIG_UID16=y | ||
| 70 | # CONFIG_SYSCTL_SYSCALL is not set | ||
| 71 | CONFIG_KALLSYMS=y | ||
| 72 | # CONFIG_KALLSYMS_ALL is not set | ||
| 73 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 74 | CONFIG_HOTPLUG=y | ||
| 75 | CONFIG_PRINTK=y | ||
| 76 | CONFIG_BUG=y | ||
| 77 | # CONFIG_ELF_CORE is not set | ||
| 78 | CONFIG_BASE_FULL=y | ||
| 79 | CONFIG_FUTEX=y | ||
| 80 | CONFIG_EPOLL=y | ||
| 81 | CONFIG_SIGNALFD=y | ||
| 82 | CONFIG_TIMERFD=y | ||
| 83 | CONFIG_EVENTFD=y | ||
| 84 | CONFIG_SHMEM=y | ||
| 85 | CONFIG_AIO=y | ||
| 86 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 87 | CONFIG_COMPAT_BRK=y | ||
| 88 | # CONFIG_SLAB is not set | ||
| 89 | # CONFIG_SLUB is not set | ||
| 90 | # CONFIG_SLOB is not set | ||
| 91 | # CONFIG_PROFILING is not set | ||
| 92 | CONFIG_HAVE_OPROFILE=y | ||
| 93 | # CONFIG_KPROBES is not set | ||
| 94 | CONFIG_HAVE_KPROBES=y | ||
| 95 | CONFIG_HAVE_KRETPROBES=y | ||
| 96 | CONFIG_HAVE_CLK=y | ||
| 97 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
| 98 | CONFIG_SLABINFO=y | ||
| 99 | CONFIG_RT_MUTEXES=y | ||
| 100 | CONFIG_BASE_SMALL=0 | ||
| 101 | CONFIG_MODULES=y | ||
| 102 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 103 | CONFIG_MODULE_UNLOAD=y | ||
| 104 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 105 | CONFIG_MODVERSIONS=y | ||
| 106 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 107 | CONFIG_BLOCK=y | ||
| 108 | # CONFIG_LBD is not set | ||
| 109 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 110 | # CONFIG_BLK_DEV_BSG is not set | ||
| 111 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 112 | |||
| 113 | # | ||
| 114 | # IO Schedulers | ||
| 115 | # | ||
| 116 | CONFIG_IOSCHED_NOOP=y | ||
| 117 | CONFIG_IOSCHED_AS=y | ||
| 118 | CONFIG_IOSCHED_DEADLINE=y | ||
| 119 | CONFIG_IOSCHED_CFQ=y | ||
| 120 | CONFIG_DEFAULT_AS=y | ||
| 121 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 122 | # CONFIG_DEFAULT_CFQ is not set | ||
| 123 | # CONFIG_DEFAULT_NOOP is not set | ||
| 124 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 125 | # CONFIG_FREEZER is not set | ||
| 126 | |||
| 127 | # | ||
| 128 | # System Type | ||
| 129 | # | ||
| 130 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 131 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 132 | # CONFIG_ARCH_REALVIEW is not set | ||
| 133 | # CONFIG_ARCH_VERSATILE is not set | ||
| 134 | # CONFIG_ARCH_AT91 is not set | ||
| 135 | # CONFIG_ARCH_CLPS711X is not set | ||
| 136 | # CONFIG_ARCH_EBSA110 is not set | ||
| 137 | # CONFIG_ARCH_EP93XX is not set | ||
| 138 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 139 | # CONFIG_ARCH_NETX is not set | ||
| 140 | # CONFIG_ARCH_H720X is not set | ||
| 141 | # CONFIG_ARCH_IMX is not set | ||
| 142 | # CONFIG_ARCH_IOP13XX is not set | ||
| 143 | # CONFIG_ARCH_IOP32X is not set | ||
| 144 | # CONFIG_ARCH_IOP33X is not set | ||
| 145 | # CONFIG_ARCH_IXP23XX is not set | ||
| 146 | # CONFIG_ARCH_IXP2000 is not set | ||
| 147 | # CONFIG_ARCH_IXP4XX is not set | ||
| 148 | # CONFIG_ARCH_L7200 is not set | ||
| 149 | # CONFIG_ARCH_KIRKWOOD is not set | ||
| 150 | # CONFIG_ARCH_KS8695 is not set | ||
| 151 | # CONFIG_ARCH_NS9XXX is not set | ||
| 152 | # CONFIG_ARCH_LOKI is not set | ||
| 153 | # CONFIG_ARCH_MV78XX0 is not set | ||
| 154 | # CONFIG_ARCH_MXC is not set | ||
| 155 | # CONFIG_ARCH_ORION5X is not set | ||
| 156 | # CONFIG_ARCH_PNX4008 is not set | ||
| 157 | # CONFIG_ARCH_PXA is not set | ||
| 158 | # CONFIG_ARCH_RPC is not set | ||
| 159 | # CONFIG_ARCH_SA1100 is not set | ||
| 160 | # CONFIG_ARCH_S3C2410 is not set | ||
| 161 | # CONFIG_ARCH_S3C64XX is not set | ||
| 162 | # CONFIG_ARCH_SHARK is not set | ||
| 163 | # CONFIG_ARCH_LH7A40X is not set | ||
| 164 | # CONFIG_ARCH_DAVINCI is not set | ||
| 165 | CONFIG_ARCH_OMAP=y | ||
| 166 | # CONFIG_ARCH_MSM is not set | ||
| 167 | # CONFIG_ARCH_W90X900 is not set | ||
| 168 | |||
| 169 | # | ||
| 170 | # TI OMAP Implementations | ||
| 171 | # | ||
| 172 | # CONFIG_ARCH_OMAP1 is not set | ||
| 173 | # CONFIG_ARCH_OMAP2 is not set | ||
| 174 | # CONFIG_ARCH_OMAP3 is not set | ||
| 175 | CONFIG_ARCH_OMAP4=y | ||
| 176 | |||
| 177 | # | ||
| 178 | # OMAP Feature Selections | ||
| 179 | # | ||
| 180 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
| 181 | # CONFIG_OMAP_COMPONENT_VERSION is not set | ||
| 182 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
| 183 | # CONFIG_OMAP_MUX is not set | ||
| 184 | # CONFIG_OMAP_MCBSP is not set | ||
| 185 | # CONFIG_OMAP_MBOX_FWK is not set | ||
| 186 | # CONFIG_OMAP_MPU_TIMER is not set | ||
| 187 | CONFIG_OMAP_32K_TIMER=y | ||
| 188 | CONFIG_OMAP_32K_TIMER_HZ=128 | ||
| 189 | CONFIG_OMAP_DM_TIMER=y | ||
| 190 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
| 191 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
| 192 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
| 193 | |||
| 194 | |||
| 195 | |||
| 196 | # | ||
| 197 | # OMAP Board Type | ||
| 198 | # | ||
| 199 | CONFIG_MACH_OMAP_4430SDP=y | ||
| 200 | |||
| 201 | # | ||
| 202 | # Processor Type | ||
| 203 | # | ||
| 204 | CONFIG_CPU_32=y | ||
| 205 | CONFIG_CPU_32v6K=y | ||
| 206 | CONFIG_CPU_V7=y | ||
| 207 | CONFIG_CPU_32v7=y | ||
| 208 | CONFIG_CPU_ABRT_EV7=y | ||
| 209 | CONFIG_CPU_PABRT_IFAR=y | ||
| 210 | CONFIG_CPU_CACHE_V7=y | ||
| 211 | CONFIG_CPU_CACHE_VIPT=y | ||
| 212 | CONFIG_CPU_COPY_V6=y | ||
| 213 | CONFIG_CPU_TLB_V7=y | ||
| 214 | CONFIG_CPU_HAS_ASID=y | ||
| 215 | CONFIG_CPU_CP15=y | ||
| 216 | CONFIG_CPU_CP15_MMU=y | ||
| 217 | |||
| 218 | # | ||
| 219 | # Processor Features | ||
| 220 | # | ||
| 221 | # CONFIG_ARM_THUMB is not set | ||
| 222 | # CONFIG_ARM_THUMBEE is not set | ||
| 223 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 224 | CONFIG_CPU_DCACHE_DISABLE=y | ||
| 225 | # CONFIG_CPU_BPREDICT_DISABLE is not set | ||
| 226 | CONFIG_HAS_TLS_REG=y | ||
| 227 | # CONFIG_OUTER_CACHE is not set | ||
| 228 | CONFIG_ARM_GIC=y | ||
| 229 | |||
| 230 | # | ||
| 231 | # Bus support | ||
| 232 | # | ||
| 233 | # CONFIG_PCI_SYSCALL is not set | ||
| 234 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 235 | # CONFIG_PCCARD is not set | ||
| 236 | |||
| 237 | # | ||
| 238 | # Kernel Features | ||
| 239 | # | ||
| 240 | # CONFIG_NO_HZ is not set | ||
| 241 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 242 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 243 | CONFIG_VMSPLIT_3G=y | ||
| 244 | # CONFIG_VMSPLIT_2G is not set | ||
| 245 | # CONFIG_VMSPLIT_1G is not set | ||
| 246 | CONFIG_PAGE_OFFSET=0xC0000000 | ||
| 247 | # CONFIG_PREEMPT is not set | ||
| 248 | CONFIG_HZ=128 | ||
| 249 | CONFIG_AEABI=y | ||
| 250 | # CONFIG_OABI_COMPAT is not set | ||
| 251 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y | ||
| 252 | # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set | ||
| 253 | # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set | ||
| 254 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 255 | CONFIG_FLATMEM_MANUAL=y | ||
| 256 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 257 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 258 | CONFIG_FLATMEM=y | ||
| 259 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 260 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 261 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 262 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 263 | CONFIG_ZONE_DMA_FLAG=0 | ||
| 264 | CONFIG_VIRT_TO_BUS=y | ||
| 265 | # CONFIG_UNEVICTABLE_LRU is not set | ||
| 266 | # CONFIG_LEDS is not set | ||
| 267 | CONFIG_ALIGNMENT_TRAP=y | ||
| 268 | |||
| 269 | # | ||
| 270 | # Boot options | ||
| 271 | # | ||
| 272 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 273 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 274 | CONFIG_CMDLINE="root=/dev/ram0 rw mem=128M console=ttyS0,115200n8 initrd=0x81600000,20M ramdisk_size=20480" | ||
| 275 | # CONFIG_XIP_KERNEL is not set | ||
| 276 | # CONFIG_KEXEC is not set | ||
| 277 | |||
| 278 | # | ||
| 279 | # CPU Power Management | ||
| 280 | # | ||
| 281 | # CONFIG_CPU_FREQ is not set | ||
| 282 | # CONFIG_CPU_IDLE is not set | ||
| 283 | |||
| 284 | # | ||
| 285 | # Floating point emulation | ||
| 286 | # | ||
| 287 | |||
| 288 | # | ||
| 289 | # At least one emulation must be selected | ||
| 290 | # | ||
| 291 | CONFIG_FPE_NWFPE=y | ||
| 292 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 293 | # CONFIG_FPE_FASTFPE is not set | ||
| 294 | CONFIG_VFP=y | ||
| 295 | CONFIG_VFPv3=y | ||
| 296 | # CONFIG_NEON is not set | ||
| 297 | |||
| 298 | # | ||
| 299 | # Userspace binary formats | ||
| 300 | # | ||
| 301 | CONFIG_BINFMT_ELF=y | ||
| 302 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 303 | CONFIG_HAVE_AOUT=y | ||
| 304 | # CONFIG_BINFMT_AOUT is not set | ||
| 305 | CONFIG_BINFMT_MISC=y | ||
| 306 | |||
| 307 | # | ||
| 308 | # Power management options | ||
| 309 | # | ||
| 310 | # CONFIG_PM is not set | ||
| 311 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 312 | # CONFIG_NET is not set | ||
| 313 | |||
| 314 | # | ||
| 315 | # Device Drivers | ||
| 316 | # | ||
| 317 | |||
| 318 | # | ||
| 319 | # Generic Driver Options | ||
| 320 | # | ||
| 321 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 322 | CONFIG_STANDALONE=y | ||
| 323 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 324 | # CONFIG_FW_LOADER is not set | ||
| 325 | # CONFIG_DEBUG_DRIVER is not set | ||
| 326 | # CONFIG_DEBUG_DEVRES is not set | ||
| 327 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 328 | # CONFIG_MTD is not set | ||
| 329 | # CONFIG_PARPORT is not set | ||
| 330 | CONFIG_BLK_DEV=y | ||
| 331 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 332 | CONFIG_BLK_DEV_LOOP=y | ||
| 333 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 334 | CONFIG_BLK_DEV_RAM=y | ||
| 335 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 336 | CONFIG_BLK_DEV_RAM_SIZE=16384 | ||
| 337 | # CONFIG_BLK_DEV_XIP is not set | ||
| 338 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 339 | # CONFIG_MISC_DEVICES is not set | ||
| 340 | CONFIG_HAVE_IDE=y | ||
| 341 | # CONFIG_IDE is not set | ||
| 342 | |||
| 343 | # | ||
| 344 | # SCSI device support | ||
| 345 | # | ||
| 346 | # CONFIG_RAID_ATTRS is not set | ||
| 347 | # CONFIG_SCSI is not set | ||
| 348 | # CONFIG_SCSI_DMA is not set | ||
| 349 | # CONFIG_SCSI_NETLINK is not set | ||
| 350 | # CONFIG_ATA is not set | ||
| 351 | # CONFIG_MD is not set | ||
| 352 | |||
| 353 | # | ||
| 354 | # Input device support | ||
| 355 | # | ||
| 356 | CONFIG_INPUT=y | ||
| 357 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 358 | # CONFIG_INPUT_POLLDEV is not set | ||
| 359 | |||
| 360 | # | ||
| 361 | # Userland interfaces | ||
| 362 | # | ||
| 363 | # CONFIG_INPUT_MOUSEDEV is not set | ||
| 364 | # CONFIG_INPUT_JOYDEV is not set | ||
| 365 | CONFIG_INPUT_EVDEV=y | ||
| 366 | # CONFIG_INPUT_EVBUG is not set | ||
| 367 | |||
| 368 | # | ||
| 369 | # Input Device Drivers | ||
| 370 | # | ||
| 371 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 372 | # CONFIG_INPUT_MOUSE is not set | ||
| 373 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 374 | # CONFIG_INPUT_TABLET is not set | ||
| 375 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 376 | # CONFIG_INPUT_MISC is not set | ||
| 377 | |||
| 378 | # | ||
| 379 | # Hardware I/O ports | ||
| 380 | # | ||
| 381 | # CONFIG_SERIO is not set | ||
| 382 | # CONFIG_GAMEPORT is not set | ||
| 383 | |||
| 384 | # | ||
| 385 | # Character devices | ||
| 386 | # | ||
| 387 | CONFIG_VT=y | ||
| 388 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 389 | CONFIG_VT_CONSOLE=y | ||
| 390 | CONFIG_HW_CONSOLE=y | ||
| 391 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 392 | CONFIG_DEVKMEM=y | ||
| 393 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 394 | |||
| 395 | # | ||
| 396 | # Serial drivers | ||
| 397 | # | ||
| 398 | CONFIG_SERIAL_8250=y | ||
| 399 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 400 | CONFIG_SERIAL_8250_NR_UARTS=32 | ||
| 401 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 402 | CONFIG_SERIAL_8250_EXTENDED=y | ||
| 403 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
| 404 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
| 405 | CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
| 406 | CONFIG_SERIAL_8250_RSA=y | ||
| 407 | |||
| 408 | # | ||
| 409 | # Non-8250 serial port support | ||
| 410 | # | ||
| 411 | CONFIG_SERIAL_CORE=y | ||
| 412 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 413 | CONFIG_UNIX98_PTYS=y | ||
| 414 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
| 415 | # CONFIG_LEGACY_PTYS is not set | ||
| 416 | # CONFIG_IPMI_HANDLER is not set | ||
| 417 | CONFIG_HW_RANDOM=y | ||
| 418 | # CONFIG_R3964 is not set | ||
| 419 | # CONFIG_RAW_DRIVER is not set | ||
| 420 | # CONFIG_TCG_TPM is not set | ||
| 421 | # CONFIG_I2C is not set | ||
| 422 | # CONFIG_SPI is not set | ||
| 423 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
| 424 | CONFIG_GPIOLIB=y | ||
| 425 | # CONFIG_DEBUG_GPIO is not set | ||
| 426 | # CONFIG_GPIO_SYSFS is not set | ||
| 427 | |||
| 428 | # | ||
| 429 | # Memory mapped GPIO expanders: | ||
| 430 | # | ||
| 431 | |||
| 432 | # | ||
| 433 | # I2C GPIO expanders: | ||
| 434 | # | ||
| 435 | |||
| 436 | # | ||
| 437 | # PCI GPIO expanders: | ||
| 438 | # | ||
| 439 | |||
| 440 | # | ||
| 441 | # SPI GPIO expanders: | ||
| 442 | # | ||
| 443 | # CONFIG_W1 is not set | ||
| 444 | # CONFIG_POWER_SUPPLY is not set | ||
| 445 | # CONFIG_HWMON is not set | ||
| 446 | # CONFIG_THERMAL is not set | ||
| 447 | # CONFIG_THERMAL_HWMON is not set | ||
| 448 | # CONFIG_WATCHDOG is not set | ||
| 449 | CONFIG_SSB_POSSIBLE=y | ||
| 450 | |||
| 451 | # | ||
| 452 | # Sonics Silicon Backplane | ||
| 453 | # | ||
| 454 | # CONFIG_SSB is not set | ||
| 455 | |||
| 456 | # | ||
| 457 | # Multifunction device drivers | ||
| 458 | # | ||
| 459 | # CONFIG_MFD_CORE is not set | ||
| 460 | # CONFIG_MFD_SM501 is not set | ||
| 461 | # CONFIG_MFD_ASIC3 is not set | ||
| 462 | # CONFIG_HTC_EGPIO is not set | ||
| 463 | # CONFIG_HTC_PASIC3 is not set | ||
| 464 | # CONFIG_MFD_TMIO is not set | ||
| 465 | # CONFIG_MFD_T7L66XB is not set | ||
| 466 | # CONFIG_MFD_TC6387XB is not set | ||
| 467 | # CONFIG_MFD_TC6393XB is not set | ||
| 468 | |||
| 469 | # | ||
| 470 | # Multimedia devices | ||
| 471 | # | ||
| 472 | |||
| 473 | # | ||
| 474 | # Multimedia core support | ||
| 475 | # | ||
| 476 | # CONFIG_VIDEO_DEV is not set | ||
| 477 | # CONFIG_VIDEO_MEDIA is not set | ||
| 478 | |||
| 479 | # | ||
| 480 | # Multimedia drivers | ||
| 481 | # | ||
| 482 | CONFIG_DAB=y | ||
| 483 | |||
| 484 | # | ||
| 485 | # Graphics support | ||
| 486 | # | ||
| 487 | # CONFIG_VGASTATE is not set | ||
| 488 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 489 | # CONFIG_FB is not set | ||
| 490 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 491 | |||
| 492 | # | ||
| 493 | # Display device support | ||
| 494 | # | ||
| 495 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 496 | |||
| 497 | # | ||
| 498 | # Console display driver support | ||
| 499 | # | ||
| 500 | # CONFIG_VGA_CONSOLE is not set | ||
| 501 | CONFIG_DUMMY_CONSOLE=y | ||
| 502 | # CONFIG_SOUND is not set | ||
| 503 | # CONFIG_HID_SUPPORT is not set | ||
| 504 | # CONFIG_USB_SUPPORT is not set | ||
| 505 | # CONFIG_MMC is not set | ||
| 506 | # CONFIG_MEMSTICK is not set | ||
| 507 | # CONFIG_ACCESSIBILITY is not set | ||
| 508 | # CONFIG_NEW_LEDS is not set | ||
| 509 | CONFIG_RTC_LIB=y | ||
| 510 | # CONFIG_RTC_CLASS is not set | ||
| 511 | # CONFIG_DMADEVICES is not set | ||
| 512 | # CONFIG_REGULATOR is not set | ||
| 513 | # CONFIG_UIO is not set | ||
| 514 | # CONFIG_STAGING is not set | ||
| 515 | |||
| 516 | # | ||
| 517 | # CBUS support | ||
| 518 | # | ||
| 519 | # CONFIG_CBUS is not set | ||
| 520 | |||
| 521 | # | ||
| 522 | # File systems | ||
| 523 | # | ||
| 524 | CONFIG_EXT2_FS=y | ||
| 525 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 526 | # CONFIG_EXT2_FS_XIP is not set | ||
| 527 | CONFIG_EXT3_FS=y | ||
| 528 | # CONFIG_EXT3_FS_XATTR is not set | ||
| 529 | # CONFIG_EXT4_FS is not set | ||
| 530 | CONFIG_JBD=y | ||
| 531 | # CONFIG_REISERFS_FS is not set | ||
| 532 | # CONFIG_JFS_FS is not set | ||
| 533 | # CONFIG_FS_POSIX_ACL is not set | ||
| 534 | CONFIG_FILE_LOCKING=y | ||
| 535 | # CONFIG_XFS_FS is not set | ||
| 536 | # CONFIG_BTRFS_FS is not set | ||
| 537 | CONFIG_DNOTIFY=y | ||
| 538 | CONFIG_INOTIFY=y | ||
| 539 | CONFIG_INOTIFY_USER=y | ||
| 540 | CONFIG_QUOTA=y | ||
| 541 | CONFIG_PRINT_QUOTA_WARNING=y | ||
| 542 | CONFIG_QUOTA_TREE=y | ||
| 543 | # CONFIG_QFMT_V1 is not set | ||
| 544 | CONFIG_QFMT_V2=y | ||
| 545 | CONFIG_QUOTACTL=y | ||
| 546 | # CONFIG_AUTOFS_FS is not set | ||
| 547 | # CONFIG_AUTOFS4_FS is not set | ||
| 548 | # CONFIG_FUSE_FS is not set | ||
| 549 | |||
| 550 | # | ||
| 551 | # CD-ROM/DVD Filesystems | ||
| 552 | # | ||
| 553 | # CONFIG_ISO9660_FS is not set | ||
| 554 | # CONFIG_UDF_FS is not set | ||
| 555 | |||
| 556 | # | ||
| 557 | # DOS/FAT/NT Filesystems | ||
| 558 | # | ||
| 559 | CONFIG_FAT_FS=y | ||
| 560 | CONFIG_MSDOS_FS=y | ||
| 561 | CONFIG_VFAT_FS=y | ||
| 562 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 563 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 564 | # CONFIG_NTFS_FS is not set | ||
| 565 | |||
| 566 | # | ||
| 567 | # Pseudo filesystems | ||
| 568 | # | ||
| 569 | CONFIG_PROC_FS=y | ||
| 570 | CONFIG_PROC_SYSCTL=y | ||
| 571 | CONFIG_SYSFS=y | ||
| 572 | CONFIG_TMPFS=y | ||
| 573 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 574 | # CONFIG_HUGETLB_PAGE is not set | ||
| 575 | # CONFIG_CONFIGFS_FS is not set | ||
| 576 | CONFIG_MISC_FILESYSTEMS=y | ||
| 577 | # CONFIG_ADFS_FS is not set | ||
| 578 | # CONFIG_AFFS_FS is not set | ||
| 579 | # CONFIG_HFS_FS is not set | ||
| 580 | # CONFIG_HFSPLUS_FS is not set | ||
| 581 | # CONFIG_BEFS_FS is not set | ||
| 582 | # CONFIG_BFS_FS is not set | ||
| 583 | # CONFIG_EFS_FS is not set | ||
| 584 | # CONFIG_CRAMFS is not set | ||
| 585 | # CONFIG_SQUASHFS is not set | ||
| 586 | # CONFIG_VXFS_FS is not set | ||
| 587 | # CONFIG_MINIX_FS is not set | ||
| 588 | # CONFIG_OMFS_FS is not set | ||
| 589 | # CONFIG_HPFS_FS is not set | ||
| 590 | # CONFIG_QNX4FS_FS is not set | ||
| 591 | # CONFIG_ROMFS_FS is not set | ||
| 592 | # CONFIG_SYSV_FS is not set | ||
| 593 | # CONFIG_UFS_FS is not set | ||
| 594 | |||
| 595 | # | ||
| 596 | # Partition Types | ||
| 597 | # | ||
| 598 | CONFIG_PARTITION_ADVANCED=y | ||
| 599 | # CONFIG_ACORN_PARTITION is not set | ||
| 600 | # CONFIG_OSF_PARTITION is not set | ||
| 601 | # CONFIG_AMIGA_PARTITION is not set | ||
| 602 | # CONFIG_ATARI_PARTITION is not set | ||
| 603 | # CONFIG_MAC_PARTITION is not set | ||
| 604 | CONFIG_MSDOS_PARTITION=y | ||
| 605 | # CONFIG_BSD_DISKLABEL is not set | ||
| 606 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 607 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 608 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 609 | # CONFIG_LDM_PARTITION is not set | ||
| 610 | # CONFIG_SGI_PARTITION is not set | ||
| 611 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 612 | # CONFIG_SUN_PARTITION is not set | ||
| 613 | # CONFIG_KARMA_PARTITION is not set | ||
| 614 | # CONFIG_EFI_PARTITION is not set | ||
| 615 | # CONFIG_SYSV68_PARTITION is not set | ||
| 616 | CONFIG_NLS=y | ||
| 617 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 618 | CONFIG_NLS_CODEPAGE_437=y | ||
| 619 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 620 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 621 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 622 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 623 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 624 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 625 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 626 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 627 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 628 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 629 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 630 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 631 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 632 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 633 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 634 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 635 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 636 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 637 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 638 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 639 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 640 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 641 | # CONFIG_NLS_ASCII is not set | ||
| 642 | CONFIG_NLS_ISO8859_1=y | ||
| 643 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 644 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 645 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 646 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 647 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 648 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 649 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 650 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 651 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 652 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 653 | # CONFIG_NLS_KOI8_R is not set | ||
| 654 | # CONFIG_NLS_KOI8_U is not set | ||
| 655 | # CONFIG_NLS_UTF8 is not set | ||
| 656 | |||
| 657 | # | ||
| 658 | # Kernel hacking | ||
| 659 | # | ||
| 660 | # CONFIG_PRINTK_TIME is not set | ||
| 661 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | ||
| 662 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
| 663 | CONFIG_FRAME_WARN=1024 | ||
| 664 | CONFIG_MAGIC_SYSRQ=y | ||
| 665 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 666 | # CONFIG_DEBUG_FS is not set | ||
| 667 | # CONFIG_HEADERS_CHECK is not set | ||
| 668 | CONFIG_DEBUG_KERNEL=y | ||
| 669 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 670 | CONFIG_DEBUG_INFO=y | ||
| 671 | # CONFIG_DEBUG_VM is not set | ||
| 672 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 673 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 674 | CONFIG_FRAME_POINTER=y | ||
| 675 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 676 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 677 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 678 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 679 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 680 | # CONFIG_FAULT_INJECTION is not set | ||
| 681 | # CONFIG_LATENCYTOP is not set | ||
| 682 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
| 683 | |||
| 684 | # | ||
| 685 | # Tracers | ||
| 686 | # | ||
| 687 | # CONFIG_FUNCTION_TRACER is not set | ||
| 688 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 689 | # CONFIG_SCHED_TRACER is not set | ||
| 690 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 691 | # CONFIG_BOOT_TRACER is not set | ||
| 692 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
| 693 | # CONFIG_STACK_TRACER is not set | ||
| 694 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 695 | # CONFIG_SAMPLES is not set | ||
| 696 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 697 | # CONFIG_KGDB is not set | ||
| 698 | # CONFIG_DEBUG_USER is not set | ||
| 699 | # CONFIG_DEBUG_ERRORS is not set | ||
| 700 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
| 701 | # CONFIG_DEBUG_ICEDCC is not set | ||
| 702 | |||
| 703 | # | ||
| 704 | # Security options | ||
| 705 | # | ||
| 706 | # CONFIG_KEYS is not set | ||
| 707 | # CONFIG_SECURITY is not set | ||
| 708 | # CONFIG_SECURITYFS is not set | ||
| 709 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 710 | CONFIG_CRYPTO=y | ||
| 711 | |||
| 712 | # | ||
| 713 | # Crypto core or helper | ||
| 714 | # | ||
| 715 | CONFIG_CRYPTO_ALGAPI=y | ||
| 716 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 717 | CONFIG_CRYPTO_MANAGER=y | ||
| 718 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 719 | # CONFIG_CRYPTO_NULL is not set | ||
| 720 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 721 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 722 | # CONFIG_CRYPTO_TEST is not set | ||
| 723 | |||
| 724 | # | ||
| 725 | # Authenticated Encryption with Associated Data | ||
| 726 | # | ||
| 727 | # CONFIG_CRYPTO_CCM is not set | ||
| 728 | # CONFIG_CRYPTO_GCM is not set | ||
| 729 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 730 | |||
| 731 | # | ||
| 732 | # Block modes | ||
| 733 | # | ||
| 734 | CONFIG_CRYPTO_CBC=y | ||
| 735 | # CONFIG_CRYPTO_CTR is not set | ||
| 736 | # CONFIG_CRYPTO_CTS is not set | ||
| 737 | CONFIG_CRYPTO_ECB=m | ||
| 738 | # CONFIG_CRYPTO_LRW is not set | ||
| 739 | CONFIG_CRYPTO_PCBC=m | ||
| 740 | # CONFIG_CRYPTO_XTS is not set | ||
| 741 | |||
| 742 | # | ||
| 743 | # Hash modes | ||
| 744 | # | ||
| 745 | # CONFIG_CRYPTO_HMAC is not set | ||
| 746 | # CONFIG_CRYPTO_XCBC is not set | ||
| 747 | |||
| 748 | # | ||
| 749 | # Digest | ||
| 750 | # | ||
| 751 | CONFIG_CRYPTO_CRC32C=y | ||
| 752 | # CONFIG_CRYPTO_MD4 is not set | ||
| 753 | CONFIG_CRYPTO_MD5=y | ||
| 754 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 755 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 756 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 757 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 758 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 759 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 760 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 761 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 762 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 763 | # CONFIG_CRYPTO_WP512 is not set | ||
| 764 | |||
| 765 | # | ||
| 766 | # Ciphers | ||
| 767 | # | ||
| 768 | # CONFIG_CRYPTO_AES is not set | ||
| 769 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 770 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 771 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 772 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 773 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 774 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 775 | CONFIG_CRYPTO_DES=y | ||
| 776 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 777 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 778 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 779 | # CONFIG_CRYPTO_SEED is not set | ||
| 780 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 781 | # CONFIG_CRYPTO_TEA is not set | ||
| 782 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 783 | |||
| 784 | # | ||
| 785 | # Compression | ||
| 786 | # | ||
| 787 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 788 | # CONFIG_CRYPTO_LZO is not set | ||
| 789 | CONFIG_CRYPTO_HW=y | ||
| 790 | |||
| 791 | # | ||
| 792 | # Library routines | ||
| 793 | # | ||
| 794 | CONFIG_BITREVERSE=y | ||
| 795 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
| 796 | CONFIG_CRC_CCITT=y | ||
| 797 | # CONFIG_CRC16 is not set | ||
| 798 | CONFIG_CRC_T10DIF=y | ||
| 799 | # CONFIG_CRC_ITU_T is not set | ||
| 800 | CONFIG_CRC32=y | ||
| 801 | # CONFIG_CRC7 is not set | ||
| 802 | CONFIG_LIBCRC32C=y | ||
| 803 | CONFIG_PLIST=y | ||
| 804 | CONFIG_HAS_IOMEM=y | ||
| 805 | CONFIG_HAS_IOPORT=y | ||
| 806 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_zoom2_defconfig b/arch/arm/configs/omap_zoom2_defconfig new file mode 100644 index 000000000000..213fe9c5eaae --- /dev/null +++ b/arch/arm/configs/omap_zoom2_defconfig | |||
| @@ -0,0 +1,1211 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.27-rc5 | ||
| 4 | # Fri Oct 10 11:49:41 2008 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 16 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 17 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 18 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 19 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 20 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 23 | CONFIG_GENERIC_HWEIGHT=y | ||
| 24 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 25 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 26 | CONFIG_ZONE_DMA=y | ||
| 27 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
| 28 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 29 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 30 | |||
| 31 | # | ||
| 32 | # General setup | ||
| 33 | # | ||
| 34 | CONFIG_EXPERIMENTAL=y | ||
| 35 | CONFIG_BROKEN_ON_SMP=y | ||
| 36 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 37 | CONFIG_LOCALVERSION="" | ||
| 38 | CONFIG_LOCALVERSION_AUTO=y | ||
| 39 | CONFIG_SWAP=y | ||
| 40 | CONFIG_SYSVIPC=y | ||
| 41 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 42 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 43 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 44 | # CONFIG_IKCONFIG is not set | ||
| 45 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 46 | # CONFIG_CGROUPS is not set | ||
| 47 | CONFIG_GROUP_SCHED=y | ||
| 48 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 49 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 50 | CONFIG_USER_SCHED=y | ||
| 51 | # CONFIG_CGROUP_SCHED is not set | ||
| 52 | CONFIG_SYSFS_DEPRECATED=y | ||
| 53 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 54 | # CONFIG_RELAY is not set | ||
| 55 | # CONFIG_NAMESPACES is not set | ||
| 56 | CONFIG_BLK_DEV_INITRD=y | ||
| 57 | CONFIG_INITRAMFS_SOURCE="" | ||
| 58 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 59 | CONFIG_SYSCTL=y | ||
| 60 | CONFIG_EMBEDDED=y | ||
| 61 | CONFIG_UID16=y | ||
| 62 | # CONFIG_SYSCTL_SYSCALL is not set | ||
| 63 | CONFIG_KALLSYMS=y | ||
| 64 | # CONFIG_KALLSYMS_ALL is not set | ||
| 65 | CONFIG_KALLSYMS_EXTRA_PASS=y | ||
| 66 | CONFIG_HOTPLUG=y | ||
| 67 | CONFIG_PRINTK=y | ||
| 68 | CONFIG_BUG=y | ||
| 69 | CONFIG_ELF_CORE=y | ||
| 70 | CONFIG_COMPAT_BRK=y | ||
| 71 | CONFIG_BASE_FULL=y | ||
| 72 | CONFIG_FUTEX=y | ||
| 73 | CONFIG_ANON_INODES=y | ||
| 74 | CONFIG_EPOLL=y | ||
| 75 | CONFIG_SIGNALFD=y | ||
| 76 | CONFIG_TIMERFD=y | ||
| 77 | CONFIG_EVENTFD=y | ||
| 78 | CONFIG_SHMEM=y | ||
| 79 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 80 | CONFIG_SLAB=y | ||
| 81 | # CONFIG_SLUB is not set | ||
| 82 | # CONFIG_SLOB is not set | ||
| 83 | # CONFIG_PROFILING is not set | ||
| 84 | # CONFIG_MARKERS is not set | ||
| 85 | CONFIG_HAVE_OPROFILE=y | ||
| 86 | # CONFIG_KPROBES is not set | ||
| 87 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 88 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 89 | CONFIG_HAVE_KPROBES=y | ||
| 90 | CONFIG_HAVE_KRETPROBES=y | ||
| 91 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 92 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 93 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 94 | CONFIG_HAVE_CLK=y | ||
| 95 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 96 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
| 97 | CONFIG_SLABINFO=y | ||
| 98 | CONFIG_RT_MUTEXES=y | ||
| 99 | # CONFIG_TINY_SHMEM is not set | ||
| 100 | CONFIG_BASE_SMALL=0 | ||
| 101 | CONFIG_MODULES=y | ||
| 102 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 103 | CONFIG_MODULE_UNLOAD=y | ||
| 104 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 105 | CONFIG_MODVERSIONS=y | ||
| 106 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 107 | CONFIG_KMOD=y | ||
| 108 | CONFIG_BLOCK=y | ||
| 109 | # CONFIG_LBD is not set | ||
| 110 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 111 | # CONFIG_LSF is not set | ||
| 112 | # CONFIG_BLK_DEV_BSG is not set | ||
| 113 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 114 | |||
| 115 | # | ||
| 116 | # IO Schedulers | ||
| 117 | # | ||
| 118 | CONFIG_IOSCHED_NOOP=y | ||
| 119 | CONFIG_IOSCHED_AS=y | ||
| 120 | CONFIG_IOSCHED_DEADLINE=y | ||
| 121 | CONFIG_IOSCHED_CFQ=y | ||
| 122 | CONFIG_DEFAULT_AS=y | ||
| 123 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 124 | # CONFIG_DEFAULT_CFQ is not set | ||
| 125 | # CONFIG_DEFAULT_NOOP is not set | ||
| 126 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 127 | CONFIG_CLASSIC_RCU=y | ||
| 128 | |||
| 129 | # | ||
| 130 | # System Type | ||
| 131 | # | ||
| 132 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 133 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 134 | # CONFIG_ARCH_REALVIEW is not set | ||
| 135 | # CONFIG_ARCH_VERSATILE is not set | ||
| 136 | # CONFIG_ARCH_AT91 is not set | ||
| 137 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 138 | # CONFIG_ARCH_CLPS711X is not set | ||
| 139 | # CONFIG_ARCH_EBSA110 is not set | ||
| 140 | # CONFIG_ARCH_EP93XX is not set | ||
| 141 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 142 | # CONFIG_ARCH_NETX is not set | ||
| 143 | # CONFIG_ARCH_H720X is not set | ||
| 144 | # CONFIG_ARCH_IMX is not set | ||
| 145 | # CONFIG_ARCH_IOP13XX is not set | ||
| 146 | # CONFIG_ARCH_IOP32X is not set | ||
| 147 | # CONFIG_ARCH_IOP33X is not set | ||
| 148 | # CONFIG_ARCH_IXP23XX is not set | ||
| 149 | # CONFIG_ARCH_IXP2000 is not set | ||
| 150 | # CONFIG_ARCH_IXP4XX is not set | ||
| 151 | # CONFIG_ARCH_L7200 is not set | ||
| 152 | # CONFIG_ARCH_KIRKWOOD is not set | ||
| 153 | # CONFIG_ARCH_KS8695 is not set | ||
| 154 | # CONFIG_ARCH_NS9XXX is not set | ||
| 155 | # CONFIG_ARCH_LOKI is not set | ||
| 156 | # CONFIG_ARCH_MV78XX0 is not set | ||
| 157 | # CONFIG_ARCH_MXC is not set | ||
| 158 | # CONFIG_ARCH_ORION5X is not set | ||
| 159 | # CONFIG_ARCH_PNX4008 is not set | ||
| 160 | # CONFIG_ARCH_PXA is not set | ||
| 161 | # CONFIG_ARCH_RPC is not set | ||
| 162 | # CONFIG_ARCH_SA1100 is not set | ||
| 163 | # CONFIG_ARCH_S3C2410 is not set | ||
| 164 | # CONFIG_ARCH_SHARK is not set | ||
| 165 | # CONFIG_ARCH_LH7A40X is not set | ||
| 166 | # CONFIG_ARCH_DAVINCI is not set | ||
| 167 | CONFIG_ARCH_OMAP=y | ||
| 168 | # CONFIG_ARCH_MSM7X00A is not set | ||
| 169 | |||
| 170 | # | ||
| 171 | # TI OMAP Implementations | ||
| 172 | # | ||
| 173 | CONFIG_ARCH_OMAP_OTG=y | ||
| 174 | # CONFIG_ARCH_OMAP1 is not set | ||
| 175 | # CONFIG_ARCH_OMAP2 is not set | ||
| 176 | CONFIG_ARCH_OMAP3=y | ||
| 177 | |||
| 178 | # | ||
| 179 | # OMAP Feature Selections | ||
| 180 | # | ||
| 181 | # CONFIG_OMAP_DEBUG_POWERDOMAIN is not set | ||
| 182 | # CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set | ||
| 183 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
| 184 | CONFIG_OMAP_MUX=y | ||
| 185 | CONFIG_OMAP_MUX_DEBUG=y | ||
| 186 | CONFIG_OMAP_MUX_WARNINGS=y | ||
| 187 | CONFIG_OMAP_MCBSP=y | ||
| 188 | # CONFIG_OMAP_MPU_TIMER is not set | ||
| 189 | CONFIG_OMAP_32K_TIMER=y | ||
| 190 | CONFIG_OMAP_32K_TIMER_HZ=128 | ||
| 191 | CONFIG_OMAP_DM_TIMER=y | ||
| 192 | # CONFIG_OMAP_LL_DEBUG_UART1 is not set | ||
| 193 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
| 194 | CONFIG_OMAP_LL_DEBUG_UART3=y | ||
| 195 | CONFIG_OMAP_SERIAL_WAKE=y | ||
| 196 | CONFIG_ARCH_OMAP34XX=y | ||
| 197 | CONFIG_ARCH_OMAP3430=y | ||
| 198 | |||
| 199 | # | ||
| 200 | # OMAP Board Type | ||
| 201 | # | ||
| 202 | # CONFIG_MACH_OMAP3_BEAGLE is not set | ||
| 203 | # CONFIG_MACH_OMAP_LDP is not set | ||
| 204 | CONFIG_MACH_OMAP_ZOOM2=y | ||
| 205 | # CONFIG_MACH_OVERO is not set | ||
| 206 | |||
| 207 | # | ||
| 208 | # Boot options | ||
| 209 | # | ||
| 210 | |||
| 211 | # | ||
| 212 | # Power management | ||
| 213 | # | ||
| 214 | |||
| 215 | # | ||
| 216 | # Processor Type | ||
| 217 | # | ||
| 218 | CONFIG_CPU_32=y | ||
| 219 | CONFIG_CPU_32v6K=y | ||
| 220 | CONFIG_CPU_V7=y | ||
| 221 | CONFIG_CPU_32v7=y | ||
| 222 | CONFIG_CPU_ABRT_EV7=y | ||
| 223 | CONFIG_CPU_PABRT_IFAR=y | ||
| 224 | CONFIG_CPU_CACHE_V7=y | ||
| 225 | CONFIG_CPU_CACHE_VIPT=y | ||
| 226 | CONFIG_CPU_COPY_V6=y | ||
| 227 | CONFIG_CPU_TLB_V7=y | ||
| 228 | CONFIG_CPU_HAS_ASID=y | ||
| 229 | CONFIG_CPU_CP15=y | ||
| 230 | CONFIG_CPU_CP15_MMU=y | ||
| 231 | |||
| 232 | # | ||
| 233 | # Processor Features | ||
| 234 | # | ||
| 235 | CONFIG_ARM_THUMB=y | ||
| 236 | # CONFIG_ARM_THUMBEE is not set | ||
| 237 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 238 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 239 | # CONFIG_CPU_BPREDICT_DISABLE is not set | ||
| 240 | CONFIG_HAS_TLS_REG=y | ||
| 241 | # CONFIG_OUTER_CACHE is not set | ||
| 242 | |||
| 243 | # | ||
| 244 | # Bus support | ||
| 245 | # | ||
| 246 | # CONFIG_PCI_SYSCALL is not set | ||
| 247 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 248 | # CONFIG_PCCARD is not set | ||
| 249 | |||
| 250 | # | ||
| 251 | # Kernel Features | ||
| 252 | # | ||
| 253 | CONFIG_TICK_ONESHOT=y | ||
| 254 | CONFIG_NO_HZ=y | ||
| 255 | CONFIG_HIGH_RES_TIMERS=y | ||
| 256 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 257 | # CONFIG_PREEMPT is not set | ||
| 258 | CONFIG_HZ=128 | ||
| 259 | CONFIG_AEABI=y | ||
| 260 | CONFIG_OABI_COMPAT=y | ||
| 261 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y | ||
| 262 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 263 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 264 | CONFIG_FLATMEM_MANUAL=y | ||
| 265 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 266 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 267 | CONFIG_FLATMEM=y | ||
| 268 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 269 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 270 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 271 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 272 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 273 | # CONFIG_RESOURCES_64BIT is not set | ||
| 274 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 275 | CONFIG_BOUNCE=y | ||
| 276 | CONFIG_VIRT_TO_BUS=y | ||
| 277 | # CONFIG_LEDS is not set | ||
| 278 | CONFIG_ALIGNMENT_TRAP=y | ||
| 279 | |||
| 280 | # | ||
| 281 | # Boot options | ||
| 282 | # | ||
| 283 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 284 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 285 | CONFIG_CMDLINE="root=/dev/nfs nfsroot=192.168.0.1:/home/user/buildroot ip=192.168.0.2:192.168.0.1:192.168.0.1:255.255.255.0:tgt:eth0:off rw console=ttyS2,115200n8" | ||
| 286 | # CONFIG_XIP_KERNEL is not set | ||
| 287 | # CONFIG_KEXEC is not set | ||
| 288 | |||
| 289 | # | ||
| 290 | # CPU Frequency scaling | ||
| 291 | # | ||
| 292 | # CONFIG_CPU_FREQ is not set | ||
| 293 | |||
| 294 | # | ||
| 295 | # Floating point emulation | ||
| 296 | # | ||
| 297 | |||
| 298 | # | ||
| 299 | # At least one emulation must be selected | ||
| 300 | # | ||
| 301 | CONFIG_FPE_NWFPE=y | ||
| 302 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 303 | # CONFIG_FPE_FASTFPE is not set | ||
| 304 | CONFIG_VFP=y | ||
| 305 | CONFIG_VFPv3=y | ||
| 306 | # CONFIG_NEON is not set | ||
| 307 | |||
| 308 | # | ||
| 309 | # Userspace binary formats | ||
| 310 | # | ||
| 311 | CONFIG_BINFMT_ELF=y | ||
| 312 | # CONFIG_BINFMT_AOUT is not set | ||
| 313 | CONFIG_BINFMT_MISC=y | ||
| 314 | |||
| 315 | # | ||
| 316 | # Power management options | ||
| 317 | # | ||
| 318 | # CONFIG_PM is not set | ||
| 319 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 320 | CONFIG_NET=y | ||
| 321 | |||
| 322 | # | ||
| 323 | # Networking options | ||
| 324 | # | ||
| 325 | CONFIG_PACKET=y | ||
| 326 | # CONFIG_PACKET_MMAP is not set | ||
| 327 | CONFIG_UNIX=y | ||
| 328 | CONFIG_XFRM=y | ||
| 329 | CONFIG_XFRM_USER=y | ||
| 330 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 331 | CONFIG_XFRM_MIGRATE=y | ||
| 332 | # CONFIG_XFRM_STATISTICS is not set | ||
| 333 | CONFIG_NET_KEY=y | ||
| 334 | CONFIG_NET_KEY_MIGRATE=y | ||
| 335 | CONFIG_INET=y | ||
| 336 | CONFIG_IP_MULTICAST=y | ||
| 337 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 338 | CONFIG_IP_FIB_HASH=y | ||
| 339 | CONFIG_IP_PNP=y | ||
| 340 | CONFIG_IP_PNP_DHCP=y | ||
| 341 | CONFIG_IP_PNP_BOOTP=y | ||
| 342 | CONFIG_IP_PNP_RARP=y | ||
| 343 | # CONFIG_NET_IPIP is not set | ||
| 344 | # CONFIG_NET_IPGRE is not set | ||
| 345 | # CONFIG_IP_MROUTE is not set | ||
| 346 | # CONFIG_ARPD is not set | ||
| 347 | # CONFIG_SYN_COOKIES is not set | ||
| 348 | # CONFIG_INET_AH is not set | ||
| 349 | # CONFIG_INET_ESP is not set | ||
| 350 | # CONFIG_INET_IPCOMP is not set | ||
| 351 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 352 | # CONFIG_INET_TUNNEL is not set | ||
| 353 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 354 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 355 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 356 | # CONFIG_INET_LRO is not set | ||
| 357 | CONFIG_INET_DIAG=y | ||
| 358 | CONFIG_INET_TCP_DIAG=y | ||
| 359 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 360 | CONFIG_TCP_CONG_CUBIC=y | ||
| 361 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 362 | # CONFIG_TCP_MD5SIG is not set | ||
| 363 | # CONFIG_IPV6 is not set | ||
| 364 | # CONFIG_NETWORK_SECMARK is not set | ||
| 365 | # CONFIG_NETFILTER is not set | ||
| 366 | # CONFIG_IP_DCCP is not set | ||
| 367 | # CONFIG_IP_SCTP is not set | ||
| 368 | # CONFIG_TIPC is not set | ||
| 369 | # CONFIG_ATM is not set | ||
| 370 | # CONFIG_BRIDGE is not set | ||
| 371 | # CONFIG_NET_DSA is not set | ||
| 372 | # CONFIG_VLAN_8021Q is not set | ||
| 373 | # CONFIG_DECNET is not set | ||
| 374 | # CONFIG_LLC2 is not set | ||
| 375 | # CONFIG_IPX is not set | ||
| 376 | # CONFIG_ATALK is not set | ||
| 377 | # CONFIG_X25 is not set | ||
| 378 | # CONFIG_LAPB is not set | ||
| 379 | # CONFIG_ECONET is not set | ||
| 380 | # CONFIG_WAN_ROUTER is not set | ||
| 381 | # CONFIG_NET_SCHED is not set | ||
| 382 | |||
| 383 | # | ||
| 384 | # Network testing | ||
| 385 | # | ||
| 386 | # CONFIG_NET_PKTGEN is not set | ||
| 387 | # CONFIG_HAMRADIO is not set | ||
| 388 | # CONFIG_CAN is not set | ||
| 389 | # CONFIG_IRDA is not set | ||
| 390 | # CONFIG_BT is not set | ||
| 391 | # CONFIG_AF_RXRPC is not set | ||
| 392 | # CONFIG_PHONET is not set | ||
| 393 | # CONFIG_WIRELESS is not set | ||
| 394 | # CONFIG_RFKILL is not set | ||
| 395 | # CONFIG_NET_9P is not set | ||
| 396 | |||
| 397 | # | ||
| 398 | # Device Drivers | ||
| 399 | # | ||
| 400 | |||
| 401 | # | ||
| 402 | # Generic Driver Options | ||
| 403 | # | ||
| 404 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 405 | CONFIG_STANDALONE=y | ||
| 406 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 407 | # CONFIG_FW_LOADER is not set | ||
| 408 | # CONFIG_DEBUG_DRIVER is not set | ||
| 409 | # CONFIG_DEBUG_DEVRES is not set | ||
| 410 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 411 | CONFIG_CONNECTOR=y | ||
| 412 | CONFIG_PROC_EVENTS=y | ||
| 413 | # CONFIG_MTD is not set | ||
| 414 | # CONFIG_PARPORT is not set | ||
| 415 | CONFIG_BLK_DEV=y | ||
| 416 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 417 | CONFIG_BLK_DEV_LOOP=y | ||
| 418 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 419 | CONFIG_BLK_DEV_RAM=y | ||
| 420 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 421 | CONFIG_BLK_DEV_RAM_SIZE=16384 | ||
| 422 | # CONFIG_BLK_DEV_XIP is not set | ||
| 423 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 424 | CONFIG_MISC_DEVICES=y | ||
| 425 | # CONFIG_EEPROM_93CX6 is not set | ||
| 426 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 427 | CONFIG_HAVE_IDE=y | ||
| 428 | # CONFIG_IDE is not set | ||
| 429 | |||
| 430 | # | ||
| 431 | # SCSI device support | ||
| 432 | # | ||
| 433 | # CONFIG_RAID_ATTRS is not set | ||
| 434 | CONFIG_SCSI=y | ||
| 435 | CONFIG_SCSI_DMA=y | ||
| 436 | # CONFIG_SCSI_TGT is not set | ||
| 437 | # CONFIG_SCSI_NETLINK is not set | ||
| 438 | CONFIG_SCSI_PROC_FS=y | ||
| 439 | |||
| 440 | # | ||
| 441 | # SCSI support type (disk, tape, CD-ROM) | ||
| 442 | # | ||
| 443 | CONFIG_BLK_DEV_SD=y | ||
| 444 | # CONFIG_CHR_DEV_ST is not set | ||
| 445 | # CONFIG_CHR_DEV_OSST is not set | ||
| 446 | # CONFIG_BLK_DEV_SR is not set | ||
| 447 | # CONFIG_CHR_DEV_SG is not set | ||
| 448 | # CONFIG_CHR_DEV_SCH is not set | ||
| 449 | |||
| 450 | # | ||
| 451 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 452 | # | ||
| 453 | # CONFIG_SCSI_MULTI_LUN is not set | ||
| 454 | # CONFIG_SCSI_CONSTANTS is not set | ||
| 455 | # CONFIG_SCSI_LOGGING is not set | ||
| 456 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 457 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 458 | |||
| 459 | # | ||
| 460 | # SCSI Transports | ||
| 461 | # | ||
| 462 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 463 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 464 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 465 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 466 | CONFIG_SCSI_LOWLEVEL=y | ||
| 467 | # CONFIG_SCSI_DEBUG is not set | ||
| 468 | # CONFIG_SCSI_DH is not set | ||
| 469 | # CONFIG_ATA is not set | ||
| 470 | # CONFIG_MD is not set | ||
| 471 | CONFIG_NETDEVICES=y | ||
| 472 | # CONFIG_DUMMY is not set | ||
| 473 | # CONFIG_BONDING is not set | ||
| 474 | # CONFIG_MACVLAN is not set | ||
| 475 | # CONFIG_EQUALIZER is not set | ||
| 476 | # CONFIG_TUN is not set | ||
| 477 | # CONFIG_VETH is not set | ||
| 478 | CONFIG_PHYLIB=y | ||
| 479 | |||
| 480 | # | ||
| 481 | # MII PHY device drivers | ||
| 482 | # | ||
| 483 | # CONFIG_MARVELL_PHY is not set | ||
| 484 | # CONFIG_DAVICOM_PHY is not set | ||
| 485 | # CONFIG_QSEMI_PHY is not set | ||
| 486 | # CONFIG_LXT_PHY is not set | ||
| 487 | # CONFIG_CICADA_PHY is not set | ||
| 488 | # CONFIG_VITESSE_PHY is not set | ||
| 489 | CONFIG_SMSC_PHY=y | ||
| 490 | # CONFIG_BROADCOM_PHY is not set | ||
| 491 | # CONFIG_ICPLUS_PHY is not set | ||
| 492 | # CONFIG_REALTEK_PHY is not set | ||
| 493 | # CONFIG_NATIONAL_PHY is not set | ||
| 494 | # CONFIG_STE10XP is not set | ||
| 495 | # CONFIG_LSI_ET1011C_PHY is not set | ||
| 496 | # CONFIG_FIXED_PHY is not set | ||
| 497 | # CONFIG_MDIO_BITBANG is not set | ||
| 498 | CONFIG_NET_ETHERNET=y | ||
| 499 | CONFIG_MII=y | ||
| 500 | # CONFIG_AX88796 is not set | ||
| 501 | # CONFIG_SMC91X is not set | ||
| 502 | # CONFIG_DM9000 is not set | ||
| 503 | # CONFIG_ENC28J60 is not set | ||
| 504 | # CONFIG_SMC911X is not set | ||
| 505 | CONFIG_SMSC911X=y | ||
| 506 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 507 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 508 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 509 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 510 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 511 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 512 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 513 | # CONFIG_B44 is not set | ||
| 514 | CONFIG_NETDEV_1000=y | ||
| 515 | CONFIG_NETDEV_10000=y | ||
| 516 | |||
| 517 | # | ||
| 518 | # Wireless LAN | ||
| 519 | # | ||
| 520 | # CONFIG_WLAN_PRE80211 is not set | ||
| 521 | # CONFIG_WLAN_80211 is not set | ||
| 522 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 523 | |||
| 524 | # | ||
| 525 | # USB Network Adapters | ||
| 526 | # | ||
| 527 | # CONFIG_USB_CATC is not set | ||
| 528 | # CONFIG_USB_KAWETH is not set | ||
| 529 | # CONFIG_USB_PEGASUS is not set | ||
| 530 | # CONFIG_USB_RTL8150 is not set | ||
| 531 | # CONFIG_USB_USBNET is not set | ||
| 532 | # CONFIG_WAN is not set | ||
| 533 | # CONFIG_PPP is not set | ||
| 534 | # CONFIG_SLIP is not set | ||
| 535 | # CONFIG_NETCONSOLE is not set | ||
| 536 | # CONFIG_NETPOLL is not set | ||
| 537 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 538 | # CONFIG_ISDN is not set | ||
| 539 | |||
| 540 | # | ||
| 541 | # Input device support | ||
| 542 | # | ||
| 543 | CONFIG_INPUT=y | ||
| 544 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 545 | # CONFIG_INPUT_POLLDEV is not set | ||
| 546 | |||
| 547 | # | ||
| 548 | # Userland interfaces | ||
| 549 | # | ||
| 550 | # CONFIG_INPUT_MOUSEDEV is not set | ||
| 551 | # CONFIG_INPUT_JOYDEV is not set | ||
| 552 | CONFIG_INPUT_EVDEV=y | ||
| 553 | # CONFIG_INPUT_EVBUG is not set | ||
| 554 | |||
| 555 | # | ||
| 556 | # Input Device Drivers | ||
| 557 | # | ||
| 558 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 559 | # CONFIG_INPUT_MOUSE is not set | ||
| 560 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 561 | # CONFIG_INPUT_TABLET is not set | ||
| 562 | CONFIG_INPUT_TOUCHSCREEN=y | ||
| 563 | CONFIG_TOUCHSCREEN_ADS7846=y | ||
| 564 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
| 565 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
| 566 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
| 567 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
| 568 | # CONFIG_TOUCHSCREEN_INEXIO is not set | ||
| 569 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
| 570 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
| 571 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
| 572 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
| 573 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | ||
| 574 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set | ||
| 575 | # CONFIG_INPUT_MISC is not set | ||
| 576 | |||
| 577 | # | ||
| 578 | # Hardware I/O ports | ||
| 579 | # | ||
| 580 | # CONFIG_SERIO is not set | ||
| 581 | # CONFIG_GAMEPORT is not set | ||
| 582 | |||
| 583 | # | ||
| 584 | # Character devices | ||
| 585 | # | ||
| 586 | CONFIG_VT=y | ||
| 587 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 588 | CONFIG_VT_CONSOLE=y | ||
| 589 | CONFIG_HW_CONSOLE=y | ||
| 590 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 591 | CONFIG_DEVKMEM=y | ||
| 592 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 593 | |||
| 594 | # | ||
| 595 | # Serial drivers | ||
| 596 | # | ||
| 597 | CONFIG_SERIAL_8250=y | ||
| 598 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 599 | CONFIG_SERIAL_8250_NR_UARTS=32 | ||
| 600 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 601 | CONFIG_SERIAL_8250_EXTENDED=y | ||
| 602 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
| 603 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
| 604 | CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
| 605 | CONFIG_SERIAL_8250_RSA=y | ||
| 606 | |||
| 607 | # | ||
| 608 | # Non-8250 serial port support | ||
| 609 | # | ||
| 610 | CONFIG_SERIAL_CORE=y | ||
| 611 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 612 | CONFIG_UNIX98_PTYS=y | ||
| 613 | # CONFIG_LEGACY_PTYS is not set | ||
| 614 | # CONFIG_IPMI_HANDLER is not set | ||
| 615 | CONFIG_HW_RANDOM=y | ||
| 616 | # CONFIG_NVRAM is not set | ||
| 617 | # CONFIG_R3964 is not set | ||
| 618 | # CONFIG_RAW_DRIVER is not set | ||
| 619 | # CONFIG_TCG_TPM is not set | ||
| 620 | CONFIG_I2C=y | ||
| 621 | CONFIG_I2C_BOARDINFO=y | ||
| 622 | CONFIG_I2C_CHARDEV=y | ||
| 623 | CONFIG_I2C_HELPER_AUTO=y | ||
| 624 | |||
| 625 | # | ||
| 626 | # I2C Hardware Bus support | ||
| 627 | # | ||
| 628 | |||
| 629 | # | ||
| 630 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 631 | # | ||
| 632 | # CONFIG_I2C_GPIO is not set | ||
| 633 | # CONFIG_I2C_OCORES is not set | ||
| 634 | CONFIG_I2C_OMAP=y | ||
| 635 | # CONFIG_I2C_SIMTEC is not set | ||
| 636 | |||
| 637 | # | ||
| 638 | # External I2C/SMBus adapter drivers | ||
| 639 | # | ||
| 640 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 641 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 642 | |||
| 643 | # | ||
| 644 | # Other I2C/SMBus bus drivers | ||
| 645 | # | ||
| 646 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 647 | # CONFIG_I2C_STUB is not set | ||
| 648 | |||
| 649 | # | ||
| 650 | # Miscellaneous I2C Chip support | ||
| 651 | # | ||
| 652 | # CONFIG_DS1682 is not set | ||
| 653 | # CONFIG_EEPROM_AT24 is not set | ||
| 654 | # CONFIG_EEPROM_LEGACY is not set | ||
| 655 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 656 | # CONFIG_PCF8575 is not set | ||
| 657 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 658 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 659 | # CONFIG_ISP1301_OMAP is not set | ||
| 660 | # CONFIG_TPS65010 is not set | ||
| 661 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 662 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 663 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 664 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 665 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 666 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 667 | CONFIG_SPI=y | ||
| 668 | # CONFIG_SPI_DEBUG is not set | ||
| 669 | CONFIG_SPI_MASTER=y | ||
| 670 | |||
| 671 | # | ||
| 672 | # SPI Master Controller Drivers | ||
| 673 | # | ||
| 674 | # CONFIG_SPI_BITBANG is not set | ||
| 675 | CONFIG_SPI_OMAP24XX=y | ||
| 676 | |||
| 677 | # | ||
| 678 | # SPI Protocol Masters | ||
| 679 | # | ||
| 680 | # CONFIG_EEPROM_AT25 is not set | ||
| 681 | # CONFIG_SPI_SPIDEV is not set | ||
| 682 | # CONFIG_SPI_TLE62X0 is not set | ||
| 683 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
| 684 | CONFIG_GPIOLIB=y | ||
| 685 | # CONFIG_DEBUG_GPIO is not set | ||
| 686 | # CONFIG_GPIO_SYSFS is not set | ||
| 687 | |||
| 688 | # | ||
| 689 | # I2C GPIO expanders: | ||
| 690 | # | ||
| 691 | # CONFIG_GPIO_MAX732X is not set | ||
| 692 | # CONFIG_GPIO_PCA953X is not set | ||
| 693 | # CONFIG_GPIO_PCF857X is not set | ||
| 694 | |||
| 695 | # | ||
| 696 | # PCI GPIO expanders: | ||
| 697 | # | ||
| 698 | |||
| 699 | # | ||
| 700 | # SPI GPIO expanders: | ||
| 701 | # | ||
| 702 | # CONFIG_GPIO_MAX7301 is not set | ||
| 703 | # CONFIG_GPIO_MCP23S08 is not set | ||
| 704 | CONFIG_W1=y | ||
| 705 | |||
| 706 | # | ||
| 707 | # 1-wire Bus Masters | ||
| 708 | # | ||
| 709 | # CONFIG_W1_MASTER_DS2482 is not set | ||
| 710 | # CONFIG_W1_MASTER_DS1WM is not set | ||
| 711 | # CONFIG_W1_MASTER_GPIO is not set | ||
| 712 | |||
| 713 | # | ||
| 714 | # 1-wire Slaves | ||
| 715 | # | ||
| 716 | # CONFIG_W1_SLAVE_THERM is not set | ||
| 717 | # CONFIG_W1_SLAVE_SMEM is not set | ||
| 718 | # CONFIG_W1_SLAVE_DS2433 is not set | ||
| 719 | # CONFIG_W1_SLAVE_DS2760 is not set | ||
| 720 | CONFIG_POWER_SUPPLY=y | ||
| 721 | # CONFIG_POWER_SUPPLY_DEBUG is not set | ||
| 722 | # CONFIG_PDA_POWER is not set | ||
| 723 | # CONFIG_BATTERY_DS2760 is not set | ||
| 724 | # CONFIG_HWMON is not set | ||
| 725 | CONFIG_WATCHDOG=y | ||
| 726 | CONFIG_WATCHDOG_NOWAYOUT=y | ||
| 727 | |||
| 728 | # | ||
| 729 | # Watchdog Device Drivers | ||
| 730 | # | ||
| 731 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 732 | |||
| 733 | # | ||
| 734 | # Sonics Silicon Backplane | ||
| 735 | # | ||
| 736 | CONFIG_SSB_POSSIBLE=y | ||
| 737 | # CONFIG_SSB is not set | ||
| 738 | |||
| 739 | # | ||
| 740 | # Multifunction device drivers | ||
| 741 | # | ||
| 742 | # CONFIG_MFD_CORE is not set | ||
| 743 | # CONFIG_MFD_SM501 is not set | ||
| 744 | # CONFIG_HTC_EGPIO is not set | ||
| 745 | # CONFIG_HTC_PASIC3 is not set | ||
| 746 | # CONFIG_MFD_TMIO is not set | ||
| 747 | # CONFIG_MFD_T7L66XB is not set | ||
| 748 | # CONFIG_MFD_TC6387XB is not set | ||
| 749 | # CONFIG_MFD_TC6393XB is not set | ||
| 750 | |||
| 751 | # | ||
| 752 | # Multimedia devices | ||
| 753 | # | ||
| 754 | |||
| 755 | # | ||
| 756 | # Multimedia core support | ||
| 757 | # | ||
| 758 | # CONFIG_VIDEO_DEV is not set | ||
| 759 | # CONFIG_VIDEO_MEDIA is not set | ||
| 760 | |||
| 761 | # | ||
| 762 | # Multimedia drivers | ||
| 763 | # | ||
| 764 | CONFIG_DAB=y | ||
| 765 | |||
| 766 | # | ||
| 767 | # Graphics support | ||
| 768 | # | ||
| 769 | # CONFIG_VGASTATE is not set | ||
| 770 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 771 | # CONFIG_FB is not set | ||
| 772 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 773 | |||
| 774 | # | ||
| 775 | # Display device support | ||
| 776 | # | ||
| 777 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 778 | |||
| 779 | # | ||
| 780 | # Console display driver support | ||
| 781 | # | ||
| 782 | # CONFIG_VGA_CONSOLE is not set | ||
| 783 | CONFIG_DUMMY_CONSOLE=y | ||
| 784 | CONFIG_SOUND=y | ||
| 785 | CONFIG_SND=y | ||
| 786 | # CONFIG_SND_SEQUENCER is not set | ||
| 787 | # CONFIG_SND_MIXER_OSS is not set | ||
| 788 | # CONFIG_SND_PCM_OSS is not set | ||
| 789 | # CONFIG_SND_DYNAMIC_MINORS is not set | ||
| 790 | CONFIG_SND_SUPPORT_OLD_API=y | ||
| 791 | CONFIG_SND_VERBOSE_PROCFS=y | ||
| 792 | # CONFIG_SND_VERBOSE_PRINTK is not set | ||
| 793 | # CONFIG_SND_DEBUG is not set | ||
| 794 | CONFIG_SND_DRIVERS=y | ||
| 795 | # CONFIG_SND_DUMMY is not set | ||
| 796 | # CONFIG_SND_MTPAV is not set | ||
| 797 | # CONFIG_SND_SERIAL_U16550 is not set | ||
| 798 | # CONFIG_SND_MPU401 is not set | ||
| 799 | CONFIG_SND_ARM=y | ||
| 800 | CONFIG_SND_SPI=y | ||
| 801 | # CONFIG_SND_SOC is not set | ||
| 802 | # CONFIG_SOUND_PRIME is not set | ||
| 803 | CONFIG_HID_SUPPORT=y | ||
| 804 | CONFIG_HID=y | ||
| 805 | # CONFIG_HID_DEBUG is not set | ||
| 806 | # CONFIG_HIDRAW is not set | ||
| 807 | # CONFIG_USB_SUPPORT is not set | ||
| 808 | CONFIG_MMC=y | ||
| 809 | # CONFIG_MMC_DEBUG is not set | ||
| 810 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 811 | |||
| 812 | # | ||
| 813 | # MMC/SD Card Drivers | ||
| 814 | # | ||
| 815 | CONFIG_MMC_BLOCK=y | ||
| 816 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 817 | # CONFIG_SDIO_UART is not set | ||
| 818 | # CONFIG_MMC_TEST is not set | ||
| 819 | |||
| 820 | # | ||
| 821 | # MMC/SD Host Controller Drivers | ||
| 822 | # | ||
| 823 | # CONFIG_MMC_SDHCI is not set | ||
| 824 | # CONFIG_MMC_OMAP is not set | ||
| 825 | # CONFIG_MMC_SPI is not set | ||
| 826 | # CONFIG_NEW_LEDS is not set | ||
| 827 | CONFIG_RTC_LIB=y | ||
| 828 | CONFIG_RTC_CLASS=y | ||
| 829 | CONFIG_RTC_HCTOSYS=y | ||
| 830 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 831 | # CONFIG_RTC_DEBUG is not set | ||
| 832 | |||
| 833 | # | ||
| 834 | # RTC interfaces | ||
| 835 | # | ||
| 836 | CONFIG_RTC_INTF_SYSFS=y | ||
| 837 | CONFIG_RTC_INTF_PROC=y | ||
| 838 | CONFIG_RTC_INTF_DEV=y | ||
| 839 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 840 | # CONFIG_RTC_DRV_TEST is not set | ||
| 841 | |||
| 842 | # | ||
| 843 | # I2C RTC drivers | ||
| 844 | # | ||
| 845 | # CONFIG_RTC_DRV_DS1307 is not set | ||
| 846 | # CONFIG_RTC_DRV_DS1374 is not set | ||
| 847 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 848 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 849 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 850 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 851 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 852 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 853 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 854 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 855 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 856 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 857 | |||
| 858 | # | ||
| 859 | # SPI RTC drivers | ||
| 860 | # | ||
| 861 | # CONFIG_RTC_DRV_M41T94 is not set | ||
| 862 | # CONFIG_RTC_DRV_DS1305 is not set | ||
| 863 | # CONFIG_RTC_DRV_MAX6902 is not set | ||
| 864 | # CONFIG_RTC_DRV_R9701 is not set | ||
| 865 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
| 866 | |||
| 867 | # | ||
| 868 | # Platform RTC drivers | ||
| 869 | # | ||
| 870 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 871 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 872 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 873 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 874 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 875 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 876 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 877 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 878 | |||
| 879 | # | ||
| 880 | # on-CPU RTC drivers | ||
| 881 | # | ||
| 882 | # CONFIG_DMADEVICES is not set | ||
| 883 | |||
| 884 | # | ||
| 885 | # Voltage and Current regulators | ||
| 886 | # | ||
| 887 | # CONFIG_REGULATOR is not set | ||
| 888 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set | ||
| 889 | # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set | ||
| 890 | # CONFIG_REGULATOR_BQ24022 is not set | ||
| 891 | # CONFIG_UIO is not set | ||
| 892 | |||
| 893 | # | ||
| 894 | # File systems | ||
| 895 | # | ||
| 896 | CONFIG_EXT2_FS=y | ||
| 897 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 898 | # CONFIG_EXT2_FS_XIP is not set | ||
| 899 | CONFIG_EXT3_FS=y | ||
| 900 | # CONFIG_EXT3_FS_XATTR is not set | ||
| 901 | # CONFIG_EXT4DEV_FS is not set | ||
| 902 | CONFIG_JBD=y | ||
| 903 | # CONFIG_REISERFS_FS is not set | ||
| 904 | # CONFIG_JFS_FS is not set | ||
| 905 | # CONFIG_FS_POSIX_ACL is not set | ||
| 906 | # CONFIG_XFS_FS is not set | ||
| 907 | CONFIG_DNOTIFY=y | ||
| 908 | CONFIG_INOTIFY=y | ||
| 909 | CONFIG_INOTIFY_USER=y | ||
| 910 | CONFIG_QUOTA=y | ||
| 911 | CONFIG_PRINT_QUOTA_WARNING=y | ||
| 912 | # CONFIG_QFMT_V1 is not set | ||
| 913 | CONFIG_QFMT_V2=y | ||
| 914 | CONFIG_QUOTACTL=y | ||
| 915 | # CONFIG_AUTOFS_FS is not set | ||
| 916 | # CONFIG_AUTOFS4_FS is not set | ||
| 917 | # CONFIG_FUSE_FS is not set | ||
| 918 | |||
| 919 | # | ||
| 920 | # CD-ROM/DVD Filesystems | ||
| 921 | # | ||
| 922 | # CONFIG_ISO9660_FS is not set | ||
| 923 | # CONFIG_UDF_FS is not set | ||
| 924 | |||
| 925 | # | ||
| 926 | # DOS/FAT/NT Filesystems | ||
| 927 | # | ||
| 928 | CONFIG_FAT_FS=y | ||
| 929 | CONFIG_MSDOS_FS=y | ||
| 930 | CONFIG_VFAT_FS=y | ||
| 931 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 932 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 933 | # CONFIG_NTFS_FS is not set | ||
| 934 | |||
| 935 | # | ||
| 936 | # Pseudo filesystems | ||
| 937 | # | ||
| 938 | CONFIG_PROC_FS=y | ||
| 939 | CONFIG_PROC_SYSCTL=y | ||
| 940 | CONFIG_SYSFS=y | ||
| 941 | CONFIG_TMPFS=y | ||
| 942 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 943 | # CONFIG_HUGETLB_PAGE is not set | ||
| 944 | # CONFIG_CONFIGFS_FS is not set | ||
| 945 | |||
| 946 | # | ||
| 947 | # Miscellaneous filesystems | ||
| 948 | # | ||
| 949 | # CONFIG_ADFS_FS is not set | ||
| 950 | # CONFIG_AFFS_FS is not set | ||
| 951 | # CONFIG_HFS_FS is not set | ||
| 952 | # CONFIG_HFSPLUS_FS is not set | ||
| 953 | # CONFIG_BEFS_FS is not set | ||
| 954 | # CONFIG_BFS_FS is not set | ||
| 955 | # CONFIG_EFS_FS is not set | ||
| 956 | # CONFIG_CRAMFS is not set | ||
| 957 | # CONFIG_VXFS_FS is not set | ||
| 958 | # CONFIG_MINIX_FS is not set | ||
| 959 | # CONFIG_OMFS_FS is not set | ||
| 960 | # CONFIG_HPFS_FS is not set | ||
| 961 | # CONFIG_QNX4FS_FS is not set | ||
| 962 | # CONFIG_ROMFS_FS is not set | ||
| 963 | # CONFIG_SYSV_FS is not set | ||
| 964 | # CONFIG_UFS_FS is not set | ||
| 965 | CONFIG_NETWORK_FILESYSTEMS=y | ||
| 966 | CONFIG_NFS_FS=y | ||
| 967 | CONFIG_NFS_V3=y | ||
| 968 | CONFIG_NFS_V3_ACL=y | ||
| 969 | CONFIG_NFS_V4=y | ||
| 970 | CONFIG_ROOT_NFS=y | ||
| 971 | # CONFIG_NFSD is not set | ||
| 972 | CONFIG_LOCKD=y | ||
| 973 | CONFIG_LOCKD_V4=y | ||
| 974 | CONFIG_NFS_ACL_SUPPORT=y | ||
| 975 | CONFIG_NFS_COMMON=y | ||
| 976 | CONFIG_SUNRPC=y | ||
| 977 | CONFIG_SUNRPC_GSS=y | ||
| 978 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 979 | CONFIG_RPCSEC_GSS_KRB5=y | ||
| 980 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 981 | # CONFIG_SMB_FS is not set | ||
| 982 | # CONFIG_CIFS is not set | ||
| 983 | # CONFIG_NCP_FS is not set | ||
| 984 | # CONFIG_CODA_FS is not set | ||
| 985 | # CONFIG_AFS_FS is not set | ||
| 986 | |||
| 987 | # | ||
| 988 | # Partition Types | ||
| 989 | # | ||
| 990 | CONFIG_PARTITION_ADVANCED=y | ||
| 991 | # CONFIG_ACORN_PARTITION is not set | ||
| 992 | # CONFIG_OSF_PARTITION is not set | ||
| 993 | # CONFIG_AMIGA_PARTITION is not set | ||
| 994 | # CONFIG_ATARI_PARTITION is not set | ||
| 995 | # CONFIG_MAC_PARTITION is not set | ||
| 996 | CONFIG_MSDOS_PARTITION=y | ||
| 997 | # CONFIG_BSD_DISKLABEL is not set | ||
| 998 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 999 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 1000 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 1001 | # CONFIG_LDM_PARTITION is not set | ||
| 1002 | # CONFIG_SGI_PARTITION is not set | ||
| 1003 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 1004 | # CONFIG_SUN_PARTITION is not set | ||
| 1005 | # CONFIG_KARMA_PARTITION is not set | ||
| 1006 | # CONFIG_EFI_PARTITION is not set | ||
| 1007 | # CONFIG_SYSV68_PARTITION is not set | ||
| 1008 | CONFIG_NLS=y | ||
| 1009 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 1010 | CONFIG_NLS_CODEPAGE_437=y | ||
| 1011 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 1012 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 1013 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 1014 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 1015 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 1016 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 1017 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 1018 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 1019 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 1020 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 1021 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 1022 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 1023 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 1024 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 1025 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 1026 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 1027 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 1028 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 1029 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 1030 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 1031 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 1032 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 1033 | # CONFIG_NLS_ASCII is not set | ||
| 1034 | CONFIG_NLS_ISO8859_1=y | ||
| 1035 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 1036 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1037 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1038 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 1039 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1040 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1041 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1042 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1043 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1044 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 1045 | # CONFIG_NLS_KOI8_R is not set | ||
| 1046 | # CONFIG_NLS_KOI8_U is not set | ||
| 1047 | # CONFIG_NLS_UTF8 is not set | ||
| 1048 | |||
| 1049 | # | ||
| 1050 | # Kernel hacking | ||
| 1051 | # | ||
| 1052 | # CONFIG_PRINTK_TIME is not set | ||
| 1053 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1054 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1055 | CONFIG_FRAME_WARN=1024 | ||
| 1056 | CONFIG_MAGIC_SYSRQ=y | ||
| 1057 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1058 | # CONFIG_DEBUG_FS is not set | ||
| 1059 | # CONFIG_HEADERS_CHECK is not set | ||
| 1060 | CONFIG_DEBUG_KERNEL=y | ||
| 1061 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1062 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 1063 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1064 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1065 | CONFIG_SCHED_DEBUG=y | ||
| 1066 | # CONFIG_SCHEDSTATS is not set | ||
| 1067 | # CONFIG_TIMER_STATS is not set | ||
| 1068 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1069 | # CONFIG_DEBUG_SLAB is not set | ||
| 1070 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1071 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1072 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 1073 | CONFIG_DEBUG_MUTEXES=y | ||
| 1074 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1075 | # CONFIG_PROVE_LOCKING is not set | ||
| 1076 | # CONFIG_LOCK_STAT is not set | ||
| 1077 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1078 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1079 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 1080 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 1081 | CONFIG_DEBUG_INFO=y | ||
| 1082 | # CONFIG_DEBUG_VM is not set | ||
| 1083 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1084 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1085 | # CONFIG_DEBUG_LIST is not set | ||
| 1086 | # CONFIG_DEBUG_SG is not set | ||
| 1087 | CONFIG_FRAME_POINTER=y | ||
| 1088 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 1089 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1090 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1091 | # CONFIG_FAULT_INJECTION is not set | ||
| 1092 | # CONFIG_LATENCYTOP is not set | ||
| 1093 | CONFIG_HAVE_FTRACE=y | ||
| 1094 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1095 | # CONFIG_FTRACE is not set | ||
| 1096 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 1097 | # CONFIG_SCHED_TRACER is not set | ||
| 1098 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1099 | # CONFIG_SAMPLES is not set | ||
| 1100 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1101 | # CONFIG_KGDB is not set | ||
| 1102 | # CONFIG_DEBUG_USER is not set | ||
| 1103 | # CONFIG_DEBUG_ERRORS is not set | ||
| 1104 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
| 1105 | CONFIG_DEBUG_LL=y | ||
| 1106 | # CONFIG_DEBUG_ICEDCC is not set | ||
| 1107 | |||
| 1108 | # | ||
| 1109 | # Security options | ||
| 1110 | # | ||
| 1111 | # CONFIG_KEYS is not set | ||
| 1112 | # CONFIG_SECURITY is not set | ||
| 1113 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1114 | CONFIG_CRYPTO=y | ||
| 1115 | |||
| 1116 | # | ||
| 1117 | # Crypto core or helper | ||
| 1118 | # | ||
| 1119 | CONFIG_CRYPTO_ALGAPI=y | ||
| 1120 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 1121 | CONFIG_CRYPTO_MANAGER=y | ||
| 1122 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1123 | # CONFIG_CRYPTO_NULL is not set | ||
| 1124 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1125 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1126 | # CONFIG_CRYPTO_TEST is not set | ||
| 1127 | |||
| 1128 | # | ||
| 1129 | # Authenticated Encryption with Associated Data | ||
| 1130 | # | ||
| 1131 | # CONFIG_CRYPTO_CCM is not set | ||
| 1132 | # CONFIG_CRYPTO_GCM is not set | ||
| 1133 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1134 | |||
| 1135 | # | ||
| 1136 | # Block modes | ||
| 1137 | # | ||
| 1138 | CONFIG_CRYPTO_CBC=y | ||
| 1139 | # CONFIG_CRYPTO_CTR is not set | ||
| 1140 | # CONFIG_CRYPTO_CTS is not set | ||
| 1141 | CONFIG_CRYPTO_ECB=m | ||
| 1142 | # CONFIG_CRYPTO_LRW is not set | ||
| 1143 | CONFIG_CRYPTO_PCBC=m | ||
| 1144 | # CONFIG_CRYPTO_XTS is not set | ||
| 1145 | |||
| 1146 | # | ||
| 1147 | # Hash modes | ||
| 1148 | # | ||
| 1149 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1150 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1151 | |||
| 1152 | # | ||
| 1153 | # Digest | ||
| 1154 | # | ||
| 1155 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1156 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1157 | CONFIG_CRYPTO_MD5=y | ||
| 1158 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1159 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1160 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1161 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1162 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1163 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 1164 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1165 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1166 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1167 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1168 | |||
| 1169 | # | ||
| 1170 | # Ciphers | ||
| 1171 | # | ||
| 1172 | # CONFIG_CRYPTO_AES is not set | ||
| 1173 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1174 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1175 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1176 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1177 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1178 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1179 | CONFIG_CRYPTO_DES=y | ||
| 1180 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1181 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1182 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 1183 | # CONFIG_CRYPTO_SEED is not set | ||
| 1184 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1185 | # CONFIG_CRYPTO_TEA is not set | ||
| 1186 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1187 | |||
| 1188 | # | ||
| 1189 | # Compression | ||
| 1190 | # | ||
| 1191 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1192 | # CONFIG_CRYPTO_LZO is not set | ||
| 1193 | CONFIG_CRYPTO_HW=y | ||
| 1194 | |||
| 1195 | # | ||
| 1196 | # Library routines | ||
| 1197 | # | ||
| 1198 | CONFIG_BITREVERSE=y | ||
| 1199 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1200 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1201 | CONFIG_CRC_CCITT=y | ||
| 1202 | # CONFIG_CRC16 is not set | ||
| 1203 | CONFIG_CRC_T10DIF=y | ||
| 1204 | # CONFIG_CRC_ITU_T is not set | ||
| 1205 | CONFIG_CRC32=y | ||
| 1206 | # CONFIG_CRC7 is not set | ||
| 1207 | CONFIG_LIBCRC32C=y | ||
| 1208 | CONFIG_PLIST=y | ||
| 1209 | CONFIG_HAS_IOMEM=y | ||
| 1210 | CONFIG_HAS_IOPORT=y | ||
| 1211 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/rx51_defconfig b/arch/arm/configs/rx51_defconfig index 593102da8cd7..eb2cb31825c0 100644 --- a/arch/arm/configs/rx51_defconfig +++ b/arch/arm/configs/rx51_defconfig | |||
| @@ -282,7 +282,7 @@ CONFIG_ALIGNMENT_TRAP=y | |||
| 282 | # | 282 | # |
| 283 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 283 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
| 284 | CONFIG_ZBOOT_ROM_BSS=0x0 | 284 | CONFIG_ZBOOT_ROM_BSS=0x0 |
| 285 | CONFIG_CMDLINE="init=/sbin/preinit ubi.mtd=4 root=ubi0:rootfs rootfstype=ubifs rw console=ttyMTD5" | 285 | CONFIG_CMDLINE="init=/sbin/preinit ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs rootflags=bulk_read,no_chk_data_crc rw console=ttyMTD,log console=tty0" |
| 286 | # CONFIG_XIP_KERNEL is not set | 286 | # CONFIG_XIP_KERNEL is not set |
| 287 | # CONFIG_KEXEC is not set | 287 | # CONFIG_KEXEC is not set |
| 288 | 288 | ||
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index cd8de89c5fad..55ecc01ea206 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig | |||
| @@ -46,7 +46,6 @@ config MACH_OMAP_H2 | |||
| 46 | config MACH_OMAP_H3 | 46 | config MACH_OMAP_H3 |
| 47 | bool "TI H3 Support" | 47 | bool "TI H3 Support" |
| 48 | depends on ARCH_OMAP1 && ARCH_OMAP16XX | 48 | depends on ARCH_OMAP1 && ARCH_OMAP16XX |
| 49 | # select GPIOEXPANDER_OMAP | ||
| 50 | help | 49 | help |
| 51 | TI OMAP 1710 H3 board support. Say Y here if you have such | 50 | TI OMAP 1710 H3 board support. Say Y here if you have such |
| 52 | a board. | 51 | a board. |
diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile index 1bda8f5d7546..6867cd3ad0b4 100644 --- a/arch/arm/mach-omap1/Makefile +++ b/arch/arm/mach-omap1/Makefile | |||
| @@ -13,6 +13,10 @@ obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o | |||
| 13 | # Power Management | 13 | # Power Management |
| 14 | obj-$(CONFIG_PM) += pm.o sleep.o | 14 | obj-$(CONFIG_PM) += pm.o sleep.o |
| 15 | 15 | ||
| 16 | # DSP | ||
| 17 | obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o | ||
| 18 | mailbox_mach-objs := mailbox.o | ||
| 19 | |||
| 16 | led-y := leds.o | 20 | led-y := leds.o |
| 17 | 21 | ||
| 18 | # Specific board support | 22 | # Specific board support |
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index d1ed1365319e..e70fc7c66bbb 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c | |||
| @@ -33,8 +33,11 @@ | |||
| 33 | #include <mach/common.h> | 33 | #include <mach/common.h> |
| 34 | #include <mach/dsp_common.h> | 34 | #include <mach/dsp_common.h> |
| 35 | #include <mach/omapfb.h> | 35 | #include <mach/omapfb.h> |
| 36 | #include <mach/hwa742.h> | ||
| 36 | #include <mach/lcd_mipid.h> | 37 | #include <mach/lcd_mipid.h> |
| 37 | #include <mach/mmc.h> | 38 | #include <mach/mmc.h> |
| 39 | #include <mach/usb.h> | ||
| 40 | #include <mach/clock.h> | ||
| 38 | 41 | ||
| 39 | #define ADS7846_PENDOWN_GPIO 15 | 42 | #define ADS7846_PENDOWN_GPIO 15 |
| 40 | 43 | ||
| @@ -162,6 +165,15 @@ static struct spi_board_info nokia770_spi_board_info[] __initdata = { | |||
| 162 | }, | 165 | }, |
| 163 | }; | 166 | }; |
| 164 | 167 | ||
| 168 | static struct hwa742_platform_data nokia770_hwa742_platform_data = { | ||
| 169 | .te_connected = 1, | ||
| 170 | }; | ||
| 171 | |||
| 172 | static void hwa742_dev_init(void) | ||
| 173 | { | ||
| 174 | clk_add_alias("hwa_sys_ck", NULL, "bclk", NULL); | ||
| 175 | omapfb_set_ctrl_platform_data(&nokia770_hwa742_platform_data); | ||
| 176 | } | ||
| 165 | 177 | ||
| 166 | /* assume no Mini-AB port */ | 178 | /* assume no Mini-AB port */ |
| 167 | 179 | ||
| @@ -370,6 +382,7 @@ static void __init omap_nokia770_init(void) | |||
| 370 | omap_serial_init(); | 382 | omap_serial_init(); |
| 371 | omap_register_i2c_bus(1, 100, NULL, 0); | 383 | omap_register_i2c_bus(1, 100, NULL, 0); |
| 372 | omap_dsp_init(); | 384 | omap_dsp_init(); |
| 385 | hwa742_dev_init(); | ||
| 373 | ads7846_dev_init(); | 386 | ads7846_dev_init(); |
| 374 | mipid_dev_init(); | 387 | mipid_dev_init(); |
| 375 | omap_usb_init(&nokia770_usb_config); | 388 | omap_usb_init(&nokia770_usb_config); |
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index 336e51dc6127..436eed22801b 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c | |||
| @@ -776,7 +776,7 @@ int __init omap1_clk_init(void) | |||
| 776 | arm_idlect1_mask = ~0; | 776 | arm_idlect1_mask = ~0; |
| 777 | 777 | ||
| 778 | for (c = omap_clks; c < omap_clks + ARRAY_SIZE(omap_clks); c++) | 778 | for (c = omap_clks; c < omap_clks + ARRAY_SIZE(omap_clks); c++) |
| 779 | clk_init_one(c->lk.clk); | 779 | clk_preinit(c->lk.clk); |
| 780 | 780 | ||
| 781 | cpu_mask = 0; | 781 | cpu_mask = 0; |
| 782 | if (cpu_is_omap16xx()) | 782 | if (cpu_is_omap16xx()) |
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index 9774c1f5311e..5218943c91c0 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c | |||
| @@ -53,11 +53,12 @@ | |||
| 53 | #include <mach/clock.h> | 53 | #include <mach/clock.h> |
| 54 | #include <mach/sram.h> | 54 | #include <mach/sram.h> |
| 55 | #include <mach/tc.h> | 55 | #include <mach/tc.h> |
| 56 | #include <mach/pm.h> | ||
| 57 | #include <mach/mux.h> | 56 | #include <mach/mux.h> |
| 58 | #include <mach/dma.h> | 57 | #include <mach/dma.h> |
| 59 | #include <mach/dmtimer.h> | 58 | #include <mach/dmtimer.h> |
| 60 | 59 | ||
| 60 | #include "pm.h" | ||
| 61 | |||
| 61 | static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE]; | 62 | static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE]; |
| 62 | static unsigned short dsp_sleep_save[DSP_SLEEP_SAVE_SIZE]; | 63 | static unsigned short dsp_sleep_save[DSP_SLEEP_SAVE_SIZE]; |
| 63 | static unsigned short ulpd_sleep_save[ULPD_SLEEP_SAVE_SIZE]; | 64 | static unsigned short ulpd_sleep_save[ULPD_SLEEP_SAVE_SIZE]; |
| @@ -101,7 +102,7 @@ static void (*omap_sram_suspend)(unsigned long r0, unsigned long r1) = NULL; | |||
| 101 | * going idle we continue to do idle even if we get | 102 | * going idle we continue to do idle even if we get |
| 102 | * a clock tick interrupt . . | 103 | * a clock tick interrupt . . |
| 103 | */ | 104 | */ |
| 104 | void omap_pm_idle(void) | 105 | void omap1_pm_idle(void) |
| 105 | { | 106 | { |
| 106 | extern __u32 arm_idlect1_mask; | 107 | extern __u32 arm_idlect1_mask; |
| 107 | __u32 use_idlect1 = arm_idlect1_mask; | 108 | __u32 use_idlect1 = arm_idlect1_mask; |
| @@ -222,7 +223,7 @@ static void omap_pm_wakeup_setup(void) | |||
| 222 | #define EN_APICK 6 /* ARM_IDLECT2 */ | 223 | #define EN_APICK 6 /* ARM_IDLECT2 */ |
| 223 | #define DSP_EN 1 /* ARM_RSTCT1 */ | 224 | #define DSP_EN 1 /* ARM_RSTCT1 */ |
| 224 | 225 | ||
| 225 | void omap_pm_suspend(void) | 226 | void omap1_pm_suspend(void) |
| 226 | { | 227 | { |
| 227 | unsigned long arg0 = 0, arg1 = 0; | 228 | unsigned long arg0 = 0, arg1 = 0; |
| 228 | 229 | ||
| @@ -610,7 +611,7 @@ static int omap_pm_enter(suspend_state_t state) | |||
| 610 | { | 611 | { |
| 611 | case PM_SUSPEND_STANDBY: | 612 | case PM_SUSPEND_STANDBY: |
| 612 | case PM_SUSPEND_MEM: | 613 | case PM_SUSPEND_MEM: |
| 613 | omap_pm_suspend(); | 614 | omap1_pm_suspend(); |
| 614 | break; | 615 | break; |
| 615 | default: | 616 | default: |
| 616 | return -EINVAL; | 617 | return -EINVAL; |
| @@ -683,7 +684,7 @@ static int __init omap_pm_init(void) | |||
| 683 | return -ENODEV; | 684 | return -ENODEV; |
| 684 | } | 685 | } |
| 685 | 686 | ||
| 686 | pm_idle = omap_pm_idle; | 687 | pm_idle = omap1_pm_idle; |
| 687 | 688 | ||
| 688 | if (cpu_is_omap730()) | 689 | if (cpu_is_omap730()) |
| 689 | setup_irq(INT_730_WAKE_UP_REQ, &omap_wakeup_irq); | 690 | setup_irq(INT_730_WAKE_UP_REQ, &omap_wakeup_irq); |
diff --git a/arch/arm/plat-omap/include/mach/pm.h b/arch/arm/mach-omap1/pm.h index ce6ee7927537..9ed5e2c1de4d 100644 --- a/arch/arm/plat-omap/include/mach/pm.h +++ b/arch/arm/mach-omap1/pm.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/plat-omap/include/mach/pm.h | 2 | * arch/arm/mach-omap1/pm.h |
| 3 | * | 3 | * |
| 4 | * Header file for OMAP Power Management Routines | 4 | * Header file for OMAP1 Power Management Routines |
| 5 | * | 5 | * |
| 6 | * Author: MontaVista Software, Inc. | 6 | * Author: MontaVista Software, Inc. |
| 7 | * support@mvista.com | 7 | * support@mvista.com |
| @@ -31,8 +31,8 @@ | |||
| 31 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 31 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #ifndef __ASM_ARCH_OMAP_PM_H | 34 | #ifndef __ARCH_ARM_MACH_OMAP1_PM_H |
| 35 | #define __ASM_ARCH_OMAP_PM_H | 35 | #define __ARCH_ARM_MACH_OMAP1_PM_H |
| 36 | 36 | ||
| 37 | /* | 37 | /* |
| 38 | * ---------------------------------------------------------------------------- | 38 | * ---------------------------------------------------------------------------- |
| @@ -106,8 +106,7 @@ | |||
| 106 | 106 | ||
| 107 | #if !defined(CONFIG_ARCH_OMAP730) && \ | 107 | #if !defined(CONFIG_ARCH_OMAP730) && \ |
| 108 | !defined(CONFIG_ARCH_OMAP15XX) && \ | 108 | !defined(CONFIG_ARCH_OMAP15XX) && \ |
| 109 | !defined(CONFIG_ARCH_OMAP16XX) && \ | 109 | !defined(CONFIG_ARCH_OMAP16XX) |
| 110 | !defined(CONFIG_ARCH_OMAP24XX) | ||
| 111 | #warning "Power management for this processor not implemented yet" | 110 | #warning "Power management for this processor not implemented yet" |
| 112 | #endif | 111 | #endif |
| 113 | 112 | ||
| @@ -115,29 +114,27 @@ | |||
| 115 | 114 | ||
| 116 | #include <linux/clk.h> | 115 | #include <linux/clk.h> |
| 117 | 116 | ||
| 117 | extern struct kset power_subsys; | ||
| 118 | |||
| 118 | extern void prevent_idle_sleep(void); | 119 | extern void prevent_idle_sleep(void); |
| 119 | extern void allow_idle_sleep(void); | 120 | extern void allow_idle_sleep(void); |
| 120 | 121 | ||
| 121 | extern void omap_pm_idle(void); | 122 | extern void omap1_pm_idle(void); |
| 122 | extern void omap_pm_suspend(void); | 123 | extern void omap1_pm_suspend(void); |
| 124 | |||
| 123 | extern void omap730_cpu_suspend(unsigned short, unsigned short); | 125 | extern void omap730_cpu_suspend(unsigned short, unsigned short); |
| 124 | extern void omap1510_cpu_suspend(unsigned short, unsigned short); | 126 | extern void omap1510_cpu_suspend(unsigned short, unsigned short); |
| 125 | extern void omap1610_cpu_suspend(unsigned short, unsigned short); | 127 | extern void omap1610_cpu_suspend(unsigned short, unsigned short); |
| 126 | extern void omap24xx_cpu_suspend(u32 dll_ctrl, void __iomem *sdrc_dlla_ctrl, | ||
| 127 | void __iomem *sdrc_power); | ||
| 128 | extern void omap730_idle_loop_suspend(void); | 128 | extern void omap730_idle_loop_suspend(void); |
| 129 | extern void omap1510_idle_loop_suspend(void); | 129 | extern void omap1510_idle_loop_suspend(void); |
| 130 | extern void omap1610_idle_loop_suspend(void); | 130 | extern void omap1610_idle_loop_suspend(void); |
| 131 | extern void omap24xx_idle_loop_suspend(void); | ||
| 132 | 131 | ||
| 133 | extern unsigned int omap730_cpu_suspend_sz; | 132 | extern unsigned int omap730_cpu_suspend_sz; |
| 134 | extern unsigned int omap1510_cpu_suspend_sz; | 133 | extern unsigned int omap1510_cpu_suspend_sz; |
| 135 | extern unsigned int omap1610_cpu_suspend_sz; | 134 | extern unsigned int omap1610_cpu_suspend_sz; |
| 136 | extern unsigned int omap24xx_cpu_suspend_sz; | ||
| 137 | extern unsigned int omap730_idle_loop_suspend_sz; | 135 | extern unsigned int omap730_idle_loop_suspend_sz; |
| 138 | extern unsigned int omap1510_idle_loop_suspend_sz; | 136 | extern unsigned int omap1510_idle_loop_suspend_sz; |
| 139 | extern unsigned int omap1610_idle_loop_suspend_sz; | 137 | extern unsigned int omap1610_idle_loop_suspend_sz; |
| 140 | extern unsigned int omap24xx_idle_loop_suspend_sz; | ||
| 141 | 138 | ||
| 142 | #ifdef CONFIG_OMAP_SERIAL_WAKE | 139 | #ifdef CONFIG_OMAP_SERIAL_WAKE |
| 143 | extern void omap_serial_wake_trigger(int enable); | 140 | extern void omap_serial_wake_trigger(int enable); |
| @@ -170,10 +167,6 @@ extern void omap_serial_wake_trigger(int enable); | |||
| 170 | #define MPUI1610_RESTORE(x) omap_writel((mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_##x]), (x)) | 167 | #define MPUI1610_RESTORE(x) omap_writel((mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_##x]), (x)) |
| 171 | #define MPUI1610_SHOW(x) mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_##x] | 168 | #define MPUI1610_SHOW(x) mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_##x] |
| 172 | 169 | ||
| 173 | #define OMAP24XX_SAVE(x) omap24xx_sleep_save[OMAP24XX_SLEEP_SAVE_##x] = x | ||
| 174 | #define OMAP24XX_RESTORE(x) x = omap24xx_sleep_save[OMAP24XX_SLEEP_SAVE_##x] | ||
| 175 | #define OMAP24XX_SHOW(x) omap24xx_sleep_save[OMAP24XX_SLEEP_SAVE_##x] | ||
| 176 | |||
| 177 | /* | 170 | /* |
| 178 | * List of global OMAP registers to preserve. | 171 | * List of global OMAP registers to preserve. |
| 179 | * More ones like CP and general purpose register values are preserved | 172 | * More ones like CP and general purpose register values are preserved |
| @@ -283,63 +276,5 @@ enum mpui1610_save_state { | |||
| 283 | #endif | 276 | #endif |
| 284 | }; | 277 | }; |
| 285 | 278 | ||
| 286 | enum omap24xx_save_state { | ||
| 287 | OMAP24XX_SLEEP_SAVE_START = 0, | ||
| 288 | OMAP24XX_SLEEP_SAVE_INTC_MIR0, | ||
| 289 | OMAP24XX_SLEEP_SAVE_INTC_MIR1, | ||
| 290 | OMAP24XX_SLEEP_SAVE_INTC_MIR2, | ||
| 291 | |||
| 292 | OMAP24XX_SLEEP_SAVE_CM_CLKSTCTRL_MPU, | ||
| 293 | OMAP24XX_SLEEP_SAVE_CM_CLKSTCTRL_CORE, | ||
| 294 | OMAP24XX_SLEEP_SAVE_CM_CLKSTCTRL_GFX, | ||
| 295 | OMAP24XX_SLEEP_SAVE_CM_CLKSTCTRL_DSP, | ||
| 296 | OMAP24XX_SLEEP_SAVE_CM_CLKSTCTRL_MDM, | ||
| 297 | |||
| 298 | OMAP24XX_SLEEP_SAVE_PM_PWSTCTRL_MPU, | ||
| 299 | OMAP24XX_SLEEP_SAVE_PM_PWSTCTRL_CORE, | ||
| 300 | OMAP24XX_SLEEP_SAVE_PM_PWSTCTRL_GFX, | ||
| 301 | OMAP24XX_SLEEP_SAVE_PM_PWSTCTRL_DSP, | ||
| 302 | OMAP24XX_SLEEP_SAVE_PM_PWSTCTRL_MDM, | ||
| 303 | |||
| 304 | OMAP24XX_SLEEP_SAVE_CM_IDLEST1_CORE, | ||
| 305 | OMAP24XX_SLEEP_SAVE_CM_IDLEST2_CORE, | ||
| 306 | OMAP24XX_SLEEP_SAVE_CM_IDLEST3_CORE, | ||
| 307 | OMAP24XX_SLEEP_SAVE_CM_IDLEST4_CORE, | ||
| 308 | OMAP24XX_SLEEP_SAVE_CM_IDLEST_GFX, | ||
| 309 | OMAP24XX_SLEEP_SAVE_CM_IDLEST_WKUP, | ||
| 310 | OMAP24XX_SLEEP_SAVE_CM_IDLEST_CKGEN, | ||
| 311 | OMAP24XX_SLEEP_SAVE_CM_IDLEST_DSP, | ||
| 312 | OMAP24XX_SLEEP_SAVE_CM_IDLEST_MDM, | ||
| 313 | |||
| 314 | OMAP24XX_SLEEP_SAVE_CM_AUTOIDLE1_CORE, | ||
| 315 | OMAP24XX_SLEEP_SAVE_CM_AUTOIDLE2_CORE, | ||
| 316 | OMAP24XX_SLEEP_SAVE_CM_AUTOIDLE3_CORE, | ||
| 317 | OMAP24XX_SLEEP_SAVE_CM_AUTOIDLE4_CORE, | ||
| 318 | OMAP24XX_SLEEP_SAVE_CM_AUTOIDLE_WKUP, | ||
| 319 | OMAP24XX_SLEEP_SAVE_CM_AUTOIDLE_PLL, | ||
| 320 | OMAP24XX_SLEEP_SAVE_CM_AUTOIDLE_DSP, | ||
| 321 | OMAP24XX_SLEEP_SAVE_CM_AUTOIDLE_MDM, | ||
| 322 | |||
| 323 | OMAP24XX_SLEEP_SAVE_CM_FCLKEN1_CORE, | ||
| 324 | OMAP24XX_SLEEP_SAVE_CM_FCLKEN2_CORE, | ||
| 325 | OMAP24XX_SLEEP_SAVE_CM_ICLKEN1_CORE, | ||
| 326 | OMAP24XX_SLEEP_SAVE_CM_ICLKEN2_CORE, | ||
| 327 | OMAP24XX_SLEEP_SAVE_CM_ICLKEN3_CORE, | ||
| 328 | OMAP24XX_SLEEP_SAVE_CM_ICLKEN4_CORE, | ||
| 329 | OMAP24XX_SLEEP_SAVE_GPIO1_IRQENABLE1, | ||
| 330 | OMAP24XX_SLEEP_SAVE_GPIO2_IRQENABLE1, | ||
| 331 | OMAP24XX_SLEEP_SAVE_GPIO3_IRQENABLE1, | ||
| 332 | OMAP24XX_SLEEP_SAVE_GPIO4_IRQENABLE1, | ||
| 333 | OMAP24XX_SLEEP_SAVE_GPIO3_OE, | ||
| 334 | OMAP24XX_SLEEP_SAVE_GPIO4_OE, | ||
| 335 | OMAP24XX_SLEEP_SAVE_GPIO3_RISINGDETECT, | ||
| 336 | OMAP24XX_SLEEP_SAVE_GPIO3_FALLINGDETECT, | ||
| 337 | OMAP24XX_SLEEP_SAVE_CONTROL_PADCONF_SPI1_NCS2, | ||
| 338 | OMAP24XX_SLEEP_SAVE_CONTROL_PADCONF_MCBSP1_DX, | ||
| 339 | OMAP24XX_SLEEP_SAVE_CONTROL_PADCONF_SSI1_FLAG_TX, | ||
| 340 | OMAP24XX_SLEEP_SAVE_CONTROL_PADCONF_SYS_NIRQW0, | ||
| 341 | OMAP24XX_SLEEP_SAVE_SIZE | ||
| 342 | }; | ||
| 343 | |||
| 344 | #endif /* ASSEMBLER */ | 279 | #endif /* ASSEMBLER */ |
| 345 | #endif /* __ASM_ARCH_OMAP_PM_H */ | 280 | #endif /* __ASM_ARCH_OMAP_PM_H */ |
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c index 842090b148f1..f754cee4f3c3 100644 --- a/arch/arm/mach-omap1/serial.c +++ b/arch/arm/mach-omap1/serial.c | |||
| @@ -26,9 +26,6 @@ | |||
| 26 | #include <mach/mux.h> | 26 | #include <mach/mux.h> |
| 27 | #include <mach/gpio.h> | 27 | #include <mach/gpio.h> |
| 28 | #include <mach/fpga.h> | 28 | #include <mach/fpga.h> |
| 29 | #ifdef CONFIG_PM | ||
| 30 | #include <mach/pm.h> | ||
| 31 | #endif | ||
| 32 | 29 | ||
| 33 | static struct clk * uart1_ck; | 30 | static struct clk * uart1_ck; |
| 34 | static struct clk * uart2_ck; | 31 | static struct clk * uart2_ck; |
diff --git a/arch/arm/mach-omap1/sleep.S b/arch/arm/mach-omap1/sleep.S index f3eac932092d..22e8568339b0 100644 --- a/arch/arm/mach-omap1/sleep.S +++ b/arch/arm/mach-omap1/sleep.S | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #include <linux/linkage.h> | 35 | #include <linux/linkage.h> |
| 36 | #include <asm/assembler.h> | 36 | #include <asm/assembler.h> |
| 37 | #include <mach/io.h> | 37 | #include <mach/io.h> |
| 38 | #include <mach/pm.h> | 38 | #include "pm.h" |
| 39 | 39 | ||
| 40 | .text | 40 | .text |
| 41 | 41 | ||
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 64ab386a65c7..a755eb5e2361 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
| @@ -25,7 +25,7 @@ config ARCH_OMAP3430 | |||
| 25 | select ARCH_OMAP_OTG | 25 | select ARCH_OMAP_OTG |
| 26 | 26 | ||
| 27 | comment "OMAP Board Type" | 27 | comment "OMAP Board Type" |
| 28 | depends on ARCH_OMAP2 || ARCH_OMAP3 | 28 | depends on ARCH_OMAP2 || ARCH_OMAP3 || ARCH_OMAP4 |
| 29 | 29 | ||
| 30 | config MACH_OMAP_GENERIC | 30 | config MACH_OMAP_GENERIC |
| 31 | bool "Generic OMAP board" | 31 | bool "Generic OMAP board" |
| @@ -56,6 +56,10 @@ config MACH_OVERO | |||
| 56 | bool "Gumstix Overo board" | 56 | bool "Gumstix Overo board" |
| 57 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | 57 | depends on ARCH_OMAP3 && ARCH_OMAP34XX |
| 58 | 58 | ||
| 59 | config MACH_OMAP3EVM | ||
| 60 | bool "OMAP 3530 EVM board" | ||
| 61 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | ||
| 62 | |||
| 59 | config MACH_OMAP3_PANDORA | 63 | config MACH_OMAP3_PANDORA |
| 60 | bool "OMAP3 Pandora" | 64 | bool "OMAP3 Pandora" |
| 61 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | 65 | depends on ARCH_OMAP3 && ARCH_OMAP34XX |
| @@ -67,3 +71,11 @@ config MACH_OMAP_3430SDP | |||
| 67 | config MACH_NOKIA_RX51 | 71 | config MACH_NOKIA_RX51 |
| 68 | bool "Nokia RX-51 board" | 72 | bool "Nokia RX-51 board" |
| 69 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | 73 | depends on ARCH_OMAP3 && ARCH_OMAP34XX |
| 74 | |||
| 75 | config MACH_OMAP_ZOOM2 | ||
| 76 | bool "OMAP3 Zoom2 board" | ||
| 77 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | ||
| 78 | |||
| 79 | config MACH_OMAP_4430SDP | ||
| 80 | bool "OMAP 4430 SDP board" | ||
| 81 | depends on ARCH_OMAP4 | ||
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 88629a7455a6..6226e64d99a1 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
| @@ -3,9 +3,14 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | # Common support | 5 | # Common support |
| 6 | obj-y := irq.o id.o io.o sdrc.o control.o prcm.o clock.o mux.o \ | 6 | obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o |
| 7 | devices.o serial.o gpmc.o timer-gp.o powerdomain.o \ | 7 | |
| 8 | clockdomain.o | 8 | omap-2-3-common = irq.o sdrc.o |
| 9 | prcm-common = prcm.o powerdomain.o | ||
| 10 | clock-common = clock.o clockdomain.o | ||
| 11 | |||
| 12 | obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(clock-common) | ||
| 13 | obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(clock-common) | ||
| 9 | 14 | ||
| 10 | obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o | 15 | obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o |
| 11 | 16 | ||
| @@ -20,8 +25,10 @@ obj-$(CONFIG_ARCH_OMAP2) += sdrc2xxx.o | |||
| 20 | 25 | ||
| 21 | # Power Management | 26 | # Power Management |
| 22 | ifeq ($(CONFIG_PM),y) | 27 | ifeq ($(CONFIG_PM),y) |
| 23 | obj-y += pm.o | 28 | obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o |
| 24 | obj-$(CONFIG_ARCH_OMAP24XX) += sleep24xx.o | 29 | obj-$(CONFIG_ARCH_OMAP24XX) += sleep24xx.o |
| 30 | obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o | ||
| 31 | obj-$(CONFIG_PM_DEBUG) += pm-debug.o | ||
| 25 | endif | 32 | endif |
| 26 | 33 | ||
| 27 | # Clock framework | 34 | # Clock framework |
| @@ -45,6 +52,8 @@ obj-$(CONFIG_MACH_OMAP_LDP) += board-ldp.o \ | |||
| 45 | mmc-twl4030.o | 52 | mmc-twl4030.o |
| 46 | obj-$(CONFIG_MACH_OVERO) += board-overo.o \ | 53 | obj-$(CONFIG_MACH_OVERO) += board-overo.o \ |
| 47 | mmc-twl4030.o | 54 | mmc-twl4030.o |
| 55 | obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o \ | ||
| 56 | mmc-twl4030.o | ||
| 48 | obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o \ | 57 | obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o \ |
| 49 | mmc-twl4030.o | 58 | mmc-twl4030.o |
| 50 | obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \ | 59 | obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \ |
| @@ -53,8 +62,17 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \ | |||
| 53 | obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \ | 62 | obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \ |
| 54 | board-rx51-peripherals.o \ | 63 | board-rx51-peripherals.o \ |
| 55 | mmc-twl4030.o | 64 | mmc-twl4030.o |
| 65 | obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2.o \ | ||
| 66 | mmc-twl4030.o \ | ||
| 67 | board-zoom-debugboard.o | ||
| 68 | |||
| 69 | obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o | ||
| 56 | 70 | ||
| 57 | # Platform specific device init code | 71 | # Platform specific device init code |
| 58 | ifeq ($(CONFIG_USB_MUSB_SOC),y) | ||
| 59 | obj-y += usb-musb.o | 72 | obj-y += usb-musb.o |
| 60 | endif | 73 | |
| 74 | onenand-$(CONFIG_MTD_ONENAND_OMAP2) := gpmc-onenand.o | ||
| 75 | obj-y += $(onenand-m) $(onenand-y) | ||
| 76 | |||
| 77 | smc91x-$(CONFIG_SMC91X) := gpmc-smc91x.o | ||
| 78 | obj-y += $(smc91x-m) $(smc91x-y) | ||
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index 22143651037e..9c3fdcdf76c3 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c | |||
| @@ -36,14 +36,12 @@ | |||
| 36 | #include <mach/common.h> | 36 | #include <mach/common.h> |
| 37 | #include <mach/gpmc.h> | 37 | #include <mach/gpmc.h> |
| 38 | #include <mach/usb.h> | 38 | #include <mach/usb.h> |
| 39 | #include <mach/gpmc-smc91x.h> | ||
| 39 | 40 | ||
| 40 | #include "mmc-twl4030.h" | 41 | #include "mmc-twl4030.h" |
| 41 | 42 | ||
| 42 | #define SDP2430_CS0_BASE 0x04000000 | 43 | #define SDP2430_CS0_BASE 0x04000000 |
| 43 | #define SDP2430_FLASH_CS 0 | 44 | #define SECONDARY_LCD_GPIO 147 |
| 44 | #define SDP2430_SMC91X_CS 5 | ||
| 45 | |||
| 46 | #define SDP2430_ETHR_GPIO_IRQ 149 | ||
| 47 | 45 | ||
| 48 | static struct mtd_partition sdp2430_partitions[] = { | 46 | static struct mtd_partition sdp2430_partitions[] = { |
| 49 | /* bootloader (U-Boot, etc) in first sector */ | 47 | /* bootloader (U-Boot, etc) in first sector */ |
| @@ -99,100 +97,53 @@ static struct platform_device sdp2430_flash_device = { | |||
| 99 | .resource = &sdp2430_flash_resource, | 97 | .resource = &sdp2430_flash_resource, |
| 100 | }; | 98 | }; |
| 101 | 99 | ||
| 102 | static struct resource sdp2430_smc91x_resources[] = { | 100 | static struct platform_device sdp2430_lcd_device = { |
| 103 | [0] = { | 101 | .name = "sdp2430_lcd", |
| 104 | .start = SDP2430_CS0_BASE, | ||
| 105 | .end = SDP2430_CS0_BASE + SZ_64M - 1, | ||
| 106 | .flags = IORESOURCE_MEM, | ||
| 107 | }, | ||
| 108 | [1] = { | ||
| 109 | .start = OMAP_GPIO_IRQ(SDP2430_ETHR_GPIO_IRQ), | ||
| 110 | .end = OMAP_GPIO_IRQ(SDP2430_ETHR_GPIO_IRQ), | ||
| 111 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL, | ||
| 112 | }, | ||
| 113 | }; | ||
| 114 | |||
| 115 | static struct platform_device sdp2430_smc91x_device = { | ||
| 116 | .name = "smc91x", | ||
| 117 | .id = -1, | 102 | .id = -1, |
| 118 | .num_resources = ARRAY_SIZE(sdp2430_smc91x_resources), | ||
| 119 | .resource = sdp2430_smc91x_resources, | ||
| 120 | }; | 103 | }; |
| 121 | 104 | ||
| 122 | static struct platform_device *sdp2430_devices[] __initdata = { | 105 | static struct platform_device *sdp2430_devices[] __initdata = { |
| 123 | &sdp2430_smc91x_device, | ||
| 124 | &sdp2430_flash_device, | 106 | &sdp2430_flash_device, |
| 107 | &sdp2430_lcd_device, | ||
| 125 | }; | 108 | }; |
| 126 | 109 | ||
| 127 | static inline void __init sdp2430_init_smc91x(void) | 110 | static struct omap_lcd_config sdp2430_lcd_config __initdata = { |
| 128 | { | 111 | .ctrl_name = "internal", |
| 129 | int eth_cs; | 112 | }; |
| 130 | unsigned long cs_mem_base; | ||
| 131 | unsigned int rate; | ||
| 132 | struct clk *gpmc_fck; | ||
| 133 | 113 | ||
| 134 | eth_cs = SDP2430_SMC91X_CS; | 114 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91x_MODULE) |
| 135 | 115 | ||
| 136 | gpmc_fck = clk_get(NULL, "gpmc_fck"); /* Always on ENABLE_ON_INIT */ | 116 | static struct omap_smc91x_platform_data board_smc91x_data = { |
| 137 | if (IS_ERR(gpmc_fck)) { | 117 | .cs = 5, |
| 138 | WARN_ON(1); | 118 | .gpio_irq = 149, |
| 139 | return; | 119 | .flags = GPMC_MUX_ADD_DATA | GPMC_TIMINGS_SMC91C96 | |
| 140 | } | 120 | IORESOURCE_IRQ_LOWLEVEL, |
| 141 | 121 | ||
| 142 | clk_enable(gpmc_fck); | 122 | }; |
| 143 | rate = clk_get_rate(gpmc_fck); | ||
| 144 | |||
| 145 | /* Make sure CS1 timings are correct, for 2430 always muxed */ | ||
| 146 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG1, 0x00011200); | ||
| 147 | |||
| 148 | if (rate >= 160000000) { | ||
| 149 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG2, 0x001f1f01); | ||
| 150 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG3, 0x00080803); | ||
| 151 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG4, 0x1c0b1c0a); | ||
| 152 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG5, 0x041f1F1F); | ||
| 153 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG6, 0x000004C4); | ||
| 154 | } else if (rate >= 130000000) { | ||
| 155 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG2, 0x001f1f00); | ||
| 156 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG3, 0x00080802); | ||
| 157 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG4, 0x1C091C09); | ||
| 158 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG5, 0x041f1F1F); | ||
| 159 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG6, 0x000004C4); | ||
| 160 | } else { /* rate = 100000000 */ | ||
| 161 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG2, 0x001f1f00); | ||
| 162 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG3, 0x00080802); | ||
| 163 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG4, 0x1C091C09); | ||
| 164 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG5, 0x031A1F1F); | ||
| 165 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG6, 0x000003C2); | ||
| 166 | } | ||
| 167 | 123 | ||
| 168 | if (gpmc_cs_request(eth_cs, SZ_16M, &cs_mem_base) < 0) { | 124 | static void __init board_smc91x_init(void) |
| 169 | printk(KERN_ERR "Failed to request GPMC mem for smc91x\n"); | 125 | { |
| 170 | goto out; | 126 | if (omap_rev() > OMAP3430_REV_ES1_0) |
| 171 | } | 127 | board_smc91x_data.gpio_irq = 6; |
| 128 | else | ||
| 129 | board_smc91x_data.gpio_irq = 29; | ||
| 172 | 130 | ||
| 173 | sdp2430_smc91x_resources[0].start = cs_mem_base + 0x300; | 131 | gpmc_smc91x_init(&board_smc91x_data); |
| 174 | sdp2430_smc91x_resources[0].end = cs_mem_base + 0x30f; | 132 | } |
| 175 | udelay(100); | ||
| 176 | 133 | ||
| 177 | if (gpio_request(SDP2430_ETHR_GPIO_IRQ, "SMC91x irq") < 0) { | 134 | #else |
| 178 | printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n", | ||
| 179 | SDP2430_ETHR_GPIO_IRQ); | ||
| 180 | gpmc_cs_free(eth_cs); | ||
| 181 | goto out; | ||
| 182 | } | ||
| 183 | gpio_direction_input(SDP2430_ETHR_GPIO_IRQ); | ||
| 184 | 135 | ||
| 185 | out: | 136 | static inline void board_smc91x_init(void) |
| 186 | clk_disable(gpmc_fck); | 137 | { |
| 187 | clk_put(gpmc_fck); | ||
| 188 | } | 138 | } |
| 189 | 139 | ||
| 140 | #endif | ||
| 141 | |||
| 190 | static void __init omap_2430sdp_init_irq(void) | 142 | static void __init omap_2430sdp_init_irq(void) |
| 191 | { | 143 | { |
| 192 | omap2_init_common_hw(NULL); | 144 | omap2_init_common_hw(NULL); |
| 193 | omap_init_irq(); | 145 | omap_init_irq(); |
| 194 | omap_gpio_init(); | 146 | omap_gpio_init(); |
| 195 | sdp2430_init_smc91x(); | ||
| 196 | } | 147 | } |
| 197 | 148 | ||
| 198 | static struct omap_uart_config sdp2430_uart_config __initdata = { | 149 | static struct omap_uart_config sdp2430_uart_config __initdata = { |
| @@ -201,6 +152,7 @@ static struct omap_uart_config sdp2430_uart_config __initdata = { | |||
| 201 | 152 | ||
| 202 | static struct omap_board_config_kernel sdp2430_config[] = { | 153 | static struct omap_board_config_kernel sdp2430_config[] = { |
| 203 | {OMAP_TAG_UART, &sdp2430_uart_config}, | 154 | {OMAP_TAG_UART, &sdp2430_uart_config}, |
| 155 | {OMAP_TAG_LCD, &sdp2430_lcd_config}, | ||
| 204 | }; | 156 | }; |
| 205 | 157 | ||
| 206 | 158 | ||
| @@ -248,6 +200,8 @@ static struct twl4030_hsmmc_info mmc[] __initdata = { | |||
| 248 | 200 | ||
| 249 | static void __init omap_2430sdp_init(void) | 201 | static void __init omap_2430sdp_init(void) |
| 250 | { | 202 | { |
| 203 | int ret; | ||
| 204 | |||
| 251 | omap2430_i2c_init(); | 205 | omap2430_i2c_init(); |
| 252 | 206 | ||
| 253 | platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices)); | 207 | platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices)); |
| @@ -256,6 +210,12 @@ static void __init omap_2430sdp_init(void) | |||
| 256 | omap_serial_init(); | 210 | omap_serial_init(); |
| 257 | twl4030_mmc_init(mmc); | 211 | twl4030_mmc_init(mmc); |
| 258 | usb_musb_init(); | 212 | usb_musb_init(); |
| 213 | board_smc91x_init(); | ||
| 214 | |||
| 215 | /* Turn off secondary LCD backlight */ | ||
| 216 | ret = gpio_request(SECONDARY_LCD_GPIO, "Secondary LCD backlight"); | ||
| 217 | if (ret == 0) | ||
| 218 | gpio_direction_output(SECONDARY_LCD_GPIO, 0); | ||
| 259 | } | 219 | } |
| 260 | 220 | ||
| 261 | static void __init omap_2430sdp_map_io(void) | 221 | static void __init omap_2430sdp_map_io(void) |
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index ed9274972122..496a90e4ea7a 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c | |||
| @@ -39,15 +39,13 @@ | |||
| 39 | 39 | ||
| 40 | #include <mach/control.h> | 40 | #include <mach/control.h> |
| 41 | #include <mach/keypad.h> | 41 | #include <mach/keypad.h> |
| 42 | #include <mach/gpmc-smc91x.h> | ||
| 42 | 43 | ||
| 44 | #include "sdram-qimonda-hyb18m512160af-6.h" | ||
| 43 | #include "mmc-twl4030.h" | 45 | #include "mmc-twl4030.h" |
| 44 | 46 | ||
| 45 | #define CONFIG_DISABLE_HFCLK 1 | 47 | #define CONFIG_DISABLE_HFCLK 1 |
| 46 | 48 | ||
| 47 | #define SDP3430_ETHR_GPIO_IRQ_SDPV1 29 | ||
| 48 | #define SDP3430_ETHR_GPIO_IRQ_SDPV2 6 | ||
| 49 | #define SDP3430_SMC91X_CS 3 | ||
| 50 | |||
| 51 | #define SDP3430_TS_GPIO_IRQ_SDPV1 3 | 49 | #define SDP3430_TS_GPIO_IRQ_SDPV1 3 |
| 52 | #define SDP3430_TS_GPIO_IRQ_SDPV2 2 | 50 | #define SDP3430_TS_GPIO_IRQ_SDPV2 2 |
| 53 | 51 | ||
| @@ -56,24 +54,6 @@ | |||
| 56 | 54 | ||
| 57 | #define TWL4030_MSECURE_GPIO 22 | 55 | #define TWL4030_MSECURE_GPIO 22 |
| 58 | 56 | ||
| 59 | static struct resource sdp3430_smc91x_resources[] = { | ||
| 60 | [0] = { | ||
| 61 | .flags = IORESOURCE_MEM, | ||
| 62 | }, | ||
| 63 | [1] = { | ||
| 64 | .start = 0, | ||
| 65 | .end = 0, | ||
| 66 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL, | ||
| 67 | }, | ||
| 68 | }; | ||
| 69 | |||
| 70 | static struct platform_device sdp3430_smc91x_device = { | ||
| 71 | .name = "smc91x", | ||
| 72 | .id = -1, | ||
| 73 | .num_resources = ARRAY_SIZE(sdp3430_smc91x_resources), | ||
| 74 | .resource = sdp3430_smc91x_resources, | ||
| 75 | }; | ||
| 76 | |||
| 77 | static int sdp3430_keymap[] = { | 57 | static int sdp3430_keymap[] = { |
| 78 | KEY(0, 0, KEY_LEFT), | 58 | KEY(0, 0, KEY_LEFT), |
| 79 | KEY(0, 1, KEY_RIGHT), | 59 | KEY(0, 1, KEY_RIGHT), |
| @@ -184,48 +164,14 @@ static struct regulator_consumer_supply sdp3430_vdvi_supply = { | |||
| 184 | }; | 164 | }; |
| 185 | 165 | ||
| 186 | static struct platform_device *sdp3430_devices[] __initdata = { | 166 | static struct platform_device *sdp3430_devices[] __initdata = { |
| 187 | &sdp3430_smc91x_device, | ||
| 188 | &sdp3430_lcd_device, | 167 | &sdp3430_lcd_device, |
| 189 | }; | 168 | }; |
| 190 | 169 | ||
| 191 | static inline void __init sdp3430_init_smc91x(void) | ||
| 192 | { | ||
| 193 | int eth_cs; | ||
| 194 | unsigned long cs_mem_base; | ||
| 195 | int eth_gpio = 0; | ||
| 196 | |||
| 197 | eth_cs = SDP3430_SMC91X_CS; | ||
| 198 | |||
| 199 | if (gpmc_cs_request(eth_cs, SZ_16M, &cs_mem_base) < 0) { | ||
| 200 | printk(KERN_ERR "Failed to request GPMC mem for smc91x\n"); | ||
| 201 | return; | ||
| 202 | } | ||
| 203 | |||
| 204 | sdp3430_smc91x_resources[0].start = cs_mem_base + 0x300; | ||
| 205 | sdp3430_smc91x_resources[0].end = cs_mem_base + 0x30f; | ||
| 206 | udelay(100); | ||
| 207 | |||
| 208 | if (omap_rev() > OMAP3430_REV_ES1_0) | ||
| 209 | eth_gpio = SDP3430_ETHR_GPIO_IRQ_SDPV2; | ||
| 210 | else | ||
| 211 | eth_gpio = SDP3430_ETHR_GPIO_IRQ_SDPV1; | ||
| 212 | |||
| 213 | sdp3430_smc91x_resources[1].start = gpio_to_irq(eth_gpio); | ||
| 214 | |||
| 215 | if (gpio_request(eth_gpio, "SMC91x irq") < 0) { | ||
| 216 | printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n", | ||
| 217 | eth_gpio); | ||
| 218 | return; | ||
| 219 | } | ||
| 220 | gpio_direction_input(eth_gpio); | ||
| 221 | } | ||
| 222 | |||
| 223 | static void __init omap_3430sdp_init_irq(void) | 170 | static void __init omap_3430sdp_init_irq(void) |
| 224 | { | 171 | { |
| 225 | omap2_init_common_hw(NULL); | 172 | omap2_init_common_hw(hyb18m512160af6_sdrc_params); |
| 226 | omap_init_irq(); | 173 | omap_init_irq(); |
| 227 | omap_gpio_init(); | 174 | omap_gpio_init(); |
| 228 | sdp3430_init_smc91x(); | ||
| 229 | } | 175 | } |
| 230 | 176 | ||
| 231 | static struct omap_uart_config sdp3430_uart_config __initdata = { | 177 | static struct omap_uart_config sdp3430_uart_config __initdata = { |
| @@ -506,6 +452,32 @@ static int __init omap3430_i2c_init(void) | |||
| 506 | return 0; | 452 | return 0; |
| 507 | } | 453 | } |
| 508 | 454 | ||
| 455 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) | ||
| 456 | |||
| 457 | static struct omap_smc91x_platform_data board_smc91x_data = { | ||
| 458 | .cs = 3, | ||
| 459 | .flags = GPMC_MUX_ADD_DATA | GPMC_TIMINGS_SMC91C96 | | ||
| 460 | IORESOURCE_IRQ_LOWLEVEL, | ||
| 461 | }; | ||
| 462 | |||
| 463 | static void __init board_smc91x_init(void) | ||
| 464 | { | ||
| 465 | if (omap_rev() > OMAP3430_REV_ES1_0) | ||
| 466 | board_smc91x_data.gpio_irq = 6; | ||
| 467 | else | ||
| 468 | board_smc91x_data.gpio_irq = 29; | ||
| 469 | |||
| 470 | gpmc_smc91x_init(&board_smc91x_data); | ||
| 471 | } | ||
| 472 | |||
| 473 | #else | ||
| 474 | |||
| 475 | static inline void board_smc91x_init(void) | ||
| 476 | { | ||
| 477 | } | ||
| 478 | |||
| 479 | #endif | ||
| 480 | |||
| 509 | static void __init omap_3430sdp_init(void) | 481 | static void __init omap_3430sdp_init(void) |
| 510 | { | 482 | { |
| 511 | omap3430_i2c_init(); | 483 | omap3430_i2c_init(); |
| @@ -522,6 +494,7 @@ static void __init omap_3430sdp_init(void) | |||
| 522 | ads7846_dev_init(); | 494 | ads7846_dev_init(); |
| 523 | omap_serial_init(); | 495 | omap_serial_init(); |
| 524 | usb_musb_init(); | 496 | usb_musb_init(); |
| 497 | board_smc91x_init(); | ||
| 525 | } | 498 | } |
| 526 | 499 | ||
| 527 | static void __init omap_3430sdp_map_io(void) | 500 | static void __init omap_3430sdp_map_io(void) |
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c new file mode 100644 index 000000000000..57e477bd89c6 --- /dev/null +++ b/arch/arm/mach-omap2/board-4430sdp.c | |||
| @@ -0,0 +1,94 @@ | |||
| 1 | /* | ||
| 2 | * Board support file for OMAP4430 SDP. | ||
| 3 | * | ||
| 4 | * Copyright (C) 2009 Texas Instruments | ||
| 5 | * | ||
| 6 | * Author: Santosh Shilimkar <santosh.shilimkar@ti.com> | ||
| 7 | * | ||
| 8 | * Based on mach-omap2/board-3430sdp.c | ||
| 9 | * | ||
| 10 | * This program is free software; you can redistribute it and/or modify | ||
| 11 | * it under the terms of the GNU General Public License version 2 as | ||
| 12 | * published by the Free Software Foundation. | ||
| 13 | */ | ||
| 14 | |||
| 15 | #include <linux/kernel.h> | ||
| 16 | #include <linux/init.h> | ||
| 17 | #include <linux/platform_device.h> | ||
| 18 | #include <linux/io.h> | ||
| 19 | #include <linux/gpio.h> | ||
| 20 | |||
| 21 | #include <mach/hardware.h> | ||
| 22 | #include <asm/mach-types.h> | ||
| 23 | #include <asm/mach/arch.h> | ||
| 24 | #include <asm/mach/map.h> | ||
| 25 | |||
| 26 | #include <mach/board.h> | ||
| 27 | #include <mach/common.h> | ||
| 28 | #include <mach/control.h> | ||
| 29 | #include <mach/timer-gp.h> | ||
| 30 | #include <asm/hardware/gic.h> | ||
| 31 | |||
| 32 | static struct platform_device sdp4430_lcd_device = { | ||
| 33 | .name = "sdp4430_lcd", | ||
| 34 | .id = -1, | ||
| 35 | }; | ||
| 36 | |||
| 37 | static struct platform_device *sdp4430_devices[] __initdata = { | ||
| 38 | &sdp4430_lcd_device, | ||
| 39 | }; | ||
| 40 | |||
| 41 | static struct omap_uart_config sdp4430_uart_config __initdata = { | ||
| 42 | .enabled_uarts = (1 << 0) | (1 << 1) | (1 << 2), | ||
| 43 | }; | ||
| 44 | |||
| 45 | static struct omap_lcd_config sdp4430_lcd_config __initdata = { | ||
| 46 | .ctrl_name = "internal", | ||
| 47 | }; | ||
| 48 | |||
| 49 | static struct omap_board_config_kernel sdp4430_config[] __initdata = { | ||
| 50 | { OMAP_TAG_UART, &sdp4430_uart_config }, | ||
| 51 | { OMAP_TAG_LCD, &sdp4430_lcd_config }, | ||
| 52 | }; | ||
| 53 | |||
| 54 | static void __init gic_init_irq(void) | ||
| 55 | { | ||
| 56 | gic_dist_init(0, IO_ADDRESS(OMAP44XX_GIC_DIST_BASE), 29); | ||
| 57 | gic_cpu_init(0, IO_ADDRESS(OMAP44XX_GIC_CPU_BASE)); | ||
| 58 | } | ||
| 59 | |||
| 60 | static void __init omap_4430sdp_init_irq(void) | ||
| 61 | { | ||
| 62 | omap2_init_common_hw(NULL); | ||
| 63 | #ifdef CONFIG_OMAP_32K_TIMER | ||
| 64 | omap2_gp_clockevent_set_gptimer(1); | ||
| 65 | #endif | ||
| 66 | gic_init_irq(); | ||
| 67 | omap_gpio_init(); | ||
| 68 | } | ||
| 69 | |||
| 70 | |||
| 71 | static void __init omap_4430sdp_init(void) | ||
| 72 | { | ||
| 73 | platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices)); | ||
| 74 | omap_board_config = sdp4430_config; | ||
| 75 | omap_board_config_size = ARRAY_SIZE(sdp4430_config); | ||
| 76 | omap_serial_init(); | ||
| 77 | } | ||
| 78 | |||
| 79 | static void __init omap_4430sdp_map_io(void) | ||
| 80 | { | ||
| 81 | omap2_set_globals_443x(); | ||
| 82 | omap2_map_common_io(); | ||
| 83 | } | ||
| 84 | |||
| 85 | MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board") | ||
| 86 | /* Maintainer: Santosh Shilimkar - Texas Instruments Inc */ | ||
| 87 | .phys_io = 0x48000000, | ||
| 88 | .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, | ||
| 89 | .boot_params = 0x80000100, | ||
| 90 | .map_io = omap_4430sdp_map_io, | ||
| 91 | .init_irq = omap_4430sdp_init_irq, | ||
| 92 | .init_machine = omap_4430sdp_init, | ||
| 93 | .timer = &omap_timer, | ||
| 94 | MACHINE_END | ||
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index da57b0fcda14..d8bc0a7dcb8d 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c | |||
| @@ -16,11 +16,13 @@ | |||
| 16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| 17 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
| 18 | #include <linux/input.h> | 18 | #include <linux/input.h> |
| 19 | #include <linux/gpio_keys.h> | ||
| 19 | #include <linux/workqueue.h> | 20 | #include <linux/workqueue.h> |
| 20 | #include <linux/err.h> | 21 | #include <linux/err.h> |
| 21 | #include <linux/clk.h> | 22 | #include <linux/clk.h> |
| 22 | #include <linux/spi/spi.h> | 23 | #include <linux/spi/spi.h> |
| 23 | #include <linux/spi/ads7846.h> | 24 | #include <linux/spi/ads7846.h> |
| 25 | #include <linux/regulator/machine.h> | ||
| 24 | #include <linux/i2c/twl4030.h> | 26 | #include <linux/i2c/twl4030.h> |
| 25 | #include <linux/io.h> | 27 | #include <linux/io.h> |
| 26 | #include <linux/smsc911x.h> | 28 | #include <linux/smsc911x.h> |
| @@ -39,6 +41,7 @@ | |||
| 39 | #include <asm/delay.h> | 41 | #include <asm/delay.h> |
| 40 | #include <mach/control.h> | 42 | #include <mach/control.h> |
| 41 | #include <mach/usb.h> | 43 | #include <mach/usb.h> |
| 44 | #include <mach/keypad.h> | ||
| 42 | 45 | ||
| 43 | #include "mmc-twl4030.h" | 46 | #include "mmc-twl4030.h" |
| 44 | 47 | ||
| @@ -77,8 +80,163 @@ static struct platform_device ldp_smsc911x_device = { | |||
| 77 | }, | 80 | }, |
| 78 | }; | 81 | }; |
| 79 | 82 | ||
| 80 | static struct platform_device *ldp_devices[] __initdata = { | 83 | static int ldp_twl4030_keymap[] = { |
| 81 | &ldp_smsc911x_device, | 84 | KEY(0, 0, KEY_1), |
| 85 | KEY(1, 0, KEY_2), | ||
| 86 | KEY(2, 0, KEY_3), | ||
| 87 | KEY(0, 1, KEY_4), | ||
| 88 | KEY(1, 1, KEY_5), | ||
| 89 | KEY(2, 1, KEY_6), | ||
| 90 | KEY(3, 1, KEY_F5), | ||
| 91 | KEY(0, 2, KEY_7), | ||
| 92 | KEY(1, 2, KEY_8), | ||
| 93 | KEY(2, 2, KEY_9), | ||
| 94 | KEY(3, 2, KEY_F6), | ||
| 95 | KEY(0, 3, KEY_F7), | ||
| 96 | KEY(1, 3, KEY_0), | ||
| 97 | KEY(2, 3, KEY_F8), | ||
| 98 | PERSISTENT_KEY(4, 5), | ||
| 99 | KEY(4, 4, KEY_VOLUMEUP), | ||
| 100 | KEY(5, 5, KEY_VOLUMEDOWN), | ||
| 101 | 0 | ||
| 102 | }; | ||
| 103 | |||
| 104 | static struct twl4030_keypad_data ldp_kp_twl4030_data = { | ||
| 105 | .rows = 6, | ||
| 106 | .cols = 6, | ||
| 107 | .keymap = ldp_twl4030_keymap, | ||
| 108 | .keymapsize = ARRAY_SIZE(ldp_twl4030_keymap), | ||
| 109 | .rep = 1, | ||
| 110 | }; | ||
| 111 | |||
| 112 | static struct gpio_keys_button ldp_gpio_keys_buttons[] = { | ||
| 113 | [0] = { | ||
| 114 | .code = KEY_ENTER, | ||
| 115 | .gpio = 101, | ||
| 116 | .desc = "enter sw", | ||
| 117 | .active_low = 1, | ||
| 118 | .debounce_interval = 30, | ||
| 119 | }, | ||
| 120 | [1] = { | ||
| 121 | .code = KEY_F1, | ||
| 122 | .gpio = 102, | ||
| 123 | .desc = "func 1", | ||
| 124 | .active_low = 1, | ||
| 125 | .debounce_interval = 30, | ||
| 126 | }, | ||
| 127 | [2] = { | ||
| 128 | .code = KEY_F2, | ||
| 129 | .gpio = 103, | ||
| 130 | .desc = "func 2", | ||
| 131 | .active_low = 1, | ||
| 132 | .debounce_interval = 30, | ||
| 133 | }, | ||
| 134 | [3] = { | ||
| 135 | .code = KEY_F3, | ||
| 136 | .gpio = 104, | ||
| 137 | .desc = "func 3", | ||
| 138 | .active_low = 1, | ||
| 139 | .debounce_interval = 30, | ||
| 140 | }, | ||
| 141 | [4] = { | ||
| 142 | .code = KEY_F4, | ||
| 143 | .gpio = 105, | ||
| 144 | .desc = "func 4", | ||
| 145 | .active_low = 1, | ||
| 146 | .debounce_interval = 30, | ||
| 147 | }, | ||
| 148 | [5] = { | ||
| 149 | .code = KEY_LEFT, | ||
| 150 | .gpio = 106, | ||
| 151 | .desc = "left sw", | ||
| 152 | .active_low = 1, | ||
| 153 | .debounce_interval = 30, | ||
| 154 | }, | ||
| 155 | [6] = { | ||
| 156 | .code = KEY_RIGHT, | ||
| 157 | .gpio = 107, | ||
| 158 | .desc = "right sw", | ||
| 159 | .active_low = 1, | ||
| 160 | .debounce_interval = 30, | ||
| 161 | }, | ||
| 162 | [7] = { | ||
| 163 | .code = KEY_UP, | ||
| 164 | .gpio = 108, | ||
| 165 | .desc = "up sw", | ||
| 166 | .active_low = 1, | ||
| 167 | .debounce_interval = 30, | ||
| 168 | }, | ||
| 169 | [8] = { | ||
| 170 | .code = KEY_DOWN, | ||
| 171 | .gpio = 109, | ||
| 172 | .desc = "down sw", | ||
| 173 | .active_low = 1, | ||
| 174 | .debounce_interval = 30, | ||
| 175 | }, | ||
| 176 | }; | ||
| 177 | |||
| 178 | static struct gpio_keys_platform_data ldp_gpio_keys = { | ||
| 179 | .buttons = ldp_gpio_keys_buttons, | ||
| 180 | .nbuttons = ARRAY_SIZE(ldp_gpio_keys_buttons), | ||
| 181 | .rep = 1, | ||
| 182 | }; | ||
| 183 | |||
| 184 | static struct platform_device ldp_gpio_keys_device = { | ||
| 185 | .name = "gpio-keys", | ||
| 186 | .id = -1, | ||
| 187 | .dev = { | ||
| 188 | .platform_data = &ldp_gpio_keys, | ||
| 189 | }, | ||
| 190 | }; | ||
| 191 | |||
| 192 | static int ts_gpio; | ||
| 193 | |||
| 194 | /** | ||
| 195 | * @brief ads7846_dev_init : Requests & sets GPIO line for pen-irq | ||
| 196 | * | ||
| 197 | * @return - void. If request gpio fails then Flag KERN_ERR. | ||
| 198 | */ | ||
| 199 | static void ads7846_dev_init(void) | ||
| 200 | { | ||
| 201 | if (gpio_request(ts_gpio, "ads7846 irq") < 0) { | ||
| 202 | printk(KERN_ERR "can't get ads746 pen down GPIO\n"); | ||
| 203 | return; | ||
| 204 | } | ||
| 205 | |||
| 206 | gpio_direction_input(ts_gpio); | ||
| 207 | omap_set_gpio_debounce(ts_gpio, 1); | ||
| 208 | omap_set_gpio_debounce_time(ts_gpio, 0xa); | ||
| 209 | } | ||
| 210 | |||
| 211 | static int ads7846_get_pendown_state(void) | ||
| 212 | { | ||
| 213 | return !gpio_get_value(ts_gpio); | ||
| 214 | } | ||
| 215 | |||
| 216 | static struct ads7846_platform_data tsc2046_config __initdata = { | ||
| 217 | .get_pendown_state = ads7846_get_pendown_state, | ||
| 218 | .keep_vref_on = 1, | ||
| 219 | }; | ||
| 220 | |||
| 221 | static struct omap2_mcspi_device_config tsc2046_mcspi_config = { | ||
| 222 | .turbo_mode = 0, | ||
| 223 | .single_channel = 1, /* 0: slave, 1: master */ | ||
| 224 | }; | ||
| 225 | |||
| 226 | static struct spi_board_info ldp_spi_board_info[] __initdata = { | ||
| 227 | [0] = { | ||
| 228 | /* | ||
| 229 | * TSC2046 operates at a max freqency of 2MHz, so | ||
| 230 | * operate slightly below at 1.5MHz | ||
| 231 | */ | ||
| 232 | .modalias = "ads7846", | ||
| 233 | .bus_num = 1, | ||
| 234 | .chip_select = 0, | ||
| 235 | .max_speed_hz = 1500000, | ||
| 236 | .controller_data = &tsc2046_mcspi_config, | ||
| 237 | .irq = 0, | ||
| 238 | .platform_data = &tsc2046_config, | ||
| 239 | }, | ||
| 82 | }; | 240 | }; |
| 83 | 241 | ||
| 84 | static inline void __init ldp_init_smsc911x(void) | 242 | static inline void __init ldp_init_smsc911x(void) |
| @@ -122,8 +280,22 @@ static struct omap_uart_config ldp_uart_config __initdata = { | |||
| 122 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), | 280 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), |
| 123 | }; | 281 | }; |
| 124 | 282 | ||
| 283 | static struct platform_device ldp_lcd_device = { | ||
| 284 | .name = "ldp_lcd", | ||
| 285 | .id = -1, | ||
| 286 | }; | ||
| 287 | |||
| 288 | static struct omap_lcd_config ldp_lcd_config __initdata = { | ||
| 289 | .ctrl_name = "internal", | ||
| 290 | }; | ||
| 291 | |||
| 125 | static struct omap_board_config_kernel ldp_config[] __initdata = { | 292 | static struct omap_board_config_kernel ldp_config[] __initdata = { |
| 126 | { OMAP_TAG_UART, &ldp_uart_config }, | 293 | { OMAP_TAG_UART, &ldp_uart_config }, |
| 294 | { OMAP_TAG_LCD, &ldp_lcd_config }, | ||
| 295 | }; | ||
| 296 | |||
| 297 | static struct twl4030_usb_data ldp_usb_data = { | ||
| 298 | .usb_mode = T2_USB_MODE_ULPI, | ||
| 127 | }; | 299 | }; |
| 128 | 300 | ||
| 129 | static struct twl4030_gpio_platform_data ldp_gpio_data = { | 301 | static struct twl4030_gpio_platform_data ldp_gpio_data = { |
| @@ -132,12 +304,39 @@ static struct twl4030_gpio_platform_data ldp_gpio_data = { | |||
| 132 | .irq_end = TWL4030_GPIO_IRQ_END, | 304 | .irq_end = TWL4030_GPIO_IRQ_END, |
| 133 | }; | 305 | }; |
| 134 | 306 | ||
| 307 | static struct twl4030_madc_platform_data ldp_madc_data = { | ||
| 308 | .irq_line = 1, | ||
| 309 | }; | ||
| 310 | |||
| 311 | static struct regulator_consumer_supply ldp_vmmc1_supply = { | ||
| 312 | .supply = "vmmc", | ||
| 313 | }; | ||
| 314 | |||
| 315 | /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */ | ||
| 316 | static struct regulator_init_data ldp_vmmc1 = { | ||
| 317 | .constraints = { | ||
| 318 | .min_uV = 1850000, | ||
| 319 | .max_uV = 3150000, | ||
| 320 | .valid_modes_mask = REGULATOR_MODE_NORMAL | ||
| 321 | | REGULATOR_MODE_STANDBY, | ||
| 322 | .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | ||
| 323 | | REGULATOR_CHANGE_MODE | ||
| 324 | | REGULATOR_CHANGE_STATUS, | ||
| 325 | }, | ||
| 326 | .num_consumer_supplies = 1, | ||
| 327 | .consumer_supplies = &ldp_vmmc1_supply, | ||
| 328 | }; | ||
| 329 | |||
| 135 | static struct twl4030_platform_data ldp_twldata = { | 330 | static struct twl4030_platform_data ldp_twldata = { |
| 136 | .irq_base = TWL4030_IRQ_BASE, | 331 | .irq_base = TWL4030_IRQ_BASE, |
| 137 | .irq_end = TWL4030_IRQ_END, | 332 | .irq_end = TWL4030_IRQ_END, |
| 138 | 333 | ||
| 139 | /* platform_data for children goes here */ | 334 | /* platform_data for children goes here */ |
| 335 | .madc = &ldp_madc_data, | ||
| 336 | .usb = &ldp_usb_data, | ||
| 337 | .vmmc1 = &ldp_vmmc1, | ||
| 140 | .gpio = &ldp_gpio_data, | 338 | .gpio = &ldp_gpio_data, |
| 339 | .keypad = &ldp_kp_twl4030_data, | ||
| 141 | }; | 340 | }; |
| 142 | 341 | ||
| 143 | static struct i2c_board_info __initdata ldp_i2c_boardinfo[] = { | 342 | static struct i2c_board_info __initdata ldp_i2c_boardinfo[] = { |
| @@ -168,15 +367,29 @@ static struct twl4030_hsmmc_info mmc[] __initdata = { | |||
| 168 | {} /* Terminator */ | 367 | {} /* Terminator */ |
| 169 | }; | 368 | }; |
| 170 | 369 | ||
| 370 | static struct platform_device *ldp_devices[] __initdata = { | ||
| 371 | &ldp_smsc911x_device, | ||
| 372 | &ldp_lcd_device, | ||
| 373 | &ldp_gpio_keys_device, | ||
| 374 | }; | ||
| 375 | |||
| 171 | static void __init omap_ldp_init(void) | 376 | static void __init omap_ldp_init(void) |
| 172 | { | 377 | { |
| 173 | omap_i2c_init(); | 378 | omap_i2c_init(); |
| 174 | platform_add_devices(ldp_devices, ARRAY_SIZE(ldp_devices)); | 379 | platform_add_devices(ldp_devices, ARRAY_SIZE(ldp_devices)); |
| 175 | omap_board_config = ldp_config; | 380 | omap_board_config = ldp_config; |
| 176 | omap_board_config_size = ARRAY_SIZE(ldp_config); | 381 | omap_board_config_size = ARRAY_SIZE(ldp_config); |
| 382 | ts_gpio = 54; | ||
| 383 | ldp_spi_board_info[0].irq = gpio_to_irq(ts_gpio); | ||
| 384 | spi_register_board_info(ldp_spi_board_info, | ||
| 385 | ARRAY_SIZE(ldp_spi_board_info)); | ||
| 386 | ads7846_dev_init(); | ||
| 177 | omap_serial_init(); | 387 | omap_serial_init(); |
| 178 | twl4030_mmc_init(mmc); | ||
| 179 | usb_musb_init(); | 388 | usb_musb_init(); |
| 389 | |||
| 390 | twl4030_mmc_init(mmc); | ||
| 391 | /* link regulators to MMC adapters */ | ||
| 392 | ldp_vmmc1_supply.dev = mmc[0].dev; | ||
| 180 | } | 393 | } |
| 181 | 394 | ||
| 182 | static void __init omap_ldp_map_io(void) | 395 | static void __init omap_ldp_map_io(void) |
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 3a7a29d1f9a7..991ac9c38032 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/mtd/partitions.h> | 28 | #include <linux/mtd/partitions.h> |
| 29 | #include <linux/mtd/nand.h> | 29 | #include <linux/mtd/nand.h> |
| 30 | 30 | ||
| 31 | #include <linux/regulator/machine.h> | ||
| 31 | #include <linux/i2c/twl4030.h> | 32 | #include <linux/i2c/twl4030.h> |
| 32 | 33 | ||
| 33 | #include <mach/hardware.h> | 34 | #include <mach/hardware.h> |
| @@ -105,6 +106,8 @@ static struct platform_device omap3beagle_nand_device = { | |||
| 105 | .resource = &omap3beagle_nand_resource, | 106 | .resource = &omap3beagle_nand_resource, |
| 106 | }; | 107 | }; |
| 107 | 108 | ||
| 109 | #include "sdram-micron-mt46h32m32lf-6.h" | ||
| 110 | |||
| 108 | static struct omap_uart_config omap3_beagle_uart_config __initdata = { | 111 | static struct omap_uart_config omap3_beagle_uart_config __initdata = { |
| 109 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), | 112 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), |
| 110 | }; | 113 | }; |
| @@ -118,6 +121,23 @@ static struct twl4030_hsmmc_info mmc[] = { | |||
| 118 | {} /* Terminator */ | 121 | {} /* Terminator */ |
| 119 | }; | 122 | }; |
| 120 | 123 | ||
| 124 | static struct platform_device omap3_beagle_lcd_device = { | ||
| 125 | .name = "omap3beagle_lcd", | ||
| 126 | .id = -1, | ||
| 127 | }; | ||
| 128 | |||
| 129 | static struct omap_lcd_config omap3_beagle_lcd_config __initdata = { | ||
| 130 | .ctrl_name = "internal", | ||
| 131 | }; | ||
| 132 | |||
| 133 | static struct regulator_consumer_supply beagle_vmmc1_supply = { | ||
| 134 | .supply = "vmmc", | ||
| 135 | }; | ||
| 136 | |||
| 137 | static struct regulator_consumer_supply beagle_vsim_supply = { | ||
| 138 | .supply = "vmmc_aux", | ||
| 139 | }; | ||
| 140 | |||
| 121 | static struct gpio_led gpio_leds[]; | 141 | static struct gpio_led gpio_leds[]; |
| 122 | 142 | ||
| 123 | static int beagle_twl_gpio_setup(struct device *dev, | 143 | static int beagle_twl_gpio_setup(struct device *dev, |
| @@ -128,6 +148,10 @@ static int beagle_twl_gpio_setup(struct device *dev, | |||
| 128 | mmc[0].gpio_cd = gpio + 0; | 148 | mmc[0].gpio_cd = gpio + 0; |
| 129 | twl4030_mmc_init(mmc); | 149 | twl4030_mmc_init(mmc); |
| 130 | 150 | ||
| 151 | /* link regulators to MMC adapters */ | ||
| 152 | beagle_vmmc1_supply.dev = mmc[0].dev; | ||
| 153 | beagle_vsim_supply.dev = mmc[0].dev; | ||
| 154 | |||
| 131 | /* REVISIT: need ehci-omap hooks for external VBUS | 155 | /* REVISIT: need ehci-omap hooks for external VBUS |
| 132 | * power switch and overcurrent detect | 156 | * power switch and overcurrent detect |
| 133 | */ | 157 | */ |
| @@ -156,12 +180,85 @@ static struct twl4030_gpio_platform_data beagle_gpio_data = { | |||
| 156 | .setup = beagle_twl_gpio_setup, | 180 | .setup = beagle_twl_gpio_setup, |
| 157 | }; | 181 | }; |
| 158 | 182 | ||
| 183 | static struct regulator_consumer_supply beagle_vdac_supply = { | ||
| 184 | .supply = "vdac", | ||
| 185 | .dev = &omap3_beagle_lcd_device.dev, | ||
| 186 | }; | ||
| 187 | |||
| 188 | static struct regulator_consumer_supply beagle_vdvi_supply = { | ||
| 189 | .supply = "vdvi", | ||
| 190 | .dev = &omap3_beagle_lcd_device.dev, | ||
| 191 | }; | ||
| 192 | |||
| 193 | /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */ | ||
| 194 | static struct regulator_init_data beagle_vmmc1 = { | ||
| 195 | .constraints = { | ||
| 196 | .min_uV = 1850000, | ||
| 197 | .max_uV = 3150000, | ||
| 198 | .valid_modes_mask = REGULATOR_MODE_NORMAL | ||
| 199 | | REGULATOR_MODE_STANDBY, | ||
| 200 | .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | ||
| 201 | | REGULATOR_CHANGE_MODE | ||
| 202 | | REGULATOR_CHANGE_STATUS, | ||
| 203 | }, | ||
| 204 | .num_consumer_supplies = 1, | ||
| 205 | .consumer_supplies = &beagle_vmmc1_supply, | ||
| 206 | }; | ||
| 207 | |||
| 208 | /* VSIM for MMC1 pins DAT4..DAT7 (2 mA, plus card == max 50 mA) */ | ||
| 209 | static struct regulator_init_data beagle_vsim = { | ||
| 210 | .constraints = { | ||
| 211 | .min_uV = 1800000, | ||
| 212 | .max_uV = 3000000, | ||
| 213 | .valid_modes_mask = REGULATOR_MODE_NORMAL | ||
| 214 | | REGULATOR_MODE_STANDBY, | ||
| 215 | .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | ||
| 216 | | REGULATOR_CHANGE_MODE | ||
| 217 | | REGULATOR_CHANGE_STATUS, | ||
| 218 | }, | ||
| 219 | .num_consumer_supplies = 1, | ||
| 220 | .consumer_supplies = &beagle_vsim_supply, | ||
| 221 | }; | ||
| 222 | |||
| 223 | /* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */ | ||
| 224 | static struct regulator_init_data beagle_vdac = { | ||
| 225 | .constraints = { | ||
| 226 | .min_uV = 1800000, | ||
| 227 | .max_uV = 1800000, | ||
| 228 | .valid_modes_mask = REGULATOR_MODE_NORMAL | ||
| 229 | | REGULATOR_MODE_STANDBY, | ||
| 230 | .valid_ops_mask = REGULATOR_CHANGE_MODE | ||
| 231 | | REGULATOR_CHANGE_STATUS, | ||
| 232 | }, | ||
| 233 | .num_consumer_supplies = 1, | ||
| 234 | .consumer_supplies = &beagle_vdac_supply, | ||
| 235 | }; | ||
| 236 | |||
| 237 | /* VPLL2 for digital video outputs */ | ||
| 238 | static struct regulator_init_data beagle_vpll2 = { | ||
| 239 | .constraints = { | ||
| 240 | .name = "VDVI", | ||
| 241 | .min_uV = 1800000, | ||
| 242 | .max_uV = 1800000, | ||
| 243 | .valid_modes_mask = REGULATOR_MODE_NORMAL | ||
| 244 | | REGULATOR_MODE_STANDBY, | ||
| 245 | .valid_ops_mask = REGULATOR_CHANGE_MODE | ||
| 246 | | REGULATOR_CHANGE_STATUS, | ||
| 247 | }, | ||
| 248 | .num_consumer_supplies = 1, | ||
| 249 | .consumer_supplies = &beagle_vdvi_supply, | ||
| 250 | }; | ||
| 251 | |||
| 159 | static struct twl4030_platform_data beagle_twldata = { | 252 | static struct twl4030_platform_data beagle_twldata = { |
| 160 | .irq_base = TWL4030_IRQ_BASE, | 253 | .irq_base = TWL4030_IRQ_BASE, |
| 161 | .irq_end = TWL4030_IRQ_END, | 254 | .irq_end = TWL4030_IRQ_END, |
| 162 | 255 | ||
| 163 | /* platform_data for children goes here */ | 256 | /* platform_data for children goes here */ |
| 164 | .gpio = &beagle_gpio_data, | 257 | .gpio = &beagle_gpio_data, |
| 258 | .vmmc1 = &beagle_vmmc1, | ||
| 259 | .vsim = &beagle_vsim, | ||
| 260 | .vdac = &beagle_vdac, | ||
| 261 | .vpll2 = &beagle_vpll2, | ||
| 165 | }; | 262 | }; |
| 166 | 263 | ||
| 167 | static struct i2c_board_info __initdata beagle_i2c_boardinfo[] = { | 264 | static struct i2c_board_info __initdata beagle_i2c_boardinfo[] = { |
| @@ -185,7 +282,7 @@ static int __init omap3_beagle_i2c_init(void) | |||
| 185 | 282 | ||
| 186 | static void __init omap3_beagle_init_irq(void) | 283 | static void __init omap3_beagle_init_irq(void) |
| 187 | { | 284 | { |
| 188 | omap2_init_common_hw(NULL); | 285 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params); |
| 189 | omap_init_irq(); | 286 | omap_init_irq(); |
| 190 | #ifdef CONFIG_OMAP_32K_TIMER | 287 | #ifdef CONFIG_OMAP_32K_TIMER |
| 191 | omap2_gp_clockevent_set_gptimer(12); | 288 | omap2_gp_clockevent_set_gptimer(12); |
| @@ -193,15 +290,6 @@ static void __init omap3_beagle_init_irq(void) | |||
| 193 | omap_gpio_init(); | 290 | omap_gpio_init(); |
| 194 | } | 291 | } |
| 195 | 292 | ||
| 196 | static struct platform_device omap3_beagle_lcd_device = { | ||
| 197 | .name = "omap3beagle_lcd", | ||
| 198 | .id = -1, | ||
| 199 | }; | ||
| 200 | |||
| 201 | static struct omap_lcd_config omap3_beagle_lcd_config __initdata = { | ||
| 202 | .ctrl_name = "internal", | ||
| 203 | }; | ||
| 204 | |||
| 205 | static struct gpio_led gpio_leds[] = { | 293 | static struct gpio_led gpio_leds[] = { |
| 206 | { | 294 | { |
| 207 | .name = "beagleboard::usr0", | 295 | .name = "beagleboard::usr0", |
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c new file mode 100644 index 000000000000..d3cc145814d0 --- /dev/null +++ b/arch/arm/mach-omap2/board-omap3evm.c | |||
| @@ -0,0 +1,329 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-omap2/board-omap3evm.c | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008 Texas Instruments | ||
| 5 | * | ||
| 6 | * Modified from mach-omap2/board-3430sdp.c | ||
| 7 | * | ||
| 8 | * Initial code: Syed Mohammed Khasim | ||
| 9 | * | ||
| 10 | * This program is free software; you can redistribute it and/or modify | ||
| 11 | * it under the terms of the GNU General Public License version 2 as | ||
| 12 | * published by the Free Software Foundation. | ||
| 13 | */ | ||
| 14 | |||
| 15 | #include <linux/kernel.h> | ||
| 16 | #include <linux/init.h> | ||
| 17 | #include <linux/platform_device.h> | ||
| 18 | #include <linux/delay.h> | ||
| 19 | #include <linux/err.h> | ||
| 20 | #include <linux/clk.h> | ||
| 21 | #include <linux/gpio.h> | ||
| 22 | #include <linux/input.h> | ||
| 23 | #include <linux/leds.h> | ||
| 24 | |||
| 25 | #include <linux/spi/spi.h> | ||
| 26 | #include <linux/spi/ads7846.h> | ||
| 27 | #include <linux/i2c/twl4030.h> | ||
| 28 | |||
| 29 | #include <mach/hardware.h> | ||
| 30 | #include <asm/mach-types.h> | ||
| 31 | #include <asm/mach/arch.h> | ||
| 32 | #include <asm/mach/map.h> | ||
| 33 | |||
| 34 | #include <mach/board.h> | ||
| 35 | #include <mach/mux.h> | ||
| 36 | #include <mach/usb.h> | ||
| 37 | #include <mach/common.h> | ||
| 38 | #include <mach/mcspi.h> | ||
| 39 | #include <mach/keypad.h> | ||
| 40 | |||
| 41 | #include "sdram-micron-mt46h32m32lf-6.h" | ||
| 42 | #include "mmc-twl4030.h" | ||
| 43 | |||
| 44 | #define OMAP3_EVM_TS_GPIO 175 | ||
| 45 | |||
| 46 | #define OMAP3EVM_ETHR_START 0x2c000000 | ||
| 47 | #define OMAP3EVM_ETHR_SIZE 1024 | ||
| 48 | #define OMAP3EVM_ETHR_GPIO_IRQ 176 | ||
| 49 | #define OMAP3EVM_SMC911X_CS 5 | ||
| 50 | |||
| 51 | static struct resource omap3evm_smc911x_resources[] = { | ||
| 52 | [0] = { | ||
| 53 | .start = OMAP3EVM_ETHR_START, | ||
| 54 | .end = (OMAP3EVM_ETHR_START + OMAP3EVM_ETHR_SIZE - 1), | ||
| 55 | .flags = IORESOURCE_MEM, | ||
| 56 | }, | ||
| 57 | [1] = { | ||
| 58 | .start = OMAP_GPIO_IRQ(OMAP3EVM_ETHR_GPIO_IRQ), | ||
| 59 | .end = OMAP_GPIO_IRQ(OMAP3EVM_ETHR_GPIO_IRQ), | ||
| 60 | .flags = IORESOURCE_IRQ, | ||
| 61 | }, | ||
| 62 | }; | ||
| 63 | |||
| 64 | static struct platform_device omap3evm_smc911x_device = { | ||
| 65 | .name = "smc911x", | ||
| 66 | .id = -1, | ||
| 67 | .num_resources = ARRAY_SIZE(omap3evm_smc911x_resources), | ||
| 68 | .resource = &omap3evm_smc911x_resources[0], | ||
| 69 | }; | ||
| 70 | |||
| 71 | static inline void __init omap3evm_init_smc911x(void) | ||
| 72 | { | ||
| 73 | int eth_cs; | ||
| 74 | struct clk *l3ck; | ||
| 75 | unsigned int rate; | ||
| 76 | |||
| 77 | eth_cs = OMAP3EVM_SMC911X_CS; | ||
| 78 | |||
| 79 | l3ck = clk_get(NULL, "l3_ck"); | ||
| 80 | if (IS_ERR(l3ck)) | ||
| 81 | rate = 100000000; | ||
| 82 | else | ||
| 83 | rate = clk_get_rate(l3ck); | ||
| 84 | |||
| 85 | if (gpio_request(OMAP3EVM_ETHR_GPIO_IRQ, "SMC911x irq") < 0) { | ||
| 86 | printk(KERN_ERR "Failed to request GPIO%d for smc911x IRQ\n", | ||
| 87 | OMAP3EVM_ETHR_GPIO_IRQ); | ||
| 88 | return; | ||
| 89 | } | ||
| 90 | |||
| 91 | gpio_direction_input(OMAP3EVM_ETHR_GPIO_IRQ); | ||
| 92 | } | ||
| 93 | |||
| 94 | static struct omap_uart_config omap3_evm_uart_config __initdata = { | ||
| 95 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), | ||
| 96 | }; | ||
| 97 | |||
| 98 | static struct twl4030_hsmmc_info mmc[] = { | ||
| 99 | { | ||
| 100 | .mmc = 1, | ||
| 101 | .wires = 4, | ||
| 102 | .gpio_cd = -EINVAL, | ||
| 103 | .gpio_wp = 63, | ||
| 104 | }, | ||
| 105 | {} /* Terminator */ | ||
| 106 | }; | ||
| 107 | |||
| 108 | static struct gpio_led gpio_leds[] = { | ||
| 109 | { | ||
| 110 | .name = "omap3evm::ledb", | ||
| 111 | /* normally not visible (board underside) */ | ||
| 112 | .default_trigger = "default-on", | ||
| 113 | .gpio = -EINVAL, /* gets replaced */ | ||
| 114 | .active_low = true, | ||
| 115 | }, | ||
| 116 | }; | ||
| 117 | |||
| 118 | static struct gpio_led_platform_data gpio_led_info = { | ||
| 119 | .leds = gpio_leds, | ||
| 120 | .num_leds = ARRAY_SIZE(gpio_leds), | ||
| 121 | }; | ||
| 122 | |||
| 123 | static struct platform_device leds_gpio = { | ||
| 124 | .name = "leds-gpio", | ||
| 125 | .id = -1, | ||
| 126 | .dev = { | ||
| 127 | .platform_data = &gpio_led_info, | ||
| 128 | }, | ||
| 129 | }; | ||
| 130 | |||
| 131 | |||
| 132 | static int omap3evm_twl_gpio_setup(struct device *dev, | ||
| 133 | unsigned gpio, unsigned ngpio) | ||
| 134 | { | ||
| 135 | /* gpio + 0 is "mmc0_cd" (input/IRQ) */ | ||
| 136 | omap_cfg_reg(L8_34XX_GPIO63); | ||
| 137 | mmc[0].gpio_cd = gpio + 0; | ||
| 138 | twl4030_mmc_init(mmc); | ||
| 139 | |||
| 140 | /* | ||
| 141 | * Most GPIOs are for USB OTG. Some are mostly sent to | ||
| 142 | * the P2 connector; notably LEDA for the LCD backlight. | ||
| 143 | */ | ||
| 144 | |||
| 145 | /* TWL4030_GPIO_MAX + 1 == ledB (out, active low LED) */ | ||
| 146 | gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; | ||
| 147 | |||
| 148 | platform_device_register(&leds_gpio); | ||
| 149 | |||
| 150 | return 0; | ||
| 151 | } | ||
| 152 | |||
| 153 | static struct twl4030_gpio_platform_data omap3evm_gpio_data = { | ||
| 154 | .gpio_base = OMAP_MAX_GPIO_LINES, | ||
| 155 | .irq_base = TWL4030_GPIO_IRQ_BASE, | ||
| 156 | .irq_end = TWL4030_GPIO_IRQ_END, | ||
| 157 | .use_leds = true, | ||
| 158 | .setup = omap3evm_twl_gpio_setup, | ||
| 159 | }; | ||
| 160 | |||
| 161 | static struct twl4030_usb_data omap3evm_usb_data = { | ||
| 162 | .usb_mode = T2_USB_MODE_ULPI, | ||
| 163 | }; | ||
| 164 | |||
| 165 | static int omap3evm_keymap[] = { | ||
| 166 | KEY(0, 0, KEY_LEFT), | ||
| 167 | KEY(0, 1, KEY_RIGHT), | ||
| 168 | KEY(0, 2, KEY_A), | ||
| 169 | KEY(0, 3, KEY_B), | ||
| 170 | KEY(1, 0, KEY_DOWN), | ||
| 171 | KEY(1, 1, KEY_UP), | ||
| 172 | KEY(1, 2, KEY_E), | ||
| 173 | KEY(1, 3, KEY_F), | ||
| 174 | KEY(2, 0, KEY_ENTER), | ||
| 175 | KEY(2, 1, KEY_I), | ||
| 176 | KEY(2, 2, KEY_J), | ||
| 177 | KEY(2, 3, KEY_K), | ||
| 178 | KEY(3, 0, KEY_M), | ||
| 179 | KEY(3, 1, KEY_N), | ||
| 180 | KEY(3, 2, KEY_O), | ||
| 181 | KEY(3, 3, KEY_P) | ||
| 182 | }; | ||
| 183 | |||
| 184 | static struct twl4030_keypad_data omap3evm_kp_data = { | ||
| 185 | .rows = 4, | ||
| 186 | .cols = 4, | ||
| 187 | .keymap = omap3evm_keymap, | ||
| 188 | .keymapsize = ARRAY_SIZE(omap3evm_keymap), | ||
| 189 | .rep = 1, | ||
| 190 | }; | ||
| 191 | |||
| 192 | static struct twl4030_madc_platform_data omap3evm_madc_data = { | ||
| 193 | .irq_line = 1, | ||
| 194 | }; | ||
| 195 | |||
| 196 | static struct twl4030_platform_data omap3evm_twldata = { | ||
| 197 | .irq_base = TWL4030_IRQ_BASE, | ||
| 198 | .irq_end = TWL4030_IRQ_END, | ||
| 199 | |||
| 200 | /* platform_data for children goes here */ | ||
| 201 | .keypad = &omap3evm_kp_data, | ||
| 202 | .madc = &omap3evm_madc_data, | ||
| 203 | .usb = &omap3evm_usb_data, | ||
| 204 | .gpio = &omap3evm_gpio_data, | ||
| 205 | }; | ||
| 206 | |||
| 207 | static struct i2c_board_info __initdata omap3evm_i2c_boardinfo[] = { | ||
| 208 | { | ||
| 209 | I2C_BOARD_INFO("twl4030", 0x48), | ||
| 210 | .flags = I2C_CLIENT_WAKE, | ||
| 211 | .irq = INT_34XX_SYS_NIRQ, | ||
| 212 | .platform_data = &omap3evm_twldata, | ||
| 213 | }, | ||
| 214 | }; | ||
| 215 | |||
| 216 | static int __init omap3_evm_i2c_init(void) | ||
| 217 | { | ||
| 218 | omap_register_i2c_bus(1, 2600, omap3evm_i2c_boardinfo, | ||
| 219 | ARRAY_SIZE(omap3evm_i2c_boardinfo)); | ||
| 220 | omap_register_i2c_bus(2, 400, NULL, 0); | ||
| 221 | omap_register_i2c_bus(3, 400, NULL, 0); | ||
| 222 | return 0; | ||
| 223 | } | ||
| 224 | |||
| 225 | static struct platform_device omap3_evm_lcd_device = { | ||
| 226 | .name = "omap3evm_lcd", | ||
| 227 | .id = -1, | ||
| 228 | }; | ||
| 229 | |||
| 230 | static struct omap_lcd_config omap3_evm_lcd_config __initdata = { | ||
| 231 | .ctrl_name = "internal", | ||
| 232 | }; | ||
| 233 | |||
| 234 | static void ads7846_dev_init(void) | ||
| 235 | { | ||
| 236 | if (gpio_request(OMAP3_EVM_TS_GPIO, "ADS7846 pendown") < 0) | ||
| 237 | printk(KERN_ERR "can't get ads7846 pen down GPIO\n"); | ||
| 238 | |||
| 239 | gpio_direction_input(OMAP3_EVM_TS_GPIO); | ||
| 240 | |||
| 241 | omap_set_gpio_debounce(OMAP3_EVM_TS_GPIO, 1); | ||
| 242 | omap_set_gpio_debounce_time(OMAP3_EVM_TS_GPIO, 0xa); | ||
| 243 | } | ||
| 244 | |||
| 245 | static int ads7846_get_pendown_state(void) | ||
| 246 | { | ||
| 247 | return !gpio_get_value(OMAP3_EVM_TS_GPIO); | ||
| 248 | } | ||
| 249 | |||
| 250 | struct ads7846_platform_data ads7846_config = { | ||
| 251 | .x_max = 0x0fff, | ||
| 252 | .y_max = 0x0fff, | ||
| 253 | .x_plate_ohms = 180, | ||
| 254 | .pressure_max = 255, | ||
| 255 | .debounce_max = 10, | ||
| 256 | .debounce_tol = 3, | ||
| 257 | .debounce_rep = 1, | ||
| 258 | .get_pendown_state = ads7846_get_pendown_state, | ||
| 259 | .keep_vref_on = 1, | ||
| 260 | .settle_delay_usecs = 150, | ||
| 261 | }; | ||
| 262 | |||
| 263 | static struct omap2_mcspi_device_config ads7846_mcspi_config = { | ||
| 264 | .turbo_mode = 0, | ||
| 265 | .single_channel = 1, /* 0: slave, 1: master */ | ||
| 266 | }; | ||
| 267 | |||
| 268 | struct spi_board_info omap3evm_spi_board_info[] = { | ||
| 269 | [0] = { | ||
| 270 | .modalias = "ads7846", | ||
| 271 | .bus_num = 1, | ||
| 272 | .chip_select = 0, | ||
| 273 | .max_speed_hz = 1500000, | ||
| 274 | .controller_data = &ads7846_mcspi_config, | ||
| 275 | .irq = OMAP_GPIO_IRQ(OMAP3_EVM_TS_GPIO), | ||
| 276 | .platform_data = &ads7846_config, | ||
| 277 | }, | ||
| 278 | }; | ||
| 279 | |||
| 280 | static void __init omap3_evm_init_irq(void) | ||
| 281 | { | ||
| 282 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params); | ||
| 283 | omap_init_irq(); | ||
| 284 | omap_gpio_init(); | ||
| 285 | omap3evm_init_smc911x(); | ||
| 286 | } | ||
| 287 | |||
| 288 | static struct omap_board_config_kernel omap3_evm_config[] __initdata = { | ||
| 289 | { OMAP_TAG_UART, &omap3_evm_uart_config }, | ||
| 290 | { OMAP_TAG_LCD, &omap3_evm_lcd_config }, | ||
| 291 | }; | ||
| 292 | |||
| 293 | static struct platform_device *omap3_evm_devices[] __initdata = { | ||
| 294 | &omap3_evm_lcd_device, | ||
| 295 | &omap3evm_smc911x_device, | ||
| 296 | }; | ||
| 297 | |||
| 298 | static void __init omap3_evm_init(void) | ||
| 299 | { | ||
| 300 | omap3_evm_i2c_init(); | ||
| 301 | |||
| 302 | platform_add_devices(omap3_evm_devices, ARRAY_SIZE(omap3_evm_devices)); | ||
| 303 | omap_board_config = omap3_evm_config; | ||
| 304 | omap_board_config_size = ARRAY_SIZE(omap3_evm_config); | ||
| 305 | |||
| 306 | spi_register_board_info(omap3evm_spi_board_info, | ||
| 307 | ARRAY_SIZE(omap3evm_spi_board_info)); | ||
| 308 | |||
| 309 | omap_serial_init(); | ||
| 310 | usb_musb_init(); | ||
| 311 | ads7846_dev_init(); | ||
| 312 | } | ||
| 313 | |||
| 314 | static void __init omap3_evm_map_io(void) | ||
| 315 | { | ||
| 316 | omap2_set_globals_343x(); | ||
| 317 | omap2_map_common_io(); | ||
| 318 | } | ||
| 319 | |||
| 320 | MACHINE_START(OMAP3EVM, "OMAP3 EVM") | ||
| 321 | /* Maintainer: Syed Mohammed Khasim - Texas Instruments */ | ||
| 322 | .phys_io = 0x48000000, | ||
| 323 | .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, | ||
| 324 | .boot_params = 0x80000100, | ||
| 325 | .map_io = omap3_evm_map_io, | ||
| 326 | .init_irq = omap3_evm_init_irq, | ||
| 327 | .init_machine = omap3_evm_init, | ||
| 328 | .timer = &omap_timer, | ||
| 329 | MACHINE_END | ||
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index 402f09c6cf10..e32aa23ce962 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c | |||
| @@ -23,7 +23,11 @@ | |||
| 23 | 23 | ||
| 24 | #include <linux/spi/spi.h> | 24 | #include <linux/spi/spi.h> |
| 25 | #include <linux/spi/ads7846.h> | 25 | #include <linux/spi/ads7846.h> |
| 26 | #include <linux/regulator/machine.h> | ||
| 26 | #include <linux/i2c/twl4030.h> | 27 | #include <linux/i2c/twl4030.h> |
| 28 | #include <linux/leds.h> | ||
| 29 | #include <linux/input.h> | ||
| 30 | #include <linux/gpio_keys.h> | ||
| 27 | 31 | ||
| 28 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
| 29 | #include <asm/mach/arch.h> | 33 | #include <asm/mach/arch.h> |
| @@ -35,11 +39,154 @@ | |||
| 35 | #include <mach/hardware.h> | 39 | #include <mach/hardware.h> |
| 36 | #include <mach/mcspi.h> | 40 | #include <mach/mcspi.h> |
| 37 | #include <mach/usb.h> | 41 | #include <mach/usb.h> |
| 42 | #include <mach/keypad.h> | ||
| 38 | 43 | ||
| 44 | #include "sdram-micron-mt46h32m32lf-6.h" | ||
| 39 | #include "mmc-twl4030.h" | 45 | #include "mmc-twl4030.h" |
| 40 | 46 | ||
| 41 | #define OMAP3_PANDORA_TS_GPIO 94 | 47 | #define OMAP3_PANDORA_TS_GPIO 94 |
| 42 | 48 | ||
| 49 | /* hardware debounce: (value + 1) * 31us */ | ||
| 50 | #define GPIO_DEBOUNCE_TIME 127 | ||
| 51 | |||
| 52 | static struct gpio_led pandora_gpio_leds[] = { | ||
| 53 | { | ||
| 54 | .name = "pandora::sd1", | ||
| 55 | .default_trigger = "mmc0", | ||
| 56 | .gpio = 128, | ||
| 57 | }, { | ||
| 58 | .name = "pandora::sd2", | ||
| 59 | .default_trigger = "mmc1", | ||
| 60 | .gpio = 129, | ||
| 61 | }, { | ||
| 62 | .name = "pandora::bluetooth", | ||
| 63 | .gpio = 158, | ||
| 64 | }, { | ||
| 65 | .name = "pandora::wifi", | ||
| 66 | .gpio = 159, | ||
| 67 | }, | ||
| 68 | }; | ||
| 69 | |||
| 70 | static struct gpio_led_platform_data pandora_gpio_led_data = { | ||
| 71 | .leds = pandora_gpio_leds, | ||
| 72 | .num_leds = ARRAY_SIZE(pandora_gpio_leds), | ||
| 73 | }; | ||
| 74 | |||
| 75 | static struct platform_device pandora_leds_gpio = { | ||
| 76 | .name = "leds-gpio", | ||
| 77 | .id = -1, | ||
| 78 | .dev = { | ||
| 79 | .platform_data = &pandora_gpio_led_data, | ||
| 80 | }, | ||
| 81 | }; | ||
| 82 | |||
| 83 | #define GPIO_BUTTON(gpio_num, ev_type, ev_code, act_low, descr) \ | ||
| 84 | { \ | ||
| 85 | .gpio = gpio_num, \ | ||
| 86 | .type = ev_type, \ | ||
| 87 | .code = ev_code, \ | ||
| 88 | .active_low = act_low, \ | ||
| 89 | .desc = "btn " descr, \ | ||
| 90 | } | ||
| 91 | |||
| 92 | #define GPIO_BUTTON_LOW(gpio_num, event_code, description) \ | ||
| 93 | GPIO_BUTTON(gpio_num, EV_KEY, event_code, 1, description) | ||
| 94 | |||
| 95 | static struct gpio_keys_button pandora_gpio_keys[] = { | ||
| 96 | GPIO_BUTTON_LOW(110, KEY_UP, "up"), | ||
| 97 | GPIO_BUTTON_LOW(103, KEY_DOWN, "down"), | ||
| 98 | GPIO_BUTTON_LOW(96, KEY_LEFT, "left"), | ||
| 99 | GPIO_BUTTON_LOW(98, KEY_RIGHT, "right"), | ||
| 100 | GPIO_BUTTON_LOW(111, BTN_A, "a"), | ||
| 101 | GPIO_BUTTON_LOW(106, BTN_B, "b"), | ||
| 102 | GPIO_BUTTON_LOW(109, BTN_X, "x"), | ||
| 103 | GPIO_BUTTON_LOW(101, BTN_Y, "y"), | ||
| 104 | GPIO_BUTTON_LOW(102, BTN_TL, "l"), | ||
| 105 | GPIO_BUTTON_LOW(97, BTN_TL2, "l2"), | ||
| 106 | GPIO_BUTTON_LOW(105, BTN_TR, "r"), | ||
| 107 | GPIO_BUTTON_LOW(107, BTN_TR2, "r2"), | ||
| 108 | GPIO_BUTTON_LOW(104, KEY_LEFTCTRL, "ctrl"), | ||
| 109 | GPIO_BUTTON_LOW(99, KEY_MENU, "menu"), | ||
| 110 | GPIO_BUTTON_LOW(176, KEY_COFFEE, "hold"), | ||
| 111 | GPIO_BUTTON(100, EV_KEY, KEY_LEFTALT, 0, "alt"), | ||
| 112 | GPIO_BUTTON(108, EV_SW, SW_LID, 1, "lid"), | ||
| 113 | }; | ||
| 114 | |||
| 115 | static struct gpio_keys_platform_data pandora_gpio_key_info = { | ||
| 116 | .buttons = pandora_gpio_keys, | ||
| 117 | .nbuttons = ARRAY_SIZE(pandora_gpio_keys), | ||
| 118 | }; | ||
| 119 | |||
| 120 | static struct platform_device pandora_keys_gpio = { | ||
| 121 | .name = "gpio-keys", | ||
| 122 | .id = -1, | ||
| 123 | .dev = { | ||
| 124 | .platform_data = &pandora_gpio_key_info, | ||
| 125 | }, | ||
| 126 | }; | ||
| 127 | |||
| 128 | static void __init pandora_keys_gpio_init(void) | ||
| 129 | { | ||
| 130 | /* set debounce time for GPIO banks 4 and 6 */ | ||
| 131 | omap_set_gpio_debounce_time(32 * 3, GPIO_DEBOUNCE_TIME); | ||
| 132 | omap_set_gpio_debounce_time(32 * 5, GPIO_DEBOUNCE_TIME); | ||
| 133 | } | ||
| 134 | |||
| 135 | static int pandora_keypad_map[] = { | ||
| 136 | /* col, row, code */ | ||
| 137 | KEY(0, 0, KEY_9), | ||
| 138 | KEY(0, 1, KEY_0), | ||
| 139 | KEY(0, 2, KEY_BACKSPACE), | ||
| 140 | KEY(0, 3, KEY_O), | ||
| 141 | KEY(0, 4, KEY_P), | ||
| 142 | KEY(0, 5, KEY_K), | ||
| 143 | KEY(0, 6, KEY_L), | ||
| 144 | KEY(0, 7, KEY_ENTER), | ||
| 145 | KEY(1, 0, KEY_8), | ||
| 146 | KEY(1, 1, KEY_7), | ||
| 147 | KEY(1, 2, KEY_6), | ||
| 148 | KEY(1, 3, KEY_5), | ||
| 149 | KEY(1, 4, KEY_4), | ||
| 150 | KEY(1, 5, KEY_3), | ||
| 151 | KEY(1, 6, KEY_2), | ||
| 152 | KEY(1, 7, KEY_1), | ||
| 153 | KEY(2, 0, KEY_I), | ||
| 154 | KEY(2, 1, KEY_U), | ||
| 155 | KEY(2, 2, KEY_Y), | ||
| 156 | KEY(2, 3, KEY_T), | ||
| 157 | KEY(2, 4, KEY_R), | ||
| 158 | KEY(2, 5, KEY_E), | ||
| 159 | KEY(2, 6, KEY_W), | ||
| 160 | KEY(2, 7, KEY_Q), | ||
| 161 | KEY(3, 0, KEY_J), | ||
| 162 | KEY(3, 1, KEY_H), | ||
| 163 | KEY(3, 2, KEY_G), | ||
| 164 | KEY(3, 3, KEY_F), | ||
| 165 | KEY(3, 4, KEY_D), | ||
| 166 | KEY(3, 5, KEY_S), | ||
| 167 | KEY(3, 6, KEY_A), | ||
| 168 | KEY(3, 7, KEY_LEFTSHIFT), | ||
| 169 | KEY(4, 0, KEY_N), | ||
| 170 | KEY(4, 1, KEY_B), | ||
| 171 | KEY(4, 2, KEY_V), | ||
| 172 | KEY(4, 3, KEY_C), | ||
| 173 | KEY(4, 4, KEY_X), | ||
| 174 | KEY(4, 5, KEY_Z), | ||
| 175 | KEY(4, 6, KEY_DOT), | ||
| 176 | KEY(4, 7, KEY_COMMA), | ||
| 177 | KEY(5, 0, KEY_M), | ||
| 178 | KEY(5, 1, KEY_SPACE), | ||
| 179 | KEY(5, 2, KEY_FN), | ||
| 180 | }; | ||
| 181 | |||
| 182 | static struct twl4030_keypad_data pandora_kp_data = { | ||
| 183 | .rows = 8, | ||
| 184 | .cols = 6, | ||
| 185 | .keymap = pandora_keypad_map, | ||
| 186 | .keymapsize = ARRAY_SIZE(pandora_keypad_map), | ||
| 187 | .rep = 1, | ||
| 188 | }; | ||
| 189 | |||
| 43 | static struct twl4030_hsmmc_info omap3pandora_mmc[] = { | 190 | static struct twl4030_hsmmc_info omap3pandora_mmc[] = { |
| 44 | { | 191 | { |
| 45 | .mmc = 1, | 192 | .mmc = 1, |
| @@ -69,6 +216,14 @@ static struct omap_uart_config omap3pandora_uart_config __initdata = { | |||
| 69 | .enabled_uarts = (1 << 2), /* UART3 */ | 216 | .enabled_uarts = (1 << 2), /* UART3 */ |
| 70 | }; | 217 | }; |
| 71 | 218 | ||
| 219 | static struct regulator_consumer_supply pandora_vmmc1_supply = { | ||
| 220 | .supply = "vmmc", | ||
| 221 | }; | ||
| 222 | |||
| 223 | static struct regulator_consumer_supply pandora_vmmc2_supply = { | ||
| 224 | .supply = "vmmc", | ||
| 225 | }; | ||
| 226 | |||
| 72 | static int omap3pandora_twl_gpio_setup(struct device *dev, | 227 | static int omap3pandora_twl_gpio_setup(struct device *dev, |
| 73 | unsigned gpio, unsigned ngpio) | 228 | unsigned gpio, unsigned ngpio) |
| 74 | { | 229 | { |
| @@ -77,6 +232,10 @@ static int omap3pandora_twl_gpio_setup(struct device *dev, | |||
| 77 | omap3pandora_mmc[1].gpio_cd = gpio + 1; | 232 | omap3pandora_mmc[1].gpio_cd = gpio + 1; |
| 78 | twl4030_mmc_init(omap3pandora_mmc); | 233 | twl4030_mmc_init(omap3pandora_mmc); |
| 79 | 234 | ||
| 235 | /* link regulators to MMC adapters */ | ||
| 236 | pandora_vmmc1_supply.dev = omap3pandora_mmc[0].dev; | ||
| 237 | pandora_vmmc2_supply.dev = omap3pandora_mmc[1].dev; | ||
| 238 | |||
| 80 | return 0; | 239 | return 0; |
| 81 | } | 240 | } |
| 82 | 241 | ||
| @@ -87,6 +246,36 @@ static struct twl4030_gpio_platform_data omap3pandora_gpio_data = { | |||
| 87 | .setup = omap3pandora_twl_gpio_setup, | 246 | .setup = omap3pandora_twl_gpio_setup, |
| 88 | }; | 247 | }; |
| 89 | 248 | ||
| 249 | /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */ | ||
| 250 | static struct regulator_init_data pandora_vmmc1 = { | ||
| 251 | .constraints = { | ||
| 252 | .min_uV = 1850000, | ||
| 253 | .max_uV = 3150000, | ||
| 254 | .valid_modes_mask = REGULATOR_MODE_NORMAL | ||
| 255 | | REGULATOR_MODE_STANDBY, | ||
| 256 | .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | ||
| 257 | | REGULATOR_CHANGE_MODE | ||
| 258 | | REGULATOR_CHANGE_STATUS, | ||
| 259 | }, | ||
| 260 | .num_consumer_supplies = 1, | ||
| 261 | .consumer_supplies = &pandora_vmmc1_supply, | ||
| 262 | }; | ||
| 263 | |||
| 264 | /* VMMC2 for MMC2 pins CMD, CLK, DAT0..DAT3 (max 100 mA) */ | ||
| 265 | static struct regulator_init_data pandora_vmmc2 = { | ||
| 266 | .constraints = { | ||
| 267 | .min_uV = 1850000, | ||
| 268 | .max_uV = 3150000, | ||
| 269 | .valid_modes_mask = REGULATOR_MODE_NORMAL | ||
| 270 | | REGULATOR_MODE_STANDBY, | ||
| 271 | .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | ||
| 272 | | REGULATOR_CHANGE_MODE | ||
| 273 | | REGULATOR_CHANGE_STATUS, | ||
| 274 | }, | ||
| 275 | .num_consumer_supplies = 1, | ||
| 276 | .consumer_supplies = &pandora_vmmc2_supply, | ||
| 277 | }; | ||
| 278 | |||
| 90 | static struct twl4030_usb_data omap3pandora_usb_data = { | 279 | static struct twl4030_usb_data omap3pandora_usb_data = { |
| 91 | .usb_mode = T2_USB_MODE_ULPI, | 280 | .usb_mode = T2_USB_MODE_ULPI, |
| 92 | }; | 281 | }; |
| @@ -96,6 +285,9 @@ static struct twl4030_platform_data omap3pandora_twldata = { | |||
| 96 | .irq_end = TWL4030_IRQ_END, | 285 | .irq_end = TWL4030_IRQ_END, |
| 97 | .gpio = &omap3pandora_gpio_data, | 286 | .gpio = &omap3pandora_gpio_data, |
| 98 | .usb = &omap3pandora_usb_data, | 287 | .usb = &omap3pandora_usb_data, |
| 288 | .vmmc1 = &pandora_vmmc1, | ||
| 289 | .vmmc2 = &pandora_vmmc2, | ||
| 290 | .keypad = &pandora_kp_data, | ||
| 99 | }; | 291 | }; |
| 100 | 292 | ||
| 101 | static struct i2c_board_info __initdata omap3pandora_i2c_boardinfo[] = { | 293 | static struct i2c_board_info __initdata omap3pandora_i2c_boardinfo[] = { |
| @@ -118,7 +310,7 @@ static int __init omap3pandora_i2c_init(void) | |||
| 118 | 310 | ||
| 119 | static void __init omap3pandora_init_irq(void) | 311 | static void __init omap3pandora_init_irq(void) |
| 120 | { | 312 | { |
| 121 | omap2_init_common_hw(NULL); | 313 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params); |
| 122 | omap_init_irq(); | 314 | omap_init_irq(); |
| 123 | omap_gpio_init(); | 315 | omap_gpio_init(); |
| 124 | } | 316 | } |
| @@ -188,6 +380,8 @@ static struct omap_board_config_kernel omap3pandora_config[] __initdata = { | |||
| 188 | 380 | ||
| 189 | static struct platform_device *omap3pandora_devices[] __initdata = { | 381 | static struct platform_device *omap3pandora_devices[] __initdata = { |
| 190 | &omap3pandora_lcd_device, | 382 | &omap3pandora_lcd_device, |
| 383 | &pandora_leds_gpio, | ||
| 384 | &pandora_keys_gpio, | ||
| 191 | }; | 385 | }; |
| 192 | 386 | ||
| 193 | static void __init omap3pandora_init(void) | 387 | static void __init omap3pandora_init(void) |
| @@ -201,6 +395,7 @@ static void __init omap3pandora_init(void) | |||
| 201 | spi_register_board_info(omap3pandora_spi_board_info, | 395 | spi_register_board_info(omap3pandora_spi_board_info, |
| 202 | ARRAY_SIZE(omap3pandora_spi_board_info)); | 396 | ARRAY_SIZE(omap3pandora_spi_board_info)); |
| 203 | omap3pandora_ads7846_init(); | 397 | omap3pandora_ads7846_init(); |
| 398 | pandora_keys_gpio_init(); | ||
| 204 | usb_musb_init(); | 399 | usb_musb_init(); |
| 205 | } | 400 | } |
| 206 | 401 | ||
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index b1f23bea863f..dff5528fbfb5 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
| 29 | #include <linux/i2c/twl4030.h> | 29 | #include <linux/i2c/twl4030.h> |
| 30 | #include <linux/regulator/machine.h> | ||
| 30 | 31 | ||
| 31 | #include <linux/mtd/mtd.h> | 32 | #include <linux/mtd/mtd.h> |
| 32 | #include <linux/mtd/nand.h> | 33 | #include <linux/mtd/nand.h> |
| @@ -45,6 +46,7 @@ | |||
| 45 | #include <mach/nand.h> | 46 | #include <mach/nand.h> |
| 46 | #include <mach/usb.h> | 47 | #include <mach/usb.h> |
| 47 | 48 | ||
| 49 | #include "sdram-micron-mt46h32m32lf-6.h" | ||
| 48 | #include "mmc-twl4030.h" | 50 | #include "mmc-twl4030.h" |
| 49 | 51 | ||
| 50 | #define OVERO_GPIO_BT_XGATE 15 | 52 | #define OVERO_GPIO_BT_XGATE 15 |
| @@ -271,21 +273,76 @@ static struct omap_uart_config overo_uart_config __initdata = { | |||
| 271 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), | 273 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), |
| 272 | }; | 274 | }; |
| 273 | 275 | ||
| 276 | static struct twl4030_hsmmc_info mmc[] = { | ||
| 277 | { | ||
| 278 | .mmc = 1, | ||
| 279 | .wires = 4, | ||
| 280 | .gpio_cd = -EINVAL, | ||
| 281 | .gpio_wp = -EINVAL, | ||
| 282 | }, | ||
| 283 | { | ||
| 284 | .mmc = 2, | ||
| 285 | .wires = 4, | ||
| 286 | .gpio_cd = -EINVAL, | ||
| 287 | .gpio_wp = -EINVAL, | ||
| 288 | .transceiver = true, | ||
| 289 | .ocr_mask = 0x00100000, /* 3.3V */ | ||
| 290 | }, | ||
| 291 | {} /* Terminator */ | ||
| 292 | }; | ||
| 293 | |||
| 294 | static struct regulator_consumer_supply overo_vmmc1_supply = { | ||
| 295 | .supply = "vmmc", | ||
| 296 | }; | ||
| 297 | |||
| 298 | static int overo_twl_gpio_setup(struct device *dev, | ||
| 299 | unsigned gpio, unsigned ngpio) | ||
| 300 | { | ||
| 301 | twl4030_mmc_init(mmc); | ||
| 302 | |||
| 303 | overo_vmmc1_supply.dev = mmc[0].dev; | ||
| 304 | |||
| 305 | return 0; | ||
| 306 | } | ||
| 307 | |||
| 274 | static struct twl4030_gpio_platform_data overo_gpio_data = { | 308 | static struct twl4030_gpio_platform_data overo_gpio_data = { |
| 275 | .gpio_base = OMAP_MAX_GPIO_LINES, | 309 | .gpio_base = OMAP_MAX_GPIO_LINES, |
| 276 | .irq_base = TWL4030_GPIO_IRQ_BASE, | 310 | .irq_base = TWL4030_GPIO_IRQ_BASE, |
| 277 | .irq_end = TWL4030_GPIO_IRQ_END, | 311 | .irq_end = TWL4030_GPIO_IRQ_END, |
| 312 | .setup = overo_twl_gpio_setup, | ||
| 313 | }; | ||
| 314 | |||
| 315 | static struct twl4030_usb_data overo_usb_data = { | ||
| 316 | .usb_mode = T2_USB_MODE_ULPI, | ||
| 317 | }; | ||
| 318 | |||
| 319 | static struct regulator_init_data overo_vmmc1 = { | ||
| 320 | .constraints = { | ||
| 321 | .min_uV = 1850000, | ||
| 322 | .max_uV = 3150000, | ||
| 323 | .valid_modes_mask = REGULATOR_MODE_NORMAL | ||
| 324 | | REGULATOR_MODE_STANDBY, | ||
| 325 | .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | ||
| 326 | | REGULATOR_CHANGE_MODE | ||
| 327 | | REGULATOR_CHANGE_STATUS, | ||
| 328 | }, | ||
| 329 | .num_consumer_supplies = 1, | ||
| 330 | .consumer_supplies = &overo_vmmc1_supply, | ||
| 278 | }; | 331 | }; |
| 279 | 332 | ||
| 333 | /* mmc2 (WLAN) and Bluetooth don't use twl4030 regulators */ | ||
| 334 | |||
| 280 | static struct twl4030_platform_data overo_twldata = { | 335 | static struct twl4030_platform_data overo_twldata = { |
| 281 | .irq_base = TWL4030_IRQ_BASE, | 336 | .irq_base = TWL4030_IRQ_BASE, |
| 282 | .irq_end = TWL4030_IRQ_END, | 337 | .irq_end = TWL4030_IRQ_END, |
| 283 | .gpio = &overo_gpio_data, | 338 | .gpio = &overo_gpio_data, |
| 339 | .usb = &overo_usb_data, | ||
| 340 | .vmmc1 = &overo_vmmc1, | ||
| 284 | }; | 341 | }; |
| 285 | 342 | ||
| 286 | static struct i2c_board_info __initdata overo_i2c_boardinfo[] = { | 343 | static struct i2c_board_info __initdata overo_i2c_boardinfo[] = { |
| 287 | { | 344 | { |
| 288 | I2C_BOARD_INFO("twl4030", 0x48), | 345 | I2C_BOARD_INFO("tps65950", 0x48), |
| 289 | .flags = I2C_CLIENT_WAKE, | 346 | .flags = I2C_CLIENT_WAKE, |
| 290 | .irq = INT_34XX_SYS_NIRQ, | 347 | .irq = INT_34XX_SYS_NIRQ, |
| 291 | .platform_data = &overo_twldata, | 348 | .platform_data = &overo_twldata, |
| @@ -303,7 +360,7 @@ static int __init overo_i2c_init(void) | |||
| 303 | 360 | ||
| 304 | static void __init overo_init_irq(void) | 361 | static void __init overo_init_irq(void) |
| 305 | { | 362 | { |
| 306 | omap2_init_common_hw(NULL); | 363 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params); |
| 307 | omap_init_irq(); | 364 | omap_init_irq(); |
| 308 | omap_gpio_init(); | 365 | omap_gpio_init(); |
| 309 | } | 366 | } |
| @@ -326,23 +383,6 @@ static struct platform_device *overo_devices[] __initdata = { | |||
| 326 | &overo_lcd_device, | 383 | &overo_lcd_device, |
| 327 | }; | 384 | }; |
| 328 | 385 | ||
| 329 | static struct twl4030_hsmmc_info mmc[] __initdata = { | ||
| 330 | { | ||
| 331 | .mmc = 1, | ||
| 332 | .wires = 4, | ||
| 333 | .gpio_cd = -EINVAL, | ||
| 334 | .gpio_wp = -EINVAL, | ||
| 335 | }, | ||
| 336 | { | ||
| 337 | .mmc = 2, | ||
| 338 | .wires = 4, | ||
| 339 | .gpio_cd = -EINVAL, | ||
| 340 | .gpio_wp = -EINVAL, | ||
| 341 | .transceiver = true, | ||
| 342 | }, | ||
| 343 | {} /* Terminator */ | ||
| 344 | }; | ||
| 345 | |||
| 346 | static void __init overo_init(void) | 386 | static void __init overo_init(void) |
| 347 | { | 387 | { |
| 348 | overo_i2c_init(); | 388 | overo_i2c_init(); |
| @@ -350,7 +390,6 @@ static void __init overo_init(void) | |||
| 350 | omap_board_config = overo_config; | 390 | omap_board_config = overo_config; |
| 351 | omap_board_config_size = ARRAY_SIZE(overo_config); | 391 | omap_board_config_size = ARRAY_SIZE(overo_config); |
| 352 | omap_serial_init(); | 392 | omap_serial_init(); |
| 353 | twl4030_mmc_init(mmc); | ||
| 354 | overo_flash_init(); | 393 | overo_flash_init(); |
| 355 | usb_musb_init(); | 394 | usb_musb_init(); |
| 356 | overo_ads7846_init(); | 395 | overo_ads7846_init(); |
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index a7381729645c..da93b86234ed 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |||
| @@ -27,30 +27,13 @@ | |||
| 27 | #include <mach/dma.h> | 27 | #include <mach/dma.h> |
| 28 | #include <mach/gpmc.h> | 28 | #include <mach/gpmc.h> |
| 29 | #include <mach/keypad.h> | 29 | #include <mach/keypad.h> |
| 30 | #include <mach/onenand.h> | ||
| 31 | #include <mach/gpmc-smc91x.h> | ||
| 30 | 32 | ||
| 31 | #include "mmc-twl4030.h" | 33 | #include "mmc-twl4030.h" |
| 32 | 34 | ||
| 33 | 35 | #define SYSTEM_REV_B_USES_VAUX3 0x1699 | |
| 34 | #define SMC91X_CS 1 | 36 | #define SYSTEM_REV_S_USES_VAUX3 0x8 |
| 35 | #define SMC91X_GPIO_IRQ 54 | ||
| 36 | #define SMC91X_GPIO_RESET 164 | ||
| 37 | #define SMC91X_GPIO_PWRDWN 86 | ||
| 38 | |||
| 39 | static struct resource rx51_smc91x_resources[] = { | ||
| 40 | [0] = { | ||
| 41 | .flags = IORESOURCE_MEM, | ||
| 42 | }, | ||
| 43 | [1] = { | ||
| 44 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, | ||
| 45 | }, | ||
| 46 | }; | ||
| 47 | |||
| 48 | static struct platform_device rx51_smc91x_device = { | ||
| 49 | .name = "smc91x", | ||
| 50 | .id = -1, | ||
| 51 | .num_resources = ARRAY_SIZE(rx51_smc91x_resources), | ||
| 52 | .resource = rx51_smc91x_resources, | ||
| 53 | }; | ||
| 54 | 37 | ||
| 55 | static int rx51_keymap[] = { | 38 | static int rx51_keymap[] = { |
| 56 | KEY(0, 0, KEY_Q), | 39 | KEY(0, 0, KEY_Q), |
| @@ -107,98 +90,6 @@ static struct twl4030_keypad_data rx51_kp_data = { | |||
| 107 | .rep = 1, | 90 | .rep = 1, |
| 108 | }; | 91 | }; |
| 109 | 92 | ||
| 110 | static struct platform_device *rx51_peripherals_devices[] = { | ||
| 111 | &rx51_smc91x_device, | ||
| 112 | }; | ||
| 113 | |||
| 114 | /* | ||
| 115 | * Timings are taken from smsc-lan91c96-ms.pdf | ||
| 116 | */ | ||
| 117 | static int smc91x_init_gpmc(int cs) | ||
| 118 | { | ||
| 119 | struct gpmc_timings t; | ||
| 120 | const int t2_r = 45; /* t2 in Figure 12.10 */ | ||
| 121 | const int t2_w = 30; /* t2 in Figure 12.11 */ | ||
| 122 | const int t3 = 15; /* t3 in Figure 12.10 */ | ||
| 123 | const int t5_r = 0; /* t5 in Figure 12.10 */ | ||
| 124 | const int t6_r = 45; /* t6 in Figure 12.10 */ | ||
| 125 | const int t6_w = 0; /* t6 in Figure 12.11 */ | ||
| 126 | const int t7_w = 15; /* t7 in Figure 12.11 */ | ||
| 127 | const int t15 = 12; /* t15 in Figure 12.2 */ | ||
| 128 | const int t20 = 185; /* t20 in Figure 12.2 */ | ||
| 129 | |||
| 130 | memset(&t, 0, sizeof(t)); | ||
| 131 | |||
| 132 | t.cs_on = t15; | ||
| 133 | t.cs_rd_off = t3 + t2_r + t5_r; /* Figure 12.10 */ | ||
| 134 | t.cs_wr_off = t3 + t2_w + t6_w; /* Figure 12.11 */ | ||
| 135 | t.adv_on = t3; /* Figure 12.10 */ | ||
| 136 | t.adv_rd_off = t3 + t2_r; /* Figure 12.10 */ | ||
| 137 | t.adv_wr_off = t3 + t2_w; /* Figure 12.11 */ | ||
| 138 | t.oe_off = t3 + t2_r + t5_r; /* Figure 12.10 */ | ||
| 139 | t.oe_on = t.oe_off - t6_r; /* Figure 12.10 */ | ||
| 140 | t.we_off = t3 + t2_w + t6_w; /* Figure 12.11 */ | ||
| 141 | t.we_on = t.we_off - t7_w; /* Figure 12.11 */ | ||
| 142 | t.rd_cycle = t20; /* Figure 12.2 */ | ||
| 143 | t.wr_cycle = t20; /* Figure 12.4 */ | ||
| 144 | t.access = t3 + t2_r + t5_r; /* Figure 12.10 */ | ||
| 145 | t.wr_access = t3 + t2_w + t6_w; /* Figure 12.11 */ | ||
| 146 | |||
| 147 | gpmc_cs_write_reg(cs, GPMC_CS_CONFIG1, GPMC_CONFIG1_DEVICESIZE_16); | ||
| 148 | |||
| 149 | return gpmc_cs_set_timings(cs, &t); | ||
| 150 | } | ||
| 151 | |||
| 152 | static void __init rx51_init_smc91x(void) | ||
| 153 | { | ||
| 154 | unsigned long cs_mem_base; | ||
| 155 | int ret; | ||
| 156 | |||
| 157 | omap_cfg_reg(U8_34XX_GPIO54_DOWN); | ||
| 158 | omap_cfg_reg(G25_34XX_GPIO86_OUT); | ||
| 159 | omap_cfg_reg(H19_34XX_GPIO164_OUT); | ||
| 160 | |||
| 161 | if (gpmc_cs_request(SMC91X_CS, SZ_16M, &cs_mem_base) < 0) { | ||
| 162 | printk(KERN_ERR "Failed to request GPMC mem for smc91x\n"); | ||
| 163 | return; | ||
| 164 | } | ||
| 165 | |||
| 166 | rx51_smc91x_resources[0].start = cs_mem_base + 0x300; | ||
| 167 | rx51_smc91x_resources[0].end = cs_mem_base + 0x30f; | ||
| 168 | |||
| 169 | smc91x_init_gpmc(SMC91X_CS); | ||
| 170 | |||
| 171 | if (gpio_request(SMC91X_GPIO_IRQ, "SMC91X irq") < 0) | ||
| 172 | goto free1; | ||
| 173 | |||
| 174 | gpio_direction_input(SMC91X_GPIO_IRQ); | ||
| 175 | rx51_smc91x_resources[1].start = gpio_to_irq(SMC91X_GPIO_IRQ); | ||
| 176 | |||
| 177 | ret = gpio_request(SMC91X_GPIO_PWRDWN, "SMC91X powerdown"); | ||
| 178 | if (ret) | ||
| 179 | goto free2; | ||
| 180 | gpio_direction_output(SMC91X_GPIO_PWRDWN, 0); | ||
| 181 | |||
| 182 | ret = gpio_request(SMC91X_GPIO_RESET, "SMC91X reset"); | ||
| 183 | if (ret) | ||
| 184 | goto free3; | ||
| 185 | gpio_direction_output(SMC91X_GPIO_RESET, 0); | ||
| 186 | gpio_set_value(SMC91X_GPIO_RESET, 1); | ||
| 187 | msleep(100); | ||
| 188 | gpio_set_value(SMC91X_GPIO_RESET, 0); | ||
| 189 | |||
| 190 | return; | ||
| 191 | |||
| 192 | free3: | ||
| 193 | gpio_free(SMC91X_GPIO_PWRDWN); | ||
| 194 | free2: | ||
| 195 | gpio_free(SMC91X_GPIO_IRQ); | ||
| 196 | free1: | ||
| 197 | gpmc_cs_free(SMC91X_CS); | ||
| 198 | |||
| 199 | printk(KERN_ERR "Could not initialize smc91x\n"); | ||
| 200 | } | ||
| 201 | |||
| 202 | static struct twl4030_madc_platform_data rx51_madc_data = { | 93 | static struct twl4030_madc_platform_data rx51_madc_data = { |
| 203 | .irq_line = 1, | 94 | .irq_line = 1, |
| 204 | }; | 95 | }; |
| @@ -259,7 +150,7 @@ static struct regulator_init_data rx51_vaux2 = { | |||
| 259 | }; | 150 | }; |
| 260 | 151 | ||
| 261 | /* VAUX3 - adds more power to VIO_18 rail */ | 152 | /* VAUX3 - adds more power to VIO_18 rail */ |
| 262 | static struct regulator_init_data rx51_vaux3 = { | 153 | static struct regulator_init_data rx51_vaux3_cam = { |
| 263 | .constraints = { | 154 | .constraints = { |
| 264 | .name = "VCAM_DIG_18", | 155 | .name = "VCAM_DIG_18", |
| 265 | .min_uV = 1800000, | 156 | .min_uV = 1800000, |
| @@ -272,6 +163,22 @@ static struct regulator_init_data rx51_vaux3 = { | |||
| 272 | }, | 163 | }, |
| 273 | }; | 164 | }; |
| 274 | 165 | ||
| 166 | static struct regulator_init_data rx51_vaux3_mmc = { | ||
| 167 | .constraints = { | ||
| 168 | .name = "VMMC2_30", | ||
| 169 | .min_uV = 2800000, | ||
| 170 | .max_uV = 3000000, | ||
| 171 | .apply_uV = true, | ||
| 172 | .valid_modes_mask = REGULATOR_MODE_NORMAL | ||
| 173 | | REGULATOR_MODE_STANDBY, | ||
| 174 | .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | ||
| 175 | | REGULATOR_CHANGE_MODE | ||
| 176 | | REGULATOR_CHANGE_STATUS, | ||
| 177 | }, | ||
| 178 | .num_consumer_supplies = 1, | ||
| 179 | .consumer_supplies = &rx51_vmmc2_supply, | ||
| 180 | }; | ||
| 181 | |||
| 275 | static struct regulator_init_data rx51_vaux4 = { | 182 | static struct regulator_init_data rx51_vaux4 = { |
| 276 | .constraints = { | 183 | .constraints = { |
| 277 | .name = "VCAM_ANA_28", | 184 | .name = "VCAM_ANA_28", |
| @@ -382,10 +289,8 @@ static struct twl4030_platform_data rx51_twldata = { | |||
| 382 | 289 | ||
| 383 | .vaux1 = &rx51_vaux1, | 290 | .vaux1 = &rx51_vaux1, |
| 384 | .vaux2 = &rx51_vaux2, | 291 | .vaux2 = &rx51_vaux2, |
| 385 | .vaux3 = &rx51_vaux3, | ||
| 386 | .vaux4 = &rx51_vaux4, | 292 | .vaux4 = &rx51_vaux4, |
| 387 | .vmmc1 = &rx51_vmmc1, | 293 | .vmmc1 = &rx51_vmmc1, |
| 388 | .vmmc2 = &rx51_vmmc2, | ||
| 389 | .vsim = &rx51_vsim, | 294 | .vsim = &rx51_vsim, |
| 390 | .vdac = &rx51_vdac, | 295 | .vdac = &rx51_vdac, |
| 391 | }; | 296 | }; |
| @@ -401,6 +306,13 @@ static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_1[] = { | |||
| 401 | 306 | ||
| 402 | static int __init rx51_i2c_init(void) | 307 | static int __init rx51_i2c_init(void) |
| 403 | { | 308 | { |
| 309 | if ((system_rev >= SYSTEM_REV_S_USES_VAUX3 && system_rev < 0x100) || | ||
| 310 | system_rev >= SYSTEM_REV_B_USES_VAUX3) | ||
| 311 | rx51_twldata.vaux3 = &rx51_vaux3_mmc; | ||
| 312 | else { | ||
| 313 | rx51_twldata.vaux3 = &rx51_vaux3_cam; | ||
| 314 | rx51_twldata.vmmc2 = &rx51_vmmc2; | ||
| 315 | } | ||
| 404 | omap_register_i2c_bus(1, 2600, rx51_peripherals_i2c_board_info_1, | 316 | omap_register_i2c_bus(1, 2600, rx51_peripherals_i2c_board_info_1, |
| 405 | ARRAY_SIZE(rx51_peripherals_i2c_board_info_1)); | 317 | ARRAY_SIZE(rx51_peripherals_i2c_board_info_1)); |
| 406 | omap_register_i2c_bus(2, 100, NULL, 0); | 318 | omap_register_i2c_bus(2, 100, NULL, 0); |
| @@ -408,12 +320,94 @@ static int __init rx51_i2c_init(void) | |||
| 408 | return 0; | 320 | return 0; |
| 409 | } | 321 | } |
| 410 | 322 | ||
| 323 | #if defined(CONFIG_MTD_ONENAND_OMAP2) || \ | ||
| 324 | defined(CONFIG_MTD_ONENAND_OMAP2_MODULE) | ||
| 325 | |||
| 326 | static struct mtd_partition onenand_partitions[] = { | ||
| 327 | { | ||
| 328 | .name = "bootloader", | ||
| 329 | .offset = 0, | ||
| 330 | .size = 0x20000, | ||
| 331 | .mask_flags = MTD_WRITEABLE, /* Force read-only */ | ||
| 332 | }, | ||
| 333 | { | ||
| 334 | .name = "config", | ||
| 335 | .offset = MTDPART_OFS_APPEND, | ||
| 336 | .size = 0x60000, | ||
| 337 | }, | ||
| 338 | { | ||
| 339 | .name = "log", | ||
| 340 | .offset = MTDPART_OFS_APPEND, | ||
| 341 | .size = 0x40000, | ||
| 342 | }, | ||
| 343 | { | ||
| 344 | .name = "kernel", | ||
| 345 | .offset = MTDPART_OFS_APPEND, | ||
| 346 | .size = 0x200000, | ||
| 347 | }, | ||
| 348 | { | ||
| 349 | .name = "initfs", | ||
| 350 | .offset = MTDPART_OFS_APPEND, | ||
| 351 | .size = 0x200000, | ||
| 352 | }, | ||
| 353 | { | ||
| 354 | .name = "rootfs", | ||
| 355 | .offset = MTDPART_OFS_APPEND, | ||
| 356 | .size = MTDPART_SIZ_FULL, | ||
| 357 | }, | ||
| 358 | }; | ||
| 359 | |||
| 360 | static struct omap_onenand_platform_data board_onenand_data = { | ||
| 361 | .cs = 0, | ||
| 362 | .gpio_irq = 65, | ||
| 363 | .parts = onenand_partitions, | ||
| 364 | .nr_parts = ARRAY_SIZE(onenand_partitions), | ||
| 365 | }; | ||
| 366 | |||
| 367 | static void __init board_onenand_init(void) | ||
| 368 | { | ||
| 369 | gpmc_onenand_init(&board_onenand_data); | ||
| 370 | } | ||
| 371 | |||
| 372 | #else | ||
| 373 | |||
| 374 | static inline void board_onenand_init(void) | ||
| 375 | { | ||
| 376 | } | ||
| 377 | |||
| 378 | #endif | ||
| 379 | |||
| 380 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) | ||
| 381 | |||
| 382 | static struct omap_smc91x_platform_data board_smc91x_data = { | ||
| 383 | .cs = 1, | ||
| 384 | .gpio_irq = 54, | ||
| 385 | .gpio_pwrdwn = 86, | ||
| 386 | .gpio_reset = 164, | ||
| 387 | .flags = GPMC_TIMINGS_SMC91C96 | IORESOURCE_IRQ_HIGHLEVEL, | ||
| 388 | }; | ||
| 389 | |||
| 390 | static void __init board_smc91x_init(void) | ||
| 391 | { | ||
| 392 | omap_cfg_reg(U8_34XX_GPIO54_DOWN); | ||
| 393 | omap_cfg_reg(G25_34XX_GPIO86_OUT); | ||
| 394 | omap_cfg_reg(H19_34XX_GPIO164_OUT); | ||
| 395 | |||
| 396 | gpmc_smc91x_init(&board_smc91x_data); | ||
| 397 | } | ||
| 398 | |||
| 399 | #else | ||
| 400 | |||
| 401 | static inline void board_smc91x_init(void) | ||
| 402 | { | ||
| 403 | } | ||
| 404 | |||
| 405 | #endif | ||
| 411 | 406 | ||
| 412 | void __init rx51_peripherals_init(void) | 407 | void __init rx51_peripherals_init(void) |
| 413 | { | 408 | { |
| 414 | platform_add_devices(rx51_peripherals_devices, | ||
| 415 | ARRAY_SIZE(rx51_peripherals_devices)); | ||
| 416 | rx51_i2c_init(); | 409 | rx51_i2c_init(); |
| 417 | rx51_init_smc91x(); | 410 | board_onenand_init(); |
| 411 | board_smc91x_init(); | ||
| 418 | } | 412 | } |
| 419 | 413 | ||
diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c new file mode 100644 index 000000000000..bac5c4321ff7 --- /dev/null +++ b/arch/arm/mach-omap2/board-zoom-debugboard.c | |||
| @@ -0,0 +1,160 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2009 Texas Instruments Inc. | ||
| 3 | * Mikkel Christensen <mlc@ti.com> | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or modify | ||
| 6 | * it under the terms of the GNU General Public License version 2 as | ||
| 7 | * published by the Free Software Foundation. | ||
| 8 | */ | ||
| 9 | |||
| 10 | #include <linux/kernel.h> | ||
| 11 | #include <linux/init.h> | ||
| 12 | #include <linux/gpio.h> | ||
| 13 | #include <linux/serial_8250.h> | ||
| 14 | #include <linux/smsc911x.h> | ||
| 15 | |||
| 16 | #include <mach/gpmc.h> | ||
| 17 | |||
| 18 | #define ZOOM2_SMSC911X_CS 7 | ||
| 19 | #define ZOOM2_SMSC911X_GPIO 158 | ||
| 20 | #define ZOOM2_QUADUART_CS 3 | ||
| 21 | #define ZOOM2_QUADUART_GPIO 102 | ||
| 22 | #define QUART_CLK 1843200 | ||
| 23 | #define DEBUG_BASE 0x08000000 | ||
| 24 | #define ZOOM2_ETHR_START DEBUG_BASE | ||
| 25 | |||
| 26 | static struct resource zoom2_smsc911x_resources[] = { | ||
| 27 | [0] = { | ||
| 28 | .start = ZOOM2_ETHR_START, | ||
| 29 | .end = ZOOM2_ETHR_START + SZ_4K, | ||
| 30 | .flags = IORESOURCE_MEM, | ||
| 31 | }, | ||
| 32 | [1] = { | ||
| 33 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL, | ||
| 34 | }, | ||
| 35 | }; | ||
| 36 | |||
| 37 | static struct smsc911x_platform_config zoom2_smsc911x_config = { | ||
| 38 | .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW, | ||
| 39 | .irq_type = SMSC911X_IRQ_TYPE_OPEN_DRAIN, | ||
| 40 | .flags = SMSC911X_USE_32BIT, | ||
| 41 | .phy_interface = PHY_INTERFACE_MODE_MII, | ||
| 42 | }; | ||
| 43 | |||
| 44 | static struct platform_device zoom2_smsc911x_device = { | ||
| 45 | .name = "smsc911x", | ||
| 46 | .id = -1, | ||
| 47 | .num_resources = ARRAY_SIZE(zoom2_smsc911x_resources), | ||
| 48 | .resource = zoom2_smsc911x_resources, | ||
| 49 | .dev = { | ||
| 50 | .platform_data = &zoom2_smsc911x_config, | ||
| 51 | }, | ||
| 52 | }; | ||
| 53 | |||
| 54 | static inline void __init zoom2_init_smsc911x(void) | ||
| 55 | { | ||
| 56 | int eth_cs; | ||
| 57 | unsigned long cs_mem_base; | ||
| 58 | int eth_gpio = 0; | ||
| 59 | |||
| 60 | eth_cs = ZOOM2_SMSC911X_CS; | ||
| 61 | |||
| 62 | if (gpmc_cs_request(eth_cs, SZ_16M, &cs_mem_base) < 0) { | ||
| 63 | printk(KERN_ERR "Failed to request GPMC mem for smsc911x\n"); | ||
| 64 | return; | ||
| 65 | } | ||
| 66 | |||
| 67 | zoom2_smsc911x_resources[0].start = cs_mem_base + 0x0; | ||
| 68 | zoom2_smsc911x_resources[0].end = cs_mem_base + 0xff; | ||
| 69 | |||
| 70 | eth_gpio = ZOOM2_SMSC911X_GPIO; | ||
| 71 | |||
| 72 | zoom2_smsc911x_resources[1].start = OMAP_GPIO_IRQ(eth_gpio); | ||
| 73 | |||
| 74 | if (gpio_request(eth_gpio, "smsc911x irq") < 0) { | ||
| 75 | printk(KERN_ERR "Failed to request GPIO%d for smsc911x IRQ\n", | ||
| 76 | eth_gpio); | ||
| 77 | return; | ||
| 78 | } | ||
| 79 | gpio_direction_input(eth_gpio); | ||
| 80 | } | ||
| 81 | |||
| 82 | static struct plat_serial8250_port serial_platform_data[] = { | ||
| 83 | { | ||
| 84 | .mapbase = 0x10000000, | ||
| 85 | .irq = OMAP_GPIO_IRQ(102), | ||
| 86 | .flags = UPF_BOOT_AUTOCONF|UPF_IOREMAP|UPF_SHARE_IRQ, | ||
| 87 | .iotype = UPIO_MEM, | ||
| 88 | .regshift = 1, | ||
| 89 | .uartclk = QUART_CLK, | ||
| 90 | }, { | ||
| 91 | .flags = 0 | ||
| 92 | } | ||
| 93 | }; | ||
| 94 | |||
| 95 | static struct platform_device zoom2_debugboard_serial_device = { | ||
| 96 | .name = "serial8250", | ||
| 97 | .id = PLAT8250_DEV_PLATFORM1, | ||
| 98 | .dev = { | ||
| 99 | .platform_data = serial_platform_data, | ||
| 100 | }, | ||
| 101 | }; | ||
| 102 | |||
| 103 | static inline void __init zoom2_init_quaduart(void) | ||
| 104 | { | ||
| 105 | int quart_cs; | ||
| 106 | unsigned long cs_mem_base; | ||
| 107 | int quart_gpio = 0; | ||
| 108 | |||
| 109 | quart_cs = ZOOM2_QUADUART_CS; | ||
| 110 | |||
| 111 | if (gpmc_cs_request(quart_cs, SZ_1M, &cs_mem_base) < 0) { | ||
| 112 | printk(KERN_ERR "Failed to request GPMC mem" | ||
| 113 | "for Quad UART(TL16CP754C)\n"); | ||
| 114 | return; | ||
| 115 | } | ||
| 116 | |||
| 117 | quart_gpio = ZOOM2_QUADUART_GPIO; | ||
| 118 | |||
| 119 | if (gpio_request(quart_gpio, "TL16CP754C GPIO") < 0) { | ||
| 120 | printk(KERN_ERR "Failed to request GPIO%d for TL16CP754C\n", | ||
| 121 | quart_gpio); | ||
| 122 | return; | ||
| 123 | } | ||
| 124 | gpio_direction_input(quart_gpio); | ||
| 125 | } | ||
| 126 | |||
| 127 | static inline int omap_zoom2_debugboard_detect(void) | ||
| 128 | { | ||
| 129 | int debug_board_detect = 0; | ||
| 130 | |||
| 131 | debug_board_detect = ZOOM2_SMSC911X_GPIO; | ||
| 132 | |||
| 133 | if (gpio_request(debug_board_detect, "Zoom2 debug board detect") < 0) { | ||
| 134 | printk(KERN_ERR "Failed to request GPIO%d for Zoom2 debug" | ||
| 135 | "board detect\n", debug_board_detect); | ||
| 136 | return 0; | ||
| 137 | } | ||
| 138 | gpio_direction_input(debug_board_detect); | ||
| 139 | |||
| 140 | if (!gpio_get_value(debug_board_detect)) { | ||
| 141 | gpio_free(debug_board_detect); | ||
| 142 | return 0; | ||
| 143 | } | ||
| 144 | return 1; | ||
| 145 | } | ||
| 146 | |||
| 147 | static struct platform_device *zoom2_devices[] __initdata = { | ||
| 148 | &zoom2_smsc911x_device, | ||
| 149 | &zoom2_debugboard_serial_device, | ||
| 150 | }; | ||
| 151 | |||
| 152 | int __init omap_zoom2_debugboard_init(void) | ||
| 153 | { | ||
| 154 | if (!omap_zoom2_debugboard_detect()) | ||
| 155 | return 0; | ||
| 156 | |||
| 157 | zoom2_init_smsc911x(); | ||
| 158 | zoom2_init_quaduart(); | ||
| 159 | return platform_add_devices(zoom2_devices, ARRAY_SIZE(zoom2_devices)); | ||
| 160 | } | ||
diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c new file mode 100644 index 000000000000..bcc0f7632dea --- /dev/null +++ b/arch/arm/mach-omap2/board-zoom2.c | |||
| @@ -0,0 +1,110 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2009 Texas Instruments Inc. | ||
| 3 | * Mikkel Christensen <mlc@ti.com> | ||
| 4 | * | ||
| 5 | * Modified from mach-omap2/board-ldp.c | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License version 2 as | ||
| 9 | * published by the Free Software Foundation. | ||
| 10 | */ | ||
| 11 | |||
| 12 | #include <linux/kernel.h> | ||
| 13 | #include <linux/init.h> | ||
| 14 | #include <linux/platform_device.h> | ||
| 15 | #include <linux/gpio.h> | ||
| 16 | #include <linux/i2c/twl4030.h> | ||
| 17 | |||
| 18 | #include <asm/mach-types.h> | ||
| 19 | #include <asm/mach/arch.h> | ||
| 20 | |||
| 21 | #include <mach/common.h> | ||
| 22 | #include <mach/usb.h> | ||
| 23 | |||
| 24 | #include "mmc-twl4030.h" | ||
| 25 | |||
| 26 | static void __init omap_zoom2_init_irq(void) | ||
| 27 | { | ||
| 28 | omap2_init_common_hw(NULL); | ||
| 29 | omap_init_irq(); | ||
| 30 | omap_gpio_init(); | ||
| 31 | } | ||
| 32 | |||
| 33 | static struct omap_uart_config zoom2_uart_config __initdata = { | ||
| 34 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), | ||
| 35 | }; | ||
| 36 | |||
| 37 | static struct omap_board_config_kernel zoom2_config[] __initdata = { | ||
| 38 | { OMAP_TAG_UART, &zoom2_uart_config }, | ||
| 39 | }; | ||
| 40 | |||
| 41 | static struct twl4030_gpio_platform_data zoom2_gpio_data = { | ||
| 42 | .gpio_base = OMAP_MAX_GPIO_LINES, | ||
| 43 | .irq_base = TWL4030_GPIO_IRQ_BASE, | ||
| 44 | .irq_end = TWL4030_GPIO_IRQ_END, | ||
| 45 | }; | ||
| 46 | |||
| 47 | static struct twl4030_platform_data zoom2_twldata = { | ||
| 48 | .irq_base = TWL4030_IRQ_BASE, | ||
| 49 | .irq_end = TWL4030_IRQ_END, | ||
| 50 | |||
| 51 | /* platform_data for children goes here */ | ||
| 52 | .gpio = &zoom2_gpio_data, | ||
| 53 | }; | ||
| 54 | |||
| 55 | static struct i2c_board_info __initdata zoom2_i2c_boardinfo[] = { | ||
| 56 | { | ||
| 57 | I2C_BOARD_INFO("twl4030", 0x48), | ||
| 58 | .flags = I2C_CLIENT_WAKE, | ||
| 59 | .irq = INT_34XX_SYS_NIRQ, | ||
| 60 | .platform_data = &zoom2_twldata, | ||
| 61 | }, | ||
| 62 | }; | ||
| 63 | |||
| 64 | static int __init omap_i2c_init(void) | ||
| 65 | { | ||
| 66 | omap_register_i2c_bus(1, 2600, zoom2_i2c_boardinfo, | ||
| 67 | ARRAY_SIZE(zoom2_i2c_boardinfo)); | ||
| 68 | omap_register_i2c_bus(2, 400, NULL, 0); | ||
| 69 | omap_register_i2c_bus(3, 400, NULL, 0); | ||
| 70 | return 0; | ||
| 71 | } | ||
| 72 | |||
| 73 | static struct twl4030_hsmmc_info mmc[] __initdata = { | ||
| 74 | { | ||
| 75 | .mmc = 1, | ||
| 76 | .wires = 4, | ||
| 77 | .gpio_cd = -EINVAL, | ||
| 78 | .gpio_wp = -EINVAL, | ||
| 79 | }, | ||
| 80 | {} /* Terminator */ | ||
| 81 | }; | ||
| 82 | |||
| 83 | extern int __init omap_zoom2_debugboard_init(void); | ||
| 84 | |||
| 85 | static void __init omap_zoom2_init(void) | ||
| 86 | { | ||
| 87 | omap_i2c_init(); | ||
| 88 | omap_board_config = zoom2_config; | ||
| 89 | omap_board_config_size = ARRAY_SIZE(zoom2_config); | ||
| 90 | omap_serial_init(); | ||
| 91 | omap_zoom2_debugboard_init(); | ||
| 92 | twl4030_mmc_init(mmc); | ||
| 93 | usb_musb_init(); | ||
| 94 | } | ||
| 95 | |||
| 96 | static void __init omap_zoom2_map_io(void) | ||
| 97 | { | ||
| 98 | omap2_set_globals_343x(); | ||
| 99 | omap2_map_common_io(); | ||
| 100 | } | ||
| 101 | |||
| 102 | MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board") | ||
| 103 | .phys_io = 0x48000000, | ||
| 104 | .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, | ||
| 105 | .boot_params = 0x80000100, | ||
| 106 | .map_io = omap_zoom2_map_io, | ||
| 107 | .init_irq = omap_zoom2_init_irq, | ||
| 108 | .init_machine = omap_zoom2_init, | ||
| 109 | .timer = &omap_timer, | ||
| 110 | MACHINE_END | ||
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index 4247a1534411..ba528f85749c 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c | |||
| @@ -91,9 +91,9 @@ static void _omap2xxx_clk_commit(struct clk *clk) | |||
| 91 | return; | 91 | return; |
| 92 | 92 | ||
| 93 | prm_write_mod_reg(OMAP24XX_VALID_CONFIG, OMAP24XX_GR_MOD, | 93 | prm_write_mod_reg(OMAP24XX_VALID_CONFIG, OMAP24XX_GR_MOD, |
| 94 | OMAP24XX_PRCM_CLKCFG_CTRL_OFFSET); | 94 | OMAP2_PRCM_CLKCFG_CTRL_OFFSET); |
| 95 | /* OCP barrier */ | 95 | /* OCP barrier */ |
| 96 | prm_read_mod_reg(OMAP24XX_GR_MOD, OMAP24XX_PRCM_CLKCFG_CTRL_OFFSET); | 96 | prm_read_mod_reg(OMAP24XX_GR_MOD, OMAP2_PRCM_CLKCFG_CTRL_OFFSET); |
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | /* | 99 | /* |
| @@ -547,8 +547,8 @@ u32 omap2_clksel_round_rate_div(struct clk *clk, unsigned long target_rate, | |||
| 547 | const struct clksel_rate *clkr; | 547 | const struct clksel_rate *clkr; |
| 548 | u32 last_div = 0; | 548 | u32 last_div = 0; |
| 549 | 549 | ||
| 550 | printk(KERN_INFO "clock: clksel_round_rate_div: %s target_rate %ld\n", | 550 | pr_debug("clock: clksel_round_rate_div: %s target_rate %ld\n", |
| 551 | clk->name, target_rate); | 551 | clk->name, target_rate); |
| 552 | 552 | ||
| 553 | *new_div = 1; | 553 | *new_div = 1; |
| 554 | 554 | ||
| @@ -562,7 +562,7 @@ u32 omap2_clksel_round_rate_div(struct clk *clk, unsigned long target_rate, | |||
| 562 | 562 | ||
| 563 | /* Sanity check */ | 563 | /* Sanity check */ |
| 564 | if (clkr->div <= last_div) | 564 | if (clkr->div <= last_div) |
| 565 | printk(KERN_ERR "clock: clksel_rate table not sorted " | 565 | pr_err("clock: clksel_rate table not sorted " |
| 566 | "for clock %s", clk->name); | 566 | "for clock %s", clk->name); |
| 567 | 567 | ||
| 568 | last_div = clkr->div; | 568 | last_div = clkr->div; |
| @@ -574,7 +574,7 @@ u32 omap2_clksel_round_rate_div(struct clk *clk, unsigned long target_rate, | |||
| 574 | } | 574 | } |
| 575 | 575 | ||
| 576 | if (!clkr->div) { | 576 | if (!clkr->div) { |
| 577 | printk(KERN_ERR "clock: Could not find divisor for target " | 577 | pr_err("clock: Could not find divisor for target " |
| 578 | "rate %ld for clock %s parent %s\n", target_rate, | 578 | "rate %ld for clock %s parent %s\n", target_rate, |
| 579 | clk->name, clk->parent->name); | 579 | clk->name, clk->parent->name); |
| 580 | return ~0; | 580 | return ~0; |
| @@ -582,8 +582,8 @@ u32 omap2_clksel_round_rate_div(struct clk *clk, unsigned long target_rate, | |||
| 582 | 582 | ||
| 583 | *new_div = clkr->div; | 583 | *new_div = clkr->div; |
| 584 | 584 | ||
| 585 | printk(KERN_INFO "clock: new_div = %d, new_rate = %ld\n", *new_div, | 585 | pr_debug("clock: new_div = %d, new_rate = %ld\n", *new_div, |
| 586 | (clk->parent->rate / clkr->div)); | 586 | (clk->parent->rate / clkr->div)); |
| 587 | 587 | ||
| 588 | return (clk->parent->rate / clkr->div); | 588 | return (clk->parent->rate / clkr->div); |
| 589 | } | 589 | } |
| @@ -1035,7 +1035,7 @@ void omap2_clk_disable_unused(struct clk *clk) | |||
| 1035 | if ((regval32 & (1 << clk->enable_bit)) == v) | 1035 | if ((regval32 & (1 << clk->enable_bit)) == v) |
| 1036 | return; | 1036 | return; |
| 1037 | 1037 | ||
| 1038 | printk(KERN_INFO "Disabling unused clock \"%s\"\n", clk->name); | 1038 | printk(KERN_DEBUG "Disabling unused clock \"%s\"\n", clk->name); |
| 1039 | if (cpu_is_omap34xx()) { | 1039 | if (cpu_is_omap34xx()) { |
| 1040 | omap2_clk_enable(clk); | 1040 | omap2_clk_enable(clk); |
| 1041 | omap2_clk_disable(clk); | 1041 | omap2_clk_disable(clk); |
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c index e4cef333e291..44de0271fc2f 100644 --- a/arch/arm/mach-omap2/clock24xx.c +++ b/arch/arm/mach-omap2/clock24xx.c | |||
| @@ -233,6 +233,8 @@ static struct prcm_config *curr_prcm_set; | |||
| 233 | static struct clk *vclk; | 233 | static struct clk *vclk; |
| 234 | static struct clk *sclk; | 234 | static struct clk *sclk; |
| 235 | 235 | ||
| 236 | static void __iomem *prcm_clksrc_ctrl; | ||
| 237 | |||
| 236 | /*------------------------------------------------------------------------- | 238 | /*------------------------------------------------------------------------- |
| 237 | * Omap24xx specific clock functions | 239 | * Omap24xx specific clock functions |
| 238 | *-------------------------------------------------------------------------*/ | 240 | *-------------------------------------------------------------------------*/ |
| @@ -269,10 +271,9 @@ static int omap2_enable_osc_ck(struct clk *clk) | |||
| 269 | { | 271 | { |
| 270 | u32 pcc; | 272 | u32 pcc; |
| 271 | 273 | ||
| 272 | pcc = __raw_readl(OMAP24XX_PRCM_CLKSRC_CTRL); | 274 | pcc = __raw_readl(prcm_clksrc_ctrl); |
| 273 | 275 | ||
| 274 | __raw_writel(pcc & ~OMAP_AUTOEXTCLKMODE_MASK, | 276 | __raw_writel(pcc & ~OMAP_AUTOEXTCLKMODE_MASK, prcm_clksrc_ctrl); |
| 275 | OMAP24XX_PRCM_CLKSRC_CTRL); | ||
| 276 | 277 | ||
| 277 | return 0; | 278 | return 0; |
| 278 | } | 279 | } |
| @@ -281,10 +282,9 @@ static void omap2_disable_osc_ck(struct clk *clk) | |||
| 281 | { | 282 | { |
| 282 | u32 pcc; | 283 | u32 pcc; |
| 283 | 284 | ||
| 284 | pcc = __raw_readl(OMAP24XX_PRCM_CLKSRC_CTRL); | 285 | pcc = __raw_readl(prcm_clksrc_ctrl); |
| 285 | 286 | ||
| 286 | __raw_writel(pcc | OMAP_AUTOEXTCLKMODE_MASK, | 287 | __raw_writel(pcc | OMAP_AUTOEXTCLKMODE_MASK, prcm_clksrc_ctrl); |
| 287 | OMAP24XX_PRCM_CLKSRC_CTRL); | ||
| 288 | } | 288 | } |
| 289 | 289 | ||
| 290 | static const struct clkops clkops_oscck = { | 290 | static const struct clkops clkops_oscck = { |
| @@ -654,7 +654,7 @@ static u32 omap2_get_sysclkdiv(void) | |||
| 654 | { | 654 | { |
| 655 | u32 div; | 655 | u32 div; |
| 656 | 656 | ||
| 657 | div = __raw_readl(OMAP24XX_PRCM_CLKSRC_CTRL); | 657 | div = __raw_readl(prcm_clksrc_ctrl); |
| 658 | div &= OMAP_SYSCLKDIV_MASK; | 658 | div &= OMAP_SYSCLKDIV_MASK; |
| 659 | div >>= OMAP_SYSCLKDIV_SHIFT; | 659 | div >>= OMAP_SYSCLKDIV_SHIFT; |
| 660 | 660 | ||
| @@ -714,15 +714,18 @@ int __init omap2_clk_init(void) | |||
| 714 | struct omap_clk *c; | 714 | struct omap_clk *c; |
| 715 | u32 clkrate; | 715 | u32 clkrate; |
| 716 | 716 | ||
| 717 | if (cpu_is_omap242x()) | 717 | if (cpu_is_omap242x()) { |
| 718 | prcm_clksrc_ctrl = OMAP2420_PRCM_CLKSRC_CTRL; | ||
| 718 | cpu_mask = RATE_IN_242X; | 719 | cpu_mask = RATE_IN_242X; |
| 719 | else if (cpu_is_omap2430()) | 720 | } else if (cpu_is_omap2430()) { |
| 721 | prcm_clksrc_ctrl = OMAP2430_PRCM_CLKSRC_CTRL; | ||
| 720 | cpu_mask = RATE_IN_243X; | 722 | cpu_mask = RATE_IN_243X; |
| 723 | } | ||
| 721 | 724 | ||
| 722 | clk_init(&omap2_clk_functions); | 725 | clk_init(&omap2_clk_functions); |
| 723 | 726 | ||
| 724 | for (c = omap24xx_clks; c < omap24xx_clks + ARRAY_SIZE(omap24xx_clks); c++) | 727 | for (c = omap24xx_clks; c < omap24xx_clks + ARRAY_SIZE(omap24xx_clks); c++) |
| 725 | clk_init_one(c->lk.clk); | 728 | clk_preinit(c->lk.clk); |
| 726 | 729 | ||
| 727 | osc_ck.rate = omap2_osc_clk_recalc(&osc_ck); | 730 | osc_ck.rate = omap2_osc_clk_recalc(&osc_ck); |
| 728 | propagate_rate(&osc_ck); | 731 | propagate_rate(&osc_ck); |
diff --git a/arch/arm/mach-omap2/clock24xx.h b/arch/arm/mach-omap2/clock24xx.h index 88c5acb40fcf..458f00cdcbea 100644 --- a/arch/arm/mach-omap2/clock24xx.h +++ b/arch/arm/mach-omap2/clock24xx.h | |||
| @@ -24,6 +24,17 @@ | |||
| 24 | #include "cm-regbits-24xx.h" | 24 | #include "cm-regbits-24xx.h" |
| 25 | #include "sdrc.h" | 25 | #include "sdrc.h" |
| 26 | 26 | ||
| 27 | /* REVISIT: These should be set dynamically for CONFIG_MULTI_OMAP2 */ | ||
| 28 | #ifdef CONFIG_ARCH_OMAP2420 | ||
| 29 | #define OMAP_CM_REGADDR OMAP2420_CM_REGADDR | ||
| 30 | #define OMAP24XX_PRCM_CLKOUT_CTRL OMAP2420_PRCM_CLKOUT_CTRL | ||
| 31 | #define OMAP24XX_PRCM_CLKEMUL_CTRL OMAP2420_PRCM_CLKEMUL_CTRL | ||
| 32 | #else | ||
| 33 | #define OMAP_CM_REGADDR OMAP2430_CM_REGADDR | ||
| 34 | #define OMAP24XX_PRCM_CLKOUT_CTRL OMAP2430_PRCM_CLKOUT_CTRL | ||
| 35 | #define OMAP24XX_PRCM_CLKEMUL_CTRL OMAP2430_PRCM_CLKEMUL_CTRL | ||
| 36 | #endif | ||
| 37 | |||
| 27 | static unsigned long omap2_table_mpu_recalc(struct clk *clk); | 38 | static unsigned long omap2_table_mpu_recalc(struct clk *clk); |
| 28 | static int omap2_select_table_rate(struct clk *clk, unsigned long rate); | 39 | static int omap2_select_table_rate(struct clk *clk, unsigned long rate); |
| 29 | static long omap2_round_to_table_rate(struct clk *clk, unsigned long rate); | 40 | static long omap2_round_to_table_rate(struct clk *clk, unsigned long rate); |
diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c index ba05aa42bd8e..9e43fe5209d3 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c | |||
| @@ -129,6 +129,9 @@ static struct omap_clk omap34xx_clks[] = { | |||
| 129 | CLK(NULL, "sgx_fck", &sgx_fck, CK_3430ES2), | 129 | CLK(NULL, "sgx_fck", &sgx_fck, CK_3430ES2), |
| 130 | CLK(NULL, "sgx_ick", &sgx_ick, CK_3430ES2), | 130 | CLK(NULL, "sgx_ick", &sgx_ick, CK_3430ES2), |
| 131 | CLK(NULL, "d2d_26m_fck", &d2d_26m_fck, CK_3430ES1), | 131 | CLK(NULL, "d2d_26m_fck", &d2d_26m_fck, CK_3430ES1), |
| 132 | CLK(NULL, "modem_fck", &modem_fck, CK_343X), | ||
| 133 | CLK(NULL, "sad2d_ick", &sad2d_ick, CK_343X), | ||
| 134 | CLK(NULL, "mad2d_ick", &mad2d_ick, CK_343X), | ||
| 132 | CLK(NULL, "gpt10_fck", &gpt10_fck, CK_343X), | 135 | CLK(NULL, "gpt10_fck", &gpt10_fck, CK_343X), |
| 133 | CLK(NULL, "gpt11_fck", &gpt11_fck, CK_343X), | 136 | CLK(NULL, "gpt11_fck", &gpt11_fck, CK_343X), |
| 134 | CLK(NULL, "cpefuse_fck", &cpefuse_fck, CK_3430ES2), | 137 | CLK(NULL, "cpefuse_fck", &cpefuse_fck, CK_3430ES2), |
| @@ -281,6 +284,8 @@ static struct omap_clk omap34xx_clks[] = { | |||
| 281 | 284 | ||
| 282 | #define MAX_DPLL_WAIT_TRIES 1000000 | 285 | #define MAX_DPLL_WAIT_TRIES 1000000 |
| 283 | 286 | ||
| 287 | #define MIN_SDRC_DLL_LOCK_FREQ 83000000 | ||
| 288 | |||
| 284 | /** | 289 | /** |
| 285 | * omap3_dpll_recalc - recalculate DPLL rate | 290 | * omap3_dpll_recalc - recalculate DPLL rate |
| 286 | * @clk: DPLL struct clk | 291 | * @clk: DPLL struct clk |
| @@ -703,6 +708,7 @@ static int omap3_dpll4_set_rate(struct clk *clk, unsigned long rate) | |||
| 703 | static int omap3_core_dpll_m2_set_rate(struct clk *clk, unsigned long rate) | 708 | static int omap3_core_dpll_m2_set_rate(struct clk *clk, unsigned long rate) |
| 704 | { | 709 | { |
| 705 | u32 new_div = 0; | 710 | u32 new_div = 0; |
| 711 | u32 unlock_dll = 0; | ||
| 706 | unsigned long validrate, sdrcrate; | 712 | unsigned long validrate, sdrcrate; |
| 707 | struct omap_sdrc_params *sp; | 713 | struct omap_sdrc_params *sp; |
| 708 | 714 | ||
| @@ -729,17 +735,22 @@ static int omap3_core_dpll_m2_set_rate(struct clk *clk, unsigned long rate) | |||
| 729 | if (!sp) | 735 | if (!sp) |
| 730 | return -EINVAL; | 736 | return -EINVAL; |
| 731 | 737 | ||
| 732 | pr_info("clock: changing CORE DPLL rate from %lu to %lu\n", clk->rate, | 738 | if (sdrcrate < MIN_SDRC_DLL_LOCK_FREQ) { |
| 733 | validrate); | 739 | pr_debug("clock: will unlock SDRC DLL\n"); |
| 734 | pr_info("clock: SDRC timing params used: %08x %08x %08x\n", | 740 | unlock_dll = 1; |
| 735 | sp->rfr_ctrl, sp->actim_ctrla, sp->actim_ctrlb); | 741 | } |
| 742 | |||
| 743 | pr_debug("clock: changing CORE DPLL rate from %lu to %lu\n", clk->rate, | ||
| 744 | validrate); | ||
| 745 | pr_debug("clock: SDRC timing params used: %08x %08x %08x\n", | ||
| 746 | sp->rfr_ctrl, sp->actim_ctrla, sp->actim_ctrlb); | ||
| 736 | 747 | ||
| 737 | /* REVISIT: SRAM code doesn't support other M2 divisors yet */ | 748 | /* REVISIT: SRAM code doesn't support other M2 divisors yet */ |
| 738 | WARN_ON(new_div != 1 && new_div != 2); | 749 | WARN_ON(new_div != 1 && new_div != 2); |
| 739 | 750 | ||
| 740 | /* REVISIT: Add SDRC_MR changing to this code also */ | 751 | /* REVISIT: Add SDRC_MR changing to this code also */ |
| 741 | omap3_configure_core_dpll(sp->rfr_ctrl, sp->actim_ctrla, | 752 | omap3_configure_core_dpll(sp->rfr_ctrl, sp->actim_ctrla, |
| 742 | sp->actim_ctrlb, new_div); | 753 | sp->actim_ctrlb, new_div, unlock_dll); |
| 743 | 754 | ||
| 744 | return 0; | 755 | return 0; |
| 745 | } | 756 | } |
| @@ -956,7 +967,7 @@ int __init omap2_clk_init(void) | |||
| 956 | clk_init(&omap2_clk_functions); | 967 | clk_init(&omap2_clk_functions); |
| 957 | 968 | ||
| 958 | for (c = omap34xx_clks; c < omap34xx_clks + ARRAY_SIZE(omap34xx_clks); c++) | 969 | for (c = omap34xx_clks; c < omap34xx_clks + ARRAY_SIZE(omap34xx_clks); c++) |
| 959 | clk_init_one(c->lk.clk); | 970 | clk_preinit(c->lk.clk); |
| 960 | 971 | ||
| 961 | for (c = omap34xx_clks; c < omap34xx_clks + ARRAY_SIZE(omap34xx_clks); c++) | 972 | for (c = omap34xx_clks; c < omap34xx_clks + ARRAY_SIZE(omap34xx_clks); c++) |
| 962 | if (c->cpu & cpu_clkflg) { | 973 | if (c->cpu & cpu_clkflg) { |
diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h index 017a30e9aa1d..e433aec4efdd 100644 --- a/arch/arm/mach-omap2/clock34xx.h +++ b/arch/arm/mach-omap2/clock34xx.h | |||
| @@ -27,6 +27,8 @@ | |||
| 27 | #include "prm.h" | 27 | #include "prm.h" |
| 28 | #include "prm-regbits-34xx.h" | 28 | #include "prm-regbits-34xx.h" |
| 29 | 29 | ||
| 30 | #define OMAP_CM_REGADDR OMAP34XX_CM_REGADDR | ||
| 31 | |||
| 30 | static unsigned long omap3_dpll_recalc(struct clk *clk); | 32 | static unsigned long omap3_dpll_recalc(struct clk *clk); |
| 31 | static unsigned long omap3_clkoutx2_recalc(struct clk *clk); | 33 | static unsigned long omap3_clkoutx2_recalc(struct clk *clk); |
| 32 | static void omap3_dpll_allow_idle(struct clk *clk); | 34 | static void omap3_dpll_allow_idle(struct clk *clk); |
| @@ -1228,6 +1230,37 @@ static struct clk d2d_26m_fck = { | |||
| 1228 | .recalc = &followparent_recalc, | 1230 | .recalc = &followparent_recalc, |
| 1229 | }; | 1231 | }; |
| 1230 | 1232 | ||
| 1233 | static struct clk modem_fck = { | ||
| 1234 | .name = "modem_fck", | ||
| 1235 | .ops = &clkops_omap2_dflt_wait, | ||
| 1236 | .parent = &sys_ck, | ||
| 1237 | .init = &omap2_init_clk_clkdm, | ||
| 1238 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), | ||
| 1239 | .enable_bit = OMAP3430_EN_MODEM_SHIFT, | ||
| 1240 | .clkdm_name = "d2d_clkdm", | ||
| 1241 | .recalc = &followparent_recalc, | ||
| 1242 | }; | ||
| 1243 | |||
| 1244 | static struct clk sad2d_ick = { | ||
| 1245 | .name = "sad2d_ick", | ||
| 1246 | .ops = &clkops_omap2_dflt_wait, | ||
| 1247 | .parent = &l3_ick, | ||
| 1248 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), | ||
| 1249 | .enable_bit = OMAP3430_EN_SAD2D_SHIFT, | ||
| 1250 | .clkdm_name = "d2d_clkdm", | ||
| 1251 | .recalc = &followparent_recalc, | ||
| 1252 | }; | ||
| 1253 | |||
| 1254 | static struct clk mad2d_ick = { | ||
| 1255 | .name = "mad2d_ick", | ||
| 1256 | .ops = &clkops_omap2_dflt_wait, | ||
| 1257 | .parent = &l3_ick, | ||
| 1258 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN3), | ||
| 1259 | .enable_bit = OMAP3430_EN_MAD2D_SHIFT, | ||
| 1260 | .clkdm_name = "d2d_clkdm", | ||
| 1261 | .recalc = &followparent_recalc, | ||
| 1262 | }; | ||
| 1263 | |||
| 1231 | static const struct clksel omap343x_gpt_clksel[] = { | 1264 | static const struct clksel omap343x_gpt_clksel[] = { |
| 1232 | { .parent = &omap_32k_fck, .rates = gpt_32k_rates }, | 1265 | { .parent = &omap_32k_fck, .rates = gpt_32k_rates }, |
| 1233 | { .parent = &sys_ck, .rates = gpt_sys_rates }, | 1266 | { .parent = &sys_ck, .rates = gpt_sys_rates }, |
| @@ -1945,8 +1978,6 @@ static struct clk usb_l4_ick = { | |||
| 1945 | .recalc = &omap2_clksel_recalc, | 1978 | .recalc = &omap2_clksel_recalc, |
| 1946 | }; | 1979 | }; |
| 1947 | 1980 | ||
| 1948 | /* XXX MDM_INTC_ICK, SAD2D_ICK ?? */ | ||
| 1949 | |||
| 1950 | /* SECURITY_L4_ICK2 based clocks */ | 1981 | /* SECURITY_L4_ICK2 based clocks */ |
| 1951 | 1982 | ||
| 1952 | static struct clk security_l4_ick2 = { | 1983 | static struct clk security_l4_ick2 = { |
diff --git a/arch/arm/mach-omap2/clockdomains.h b/arch/arm/mach-omap2/clockdomains.h index 281d5da19188..fe319ae4ca0a 100644 --- a/arch/arm/mach-omap2/clockdomains.h +++ b/arch/arm/mach-omap2/clockdomains.h | |||
| @@ -195,7 +195,7 @@ static struct clockdomain sgx_clkdm = { | |||
| 195 | static struct clockdomain d2d_clkdm = { | 195 | static struct clockdomain d2d_clkdm = { |
| 196 | .name = "d2d_clkdm", | 196 | .name = "d2d_clkdm", |
| 197 | .pwrdm = { .name = "core_pwrdm" }, | 197 | .pwrdm = { .name = "core_pwrdm" }, |
| 198 | .flags = CLKDM_CAN_HWSUP, | 198 | .flags = CLKDM_CAN_HWSUP_SWSUP, |
| 199 | .clktrctrl_mask = OMAP3430ES1_CLKTRCTRL_D2D_MASK, | 199 | .clktrctrl_mask = OMAP3430ES1_CLKTRCTRL_D2D_MASK, |
| 200 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), | 200 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), |
| 201 | }; | 201 | }; |
diff --git a/arch/arm/mach-omap2/cm-regbits-34xx.h b/arch/arm/mach-omap2/cm-regbits-34xx.h index 6f3f5a36aae6..6923deb98a28 100644 --- a/arch/arm/mach-omap2/cm-regbits-34xx.h +++ b/arch/arm/mach-omap2/cm-regbits-34xx.h | |||
| @@ -145,6 +145,8 @@ | |||
| 145 | #define OMAP3430_CLKACTIVITY_MPU_MASK (1 << 0) | 145 | #define OMAP3430_CLKACTIVITY_MPU_MASK (1 << 0) |
| 146 | 146 | ||
| 147 | /* CM_FCLKEN1_CORE specific bits */ | 147 | /* CM_FCLKEN1_CORE specific bits */ |
| 148 | #define OMAP3430_EN_MODEM (1 << 31) | ||
| 149 | #define OMAP3430_EN_MODEM_SHIFT 31 | ||
| 148 | 150 | ||
| 149 | /* CM_ICLKEN1_CORE specific bits */ | 151 | /* CM_ICLKEN1_CORE specific bits */ |
| 150 | #define OMAP3430_EN_ICR (1 << 29) | 152 | #define OMAP3430_EN_ICR (1 << 29) |
| @@ -161,6 +163,8 @@ | |||
| 161 | #define OMAP3430_EN_MAILBOXES_SHIFT 7 | 163 | #define OMAP3430_EN_MAILBOXES_SHIFT 7 |
| 162 | #define OMAP3430_EN_OMAPCTRL (1 << 6) | 164 | #define OMAP3430_EN_OMAPCTRL (1 << 6) |
| 163 | #define OMAP3430_EN_OMAPCTRL_SHIFT 6 | 165 | #define OMAP3430_EN_OMAPCTRL_SHIFT 6 |
| 166 | #define OMAP3430_EN_SAD2D (1 << 3) | ||
| 167 | #define OMAP3430_EN_SAD2D_SHIFT 3 | ||
| 164 | #define OMAP3430_EN_SDRC (1 << 1) | 168 | #define OMAP3430_EN_SDRC (1 << 1) |
| 165 | #define OMAP3430_EN_SDRC_SHIFT 1 | 169 | #define OMAP3430_EN_SDRC_SHIFT 1 |
| 166 | 170 | ||
| @@ -176,6 +180,10 @@ | |||
| 176 | #define OMAP3430_EN_DES1 (1 << 0) | 180 | #define OMAP3430_EN_DES1 (1 << 0) |
| 177 | #define OMAP3430_EN_DES1_SHIFT 0 | 181 | #define OMAP3430_EN_DES1_SHIFT 0 |
| 178 | 182 | ||
| 183 | /* CM_ICLKEN3_CORE */ | ||
| 184 | #define OMAP3430_EN_MAD2D_SHIFT 3 | ||
| 185 | #define OMAP3430_EN_MAD2D (1 << 3) | ||
| 186 | |||
| 179 | /* CM_FCLKEN3_CORE specific bits */ | 187 | /* CM_FCLKEN3_CORE specific bits */ |
| 180 | #define OMAP3430ES2_EN_TS_SHIFT 1 | 188 | #define OMAP3430ES2_EN_TS_SHIFT 1 |
| 181 | #define OMAP3430ES2_EN_TS_MASK (1 << 1) | 189 | #define OMAP3430ES2_EN_TS_MASK (1 << 1) |
| @@ -231,6 +239,8 @@ | |||
| 231 | #define OMAP3430ES2_ST_CPEFUSE_MASK (1 << 0) | 239 | #define OMAP3430ES2_ST_CPEFUSE_MASK (1 << 0) |
| 232 | 240 | ||
| 233 | /* CM_AUTOIDLE1_CORE */ | 241 | /* CM_AUTOIDLE1_CORE */ |
| 242 | #define OMAP3430_AUTO_MODEM (1 << 31) | ||
| 243 | #define OMAP3430_AUTO_MODEM_SHIFT 31 | ||
| 234 | #define OMAP3430ES2_AUTO_MMC3 (1 << 30) | 244 | #define OMAP3430ES2_AUTO_MMC3 (1 << 30) |
| 235 | #define OMAP3430ES2_AUTO_MMC3_SHIFT 30 | 245 | #define OMAP3430ES2_AUTO_MMC3_SHIFT 30 |
| 236 | #define OMAP3430ES2_AUTO_ICR (1 << 29) | 246 | #define OMAP3430ES2_AUTO_ICR (1 << 29) |
| @@ -287,6 +297,8 @@ | |||
| 287 | #define OMAP3430_AUTO_HSOTGUSB_SHIFT 4 | 297 | #define OMAP3430_AUTO_HSOTGUSB_SHIFT 4 |
| 288 | #define OMAP3430ES1_AUTO_D2D (1 << 3) | 298 | #define OMAP3430ES1_AUTO_D2D (1 << 3) |
| 289 | #define OMAP3430ES1_AUTO_D2D_SHIFT 3 | 299 | #define OMAP3430ES1_AUTO_D2D_SHIFT 3 |
| 300 | #define OMAP3430_AUTO_SAD2D (1 << 3) | ||
| 301 | #define OMAP3430_AUTO_SAD2D_SHIFT 3 | ||
| 290 | #define OMAP3430_AUTO_SSI (1 << 0) | 302 | #define OMAP3430_AUTO_SSI (1 << 0) |
| 291 | #define OMAP3430_AUTO_SSI_SHIFT 0 | 303 | #define OMAP3430_AUTO_SSI_SHIFT 0 |
| 292 | 304 | ||
| @@ -308,6 +320,8 @@ | |||
| 308 | #define OMAP3430ES2_AUTO_USBTLL (1 << 2) | 320 | #define OMAP3430ES2_AUTO_USBTLL (1 << 2) |
| 309 | #define OMAP3430ES2_AUTO_USBTLL_SHIFT 2 | 321 | #define OMAP3430ES2_AUTO_USBTLL_SHIFT 2 |
| 310 | #define OMAP3430ES2_AUTO_USBTLL_MASK (1 << 2) | 322 | #define OMAP3430ES2_AUTO_USBTLL_MASK (1 << 2) |
| 323 | #define OMAP3430_AUTO_MAD2D_SHIFT 3 | ||
| 324 | #define OMAP3430_AUTO_MAD2D (1 << 3) | ||
| 311 | 325 | ||
| 312 | /* CM_CLKSEL_CORE */ | 326 | /* CM_CLKSEL_CORE */ |
| 313 | #define OMAP3430_CLKSEL_SSI_SHIFT 8 | 327 | #define OMAP3430_CLKSEL_SSI_SHIFT 8 |
diff --git a/arch/arm/mach-omap2/cm.h b/arch/arm/mach-omap2/cm.h index 65fdf78c91e1..1d3c93bf86d3 100644 --- a/arch/arm/mach-omap2/cm.h +++ b/arch/arm/mach-omap2/cm.h | |||
| @@ -16,17 +16,12 @@ | |||
| 16 | 16 | ||
| 17 | #include "prcm-common.h" | 17 | #include "prcm-common.h" |
| 18 | 18 | ||
| 19 | #ifndef __ASSEMBLER__ | ||
| 20 | #define OMAP_CM_REGADDR(module, reg) \ | ||
| 21 | IO_ADDRESS(OMAP2_CM_BASE + (module) + (reg)) | ||
| 22 | #else | ||
| 23 | #define OMAP2420_CM_REGADDR(module, reg) \ | 19 | #define OMAP2420_CM_REGADDR(module, reg) \ |
| 24 | IO_ADDRESS(OMAP2420_CM_BASE + (module) + (reg)) | 20 | IO_ADDRESS(OMAP2420_CM_BASE + (module) + (reg)) |
| 25 | #define OMAP2430_CM_REGADDR(module, reg) \ | 21 | #define OMAP2430_CM_REGADDR(module, reg) \ |
| 26 | IO_ADDRESS(OMAP2430_CM_BASE + (module) + (reg)) | 22 | IO_ADDRESS(OMAP2430_CM_BASE + (module) + (reg)) |
| 27 | #define OMAP34XX_CM_REGADDR(module, reg) \ | 23 | #define OMAP34XX_CM_REGADDR(module, reg) \ |
| 28 | IO_ADDRESS(OMAP3430_CM_BASE + (module) + (reg)) | 24 | IO_ADDRESS(OMAP3430_CM_BASE + (module) + (reg)) |
| 29 | #endif | ||
| 30 | 25 | ||
| 31 | /* | 26 | /* |
| 32 | * Architecture-specific global CM registers | 27 | * Architecture-specific global CM registers |
| @@ -38,6 +33,7 @@ | |||
| 38 | #define OMAP3430_CM_SYSCONFIG OMAP_CM_REGADDR(OCP_MOD, 0x0010) | 33 | #define OMAP3430_CM_SYSCONFIG OMAP_CM_REGADDR(OCP_MOD, 0x0010) |
| 39 | #define OMAP3430_CM_POLCTRL OMAP_CM_REGADDR(OCP_MOD, 0x009c) | 34 | #define OMAP3430_CM_POLCTRL OMAP_CM_REGADDR(OCP_MOD, 0x009c) |
| 40 | 35 | ||
| 36 | #define OMAP3_CM_CLKOUT_CTRL_OFFSET 0x0070 | ||
| 41 | #define OMAP3430_CM_CLKOUT_CTRL OMAP_CM_REGADDR(OMAP3430_CCR_MOD, 0x0070) | 37 | #define OMAP3430_CM_CLKOUT_CTRL OMAP_CM_REGADDR(OMAP3430_CCR_MOD, 0x0070) |
| 42 | 38 | ||
| 43 | /* | 39 | /* |
diff --git a/arch/arm/mach-omap2/gpmc-onenand.c b/arch/arm/mach-omap2/gpmc-onenand.c new file mode 100644 index 000000000000..2fd22f9c5f0e --- /dev/null +++ b/arch/arm/mach-omap2/gpmc-onenand.c | |||
| @@ -0,0 +1,330 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-omap2/gpmc-onenand.c | ||
| 3 | * | ||
| 4 | * Copyright (C) 2006 - 2009 Nokia Corporation | ||
| 5 | * Contacts: Juha Yrjola | ||
| 6 | * Tony Lindgren | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #include <linux/kernel.h> | ||
| 14 | #include <linux/platform_device.h> | ||
| 15 | #include <linux/mtd/onenand_regs.h> | ||
| 16 | #include <linux/io.h> | ||
| 17 | |||
| 18 | #include <asm/mach/flash.h> | ||
| 19 | |||
| 20 | #include <mach/onenand.h> | ||
| 21 | #include <mach/board.h> | ||
| 22 | #include <mach/gpmc.h> | ||
| 23 | |||
| 24 | static struct omap_onenand_platform_data *gpmc_onenand_data; | ||
| 25 | |||
| 26 | static struct platform_device gpmc_onenand_device = { | ||
| 27 | .name = "omap2-onenand", | ||
| 28 | .id = -1, | ||
| 29 | }; | ||
| 30 | |||
| 31 | static int omap2_onenand_set_async_mode(int cs, void __iomem *onenand_base) | ||
| 32 | { | ||
| 33 | struct gpmc_timings t; | ||
| 34 | |||
| 35 | const int t_cer = 15; | ||
| 36 | const int t_avdp = 12; | ||
| 37 | const int t_aavdh = 7; | ||
| 38 | const int t_ce = 76; | ||
| 39 | const int t_aa = 76; | ||
| 40 | const int t_oe = 20; | ||
| 41 | const int t_cez = 20; /* max of t_cez, t_oez */ | ||
| 42 | const int t_ds = 30; | ||
| 43 | const int t_wpl = 40; | ||
| 44 | const int t_wph = 30; | ||
| 45 | |||
| 46 | memset(&t, 0, sizeof(t)); | ||
| 47 | t.sync_clk = 0; | ||
| 48 | t.cs_on = 0; | ||
| 49 | t.adv_on = 0; | ||
| 50 | |||
| 51 | /* Read */ | ||
| 52 | t.adv_rd_off = gpmc_round_ns_to_ticks(max_t(int, t_avdp, t_cer)); | ||
| 53 | t.oe_on = t.adv_rd_off + gpmc_round_ns_to_ticks(t_aavdh); | ||
| 54 | t.access = t.adv_on + gpmc_round_ns_to_ticks(t_aa); | ||
| 55 | t.access = max_t(int, t.access, t.cs_on + gpmc_round_ns_to_ticks(t_ce)); | ||
| 56 | t.access = max_t(int, t.access, t.oe_on + gpmc_round_ns_to_ticks(t_oe)); | ||
| 57 | t.oe_off = t.access + gpmc_round_ns_to_ticks(1); | ||
| 58 | t.cs_rd_off = t.oe_off; | ||
| 59 | t.rd_cycle = t.cs_rd_off + gpmc_round_ns_to_ticks(t_cez); | ||
| 60 | |||
| 61 | /* Write */ | ||
| 62 | t.adv_wr_off = t.adv_rd_off; | ||
| 63 | t.we_on = t.oe_on; | ||
| 64 | if (cpu_is_omap34xx()) { | ||
| 65 | t.wr_data_mux_bus = t.we_on; | ||
| 66 | t.wr_access = t.we_on + gpmc_round_ns_to_ticks(t_ds); | ||
| 67 | } | ||
| 68 | t.we_off = t.we_on + gpmc_round_ns_to_ticks(t_wpl); | ||
| 69 | t.cs_wr_off = t.we_off + gpmc_round_ns_to_ticks(t_wph); | ||
| 70 | t.wr_cycle = t.cs_wr_off + gpmc_round_ns_to_ticks(t_cez); | ||
| 71 | |||
| 72 | /* Configure GPMC for asynchronous read */ | ||
| 73 | gpmc_cs_write_reg(cs, GPMC_CS_CONFIG1, | ||
| 74 | GPMC_CONFIG1_DEVICESIZE_16 | | ||
| 75 | GPMC_CONFIG1_MUXADDDATA); | ||
| 76 | |||
| 77 | return gpmc_cs_set_timings(cs, &t); | ||
| 78 | } | ||
| 79 | |||
| 80 | static void set_onenand_cfg(void __iomem *onenand_base, int latency, | ||
| 81 | int sync_read, int sync_write, int hf) | ||
| 82 | { | ||
| 83 | u32 reg; | ||
| 84 | |||
| 85 | reg = readw(onenand_base + ONENAND_REG_SYS_CFG1); | ||
| 86 | reg &= ~((0x7 << ONENAND_SYS_CFG1_BRL_SHIFT) | (0x7 << 9)); | ||
| 87 | reg |= (latency << ONENAND_SYS_CFG1_BRL_SHIFT) | | ||
| 88 | ONENAND_SYS_CFG1_BL_16; | ||
| 89 | if (sync_read) | ||
| 90 | reg |= ONENAND_SYS_CFG1_SYNC_READ; | ||
| 91 | else | ||
| 92 | reg &= ~ONENAND_SYS_CFG1_SYNC_READ; | ||
| 93 | if (sync_write) | ||
| 94 | reg |= ONENAND_SYS_CFG1_SYNC_WRITE; | ||
| 95 | else | ||
| 96 | reg &= ~ONENAND_SYS_CFG1_SYNC_WRITE; | ||
| 97 | if (hf) | ||
| 98 | reg |= ONENAND_SYS_CFG1_HF; | ||
| 99 | else | ||
| 100 | reg &= ~ONENAND_SYS_CFG1_HF; | ||
| 101 | writew(reg, onenand_base + ONENAND_REG_SYS_CFG1); | ||
| 102 | } | ||
| 103 | |||
| 104 | static int omap2_onenand_set_sync_mode(struct omap_onenand_platform_data *cfg, | ||
| 105 | void __iomem *onenand_base, | ||
| 106 | int freq) | ||
| 107 | { | ||
| 108 | struct gpmc_timings t; | ||
| 109 | const int t_cer = 15; | ||
| 110 | const int t_avdp = 12; | ||
| 111 | const int t_cez = 20; /* max of t_cez, t_oez */ | ||
| 112 | const int t_ds = 30; | ||
| 113 | const int t_wpl = 40; | ||
| 114 | const int t_wph = 30; | ||
| 115 | int min_gpmc_clk_period, t_ces, t_avds, t_avdh, t_ach, t_aavdh, t_rdyo; | ||
| 116 | int tick_ns, div, fclk_offset_ns, fclk_offset, gpmc_clk_ns, latency; | ||
| 117 | int first_time = 0, hf = 0, sync_read = 0, sync_write = 0; | ||
| 118 | int err, ticks_cez; | ||
| 119 | int cs = cfg->cs; | ||
| 120 | u32 reg; | ||
| 121 | |||
| 122 | if (cfg->flags & ONENAND_SYNC_READ) { | ||
| 123 | sync_read = 1; | ||
| 124 | } else if (cfg->flags & ONENAND_SYNC_READWRITE) { | ||
| 125 | sync_read = 1; | ||
| 126 | sync_write = 1; | ||
| 127 | } | ||
| 128 | |||
| 129 | if (!freq) { | ||
| 130 | /* Very first call freq is not known */ | ||
| 131 | err = omap2_onenand_set_async_mode(cs, onenand_base); | ||
| 132 | if (err) | ||
| 133 | return err; | ||
| 134 | reg = readw(onenand_base + ONENAND_REG_VERSION_ID); | ||
| 135 | switch ((reg >> 4) & 0xf) { | ||
| 136 | case 0: | ||
| 137 | freq = 40; | ||
| 138 | break; | ||
| 139 | case 1: | ||
| 140 | freq = 54; | ||
| 141 | break; | ||
| 142 | case 2: | ||
| 143 | freq = 66; | ||
| 144 | break; | ||
| 145 | case 3: | ||
| 146 | freq = 83; | ||
| 147 | break; | ||
| 148 | case 4: | ||
| 149 | freq = 104; | ||
| 150 | break; | ||
| 151 | default: | ||
| 152 | freq = 54; | ||
| 153 | break; | ||
| 154 | } | ||
| 155 | first_time = 1; | ||
| 156 | } | ||
| 157 | |||
| 158 | switch (freq) { | ||
| 159 | case 83: | ||
| 160 | min_gpmc_clk_period = 12; /* 83 MHz */ | ||
| 161 | t_ces = 5; | ||
| 162 | t_avds = 4; | ||
| 163 | t_avdh = 2; | ||
| 164 | t_ach = 6; | ||
| 165 | t_aavdh = 6; | ||
| 166 | t_rdyo = 9; | ||
| 167 | break; | ||
| 168 | case 66: | ||
| 169 | min_gpmc_clk_period = 15; /* 66 MHz */ | ||
| 170 | t_ces = 6; | ||
| 171 | t_avds = 5; | ||
| 172 | t_avdh = 2; | ||
| 173 | t_ach = 6; | ||
| 174 | t_aavdh = 6; | ||
| 175 | t_rdyo = 11; | ||
| 176 | break; | ||
| 177 | default: | ||
| 178 | min_gpmc_clk_period = 18; /* 54 MHz */ | ||
| 179 | t_ces = 7; | ||
| 180 | t_avds = 7; | ||
| 181 | t_avdh = 7; | ||
| 182 | t_ach = 9; | ||
| 183 | t_aavdh = 7; | ||
| 184 | t_rdyo = 15; | ||
| 185 | sync_write = 0; | ||
| 186 | break; | ||
| 187 | } | ||
| 188 | |||
| 189 | tick_ns = gpmc_ticks_to_ns(1); | ||
| 190 | div = gpmc_cs_calc_divider(cs, min_gpmc_clk_period); | ||
| 191 | gpmc_clk_ns = gpmc_ticks_to_ns(div); | ||
| 192 | if (gpmc_clk_ns < 15) /* >66Mhz */ | ||
| 193 | hf = 1; | ||
| 194 | if (hf) | ||
| 195 | latency = 6; | ||
| 196 | else if (gpmc_clk_ns >= 25) /* 40 MHz*/ | ||
| 197 | latency = 3; | ||
| 198 | else | ||
| 199 | latency = 4; | ||
| 200 | |||
| 201 | if (first_time) | ||
| 202 | set_onenand_cfg(onenand_base, latency, | ||
| 203 | sync_read, sync_write, hf); | ||
| 204 | |||
| 205 | if (div == 1) { | ||
| 206 | reg = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG2); | ||
| 207 | reg |= (1 << 7); | ||
| 208 | gpmc_cs_write_reg(cs, GPMC_CS_CONFIG2, reg); | ||
| 209 | reg = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG3); | ||
| 210 | reg |= (1 << 7); | ||
| 211 | gpmc_cs_write_reg(cs, GPMC_CS_CONFIG3, reg); | ||
| 212 | reg = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG4); | ||
| 213 | reg |= (1 << 7); | ||
| 214 | reg |= (1 << 23); | ||
| 215 | gpmc_cs_write_reg(cs, GPMC_CS_CONFIG4, reg); | ||
| 216 | } else { | ||
| 217 | reg = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG2); | ||
| 218 | reg &= ~(1 << 7); | ||
| 219 | gpmc_cs_write_reg(cs, GPMC_CS_CONFIG2, reg); | ||
| 220 | reg = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG3); | ||
| 221 | reg &= ~(1 << 7); | ||
| 222 | gpmc_cs_write_reg(cs, GPMC_CS_CONFIG3, reg); | ||
| 223 | reg = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG4); | ||
| 224 | reg &= ~(1 << 7); | ||
| 225 | reg &= ~(1 << 23); | ||
| 226 | gpmc_cs_write_reg(cs, GPMC_CS_CONFIG4, reg); | ||
| 227 | } | ||
| 228 | |||
| 229 | /* Set synchronous read timings */ | ||
| 230 | memset(&t, 0, sizeof(t)); | ||
| 231 | t.sync_clk = min_gpmc_clk_period; | ||
| 232 | t.cs_on = 0; | ||
| 233 | t.adv_on = 0; | ||
| 234 | fclk_offset_ns = gpmc_round_ns_to_ticks(max_t(int, t_ces, t_avds)); | ||
| 235 | fclk_offset = gpmc_ns_to_ticks(fclk_offset_ns); | ||
| 236 | t.page_burst_access = gpmc_clk_ns; | ||
| 237 | |||
| 238 | /* Read */ | ||
| 239 | t.adv_rd_off = gpmc_ticks_to_ns(fclk_offset + gpmc_ns_to_ticks(t_avdh)); | ||
| 240 | t.oe_on = gpmc_ticks_to_ns(fclk_offset + gpmc_ns_to_ticks(t_ach)); | ||
| 241 | t.access = gpmc_ticks_to_ns(fclk_offset + (latency + 1) * div); | ||
| 242 | t.oe_off = t.access + gpmc_round_ns_to_ticks(1); | ||
| 243 | t.cs_rd_off = t.oe_off; | ||
| 244 | ticks_cez = ((gpmc_ns_to_ticks(t_cez) + div - 1) / div) * div; | ||
| 245 | t.rd_cycle = gpmc_ticks_to_ns(fclk_offset + (latency + 1) * div + | ||
| 246 | ticks_cez); | ||
| 247 | |||
| 248 | /* Write */ | ||
| 249 | if (sync_write) { | ||
| 250 | t.adv_wr_off = t.adv_rd_off; | ||
| 251 | t.we_on = 0; | ||
| 252 | t.we_off = t.cs_rd_off; | ||
| 253 | t.cs_wr_off = t.cs_rd_off; | ||
| 254 | t.wr_cycle = t.rd_cycle; | ||
| 255 | if (cpu_is_omap34xx()) { | ||
| 256 | t.wr_data_mux_bus = gpmc_ticks_to_ns(fclk_offset + | ||
| 257 | gpmc_ns_to_ticks(min_gpmc_clk_period + | ||
| 258 | t_rdyo)); | ||
| 259 | t.wr_access = t.access; | ||
| 260 | } | ||
| 261 | } else { | ||
| 262 | t.adv_wr_off = gpmc_round_ns_to_ticks(max_t(int, | ||
| 263 | t_avdp, t_cer)); | ||
| 264 | t.we_on = t.adv_wr_off + gpmc_round_ns_to_ticks(t_aavdh); | ||
| 265 | t.we_off = t.we_on + gpmc_round_ns_to_ticks(t_wpl); | ||
| 266 | t.cs_wr_off = t.we_off + gpmc_round_ns_to_ticks(t_wph); | ||
| 267 | t.wr_cycle = t.cs_wr_off + gpmc_round_ns_to_ticks(t_cez); | ||
| 268 | if (cpu_is_omap34xx()) { | ||
| 269 | t.wr_data_mux_bus = t.we_on; | ||
| 270 | t.wr_access = t.we_on + gpmc_round_ns_to_ticks(t_ds); | ||
| 271 | } | ||
| 272 | } | ||
| 273 | |||
| 274 | /* Configure GPMC for synchronous read */ | ||
| 275 | gpmc_cs_write_reg(cs, GPMC_CS_CONFIG1, | ||
| 276 | GPMC_CONFIG1_WRAPBURST_SUPP | | ||
| 277 | GPMC_CONFIG1_READMULTIPLE_SUPP | | ||
| 278 | (sync_read ? GPMC_CONFIG1_READTYPE_SYNC : 0) | | ||
| 279 | (sync_write ? GPMC_CONFIG1_WRITEMULTIPLE_SUPP : 0) | | ||
| 280 | (sync_write ? GPMC_CONFIG1_WRITETYPE_SYNC : 0) | | ||
| 281 | GPMC_CONFIG1_CLKACTIVATIONTIME(fclk_offset) | | ||
| 282 | GPMC_CONFIG1_PAGE_LEN(2) | | ||
| 283 | (cpu_is_omap34xx() ? 0 : | ||
| 284 | (GPMC_CONFIG1_WAIT_READ_MON | | ||
| 285 | GPMC_CONFIG1_WAIT_PIN_SEL(0))) | | ||
| 286 | GPMC_CONFIG1_DEVICESIZE_16 | | ||
| 287 | GPMC_CONFIG1_DEVICETYPE_NOR | | ||
| 288 | GPMC_CONFIG1_MUXADDDATA); | ||
| 289 | |||
| 290 | err = gpmc_cs_set_timings(cs, &t); | ||
| 291 | if (err) | ||
| 292 | return err; | ||
| 293 | |||
| 294 | set_onenand_cfg(onenand_base, latency, sync_read, sync_write, hf); | ||
| 295 | |||
| 296 | return 0; | ||
| 297 | } | ||
| 298 | |||
| 299 | static int gpmc_onenand_setup(void __iomem *onenand_base, int freq) | ||
| 300 | { | ||
| 301 | struct device *dev = &gpmc_onenand_device.dev; | ||
| 302 | |||
| 303 | /* Set sync timings in GPMC */ | ||
| 304 | if (omap2_onenand_set_sync_mode(gpmc_onenand_data, onenand_base, | ||
| 305 | freq) < 0) { | ||
| 306 | dev_err(dev, "Unable to set synchronous mode\n"); | ||
| 307 | return -EINVAL; | ||
| 308 | } | ||
| 309 | |||
| 310 | return 0; | ||
| 311 | } | ||
| 312 | |||
| 313 | void __init gpmc_onenand_init(struct omap_onenand_platform_data *_onenand_data) | ||
| 314 | { | ||
| 315 | gpmc_onenand_data = _onenand_data; | ||
| 316 | gpmc_onenand_data->onenand_setup = gpmc_onenand_setup; | ||
| 317 | gpmc_onenand_device.dev.platform_data = gpmc_onenand_data; | ||
| 318 | |||
| 319 | if (cpu_is_omap24xx() && | ||
| 320 | (gpmc_onenand_data->flags & ONENAND_SYNC_READWRITE)) { | ||
| 321 | printk(KERN_ERR "Onenand using only SYNC_READ on 24xx\n"); | ||
| 322 | gpmc_onenand_data->flags &= ~ONENAND_SYNC_READWRITE; | ||
| 323 | gpmc_onenand_data->flags |= ONENAND_SYNC_READ; | ||
| 324 | } | ||
| 325 | |||
| 326 | if (platform_device_register(&gpmc_onenand_device) < 0) { | ||
| 327 | printk(KERN_ERR "Unable to register OneNAND device\n"); | ||
| 328 | return; | ||
| 329 | } | ||
| 330 | } | ||
diff --git a/arch/arm/mach-omap2/gpmc-smc91x.c b/arch/arm/mach-omap2/gpmc-smc91x.c new file mode 100644 index 000000000000..df99d31d8b64 --- /dev/null +++ b/arch/arm/mach-omap2/gpmc-smc91x.c | |||
| @@ -0,0 +1,189 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-omap2/gpmc-smc91x.c | ||
| 3 | * | ||
| 4 | * Copyright (C) 2009 Nokia Corporation | ||
| 5 | * Contact: Tony Lindgren | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License version 2 as | ||
| 9 | * published by the Free Software Foundation. | ||
| 10 | */ | ||
| 11 | |||
| 12 | #include <linux/kernel.h> | ||
| 13 | #include <linux/platform_device.h> | ||
| 14 | #include <linux/gpio.h> | ||
| 15 | #include <linux/delay.h> | ||
| 16 | #include <linux/interrupt.h> | ||
| 17 | #include <linux/io.h> | ||
| 18 | #include <linux/smc91x.h> | ||
| 19 | |||
| 20 | #include <mach/board.h> | ||
| 21 | #include <mach/gpmc.h> | ||
| 22 | #include <mach/gpmc-smc91x.h> | ||
| 23 | |||
| 24 | static struct omap_smc91x_platform_data *gpmc_cfg; | ||
| 25 | |||
| 26 | static struct resource gpmc_smc91x_resources[] = { | ||
| 27 | [0] = { | ||
| 28 | .flags = IORESOURCE_MEM, | ||
| 29 | }, | ||
| 30 | [1] = { | ||
| 31 | .flags = IORESOURCE_IRQ, | ||
| 32 | }, | ||
| 33 | }; | ||
| 34 | |||
| 35 | static struct smc91x_platdata gpmc_smc91x_info = { | ||
| 36 | .flags = SMC91X_USE_16BIT | SMC91X_NOWAIT | SMC91X_IO_SHIFT_0, | ||
| 37 | }; | ||
| 38 | |||
| 39 | static struct platform_device gpmc_smc91x_device = { | ||
| 40 | .name = "smc91x", | ||
| 41 | .id = -1, | ||
| 42 | .num_resources = ARRAY_SIZE(gpmc_smc91x_resources), | ||
| 43 | .resource = gpmc_smc91x_resources, | ||
| 44 | .dev = { | ||
| 45 | .platform_data = &gpmc_smc91x_info, | ||
| 46 | }, | ||
| 47 | }; | ||
| 48 | |||
| 49 | /* | ||
| 50 | * Set the gpmc timings for smc91c96. The timings are taken | ||
| 51 | * from the data sheet available at: | ||
| 52 | * http://www.smsc.com/main/catalog/lan91c96.html | ||
| 53 | * REVISIT: Level shifters can add at least to the access latency. | ||
| 54 | */ | ||
| 55 | static int smc91c96_gpmc_retime(void) | ||
| 56 | { | ||
| 57 | struct gpmc_timings t; | ||
| 58 | const int t3 = 10; /* Figure 12.2 read and 12.4 write */ | ||
| 59 | const int t4_r = 20; /* Figure 12.2 read */ | ||
| 60 | const int t4_w = 5; /* Figure 12.4 write */ | ||
| 61 | const int t5 = 25; /* Figure 12.2 read */ | ||
| 62 | const int t6 = 15; /* Figure 12.2 read */ | ||
| 63 | const int t7 = 5; /* Figure 12.4 write */ | ||
| 64 | const int t8 = 5; /* Figure 12.4 write */ | ||
| 65 | const int t20 = 185; /* Figure 12.2 read and 12.4 write */ | ||
| 66 | u32 l; | ||
| 67 | |||
| 68 | memset(&t, 0, sizeof(t)); | ||
| 69 | |||
| 70 | /* Read timings */ | ||
| 71 | t.cs_on = 0; | ||
| 72 | t.adv_on = t.cs_on; | ||
| 73 | t.oe_on = t.adv_on + t3; | ||
| 74 | t.access = t.oe_on + t5; | ||
| 75 | t.oe_off = t.access; | ||
| 76 | t.adv_rd_off = t.oe_off + max(t4_r, t6); | ||
| 77 | t.cs_rd_off = t.oe_off; | ||
| 78 | t.rd_cycle = t20 - t.oe_on; | ||
| 79 | |||
| 80 | /* Write timings */ | ||
| 81 | t.we_on = t.adv_on + t3; | ||
| 82 | |||
| 83 | if (cpu_is_omap34xx() && (gpmc_cfg->flags & GPMC_MUX_ADD_DATA)) { | ||
| 84 | t.wr_data_mux_bus = t.we_on; | ||
| 85 | t.we_off = t.wr_data_mux_bus + t7; | ||
| 86 | } else | ||
| 87 | t.we_off = t.we_on + t7; | ||
| 88 | if (cpu_is_omap34xx()) | ||
| 89 | t.wr_access = t.we_off; | ||
| 90 | t.adv_wr_off = t.we_off + max(t4_w, t8); | ||
| 91 | t.cs_wr_off = t.we_off + t4_w; | ||
| 92 | t.wr_cycle = t20 - t.we_on; | ||
| 93 | |||
| 94 | l = GPMC_CONFIG1_DEVICESIZE_16; | ||
| 95 | if (gpmc_cfg->flags & GPMC_MUX_ADD_DATA) | ||
| 96 | l |= GPMC_CONFIG1_MUXADDDATA; | ||
| 97 | if (gpmc_cfg->flags & GPMC_READ_MON) | ||
| 98 | l |= GPMC_CONFIG1_WAIT_READ_MON; | ||
| 99 | if (gpmc_cfg->flags & GPMC_WRITE_MON) | ||
| 100 | l |= GPMC_CONFIG1_WAIT_WRITE_MON; | ||
| 101 | if (gpmc_cfg->wait_pin) | ||
| 102 | l |= GPMC_CONFIG1_WAIT_PIN_SEL(gpmc_cfg->wait_pin); | ||
| 103 | gpmc_cs_write_reg(gpmc_cfg->cs, GPMC_CS_CONFIG1, l); | ||
| 104 | |||
| 105 | /* | ||
| 106 | * FIXME: Calculate the address and data bus muxed timings. | ||
| 107 | * Note that at least adv_rd_off needs to be changed according | ||
| 108 | * to omap3430 TRM Figure 11-11. Are the sdp boards using the | ||
| 109 | * FPGA in between smc91x and omap as the timings are different | ||
| 110 | * from above? | ||
| 111 | */ | ||
| 112 | if (gpmc_cfg->flags & GPMC_MUX_ADD_DATA) | ||
| 113 | return 0; | ||
| 114 | |||
| 115 | return gpmc_cs_set_timings(gpmc_cfg->cs, &t); | ||
| 116 | } | ||
| 117 | |||
| 118 | /* | ||
| 119 | * Initialize smc91x device connected to the GPMC. Note that we | ||
| 120 | * assume that pin multiplexing is done in the board-*.c file, | ||
| 121 | * or in the bootloader. | ||
| 122 | */ | ||
| 123 | void __init gpmc_smc91x_init(struct omap_smc91x_platform_data *board_data) | ||
| 124 | { | ||
| 125 | unsigned long cs_mem_base; | ||
| 126 | int ret; | ||
| 127 | |||
| 128 | gpmc_cfg = board_data; | ||
| 129 | |||
| 130 | if (gpmc_cfg->flags & GPMC_TIMINGS_SMC91C96) | ||
| 131 | gpmc_cfg->retime = smc91c96_gpmc_retime; | ||
| 132 | |||
| 133 | if (gpmc_cs_request(gpmc_cfg->cs, SZ_16M, &cs_mem_base) < 0) { | ||
| 134 | printk(KERN_ERR "Failed to request GPMC mem for smc91x\n"); | ||
| 135 | return; | ||
| 136 | } | ||
| 137 | |||
| 138 | gpmc_smc91x_resources[0].start = cs_mem_base + 0x300; | ||
| 139 | gpmc_smc91x_resources[0].end = cs_mem_base + 0x30f; | ||
| 140 | gpmc_smc91x_resources[1].flags |= (gpmc_cfg->flags & IRQF_TRIGGER_MASK); | ||
| 141 | |||
| 142 | if (gpmc_cfg->retime) { | ||
| 143 | ret = gpmc_cfg->retime(); | ||
| 144 | if (ret != 0) | ||
| 145 | goto free1; | ||
| 146 | } | ||
| 147 | |||
| 148 | if (gpio_request(gpmc_cfg->gpio_irq, "SMC91X irq") < 0) | ||
| 149 | goto free1; | ||
| 150 | |||
| 151 | gpio_direction_input(gpmc_cfg->gpio_irq); | ||
| 152 | gpmc_smc91x_resources[1].start = gpio_to_irq(gpmc_cfg->gpio_irq); | ||
| 153 | |||
| 154 | if (gpmc_cfg->gpio_pwrdwn) { | ||
| 155 | ret = gpio_request(gpmc_cfg->gpio_pwrdwn, "SMC91X powerdown"); | ||
| 156 | if (ret) | ||
| 157 | goto free2; | ||
| 158 | gpio_direction_output(gpmc_cfg->gpio_pwrdwn, 0); | ||
| 159 | } | ||
| 160 | |||
| 161 | if (gpmc_cfg->gpio_reset) { | ||
| 162 | ret = gpio_request(gpmc_cfg->gpio_reset, "SMC91X reset"); | ||
| 163 | if (ret) | ||
| 164 | goto free3; | ||
| 165 | |||
| 166 | gpio_direction_output(gpmc_cfg->gpio_reset, 0); | ||
| 167 | gpio_set_value(gpmc_cfg->gpio_reset, 1); | ||
| 168 | msleep(100); | ||
| 169 | gpio_set_value(gpmc_cfg->gpio_reset, 0); | ||
| 170 | } | ||
| 171 | |||
| 172 | if (platform_device_register(&gpmc_smc91x_device) < 0) { | ||
| 173 | printk(KERN_ERR "Unable to register smc91x device\n"); | ||
| 174 | gpio_free(gpmc_cfg->gpio_reset); | ||
| 175 | goto free3; | ||
| 176 | } | ||
| 177 | |||
| 178 | return; | ||
| 179 | |||
| 180 | free3: | ||
| 181 | if (gpmc_cfg->gpio_pwrdwn) | ||
| 182 | gpio_free(gpmc_cfg->gpio_pwrdwn); | ||
| 183 | free2: | ||
| 184 | gpio_free(gpmc_cfg->gpio_irq); | ||
| 185 | free1: | ||
| 186 | gpmc_cs_free(gpmc_cfg->cs); | ||
| 187 | |||
| 188 | printk(KERN_ERR "Could not initialize smc91x\n"); | ||
| 189 | } | ||
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 2249049c1d5a..f91934b2b092 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c | |||
| @@ -5,6 +5,9 @@ | |||
| 5 | * | 5 | * |
| 6 | * Author: Juha Yrjola | 6 | * Author: Juha Yrjola |
| 7 | * | 7 | * |
| 8 | * Copyright (C) 2009 Texas Instruments | ||
| 9 | * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com> | ||
| 10 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | 11 | * This program is free software; you can redistribute it and/or modify |
| 9 | * it under the terms of the GNU General Public License version 2 as | 12 | * it under the terms of the GNU General Public License version 2 as |
| 10 | * published by the Free Software Foundation. | 13 | * published by the Free Software Foundation. |
| @@ -424,6 +427,9 @@ void __init gpmc_init(void) | |||
| 424 | } else if (cpu_is_omap34xx()) { | 427 | } else if (cpu_is_omap34xx()) { |
| 425 | ck = "gpmc_fck"; | 428 | ck = "gpmc_fck"; |
| 426 | l = OMAP34XX_GPMC_BASE; | 429 | l = OMAP34XX_GPMC_BASE; |
| 430 | } else if (cpu_is_omap44xx()) { | ||
| 431 | ck = "gpmc_fck"; | ||
| 432 | l = OMAP44XX_GPMC_BASE; | ||
| 427 | } | 433 | } |
| 428 | 434 | ||
| 429 | gpmc_l3_clk = clk_get(NULL, ck); | 435 | gpmc_l3_clk = clk_get(NULL, ck); |
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 34b5914e0f8b..458990e20c60 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c | |||
| @@ -6,6 +6,9 @@ | |||
| 6 | * Copyright (C) 2005 Nokia Corporation | 6 | * Copyright (C) 2005 Nokia Corporation |
| 7 | * Written by Tony Lindgren <tony@atomide.com> | 7 | * Written by Tony Lindgren <tony@atomide.com> |
| 8 | * | 8 | * |
| 9 | * Copyright (C) 2009 Texas Instruments | ||
| 10 | * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com> | ||
| 11 | * | ||
| 9 | * This program is free software; you can redistribute it and/or modify | 12 | * This program is free software; you can redistribute it and/or modify |
| 10 | * it under the terms of the GNU General Public License version 2 as | 13 | * it under the terms of the GNU General Public License version 2 as |
| 11 | * published by the Free Software Foundation. | 14 | * published by the Free Software Foundation. |
| @@ -200,7 +203,10 @@ void __init omap2_check_revision(void) | |||
| 200 | omap24xx_check_revision(); | 203 | omap24xx_check_revision(); |
| 201 | else if (cpu_is_omap34xx()) | 204 | else if (cpu_is_omap34xx()) |
| 202 | omap34xx_check_revision(); | 205 | omap34xx_check_revision(); |
| 203 | else | 206 | else if (cpu_is_omap44xx()) { |
| 207 | printk(KERN_INFO "FIXME: CPU revision = OMAP4430\n"); | ||
| 208 | return; | ||
| 209 | } else | ||
| 204 | pr_err("OMAP revision unknown, please fix!\n"); | 210 | pr_err("OMAP revision unknown, please fix!\n"); |
| 205 | 211 | ||
| 206 | /* | 212 | /* |
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 916fcd3a2328..32afd9448216 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
| @@ -4,12 +4,14 @@ | |||
| 4 | * OMAP2 I/O mapping code | 4 | * OMAP2 I/O mapping code |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2005 Nokia Corporation | 6 | * Copyright (C) 2005 Nokia Corporation |
| 7 | * Copyright (C) 2007 Texas Instruments | 7 | * Copyright (C) 2007-2009 Texas Instruments |
| 8 | * | 8 | * |
| 9 | * Author: | 9 | * Author: |
| 10 | * Juha Yrjola <juha.yrjola@nokia.com> | 10 | * Juha Yrjola <juha.yrjola@nokia.com> |
| 11 | * Syed Khasim <x0khasim@ti.com> | 11 | * Syed Khasim <x0khasim@ti.com> |
| 12 | * | 12 | * |
| 13 | * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com> | ||
| 14 | * | ||
| 13 | * This program is free software; you can redistribute it and/or modify | 15 | * This program is free software; you can redistribute it and/or modify |
| 14 | * it under the terms of the GNU General Public License version 2 as | 16 | * it under the terms of the GNU General Public License version 2 as |
| 15 | * published by the Free Software Foundation. | 17 | * published by the Free Software Foundation. |
| @@ -30,6 +32,7 @@ | |||
| 30 | #include <mach/sdrc.h> | 32 | #include <mach/sdrc.h> |
| 31 | #include <mach/gpmc.h> | 33 | #include <mach/gpmc.h> |
| 32 | 34 | ||
| 35 | #ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdev is ready */ | ||
| 33 | #include "clock.h" | 36 | #include "clock.h" |
| 34 | 37 | ||
| 35 | #include <mach/powerdomain.h> | 38 | #include <mach/powerdomain.h> |
| @@ -38,7 +41,7 @@ | |||
| 38 | 41 | ||
| 39 | #include <mach/clockdomain.h> | 42 | #include <mach/clockdomain.h> |
| 40 | #include "clockdomains.h" | 43 | #include "clockdomains.h" |
| 41 | 44 | #endif | |
| 42 | /* | 45 | /* |
| 43 | * The machine specific code may provide the extra mapping besides the | 46 | * The machine specific code may provide the extra mapping besides the |
| 44 | * default mapping provided here. | 47 | * default mapping provided here. |
| @@ -166,6 +169,46 @@ static struct map_desc omap34xx_io_desc[] __initdata = { | |||
| 166 | }, | 169 | }, |
| 167 | }; | 170 | }; |
| 168 | #endif | 171 | #endif |
| 172 | #ifdef CONFIG_ARCH_OMAP4 | ||
| 173 | static struct map_desc omap44xx_io_desc[] __initdata = { | ||
| 174 | { | ||
| 175 | .virtual = L3_44XX_VIRT, | ||
| 176 | .pfn = __phys_to_pfn(L3_44XX_PHYS), | ||
| 177 | .length = L3_44XX_SIZE, | ||
| 178 | .type = MT_DEVICE, | ||
| 179 | }, | ||
| 180 | { | ||
| 181 | .virtual = L4_44XX_VIRT, | ||
| 182 | .pfn = __phys_to_pfn(L4_44XX_PHYS), | ||
| 183 | .length = L4_44XX_SIZE, | ||
| 184 | .type = MT_DEVICE, | ||
| 185 | }, | ||
| 186 | { | ||
| 187 | .virtual = L4_WK_44XX_VIRT, | ||
| 188 | .pfn = __phys_to_pfn(L4_WK_44XX_PHYS), | ||
| 189 | .length = L4_WK_44XX_SIZE, | ||
| 190 | .type = MT_DEVICE, | ||
| 191 | }, | ||
| 192 | { | ||
| 193 | .virtual = OMAP44XX_GPMC_VIRT, | ||
| 194 | .pfn = __phys_to_pfn(OMAP44XX_GPMC_PHYS), | ||
| 195 | .length = OMAP44XX_GPMC_SIZE, | ||
| 196 | .type = MT_DEVICE, | ||
| 197 | }, | ||
| 198 | { | ||
| 199 | .virtual = L4_PER_44XX_VIRT, | ||
| 200 | .pfn = __phys_to_pfn(L4_PER_44XX_PHYS), | ||
| 201 | .length = L4_PER_44XX_SIZE, | ||
| 202 | .type = MT_DEVICE, | ||
| 203 | }, | ||
| 204 | { | ||
| 205 | .virtual = L4_EMU_44XX_VIRT, | ||
| 206 | .pfn = __phys_to_pfn(L4_EMU_44XX_PHYS), | ||
| 207 | .length = L4_EMU_44XX_SIZE, | ||
| 208 | .type = MT_DEVICE, | ||
| 209 | }, | ||
| 210 | }; | ||
| 211 | #endif | ||
| 169 | 212 | ||
| 170 | void __init omap2_map_common_io(void) | 213 | void __init omap2_map_common_io(void) |
| 171 | { | 214 | { |
| @@ -183,6 +226,9 @@ void __init omap2_map_common_io(void) | |||
| 183 | iotable_init(omap34xx_io_desc, ARRAY_SIZE(omap34xx_io_desc)); | 226 | iotable_init(omap34xx_io_desc, ARRAY_SIZE(omap34xx_io_desc)); |
| 184 | #endif | 227 | #endif |
| 185 | 228 | ||
| 229 | #if defined(CONFIG_ARCH_OMAP4) | ||
| 230 | iotable_init(omap44xx_io_desc, ARRAY_SIZE(omap44xx_io_desc)); | ||
| 231 | #endif | ||
| 186 | /* Normally devicemaps_init() would flush caches and tlb after | 232 | /* Normally devicemaps_init() would flush caches and tlb after |
| 187 | * mdesc->map_io(), but we must also do it here because of the CPU | 233 | * mdesc->map_io(), but we must also do it here because of the CPU |
| 188 | * revision check below. | 234 | * revision check below. |
| @@ -198,9 +244,11 @@ void __init omap2_map_common_io(void) | |||
| 198 | void __init omap2_init_common_hw(struct omap_sdrc_params *sp) | 244 | void __init omap2_init_common_hw(struct omap_sdrc_params *sp) |
| 199 | { | 245 | { |
| 200 | omap2_mux_init(); | 246 | omap2_mux_init(); |
| 247 | #ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once the clkdev is ready */ | ||
| 201 | pwrdm_init(powerdomains_omap); | 248 | pwrdm_init(powerdomains_omap); |
| 202 | clkdm_init(clockdomains_omap, clkdm_pwrdm_autodeps); | 249 | clkdm_init(clockdomains_omap, clkdm_pwrdm_autodeps); |
| 203 | omap2_clk_init(); | 250 | omap2_clk_init(); |
| 204 | omap2_sdrc_init(sp); | 251 | omap2_sdrc_init(sp); |
| 252 | #endif | ||
| 205 | gpmc_init(); | 253 | gpmc_init(); |
| 206 | } | 254 | } |
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 998c5c45587e..b82863887f10 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #define INTC_MIR_CLEAR0 0x0088 | 28 | #define INTC_MIR_CLEAR0 0x0088 |
| 29 | #define INTC_MIR_SET0 0x008c | 29 | #define INTC_MIR_SET0 0x008c |
| 30 | #define INTC_PENDING_IRQ0 0x0098 | 30 | #define INTC_PENDING_IRQ0 0x0098 |
| 31 | |||
| 32 | /* Number of IRQ state bits in each MIR register */ | 31 | /* Number of IRQ state bits in each MIR register */ |
| 33 | #define IRQ_BITS_PER_REG 32 | 32 | #define IRQ_BITS_PER_REG 32 |
| 34 | 33 | ||
| @@ -134,7 +133,6 @@ static struct irq_chip omap_irq_chip = { | |||
| 134 | .ack = omap_mask_ack_irq, | 133 | .ack = omap_mask_ack_irq, |
| 135 | .mask = omap_mask_irq, | 134 | .mask = omap_mask_irq, |
| 136 | .unmask = omap_unmask_irq, | 135 | .unmask = omap_unmask_irq, |
| 137 | .disable = omap_mask_irq, | ||
| 138 | }; | 136 | }; |
| 139 | 137 | ||
| 140 | static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank) | 138 | static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank) |
| @@ -157,6 +155,22 @@ static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank) | |||
| 157 | intc_bank_write_reg(1 << 0, bank, INTC_SYSCONFIG); | 155 | intc_bank_write_reg(1 << 0, bank, INTC_SYSCONFIG); |
| 158 | } | 156 | } |
| 159 | 157 | ||
| 158 | int omap_irq_pending(void) | ||
| 159 | { | ||
| 160 | int i; | ||
| 161 | |||
| 162 | for (i = 0; i < ARRAY_SIZE(irq_banks); i++) { | ||
| 163 | struct omap_irq_bank *bank = irq_banks + i; | ||
| 164 | int irq; | ||
| 165 | |||
| 166 | for (irq = 0; irq < bank->nr_irqs; irq += 32) | ||
| 167 | if (intc_bank_read_reg(bank, INTC_PENDING_IRQ0 + | ||
| 168 | ((irq >> 5) << 5))) | ||
| 169 | return 1; | ||
| 170 | } | ||
| 171 | return 0; | ||
| 172 | } | ||
| 173 | |||
| 160 | void __init omap_init_irq(void) | 174 | void __init omap_init_irq(void) |
| 161 | { | 175 | { |
| 162 | unsigned long nr_of_irqs = 0; | 176 | unsigned long nr_of_irqs = 0; |
diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c index dc40b3e72206..9756a878fd90 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.c +++ b/arch/arm/mach-omap2/mmc-twl4030.c | |||
| @@ -16,8 +16,8 @@ | |||
| 16 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
| 17 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
| 18 | #include <linux/gpio.h> | 18 | #include <linux/gpio.h> |
| 19 | #include <linux/i2c/twl4030.h> | 19 | #include <linux/mmc/host.h> |
| 20 | #include <linux/regulator/machine.h> | 20 | #include <linux/regulator/consumer.h> |
| 21 | 21 | ||
| 22 | #include <mach/hardware.h> | 22 | #include <mach/hardware.h> |
| 23 | #include <mach/control.h> | 23 | #include <mach/control.h> |
| @@ -26,31 +26,9 @@ | |||
| 26 | 26 | ||
| 27 | #include "mmc-twl4030.h" | 27 | #include "mmc-twl4030.h" |
| 28 | 28 | ||
| 29 | #if defined(CONFIG_TWL4030_CORE) && \ | ||
| 30 | (defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)) | ||
| 31 | 29 | ||
| 32 | #define LDO_CLR 0x00 | 30 | #if defined(CONFIG_REGULATOR) && \ |
| 33 | #define VSEL_S2_CLR 0x40 | 31 | (defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)) |
| 34 | |||
| 35 | #define VMMC1_DEV_GRP 0x27 | ||
| 36 | #define VMMC1_CLR 0x00 | ||
| 37 | #define VMMC1_315V 0x03 | ||
| 38 | #define VMMC1_300V 0x02 | ||
| 39 | #define VMMC1_285V 0x01 | ||
| 40 | #define VMMC1_185V 0x00 | ||
| 41 | #define VMMC1_DEDICATED 0x2A | ||
| 42 | |||
| 43 | #define VMMC2_DEV_GRP 0x2B | ||
| 44 | #define VMMC2_CLR 0x40 | ||
| 45 | #define VMMC2_315V 0x0c | ||
| 46 | #define VMMC2_300V 0x0b | ||
| 47 | #define VMMC2_285V 0x0a | ||
| 48 | #define VMMC2_280V 0x09 | ||
| 49 | #define VMMC2_260V 0x08 | ||
| 50 | #define VMMC2_185V 0x06 | ||
| 51 | #define VMMC2_DEDICATED 0x2E | ||
| 52 | |||
| 53 | #define VMMC_DEV_GRP_P1 0x20 | ||
| 54 | 32 | ||
| 55 | static u16 control_pbias_offset; | 33 | static u16 control_pbias_offset; |
| 56 | static u16 control_devconf1_offset; | 34 | static u16 control_devconf1_offset; |
| @@ -59,19 +37,16 @@ static u16 control_devconf1_offset; | |||
| 59 | 37 | ||
| 60 | static struct twl_mmc_controller { | 38 | static struct twl_mmc_controller { |
| 61 | struct omap_mmc_platform_data *mmc; | 39 | struct omap_mmc_platform_data *mmc; |
| 62 | u8 twl_vmmc_dev_grp; | 40 | /* Vcc == configured supply |
| 63 | u8 twl_mmc_dedicated; | 41 | * Vcc_alt == optional |
| 64 | char name[HSMMC_NAME_LEN + 1]; | 42 | * - MMC1, supply for DAT4..DAT7 |
| 65 | } hsmmc[OMAP34XX_NR_MMC] = { | 43 | * - MMC2/MMC2, external level shifter voltage supply, for |
| 66 | { | 44 | * chip (SDIO, eMMC, etc) or transceiver (MMC2 only) |
| 67 | .twl_vmmc_dev_grp = VMMC1_DEV_GRP, | 45 | */ |
| 68 | .twl_mmc_dedicated = VMMC1_DEDICATED, | 46 | struct regulator *vcc; |
| 69 | }, | 47 | struct regulator *vcc_aux; |
| 70 | { | 48 | char name[HSMMC_NAME_LEN + 1]; |
| 71 | .twl_vmmc_dev_grp = VMMC2_DEV_GRP, | 49 | } hsmmc[OMAP34XX_NR_MMC]; |
| 72 | .twl_mmc_dedicated = VMMC2_DEDICATED, | ||
| 73 | }, | ||
| 74 | }; | ||
| 75 | 50 | ||
| 76 | static int twl_mmc_card_detect(int irq) | 51 | static int twl_mmc_card_detect(int irq) |
| 77 | { | 52 | { |
| @@ -117,16 +92,60 @@ static int twl_mmc_late_init(struct device *dev) | |||
| 117 | int ret = 0; | 92 | int ret = 0; |
| 118 | int i; | 93 | int i; |
| 119 | 94 | ||
| 120 | ret = gpio_request(mmc->slots[0].switch_pin, "mmc_cd"); | 95 | /* MMC/SD/SDIO doesn't require a card detect switch */ |
| 121 | if (ret) | 96 | if (gpio_is_valid(mmc->slots[0].switch_pin)) { |
| 122 | goto done; | 97 | ret = gpio_request(mmc->slots[0].switch_pin, "mmc_cd"); |
| 123 | ret = gpio_direction_input(mmc->slots[0].switch_pin); | 98 | if (ret) |
| 124 | if (ret) | 99 | goto done; |
| 125 | goto err; | 100 | ret = gpio_direction_input(mmc->slots[0].switch_pin); |
| 101 | if (ret) | ||
| 102 | goto err; | ||
| 103 | } | ||
| 126 | 104 | ||
| 105 | /* require at least main regulator */ | ||
| 127 | for (i = 0; i < ARRAY_SIZE(hsmmc); i++) { | 106 | for (i = 0; i < ARRAY_SIZE(hsmmc); i++) { |
| 128 | if (hsmmc[i].name == mmc->slots[0].name) { | 107 | if (hsmmc[i].name == mmc->slots[0].name) { |
| 108 | struct regulator *reg; | ||
| 109 | |||
| 129 | hsmmc[i].mmc = mmc; | 110 | hsmmc[i].mmc = mmc; |
| 111 | |||
| 112 | reg = regulator_get(dev, "vmmc"); | ||
| 113 | if (IS_ERR(reg)) { | ||
| 114 | dev_dbg(dev, "vmmc regulator missing\n"); | ||
| 115 | /* HACK: until fixed.c regulator is usable, | ||
| 116 | * we don't require a main regulator | ||
| 117 | * for MMC2 or MMC3 | ||
| 118 | */ | ||
| 119 | if (i != 0) | ||
| 120 | break; | ||
| 121 | ret = PTR_ERR(reg); | ||
| 122 | goto err; | ||
| 123 | } | ||
| 124 | hsmmc[i].vcc = reg; | ||
| 125 | mmc->slots[0].ocr_mask = mmc_regulator_get_ocrmask(reg); | ||
| 126 | |||
| 127 | /* allow an aux regulator */ | ||
| 128 | reg = regulator_get(dev, "vmmc_aux"); | ||
| 129 | hsmmc[i].vcc_aux = IS_ERR(reg) ? NULL : reg; | ||
| 130 | |||
| 131 | /* UGLY HACK: workaround regulator framework bugs. | ||
| 132 | * When the bootloader leaves a supply active, it's | ||
| 133 | * initialized with zero usecount ... and we can't | ||
| 134 | * disable it without first enabling it. Until the | ||
| 135 | * framework is fixed, we need a workaround like this | ||
| 136 | * (which is safe for MMC, but not in general). | ||
| 137 | */ | ||
| 138 | if (regulator_is_enabled(hsmmc[i].vcc) > 0) { | ||
| 139 | regulator_enable(hsmmc[i].vcc); | ||
| 140 | regulator_disable(hsmmc[i].vcc); | ||
| 141 | } | ||
| 142 | if (hsmmc[i].vcc_aux) { | ||
| 143 | if (regulator_is_enabled(reg) > 0) { | ||
| 144 | regulator_enable(reg); | ||
| 145 | regulator_disable(reg); | ||
| 146 | } | ||
| 147 | } | ||
| 148 | |||
| 130 | break; | 149 | break; |
| 131 | } | 150 | } |
| 132 | } | 151 | } |
| @@ -173,96 +192,6 @@ static int twl_mmc_resume(struct device *dev, int slot) | |||
| 173 | #define twl_mmc_resume NULL | 192 | #define twl_mmc_resume NULL |
| 174 | #endif | 193 | #endif |
| 175 | 194 | ||
| 176 | /* | ||
| 177 | * Sets the MMC voltage in twl4030 | ||
| 178 | */ | ||
| 179 | |||
| 180 | #define MMC1_OCR (MMC_VDD_165_195 \ | ||
| 181 | |MMC_VDD_28_29|MMC_VDD_29_30|MMC_VDD_30_31|MMC_VDD_31_32) | ||
| 182 | #define MMC2_OCR (MMC_VDD_165_195 \ | ||
| 183 | |MMC_VDD_25_26|MMC_VDD_26_27|MMC_VDD_27_28 \ | ||
| 184 | |MMC_VDD_28_29|MMC_VDD_29_30|MMC_VDD_30_31|MMC_VDD_31_32) | ||
| 185 | |||
| 186 | static int twl_mmc_set_voltage(struct twl_mmc_controller *c, int vdd) | ||
| 187 | { | ||
| 188 | int ret; | ||
| 189 | u8 vmmc = 0, dev_grp_val; | ||
| 190 | |||
| 191 | if (!vdd) | ||
| 192 | goto doit; | ||
| 193 | |||
| 194 | if (c->twl_vmmc_dev_grp == VMMC1_DEV_GRP) { | ||
| 195 | /* VMMC1: max 220 mA. And for 8-bit mode, | ||
| 196 | * VSIM: max 50 mA | ||
| 197 | */ | ||
| 198 | switch (1 << vdd) { | ||
| 199 | case MMC_VDD_165_195: | ||
| 200 | vmmc = VMMC1_185V; | ||
| 201 | /* and VSIM_180V */ | ||
| 202 | break; | ||
| 203 | case MMC_VDD_28_29: | ||
| 204 | vmmc = VMMC1_285V; | ||
| 205 | /* and VSIM_280V */ | ||
| 206 | break; | ||
| 207 | case MMC_VDD_29_30: | ||
| 208 | case MMC_VDD_30_31: | ||
| 209 | vmmc = VMMC1_300V; | ||
| 210 | /* and VSIM_300V */ | ||
| 211 | break; | ||
| 212 | case MMC_VDD_31_32: | ||
| 213 | vmmc = VMMC1_315V; | ||
| 214 | /* error if VSIM needed */ | ||
| 215 | break; | ||
| 216 | default: | ||
| 217 | return -EINVAL; | ||
| 218 | } | ||
| 219 | } else if (c->twl_vmmc_dev_grp == VMMC2_DEV_GRP) { | ||
| 220 | /* VMMC2: max 100 mA */ | ||
| 221 | switch (1 << vdd) { | ||
| 222 | case MMC_VDD_165_195: | ||
| 223 | vmmc = VMMC2_185V; | ||
| 224 | break; | ||
| 225 | case MMC_VDD_25_26: | ||
| 226 | case MMC_VDD_26_27: | ||
| 227 | vmmc = VMMC2_260V; | ||
| 228 | break; | ||
| 229 | case MMC_VDD_27_28: | ||
| 230 | vmmc = VMMC2_280V; | ||
| 231 | break; | ||
| 232 | case MMC_VDD_28_29: | ||
| 233 | vmmc = VMMC2_285V; | ||
| 234 | break; | ||
| 235 | case MMC_VDD_29_30: | ||
| 236 | case MMC_VDD_30_31: | ||
| 237 | vmmc = VMMC2_300V; | ||
| 238 | break; | ||
| 239 | case MMC_VDD_31_32: | ||
| 240 | vmmc = VMMC2_315V; | ||
| 241 | break; | ||
| 242 | default: | ||
| 243 | return -EINVAL; | ||
| 244 | } | ||
| 245 | } else { | ||
| 246 | return -EINVAL; | ||
| 247 | } | ||
| 248 | |||
| 249 | doit: | ||
| 250 | if (vdd) | ||
| 251 | dev_grp_val = VMMC_DEV_GRP_P1; /* Power up */ | ||
| 252 | else | ||
| 253 | dev_grp_val = LDO_CLR; /* Power down */ | ||
| 254 | |||
| 255 | ret = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, | ||
| 256 | dev_grp_val, c->twl_vmmc_dev_grp); | ||
| 257 | if (ret || !vdd) | ||
| 258 | return ret; | ||
| 259 | |||
| 260 | ret = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, | ||
| 261 | vmmc, c->twl_mmc_dedicated); | ||
| 262 | |||
| 263 | return ret; | ||
| 264 | } | ||
| 265 | |||
| 266 | static int twl_mmc1_set_power(struct device *dev, int slot, int power_on, | 195 | static int twl_mmc1_set_power(struct device *dev, int slot, int power_on, |
| 267 | int vdd) | 196 | int vdd) |
| 268 | { | 197 | { |
| @@ -273,11 +202,13 @@ static int twl_mmc1_set_power(struct device *dev, int slot, int power_on, | |||
| 273 | 202 | ||
| 274 | /* | 203 | /* |
| 275 | * Assume we power both OMAP VMMC1 (for CMD, CLK, DAT0..3) and the | 204 | * Assume we power both OMAP VMMC1 (for CMD, CLK, DAT0..3) and the |
| 276 | * card using the same TWL VMMC1 supply (hsmmc[0]); OMAP has both | 205 | * card with Vcc regulator (from twl4030 or whatever). OMAP has both |
| 277 | * 1.8V and 3.0V modes, controlled by the PBIAS register. | 206 | * 1.8V and 3.0V modes, controlled by the PBIAS register. |
| 278 | * | 207 | * |
| 279 | * In 8-bit modes, OMAP VMMC1A (for DAT4..7) needs a supply, which | 208 | * In 8-bit modes, OMAP VMMC1A (for DAT4..7) needs a supply, which |
| 280 | * is most naturally TWL VSIM; those pins also use PBIAS. | 209 | * is most naturally TWL VSIM; those pins also use PBIAS. |
| 210 | * | ||
| 211 | * FIXME handle VMMC1A as needed ... | ||
| 281 | */ | 212 | */ |
| 282 | if (power_on) { | 213 | if (power_on) { |
| 283 | if (cpu_is_omap2430()) { | 214 | if (cpu_is_omap2430()) { |
| @@ -300,7 +231,7 @@ static int twl_mmc1_set_power(struct device *dev, int slot, int power_on, | |||
| 300 | reg &= ~OMAP2_PBIASLITEPWRDNZ0; | 231 | reg &= ~OMAP2_PBIASLITEPWRDNZ0; |
| 301 | omap_ctrl_writel(reg, control_pbias_offset); | 232 | omap_ctrl_writel(reg, control_pbias_offset); |
| 302 | 233 | ||
| 303 | ret = twl_mmc_set_voltage(c, vdd); | 234 | ret = mmc_regulator_set_ocr(c->vcc, vdd); |
| 304 | 235 | ||
| 305 | /* 100ms delay required for PBIAS configuration */ | 236 | /* 100ms delay required for PBIAS configuration */ |
| 306 | msleep(100); | 237 | msleep(100); |
| @@ -316,7 +247,7 @@ static int twl_mmc1_set_power(struct device *dev, int slot, int power_on, | |||
| 316 | reg &= ~OMAP2_PBIASLITEPWRDNZ0; | 247 | reg &= ~OMAP2_PBIASLITEPWRDNZ0; |
| 317 | omap_ctrl_writel(reg, control_pbias_offset); | 248 | omap_ctrl_writel(reg, control_pbias_offset); |
| 318 | 249 | ||
| 319 | ret = twl_mmc_set_voltage(c, 0); | 250 | ret = mmc_regulator_set_ocr(c->vcc, 0); |
| 320 | 251 | ||
| 321 | /* 100ms delay required for PBIAS configuration */ | 252 | /* 100ms delay required for PBIAS configuration */ |
| 322 | msleep(100); | 253 | msleep(100); |
| @@ -329,19 +260,33 @@ static int twl_mmc1_set_power(struct device *dev, int slot, int power_on, | |||
| 329 | return ret; | 260 | return ret; |
| 330 | } | 261 | } |
| 331 | 262 | ||
| 332 | static int twl_mmc2_set_power(struct device *dev, int slot, int power_on, int vdd) | 263 | static int twl_mmc23_set_power(struct device *dev, int slot, int power_on, int vdd) |
| 333 | { | 264 | { |
| 334 | int ret; | 265 | int ret = 0; |
| 335 | struct twl_mmc_controller *c = &hsmmc[1]; | 266 | struct twl_mmc_controller *c = &hsmmc[1]; |
| 336 | struct omap_mmc_platform_data *mmc = dev->platform_data; | 267 | struct omap_mmc_platform_data *mmc = dev->platform_data; |
| 337 | 268 | ||
| 269 | /* If we don't see a Vcc regulator, assume it's a fixed | ||
| 270 | * voltage always-on regulator. | ||
| 271 | */ | ||
| 272 | if (!c->vcc) | ||
| 273 | return 0; | ||
| 274 | |||
| 338 | /* | 275 | /* |
| 339 | * Assume TWL VMMC2 (hsmmc[1]) is used only to power the card ... OMAP | 276 | * Assume Vcc regulator is used only to power the card ... OMAP |
| 340 | * VDDS is used to power the pins, optionally with a transceiver to | 277 | * VDDS is used to power the pins, optionally with a transceiver to |
| 341 | * support cards using voltages other than VDDS (1.8V nominal). When a | 278 | * support cards using voltages other than VDDS (1.8V nominal). When a |
| 342 | * transceiver is used, DAT3..7 are muxed as transceiver control pins. | 279 | * transceiver is used, DAT3..7 are muxed as transceiver control pins. |
| 280 | * | ||
| 281 | * In some cases this regulator won't support enable/disable; | ||
| 282 | * e.g. it's a fixed rail for a WLAN chip. | ||
| 283 | * | ||
| 284 | * In other cases vcc_aux switches interface power. Example, for | ||
| 285 | * eMMC cards it represents VccQ. Sometimes transceivers or SDIO | ||
| 286 | * chips/cards need an interface voltage rail too. | ||
| 343 | */ | 287 | */ |
| 344 | if (power_on) { | 288 | if (power_on) { |
| 289 | /* only MMC2 supports a CLKIN */ | ||
| 345 | if (mmc->slots[0].internal_clock) { | 290 | if (mmc->slots[0].internal_clock) { |
| 346 | u32 reg; | 291 | u32 reg; |
| 347 | 292 | ||
| @@ -349,24 +294,23 @@ static int twl_mmc2_set_power(struct device *dev, int slot, int power_on, int vd | |||
| 349 | reg |= OMAP2_MMCSDIO2ADPCLKISEL; | 294 | reg |= OMAP2_MMCSDIO2ADPCLKISEL; |
| 350 | omap_ctrl_writel(reg, control_devconf1_offset); | 295 | omap_ctrl_writel(reg, control_devconf1_offset); |
| 351 | } | 296 | } |
| 352 | ret = twl_mmc_set_voltage(c, vdd); | 297 | ret = mmc_regulator_set_ocr(c->vcc, vdd); |
| 298 | /* enable interface voltage rail, if needed */ | ||
| 299 | if (ret == 0 && c->vcc_aux) { | ||
| 300 | ret = regulator_enable(c->vcc_aux); | ||
| 301 | if (ret < 0) | ||
| 302 | ret = mmc_regulator_set_ocr(c->vcc, 0); | ||
| 303 | } | ||
| 353 | } else { | 304 | } else { |
| 354 | ret = twl_mmc_set_voltage(c, 0); | 305 | if (c->vcc_aux && (ret = regulator_is_enabled(c->vcc_aux)) > 0) |
| 306 | ret = regulator_disable(c->vcc_aux); | ||
| 307 | if (ret == 0) | ||
| 308 | ret = mmc_regulator_set_ocr(c->vcc, 0); | ||
| 355 | } | 309 | } |
| 356 | 310 | ||
| 357 | return ret; | 311 | return ret; |
| 358 | } | 312 | } |
| 359 | 313 | ||
| 360 | static int twl_mmc3_set_power(struct device *dev, int slot, int power_on, | ||
| 361 | int vdd) | ||
| 362 | { | ||
| 363 | /* | ||
| 364 | * Assume MMC3 has self-powered device connected, for example on-board | ||
| 365 | * chip with external power source. | ||
| 366 | */ | ||
| 367 | return 0; | ||
| 368 | } | ||
| 369 | |||
| 370 | static struct omap_mmc_platform_data *hsmmc_data[OMAP34XX_NR_MMC] __initdata; | 314 | static struct omap_mmc_platform_data *hsmmc_data[OMAP34XX_NR_MMC] __initdata; |
| 371 | 315 | ||
| 372 | void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) | 316 | void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) |
| @@ -412,10 +356,10 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) | |||
| 412 | mmc->slots[0].wires = c->wires; | 356 | mmc->slots[0].wires = c->wires; |
| 413 | mmc->slots[0].internal_clock = !c->ext_clock; | 357 | mmc->slots[0].internal_clock = !c->ext_clock; |
| 414 | mmc->dma_mask = 0xffffffff; | 358 | mmc->dma_mask = 0xffffffff; |
| 359 | mmc->init = twl_mmc_late_init; | ||
| 415 | 360 | ||
| 416 | /* note: twl4030 card detect GPIOs normally switch VMMCx ... */ | 361 | /* note: twl4030 card detect GPIOs can disable VMMCx ... */ |
| 417 | if (gpio_is_valid(c->gpio_cd)) { | 362 | if (gpio_is_valid(c->gpio_cd)) { |
| 418 | mmc->init = twl_mmc_late_init; | ||
| 419 | mmc->cleanup = twl_mmc_cleanup; | 363 | mmc->cleanup = twl_mmc_cleanup; |
| 420 | mmc->suspend = twl_mmc_suspend; | 364 | mmc->suspend = twl_mmc_suspend; |
| 421 | mmc->resume = twl_mmc_resume; | 365 | mmc->resume = twl_mmc_resume; |
| @@ -439,26 +383,28 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) | |||
| 439 | } else | 383 | } else |
| 440 | mmc->slots[0].gpio_wp = -EINVAL; | 384 | mmc->slots[0].gpio_wp = -EINVAL; |
| 441 | 385 | ||
| 442 | /* NOTE: we assume OMAP's MMC1 and MMC2 use | 386 | /* NOTE: MMC slots should have a Vcc regulator set up. |
| 443 | * the TWL4030's VMMC1 and VMMC2, respectively; | 387 | * This may be from a TWL4030-family chip, another |
| 444 | * and that MMC3 device has it's own power source. | 388 | * controllable regulator, or a fixed supply. |
| 389 | * | ||
| 390 | * temporary HACK: ocr_mask instead of fixed supply | ||
| 445 | */ | 391 | */ |
| 392 | mmc->slots[0].ocr_mask = c->ocr_mask; | ||
| 446 | 393 | ||
| 447 | switch (c->mmc) { | 394 | switch (c->mmc) { |
| 448 | case 1: | 395 | case 1: |
| 396 | /* on-chip level shifting via PBIAS0/PBIAS1 */ | ||
| 449 | mmc->slots[0].set_power = twl_mmc1_set_power; | 397 | mmc->slots[0].set_power = twl_mmc1_set_power; |
| 450 | mmc->slots[0].ocr_mask = MMC1_OCR; | ||
| 451 | break; | 398 | break; |
| 452 | case 2: | 399 | case 2: |
| 453 | mmc->slots[0].set_power = twl_mmc2_set_power; | 400 | if (c->ext_clock) |
| 454 | if (c->transceiver) | 401 | c->transceiver = 1; |
| 455 | mmc->slots[0].ocr_mask = MMC2_OCR; | 402 | if (c->transceiver && c->wires > 4) |
| 456 | else | 403 | c->wires = 4; |
| 457 | mmc->slots[0].ocr_mask = MMC_VDD_165_195; | 404 | /* FALLTHROUGH */ |
| 458 | break; | ||
| 459 | case 3: | 405 | case 3: |
| 460 | mmc->slots[0].set_power = twl_mmc3_set_power; | 406 | /* off-chip level shifting, or none */ |
| 461 | mmc->slots[0].ocr_mask = MMC_VDD_165_195; | 407 | mmc->slots[0].set_power = twl_mmc23_set_power; |
| 462 | break; | 408 | break; |
| 463 | default: | 409 | default: |
| 464 | pr_err("MMC%d configuration not supported!\n", c->mmc); | 410 | pr_err("MMC%d configuration not supported!\n", c->mmc); |
diff --git a/arch/arm/mach-omap2/mmc-twl4030.h b/arch/arm/mach-omap2/mmc-twl4030.h index ea59e8624290..3807c45c9a6c 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.h +++ b/arch/arm/mach-omap2/mmc-twl4030.h | |||
| @@ -16,9 +16,10 @@ struct twl4030_hsmmc_info { | |||
| 16 | int gpio_wp; /* or -EINVAL */ | 16 | int gpio_wp; /* or -EINVAL */ |
| 17 | char *name; /* or NULL for default */ | 17 | char *name; /* or NULL for default */ |
| 18 | struct device *dev; /* returned: pointer to mmc adapter */ | 18 | struct device *dev; /* returned: pointer to mmc adapter */ |
| 19 | int ocr_mask; /* temporary HACK */ | ||
| 19 | }; | 20 | }; |
| 20 | 21 | ||
| 21 | #if defined(CONFIG_TWL4030_CORE) && \ | 22 | #if defined(CONFIG_REGULATOR) && \ |
| 22 | (defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \ | 23 | (defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \ |
| 23 | defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)) | 24 | defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)) |
| 24 | 25 | ||
diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c new file mode 100644 index 000000000000..6cc375a275be --- /dev/null +++ b/arch/arm/mach-omap2/pm-debug.c | |||
| @@ -0,0 +1,152 @@ | |||
| 1 | /* | ||
| 2 | * OMAP Power Management debug routines | ||
| 3 | * | ||
| 4 | * Copyright (C) 2005 Texas Instruments, Inc. | ||
| 5 | * Copyright (C) 2006-2008 Nokia Corporation | ||
| 6 | * | ||
| 7 | * Written by: | ||
| 8 | * Richard Woodruff <r-woodruff2@ti.com> | ||
| 9 | * Tony Lindgren | ||
| 10 | * Juha Yrjola | ||
| 11 | * Amit Kucheria <amit.kucheria@nokia.com> | ||
| 12 | * Igor Stoppa <igor.stoppa@nokia.com> | ||
| 13 | * Jouni Hogander | ||
| 14 | * | ||
| 15 | * Based on pm.c for omap2 | ||
| 16 | * | ||
| 17 | * This program is free software; you can redistribute it and/or modify | ||
| 18 | * it under the terms of the GNU General Public License version 2 as | ||
| 19 | * published by the Free Software Foundation. | ||
| 20 | */ | ||
| 21 | |||
| 22 | #include <linux/kernel.h> | ||
| 23 | #include <linux/timer.h> | ||
| 24 | #include <linux/clk.h> | ||
| 25 | #include <linux/err.h> | ||
| 26 | #include <linux/io.h> | ||
| 27 | |||
| 28 | #include <mach/clock.h> | ||
| 29 | #include <mach/board.h> | ||
| 30 | |||
| 31 | #include "prm.h" | ||
| 32 | #include "cm.h" | ||
| 33 | #include "pm.h" | ||
| 34 | |||
| 35 | int omap2_pm_debug; | ||
| 36 | |||
| 37 | #define DUMP_PRM_MOD_REG(mod, reg) \ | ||
| 38 | regs[reg_count].name = #mod "." #reg; \ | ||
| 39 | regs[reg_count++].val = prm_read_mod_reg(mod, reg) | ||
| 40 | #define DUMP_CM_MOD_REG(mod, reg) \ | ||
| 41 | regs[reg_count].name = #mod "." #reg; \ | ||
| 42 | regs[reg_count++].val = cm_read_mod_reg(mod, reg) | ||
| 43 | #define DUMP_PRM_REG(reg) \ | ||
| 44 | regs[reg_count].name = #reg; \ | ||
| 45 | regs[reg_count++].val = __raw_readl(reg) | ||
| 46 | #define DUMP_CM_REG(reg) \ | ||
| 47 | regs[reg_count].name = #reg; \ | ||
| 48 | regs[reg_count++].val = __raw_readl(reg) | ||
| 49 | #define DUMP_INTC_REG(reg, off) \ | ||
| 50 | regs[reg_count].name = #reg; \ | ||
| 51 | regs[reg_count++].val = __raw_readl(IO_ADDRESS(0x480fe000 + (off))) | ||
| 52 | |||
| 53 | void omap2_pm_dump(int mode, int resume, unsigned int us) | ||
| 54 | { | ||
| 55 | struct reg { | ||
| 56 | const char *name; | ||
| 57 | u32 val; | ||
| 58 | } regs[32]; | ||
| 59 | int reg_count = 0, i; | ||
| 60 | const char *s1 = NULL, *s2 = NULL; | ||
| 61 | |||
| 62 | if (!resume) { | ||
| 63 | #if 0 | ||
| 64 | /* MPU */ | ||
| 65 | DUMP_PRM_MOD_REG(OCP_MOD, OMAP2_PRM_IRQENABLE_MPU_OFFSET); | ||
| 66 | DUMP_CM_MOD_REG(MPU_MOD, CM_CLKSTCTRL); | ||
| 67 | DUMP_PRM_MOD_REG(MPU_MOD, PM_PWSTCTRL); | ||
| 68 | DUMP_PRM_MOD_REG(MPU_MOD, PM_PWSTST); | ||
| 69 | DUMP_PRM_MOD_REG(MPU_MOD, PM_WKDEP); | ||
| 70 | #endif | ||
| 71 | #if 0 | ||
| 72 | /* INTC */ | ||
| 73 | DUMP_INTC_REG(INTC_MIR0, 0x0084); | ||
| 74 | DUMP_INTC_REG(INTC_MIR1, 0x00a4); | ||
| 75 | DUMP_INTC_REG(INTC_MIR2, 0x00c4); | ||
| 76 | #endif | ||
| 77 | #if 0 | ||
| 78 | DUMP_CM_MOD_REG(CORE_MOD, CM_FCLKEN1); | ||
| 79 | if (cpu_is_omap24xx()) { | ||
| 80 | DUMP_CM_MOD_REG(CORE_MOD, OMAP24XX_CM_FCLKEN2); | ||
| 81 | DUMP_PRM_MOD_REG(OMAP24XX_GR_MOD, | ||
| 82 | OMAP2_PRCM_CLKEMUL_CTRL_OFFSET); | ||
| 83 | DUMP_PRM_MOD_REG(OMAP24XX_GR_MOD, | ||
| 84 | OMAP2_PRCM_CLKSRC_CTRL_OFFSET); | ||
| 85 | } | ||
| 86 | DUMP_CM_MOD_REG(WKUP_MOD, CM_FCLKEN); | ||
| 87 | DUMP_CM_MOD_REG(CORE_MOD, CM_ICLKEN1); | ||
| 88 | DUMP_CM_MOD_REG(CORE_MOD, CM_ICLKEN2); | ||
| 89 | DUMP_CM_MOD_REG(WKUP_MOD, CM_ICLKEN); | ||
| 90 | DUMP_CM_MOD_REG(PLL_MOD, CM_CLKEN); | ||
| 91 | DUMP_CM_MOD_REG(PLL_MOD, CM_AUTOIDLE); | ||
| 92 | DUMP_PRM_MOD_REG(CORE_MOD, PM_PWSTST); | ||
| 93 | #endif | ||
| 94 | #if 0 | ||
| 95 | /* DSP */ | ||
| 96 | if (cpu_is_omap24xx()) { | ||
| 97 | DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_FCLKEN); | ||
| 98 | DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_ICLKEN); | ||
| 99 | DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_IDLEST); | ||
| 100 | DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_AUTOIDLE); | ||
| 101 | DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_CLKSEL); | ||
| 102 | DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_CLKSTCTRL); | ||
| 103 | DUMP_PRM_MOD_REG(OMAP24XX_DSP_MOD, RM_RSTCTRL); | ||
| 104 | DUMP_PRM_MOD_REG(OMAP24XX_DSP_MOD, RM_RSTST); | ||
| 105 | DUMP_PRM_MOD_REG(OMAP24XX_DSP_MOD, PM_PWSTCTRL); | ||
| 106 | DUMP_PRM_MOD_REG(OMAP24XX_DSP_MOD, PM_PWSTST); | ||
| 107 | } | ||
| 108 | #endif | ||
| 109 | } else { | ||
| 110 | DUMP_PRM_MOD_REG(CORE_MOD, PM_WKST1); | ||
| 111 | if (cpu_is_omap24xx()) | ||
| 112 | DUMP_PRM_MOD_REG(CORE_MOD, OMAP24XX_PM_WKST2); | ||
| 113 | DUMP_PRM_MOD_REG(WKUP_MOD, PM_WKST); | ||
| 114 | DUMP_PRM_MOD_REG(OCP_MOD, OMAP2_PRCM_IRQSTATUS_MPU_OFFSET); | ||
| 115 | #if 1 | ||
| 116 | DUMP_INTC_REG(INTC_PENDING_IRQ0, 0x0098); | ||
| 117 | DUMP_INTC_REG(INTC_PENDING_IRQ1, 0x00b8); | ||
| 118 | DUMP_INTC_REG(INTC_PENDING_IRQ2, 0x00d8); | ||
| 119 | #endif | ||
| 120 | } | ||
| 121 | |||
| 122 | switch (mode) { | ||
| 123 | case 0: | ||
| 124 | s1 = "full"; | ||
| 125 | s2 = "retention"; | ||
| 126 | break; | ||
| 127 | case 1: | ||
| 128 | s1 = "MPU"; | ||
| 129 | s2 = "retention"; | ||
| 130 | break; | ||
| 131 | case 2: | ||
| 132 | s1 = "MPU"; | ||
| 133 | s2 = "idle"; | ||
| 134 | break; | ||
| 135 | } | ||
| 136 | |||
| 137 | if (!resume) | ||
| 138 | #ifdef CONFIG_NO_HZ | ||
| 139 | printk(KERN_INFO | ||
| 140 | "--- Going to %s %s (next timer after %u ms)\n", s1, s2, | ||
| 141 | jiffies_to_msecs(get_next_timer_interrupt(jiffies) - | ||
| 142 | jiffies)); | ||
| 143 | #else | ||
| 144 | printk(KERN_INFO "--- Going to %s %s\n", s1, s2); | ||
| 145 | #endif | ||
| 146 | else | ||
| 147 | printk(KERN_INFO "--- Woke up (slept for %u.%03u ms)\n", | ||
| 148 | us / 1000, us % 1000); | ||
| 149 | |||
| 150 | for (i = 0; i < reg_count; i++) | ||
| 151 | printk(KERN_INFO "%-20s: 0x%08x\n", regs[i].name, regs[i].val); | ||
| 152 | } | ||
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c deleted file mode 100644 index ea8ceaed09cb..000000000000 --- a/arch/arm/mach-omap2/pm.c +++ /dev/null | |||
| @@ -1,111 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-omap2/pm.c | ||
| 3 | * | ||
| 4 | * OMAP2 Power Management Routines | ||
| 5 | * | ||
| 6 | * Copyright (C) 2006 Nokia Corporation | ||
| 7 | * Tony Lindgren <tony@atomide.com> | ||
| 8 | * | ||
| 9 | * Copyright (C) 2005 Texas Instruments, Inc. | ||
| 10 | * Richard Woodruff <r-woodruff2@ti.com> | ||
| 11 | * | ||
| 12 | * Based on pm.c for omap1 | ||
| 13 | * | ||
| 14 | * This program is free software; you can redistribute it and/or modify | ||
| 15 | * it under the terms of the GNU General Public License version 2 as | ||
| 16 | * published by the Free Software Foundation. | ||
| 17 | */ | ||
| 18 | |||
| 19 | #include <linux/suspend.h> | ||
| 20 | #include <linux/sched.h> | ||
| 21 | #include <linux/proc_fs.h> | ||
| 22 | #include <linux/interrupt.h> | ||
| 23 | #include <linux/sysfs.h> | ||
| 24 | #include <linux/module.h> | ||
| 25 | #include <linux/delay.h> | ||
| 26 | #include <linux/clk.h> | ||
| 27 | #include <linux/io.h> | ||
| 28 | |||
| 29 | #include <asm/irq.h> | ||
| 30 | #include <asm/atomic.h> | ||
| 31 | #include <asm/mach/time.h> | ||
| 32 | #include <asm/mach/irq.h> | ||
| 33 | |||
| 34 | #include <mach/irqs.h> | ||
| 35 | #include <mach/clock.h> | ||
| 36 | #include <mach/sram.h> | ||
| 37 | #include <mach/pm.h> | ||
| 38 | |||
| 39 | static struct clk *vclk; | ||
| 40 | static void (*omap2_sram_idle)(void); | ||
| 41 | static void (*omap2_sram_suspend)(int dllctrl, int cpu_rev); | ||
| 42 | static void (*saved_idle)(void); | ||
| 43 | |||
| 44 | extern void __init pmdomain_init(void); | ||
| 45 | extern void pmdomain_set_autoidle(void); | ||
| 46 | |||
| 47 | static unsigned int omap24xx_sleep_save[OMAP24XX_SLEEP_SAVE_SIZE]; | ||
| 48 | |||
| 49 | void omap2_pm_idle(void) | ||
| 50 | { | ||
| 51 | local_irq_disable(); | ||
| 52 | local_fiq_disable(); | ||
| 53 | if (need_resched()) { | ||
| 54 | local_fiq_enable(); | ||
| 55 | local_irq_enable(); | ||
| 56 | return; | ||
| 57 | } | ||
| 58 | |||
| 59 | omap2_sram_idle(); | ||
| 60 | local_fiq_enable(); | ||
| 61 | local_irq_enable(); | ||
| 62 | } | ||
| 63 | |||
| 64 | static int omap2_pm_prepare(void) | ||
| 65 | { | ||
| 66 | /* We cannot sleep in idle until we have resumed */ | ||
| 67 | saved_idle = pm_idle; | ||
| 68 | pm_idle = NULL; | ||
| 69 | return 0; | ||
| 70 | } | ||
| 71 | |||
| 72 | static int omap2_pm_suspend(void) | ||
| 73 | { | ||
| 74 | return 0; | ||
| 75 | } | ||
| 76 | |||
| 77 | static int omap2_pm_enter(suspend_state_t state) | ||
| 78 | { | ||
| 79 | int ret = 0; | ||
| 80 | |||
| 81 | switch (state) | ||
| 82 | { | ||
| 83 | case PM_SUSPEND_STANDBY: | ||
| 84 | case PM_SUSPEND_MEM: | ||
| 85 | ret = omap2_pm_suspend(); | ||
| 86 | break; | ||
| 87 | default: | ||
| 88 | ret = -EINVAL; | ||
| 89 | } | ||
| 90 | |||
| 91 | return ret; | ||
| 92 | } | ||
| 93 | |||
| 94 | static void omap2_pm_finish(void) | ||
| 95 | { | ||
| 96 | pm_idle = saved_idle; | ||
| 97 | } | ||
| 98 | |||
| 99 | static struct platform_suspend_ops omap_pm_ops = { | ||
| 100 | .prepare = omap2_pm_prepare, | ||
| 101 | .enter = omap2_pm_enter, | ||
| 102 | .finish = omap2_pm_finish, | ||
| 103 | .valid = suspend_valid_only_mem, | ||
| 104 | }; | ||
| 105 | |||
| 106 | static int __init omap2_pm_init(void) | ||
| 107 | { | ||
| 108 | return 0; | ||
| 109 | } | ||
| 110 | |||
| 111 | __initcall(omap2_pm_init); | ||
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h new file mode 100644 index 000000000000..f7b3baf76678 --- /dev/null +++ b/arch/arm/mach-omap2/pm.h | |||
| @@ -0,0 +1,38 @@ | |||
| 1 | /* | ||
| 2 | * OMAP2/3 Power Management Routines | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008 Nokia Corporation | ||
| 5 | * Jouni Hogander | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License version 2 as | ||
| 9 | * published by the Free Software Foundation. | ||
| 10 | */ | ||
| 11 | #ifndef __ARCH_ARM_MACH_OMAP2_PM_H | ||
| 12 | #define __ARCH_ARM_MACH_OMAP2_PM_H | ||
| 13 | |||
| 14 | extern int omap2_pm_init(void); | ||
| 15 | extern int omap3_pm_init(void); | ||
| 16 | |||
| 17 | #ifdef CONFIG_PM_DEBUG | ||
| 18 | extern void omap2_pm_dump(int mode, int resume, unsigned int us); | ||
| 19 | extern int omap2_pm_debug; | ||
| 20 | #else | ||
| 21 | #define omap2_pm_dump(mode, resume, us) do {} while (0); | ||
| 22 | #define omap2_pm_debug 0 | ||
| 23 | #endif /* CONFIG_PM_DEBUG */ | ||
| 24 | |||
| 25 | extern void omap24xx_idle_loop_suspend(void); | ||
| 26 | |||
| 27 | extern void omap24xx_cpu_suspend(u32 dll_ctrl, void __iomem *sdrc_dlla_ctrl, | ||
| 28 | void __iomem *sdrc_power); | ||
| 29 | extern void omap34xx_cpu_suspend(u32 *addr, int save_state); | ||
| 30 | extern void save_secure_ram_context(u32 *addr); | ||
| 31 | |||
| 32 | extern unsigned int omap24xx_idle_loop_suspend_sz; | ||
| 33 | extern unsigned int omap34xx_suspend_sz; | ||
| 34 | extern unsigned int save_secure_ram_context_sz; | ||
| 35 | extern unsigned int omap24xx_cpu_suspend_sz; | ||
| 36 | extern unsigned int omap34xx_cpu_suspend_sz; | ||
| 37 | |||
| 38 | #endif | ||
diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c new file mode 100644 index 000000000000..db1025562fb0 --- /dev/null +++ b/arch/arm/mach-omap2/pm24xx.c | |||
| @@ -0,0 +1,549 @@ | |||
| 1 | /* | ||
| 2 | * OMAP2 Power Management Routines | ||
| 3 | * | ||
| 4 | * Copyright (C) 2005 Texas Instruments, Inc. | ||
| 5 | * Copyright (C) 2006-2008 Nokia Corporation | ||
| 6 | * | ||
| 7 | * Written by: | ||
| 8 | * Richard Woodruff <r-woodruff2@ti.com> | ||
| 9 | * Tony Lindgren | ||
| 10 | * Juha Yrjola | ||
| 11 | * Amit Kucheria <amit.kucheria@nokia.com> | ||
| 12 | * Igor Stoppa <igor.stoppa@nokia.com> | ||
| 13 | * | ||
| 14 | * Based on pm.c for omap1 | ||
| 15 | * | ||
| 16 | * This program is free software; you can redistribute it and/or modify | ||
| 17 | * it under the terms of the GNU General Public License version 2 as | ||
| 18 | * published by the Free Software Foundation. | ||
| 19 | */ | ||
| 20 | |||
| 21 | #include <linux/suspend.h> | ||
| 22 | #include <linux/sched.h> | ||
| 23 | #include <linux/proc_fs.h> | ||
| 24 | #include <linux/interrupt.h> | ||
| 25 | #include <linux/sysfs.h> | ||
| 26 | #include <linux/module.h> | ||
| 27 | #include <linux/delay.h> | ||
| 28 | #include <linux/clk.h> | ||
| 29 | #include <linux/io.h> | ||
| 30 | #include <linux/irq.h> | ||
| 31 | #include <linux/time.h> | ||
| 32 | #include <linux/gpio.h> | ||
| 33 | |||
| 34 | #include <asm/mach/time.h> | ||
| 35 | #include <asm/mach/irq.h> | ||
| 36 | #include <asm/mach-types.h> | ||
| 37 | |||
| 38 | #include <mach/irqs.h> | ||
| 39 | #include <mach/clock.h> | ||
| 40 | #include <mach/sram.h> | ||
| 41 | #include <mach/control.h> | ||
| 42 | #include <mach/mux.h> | ||
| 43 | #include <mach/dma.h> | ||
| 44 | #include <mach/board.h> | ||
| 45 | |||
| 46 | #include "prm.h" | ||
| 47 | #include "prm-regbits-24xx.h" | ||
| 48 | #include "cm.h" | ||
| 49 | #include "cm-regbits-24xx.h" | ||
| 50 | #include "sdrc.h" | ||
| 51 | #include "pm.h" | ||
| 52 | |||
| 53 | #include <mach/powerdomain.h> | ||
| 54 | #include <mach/clockdomain.h> | ||
| 55 | |||
| 56 | static void (*omap2_sram_idle)(void); | ||
| 57 | static void (*omap2_sram_suspend)(u32 dllctrl, void __iomem *sdrc_dlla_ctrl, | ||
| 58 | void __iomem *sdrc_power); | ||
| 59 | |||
| 60 | static struct powerdomain *mpu_pwrdm; | ||
| 61 | static struct powerdomain *core_pwrdm; | ||
| 62 | |||
| 63 | static struct clockdomain *dsp_clkdm; | ||
| 64 | static struct clockdomain *gfx_clkdm; | ||
| 65 | |||
| 66 | static struct clk *osc_ck, *emul_ck; | ||
| 67 | |||
| 68 | static int omap2_fclks_active(void) | ||
| 69 | { | ||
| 70 | u32 f1, f2; | ||
| 71 | |||
| 72 | f1 = cm_read_mod_reg(CORE_MOD, CM_FCLKEN1); | ||
| 73 | f2 = cm_read_mod_reg(CORE_MOD, OMAP24XX_CM_FCLKEN2); | ||
| 74 | |||
| 75 | /* Ignore UART clocks. These are handled by UART core (serial.c) */ | ||
| 76 | f1 &= ~(OMAP24XX_EN_UART1 | OMAP24XX_EN_UART2); | ||
| 77 | f2 &= ~OMAP24XX_EN_UART3; | ||
| 78 | |||
| 79 | if (f1 | f2) | ||
| 80 | return 1; | ||
| 81 | return 0; | ||
| 82 | } | ||
| 83 | |||
| 84 | static void omap2_enter_full_retention(void) | ||
| 85 | { | ||
| 86 | u32 l; | ||
| 87 | struct timespec ts_preidle, ts_postidle, ts_idle; | ||
| 88 | |||
| 89 | /* There is 1 reference hold for all children of the oscillator | ||
| 90 | * clock, the following will remove it. If no one else uses the | ||
| 91 | * oscillator itself it will be disabled if/when we enter retention | ||
| 92 | * mode. | ||
| 93 | */ | ||
| 94 | clk_disable(osc_ck); | ||
| 95 | |||
| 96 | /* Clear old wake-up events */ | ||
| 97 | /* REVISIT: These write to reserved bits? */ | ||
| 98 | prm_write_mod_reg(0xffffffff, CORE_MOD, PM_WKST1); | ||
| 99 | prm_write_mod_reg(0xffffffff, CORE_MOD, OMAP24XX_PM_WKST2); | ||
| 100 | prm_write_mod_reg(0xffffffff, WKUP_MOD, PM_WKST); | ||
| 101 | |||
| 102 | /* | ||
| 103 | * Set MPU powerdomain's next power state to RETENTION; | ||
| 104 | * preserve logic state during retention | ||
| 105 | */ | ||
| 106 | pwrdm_set_logic_retst(mpu_pwrdm, PWRDM_POWER_RET); | ||
| 107 | pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_RET); | ||
| 108 | |||
| 109 | /* Workaround to kill USB */ | ||
| 110 | l = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0) | OMAP24XX_USBSTANDBYCTRL; | ||
| 111 | omap_ctrl_writel(l, OMAP2_CONTROL_DEVCONF0); | ||
| 112 | |||
| 113 | omap2_gpio_prepare_for_retention(); | ||
| 114 | |||
| 115 | if (omap2_pm_debug) { | ||
| 116 | omap2_pm_dump(0, 0, 0); | ||
| 117 | getnstimeofday(&ts_preidle); | ||
| 118 | } | ||
| 119 | |||
| 120 | /* One last check for pending IRQs to avoid extra latency due | ||
| 121 | * to sleeping unnecessarily. */ | ||
| 122 | if (omap_irq_pending()) | ||
| 123 | goto no_sleep; | ||
| 124 | |||
| 125 | omap_uart_prepare_idle(0); | ||
| 126 | omap_uart_prepare_idle(1); | ||
| 127 | omap_uart_prepare_idle(2); | ||
| 128 | |||
| 129 | /* Jump to SRAM suspend code */ | ||
| 130 | omap2_sram_suspend(sdrc_read_reg(SDRC_DLLA_CTRL), | ||
| 131 | OMAP_SDRC_REGADDR(SDRC_DLLA_CTRL), | ||
| 132 | OMAP_SDRC_REGADDR(SDRC_POWER)); | ||
| 133 | |||
| 134 | omap_uart_resume_idle(2); | ||
| 135 | omap_uart_resume_idle(1); | ||
| 136 | omap_uart_resume_idle(0); | ||
| 137 | |||
| 138 | no_sleep: | ||
| 139 | if (omap2_pm_debug) { | ||
| 140 | unsigned long long tmp; | ||
| 141 | |||
| 142 | getnstimeofday(&ts_postidle); | ||
| 143 | ts_idle = timespec_sub(ts_postidle, ts_preidle); | ||
| 144 | tmp = timespec_to_ns(&ts_idle) * NSEC_PER_USEC; | ||
| 145 | omap2_pm_dump(0, 1, tmp); | ||
| 146 | } | ||
| 147 | omap2_gpio_resume_after_retention(); | ||
| 148 | |||
| 149 | clk_enable(osc_ck); | ||
| 150 | |||
| 151 | /* clear CORE wake-up events */ | ||
| 152 | prm_write_mod_reg(0xffffffff, CORE_MOD, PM_WKST1); | ||
| 153 | prm_write_mod_reg(0xffffffff, CORE_MOD, OMAP24XX_PM_WKST2); | ||
| 154 | |||
| 155 | /* wakeup domain events - bit 1: GPT1, bit5 GPIO */ | ||
| 156 | prm_clear_mod_reg_bits(0x4 | 0x1, WKUP_MOD, PM_WKST); | ||
| 157 | |||
| 158 | /* MPU domain wake events */ | ||
| 159 | l = prm_read_mod_reg(OCP_MOD, OMAP2_PRCM_IRQSTATUS_MPU_OFFSET); | ||
| 160 | if (l & 0x01) | ||
| 161 | prm_write_mod_reg(0x01, OCP_MOD, | ||
| 162 | OMAP2_PRCM_IRQSTATUS_MPU_OFFSET); | ||
| 163 | if (l & 0x20) | ||
| 164 | prm_write_mod_reg(0x20, OCP_MOD, | ||
| 165 | OMAP2_PRCM_IRQSTATUS_MPU_OFFSET); | ||
| 166 | |||
| 167 | /* Mask future PRCM-to-MPU interrupts */ | ||
| 168 | prm_write_mod_reg(0x0, OCP_MOD, OMAP2_PRCM_IRQSTATUS_MPU_OFFSET); | ||
| 169 | } | ||
| 170 | |||
| 171 | static int omap2_i2c_active(void) | ||
| 172 | { | ||
| 173 | u32 l; | ||
| 174 | |||
| 175 | l = cm_read_mod_reg(CORE_MOD, CM_FCLKEN1); | ||
| 176 | return l & (OMAP2420_EN_I2C2 | OMAP2420_EN_I2C1); | ||
| 177 | } | ||
| 178 | |||
| 179 | static int sti_console_enabled; | ||
| 180 | |||
| 181 | static int omap2_allow_mpu_retention(void) | ||
| 182 | { | ||
| 183 | u32 l; | ||
| 184 | |||
| 185 | /* Check for MMC, UART2, UART1, McSPI2, McSPI1 and DSS1. */ | ||
| 186 | l = cm_read_mod_reg(CORE_MOD, CM_FCLKEN1); | ||
| 187 | if (l & (OMAP2420_EN_MMC | OMAP24XX_EN_UART2 | | ||
| 188 | OMAP24XX_EN_UART1 | OMAP24XX_EN_MCSPI2 | | ||
| 189 | OMAP24XX_EN_MCSPI1 | OMAP24XX_EN_DSS1)) | ||
| 190 | return 0; | ||
| 191 | /* Check for UART3. */ | ||
| 192 | l = cm_read_mod_reg(CORE_MOD, OMAP24XX_CM_FCLKEN2); | ||
| 193 | if (l & OMAP24XX_EN_UART3) | ||
| 194 | return 0; | ||
| 195 | if (sti_console_enabled) | ||
| 196 | return 0; | ||
| 197 | |||
| 198 | return 1; | ||
| 199 | } | ||
| 200 | |||
| 201 | static void omap2_enter_mpu_retention(void) | ||
| 202 | { | ||
| 203 | int only_idle = 0; | ||
| 204 | struct timespec ts_preidle, ts_postidle, ts_idle; | ||
| 205 | |||
| 206 | /* Putting MPU into the WFI state while a transfer is active | ||
| 207 | * seems to cause the I2C block to timeout. Why? Good question. */ | ||
| 208 | if (omap2_i2c_active()) | ||
| 209 | return; | ||
| 210 | |||
| 211 | /* The peripherals seem not to be able to wake up the MPU when | ||
| 212 | * it is in retention mode. */ | ||
| 213 | if (omap2_allow_mpu_retention()) { | ||
| 214 | /* REVISIT: These write to reserved bits? */ | ||
| 215 | prm_write_mod_reg(0xffffffff, CORE_MOD, PM_WKST1); | ||
| 216 | prm_write_mod_reg(0xffffffff, CORE_MOD, OMAP24XX_PM_WKST2); | ||
| 217 | prm_write_mod_reg(0xffffffff, WKUP_MOD, PM_WKST); | ||
| 218 | |||
| 219 | /* Try to enter MPU retention */ | ||
| 220 | prm_write_mod_reg((0x01 << OMAP_POWERSTATE_SHIFT) | | ||
| 221 | OMAP_LOGICRETSTATE, | ||
| 222 | MPU_MOD, PM_PWSTCTRL); | ||
| 223 | } else { | ||
| 224 | /* Block MPU retention */ | ||
| 225 | |||
| 226 | prm_write_mod_reg(OMAP_LOGICRETSTATE, MPU_MOD, PM_PWSTCTRL); | ||
| 227 | only_idle = 1; | ||
| 228 | } | ||
| 229 | |||
| 230 | if (omap2_pm_debug) { | ||
| 231 | omap2_pm_dump(only_idle ? 2 : 1, 0, 0); | ||
| 232 | getnstimeofday(&ts_preidle); | ||
| 233 | } | ||
| 234 | |||
| 235 | omap2_sram_idle(); | ||
| 236 | |||
| 237 | if (omap2_pm_debug) { | ||
| 238 | unsigned long long tmp; | ||
| 239 | |||
| 240 | getnstimeofday(&ts_postidle); | ||
| 241 | ts_idle = timespec_sub(ts_postidle, ts_preidle); | ||
| 242 | tmp = timespec_to_ns(&ts_idle) * NSEC_PER_USEC; | ||
| 243 | omap2_pm_dump(only_idle ? 2 : 1, 1, tmp); | ||
| 244 | } | ||
| 245 | } | ||
| 246 | |||
| 247 | static int omap2_can_sleep(void) | ||
| 248 | { | ||
| 249 | if (omap2_fclks_active()) | ||
| 250 | return 0; | ||
| 251 | if (osc_ck->usecount > 1) | ||
| 252 | return 0; | ||
| 253 | if (omap_dma_running()) | ||
| 254 | return 0; | ||
| 255 | |||
| 256 | return 1; | ||
| 257 | } | ||
| 258 | |||
| 259 | static void omap2_pm_idle(void) | ||
| 260 | { | ||
| 261 | local_irq_disable(); | ||
| 262 | local_fiq_disable(); | ||
| 263 | |||
| 264 | if (!omap2_can_sleep()) { | ||
| 265 | if (omap_irq_pending()) | ||
| 266 | goto out; | ||
| 267 | omap2_enter_mpu_retention(); | ||
| 268 | goto out; | ||
| 269 | } | ||
| 270 | |||
| 271 | if (omap_irq_pending()) | ||
| 272 | goto out; | ||
| 273 | |||
| 274 | omap2_enter_full_retention(); | ||
| 275 | |||
| 276 | out: | ||
| 277 | local_fiq_enable(); | ||
| 278 | local_irq_enable(); | ||
| 279 | } | ||
| 280 | |||
| 281 | static int omap2_pm_prepare(void) | ||
| 282 | { | ||
| 283 | /* We cannot sleep in idle until we have resumed */ | ||
| 284 | disable_hlt(); | ||
| 285 | return 0; | ||
| 286 | } | ||
| 287 | |||
| 288 | static int omap2_pm_suspend(void) | ||
| 289 | { | ||
| 290 | u32 wken_wkup, mir1; | ||
| 291 | |||
| 292 | wken_wkup = prm_read_mod_reg(WKUP_MOD, PM_WKEN); | ||
| 293 | prm_write_mod_reg(wken_wkup & ~OMAP24XX_EN_GPT1, WKUP_MOD, PM_WKEN); | ||
| 294 | |||
| 295 | /* Mask GPT1 */ | ||
| 296 | mir1 = omap_readl(0x480fe0a4); | ||
| 297 | omap_writel(1 << 5, 0x480fe0ac); | ||
| 298 | |||
| 299 | omap_uart_prepare_suspend(); | ||
| 300 | omap2_enter_full_retention(); | ||
| 301 | |||
| 302 | omap_writel(mir1, 0x480fe0a4); | ||
| 303 | prm_write_mod_reg(wken_wkup, WKUP_MOD, PM_WKEN); | ||
| 304 | |||
| 305 | return 0; | ||
| 306 | } | ||
| 307 | |||
| 308 | static int omap2_pm_enter(suspend_state_t state) | ||
| 309 | { | ||
| 310 | int ret = 0; | ||
| 311 | |||
| 312 | switch (state) { | ||
| 313 | case PM_SUSPEND_STANDBY: | ||
| 314 | case PM_SUSPEND_MEM: | ||
| 315 | ret = omap2_pm_suspend(); | ||
| 316 | break; | ||
| 317 | default: | ||
| 318 | ret = -EINVAL; | ||
| 319 | } | ||
| 320 | |||
| 321 | return ret; | ||
| 322 | } | ||
| 323 | |||
| 324 | static void omap2_pm_finish(void) | ||
| 325 | { | ||
| 326 | enable_hlt(); | ||
| 327 | } | ||
| 328 | |||
| 329 | static struct platform_suspend_ops omap_pm_ops = { | ||
| 330 | .prepare = omap2_pm_prepare, | ||
| 331 | .enter = omap2_pm_enter, | ||
| 332 | .finish = omap2_pm_finish, | ||
| 333 | .valid = suspend_valid_only_mem, | ||
| 334 | }; | ||
| 335 | |||
| 336 | static int _pm_clkdm_enable_hwsup(struct clockdomain *clkdm) | ||
| 337 | { | ||
| 338 | omap2_clkdm_allow_idle(clkdm); | ||
| 339 | return 0; | ||
| 340 | } | ||
| 341 | |||
| 342 | static void __init prcm_setup_regs(void) | ||
| 343 | { | ||
| 344 | int i, num_mem_banks; | ||
| 345 | struct powerdomain *pwrdm; | ||
| 346 | |||
| 347 | /* Enable autoidle */ | ||
| 348 | prm_write_mod_reg(OMAP24XX_AUTOIDLE, OCP_MOD, | ||
| 349 | OMAP2_PRCM_SYSCONFIG_OFFSET); | ||
| 350 | |||
| 351 | /* Set all domain wakeup dependencies */ | ||
| 352 | prm_write_mod_reg(OMAP_EN_WKUP_MASK, MPU_MOD, PM_WKDEP); | ||
| 353 | prm_write_mod_reg(0, OMAP24XX_DSP_MOD, PM_WKDEP); | ||
| 354 | prm_write_mod_reg(0, GFX_MOD, PM_WKDEP); | ||
| 355 | prm_write_mod_reg(0, CORE_MOD, PM_WKDEP); | ||
| 356 | if (cpu_is_omap2430()) | ||
| 357 | prm_write_mod_reg(0, OMAP2430_MDM_MOD, PM_WKDEP); | ||
| 358 | |||
| 359 | /* | ||
| 360 | * Set CORE powerdomain memory banks to retain their contents | ||
| 361 | * during RETENTION | ||
| 362 | */ | ||
| 363 | num_mem_banks = pwrdm_get_mem_bank_count(core_pwrdm); | ||
| 364 | for (i = 0; i < num_mem_banks; i++) | ||
| 365 | pwrdm_set_mem_retst(core_pwrdm, i, PWRDM_POWER_RET); | ||
| 366 | |||
| 367 | /* Set CORE powerdomain's next power state to RETENTION */ | ||
| 368 | pwrdm_set_next_pwrst(core_pwrdm, PWRDM_POWER_RET); | ||
| 369 | |||
| 370 | /* | ||
| 371 | * Set MPU powerdomain's next power state to RETENTION; | ||
| 372 | * preserve logic state during retention | ||
| 373 | */ | ||
| 374 | pwrdm_set_logic_retst(mpu_pwrdm, PWRDM_POWER_RET); | ||
| 375 | pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_RET); | ||
| 376 | |||
| 377 | /* Force-power down DSP, GFX powerdomains */ | ||
| 378 | |||
| 379 | pwrdm = clkdm_get_pwrdm(dsp_clkdm); | ||
| 380 | pwrdm_set_next_pwrst(pwrdm, PWRDM_POWER_OFF); | ||
| 381 | omap2_clkdm_sleep(dsp_clkdm); | ||
| 382 | |||
| 383 | pwrdm = clkdm_get_pwrdm(gfx_clkdm); | ||
| 384 | pwrdm_set_next_pwrst(pwrdm, PWRDM_POWER_OFF); | ||
| 385 | omap2_clkdm_sleep(gfx_clkdm); | ||
| 386 | |||
| 387 | /* Enable clockdomain hardware-supervised control for all clkdms */ | ||
| 388 | clkdm_for_each(_pm_clkdm_enable_hwsup); | ||
| 389 | |||
| 390 | /* Enable clock autoidle for all domains */ | ||
| 391 | cm_write_mod_reg(OMAP24XX_AUTO_CAM | | ||
| 392 | OMAP24XX_AUTO_MAILBOXES | | ||
| 393 | OMAP24XX_AUTO_WDT4 | | ||
| 394 | OMAP2420_AUTO_WDT3 | | ||
| 395 | OMAP24XX_AUTO_MSPRO | | ||
| 396 | OMAP2420_AUTO_MMC | | ||
| 397 | OMAP24XX_AUTO_FAC | | ||
| 398 | OMAP2420_AUTO_EAC | | ||
| 399 | OMAP24XX_AUTO_HDQ | | ||
| 400 | OMAP24XX_AUTO_UART2 | | ||
| 401 | OMAP24XX_AUTO_UART1 | | ||
| 402 | OMAP24XX_AUTO_I2C2 | | ||
| 403 | OMAP24XX_AUTO_I2C1 | | ||
| 404 | OMAP24XX_AUTO_MCSPI2 | | ||
| 405 | OMAP24XX_AUTO_MCSPI1 | | ||
| 406 | OMAP24XX_AUTO_MCBSP2 | | ||
| 407 | OMAP24XX_AUTO_MCBSP1 | | ||
| 408 | OMAP24XX_AUTO_GPT12 | | ||
| 409 | OMAP24XX_AUTO_GPT11 | | ||
| 410 | OMAP24XX_AUTO_GPT10 | | ||
| 411 | OMAP24XX_AUTO_GPT9 | | ||
| 412 | OMAP24XX_AUTO_GPT8 | | ||
| 413 | OMAP24XX_AUTO_GPT7 | | ||
| 414 | OMAP24XX_AUTO_GPT6 | | ||
| 415 | OMAP24XX_AUTO_GPT5 | | ||
| 416 | OMAP24XX_AUTO_GPT4 | | ||
| 417 | OMAP24XX_AUTO_GPT3 | | ||
| 418 | OMAP24XX_AUTO_GPT2 | | ||
| 419 | OMAP2420_AUTO_VLYNQ | | ||
| 420 | OMAP24XX_AUTO_DSS, | ||
| 421 | CORE_MOD, CM_AUTOIDLE1); | ||
| 422 | cm_write_mod_reg(OMAP24XX_AUTO_UART3 | | ||
| 423 | OMAP24XX_AUTO_SSI | | ||
| 424 | OMAP24XX_AUTO_USB, | ||
| 425 | CORE_MOD, CM_AUTOIDLE2); | ||
| 426 | cm_write_mod_reg(OMAP24XX_AUTO_SDRC | | ||
| 427 | OMAP24XX_AUTO_GPMC | | ||
| 428 | OMAP24XX_AUTO_SDMA, | ||
| 429 | CORE_MOD, CM_AUTOIDLE3); | ||
| 430 | cm_write_mod_reg(OMAP24XX_AUTO_PKA | | ||
| 431 | OMAP24XX_AUTO_AES | | ||
| 432 | OMAP24XX_AUTO_RNG | | ||
| 433 | OMAP24XX_AUTO_SHA | | ||
| 434 | OMAP24XX_AUTO_DES, | ||
| 435 | CORE_MOD, OMAP24XX_CM_AUTOIDLE4); | ||
| 436 | |||
| 437 | cm_write_mod_reg(OMAP2420_AUTO_DSP_IPI, OMAP24XX_DSP_MOD, CM_AUTOIDLE); | ||
| 438 | |||
| 439 | /* Put DPLL and both APLLs into autoidle mode */ | ||
| 440 | cm_write_mod_reg((0x03 << OMAP24XX_AUTO_DPLL_SHIFT) | | ||
| 441 | (0x03 << OMAP24XX_AUTO_96M_SHIFT) | | ||
| 442 | (0x03 << OMAP24XX_AUTO_54M_SHIFT), | ||
| 443 | PLL_MOD, CM_AUTOIDLE); | ||
| 444 | |||
| 445 | cm_write_mod_reg(OMAP24XX_AUTO_OMAPCTRL | | ||
| 446 | OMAP24XX_AUTO_WDT1 | | ||
| 447 | OMAP24XX_AUTO_MPU_WDT | | ||
| 448 | OMAP24XX_AUTO_GPIOS | | ||
| 449 | OMAP24XX_AUTO_32KSYNC | | ||
| 450 | OMAP24XX_AUTO_GPT1, | ||
| 451 | WKUP_MOD, CM_AUTOIDLE); | ||
| 452 | |||
| 453 | /* REVISIT: Configure number of 32 kHz clock cycles for sys_clk | ||
| 454 | * stabilisation */ | ||
| 455 | prm_write_mod_reg(15 << OMAP_SETUP_TIME_SHIFT, OMAP24XX_GR_MOD, | ||
| 456 | OMAP2_PRCM_CLKSSETUP_OFFSET); | ||
| 457 | |||
| 458 | /* Configure automatic voltage transition */ | ||
| 459 | prm_write_mod_reg(2 << OMAP_SETUP_TIME_SHIFT, OMAP24XX_GR_MOD, | ||
| 460 | OMAP2_PRCM_VOLTSETUP_OFFSET); | ||
| 461 | prm_write_mod_reg(OMAP24XX_AUTO_EXTVOLT | | ||
| 462 | (0x1 << OMAP24XX_SETOFF_LEVEL_SHIFT) | | ||
| 463 | OMAP24XX_MEMRETCTRL | | ||
| 464 | (0x1 << OMAP24XX_SETRET_LEVEL_SHIFT) | | ||
| 465 | (0x0 << OMAP24XX_VOLT_LEVEL_SHIFT), | ||
| 466 | OMAP24XX_GR_MOD, OMAP2_PRCM_VOLTCTRL_OFFSET); | ||
| 467 | |||
| 468 | /* Enable wake-up events */ | ||
| 469 | prm_write_mod_reg(OMAP24XX_EN_GPIOS | OMAP24XX_EN_GPT1, | ||
| 470 | WKUP_MOD, PM_WKEN); | ||
| 471 | } | ||
| 472 | |||
| 473 | int __init omap2_pm_init(void) | ||
| 474 | { | ||
| 475 | u32 l; | ||
| 476 | |||
| 477 | if (!cpu_is_omap24xx()) | ||
| 478 | return -ENODEV; | ||
| 479 | |||
| 480 | printk(KERN_INFO "Power Management for OMAP2 initializing\n"); | ||
| 481 | l = prm_read_mod_reg(OCP_MOD, OMAP2_PRCM_REVISION_OFFSET); | ||
| 482 | printk(KERN_INFO "PRCM revision %d.%d\n", (l >> 4) & 0x0f, l & 0x0f); | ||
| 483 | |||
| 484 | /* Look up important powerdomains, clockdomains */ | ||
| 485 | |||
| 486 | mpu_pwrdm = pwrdm_lookup("mpu_pwrdm"); | ||
| 487 | if (!mpu_pwrdm) | ||
| 488 | pr_err("PM: mpu_pwrdm not found\n"); | ||
| 489 | |||
| 490 | core_pwrdm = pwrdm_lookup("core_pwrdm"); | ||
| 491 | if (!core_pwrdm) | ||
| 492 | pr_err("PM: core_pwrdm not found\n"); | ||
| 493 | |||
| 494 | dsp_clkdm = clkdm_lookup("dsp_clkdm"); | ||
| 495 | if (!dsp_clkdm) | ||
| 496 | pr_err("PM: mpu_clkdm not found\n"); | ||
| 497 | |||
| 498 | gfx_clkdm = clkdm_lookup("gfx_clkdm"); | ||
| 499 | if (!gfx_clkdm) | ||
| 500 | pr_err("PM: gfx_clkdm not found\n"); | ||
| 501 | |||
| 502 | |||
| 503 | osc_ck = clk_get(NULL, "osc_ck"); | ||
| 504 | if (IS_ERR(osc_ck)) { | ||
| 505 | printk(KERN_ERR "could not get osc_ck\n"); | ||
| 506 | return -ENODEV; | ||
| 507 | } | ||
| 508 | |||
| 509 | if (cpu_is_omap242x()) { | ||
| 510 | emul_ck = clk_get(NULL, "emul_ck"); | ||
| 511 | if (IS_ERR(emul_ck)) { | ||
| 512 | printk(KERN_ERR "could not get emul_ck\n"); | ||
| 513 | clk_put(osc_ck); | ||
| 514 | return -ENODEV; | ||
| 515 | } | ||
| 516 | } | ||
| 517 | |||
| 518 | prcm_setup_regs(); | ||
| 519 | |||
| 520 | /* Hack to prevent MPU retention when STI console is enabled. */ | ||
| 521 | { | ||
| 522 | const struct omap_sti_console_config *sti; | ||
| 523 | |||
| 524 | sti = omap_get_config(OMAP_TAG_STI_CONSOLE, | ||
| 525 | struct omap_sti_console_config); | ||
| 526 | if (sti != NULL && sti->enable) | ||
| 527 | sti_console_enabled = 1; | ||
| 528 | } | ||
| 529 | |||
| 530 | /* | ||
| 531 | * We copy the assembler sleep/wakeup routines to SRAM. | ||
| 532 | * These routines need to be in SRAM as that's the only | ||
| 533 | * memory the MPU can see when it wakes up. | ||
| 534 | */ | ||
| 535 | if (cpu_is_omap24xx()) { | ||
| 536 | omap2_sram_idle = omap_sram_push(omap24xx_idle_loop_suspend, | ||
| 537 | omap24xx_idle_loop_suspend_sz); | ||
| 538 | |||
| 539 | omap2_sram_suspend = omap_sram_push(omap24xx_cpu_suspend, | ||
| 540 | omap24xx_cpu_suspend_sz); | ||
| 541 | } | ||
| 542 | |||
| 543 | suspend_set_ops(&omap_pm_ops); | ||
| 544 | pm_idle = omap2_pm_idle; | ||
| 545 | |||
| 546 | return 0; | ||
| 547 | } | ||
| 548 | |||
| 549 | late_initcall(omap2_pm_init); | ||
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c new file mode 100644 index 000000000000..841d4c5ed8be --- /dev/null +++ b/arch/arm/mach-omap2/pm34xx.c | |||
| @@ -0,0 +1,710 @@ | |||
| 1 | /* | ||
| 2 | * OMAP3 Power Management Routines | ||
| 3 | * | ||
| 4 | * Copyright (C) 2006-2008 Nokia Corporation | ||
| 5 | * Tony Lindgren <tony@atomide.com> | ||
| 6 | * Jouni Hogander | ||
| 7 | * | ||
| 8 | * Copyright (C) 2005 Texas Instruments, Inc. | ||
| 9 | * Richard Woodruff <r-woodruff2@ti.com> | ||
| 10 | * | ||
| 11 | * Based on pm.c for omap1 | ||
| 12 | * | ||
| 13 | * This program is free software; you can redistribute it and/or modify | ||
| 14 | * it under the terms of the GNU General Public License version 2 as | ||
| 15 | * published by the Free Software Foundation. | ||
| 16 | */ | ||
| 17 | |||
| 18 | #include <linux/pm.h> | ||
| 19 | #include <linux/suspend.h> | ||
| 20 | #include <linux/interrupt.h> | ||
| 21 | #include <linux/module.h> | ||
| 22 | #include <linux/list.h> | ||
| 23 | #include <linux/err.h> | ||
| 24 | #include <linux/gpio.h> | ||
| 25 | |||
| 26 | #include <mach/sram.h> | ||
| 27 | #include <mach/clockdomain.h> | ||
| 28 | #include <mach/powerdomain.h> | ||
| 29 | #include <mach/control.h> | ||
| 30 | #include <mach/serial.h> | ||
| 31 | |||
| 32 | #include "cm.h" | ||
| 33 | #include "cm-regbits-34xx.h" | ||
| 34 | #include "prm-regbits-34xx.h" | ||
| 35 | |||
| 36 | #include "prm.h" | ||
| 37 | #include "pm.h" | ||
| 38 | |||
| 39 | struct power_state { | ||
| 40 | struct powerdomain *pwrdm; | ||
| 41 | u32 next_state; | ||
| 42 | u32 saved_state; | ||
| 43 | struct list_head node; | ||
| 44 | }; | ||
| 45 | |||
| 46 | static LIST_HEAD(pwrst_list); | ||
| 47 | |||
| 48 | static void (*_omap_sram_idle)(u32 *addr, int save_state); | ||
| 49 | |||
| 50 | static struct powerdomain *mpu_pwrdm; | ||
| 51 | |||
| 52 | /* PRCM Interrupt Handler for wakeups */ | ||
| 53 | static irqreturn_t prcm_interrupt_handler (int irq, void *dev_id) | ||
| 54 | { | ||
| 55 | u32 wkst, irqstatus_mpu; | ||
| 56 | u32 fclk, iclk; | ||
| 57 | |||
| 58 | /* WKUP */ | ||
| 59 | wkst = prm_read_mod_reg(WKUP_MOD, PM_WKST); | ||
| 60 | if (wkst) { | ||
| 61 | iclk = cm_read_mod_reg(WKUP_MOD, CM_ICLKEN); | ||
| 62 | fclk = cm_read_mod_reg(WKUP_MOD, CM_FCLKEN); | ||
| 63 | cm_set_mod_reg_bits(wkst, WKUP_MOD, CM_ICLKEN); | ||
| 64 | cm_set_mod_reg_bits(wkst, WKUP_MOD, CM_FCLKEN); | ||
| 65 | prm_write_mod_reg(wkst, WKUP_MOD, PM_WKST); | ||
| 66 | while (prm_read_mod_reg(WKUP_MOD, PM_WKST)) | ||
| 67 | cpu_relax(); | ||
| 68 | cm_write_mod_reg(iclk, WKUP_MOD, CM_ICLKEN); | ||
| 69 | cm_write_mod_reg(fclk, WKUP_MOD, CM_FCLKEN); | ||
| 70 | } | ||
| 71 | |||
| 72 | /* CORE */ | ||
| 73 | wkst = prm_read_mod_reg(CORE_MOD, PM_WKST1); | ||
| 74 | if (wkst) { | ||
| 75 | iclk = cm_read_mod_reg(CORE_MOD, CM_ICLKEN1); | ||
| 76 | fclk = cm_read_mod_reg(CORE_MOD, CM_FCLKEN1); | ||
| 77 | cm_set_mod_reg_bits(wkst, CORE_MOD, CM_ICLKEN1); | ||
| 78 | cm_set_mod_reg_bits(wkst, CORE_MOD, CM_FCLKEN1); | ||
| 79 | prm_write_mod_reg(wkst, CORE_MOD, PM_WKST1); | ||
| 80 | while (prm_read_mod_reg(CORE_MOD, PM_WKST1)) | ||
| 81 | cpu_relax(); | ||
| 82 | cm_write_mod_reg(iclk, CORE_MOD, CM_ICLKEN1); | ||
| 83 | cm_write_mod_reg(fclk, CORE_MOD, CM_FCLKEN1); | ||
| 84 | } | ||
| 85 | wkst = prm_read_mod_reg(CORE_MOD, OMAP3430ES2_PM_WKST3); | ||
| 86 | if (wkst) { | ||
| 87 | iclk = cm_read_mod_reg(CORE_MOD, CM_ICLKEN3); | ||
| 88 | fclk = cm_read_mod_reg(CORE_MOD, OMAP3430ES2_CM_FCLKEN3); | ||
| 89 | cm_set_mod_reg_bits(wkst, CORE_MOD, CM_ICLKEN3); | ||
| 90 | cm_set_mod_reg_bits(wkst, CORE_MOD, OMAP3430ES2_CM_FCLKEN3); | ||
| 91 | prm_write_mod_reg(wkst, CORE_MOD, OMAP3430ES2_PM_WKST3); | ||
| 92 | while (prm_read_mod_reg(CORE_MOD, OMAP3430ES2_PM_WKST3)) | ||
| 93 | cpu_relax(); | ||
| 94 | cm_write_mod_reg(iclk, CORE_MOD, CM_ICLKEN3); | ||
| 95 | cm_write_mod_reg(fclk, CORE_MOD, OMAP3430ES2_CM_FCLKEN3); | ||
| 96 | } | ||
| 97 | |||
| 98 | /* PER */ | ||
| 99 | wkst = prm_read_mod_reg(OMAP3430_PER_MOD, PM_WKST); | ||
| 100 | if (wkst) { | ||
| 101 | iclk = cm_read_mod_reg(OMAP3430_PER_MOD, CM_ICLKEN); | ||
| 102 | fclk = cm_read_mod_reg(OMAP3430_PER_MOD, CM_FCLKEN); | ||
| 103 | cm_set_mod_reg_bits(wkst, OMAP3430_PER_MOD, CM_ICLKEN); | ||
| 104 | cm_set_mod_reg_bits(wkst, OMAP3430_PER_MOD, CM_FCLKEN); | ||
| 105 | prm_write_mod_reg(wkst, OMAP3430_PER_MOD, PM_WKST); | ||
| 106 | while (prm_read_mod_reg(OMAP3430_PER_MOD, PM_WKST)) | ||
| 107 | cpu_relax(); | ||
| 108 | cm_write_mod_reg(iclk, OMAP3430_PER_MOD, CM_ICLKEN); | ||
| 109 | cm_write_mod_reg(fclk, OMAP3430_PER_MOD, CM_FCLKEN); | ||
| 110 | } | ||
| 111 | |||
| 112 | if (omap_rev() > OMAP3430_REV_ES1_0) { | ||
| 113 | /* USBHOST */ | ||
| 114 | wkst = prm_read_mod_reg(OMAP3430ES2_USBHOST_MOD, PM_WKST); | ||
| 115 | if (wkst) { | ||
| 116 | iclk = cm_read_mod_reg(OMAP3430ES2_USBHOST_MOD, | ||
| 117 | CM_ICLKEN); | ||
| 118 | fclk = cm_read_mod_reg(OMAP3430ES2_USBHOST_MOD, | ||
| 119 | CM_FCLKEN); | ||
| 120 | cm_set_mod_reg_bits(wkst, OMAP3430ES2_USBHOST_MOD, | ||
| 121 | CM_ICLKEN); | ||
| 122 | cm_set_mod_reg_bits(wkst, OMAP3430ES2_USBHOST_MOD, | ||
| 123 | CM_FCLKEN); | ||
| 124 | prm_write_mod_reg(wkst, OMAP3430ES2_USBHOST_MOD, | ||
| 125 | PM_WKST); | ||
| 126 | while (prm_read_mod_reg(OMAP3430ES2_USBHOST_MOD, | ||
| 127 | PM_WKST)) | ||
| 128 | cpu_relax(); | ||
| 129 | cm_write_mod_reg(iclk, OMAP3430ES2_USBHOST_MOD, | ||
| 130 | CM_ICLKEN); | ||
| 131 | cm_write_mod_reg(fclk, OMAP3430ES2_USBHOST_MOD, | ||
| 132 | CM_FCLKEN); | ||
| 133 | } | ||
| 134 | } | ||
| 135 | |||
| 136 | irqstatus_mpu = prm_read_mod_reg(OCP_MOD, | ||
| 137 | OMAP3_PRM_IRQSTATUS_MPU_OFFSET); | ||
| 138 | prm_write_mod_reg(irqstatus_mpu, OCP_MOD, | ||
| 139 | OMAP3_PRM_IRQSTATUS_MPU_OFFSET); | ||
| 140 | |||
| 141 | while (prm_read_mod_reg(OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET)) | ||
| 142 | cpu_relax(); | ||
| 143 | |||
| 144 | return IRQ_HANDLED; | ||
| 145 | } | ||
| 146 | |||
| 147 | static void omap_sram_idle(void) | ||
| 148 | { | ||
| 149 | /* Variable to tell what needs to be saved and restored | ||
| 150 | * in omap_sram_idle*/ | ||
| 151 | /* save_state = 0 => Nothing to save and restored */ | ||
| 152 | /* save_state = 1 => Only L1 and logic lost */ | ||
| 153 | /* save_state = 2 => Only L2 lost */ | ||
| 154 | /* save_state = 3 => L1, L2 and logic lost */ | ||
| 155 | int save_state = 0, mpu_next_state; | ||
| 156 | |||
| 157 | if (!_omap_sram_idle) | ||
| 158 | return; | ||
| 159 | |||
| 160 | mpu_next_state = pwrdm_read_next_pwrst(mpu_pwrdm); | ||
| 161 | switch (mpu_next_state) { | ||
| 162 | case PWRDM_POWER_RET: | ||
| 163 | /* No need to save context */ | ||
| 164 | save_state = 0; | ||
| 165 | break; | ||
| 166 | default: | ||
| 167 | /* Invalid state */ | ||
| 168 | printk(KERN_ERR "Invalid mpu state in sram_idle\n"); | ||
| 169 | return; | ||
| 170 | } | ||
| 171 | omap2_gpio_prepare_for_retention(); | ||
| 172 | omap_uart_prepare_idle(0); | ||
| 173 | omap_uart_prepare_idle(1); | ||
| 174 | omap_uart_prepare_idle(2); | ||
| 175 | |||
| 176 | _omap_sram_idle(NULL, save_state); | ||
| 177 | cpu_init(); | ||
| 178 | |||
| 179 | omap_uart_resume_idle(2); | ||
| 180 | omap_uart_resume_idle(1); | ||
| 181 | omap_uart_resume_idle(0); | ||
| 182 | omap2_gpio_resume_after_retention(); | ||
| 183 | } | ||
| 184 | |||
| 185 | /* | ||
| 186 | * Check if functional clocks are enabled before entering | ||
| 187 | * sleep. This function could be behind CONFIG_PM_DEBUG | ||
| 188 | * when all drivers are configuring their sysconfig registers | ||
| 189 | * properly and using their clocks properly. | ||
| 190 | */ | ||
| 191 | static int omap3_fclks_active(void) | ||
| 192 | { | ||
| 193 | u32 fck_core1 = 0, fck_core3 = 0, fck_sgx = 0, fck_dss = 0, | ||
| 194 | fck_cam = 0, fck_per = 0, fck_usbhost = 0; | ||
| 195 | |||
| 196 | fck_core1 = cm_read_mod_reg(CORE_MOD, | ||
| 197 | CM_FCLKEN1); | ||
| 198 | if (omap_rev() > OMAP3430_REV_ES1_0) { | ||
| 199 | fck_core3 = cm_read_mod_reg(CORE_MOD, | ||
| 200 | OMAP3430ES2_CM_FCLKEN3); | ||
| 201 | fck_sgx = cm_read_mod_reg(OMAP3430ES2_SGX_MOD, | ||
| 202 | CM_FCLKEN); | ||
| 203 | fck_usbhost = cm_read_mod_reg(OMAP3430ES2_USBHOST_MOD, | ||
| 204 | CM_FCLKEN); | ||
| 205 | } else | ||
| 206 | fck_sgx = cm_read_mod_reg(GFX_MOD, | ||
| 207 | OMAP3430ES2_CM_FCLKEN3); | ||
| 208 | fck_dss = cm_read_mod_reg(OMAP3430_DSS_MOD, | ||
| 209 | CM_FCLKEN); | ||
| 210 | fck_cam = cm_read_mod_reg(OMAP3430_CAM_MOD, | ||
| 211 | CM_FCLKEN); | ||
| 212 | fck_per = cm_read_mod_reg(OMAP3430_PER_MOD, | ||
| 213 | CM_FCLKEN); | ||
| 214 | |||
| 215 | /* Ignore UART clocks. These are handled by UART core (serial.c) */ | ||
| 216 | fck_core1 &= ~(OMAP3430_EN_UART1 | OMAP3430_EN_UART2); | ||
| 217 | fck_per &= ~OMAP3430_EN_UART3; | ||
| 218 | |||
| 219 | if (fck_core1 | fck_core3 | fck_sgx | fck_dss | | ||
| 220 | fck_cam | fck_per | fck_usbhost) | ||
| 221 | return 1; | ||
| 222 | return 0; | ||
| 223 | } | ||
| 224 | |||
| 225 | static int omap3_can_sleep(void) | ||
| 226 | { | ||
| 227 | if (!omap_uart_can_sleep()) | ||
| 228 | return 0; | ||
| 229 | if (omap3_fclks_active()) | ||
| 230 | return 0; | ||
| 231 | return 1; | ||
| 232 | } | ||
| 233 | |||
| 234 | /* This sets pwrdm state (other than mpu & core. Currently only ON & | ||
| 235 | * RET are supported. Function is assuming that clkdm doesn't have | ||
| 236 | * hw_sup mode enabled. */ | ||
| 237 | static int set_pwrdm_state(struct powerdomain *pwrdm, u32 state) | ||
| 238 | { | ||
| 239 | u32 cur_state; | ||
| 240 | int sleep_switch = 0; | ||
| 241 | int ret = 0; | ||
| 242 | |||
| 243 | if (pwrdm == NULL || IS_ERR(pwrdm)) | ||
| 244 | return -EINVAL; | ||
| 245 | |||
| 246 | while (!(pwrdm->pwrsts & (1 << state))) { | ||
| 247 | if (state == PWRDM_POWER_OFF) | ||
| 248 | return ret; | ||
| 249 | state--; | ||
| 250 | } | ||
| 251 | |||
| 252 | cur_state = pwrdm_read_next_pwrst(pwrdm); | ||
| 253 | if (cur_state == state) | ||
| 254 | return ret; | ||
| 255 | |||
| 256 | if (pwrdm_read_pwrst(pwrdm) < PWRDM_POWER_ON) { | ||
| 257 | omap2_clkdm_wakeup(pwrdm->pwrdm_clkdms[0]); | ||
| 258 | sleep_switch = 1; | ||
| 259 | pwrdm_wait_transition(pwrdm); | ||
| 260 | } | ||
| 261 | |||
| 262 | ret = pwrdm_set_next_pwrst(pwrdm, state); | ||
| 263 | if (ret) { | ||
| 264 | printk(KERN_ERR "Unable to set state of powerdomain: %s\n", | ||
| 265 | pwrdm->name); | ||
| 266 | goto err; | ||
| 267 | } | ||
| 268 | |||
| 269 | if (sleep_switch) { | ||
| 270 | omap2_clkdm_allow_idle(pwrdm->pwrdm_clkdms[0]); | ||
| 271 | pwrdm_wait_transition(pwrdm); | ||
| 272 | } | ||
| 273 | |||
| 274 | err: | ||
| 275 | return ret; | ||
| 276 | } | ||
| 277 | |||
| 278 | static void omap3_pm_idle(void) | ||
| 279 | { | ||
| 280 | local_irq_disable(); | ||
| 281 | local_fiq_disable(); | ||
| 282 | |||
| 283 | if (!omap3_can_sleep()) | ||
| 284 | goto out; | ||
| 285 | |||
| 286 | if (omap_irq_pending()) | ||
| 287 | goto out; | ||
| 288 | |||
| 289 | omap_sram_idle(); | ||
| 290 | |||
| 291 | out: | ||
| 292 | local_fiq_enable(); | ||
| 293 | local_irq_enable(); | ||
| 294 | } | ||
| 295 | |||
| 296 | static int omap3_pm_prepare(void) | ||
| 297 | { | ||
| 298 | disable_hlt(); | ||
| 299 | return 0; | ||
| 300 | } | ||
| 301 | |||
| 302 | static int omap3_pm_suspend(void) | ||
| 303 | { | ||
| 304 | struct power_state *pwrst; | ||
| 305 | int state, ret = 0; | ||
| 306 | |||
| 307 | /* Read current next_pwrsts */ | ||
| 308 | list_for_each_entry(pwrst, &pwrst_list, node) | ||
| 309 | pwrst->saved_state = pwrdm_read_next_pwrst(pwrst->pwrdm); | ||
| 310 | /* Set ones wanted by suspend */ | ||
| 311 | list_for_each_entry(pwrst, &pwrst_list, node) { | ||
| 312 | if (set_pwrdm_state(pwrst->pwrdm, pwrst->next_state)) | ||
| 313 | goto restore; | ||
| 314 | if (pwrdm_clear_all_prev_pwrst(pwrst->pwrdm)) | ||
| 315 | goto restore; | ||
| 316 | } | ||
| 317 | |||
| 318 | omap_uart_prepare_suspend(); | ||
| 319 | omap_sram_idle(); | ||
| 320 | |||
| 321 | restore: | ||
| 322 | /* Restore next_pwrsts */ | ||
| 323 | list_for_each_entry(pwrst, &pwrst_list, node) { | ||
| 324 | set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state); | ||
| 325 | state = pwrdm_read_prev_pwrst(pwrst->pwrdm); | ||
| 326 | if (state > pwrst->next_state) { | ||
| 327 | printk(KERN_INFO "Powerdomain (%s) didn't enter " | ||
| 328 | "target state %d\n", | ||
| 329 | pwrst->pwrdm->name, pwrst->next_state); | ||
| 330 | ret = -1; | ||
| 331 | } | ||
| 332 | } | ||
| 333 | if (ret) | ||
| 334 | printk(KERN_ERR "Could not enter target state in pm_suspend\n"); | ||
| 335 | else | ||
| 336 | printk(KERN_INFO "Successfully put all powerdomains " | ||
| 337 | "to target state\n"); | ||
| 338 | |||
| 339 | return ret; | ||
| 340 | } | ||
| 341 | |||
| 342 | static int omap3_pm_enter(suspend_state_t state) | ||
| 343 | { | ||
| 344 | int ret = 0; | ||
| 345 | |||
| 346 | switch (state) { | ||
| 347 | case PM_SUSPEND_STANDBY: | ||
| 348 | case PM_SUSPEND_MEM: | ||
| 349 | ret = omap3_pm_suspend(); | ||
| 350 | break; | ||
| 351 | default: | ||
| 352 | ret = -EINVAL; | ||
| 353 | } | ||
| 354 | |||
| 355 | return ret; | ||
| 356 | } | ||
| 357 | |||
| 358 | static void omap3_pm_finish(void) | ||
| 359 | { | ||
| 360 | enable_hlt(); | ||
| 361 | } | ||
| 362 | |||
| 363 | static struct platform_suspend_ops omap_pm_ops = { | ||
| 364 | .prepare = omap3_pm_prepare, | ||
| 365 | .enter = omap3_pm_enter, | ||
| 366 | .finish = omap3_pm_finish, | ||
| 367 | .valid = suspend_valid_only_mem, | ||
| 368 | }; | ||
| 369 | |||
| 370 | |||
| 371 | /** | ||
| 372 | * omap3_iva_idle(): ensure IVA is in idle so it can be put into | ||
| 373 | * retention | ||
| 374 | * | ||
| 375 | * In cases where IVA2 is activated by bootcode, it may prevent | ||
| 376 | * full-chip retention or off-mode because it is not idle. This | ||
| 377 | * function forces the IVA2 into idle state so it can go | ||
| 378 | * into retention/off and thus allow full-chip retention/off. | ||
| 379 | * | ||
| 380 | **/ | ||
| 381 | static void __init omap3_iva_idle(void) | ||
| 382 | { | ||
| 383 | /* ensure IVA2 clock is disabled */ | ||
| 384 | cm_write_mod_reg(0, OMAP3430_IVA2_MOD, CM_FCLKEN); | ||
| 385 | |||
| 386 | /* if no clock activity, nothing else to do */ | ||
| 387 | if (!(cm_read_mod_reg(OMAP3430_IVA2_MOD, OMAP3430_CM_CLKSTST) & | ||
| 388 | OMAP3430_CLKACTIVITY_IVA2_MASK)) | ||
| 389 | return; | ||
| 390 | |||
| 391 | /* Reset IVA2 */ | ||
| 392 | prm_write_mod_reg(OMAP3430_RST1_IVA2 | | ||
| 393 | OMAP3430_RST2_IVA2 | | ||
| 394 | OMAP3430_RST3_IVA2, | ||
| 395 | OMAP3430_IVA2_MOD, RM_RSTCTRL); | ||
| 396 | |||
| 397 | /* Enable IVA2 clock */ | ||
| 398 | cm_write_mod_reg(OMAP3430_CM_FCLKEN_IVA2_EN_IVA2, | ||
| 399 | OMAP3430_IVA2_MOD, CM_FCLKEN); | ||
| 400 | |||
| 401 | /* Set IVA2 boot mode to 'idle' */ | ||
| 402 | omap_ctrl_writel(OMAP3_IVA2_BOOTMOD_IDLE, | ||
| 403 | OMAP343X_CONTROL_IVA2_BOOTMOD); | ||
| 404 | |||
| 405 | /* Un-reset IVA2 */ | ||
| 406 | prm_write_mod_reg(0, OMAP3430_IVA2_MOD, RM_RSTCTRL); | ||
| 407 | |||
| 408 | /* Disable IVA2 clock */ | ||
| 409 | cm_write_mod_reg(0, OMAP3430_IVA2_MOD, CM_FCLKEN); | ||
| 410 | |||
| 411 | /* Reset IVA2 */ | ||
| 412 | prm_write_mod_reg(OMAP3430_RST1_IVA2 | | ||
| 413 | OMAP3430_RST2_IVA2 | | ||
| 414 | OMAP3430_RST3_IVA2, | ||
| 415 | OMAP3430_IVA2_MOD, RM_RSTCTRL); | ||
| 416 | } | ||
| 417 | |||
| 418 | static void __init omap3_d2d_idle(void) | ||
| 419 | { | ||
| 420 | u16 mask, padconf; | ||
| 421 | |||
| 422 | /* In a stand alone OMAP3430 where there is not a stacked | ||
| 423 | * modem for the D2D Idle Ack and D2D MStandby must be pulled | ||
| 424 | * high. S CONTROL_PADCONF_SAD2D_IDLEACK and | ||
| 425 | * CONTROL_PADCONF_SAD2D_MSTDBY to have a pull up. */ | ||
| 426 | mask = (1 << 4) | (1 << 3); /* pull-up, enabled */ | ||
| 427 | padconf = omap_ctrl_readw(OMAP3_PADCONF_SAD2D_MSTANDBY); | ||
| 428 | padconf |= mask; | ||
| 429 | omap_ctrl_writew(padconf, OMAP3_PADCONF_SAD2D_MSTANDBY); | ||
| 430 | |||
| 431 | padconf = omap_ctrl_readw(OMAP3_PADCONF_SAD2D_IDLEACK); | ||
| 432 | padconf |= mask; | ||
| 433 | omap_ctrl_writew(padconf, OMAP3_PADCONF_SAD2D_IDLEACK); | ||
| 434 | |||
| 435 | /* reset modem */ | ||
| 436 | prm_write_mod_reg(OMAP3430_RM_RSTCTRL_CORE_MODEM_SW_RSTPWRON | | ||
| 437 | OMAP3430_RM_RSTCTRL_CORE_MODEM_SW_RST, | ||
| 438 | CORE_MOD, RM_RSTCTRL); | ||
| 439 | prm_write_mod_reg(0, CORE_MOD, RM_RSTCTRL); | ||
| 440 | } | ||
| 441 | |||
| 442 | static void __init prcm_setup_regs(void) | ||
| 443 | { | ||
| 444 | /* XXX Reset all wkdeps. This should be done when initializing | ||
| 445 | * powerdomains */ | ||
| 446 | prm_write_mod_reg(0, OMAP3430_IVA2_MOD, PM_WKDEP); | ||
| 447 | prm_write_mod_reg(0, MPU_MOD, PM_WKDEP); | ||
| 448 | prm_write_mod_reg(0, OMAP3430_DSS_MOD, PM_WKDEP); | ||
| 449 | prm_write_mod_reg(0, OMAP3430_NEON_MOD, PM_WKDEP); | ||
| 450 | prm_write_mod_reg(0, OMAP3430_CAM_MOD, PM_WKDEP); | ||
| 451 | prm_write_mod_reg(0, OMAP3430_PER_MOD, PM_WKDEP); | ||
| 452 | if (omap_rev() > OMAP3430_REV_ES1_0) { | ||
| 453 | prm_write_mod_reg(0, OMAP3430ES2_SGX_MOD, PM_WKDEP); | ||
| 454 | prm_write_mod_reg(0, OMAP3430ES2_USBHOST_MOD, PM_WKDEP); | ||
| 455 | } else | ||
| 456 | prm_write_mod_reg(0, GFX_MOD, PM_WKDEP); | ||
| 457 | |||
| 458 | /* | ||
| 459 | * Enable interface clock autoidle for all modules. | ||
| 460 | * Note that in the long run this should be done by clockfw | ||
| 461 | */ | ||
| 462 | cm_write_mod_reg( | ||
| 463 | OMAP3430_AUTO_MODEM | | ||
| 464 | OMAP3430ES2_AUTO_MMC3 | | ||
| 465 | OMAP3430ES2_AUTO_ICR | | ||
| 466 | OMAP3430_AUTO_AES2 | | ||
| 467 | OMAP3430_AUTO_SHA12 | | ||
| 468 | OMAP3430_AUTO_DES2 | | ||
| 469 | OMAP3430_AUTO_MMC2 | | ||
| 470 | OMAP3430_AUTO_MMC1 | | ||
| 471 | OMAP3430_AUTO_MSPRO | | ||
| 472 | OMAP3430_AUTO_HDQ | | ||
| 473 | OMAP3430_AUTO_MCSPI4 | | ||
| 474 | OMAP3430_AUTO_MCSPI3 | | ||
| 475 | OMAP3430_AUTO_MCSPI2 | | ||
| 476 | OMAP3430_AUTO_MCSPI1 | | ||
| 477 | OMAP3430_AUTO_I2C3 | | ||
| 478 | OMAP3430_AUTO_I2C2 | | ||
| 479 | OMAP3430_AUTO_I2C1 | | ||
| 480 | OMAP3430_AUTO_UART2 | | ||
| 481 | OMAP3430_AUTO_UART1 | | ||
| 482 | OMAP3430_AUTO_GPT11 | | ||
| 483 | OMAP3430_AUTO_GPT10 | | ||
| 484 | OMAP3430_AUTO_MCBSP5 | | ||
| 485 | OMAP3430_AUTO_MCBSP1 | | ||
| 486 | OMAP3430ES1_AUTO_FAC | /* This is es1 only */ | ||
| 487 | OMAP3430_AUTO_MAILBOXES | | ||
| 488 | OMAP3430_AUTO_OMAPCTRL | | ||
| 489 | OMAP3430ES1_AUTO_FSHOSTUSB | | ||
| 490 | OMAP3430_AUTO_HSOTGUSB | | ||
| 491 | OMAP3430_AUTO_SAD2D | | ||
| 492 | OMAP3430_AUTO_SSI, | ||
| 493 | CORE_MOD, CM_AUTOIDLE1); | ||
| 494 | |||
| 495 | cm_write_mod_reg( | ||
| 496 | OMAP3430_AUTO_PKA | | ||
| 497 | OMAP3430_AUTO_AES1 | | ||
| 498 | OMAP3430_AUTO_RNG | | ||
| 499 | OMAP3430_AUTO_SHA11 | | ||
| 500 | OMAP3430_AUTO_DES1, | ||
| 501 | CORE_MOD, CM_AUTOIDLE2); | ||
| 502 | |||
| 503 | if (omap_rev() > OMAP3430_REV_ES1_0) { | ||
| 504 | cm_write_mod_reg( | ||
| 505 | OMAP3430_AUTO_MAD2D | | ||
| 506 | OMAP3430ES2_AUTO_USBTLL, | ||
| 507 | CORE_MOD, CM_AUTOIDLE3); | ||
| 508 | } | ||
| 509 | |||
| 510 | cm_write_mod_reg( | ||
| 511 | OMAP3430_AUTO_WDT2 | | ||
| 512 | OMAP3430_AUTO_WDT1 | | ||
| 513 | OMAP3430_AUTO_GPIO1 | | ||
| 514 | OMAP3430_AUTO_32KSYNC | | ||
| 515 | OMAP3430_AUTO_GPT12 | | ||
| 516 | OMAP3430_AUTO_GPT1 , | ||
| 517 | WKUP_MOD, CM_AUTOIDLE); | ||
| 518 | |||
| 519 | cm_write_mod_reg( | ||
| 520 | OMAP3430_AUTO_DSS, | ||
| 521 | OMAP3430_DSS_MOD, | ||
| 522 | CM_AUTOIDLE); | ||
| 523 | |||
| 524 | cm_write_mod_reg( | ||
| 525 | OMAP3430_AUTO_CAM, | ||
| 526 | OMAP3430_CAM_MOD, | ||
| 527 | CM_AUTOIDLE); | ||
| 528 | |||
| 529 | cm_write_mod_reg( | ||
| 530 | OMAP3430_AUTO_GPIO6 | | ||
| 531 | OMAP3430_AUTO_GPIO5 | | ||
| 532 | OMAP3430_AUTO_GPIO4 | | ||
| 533 | OMAP3430_AUTO_GPIO3 | | ||
| 534 | OMAP3430_AUTO_GPIO2 | | ||
| 535 | OMAP3430_AUTO_WDT3 | | ||
| 536 | OMAP3430_AUTO_UART3 | | ||
| 537 | OMAP3430_AUTO_GPT9 | | ||
| 538 | OMAP3430_AUTO_GPT8 | | ||
| 539 | OMAP3430_AUTO_GPT7 | | ||
| 540 | OMAP3430_AUTO_GPT6 | | ||
| 541 | OMAP3430_AUTO_GPT5 | | ||
| 542 | OMAP3430_AUTO_GPT4 | | ||
| 543 | OMAP3430_AUTO_GPT3 | | ||
| 544 | OMAP3430_AUTO_GPT2 | | ||
| 545 | OMAP3430_AUTO_MCBSP4 | | ||
| 546 | OMAP3430_AUTO_MCBSP3 | | ||
| 547 | OMAP3430_AUTO_MCBSP2, | ||
| 548 | OMAP3430_PER_MOD, | ||
| 549 | CM_AUTOIDLE); | ||
| 550 | |||
| 551 | if (omap_rev() > OMAP3430_REV_ES1_0) { | ||
| 552 | cm_write_mod_reg( | ||
| 553 | OMAP3430ES2_AUTO_USBHOST, | ||
| 554 | OMAP3430ES2_USBHOST_MOD, | ||
| 555 | CM_AUTOIDLE); | ||
| 556 | } | ||
| 557 | |||
| 558 | /* | ||
| 559 | * Set all plls to autoidle. This is needed until autoidle is | ||
| 560 | * enabled by clockfw | ||
| 561 | */ | ||
| 562 | cm_write_mod_reg(1 << OMAP3430_AUTO_IVA2_DPLL_SHIFT, | ||
| 563 | OMAP3430_IVA2_MOD, CM_AUTOIDLE2); | ||
| 564 | cm_write_mod_reg(1 << OMAP3430_AUTO_MPU_DPLL_SHIFT, | ||
| 565 | MPU_MOD, | ||
| 566 | CM_AUTOIDLE2); | ||
| 567 | cm_write_mod_reg((1 << OMAP3430_AUTO_PERIPH_DPLL_SHIFT) | | ||
| 568 | (1 << OMAP3430_AUTO_CORE_DPLL_SHIFT), | ||
| 569 | PLL_MOD, | ||
| 570 | CM_AUTOIDLE); | ||
| 571 | cm_write_mod_reg(1 << OMAP3430ES2_AUTO_PERIPH2_DPLL_SHIFT, | ||
| 572 | PLL_MOD, | ||
| 573 | CM_AUTOIDLE2); | ||
| 574 | |||
| 575 | /* | ||
| 576 | * Enable control of expternal oscillator through | ||
| 577 | * sys_clkreq. In the long run clock framework should | ||
| 578 | * take care of this. | ||
| 579 | */ | ||
| 580 | prm_rmw_mod_reg_bits(OMAP_AUTOEXTCLKMODE_MASK, | ||
| 581 | 1 << OMAP_AUTOEXTCLKMODE_SHIFT, | ||
| 582 | OMAP3430_GR_MOD, | ||
| 583 | OMAP3_PRM_CLKSRC_CTRL_OFFSET); | ||
| 584 | |||
| 585 | /* setup wakup source */ | ||
| 586 | prm_write_mod_reg(OMAP3430_EN_IO | OMAP3430_EN_GPIO1 | | ||
| 587 | OMAP3430_EN_GPT1 | OMAP3430_EN_GPT12, | ||
| 588 | WKUP_MOD, PM_WKEN); | ||
| 589 | /* No need to write EN_IO, that is always enabled */ | ||
| 590 | prm_write_mod_reg(OMAP3430_EN_GPIO1 | OMAP3430_EN_GPT1 | | ||
| 591 | OMAP3430_EN_GPT12, | ||
| 592 | WKUP_MOD, OMAP3430_PM_MPUGRPSEL); | ||
| 593 | /* For some reason IO doesn't generate wakeup event even if | ||
| 594 | * it is selected to mpu wakeup goup */ | ||
| 595 | prm_write_mod_reg(OMAP3430_IO_EN | OMAP3430_WKUP_EN, | ||
| 596 | OCP_MOD, OMAP3_PRM_IRQENABLE_MPU_OFFSET); | ||
| 597 | |||
| 598 | /* Don't attach IVA interrupts */ | ||
| 599 | prm_write_mod_reg(0, WKUP_MOD, OMAP3430_PM_IVAGRPSEL); | ||
| 600 | prm_write_mod_reg(0, CORE_MOD, OMAP3430_PM_IVAGRPSEL1); | ||
| 601 | prm_write_mod_reg(0, CORE_MOD, OMAP3430ES2_PM_IVAGRPSEL3); | ||
| 602 | prm_write_mod_reg(0, OMAP3430_PER_MOD, OMAP3430_PM_IVAGRPSEL); | ||
| 603 | |||
| 604 | /* Clear any pending 'reset' flags */ | ||
| 605 | prm_write_mod_reg(0xffffffff, MPU_MOD, RM_RSTST); | ||
| 606 | prm_write_mod_reg(0xffffffff, CORE_MOD, RM_RSTST); | ||
| 607 | prm_write_mod_reg(0xffffffff, OMAP3430_PER_MOD, RM_RSTST); | ||
| 608 | prm_write_mod_reg(0xffffffff, OMAP3430_EMU_MOD, RM_RSTST); | ||
| 609 | prm_write_mod_reg(0xffffffff, OMAP3430_NEON_MOD, RM_RSTST); | ||
| 610 | prm_write_mod_reg(0xffffffff, OMAP3430_DSS_MOD, RM_RSTST); | ||
| 611 | prm_write_mod_reg(0xffffffff, OMAP3430ES2_USBHOST_MOD, RM_RSTST); | ||
| 612 | |||
| 613 | /* Clear any pending PRCM interrupts */ | ||
| 614 | prm_write_mod_reg(0, OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET); | ||
| 615 | |||
| 616 | omap3_iva_idle(); | ||
| 617 | omap3_d2d_idle(); | ||
| 618 | } | ||
| 619 | |||
| 620 | static int __init pwrdms_setup(struct powerdomain *pwrdm) | ||
| 621 | { | ||
| 622 | struct power_state *pwrst; | ||
| 623 | |||
| 624 | if (!pwrdm->pwrsts) | ||
| 625 | return 0; | ||
| 626 | |||
| 627 | pwrst = kmalloc(sizeof(struct power_state), GFP_KERNEL); | ||
| 628 | if (!pwrst) | ||
| 629 | return -ENOMEM; | ||
| 630 | pwrst->pwrdm = pwrdm; | ||
| 631 | pwrst->next_state = PWRDM_POWER_RET; | ||
| 632 | list_add(&pwrst->node, &pwrst_list); | ||
| 633 | |||
| 634 | if (pwrdm_has_hdwr_sar(pwrdm)) | ||
| 635 | pwrdm_enable_hdwr_sar(pwrdm); | ||
| 636 | |||
| 637 | return set_pwrdm_state(pwrst->pwrdm, pwrst->next_state); | ||
| 638 | } | ||
| 639 | |||
| 640 | /* | ||
| 641 | * Enable hw supervised mode for all clockdomains if it's | ||
| 642 | * supported. Initiate sleep transition for other clockdomains, if | ||
| 643 | * they are not used | ||
| 644 | */ | ||
| 645 | static int __init clkdms_setup(struct clockdomain *clkdm) | ||
| 646 | { | ||
| 647 | if (clkdm->flags & CLKDM_CAN_ENABLE_AUTO) | ||
| 648 | omap2_clkdm_allow_idle(clkdm); | ||
| 649 | else if (clkdm->flags & CLKDM_CAN_FORCE_SLEEP && | ||
| 650 | atomic_read(&clkdm->usecount) == 0) | ||
| 651 | omap2_clkdm_sleep(clkdm); | ||
| 652 | return 0; | ||
| 653 | } | ||
| 654 | |||
| 655 | int __init omap3_pm_init(void) | ||
| 656 | { | ||
| 657 | struct power_state *pwrst, *tmp; | ||
| 658 | int ret; | ||
| 659 | |||
| 660 | if (!cpu_is_omap34xx()) | ||
| 661 | return -ENODEV; | ||
| 662 | |||
| 663 | printk(KERN_ERR "Power Management for TI OMAP3.\n"); | ||
| 664 | |||
| 665 | /* XXX prcm_setup_regs needs to be before enabling hw | ||
| 666 | * supervised mode for powerdomains */ | ||
| 667 | prcm_setup_regs(); | ||
| 668 | |||
| 669 | ret = request_irq(INT_34XX_PRCM_MPU_IRQ, | ||
| 670 | (irq_handler_t)prcm_interrupt_handler, | ||
| 671 | IRQF_DISABLED, "prcm", NULL); | ||
| 672 | if (ret) { | ||
| 673 | printk(KERN_ERR "request_irq failed to register for 0x%x\n", | ||
| 674 | INT_34XX_PRCM_MPU_IRQ); | ||
| 675 | goto err1; | ||
| 676 | } | ||
| 677 | |||
| 678 | ret = pwrdm_for_each(pwrdms_setup); | ||
| 679 | if (ret) { | ||
| 680 | printk(KERN_ERR "Failed to setup powerdomains\n"); | ||
| 681 | goto err2; | ||
| 682 | } | ||
| 683 | |||
| 684 | (void) clkdm_for_each(clkdms_setup); | ||
| 685 | |||
| 686 | mpu_pwrdm = pwrdm_lookup("mpu_pwrdm"); | ||
| 687 | if (mpu_pwrdm == NULL) { | ||
| 688 | printk(KERN_ERR "Failed to get mpu_pwrdm\n"); | ||
| 689 | goto err2; | ||
| 690 | } | ||
| 691 | |||
| 692 | _omap_sram_idle = omap_sram_push(omap34xx_cpu_suspend, | ||
| 693 | omap34xx_cpu_suspend_sz); | ||
| 694 | |||
| 695 | suspend_set_ops(&omap_pm_ops); | ||
| 696 | |||
| 697 | pm_idle = omap3_pm_idle; | ||
| 698 | |||
| 699 | err1: | ||
| 700 | return ret; | ||
| 701 | err2: | ||
| 702 | free_irq(INT_34XX_PRCM_MPU_IRQ, NULL); | ||
| 703 | list_for_each_entry_safe(pwrst, tmp, &pwrst_list, node) { | ||
| 704 | list_del(&pwrst->node); | ||
| 705 | kfree(pwrst); | ||
| 706 | } | ||
| 707 | return ret; | ||
| 708 | } | ||
| 709 | |||
| 710 | late_initcall(omap3_pm_init); | ||
diff --git a/arch/arm/mach-omap2/prcm-common.h b/arch/arm/mach-omap2/prcm-common.h index 812d50ee495d..cb1ae84e0925 100644 --- a/arch/arm/mach-omap2/prcm-common.h +++ b/arch/arm/mach-omap2/prcm-common.h | |||
| @@ -276,6 +276,8 @@ | |||
| 276 | /* CM_FCLKEN_WKUP, CM_ICLKEN_WKUP, PM_WKEN_WKUP shared bits */ | 276 | /* CM_FCLKEN_WKUP, CM_ICLKEN_WKUP, PM_WKEN_WKUP shared bits */ |
| 277 | #define OMAP3430_EN_GPIO1 (1 << 3) | 277 | #define OMAP3430_EN_GPIO1 (1 << 3) |
| 278 | #define OMAP3430_EN_GPIO1_SHIFT 3 | 278 | #define OMAP3430_EN_GPIO1_SHIFT 3 |
| 279 | #define OMAP3430_EN_GPT12 (1 << 1) | ||
| 280 | #define OMAP3430_EN_GPT12_SHIFT 1 | ||
| 279 | #define OMAP3430_EN_GPT1 (1 << 0) | 281 | #define OMAP3430_EN_GPT1 (1 << 0) |
| 280 | #define OMAP3430_EN_GPT1_SHIFT 0 | 282 | #define OMAP3430_EN_GPT1_SHIFT 0 |
| 281 | 283 | ||
diff --git a/arch/arm/mach-omap2/prm.h b/arch/arm/mach-omap2/prm.h index 826d326b8062..9937e2814696 100644 --- a/arch/arm/mach-omap2/prm.h +++ b/arch/arm/mach-omap2/prm.h | |||
| @@ -16,17 +16,12 @@ | |||
| 16 | 16 | ||
| 17 | #include "prcm-common.h" | 17 | #include "prcm-common.h" |
| 18 | 18 | ||
| 19 | #ifndef __ASSEMBLER__ | ||
| 20 | #define OMAP_PRM_REGADDR(module, reg) \ | ||
| 21 | IO_ADDRESS(OMAP2_PRM_BASE + (module) + (reg)) | ||
| 22 | #else | ||
| 23 | #define OMAP2420_PRM_REGADDR(module, reg) \ | 19 | #define OMAP2420_PRM_REGADDR(module, reg) \ |
| 24 | IO_ADDRESS(OMAP2420_PRM_BASE + (module) + (reg)) | 20 | IO_ADDRESS(OMAP2420_PRM_BASE + (module) + (reg)) |
| 25 | #define OMAP2430_PRM_REGADDR(module, reg) \ | 21 | #define OMAP2430_PRM_REGADDR(module, reg) \ |
| 26 | IO_ADDRESS(OMAP2430_PRM_BASE + (module) + (reg)) | 22 | IO_ADDRESS(OMAP2430_PRM_BASE + (module) + (reg)) |
| 27 | #define OMAP34XX_PRM_REGADDR(module, reg) \ | 23 | #define OMAP34XX_PRM_REGADDR(module, reg) \ |
| 28 | IO_ADDRESS(OMAP3430_PRM_BASE + (module) + (reg)) | 24 | IO_ADDRESS(OMAP3430_PRM_BASE + (module) + (reg)) |
| 29 | #endif | ||
| 30 | 25 | ||
| 31 | /* | 26 | /* |
| 32 | * Architecture-specific global PRM registers | 27 | * Architecture-specific global PRM registers |
| @@ -38,80 +33,132 @@ | |||
| 38 | * | 33 | * |
| 39 | */ | 34 | */ |
| 40 | 35 | ||
| 41 | /* Global 24xx registers in GR_MOD (Same as OCP_MOD for 24xx) */ | 36 | #define OMAP2_PRCM_REVISION_OFFSET 0x0000 |
| 42 | #define OMAP24XX_PRCM_VOLTCTRL_OFFSET 0x0050 | 37 | #define OMAP2420_PRCM_REVISION OMAP2420_PRM_REGADDR(OCP_MOD, 0x0000) |
| 43 | #define OMAP24XX_PRCM_CLKCFG_CTRL_OFFSET 0x0080 | 38 | #define OMAP2_PRCM_SYSCONFIG_OFFSET 0x0010 |
| 44 | 39 | #define OMAP2420_PRCM_SYSCONFIG OMAP2420_PRM_REGADDR(OCP_MOD, 0x0010) | |
| 45 | /* 242x GR_MOD registers, use these only for assembly code */ | 40 | |
| 46 | #define OMAP242X_PRCM_VOLTCTRL OMAP2420_PRM_REGADDR(OMAP24XX_GR_MOD, \ | 41 | #define OMAP2_PRCM_IRQSTATUS_MPU_OFFSET 0x0018 |
| 47 | OMAP24XX_PRCM_VOLTCTRL_OFFSET) | 42 | #define OMAP2420_PRCM_IRQSTATUS_MPU OMAP2420_PRM_REGADDR(OCP_MOD, 0x0018) |
| 48 | #define OMAP242X_PRCM_CLKCFG_CTRL OMAP2420_PRM_REGADDR(OMAP24XX_GR_MOD, \ | 43 | #define OMAP2_PRCM_IRQENABLE_MPU_OFFSET 0x001c |
| 49 | OMAP24XX_PRCM_CLKCFG_CTRL_OFFSET) | 44 | #define OMAP2420_PRCM_IRQENABLE_MPU OMAP2420_PRM_REGADDR(OCP_MOD, 0x001c) |
| 50 | 45 | ||
| 51 | /* 243x GR_MOD registers, use these only for assembly code */ | 46 | #define OMAP2_PRCM_VOLTCTRL_OFFSET 0x0050 |
| 52 | #define OMAP243X_PRCM_VOLTCTRL OMAP2430_PRM_REGADDR(OMAP24XX_GR_MOD, \ | 47 | #define OMAP2420_PRCM_VOLTCTRL OMAP2420_PRM_REGADDR(OCP_MOD, 0x0050) |
| 53 | OMAP24XX_PRCM_VOLTCTRL_OFFSET) | 48 | #define OMAP2_PRCM_VOLTST_OFFSET 0x0054 |
| 54 | #define OMAP243X_PRCM_CLKCFG_CTRL OMAP2430_PRM_REGADDR(OMAP24XX_GR_MOD, \ | 49 | #define OMAP2420_PRCM_VOLTST OMAP2420_PRM_REGADDR(OCP_MOD, 0x0054) |
| 55 | OMAP24XX_PRCM_CLKCFG_CTRL_OFFSET) | 50 | #define OMAP2_PRCM_CLKSRC_CTRL_OFFSET 0x0060 |
| 56 | 51 | #define OMAP2420_PRCM_CLKSRC_CTRL OMAP2420_PRM_REGADDR(OCP_MOD, 0x0060) | |
| 57 | /* These will disappear */ | 52 | #define OMAP2_PRCM_CLKOUT_CTRL_OFFSET 0x0070 |
| 58 | #define OMAP24XX_PRCM_REVISION OMAP_PRM_REGADDR(OCP_MOD, 0x0000) | 53 | #define OMAP2420_PRCM_CLKOUT_CTRL OMAP2420_PRM_REGADDR(OCP_MOD, 0x0070) |
| 59 | #define OMAP24XX_PRCM_SYSCONFIG OMAP_PRM_REGADDR(OCP_MOD, 0x0010) | 54 | #define OMAP2_PRCM_CLKEMUL_CTRL_OFFSET 0x0078 |
| 60 | 55 | #define OMAP2420_PRCM_CLKEMUL_CTRL OMAP2420_PRM_REGADDR(OCP_MOD, 0x0078) | |
| 61 | #define OMAP24XX_PRCM_IRQSTATUS_MPU OMAP_PRM_REGADDR(OCP_MOD, 0x0018) | 56 | #define OMAP2_PRCM_CLKCFG_CTRL_OFFSET 0x0080 |
| 62 | #define OMAP24XX_PRCM_IRQENABLE_MPU OMAP_PRM_REGADDR(OCP_MOD, 0x001c) | 57 | #define OMAP2420_PRCM_CLKCFG_CTRL OMAP2420_PRM_REGADDR(OCP_MOD, 0x0080) |
| 63 | 58 | #define OMAP2_PRCM_CLKCFG_STATUS_OFFSET 0x0084 | |
| 64 | #define OMAP24XX_PRCM_VOLTST OMAP_PRM_REGADDR(OCP_MOD, 0x0054) | 59 | #define OMAP2420_PRCM_CLKCFG_STATUS OMAP2420_PRM_REGADDR(OCP_MOD, 0x0084) |
| 65 | #define OMAP24XX_PRCM_CLKSRC_CTRL OMAP_PRM_REGADDR(OCP_MOD, 0x0060) | 60 | #define OMAP2_PRCM_VOLTSETUP_OFFSET 0x0090 |
| 66 | #define OMAP24XX_PRCM_CLKOUT_CTRL OMAP_PRM_REGADDR(OCP_MOD, 0x0070) | 61 | #define OMAP2420_PRCM_VOLTSETUP OMAP2420_PRM_REGADDR(OCP_MOD, 0x0090) |
| 67 | #define OMAP24XX_PRCM_CLKEMUL_CTRL OMAP_PRM_REGADDR(OCP_MOD, 0x0078) | 62 | #define OMAP2_PRCM_CLKSSETUP_OFFSET 0x0094 |
| 68 | #define OMAP24XX_PRCM_CLKCFG_CTRL OMAP_PRM_REGADDR(OCP_MOD, 0x0080) | 63 | #define OMAP2420_PRCM_CLKSSETUP OMAP2420_PRM_REGADDR(OCP_MOD, 0x0094) |
| 69 | #define OMAP24XX_PRCM_CLKCFG_STATUS OMAP_PRM_REGADDR(OCP_MOD, 0x0084) | 64 | #define OMAP2_PRCM_POLCTRL_OFFSET 0x0098 |
| 70 | #define OMAP24XX_PRCM_VOLTSETUP OMAP_PRM_REGADDR(OCP_MOD, 0x0090) | 65 | #define OMAP2420_PRCM_POLCTRL OMAP2420_PRM_REGADDR(OCP_MOD, 0x0098) |
| 71 | #define OMAP24XX_PRCM_CLKSSETUP OMAP_PRM_REGADDR(OCP_MOD, 0x0094) | 66 | |
| 72 | #define OMAP24XX_PRCM_POLCTRL OMAP_PRM_REGADDR(OCP_MOD, 0x0098) | 67 | #define OMAP2430_PRCM_REVISION OMAP2430_PRM_REGADDR(OCP_MOD, 0x0000) |
| 73 | 68 | #define OMAP2430_PRCM_SYSCONFIG OMAP2430_PRM_REGADDR(OCP_MOD, 0x0010) | |
| 74 | #define OMAP3430_PRM_REVISION OMAP_PRM_REGADDR(OCP_MOD, 0x0004) | 69 | |
| 75 | #define OMAP3430_PRM_SYSCONFIG OMAP_PRM_REGADDR(OCP_MOD, 0x0014) | 70 | #define OMAP2430_PRCM_IRQSTATUS_MPU OMAP2430_PRM_REGADDR(OCP_MOD, 0x0018) |
| 76 | 71 | #define OMAP2430_PRCM_IRQENABLE_MPU OMAP2430_PRM_REGADDR(OCP_MOD, 0x001c) | |
| 77 | #define OMAP3430_PRM_IRQSTATUS_MPU OMAP_PRM_REGADDR(OCP_MOD, 0x0018) | 72 | |
| 78 | #define OMAP3430_PRM_IRQENABLE_MPU OMAP_PRM_REGADDR(OCP_MOD, 0x001c) | 73 | #define OMAP2430_PRCM_VOLTCTRL OMAP2430_PRM_REGADDR(OCP_MOD, 0x0050) |
| 79 | 74 | #define OMAP2430_PRCM_VOLTST OMAP2430_PRM_REGADDR(OCP_MOD, 0x0054) | |
| 80 | 75 | #define OMAP2430_PRCM_CLKSRC_CTRL OMAP2430_PRM_REGADDR(OCP_MOD, 0x0060) | |
| 81 | #define OMAP3430_PRM_VC_SMPS_SA OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x0020) | 76 | #define OMAP2430_PRCM_CLKOUT_CTRL OMAP2430_PRM_REGADDR(OCP_MOD, 0x0070) |
| 82 | #define OMAP3430_PRM_VC_SMPS_VOL_RA OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x0024) | 77 | #define OMAP2430_PRCM_CLKEMUL_CTRL OMAP2430_PRM_REGADDR(OCP_MOD, 0x0078) |
| 83 | #define OMAP3430_PRM_VC_SMPS_CMD_RA OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x0028) | 78 | #define OMAP2430_PRCM_CLKCFG_CTRL OMAP2430_PRM_REGADDR(OCP_MOD, 0x0080) |
| 84 | #define OMAP3430_PRM_VC_CMD_VAL_0 OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x002c) | 79 | #define OMAP2430_PRCM_CLKCFG_STATUS OMAP2430_PRM_REGADDR(OCP_MOD, 0x0084) |
| 85 | #define OMAP3430_PRM_VC_CMD_VAL_1 OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x0030) | 80 | #define OMAP2430_PRCM_VOLTSETUP OMAP2430_PRM_REGADDR(OCP_MOD, 0x0090) |
| 86 | #define OMAP3430_PRM_VC_CH_CONF OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x0034) | 81 | #define OMAP2430_PRCM_CLKSSETUP OMAP2430_PRM_REGADDR(OCP_MOD, 0x0094) |
| 87 | #define OMAP3430_PRM_VC_I2C_CFG OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x0038) | 82 | #define OMAP2430_PRCM_POLCTRL OMAP2430_PRM_REGADDR(OCP_MOD, 0x0098) |
| 88 | #define OMAP3430_PRM_VC_BYPASS_VAL OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x003c) | 83 | |
| 89 | #define OMAP3430_PRM_RSTCTRL OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x0050) | 84 | #define OMAP3_PRM_REVISION_OFFSET 0x0004 |
| 90 | #define OMAP3430_PRM_RSTTIME OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x0054) | 85 | #define OMAP3430_PRM_REVISION OMAP34XX_PRM_REGADDR(OCP_MOD, 0x0004) |
| 91 | #define OMAP3430_PRM_RSTST OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x0058) | 86 | #define OMAP3_PRM_SYSCONFIG_OFFSET 0x0014 |
| 92 | #define OMAP3430_PRM_VOLTCTRL OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x0060) | 87 | #define OMAP3430_PRM_SYSCONFIG OMAP34XX_PRM_REGADDR(OCP_MOD, 0x0014) |
| 93 | #define OMAP3430_PRM_SRAM_PCHARGE OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x0064) | 88 | |
| 94 | #define OMAP3430_PRM_CLKSRC_CTRL OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x0070) | 89 | #define OMAP3_PRM_IRQSTATUS_MPU_OFFSET 0x0018 |
| 95 | #define OMAP3430_PRM_VOLTSETUP1 OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x0090) | 90 | #define OMAP3430_PRM_IRQSTATUS_MPU OMAP34XX_PRM_REGADDR(OCP_MOD, 0x0018) |
| 96 | #define OMAP3430_PRM_VOLTOFFSET OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x0094) | 91 | #define OMAP3_PRM_IRQENABLE_MPU_OFFSET 0x001c |
| 97 | #define OMAP3430_PRM_CLKSETUP OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x0098) | 92 | #define OMAP3430_PRM_IRQENABLE_MPU OMAP34XX_PRM_REGADDR(OCP_MOD, 0x001c) |
| 98 | #define OMAP3430_PRM_POLCTRL OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x009c) | 93 | |
| 99 | #define OMAP3430_PRM_VOLTSETUP2 OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x00a0) | 94 | |
| 100 | #define OMAP3430_PRM_VP1_CONFIG OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x00b0) | 95 | #define OMAP3_PRM_VC_SMPS_SA_OFFSET 0x0020 |
| 101 | #define OMAP3430_PRM_VP1_VSTEPMIN OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x00b4) | 96 | #define OMAP3430_PRM_VC_SMPS_SA OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0020) |
| 102 | #define OMAP3430_PRM_VP1_VSTEPMAX OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x00b8) | 97 | #define OMAP3_PRM_VC_SMPS_VOL_RA_OFFSET 0x0024 |
| 103 | #define OMAP3430_PRM_VP1_VLIMITTO OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x00bc) | 98 | #define OMAP3430_PRM_VC_SMPS_VOL_RA OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0024) |
| 104 | #define OMAP3430_PRM_VP1_VOLTAGE OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x00c0) | 99 | #define OMAP3_PRM_VC_SMPS_CMD_RA_OFFSET 0x0028 |
| 105 | #define OMAP3430_PRM_VP1_STATUS OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x00c4) | 100 | #define OMAP3430_PRM_VC_SMPS_CMD_RA OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0028) |
| 106 | #define OMAP3430_PRM_VP2_CONFIG OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x00d0) | 101 | #define OMAP3_PRM_VC_CMD_VAL_0_OFFSET 0x002c |
| 107 | #define OMAP3430_PRM_VP2_VSTEPMIN OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x00d4) | 102 | #define OMAP3430_PRM_VC_CMD_VAL_0 OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x002c) |
| 108 | #define OMAP3430_PRM_VP2_VSTEPMAX OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x00d8) | 103 | #define OMAP3_PRM_VC_CMD_VAL_1_OFFSET 0x0030 |
| 109 | #define OMAP3430_PRM_VP2_VLIMITTO OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x00dc) | 104 | #define OMAP3430_PRM_VC_CMD_VAL_1 OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0030) |
| 110 | #define OMAP3430_PRM_VP2_VOLTAGE OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x00e0) | 105 | #define OMAP3_PRM_VC_CH_CONF_OFFSET 0x0034 |
| 111 | #define OMAP3430_PRM_VP2_STATUS OMAP_PRM_REGADDR(OMAP3430_GR_MOD, 0x00e4) | 106 | #define OMAP3430_PRM_VC_CH_CONF OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0034) |
| 112 | 107 | #define OMAP3_PRM_VC_I2C_CFG_OFFSET 0x0038 | |
| 113 | #define OMAP3430_PRM_CLKSEL OMAP_PRM_REGADDR(OMAP3430_CCR_MOD, 0x0040) | 108 | #define OMAP3430_PRM_VC_I2C_CFG OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0038) |
| 114 | #define OMAP3430_PRM_CLKOUT_CTRL OMAP_PRM_REGADDR(OMAP3430_CCR_MOD, 0x0070) | 109 | #define OMAP3_PRM_VC_BYPASS_VAL_OFFSET 0x003c |
| 110 | #define OMAP3430_PRM_VC_BYPASS_VAL OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x003c) | ||
| 111 | #define OMAP3_PRM_RSTCTRL_OFFSET 0x0050 | ||
| 112 | #define OMAP3430_PRM_RSTCTRL OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0050) | ||
| 113 | #define OMAP3_PRM_RSTTIME_OFFSET 0x0054 | ||
| 114 | #define OMAP3430_PRM_RSTTIME OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0054) | ||
| 115 | #define OMAP3_PRM_RSTST_OFFSET 0x0058 | ||
| 116 | #define OMAP3430_PRM_RSTST OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0058) | ||
| 117 | #define OMAP3_PRM_VOLTCTRL_OFFSET 0x0060 | ||
| 118 | #define OMAP3430_PRM_VOLTCTRL OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0060) | ||
| 119 | #define OMAP3_PRM_SRAM_PCHARGE_OFFSET 0x0064 | ||
| 120 | #define OMAP3430_PRM_SRAM_PCHARGE OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0064) | ||
| 121 | #define OMAP3_PRM_CLKSRC_CTRL_OFFSET 0x0070 | ||
| 122 | #define OMAP3430_PRM_CLKSRC_CTRL OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0070) | ||
| 123 | #define OMAP3_PRM_VOLTSETUP1_OFFSET 0x0090 | ||
| 124 | #define OMAP3430_PRM_VOLTSETUP1 OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0090) | ||
| 125 | #define OMAP3_PRM_VOLTOFFSET_OFFSET 0x0094 | ||
| 126 | #define OMAP3430_PRM_VOLTOFFSET OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0094) | ||
| 127 | #define OMAP3_PRM_CLKSETUP_OFFSET 0x0098 | ||
| 128 | #define OMAP3430_PRM_CLKSETUP OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0098) | ||
| 129 | #define OMAP3_PRM_POLCTRL_OFFSET 0x009c | ||
| 130 | #define OMAP3430_PRM_POLCTRL OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x009c) | ||
| 131 | #define OMAP3_PRM_VOLTSETUP2_OFFSET 0x00a0 | ||
| 132 | #define OMAP3430_PRM_VOLTSETUP2 OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00a0) | ||
| 133 | #define OMAP3_PRM_VP1_CONFIG_OFFSET 0x00b0 | ||
| 134 | #define OMAP3430_PRM_VP1_CONFIG OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00b0) | ||
| 135 | #define OMAP3_PRM_VP1_VSTEPMIN_OFFSET 0x00b4 | ||
| 136 | #define OMAP3430_PRM_VP1_VSTEPMIN OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00b4) | ||
| 137 | #define OMAP3_PRM_VP1_VSTEPMAX_OFFSET 0x00b8 | ||
| 138 | #define OMAP3430_PRM_VP1_VSTEPMAX OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00b8) | ||
| 139 | #define OMAP3_PRM_VP1_VLIMITTO_OFFSET 0x00bc | ||
| 140 | #define OMAP3430_PRM_VP1_VLIMITTO OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00bc) | ||
| 141 | #define OMAP3_PRM_VP1_VOLTAGE_OFFSET 0x00c0 | ||
| 142 | #define OMAP3430_PRM_VP1_VOLTAGE OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00c0) | ||
| 143 | #define OMAP3_PRM_VP1_STATUS_OFFSET 0x00c4 | ||
| 144 | #define OMAP3430_PRM_VP1_STATUS OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00c4) | ||
| 145 | #define OMAP3_PRM_VP2_CONFIG_OFFSET 0x00d0 | ||
| 146 | #define OMAP3430_PRM_VP2_CONFIG OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00d0) | ||
| 147 | #define OMAP3_PRM_VP2_VSTEPMIN_OFFSET 0x00d4 | ||
| 148 | #define OMAP3430_PRM_VP2_VSTEPMIN OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00d4) | ||
| 149 | #define OMAP3_PRM_VP2_VSTEPMAX_OFFSET 0x00d8 | ||
| 150 | #define OMAP3430_PRM_VP2_VSTEPMAX OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00d8) | ||
| 151 | #define OMAP3_PRM_VP2_VLIMITTO_OFFSET 0x00dc | ||
| 152 | #define OMAP3430_PRM_VP2_VLIMITTO OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00dc) | ||
| 153 | #define OMAP3_PRM_VP2_VOLTAGE_OFFSET 0x00e0 | ||
| 154 | #define OMAP3430_PRM_VP2_VOLTAGE OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00e0) | ||
| 155 | #define OMAP3_PRM_VP2_STATUS_OFFSET 0x00e4 | ||
| 156 | #define OMAP3430_PRM_VP2_STATUS OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00e4) | ||
| 157 | |||
| 158 | #define OMAP3_PRM_CLKSEL_OFFSET 0x0040 | ||
| 159 | #define OMAP3430_PRM_CLKSEL OMAP34XX_PRM_REGADDR(OMAP3430_CCR_MOD, 0x0040) | ||
| 160 | #define OMAP3_PRM_CLKOUT_CTRL_OFFSET 0x0070 | ||
| 161 | #define OMAP3430_PRM_CLKOUT_CTRL OMAP34XX_PRM_REGADDR(OMAP3430_CCR_MOD, 0x0070) | ||
| 115 | 162 | ||
| 116 | /* | 163 | /* |
| 117 | * Module specific PRM registers from PRM_BASE + domain offset | 164 | * Module specific PRM registers from PRM_BASE + domain offset |
| @@ -156,9 +203,11 @@ | |||
| 156 | 203 | ||
| 157 | #define OMAP3430_PM_MPUGRPSEL 0x00a4 | 204 | #define OMAP3430_PM_MPUGRPSEL 0x00a4 |
| 158 | #define OMAP3430_PM_MPUGRPSEL1 OMAP3430_PM_MPUGRPSEL | 205 | #define OMAP3430_PM_MPUGRPSEL1 OMAP3430_PM_MPUGRPSEL |
| 206 | #define OMAP3430ES2_PM_MPUGRPSEL3 0x00f8 | ||
| 159 | 207 | ||
| 160 | #define OMAP3430_PM_IVAGRPSEL 0x00a8 | 208 | #define OMAP3430_PM_IVAGRPSEL 0x00a8 |
| 161 | #define OMAP3430_PM_IVAGRPSEL1 OMAP3430_PM_IVAGRPSEL | 209 | #define OMAP3430_PM_IVAGRPSEL1 OMAP3430_PM_IVAGRPSEL |
| 210 | #define OMAP3430ES2_PM_IVAGRPSEL3 0x00f4 | ||
| 162 | 211 | ||
| 163 | #define OMAP3430_PM_PREPWSTST 0x00e8 | 212 | #define OMAP3430_PM_PREPWSTST 0x00e8 |
| 164 | 213 | ||
diff --git a/arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h b/arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h new file mode 100644 index 000000000000..02e1c2d4705f --- /dev/null +++ b/arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h | |||
| @@ -0,0 +1,55 @@ | |||
| 1 | /* | ||
| 2 | * SDRC register values for the Micron MT46H32M32LF-6 | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008 Texas Instruments, Inc. | ||
| 5 | * Copyright (C) 2008-2009 Nokia Corporation | ||
| 6 | * | ||
| 7 | * Paul Walmsley | ||
| 8 | * | ||
| 9 | * This program is free software; you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License version 2 as | ||
| 11 | * published by the Free Software Foundation. | ||
| 12 | */ | ||
| 13 | |||
| 14 | #ifndef ARCH_ARM_MACH_OMAP2_SDRAM_MICRON_MT46H32M32LF | ||
| 15 | #define ARCH_ARM_MACH_OMAP2_SDRAM_MICRON_MT46H32M32LF | ||
| 16 | |||
| 17 | #include <mach/sdrc.h> | ||
| 18 | |||
| 19 | /* Micron MT46H32M32LF-6 */ | ||
| 20 | /* XXX Using ARE = 0x1 (no autorefresh burst) -- can this be changed? */ | ||
| 21 | static struct omap_sdrc_params mt46h32m32lf6_sdrc_params[] = { | ||
| 22 | [0] = { | ||
| 23 | .rate = 166000000, | ||
| 24 | .actim_ctrla = 0x9a9db4c6, | ||
| 25 | .actim_ctrlb = 0x00011217, | ||
| 26 | .rfr_ctrl = 0x0004dc01, | ||
| 27 | .mr = 0x00000032, | ||
| 28 | }, | ||
| 29 | [1] = { | ||
| 30 | .rate = 165941176, | ||
| 31 | .actim_ctrla = 0x9a9db4c6, | ||
| 32 | .actim_ctrlb = 0x00011217, | ||
| 33 | .rfr_ctrl = 0x0004dc01, | ||
| 34 | .mr = 0x00000032, | ||
| 35 | }, | ||
| 36 | [2] = { | ||
| 37 | .rate = 83000000, | ||
| 38 | .actim_ctrla = 0x51512283, | ||
| 39 | .actim_ctrlb = 0x0001120c, | ||
| 40 | .rfr_ctrl = 0x00025501, | ||
| 41 | .mr = 0x00000032, | ||
| 42 | }, | ||
| 43 | [3] = { | ||
| 44 | .rate = 82970588, | ||
| 45 | .actim_ctrla = 0x51512283, | ||
| 46 | .actim_ctrlb = 0x0001120c, | ||
| 47 | .rfr_ctrl = 0x00025501, | ||
| 48 | .mr = 0x00000032, | ||
| 49 | }, | ||
| 50 | [4] = { | ||
| 51 | .rate = 0 | ||
| 52 | }, | ||
| 53 | }; | ||
| 54 | |||
| 55 | #endif | ||
diff --git a/arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h b/arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h new file mode 100644 index 000000000000..3751d293cb1f --- /dev/null +++ b/arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h | |||
| @@ -0,0 +1,54 @@ | |||
| 1 | /* | ||
| 2 | * SDRC register values for the Qimonda HYB18M512160AF-6 | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008-2009 Texas Instruments, Inc. | ||
| 5 | * Copyright (C) 2008-2009 Nokia Corporation | ||
| 6 | * | ||
| 7 | * Paul Walmsley | ||
| 8 | * | ||
| 9 | * This program is free software; you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License version 2 as | ||
| 11 | * published by the Free Software Foundation. | ||
| 12 | */ | ||
| 13 | |||
| 14 | #ifndef ARCH_ARM_MACH_OMAP2_SDRAM_QIMONDA_HYB18M512160AF6 | ||
| 15 | #define ARCH_ARM_MACH_OMAP2_SDRAM_QIMONDA_HYB18M512160AF6 | ||
| 16 | |||
| 17 | #include <mach/sdrc.h> | ||
| 18 | |||
| 19 | /* Qimonda HYB18M512160AF-6 */ | ||
| 20 | static struct omap_sdrc_params hyb18m512160af6_sdrc_params[] = { | ||
| 21 | [0] = { | ||
| 22 | .rate = 166000000, | ||
| 23 | .actim_ctrla = 0x629db4c6, | ||
| 24 | .actim_ctrlb = 0x00012214, | ||
| 25 | .rfr_ctrl = 0x0004dc01, | ||
| 26 | .mr = 0x00000032, | ||
| 27 | }, | ||
| 28 | [1] = { | ||
| 29 | .rate = 165941176, | ||
| 30 | .actim_ctrla = 0x629db4c6, | ||
| 31 | .actim_ctrlb = 0x00012214, | ||
| 32 | .rfr_ctrl = 0x0004dc01, | ||
| 33 | .mr = 0x00000032, | ||
| 34 | }, | ||
| 35 | [2] = { | ||
| 36 | .rate = 83000000, | ||
| 37 | .actim_ctrla = 0x31512283, | ||
| 38 | .actim_ctrlb = 0x0001220a, | ||
| 39 | .rfr_ctrl = 0x00025501, | ||
| 40 | .mr = 0x00000022, | ||
| 41 | }, | ||
| 42 | [3] = { | ||
| 43 | .rate = 82970588, | ||
| 44 | .actim_ctrla = 0x31512283, | ||
| 45 | .actim_ctrlb = 0x0001220a, | ||
| 46 | .rfr_ctrl = 0x00025501, | ||
| 47 | .mr = 0x00000022, | ||
| 48 | }, | ||
| 49 | [4] = { | ||
| 50 | .rate = 0 | ||
| 51 | }, | ||
| 52 | }; | ||
| 53 | |||
| 54 | #endif | ||
diff --git a/arch/arm/mach-omap2/sdrc.c b/arch/arm/mach-omap2/sdrc.c index 2a30060cb4b7..2045441e8385 100644 --- a/arch/arm/mach-omap2/sdrc.c +++ b/arch/arm/mach-omap2/sdrc.c | |||
| @@ -37,6 +37,10 @@ static struct omap_sdrc_params *sdrc_init_params; | |||
| 37 | void __iomem *omap2_sdrc_base; | 37 | void __iomem *omap2_sdrc_base; |
| 38 | void __iomem *omap2_sms_base; | 38 | void __iomem *omap2_sms_base; |
| 39 | 39 | ||
| 40 | /* SDRC_POWER register bits */ | ||
| 41 | #define SDRC_POWER_EXTCLKDIS_SHIFT 3 | ||
| 42 | #define SDRC_POWER_PWDENA_SHIFT 2 | ||
| 43 | #define SDRC_POWER_PAGEPOLICY_SHIFT 0 | ||
| 40 | 44 | ||
| 41 | /** | 45 | /** |
| 42 | * omap2_sdrc_get_params - return SDRC register values for a given clock rate | 46 | * omap2_sdrc_get_params - return SDRC register values for a given clock rate |
| @@ -56,9 +60,12 @@ struct omap_sdrc_params *omap2_sdrc_get_params(unsigned long r) | |||
| 56 | { | 60 | { |
| 57 | struct omap_sdrc_params *sp; | 61 | struct omap_sdrc_params *sp; |
| 58 | 62 | ||
| 63 | if (!sdrc_init_params) | ||
| 64 | return NULL; | ||
| 65 | |||
| 59 | sp = sdrc_init_params; | 66 | sp = sdrc_init_params; |
| 60 | 67 | ||
| 61 | while (sp->rate != r) | 68 | while (sp->rate && sp->rate != r) |
| 62 | sp++; | 69 | sp++; |
| 63 | 70 | ||
| 64 | if (!sp->rate) | 71 | if (!sp->rate) |
| @@ -74,7 +81,14 @@ void __init omap2_set_globals_sdrc(struct omap_globals *omap2_globals) | |||
| 74 | omap2_sms_base = omap2_globals->sms; | 81 | omap2_sms_base = omap2_globals->sms; |
| 75 | } | 82 | } |
| 76 | 83 | ||
| 77 | /* turn on smart idle modes for SDRAM scheduler and controller */ | 84 | /** |
| 85 | * omap2_sdrc_init - initialize SMS, SDRC devices on boot | ||
| 86 | * @sp: pointer to a null-terminated list of struct omap_sdrc_params | ||
| 87 | * | ||
| 88 | * Turn on smart idle modes for SDRAM scheduler and controller. | ||
| 89 | * Program a known-good configuration for the SDRC to deal with buggy | ||
| 90 | * bootloaders. | ||
| 91 | */ | ||
| 78 | void __init omap2_sdrc_init(struct omap_sdrc_params *sp) | 92 | void __init omap2_sdrc_init(struct omap_sdrc_params *sp) |
| 79 | { | 93 | { |
| 80 | u32 l; | 94 | u32 l; |
| @@ -90,4 +104,10 @@ void __init omap2_sdrc_init(struct omap_sdrc_params *sp) | |||
| 90 | sdrc_write_reg(l, SDRC_SYSCONFIG); | 104 | sdrc_write_reg(l, SDRC_SYSCONFIG); |
| 91 | 105 | ||
| 92 | sdrc_init_params = sp; | 106 | sdrc_init_params = sp; |
| 107 | |||
| 108 | /* XXX Enable SRFRONIDLEREQ here also? */ | ||
| 109 | l = (1 << SDRC_POWER_EXTCLKDIS_SHIFT) | | ||
| 110 | (1 << SDRC_POWER_PWDENA_SHIFT) | | ||
| 111 | (1 << SDRC_POWER_PAGEPOLICY_SHIFT); | ||
| 112 | sdrc_write_reg(l, SDRC_POWER); | ||
| 93 | } | 113 | } |
diff --git a/arch/arm/mach-omap2/sdrc2xxx.c b/arch/arm/mach-omap2/sdrc2xxx.c index 0afdad5ae9fb..feaec7eaf6bd 100644 --- a/arch/arm/mach-omap2/sdrc2xxx.c +++ b/arch/arm/mach-omap2/sdrc2xxx.c | |||
| @@ -99,7 +99,10 @@ u32 omap2xxx_sdrc_reprogram(u32 level, u32 force) | |||
| 99 | m_type = omap2xxx_sdrc_get_type(); | 99 | m_type = omap2xxx_sdrc_get_type(); |
| 100 | 100 | ||
| 101 | local_irq_save(flags); | 101 | local_irq_save(flags); |
| 102 | __raw_writel(0xffff, OMAP24XX_PRCM_VOLTSETUP); | 102 | if (cpu_is_omap2420()) |
| 103 | __raw_writel(0xffff, OMAP2420_PRCM_VOLTSETUP); | ||
| 104 | else | ||
| 105 | __raw_writel(0xffff, OMAP2430_PRCM_VOLTSETUP); | ||
| 103 | omap2_sram_reprogram_sdrc(level, dll_ctrl, m_type); | 106 | omap2_sram_reprogram_sdrc(level, dll_ctrl, m_type); |
| 104 | curr_perf_level = level; | 107 | curr_perf_level = level; |
| 105 | local_irq_restore(flags); | 108 | local_irq_restore(flags); |
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 4dcf39c285b9..b094c15bfe47 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c | |||
| @@ -6,8 +6,13 @@ | |||
| 6 | * Copyright (C) 2005-2008 Nokia Corporation | 6 | * Copyright (C) 2005-2008 Nokia Corporation |
| 7 | * Author: Paul Mundt <paul.mundt@nokia.com> | 7 | * Author: Paul Mundt <paul.mundt@nokia.com> |
| 8 | * | 8 | * |
| 9 | * Major rework for PM support by Kevin Hilman | ||
| 10 | * | ||
| 9 | * Based off of arch/arm/mach-omap/omap1/serial.c | 11 | * Based off of arch/arm/mach-omap/omap1/serial.c |
| 10 | * | 12 | * |
| 13 | * Copyright (C) 2009 Texas Instruments | ||
| 14 | * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com | ||
| 15 | * | ||
| 11 | * This file is subject to the terms and conditions of the GNU General Public | 16 | * This file is subject to the terms and conditions of the GNU General Public |
| 12 | * License. See the file "COPYING" in the main directory of this archive | 17 | * License. See the file "COPYING" in the main directory of this archive |
| 13 | * for more details. | 18 | * for more details. |
| @@ -21,9 +26,50 @@ | |||
| 21 | 26 | ||
| 22 | #include <mach/common.h> | 27 | #include <mach/common.h> |
| 23 | #include <mach/board.h> | 28 | #include <mach/board.h> |
| 29 | #include <mach/clock.h> | ||
| 30 | #include <mach/control.h> | ||
| 31 | |||
| 32 | #include "prm.h" | ||
| 33 | #include "pm.h" | ||
| 34 | #include "prm-regbits-34xx.h" | ||
| 35 | |||
| 36 | #define UART_OMAP_WER 0x17 /* Wake-up enable register */ | ||
| 37 | |||
| 38 | #define DEFAULT_TIMEOUT (5 * HZ) | ||
| 24 | 39 | ||
| 25 | static struct clk *uart_ick[OMAP_MAX_NR_PORTS]; | 40 | struct omap_uart_state { |
| 26 | static struct clk *uart_fck[OMAP_MAX_NR_PORTS]; | 41 | int num; |
| 42 | int can_sleep; | ||
| 43 | struct timer_list timer; | ||
| 44 | u32 timeout; | ||
| 45 | |||
| 46 | void __iomem *wk_st; | ||
| 47 | void __iomem *wk_en; | ||
| 48 | u32 wk_mask; | ||
| 49 | u32 padconf; | ||
| 50 | |||
| 51 | struct clk *ick; | ||
| 52 | struct clk *fck; | ||
| 53 | int clocked; | ||
| 54 | |||
| 55 | struct plat_serial8250_port *p; | ||
| 56 | struct list_head node; | ||
| 57 | |||
| 58 | #if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM) | ||
| 59 | int context_valid; | ||
| 60 | |||
| 61 | /* Registers to be saved/restored for OFF-mode */ | ||
| 62 | u16 dll; | ||
| 63 | u16 dlh; | ||
| 64 | u16 ier; | ||
| 65 | u16 sysc; | ||
| 66 | u16 scr; | ||
| 67 | u16 wer; | ||
| 68 | #endif | ||
| 69 | }; | ||
| 70 | |||
| 71 | static struct omap_uart_state omap_uart[OMAP_MAX_NR_PORTS]; | ||
| 72 | static LIST_HEAD(uart_list); | ||
| 27 | 73 | ||
| 28 | static struct plat_serial8250_port serial_platform_data[] = { | 74 | static struct plat_serial8250_port serial_platform_data[] = { |
| 29 | { | 75 | { |
| @@ -74,33 +120,369 @@ static inline void serial_write_reg(struct plat_serial8250_port *p, int offset, | |||
| 74 | * properly. Note that the TX watermark initialization may not be needed | 120 | * properly. Note that the TX watermark initialization may not be needed |
| 75 | * once the 8250.c watermark handling code is merged. | 121 | * once the 8250.c watermark handling code is merged. |
| 76 | */ | 122 | */ |
| 77 | static inline void __init omap_serial_reset(struct plat_serial8250_port *p) | 123 | static inline void __init omap_uart_reset(struct omap_uart_state *uart) |
| 78 | { | 124 | { |
| 125 | struct plat_serial8250_port *p = uart->p; | ||
| 126 | |||
| 79 | serial_write_reg(p, UART_OMAP_MDR1, 0x07); | 127 | serial_write_reg(p, UART_OMAP_MDR1, 0x07); |
| 80 | serial_write_reg(p, UART_OMAP_SCR, 0x08); | 128 | serial_write_reg(p, UART_OMAP_SCR, 0x08); |
| 81 | serial_write_reg(p, UART_OMAP_MDR1, 0x00); | 129 | serial_write_reg(p, UART_OMAP_MDR1, 0x00); |
| 82 | serial_write_reg(p, UART_OMAP_SYSC, (0x02 << 3) | (1 << 2) | (1 << 0)); | 130 | serial_write_reg(p, UART_OMAP_SYSC, (0x02 << 3) | (1 << 2) | (1 << 0)); |
| 83 | } | 131 | } |
| 84 | 132 | ||
| 85 | void omap_serial_enable_clocks(int enable) | 133 | #if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP3) |
| 134 | |||
| 135 | static int enable_off_mode; /* to be removed by full off-mode patches */ | ||
| 136 | |||
| 137 | static void omap_uart_save_context(struct omap_uart_state *uart) | ||
| 86 | { | 138 | { |
| 87 | int i; | 139 | u16 lcr = 0; |
| 88 | for (i = 0; i < OMAP_MAX_NR_PORTS; i++) { | 140 | struct plat_serial8250_port *p = uart->p; |
| 89 | if (uart_ick[i] && uart_fck[i]) { | 141 | |
| 90 | if (enable) { | 142 | if (!enable_off_mode) |
| 91 | clk_enable(uart_ick[i]); | 143 | return; |
| 92 | clk_enable(uart_fck[i]); | 144 | |
| 93 | } else { | 145 | lcr = serial_read_reg(p, UART_LCR); |
| 94 | clk_disable(uart_ick[i]); | 146 | serial_write_reg(p, UART_LCR, 0xBF); |
| 95 | clk_disable(uart_fck[i]); | 147 | uart->dll = serial_read_reg(p, UART_DLL); |
| 148 | uart->dlh = serial_read_reg(p, UART_DLM); | ||
| 149 | serial_write_reg(p, UART_LCR, lcr); | ||
| 150 | uart->ier = serial_read_reg(p, UART_IER); | ||
| 151 | uart->sysc = serial_read_reg(p, UART_OMAP_SYSC); | ||
| 152 | uart->scr = serial_read_reg(p, UART_OMAP_SCR); | ||
| 153 | uart->wer = serial_read_reg(p, UART_OMAP_WER); | ||
| 154 | |||
| 155 | uart->context_valid = 1; | ||
| 156 | } | ||
| 157 | |||
| 158 | static void omap_uart_restore_context(struct omap_uart_state *uart) | ||
| 159 | { | ||
| 160 | u16 efr = 0; | ||
| 161 | struct plat_serial8250_port *p = uart->p; | ||
| 162 | |||
| 163 | if (!enable_off_mode) | ||
| 164 | return; | ||
| 165 | |||
| 166 | if (!uart->context_valid) | ||
| 167 | return; | ||
| 168 | |||
| 169 | uart->context_valid = 0; | ||
| 170 | |||
| 171 | serial_write_reg(p, UART_OMAP_MDR1, 0x7); | ||
| 172 | serial_write_reg(p, UART_LCR, 0xBF); /* Config B mode */ | ||
| 173 | efr = serial_read_reg(p, UART_EFR); | ||
| 174 | serial_write_reg(p, UART_EFR, UART_EFR_ECB); | ||
| 175 | serial_write_reg(p, UART_LCR, 0x0); /* Operational mode */ | ||
| 176 | serial_write_reg(p, UART_IER, 0x0); | ||
| 177 | serial_write_reg(p, UART_LCR, 0xBF); /* Config B mode */ | ||
| 178 | serial_write_reg(p, UART_DLL, uart->dll); | ||
| 179 | serial_write_reg(p, UART_DLM, uart->dlh); | ||
| 180 | serial_write_reg(p, UART_LCR, 0x0); /* Operational mode */ | ||
| 181 | serial_write_reg(p, UART_IER, uart->ier); | ||
| 182 | serial_write_reg(p, UART_FCR, 0xA1); | ||
| 183 | serial_write_reg(p, UART_LCR, 0xBF); /* Config B mode */ | ||
| 184 | serial_write_reg(p, UART_EFR, efr); | ||
| 185 | serial_write_reg(p, UART_LCR, UART_LCR_WLEN8); | ||
| 186 | serial_write_reg(p, UART_OMAP_SCR, uart->scr); | ||
| 187 | serial_write_reg(p, UART_OMAP_WER, uart->wer); | ||
| 188 | serial_write_reg(p, UART_OMAP_SYSC, uart->sysc); | ||
| 189 | serial_write_reg(p, UART_OMAP_MDR1, 0x00); /* UART 16x mode */ | ||
| 190 | } | ||
| 191 | #else | ||
| 192 | static inline void omap_uart_save_context(struct omap_uart_state *uart) {} | ||
| 193 | static inline void omap_uart_restore_context(struct omap_uart_state *uart) {} | ||
| 194 | #endif /* CONFIG_PM && CONFIG_ARCH_OMAP3 */ | ||
| 195 | |||
| 196 | static inline void omap_uart_enable_clocks(struct omap_uart_state *uart) | ||
| 197 | { | ||
| 198 | if (uart->clocked) | ||
| 199 | return; | ||
| 200 | |||
| 201 | clk_enable(uart->ick); | ||
| 202 | clk_enable(uart->fck); | ||
| 203 | uart->clocked = 1; | ||
| 204 | omap_uart_restore_context(uart); | ||
| 205 | } | ||
| 206 | |||
| 207 | #ifdef CONFIG_PM | ||
| 208 | |||
| 209 | static inline void omap_uart_disable_clocks(struct omap_uart_state *uart) | ||
| 210 | { | ||
| 211 | if (!uart->clocked) | ||
| 212 | return; | ||
| 213 | |||
| 214 | omap_uart_save_context(uart); | ||
| 215 | uart->clocked = 0; | ||
| 216 | clk_disable(uart->ick); | ||
| 217 | clk_disable(uart->fck); | ||
| 218 | } | ||
| 219 | |||
| 220 | static void omap_uart_smart_idle_enable(struct omap_uart_state *uart, | ||
| 221 | int enable) | ||
| 222 | { | ||
| 223 | struct plat_serial8250_port *p = uart->p; | ||
| 224 | u16 sysc; | ||
| 225 | |||
| 226 | sysc = serial_read_reg(p, UART_OMAP_SYSC) & 0x7; | ||
| 227 | if (enable) | ||
| 228 | sysc |= 0x2 << 3; | ||
| 229 | else | ||
| 230 | sysc |= 0x1 << 3; | ||
| 231 | |||
| 232 | serial_write_reg(p, UART_OMAP_SYSC, sysc); | ||
| 233 | } | ||
| 234 | |||
| 235 | static void omap_uart_block_sleep(struct omap_uart_state *uart) | ||
| 236 | { | ||
| 237 | omap_uart_enable_clocks(uart); | ||
| 238 | |||
| 239 | omap_uart_smart_idle_enable(uart, 0); | ||
| 240 | uart->can_sleep = 0; | ||
| 241 | if (uart->timeout) | ||
| 242 | mod_timer(&uart->timer, jiffies + uart->timeout); | ||
| 243 | else | ||
| 244 | del_timer(&uart->timer); | ||
| 245 | } | ||
| 246 | |||
| 247 | static void omap_uart_allow_sleep(struct omap_uart_state *uart) | ||
| 248 | { | ||
| 249 | if (!uart->clocked) | ||
| 250 | return; | ||
| 251 | |||
| 252 | omap_uart_smart_idle_enable(uart, 1); | ||
| 253 | uart->can_sleep = 1; | ||
| 254 | del_timer(&uart->timer); | ||
| 255 | } | ||
| 256 | |||
| 257 | static void omap_uart_idle_timer(unsigned long data) | ||
| 258 | { | ||
| 259 | struct omap_uart_state *uart = (struct omap_uart_state *)data; | ||
| 260 | |||
| 261 | omap_uart_allow_sleep(uart); | ||
| 262 | } | ||
| 263 | |||
| 264 | void omap_uart_prepare_idle(int num) | ||
| 265 | { | ||
| 266 | struct omap_uart_state *uart; | ||
| 267 | |||
| 268 | list_for_each_entry(uart, &uart_list, node) { | ||
| 269 | if (num == uart->num && uart->can_sleep) { | ||
| 270 | omap_uart_disable_clocks(uart); | ||
| 271 | return; | ||
| 272 | } | ||
| 273 | } | ||
| 274 | } | ||
| 275 | |||
| 276 | void omap_uart_resume_idle(int num) | ||
| 277 | { | ||
| 278 | struct omap_uart_state *uart; | ||
| 279 | |||
| 280 | list_for_each_entry(uart, &uart_list, node) { | ||
| 281 | if (num == uart->num) { | ||
| 282 | omap_uart_enable_clocks(uart); | ||
| 283 | |||
| 284 | /* Check for IO pad wakeup */ | ||
| 285 | if (cpu_is_omap34xx() && uart->padconf) { | ||
| 286 | u16 p = omap_ctrl_readw(uart->padconf); | ||
| 287 | |||
| 288 | if (p & OMAP3_PADCONF_WAKEUPEVENT0) | ||
| 289 | omap_uart_block_sleep(uart); | ||
| 96 | } | 290 | } |
| 291 | |||
| 292 | /* Check for normal UART wakeup */ | ||
| 293 | if (__raw_readl(uart->wk_st) & uart->wk_mask) | ||
| 294 | omap_uart_block_sleep(uart); | ||
| 295 | |||
| 296 | return; | ||
| 97 | } | 297 | } |
| 98 | } | 298 | } |
| 99 | } | 299 | } |
| 100 | 300 | ||
| 301 | void omap_uart_prepare_suspend(void) | ||
| 302 | { | ||
| 303 | struct omap_uart_state *uart; | ||
| 304 | |||
| 305 | list_for_each_entry(uart, &uart_list, node) { | ||
| 306 | omap_uart_allow_sleep(uart); | ||
| 307 | } | ||
| 308 | } | ||
| 309 | |||
| 310 | int omap_uart_can_sleep(void) | ||
| 311 | { | ||
| 312 | struct omap_uart_state *uart; | ||
| 313 | int can_sleep = 1; | ||
| 314 | |||
| 315 | list_for_each_entry(uart, &uart_list, node) { | ||
| 316 | if (!uart->clocked) | ||
| 317 | continue; | ||
| 318 | |||
| 319 | if (!uart->can_sleep) { | ||
| 320 | can_sleep = 0; | ||
| 321 | continue; | ||
| 322 | } | ||
| 323 | |||
| 324 | /* This UART can now safely sleep. */ | ||
| 325 | omap_uart_allow_sleep(uart); | ||
| 326 | } | ||
| 327 | |||
| 328 | return can_sleep; | ||
| 329 | } | ||
| 330 | |||
| 331 | /** | ||
| 332 | * omap_uart_interrupt() | ||
| 333 | * | ||
| 334 | * This handler is used only to detect that *any* UART interrupt has | ||
| 335 | * occurred. It does _nothing_ to handle the interrupt. Rather, | ||
| 336 | * any UART interrupt will trigger the inactivity timer so the | ||
| 337 | * UART will not idle or sleep for its timeout period. | ||
| 338 | * | ||
| 339 | **/ | ||
| 340 | static irqreturn_t omap_uart_interrupt(int irq, void *dev_id) | ||
| 341 | { | ||
| 342 | struct omap_uart_state *uart = dev_id; | ||
| 343 | |||
| 344 | omap_uart_block_sleep(uart); | ||
| 345 | |||
| 346 | return IRQ_NONE; | ||
| 347 | } | ||
| 348 | |||
| 349 | static u32 sleep_timeout = DEFAULT_TIMEOUT; | ||
| 350 | |||
| 351 | static void omap_uart_idle_init(struct omap_uart_state *uart) | ||
| 352 | { | ||
| 353 | u32 v; | ||
| 354 | struct plat_serial8250_port *p = uart->p; | ||
| 355 | int ret; | ||
| 356 | |||
| 357 | uart->can_sleep = 0; | ||
| 358 | uart->timeout = sleep_timeout; | ||
| 359 | setup_timer(&uart->timer, omap_uart_idle_timer, | ||
| 360 | (unsigned long) uart); | ||
| 361 | mod_timer(&uart->timer, jiffies + uart->timeout); | ||
| 362 | omap_uart_smart_idle_enable(uart, 0); | ||
| 363 | |||
| 364 | if (cpu_is_omap34xx()) { | ||
| 365 | u32 mod = (uart->num == 2) ? OMAP3430_PER_MOD : CORE_MOD; | ||
| 366 | u32 wk_mask = 0; | ||
| 367 | u32 padconf = 0; | ||
| 368 | |||
| 369 | uart->wk_en = OMAP34XX_PRM_REGADDR(mod, PM_WKEN1); | ||
| 370 | uart->wk_st = OMAP34XX_PRM_REGADDR(mod, PM_WKST1); | ||
| 371 | switch (uart->num) { | ||
| 372 | case 0: | ||
| 373 | wk_mask = OMAP3430_ST_UART1_MASK; | ||
| 374 | padconf = 0x182; | ||
| 375 | break; | ||
| 376 | case 1: | ||
| 377 | wk_mask = OMAP3430_ST_UART2_MASK; | ||
| 378 | padconf = 0x17a; | ||
| 379 | break; | ||
| 380 | case 2: | ||
| 381 | wk_mask = OMAP3430_ST_UART3_MASK; | ||
| 382 | padconf = 0x19e; | ||
| 383 | break; | ||
| 384 | } | ||
| 385 | uart->wk_mask = wk_mask; | ||
| 386 | uart->padconf = padconf; | ||
| 387 | } else if (cpu_is_omap24xx()) { | ||
| 388 | u32 wk_mask = 0; | ||
| 389 | |||
| 390 | if (cpu_is_omap2430()) { | ||
| 391 | uart->wk_en = OMAP2430_PRM_REGADDR(CORE_MOD, PM_WKEN1); | ||
| 392 | uart->wk_st = OMAP2430_PRM_REGADDR(CORE_MOD, PM_WKST1); | ||
| 393 | } else if (cpu_is_omap2420()) { | ||
| 394 | uart->wk_en = OMAP2420_PRM_REGADDR(CORE_MOD, PM_WKEN1); | ||
| 395 | uart->wk_st = OMAP2420_PRM_REGADDR(CORE_MOD, PM_WKST1); | ||
| 396 | } | ||
| 397 | switch (uart->num) { | ||
| 398 | case 0: | ||
| 399 | wk_mask = OMAP24XX_ST_UART1_MASK; | ||
| 400 | break; | ||
| 401 | case 1: | ||
| 402 | wk_mask = OMAP24XX_ST_UART2_MASK; | ||
| 403 | break; | ||
| 404 | case 2: | ||
| 405 | wk_mask = OMAP24XX_ST_UART3_MASK; | ||
| 406 | break; | ||
| 407 | } | ||
| 408 | uart->wk_mask = wk_mask; | ||
| 409 | } else { | ||
| 410 | uart->wk_en = 0; | ||
| 411 | uart->wk_st = 0; | ||
| 412 | uart->wk_mask = 0; | ||
| 413 | uart->padconf = 0; | ||
| 414 | } | ||
| 415 | |||
| 416 | /* Set wake-enable bit */ | ||
| 417 | if (uart->wk_en && uart->wk_mask) { | ||
| 418 | v = __raw_readl(uart->wk_en); | ||
| 419 | v |= uart->wk_mask; | ||
| 420 | __raw_writel(v, uart->wk_en); | ||
| 421 | } | ||
| 422 | |||
| 423 | /* Ensure IOPAD wake-enables are set */ | ||
| 424 | if (cpu_is_omap34xx() && uart->padconf) { | ||
| 425 | u16 v; | ||
| 426 | |||
| 427 | v = omap_ctrl_readw(uart->padconf); | ||
| 428 | v |= OMAP3_PADCONF_WAKEUPENABLE0; | ||
| 429 | omap_ctrl_writew(v, uart->padconf); | ||
| 430 | } | ||
| 431 | |||
| 432 | p->flags |= UPF_SHARE_IRQ; | ||
| 433 | ret = request_irq(p->irq, omap_uart_interrupt, IRQF_SHARED, | ||
| 434 | "serial idle", (void *)uart); | ||
| 435 | WARN_ON(ret); | ||
| 436 | } | ||
| 437 | |||
| 438 | static ssize_t sleep_timeout_show(struct kobject *kobj, | ||
| 439 | struct kobj_attribute *attr, | ||
| 440 | char *buf) | ||
| 441 | { | ||
| 442 | return sprintf(buf, "%u\n", sleep_timeout / HZ); | ||
| 443 | } | ||
| 444 | |||
| 445 | static ssize_t sleep_timeout_store(struct kobject *kobj, | ||
| 446 | struct kobj_attribute *attr, | ||
| 447 | const char *buf, size_t n) | ||
| 448 | { | ||
| 449 | struct omap_uart_state *uart; | ||
| 450 | unsigned int value; | ||
| 451 | |||
| 452 | if (sscanf(buf, "%u", &value) != 1) { | ||
| 453 | printk(KERN_ERR "sleep_timeout_store: Invalid value\n"); | ||
| 454 | return -EINVAL; | ||
| 455 | } | ||
| 456 | sleep_timeout = value * HZ; | ||
| 457 | list_for_each_entry(uart, &uart_list, node) { | ||
| 458 | uart->timeout = sleep_timeout; | ||
| 459 | if (uart->timeout) | ||
| 460 | mod_timer(&uart->timer, jiffies + uart->timeout); | ||
| 461 | else | ||
| 462 | /* A zero value means disable timeout feature */ | ||
| 463 | omap_uart_block_sleep(uart); | ||
| 464 | } | ||
| 465 | return n; | ||
| 466 | } | ||
| 467 | |||
| 468 | static struct kobj_attribute sleep_timeout_attr = | ||
| 469 | __ATTR(sleep_timeout, 0644, sleep_timeout_show, sleep_timeout_store); | ||
| 470 | |||
| 471 | #else | ||
| 472 | static inline void omap_uart_idle_init(struct omap_uart_state *uart) {} | ||
| 473 | #endif /* CONFIG_PM */ | ||
| 474 | |||
| 475 | static struct platform_device serial_device = { | ||
| 476 | .name = "serial8250", | ||
| 477 | .id = PLAT8250_DEV_PLATFORM, | ||
| 478 | .dev = { | ||
| 479 | .platform_data = serial_platform_data, | ||
| 480 | }, | ||
| 481 | }; | ||
| 482 | |||
| 101 | void __init omap_serial_init(void) | 483 | void __init omap_serial_init(void) |
| 102 | { | 484 | { |
| 103 | int i; | 485 | int i, err; |
| 104 | const struct omap_uart_config *info; | 486 | const struct omap_uart_config *info; |
| 105 | char name[16]; | 487 | char name[16]; |
| 106 | 488 | ||
| @@ -114,9 +496,14 @@ void __init omap_serial_init(void) | |||
| 114 | 496 | ||
| 115 | if (info == NULL) | 497 | if (info == NULL) |
| 116 | return; | 498 | return; |
| 499 | if (cpu_is_omap44xx()) { | ||
| 500 | for (i = 0; i < OMAP_MAX_NR_PORTS; i++) | ||
| 501 | serial_platform_data[i].irq += 32; | ||
| 502 | } | ||
| 117 | 503 | ||
| 118 | for (i = 0; i < OMAP_MAX_NR_PORTS; i++) { | 504 | for (i = 0; i < OMAP_MAX_NR_PORTS; i++) { |
| 119 | struct plat_serial8250_port *p = serial_platform_data + i; | 505 | struct plat_serial8250_port *p = serial_platform_data + i; |
| 506 | struct omap_uart_state *uart = &omap_uart[i]; | ||
| 120 | 507 | ||
| 121 | if (!(info->enabled_uarts & (1 << i))) { | 508 | if (!(info->enabled_uarts & (1 << i))) { |
| 122 | p->membase = NULL; | 509 | p->membase = NULL; |
| @@ -125,35 +512,39 @@ void __init omap_serial_init(void) | |||
| 125 | } | 512 | } |
| 126 | 513 | ||
| 127 | sprintf(name, "uart%d_ick", i+1); | 514 | sprintf(name, "uart%d_ick", i+1); |
| 128 | uart_ick[i] = clk_get(NULL, name); | 515 | uart->ick = clk_get(NULL, name); |
| 129 | if (IS_ERR(uart_ick[i])) { | 516 | if (IS_ERR(uart->ick)) { |
| 130 | printk(KERN_ERR "Could not get uart%d_ick\n", i+1); | 517 | printk(KERN_ERR "Could not get uart%d_ick\n", i+1); |
| 131 | uart_ick[i] = NULL; | 518 | uart->ick = NULL; |
| 132 | } else | 519 | } |
| 133 | clk_enable(uart_ick[i]); | ||
| 134 | 520 | ||
| 135 | sprintf(name, "uart%d_fck", i+1); | 521 | sprintf(name, "uart%d_fck", i+1); |
| 136 | uart_fck[i] = clk_get(NULL, name); | 522 | uart->fck = clk_get(NULL, name); |
| 137 | if (IS_ERR(uart_fck[i])) { | 523 | if (IS_ERR(uart->fck)) { |
| 138 | printk(KERN_ERR "Could not get uart%d_fck\n", i+1); | 524 | printk(KERN_ERR "Could not get uart%d_fck\n", i+1); |
| 139 | uart_fck[i] = NULL; | 525 | uart->fck = NULL; |
| 140 | } else | 526 | } |
| 141 | clk_enable(uart_fck[i]); | ||
| 142 | 527 | ||
| 143 | omap_serial_reset(p); | 528 | if (!uart->ick || !uart->fck) |
| 529 | continue; | ||
| 530 | |||
| 531 | uart->num = i; | ||
| 532 | p->private_data = uart; | ||
| 533 | uart->p = p; | ||
| 534 | list_add(&uart->node, &uart_list); | ||
| 535 | |||
| 536 | omap_uart_enable_clocks(uart); | ||
| 537 | omap_uart_reset(uart); | ||
| 538 | omap_uart_idle_init(uart); | ||
| 144 | } | 539 | } |
| 145 | } | ||
| 146 | 540 | ||
| 147 | static struct platform_device serial_device = { | 541 | err = platform_device_register(&serial_device); |
| 148 | .name = "serial8250", | 542 | |
| 149 | .id = PLAT8250_DEV_PLATFORM, | 543 | #ifdef CONFIG_PM |
| 150 | .dev = { | 544 | if (!err) |
| 151 | .platform_data = serial_platform_data, | 545 | err = sysfs_create_file(&serial_device.dev.kobj, |
| 152 | }, | 546 | &sleep_timeout_attr.attr); |
| 153 | }; | 547 | #endif |
| 154 | 548 | ||
| 155 | static int __init omap_init(void) | ||
| 156 | { | ||
| 157 | return platform_device_register(&serial_device); | ||
| 158 | } | 549 | } |
| 159 | arch_initcall(omap_init); | 550 | |
diff --git a/arch/arm/mach-omap2/sleep24xx.S b/arch/arm/mach-omap2/sleep24xx.S index bf9e96105e11..130aadbfa083 100644 --- a/arch/arm/mach-omap2/sleep24xx.S +++ b/arch/arm/mach-omap2/sleep24xx.S | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <linux/linkage.h> | 28 | #include <linux/linkage.h> |
| 29 | #include <asm/assembler.h> | 29 | #include <asm/assembler.h> |
| 30 | #include <mach/io.h> | 30 | #include <mach/io.h> |
| 31 | #include <mach/pm.h> | ||
| 32 | 31 | ||
| 33 | #include <mach/omap24xx.h> | 32 | #include <mach/omap24xx.h> |
| 34 | 33 | ||
diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S new file mode 100644 index 000000000000..e5e2553e79a6 --- /dev/null +++ b/arch/arm/mach-omap2/sleep34xx.S | |||
| @@ -0,0 +1,436 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-omap2/sleep.S | ||
| 3 | * | ||
| 4 | * (C) Copyright 2007 | ||
| 5 | * Texas Instruments | ||
| 6 | * Karthik Dasu <karthik-dp@ti.com> | ||
| 7 | * | ||
| 8 | * (C) Copyright 2004 | ||
| 9 | * Texas Instruments, <www.ti.com> | ||
| 10 | * Richard Woodruff <r-woodruff2@ti.com> | ||
| 11 | * | ||
| 12 | * This program is free software; you can redistribute it and/or | ||
| 13 | * modify it under the terms of the GNU General Public License as | ||
| 14 | * published by the Free Software Foundation; either version 2 of | ||
| 15 | * the License, or (at your option) any later version. | ||
| 16 | * | ||
| 17 | * This program is distributed in the hope that it will be useful, | ||
| 18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR /PURPOSE. See the | ||
| 20 | * GNU General Public License for more details. | ||
| 21 | * | ||
| 22 | * You should have received a copy of the GNU General Public License | ||
| 23 | * along with this program; if not, write to the Free Software | ||
| 24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | ||
| 25 | * MA 02111-1307 USA | ||
| 26 | */ | ||
| 27 | #include <linux/linkage.h> | ||
| 28 | #include <asm/assembler.h> | ||
| 29 | #include <mach/io.h> | ||
| 30 | #include <mach/control.h> | ||
| 31 | |||
| 32 | #include "prm.h" | ||
| 33 | #include "sdrc.h" | ||
| 34 | |||
| 35 | #define PM_PREPWSTST_CORE_V OMAP34XX_PRM_REGADDR(CORE_MOD, \ | ||
| 36 | OMAP3430_PM_PREPWSTST) | ||
| 37 | #define PM_PREPWSTST_MPU_V OMAP34XX_PRM_REGADDR(MPU_MOD, \ | ||
| 38 | OMAP3430_PM_PREPWSTST) | ||
| 39 | #define PM_PWSTCTRL_MPU_P OMAP34XX_PRM_REGADDR(MPU_MOD, PM_PWSTCTRL) | ||
| 40 | #define SCRATCHPAD_MEM_OFFS 0x310 /* Move this as correct place is | ||
| 41 | * available */ | ||
| 42 | #define SCRATCHPAD_BASE_P OMAP343X_CTRL_REGADDR(\ | ||
| 43 | OMAP343X_CONTROL_MEM_WKUP +\ | ||
| 44 | SCRATCHPAD_MEM_OFFS) | ||
| 45 | #define SDRC_POWER_V OMAP34XX_SDRC_REGADDR(SDRC_POWER) | ||
| 46 | |||
| 47 | .text | ||
| 48 | /* Function call to get the restore pointer for resume from OFF */ | ||
| 49 | ENTRY(get_restore_pointer) | ||
| 50 | stmfd sp!, {lr} @ save registers on stack | ||
| 51 | adr r0, restore | ||
| 52 | ldmfd sp!, {pc} @ restore regs and return | ||
| 53 | ENTRY(get_restore_pointer_sz) | ||
| 54 | .word . - get_restore_pointer_sz | ||
| 55 | /* | ||
| 56 | * Forces OMAP into idle state | ||
| 57 | * | ||
| 58 | * omap34xx_suspend() - This bit of code just executes the WFI | ||
| 59 | * for normal idles. | ||
| 60 | * | ||
| 61 | * Note: This code get's copied to internal SRAM at boot. When the OMAP | ||
| 62 | * wakes up it continues execution at the point it went to sleep. | ||
| 63 | */ | ||
| 64 | ENTRY(omap34xx_cpu_suspend) | ||
| 65 | stmfd sp!, {r0-r12, lr} @ save registers on stack | ||
| 66 | loop: | ||
| 67 | /*b loop*/ @Enable to debug by stepping through code | ||
| 68 | /* r0 contains restore pointer in sdram */ | ||
| 69 | /* r1 contains information about saving context */ | ||
| 70 | ldr r4, sdrc_power @ read the SDRC_POWER register | ||
| 71 | ldr r5, [r4] @ read the contents of SDRC_POWER | ||
| 72 | orr r5, r5, #0x40 @ enable self refresh on idle req | ||
| 73 | str r5, [r4] @ write back to SDRC_POWER register | ||
| 74 | |||
| 75 | cmp r1, #0x0 | ||
| 76 | /* If context save is required, do that and execute wfi */ | ||
| 77 | bne save_context_wfi | ||
| 78 | /* Data memory barrier and Data sync barrier */ | ||
| 79 | mov r1, #0 | ||
| 80 | mcr p15, 0, r1, c7, c10, 4 | ||
| 81 | mcr p15, 0, r1, c7, c10, 5 | ||
| 82 | |||
| 83 | wfi @ wait for interrupt | ||
| 84 | |||
| 85 | nop | ||
| 86 | nop | ||
| 87 | nop | ||
| 88 | nop | ||
| 89 | nop | ||
| 90 | nop | ||
| 91 | nop | ||
| 92 | nop | ||
| 93 | nop | ||
| 94 | nop | ||
| 95 | bl i_dll_wait | ||
| 96 | |||
| 97 | ldmfd sp!, {r0-r12, pc} @ restore regs and return | ||
| 98 | restore: | ||
| 99 | /* b restore*/ @ Enable to debug restore code | ||
| 100 | /* Check what was the reason for mpu reset and store the reason in r9*/ | ||
| 101 | /* 1 - Only L1 and logic lost */ | ||
| 102 | /* 2 - Only L2 lost - In this case, we wont be here */ | ||
| 103 | /* 3 - Both L1 and L2 lost */ | ||
| 104 | ldr r1, pm_pwstctrl_mpu | ||
| 105 | ldr r2, [r1] | ||
| 106 | and r2, r2, #0x3 | ||
| 107 | cmp r2, #0x0 @ Check if target power state was OFF or RET | ||
| 108 | moveq r9, #0x3 @ MPU OFF => L1 and L2 lost | ||
| 109 | movne r9, #0x1 @ Only L1 and L2 lost => avoid L2 invalidation | ||
| 110 | bne logic_l1_restore | ||
| 111 | /* Execute smi to invalidate L2 cache */ | ||
| 112 | mov r12, #0x1 @ set up to invalide L2 | ||
| 113 | smi: .word 0xE1600070 @ Call SMI monitor (smieq) | ||
| 114 | logic_l1_restore: | ||
| 115 | mov r1, #0 | ||
| 116 | /* Invalidate all instruction caches to PoU | ||
| 117 | * and flush branch target cache */ | ||
| 118 | mcr p15, 0, r1, c7, c5, 0 | ||
| 119 | |||
| 120 | ldr r4, scratchpad_base | ||
| 121 | ldr r3, [r4,#0xBC] | ||
| 122 | ldmia r3!, {r4-r6} | ||
| 123 | mov sp, r4 | ||
| 124 | msr spsr_cxsf, r5 | ||
| 125 | mov lr, r6 | ||
| 126 | |||
| 127 | ldmia r3!, {r4-r9} | ||
| 128 | /* Coprocessor access Control Register */ | ||
| 129 | mcr p15, 0, r4, c1, c0, 2 | ||
| 130 | |||
| 131 | /* TTBR0 */ | ||
| 132 | MCR p15, 0, r5, c2, c0, 0 | ||
| 133 | /* TTBR1 */ | ||
| 134 | MCR p15, 0, r6, c2, c0, 1 | ||
| 135 | /* Translation table base control register */ | ||
| 136 | MCR p15, 0, r7, c2, c0, 2 | ||
| 137 | /*domain access Control Register */ | ||
| 138 | MCR p15, 0, r8, c3, c0, 0 | ||
| 139 | /* data fault status Register */ | ||
| 140 | MCR p15, 0, r9, c5, c0, 0 | ||
| 141 | |||
| 142 | ldmia r3!,{r4-r8} | ||
| 143 | /* instruction fault status Register */ | ||
| 144 | MCR p15, 0, r4, c5, c0, 1 | ||
| 145 | /*Data Auxiliary Fault Status Register */ | ||
| 146 | MCR p15, 0, r5, c5, c1, 0 | ||
| 147 | /*Instruction Auxiliary Fault Status Register*/ | ||
| 148 | MCR p15, 0, r6, c5, c1, 1 | ||
| 149 | /*Data Fault Address Register */ | ||
| 150 | MCR p15, 0, r7, c6, c0, 0 | ||
| 151 | /*Instruction Fault Address Register*/ | ||
| 152 | MCR p15, 0, r8, c6, c0, 2 | ||
| 153 | ldmia r3!,{r4-r7} | ||
| 154 | |||
| 155 | /* user r/w thread and process ID */ | ||
| 156 | MCR p15, 0, r4, c13, c0, 2 | ||
| 157 | /* user ro thread and process ID */ | ||
| 158 | MCR p15, 0, r5, c13, c0, 3 | ||
| 159 | /*Privileged only thread and process ID */ | ||
| 160 | MCR p15, 0, r6, c13, c0, 4 | ||
| 161 | /* cache size selection */ | ||
| 162 | MCR p15, 2, r7, c0, c0, 0 | ||
| 163 | ldmia r3!,{r4-r8} | ||
| 164 | /* Data TLB lockdown registers */ | ||
| 165 | MCR p15, 0, r4, c10, c0, 0 | ||
| 166 | /* Instruction TLB lockdown registers */ | ||
| 167 | MCR p15, 0, r5, c10, c0, 1 | ||
| 168 | /* Secure or Nonsecure Vector Base Address */ | ||
| 169 | MCR p15, 0, r6, c12, c0, 0 | ||
| 170 | /* FCSE PID */ | ||
| 171 | MCR p15, 0, r7, c13, c0, 0 | ||
| 172 | /* Context PID */ | ||
| 173 | MCR p15, 0, r8, c13, c0, 1 | ||
| 174 | |||
| 175 | ldmia r3!,{r4-r5} | ||
| 176 | /* primary memory remap register */ | ||
| 177 | MCR p15, 0, r4, c10, c2, 0 | ||
| 178 | /*normal memory remap register */ | ||
| 179 | MCR p15, 0, r5, c10, c2, 1 | ||
| 180 | |||
| 181 | /* Restore cpsr */ | ||
| 182 | ldmia r3!,{r4} /*load CPSR from SDRAM*/ | ||
| 183 | msr cpsr, r4 /*store cpsr */ | ||
| 184 | |||
| 185 | /* Enabling MMU here */ | ||
| 186 | mrc p15, 0, r7, c2, c0, 2 /* Read TTBRControl */ | ||
| 187 | /* Extract N (0:2) bits and decide whether to use TTBR0 or TTBR1*/ | ||
| 188 | and r7, #0x7 | ||
| 189 | cmp r7, #0x0 | ||
| 190 | beq usettbr0 | ||
| 191 | ttbr_error: | ||
| 192 | /* More work needs to be done to support N[0:2] value other than 0 | ||
| 193 | * So looping here so that the error can be detected | ||
| 194 | */ | ||
| 195 | b ttbr_error | ||
| 196 | usettbr0: | ||
| 197 | mrc p15, 0, r2, c2, c0, 0 | ||
| 198 | ldr r5, ttbrbit_mask | ||
| 199 | and r2, r5 | ||
| 200 | mov r4, pc | ||
| 201 | ldr r5, table_index_mask | ||
| 202 | and r4, r5 /* r4 = 31 to 20 bits of pc */ | ||
| 203 | /* Extract the value to be written to table entry */ | ||
| 204 | ldr r1, table_entry | ||
| 205 | add r1, r1, r4 /* r1 has value to be written to table entry*/ | ||
| 206 | /* Getting the address of table entry to modify */ | ||
| 207 | lsr r4, #18 | ||
| 208 | add r2, r4 /* r2 has the location which needs to be modified */ | ||
| 209 | /* Storing previous entry of location being modified */ | ||
| 210 | ldr r5, scratchpad_base | ||
| 211 | ldr r4, [r2] | ||
| 212 | str r4, [r5, #0xC0] | ||
| 213 | /* Modify the table entry */ | ||
| 214 | str r1, [r2] | ||
| 215 | /* Storing address of entry being modified | ||
| 216 | * - will be restored after enabling MMU */ | ||
| 217 | ldr r5, scratchpad_base | ||
| 218 | str r2, [r5, #0xC4] | ||
| 219 | |||
| 220 | mov r0, #0 | ||
| 221 | mcr p15, 0, r0, c7, c5, 4 @ Flush prefetch buffer | ||
| 222 | mcr p15, 0, r0, c7, c5, 6 @ Invalidate branch predictor array | ||
| 223 | mcr p15, 0, r0, c8, c5, 0 @ Invalidate instruction TLB | ||
| 224 | mcr p15, 0, r0, c8, c6, 0 @ Invalidate data TLB | ||
| 225 | /* Restore control register but dont enable caches here*/ | ||
| 226 | /* Caches will be enabled after restoring MMU table entry */ | ||
| 227 | ldmia r3!, {r4} | ||
| 228 | /* Store previous value of control register in scratchpad */ | ||
| 229 | str r4, [r5, #0xC8] | ||
| 230 | ldr r2, cache_pred_disable_mask | ||
| 231 | and r4, r2 | ||
| 232 | mcr p15, 0, r4, c1, c0, 0 | ||
| 233 | |||
| 234 | ldmfd sp!, {r0-r12, pc} @ restore regs and return | ||
| 235 | save_context_wfi: | ||
| 236 | /*b save_context_wfi*/ @ enable to debug save code | ||
| 237 | mov r8, r0 /* Store SDRAM address in r8 */ | ||
| 238 | /* Check what that target sleep state is:stored in r1*/ | ||
| 239 | /* 1 - Only L1 and logic lost */ | ||
| 240 | /* 2 - Only L2 lost */ | ||
| 241 | /* 3 - Both L1 and L2 lost */ | ||
| 242 | cmp r1, #0x2 /* Only L2 lost */ | ||
| 243 | beq clean_l2 | ||
| 244 | cmp r1, #0x1 /* L2 retained */ | ||
| 245 | /* r9 stores whether to clean L2 or not*/ | ||
| 246 | moveq r9, #0x0 /* Dont Clean L2 */ | ||
| 247 | movne r9, #0x1 /* Clean L2 */ | ||
| 248 | l1_logic_lost: | ||
| 249 | /* Store sp and spsr to SDRAM */ | ||
| 250 | mov r4, sp | ||
| 251 | mrs r5, spsr | ||
| 252 | mov r6, lr | ||
| 253 | stmia r8!, {r4-r6} | ||
| 254 | /* Save all ARM registers */ | ||
| 255 | /* Coprocessor access control register */ | ||
| 256 | mrc p15, 0, r6, c1, c0, 2 | ||
| 257 | stmia r8!, {r6} | ||
| 258 | /* TTBR0, TTBR1 and Translation table base control */ | ||
| 259 | mrc p15, 0, r4, c2, c0, 0 | ||
| 260 | mrc p15, 0, r5, c2, c0, 1 | ||
| 261 | mrc p15, 0, r6, c2, c0, 2 | ||
| 262 | stmia r8!, {r4-r6} | ||
| 263 | /* Domain access control register, data fault status register, | ||
| 264 | and instruction fault status register */ | ||
| 265 | mrc p15, 0, r4, c3, c0, 0 | ||
| 266 | mrc p15, 0, r5, c5, c0, 0 | ||
| 267 | mrc p15, 0, r6, c5, c0, 1 | ||
| 268 | stmia r8!, {r4-r6} | ||
| 269 | /* Data aux fault status register, instruction aux fault status, | ||
| 270 | datat fault address register and instruction fault address register*/ | ||
| 271 | mrc p15, 0, r4, c5, c1, 0 | ||
| 272 | mrc p15, 0, r5, c5, c1, 1 | ||
| 273 | mrc p15, 0, r6, c6, c0, 0 | ||
| 274 | mrc p15, 0, r7, c6, c0, 2 | ||
| 275 | stmia r8!, {r4-r7} | ||
| 276 | /* user r/w thread and process ID, user r/o thread and process ID, | ||
| 277 | priv only thread and process ID, cache size selection */ | ||
| 278 | mrc p15, 0, r4, c13, c0, 2 | ||
| 279 | mrc p15, 0, r5, c13, c0, 3 | ||
| 280 | mrc p15, 0, r6, c13, c0, 4 | ||
| 281 | mrc p15, 2, r7, c0, c0, 0 | ||
| 282 | stmia r8!, {r4-r7} | ||
| 283 | /* Data TLB lockdown, instruction TLB lockdown registers */ | ||
| 284 | mrc p15, 0, r5, c10, c0, 0 | ||
| 285 | mrc p15, 0, r6, c10, c0, 1 | ||
| 286 | stmia r8!, {r5-r6} | ||
| 287 | /* Secure or non secure vector base address, FCSE PID, Context PID*/ | ||
| 288 | mrc p15, 0, r4, c12, c0, 0 | ||
| 289 | mrc p15, 0, r5, c13, c0, 0 | ||
| 290 | mrc p15, 0, r6, c13, c0, 1 | ||
| 291 | stmia r8!, {r4-r6} | ||
| 292 | /* Primary remap, normal remap registers */ | ||
| 293 | mrc p15, 0, r4, c10, c2, 0 | ||
| 294 | mrc p15, 0, r5, c10, c2, 1 | ||
| 295 | stmia r8!,{r4-r5} | ||
| 296 | |||
| 297 | /* Store current cpsr*/ | ||
| 298 | mrs r2, cpsr | ||
| 299 | stmia r8!, {r2} | ||
| 300 | |||
| 301 | mrc p15, 0, r4, c1, c0, 0 | ||
| 302 | /* save control register */ | ||
| 303 | stmia r8!, {r4} | ||
| 304 | clean_caches: | ||
| 305 | /* Clean Data or unified cache to POU*/ | ||
| 306 | /* How to invalidate only L1 cache???? - #FIX_ME# */ | ||
| 307 | /* mcr p15, 0, r11, c7, c11, 1 */ | ||
| 308 | cmp r9, #1 /* Check whether L2 inval is required or not*/ | ||
| 309 | bne skip_l2_inval | ||
| 310 | clean_l2: | ||
| 311 | /* read clidr */ | ||
| 312 | mrc p15, 1, r0, c0, c0, 1 | ||
| 313 | /* extract loc from clidr */ | ||
| 314 | ands r3, r0, #0x7000000 | ||
| 315 | /* left align loc bit field */ | ||
| 316 | mov r3, r3, lsr #23 | ||
| 317 | /* if loc is 0, then no need to clean */ | ||
| 318 | beq finished | ||
| 319 | /* start clean at cache level 0 */ | ||
| 320 | mov r10, #0 | ||
| 321 | loop1: | ||
| 322 | /* work out 3x current cache level */ | ||
| 323 | add r2, r10, r10, lsr #1 | ||
| 324 | /* extract cache type bits from clidr*/ | ||
| 325 | mov r1, r0, lsr r2 | ||
| 326 | /* mask of the bits for current cache only */ | ||
| 327 | and r1, r1, #7 | ||
| 328 | /* see what cache we have at this level */ | ||
| 329 | cmp r1, #2 | ||
| 330 | /* skip if no cache, or just i-cache */ | ||
| 331 | blt skip | ||
| 332 | /* select current cache level in cssr */ | ||
| 333 | mcr p15, 2, r10, c0, c0, 0 | ||
| 334 | /* isb to sych the new cssr&csidr */ | ||
| 335 | isb | ||
| 336 | /* read the new csidr */ | ||
| 337 | mrc p15, 1, r1, c0, c0, 0 | ||
| 338 | /* extract the length of the cache lines */ | ||
| 339 | and r2, r1, #7 | ||
| 340 | /* add 4 (line length offset) */ | ||
| 341 | add r2, r2, #4 | ||
| 342 | ldr r4, assoc_mask | ||
| 343 | /* find maximum number on the way size */ | ||
| 344 | ands r4, r4, r1, lsr #3 | ||
| 345 | /* find bit position of way size increment */ | ||
| 346 | clz r5, r4 | ||
| 347 | ldr r7, numset_mask | ||
| 348 | /* extract max number of the index size*/ | ||
| 349 | ands r7, r7, r1, lsr #13 | ||
| 350 | loop2: | ||
| 351 | mov r9, r4 | ||
| 352 | /* create working copy of max way size*/ | ||
| 353 | loop3: | ||
| 354 | /* factor way and cache number into r11 */ | ||
| 355 | orr r11, r10, r9, lsl r5 | ||
| 356 | /* factor index number into r11 */ | ||
| 357 | orr r11, r11, r7, lsl r2 | ||
| 358 | /*clean & invalidate by set/way */ | ||
| 359 | mcr p15, 0, r11, c7, c10, 2 | ||
| 360 | /* decrement the way*/ | ||
| 361 | subs r9, r9, #1 | ||
| 362 | bge loop3 | ||
| 363 | /*decrement the index */ | ||
| 364 | subs r7, r7, #1 | ||
| 365 | bge loop2 | ||
| 366 | skip: | ||
| 367 | add r10, r10, #2 | ||
| 368 | /* increment cache number */ | ||
| 369 | cmp r3, r10 | ||
| 370 | bgt loop1 | ||
| 371 | finished: | ||
| 372 | /*swith back to cache level 0 */ | ||
| 373 | mov r10, #0 | ||
| 374 | /* select current cache level in cssr */ | ||
| 375 | mcr p15, 2, r10, c0, c0, 0 | ||
| 376 | isb | ||
| 377 | skip_l2_inval: | ||
| 378 | /* Data memory barrier and Data sync barrier */ | ||
| 379 | mov r1, #0 | ||
| 380 | mcr p15, 0, r1, c7, c10, 4 | ||
| 381 | mcr p15, 0, r1, c7, c10, 5 | ||
| 382 | |||
| 383 | wfi @ wait for interrupt | ||
| 384 | nop | ||
| 385 | nop | ||
| 386 | nop | ||
| 387 | nop | ||
| 388 | nop | ||
| 389 | nop | ||
| 390 | nop | ||
| 391 | nop | ||
| 392 | nop | ||
| 393 | nop | ||
| 394 | bl i_dll_wait | ||
| 395 | /* restore regs and return */ | ||
| 396 | ldmfd sp!, {r0-r12, pc} | ||
| 397 | |||
| 398 | i_dll_wait: | ||
| 399 | ldr r4, clk_stabilize_delay | ||
| 400 | |||
| 401 | i_dll_delay: | ||
| 402 | subs r4, r4, #0x1 | ||
| 403 | bne i_dll_delay | ||
| 404 | ldr r4, sdrc_power | ||
| 405 | ldr r5, [r4] | ||
| 406 | bic r5, r5, #0x40 | ||
| 407 | str r5, [r4] | ||
| 408 | bx lr | ||
| 409 | pm_prepwstst_core: | ||
| 410 | .word PM_PREPWSTST_CORE_V | ||
| 411 | pm_prepwstst_mpu: | ||
| 412 | .word PM_PREPWSTST_MPU_V | ||
| 413 | pm_pwstctrl_mpu: | ||
| 414 | .word PM_PWSTCTRL_MPU_P | ||
| 415 | scratchpad_base: | ||
| 416 | .word SCRATCHPAD_BASE_P | ||
| 417 | sdrc_power: | ||
| 418 | .word SDRC_POWER_V | ||
| 419 | context_mem: | ||
| 420 | .word 0x803E3E14 | ||
| 421 | clk_stabilize_delay: | ||
| 422 | .word 0x000001FF | ||
| 423 | assoc_mask: | ||
| 424 | .word 0x3ff | ||
| 425 | numset_mask: | ||
| 426 | .word 0x7fff | ||
| 427 | ttbrbit_mask: | ||
| 428 | .word 0xFFFFC000 | ||
| 429 | table_index_mask: | ||
| 430 | .word 0xFFF00000 | ||
| 431 | table_entry: | ||
| 432 | .word 0x00000C02 | ||
| 433 | cache_pred_disable_mask: | ||
| 434 | .word 0xFFFFE7FB | ||
| 435 | ENTRY(omap34xx_cpu_suspend_sz) | ||
| 436 | .word . - omap34xx_cpu_suspend | ||
diff --git a/arch/arm/mach-omap2/sram242x.S b/arch/arm/mach-omap2/sram242x.S index af4bd3490227..bb299851116d 100644 --- a/arch/arm/mach-omap2/sram242x.S +++ b/arch/arm/mach-omap2/sram242x.S | |||
| @@ -124,11 +124,11 @@ omap242x_sdi_cm_clksel2_pll: | |||
| 124 | omap242x_sdi_sdrc_dlla_ctrl: | 124 | omap242x_sdi_sdrc_dlla_ctrl: |
| 125 | .word OMAP242X_SDRC_REGADDR(SDRC_DLLA_CTRL) | 125 | .word OMAP242X_SDRC_REGADDR(SDRC_DLLA_CTRL) |
| 126 | omap242x_sdi_prcm_voltctrl: | 126 | omap242x_sdi_prcm_voltctrl: |
| 127 | .word OMAP242X_PRCM_VOLTCTRL | 127 | .word OMAP2420_PRCM_VOLTCTRL |
| 128 | prcm_mask_val: | 128 | prcm_mask_val: |
| 129 | .word 0xFFFF3FFC | 129 | .word 0xFFFF3FFC |
| 130 | omap242x_sdi_timer_32ksynct_cr: | 130 | omap242x_sdi_timer_32ksynct_cr: |
| 131 | .word IO_ADDRESS(OMAP2_32KSYNCT_BASE + 0x010) | 131 | .word IO_ADDRESS(OMAP2420_32KSYNCT_BASE + 0x010) |
| 132 | ENTRY(omap242x_sram_ddr_init_sz) | 132 | ENTRY(omap242x_sram_ddr_init_sz) |
| 133 | .word . - omap242x_sram_ddr_init | 133 | .word . - omap242x_sram_ddr_init |
| 134 | 134 | ||
| @@ -220,11 +220,11 @@ omap242x_srs_sdrc_dlla_ctrl: | |||
| 220 | omap242x_srs_sdrc_rfr_ctrl: | 220 | omap242x_srs_sdrc_rfr_ctrl: |
| 221 | .word OMAP242X_SDRC_REGADDR(SDRC_RFR_CTRL_0) | 221 | .word OMAP242X_SDRC_REGADDR(SDRC_RFR_CTRL_0) |
| 222 | omap242x_srs_prcm_voltctrl: | 222 | omap242x_srs_prcm_voltctrl: |
| 223 | .word OMAP242X_PRCM_VOLTCTRL | 223 | .word OMAP2420_PRCM_VOLTCTRL |
| 224 | ddr_prcm_mask_val: | 224 | ddr_prcm_mask_val: |
| 225 | .word 0xFFFF3FFC | 225 | .word 0xFFFF3FFC |
| 226 | omap242x_srs_timer_32ksynct: | 226 | omap242x_srs_timer_32ksynct: |
| 227 | .word IO_ADDRESS(OMAP2_32KSYNCT_BASE + 0x010) | 227 | .word IO_ADDRESS(OMAP2420_32KSYNCT_BASE + 0x010) |
| 228 | 228 | ||
| 229 | ENTRY(omap242x_sram_reprogram_sdrc_sz) | 229 | ENTRY(omap242x_sram_reprogram_sdrc_sz) |
| 230 | .word . - omap242x_sram_reprogram_sdrc | 230 | .word . - omap242x_sram_reprogram_sdrc |
| @@ -305,7 +305,7 @@ wait_dll_lock: | |||
| 305 | ldmfd sp!, {r0-r12, pc} @ restore regs and return | 305 | ldmfd sp!, {r0-r12, pc} @ restore regs and return |
| 306 | 306 | ||
| 307 | omap242x_ssp_set_config: | 307 | omap242x_ssp_set_config: |
| 308 | .word OMAP242X_PRCM_CLKCFG_CTRL | 308 | .word OMAP2420_PRCM_CLKCFG_CTRL |
| 309 | omap242x_ssp_pll_ctl: | 309 | omap242x_ssp_pll_ctl: |
| 310 | .word OMAP2420_CM_REGADDR(PLL_MOD, CM_CLKEN) | 310 | .word OMAP2420_CM_REGADDR(PLL_MOD, CM_CLKEN) |
| 311 | omap242x_ssp_pll_stat: | 311 | omap242x_ssp_pll_stat: |
diff --git a/arch/arm/mach-omap2/sram243x.S b/arch/arm/mach-omap2/sram243x.S index 84363e269e8c..9955abcaeb31 100644 --- a/arch/arm/mach-omap2/sram243x.S +++ b/arch/arm/mach-omap2/sram243x.S | |||
| @@ -124,11 +124,11 @@ omap243x_sdi_cm_clksel2_pll: | |||
| 124 | omap243x_sdi_sdrc_dlla_ctrl: | 124 | omap243x_sdi_sdrc_dlla_ctrl: |
| 125 | .word OMAP243X_SDRC_REGADDR(SDRC_DLLA_CTRL) | 125 | .word OMAP243X_SDRC_REGADDR(SDRC_DLLA_CTRL) |
| 126 | omap243x_sdi_prcm_voltctrl: | 126 | omap243x_sdi_prcm_voltctrl: |
| 127 | .word OMAP243X_PRCM_VOLTCTRL | 127 | .word OMAP2430_PRCM_VOLTCTRL |
| 128 | prcm_mask_val: | 128 | prcm_mask_val: |
| 129 | .word 0xFFFF3FFC | 129 | .word 0xFFFF3FFC |
| 130 | omap243x_sdi_timer_32ksynct_cr: | 130 | omap243x_sdi_timer_32ksynct_cr: |
| 131 | .word IO_ADDRESS(OMAP2_32KSYNCT_BASE + 0x010) | 131 | .word IO_ADDRESS(OMAP2430_32KSYNCT_BASE + 0x010) |
| 132 | ENTRY(omap243x_sram_ddr_init_sz) | 132 | ENTRY(omap243x_sram_ddr_init_sz) |
| 133 | .word . - omap243x_sram_ddr_init | 133 | .word . - omap243x_sram_ddr_init |
| 134 | 134 | ||
| @@ -220,11 +220,11 @@ omap243x_srs_sdrc_dlla_ctrl: | |||
| 220 | omap243x_srs_sdrc_rfr_ctrl: | 220 | omap243x_srs_sdrc_rfr_ctrl: |
| 221 | .word OMAP243X_SDRC_REGADDR(SDRC_RFR_CTRL_0) | 221 | .word OMAP243X_SDRC_REGADDR(SDRC_RFR_CTRL_0) |
| 222 | omap243x_srs_prcm_voltctrl: | 222 | omap243x_srs_prcm_voltctrl: |
| 223 | .word OMAP243X_PRCM_VOLTCTRL | 223 | .word OMAP2430_PRCM_VOLTCTRL |
| 224 | ddr_prcm_mask_val: | 224 | ddr_prcm_mask_val: |
| 225 | .word 0xFFFF3FFC | 225 | .word 0xFFFF3FFC |
| 226 | omap243x_srs_timer_32ksynct: | 226 | omap243x_srs_timer_32ksynct: |
| 227 | .word IO_ADDRESS(OMAP2_32KSYNCT_BASE + 0x010) | 227 | .word IO_ADDRESS(OMAP2430_32KSYNCT_BASE + 0x010) |
| 228 | 228 | ||
| 229 | ENTRY(omap243x_sram_reprogram_sdrc_sz) | 229 | ENTRY(omap243x_sram_reprogram_sdrc_sz) |
| 230 | .word . - omap243x_sram_reprogram_sdrc | 230 | .word . - omap243x_sram_reprogram_sdrc |
| @@ -305,7 +305,7 @@ wait_dll_lock: | |||
| 305 | ldmfd sp!, {r0-r12, pc} @ restore regs and return | 305 | ldmfd sp!, {r0-r12, pc} @ restore regs and return |
| 306 | 306 | ||
| 307 | omap243x_ssp_set_config: | 307 | omap243x_ssp_set_config: |
| 308 | .word OMAP243X_PRCM_CLKCFG_CTRL | 308 | .word OMAP2430_PRCM_CLKCFG_CTRL |
| 309 | omap243x_ssp_pll_ctl: | 309 | omap243x_ssp_pll_ctl: |
| 310 | .word OMAP2430_CM_REGADDR(PLL_MOD, CM_CLKEN) | 310 | .word OMAP2430_CM_REGADDR(PLL_MOD, CM_CLKEN) |
| 311 | omap243x_ssp_pll_stat: | 311 | omap243x_ssp_pll_stat: |
diff --git a/arch/arm/mach-omap2/sram34xx.S b/arch/arm/mach-omap2/sram34xx.S index 2c7146136342..c080c82521e1 100644 --- a/arch/arm/mach-omap2/sram34xx.S +++ b/arch/arm/mach-omap2/sram34xx.S | |||
| @@ -40,69 +40,74 @@ | |||
| 40 | /* | 40 | /* |
| 41 | * Change frequency of core dpll | 41 | * Change frequency of core dpll |
| 42 | * r0 = sdrc_rfr_ctrl r1 = sdrc_actim_ctrla r2 = sdrc_actim_ctrlb r3 = M2 | 42 | * r0 = sdrc_rfr_ctrl r1 = sdrc_actim_ctrla r2 = sdrc_actim_ctrlb r3 = M2 |
| 43 | * r4 = Unlock SDRC DLL? (1 = yes, 0 = no) -- only unlock DLL for | ||
| 44 | * SDRC rates < 83MHz | ||
| 43 | */ | 45 | */ |
| 44 | ENTRY(omap3_sram_configure_core_dpll) | 46 | ENTRY(omap3_sram_configure_core_dpll) |
| 45 | stmfd sp!, {r1-r12, lr} @ store regs to stack | 47 | stmfd sp!, {r1-r12, lr} @ store regs to stack |
| 48 | ldr r4, [sp, #52] @ pull extra args off the stack | ||
| 49 | dsb @ flush buffered writes to interconnect | ||
| 46 | cmp r3, #0x2 | 50 | cmp r3, #0x2 |
| 47 | blne configure_sdrc | 51 | blne configure_sdrc |
| 48 | cmp r3, #0x2 | 52 | cmp r4, #0x1 |
| 53 | bleq unlock_dll | ||
| 49 | blne lock_dll | 54 | blne lock_dll |
| 50 | cmp r3, #0x1 | ||
| 51 | blne unlock_dll | ||
| 52 | bl sdram_in_selfrefresh @ put the SDRAM in self refresh | 55 | bl sdram_in_selfrefresh @ put the SDRAM in self refresh |
| 53 | bl configure_core_dpll | 56 | bl configure_core_dpll |
| 54 | bl enable_sdrc | 57 | bl enable_sdrc |
| 55 | cmp r3, #0x1 | 58 | cmp r4, #0x1 |
| 56 | blne wait_dll_unlock | 59 | bleq wait_dll_unlock |
| 57 | cmp r3, #0x2 | ||
| 58 | blne wait_dll_lock | 60 | blne wait_dll_lock |
| 59 | cmp r3, #0x1 | 61 | cmp r3, #0x1 |
| 60 | blne configure_sdrc | 62 | blne configure_sdrc |
| 63 | isb @ prevent speculative exec past here | ||
| 61 | mov r0, #0 @ return value | 64 | mov r0, #0 @ return value |
| 62 | ldmfd sp!, {r1-r12, pc} @ restore regs and return | 65 | ldmfd sp!, {r1-r12, pc} @ restore regs and return |
| 63 | unlock_dll: | 66 | unlock_dll: |
| 64 | ldr r4, omap3_sdrc_dlla_ctrl | 67 | ldr r11, omap3_sdrc_dlla_ctrl |
| 65 | ldr r5, [r4] | 68 | ldr r12, [r11] |
| 66 | orr r5, r5, #0x4 | 69 | orr r12, r12, #0x4 |
| 67 | str r5, [r4] | 70 | str r12, [r11] @ (no OCP barrier needed) |
| 68 | bx lr | 71 | bx lr |
| 69 | lock_dll: | 72 | lock_dll: |
| 70 | ldr r4, omap3_sdrc_dlla_ctrl | 73 | ldr r11, omap3_sdrc_dlla_ctrl |
| 71 | ldr r5, [r4] | 74 | ldr r12, [r11] |
| 72 | bic r5, r5, #0x4 | 75 | bic r12, r12, #0x4 |
| 73 | str r5, [r4] | 76 | str r12, [r11] @ (no OCP barrier needed) |
| 74 | bx lr | 77 | bx lr |
| 75 | sdram_in_selfrefresh: | 78 | sdram_in_selfrefresh: |
| 76 | mov r5, #0x0 @ Move 0 to R5 | 79 | ldr r11, omap3_sdrc_power @ read the SDRC_POWER register |
| 77 | mcr p15, 0, r5, c7, c10, 5 @ memory barrier | 80 | ldr r12, [r11] @ read the contents of SDRC_POWER |
| 78 | ldr r4, omap3_sdrc_power @ read the SDRC_POWER register | 81 | mov r9, r12 @ keep a copy of SDRC_POWER bits |
| 79 | ldr r5, [r4] @ read the contents of SDRC_POWER | 82 | orr r12, r12, #0x40 @ enable self refresh on idle req |
| 80 | orr r5, r5, #0x40 @ enable self refresh on idle req | 83 | bic r12, r12, #0x4 @ clear PWDENA |
| 81 | str r5, [r4] @ write back to SDRC_POWER register | 84 | str r12, [r11] @ write back to SDRC_POWER register |
| 82 | ldr r4, omap3_cm_iclken1_core @ read the CM_ICLKEN1_CORE reg | 85 | ldr r12, [r11] @ posted-write barrier for SDRC |
| 83 | ldr r5, [r4] | 86 | ldr r11, omap3_cm_iclken1_core @ read the CM_ICLKEN1_CORE reg |
| 84 | bic r5, r5, #0x2 @ disable iclk bit for SRDC | 87 | ldr r12, [r11] |
| 85 | str r5, [r4] | 88 | bic r12, r12, #0x2 @ disable iclk bit for SDRC |
| 89 | str r12, [r11] | ||
| 86 | wait_sdrc_idle: | 90 | wait_sdrc_idle: |
| 87 | ldr r4, omap3_cm_idlest1_core | 91 | ldr r11, omap3_cm_idlest1_core |
| 88 | ldr r5, [r4] | 92 | ldr r12, [r11] |
| 89 | and r5, r5, #0x2 @ check for SDRC idle | 93 | and r12, r12, #0x2 @ check for SDRC idle |
| 90 | cmp r5, #2 | 94 | cmp r12, #2 |
| 91 | bne wait_sdrc_idle | 95 | bne wait_sdrc_idle |
| 92 | bx lr | 96 | bx lr |
| 93 | configure_core_dpll: | 97 | configure_core_dpll: |
| 94 | ldr r4, omap3_cm_clksel1_pll | 98 | ldr r11, omap3_cm_clksel1_pll |
| 95 | ldr r5, [r4] | 99 | ldr r12, [r11] |
| 96 | ldr r6, core_m2_mask_val @ modify m2 for core dpll | 100 | ldr r10, core_m2_mask_val @ modify m2 for core dpll |
| 97 | and r5, r5, r6 | 101 | and r12, r12, r10 |
| 98 | orr r5, r5, r3, lsl #0x1B @ r3 contains the M2 val | 102 | orr r12, r12, r3, lsl #0x1B @ r3 contains the M2 val |
| 99 | str r5, [r4] | 103 | str r12, [r11] |
| 100 | mov r5, #0x800 @ wait for the clock to stabilise | 104 | ldr r12, [r11] @ posted-write barrier for CM |
| 105 | mov r12, #0x800 @ wait for the clock to stabilise | ||
| 101 | cmp r3, #2 | 106 | cmp r3, #2 |
| 102 | bne wait_clk_stable | 107 | bne wait_clk_stable |
| 103 | bx lr | 108 | bx lr |
| 104 | wait_clk_stable: | 109 | wait_clk_stable: |
| 105 | subs r5, r5, #1 | 110 | subs r12, r12, #1 |
| 106 | bne wait_clk_stable | 111 | bne wait_clk_stable |
| 107 | nop | 112 | nop |
| 108 | nop | 113 | nop |
| @@ -116,42 +121,42 @@ wait_clk_stable: | |||
| 116 | nop | 121 | nop |
| 117 | bx lr | 122 | bx lr |
| 118 | enable_sdrc: | 123 | enable_sdrc: |
| 119 | ldr r4, omap3_cm_iclken1_core | 124 | ldr r11, omap3_cm_iclken1_core |
| 120 | ldr r5, [r4] | 125 | ldr r12, [r11] |
| 121 | orr r5, r5, #0x2 @ enable iclk bit for SDRC | 126 | orr r12, r12, #0x2 @ enable iclk bit for SDRC |
| 122 | str r5, [r4] | 127 | str r12, [r11] |
| 123 | wait_sdrc_idle1: | 128 | wait_sdrc_idle1: |
| 124 | ldr r4, omap3_cm_idlest1_core | 129 | ldr r11, omap3_cm_idlest1_core |
| 125 | ldr r5, [r4] | 130 | ldr r12, [r11] |
| 126 | and r5, r5, #0x2 | 131 | and r12, r12, #0x2 |
| 127 | cmp r5, #0 | 132 | cmp r12, #0 |
| 128 | bne wait_sdrc_idle1 | 133 | bne wait_sdrc_idle1 |
| 129 | ldr r4, omap3_sdrc_power | 134 | restore_sdrc_power_val: |
| 130 | ldr r5, [r4] | 135 | ldr r11, omap3_sdrc_power |
| 131 | bic r5, r5, #0x40 | 136 | str r9, [r11] @ restore SDRC_POWER, no barrier needed |
| 132 | str r5, [r4] | ||
| 133 | bx lr | 137 | bx lr |
| 134 | wait_dll_lock: | 138 | wait_dll_lock: |
| 135 | ldr r4, omap3_sdrc_dlla_status | 139 | ldr r11, omap3_sdrc_dlla_status |
| 136 | ldr r5, [r4] | 140 | ldr r12, [r11] |
| 137 | and r5, r5, #0x4 | 141 | and r12, r12, #0x4 |
| 138 | cmp r5, #0x4 | 142 | cmp r12, #0x4 |
| 139 | bne wait_dll_lock | 143 | bne wait_dll_lock |
| 140 | bx lr | 144 | bx lr |
| 141 | wait_dll_unlock: | 145 | wait_dll_unlock: |
| 142 | ldr r4, omap3_sdrc_dlla_status | 146 | ldr r11, omap3_sdrc_dlla_status |
| 143 | ldr r5, [r4] | 147 | ldr r12, [r11] |
| 144 | and r5, r5, #0x4 | 148 | and r12, r12, #0x4 |
| 145 | cmp r5, #0x0 | 149 | cmp r12, #0x0 |
| 146 | bne wait_dll_unlock | 150 | bne wait_dll_unlock |
| 147 | bx lr | 151 | bx lr |
| 148 | configure_sdrc: | 152 | configure_sdrc: |
| 149 | ldr r4, omap3_sdrc_rfr_ctrl | 153 | ldr r11, omap3_sdrc_rfr_ctrl |
| 150 | str r0, [r4] | 154 | str r0, [r11] |
| 151 | ldr r4, omap3_sdrc_actim_ctrla | 155 | ldr r11, omap3_sdrc_actim_ctrla |
| 152 | str r1, [r4] | 156 | str r1, [r11] |
| 153 | ldr r4, omap3_sdrc_actim_ctrlb | 157 | ldr r11, omap3_sdrc_actim_ctrlb |
| 154 | str r2, [r4] | 158 | str r2, [r11] |
| 159 | ldr r2, [r11] @ posted-write barrier for SDRC | ||
| 155 | bx lr | 160 | bx lr |
| 156 | 161 | ||
| 157 | omap3_sdrc_power: | 162 | omap3_sdrc_power: |
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c index f36aba12090e..2ce474a9d2b6 100644 --- a/arch/arm/mach-omap2/timer-gp.c +++ b/arch/arm/mach-omap2/timer-gp.c | |||
| @@ -17,9 +17,10 @@ | |||
| 17 | * | 17 | * |
| 18 | * Some parts based off of TI's 24xx code: | 18 | * Some parts based off of TI's 24xx code: |
| 19 | * | 19 | * |
| 20 | * Copyright (C) 2004 Texas Instruments, Inc. | 20 | * Copyright (C) 2004-2009 Texas Instruments, Inc. |
| 21 | * | 21 | * |
| 22 | * Roughly modelled after the OMAP1 MPU timer code. | 22 | * Roughly modelled after the OMAP1 MPU timer code. |
| 23 | * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com> | ||
| 23 | * | 24 | * |
| 24 | * This file is subject to the terms and conditions of the GNU General Public | 25 | * This file is subject to the terms and conditions of the GNU General Public |
| 25 | * License. See the file "COPYING" in the main directory of this archive | 26 | * License. See the file "COPYING" in the main directory of this archive |
| @@ -82,7 +83,8 @@ static void omap2_gp_timer_set_mode(enum clock_event_mode mode, | |||
| 82 | case CLOCK_EVT_MODE_PERIODIC: | 83 | case CLOCK_EVT_MODE_PERIODIC: |
| 83 | period = clk_get_rate(omap_dm_timer_get_fclk(gptimer)) / HZ; | 84 | period = clk_get_rate(omap_dm_timer_get_fclk(gptimer)) / HZ; |
| 84 | period -= 1; | 85 | period -= 1; |
| 85 | 86 | if (cpu_is_omap44xx()) | |
| 87 | period = 0xff; /* FIXME: */ | ||
| 86 | omap_dm_timer_set_load_start(gptimer, 1, 0xffffffff - period); | 88 | omap_dm_timer_set_load_start(gptimer, 1, 0xffffffff - period); |
| 87 | break; | 89 | break; |
| 88 | case CLOCK_EVT_MODE_ONESHOT: | 90 | case CLOCK_EVT_MODE_ONESHOT: |
| @@ -145,6 +147,9 @@ static void __init omap2_gp_clockevent_init(void) | |||
| 145 | "timer-gp: omap_dm_timer_set_source() failed\n"); | 147 | "timer-gp: omap_dm_timer_set_source() failed\n"); |
| 146 | 148 | ||
| 147 | tick_rate = clk_get_rate(omap_dm_timer_get_fclk(gptimer)); | 149 | tick_rate = clk_get_rate(omap_dm_timer_get_fclk(gptimer)); |
| 150 | if (cpu_is_omap44xx()) | ||
| 151 | /* Assuming 32kHz clk is driving GPT1 */ | ||
| 152 | tick_rate = 32768; /* FIXME: */ | ||
| 148 | 153 | ||
| 149 | pr_info("OMAP clockevent source: GPTIMER%d at %u Hz\n", | 154 | pr_info("OMAP clockevent source: GPTIMER%d at %u Hz\n", |
| 150 | gptimer_id, tick_rate); | 155 | gptimer_id, tick_rate); |
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c index 34a56a136efd..d85296dc896c 100644 --- a/arch/arm/mach-omap2/usb-musb.c +++ b/arch/arm/mach-omap2/usb-musb.c | |||
| @@ -28,10 +28,20 @@ | |||
| 28 | 28 | ||
| 29 | #include <mach/hardware.h> | 29 | #include <mach/hardware.h> |
| 30 | #include <mach/irqs.h> | 30 | #include <mach/irqs.h> |
| 31 | #include <mach/pm.h> | ||
| 32 | #include <mach/mux.h> | 31 | #include <mach/mux.h> |
| 33 | #include <mach/usb.h> | 32 | #include <mach/usb.h> |
| 34 | 33 | ||
| 34 | #define OTG_SYSCONFIG (OMAP34XX_HSUSB_OTG_BASE + 0x404) | ||
| 35 | |||
| 36 | static void __init usb_musb_pm_init(void) | ||
| 37 | { | ||
| 38 | /* Ensure force-idle mode for OTG controller */ | ||
| 39 | if (cpu_is_omap34xx()) | ||
| 40 | omap_writel(0, OTG_SYSCONFIG); | ||
| 41 | } | ||
| 42 | |||
| 43 | #ifdef CONFIG_USB_MUSB_SOC | ||
| 44 | |||
| 35 | static struct resource musb_resources[] = { | 45 | static struct resource musb_resources[] = { |
| 36 | [0] = { /* start and end set dynamically */ | 46 | [0] = { /* start and end set dynamically */ |
| 37 | .flags = IORESOURCE_MEM, | 47 | .flags = IORESOURCE_MEM, |
| @@ -184,4 +194,13 @@ void __init usb_musb_init(void) | |||
| 184 | printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n"); | 194 | printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n"); |
| 185 | return; | 195 | return; |
| 186 | } | 196 | } |
| 197 | |||
| 198 | usb_musb_pm_init(); | ||
| 199 | } | ||
| 200 | |||
| 201 | #else | ||
| 202 | void __init usb_musb_init(void) | ||
| 203 | { | ||
| 204 | usb_musb_pm_init(); | ||
| 187 | } | 205 | } |
| 206 | #endif /* CONFIG_USB_MUSB_SOC */ | ||
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index d483b2592ec8..9a6ecc7159b7 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig | |||
| @@ -23,6 +23,11 @@ config ARCH_OMAP3 | |||
| 23 | select CPU_V7 | 23 | select CPU_V7 |
| 24 | select COMMON_CLKDEV | 24 | select COMMON_CLKDEV |
| 25 | 25 | ||
| 26 | config ARCH_OMAP4 | ||
| 27 | bool "TI OMAP4" | ||
| 28 | select CPU_V7 | ||
| 29 | select ARM_GIC | ||
| 30 | |||
| 26 | endchoice | 31 | endchoice |
| 27 | 32 | ||
| 28 | comment "OMAP Feature Selections" | 33 | comment "OMAP Feature Selections" |
| @@ -131,13 +136,13 @@ config OMAP_MPU_TIMER | |||
| 131 | 136 | ||
| 132 | config OMAP_32K_TIMER | 137 | config OMAP_32K_TIMER |
| 133 | bool "Use 32KHz timer" | 138 | bool "Use 32KHz timer" |
| 134 | depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX | 139 | depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX || ARCH_OMAP4 |
| 135 | help | 140 | help |
| 136 | Select this option if you want to enable the OMAP 32KHz timer. | 141 | Select this option if you want to enable the OMAP 32KHz timer. |
| 137 | This timer saves power compared to the OMAP_MPU_TIMER, and has | 142 | This timer saves power compared to the OMAP_MPU_TIMER, and has |
| 138 | support for no tick during idle. The 32KHz timer provides less | 143 | support for no tick during idle. The 32KHz timer provides less |
| 139 | intra-tick resolution than OMAP_MPU_TIMER. The 32KHz timer is | 144 | intra-tick resolution than OMAP_MPU_TIMER. The 32KHz timer is |
| 140 | currently only available for OMAP16XX, 24XX and 34XX. | 145 | currently only available for OMAP16XX, 24XX, 34XX and OMAP4. |
| 141 | 146 | ||
| 142 | endchoice | 147 | endchoice |
| 143 | 148 | ||
| @@ -152,7 +157,7 @@ config OMAP_32K_TIMER_HZ | |||
| 152 | 157 | ||
| 153 | config OMAP_DM_TIMER | 158 | config OMAP_DM_TIMER |
| 154 | bool "Use dual-mode timer" | 159 | bool "Use dual-mode timer" |
| 155 | depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX | 160 | depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX || ARCH_OMAP4 |
| 156 | help | 161 | help |
| 157 | Select this option if you want to use OMAP Dual-Mode timers. | 162 | Select this option if you want to use OMAP Dual-Mode timers. |
| 158 | 163 | ||
| @@ -174,7 +179,7 @@ endchoice | |||
| 174 | 179 | ||
| 175 | config OMAP_SERIAL_WAKE | 180 | config OMAP_SERIAL_WAKE |
| 176 | bool "Enable wake-up events for serial ports" | 181 | bool "Enable wake-up events for serial ports" |
| 177 | depends on OMAP_MUX | 182 | depends on ARCH_OMAP1 && OMAP_MUX |
| 178 | default y | 183 | default y |
| 179 | help | 184 | help |
| 180 | Select this option if you want to have your system wake up | 185 | Select this option if you want to have your system wake up |
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c index 29efc279287a..e8c327a45a55 100644 --- a/arch/arm/plat-omap/clock.c +++ b/arch/arm/plat-omap/clock.c | |||
| @@ -36,10 +36,40 @@ static struct clk_functions *arch_clock; | |||
| 36 | * Standard clock functions defined in include/linux/clk.h | 36 | * Standard clock functions defined in include/linux/clk.h |
| 37 | *-------------------------------------------------------------------------*/ | 37 | *-------------------------------------------------------------------------*/ |
| 38 | 38 | ||
| 39 | /* This functions is moved to arch/arm/common/clkdev.c. For OMAP4 since | ||
| 40 | * clock framework is not up , it is defined here to avoid rework in | ||
| 41 | * every driver. Also dummy prcm reset function is added */ | ||
| 42 | |||
| 43 | /* Dummy hooks only for OMAP4.For rest OMAPs, common clkdev is used */ | ||
| 44 | #if defined(CONFIG_ARCH_OMAP4) | ||
| 45 | struct clk *clk_get(struct device *dev, const char *id) | ||
| 46 | { | ||
| 47 | return NULL; | ||
| 48 | } | ||
| 49 | EXPORT_SYMBOL(clk_get); | ||
| 50 | |||
| 51 | void clk_put(struct clk *clk) | ||
| 52 | { | ||
| 53 | } | ||
| 54 | EXPORT_SYMBOL(clk_put); | ||
| 55 | |||
| 56 | void omap2_clk_prepare_for_reboot(void) | ||
| 57 | { | ||
| 58 | } | ||
| 59 | EXPORT_SYMBOL(omap2_clk_prepare_for_reboot); | ||
| 60 | |||
| 61 | void omap_prcm_arch_reset(char mode) | ||
| 62 | { | ||
| 63 | } | ||
| 64 | EXPORT_SYMBOL(omap_prcm_arch_reset); | ||
| 65 | #endif | ||
| 39 | int clk_enable(struct clk *clk) | 66 | int clk_enable(struct clk *clk) |
| 40 | { | 67 | { |
| 41 | unsigned long flags; | 68 | unsigned long flags; |
| 42 | int ret = 0; | 69 | int ret = 0; |
| 70 | if (cpu_is_omap44xx()) | ||
| 71 | /* OMAP4 clk framework not supported yet */ | ||
| 72 | return 0; | ||
| 43 | 73 | ||
| 44 | if (clk == NULL || IS_ERR(clk)) | 74 | if (clk == NULL || IS_ERR(clk)) |
| 45 | return -EINVAL; | 75 | return -EINVAL; |
| @@ -140,6 +170,9 @@ int clk_set_parent(struct clk *clk, struct clk *parent) | |||
| 140 | unsigned long flags; | 170 | unsigned long flags; |
| 141 | int ret = -EINVAL; | 171 | int ret = -EINVAL; |
| 142 | 172 | ||
| 173 | if (cpu_is_omap44xx()) | ||
| 174 | /* OMAP4 clk framework not supported yet */ | ||
| 175 | return 0; | ||
| 143 | if (clk == NULL || IS_ERR(clk) || parent == NULL || IS_ERR(parent)) | 176 | if (clk == NULL || IS_ERR(clk) || parent == NULL || IS_ERR(parent)) |
| 144 | return ret; | 177 | return ret; |
| 145 | 178 | ||
| @@ -240,13 +273,13 @@ void recalculate_root_clocks(void) | |||
| 240 | } | 273 | } |
| 241 | 274 | ||
| 242 | /** | 275 | /** |
| 243 | * clk_init_one - initialize any fields in the struct clk before clk init | 276 | * clk_preinit - initialize any fields in the struct clk before clk init |
| 244 | * @clk: struct clk * to initialize | 277 | * @clk: struct clk * to initialize |
| 245 | * | 278 | * |
| 246 | * Initialize any struct clk fields needed before normal clk initialization | 279 | * Initialize any struct clk fields needed before normal clk initialization |
| 247 | * can run. No return value. | 280 | * can run. No return value. |
| 248 | */ | 281 | */ |
| 249 | void clk_init_one(struct clk *clk) | 282 | void clk_preinit(struct clk *clk) |
| 250 | { | 283 | { |
| 251 | INIT_LIST_HEAD(&clk->children); | 284 | INIT_LIST_HEAD(&clk->children); |
| 252 | } | 285 | } |
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 433021f3d7cc..ebcf006406f9 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c | |||
| @@ -2,6 +2,10 @@ | |||
| 2 | * linux/arch/arm/plat-omap/common.c | 2 | * linux/arch/arm/plat-omap/common.c |
| 3 | * | 3 | * |
| 4 | * Code common to all OMAP machines. | 4 | * Code common to all OMAP machines. |
| 5 | * The file is created by Tony Lindgren <tony@atomide.com> | ||
| 6 | * | ||
| 7 | * Copyright (C) 2009 Texas Instruments | ||
| 8 | * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com> | ||
| 5 | * | 9 | * |
| 6 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
| 7 | * it under the terms of the GNU General Public License version 2 as | 11 | * it under the terms of the GNU General Public License version 2 as |
| @@ -11,7 +15,6 @@ | |||
| 11 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 12 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 13 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
| 14 | #include <linux/pm.h> | ||
| 15 | #include <linux/console.h> | 18 | #include <linux/console.h> |
| 16 | #include <linux/serial.h> | 19 | #include <linux/serial.h> |
| 17 | #include <linux/tty.h> | 20 | #include <linux/tty.h> |
| @@ -175,25 +178,70 @@ console_initcall(omap_add_serial_console); | |||
| 175 | * but systems won't necessarily want to spend resources that way. | 178 | * but systems won't necessarily want to spend resources that way. |
| 176 | */ | 179 | */ |
| 177 | 180 | ||
| 178 | #if defined(CONFIG_ARCH_OMAP16XX) | 181 | #define OMAP16XX_TIMER_32K_SYNCHRONIZED 0xfffbc410 |
| 179 | #define TIMER_32K_SYNCHRONIZED 0xfffbc410 | ||
| 180 | #elif defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | ||
| 181 | #define TIMER_32K_SYNCHRONIZED (OMAP2_32KSYNCT_BASE + 0x10) | ||
| 182 | #endif | ||
| 183 | 182 | ||
| 184 | #ifdef TIMER_32K_SYNCHRONIZED | 183 | #if !(defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP15XX)) |
| 185 | 184 | ||
| 186 | #include <linux/clocksource.h> | 185 | #include <linux/clocksource.h> |
| 187 | 186 | ||
| 188 | static cycle_t omap_32k_read(struct clocksource *cs) | 187 | #ifdef CONFIG_ARCH_OMAP16XX |
| 188 | static cycle_t omap16xx_32k_read(struct clocksource *cs) | ||
| 189 | { | ||
| 190 | return omap_readl(OMAP16XX_TIMER_32K_SYNCHRONIZED); | ||
| 191 | } | ||
| 192 | #else | ||
| 193 | #define omap16xx_32k_read NULL | ||
| 194 | #endif | ||
| 195 | |||
| 196 | #ifdef CONFIG_ARCH_OMAP2420 | ||
| 197 | static cycle_t omap2420_32k_read(struct clocksource *cs) | ||
| 198 | { | ||
| 199 | return omap_readl(OMAP2420_32KSYNCT_BASE + 0x10); | ||
| 200 | } | ||
| 201 | #else | ||
| 202 | #define omap2420_32k_read NULL | ||
| 203 | #endif | ||
| 204 | |||
| 205 | #ifdef CONFIG_ARCH_OMAP2430 | ||
| 206 | static cycle_t omap2430_32k_read(struct clocksource *cs) | ||
| 207 | { | ||
| 208 | return omap_readl(OMAP2430_32KSYNCT_BASE + 0x10); | ||
| 209 | } | ||
| 210 | #else | ||
| 211 | #define omap2430_32k_read NULL | ||
| 212 | #endif | ||
| 213 | |||
| 214 | #ifdef CONFIG_ARCH_OMAP34XX | ||
| 215 | static cycle_t omap34xx_32k_read(struct clocksource *cs) | ||
| 216 | { | ||
| 217 | return omap_readl(OMAP3430_32KSYNCT_BASE + 0x10); | ||
| 218 | } | ||
| 219 | #else | ||
| 220 | #define omap34xx_32k_read NULL | ||
| 221 | #endif | ||
| 222 | |||
| 223 | #ifdef CONFIG_ARCH_OMAP4 | ||
| 224 | static cycle_t omap44xx_32k_read(struct clocksource *cs) | ||
| 189 | { | 225 | { |
| 190 | return omap_readl(TIMER_32K_SYNCHRONIZED); | 226 | return omap_readl(OMAP4430_32KSYNCT_BASE + 0x10); |
| 227 | } | ||
| 228 | #else | ||
| 229 | #define omap44xx_32k_read NULL | ||
| 230 | #endif | ||
| 231 | |||
| 232 | /* | ||
| 233 | * Kernel assumes that sched_clock can be called early but may not have | ||
| 234 | * things ready yet. | ||
| 235 | */ | ||
| 236 | static cycle_t omap_32k_read_dummy(struct clocksource *cs) | ||
| 237 | { | ||
| 238 | return 0; | ||
| 191 | } | 239 | } |
| 192 | 240 | ||
| 193 | static struct clocksource clocksource_32k = { | 241 | static struct clocksource clocksource_32k = { |
| 194 | .name = "32k_counter", | 242 | .name = "32k_counter", |
| 195 | .rating = 250, | 243 | .rating = 250, |
| 196 | .read = omap_32k_read, | 244 | .read = omap_32k_read_dummy, |
| 197 | .mask = CLOCKSOURCE_MASK(32), | 245 | .mask = CLOCKSOURCE_MASK(32), |
| 198 | .shift = 10, | 246 | .shift = 10, |
| 199 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 247 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
| @@ -207,7 +255,7 @@ unsigned long long sched_clock(void) | |||
| 207 | { | 255 | { |
| 208 | unsigned long long ret; | 256 | unsigned long long ret; |
| 209 | 257 | ||
| 210 | ret = (unsigned long long)omap_32k_read(&clocksource_32k); | 258 | ret = (unsigned long long)clocksource_32k.read(&clocksource_32k); |
| 211 | ret = (ret * clocksource_32k.mult_orig) >> clocksource_32k.shift; | 259 | ret = (ret * clocksource_32k.mult_orig) >> clocksource_32k.shift; |
| 212 | return ret; | 260 | return ret; |
| 213 | } | 261 | } |
| @@ -220,6 +268,19 @@ static int __init omap_init_clocksource_32k(void) | |||
| 220 | if (cpu_is_omap16xx() || cpu_class_is_omap2()) { | 268 | if (cpu_is_omap16xx() || cpu_class_is_omap2()) { |
| 221 | struct clk *sync_32k_ick; | 269 | struct clk *sync_32k_ick; |
| 222 | 270 | ||
| 271 | if (cpu_is_omap16xx()) | ||
| 272 | clocksource_32k.read = omap16xx_32k_read; | ||
| 273 | else if (cpu_is_omap2420()) | ||
| 274 | clocksource_32k.read = omap2420_32k_read; | ||
| 275 | else if (cpu_is_omap2430()) | ||
| 276 | clocksource_32k.read = omap2430_32k_read; | ||
| 277 | else if (cpu_is_omap34xx()) | ||
| 278 | clocksource_32k.read = omap34xx_32k_read; | ||
| 279 | else if (cpu_is_omap44xx()) | ||
| 280 | clocksource_32k.read = omap44xx_32k_read; | ||
| 281 | else | ||
| 282 | return -ENODEV; | ||
| 283 | |||
| 223 | sync_32k_ick = clk_get(NULL, "omap_32ksync_ick"); | 284 | sync_32k_ick = clk_get(NULL, "omap_32ksync_ick"); |
| 224 | if (sync_32k_ick) | 285 | if (sync_32k_ick) |
| 225 | clk_enable(sync_32k_ick); | 286 | clk_enable(sync_32k_ick); |
| @@ -234,15 +295,13 @@ static int __init omap_init_clocksource_32k(void) | |||
| 234 | } | 295 | } |
| 235 | arch_initcall(omap_init_clocksource_32k); | 296 | arch_initcall(omap_init_clocksource_32k); |
| 236 | 297 | ||
| 237 | #endif /* TIMER_32K_SYNCHRONIZED */ | 298 | #endif /* !(defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP15XX)) */ |
| 238 | 299 | ||
| 239 | /* Global address base setup code */ | 300 | /* Global address base setup code */ |
| 240 | 301 | ||
| 241 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) | 302 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) |
| 242 | 303 | ||
| 243 | static struct omap_globals *omap2_globals; | 304 | static void __init __omap2_set_globals(struct omap_globals *omap2_globals) |
| 244 | |||
| 245 | static void __init __omap2_set_globals(void) | ||
| 246 | { | 305 | { |
| 247 | omap2_set_globals_tap(omap2_globals); | 306 | omap2_set_globals_tap(omap2_globals); |
| 248 | omap2_set_globals_sdrc(omap2_globals); | 307 | omap2_set_globals_sdrc(omap2_globals); |
| @@ -266,8 +325,7 @@ static struct omap_globals omap242x_globals = { | |||
| 266 | 325 | ||
| 267 | void __init omap2_set_globals_242x(void) | 326 | void __init omap2_set_globals_242x(void) |
| 268 | { | 327 | { |
| 269 | omap2_globals = &omap242x_globals; | 328 | __omap2_set_globals(&omap242x_globals); |
| 270 | __omap2_set_globals(); | ||
| 271 | } | 329 | } |
| 272 | #endif | 330 | #endif |
| 273 | 331 | ||
| @@ -285,8 +343,7 @@ static struct omap_globals omap243x_globals = { | |||
| 285 | 343 | ||
| 286 | void __init omap2_set_globals_243x(void) | 344 | void __init omap2_set_globals_243x(void) |
| 287 | { | 345 | { |
| 288 | omap2_globals = &omap243x_globals; | 346 | __omap2_set_globals(&omap243x_globals); |
| 289 | __omap2_set_globals(); | ||
| 290 | } | 347 | } |
| 291 | #endif | 348 | #endif |
| 292 | 349 | ||
| @@ -304,8 +361,23 @@ static struct omap_globals omap343x_globals = { | |||
| 304 | 361 | ||
| 305 | void __init omap2_set_globals_343x(void) | 362 | void __init omap2_set_globals_343x(void) |
| 306 | { | 363 | { |
| 307 | omap2_globals = &omap343x_globals; | 364 | __omap2_set_globals(&omap343x_globals); |
| 308 | __omap2_set_globals(); | 365 | } |
| 366 | #endif | ||
| 367 | |||
| 368 | #if defined(CONFIG_ARCH_OMAP4) | ||
| 369 | static struct omap_globals omap4_globals = { | ||
| 370 | .class = OMAP443X_CLASS, | ||
| 371 | .tap = OMAP2_IO_ADDRESS(0x4830a000), | ||
| 372 | .ctrl = OMAP2_IO_ADDRESS(OMAP443X_CTRL_BASE), | ||
| 373 | .prm = OMAP2_IO_ADDRESS(OMAP4430_PRM_BASE), | ||
| 374 | .cm = OMAP2_IO_ADDRESS(OMAP4430_CM_BASE), | ||
| 375 | }; | ||
| 376 | |||
| 377 | void __init omap2_set_globals_443x(void) | ||
| 378 | { | ||
| 379 | omap2_set_globals_tap(&omap4_globals); | ||
| 380 | omap2_set_globals_control(&omap4_globals); | ||
| 309 | } | 381 | } |
| 310 | #endif | 382 | #endif |
| 311 | 383 | ||
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 87fb7ff41794..a64b692a1bfe 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c | |||
| @@ -311,6 +311,8 @@ static void omap_init_wdt(void) | |||
| 311 | wdt_resources[0].start = 0x49016000; /* WDT2 */ | 311 | wdt_resources[0].start = 0x49016000; /* WDT2 */ |
| 312 | else if (cpu_is_omap343x()) | 312 | else if (cpu_is_omap343x()) |
| 313 | wdt_resources[0].start = 0x48314000; /* WDT2 */ | 313 | wdt_resources[0].start = 0x48314000; /* WDT2 */ |
| 314 | else if (cpu_is_omap44xx()) | ||
| 315 | wdt_resources[0].start = 0x4a314000; | ||
| 314 | else | 316 | else |
| 315 | return; | 317 | return; |
| 316 | 318 | ||
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 7fc8c045ad5d..def14ec265b3 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
| @@ -10,6 +10,9 @@ | |||
| 10 | * Merged to support both OMAP1 and OMAP2 by Tony Lindgren <tony@atomide.com> | 10 | * Merged to support both OMAP1 and OMAP2 by Tony Lindgren <tony@atomide.com> |
| 11 | * Some functions based on earlier dma-omap.c Copyright (C) 2001 RidgeRun, Inc. | 11 | * Some functions based on earlier dma-omap.c Copyright (C) 2001 RidgeRun, Inc. |
| 12 | * | 12 | * |
| 13 | * Copyright (C) 2009 Texas Instruments | ||
| 14 | * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com> | ||
| 15 | * | ||
| 13 | * Support functions for the OMAP internal DMA channels. | 16 | * Support functions for the OMAP internal DMA channels. |
| 14 | * | 17 | * |
| 15 | * This program is free software; you can redistribute it and/or modify | 18 | * This program is free software; you can redistribute it and/or modify |
| @@ -310,41 +313,62 @@ EXPORT_SYMBOL(omap_set_dma_transfer_params); | |||
| 310 | 313 | ||
| 311 | void omap_set_dma_color_mode(int lch, enum omap_dma_color_mode mode, u32 color) | 314 | void omap_set_dma_color_mode(int lch, enum omap_dma_color_mode mode, u32 color) |
| 312 | { | 315 | { |
| 313 | u16 w; | ||
| 314 | |||
| 315 | BUG_ON(omap_dma_in_1510_mode()); | 316 | BUG_ON(omap_dma_in_1510_mode()); |
| 316 | 317 | ||
| 317 | if (cpu_class_is_omap2()) { | 318 | if (cpu_class_is_omap1()) { |
| 318 | REVISIT_24XX(); | 319 | u16 w; |
| 319 | return; | ||
| 320 | } | ||
| 321 | 320 | ||
| 322 | w = dma_read(CCR2(lch)); | 321 | w = dma_read(CCR2(lch)); |
| 323 | w &= ~0x03; | 322 | w &= ~0x03; |
| 324 | 323 | ||
| 325 | switch (mode) { | 324 | switch (mode) { |
| 326 | case OMAP_DMA_CONSTANT_FILL: | 325 | case OMAP_DMA_CONSTANT_FILL: |
| 327 | w |= 0x01; | 326 | w |= 0x01; |
| 328 | break; | 327 | break; |
| 329 | case OMAP_DMA_TRANSPARENT_COPY: | 328 | case OMAP_DMA_TRANSPARENT_COPY: |
| 330 | w |= 0x02; | 329 | w |= 0x02; |
| 331 | break; | 330 | break; |
| 332 | case OMAP_DMA_COLOR_DIS: | 331 | case OMAP_DMA_COLOR_DIS: |
| 333 | break; | 332 | break; |
| 334 | default: | 333 | default: |
| 335 | BUG(); | 334 | BUG(); |
| 335 | } | ||
| 336 | dma_write(w, CCR2(lch)); | ||
| 337 | |||
| 338 | w = dma_read(LCH_CTRL(lch)); | ||
| 339 | w &= ~0x0f; | ||
| 340 | /* Default is channel type 2D */ | ||
| 341 | if (mode) { | ||
| 342 | dma_write((u16)color, COLOR_L(lch)); | ||
| 343 | dma_write((u16)(color >> 16), COLOR_U(lch)); | ||
| 344 | w |= 1; /* Channel type G */ | ||
| 345 | } | ||
| 346 | dma_write(w, LCH_CTRL(lch)); | ||
| 336 | } | 347 | } |
| 337 | dma_write(w, CCR2(lch)); | ||
| 338 | 348 | ||
| 339 | w = dma_read(LCH_CTRL(lch)); | 349 | if (cpu_class_is_omap2()) { |
| 340 | w &= ~0x0f; | 350 | u32 val; |
| 341 | /* Default is channel type 2D */ | 351 | |
| 342 | if (mode) { | 352 | val = dma_read(CCR(lch)); |
| 343 | dma_write((u16)color, COLOR_L(lch)); | 353 | val &= ~((1 << 17) | (1 << 16)); |
| 344 | dma_write((u16)(color >> 16), COLOR_U(lch)); | 354 | |
| 345 | w |= 1; /* Channel type G */ | 355 | switch (mode) { |
| 356 | case OMAP_DMA_CONSTANT_FILL: | ||
| 357 | val |= 1 << 16; | ||
| 358 | break; | ||
| 359 | case OMAP_DMA_TRANSPARENT_COPY: | ||
| 360 | val |= 1 << 17; | ||
| 361 | break; | ||
| 362 | case OMAP_DMA_COLOR_DIS: | ||
| 363 | break; | ||
| 364 | default: | ||
| 365 | BUG(); | ||
| 366 | } | ||
| 367 | dma_write(val, CCR(lch)); | ||
| 368 | |||
| 369 | color &= 0xffffff; | ||
| 370 | dma_write(color, COLOR(lch)); | ||
| 346 | } | 371 | } |
| 347 | dma_write(w, LCH_CTRL(lch)); | ||
| 348 | } | 372 | } |
| 349 | EXPORT_SYMBOL(omap_set_dma_color_mode); | 373 | EXPORT_SYMBOL(omap_set_dma_color_mode); |
| 350 | 374 | ||
| @@ -851,7 +875,7 @@ omap_dma_set_prio_lch(int lch, unsigned char read_prio, | |||
| 851 | } | 875 | } |
| 852 | l = dma_read(CCR(lch)); | 876 | l = dma_read(CCR(lch)); |
| 853 | l &= ~((1 << 6) | (1 << 26)); | 877 | l &= ~((1 << 6) | (1 << 26)); |
| 854 | if (cpu_is_omap2430() || cpu_is_omap34xx()) | 878 | if (cpu_is_omap2430() || cpu_is_omap34xx() || cpu_is_omap44xx()) |
| 855 | l |= ((read_prio & 0x1) << 6) | ((write_prio & 0x1) << 26); | 879 | l |= ((read_prio & 0x1) << 6) | ((write_prio & 0x1) << 26); |
| 856 | else | 880 | else |
| 857 | l |= ((read_prio & 0x1) << 6); | 881 | l |= ((read_prio & 0x1) << 6); |
| @@ -1199,7 +1223,7 @@ static void create_dma_lch_chain(int lch_head, int lch_queue) | |||
| 1199 | * Failure: -EINVAL/-ENOMEM | 1223 | * Failure: -EINVAL/-ENOMEM |
| 1200 | */ | 1224 | */ |
| 1201 | int omap_request_dma_chain(int dev_id, const char *dev_name, | 1225 | int omap_request_dma_chain(int dev_id, const char *dev_name, |
| 1202 | void (*callback) (int chain_id, u16 ch_status, | 1226 | void (*callback) (int lch, u16 ch_status, |
| 1203 | void *data), | 1227 | void *data), |
| 1204 | int *chain_id, int no_of_chans, int chain_mode, | 1228 | int *chain_id, int no_of_chans, int chain_mode, |
| 1205 | struct omap_dma_channel_params params) | 1229 | struct omap_dma_channel_params params) |
| @@ -1823,7 +1847,8 @@ static irqreturn_t omap1_dma_irq_handler(int irq, void *dev_id) | |||
| 1823 | #define omap1_dma_irq_handler NULL | 1847 | #define omap1_dma_irq_handler NULL |
| 1824 | #endif | 1848 | #endif |
| 1825 | 1849 | ||
| 1826 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) | 1850 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \ |
| 1851 | defined(CONFIG_ARCH_OMAP4) | ||
| 1827 | 1852 | ||
| 1828 | static int omap2_dma_handle_ch(int ch) | 1853 | static int omap2_dma_handle_ch(int ch) |
| 1829 | { | 1854 | { |
| @@ -2318,6 +2343,9 @@ static int __init omap_init_dma(void) | |||
| 2318 | } else if (cpu_is_omap34xx()) { | 2343 | } else if (cpu_is_omap34xx()) { |
| 2319 | omap_dma_base = IO_ADDRESS(OMAP34XX_DMA4_BASE); | 2344 | omap_dma_base = IO_ADDRESS(OMAP34XX_DMA4_BASE); |
| 2320 | dma_lch_count = OMAP_DMA4_LOGICAL_DMA_CH_COUNT; | 2345 | dma_lch_count = OMAP_DMA4_LOGICAL_DMA_CH_COUNT; |
| 2346 | } else if (cpu_is_omap44xx()) { | ||
| 2347 | omap_dma_base = IO_ADDRESS(OMAP44XX_DMA4_BASE); | ||
| 2348 | dma_lch_count = OMAP_DMA4_LOGICAL_DMA_CH_COUNT; | ||
| 2321 | } else { | 2349 | } else { |
| 2322 | pr_err("DMA init failed for unsupported omap\n"); | 2350 | pr_err("DMA init failed for unsupported omap\n"); |
| 2323 | return -ENODEV; | 2351 | return -ENODEV; |
| @@ -2416,12 +2444,18 @@ static int __init omap_init_dma(void) | |||
| 2416 | } | 2444 | } |
| 2417 | } | 2445 | } |
| 2418 | 2446 | ||
| 2419 | if (cpu_is_omap2430() || cpu_is_omap34xx()) | 2447 | if (cpu_is_omap2430() || cpu_is_omap34xx() || cpu_is_omap44xx()) |
| 2420 | omap_dma_set_global_params(DMA_DEFAULT_ARB_RATE, | 2448 | omap_dma_set_global_params(DMA_DEFAULT_ARB_RATE, |
| 2421 | DMA_DEFAULT_FIFO_DEPTH, 0); | 2449 | DMA_DEFAULT_FIFO_DEPTH, 0); |
| 2422 | 2450 | ||
| 2423 | if (cpu_class_is_omap2()) | 2451 | if (cpu_class_is_omap2()) { |
| 2424 | setup_irq(INT_24XX_SDMA_IRQ0, &omap24xx_dma_irq); | 2452 | int irq; |
| 2453 | if (cpu_is_omap44xx()) | ||
| 2454 | irq = INT_44XX_SDMA_IRQ0; | ||
| 2455 | else | ||
| 2456 | irq = INT_24XX_SDMA_IRQ0; | ||
| 2457 | setup_irq(irq, &omap24xx_dma_irq); | ||
| 2458 | } | ||
| 2425 | 2459 | ||
| 2426 | /* FIXME: Update LCD DMA to work on 24xx */ | 2460 | /* FIXME: Update LCD DMA to work on 24xx */ |
| 2427 | if (cpu_class_is_omap1()) { | 2461 | if (cpu_class_is_omap1()) { |
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 55bb99631292..7f50b6103dee 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c | |||
| @@ -7,6 +7,9 @@ | |||
| 7 | * OMAP2 support by Juha Yrjola | 7 | * OMAP2 support by Juha Yrjola |
| 8 | * API improvements and OMAP2 clock framework support by Timo Teras | 8 | * API improvements and OMAP2 clock framework support by Timo Teras |
| 9 | * | 9 | * |
| 10 | * Copyright (C) 2009 Texas Instruments | ||
| 11 | * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com> | ||
| 12 | * | ||
| 10 | * This program is free software; you can redistribute it and/or modify it | 13 | * This program is free software; you can redistribute it and/or modify it |
| 11 | * under the terms of the GNU General Public License as published by the | 14 | * under the terms of the GNU General Public License as published by the |
| 12 | * Free Software Foundation; either version 2 of the License, or (at your | 15 | * Free Software Foundation; either version 2 of the License, or (at your |
| @@ -150,7 +153,8 @@ | |||
| 150 | struct omap_dm_timer { | 153 | struct omap_dm_timer { |
| 151 | unsigned long phys_base; | 154 | unsigned long phys_base; |
| 152 | int irq; | 155 | int irq; |
| 153 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) | 156 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \ |
| 157 | defined(CONFIG_ARCH_OMAP4) | ||
| 154 | struct clk *iclk, *fclk; | 158 | struct clk *iclk, *fclk; |
| 155 | #endif | 159 | #endif |
| 156 | void __iomem *io_base; | 160 | void __iomem *io_base; |
| @@ -169,6 +173,9 @@ struct omap_dm_timer { | |||
| 169 | #define omap3_dm_timers NULL | 173 | #define omap3_dm_timers NULL |
| 170 | #define omap3_dm_source_names NULL | 174 | #define omap3_dm_source_names NULL |
| 171 | #define omap3_dm_source_clocks NULL | 175 | #define omap3_dm_source_clocks NULL |
| 176 | #define omap4_dm_timers NULL | ||
| 177 | #define omap4_dm_source_names NULL | ||
| 178 | #define omap4_dm_source_clocks NULL | ||
| 172 | 179 | ||
| 173 | static struct omap_dm_timer omap1_dm_timers[] = { | 180 | static struct omap_dm_timer omap1_dm_timers[] = { |
| 174 | { .phys_base = 0xfffb1400, .irq = INT_1610_GPTIMER1 }, | 181 | { .phys_base = 0xfffb1400, .irq = INT_1610_GPTIMER1 }, |
| @@ -191,6 +198,9 @@ static const int dm_timer_count = ARRAY_SIZE(omap1_dm_timers); | |||
| 191 | #define omap3_dm_timers NULL | 198 | #define omap3_dm_timers NULL |
| 192 | #define omap3_dm_source_names NULL | 199 | #define omap3_dm_source_names NULL |
| 193 | #define omap3_dm_source_clocks NULL | 200 | #define omap3_dm_source_clocks NULL |
| 201 | #define omap4_dm_timers NULL | ||
| 202 | #define omap4_dm_source_names NULL | ||
| 203 | #define omap4_dm_source_clocks NULL | ||
| 194 | 204 | ||
| 195 | static struct omap_dm_timer omap2_dm_timers[] = { | 205 | static struct omap_dm_timer omap2_dm_timers[] = { |
| 196 | { .phys_base = 0x48028000, .irq = INT_24XX_GPTIMER1 }, | 206 | { .phys_base = 0x48028000, .irq = INT_24XX_GPTIMER1 }, |
| @@ -214,7 +224,7 @@ static const char *omap2_dm_source_names[] __initdata = { | |||
| 214 | NULL | 224 | NULL |
| 215 | }; | 225 | }; |
| 216 | 226 | ||
| 217 | static struct clk **omap2_dm_source_clocks[3]; | 227 | static struct clk *omap2_dm_source_clocks[3]; |
| 218 | static const int dm_timer_count = ARRAY_SIZE(omap2_dm_timers); | 228 | static const int dm_timer_count = ARRAY_SIZE(omap2_dm_timers); |
| 219 | 229 | ||
| 220 | #elif defined(CONFIG_ARCH_OMAP3) | 230 | #elif defined(CONFIG_ARCH_OMAP3) |
| @@ -225,6 +235,9 @@ static const int dm_timer_count = ARRAY_SIZE(omap2_dm_timers); | |||
| 225 | #define omap2_dm_timers NULL | 235 | #define omap2_dm_timers NULL |
| 226 | #define omap2_dm_source_names NULL | 236 | #define omap2_dm_source_names NULL |
| 227 | #define omap2_dm_source_clocks NULL | 237 | #define omap2_dm_source_clocks NULL |
| 238 | #define omap4_dm_timers NULL | ||
| 239 | #define omap4_dm_source_names NULL | ||
| 240 | #define omap4_dm_source_clocks NULL | ||
| 228 | 241 | ||
| 229 | static struct omap_dm_timer omap3_dm_timers[] = { | 242 | static struct omap_dm_timer omap3_dm_timers[] = { |
| 230 | { .phys_base = 0x48318000, .irq = INT_24XX_GPTIMER1 }, | 243 | { .phys_base = 0x48318000, .irq = INT_24XX_GPTIMER1 }, |
| @@ -247,9 +260,43 @@ static const char *omap3_dm_source_names[] __initdata = { | |||
| 247 | NULL | 260 | NULL |
| 248 | }; | 261 | }; |
| 249 | 262 | ||
| 250 | static struct clk **omap3_dm_source_clocks[2]; | 263 | static struct clk *omap3_dm_source_clocks[2]; |
| 251 | static const int dm_timer_count = ARRAY_SIZE(omap3_dm_timers); | 264 | static const int dm_timer_count = ARRAY_SIZE(omap3_dm_timers); |
| 252 | 265 | ||
| 266 | #elif defined(CONFIG_ARCH_OMAP4) | ||
| 267 | |||
| 268 | #define omap_dm_clk_enable(x) clk_enable(x) | ||
| 269 | #define omap_dm_clk_disable(x) clk_disable(x) | ||
| 270 | #define omap1_dm_timers NULL | ||
| 271 | #define omap2_dm_timers NULL | ||
| 272 | #define omap2_dm_source_names NULL | ||
| 273 | #define omap2_dm_source_clocks NULL | ||
| 274 | #define omap3_dm_timers NULL | ||
| 275 | #define omap3_dm_source_names NULL | ||
| 276 | #define omap3_dm_source_clocks NULL | ||
| 277 | |||
| 278 | static struct omap_dm_timer omap4_dm_timers[] = { | ||
| 279 | { .phys_base = 0x4a318000, .irq = INT_44XX_GPTIMER1 }, | ||
| 280 | { .phys_base = 0x48032000, .irq = INT_44XX_GPTIMER2 }, | ||
| 281 | { .phys_base = 0x48034000, .irq = INT_44XX_GPTIMER3 }, | ||
| 282 | { .phys_base = 0x48036000, .irq = INT_44XX_GPTIMER4 }, | ||
| 283 | { .phys_base = 0x40138000, .irq = INT_44XX_GPTIMER5 }, | ||
| 284 | { .phys_base = 0x4013a000, .irq = INT_44XX_GPTIMER6 }, | ||
| 285 | { .phys_base = 0x4013a000, .irq = INT_44XX_GPTIMER7 }, | ||
| 286 | { .phys_base = 0x4013e000, .irq = INT_44XX_GPTIMER8 }, | ||
| 287 | { .phys_base = 0x4803e000, .irq = INT_44XX_GPTIMER9 }, | ||
| 288 | { .phys_base = 0x48086000, .irq = INT_44XX_GPTIMER10 }, | ||
| 289 | { .phys_base = 0x48088000, .irq = INT_44XX_GPTIMER11 }, | ||
| 290 | { .phys_base = 0x4a320000, .irq = INT_44XX_GPTIMER12 }, | ||
| 291 | }; | ||
| 292 | static const char *omap4_dm_source_names[] __initdata = { | ||
| 293 | "sys_ck", | ||
| 294 | "omap_32k_fck", | ||
| 295 | NULL | ||
| 296 | }; | ||
| 297 | static struct clk *omap4_dm_source_clocks[2]; | ||
| 298 | static const int dm_timer_count = ARRAY_SIZE(omap4_dm_timers); | ||
| 299 | |||
| 253 | #else | 300 | #else |
| 254 | 301 | ||
| 255 | #error OMAP architecture not supported! | 302 | #error OMAP architecture not supported! |
| @@ -257,7 +304,7 @@ static const int dm_timer_count = ARRAY_SIZE(omap3_dm_timers); | |||
| 257 | #endif | 304 | #endif |
| 258 | 305 | ||
| 259 | static struct omap_dm_timer *dm_timers; | 306 | static struct omap_dm_timer *dm_timers; |
| 260 | static char **dm_source_names; | 307 | static const char **dm_source_names; |
| 261 | static struct clk **dm_source_clocks; | 308 | static struct clk **dm_source_clocks; |
| 262 | 309 | ||
| 263 | static spinlock_t dm_timer_lock; | 310 | static spinlock_t dm_timer_lock; |
| @@ -459,7 +506,8 @@ __u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask) | |||
| 459 | } | 506 | } |
| 460 | EXPORT_SYMBOL_GPL(omap_dm_timer_modify_idlect_mask); | 507 | EXPORT_SYMBOL_GPL(omap_dm_timer_modify_idlect_mask); |
| 461 | 508 | ||
| 462 | #elif defined(CONFIG_ARCH_OMAP2) || defined (CONFIG_ARCH_OMAP3) | 509 | #elif defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \ |
| 510 | defined(CONFIG_ARCH_OMAP4) | ||
| 463 | 511 | ||
| 464 | struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer) | 512 | struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer) |
| 465 | { | 513 | { |
| @@ -705,12 +753,16 @@ int __init omap_dm_timer_init(void) | |||
| 705 | dm_timers = omap1_dm_timers; | 753 | dm_timers = omap1_dm_timers; |
| 706 | else if (cpu_is_omap24xx()) { | 754 | else if (cpu_is_omap24xx()) { |
| 707 | dm_timers = omap2_dm_timers; | 755 | dm_timers = omap2_dm_timers; |
| 708 | dm_source_names = (char **)omap2_dm_source_names; | 756 | dm_source_names = omap2_dm_source_names; |
| 709 | dm_source_clocks = (struct clk **)omap2_dm_source_clocks; | 757 | dm_source_clocks = omap2_dm_source_clocks; |
| 710 | } else if (cpu_is_omap34xx()) { | 758 | } else if (cpu_is_omap34xx()) { |
| 711 | dm_timers = omap3_dm_timers; | 759 | dm_timers = omap3_dm_timers; |
| 712 | dm_source_names = (char **)omap3_dm_source_names; | 760 | dm_source_names = omap3_dm_source_names; |
| 713 | dm_source_clocks = (struct clk **)omap3_dm_source_clocks; | 761 | dm_source_clocks = omap3_dm_source_clocks; |
| 762 | } else if (cpu_is_omap44xx()) { | ||
| 763 | dm_timers = omap4_dm_timers; | ||
| 764 | dm_source_names = omap4_dm_source_names; | ||
| 765 | dm_source_clocks = omap4_dm_source_clocks; | ||
| 714 | } | 766 | } |
| 715 | 767 | ||
| 716 | if (cpu_class_is_omap2()) | 768 | if (cpu_class_is_omap2()) |
| @@ -723,7 +775,8 @@ int __init omap_dm_timer_init(void) | |||
| 723 | for (i = 0; i < dm_timer_count; i++) { | 775 | for (i = 0; i < dm_timer_count; i++) { |
| 724 | timer = &dm_timers[i]; | 776 | timer = &dm_timers[i]; |
| 725 | timer->io_base = IO_ADDRESS(timer->phys_base); | 777 | timer->io_base = IO_ADDRESS(timer->phys_base); |
| 726 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) | 778 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \ |
| 779 | defined(CONFIG_ARCH_OMAP4) | ||
| 727 | if (cpu_class_is_omap2()) { | 780 | if (cpu_class_is_omap2()) { |
| 728 | char clk_name[16]; | 781 | char clk_name[16]; |
| 729 | sprintf(clk_name, "gpt%d_ick", i + 1); | 782 | sprintf(clk_name, "gpt%d_ick", i + 1); |
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index ee0b21f5b094..7fd89ba8d3b5 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c | |||
| @@ -6,6 +6,9 @@ | |||
| 6 | * Copyright (C) 2003-2005 Nokia Corporation | 6 | * Copyright (C) 2003-2005 Nokia Corporation |
| 7 | * Written by Juha Yrjölä <juha.yrjola@nokia.com> | 7 | * Written by Juha Yrjölä <juha.yrjola@nokia.com> |
| 8 | * | 8 | * |
| 9 | * Copyright (C) 2009 Texas Instruments | ||
| 10 | * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com> | ||
| 11 | * | ||
| 9 | * This program is free software; you can redistribute it and/or modify | 12 | * This program is free software; you can redistribute it and/or modify |
| 10 | * it under the terms of the GNU General Public License version 2 as | 13 | * it under the terms of the GNU General Public License version 2 as |
| 11 | * published by the Free Software Foundation. | 14 | * published by the Free Software Foundation. |
| @@ -146,6 +149,16 @@ | |||
| 146 | #define OMAP34XX_GPIO5_BASE IO_ADDRESS(0x49056000) | 149 | #define OMAP34XX_GPIO5_BASE IO_ADDRESS(0x49056000) |
| 147 | #define OMAP34XX_GPIO6_BASE IO_ADDRESS(0x49058000) | 150 | #define OMAP34XX_GPIO6_BASE IO_ADDRESS(0x49058000) |
| 148 | 151 | ||
| 152 | /* | ||
| 153 | * OMAP44XX specific GPIO registers | ||
| 154 | */ | ||
| 155 | #define OMAP44XX_GPIO1_BASE IO_ADDRESS(0x4a310000) | ||
| 156 | #define OMAP44XX_GPIO2_BASE IO_ADDRESS(0x48055000) | ||
| 157 | #define OMAP44XX_GPIO3_BASE IO_ADDRESS(0x48057000) | ||
| 158 | #define OMAP44XX_GPIO4_BASE IO_ADDRESS(0x48059000) | ||
| 159 | #define OMAP44XX_GPIO5_BASE IO_ADDRESS(0x4805B000) | ||
| 160 | #define OMAP44XX_GPIO6_BASE IO_ADDRESS(0x4805D000) | ||
| 161 | |||
| 149 | #define OMAP_MPUIO_VBASE IO_ADDRESS(OMAP_MPUIO_BASE) | 162 | #define OMAP_MPUIO_VBASE IO_ADDRESS(OMAP_MPUIO_BASE) |
| 150 | 163 | ||
| 151 | struct gpio_bank { | 164 | struct gpio_bank { |
| @@ -153,11 +166,13 @@ struct gpio_bank { | |||
| 153 | u16 irq; | 166 | u16 irq; |
| 154 | u16 virtual_irq_start; | 167 | u16 virtual_irq_start; |
| 155 | int method; | 168 | int method; |
| 156 | #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 169 | #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || \ |
| 170 | defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4) | ||
| 157 | u32 suspend_wakeup; | 171 | u32 suspend_wakeup; |
| 158 | u32 saved_wakeup; | 172 | u32 saved_wakeup; |
| 159 | #endif | 173 | #endif |
| 160 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 174 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 175 | defined(CONFIG_ARCH_OMAP4) | ||
| 161 | u32 non_wakeup_gpios; | 176 | u32 non_wakeup_gpios; |
| 162 | u32 enabled_non_wakeup_gpios; | 177 | u32 enabled_non_wakeup_gpios; |
| 163 | 178 | ||
| @@ -251,6 +266,24 @@ static struct gpio_bank gpio_bank_34xx[6] = { | |||
| 251 | 266 | ||
| 252 | #endif | 267 | #endif |
| 253 | 268 | ||
| 269 | #ifdef CONFIG_ARCH_OMAP4 | ||
| 270 | static struct gpio_bank gpio_bank_44xx[6] = { | ||
| 271 | { OMAP44XX_GPIO1_BASE, INT_44XX_GPIO_BANK1, IH_GPIO_BASE, \ | ||
| 272 | METHOD_GPIO_24XX }, | ||
| 273 | { OMAP44XX_GPIO2_BASE, INT_44XX_GPIO_BANK2, IH_GPIO_BASE + 32, \ | ||
| 274 | METHOD_GPIO_24XX }, | ||
| 275 | { OMAP44XX_GPIO3_BASE, INT_44XX_GPIO_BANK3, IH_GPIO_BASE + 64, \ | ||
| 276 | METHOD_GPIO_24XX }, | ||
| 277 | { OMAP44XX_GPIO4_BASE, INT_44XX_GPIO_BANK4, IH_GPIO_BASE + 96, \ | ||
| 278 | METHOD_GPIO_24XX }, | ||
| 279 | { OMAP44XX_GPIO5_BASE, INT_44XX_GPIO_BANK5, IH_GPIO_BASE + 128, \ | ||
| 280 | METHOD_GPIO_24XX }, | ||
| 281 | { OMAP44XX_GPIO6_BASE, INT_44XX_GPIO_BANK6, IH_GPIO_BASE + 160, \ | ||
| 282 | METHOD_GPIO_24XX }, | ||
| 283 | }; | ||
| 284 | |||
| 285 | #endif | ||
| 286 | |||
| 254 | static struct gpio_bank *gpio_bank; | 287 | static struct gpio_bank *gpio_bank; |
| 255 | static int gpio_bank_count; | 288 | static int gpio_bank_count; |
| 256 | 289 | ||
| @@ -273,7 +306,7 @@ static inline struct gpio_bank *get_gpio_bank(int gpio) | |||
| 273 | } | 306 | } |
| 274 | if (cpu_is_omap24xx()) | 307 | if (cpu_is_omap24xx()) |
| 275 | return &gpio_bank[gpio >> 5]; | 308 | return &gpio_bank[gpio >> 5]; |
| 276 | if (cpu_is_omap34xx()) | 309 | if (cpu_is_omap34xx() || cpu_is_omap44xx()) |
| 277 | return &gpio_bank[gpio >> 5]; | 310 | return &gpio_bank[gpio >> 5]; |
| 278 | BUG(); | 311 | BUG(); |
| 279 | return NULL; | 312 | return NULL; |
| @@ -285,7 +318,7 @@ static inline int get_gpio_index(int gpio) | |||
| 285 | return gpio & 0x1f; | 318 | return gpio & 0x1f; |
| 286 | if (cpu_is_omap24xx()) | 319 | if (cpu_is_omap24xx()) |
| 287 | return gpio & 0x1f; | 320 | return gpio & 0x1f; |
| 288 | if (cpu_is_omap34xx()) | 321 | if (cpu_is_omap34xx() || cpu_is_omap44xx()) |
| 289 | return gpio & 0x1f; | 322 | return gpio & 0x1f; |
| 290 | return gpio & 0x0f; | 323 | return gpio & 0x0f; |
| 291 | } | 324 | } |
| @@ -307,7 +340,7 @@ static inline int gpio_valid(int gpio) | |||
| 307 | return 0; | 340 | return 0; |
| 308 | if (cpu_is_omap24xx() && gpio < 128) | 341 | if (cpu_is_omap24xx() && gpio < 128) |
| 309 | return 0; | 342 | return 0; |
| 310 | if (cpu_is_omap34xx() && gpio < 192) | 343 | if ((cpu_is_omap34xx() || cpu_is_omap44xx()) && gpio < 192) |
| 311 | return 0; | 344 | return 0; |
| 312 | return -1; | 345 | return -1; |
| 313 | } | 346 | } |
| @@ -353,7 +386,8 @@ static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input) | |||
| 353 | reg += OMAP850_GPIO_DIR_CONTROL; | 386 | reg += OMAP850_GPIO_DIR_CONTROL; |
| 354 | break; | 387 | break; |
| 355 | #endif | 388 | #endif |
| 356 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 389 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 390 | defined(CONFIG_ARCH_OMAP4) | ||
| 357 | case METHOD_GPIO_24XX: | 391 | case METHOD_GPIO_24XX: |
| 358 | reg += OMAP24XX_GPIO_OE; | 392 | reg += OMAP24XX_GPIO_OE; |
| 359 | break; | 393 | break; |
| @@ -425,7 +459,8 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable) | |||
| 425 | l &= ~(1 << gpio); | 459 | l &= ~(1 << gpio); |
| 426 | break; | 460 | break; |
| 427 | #endif | 461 | #endif |
| 428 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 462 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 463 | defined(CONFIG_ARCH_OMAP4) | ||
| 429 | case METHOD_GPIO_24XX: | 464 | case METHOD_GPIO_24XX: |
| 430 | if (enable) | 465 | if (enable) |
| 431 | reg += OMAP24XX_GPIO_SETDATAOUT; | 466 | reg += OMAP24XX_GPIO_SETDATAOUT; |
| @@ -476,7 +511,8 @@ static int __omap_get_gpio_datain(int gpio) | |||
| 476 | reg += OMAP850_GPIO_DATA_INPUT; | 511 | reg += OMAP850_GPIO_DATA_INPUT; |
| 477 | break; | 512 | break; |
| 478 | #endif | 513 | #endif |
| 479 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 514 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 515 | defined(CONFIG_ARCH_OMAP4) | ||
| 480 | case METHOD_GPIO_24XX: | 516 | case METHOD_GPIO_24XX: |
| 481 | reg += OMAP24XX_GPIO_DATAIN; | 517 | reg += OMAP24XX_GPIO_DATAIN; |
| 482 | break; | 518 | break; |
| @@ -520,7 +556,7 @@ void omap_set_gpio_debounce(int gpio, int enable) | |||
| 520 | else | 556 | else |
| 521 | goto done; | 557 | goto done; |
| 522 | 558 | ||
| 523 | if (cpu_is_omap34xx()) { | 559 | if (cpu_is_omap34xx() || cpu_is_omap44xx()) { |
| 524 | if (enable) | 560 | if (enable) |
| 525 | clk_enable(bank->dbck); | 561 | clk_enable(bank->dbck); |
| 526 | else | 562 | else |
| @@ -550,7 +586,8 @@ void omap_set_gpio_debounce_time(int gpio, int enc_time) | |||
| 550 | } | 586 | } |
| 551 | EXPORT_SYMBOL(omap_set_gpio_debounce_time); | 587 | EXPORT_SYMBOL(omap_set_gpio_debounce_time); |
| 552 | 588 | ||
| 553 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 589 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 590 | defined(CONFIG_ARCH_OMAP4) | ||
| 554 | static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio, | 591 | static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio, |
| 555 | int trigger) | 592 | int trigger) |
| 556 | { | 593 | { |
| @@ -660,7 +697,8 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) | |||
| 660 | goto bad; | 697 | goto bad; |
| 661 | break; | 698 | break; |
| 662 | #endif | 699 | #endif |
| 663 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 700 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 701 | defined(CONFIG_ARCH_OMAP4) | ||
| 664 | case METHOD_GPIO_24XX: | 702 | case METHOD_GPIO_24XX: |
| 665 | set_24xx_gpio_triggering(bank, gpio, trigger); | 703 | set_24xx_gpio_triggering(bank, gpio, trigger); |
| 666 | break; | 704 | break; |
| @@ -745,7 +783,8 @@ static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask) | |||
| 745 | reg += OMAP850_GPIO_INT_STATUS; | 783 | reg += OMAP850_GPIO_INT_STATUS; |
| 746 | break; | 784 | break; |
| 747 | #endif | 785 | #endif |
| 748 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 786 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 787 | defined(CONFIG_ARCH_OMAP4) | ||
| 749 | case METHOD_GPIO_24XX: | 788 | case METHOD_GPIO_24XX: |
| 750 | reg += OMAP24XX_GPIO_IRQSTATUS1; | 789 | reg += OMAP24XX_GPIO_IRQSTATUS1; |
| 751 | break; | 790 | break; |
| @@ -814,7 +853,8 @@ static u32 _get_gpio_irqbank_mask(struct gpio_bank *bank) | |||
| 814 | inv = 1; | 853 | inv = 1; |
| 815 | break; | 854 | break; |
| 816 | #endif | 855 | #endif |
| 817 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 856 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 857 | defined(CONFIG_ARCH_OMAP4) | ||
| 818 | case METHOD_GPIO_24XX: | 858 | case METHOD_GPIO_24XX: |
| 819 | reg += OMAP24XX_GPIO_IRQENABLE1; | 859 | reg += OMAP24XX_GPIO_IRQENABLE1; |
| 820 | mask = 0xffffffff; | 860 | mask = 0xffffffff; |
| @@ -887,7 +927,8 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab | |||
| 887 | l |= gpio_mask; | 927 | l |= gpio_mask; |
| 888 | break; | 928 | break; |
| 889 | #endif | 929 | #endif |
| 890 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 930 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 931 | defined(CONFIG_ARCH_OMAP4) | ||
| 891 | case METHOD_GPIO_24XX: | 932 | case METHOD_GPIO_24XX: |
| 892 | if (enable) | 933 | if (enable) |
| 893 | reg += OMAP24XX_GPIO_SETIRQENABLE1; | 934 | reg += OMAP24XX_GPIO_SETIRQENABLE1; |
| @@ -932,7 +973,8 @@ static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable) | |||
| 932 | spin_unlock_irqrestore(&bank->lock, flags); | 973 | spin_unlock_irqrestore(&bank->lock, flags); |
| 933 | return 0; | 974 | return 0; |
| 934 | #endif | 975 | #endif |
| 935 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 976 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 977 | defined(CONFIG_ARCH_OMAP4) | ||
| 936 | case METHOD_GPIO_24XX: | 978 | case METHOD_GPIO_24XX: |
| 937 | if (bank->non_wakeup_gpios & (1 << gpio)) { | 979 | if (bank->non_wakeup_gpios & (1 << gpio)) { |
| 938 | printk(KERN_ERR "Unable to modify wakeup on " | 980 | printk(KERN_ERR "Unable to modify wakeup on " |
| @@ -1017,7 +1059,8 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset) | |||
| 1017 | __raw_writel(1 << offset, reg); | 1059 | __raw_writel(1 << offset, reg); |
| 1018 | } | 1060 | } |
| 1019 | #endif | 1061 | #endif |
| 1020 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 1062 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 1063 | defined(CONFIG_ARCH_OMAP4) | ||
| 1021 | if (bank->method == METHOD_GPIO_24XX) { | 1064 | if (bank->method == METHOD_GPIO_24XX) { |
| 1022 | /* Disable wake-up during idle for dynamic tick */ | 1065 | /* Disable wake-up during idle for dynamic tick */ |
| 1023 | void __iomem *reg = bank->base + OMAP24XX_GPIO_CLEARWKUENA; | 1066 | void __iomem *reg = bank->base + OMAP24XX_GPIO_CLEARWKUENA; |
| @@ -1069,7 +1112,8 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc) | |||
| 1069 | if (bank->method == METHOD_GPIO_850) | 1112 | if (bank->method == METHOD_GPIO_850) |
| 1070 | isr_reg = bank->base + OMAP850_GPIO_INT_STATUS; | 1113 | isr_reg = bank->base + OMAP850_GPIO_INT_STATUS; |
| 1071 | #endif | 1114 | #endif |
| 1072 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 1115 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 1116 | defined(CONFIG_ARCH_OMAP4) | ||
| 1073 | if (bank->method == METHOD_GPIO_24XX) | 1117 | if (bank->method == METHOD_GPIO_24XX) |
| 1074 | isr_reg = bank->base + OMAP24XX_GPIO_IRQSTATUS1; | 1118 | isr_reg = bank->base + OMAP24XX_GPIO_IRQSTATUS1; |
| 1075 | #endif | 1119 | #endif |
| @@ -1346,7 +1390,7 @@ static int gpio_2irq(struct gpio_chip *chip, unsigned offset) | |||
| 1346 | /*---------------------------------------------------------------------*/ | 1390 | /*---------------------------------------------------------------------*/ |
| 1347 | 1391 | ||
| 1348 | static int initialized; | 1392 | static int initialized; |
| 1349 | #if !defined(CONFIG_ARCH_OMAP3) | 1393 | #if !(defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)) |
| 1350 | static struct clk * gpio_ick; | 1394 | static struct clk * gpio_ick; |
| 1351 | #endif | 1395 | #endif |
| 1352 | 1396 | ||
| @@ -1359,7 +1403,7 @@ static struct clk * gpio5_ick; | |||
| 1359 | static struct clk * gpio5_fck; | 1403 | static struct clk * gpio5_fck; |
| 1360 | #endif | 1404 | #endif |
| 1361 | 1405 | ||
| 1362 | #if defined(CONFIG_ARCH_OMAP3) | 1406 | #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) |
| 1363 | static struct clk *gpio_iclks[OMAP34XX_NR_GPIOS]; | 1407 | static struct clk *gpio_iclks[OMAP34XX_NR_GPIOS]; |
| 1364 | #endif | 1408 | #endif |
| 1365 | 1409 | ||
| @@ -1419,8 +1463,8 @@ static int __init _omap_gpio_init(void) | |||
| 1419 | } | 1463 | } |
| 1420 | #endif | 1464 | #endif |
| 1421 | 1465 | ||
| 1422 | #if defined(CONFIG_ARCH_OMAP3) | 1466 | #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) |
| 1423 | if (cpu_is_omap34xx()) { | 1467 | if (cpu_is_omap34xx() || cpu_is_omap44xx()) { |
| 1424 | for (i = 0; i < OMAP34XX_NR_GPIOS; i++) { | 1468 | for (i = 0; i < OMAP34XX_NR_GPIOS; i++) { |
| 1425 | sprintf(clk_name, "gpio%d_ick", i + 1); | 1469 | sprintf(clk_name, "gpio%d_ick", i + 1); |
| 1426 | gpio_iclks[i] = clk_get(NULL, clk_name); | 1470 | gpio_iclks[i] = clk_get(NULL, clk_name); |
| @@ -1497,6 +1541,17 @@ static int __init _omap_gpio_init(void) | |||
| 1497 | (rev >> 4) & 0x0f, rev & 0x0f); | 1541 | (rev >> 4) & 0x0f, rev & 0x0f); |
| 1498 | } | 1542 | } |
| 1499 | #endif | 1543 | #endif |
| 1544 | #ifdef CONFIG_ARCH_OMAP4 | ||
| 1545 | if (cpu_is_omap44xx()) { | ||
| 1546 | int rev; | ||
| 1547 | |||
| 1548 | gpio_bank_count = OMAP34XX_NR_GPIOS; | ||
| 1549 | gpio_bank = gpio_bank_44xx; | ||
| 1550 | rev = __raw_readl(gpio_bank[0].base + OMAP24XX_GPIO_REVISION); | ||
| 1551 | printk(KERN_INFO "OMAP44xx GPIO hardware version %d.%d\n", | ||
| 1552 | (rev >> 4) & 0x0f, rev & 0x0f); | ||
| 1553 | } | ||
| 1554 | #endif | ||
| 1500 | for (i = 0; i < gpio_bank_count; i++) { | 1555 | for (i = 0; i < gpio_bank_count; i++) { |
| 1501 | int j, gpio_count = 16; | 1556 | int j, gpio_count = 16; |
| 1502 | 1557 | ||
| @@ -1520,7 +1575,8 @@ static int __init _omap_gpio_init(void) | |||
| 1520 | gpio_count = 32; /* 730 has 32-bit GPIOs */ | 1575 | gpio_count = 32; /* 730 has 32-bit GPIOs */ |
| 1521 | } | 1576 | } |
| 1522 | 1577 | ||
| 1523 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 1578 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 1579 | defined(CONFIG_ARCH_OMAP4) | ||
| 1524 | if (bank->method == METHOD_GPIO_24XX) { | 1580 | if (bank->method == METHOD_GPIO_24XX) { |
| 1525 | static const u32 non_wakeup_gpios[] = { | 1581 | static const u32 non_wakeup_gpios[] = { |
| 1526 | 0xe203ffc0, 0x08700040 | 1582 | 0xe203ffc0, 0x08700040 |
| @@ -1577,7 +1633,7 @@ static int __init _omap_gpio_init(void) | |||
| 1577 | set_irq_chained_handler(bank->irq, gpio_irq_handler); | 1633 | set_irq_chained_handler(bank->irq, gpio_irq_handler); |
| 1578 | set_irq_data(bank->irq, bank); | 1634 | set_irq_data(bank->irq, bank); |
| 1579 | 1635 | ||
| 1580 | if (cpu_is_omap34xx()) { | 1636 | if (cpu_is_omap34xx() || cpu_is_omap44xx()) { |
| 1581 | sprintf(clk_name, "gpio%d_dbck", i + 1); | 1637 | sprintf(clk_name, "gpio%d_dbck", i + 1); |
| 1582 | bank->dbck = clk_get(NULL, clk_name); | 1638 | bank->dbck = clk_get(NULL, clk_name); |
| 1583 | if (IS_ERR(bank->dbck)) | 1639 | if (IS_ERR(bank->dbck)) |
| @@ -1599,7 +1655,8 @@ static int __init _omap_gpio_init(void) | |||
| 1599 | return 0; | 1655 | return 0; |
| 1600 | } | 1656 | } |
| 1601 | 1657 | ||
| 1602 | #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 1658 | #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || \ |
| 1659 | defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4) | ||
| 1603 | static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg) | 1660 | static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg) |
| 1604 | { | 1661 | { |
| 1605 | int i; | 1662 | int i; |
| @@ -1622,7 +1679,8 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg) | |||
| 1622 | wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA; | 1679 | wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA; |
| 1623 | break; | 1680 | break; |
| 1624 | #endif | 1681 | #endif |
| 1625 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 1682 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 1683 | defined(CONFIG_ARCH_OMAP4) | ||
| 1626 | case METHOD_GPIO_24XX: | 1684 | case METHOD_GPIO_24XX: |
| 1627 | wake_status = bank->base + OMAP24XX_GPIO_WAKE_EN; | 1685 | wake_status = bank->base + OMAP24XX_GPIO_WAKE_EN; |
| 1628 | wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA; | 1686 | wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA; |
| @@ -1663,7 +1721,8 @@ static int omap_gpio_resume(struct sys_device *dev) | |||
| 1663 | wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA; | 1721 | wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA; |
| 1664 | break; | 1722 | break; |
| 1665 | #endif | 1723 | #endif |
| 1666 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 1724 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 1725 | defined(CONFIG_ARCH_OMAP4) | ||
| 1667 | case METHOD_GPIO_24XX: | 1726 | case METHOD_GPIO_24XX: |
| 1668 | wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA; | 1727 | wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA; |
| 1669 | wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA; | 1728 | wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA; |
| @@ -1695,7 +1754,8 @@ static struct sys_device omap_gpio_device = { | |||
| 1695 | 1754 | ||
| 1696 | #endif | 1755 | #endif |
| 1697 | 1756 | ||
| 1698 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 1757 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 1758 | defined(CONFIG_ARCH_OMAP4) | ||
| 1699 | 1759 | ||
| 1700 | static int workaround_enabled; | 1760 | static int workaround_enabled; |
| 1701 | 1761 | ||
| @@ -1711,7 +1771,8 @@ void omap2_gpio_prepare_for_retention(void) | |||
| 1711 | 1771 | ||
| 1712 | if (!(bank->enabled_non_wakeup_gpios)) | 1772 | if (!(bank->enabled_non_wakeup_gpios)) |
| 1713 | continue; | 1773 | continue; |
| 1714 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 1774 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 1775 | defined(CONFIG_ARCH_OMAP4) | ||
| 1715 | bank->saved_datain = __raw_readl(bank->base + OMAP24XX_GPIO_DATAIN); | 1776 | bank->saved_datain = __raw_readl(bank->base + OMAP24XX_GPIO_DATAIN); |
| 1716 | l1 = __raw_readl(bank->base + OMAP24XX_GPIO_FALLINGDETECT); | 1777 | l1 = __raw_readl(bank->base + OMAP24XX_GPIO_FALLINGDETECT); |
| 1717 | l2 = __raw_readl(bank->base + OMAP24XX_GPIO_RISINGDETECT); | 1778 | l2 = __raw_readl(bank->base + OMAP24XX_GPIO_RISINGDETECT); |
| @@ -1720,7 +1781,8 @@ void omap2_gpio_prepare_for_retention(void) | |||
| 1720 | bank->saved_risingdetect = l2; | 1781 | bank->saved_risingdetect = l2; |
| 1721 | l1 &= ~bank->enabled_non_wakeup_gpios; | 1782 | l1 &= ~bank->enabled_non_wakeup_gpios; |
| 1722 | l2 &= ~bank->enabled_non_wakeup_gpios; | 1783 | l2 &= ~bank->enabled_non_wakeup_gpios; |
| 1723 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 1784 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 1785 | defined(CONFIG_ARCH_OMAP4) | ||
| 1724 | __raw_writel(l1, bank->base + OMAP24XX_GPIO_FALLINGDETECT); | 1786 | __raw_writel(l1, bank->base + OMAP24XX_GPIO_FALLINGDETECT); |
| 1725 | __raw_writel(l2, bank->base + OMAP24XX_GPIO_RISINGDETECT); | 1787 | __raw_writel(l2, bank->base + OMAP24XX_GPIO_RISINGDETECT); |
| 1726 | #endif | 1788 | #endif |
| @@ -1745,7 +1807,8 @@ void omap2_gpio_resume_after_retention(void) | |||
| 1745 | 1807 | ||
| 1746 | if (!(bank->enabled_non_wakeup_gpios)) | 1808 | if (!(bank->enabled_non_wakeup_gpios)) |
| 1747 | continue; | 1809 | continue; |
| 1748 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 1810 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 1811 | defined(CONFIG_ARCH_OMAP4) | ||
| 1749 | __raw_writel(bank->saved_fallingdetect, | 1812 | __raw_writel(bank->saved_fallingdetect, |
| 1750 | bank->base + OMAP24XX_GPIO_FALLINGDETECT); | 1813 | bank->base + OMAP24XX_GPIO_FALLINGDETECT); |
| 1751 | __raw_writel(bank->saved_risingdetect, | 1814 | __raw_writel(bank->saved_risingdetect, |
| @@ -1755,14 +1818,16 @@ void omap2_gpio_resume_after_retention(void) | |||
| 1755 | * state. If so, generate an IRQ by software. This is | 1818 | * state. If so, generate an IRQ by software. This is |
| 1756 | * horribly racy, but it's the best we can do to work around | 1819 | * horribly racy, but it's the best we can do to work around |
| 1757 | * this silicon bug. */ | 1820 | * this silicon bug. */ |
| 1758 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 1821 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 1822 | defined(CONFIG_ARCH_OMAP4) | ||
| 1759 | l = __raw_readl(bank->base + OMAP24XX_GPIO_DATAIN); | 1823 | l = __raw_readl(bank->base + OMAP24XX_GPIO_DATAIN); |
| 1760 | #endif | 1824 | #endif |
| 1761 | l ^= bank->saved_datain; | 1825 | l ^= bank->saved_datain; |
| 1762 | l &= bank->non_wakeup_gpios; | 1826 | l &= bank->non_wakeup_gpios; |
| 1763 | if (l) { | 1827 | if (l) { |
| 1764 | u32 old0, old1; | 1828 | u32 old0, old1; |
| 1765 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 1829 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 1830 | defined(CONFIG_ARCH_OMAP4) | ||
| 1766 | old0 = __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT0); | 1831 | old0 = __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT0); |
| 1767 | old1 = __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT1); | 1832 | old1 = __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT1); |
| 1768 | __raw_writel(old0 | l, bank->base + OMAP24XX_GPIO_LEVELDETECT0); | 1833 | __raw_writel(old0 | l, bank->base + OMAP24XX_GPIO_LEVELDETECT0); |
| @@ -1798,7 +1863,8 @@ static int __init omap_gpio_sysinit(void) | |||
| 1798 | 1863 | ||
| 1799 | mpuio_init(); | 1864 | mpuio_init(); |
| 1800 | 1865 | ||
| 1801 | #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 1866 | #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || \ |
| 1867 | defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4) | ||
| 1802 | if (cpu_is_omap16xx() || cpu_class_is_omap2()) { | 1868 | if (cpu_is_omap16xx() || cpu_class_is_omap2()) { |
| 1803 | if (ret == 0) { | 1869 | if (ret == 0) { |
| 1804 | ret = sysdev_class_register(&omap_gpio_sysclass); | 1870 | ret = sysdev_class_register(&omap_gpio_sysclass); |
| @@ -1887,7 +1953,7 @@ static int dbg_gpio_show(struct seq_file *s, void *unused) | |||
| 1887 | 1953 | ||
| 1888 | irqstat = irq_desc[irq].status; | 1954 | irqstat = irq_desc[irq].status; |
| 1889 | #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || \ | 1955 | #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || \ |
| 1890 | defined(CONFIG_ARCH_OMAP34XX) | 1956 | defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4) |
| 1891 | if (is_in && ((bank->suspend_wakeup & mask) | 1957 | if (is_in && ((bank->suspend_wakeup & mask) |
| 1892 | || irqstat & IRQ_TYPE_SENSE_MASK)) { | 1958 | || irqstat & IRQ_TYPE_SENSE_MASK)) { |
| 1893 | char *trigger = NULL; | 1959 | char *trigger = NULL; |
diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c index a303071d5e36..8b848391f0c8 100644 --- a/arch/arm/plat-omap/i2c.c +++ b/arch/arm/plat-omap/i2c.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2007 Nokia Corporation. | 6 | * Copyright (C) 2007 Nokia Corporation. |
| 7 | * | 7 | * |
| 8 | * Contact: Jarkko Nikula <jarkko.nikula@nokia.com> | 8 | * Contact: Jarkko Nikula <jhnikula@gmail.com> |
| 9 | * | 9 | * |
| 10 | * This program is free software; you can redistribute it and/or | 10 | * This program is free software; you can redistribute it and/or |
| 11 | * modify it under the terms of the GNU General Public License | 11 | * modify it under the terms of the GNU General Public License |
diff --git a/arch/arm/plat-omap/include/mach/clock.h b/arch/arm/plat-omap/include/mach/clock.h index 073a2c5569f0..f9f65e1ba3f1 100644 --- a/arch/arm/plat-omap/include/mach/clock.h +++ b/arch/arm/plat-omap/include/mach/clock.h | |||
| @@ -22,7 +22,8 @@ struct clkops { | |||
| 22 | void (*disable)(struct clk *); | 22 | void (*disable)(struct clk *); |
| 23 | }; | 23 | }; |
| 24 | 24 | ||
| 25 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) | 25 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \ |
| 26 | defined(CONFIG_ARCH_OMAP4) | ||
| 26 | 27 | ||
| 27 | struct clksel_rate { | 28 | struct clksel_rate { |
| 28 | u32 val; | 29 | u32 val; |
| @@ -51,7 +52,7 @@ struct dpll_data { | |||
| 51 | u8 max_divider; | 52 | u8 max_divider; |
| 52 | u32 max_tolerance; | 53 | u32 max_tolerance; |
| 53 | u16 max_multiplier; | 54 | u16 max_multiplier; |
| 54 | # if defined(CONFIG_ARCH_OMAP3) | 55 | #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) |
| 55 | u8 modes; | 56 | u8 modes; |
| 56 | void __iomem *autoidle_reg; | 57 | void __iomem *autoidle_reg; |
| 57 | void __iomem *idlest_reg; | 58 | void __iomem *idlest_reg; |
| @@ -83,7 +84,8 @@ struct clk { | |||
| 83 | void (*init)(struct clk *); | 84 | void (*init)(struct clk *); |
| 84 | __u8 enable_bit; | 85 | __u8 enable_bit; |
| 85 | __s8 usecount; | 86 | __s8 usecount; |
| 86 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) | 87 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \ |
| 88 | defined(CONFIG_ARCH_OMAP4) | ||
| 87 | u8 fixed_div; | 89 | u8 fixed_div; |
| 88 | void __iomem *clksel_reg; | 90 | void __iomem *clksel_reg; |
| 89 | u32 clksel_mask; | 91 | u32 clksel_mask; |
| @@ -119,7 +121,7 @@ struct clk_functions { | |||
| 119 | extern unsigned int mpurate; | 121 | extern unsigned int mpurate; |
| 120 | 122 | ||
| 121 | extern int clk_init(struct clk_functions *custom_clocks); | 123 | extern int clk_init(struct clk_functions *custom_clocks); |
| 122 | extern void clk_init_one(struct clk *clk); | 124 | extern void clk_preinit(struct clk *clk); |
| 123 | extern int clk_register(struct clk *clk); | 125 | extern int clk_register(struct clk *clk); |
| 124 | extern void clk_reparent(struct clk *child, struct clk *parent); | 126 | extern void clk_reparent(struct clk *child, struct clk *parent); |
| 125 | extern void clk_unregister(struct clk *clk); | 127 | extern void clk_unregister(struct clk *clk); |
diff --git a/arch/arm/plat-omap/include/mach/common.h b/arch/arm/plat-omap/include/mach/common.h index 0ecf36deb17b..fdeab421b4dc 100644 --- a/arch/arm/plat-omap/include/mach/common.h +++ b/arch/arm/plat-omap/include/mach/common.h | |||
| @@ -33,8 +33,6 @@ struct sys_timer; | |||
| 33 | 33 | ||
| 34 | extern void omap_map_common_io(void); | 34 | extern void omap_map_common_io(void); |
| 35 | extern struct sys_timer omap_timer; | 35 | extern struct sys_timer omap_timer; |
| 36 | extern void omap_serial_init(void); | ||
| 37 | extern void omap_serial_enable_clocks(int enable); | ||
| 38 | #if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE) | 36 | #if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE) |
| 39 | extern int omap_register_i2c_bus(int bus_id, u32 clkrate, | 37 | extern int omap_register_i2c_bus(int bus_id, u32 clkrate, |
| 40 | struct i2c_board_info const *info, | 38 | struct i2c_board_info const *info, |
| @@ -62,6 +60,7 @@ struct omap_globals { | |||
| 62 | void omap2_set_globals_242x(void); | 60 | void omap2_set_globals_242x(void); |
| 63 | void omap2_set_globals_243x(void); | 61 | void omap2_set_globals_243x(void); |
| 64 | void omap2_set_globals_343x(void); | 62 | void omap2_set_globals_343x(void); |
| 63 | void omap2_set_globals_443x(void); | ||
| 65 | 64 | ||
| 66 | /* These get called from omap2_set_globals_xxxx(), do not call these */ | 65 | /* These get called from omap2_set_globals_xxxx(), do not call these */ |
| 67 | void omap2_set_globals_tap(struct omap_globals *); | 66 | void omap2_set_globals_tap(struct omap_globals *); |
diff --git a/arch/arm/plat-omap/include/mach/control.h b/arch/arm/plat-omap/include/mach/control.h index 269147f3836f..8140dbccb7bc 100644 --- a/arch/arm/plat-omap/include/mach/control.h +++ b/arch/arm/plat-omap/include/mach/control.h | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/plat-omap/include/mach/control.h | 2 | * arch/arm/plat-omap/include/mach/control.h |
| 3 | * | 3 | * |
| 4 | * OMAP2/3 System Control Module definitions | 4 | * OMAP2/3/4 System Control Module definitions |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2007-2008 Texas Instruments, Inc. | 6 | * Copyright (C) 2007-2009 Texas Instruments, Inc. |
| 7 | * Copyright (C) 2007-2008 Nokia Corporation | 7 | * Copyright (C) 2007-2008 Nokia Corporation |
| 8 | * | 8 | * |
| 9 | * Written by Paul Walmsley | 9 | * Written by Paul Walmsley |
| @@ -144,6 +144,10 @@ | |||
| 144 | #define OMAP343X_CONTROL_PBIAS_LITE (OMAP2_CONTROL_GENERAL + 0x02b0) | 144 | #define OMAP343X_CONTROL_PBIAS_LITE (OMAP2_CONTROL_GENERAL + 0x02b0) |
| 145 | #define OMAP343X_CONTROL_TEMP_SENSOR (OMAP2_CONTROL_GENERAL + 0x02b4) | 145 | #define OMAP343X_CONTROL_TEMP_SENSOR (OMAP2_CONTROL_GENERAL + 0x02b4) |
| 146 | 146 | ||
| 147 | /* 34xx D2D idle-related pins, handled by PM core */ | ||
| 148 | #define OMAP3_PADCONF_SAD2D_MSTANDBY 0x250 | ||
| 149 | #define OMAP3_PADCONF_SAD2D_IDLEACK 0x254 | ||
| 150 | |||
| 147 | /* | 151 | /* |
| 148 | * REVISIT: This list of registers is not comprehensive - there are more | 152 | * REVISIT: This list of registers is not comprehensive - there are more |
| 149 | * that should be added. | 153 | * that should be added. |
| @@ -189,8 +193,18 @@ | |||
| 189 | #define OMAP2_PBIASLITEPWRDNZ0 (1 << 1) | 193 | #define OMAP2_PBIASLITEPWRDNZ0 (1 << 1) |
| 190 | #define OMAP2_PBIASLITEVMODE0 (1 << 0) | 194 | #define OMAP2_PBIASLITEVMODE0 (1 << 0) |
| 191 | 195 | ||
| 196 | /* CONTROL_IVA2_BOOTMOD bits */ | ||
| 197 | #define OMAP3_IVA2_BOOTMOD_SHIFT 0 | ||
| 198 | #define OMAP3_IVA2_BOOTMOD_MASK (0xf << 0) | ||
| 199 | #define OMAP3_IVA2_BOOTMOD_IDLE (0x1 << 0) | ||
| 200 | |||
| 201 | /* CONTROL_PADCONF_X bits */ | ||
| 202 | #define OMAP3_PADCONF_WAKEUPEVENT0 (1 << 15) | ||
| 203 | #define OMAP3_PADCONF_WAKEUPENABLE0 (1 << 14) | ||
| 204 | |||
| 192 | #ifndef __ASSEMBLY__ | 205 | #ifndef __ASSEMBLY__ |
| 193 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) | 206 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \ |
| 207 | defined(CONFIG_ARCH_OMAP4) | ||
| 194 | extern void __iomem *omap_ctrl_base_get(void); | 208 | extern void __iomem *omap_ctrl_base_get(void); |
| 195 | extern u8 omap_ctrl_readb(u16 offset); | 209 | extern u8 omap_ctrl_readb(u16 offset); |
| 196 | extern u16 omap_ctrl_readw(u16 offset); | 210 | extern u16 omap_ctrl_readw(u16 offset); |
diff --git a/arch/arm/plat-omap/include/mach/cpu.h b/arch/arm/plat-omap/include/mach/cpu.h index 98b144252364..fc60c4ebcc28 100644 --- a/arch/arm/plat-omap/include/mach/cpu.h +++ b/arch/arm/plat-omap/include/mach/cpu.h | |||
| @@ -5,8 +5,12 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2004, 2008 Nokia Corporation | 6 | * Copyright (C) 2004, 2008 Nokia Corporation |
| 7 | * | 7 | * |
| 8 | * Copyright (C) 2009 Texas Instruments. | ||
| 9 | * | ||
| 8 | * Written by Tony Lindgren <tony.lindgren@nokia.com> | 10 | * Written by Tony Lindgren <tony.lindgren@nokia.com> |
| 9 | * | 11 | * |
| 12 | * Added OMAP4 specific defines - Santosh Shilimkar<santosh.shilimkar@ti.com> | ||
| 13 | * | ||
| 10 | * This program is free software; you can redistribute it and/or modify | 14 | * This program is free software; you can redistribute it and/or modify |
| 11 | * it under the terms of the GNU General Public License as published by | 15 | * it under the terms of the GNU General Public License as published by |
| 12 | * the Free Software Foundation; either version 2 of the License, or | 16 | * the Free Software Foundation; either version 2 of the License, or |
| @@ -155,6 +159,8 @@ IS_OMAP_SUBCLASS(343x, 0x343) | |||
| 155 | #define cpu_is_omap243x() 0 | 159 | #define cpu_is_omap243x() 0 |
| 156 | #define cpu_is_omap34xx() 0 | 160 | #define cpu_is_omap34xx() 0 |
| 157 | #define cpu_is_omap343x() 0 | 161 | #define cpu_is_omap343x() 0 |
| 162 | #define cpu_is_omap44xx() 0 | ||
| 163 | #define cpu_is_omap443x() 0 | ||
| 158 | 164 | ||
| 159 | #if defined(MULTI_OMAP1) | 165 | #if defined(MULTI_OMAP1) |
| 160 | # if defined(CONFIG_ARCH_OMAP730) | 166 | # if defined(CONFIG_ARCH_OMAP730) |
| @@ -348,12 +354,21 @@ IS_OMAP_TYPE(3430, 0x3430) | |||
| 348 | # define cpu_is_omap3430() is_omap3430() | 354 | # define cpu_is_omap3430() is_omap3430() |
| 349 | #endif | 355 | #endif |
| 350 | 356 | ||
| 357 | # if defined(CONFIG_ARCH_OMAP4) | ||
| 358 | # undef cpu_is_omap44xx | ||
| 359 | # undef cpu_is_omap443x | ||
| 360 | # define cpu_is_omap44xx() 1 | ||
| 361 | # define cpu_is_omap443x() 1 | ||
| 362 | # endif | ||
| 363 | |||
| 351 | /* Macros to detect if we have OMAP1 or OMAP2 */ | 364 | /* Macros to detect if we have OMAP1 or OMAP2 */ |
| 352 | #define cpu_class_is_omap1() (cpu_is_omap7xx() || cpu_is_omap15xx() || \ | 365 | #define cpu_class_is_omap1() (cpu_is_omap7xx() || cpu_is_omap15xx() || \ |
| 353 | cpu_is_omap16xx()) | 366 | cpu_is_omap16xx()) |
| 354 | #define cpu_class_is_omap2() (cpu_is_omap24xx() || cpu_is_omap34xx()) | 367 | #define cpu_class_is_omap2() (cpu_is_omap24xx() || cpu_is_omap34xx() || \ |
| 368 | cpu_is_omap44xx()) | ||
| 355 | 369 | ||
| 356 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) | 370 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \ |
| 371 | defined(CONFIG_ARCH_OMAP4) | ||
| 357 | 372 | ||
| 358 | /* Various silicon revisions for omap2 */ | 373 | /* Various silicon revisions for omap2 */ |
| 359 | #define OMAP242X_CLASS 0x24200024 | 374 | #define OMAP242X_CLASS 0x24200024 |
| @@ -370,6 +385,8 @@ IS_OMAP_TYPE(3430, 0x3430) | |||
| 370 | #define OMAP3430_REV_ES3_0 0x34303034 | 385 | #define OMAP3430_REV_ES3_0 0x34303034 |
| 371 | #define OMAP3430_REV_ES3_1 0x34304034 | 386 | #define OMAP3430_REV_ES3_1 0x34304034 |
| 372 | 387 | ||
| 388 | #define OMAP443X_CLASS 0x44300034 | ||
| 389 | |||
| 373 | /* | 390 | /* |
| 374 | * omap_chip bits | 391 | * omap_chip bits |
| 375 | * | 392 | * |
diff --git a/arch/arm/plat-omap/include/mach/debug-macro.S b/arch/arm/plat-omap/include/mach/debug-macro.S index 1b11f5c6a2d9..ac24050e3416 100644 --- a/arch/arm/plat-omap/include/mach/debug-macro.S +++ b/arch/arm/plat-omap/include/mach/debug-macro.S | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | add \rx, \rx, #0x00004000 @ UART 3 | 36 | add \rx, \rx, #0x00004000 @ UART 3 |
| 37 | #endif | 37 | #endif |
| 38 | 38 | ||
| 39 | #elif CONFIG_ARCH_OMAP3 | 39 | #elif defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) |
| 40 | moveq \rx, #0x48000000 @ physical base address | 40 | moveq \rx, #0x48000000 @ physical base address |
| 41 | movne \rx, #0xd8000000 @ virtual base | 41 | movne \rx, #0xd8000000 @ virtual base |
| 42 | orr \rx, \rx, #0x0006a000 | 42 | orr \rx, \rx, #0x0006a000 |
diff --git a/arch/arm/plat-omap/include/mach/dma.h b/arch/arm/plat-omap/include/mach/dma.h index 54fe9665b182..8c1eae88737e 100644 --- a/arch/arm/plat-omap/include/mach/dma.h +++ b/arch/arm/plat-omap/include/mach/dma.h | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | /* Hardware registers for omap2 and omap3 */ | 48 | /* Hardware registers for omap2 and omap3 */ |
| 49 | #define OMAP24XX_DMA4_BASE (L4_24XX_BASE + 0x56000) | 49 | #define OMAP24XX_DMA4_BASE (L4_24XX_BASE + 0x56000) |
| 50 | #define OMAP34XX_DMA4_BASE (L4_34XX_BASE + 0x56000) | 50 | #define OMAP34XX_DMA4_BASE (L4_34XX_BASE + 0x56000) |
| 51 | #define OMAP44XX_DMA4_BASE (L4_44XX_BASE + 0x56000) | ||
| 51 | 52 | ||
| 52 | #define OMAP_DMA4_REVISION 0x00 | 53 | #define OMAP_DMA4_REVISION 0x00 |
| 53 | #define OMAP_DMA4_GCR 0x78 | 54 | #define OMAP_DMA4_GCR 0x78 |
| @@ -144,6 +145,7 @@ | |||
| 144 | #define OMAP_DMA4_CSSA_U(n) 0 | 145 | #define OMAP_DMA4_CSSA_U(n) 0 |
| 145 | #define OMAP_DMA4_CDSA_L(n) 0 | 146 | #define OMAP_DMA4_CDSA_L(n) 0 |
| 146 | #define OMAP_DMA4_CDSA_U(n) 0 | 147 | #define OMAP_DMA4_CDSA_U(n) 0 |
| 148 | #define OMAP1_DMA_COLOR(n) 0 | ||
| 147 | 149 | ||
| 148 | /*----------------------------------------------------------------------------*/ | 150 | /*----------------------------------------------------------------------------*/ |
| 149 | 151 | ||
| @@ -531,7 +533,7 @@ extern int omap_get_dma_index(int lch, int *ei, int *fi); | |||
| 531 | /* Chaining APIs */ | 533 | /* Chaining APIs */ |
| 532 | #ifndef CONFIG_ARCH_OMAP1 | 534 | #ifndef CONFIG_ARCH_OMAP1 |
| 533 | extern int omap_request_dma_chain(int dev_id, const char *dev_name, | 535 | extern int omap_request_dma_chain(int dev_id, const char *dev_name, |
| 534 | void (*callback) (int chain_id, u16 ch_status, | 536 | void (*callback) (int lch, u16 ch_status, |
| 535 | void *data), | 537 | void *data), |
| 536 | int *chain_id, int no_of_chans, | 538 | int *chain_id, int no_of_chans, |
| 537 | int chain_mode, | 539 | int chain_mode, |
diff --git a/arch/arm/plat-omap/include/mach/entry-macro.S b/arch/arm/plat-omap/include/mach/entry-macro.S index 2276f89671d8..00f45c01390d 100644 --- a/arch/arm/plat-omap/include/mach/entry-macro.S +++ b/arch/arm/plat-omap/include/mach/entry-macro.S | |||
| @@ -3,6 +3,9 @@ | |||
| 3 | * | 3 | * |
| 4 | * Low-level IRQ helper macros for OMAP-based platforms | 4 | * Low-level IRQ helper macros for OMAP-based platforms |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 Texas Instruments | ||
| 7 | * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com> | ||
| 8 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 7 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| 8 | * warranty of any kind, whether express or implied. | 11 | * warranty of any kind, whether express or implied. |
| @@ -10,6 +13,7 @@ | |||
| 10 | #include <mach/hardware.h> | 13 | #include <mach/hardware.h> |
| 11 | #include <mach/io.h> | 14 | #include <mach/io.h> |
| 12 | #include <mach/irqs.h> | 15 | #include <mach/irqs.h> |
| 16 | #include <asm/hardware/gic.h> | ||
| 13 | 17 | ||
| 14 | #if defined(CONFIG_ARCH_OMAP1) | 18 | #if defined(CONFIG_ARCH_OMAP1) |
| 15 | 19 | ||
| @@ -56,15 +60,21 @@ | |||
| 56 | .endm | 60 | .endm |
| 57 | 61 | ||
| 58 | #endif | 62 | #endif |
| 59 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 63 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ |
| 64 | defined(CONFIG_ARCH_OMAP4) | ||
| 60 | 65 | ||
| 61 | #if defined(CONFIG_ARCH_OMAP24XX) | ||
| 62 | #include <mach/omap24xx.h> | 66 | #include <mach/omap24xx.h> |
| 63 | #endif | ||
| 64 | #if defined(CONFIG_ARCH_OMAP34XX) | ||
| 65 | #include <mach/omap34xx.h> | 67 | #include <mach/omap34xx.h> |
| 66 | #endif | ||
| 67 | 68 | ||
| 69 | /* REVISIT: This should be set dynamically if CONFIG_MULTI_OMAP2 is selected */ | ||
| 70 | #if defined(CONFIG_ARCH_OMAP2420) || defined(CONFIG_ARCH_OMAP2430) | ||
| 71 | #define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP24XX_IC_BASE) | ||
| 72 | #elif defined(CONFIG_ARCH_OMAP34XX) | ||
| 73 | #define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP34XX_IC_BASE) | ||
| 74 | #endif | ||
| 75 | #if defined(CONFIG_ARCH_OMAP4) | ||
| 76 | #include <mach/omap44xx.h> | ||
| 77 | #endif | ||
| 68 | #define INTCPS_SIR_IRQ_OFFSET 0x0040 /* Active interrupt offset */ | 78 | #define INTCPS_SIR_IRQ_OFFSET 0x0040 /* Active interrupt offset */ |
| 69 | #define ACTIVEIRQ_MASK 0x7f /* Active interrupt bits */ | 79 | #define ACTIVEIRQ_MASK 0x7f /* Active interrupt bits */ |
| 70 | 80 | ||
| @@ -77,6 +87,7 @@ | |||
| 77 | .macro arch_ret_to_user, tmp1, tmp2 | 87 | .macro arch_ret_to_user, tmp1, tmp2 |
| 78 | .endm | 88 | .endm |
| 79 | 89 | ||
| 90 | #ifndef CONFIG_ARCH_OMAP4 | ||
| 80 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp | 91 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp |
| 81 | ldr \base, =OMAP2_VA_IC_BASE | 92 | ldr \base, =OMAP2_VA_IC_BASE |
| 82 | ldr \irqnr, [\base, #0x98] /* IRQ pending reg 1 */ | 93 | ldr \irqnr, [\base, #0x98] /* IRQ pending reg 1 */ |
| @@ -92,6 +103,40 @@ | |||
| 92 | and \irqnr, \irqnr, #ACTIVEIRQ_MASK /* Clear spurious bits */ | 103 | and \irqnr, \irqnr, #ACTIVEIRQ_MASK /* Clear spurious bits */ |
| 93 | 104 | ||
| 94 | .endm | 105 | .endm |
| 106 | #else | ||
| 107 | /* | ||
| 108 | * The interrupt numbering scheme is defined in the | ||
| 109 | * interrupt controller spec. To wit: | ||
| 110 | * | ||
| 111 | * Interrupts 0-15 are IPI | ||
| 112 | * 16-28 are reserved | ||
| 113 | * 29-31 are local. We allow 30 to be used for the watchdog. | ||
| 114 | * 32-1020 are global | ||
| 115 | * 1021-1022 are reserved | ||
| 116 | * 1023 is "spurious" (no interrupt) | ||
| 117 | * | ||
| 118 | * For now, we ignore all local interrupts so only return an | ||
| 119 | * interrupt if it's between 30 and 1020. The test_for_ipi | ||
| 120 | * routine below will pick up on IPIs. | ||
| 121 | * A simple read from the controller will tell us the number | ||
| 122 | * of the highest priority enabled interrupt. | ||
| 123 | * We then just need to check whether it is in the | ||
| 124 | * valid range for an IRQ (30-1020 inclusive). | ||
| 125 | */ | ||
| 126 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp | ||
| 127 | ldr \base, =OMAP44XX_VA_GIC_CPU_BASE | ||
| 128 | ldr \irqstat, [\base, #GIC_CPU_INTACK] | ||
| 129 | |||
| 130 | ldr \tmp, =1021 | ||
| 131 | |||
| 132 | bic \irqnr, \irqstat, #0x1c00 | ||
| 133 | |||
| 134 | cmp \irqnr, #29 | ||
| 135 | cmpcc \irqnr, \irqnr | ||
| 136 | cmpne \irqnr, \tmp | ||
| 137 | cmpcs \irqnr, \irqnr | ||
| 138 | .endm | ||
| 139 | #endif | ||
| 95 | 140 | ||
| 96 | .macro irq_prio_table | 141 | .macro irq_prio_table |
| 97 | .endm | 142 | .endm |
diff --git a/arch/arm/plat-omap/include/mach/gpmc-smc91x.h b/arch/arm/plat-omap/include/mach/gpmc-smc91x.h new file mode 100644 index 000000000000..b64fbee4d567 --- /dev/null +++ b/arch/arm/plat-omap/include/mach/gpmc-smc91x.h | |||
| @@ -0,0 +1,42 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/plat-omap/include/mach/gpmc-smc91x.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2009 Nokia Corporation | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #ifndef __ASM_ARCH_OMAP_GPMC_SMC91X_H__ | ||
| 12 | |||
| 13 | #define GPMC_TIMINGS_SMC91C96 (1 << 4) | ||
| 14 | #define GPMC_MUX_ADD_DATA (1 << 5) /* GPMC_CONFIG1_MUXADDDATA */ | ||
| 15 | #define GPMC_READ_MON (1 << 6) /* GPMC_CONFIG1_WAIT_READ_MON */ | ||
| 16 | #define GPMC_WRITE_MON (1 << 7) /* GPMC_CONFIG1_WAIT_WRITE_MON */ | ||
| 17 | |||
| 18 | struct omap_smc91x_platform_data { | ||
| 19 | int cs; | ||
| 20 | int gpio_irq; | ||
| 21 | int gpio_pwrdwn; | ||
| 22 | int gpio_reset; | ||
| 23 | int wait_pin; /* Optional GPMC_CONFIG1_WAITPINSELECT */ | ||
| 24 | u32 flags; | ||
| 25 | int (*retime)(void); | ||
| 26 | }; | ||
| 27 | |||
| 28 | #if defined(CONFIG_SMC91X) || \ | ||
| 29 | defined(CONFIG_SMC91X_MODULE) | ||
| 30 | |||
| 31 | extern void gpmc_smc91x_init(struct omap_smc91x_platform_data *d); | ||
| 32 | |||
| 33 | #else | ||
| 34 | |||
| 35 | #define board_smc91x_data NULL | ||
| 36 | |||
| 37 | static inline void gpmc_smc91x_init(struct omap_smc91x_platform_data *d) | ||
| 38 | { | ||
| 39 | } | ||
| 40 | |||
| 41 | #endif | ||
| 42 | #endif | ||
diff --git a/arch/arm/plat-omap/include/mach/hardware.h b/arch/arm/plat-omap/include/mach/hardware.h index 3dc423ed3e80..26c1fbff08aa 100644 --- a/arch/arm/plat-omap/include/mach/hardware.h +++ b/arch/arm/plat-omap/include/mach/hardware.h | |||
| @@ -285,5 +285,6 @@ | |||
| 285 | #include "omap16xx.h" | 285 | #include "omap16xx.h" |
| 286 | #include "omap24xx.h" | 286 | #include "omap24xx.h" |
| 287 | #include "omap34xx.h" | 287 | #include "omap34xx.h" |
| 288 | #include "omap44xx.h" | ||
| 288 | 289 | ||
| 289 | #endif /* __ASM_ARCH_OMAP_HARDWARE_H */ | 290 | #endif /* __ASM_ARCH_OMAP_HARDWARE_H */ |
diff --git a/arch/arm/plat-omap/include/mach/hwa742.h b/arch/arm/plat-omap/include/mach/hwa742.h index 577f492f2d3c..886248d32b49 100644 --- a/arch/arm/plat-omap/include/mach/hwa742.h +++ b/arch/arm/plat-omap/include/mach/hwa742.h | |||
| @@ -2,10 +2,6 @@ | |||
| 2 | #define _HWA742_H | 2 | #define _HWA742_H |
| 3 | 3 | ||
| 4 | struct hwa742_platform_data { | 4 | struct hwa742_platform_data { |
| 5 | void (*power_up)(struct device *dev); | ||
| 6 | void (*power_down)(struct device *dev); | ||
| 7 | unsigned long (*get_clock_rate)(struct device *dev); | ||
| 8 | |||
| 9 | unsigned te_connected:1; | 5 | unsigned te_connected:1; |
| 10 | }; | 6 | }; |
| 11 | 7 | ||
diff --git a/arch/arm/plat-omap/include/mach/io.h b/arch/arm/plat-omap/include/mach/io.h index 0610d7e2b3d7..3b2814720569 100644 --- a/arch/arm/plat-omap/include/mach/io.h +++ b/arch/arm/plat-omap/include/mach/io.h | |||
| @@ -6,6 +6,9 @@ | |||
| 6 | * Copied from arch/arm/mach-sa1100/include/mach/io.h | 6 | * Copied from arch/arm/mach-sa1100/include/mach/io.h |
| 7 | * Copyright (C) 1997-1999 Russell King | 7 | * Copyright (C) 1997-1999 Russell King |
| 8 | * | 8 | * |
| 9 | * Copyright (C) 2009 Texas Instruments | ||
| 10 | * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com> | ||
| 11 | * | ||
| 9 | * This program is free software; you can redistribute it and/or modify it | 12 | * This program is free software; you can redistribute it and/or modify it |
| 10 | * under the terms of the GNU General Public License as published by the | 13 | * under the terms of the GNU General Public License as published by the |
| 11 | * Free Software Foundation; either version 2 of the License, or (at your | 14 | * Free Software Foundation; either version 2 of the License, or (at your |
| @@ -157,6 +160,40 @@ | |||
| 157 | #define DSP_MMU_34XX_VIRT 0xe2000000 | 160 | #define DSP_MMU_34XX_VIRT 0xe2000000 |
| 158 | #define DSP_MMU_34XX_SIZE SZ_4K | 161 | #define DSP_MMU_34XX_SIZE SZ_4K |
| 159 | 162 | ||
| 163 | |||
| 164 | #elif defined(CONFIG_ARCH_OMAP4) | ||
| 165 | /* We map both L3 and L4 on OMAP4 */ | ||
| 166 | #define L3_44XX_PHYS L3_44XX_BASE | ||
| 167 | #define L3_44XX_VIRT 0xd4000000 | ||
| 168 | #define L3_44XX_SIZE SZ_1M | ||
| 169 | |||
| 170 | #define L4_44XX_PHYS L4_44XX_BASE | ||
| 171 | #define L4_44XX_VIRT 0xda000000 | ||
| 172 | #define L4_44XX_SIZE SZ_4M | ||
| 173 | |||
| 174 | |||
| 175 | #define L4_WK_44XX_PHYS L4_WK_44XX_BASE | ||
| 176 | #define L4_WK_44XX_VIRT 0xda300000 | ||
| 177 | #define L4_WK_44XX_SIZE SZ_1M | ||
| 178 | |||
| 179 | #define L4_PER_44XX_PHYS L4_PER_44XX_BASE | ||
| 180 | #define L4_PER_44XX_VIRT 0xd8000000 | ||
| 181 | #define L4_PER_44XX_SIZE SZ_4M | ||
| 182 | |||
| 183 | #define L4_EMU_44XX_PHYS L4_EMU_44XX_BASE | ||
| 184 | #define L4_EMU_44XX_VIRT 0xe4000000 | ||
| 185 | #define L4_EMU_44XX_SIZE SZ_64M | ||
| 186 | |||
| 187 | #define OMAP44XX_GPMC_PHYS OMAP44XX_GPMC_BASE | ||
| 188 | #define OMAP44XX_GPMC_VIRT 0xe0000000 | ||
| 189 | #define OMAP44XX_GPMC_SIZE SZ_1M | ||
| 190 | |||
| 191 | |||
| 192 | #define IO_OFFSET 0x90000000 | ||
| 193 | #define __IO_ADDRESS(pa) ((pa) + IO_OFFSET)/* Works for L3 and L4 */ | ||
| 194 | #define __OMAP2_IO_ADDRESS(pa) ((pa) + IO_OFFSET)/* Works for L3 and L4 */ | ||
| 195 | #define io_v2p(va) ((va) - IO_OFFSET)/* Works for L3 and L4 */ | ||
| 196 | |||
| 160 | #endif | 197 | #endif |
| 161 | 198 | ||
| 162 | #define IO_ADDRESS(pa) IOMEM(__IO_ADDRESS(pa)) | 199 | #define IO_ADDRESS(pa) IOMEM(__IO_ADDRESS(pa)) |
diff --git a/arch/arm/plat-omap/include/mach/irqs.h b/arch/arm/plat-omap/include/mach/irqs.h index 7f57ee66f364..8015fe27c8b0 100644 --- a/arch/arm/plat-omap/include/mach/irqs.h +++ b/arch/arm/plat-omap/include/mach/irqs.h | |||
| @@ -4,6 +4,9 @@ | |||
| 4 | * Copyright (C) Greg Lonnon 2001 | 4 | * Copyright (C) Greg Lonnon 2001 |
| 5 | * Updated for OMAP-1610 by Tony Lindgren <tony@atomide.com> | 5 | * Updated for OMAP-1610 by Tony Lindgren <tony@atomide.com> |
| 6 | * | 6 | * |
| 7 | * Copyright (C) 2009 Texas Instruments | ||
| 8 | * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com> | ||
| 9 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
| 8 | * it under the terms of the GNU General Public License as published by | 11 | * it under the terms of the GNU General Public License as published by |
| 9 | * the Free Software Foundation; either version 2 of the License, or | 12 | * the Free Software Foundation; either version 2 of the License, or |
| @@ -422,6 +425,92 @@ | |||
| 422 | 425 | ||
| 423 | #define INT_34XX_BENCH_MPU_EMUL 3 | 426 | #define INT_34XX_BENCH_MPU_EMUL 3 |
| 424 | 427 | ||
| 428 | |||
| 429 | #define IRQ_GIC_START 32 | ||
| 430 | |||
| 431 | #define INT_44XX_BENCH_MPU_EMUL (3 + IRQ_GIC_START) | ||
| 432 | #define INT_44XX_SSM_ABORT_IRQ (6 + IRQ_GIC_START) | ||
| 433 | #define INT_44XX_SYS_NIRQ (7 + IRQ_GIC_START) | ||
| 434 | #define INT_44XX_D2D_FW_IRQ (8 + IRQ_GIC_START) | ||
| 435 | #define INT_44XX_PRCM_MPU_IRQ (11 + IRQ_GIC_START) | ||
| 436 | #define INT_44XX_SDMA_IRQ0 (12 + IRQ_GIC_START) | ||
| 437 | #define INT_44XX_SDMA_IRQ1 (13 + IRQ_GIC_START) | ||
| 438 | #define INT_44XX_SDMA_IRQ2 (14 + IRQ_GIC_START) | ||
| 439 | #define INT_44XX_SDMA_IRQ3 (15 + IRQ_GIC_START) | ||
| 440 | #define INT_44XX_ISS_IRQ (24 + IRQ_GIC_START) | ||
| 441 | #define INT_44XX_DSS_IRQ (25 + IRQ_GIC_START) | ||
| 442 | #define INT_44XX_MAIL_U0_MPU (26 + IRQ_GIC_START) | ||
| 443 | #define INT_44XX_DSP_MMU (28 + IRQ_GIC_START) | ||
| 444 | #define INT_44XX_GPTIMER1 (37 + IRQ_GIC_START) | ||
| 445 | #define INT_44XX_GPTIMER2 (38 + IRQ_GIC_START) | ||
| 446 | #define INT_44XX_GPTIMER3 (39 + IRQ_GIC_START) | ||
| 447 | #define INT_44XX_GPTIMER4 (40 + IRQ_GIC_START) | ||
| 448 | #define INT_44XX_GPTIMER5 (41 + IRQ_GIC_START) | ||
| 449 | #define INT_44XX_GPTIMER6 (42 + IRQ_GIC_START) | ||
| 450 | #define INT_44XX_GPTIMER7 (43 + IRQ_GIC_START) | ||
| 451 | #define INT_44XX_GPTIMER8 (44 + IRQ_GIC_START) | ||
| 452 | #define INT_44XX_GPTIMER9 (45 + IRQ_GIC_START) | ||
| 453 | #define INT_44XX_GPTIMER10 (46 + IRQ_GIC_START) | ||
| 454 | #define INT_44XX_GPTIMER11 (47 + IRQ_GIC_START) | ||
| 455 | #define INT_44XX_GPTIMER12 (95 + IRQ_GIC_START) | ||
| 456 | #define INT_44XX_SHA1MD5 (51 + IRQ_GIC_START) | ||
| 457 | #define INT_44XX_I2C1_IRQ (56 + IRQ_GIC_START) | ||
| 458 | #define INT_44XX_I2C2_IRQ (57 + IRQ_GIC_START) | ||
| 459 | #define INT_44XX_HDQ_IRQ (58 + IRQ_GIC_START) | ||
| 460 | #define INT_44XX_SPI1_IRQ (65 + IRQ_GIC_START) | ||
| 461 | #define INT_44XX_SPI2_IRQ (66 + IRQ_GIC_START) | ||
| 462 | #define INT_44XX_HSI_1_IRQ0 (67 + IRQ_GIC_START) | ||
| 463 | #define INT_44XX_HSI_2_IRQ1 (68 + IRQ_GIC_START) | ||
| 464 | #define INT_44XX_HSI_1_DMAIRQ (71 + IRQ_GIC_START) | ||
| 465 | #define INT_44XX_UART1_IRQ (72 + IRQ_GIC_START) | ||
| 466 | #define INT_44XX_UART2_IRQ (73 + IRQ_GIC_START) | ||
| 467 | #define INT_44XX_UART3_IRQ (74 + IRQ_GIC_START) | ||
| 468 | #define INT_44XX_UART4_IRQ (70 + IRQ_GIC_START) | ||
| 469 | #define INT_44XX_USB_IRQ_NISO (76 + IRQ_GIC_START) | ||
| 470 | #define INT_44XX_USB_IRQ_ISO (77 + IRQ_GIC_START) | ||
| 471 | #define INT_44XX_USB_IRQ_HGEN (78 + IRQ_GIC_START) | ||
| 472 | #define INT_44XX_USB_IRQ_HSOF (79 + IRQ_GIC_START) | ||
| 473 | #define INT_44XX_USB_IRQ_OTG (80 + IRQ_GIC_START) | ||
| 474 | #define INT_44XX_MCBSP4_IRQ_TX (81 + IRQ_GIC_START) | ||
| 475 | #define INT_44XX_MCBSP4_IRQ_RX (82 + IRQ_GIC_START) | ||
| 476 | #define INT_44XX_MMC_IRQ (83 + IRQ_GIC_START) | ||
| 477 | #define INT_44XX_MMC2_IRQ (86 + IRQ_GIC_START) | ||
| 478 | #define INT_44XX_MCBSP2_IRQ_TX (89 + IRQ_GIC_START) | ||
| 479 | #define INT_44XX_MCBSP2_IRQ_RX (90 + IRQ_GIC_START) | ||
| 480 | #define INT_44XX_SPI3_IRQ (91 + IRQ_GIC_START) | ||
| 481 | #define INT_44XX_SPI5_IRQ (69 + IRQ_GIC_START) | ||
| 482 | |||
| 483 | #define INT_44XX_MCBSP5_IRQ (16 + IRQ_GIC_START) | ||
| 484 | #define INT_44xX_MCBSP1_IRQ (17 + IRQ_GIC_START) | ||
| 485 | #define INT_44XX_MCBSP2_IRQ (22 + IRQ_GIC_START) | ||
| 486 | #define INT_44XX_MCBSP3_IRQ (23 + IRQ_GIC_START) | ||
| 487 | #define INT_44XX_MCBSP4_IRQ (27 + IRQ_GIC_START) | ||
| 488 | #define INT_44XX_HS_USB_MC (92 + IRQ_GIC_START) | ||
| 489 | #define INT_44XX_HS_USB_DMA (93 + IRQ_GIC_START) | ||
| 490 | |||
| 491 | #define INT_44XX_GPIO_BANK1 (29 + IRQ_GIC_START) | ||
| 492 | #define INT_44XX_GPIO_BANK2 (30 + IRQ_GIC_START) | ||
| 493 | #define INT_44XX_GPIO_BANK3 (31 + IRQ_GIC_START) | ||
| 494 | #define INT_44XX_GPIO_BANK4 (32 + IRQ_GIC_START) | ||
| 495 | #define INT_44XX_GPIO_BANK5 (33 + IRQ_GIC_START) | ||
| 496 | #define INT_44XX_GPIO_BANK6 (34 + IRQ_GIC_START) | ||
| 497 | #define INT_44XX_USIM_IRQ (35 + IRQ_GIC_START) | ||
| 498 | #define INT_44XX_WDT3_IRQ (36 + IRQ_GIC_START) | ||
| 499 | #define INT_44XX_SPI4_IRQ (48 + IRQ_GIC_START) | ||
| 500 | #define INT_44XX_SHA1MD52_IRQ (49 + IRQ_GIC_START) | ||
| 501 | #define INT_44XX_FPKA_READY_IRQ (50 + IRQ_GIC_START) | ||
| 502 | #define INT_44XX_SHA1MD51_IRQ (51 + IRQ_GIC_START) | ||
| 503 | #define INT_44XX_RNG_IRQ (52 + IRQ_GIC_START) | ||
| 504 | #define INT_44XX_I2C3_IRQ (61 + IRQ_GIC_START) | ||
| 505 | #define INT_44XX_FPKA_ERROR_IRQ (64 + IRQ_GIC_START) | ||
| 506 | #define INT_44XX_PBIAS_IRQ (75 + IRQ_GIC_START) | ||
| 507 | #define INT_44XX_OHCI_IRQ (76 + IRQ_GIC_START) | ||
| 508 | #define INT_44XX_EHCI_IRQ (77 + IRQ_GIC_START) | ||
| 509 | #define INT_44XX_TLL_IRQ (78 + IRQ_GIC_START) | ||
| 510 | #define INT_44XX_PARTHASH_IRQ (79 + IRQ_GIC_START) | ||
| 511 | #define INT_44XX_MMC3_IRQ (94 + IRQ_GIC_START) | ||
| 512 | |||
| 513 | |||
| 425 | /* Max. 128 level 2 IRQs (OMAP1610), 192 GPIOs (OMAP730/850) and | 514 | /* Max. 128 level 2 IRQs (OMAP1610), 192 GPIOs (OMAP730/850) and |
| 426 | * 16 MPUIO lines */ | 515 | * 16 MPUIO lines */ |
| 427 | #define OMAP_MAX_GPIO_LINES 192 | 516 | #define OMAP_MAX_GPIO_LINES 192 |
| @@ -467,6 +556,7 @@ | |||
| 467 | 556 | ||
| 468 | #ifndef __ASSEMBLY__ | 557 | #ifndef __ASSEMBLY__ |
| 469 | extern void omap_init_irq(void); | 558 | extern void omap_init_irq(void); |
| 559 | extern int omap_irq_pending(void); | ||
| 470 | #endif | 560 | #endif |
| 471 | 561 | ||
| 472 | #include <mach/hardware.h> | 562 | #include <mach/hardware.h> |
diff --git a/arch/arm/plat-omap/include/mach/keypad.h b/arch/arm/plat-omap/include/mach/keypad.h index 232923aaf61d..45ea3ae3c995 100644 --- a/arch/arm/plat-omap/include/mach/keypad.h +++ b/arch/arm/plat-omap/include/mach/keypad.h | |||
| @@ -33,7 +33,11 @@ struct omap_kp_platform_data { | |||
| 33 | #define GROUP_3 (3 << 16) | 33 | #define GROUP_3 (3 << 16) |
| 34 | #define GROUP_MASK GROUP_3 | 34 | #define GROUP_MASK GROUP_3 |
| 35 | 35 | ||
| 36 | #define KEY_PERSISTENT 0x00800000 | ||
| 37 | #define KEYNUM_MASK 0x00EFFFFF | ||
| 36 | #define KEY(col, row, val) (((col) << 28) | ((row) << 24) | (val)) | 38 | #define KEY(col, row, val) (((col) << 28) | ((row) << 24) | (val)) |
| 39 | #define PERSISTENT_KEY(col, row) (((col) << 28) | ((row) << 24) | \ | ||
| 40 | KEY_PERSISTENT) | ||
| 37 | 41 | ||
| 38 | #endif | 42 | #endif |
| 39 | 43 | ||
diff --git a/arch/arm/plat-omap/include/mach/memory.h b/arch/arm/plat-omap/include/mach/memory.h index 99ed564d9277..9ad41dc484c1 100644 --- a/arch/arm/plat-omap/include/mach/memory.h +++ b/arch/arm/plat-omap/include/mach/memory.h | |||
| @@ -38,7 +38,8 @@ | |||
| 38 | */ | 38 | */ |
| 39 | #if defined(CONFIG_ARCH_OMAP1) | 39 | #if defined(CONFIG_ARCH_OMAP1) |
| 40 | #define PHYS_OFFSET UL(0x10000000) | 40 | #define PHYS_OFFSET UL(0x10000000) |
| 41 | #elif defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) | 41 | #elif defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \ |
| 42 | defined(CONFIG_ARCH_OMAP4) | ||
| 42 | #define PHYS_OFFSET UL(0x80000000) | 43 | #define PHYS_OFFSET UL(0x80000000) |
| 43 | #endif | 44 | #endif |
| 44 | 45 | ||
diff --git a/arch/arm/plat-omap/include/mach/omap24xx.h b/arch/arm/plat-omap/include/mach/omap24xx.h index 24335d4932f5..696edfc145a6 100644 --- a/arch/arm/plat-omap/include/mach/omap24xx.h +++ b/arch/arm/plat-omap/include/mach/omap24xx.h | |||
| @@ -85,23 +85,5 @@ | |||
| 85 | #define OMAP24XX_SEC_AES_BASE (OMAP24XX_SEC_BASE + 0x6000) | 85 | #define OMAP24XX_SEC_AES_BASE (OMAP24XX_SEC_BASE + 0x6000) |
| 86 | #define OMAP24XX_SEC_PKA_BASE (OMAP24XX_SEC_BASE + 0x8000) | 86 | #define OMAP24XX_SEC_PKA_BASE (OMAP24XX_SEC_BASE + 0x8000) |
| 87 | 87 | ||
| 88 | #if defined(CONFIG_ARCH_OMAP2420) | ||
| 89 | |||
| 90 | #define OMAP2_32KSYNCT_BASE OMAP2420_32KSYNCT_BASE | ||
| 91 | #define OMAP2_PRCM_BASE OMAP2420_PRCM_BASE | ||
| 92 | #define OMAP2_CM_BASE OMAP2420_CM_BASE | ||
| 93 | #define OMAP2_PRM_BASE OMAP2420_PRM_BASE | ||
| 94 | #define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP24XX_IC_BASE) | ||
| 95 | |||
| 96 | #elif defined(CONFIG_ARCH_OMAP2430) | ||
| 97 | |||
| 98 | #define OMAP2_32KSYNCT_BASE OMAP2430_32KSYNCT_BASE | ||
| 99 | #define OMAP2_PRCM_BASE OMAP2430_PRCM_BASE | ||
| 100 | #define OMAP2_CM_BASE OMAP2430_CM_BASE | ||
| 101 | #define OMAP2_PRM_BASE OMAP2430_PRM_BASE | ||
| 102 | #define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP24XX_IC_BASE) | ||
| 103 | |||
| 104 | #endif | ||
| 105 | |||
| 106 | #endif /* __ASM_ARCH_OMAP24XX_H */ | 88 | #endif /* __ASM_ARCH_OMAP24XX_H */ |
| 107 | 89 | ||
diff --git a/arch/arm/plat-omap/include/mach/omap34xx.h b/arch/arm/plat-omap/include/mach/omap34xx.h index ab640151d3ec..f8d186a73712 100644 --- a/arch/arm/plat-omap/include/mach/omap34xx.h +++ b/arch/arm/plat-omap/include/mach/omap34xx.h | |||
| @@ -31,13 +31,9 @@ | |||
| 31 | 31 | ||
| 32 | #define L4_34XX_BASE 0x48000000 | 32 | #define L4_34XX_BASE 0x48000000 |
| 33 | #define L4_WK_34XX_BASE 0x48300000 | 33 | #define L4_WK_34XX_BASE 0x48300000 |
| 34 | #define L4_WK_OMAP_BASE L4_WK_34XX_BASE | ||
| 35 | #define L4_PER_34XX_BASE 0x49000000 | 34 | #define L4_PER_34XX_BASE 0x49000000 |
| 36 | #define L4_PER_OMAP_BASE L4_PER_34XX_BASE | ||
| 37 | #define L4_EMU_34XX_BASE 0x54000000 | 35 | #define L4_EMU_34XX_BASE 0x54000000 |
| 38 | #define L4_EMU_BASE L4_EMU_34XX_BASE | ||
| 39 | #define L3_34XX_BASE 0x68000000 | 36 | #define L3_34XX_BASE 0x68000000 |
| 40 | #define L3_OMAP_BASE L3_34XX_BASE | ||
| 41 | 37 | ||
| 42 | #define OMAP3430_32KSYNCT_BASE 0x48320000 | 38 | #define OMAP3430_32KSYNCT_BASE 0x48320000 |
| 43 | #define OMAP3430_CM_BASE 0x48004800 | 39 | #define OMAP3430_CM_BASE 0x48004800 |
| @@ -83,15 +79,6 @@ | |||
| 83 | 79 | ||
| 84 | #define OMAP34XX_MAILBOX_BASE (L4_34XX_BASE + 0x94000) | 80 | #define OMAP34XX_MAILBOX_BASE (L4_34XX_BASE + 0x94000) |
| 85 | 81 | ||
| 86 | #if defined(CONFIG_ARCH_OMAP3430) | ||
| 87 | |||
| 88 | #define OMAP2_32KSYNCT_BASE OMAP3430_32KSYNCT_BASE | ||
| 89 | #define OMAP2_CM_BASE OMAP3430_CM_BASE | ||
| 90 | #define OMAP2_PRM_BASE OMAP3430_PRM_BASE | ||
| 91 | #define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP34XX_IC_BASE) | ||
| 92 | |||
| 93 | #endif | ||
| 94 | |||
| 95 | #define OMAP34XX_DSP_BASE 0x58000000 | 82 | #define OMAP34XX_DSP_BASE 0x58000000 |
| 96 | #define OMAP34XX_DSP_MEM_BASE (OMAP34XX_DSP_BASE + 0x0) | 83 | #define OMAP34XX_DSP_MEM_BASE (OMAP34XX_DSP_BASE + 0x0) |
| 97 | #define OMAP34XX_DSP_IPI_BASE (OMAP34XX_DSP_BASE + 0x1000000) | 84 | #define OMAP34XX_DSP_IPI_BASE (OMAP34XX_DSP_BASE + 0x1000000) |
diff --git a/arch/arm/plat-omap/include/mach/omap44xx.h b/arch/arm/plat-omap/include/mach/omap44xx.h new file mode 100644 index 000000000000..15dec7f1c7c0 --- /dev/null +++ b/arch/arm/plat-omap/include/mach/omap44xx.h | |||
| @@ -0,0 +1,46 @@ | |||
| 1 | /*: | ||
| 2 | * Address mappings and base address for OMAP4 interconnects | ||
| 3 | * and peripherals. | ||
| 4 | * | ||
| 5 | * Copyright (C) 2009 Texas Instruments | ||
| 6 | * | ||
| 7 | * Author: Santosh Shilimkar <santosh.shilimkar@ti.com> | ||
| 8 | * | ||
| 9 | * This program is free software; you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License version 2 as | ||
| 11 | * published by the Free Software Foundation. | ||
| 12 | */ | ||
| 13 | #ifndef __ASM_ARCH_OMAP44XX_H | ||
| 14 | #define __ASM_ARCH_OMAP44XX_H | ||
| 15 | |||
| 16 | /* | ||
| 17 | * Please place only base defines here and put the rest in device | ||
| 18 | * specific headers. | ||
| 19 | */ | ||
| 20 | #define L4_44XX_BASE 0x4a000000 | ||
| 21 | #define L4_WK_44XX_BASE 0x4a300000 | ||
| 22 | #define L4_PER_44XX_BASE 0x48000000 | ||
| 23 | #define L4_EMU_44XX_BASE 0x54000000 | ||
| 24 | #define L3_44XX_BASE 0x44000000 | ||
| 25 | #define OMAP4430_32KSYNCT_BASE 0x4a304000 | ||
| 26 | #define OMAP4430_CM_BASE 0x4a004000 | ||
| 27 | #define OMAP4430_PRM_BASE 0x48306000 | ||
| 28 | #define OMAP44XX_GPMC_BASE 0x50000000 | ||
| 29 | #define OMAP443X_SCM_BASE 0x4a002000 | ||
| 30 | #define OMAP443X_CTRL_BASE OMAP443X_SCM_BASE | ||
| 31 | #define OMAP44XX_IC_BASE 0x48200000 | ||
| 32 | #define OMAP44XX_IVA_INTC_BASE 0x40000000 | ||
| 33 | #define IRQ_SIR_IRQ 0x0040 | ||
| 34 | #define OMAP44XX_GIC_DIST_BASE 0x48241000 | ||
| 35 | #define OMAP44XX_GIC_CPU_BASE 0x48240100 | ||
| 36 | #define OMAP44XX_VA_GIC_CPU_BASE IO_ADDRESS(OMAP44XX_GIC_CPU_BASE) | ||
| 37 | #define OMAP44XX_SCU_BASE 0x48240000 | ||
| 38 | #define OMAP44XX_VA_SCU_BASE IO_ADDRESS(OMAP44XX_SCU_BASE) | ||
| 39 | #define OMAP44XX_LOCAL_TWD_BASE 0x48240600 | ||
| 40 | #define OMAP44XX_VA_LOCAL_TWD_BASE IO_ADDRESS(OMAP44XX_LOCAL_TWD_BASE) | ||
| 41 | #define OMAP44XX_LOCAL_TWD_SIZE 0x00000100 | ||
| 42 | #define OMAP44XX_WKUPGEN_BASE 0x48281000 | ||
| 43 | #define OMAP44XX_VA_WKUPGEN_BASE IO_ADDRESS(OMAP44XX_WKUPGEN_BASE) | ||
| 44 | |||
| 45 | #endif /* __ASM_ARCH_OMAP44XX_H */ | ||
| 46 | |||
diff --git a/arch/arm/plat-omap/include/mach/onenand.h b/arch/arm/plat-omap/include/mach/onenand.h index 4649d302c263..72f433d7d827 100644 --- a/arch/arm/plat-omap/include/mach/onenand.h +++ b/arch/arm/plat-omap/include/mach/onenand.h | |||
| @@ -9,8 +9,12 @@ | |||
| 9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/mtd/mtd.h> | ||
| 12 | #include <linux/mtd/partitions.h> | 13 | #include <linux/mtd/partitions.h> |
| 13 | 14 | ||
| 15 | #define ONENAND_SYNC_READ (1 << 0) | ||
| 16 | #define ONENAND_SYNC_READWRITE (1 << 1) | ||
| 17 | |||
| 14 | struct omap_onenand_platform_data { | 18 | struct omap_onenand_platform_data { |
| 15 | int cs; | 19 | int cs; |
| 16 | int gpio_irq; | 20 | int gpio_irq; |
| @@ -18,8 +22,22 @@ struct omap_onenand_platform_data { | |||
| 18 | int nr_parts; | 22 | int nr_parts; |
| 19 | int (*onenand_setup)(void __iomem *, int freq); | 23 | int (*onenand_setup)(void __iomem *, int freq); |
| 20 | int dma_channel; | 24 | int dma_channel; |
| 25 | u8 flags; | ||
| 21 | }; | 26 | }; |
| 22 | 27 | ||
| 23 | int omap2_onenand_rephase(void); | ||
| 24 | |||
| 25 | #define ONENAND_MAX_PARTITIONS 8 | 28 | #define ONENAND_MAX_PARTITIONS 8 |
| 29 | |||
| 30 | #if defined(CONFIG_MTD_ONENAND_OMAP2) || \ | ||
| 31 | defined(CONFIG_MTD_ONENAND_OMAP2_MODULE) | ||
| 32 | |||
| 33 | extern void gpmc_onenand_init(struct omap_onenand_platform_data *d); | ||
| 34 | |||
| 35 | #else | ||
| 36 | |||
| 37 | #define board_onenand_data NULL | ||
| 38 | |||
| 39 | static inline void gpmc_onenand_init(struct omap_onenand_platform_data *d) | ||
| 40 | { | ||
| 41 | } | ||
| 42 | |||
| 43 | #endif | ||
diff --git a/arch/arm/plat-omap/include/mach/serial.h b/arch/arm/plat-omap/include/mach/serial.h index 8a676a04be48..13abd02d1527 100644 --- a/arch/arm/plat-omap/include/mach/serial.h +++ b/arch/arm/plat-omap/include/mach/serial.h | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/plat-omap/include/mach/serial.h | 2 | * arch/arm/plat-omap/include/mach/serial.h |
| 3 | * | ||
| 4 | * Copyright (C) 2009 Texas Instruments | ||
| 5 | * Addded OMAP4 support- Santosh Shilimkar <santosh.shilimkar@ti.com> | ||
| 3 | * | 6 | * |
| 4 | * This program is distributed in the hope that it will be useful, | 7 | * This program is distributed in the hope that it will be useful, |
| 5 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 8 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| @@ -15,19 +18,28 @@ | |||
| 15 | #define OMAP_UART1_BASE 0xfffb0000 | 18 | #define OMAP_UART1_BASE 0xfffb0000 |
| 16 | #define OMAP_UART2_BASE 0xfffb0800 | 19 | #define OMAP_UART2_BASE 0xfffb0800 |
| 17 | #define OMAP_UART3_BASE 0xfffb9800 | 20 | #define OMAP_UART3_BASE 0xfffb9800 |
| 21 | #define OMAP_MAX_NR_PORTS 3 | ||
| 18 | #elif defined(CONFIG_ARCH_OMAP2) | 22 | #elif defined(CONFIG_ARCH_OMAP2) |
| 19 | /* OMAP2 serial ports */ | 23 | /* OMAP2 serial ports */ |
| 20 | #define OMAP_UART1_BASE 0x4806a000 | 24 | #define OMAP_UART1_BASE 0x4806a000 |
| 21 | #define OMAP_UART2_BASE 0x4806c000 | 25 | #define OMAP_UART2_BASE 0x4806c000 |
| 22 | #define OMAP_UART3_BASE 0x4806e000 | 26 | #define OMAP_UART3_BASE 0x4806e000 |
| 27 | #define OMAP_MAX_NR_PORTS 3 | ||
| 23 | #elif defined(CONFIG_ARCH_OMAP3) | 28 | #elif defined(CONFIG_ARCH_OMAP3) |
| 24 | /* OMAP3 serial ports */ | 29 | /* OMAP3 serial ports */ |
| 25 | #define OMAP_UART1_BASE 0x4806a000 | 30 | #define OMAP_UART1_BASE 0x4806a000 |
| 26 | #define OMAP_UART2_BASE 0x4806c000 | 31 | #define OMAP_UART2_BASE 0x4806c000 |
| 27 | #define OMAP_UART3_BASE 0x49020000 | 32 | #define OMAP_UART3_BASE 0x49020000 |
| 33 | #define OMAP_MAX_NR_PORTS 3 | ||
| 34 | #elif defined(CONFIG_ARCH_OMAP4) | ||
| 35 | /* OMAP4 serial ports */ | ||
| 36 | #define OMAP_UART1_BASE 0x4806a000 | ||
| 37 | #define OMAP_UART2_BASE 0x4806c000 | ||
| 38 | #define OMAP_UART3_BASE 0x48020000 | ||
| 39 | #define OMAP_UART4_BASE 0x4806e000 | ||
| 40 | #define OMAP_MAX_NR_PORTS 4 | ||
| 28 | #endif | 41 | #endif |
| 29 | 42 | ||
| 30 | #define OMAP_MAX_NR_PORTS 3 | ||
| 31 | #define OMAP1510_BASE_BAUD (12000000/16) | 43 | #define OMAP1510_BASE_BAUD (12000000/16) |
| 32 | #define OMAP16XX_BASE_BAUD (48000000/16) | 44 | #define OMAP16XX_BASE_BAUD (48000000/16) |
| 33 | #define OMAP24XX_BASE_BAUD (48000000/16) | 45 | #define OMAP24XX_BASE_BAUD (48000000/16) |
| @@ -40,4 +52,13 @@ | |||
| 40 | __ret; \ | 52 | __ret; \ |
| 41 | }) | 53 | }) |
| 42 | 54 | ||
| 55 | #ifndef __ASSEMBLER__ | ||
| 56 | extern void omap_serial_init(void); | ||
| 57 | extern int omap_uart_can_sleep(void); | ||
| 58 | extern void omap_uart_check_wakeup(void); | ||
| 59 | extern void omap_uart_prepare_suspend(void); | ||
| 60 | extern void omap_uart_prepare_idle(int num); | ||
| 61 | extern void omap_uart_resume_idle(int num); | ||
| 62 | #endif | ||
| 63 | |||
| 43 | #endif | 64 | #endif |
diff --git a/arch/arm/plat-omap/include/mach/sram.h b/arch/arm/plat-omap/include/mach/sram.h index ab35d622dcf5..dca7c16ae903 100644 --- a/arch/arm/plat-omap/include/mach/sram.h +++ b/arch/arm/plat-omap/include/mach/sram.h | |||
| @@ -23,7 +23,8 @@ extern u32 omap2_set_prcm(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass); | |||
| 23 | 23 | ||
| 24 | extern u32 omap3_configure_core_dpll(u32 sdrc_rfr_ctrl, | 24 | extern u32 omap3_configure_core_dpll(u32 sdrc_rfr_ctrl, |
| 25 | u32 sdrc_actim_ctrla, | 25 | u32 sdrc_actim_ctrla, |
| 26 | u32 sdrc_actim_ctrlb, u32 m2); | 26 | u32 sdrc_actim_ctrlb, u32 m2, |
| 27 | u32 unlock_dll); | ||
| 27 | 28 | ||
| 28 | /* Do not use these */ | 29 | /* Do not use these */ |
| 29 | extern void omap1_sram_reprogram_clock(u32 ckctl, u32 dpllctl); | 30 | extern void omap1_sram_reprogram_clock(u32 ckctl, u32 dpllctl); |
| @@ -60,7 +61,8 @@ extern unsigned long omap243x_sram_reprogram_sdrc_sz; | |||
| 60 | 61 | ||
| 61 | extern u32 omap3_sram_configure_core_dpll(u32 sdrc_rfr_ctrl, | 62 | extern u32 omap3_sram_configure_core_dpll(u32 sdrc_rfr_ctrl, |
| 62 | u32 sdrc_actim_ctrla, | 63 | u32 sdrc_actim_ctrla, |
| 63 | u32 sdrc_actim_ctrlb, u32 m2); | 64 | u32 sdrc_actim_ctrlb, u32 m2, |
| 65 | u32 unlock_dll); | ||
| 64 | extern unsigned long omap3_sram_configure_core_dpll_sz; | 66 | extern unsigned long omap3_sram_configure_core_dpll_sz; |
| 65 | 67 | ||
| 66 | #endif | 68 | #endif |
diff --git a/arch/arm/plat-omap/include/mach/usb.h b/arch/arm/plat-omap/include/mach/usb.h index 69f0ceed500b..f337e1761e2c 100644 --- a/arch/arm/plat-omap/include/mach/usb.h +++ b/arch/arm/plat-omap/include/mach/usb.h | |||
| @@ -27,13 +27,7 @@ | |||
| 27 | #define UDC_BASE OMAP2_UDC_BASE | 27 | #define UDC_BASE OMAP2_UDC_BASE |
| 28 | #define OMAP_OHCI_BASE OMAP2_OHCI_BASE | 28 | #define OMAP_OHCI_BASE OMAP2_OHCI_BASE |
| 29 | 29 | ||
| 30 | #ifdef CONFIG_USB_MUSB_SOC | ||
| 31 | extern void usb_musb_init(void); | 30 | extern void usb_musb_init(void); |
| 32 | #else | ||
| 33 | static inline void usb_musb_init(void) | ||
| 34 | { | ||
| 35 | } | ||
| 36 | #endif | ||
| 37 | 31 | ||
| 38 | #endif | 32 | #endif |
| 39 | 33 | ||
diff --git a/arch/arm/plat-omap/include/mach/vmalloc.h b/arch/arm/plat-omap/include/mach/vmalloc.h index dc104cd96197..b97dfafeebda 100644 --- a/arch/arm/plat-omap/include/mach/vmalloc.h +++ b/arch/arm/plat-omap/include/mach/vmalloc.h | |||
| @@ -17,5 +17,5 @@ | |||
| 17 | * along with this program; if not, write to the Free Software | 17 | * along with this program; if not, write to the Free Software |
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | */ | 19 | */ |
| 20 | #define VMALLOC_END (PAGE_OFFSET + 0x10000000) | 20 | #define VMALLOC_END (PAGE_OFFSET + 0x18000000) |
| 21 | 21 | ||
diff --git a/arch/arm/plat-omap/io.c b/arch/arm/plat-omap/io.c index af326efc1ad3..9b42d72d96cf 100644 --- a/arch/arm/plat-omap/io.c +++ b/arch/arm/plat-omap/io.c | |||
| @@ -1,3 +1,14 @@ | |||
| 1 | /* | ||
| 2 | * Common io.c file | ||
| 3 | * This file is created by Russell King <rmk+kernel@arm.linux.org.uk> | ||
| 4 | * | ||
| 5 | * Copyright (C) 2009 Texas Instruments | ||
| 6 | * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com> | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | */ | ||
| 1 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 2 | #include <linux/io.h> | 13 | #include <linux/io.h> |
| 3 | #include <linux/mm.h> | 14 | #include <linux/mm.h> |
| @@ -7,6 +18,7 @@ | |||
| 7 | #include <mach/omap16xx.h> | 18 | #include <mach/omap16xx.h> |
| 8 | #include <mach/omap24xx.h> | 19 | #include <mach/omap24xx.h> |
| 9 | #include <mach/omap34xx.h> | 20 | #include <mach/omap34xx.h> |
| 21 | #include <mach/omap44xx.h> | ||
| 10 | 22 | ||
| 11 | #define BETWEEN(p,st,sz) ((p) >= (st) && (p) < ((st) + (sz))) | 23 | #define BETWEEN(p,st,sz) ((p) >= (st) && (p) < ((st) + (sz))) |
| 12 | #define XLATE(p,pst,vst) ((void __iomem *)((p) - (pst) + (vst))) | 24 | #define XLATE(p,pst,vst) ((void __iomem *)((p) - (pst) + (vst))) |
| @@ -92,7 +104,22 @@ void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type) | |||
| 92 | return XLATE(p, L4_EMU_34XX_PHYS, L4_EMU_34XX_VIRT); | 104 | return XLATE(p, L4_EMU_34XX_PHYS, L4_EMU_34XX_VIRT); |
| 93 | } | 105 | } |
| 94 | #endif | 106 | #endif |
| 95 | 107 | #ifdef CONFIG_ARCH_OMAP4 | |
| 108 | if (cpu_is_omap44xx()) { | ||
| 109 | if (BETWEEN(p, L3_44XX_PHYS, L3_44XX_SIZE)) | ||
| 110 | return XLATE(p, L3_44XX_PHYS, L3_44XX_VIRT); | ||
| 111 | if (BETWEEN(p, L4_44XX_PHYS, L4_44XX_SIZE)) | ||
| 112 | return XLATE(p, L4_44XX_PHYS, L4_44XX_VIRT); | ||
| 113 | if (BETWEEN(p, L4_WK_44XX_PHYS, L4_WK_44XX_SIZE)) | ||
| 114 | return XLATE(p, L4_WK_44XX_PHYS, L4_WK_44XX_VIRT); | ||
| 115 | if (BETWEEN(p, OMAP44XX_GPMC_PHYS, OMAP44XX_GPMC_SIZE)) | ||
| 116 | return XLATE(p, OMAP44XX_GPMC_PHYS, OMAP44XX_GPMC_VIRT); | ||
| 117 | if (BETWEEN(p, L4_PER_44XX_PHYS, L4_PER_44XX_SIZE)) | ||
| 118 | return XLATE(p, L4_PER_44XX_PHYS, L4_PER_44XX_VIRT); | ||
| 119 | if (BETWEEN(p, L4_EMU_44XX_PHYS, L4_EMU_44XX_SIZE)) | ||
| 120 | return XLATE(p, L4_EMU_44XX_PHYS, L4_EMU_44XX_VIRT); | ||
| 121 | } | ||
| 122 | #endif | ||
| 96 | return __arm_ioremap(p, size, type); | 123 | return __arm_ioremap(p, size, type); |
| 97 | } | 124 | } |
| 98 | EXPORT_SYMBOL(omap_ioremap); | 125 | EXPORT_SYMBOL(omap_ioremap); |
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index 28b0a824b8cf..efa0e0111f38 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c | |||
| @@ -91,11 +91,20 @@ static void omap_mcbsp_dump_reg(u8 id) | |||
| 91 | static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *dev_id) | 91 | static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *dev_id) |
| 92 | { | 92 | { |
| 93 | struct omap_mcbsp *mcbsp_tx = dev_id; | 93 | struct omap_mcbsp *mcbsp_tx = dev_id; |
| 94 | u16 irqst_spcr2; | ||
| 94 | 95 | ||
| 95 | dev_dbg(mcbsp_tx->dev, "TX IRQ callback : 0x%x\n", | 96 | irqst_spcr2 = OMAP_MCBSP_READ(mcbsp_tx->io_base, SPCR2); |
| 96 | OMAP_MCBSP_READ(mcbsp_tx->io_base, SPCR2)); | 97 | dev_dbg(mcbsp_tx->dev, "TX IRQ callback : 0x%x\n", irqst_spcr2); |
| 97 | 98 | ||
| 98 | complete(&mcbsp_tx->tx_irq_completion); | 99 | if (irqst_spcr2 & XSYNC_ERR) { |
| 100 | dev_err(mcbsp_tx->dev, "TX Frame Sync Error! : 0x%x\n", | ||
| 101 | irqst_spcr2); | ||
| 102 | /* Writing zero to XSYNC_ERR clears the IRQ */ | ||
| 103 | OMAP_MCBSP_WRITE(mcbsp_tx->io_base, SPCR2, | ||
| 104 | irqst_spcr2 & ~(XSYNC_ERR)); | ||
| 105 | } else { | ||
| 106 | complete(&mcbsp_tx->tx_irq_completion); | ||
| 107 | } | ||
| 99 | 108 | ||
| 100 | return IRQ_HANDLED; | 109 | return IRQ_HANDLED; |
| 101 | } | 110 | } |
| @@ -103,11 +112,20 @@ static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *dev_id) | |||
| 103 | static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *dev_id) | 112 | static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *dev_id) |
| 104 | { | 113 | { |
| 105 | struct omap_mcbsp *mcbsp_rx = dev_id; | 114 | struct omap_mcbsp *mcbsp_rx = dev_id; |
| 115 | u16 irqst_spcr1; | ||
| 106 | 116 | ||
| 107 | dev_dbg(mcbsp_rx->dev, "RX IRQ callback : 0x%x\n", | 117 | irqst_spcr1 = OMAP_MCBSP_READ(mcbsp_rx->io_base, SPCR1); |
| 108 | OMAP_MCBSP_READ(mcbsp_rx->io_base, SPCR2)); | 118 | dev_dbg(mcbsp_rx->dev, "RX IRQ callback : 0x%x\n", irqst_spcr1); |
| 109 | 119 | ||
| 110 | complete(&mcbsp_rx->rx_irq_completion); | 120 | if (irqst_spcr1 & RSYNC_ERR) { |
| 121 | dev_err(mcbsp_rx->dev, "RX Frame Sync Error! : 0x%x\n", | ||
| 122 | irqst_spcr1); | ||
| 123 | /* Writing zero to RSYNC_ERR clears the IRQ */ | ||
| 124 | OMAP_MCBSP_WRITE(mcbsp_rx->io_base, SPCR1, | ||
| 125 | irqst_spcr1 & ~(RSYNC_ERR)); | ||
| 126 | } else { | ||
| 127 | complete(&mcbsp_rx->tx_irq_completion); | ||
| 128 | } | ||
| 111 | 129 | ||
| 112 | return IRQ_HANDLED; | 130 | return IRQ_HANDLED; |
| 113 | } | 131 | } |
diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c index 80b040fd5ca7..8d329fb20740 100644 --- a/arch/arm/plat-omap/mux.c +++ b/arch/arm/plat-omap/mux.c | |||
| @@ -54,6 +54,9 @@ int __init_or_module omap_cfg_reg(const unsigned long index) | |||
| 54 | { | 54 | { |
| 55 | struct pin_config *reg; | 55 | struct pin_config *reg; |
| 56 | 56 | ||
| 57 | if (cpu_is_omap44xx()) | ||
| 58 | return 0; | ||
| 59 | |||
| 57 | if (mux_cfg == NULL) { | 60 | if (mux_cfg == NULL) { |
| 58 | printk(KERN_ERR "Pin mux table not initialized\n"); | 61 | printk(KERN_ERR "Pin mux table not initialized\n"); |
| 59 | return -ENODEV; | 62 | return -ENODEV; |
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c index fa5297d643d3..a5b9bcd6b108 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c | |||
| @@ -6,6 +6,9 @@ | |||
| 6 | * Copyright (C) 2005 Nokia Corporation | 6 | * Copyright (C) 2005 Nokia Corporation |
| 7 | * Written by Tony Lindgren <tony@atomide.com> | 7 | * Written by Tony Lindgren <tony@atomide.com> |
| 8 | * | 8 | * |
| 9 | * Copyright (C) 2009 Texas Instruments | ||
| 10 | * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com> | ||
| 11 | * | ||
| 9 | * This program is free software; you can redistribute it and/or modify | 12 | * This program is free software; you can redistribute it and/or modify |
| 10 | * it under the terms of the GNU General Public License version 2 as | 13 | * it under the terms of the GNU General Public License version 2 as |
| 11 | * published by the Free Software Foundation. | 14 | * published by the Free Software Foundation. |
| @@ -38,12 +41,14 @@ | |||
| 38 | #define OMAP1_SRAM_VA VMALLOC_END | 41 | #define OMAP1_SRAM_VA VMALLOC_END |
| 39 | #define OMAP2_SRAM_PA 0x40200000 | 42 | #define OMAP2_SRAM_PA 0x40200000 |
| 40 | #define OMAP2_SRAM_PUB_PA 0x4020f800 | 43 | #define OMAP2_SRAM_PUB_PA 0x4020f800 |
| 41 | #define OMAP2_SRAM_VA VMALLOC_END | 44 | #define OMAP2_SRAM_VA 0xe3000000 |
| 42 | #define OMAP2_SRAM_PUB_VA (VMALLOC_END + 0x800) | 45 | #define OMAP2_SRAM_PUB_VA (OMAP2_SRAM_VA + 0x800) |
| 43 | #define OMAP3_SRAM_PA 0x40200000 | 46 | #define OMAP3_SRAM_PA 0x40200000 |
| 44 | #define OMAP3_SRAM_VA 0xd7000000 | 47 | #define OMAP3_SRAM_VA 0xd7000000 |
| 45 | #define OMAP3_SRAM_PUB_PA 0x40208000 | 48 | #define OMAP3_SRAM_PUB_PA 0x40208000 |
| 46 | #define OMAP3_SRAM_PUB_VA 0xd7008000 | 49 | #define OMAP3_SRAM_PUB_VA 0xd7008000 |
| 50 | #define OMAP4_SRAM_PA 0x40200000 /*0x402f0000*/ | ||
| 51 | #define OMAP4_SRAM_VA 0xd7000000 /*0xd70f0000*/ | ||
| 47 | 52 | ||
| 48 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 53 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) |
| 49 | #define SRAM_BOOTLOADER_SZ 0x00 | 54 | #define SRAM_BOOTLOADER_SZ 0x00 |
| @@ -87,6 +92,10 @@ static int is_sram_locked(void) | |||
| 87 | { | 92 | { |
| 88 | int type = 0; | 93 | int type = 0; |
| 89 | 94 | ||
| 95 | if (cpu_is_omap44xx()) | ||
| 96 | /* Not yet supported */ | ||
| 97 | return 0; | ||
| 98 | |||
| 90 | if (cpu_is_omap242x()) | 99 | if (cpu_is_omap242x()) |
| 91 | type = omap_rev() & OMAP2_DEVICETYPE_MASK; | 100 | type = omap_rev() & OMAP2_DEVICETYPE_MASK; |
| 92 | 101 | ||
| @@ -135,6 +144,10 @@ void __init omap_detect_sram(void) | |||
| 135 | omap_sram_base = OMAP3_SRAM_VA; | 144 | omap_sram_base = OMAP3_SRAM_VA; |
| 136 | omap_sram_start = OMAP3_SRAM_PA; | 145 | omap_sram_start = OMAP3_SRAM_PA; |
| 137 | omap_sram_size = 0x10000; /* 64K */ | 146 | omap_sram_size = 0x10000; /* 64K */ |
| 147 | } else if (cpu_is_omap44xx()) { | ||
| 148 | omap_sram_base = OMAP4_SRAM_VA; | ||
| 149 | omap_sram_start = OMAP4_SRAM_PA; | ||
| 150 | omap_sram_size = 0x8000; /* 32K */ | ||
| 138 | } else { | 151 | } else { |
| 139 | omap_sram_base = OMAP2_SRAM_VA; | 152 | omap_sram_base = OMAP2_SRAM_VA; |
| 140 | omap_sram_start = OMAP2_SRAM_PA; | 153 | omap_sram_start = OMAP2_SRAM_PA; |
| @@ -201,8 +214,23 @@ void __init omap_map_sram(void) | |||
| 201 | base = OMAP3_SRAM_PA; | 214 | base = OMAP3_SRAM_PA; |
| 202 | base = ROUND_DOWN(base, PAGE_SIZE); | 215 | base = ROUND_DOWN(base, PAGE_SIZE); |
| 203 | omap_sram_io_desc[0].pfn = __phys_to_pfn(base); | 216 | omap_sram_io_desc[0].pfn = __phys_to_pfn(base); |
| 217 | |||
| 218 | /* | ||
| 219 | * SRAM must be marked as non-cached on OMAP3 since the | ||
| 220 | * CORE DPLL M2 divider change code (in SRAM) runs with the | ||
| 221 | * SDRAM controller disabled, and if it is marked cached, | ||
| 222 | * the ARM may attempt to write cache lines back to SDRAM | ||
| 223 | * which will cause the system to hang. | ||
| 224 | */ | ||
| 225 | omap_sram_io_desc[0].type = MT_MEMORY_NONCACHED; | ||
| 204 | } | 226 | } |
| 205 | 227 | ||
| 228 | if (cpu_is_omap44xx()) { | ||
| 229 | omap_sram_io_desc[0].virtual = OMAP4_SRAM_VA; | ||
| 230 | base = OMAP4_SRAM_PA; | ||
| 231 | base = ROUND_DOWN(base, PAGE_SIZE); | ||
| 232 | omap_sram_io_desc[0].pfn = __phys_to_pfn(base); | ||
| 233 | } | ||
| 206 | omap_sram_io_desc[0].length = 1024 * 1024; /* Use section desc */ | 234 | omap_sram_io_desc[0].length = 1024 * 1024; /* Use section desc */ |
| 207 | iotable_init(omap_sram_io_desc, ARRAY_SIZE(omap_sram_io_desc)); | 235 | iotable_init(omap_sram_io_desc, ARRAY_SIZE(omap_sram_io_desc)); |
| 208 | 236 | ||
| @@ -242,20 +270,13 @@ void * omap_sram_push(void * start, unsigned long size) | |||
| 242 | return (void *)omap_sram_ceil; | 270 | return (void *)omap_sram_ceil; |
| 243 | } | 271 | } |
| 244 | 272 | ||
| 245 | static void omap_sram_error(void) | ||
| 246 | { | ||
| 247 | panic("Uninitialized SRAM function\n"); | ||
| 248 | } | ||
| 249 | |||
| 250 | #ifdef CONFIG_ARCH_OMAP1 | 273 | #ifdef CONFIG_ARCH_OMAP1 |
| 251 | 274 | ||
| 252 | static void (*_omap_sram_reprogram_clock)(u32 dpllctl, u32 ckctl); | 275 | static void (*_omap_sram_reprogram_clock)(u32 dpllctl, u32 ckctl); |
| 253 | 276 | ||
| 254 | void omap_sram_reprogram_clock(u32 dpllctl, u32 ckctl) | 277 | void omap_sram_reprogram_clock(u32 dpllctl, u32 ckctl) |
| 255 | { | 278 | { |
| 256 | if (!_omap_sram_reprogram_clock) | 279 | BUG_ON(!_omap_sram_reprogram_clock); |
| 257 | omap_sram_error(); | ||
| 258 | |||
| 259 | _omap_sram_reprogram_clock(dpllctl, ckctl); | 280 | _omap_sram_reprogram_clock(dpllctl, ckctl); |
| 260 | } | 281 | } |
| 261 | 282 | ||
| @@ -280,9 +301,7 @@ static void (*_omap2_sram_ddr_init)(u32 *slow_dll_ctrl, u32 fast_dll_ctrl, | |||
| 280 | void omap2_sram_ddr_init(u32 *slow_dll_ctrl, u32 fast_dll_ctrl, | 301 | void omap2_sram_ddr_init(u32 *slow_dll_ctrl, u32 fast_dll_ctrl, |
| 281 | u32 base_cs, u32 force_unlock) | 302 | u32 base_cs, u32 force_unlock) |
| 282 | { | 303 | { |
| 283 | if (!_omap2_sram_ddr_init) | 304 | BUG_ON(!_omap2_sram_ddr_init); |
| 284 | omap_sram_error(); | ||
| 285 | |||
| 286 | _omap2_sram_ddr_init(slow_dll_ctrl, fast_dll_ctrl, | 305 | _omap2_sram_ddr_init(slow_dll_ctrl, fast_dll_ctrl, |
| 287 | base_cs, force_unlock); | 306 | base_cs, force_unlock); |
| 288 | } | 307 | } |
| @@ -292,9 +311,7 @@ static void (*_omap2_sram_reprogram_sdrc)(u32 perf_level, u32 dll_val, | |||
| 292 | 311 | ||
| 293 | void omap2_sram_reprogram_sdrc(u32 perf_level, u32 dll_val, u32 mem_type) | 312 | void omap2_sram_reprogram_sdrc(u32 perf_level, u32 dll_val, u32 mem_type) |
| 294 | { | 313 | { |
| 295 | if (!_omap2_sram_reprogram_sdrc) | 314 | BUG_ON(!_omap2_sram_reprogram_sdrc); |
| 296 | omap_sram_error(); | ||
| 297 | |||
| 298 | _omap2_sram_reprogram_sdrc(perf_level, dll_val, mem_type); | 315 | _omap2_sram_reprogram_sdrc(perf_level, dll_val, mem_type); |
| 299 | } | 316 | } |
| 300 | 317 | ||
| @@ -302,9 +319,7 @@ static u32 (*_omap2_set_prcm)(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass); | |||
| 302 | 319 | ||
| 303 | u32 omap2_set_prcm(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass) | 320 | u32 omap2_set_prcm(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass) |
| 304 | { | 321 | { |
| 305 | if (!_omap2_set_prcm) | 322 | BUG_ON(!_omap2_set_prcm); |
| 306 | omap_sram_error(); | ||
| 307 | |||
| 308 | return _omap2_set_prcm(dpll_ctrl_val, sdrc_rfr_val, bypass); | 323 | return _omap2_set_prcm(dpll_ctrl_val, sdrc_rfr_val, bypass); |
| 309 | } | 324 | } |
| 310 | #endif | 325 | #endif |
| @@ -356,16 +371,15 @@ static inline int omap243x_sram_init(void) | |||
| 356 | static u32 (*_omap3_sram_configure_core_dpll)(u32 sdrc_rfr_ctrl, | 371 | static u32 (*_omap3_sram_configure_core_dpll)(u32 sdrc_rfr_ctrl, |
| 357 | u32 sdrc_actim_ctrla, | 372 | u32 sdrc_actim_ctrla, |
| 358 | u32 sdrc_actim_ctrlb, | 373 | u32 sdrc_actim_ctrlb, |
| 359 | u32 m2); | 374 | u32 m2, u32 unlock_dll); |
| 360 | u32 omap3_configure_core_dpll(u32 sdrc_rfr_ctrl, u32 sdrc_actim_ctrla, | 375 | u32 omap3_configure_core_dpll(u32 sdrc_rfr_ctrl, u32 sdrc_actim_ctrla, |
| 361 | u32 sdrc_actim_ctrlb, u32 m2) | 376 | u32 sdrc_actim_ctrlb, u32 m2, u32 unlock_dll) |
| 362 | { | 377 | { |
| 363 | if (!_omap3_sram_configure_core_dpll) | 378 | BUG_ON(!_omap3_sram_configure_core_dpll); |
| 364 | omap_sram_error(); | ||
| 365 | |||
| 366 | return _omap3_sram_configure_core_dpll(sdrc_rfr_ctrl, | 379 | return _omap3_sram_configure_core_dpll(sdrc_rfr_ctrl, |
| 367 | sdrc_actim_ctrla, | 380 | sdrc_actim_ctrla, |
| 368 | sdrc_actim_ctrlb, m2); | 381 | sdrc_actim_ctrlb, m2, |
| 382 | unlock_dll); | ||
| 369 | } | 383 | } |
| 370 | 384 | ||
| 371 | /* REVISIT: Should this be same as omap34xx_sram_init() after off-idle? */ | 385 | /* REVISIT: Should this be same as omap34xx_sram_init() after off-idle? */ |
| @@ -406,6 +420,8 @@ int __init omap_sram_init(void) | |||
| 406 | omap243x_sram_init(); | 420 | omap243x_sram_init(); |
| 407 | else if (cpu_is_omap34xx()) | 421 | else if (cpu_is_omap34xx()) |
| 408 | omap34xx_sram_init(); | 422 | omap34xx_sram_init(); |
| 423 | else if (cpu_is_omap44xx()) | ||
| 424 | omap34xx_sram_init(); /* FIXME: */ | ||
| 409 | 425 | ||
| 410 | return 0; | 426 | return 0; |
| 411 | } | 427 | } |
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index e62a22a7f00c..2f19c635bc6e 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c | |||
| @@ -1073,7 +1073,6 @@ static int __init omap_mmc_probe(struct platform_device *pdev) | |||
| 1073 | mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; | 1073 | mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; |
| 1074 | mmc->max_seg_size = mmc->max_req_size; | 1074 | mmc->max_seg_size = mmc->max_req_size; |
| 1075 | 1075 | ||
| 1076 | mmc->ocr_avail = mmc_slot(host).ocr_mask; | ||
| 1077 | mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED; | 1076 | mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED; |
| 1078 | 1077 | ||
| 1079 | if (pdata->slots[host->slot_id].wires >= 8) | 1078 | if (pdata->slots[host->slot_id].wires >= 8) |
| @@ -1110,13 +1109,14 @@ static int __init omap_mmc_probe(struct platform_device *pdev) | |||
| 1110 | goto err_irq; | 1109 | goto err_irq; |
| 1111 | } | 1110 | } |
| 1112 | 1111 | ||
| 1112 | /* initialize power supplies, gpios, etc */ | ||
| 1113 | if (pdata->init != NULL) { | 1113 | if (pdata->init != NULL) { |
| 1114 | if (pdata->init(&pdev->dev) != 0) { | 1114 | if (pdata->init(&pdev->dev) != 0) { |
| 1115 | dev_dbg(mmc_dev(host->mmc), | 1115 | dev_dbg(mmc_dev(host->mmc), "late init error\n"); |
| 1116 | "Unable to configure MMC IRQs\n"); | ||
| 1117 | goto err_irq_cd_init; | 1116 | goto err_irq_cd_init; |
| 1118 | } | 1117 | } |
| 1119 | } | 1118 | } |
| 1119 | mmc->ocr_avail = mmc_slot(host).ocr_mask; | ||
| 1120 | 1120 | ||
| 1121 | /* Request IRQ for card detect */ | 1121 | /* Request IRQ for card detect */ |
| 1122 | if ((mmc_slot(host).card_detect_irq)) { | 1122 | if ((mmc_slot(host).card_detect_irq)) { |
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c index f2e9de1414df..6391e3dc8002 100644 --- a/drivers/mtd/onenand/omap2.c +++ b/drivers/mtd/onenand/omap2.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #include <mach/gpmc.h> | 39 | #include <mach/gpmc.h> |
| 40 | #include <mach/onenand.h> | 40 | #include <mach/onenand.h> |
| 41 | #include <mach/gpio.h> | 41 | #include <mach/gpio.h> |
| 42 | #include <mach/pm.h> | ||
| 43 | 42 | ||
| 44 | #include <mach/dma.h> | 43 | #include <mach/dma.h> |
| 45 | 44 | ||
diff --git a/drivers/video/omap/hwa742.c b/drivers/video/omap/hwa742.c index 8aa6e47202b9..5d4f34887a22 100644 --- a/drivers/video/omap/hwa742.c +++ b/drivers/video/omap/hwa742.c | |||
| @@ -133,8 +133,7 @@ struct { | |||
| 133 | struct lcd_ctrl_extif *extif; | 133 | struct lcd_ctrl_extif *extif; |
| 134 | struct lcd_ctrl *int_ctrl; | 134 | struct lcd_ctrl *int_ctrl; |
| 135 | 135 | ||
| 136 | void (*power_up)(struct device *dev); | 136 | struct clk *sys_ck; |
| 137 | void (*power_down)(struct device *dev); | ||
| 138 | } hwa742; | 137 | } hwa742; |
| 139 | 138 | ||
| 140 | struct lcd_ctrl hwa742_ctrl; | 139 | struct lcd_ctrl hwa742_ctrl; |
| @@ -915,14 +914,13 @@ static void hwa742_suspend(void) | |||
| 915 | hwa742_set_update_mode(OMAPFB_UPDATE_DISABLED); | 914 | hwa742_set_update_mode(OMAPFB_UPDATE_DISABLED); |
| 916 | /* Enable sleep mode */ | 915 | /* Enable sleep mode */ |
| 917 | hwa742_write_reg(HWA742_POWER_SAVE, 1 << 1); | 916 | hwa742_write_reg(HWA742_POWER_SAVE, 1 << 1); |
| 918 | if (hwa742.power_down != NULL) | 917 | clk_disable(hwa742.sys_ck); |
| 919 | hwa742.power_down(hwa742.fbdev->dev); | ||
| 920 | } | 918 | } |
| 921 | 919 | ||
| 922 | static void hwa742_resume(void) | 920 | static void hwa742_resume(void) |
| 923 | { | 921 | { |
| 924 | if (hwa742.power_up != NULL) | 922 | clk_enable(hwa742.sys_ck); |
| 925 | hwa742.power_up(hwa742.fbdev->dev); | 923 | |
| 926 | /* Disable sleep mode */ | 924 | /* Disable sleep mode */ |
| 927 | hwa742_write_reg(HWA742_POWER_SAVE, 0); | 925 | hwa742_write_reg(HWA742_POWER_SAVE, 0); |
| 928 | while (1) { | 926 | while (1) { |
| @@ -955,14 +953,13 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode, | |||
| 955 | omapfb_conf = fbdev->dev->platform_data; | 953 | omapfb_conf = fbdev->dev->platform_data; |
| 956 | ctrl_conf = omapfb_conf->ctrl_platform_data; | 954 | ctrl_conf = omapfb_conf->ctrl_platform_data; |
| 957 | 955 | ||
| 958 | if (ctrl_conf == NULL || ctrl_conf->get_clock_rate == NULL) { | 956 | if (ctrl_conf == NULL) { |
| 959 | dev_err(fbdev->dev, "HWA742: missing platform data\n"); | 957 | dev_err(fbdev->dev, "HWA742: missing platform data\n"); |
| 960 | r = -ENOENT; | 958 | r = -ENOENT; |
| 961 | goto err1; | 959 | goto err1; |
| 962 | } | 960 | } |
| 963 | 961 | ||
| 964 | hwa742.power_down = ctrl_conf->power_down; | 962 | hwa742.sys_ck = clk_get(NULL, "hwa_sys_ck"); |
| 965 | hwa742.power_up = ctrl_conf->power_up; | ||
| 966 | 963 | ||
| 967 | spin_lock_init(&hwa742.req_lock); | 964 | spin_lock_init(&hwa742.req_lock); |
| 968 | 965 | ||
| @@ -972,12 +969,11 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode, | |||
| 972 | if ((r = hwa742.extif->init(fbdev)) < 0) | 969 | if ((r = hwa742.extif->init(fbdev)) < 0) |
| 973 | goto err2; | 970 | goto err2; |
| 974 | 971 | ||
| 975 | ext_clk = ctrl_conf->get_clock_rate(fbdev->dev); | 972 | ext_clk = clk_get_rate(hwa742.sys_ck); |
| 976 | if ((r = calc_extif_timings(ext_clk, &extif_mem_div)) < 0) | 973 | if ((r = calc_extif_timings(ext_clk, &extif_mem_div)) < 0) |
| 977 | goto err3; | 974 | goto err3; |
| 978 | hwa742.extif->set_timings(&hwa742.reg_timings); | 975 | hwa742.extif->set_timings(&hwa742.reg_timings); |
| 979 | if (hwa742.power_up != NULL) | 976 | clk_enable(hwa742.sys_ck); |
| 980 | hwa742.power_up(fbdev->dev); | ||
| 981 | 977 | ||
| 982 | calc_hwa742_clk_rates(ext_clk, &sys_clk, &pix_clk); | 978 | calc_hwa742_clk_rates(ext_clk, &sys_clk, &pix_clk); |
| 983 | if ((r = calc_extif_timings(sys_clk, &extif_mem_div)) < 0) | 979 | if ((r = calc_extif_timings(sys_clk, &extif_mem_div)) < 0) |
| @@ -1040,8 +1036,7 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode, | |||
| 1040 | 1036 | ||
| 1041 | return 0; | 1037 | return 0; |
| 1042 | err4: | 1038 | err4: |
| 1043 | if (hwa742.power_down != NULL) | 1039 | clk_disable(hwa742.sys_ck); |
| 1044 | hwa742.power_down(fbdev->dev); | ||
| 1045 | err3: | 1040 | err3: |
| 1046 | hwa742.extif->cleanup(); | 1041 | hwa742.extif->cleanup(); |
| 1047 | err2: | 1042 | err2: |
| @@ -1055,8 +1050,7 @@ static void hwa742_cleanup(void) | |||
| 1055 | hwa742_set_update_mode(OMAPFB_UPDATE_DISABLED); | 1050 | hwa742_set_update_mode(OMAPFB_UPDATE_DISABLED); |
| 1056 | hwa742.extif->cleanup(); | 1051 | hwa742.extif->cleanup(); |
| 1057 | hwa742.int_ctrl->cleanup(); | 1052 | hwa742.int_ctrl->cleanup(); |
| 1058 | if (hwa742.power_down != NULL) | 1053 | clk_disable(hwa742.sys_ck); |
| 1059 | hwa742.power_down(hwa742.fbdev->dev); | ||
| 1060 | } | 1054 | } |
| 1061 | 1055 | ||
| 1062 | struct lcd_ctrl hwa742_ctrl = { | 1056 | struct lcd_ctrl hwa742_ctrl = { |