diff options
| author | Nico Huber <nico.huber@secunet.com> | 2017-08-01 14:02:40 +0200 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-08-18 15:33:29 +0000 |
| commit | 0f2dd1eff9930e30dddd9aabceb5d85ee3b4e980 (patch) | |
| tree | 50de642731203f720012db6bd2829d8dada2be40 /src/soc | |
| parent | 457fba6be5c2b31f6fc50a5e6feabf73a2663330 (diff) | |
include/device: Split i2c.h into three
Split `i2c.h` into three pieces to ease reuse of the generic defi-
nitions. No code is changed.
* `i2c.h` - keeps the generic definitions
* `i2c_simple.h` - holds the current, limited to one controller driver
per board, devicetree independent I2C interface
* `i2c_bus.h` - will become the devicetree compatible interface for
native I2C (e.g. non-SMBus) controllers
Change-Id: I382d45c70f9314588663e1284f264f877469c74d
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/20845
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc')
23 files changed, 23 insertions, 22 deletions
diff --git a/src/soc/broadcom/cygnus/i2c.c b/src/soc/broadcom/cygnus/i2c.c index bc43a8886f..ac431e734a 100644 --- a/src/soc/broadcom/cygnus/i2c.c +++ b/src/soc/broadcom/cygnus/i2c.c @@ -17,7 +17,7 @@ #include <assert.h> #include <console/console.h> #include <delay.h> -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <soc/i2c.h> struct cygnus_i2c_regs { diff --git a/src/soc/intel/apollolake/chip.h b/src/soc/intel/apollolake/chip.h index 7b36089b3c..33e2dade88 100644 --- a/src/soc/intel/apollolake/chip.h +++ b/src/soc/intel/apollolake/chip.h @@ -22,7 +22,7 @@ #include <soc/gpio.h> #include <intelblocks/lpc_lib.h> #include <intelblocks/lpss_i2c.h> -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <soc/pm.h> #include <soc/usb.h> diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c index f4b1e8c5ff..aeb6d8f2ed 100644 --- a/src/soc/intel/common/block/i2c/i2c.c +++ b/src/soc/intel/common/block/i2c/i2c.c @@ -14,7 +14,7 @@ */ #include <arch/acpigen.h> -#include <device/i2c.h> +#include <device/i2c_bus.h> #include <device/pci.h> #include <device/pci_def.h> #include <device/pci_ids.h> diff --git a/src/soc/intel/common/block/i2c/i2c_early.c b/src/soc/intel/common/block/i2c/i2c_early.c index 7c9ce60513..74fc994ca3 100644 --- a/src/soc/intel/common/block/i2c/i2c_early.c +++ b/src/soc/intel/common/block/i2c/i2c_early.c @@ -17,7 +17,7 @@ #include <arch/io.h> #include <console/console.h> #include <device/device.h> -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <device/pci.h> #include <device/pci_def.h> #include <intelblocks/lpss.h> diff --git a/src/soc/intel/common/block/i2c/lpss_i2c.c b/src/soc/intel/common/block/i2c/lpss_i2c.c index 711517f6d3..868a6ad300 100644 --- a/src/soc/intel/common/block/i2c/lpss_i2c.c +++ b/src/soc/intel/common/block/i2c/lpss_i2c.c @@ -18,7 +18,7 @@ #include <arch/io.h> #include <console/console.h> #include <device/device.h> -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <device/pci.h> #include <device/pci_def.h> #include <device/pci_ids.h> diff --git a/src/soc/intel/common/block/include/intelblocks/lpss_i2c.h b/src/soc/intel/common/block/include/intelblocks/lpss_i2c.h index 2f60d654b1..033081f4b9 100644 --- a/src/soc/intel/common/block/include/intelblocks/lpss_i2c.h +++ b/src/soc/intel/common/block/include/intelblocks/lpss_i2c.h @@ -16,6 +16,7 @@ #ifndef SOC_INTEL_COMMON_BLOCK_LPSS_I2C_H #define SOC_INTEL_COMMON_BLOCK_LPSS_I2C_H +#include <device/device.h> #include <device/i2c.h> #include <stdint.h> diff --git a/src/soc/intel/quark/gpio_i2c.c b/src/soc/intel/quark/gpio_i2c.c index 5580894ee1..d5543b803c 100644 --- a/src/soc/intel/quark/gpio_i2c.c +++ b/src/soc/intel/quark/gpio_i2c.c @@ -16,7 +16,7 @@ #include <console/console.h> #include <delay.h> #include <device/device.h> -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <device/pci.h> #include <device/pci_ids.h> #include <soc/i2c.h> diff --git a/src/soc/intel/quark/i2c.c b/src/soc/intel/quark/i2c.c index e8dba5376f..2a194af768 100644 --- a/src/soc/intel/quark/i2c.c +++ b/src/soc/intel/quark/i2c.c @@ -17,7 +17,7 @@ #include <console/console.h> #include <delay.h> #include <device/device.h> -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <device/pci.h> #include <device/pci_ids.h> #include <soc/i2c.h> diff --git a/src/soc/intel/skylake/chip.h b/src/soc/intel/skylake/chip.h index efd3566f76..ea985db11a 100644 --- a/src/soc/intel/skylake/chip.h +++ b/src/soc/intel/skylake/chip.h @@ -20,7 +20,7 @@ #define _SOC_CHIP_H_ #include <arch/acpi_device.h> -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <intelblocks/gspi.h> #include <intelblocks/lpss_i2c.h> #include <stdint.h> diff --git a/src/soc/mediatek/mt8173/da9212.c b/src/soc/mediatek/mt8173/da9212.c index 8161667fa9..cc20979f50 100644 --- a/src/soc/mediatek/mt8173/da9212.c +++ b/src/soc/mediatek/mt8173/da9212.c @@ -14,7 +14,7 @@ */ #include <console/console.h> -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <soc/da9212.h> enum { diff --git a/src/soc/mediatek/mt8173/i2c.c b/src/soc/mediatek/mt8173/i2c.c index 1d541e5d0f..9ca6803011 100644 --- a/src/soc/mediatek/mt8173/i2c.c +++ b/src/soc/mediatek/mt8173/i2c.c @@ -15,7 +15,7 @@ #include <assert.h> #include <delay.h> -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <string.h> #include <symbols.h> #include <timer.h> diff --git a/src/soc/mediatek/mt8173/mt6311.c b/src/soc/mediatek/mt8173/mt6311.c index 8390dfd4d0..8f0b274cfa 100644 --- a/src/soc/mediatek/mt8173/mt6311.c +++ b/src/soc/mediatek/mt8173/mt6311.c @@ -14,7 +14,7 @@ */ #include <console/console.h> -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <soc/mt6311.h> enum { diff --git a/src/soc/nvidia/tegra/i2c.c b/src/soc/nvidia/tegra/i2c.c index e371a9d30f..7d3e0bff90 100644 --- a/src/soc/nvidia/tegra/i2c.c +++ b/src/soc/nvidia/tegra/i2c.c @@ -16,7 +16,7 @@ #include <arch/io.h> #include <console/console.h> #include <delay.h> -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <stdlib.h> #include <string.h> #include <soc/addressmap.h> diff --git a/src/soc/nvidia/tegra/software_i2c.c b/src/soc/nvidia/tegra/software_i2c.c index fe2f61edbf..50aac8c45a 100644 --- a/src/soc/nvidia/tegra/software_i2c.c +++ b/src/soc/nvidia/tegra/software_i2c.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <gpio.h> #include <soc/pinmux.h> diff --git a/src/soc/nvidia/tegra124/dp.c b/src/soc/nvidia/tegra124/dp.c index 0132369073..d646e8ebdc 100644 --- a/src/soc/nvidia/tegra124/dp.c +++ b/src/soc/nvidia/tegra124/dp.c @@ -19,7 +19,7 @@ #include <console/console.h> #include <delay.h> #include <device/device.h> -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <edid.h> #include <soc/addressmap.h> #include <soc/nvidia/tegra/i2c.h> diff --git a/src/soc/nvidia/tegra210/dp.c b/src/soc/nvidia/tegra210/dp.c index 350eb8254d..119b4a74c8 100644 --- a/src/soc/nvidia/tegra210/dp.c +++ b/src/soc/nvidia/tegra210/dp.c @@ -17,7 +17,7 @@ #include <arch/io.h> #include <console/console.h> #include <device/device.h> -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <edid.h> #include <stdlib.h> #include <string.h> diff --git a/src/soc/qualcomm/ipq40xx/i2c.c b/src/soc/qualcomm/ipq40xx/i2c.c index 0cffaacbb2..133f56435f 100644 --- a/src/soc/qualcomm/ipq40xx/i2c.c +++ b/src/soc/qualcomm/ipq40xx/i2c.c @@ -33,7 +33,7 @@ #include <assert.h> #include <console/console.h> #include <delay.h> -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <stdlib.h> #include <string.h> #include <soc/blsp.h> diff --git a/src/soc/qualcomm/ipq806x/i2c.c b/src/soc/qualcomm/ipq806x/i2c.c index 009cb94c1f..9660ec84d6 100644 --- a/src/soc/qualcomm/ipq806x/i2c.c +++ b/src/soc/qualcomm/ipq806x/i2c.c @@ -31,7 +31,7 @@ #include <assert.h> #include <console/console.h> #include <delay.h> -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <stdlib.h> #include <string.h> #include <soc/gsbi.h> diff --git a/src/soc/rockchip/common/i2c.c b/src/soc/rockchip/common/i2c.c index 5847f1658f..09b56246fd 100644 --- a/src/soc/rockchip/common/i2c.c +++ b/src/soc/rockchip/common/i2c.c @@ -18,7 +18,7 @@ #include <cbfs.h> #include <console/console.h> #include <delay.h> -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <soc/addressmap.h> #include <soc/grf.h> #include <soc/soc.h> diff --git a/src/soc/rockchip/common/rk808.c b/src/soc/rockchip/common/rk808.c index a68b838f48..9b4708cfab 100644 --- a/src/soc/rockchip/common/rk808.c +++ b/src/soc/rockchip/common/rk808.c @@ -17,7 +17,7 @@ #include <bcd.h> #include <console/console.h> #include <delay.h> -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <rtc.h> #include <soc/rk808.h> #include <stdint.h> diff --git a/src/soc/rockchip/rk3288/software_i2c.c b/src/soc/rockchip/rk3288/software_i2c.c index 886e2d1e91..dbe058eea6 100644 --- a/src/soc/rockchip/rk3288/software_i2c.c +++ b/src/soc/rockchip/rk3288/software_i2c.c @@ -15,7 +15,7 @@ #include <arch/io.h> #include <console/console.h> -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <gpio.h> #include <soc/grf.h> #include <soc/i2c.h> diff --git a/src/soc/samsung/exynos5250/i2c.c b/src/soc/samsung/exynos5250/i2c.c index 6319a10b34..19ef667896 100644 --- a/src/soc/samsung/exynos5250/i2c.c +++ b/src/soc/samsung/exynos5250/i2c.c @@ -19,7 +19,7 @@ #include <assert.h> #include <console/console.h> #include <delay.h> -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <soc/clk.h> #include <soc/i2c.h> #include <soc/periph.h> diff --git a/src/soc/samsung/exynos5420/i2c.c b/src/soc/samsung/exynos5420/i2c.c index ae9560ffdd..dd5ffd20d0 100644 --- a/src/soc/samsung/exynos5420/i2c.c +++ b/src/soc/samsung/exynos5420/i2c.c @@ -19,7 +19,7 @@ #include <assert.h> #include <console/console.h> #include <delay.h> -#include <device/i2c.h> +#include <device/i2c_simple.h> #include <soc/clk.h> #include <soc/i2c.h> #include <soc/periph.h> |