← Back to branch summary

~ubuntu-branches/ubuntu/natty/linux-ti-omap4/natty-201011051436

« back to all changes in this revision

Viewing changes to arch/arm/mach-omap2/board-4430sdp.c

  • Committer: Bazaar Package Importer
  • Author(s): Tim Gardner, Sebastien Jan, Tim Gardner, Upstream Kernel Changes
  • Date: 2010-06-28 14:35:42 UTC
  • Revision ID: james.westby@ubuntu.com-20100628143542-pa6r3syv0z0mjvt1
Tags: 2.6.34-901.2
[ Sebastien Jan ]

* [Config] Fix configuration settings

[ Tim Gardner ]

* [Config] Fix Vcs-git entry

[ Upstream Kernel Changes ]

* Revert "ASoC: ABE: Fixes for hal 6.22"
* timer: fix for timer crash
* Serial: Hold an port lock while updating console.
* Serial: Use IIR reg to identify rx line irq.
* ASoC: ABE-TWL6040: Correct ABE initialization
* ASoC: OMAP: Correct ABE initialization
* ASoC: ABE: Support for pause resume
* ASoC: OMAP: Stop the codec after all stream are closed
* ASoC: ABE-TWL6040: Add digital_mute callback
* ASoC: Remove codec active flag
* Fix import of merge from audio branch
* ASoC: ABE: Correct implementation of hp filter
* ASoC: ABE-TWL6040: Mute the correct path
* smsc95xx: Add module parameter to override MAC address

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-omap2/board-4430sdp.c
827
827
        },
828
828
};
829
829
 
 
830
static struct twl4030_madc_platform_data sdp4430_gpadc_data = {
 
831
        .irq_line       = 1,
 
832
};
 
833
 
 
834
static struct twl4030_bci_platform_data sdp4430_bci_data = {
 
835
        .monitoring_interval            = 10,
 
836
        .max_charger_currentmA          = 1500,
 
837
        .max_charger_voltagemV          = 4560,
 
838
        .max_bat_voltagemV              = 4200,
 
839
        .low_bat_voltagemV              = 3300,
 
840
};
830
841
static struct twl4030_codec_data twl6040_codec = {
831
842
#ifdef CONFIG_OMAP4_AUDIO_PWRON
832
843
        .audpwron_gpio  = 127,
838
849
#endif
839
850
};
840
851
 
841
 
static struct twl4030_madc_platform_data sdp4430_gpadc_data = {
842
 
        .irq_line       = 1,
843
 
};
844
 
 
845
 
static struct twl4030_bci_platform_data sdp4430_bci_data = {
846
 
        .monitoring_interval            = 10,
847
 
        .max_charger_currentmA          = 1500,
848
 
        .max_charger_voltagemV          = 4560,
849
 
        .max_bat_voltagemV              = 4200,
850
 
        .low_bat_voltagemV              = 3300,
851
 
};
852
 
 
853
852
static struct twl4030_platform_data sdp4430_twldata = {
854
853
        .irq_base       = TWL6030_IRQ_BASE,
855
854
        .irq_end        = TWL6030_IRQ_END,
870
869
        .codec          = &twl6040_codec,
871
870
        .madc           = &sdp4430_gpadc_data,
872
871
        .bci            = &sdp4430_bci_data,
 
872
 
 
873
        /* children */
 
874
        .codec          = &twl6040_codec,
873
875
};
874
876
 
875
877
static struct bq2415x_platform_data sdp4430_bqdata = {