diff options
25 files changed, 23 insertions, 36 deletions
diff --git a/src/mainboard/google/auron/chromeos.c b/src/mainboard/google/auron/chromeos.c index 2827cb16f5..50eeddce0a 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 7e22fbb6c8..34ed171f8a 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 e5c3dbd955..539026b332 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 c2a22ae2a1..9776bbaa1b 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 59e949a388..e44c42e9b2 100644 --- a/src/mainboard/google/auron/variants/auron_paine/spd/spd.c +++ b/src/mainboard/google/auron/variants/auron_paine/spd/spd.c @@ -3,7 +3,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 c2a22ae2a1..9776bbaa1b 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 59e949a388..e44c42e9b2 100644 --- a/src/mainboard/google/auron/variants/auron_yuna/spd/spd.c +++ b/src/mainboard/google/auron/variants/auron_yuna/spd/spd.c @@ -3,7 +3,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 026853ff25..c748bb654f 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 c2a22ae2a1..9776bbaa1b 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 093a88c3ea..fe1aa2ae4b 100644 --- a/src/mainboard/google/auron/variants/gandof/spd/spd.c +++ b/src/mainboard/google/auron/variants/gandof/spd/spd.c @@ -3,7 +3,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 bbc7125330..15b9237098 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 67f71d6e0b..a4cc07c223 100644 --- a/src/mainboard/google/auron/variants/lulu/spd/spd.c +++ b/src/mainboard/google/auron/variants/lulu/spd/spd.c @@ -3,7 +3,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 9bcf92be73..f404d82c46 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 8ba76ac5f1..87ecfa04e3 100644 --- a/src/mainboard/google/auron/variants/samus/spd/spd.c +++ b/src/mainboard/google/auron/variants/samus/spd/spd.c @@ -3,7 +3,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 92226c1e83..441cefe6e8 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 86d1e79a43..cf59636073 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 02430b88c2..1adc5d5438 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 ba950d6954..63fd7babbb 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 ba950d6954..63fd7babbb 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 ba950d6954..63fd7babbb 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 dc130224a4..1513918a29 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 459560c990..996eee2f3c 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 92101bdc51..5591c4ca4d 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 0000000000..0e3dda1b1f --- /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 05f03ba239..0000000000 --- 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 |