← Back to branch summary

~ubuntu-branches/ubuntu/raring/linux-mvl-dove/raring

« back to all changes in this revision

Viewing changes to arch/arm/mach-dove/dove-db-setup.c

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Bader, Andy Whitcroft, Eric Miao, Upstream Kernel Changes
  • Date: 2010-03-26 22:53:03 UTC
  • Revision ID: james.westby@ubuntu.com-20100326225303-yvaososd4ns5yu0f
Tags: 2.6.32-202.14
https://launchpad.net/bugs/541921
https://launchpad.net/bugs/530404
https://launchpad.net/bugs/537311
https://launchpad.net/bugs/537311
https://launchpad.net/bugs/537311
[ Andy Whitcroft ]

* rules -- allow architecture configurations to be missing

[ Eric Miao ]

* [Config]: Make UIO_DOVE_VMETA driver builtin
  - LP: #541921

[ Upstream Kernel Changes ]

* sound: skip error handling inside soc_pcm_open
  - LP: #530404
* DVS: Fixed a potential conflict of defining dvs_enable as global for
  two diffrent baords
  - LP: #537311
* rt5611_ts: swap touchscreen Y axis
  - LP: #537311
* dove: fix section mismatch error
  - LP: #537311

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-dove/dove-db-setup.c
73
73
module_param(standby_fix, uint, 0);
74
74
MODULE_PARM_DESC(standby_fix, "if 1 then CKE and MRESET are connected to MPP4 and MPP6");
75
75
 
76
 
int dvs_enable = 1;
 
76
static int dvs_enable = 1;
77
77
module_param(dvs_enable, int, 1);
78
78
MODULE_PARM_DESC(dvs_enable, "if 1 then enable DVS");
79
79
 
710
710
/*****************************************************************************
711
711
 * POWER MANAGEMENT
712
712
 ****************************************************************************/
 
713
extern int global_dvs_enable;
713
714
static int __init dove_db_pm_init(void)
714
715
{
715
716
        MV_PMU_INFO pmuInitInfo;
718
719
        if (!machine_is_dove_db())
719
720
                return 0;
720
721
 
 
722
        global_dvs_enable = dvs_enable;
 
723
 
721
724
        dove_pcie_id(&dev, &rev);
722
725
 
723
726
        pmuInitInfo.batFltMngDis = MV_FALSE;                            /* Keep battery fault enabled */