← Back to branch summary

~ubuntu-branches/debian/experimental/linux-2.6/experimental

« back to all changes in this revision

Viewing changes to arch/arm/mach-s3c24xx/include/mach/osiris-map.h

  • Committer: Package Import Robot
  • Author(s): maximilian attems, maximilian attems, Ben Hutchings
  • Date: 2012-06-06 10:25:57 UTC
  • mfrom: (1.2.38)
  • Revision ID: package-import@ubuntu.com-20120606102557-b9j3506wcwrqrnx8
Tags: 3.4.1-1~experimental.1
* New upstream release: http://kernelnewbies.org/Linux_3.4
* New upstream stable update:
  http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.4.1

[ maximilian attems ]
* Enable DM_VERITY, NF_CONNTRACK_TIMEOUT, NF_CT_NETLINK_TIMEOUT,
  IP_NF_MATCH_RPFILTER, IP6_NF_MATCH_RPFILTER, NETFILTER_NETLINK_ACCT,
  NETFILTER_XT_MATCH_NFACCT, NET_SCH_PLUG, SCSI_UFSHCD, SCSI_VIRTIO,
  NET_TEAM, ATH6KL.

[ Ben Hutchings ]
* DFSG: Remove the new vs6624 driver, which contains non-free firmware
* aufs: Update to aufs3.4-20120521
* [rt] Update to 3.4-rt8 and reenable

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-s3c24xx/include/mach/osiris-map.h
 
1
/* arch/arm/mach-s3c2410/include/mach/osiris-map.h
 
2
 *
 
3
 * Copyright 2005 Simtec Electronics
 
4
 *      http://www.simtec.co.uk/products/
 
5
 *      Ben Dooks <ben@simtec.co.uk>
 
6
 *
 
7
 * OSIRIS - Memory map definitions
 
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
/* needs arch/map.h including with this */
 
15
 
 
16
#ifndef __ASM_ARCH_OSIRISMAP_H
 
17
#define __ASM_ARCH_OSIRISMAP_H
 
18
 
 
19
/* start peripherals off after the S3C2410 */
 
20
 
 
21
#define OSIRIS_IOADDR(x)        (S3C2410_ADDR((x) + 0x04000000))
 
22
 
 
23
#define OSIRIS_PA_CPLD          (S3C2410_CS1 | (1<<26))
 
24
 
 
25
/* we put the CPLD registers next, to get them out of the way */
 
26
 
 
27
#define OSIRIS_VA_CTRL0         OSIRIS_IOADDR(0x00000000)
 
28
#define OSIRIS_PA_CTRL0         (OSIRIS_PA_CPLD)
 
29
 
 
30
#define OSIRIS_VA_CTRL1         OSIRIS_IOADDR(0x00100000)
 
31
#define OSIRIS_PA_CTRL1         (OSIRIS_PA_CPLD + (1<<23))
 
32
 
 
33
#define OSIRIS_VA_CTRL2         OSIRIS_IOADDR(0x00200000)
 
34
#define OSIRIS_PA_CTRL2         (OSIRIS_PA_CPLD + (2<<23))
 
35
 
 
36
#define OSIRIS_VA_CTRL3         OSIRIS_IOADDR(0x00300000)
 
37
#define OSIRIS_PA_CTRL3         (OSIRIS_PA_CPLD + (2<<23))
 
38
 
 
39
#define OSIRIS_VA_IDREG         OSIRIS_IOADDR(0x00700000)
 
40
#define OSIRIS_PA_IDREG         (OSIRIS_PA_CPLD + (7<<23))
 
41
 
 
42
#endif /* __ASM_ARCH_OSIRISMAP_H */