haswell: Move some MRC settings to devicetree
There's no generic way to tell whether a mainboard has an EC or not. Making Kconfig symbols for these options seems overkill, too. So, just put them on the devicetree. Also, drop unnecessary assignments when the board's current value is zero, as the struct defaults to zero already. Change-Id: If2ebac5fcab278c97dfaf8adc9d1e125888acafe Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/43129 Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Tristan Corrick <tristan@corrick.kiwi> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
@@ -27,8 +27,6 @@ void mb_get_spd_map(uint8_t spd_map[4])
|
||||
|
||||
void mainboard_fill_pei_data(struct pei_data *pei_data)
|
||||
{
|
||||
pei_data->ec_present = 0;
|
||||
|
||||
struct usb2_port_setting usb2_ports[MAX_USB2_PORTS] = {
|
||||
/* Length, Enable, OCn#, Location */
|
||||
{ 0x0040, 1, 0, USB_PORT_BACK_PANEL },
|
||||
|
@@ -25,8 +25,6 @@ void mb_get_spd_map(uint8_t spd_map[4])
|
||||
|
||||
void mainboard_fill_pei_data(struct pei_data *pei_data)
|
||||
{
|
||||
pei_data->ec_present = 0;
|
||||
|
||||
struct usb2_port_setting usb2_ports[MAX_USB2_PORTS] = {
|
||||
/* Length, Enable, OCn#, Location */
|
||||
{ 0x0040, 1, 0, USB_PORT_BACK_PANEL },
|
||||
|
@@ -9,6 +9,10 @@ chip northbridge/intel/haswell
|
||||
# Enable HDMI Hotplug with 6ms pulse
|
||||
register "gpu_dp_b_hotplug" = "0x06"
|
||||
|
||||
register "dq_pins_interleaved" = "true"
|
||||
|
||||
register "usb_xhci_on_resume" = "true"
|
||||
|
||||
device cpu_cluster 0 on
|
||||
chip cpu/intel/haswell
|
||||
device lapic 0 on end
|
||||
|
@@ -48,10 +48,6 @@ void mb_get_spd_map(uint8_t spd_map[4])
|
||||
|
||||
void mainboard_fill_pei_data(struct pei_data *pei_data)
|
||||
{
|
||||
pei_data->ec_present = 0;
|
||||
pei_data->dq_pins_interleaved = 1;
|
||||
pei_data->usb_xhci_on_resume = 1;
|
||||
|
||||
struct usb2_port_setting usb2_ports[MAX_USB2_PORTS] = {
|
||||
/* Length, Enable, OCn#, Location */
|
||||
{ 0x0064, 1, 0, /* P0: VP8 */
|
||||
|
@@ -14,6 +14,10 @@ chip northbridge/intel/haswell
|
||||
# Set backlight PWM value for eDP
|
||||
register "gpu_pch_backlight_pwm_hz" = "200"
|
||||
|
||||
register "ec_present" = "true"
|
||||
|
||||
register "usb_xhci_on_resume" = "true"
|
||||
|
||||
device cpu_cluster 0 on
|
||||
chip cpu/intel/haswell
|
||||
device lapic 0 on end
|
||||
|
@@ -49,8 +49,5 @@ void mb_get_spd_map(uint8_t spd_map[4])
|
||||
|
||||
void mainboard_fill_pei_data(struct pei_data *pei_data)
|
||||
{
|
||||
pei_data->ec_present = 1;
|
||||
pei_data->usb_xhci_on_resume = 1;
|
||||
|
||||
variant_romstage_entry(pei_data);
|
||||
}
|
||||
|
@@ -51,8 +51,6 @@ void mb_get_spd_map(uint8_t spd_map[4])
|
||||
|
||||
void mainboard_fill_pei_data(struct pei_data *pei_data)
|
||||
{
|
||||
pei_data->ec_present = 0;
|
||||
|
||||
struct usb2_port_setting usb2_ports[MAX_USB2_PORTS] = {
|
||||
/* Length, Enable, OCn#, Location */
|
||||
{ 0x0040, 1, 0, /* P0: Back USB3 port (OC0) */
|
||||
|
@@ -11,6 +11,7 @@ chip northbridge/intel/haswell
|
||||
register "gpu_panel_power_down_delay" = "500"
|
||||
register "gpu_panel_power_up_delay" = "2000"
|
||||
register "gpu_pch_backlight_pwm_hz" = "220"
|
||||
register "ec_present" = "true"
|
||||
device cpu_cluster 0x0 on
|
||||
chip cpu/intel/haswell
|
||||
register "c1_acpower" = "1"
|
||||
|
@@ -48,8 +48,6 @@ void mb_get_spd_map(uint8_t spd_map[4])
|
||||
|
||||
void mainboard_fill_pei_data(struct pei_data *pei_data)
|
||||
{
|
||||
pei_data->ec_present = 1;
|
||||
|
||||
struct usb2_port_setting usb2_ports[MAX_USB2_PORTS] = {
|
||||
/* Length, Enable, OCn#, Location */
|
||||
{ 0x0040, 1, 0, USB_PORT_BACK_PANEL }, /* USB3 */
|
||||
|
@@ -27,8 +27,6 @@ void mb_get_spd_map(uint8_t spd_map[4])
|
||||
|
||||
void mainboard_fill_pei_data(struct pei_data *pei_data)
|
||||
{
|
||||
pei_data->ec_present = 0;
|
||||
|
||||
struct usb2_port_setting usb2_ports[MAX_USB2_PORTS] = {
|
||||
/* Length, Enable, OCn#, Location */
|
||||
{ 0x0040, 1, 0, USB_PORT_INTERNAL },
|
||||
|
Reference in New Issue
Block a user