diff options
| author | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-04 22:53:50 +0000 |
|---|---|---|
| committer | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-04 22:53:50 +0000 |
| commit | d8f699cb32c8c418b65aa6a2c252e097ae4716ae (patch) | |
| tree | 5501b4b8ef53332653d39e9fdbcb1af41af46437 /hw/omap1_clk.c | |
| parent | bfa30a38968c204725a007e6cf845178231d3645 (diff) | |
Zeroing ITR shouldn't ack irq zero.
Fix PWT & PWL clocks, fix user refcounting for clocks, add 'hsab_ck' and 'usb_w2fc_ck'.
Fix TCMI register addresses.
Implement OMAP McBSP controller and connection to I2S-compatible CODECs.
Add audio support for TSC2102 as an I2S CODEC.
Connect TSC2102 I2S interface to CPU's McBSP1 interface in the Palm Tungsten|E.
Correct '>' instead of '>>' typos.
Implement GPIO PIN_CONTROL register (not in OMAP310 TRM, from OMAP1510).
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3534 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/omap1_clk.c')
| -rw-r--r-- | hw/omap1_clk.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/hw/omap1_clk.c b/hw/omap1_clk.c index c8540de70f..b2ec23c13c 100644 --- a/hw/omap1_clk.c +++ b/hw/omap1_clk.c @@ -307,6 +307,12 @@ static struct clk lbfree_ck = { .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310, }; +static struct clk hsab_ck = { + .name = "hsab_ck", + .parent = &tc_ck, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310, +}; + static struct clk rhea1_ck = { .name = "rhea1_ck", .parent = &tc_ck, @@ -359,7 +365,7 @@ static struct clk uart2_ck = { static struct clk uart3_1510 = { .name = "uart3_ck", /* Direct from ULPD, no real parent */ - .parent = &armper_ck,/* either armper_ck or dpll4 */ + .parent = &armper_ck, /* either armper_ck or dpll4 */ .rate = 12000000, .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310 | ALWAYS_ENABLED, }; @@ -395,11 +401,12 @@ static struct clk usb_hhc_ck16xx = { .flags = CLOCK_IN_OMAP16XX, }; -static struct clk usb_dc_ck = { - .name = "usb_dc_ck", - /* Direct from ULPD, no parent */ +static struct clk usb_w2fc_mclk = { + .name = "usb_w2fc_mclk", + .alias = "usb_w2fc_ck", + .parent = &ck_48m, .rate = 48000000, - .flags = CLOCK_IN_OMAP16XX, + .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX, }; static struct clk mclk_1510 = { @@ -539,6 +546,7 @@ static struct clk *onchip_clks[] = { &api_ck, &lb_ck, &lbfree_ck, + &hsab_ck, &rhea1_ck, &rhea2_ck, &lcd_ck_16xx, @@ -551,7 +559,6 @@ static struct clk *onchip_clks[] = { &uart3_16xx, &usb_clk0, &usb_hhc_ck1510, &usb_hhc_ck16xx, - &usb_dc_ck, &mclk_1510, &mclk_16xx, &mclk_310, &bclk_1510, &bclk_16xx, &bclk_310, &mmc1_ck, @@ -560,6 +567,7 @@ static struct clk *onchip_clks[] = { &cam_exclk, &cam_lclk, &clk32k, + &usb_w2fc_mclk, /* Virtual clocks */ &i2c_fck, &i2c_ick, |