← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-lowlatency/quantal-proposed

« back to all changes in this revision

Viewing changes to drivers/clk/mxs/clk-imx23.c

  • Committer: Package Import Robot
  • Author(s): Andy Whitcroft, Andy Whitcroft, Ubuntu: 3.5.0-3.3
  • Date: 2012-07-03 09:23:14 UTC
  • Revision ID: package-import@ubuntu.com-20120703092314-wjaqz3coxptokmtl
Tags: 3.5.0-3.3
https://launchpad.net/bugs/1004535
https://launchpad.net/bugs/1006012
https://launchpad.net/bugs/1012800
https://launchpad.net/bugs/1013183
https://launchpad.net/bugs/1017017
https://launchpad.net/bugs/884652
[ Andy Whitcroft ]

* [Config] drop -pae from d-i configuration.
* rebase to Ubuntu-3.5.0-3.3

[ Ubuntu: 3.5.0-3.3 ]

* [Config] enable CONFIG_MEMTEST=y
  - LP: #1004535
* [Config] config-check: add support for a cut operation
* [Config] enforcer -- switch to cut where appropriate
* Rebase to v3.5-rc5
* [Config] Updateconfigs after rebase to v3.5-rc5
* SAUCE: ocfs2: Fix NULL pointer dereferrence in
  __ocfs2_change_file_space
  - LP: #1006012
* SAUCE: (drop after 3.5) drm/i915: ignore pipe select bit when checking
  for LVDS register initialization
  - LP: #1012800
* rebase to v3.5-rc5
  - LP: #1013183
  - LP: #1017017
  - LP: #884652

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/clk/mxs/clk-imx23.c
71
71
        __mxs_setl(30 << BP_FRAC_IOFRAC, FRAC);
72
72
}
73
73
 
74
 
static struct clk_lookup uart_lookups[] __initdata = {
 
74
static struct clk_lookup uart_lookups[] = {
75
75
        { .dev_id = "duart", },
76
76
        { .dev_id = "mxs-auart.0", },
77
77
        { .dev_id = "mxs-auart.1", },
80
80
        { .dev_id = "80070000.serial", },
81
81
};
82
82
 
83
 
static struct clk_lookup hbus_lookups[] __initdata = {
 
83
static struct clk_lookup hbus_lookups[] = {
84
84
        { .dev_id = "imx23-dma-apbh", },
85
85
        { .dev_id = "80004000.dma-apbh", },
86
86
};
87
87
 
88
 
static struct clk_lookup xbus_lookups[] __initdata = {
 
88
static struct clk_lookup xbus_lookups[] = {
89
89
        { .dev_id = "duart", .con_id = "apb_pclk"},
90
90
        { .dev_id = "80070000.serial", .con_id = "apb_pclk"},
91
91
        { .dev_id = "imx23-dma-apbx", },
92
92
        { .dev_id = "80024000.dma-apbx", },
93
93
};
94
94
 
95
 
static struct clk_lookup ssp_lookups[] __initdata = {
 
95
static struct clk_lookup ssp_lookups[] = {
96
96
        { .dev_id = "imx23-mmc.0", },
97
97
        { .dev_id = "imx23-mmc.1", },
98
98
        { .dev_id = "80010000.ssp", },
99
99
        { .dev_id = "80034000.ssp", },
100
100
};
101
101
 
102
 
static struct clk_lookup lcdif_lookups[] __initdata = {
 
102
static struct clk_lookup lcdif_lookups[] = {
103
103
        { .dev_id = "imx23-fb", },
104
104
        { .dev_id = "80030000.lcdif", },
105
105
};
106
106
 
107
 
static struct clk_lookup gpmi_lookups[] __initdata = {
 
107
static struct clk_lookup gpmi_lookups[] = {
108
108
        { .dev_id = "imx23-gpmi-nand", },
109
109
        { .dev_id = "8000c000.gpmi", },
110
110
};