From patchwork Thu Dec 10 16:28:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 555202 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3D1A7140213 for ; Fri, 11 Dec 2015 03:31:31 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a745s-0003um-5q; Thu, 10 Dec 2015 16:29:24 +0000 Received: from mout.kundenserver.de ([217.72.192.75]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a745n-0003r4-Fm for linux-arm-kernel@lists.infradead.org; Thu, 10 Dec 2015 16:29:21 +0000 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue103) with ESMTPSA (Nemesis) id 0LlYpT-1ahVZ82mil-00bGaf; Thu, 10 Dec 2015 17:28:49 +0100 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: Re: [GIT PULL] Reset controller changes for v4.5 Date: Thu, 10 Dec 2015 17:28:46 +0100 Message-ID: <1798269.3PANqSXe6n@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1447692309.3312.26.camel@pengutronix.de> References: <1447692309.3312.26.camel@pengutronix.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:XX5EqrdKhLgHOtzOchcR14B/zihA8wP1Z4hc+op7b1PIlfXAIfS iuvKCjnkriIP1DCCweZytXtixEPGF2Vl+8iwAiKa04DmuKJWZ4uCKiUedOzYfm87bpBdXo7 CZSWEGqE2uDjinKRTZ/ZwACpFDI2wRq+hvczwiXwH3Uo3NcLbRaPd3kFKo0btvVFlIwjP2o 0VVbzpDqU/fKvDln+th4Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:avy5Ak+ClkE=:igH1tlJPaDrcJiNiA+gYfR wcyB7wQwW4HpZCt1L/bSerN3jj4IYbNSswYhuWCl/s/GvHkay6GRafEiEFUhcxcQSaCIaXbcw Axe7s0hsKB22uIp45ImTYSmr9h0s5l5CCM3HYb+1/joAA5L7U3aRRRHJmCQPTyygLpbakqq3T TfIyR1KReoS9f9O0oOUTSNTuf0KDJtFzBnvc5HDMRjCGT38Fbd9wPrsAFd0QEEti13jr7n2Cx HtImaDwJTK+CGMxjbk98xjYAoRRc9hPEgd9UaYZi24mX5JlvJVc8Z8+7XofefSfLjrdKAdZao rSRIOEX27tYp0iHaOxz0ARCC0+tDQZQwAPfFMvpioX01RDymDzFwpW02SbUik8tpriYRAq1ow hDTZH1VlJl0uihoZsi7U45ui8937DulLFGkQde9sRVtbmIWCsDK9ci98himmVijoSqT9M5Gsf nanU0xkgW1begLqq4Uiuzku6IdmzkTQa/hv8yyRx6lPqHYilF/M/HS1jmen87Ru16BWVMfnX1 mVjj40oRE+HmlcJGg05/1sqOO/7NdLih85BptG2kCTGN5OT/O+8h2kYBiFwXnQWM9VHRMOijL P+0GbfCUZ7aQ3YdkANHD/0v8mGNnVJ1DlHVL+DPg1Dgqb69f1XpGov9fM1MkTdba3cyVjMJLw yTbCazrTaTUo2GhNnfQaZtacbxRuwEJ3/m/z5wT5CKjcJlpAhrsERMA6piaxsHi5xRWnfuuL5 3K2f59Pw0BgnYxCO X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151210_082919_924650_0A5D1DE5 X-CRM114-Status: GOOD ( 20.80 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [217.72.192.75 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [217.72.192.75 listed in wl.mailspike.net] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: arm@kernel.org, kernel@pengutronix.de, Philipp Zabel Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org On Monday 16 November 2015 17:45:09 Philipp Zabel wrote: > Reset controller changes for v4.5 > > - oftree support for getting reset devices by index > - fixed return value consistency of of_reset_control_get > - added support for STi co-processor resets > - added STi status callback > - various fixes Pulled into next/drivers. This reminds me that I have an old patch that I keep carrying forward in my randconfig series. I think we discussed it before, but it was a while ago. Can you have a look at this and maybe submit a version you are happy with? We frequently get drivers that add new dependencies on reset drivers that are not listed in Kconfig, so turning the dependency around would avoid the problem reliably. Arnd diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9f4bb028e62d..be45e3b45394 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -322,6 +322,7 @@ choice config ARCH_MULTIPLATFORM bool "Allow multiple platforms to be selected" + select ARCH_HAS_RESET_CONTROLLER select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_HAS_SG_CHAIN select ARM_PATCH_PHYS_VIRT diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig index ffbfa0bd091b..433e07304da8 100644 --- a/arch/arm/mach-berlin/Kconfig +++ b/arch/arm/mach-berlin/Kconfig @@ -1,7 +1,6 @@ menuconfig ARCH_BERLIN bool "Marvell Berlin SoCs" depends on ARCH_MULTI_V7 - select ARCH_HAS_RESET_CONTROLLER select ARCH_REQUIRE_GPIOLIB select ARM_GIC select DW_APB_ICTL diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 0ac180f7b330..1babe8bc1b87 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -59,7 +59,6 @@ config HAVE_IMX_MMDC config HAVE_IMX_SRC def_bool y if SMP - select ARCH_HAS_RESET_CONTROLLER config IMX_HAVE_IOMUX_V1 bool diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig index 01c57d369462..343a954b01cb 100644 --- a/arch/arm/mach-mmp/Kconfig +++ b/arch/arm/mach-mmp/Kconfig @@ -111,6 +111,7 @@ config MACH_MMP_DT select PINCTRL_SINGLE select COMMON_CLK select ARCH_HAS_RESET_CONTROLLER + select RESET_CONTROLLER select CPU_MOHAWK help Include support for Marvell MMP2 based platforms using @@ -123,6 +124,7 @@ config MACH_MMP2_DT select PINCTRL select PINCTRL_SINGLE select ARCH_HAS_RESET_CONTROLLER + select RESET_CONTROLLER select CPU_PJ4 help Include support for Marvell MMP2 based platforms using diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig index f998eb1c698e..0fd16919eab2 100644 --- a/arch/arm/mach-prima2/Kconfig +++ b/arch/arm/mach-prima2/Kconfig @@ -1,13 +1,13 @@ menuconfig ARCH_SIRF bool "CSR SiRF" depends on ARCH_MULTI_V7 - select ARCH_HAS_RESET_CONTROLLER select ARCH_REQUIRE_GPIOLIB select GENERIC_IRQ_CHIP select NO_IOPORT_MAP select REGMAP select PINCTRL select PINCTRL_SIRF + select RESET_CONTROLLER help Support for CSR SiRFprimaII/Marco/Polo platforms diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index cef42fd886d1..8177d284ffd7 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -3,7 +3,6 @@ config ARCH_ROCKCHIP depends on ARCH_MULTI_V7 select PINCTRL select PINCTRL_ROCKCHIP - select ARCH_HAS_RESET_CONTROLLER select ARCH_REQUIRE_GPIOLIB select ARM_AMBA select ARM_GIC @@ -13,6 +12,7 @@ config ARCH_ROCKCHIP select HAVE_ARM_TWD if SMP select DW_APB_TIMER_OF select REGULATOR if PM + select RESET_CONTROLLER select ROCKCHIP_TIMER select ARM_GLOBAL_TIMER select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig index a196d14f65f5..3b62535af413 100644 --- a/arch/arm/mach-sti/Kconfig +++ b/arch/arm/mach-sti/Kconfig @@ -8,7 +8,6 @@ menuconfig ARCH_STI select PINCTRL select PINCTRL_ST select MFD_SYSCON - select ARCH_HAS_RESET_CONTROLLER select HAVE_ARM_SCU if SMP select ARCH_REQUIRE_GPIOLIB select ARM_ERRATA_754322 @@ -16,7 +15,6 @@ menuconfig ARCH_STI select ARM_ERRATA_775420 select PL310_ERRATA_753970 if CACHE_L2X0 select PL310_ERRATA_769419 if CACHE_L2X0 - select RESET_CONTROLLER help Include support for STiH41x SOCs like STiH415/416 using the device tree for discovery diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index c124d658b350..7559d282ba27 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -2,7 +2,6 @@ menuconfig ARCH_SUNXI bool "Allwinner SoCs" depends on ARCH_MULTI_V7 select ARCH_REQUIRE_GPIOLIB - select ARCH_HAS_RESET_CONTROLLER select CLKSRC_MMIO select GENERIC_IRQ_CHIP select PINCTRL diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c index c2be98f38e73..b1c39eed19f1 100644 --- a/arch/arm/mach-sunxi/sunxi.c +++ b/arch/arm/mach-sunxi/sunxi.c @@ -45,7 +45,7 @@ extern void __init sun6i_reset_init(void); static void __init sun6i_timer_init(void) { of_clk_init(NULL); - if (IS_ENABLED(CONFIG_RESET_CONTROLLER)) + if (IS_ENABLED(CONFIG_RESET_SUNXI)) sun6i_reset_init(); clocksource_probe(); } diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 5ecee7b3729f..657f7d1c46d4 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -10,7 +10,6 @@ config ARCH_TEGRA select HAVE_ARM_TWD if SMP select PINCTRL select PM_OPP - select ARCH_HAS_RESET_CONTROLLER select RESET_CONTROLLER select SOC_BUS help diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 79b1390f2016..5c55a7853d1a 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -159,7 +159,6 @@ config DMA_SUN4I config DMA_SUN6I tristate "Allwinner A31 SoCs DMA support" depends on MACH_SUN6I || MACH_SUN8I || COMPILE_TEST - depends on RESET_CONTROLLER select DMA_ENGINE select DMA_VIRTUAL_CHANNELS help diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig index 35215f6867d3..cb21e3821244 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -1,7 +1,6 @@ config DRM_ROCKCHIP tristate "DRM Support for Rockchip" depends on DRM && ROCKCHIP_IOMMU - depends on RESET_CONTROLLER select DRM_KMS_HELPER select DRM_KMS_FB_HELPER select DRM_PANEL diff --git a/drivers/gpu/drm/tegra/Kconfig b/drivers/gpu/drm/tegra/Kconfig index 63ebb154b9b5..bbf5a4b7e0b6 100644 --- a/drivers/gpu/drm/tegra/Kconfig +++ b/drivers/gpu/drm/tegra/Kconfig @@ -3,7 +3,6 @@ config DRM_TEGRA depends on ARCH_TEGRA || (ARM && COMPILE_TEST) depends on COMMON_CLK depends on DRM - depends on RESET_CONTROLLER select DRM_KMS_HELPER select DRM_MIPI_DSI select DRM_PANEL diff --git a/drivers/gpu/ipu-v3/Kconfig b/drivers/gpu/ipu-v3/Kconfig index aefdff95356d..08766c6e7856 100644 --- a/drivers/gpu/ipu-v3/Kconfig +++ b/drivers/gpu/ipu-v3/Kconfig @@ -1,7 +1,6 @@ config IMX_IPUV3_CORE tristate "IPUv3 core support" depends on SOC_IMX5 || SOC_IMX6Q || ARCH_MULTIPLATFORM - depends on RESET_CONTROLLER select GENERIC_IRQ_CHIP help Choose this if you have a i.MX5/6 system and want to use the Image diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 69c46fe13777..569faf75a4bc 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -887,7 +887,6 @@ config I2C_STU300 config I2C_SUN6I_P2WI tristate "Allwinner sun6i internal P2WI controller" - depends on RESET_CONTROLLER depends on MACH_SUN6I || COMPILE_TEST help If you say yes to this option, support will be included for the diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig index 7eb5859dd035..53d92382030f 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -17,7 +17,8 @@ config GENERIC_PHY config PHY_BERLIN_USB tristate "Marvell Berlin USB PHY Driver" - depends on ARCH_BERLIN && RESET_CONTROLLER && HAS_IOMEM && OF + depends on ARCH_BERLIN || COMPILE_TEST + depends on HAS_IOMEM && OF select GENERIC_PHY help Enable this to support the USB PHY on Marvell Berlin SoCs. @@ -218,7 +219,6 @@ config PHY_MT65XX_USB3 config PHY_SUN4I_USB tristate "Allwinner sunxi SoC USB PHY driver" depends on ARCH_SUNXI && HAS_IOMEM && OF - depends on RESET_CONTROLLER depends on EXTCON depends on POWER_SUPPLY select GENERIC_PHY @@ -232,7 +232,6 @@ config PHY_SUN4I_USB config PHY_SUN9I_USB tristate "Allwinner sun9i SoC USB PHY driver" depends on ARCH_SUNXI && HAS_IOMEM && OF - depends on RESET_CONTROLLER select GENERIC_PHY help Enable this to support the transceiver that is part of Allwinner @@ -342,7 +341,6 @@ config PHY_XGENE config PHY_STIH407_USB tristate "STMicroelectronics USB2 picoPHY driver for STiH407 family" - depends on RESET_CONTROLLER depends on ARCH_STI || COMPILE_TEST select GENERIC_PHY help diff --git a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig index e68fd951129a..50bd2e37aaeb 100644 --- a/drivers/pinctrl/sunxi/Kconfig +++ b/drivers/pinctrl/sunxi/Kconfig @@ -27,7 +27,6 @@ config PINCTRL_SUN6I_A31S config PINCTRL_SUN6I_A31_R def_bool MACH_SUN6I - depends on RESET_CONTROLLER select PINCTRL_SUNXI_COMMON config PINCTRL_SUN7I_A20 @@ -48,7 +47,6 @@ config PINCTRL_SUN8I_A83T config PINCTRL_SUN8I_A23_R def_bool MACH_SUN8I - depends on RESET_CONTROLLER select PINCTRL_SUNXI_COMMON config PINCTRL_SUN9I_A80 diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index 0615f50a14cd..12026a1893b5 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -1,15 +1,24 @@ -config ARCH_HAS_RESET_CONTROLLER +config RESET_CONTROLLER bool -menuconfig RESET_CONTROLLER - bool "Reset Controller Support" - default y if ARCH_HAS_RESET_CONTROLLER - help - Generic Reset Controller support. +menu "Reset Controller Support" + depends on ARCH_HAS_RESET_CONTROLLER || COMPILE_TEST - This framework is designed to abstract reset handling of devices - via GPIOs or SoC-internal reset controller modules. +config RESET_SOCFPGA + bool "Altera SOCFPGA reset controller" if COMPILE_TEST + default ARCH_SOCFPGA + select RESET_CONTROLLER - If unsure, say no. +config RESET_BERLIN + bool "Marvell Berlin reset controller" if COMPILE_TEST + default ARCH_BERLIN + select RESET_CONTROLLER + +config RESET_SUNXI + bool "Allwinner reset controller" if COMPILE_TEST + default ARCH_SUNXI + select RESET_CONTROLLER source "drivers/reset/sti/Kconfig" + +endmenu diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile index 85d5904e5480..e05aeffb692f 100644 --- a/drivers/reset/Makefile +++ b/drivers/reset/Makefile @@ -1,8 +1,8 @@ obj-$(CONFIG_RESET_CONTROLLER) += core.o obj-$(CONFIG_ARCH_LPC18XX) += reset-lpc18xx.o -obj-$(CONFIG_ARCH_SOCFPGA) += reset-socfpga.o -obj-$(CONFIG_ARCH_BERLIN) += reset-berlin.o -obj-$(CONFIG_ARCH_SUNXI) += reset-sunxi.o -obj-$(CONFIG_ARCH_STI) += sti/ +obj-$(CONFIG_RESET_SOCFPGA) += reset-socfpga.o +obj-$(CONFIG_RESET_BERLIN) += reset-berlin.o +obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o +obj-$(CONFIG_RESET_STI_SYSCFG) += sti/ obj-$(CONFIG_ARCH_ZYNQ) += reset-zynq.o obj-$(CONFIG_ATH79) += reset-ath79.o diff --git a/drivers/reset/sti/Kconfig b/drivers/reset/sti/Kconfig index f8c15a37fb35..ef9bb8675577 100644 --- a/drivers/reset/sti/Kconfig +++ b/drivers/reset/sti/Kconfig @@ -1,19 +1,19 @@ -if ARCH_STI +if ARCH_STI || COMPILE_TEST -config STI_RESET_SYSCFG +config RESET_STI_SYSCFG bool select RESET_CONTROLLER -config STIH415_RESET - bool - select STI_RESET_SYSCFG +config RESET_STIH415 + bool "STmicroelectronics STiH415 reset controller" if COMPILE_TEST + select RESET_STI_SYSCFG -config STIH416_RESET - bool - select STI_RESET_SYSCFG +config RESET_STIH416 + bool "STmicroelectronics STiH416 reset controller" if COMPILE_TEST + select RESET_STI_SYSCFG -config STIH407_RESET - bool - select STI_RESET_SYSCFG +config RESET_STIH407 + bool "STmicroelectronics STiH407 reset controller" if COMPILE_TEST + select RESET_STI_SYSCFG endif diff --git a/drivers/reset/sti/Makefile b/drivers/reset/sti/Makefile index dc85dfbe56a9..445bdddf45b9 100644 --- a/drivers/reset/sti/Makefile +++ b/drivers/reset/sti/Makefile @@ -1,5 +1,5 @@ -obj-$(CONFIG_STI_RESET_SYSCFG) += reset-syscfg.o +obj-$(CONFIG_RESET_STI_SYSCFG) += reset-syscfg.o -obj-$(CONFIG_STIH415_RESET) += reset-stih415.o -obj-$(CONFIG_STIH416_RESET) += reset-stih416.o -obj-$(CONFIG_STIH407_RESET) += reset-stih407.o +obj-$(CONFIG_RESET_STIH415) += reset-stih415.o +obj-$(CONFIG_RESET_STIH416) += reset-stih416.o +obj-$(CONFIG_RESET_STIH407) += reset-stih407.o diff --git a/drivers/soc/mediatek/Kconfig b/drivers/soc/mediatek/Kconfig index 0a4ea809a61b..8e47d52766b7 100644 --- a/drivers/soc/mediatek/Kconfig +++ b/drivers/soc/mediatek/Kconfig @@ -13,7 +13,6 @@ config MTK_INFRACFG config MTK_PMIC_WRAP tristate "MediaTek PMIC Wrapper Support" depends on ARCH_MEDIATEK - depends on RESET_CONTROLLER select REGMAP help Say yes here to add support for MediaTek PMIC Wrapper found diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index b784450a467e..792a1a637476 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -527,7 +527,6 @@ config SPI_SH_HSPI config SPI_SIRF tristate "CSR SiRFprimaII SPI controller" depends on SIRF_DMA - depends on RESET_CONTROLLER select SPI_BITBANG help SPI driver for CSR SiRFprimaII SoCs @@ -548,7 +547,6 @@ config SPI_SUN4I config SPI_SUN6I tristate "Allwinner A31 SPI controller" depends on ARCH_SUNXI || COMPILE_TEST - depends on RESET_CONTROLLER help This enables using the SPI controller on the Allwinner A31 SoCs. @@ -562,7 +560,7 @@ config SPI_MXS config SPI_TEGRA114 tristate "NVIDIA Tegra114 SPI Controller" depends on (ARCH_TEGRA && TEGRA20_APB_DMA) || COMPILE_TEST - depends on RESET_CONTROLLER && HAS_DMA + depends on HAS_DMA help SPI driver for NVIDIA Tegra114 SPI Controller interface. This controller is different than the older SoCs SPI controller and also register interface @@ -571,7 +569,6 @@ config SPI_TEGRA114 config SPI_TEGRA20_SFLASH tristate "Nvidia Tegra20 Serial flash Controller" depends on ARCH_TEGRA || COMPILE_TEST - depends on RESET_CONTROLLER help SPI driver for Nvidia Tegra20 Serial flash Controller interface. The main usecase of this controller is to use spi flash as boot @@ -580,7 +577,7 @@ config SPI_TEGRA20_SFLASH config SPI_TEGRA20_SLINK tristate "Nvidia Tegra20/Tegra30 SLINK Controller" depends on (ARCH_TEGRA && TEGRA20_APB_DMA) || COMPILE_TEST - depends on RESET_CONTROLLER && HAS_DMA + depends on HAS_DMA help SPI driver for Nvidia Tegra20/Tegra30 SLINK Controller interface. diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 8cc4ac64a91c..6045b17d0e00 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -205,7 +205,6 @@ config SPEAR_THERMAL config ROCKCHIP_THERMAL tristate "Rockchip thermal driver" depends on ARCH_ROCKCHIP || COMPILE_TEST - depends on RESET_CONTROLLER help Rockchip thermal driver provides support for Temperature sensor ADC (TS-ADC) found on Rockchip SoCs. It supports one critical diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig index 22e8ecb6bfbd..327ee39007af 100644 --- a/drivers/usb/phy/Kconfig +++ b/drivers/usb/phy/Kconfig @@ -139,7 +139,6 @@ config USB_ISP1301 config USB_MSM_OTG tristate "Qualcomm on-chip USB OTG controller support" depends on (USB || USB_GADGET) && (ARCH_QCOM || COMPILE_TEST) - depends on RESET_CONTROLLER depends on EXTCON select USB_PHY help diff --git a/include/linux/reset.h b/include/linux/reset.h index 7f65f9cff951..56c389347096 100644 --- a/include/linux/reset.h +++ b/include/linux/reset.h @@ -40,38 +40,49 @@ struct reset_control *of_reset_control_get(struct device_node *node, #else +#include +#include + +static inline int __must_check device_reset(struct device *dev) +{ + return -ENOSYS; +} + static inline int reset_control_reset(struct reset_control *rstc) { - WARN_ON(1); + WARN_ON(rstc != NULL); return 0; } static inline int reset_control_assert(struct reset_control *rstc) { - WARN_ON(1); + WARN_ON(rstc != NULL); return 0; } static inline int reset_control_deassert(struct reset_control *rstc) { - WARN_ON(1); + WARN_ON(rstc != NULL); return 0; } static inline int reset_control_status(struct reset_control *rstc) { - WARN_ON(1); + WARN_ON(rstc != NULL); return 0; } static inline void reset_control_put(struct reset_control *rstc) { - WARN_ON(1); + WARN_ON(rstc != NULL); } static inline int device_reset_optional(struct device *dev) { - return -ENOSYS; + if (of_property_read_bool(dev->of_node, "resets")) + return -ENOSYS; + + return 0; } static inline struct reset_control *__must_check reset_control_get( @@ -88,16 +99,21 @@ static inline struct reset_control *__must_check devm_reset_control_get( return ERR_PTR(-EINVAL); } +/* + * We intentionally return NULL here when no resets are specified + * or when building without DT, which is interpreted as 'success' + * if reset controller support is left out from the kernel. + */ static inline struct reset_control *reset_control_get_optional( struct device *dev, const char *id) { - return ERR_PTR(-ENOSYS); + return ERR_PTR(device_reset_optional(dev)); } static inline struct reset_control *devm_reset_control_get_optional( struct device *dev, const char *id) { - return ERR_PTR(-ENOSYS); + return reset_control_get_optional(dev, id); } static inline struct reset_control *of_reset_control_get( diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig index a6768f832c6f..70f58bd43a56 100644 --- a/sound/soc/tegra/Kconfig +++ b/sound/soc/tegra/Kconfig @@ -2,7 +2,6 @@ config SND_SOC_TEGRA tristate "SoC Audio for the Tegra System-on-Chip" depends on (ARCH_TEGRA && TEGRA20_APB_DMA) || COMPILE_TEST depends on COMMON_CLK - depends on RESET_CONTROLLER select REGMAP_MMIO select SND_SOC_GENERIC_DMAENGINE_PCM help