diff options
Diffstat (limited to 'src/mainboard/samsung')
| -rw-r--r-- | src/mainboard/samsung/lumpy/acpi_tables.c | 40 | ||||
| -rw-r--r-- | src/mainboard/samsung/stumpy/acpi_tables.c | 34 |
2 files changed, 31 insertions, 43 deletions
diff --git a/src/mainboard/samsung/lumpy/acpi_tables.c b/src/mainboard/samsung/lumpy/acpi_tables.c index 413841c60b..3e921870fc 100644 --- a/src/mainboard/samsung/lumpy/acpi_tables.c +++ b/src/mainboard/samsung/lumpy/acpi_tables.c @@ -27,8 +27,24 @@ static global_nvs_t *gnvs_; -static void acpi_update_thermal_table(global_nvs_t *gnvs) +void acpi_create_gnvs(global_nvs_t *gnvs) { + gnvs_ = gnvs; + + /* + * Disable 3G in suspend by default. + * Provide option to enable for http://crosbug.com/p/7925 + */ + gnvs->s33g = 0; + + /* Disable USB ports in S3 by default */ + gnvs->s3u0 = 0; + gnvs->s3u1 = 0; + + /* Disable USB ports in S5 by default */ + gnvs->s5u0 = 0; + gnvs->s5u1 = 0; + gnvs->f4of = FAN4_THRESHOLD_OFF; gnvs->f4on = FAN4_THRESHOLD_ON; @@ -48,28 +64,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs) gnvs->tpsv = PASSIVE_TEMPERATURE; gnvs->tmax = MAX_TEMPERATURE; gnvs->flvl = 5; -} - -void acpi_create_gnvs(global_nvs_t *gnvs) -{ - gnvs_ = gnvs; - - /* - * Disable 3G in suspend by default. - * Provide option to enable for http://crosbug.com/p/7925 - */ - gnvs->s33g = 0; - - /* Disable USB ports in S3 by default */ - gnvs->s3u0 = 0; - gnvs->s3u1 = 0; - - /* Disable USB ports in S5 by default */ - gnvs->s5u0 = 0; - gnvs->s5u1 = 0; - - - acpi_update_thermal_table(gnvs); gnvs->chromeos.vbt2 = ec_read(0xcb) ? ACTIVE_ECFW_RW : ACTIVE_ECFW_RO; } diff --git a/src/mainboard/samsung/stumpy/acpi_tables.c b/src/mainboard/samsung/stumpy/acpi_tables.c index b913bd623d..07f4fda32a 100644 --- a/src/mainboard/samsung/stumpy/acpi_tables.c +++ b/src/mainboard/samsung/stumpy/acpi_tables.c @@ -24,8 +24,21 @@ static global_nvs_t *gnvs_; -static void acpi_update_thermal_table(global_nvs_t *gnvs) +void acpi_create_gnvs(global_nvs_t *gnvs) { + gnvs_ = gnvs; + + /* Enable Front USB ports in S3 by default */ + gnvs->s3u0 = 1; + gnvs->s3u1 = 1; + + /* + * Enable Front USB ports in S5 by default + * to be consistent with back port behavior + */ + gnvs->s5u0 = 1; + gnvs->s5u1 = 1; + gnvs->f4of = FAN4_THRESHOLD_OFF; gnvs->f4on = FAN4_THRESHOLD_ON; gnvs->f4pw = FAN4_PWM; @@ -50,25 +63,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs) gnvs->tpsv = PASSIVE_TEMPERATURE; gnvs->tmax = MAX_TEMPERATURE; gnvs->flvl = 5; -} - -void acpi_create_gnvs(global_nvs_t *gnvs) -{ - gnvs_ = gnvs; - - /* Enable Front USB ports in S3 by default */ - gnvs->s3u0 = 1; - gnvs->s3u1 = 1; - - /* - * Enable Front USB ports in S5 by default - * to be consistent with back port behavior - */ - gnvs->s5u0 = 1; - gnvs->s5u1 = 1; - - - acpi_update_thermal_table(gnvs); // Stumpy has no arms^H^H^H^HEC. gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO; |