From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:59074 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932419AbcEBXvd (ORCPT ); Mon, 2 May 2016 19:51:33 -0400 Subject: Patch "ARM: prima2: always enable reset controller" has been added to the 4.5-stable tree To: arnd@arndb.de, gregkh@linuxfoundation.org, p.zabel@pengutronix.de Cc: , From: Date: Mon, 02 May 2016 16:51:31 -0700 Message-ID: <146223309110133@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled ARM: prima2: always enable reset controller to the 4.5-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: arm-prima2-always-enable-reset-controller.patch and it can be found in the queue-4.5 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From ef2b1d777d643af227a22309d8b79898b90b123c Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Sat, 28 Nov 2015 23:56:47 +0100 Subject: ARM: prima2: always enable reset controller From: Arnd Bergmann commit ef2b1d777d643af227a22309d8b79898b90b123c upstream. The atlas7 clock controller driver registers a reset controller for itself, which causes a link error when the subsystem is disabled: drivers/built-in.o: In function `atlas7_clk_init': drivers/clk/sirf/clk-atlas7.c:1681: undefined reference to `reset_controller_register' As the clk driver does not have a Kconfig symbol for itself but it always built-in when the platform is enabled, we have to ensure that the reset controller subsystem is also built-in in this case. Signed-off-by: Arnd Bergmann Acked-by: Philipp Zabel Fixes: 301c5d29402e ("clk: sirf: add CSR atlas7 clk and reset support") Signed-off-by: Greg Kroah-Hartman --- arch/arm/mach-prima2/Kconfig | 1 + 1 file changed, 1 insertion(+) --- a/arch/arm/mach-prima2/Kconfig +++ b/arch/arm/mach-prima2/Kconfig @@ -2,6 +2,7 @@ menuconfig ARCH_SIRF bool "CSR SiRF" depends on ARCH_MULTI_V7 select ARCH_HAS_RESET_CONTROLLER + select RESET_CONTROLLER select ARCH_REQUIRE_GPIOLIB select GENERIC_IRQ_CHIP select NO_IOPORT_MAP Patches currently in stable-queue which might be from arnd@arndb.de are queue-4.5/misc-bmp085-enable-building-as-a-module.patch queue-4.5/xen-kconfig-don-t-select-input_xen_kbddev_frontend.patch queue-4.5/arm-exynos-select-thermal_of.patch queue-4.5/regulator-s5m8767-fix-get_register-error-handling.patch queue-4.5/asm-generic-futex-re-enable-preemption-in-futex_atomic_cmpxchg_inatomic.patch queue-4.5/ntb-perf-test-fix-address-space-confusion.patch queue-4.5/paride-make-verbose-parameter-an-int-again.patch queue-4.5/arm-prima2-always-enable-reset-controller.patch queue-4.5/asoc-s3c24xx-use-const-snd_soc_component_driver-pointer.patch queue-4.5/scsi_dh-force-modular-build-if-scsi-is-a-module.patch