← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to arch/arm/mach-omap2/clock3xxx_data.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-omap2/clock3xxx_data.c
1
1
/*
2
2
 * OMAP3 clock data
3
3
 *
4
 
 * Copyright (C) 2007-2010 Texas Instruments, Inc.
 
4
 * Copyright (C) 2007-2010, 2012 Texas Instruments, Inc.
5
5
 * Copyright (C) 2007-2011 Nokia Corporation
6
6
 *
7
7
 * Written by Paul Walmsley
1642
1642
        .name           = "hdq_fck",
1643
1643
        .ops            = &clkops_omap2_dflt_wait,
1644
1644
        .parent         = &core_12m_fck,
 
1645
        .clkdm_name     = "core_l4_clkdm",
1645
1646
        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
1646
1647
        .enable_bit     = OMAP3430_EN_HDQ_SHIFT,
1647
1648
        .recalc         = &followparent_recalc,
3297
3298
        CLK(NULL,       "gfx_l3_ick",   &gfx_l3_ick,    CK_3430ES1),
3298
3299
        CLK(NULL,       "gfx_cg1_ck",   &gfx_cg1_ck,    CK_3430ES1),
3299
3300
        CLK(NULL,       "gfx_cg2_ck",   &gfx_cg2_ck,    CK_3430ES1),
3300
 
        CLK(NULL,       "sgx_fck",      &sgx_fck,       CK_3430ES2PLUS | CK_3517 | CK_36XX),
3301
 
        CLK(NULL,       "sgx_ick",      &sgx_ick,       CK_3430ES2PLUS | CK_3517 | CK_36XX),
 
3301
        CLK(NULL,       "sgx_fck",      &sgx_fck,       CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
 
3302
        CLK(NULL,       "sgx_ick",      &sgx_ick,       CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
3302
3303
        CLK(NULL,       "d2d_26m_fck",  &d2d_26m_fck,   CK_3430ES1),
3303
3304
        CLK(NULL,       "modem_fck",    &modem_fck,     CK_34XX | CK_36XX),
3304
3305
        CLK(NULL,       "sad2d_ick",    &sad2d_ick,     CK_34XX | CK_36XX),
3422
3423
        CLK(NULL,       "per_48m_fck",  &per_48m_fck,   CK_3XXX),
3423
3424
        CLK(NULL,       "uart3_fck",    &uart3_fck,     CK_3XXX),
3424
3425
        CLK(NULL,       "uart4_fck",    &uart4_fck,     CK_36XX),
3425
 
        CLK(NULL,       "uart4_fck",    &uart4_fck_am35xx, CK_3505 | CK_3517),
 
3426
        CLK(NULL,       "uart4_fck",    &uart4_fck_am35xx, CK_AM35XX),
3426
3427
        CLK(NULL,       "gpt2_fck",     &gpt2_fck,      CK_3XXX),
3427
3428
        CLK(NULL,       "gpt3_fck",     &gpt3_fck,      CK_3XXX),
3428
3429
        CLK(NULL,       "gpt4_fck",     &gpt4_fck,      CK_3XXX),
3516
3517
        struct omap_clk *c;
3517
3518
        u32 cpu_clkflg = 0;
3518
3519
 
3519
 
        /*
3520
 
         * 3505 must be tested before 3517, since 3517 returns true
3521
 
         * for both AM3517 chips and AM3517 family chips, which
3522
 
         * includes 3505.  Unfortunately there's no obvious family
3523
 
         * test for 3517/3505 :-(
3524
 
         */
3525
 
        if (cpu_is_omap3505()) {
3526
 
                cpu_mask = RATE_IN_34XX;
3527
 
                cpu_clkflg = CK_3505;
3528
 
        } else if (cpu_is_omap3517()) {
3529
 
                cpu_mask = RATE_IN_34XX;
3530
 
                cpu_clkflg = CK_3517;
3531
 
        } else if (cpu_is_omap3505()) {
3532
 
                cpu_mask = RATE_IN_34XX;
3533
 
                cpu_clkflg = CK_3505;
 
3520
        if (soc_is_am35xx()) {
 
3521
                cpu_mask = RATE_IN_34XX;
 
3522
                cpu_clkflg = CK_AM35XX;
3534
3523
        } else if (cpu_is_omap3630()) {
3535
3524
                cpu_mask = (RATE_IN_34XX | RATE_IN_36XX);
3536
3525
                cpu_clkflg = CK_36XX;