Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/71813 )
Change subject: soc/mediatek: Include <gpio.h> instead of <soc/gpio.h> ......................................................................
soc/mediatek: Include <gpio.h> instead of <soc/gpio.h>
<gpio.h> chain-include <soc/gpio.h>.
Change-Id: If2af7f77e2d910a3f3470d15dbfc98775a2633b6 Signed-off-by: Elyes Haouas ehaouas@noos.fr Reviewed-on: https://review.coreboot.org/c/coreboot/+/71813 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Hung-Te Lin hungte@chromium.org --- M src/soc/mediatek/mt8173/gpio_init.c M src/soc/mediatek/mt8173/spi.c M src/soc/mediatek/mt8183/i2c.c M src/soc/mediatek/mt8183/mt8183.c M src/soc/mediatek/mt8183/spi.c M src/soc/mediatek/mt8186/i2c.c M src/soc/mediatek/mt8186/msdc.c M src/soc/mediatek/mt8186/spi.c M src/soc/mediatek/mt8186/usb.c M src/soc/mediatek/mt8188/i2c.c M src/soc/mediatek/mt8188/msdc.c M src/soc/mediatek/mt8188/spi.c M src/soc/mediatek/mt8188/usb.c M src/soc/mediatek/mt8192/i2c.c M src/soc/mediatek/mt8192/msdc.c M src/soc/mediatek/mt8192/spi.c M src/soc/mediatek/mt8195/i2c.c M src/soc/mediatek/mt8195/msdc.c M src/soc/mediatek/mt8195/pcie.c M src/soc/mediatek/mt8195/spi.c 20 files changed, 33 insertions(+), 20 deletions(-)
Approvals: build bot (Jenkins): Verified Hung-Te Lin: Looks good to me, approved
diff --git a/src/soc/mediatek/mt8173/gpio_init.c b/src/soc/mediatek/mt8173/gpio_init.c index 80652d8..b03de9f 100644 --- a/src/soc/mediatek/mt8173/gpio_init.c +++ b/src/soc/mediatek/mt8173/gpio_init.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <device/mmio.h> -#include <soc/gpio.h> +#include <gpio.h> #include <soc/mipi.h>
/* diff --git a/src/soc/mediatek/mt8173/spi.c b/src/soc/mediatek/mt8173/spi.c index d3c8ad4..b7d6d94 100644 --- a/src/soc/mediatek/mt8173/spi.c +++ b/src/soc/mediatek/mt8173/spi.c @@ -2,10 +2,10 @@
#include <device/mmio.h> #include <assert.h> +#include <gpio.h> #include <spi_flash.h> #include <soc/addressmap.h> #include <soc/flash_controller_common.h> -#include <soc/gpio.h> #include <soc/spi.h>
struct mtk_spi_bus spi_bus[SPI_BUS_NUMBER] = { diff --git a/src/soc/mediatek/mt8183/i2c.c b/src/soc/mediatek/mt8183/i2c.c index 1aaa236..8bd7c36 100644 --- a/src/soc/mediatek/mt8183/i2c.c +++ b/src/soc/mediatek/mt8183/i2c.c @@ -3,8 +3,8 @@ #include <assert.h> #include <console/console.h> #include <device/mmio.h> +#include <gpio.h> #include <soc/i2c.h> -#include <soc/gpio.h>
struct mtk_i2c mtk_i2c_bus_controller[] = { /* i2c0 setting */ diff --git a/src/soc/mediatek/mt8183/mt8183.c b/src/soc/mediatek/mt8183/mt8183.c index 1c34246..ca47e49 100644 --- a/src/soc/mediatek/mt8183/mt8183.c +++ b/src/soc/mediatek/mt8183/mt8183.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */
+#include <gpio.h> #include <soc/mt8183.h> #include <soc/wdt.h> -#include <soc/gpio.h>
void mt8183_early_init(void) { diff --git a/src/soc/mediatek/mt8183/spi.c b/src/soc/mediatek/mt8183/spi.c index c172f37..9404f93 100644 --- a/src/soc/mediatek/mt8183/spi.c +++ b/src/soc/mediatek/mt8183/spi.c @@ -2,10 +2,10 @@
#include <device/mmio.h> #include <assert.h> +#include <gpio.h> #include <spi_flash.h> #include <soc/addressmap.h> #include <soc/flash_controller.h> -#include <soc/gpio.h> #include <soc/spi.h>
struct mtk_spi_bus spi_bus[SPI_BUS_NUMBER] = { diff --git a/src/soc/mediatek/mt8186/i2c.c b/src/soc/mediatek/mt8186/i2c.c index 8345637..9e7e4b3 100644 --- a/src/soc/mediatek/mt8186/i2c.c +++ b/src/soc/mediatek/mt8186/i2c.c @@ -9,8 +9,8 @@ #include <console/console.h> #include <device/mmio.h> #include <device/i2c_simple.h> +#include <gpio.h> #include <soc/i2c.h> -#include <soc/gpio.h>
struct mtk_i2c mtk_i2c_bus_controller[] = { [0] = { diff --git a/src/soc/mediatek/mt8186/msdc.c b/src/soc/mediatek/mt8186/msdc.c index 1a316db..c1e21de 100644 --- a/src/soc/mediatek/mt8186/msdc.c +++ b/src/soc/mediatek/mt8186/msdc.c @@ -6,8 +6,8 @@ */
#include <device/mmio.h> +#include <gpio.h> #include <soc/addressmap.h> -#include <soc/gpio.h> #include <soc/regulator.h> #include <soc/msdc.h>
diff --git a/src/soc/mediatek/mt8186/spi.c b/src/soc/mediatek/mt8186/spi.c index 11f8b6a..adbd437 100644 --- a/src/soc/mediatek/mt8186/spi.c +++ b/src/soc/mediatek/mt8186/spi.c @@ -8,10 +8,10 @@ #include <assert.h> #include <console/console.h> #include <device/mmio.h> +#include <gpio.h> #include <spi_flash.h> #include <soc/addressmap.h> #include <soc/flash_controller_common.h> -#include <soc/gpio.h> #include <soc/spi.h>
struct mtk_spi_bus spi_bus[SPI_BUS_NUMBER] = { diff --git a/src/soc/mediatek/mt8186/usb.c b/src/soc/mediatek/mt8186/usb.c index 98d9c7c..42804dd 100644 --- a/src/soc/mediatek/mt8186/usb.c +++ b/src/soc/mediatek/mt8186/usb.c @@ -7,7 +7,6 @@
#include <device/mmio.h> #include <gpio.h> -#include <soc/gpio.h> #include <soc/pll_common.h> #include <soc/usb.h>
diff --git a/src/soc/mediatek/mt8188/i2c.c b/src/soc/mediatek/mt8188/i2c.c index c9841cb..1de37c5 100644 --- a/src/soc/mediatek/mt8188/i2c.c +++ b/src/soc/mediatek/mt8188/i2c.c @@ -9,8 +9,8 @@ #include <console/console.h> #include <device/i2c_simple.h> #include <device/mmio.h> +#include <gpio.h> #include <soc/i2c.h> -#include <soc/gpio.h>
struct mtk_i2c mtk_i2c_bus_controller[] = { [0] = { diff --git a/src/soc/mediatek/mt8188/msdc.c b/src/soc/mediatek/mt8188/msdc.c index 72044f0..37a96a7 100644 --- a/src/soc/mediatek/mt8188/msdc.c +++ b/src/soc/mediatek/mt8188/msdc.c @@ -6,8 +6,8 @@ */
#include <device/mmio.h> +#include <gpio.h> #include <soc/addressmap.h> -#include <soc/gpio.h> #include <soc/regulator.h> #include <soc/msdc.h> #include <soc/mt6359p.h> diff --git a/src/soc/mediatek/mt8188/spi.c b/src/soc/mediatek/mt8188/spi.c index 67249b4..56efec5 100644 --- a/src/soc/mediatek/mt8188/spi.c +++ b/src/soc/mediatek/mt8188/spi.c @@ -7,9 +7,9 @@
#include <assert.h> #include <device/mmio.h> +#include <gpio.h> #include <soc/addressmap.h> #include <soc/flash_controller_common.h> -#include <soc/gpio.h> #include <soc/spi.h> #include <spi_flash.h>
diff --git a/src/soc/mediatek/mt8188/usb.c b/src/soc/mediatek/mt8188/usb.c index 58cee55..6c575cf 100644 --- a/src/soc/mediatek/mt8188/usb.c +++ b/src/soc/mediatek/mt8188/usb.c @@ -7,7 +7,6 @@
#include <device/mmio.h> #include <gpio.h> -#include <soc/gpio.h> #include <soc/infracfg.h> #include <soc/pll_common.h> #include <soc/usb.h> diff --git a/src/soc/mediatek/mt8192/i2c.c b/src/soc/mediatek/mt8192/i2c.c index 6d88833..a3f236a 100644 --- a/src/soc/mediatek/mt8192/i2c.c +++ b/src/soc/mediatek/mt8192/i2c.c @@ -3,8 +3,8 @@ #include <assert.h> #include <console/console.h> #include <device/mmio.h> +#include <gpio.h> #include <soc/i2c.h> -#include <soc/gpio.h>
#define I2C_FULL_DUTY 100 #define I2C_HALF_DUTY 50 diff --git a/src/soc/mediatek/mt8192/msdc.c b/src/soc/mediatek/mt8192/msdc.c index 89f25a3..ec02b24 100644 --- a/src/soc/mediatek/mt8192/msdc.c +++ b/src/soc/mediatek/mt8192/msdc.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <device/mmio.h> +#include <gpio.h> #include <soc/addressmap.h> -#include <soc/gpio.h> #include <soc/regulator.h> #include <soc/msdc.h>
diff --git a/src/soc/mediatek/mt8192/spi.c b/src/soc/mediatek/mt8192/spi.c index b5abc85..42e5b4a 100644 --- a/src/soc/mediatek/mt8192/spi.c +++ b/src/soc/mediatek/mt8192/spi.c @@ -2,9 +2,9 @@
#include <device/mmio.h> #include <assert.h> +#include <gpio.h> #include <soc/addressmap.h> #include <soc/flash_controller_common.h> -#include <soc/gpio.h> #include <soc/spi.h>
struct mtk_spi_bus spi_bus[SPI_BUS_NUMBER] = { diff --git a/src/soc/mediatek/mt8195/i2c.c b/src/soc/mediatek/mt8195/i2c.c index 3f32221..e404107 100644 --- a/src/soc/mediatek/mt8195/i2c.c +++ b/src/soc/mediatek/mt8195/i2c.c @@ -4,8 +4,8 @@ #include <console/console.h> #include <device/mmio.h> #include <device/i2c_simple.h> +#include <gpio.h> #include <soc/i2c.h> -#include <soc/gpio.h>
struct mtk_i2c mtk_i2c_bus_controller[] = { [0] = { diff --git a/src/soc/mediatek/mt8195/msdc.c b/src/soc/mediatek/mt8195/msdc.c index eb37b58..8036e97 100644 --- a/src/soc/mediatek/mt8195/msdc.c +++ b/src/soc/mediatek/mt8195/msdc.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only OR MIT */
#include <device/mmio.h> +#include <gpio.h> #include <soc/addressmap.h> -#include <soc/gpio.h> #include <soc/i2c.h> #include <soc/regulator.h> #include <soc/msdc.h> diff --git a/src/soc/mediatek/mt8195/pcie.c b/src/soc/mediatek/mt8195/pcie.c index a95afe4..c9f8ecd 100644 --- a/src/soc/mediatek/mt8195/pcie.c +++ b/src/soc/mediatek/mt8195/pcie.c @@ -5,9 +5,9 @@ #include <device/mmio.h> #include <device/resource.h> #include <delay.h> +#include <gpio.h> #include <soc/addressmap.h> #include <soc/early_init.h> -#include <soc/gpio.h> #include <soc/pcie.h> #include <soc/pcie_common.h> #include <stdlib.h> diff --git a/src/soc/mediatek/mt8195/spi.c b/src/soc/mediatek/mt8195/spi.c index 44ab5a4..2772612 100644 --- a/src/soc/mediatek/mt8195/spi.c +++ b/src/soc/mediatek/mt8195/spi.c @@ -2,9 +2,9 @@
#include <assert.h> #include <device/mmio.h> +#include <gpio.h> #include <soc/addressmap.h> #include <soc/flash_controller_common.h> -#include <soc/gpio.h> #include <soc/spi.h>
struct mtk_spi_bus spi_bus[SPI_BUS_NUMBER] = {