summaryrefslogtreecommitdiff
path: root/src/mainboard/google
diff options
context:
space:
mode:
authorMichael Niewöhner <foss@mniewoehner.de>2020-12-28 00:49:33 +0100
committerNico Huber <nico.h@gmx.de>2021-01-01 21:12:12 +0000
commit97e21d3e956ea2657a63fb98c22548f9fd52afef (patch)
tree8402f766ce761b557661ad57cc20bcb85694c0ea /src/mainboard/google
parent44fa0d4ca00fa4ca88415b7ca717767dd31f83f7 (diff)
nb/intel/hsw,soc/intel/{bdw,skl,apl},mb/*: unify dt panel settings
There are multiple different devicetree setting formats for graphics panel settings present in coreboot. Replace the ones for the platforms that already have (mostly) unified gma/graphics setup code by a unified struct in the gma driver. Hook it up in HSW, BDW, SKL, and APL and adapt the devicetrees accordingly. Always ensure that values don't overflow by applying appropriate masks. The remaining platforms implementing panel settings (GM45, i945, ILK and SNB) can be migrated later after unifying their gma/graphics setup code. Signed-off-by: Michael Niewöhner <foss@mniewoehner.de> Change-Id: I445defe01d5fbf9a69cf05cf1b5bd6c7c2c1725e Reviewed-on: https://review.coreboot.org/c/coreboot/+/48885 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/mainboard/google')
-rw-r--r--src/mainboard/google/auron/devicetree.cb3
-rw-r--r--src/mainboard/google/auron/variants/auron_paine/overridetree.cb14
-rw-r--r--src/mainboard/google/auron/variants/auron_yuna/overridetree.cb14
-rw-r--r--src/mainboard/google/auron/variants/buddy/overridetree.cb14
-rw-r--r--src/mainboard/google/auron/variants/gandof/overridetree.cb14
-rw-r--r--src/mainboard/google/auron/variants/lulu/overridetree.cb14
-rw-r--r--src/mainboard/google/auron/variants/samus/overridetree.cb14
-rw-r--r--src/mainboard/google/eve/devicetree.cb15
-rw-r--r--src/mainboard/google/fizz/variants/baseboard/devicetree.cb15
-rw-r--r--src/mainboard/google/glados/devicetree.cb15
-rw-r--r--src/mainboard/google/poppy/variants/atlas/devicetree.cb14
-rw-r--r--src/mainboard/google/poppy/variants/rammus/devicetree.cb14
-rw-r--r--src/mainboard/google/slippy/devicetree.cb3
-rw-r--r--src/mainboard/google/slippy/variants/falco/overridetree.cb14
-rw-r--r--src/mainboard/google/slippy/variants/leon/overridetree.cb14
-rw-r--r--src/mainboard/google/slippy/variants/peppy/overridetree.cb14
-rw-r--r--src/mainboard/google/slippy/variants/wolf/overridetree.cb14
17 files changed, 120 insertions, 99 deletions
diff --git a/src/mainboard/google/auron/devicetree.cb b/src/mainboard/google/auron/devicetree.cb
index 26a53366b4..8bf2c129a4 100644
--- a/src/mainboard/google/auron/devicetree.cb
+++ b/src/mainboard/google/auron/devicetree.cb
@@ -12,9 +12,6 @@ chip soc/intel/broadwell
# Enable HDMI Hotplug with 6ms pulse
register "gpu_dp_b_hotplug" = "0x06"
- # Set backlight PWM value for eDP
- register "gpu_pch_backlight_pwm_hz" = "200"
-
register "s0ix_enable" = "1"
device cpu_cluster 0 on
diff --git a/src/mainboard/google/auron/variants/auron_paine/overridetree.cb b/src/mainboard/google/auron/variants/auron_paine/overridetree.cb
index cb7fb62b34..62e42b1718 100644
--- a/src/mainboard/google/auron/variants/auron_paine/overridetree.cb
+++ b/src/mainboard/google/auron/variants/auron_paine/overridetree.cb
@@ -1,11 +1,13 @@
chip soc/intel/broadwell
- # Set panel power delays
- 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 "panel_cfg" = "{
+ .up_delay_ms = 40,
+ .down_delay_ms = 15,
+ .cycle_delay_ms = 400,
+ .backlight_on_delay_ms = 7,
+ .backlight_off_delay_ms = 210,
+ .backlight_pwm_hz = 200,
+ }"
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 746ec9a58f..174463d0b7 100644
--- a/src/mainboard/google/auron/variants/auron_yuna/overridetree.cb
+++ b/src/mainboard/google/auron/variants/auron_yuna/overridetree.cb
@@ -1,11 +1,13 @@
chip soc/intel/broadwell
- # Set panel power delays
- 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"
+ register "panel_cfg" = "{
+ .up_delay_ms = 40,
+ .down_delay_ms = 15,
+ .cycle_delay_ms = 400,
+ .backlight_on_delay_ms = 210,
+ .backlight_off_delay_ms = 210,
+ .backlight_pwm_hz = 200,
+ }"
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 5423043cd8..6762eb42c4 100644
--- a/src/mainboard/google/auron/variants/buddy/overridetree.cb
+++ b/src/mainboard/google/auron/variants/buddy/overridetree.cb
@@ -1,11 +1,13 @@
chip soc/intel/broadwell
- # Set panel power delays
- 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 "panel_cfg" = "{
+ .up_delay_ms = 40,
+ .down_delay_ms = 15,
+ .cycle_delay_ms = 400,
+ .backlight_on_delay_ms = 7,
+ .backlight_off_delay_ms = 210,
+ .backlight_pwm_hz = 200,
+ }"
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 19c0ca0003..ca5d616659 100644
--- a/src/mainboard/google/auron/variants/gandof/overridetree.cb
+++ b/src/mainboard/google/auron/variants/gandof/overridetree.cb
@@ -1,11 +1,13 @@
chip soc/intel/broadwell
- # Set panel power delays
- 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"
+ register "panel_cfg" = "{
+ .up_delay_ms = 40,
+ .down_delay_ms = 15,
+ .cycle_delay_ms = 400,
+ .backlight_on_delay_ms = 50,
+ .backlight_off_delay_ms = 210,
+ .backlight_pwm_hz = 200,
+ }"
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 cb7fb62b34..62e42b1718 100644
--- a/src/mainboard/google/auron/variants/lulu/overridetree.cb
+++ b/src/mainboard/google/auron/variants/lulu/overridetree.cb
@@ -1,11 +1,13 @@
chip soc/intel/broadwell
- # Set panel power delays
- 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 "panel_cfg" = "{
+ .up_delay_ms = 40,
+ .down_delay_ms = 15,
+ .cycle_delay_ms = 400,
+ .backlight_on_delay_ms = 7,
+ .backlight_off_delay_ms = 210,
+ .backlight_pwm_hz = 200,
+ }"
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 989b887628..34a785b711 100644
--- a/src/mainboard/google/auron/variants/samus/overridetree.cb
+++ b/src/mainboard/google/auron/variants/samus/overridetree.cb
@@ -3,12 +3,14 @@ chip soc/intel/broadwell
# Enable DDI2 Hotplug with 6ms pulse
register "gpu_dp_c_hotplug" = "0x06"
- # Set panel power delays
- 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 "panel_cfg" = "{
+ .up_delay_ms = 200,
+ .down_delay_ms = 50,
+ .cycle_delay_ms = 500,
+ .backlight_on_delay_ms = 200,
+ .backlight_off_delay_ms = 200,
+ .backlight_pwm_hz = 200,
+ }"
register "vr_slow_ramp_rate_set" = "3"
register "vr_slow_ramp_rate_enable" = "1"
diff --git a/src/mainboard/google/eve/devicetree.cb b/src/mainboard/google/eve/devicetree.cb
index 0e76de140f..c0531fa238 100644
--- a/src/mainboard/google/eve/devicetree.cb
+++ b/src/mainboard/google/eve/devicetree.cb
@@ -3,13 +3,14 @@ chip soc/intel/skylake
# IGD Displays
register "gfx" = "GMA_STATIC_DISPLAYS(0)"
- register "gpu_pp_up_delay_ms" = "100"
- register "gpu_pp_down_delay_ms" = "500"
- register "gpu_pp_cycle_delay_ms" = "500"
- register "gpu_pp_backlight_on_delay_ms" = " 1"
- register "gpu_pp_backlight_off_delay_ms" = "200"
-
- register "gpu_pch_backlight_pwm_hz" = "1000"
+ register "panel_cfg" = "{
+ .up_delay_ms = 100,
+ .down_delay_ms = 500,
+ .cycle_delay_ms = 500,
+ .backlight_on_delay_ms = 1,
+ .backlight_off_delay_ms = 200,
+ .backlight_pwm_hz = 1000,
+ }"
# Enable deep Sx states
register "deep_s3_enable_ac" = "0"
diff --git a/src/mainboard/google/fizz/variants/baseboard/devicetree.cb b/src/mainboard/google/fizz/variants/baseboard/devicetree.cb
index 8c31f9ac70..e9d5a3544a 100644
--- a/src/mainboard/google/fizz/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/fizz/variants/baseboard/devicetree.cb
@@ -1,12 +1,13 @@
chip soc/intel/skylake
- register "gpu_pp_up_delay_ms" = "200"
- register "gpu_pp_down_delay_ms" = " 50"
- register "gpu_pp_cycle_delay_ms" = "500"
- register "gpu_pp_backlight_on_delay_ms" = " 1"
- register "gpu_pp_backlight_off_delay_ms" = "200"
-
- register "gpu_pch_backlight_pwm_hz" = "200"
+ register "panel_cfg" = "{
+ .up_delay_ms = 200,
+ .down_delay_ms = 50,
+ .cycle_delay_ms = 500,
+ .backlight_on_delay_ms = 1,
+ .backlight_off_delay_ms = 200,
+ .backlight_pwm_hz = 200,
+ }"
# Deep Sx states
register "deep_s3_enable_ac" = "0"
diff --git a/src/mainboard/google/glados/devicetree.cb b/src/mainboard/google/glados/devicetree.cb
index 127334e1ba..5a48c5db47 100644
--- a/src/mainboard/google/glados/devicetree.cb
+++ b/src/mainboard/google/glados/devicetree.cb
@@ -3,13 +3,14 @@ chip soc/intel/skylake
# IGD Displays
register "gfx" = "GMA_STATIC_DISPLAYS(0)"
- register "gpu_pp_up_delay_ms" = "200"
- register "gpu_pp_down_delay_ms" = " 50"
- register "gpu_pp_cycle_delay_ms" = "500"
- register "gpu_pp_backlight_on_delay_ms" = " 1"
- register "gpu_pp_backlight_off_delay_ms" = "200"
-
- register "gpu_pch_backlight_pwm_hz" = "1000"
+ register "panel_cfg" = "{
+ .up_delay_ms = 200,
+ .down_delay_ms = 50,
+ .cycle_delay_ms = 500,
+ .backlight_on_delay_ms = 1,
+ .backlight_off_delay_ms = 200,
+ .backlight_pwm_hz = 1000,
+ }"
# Enable deep Sx states
register "deep_s3_enable_ac" = "0"
diff --git a/src/mainboard/google/poppy/variants/atlas/devicetree.cb b/src/mainboard/google/poppy/variants/atlas/devicetree.cb
index a14e927b0f..d3e351ad4f 100644
--- a/src/mainboard/google/poppy/variants/atlas/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/atlas/devicetree.cb
@@ -3,12 +3,14 @@ chip soc/intel/skylake
# IGD Displays
register "gfx" = "GMA_STATIC_DISPLAYS(0)"
- register "gpu_pp_up_delay_ms" = "200"
- register "gpu_pp_down_delay_ms" = "50"
- register "gpu_pp_cycle_delay_ms" = "600"
- register "gpu_pp_backlight_on_delay_ms" = " 1"
- register "gpu_pp_backlight_off_delay_ms" = "200"
- register "gpu_pch_backlight_pwm_hz" = "200"
+ register "panel_cfg" = "{
+ .up_delay_ms = 200,
+ .down_delay_ms = 50,
+ .cycle_delay_ms = 600,
+ .backlight_on_delay_ms = 1,
+ .backlight_off_delay_ms = 200,
+ .backlight_pwm_hz = 200,
+ }"
# Deep Sx states
register "deep_s3_enable_ac" = "0"
diff --git a/src/mainboard/google/poppy/variants/rammus/devicetree.cb b/src/mainboard/google/poppy/variants/rammus/devicetree.cb
index ff117c8aa2..162b437f32 100644
--- a/src/mainboard/google/poppy/variants/rammus/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/rammus/devicetree.cb
@@ -3,12 +3,14 @@ chip soc/intel/skylake
# IGD Displays
register "gfx" = "GMA_STATIC_DISPLAYS(0)"
- register "gpu_pp_up_delay_ms" = "200"
- register "gpu_pp_down_delay_ms" = "500"
- register "gpu_pp_cycle_delay_ms" = "600"
- register "gpu_pp_backlight_on_delay_ms" = " 1"
- register "gpu_pp_backlight_off_delay_ms" = "200"
- register "gpu_pch_backlight_pwm_hz" = "1000"
+ register "panel_cfg" = "{
+ .up_delay_ms = 200,
+ .down_delay_ms = 500,
+ .cycle_delay_ms = 600,
+ .backlight_on_delay_ms = 1,
+ .backlight_off_delay_ms = 200,
+ .backlight_pwm_hz = 1000,
+ }"
# Deep Sx states
register "deep_s3_enable_ac" = "0"
diff --git a/src/mainboard/google/slippy/devicetree.cb b/src/mainboard/google/slippy/devicetree.cb
index a6fab83a5b..99cae7a406 100644
--- a/src/mainboard/google/slippy/devicetree.cb
+++ b/src/mainboard/google/slippy/devicetree.cb
@@ -11,9 +11,6 @@ chip northbridge/intel/haswell
# Enable HDMI Hotplug with 6ms pulse
register "gpu_dp_b_hotplug" = "0x06"
- # Set backlight PWM value for eDP
- register "gpu_pch_backlight_pwm_hz" = "200"
-
register "ec_present" = "true"
register "usb_xhci_on_resume" = "true"
diff --git a/src/mainboard/google/slippy/variants/falco/overridetree.cb b/src/mainboard/google/slippy/variants/falco/overridetree.cb
index 54ae6151d2..fc77345dab 100644
--- a/src/mainboard/google/slippy/variants/falco/overridetree.cb
+++ b/src/mainboard/google/slippy/variants/falco/overridetree.cb
@@ -1,11 +1,13 @@
chip northbridge/intel/haswell
- # Set panel power delays
- 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"
+ register "panel_cfg" = "{
+ .up_delay_ms = 60,
+ .down_delay_ms = 60,
+ .cycle_delay_ms = 400,
+ .backlight_on_delay_ms = 210,
+ .backlight_off_delay_ms = 210,
+ .backlight_pwm_hz = 200,
+ }"
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 9c45f0062b..1d50086c58 100644
--- a/src/mainboard/google/slippy/variants/leon/overridetree.cb
+++ b/src/mainboard/google/slippy/variants/leon/overridetree.cb
@@ -1,11 +1,13 @@
chip northbridge/intel/haswell
- # Set panel power delays
- 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"
+ register "panel_cfg" = "{
+ .up_delay_ms = 40,
+ .down_delay_ms = 15,
+ .cycle_delay_ms = 400,
+ .backlight_on_delay_ms = 210,
+ .backlight_off_delay_ms = 210,
+ .backlight_pwm_hz = 200,
+ }"
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 47edc62397..e732a9270c 100644
--- a/src/mainboard/google/slippy/variants/peppy/overridetree.cb
+++ b/src/mainboard/google/slippy/variants/peppy/overridetree.cb
@@ -1,11 +1,13 @@
chip northbridge/intel/haswell
- # Set panel power delays
- 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"
+ register "panel_cfg" = "{
+ .up_delay_ms = 40,
+ .down_delay_ms = 15,
+ .cycle_delay_ms = 400,
+ .backlight_on_delay_ms = 210,
+ .backlight_off_delay_ms = 210,
+ .backlight_pwm_hz = 200,
+ }"
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 43bdf561d6..824694720d 100644
--- a/src/mainboard/google/slippy/variants/wolf/overridetree.cb
+++ b/src/mainboard/google/slippy/variants/wolf/overridetree.cb
@@ -1,11 +1,13 @@
chip northbridge/intel/haswell
- # Set panel power delays
- 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"
+ register "panel_cfg" = "{
+ .up_delay_ms = 200,
+ .down_delay_ms = 50,
+ .cycle_delay_ms = 500,
+ .backlight_on_delay_ms = 1,
+ .backlight_off_delay_ms = 200,
+ .backlight_pwm_hz = 200,
+ }"
device domain 0 on