Attention is currently required from: Patrick Rudolph. Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/50080 )
Change subject: broadwell boards: Switch to Lynxpoint GPIO headers ......................................................................
broadwell boards: Switch to Lynxpoint GPIO headers
Move `CROS_GPIO_DEVICE_NAME` to a new `chromeos.h` header, because Lynxpoint uses a different value. Also drop unnecessary includes.
Tested with BUILD_TIMELESS=1, Google Tidus remains identical.
Change-Id: I38baed2c114fb93cfb82535a6ec00fb67e596d64 Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/google/auron/chromeos.c M src/mainboard/google/auron/smihandler.c M src/mainboard/google/auron/spd.c M src/mainboard/google/auron/variants/auron_paine/pei_data.c M src/mainboard/google/auron/variants/auron_paine/spd/spd.c M src/mainboard/google/auron/variants/auron_yuna/pei_data.c M src/mainboard/google/auron/variants/auron_yuna/spd/spd.c M src/mainboard/google/auron/variants/buddy/pei_data.c M src/mainboard/google/auron/variants/gandof/pei_data.c M src/mainboard/google/auron/variants/gandof/spd/spd.c M src/mainboard/google/auron/variants/lulu/pei_data.c M src/mainboard/google/auron/variants/lulu/spd/spd.c M src/mainboard/google/auron/variants/samus/pei_data.c M src/mainboard/google/auron/variants/samus/spd/spd.c M src/mainboard/google/auron/variants/samus/variant.c M src/mainboard/google/jecht/chromeos.c M src/mainboard/google/jecht/smihandler.c M src/mainboard/google/jecht/variants/guado/pei_data.c M src/mainboard/google/jecht/variants/jecht/pei_data.c M src/mainboard/google/jecht/variants/rikku/pei_data.c M src/mainboard/google/jecht/variants/tidus/pei_data.c M src/mainboard/intel/wtm2/chromeos.c M src/mainboard/intel/wtm2/pei_data.c A src/soc/intel/broadwell/include/soc/chromeos.h D src/soc/intel/broadwell/include/soc/gpio.h 25 files changed, 23 insertions(+), 36 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/50080/1
diff --git a/src/mainboard/google/auron/chromeos.c b/src/mainboard/google/auron/chromeos.c index 2827cb1..50eeddc 100644 --- a/src/mainboard/google/auron/chromeos.c +++ b/src/mainboard/google/auron/chromeos.c @@ -2,7 +2,8 @@
#include <boot/coreboot_tables.h> #include <vendorcode/google/chromeos/chromeos.h> -#include <soc/gpio.h> +#include <soc/chromeos.h> +#include <southbridge/intel/lynxpoint/lp_gpio.h>
/* SPI Write protect is GPIO 16 */ #define CROS_WP_GPIO 58 diff --git a/src/mainboard/google/auron/smihandler.c b/src/mainboard/google/auron/smihandler.c index 7e22fbb..34ed171 100644 --- a/src/mainboard/google/auron/smihandler.c +++ b/src/mainboard/google/auron/smihandler.c @@ -7,7 +7,7 @@ #include <soc/pm.h> #include <elog.h> #include <ec/google/chromeec/ec.h> -#include <soc/gpio.h> +#include <southbridge/intel/lynxpoint/lp_gpio.h> #include <soc/iomap.h> #include <soc/nvs.h> #include "ec.h" diff --git a/src/mainboard/google/auron/spd.c b/src/mainboard/google/auron/spd.c index e5c3dbd..539026b 100644 --- a/src/mainboard/google/auron/spd.c +++ b/src/mainboard/google/auron/spd.c @@ -3,7 +3,7 @@ #include <cbfs.h> #include <console/console.h> #include <mainboard/google/auron/variant.h> -#include <soc/gpio.h> +#include <southbridge/intel/lynxpoint/lp_gpio.h> #include <soc/pei_data.h> #include <soc/romstage.h> #include <string.h> diff --git a/src/mainboard/google/auron/variants/auron_paine/pei_data.c b/src/mainboard/google/auron/variants/auron_paine/pei_data.c index c2a22ae..9776bba 100644 --- a/src/mainboard/google/auron/variants/auron_paine/pei_data.c +++ b/src/mainboard/google/auron/variants/auron_paine/pei_data.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <soc/gpio.h> #include <soc/pei_data.h> #include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/auron/variants/auron_paine/spd/spd.c b/src/mainboard/google/auron/variants/auron_paine/spd/spd.c index 88487d5..7b2c975 100644 --- a/src/mainboard/google/auron/variants/auron_paine/spd/spd.c +++ b/src/mainboard/google/auron/variants/auron_paine/spd/spd.c @@ -4,7 +4,7 @@ #include <console/console.h> #include <endian.h> #include <string.h> -#include <soc/gpio.h> +#include <southbridge/intel/lynxpoint/lp_gpio.h> #include <soc/pei_data.h> #include <soc/romstage.h> #include <ec/google/chromeec/ec.h> diff --git a/src/mainboard/google/auron/variants/auron_yuna/pei_data.c b/src/mainboard/google/auron/variants/auron_yuna/pei_data.c index c2a22ae..9776bba 100644 --- a/src/mainboard/google/auron/variants/auron_yuna/pei_data.c +++ b/src/mainboard/google/auron/variants/auron_yuna/pei_data.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <soc/gpio.h> #include <soc/pei_data.h> #include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/auron/variants/auron_yuna/spd/spd.c b/src/mainboard/google/auron/variants/auron_yuna/spd/spd.c index 88487d5..7b2c975 100644 --- a/src/mainboard/google/auron/variants/auron_yuna/spd/spd.c +++ b/src/mainboard/google/auron/variants/auron_yuna/spd/spd.c @@ -4,7 +4,7 @@ #include <console/console.h> #include <endian.h> #include <string.h> -#include <soc/gpio.h> +#include <southbridge/intel/lynxpoint/lp_gpio.h> #include <soc/pei_data.h> #include <soc/romstage.h> #include <ec/google/chromeec/ec.h> diff --git a/src/mainboard/google/auron/variants/buddy/pei_data.c b/src/mainboard/google/auron/variants/buddy/pei_data.c index 026853f..c748bb6 100644 --- a/src/mainboard/google/auron/variants/buddy/pei_data.c +++ b/src/mainboard/google/auron/variants/buddy/pei_data.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <soc/gpio.h> #include <soc/pei_data.h> #include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/auron/variants/gandof/pei_data.c b/src/mainboard/google/auron/variants/gandof/pei_data.c index c2a22ae..9776bba 100644 --- a/src/mainboard/google/auron/variants/gandof/pei_data.c +++ b/src/mainboard/google/auron/variants/gandof/pei_data.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <soc/gpio.h> #include <soc/pei_data.h> #include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/auron/variants/gandof/spd/spd.c b/src/mainboard/google/auron/variants/gandof/spd/spd.c index 9c32314..843705e 100644 --- a/src/mainboard/google/auron/variants/gandof/spd/spd.c +++ b/src/mainboard/google/auron/variants/gandof/spd/spd.c @@ -4,7 +4,7 @@ #include <console/console.h> #include <endian.h> #include <string.h> -#include <soc/gpio.h> +#include <southbridge/intel/lynxpoint/lp_gpio.h> #include <soc/pei_data.h> #include <soc/romstage.h> #include <ec/google/chromeec/ec.h> diff --git a/src/mainboard/google/auron/variants/lulu/pei_data.c b/src/mainboard/google/auron/variants/lulu/pei_data.c index bbc7125..15b9237 100644 --- a/src/mainboard/google/auron/variants/lulu/pei_data.c +++ b/src/mainboard/google/auron/variants/lulu/pei_data.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <soc/gpio.h> #include <soc/pei_data.h> #include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/auron/variants/lulu/spd/spd.c b/src/mainboard/google/auron/variants/lulu/spd/spd.c index 8d43464..b1694dc 100644 --- a/src/mainboard/google/auron/variants/lulu/spd/spd.c +++ b/src/mainboard/google/auron/variants/lulu/spd/spd.c @@ -4,7 +4,7 @@ #include <console/console.h> #include <endian.h> #include <string.h> -#include <soc/gpio.h> +#include <southbridge/intel/lynxpoint/lp_gpio.h> #include <soc/pei_data.h> #include <soc/romstage.h> #include <ec/google/chromeec/ec.h> diff --git a/src/mainboard/google/auron/variants/samus/pei_data.c b/src/mainboard/google/auron/variants/samus/pei_data.c index 9bcf92b..f404d82 100644 --- a/src/mainboard/google/auron/variants/samus/pei_data.c +++ b/src/mainboard/google/auron/variants/samus/pei_data.c @@ -2,7 +2,6 @@
#include <stdint.h> #include <string.h> -#include <soc/gpio.h> #include <soc/pei_data.h> #include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/auron/variants/samus/spd/spd.c b/src/mainboard/google/auron/variants/samus/spd/spd.c index 06270b8..d97297f 100644 --- a/src/mainboard/google/auron/variants/samus/spd/spd.c +++ b/src/mainboard/google/auron/variants/samus/spd/spd.c @@ -4,7 +4,7 @@ #include <console/console.h> #include <endian.h> #include <string.h> -#include <soc/gpio.h> +#include <southbridge/intel/lynxpoint/lp_gpio.h> #include <soc/pei_data.h> #include <soc/romstage.h> #include <ec/google/chromeec/ec.h> diff --git a/src/mainboard/google/auron/variants/samus/variant.c b/src/mainboard/google/auron/variants/samus/variant.c index 92226c1..441cefe 100644 --- a/src/mainboard/google/auron/variants/samus/variant.c +++ b/src/mainboard/google/auron/variants/samus/variant.c @@ -2,7 +2,7 @@
#include <console/console.h> #include <ec/google/chromeec/ec.h> -#include <soc/gpio.h> +#include <southbridge/intel/lynxpoint/lp_gpio.h> #include <soc/pm.h> #include <soc/romstage.h> #include <smbios.h> diff --git a/src/mainboard/google/jecht/chromeos.c b/src/mainboard/google/jecht/chromeos.c index 86d1e79..cf59636 100644 --- a/src/mainboard/google/jecht/chromeos.c +++ b/src/mainboard/google/jecht/chromeos.c @@ -5,8 +5,9 @@ #include <device/device.h> #include <vendorcode/google/chromeos/chromeos.h> #include <ec/google/chromeec/ec.h> -#include <soc/gpio.h> +#include <soc/chromeos.h> #include <soc/sata.h> +#include <southbridge/intel/lynxpoint/lp_gpio.h> #include "onboard.h"
#define GPIO_SPI_WP 58 diff --git a/src/mainboard/google/jecht/smihandler.c b/src/mainboard/google/jecht/smihandler.c index 02430b8..1adc5d5 100644 --- a/src/mainboard/google/jecht/smihandler.c +++ b/src/mainboard/google/jecht/smihandler.c @@ -5,7 +5,7 @@ #include <cpu/x86/smm.h> #include <soc/pm.h> #include <ec/google/chromeec/ec.h> -#include <soc/gpio.h> +#include <southbridge/intel/lynxpoint/lp_gpio.h> #include <soc/iomap.h> #include <soc/nvs.h> #include "onboard.h" diff --git a/src/mainboard/google/jecht/variants/guado/pei_data.c b/src/mainboard/google/jecht/variants/guado/pei_data.c index ba950d6..63fd7ba 100644 --- a/src/mainboard/google/jecht/variants/guado/pei_data.c +++ b/src/mainboard/google/jecht/variants/guado/pei_data.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <soc/gpio.h> #include <soc/pei_data.h> #include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/jecht/variants/jecht/pei_data.c b/src/mainboard/google/jecht/variants/jecht/pei_data.c index ba950d6..63fd7ba 100644 --- a/src/mainboard/google/jecht/variants/jecht/pei_data.c +++ b/src/mainboard/google/jecht/variants/jecht/pei_data.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <soc/gpio.h> #include <soc/pei_data.h> #include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/jecht/variants/rikku/pei_data.c b/src/mainboard/google/jecht/variants/rikku/pei_data.c index ba950d6..63fd7ba 100644 --- a/src/mainboard/google/jecht/variants/rikku/pei_data.c +++ b/src/mainboard/google/jecht/variants/rikku/pei_data.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <soc/gpio.h> #include <soc/pei_data.h> #include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/jecht/variants/tidus/pei_data.c b/src/mainboard/google/jecht/variants/tidus/pei_data.c index dc13022..1513918 100644 --- a/src/mainboard/google/jecht/variants/tidus/pei_data.c +++ b/src/mainboard/google/jecht/variants/tidus/pei_data.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <soc/gpio.h> #include <soc/pei_data.h> #include <soc/pei_wrapper.h>
diff --git a/src/mainboard/intel/wtm2/chromeos.c b/src/mainboard/intel/wtm2/chromeos.c index 459560c..996eee2 100644 --- a/src/mainboard/intel/wtm2/chromeos.c +++ b/src/mainboard/intel/wtm2/chromeos.c @@ -3,7 +3,8 @@ #include <bootmode.h> #include <boot/coreboot_tables.h> #include <device/device.h> -#include <soc/gpio.h> +#include <soc/chromeos.h> +#include <southbridge/intel/lynxpoint/lp_gpio.h> #include <vendorcode/google/chromeos/chromeos.h>
/* Compile-time settings for recovery mode. */ diff --git a/src/mainboard/intel/wtm2/pei_data.c b/src/mainboard/intel/wtm2/pei_data.c index 92101bd..5591c4c 100644 --- a/src/mainboard/intel/wtm2/pei_data.c +++ b/src/mainboard/intel/wtm2/pei_data.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <soc/gpio.h> #include <soc/pei_data.h> #include <soc/pei_wrapper.h>
diff --git a/src/soc/intel/broadwell/include/soc/chromeos.h b/src/soc/intel/broadwell/include/soc/chromeos.h new file mode 100644 index 0000000..0e3dda1 --- /dev/null +++ b/src/soc/intel/broadwell/include/soc/chromeos.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef _BROADWELL_CHROMEOS_H_ +#define _BROADWELL_CHROMEOS_H_ + +#define CROS_GPIO_DEVICE_NAME "PCH-LP" + +#endif diff --git a/src/soc/intel/broadwell/include/soc/gpio.h b/src/soc/intel/broadwell/include/soc/gpio.h deleted file mode 100644 index 05f03ba..0000000 --- a/src/soc/intel/broadwell/include/soc/gpio.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef _BROADWELL_GPIO_H_ -#define _BROADWELL_GPIO_H_ - -#include <stdint.h> - -#define CROS_GPIO_DEVICE_NAME "PCH-LP" -#define CROS_GPIO_ACPI_DEVICE_NAME "INT3437:00" - -#include <southbridge/intel/lynxpoint/lp_gpio.h> - -#endif
-
Angel Pons (Code Review)