diff options
| author | Olof Johansson <olof@lixom.net> | 2017-04-19 05:25:52 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-04-19 05:25:52 -0700 |
| commit | 336a8b145e94db90b11a5ef1c338531d3fd3014e (patch) | |
| tree | c0476ae4a862530f35c1eb94ff448b67d637785d /arch/arm | |
| parent | f799969e16690f86c758fa068ba696c31d08879a (diff) | |
| parent | a1365c4081ac21d2a51fcde3a9956e0e41cc2b74 (diff) | |
Merge tag 'stm32-defconfig-for-v4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/defconfig
STM32 defconfig updates for v4.12, round 1.
Highlights:
----------
- Enable I2C
- Add config fragment for RAM start point
* tag 'stm32-defconfig-for-v4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
ARM: configs: Add new config fragment to change RAM start point
ARM: configs: stm32: Add I2C support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/dram_0xd0000000.config | 1 | ||||
| -rw-r--r-- | arch/arm/configs/stm32_defconfig | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/dram_0xd0000000.config b/arch/arm/configs/dram_0xd0000000.config new file mode 100644 index 000000000000..61ba7045f8a1 --- /dev/null +++ b/arch/arm/configs/dram_0xd0000000.config @@ -0,0 +1 @@ +CONFIG_DRAM_BASE=0xd0000000 diff --git a/arch/arm/configs/stm32_defconfig b/arch/arm/configs/stm32_defconfig index 7c9c1578a13e..ea4132a30692 100644 --- a/arch/arm/configs/stm32_defconfig +++ b/arch/arm/configs/stm32_defconfig @@ -48,6 +48,9 @@ CONFIG_SERIAL_NONSTANDARD=y CONFIG_SERIAL_STM32=y CONFIG_SERIAL_STM32_CONSOLE=y # CONFIG_HW_RANDOM is not set +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_STM32F4=y # CONFIG_HWMON is not set CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y |