diff --git a/arch/x86/soc/intel_quark/quark_x1000/Kconfig.defconfig.series b/arch/x86/soc/intel_quark/quark_x1000/Kconfig.defconfig.series index 64e7af607cc..2af306f84c2 100644 --- a/arch/x86/soc/intel_quark/quark_x1000/Kconfig.defconfig.series +++ b/arch/x86/soc/intel_quark/quark_x1000/Kconfig.defconfig.series @@ -70,12 +70,11 @@ config I2C_0 if I2C_0 -config I2C_0_NAME - default "I2C_0" config I2C_0_DEFAULT_CFG default 0x12 config I2C_0_IRQ_PRI default 2 + config I2C_DW_0_IRQ_SHARED_NAME default SHARED_IRQ_0_NAME if SHARED_IRQ diff --git a/arch/x86/soc/intel_quark/quark_x1000/dts.fixup b/arch/x86/soc/intel_quark/quark_x1000/dts.fixup index 9f80e096ff4..b7011363a90 100644 --- a/arch/x86/soc/intel_quark/quark_x1000/dts.fixup +++ b/arch/x86/soc/intel_quark/quark_x1000/dts.fixup @@ -11,3 +11,8 @@ #define CONFIG_PHYS_LOAD_ADDR CONFIG_FLASH_BASE_ADDRESS #define CONFIG_IOAPIC_BASE_ADDRESS INTEL_IOAPIC_FEC00000_BASE_ADDRESS + +#define CONFIG_I2C_0_IRQ SNPS_DESIGNWARE_I2C_90007000_IRQ_0 +#define CONFIG_I2C_0_IRQ_FLAGS SNPS_DESIGNWARE_I2C_90007000_IRQ_0_SENSE +#define CONFIG_I2C_0_BASE_ADDR SNPS_DESIGNWARE_I2C_90007000_BASE_ADDRESS +#define CONFIG_I2C_0_NAME SNPS_DESIGNWARE_I2C_90007000_LABEL diff --git a/arch/x86/soc/intel_quark/quark_x1000/soc.h b/arch/x86/soc/intel_quark/quark_x1000/soc.h index ad0816566ff..a1b37e6346a 100644 --- a/arch/x86/soc/intel_quark/quark_x1000/soc.h +++ b/arch/x86/soc/intel_quark/quark_x1000/soc.h @@ -97,18 +97,11 @@ #define I2C_DW_PCI_DEVICE_ID 0x0934 #define I2C_DW_PCI_CLASS 0x0C -#define CONFIG_I2C_0_BASE_ADDR 0x90007000 -#define CONFIG_I2C_0_IRQ 18 - #define I2C_DW_0_PCI_BUS 0 #define I2C_DW_0_PCI_DEV 21 #define I2C_DW_0_PCI_FUNCTION 2 #define I2C_DW_0_PCI_BAR 0 -#if defined(CONFIG_IOAPIC) -#define CONFIG_I2C_0_IRQ_FLAGS (IOAPIC_LEVEL | IOAPIC_LOW) -#endif - /* * UART */ diff --git a/boards/x86/galileo/Kconfig.board b/boards/x86/galileo/Kconfig.board index b4e3900e980..e5244e98d2f 100644 --- a/boards/x86/galileo/Kconfig.board +++ b/boards/x86/galileo/Kconfig.board @@ -3,6 +3,7 @@ config BOARD_GALILEO bool "Galileo Gen2" depends on SOC_SERIES_QUARK_X1000 select HAS_DTS + select HAS_DTS_I2C help The Intel Galileo Gen 2 development board is a microcontroller board based on the Intel Quark SoC X1000 application processor, a 32-bit diff --git a/boards/x86/galileo/galileo.dts b/boards/x86/galileo/galileo.dts index 0142754da15..c93ba74bc7a 100644 --- a/boards/x86/galileo/galileo.dts +++ b/boards/x86/galileo/galileo.dts @@ -31,3 +31,7 @@ current-speed = <115200>; }; +&i2c0 { + status = "ok"; + clock-frequency = ; +};