Merge tag 'amlogic-defconfig' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/defconfig

Amlogic: defconfig updates for v4.18
- multi_v7_defconfig: enable meson PWM, I2C drivers

* tag 'amlogic-defconfig' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM: multi_v7_defconfig: enable the Meson PWM controller
  arm: multi_v7_defconfig: enable the Amlogic Meson I2C driver

Signed-off-by: Olof Johansson <olof@lixom.net>