mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-09-30 16:54:56 +00:00
Pull 5283 into release branch
This commit is contained in:
commit
c8734a9663
1 changed files with 7 additions and 0 deletions
|
@ -638,6 +638,13 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
pmtmr_ioport = fadt->xpm_tmr_blk.address;
|
pmtmr_ioport = fadt->xpm_tmr_blk.address;
|
||||||
|
/*
|
||||||
|
* "X" fields are optional extensions to the original V1.0
|
||||||
|
* fields, so we must selectively expand V1.0 fields if the
|
||||||
|
* corresponding X field is zero.
|
||||||
|
*/
|
||||||
|
if (!pmtmr_ioport)
|
||||||
|
pmtmr_ioport = fadt->V1_pm_tmr_blk;
|
||||||
} else {
|
} else {
|
||||||
/* FADT rev. 1 */
|
/* FADT rev. 1 */
|
||||||
pmtmr_ioport = fadt->V1_pm_tmr_blk;
|
pmtmr_ioport = fadt->V1_pm_tmr_blk;
|
||||||
|
|
Loading…
Reference in a new issue