← 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-sa1100/shannon.c

  • 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-sa1100/shannon.c
9
9
#include <linux/mtd/mtd.h>
10
10
#include <linux/mtd/partitions.h>
11
11
 
 
12
#include <video/sa1100fb.h>
 
13
 
12
14
#include <mach/hardware.h>
13
15
#include <asm/mach-types.h>
14
16
#include <asm/setup.h>
19
21
#include <asm/mach/serial_sa1100.h>
20
22
#include <mach/mcp.h>
21
23
#include <mach/shannon.h>
 
24
#include <mach/irqs.h>
22
25
 
23
26
#include "generic.h"
24
27
 
46
49
        .nr_parts       = ARRAY_SIZE(shannon_partitions),
47
50
};
48
51
 
49
 
static struct resource shannon_flash_resource = {
50
 
        .start          = SA1100_CS0_PHYS,
51
 
        .end            = SA1100_CS0_PHYS + SZ_4M - 1,
52
 
        .flags          = IORESOURCE_MEM,
53
 
};
 
52
static struct resource shannon_flash_resource =
 
53
        DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_4M);
54
54
 
55
55
static struct mcp_plat_data shannon_mcp_data = {
56
56
        .mccr0          = MCCR0_ADM,
57
57
        .sclk_rate      = 11981000,
58
58
};
59
59
 
 
60
static struct sa1100fb_mach_info shannon_lcd_info = {
 
61
        .pixclock       = 152500,       .bpp            = 8,
 
62
        .xres           = 640,          .yres           = 480,
 
63
 
 
64
        .hsync_len      = 4,            .vsync_len      = 3,
 
65
        .left_margin    = 2,            .upper_margin   = 0,
 
66
        .right_margin   = 1,            .lower_margin   = 0,
 
67
 
 
68
        .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
 
69
 
 
70
        .lccr0          = LCCR0_Color | LCCR0_Dual | LCCR0_Pas,
 
71
        .lccr3          = LCCR3_ACBsDiv(512),
 
72
};
 
73
 
60
74
static void __init shannon_init(void)
61
75
{
 
76
        sa11x0_ppc_configure_mcp();
 
77
        sa11x0_register_lcd(&shannon_lcd_info);
62
78
        sa11x0_register_mtd(&shannon_flash_data, &shannon_flash_resource, 1);
63
79
        sa11x0_register_mcp(&shannon_mcp_data);
64
80
}
84
100
MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)")
85
101
        .atag_offset    = 0x100,
86
102
        .map_io         = shannon_map_io,
 
103
        .nr_irqs        = SA1100_NR_IRQS,
87
104
        .init_irq       = sa1100_init_irq,
88
105
        .timer          = &sa1100_timer,
89
106
        .init_machine   = shannon_init,