summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/auron/variants/auron_paine/overridetree.cb10
-rw-r--r--src/mainboard/google/auron/variants/auron_yuna/overridetree.cb10
-rw-r--r--src/mainboard/google/auron/variants/buddy/overridetree.cb10
-rw-r--r--src/mainboard/google/auron/variants/gandof/overridetree.cb10
-rw-r--r--src/mainboard/google/auron/variants/lulu/overridetree.cb10
-rw-r--r--src/mainboard/google/auron/variants/samus/overridetree.cb10
-rw-r--r--src/mainboard/google/slippy/variants/falco/overridetree.cb10
-rw-r--r--src/mainboard/google/slippy/variants/leon/overridetree.cb10
-rw-r--r--src/mainboard/google/slippy/variants/peppy/overridetree.cb10
-rw-r--r--src/mainboard/google/slippy/variants/wolf/overridetree.cb10
-rw-r--r--src/mainboard/hp/folio_9480m/devicetree.cb10
-rw-r--r--src/mainboard/lenovo/t440p/devicetree.cb10
-rw-r--r--src/mainboard/purism/librem_bdw/devicetree.cb10
-rw-r--r--src/northbridge/intel/haswell/chip.h10
-rw-r--r--src/northbridge/intel/haswell/gma.c12
-rw-r--r--src/soc/intel/broadwell/chip.h10
-rw-r--r--src/soc/intel/broadwell/gma.c13
17 files changed, 88 insertions, 87 deletions
diff --git a/src/mainboard/google/auron/variants/auron_paine/overridetree.cb b/src/mainboard/google/auron/variants/auron_paine/overridetree.cb
index 81110408c1..cb7fb62b34 100644
--- a/src/mainboard/google/auron/variants/auron_paine/overridetree.cb
+++ b/src/mainboard/google/auron/variants/auron_paine/overridetree.cb
@@ -1,11 +1,11 @@
chip soc/intel/broadwell
# Set panel power delays
- register "gpu_panel_power_cycle_delay" = "5" # 400ms
- register "gpu_panel_power_up_delay" = "400" # 40ms
- register "gpu_panel_power_down_delay" = "150" # 15ms
- register "gpu_panel_power_backlight_on_delay" = "70" # 7ms
- register "gpu_panel_power_backlight_off_delay" = "2100" # 210ms
+ register "gpu_panel_power_cycle_delay_ms" = "400"
+ register "gpu_panel_power_up_delay_ms" = "40"
+ register "gpu_panel_power_down_delay_ms" = "15"
+ register "gpu_panel_power_backlight_on_delay_ms" = "7"
+ register "gpu_panel_power_backlight_off_delay_ms" = "210"
device domain 0 on
chip soc/intel/broadwell/pch
diff --git a/src/mainboard/google/auron/variants/auron_yuna/overridetree.cb b/src/mainboard/google/auron/variants/auron_yuna/overridetree.cb
index eb33d433e8..746ec9a58f 100644
--- a/src/mainboard/google/auron/variants/auron_yuna/overridetree.cb
+++ b/src/mainboard/google/auron/variants/auron_yuna/overridetree.cb
@@ -1,11 +1,11 @@
chip soc/intel/broadwell
# Set panel power delays
- register "gpu_panel_power_cycle_delay" = "5" # 400ms
- register "gpu_panel_power_up_delay" = "400" # 40ms
- register "gpu_panel_power_down_delay" = "150" # 15ms
- register "gpu_panel_power_backlight_on_delay" = "2100" # 210ms
- register "gpu_panel_power_backlight_off_delay" = "2100" # 210ms
+ register "gpu_panel_power_cycle_delay_ms" = "400"
+ register "gpu_panel_power_up_delay_ms" = "40"
+ register "gpu_panel_power_down_delay_ms" = "15"
+ register "gpu_panel_power_backlight_on_delay_ms" = "210"
+ register "gpu_panel_power_backlight_off_delay_ms" = "210"
device domain 0 on
chip soc/intel/broadwell/pch
diff --git a/src/mainboard/google/auron/variants/buddy/overridetree.cb b/src/mainboard/google/auron/variants/buddy/overridetree.cb
index 60fb08cbf7..5423043cd8 100644
--- a/src/mainboard/google/auron/variants/buddy/overridetree.cb
+++ b/src/mainboard/google/auron/variants/buddy/overridetree.cb
@@ -1,11 +1,11 @@
chip soc/intel/broadwell
# Set panel power delays
- register "gpu_panel_power_cycle_delay" = "5" # 400ms
- register "gpu_panel_power_up_delay" = "400" # 40ms
- register "gpu_panel_power_down_delay" = "150" # 15ms
- register "gpu_panel_power_backlight_on_delay" = "70" # 7ms
- register "gpu_panel_power_backlight_off_delay" = "2100" # 210ms
+ register "gpu_panel_power_cycle_delay_ms" = "400"
+ register "gpu_panel_power_up_delay_ms" = "40"
+ register "gpu_panel_power_down_delay_ms" = "15"
+ register "gpu_panel_power_backlight_on_delay_ms" = "7"
+ register "gpu_panel_power_backlight_off_delay_ms" = "210"
register "s0ix_enable" = "0"
diff --git a/src/mainboard/google/auron/variants/gandof/overridetree.cb b/src/mainboard/google/auron/variants/gandof/overridetree.cb
index c7e2421ee8..19c0ca0003 100644
--- a/src/mainboard/google/auron/variants/gandof/overridetree.cb
+++ b/src/mainboard/google/auron/variants/gandof/overridetree.cb
@@ -1,11 +1,11 @@
chip soc/intel/broadwell
# Set panel power delays
- register "gpu_panel_power_cycle_delay" = "5" # 400ms
- register "gpu_panel_power_up_delay" = "400" # 40ms
- register "gpu_panel_power_down_delay" = "150" # 15ms
- register "gpu_panel_power_backlight_on_delay" = "500" # 50ms
- register "gpu_panel_power_backlight_off_delay" = "2100" # 210ms
+ register "gpu_panel_power_cycle_delay_ms" = "400"
+ register "gpu_panel_power_up_delay_ms" = "40"
+ register "gpu_panel_power_down_delay_ms" = "15"
+ register "gpu_panel_power_backlight_on_delay_ms" = "50"
+ register "gpu_panel_power_backlight_off_delay_ms" = "210"
device domain 0 on
chip soc/intel/broadwell/pch
diff --git a/src/mainboard/google/auron/variants/lulu/overridetree.cb b/src/mainboard/google/auron/variants/lulu/overridetree.cb
index 81110408c1..cb7fb62b34 100644
--- a/src/mainboard/google/auron/variants/lulu/overridetree.cb
+++ b/src/mainboard/google/auron/variants/lulu/overridetree.cb
@@ -1,11 +1,11 @@
chip soc/intel/broadwell
# Set panel power delays
- register "gpu_panel_power_cycle_delay" = "5" # 400ms
- register "gpu_panel_power_up_delay" = "400" # 40ms
- register "gpu_panel_power_down_delay" = "150" # 15ms
- register "gpu_panel_power_backlight_on_delay" = "70" # 7ms
- register "gpu_panel_power_backlight_off_delay" = "2100" # 210ms
+ register "gpu_panel_power_cycle_delay_ms" = "400"
+ register "gpu_panel_power_up_delay_ms" = "40"
+ register "gpu_panel_power_down_delay_ms" = "15"
+ register "gpu_panel_power_backlight_on_delay_ms" = "7"
+ register "gpu_panel_power_backlight_off_delay_ms" = "210"
device domain 0 on
chip soc/intel/broadwell/pch
diff --git a/src/mainboard/google/auron/variants/samus/overridetree.cb b/src/mainboard/google/auron/variants/samus/overridetree.cb
index d8aec0ae04..989b887628 100644
--- a/src/mainboard/google/auron/variants/samus/overridetree.cb
+++ b/src/mainboard/google/auron/variants/samus/overridetree.cb
@@ -4,11 +4,11 @@ chip soc/intel/broadwell
register "gpu_dp_c_hotplug" = "0x06"
# Set panel power delays
- register "gpu_panel_power_cycle_delay" = "6" # 500ms
- register "gpu_panel_power_up_delay" = "2000" # 200ms
- register "gpu_panel_power_down_delay" = "500" # 50ms
- register "gpu_panel_power_backlight_on_delay" = "2000" # 200ms
- register "gpu_panel_power_backlight_off_delay" = "2000" # 200ms
+ register "gpu_panel_power_cycle_delay_ms" = "500"
+ register "gpu_panel_power_up_delay_ms" = "200"
+ register "gpu_panel_power_down_delay_ms" = "50"
+ register "gpu_panel_power_backlight_on_delay_ms" = "200"
+ register "gpu_panel_power_backlight_off_delay_ms" = "200"
register "vr_slow_ramp_rate_set" = "3"
register "vr_slow_ramp_rate_enable" = "1"
diff --git a/src/mainboard/google/slippy/variants/falco/overridetree.cb b/src/mainboard/google/slippy/variants/falco/overridetree.cb
index 7df0ca1a6f..54ae6151d2 100644
--- a/src/mainboard/google/slippy/variants/falco/overridetree.cb
+++ b/src/mainboard/google/slippy/variants/falco/overridetree.cb
@@ -1,11 +1,11 @@
chip northbridge/intel/haswell
# Set panel power delays
- register "gpu_panel_power_cycle_delay" = "5" # 400ms (T4)
- register "gpu_panel_power_up_delay" = "600" # 60ms (T1+T2)
- register "gpu_panel_power_down_delay" = "600" # 60ms (T3+T7)
- register "gpu_panel_power_backlight_on_delay" = "2100" # 210ms (T5)
- register "gpu_panel_power_backlight_off_delay" = "2100" # 210ms (T6)
+ register "gpu_panel_power_cycle_delay_ms" = "400"
+ register "gpu_panel_power_up_delay_ms" = "60"
+ register "gpu_panel_power_down_delay_ms" = "60"
+ register "gpu_panel_power_backlight_on_delay_ms" = "210"
+ register "gpu_panel_power_backlight_off_delay_ms" = "210"
device domain 0 on
diff --git a/src/mainboard/google/slippy/variants/leon/overridetree.cb b/src/mainboard/google/slippy/variants/leon/overridetree.cb
index 6dee38e36e..9c45f0062b 100644
--- a/src/mainboard/google/slippy/variants/leon/overridetree.cb
+++ b/src/mainboard/google/slippy/variants/leon/overridetree.cb
@@ -1,11 +1,11 @@
chip northbridge/intel/haswell
# Set panel power delays
- register "gpu_panel_power_cycle_delay" = "5" # 400ms
- register "gpu_panel_power_up_delay" = "400" # 40ms
- register "gpu_panel_power_down_delay" = "150" # 15ms
- register "gpu_panel_power_backlight_on_delay" = "2100" # 210ms
- register "gpu_panel_power_backlight_off_delay" = "2100" # 210ms
+ register "gpu_panel_power_cycle_delay_ms" = "400"
+ register "gpu_panel_power_up_delay_ms" = "40"
+ register "gpu_panel_power_down_delay_ms" = "15"
+ register "gpu_panel_power_backlight_on_delay_ms" = "210"
+ register "gpu_panel_power_backlight_off_delay_ms" = "210"
device domain 0 on
diff --git a/src/mainboard/google/slippy/variants/peppy/overridetree.cb b/src/mainboard/google/slippy/variants/peppy/overridetree.cb
index 689fee4cf3..47edc62397 100644
--- a/src/mainboard/google/slippy/variants/peppy/overridetree.cb
+++ b/src/mainboard/google/slippy/variants/peppy/overridetree.cb
@@ -1,11 +1,11 @@
chip northbridge/intel/haswell
# Set panel power delays
- register "gpu_panel_power_cycle_delay" = "5" # 400ms
- register "gpu_panel_power_up_delay" = "400" # 40ms
- register "gpu_panel_power_down_delay" = "150" # 15ms
- register "gpu_panel_power_backlight_on_delay" = "2100" # 210ms
- register "gpu_panel_power_backlight_off_delay" = "2100" # 210ms
+ register "gpu_panel_power_cycle_delay_ms" = "400"
+ register "gpu_panel_power_up_delay_ms" = "40"
+ register "gpu_panel_power_down_delay_ms" = "15"
+ register "gpu_panel_power_backlight_on_delay_ms" = "210"
+ register "gpu_panel_power_backlight_off_delay_ms" = "210"
device domain 0 on
diff --git a/src/mainboard/google/slippy/variants/wolf/overridetree.cb b/src/mainboard/google/slippy/variants/wolf/overridetree.cb
index de61839cc7..43bdf561d6 100644
--- a/src/mainboard/google/slippy/variants/wolf/overridetree.cb
+++ b/src/mainboard/google/slippy/variants/wolf/overridetree.cb
@@ -1,11 +1,11 @@
chip northbridge/intel/haswell
# Set panel power delays
- register "gpu_panel_power_cycle_delay" = "6" # 500ms (T11+T12)
- register "gpu_panel_power_up_delay" = "2000" # 200ms (T3)
- register "gpu_panel_power_down_delay" = "500" # 50ms (T10)
- register "gpu_panel_power_backlight_on_delay" = "10" # 1ms (T8)
- register "gpu_panel_power_backlight_off_delay" = "2000" # 200ms (T9)
+ register "gpu_panel_power_cycle_delay_ms" = "500"
+ register "gpu_panel_power_up_delay_ms" = "200"
+ register "gpu_panel_power_down_delay_ms" = "50"
+ register "gpu_panel_power_backlight_on_delay_ms" = "1"
+ register "gpu_panel_power_backlight_off_delay_ms" = "200"
device domain 0 on
diff --git a/src/mainboard/hp/folio_9480m/devicetree.cb b/src/mainboard/hp/folio_9480m/devicetree.cb
index 140aa844f5..9baec90d64 100644
--- a/src/mainboard/hp/folio_9480m/devicetree.cb
+++ b/src/mainboard/hp/folio_9480m/devicetree.cb
@@ -4,11 +4,11 @@ chip northbridge/intel/haswell
register "gfx" = "GMA_STATIC_DISPLAYS(0)"
register "gpu_dp_b_hotplug" = "4"
register "gpu_dp_c_hotplug" = "4"
- register "gpu_panel_power_backlight_off_delay" = "1"
- register "gpu_panel_power_backlight_on_delay" = "1"
- register "gpu_panel_power_cycle_delay" = "6"
- register "gpu_panel_power_down_delay" = "500"
- register "gpu_panel_power_up_delay" = "2000"
+ register "gpu_panel_power_backlight_off_delay_ms" = "1"
+ register "gpu_panel_power_backlight_on_delay_ms" = "1"
+ register "gpu_panel_power_cycle_delay_ms" = "500"
+ register "gpu_panel_power_down_delay_ms" = "50"
+ register "gpu_panel_power_up_delay_ms" = "200"
register "gpu_pch_backlight_pwm_hz" = "200"
register "usb_xhci_on_resume" = "true"
device cpu_cluster 0 on
diff --git a/src/mainboard/lenovo/t440p/devicetree.cb b/src/mainboard/lenovo/t440p/devicetree.cb
index 9359bb4e5d..e17807f247 100644
--- a/src/mainboard/lenovo/t440p/devicetree.cb
+++ b/src/mainboard/lenovo/t440p/devicetree.cb
@@ -4,11 +4,11 @@ chip northbridge/intel/haswell
register "gpu_dp_b_hotplug" = "4"
register "gpu_dp_c_hotplug" = "4"
register "gpu_dp_d_hotplug" = "4"
- register "gpu_panel_power_backlight_off_delay" = "1"
- register "gpu_panel_power_backlight_on_delay" = "1"
- register "gpu_panel_power_cycle_delay" = "6"
- register "gpu_panel_power_down_delay" = "500"
- register "gpu_panel_power_up_delay" = "2000"
+ register "gpu_panel_power_backlight_off_delay_ms" = "1"
+ register "gpu_panel_power_backlight_on_delay_ms" = "1"
+ register "gpu_panel_power_cycle_delay_ms" = "500"
+ register "gpu_panel_power_down_delay_ms" = "50"
+ register "gpu_panel_power_up_delay_ms" = "200"
register "gpu_pch_backlight_pwm_hz" = "220"
register "ec_present" = "true"
device cpu_cluster 0x0 on
diff --git a/src/mainboard/purism/librem_bdw/devicetree.cb b/src/mainboard/purism/librem_bdw/devicetree.cb
index 0d0fc720f7..41943e72ef 100644
--- a/src/mainboard/purism/librem_bdw/devicetree.cb
+++ b/src/mainboard/purism/librem_bdw/devicetree.cb
@@ -10,11 +10,11 @@ chip soc/intel/broadwell
register "gpu_pch_backlight_pwm_hz" = "200"
# Set panel power delays
- register "gpu_panel_power_cycle_delay" = "6" # 500ms
- register "gpu_panel_power_up_delay" = "2000" # 200ms
- register "gpu_panel_power_down_delay" = "500" # 50ms
- register "gpu_panel_power_backlight_on_delay" = "2000" # 200ms
- register "gpu_panel_power_backlight_off_delay" = "2000" # 200ms
+ register "gpu_panel_power_cycle_delay_ms" = "500"
+ register "gpu_panel_power_up_delay_ms" = "200"
+ register "gpu_panel_power_down_delay_ms" = "50"
+ register "gpu_panel_power_backlight_on_delay_ms" = "200"
+ register "gpu_panel_power_backlight_off_delay_ms" = "200"
device cpu_cluster 0 on
device lapic 0 on end
diff --git a/src/northbridge/intel/haswell/chip.h b/src/northbridge/intel/haswell/chip.h
index 73375d788d..b1c8d37a74 100644
--- a/src/northbridge/intel/haswell/chip.h
+++ b/src/northbridge/intel/haswell/chip.h
@@ -17,11 +17,11 @@ struct northbridge_intel_haswell_config {
u8 gpu_dp_c_hotplug; /* Digital Port C Hotplug Config */
u8 gpu_dp_d_hotplug; /* Digital Port D Hotplug Config */
- u8 gpu_panel_power_cycle_delay; /* T4 time sequence */
- u16 gpu_panel_power_up_delay; /* T1+T2 time sequence */
- u16 gpu_panel_power_down_delay; /* T3 time sequence */
- u16 gpu_panel_power_backlight_on_delay; /* T5 time sequence */
- u16 gpu_panel_power_backlight_off_delay; /* Tx time sequence */
+ u16 gpu_panel_power_cycle_delay_ms; /* T4 time sequence */
+ u16 gpu_panel_power_up_delay_ms; /* T1+T2 time sequence */
+ u16 gpu_panel_power_down_delay_ms; /* T3 time sequence */
+ u16 gpu_panel_power_backlight_on_delay_ms; /* T5 time sequence */
+ u16 gpu_panel_power_backlight_off_delay_ms; /* Tx time sequence */
unsigned int gpu_pch_backlight_pwm_hz;
enum {
diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c
index 71d5ab61ec..7adcfdaa5c 100644
--- a/src/northbridge/intel/haswell/gma.c
+++ b/src/northbridge/intel/haswell/gma.c
@@ -257,24 +257,24 @@ static void gma_setup_panel(struct device *dev)
/* Setup Panel Power On Delays */
reg32 = gtt_read(PCH_PP_ON_DELAYS);
if (!reg32) {
- reg32 |= (conf->gpu_panel_power_up_delay & 0x1fff) << 16;
- reg32 |= (conf->gpu_panel_power_backlight_on_delay & 0x1fff);
+ reg32 |= ((conf->gpu_panel_power_up_delay_ms * 10) & 0x1fff) << 16;
+ reg32 |= (conf->gpu_panel_power_backlight_on_delay_ms * 10) & 0x1fff;
gtt_write(PCH_PP_ON_DELAYS, reg32);
}
/* Setup Panel Power Off Delays */
reg32 = gtt_read(PCH_PP_OFF_DELAYS);
if (!reg32) {
- reg32 = (conf->gpu_panel_power_down_delay & 0x1fff) << 16;
- reg32 |= (conf->gpu_panel_power_backlight_off_delay & 0x1fff);
+ reg32 = ((conf->gpu_panel_power_down_delay_ms * 10) & 0x1fff) << 16;
+ reg32 |= (conf->gpu_panel_power_backlight_off_delay_ms * 10) & 0x1fff;
gtt_write(PCH_PP_OFF_DELAYS, reg32);
}
/* Setup Panel Power Cycle Delay */
- if (conf->gpu_panel_power_cycle_delay) {
+ if (conf->gpu_panel_power_cycle_delay_ms) {
reg32 = gtt_read(PCH_PP_DIVISOR);
reg32 &= ~0x1f;
- reg32 |= conf->gpu_panel_power_cycle_delay & 0x1f;
+ reg32 |= (DIV_ROUND_UP(conf->gpu_panel_power_cycle_delay_ms, 100) + 1) & 0x1f;
gtt_write(PCH_PP_DIVISOR, reg32);
}
diff --git a/src/soc/intel/broadwell/chip.h b/src/soc/intel/broadwell/chip.h
index 81c9780776..b77cb71f70 100644
--- a/src/soc/intel/broadwell/chip.h
+++ b/src/soc/intel/broadwell/chip.h
@@ -19,11 +19,11 @@ struct soc_intel_broadwell_config {
u8 gpu_dp_d_hotplug;
/* Panel power sequence timings */
- u8 gpu_panel_power_cycle_delay;
- u16 gpu_panel_power_up_delay;
- u16 gpu_panel_power_down_delay;
- u16 gpu_panel_power_backlight_on_delay;
- u16 gpu_panel_power_backlight_off_delay;
+ u16 gpu_panel_power_cycle_delay_ms;
+ u16 gpu_panel_power_up_delay_ms;
+ u16 gpu_panel_power_down_delay_ms;
+ u16 gpu_panel_power_backlight_on_delay_ms;
+ u16 gpu_panel_power_backlight_off_delay_ms;
/* Panel backlight settings */
unsigned int gpu_pch_backlight_pwm_hz;
diff --git a/src/soc/intel/broadwell/gma.c b/src/soc/intel/broadwell/gma.c
index c033b499f5..9866ed3b39 100644
--- a/src/soc/intel/broadwell/gma.c
+++ b/src/soc/intel/broadwell/gma.c
@@ -4,6 +4,7 @@
#include <device/mmio.h>
#include <device/pci_ops.h>
#include <bootmode.h>
+#include <commonlib/helpers.h>
#include <console/console.h>
#include <delay.h>
#include <device/device.h>
@@ -298,24 +299,24 @@ static void gma_setup_panel(struct device *dev)
/* Setup Panel Power On Delays */
reg32 = gtt_read(PCH_PP_ON_DELAYS);
if (!reg32) {
- reg32 |= (conf->gpu_panel_power_up_delay & 0x1fff) << 16;
- reg32 |= (conf->gpu_panel_power_backlight_on_delay & 0x1fff);
+ reg32 |= ((conf->gpu_panel_power_up_delay_ms * 10) & 0x1fff) << 16;
+ reg32 |= (conf->gpu_panel_power_backlight_on_delay_ms * 10) & 0x1fff;
gtt_write(PCH_PP_ON_DELAYS, reg32);
}
/* Setup Panel Power Off Delays */
reg32 = gtt_read(PCH_PP_OFF_DELAYS);
if (!reg32) {
- reg32 = (conf->gpu_panel_power_down_delay & 0x1fff) << 16;
- reg32 |= (conf->gpu_panel_power_backlight_off_delay & 0x1fff);
+ reg32 = ((conf->gpu_panel_power_down_delay_ms * 10) & 0x1fff) << 16;
+ reg32 |= (conf->gpu_panel_power_backlight_off_delay_ms * 10) & 0x1fff;
gtt_write(PCH_PP_OFF_DELAYS, reg32);
}
/* Setup Panel Power Cycle Delay */
- if (conf->gpu_panel_power_cycle_delay) {
+ if (conf->gpu_panel_power_cycle_delay_ms) {
reg32 = gtt_read(PCH_PP_DIVISOR);
reg32 &= ~0x1f;
- reg32 |= conf->gpu_panel_power_cycle_delay & 0x1f;
+ reg32 |= (DIV_ROUND_UP(conf->gpu_panel_power_cycle_delay_ms, 100) + 1) & 0x1f;
gtt_write(PCH_PP_DIVISOR, reg32);
}