Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6a7d1c6 authored May 24, 2014 by Arnd Bergmann

Merge tag 'sunxi-defconfig-for-3.16-2' of https://github.com/mripard/linux into next/defconfig

Merge "Allwinner defconfig changes, take 2" from Maxime Ripard:

Add the A31 reset driver to the sunxi-related defconfigs

* tag 'sunxi-defconfig-for-3.16-2' of https://github.com/mripard/linux

:
  ARM: multi_v7: Add Allwinner reset drivers to multi_v7_defconfig
  ARM: sunxi: Add A31 reset driver to sunxi_defconfig
  ARM: sunxi: drop CONFIG_COMMON_CLK_DEBUG

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 6c1ef4b9 e397a785

arch/arm/configs/multi_v7_defconfig

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -200,12 +200,14 @@ CONFIG_BATTERY_SBS=y
	CONFIG_CHARGER_TPS65090=y		CONFIG_CHARGER_TPS65090=y
	CONFIG_POWER_RESET_AS3722=y		CONFIG_POWER_RESET_AS3722=y
	CONFIG_POWER_RESET_GPIO=y		CONFIG_POWER_RESET_GPIO=y
			CONFIG_POWER_RESET_SUN6I=y
	CONFIG_SENSORS_LM90=y		CONFIG_SENSORS_LM90=y
	CONFIG_THERMAL=y		CONFIG_THERMAL=y
	CONFIG_DOVE_THERMAL=y		CONFIG_DOVE_THERMAL=y
	CONFIG_ARMADA_THERMAL=y		CONFIG_ARMADA_THERMAL=y
	CONFIG_WATCHDOG=y		CONFIG_WATCHDOG=y
	CONFIG_ORION_WATCHDOG=y		CONFIG_ORION_WATCHDOG=y
			CONFIG_SUNXI_WATCHDOG=y
	CONFIG_MFD_AS3722=y		CONFIG_MFD_AS3722=y
	CONFIG_MFD_CROS_EC=y		CONFIG_MFD_CROS_EC=y
	CONFIG_MFD_CROS_EC_SPI=y		CONFIG_MFD_CROS_EC_SPI=y

arch/arm/configs/sunxi_defconfig

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -52,6 +52,9 @@ CONFIG_I2C_MV64XXX=y
	CONFIG_SPI=y		CONFIG_SPI=y
	CONFIG_SPI_SUN6I=y		CONFIG_SPI_SUN6I=y
	CONFIG_GPIO_SYSFS=y		CONFIG_GPIO_SYSFS=y
			CONFIG_POWER_SUPPLY=y
			CONFIG_POWER_RESET=y
			CONFIG_POWER_RESET_SUN6I=y
	# CONFIG_HWMON is not set		# CONFIG_HWMON is not set
	CONFIG_WATCHDOG=y		CONFIG_WATCHDOG=y
	CONFIG_SUNXI_WATCHDOG=y		CONFIG_SUNXI_WATCHDOG=y
	@@ -62,7 +65,6 @@ CONFIG_LEDS_GPIO=y
	CONFIG_LEDS_TRIGGERS=y		CONFIG_LEDS_TRIGGERS=y
	CONFIG_LEDS_TRIGGER_HEARTBEAT=y		CONFIG_LEDS_TRIGGER_HEARTBEAT=y
	CONFIG_LEDS_TRIGGER_DEFAULT_ON=y		CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
	CONFIG_COMMON_CLK_DEBUG=y
	# CONFIG_IOMMU_SUPPORT is not set		# CONFIG_IOMMU_SUPPORT is not set
	CONFIG_TMPFS=y		CONFIG_TMPFS=y
	CONFIG_NFS_FS=y		CONFIG_NFS_FS=y