From patchwork Sun Aug 7 05:53:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 656445 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3s6V8V2175z9srZ for ; Sun, 7 Aug 2016 15:53:29 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=wtH7ET8/; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 95F904BABA; Sun, 7 Aug 2016 07:53:24 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 79UtJ2Tiifcm; Sun, 7 Aug 2016 07:53:24 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3CF674BA5C; Sun, 7 Aug 2016 07:53:24 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1A61E4BA5C for ; Sun, 7 Aug 2016 07:53:21 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sovIPCZNBfGT for ; Sun, 7 Aug 2016 07:53:20 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by theia.denx.de (Postfix) with ESMTPS id B53284BA3B for ; Sun, 7 Aug 2016 07:53:16 +0200 (CEST) Received: by mail-lf0-f67.google.com with SMTP id l89so18662051lfi.2 for ; Sat, 06 Aug 2016 22:53:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=GtoDZLZdB8RsF1P6wWnQsvizwXL6UmDDNEJc/AU690s=; b=wtH7ET8/rZI4QhWCDSyi5Bbgphy+EvJbpXD1jmT5Sc1i/8N9Cn6HSOxq7FMXBiBrHU 6TxS9Ejv1oLo6cOhOImINxFsO9gBa3eJ1k8q22q48LFu1uN6C1bGWVrn9v82PIamMrNw kmt/nhCumrYOPNICigfZAVBsQxp9+7Xm5kFrzjXRCiIATklQgbW8Ooo1qdGdNW+w7H8S sqGH5fcsCcx38IKebCbWyT3quDj262rxV4/SHR0B7SvPMJA7D6TBXoU5PO3f2VlZhswa 7V5sXM4ctT/IXNttd+TR56mldSAv7VaSh0rsxlcz0kzVjocNxeW+4HLy3ITdsv5wT+V9 APQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=GtoDZLZdB8RsF1P6wWnQsvizwXL6UmDDNEJc/AU690s=; b=SJgJAJj6gyfpxdPZaA/NjonPNGQD0n3MvS2EgsBG7UQXLHFsKcHq418d5bRPcUHHuK bToyEKftMxA9xsyWxJjw68AiVp9Nj2pFjE2YcCXg3c/TvIaTdkQ1/zGMnYrhcV567pgS dlJG8tgSfochumo6dXyo8RQdHAJvJKHEYpGQg8KEbTv0DNjMkYpKHSTsTLtEmQ8gX9+B /zqkMF8lO+nlSYXXTGleiW+RxtVc7wUuCdWw4dp35K7IDpIXgPznui2d4IMtbkMRYGv5 FGjoanwm42p78FW5kMHgpZvp8trBhFDK5ki32Xv/cgzgP40VP5VihoeNX0zVdOecFYyv P53w== X-Gm-Message-State: AEkooutKd9yNtuCWvSaw3AlZYZC2+erfl4vbgNSmK7NKnI0Bv7lWqtc3SrdX81yTkVGAsQ== X-Received: by 10.25.34.65 with SMTP id i62mr27884396lfi.7.1470549195468; Sat, 06 Aug 2016 22:53:15 -0700 (PDT) Received: from octofox.metropolis ([5.19.183.212]) by smtp.gmail.com with ESMTPSA id h62sm4566795lji.28.2016.08.06.22.53.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 06 Aug 2016 22:53:14 -0700 (PDT) From: Max Filippov To: u-boot@lists.denx.de Date: Sun, 7 Aug 2016 08:53:00 +0300 Message-Id: <1470549180-1784-1-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.1.4 Subject: [U-Boot] [PATCH v2] drivers/sysreset: group sysreset drivers X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Create drivers/sysreset and move sysreset-uclass and all sysreset drivers there. Signed-off-by: Max Filippov Acked-by: Simon Glass --- Changes v1->v2: - move RK3399 sysreset driver as well; - format patch with -M to make renames explicit. --- arch/arm/mach-rockchip/rk3036/Makefile | 1 - arch/arm/mach-rockchip/rk3288/Makefile | 1 - arch/arm/mach-rockchip/rk3399/Makefile | 1 - arch/arm/mach-snapdragon/Makefile | 1 - drivers/Kconfig | 2 ++ drivers/Makefile | 3 ++- drivers/misc/Kconfig | 9 --------- drivers/misc/Makefile | 2 -- drivers/sysreset/Kconfig | 16 ++++++++++++++++ drivers/sysreset/Makefile | 15 +++++++++++++++ drivers/{misc => sysreset}/sysreset-uclass.c | 0 .../reset_rk3036.c => drivers/sysreset/sysreset_rk3036.c | 0 .../reset_rk3288.c => drivers/sysreset/sysreset_rk3288.c | 0 .../reset_rk3399.c => drivers/sysreset/sysreset_rk3399.c | 0 drivers/{misc => sysreset}/sysreset_sandbox.c | 0 .../reset.c => drivers/sysreset/sysreset_snapdragon.c | 0 16 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 drivers/sysreset/Kconfig create mode 100644 drivers/sysreset/Makefile rename drivers/{misc => sysreset}/sysreset-uclass.c (100%) rename arch/arm/mach-rockchip/rk3036/reset_rk3036.c => drivers/sysreset/sysreset_rk3036.c (100%) rename arch/arm/mach-rockchip/rk3288/reset_rk3288.c => drivers/sysreset/sysreset_rk3288.c (100%) rename arch/arm/mach-rockchip/rk3399/reset_rk3399.c => drivers/sysreset/sysreset_rk3399.c (100%) rename drivers/{misc => sysreset}/sysreset_sandbox.c (100%) rename arch/arm/mach-snapdragon/reset.c => drivers/sysreset/sysreset_snapdragon.c (100%) diff --git a/arch/arm/mach-rockchip/rk3036/Makefile b/arch/arm/mach-rockchip/rk3036/Makefile index 6095777..916a7a4 100644 --- a/arch/arm/mach-rockchip/rk3036/Makefile +++ b/arch/arm/mach-rockchip/rk3036/Makefile @@ -5,7 +5,6 @@ # ifndef CONFIG_SPL_BUILD -obj-y += reset_rk3036.o obj-y += syscon_rk3036.o endif diff --git a/arch/arm/mach-rockchip/rk3288/Makefile b/arch/arm/mach-rockchip/rk3288/Makefile index 82b00a1..5ec3f0d 100644 --- a/arch/arm/mach-rockchip/rk3288/Makefile +++ b/arch/arm/mach-rockchip/rk3288/Makefile @@ -5,6 +5,5 @@ # obj-y += clk_rk3288.o -obj-y += reset_rk3288.o obj-y += sdram_rk3288.o obj-y += syscon_rk3288.o diff --git a/arch/arm/mach-rockchip/rk3399/Makefile b/arch/arm/mach-rockchip/rk3399/Makefile index 3ca2028..607f9c9 100644 --- a/arch/arm/mach-rockchip/rk3399/Makefile +++ b/arch/arm/mach-rockchip/rk3399/Makefile @@ -5,5 +5,4 @@ # obj-y += rk3399.o -obj-y += reset_rk3399.o obj-y += syscon_rk3399.o diff --git a/arch/arm/mach-snapdragon/Makefile b/arch/arm/mach-snapdragon/Makefile index 4735844..d82a04d 100644 --- a/arch/arm/mach-snapdragon/Makefile +++ b/arch/arm/mach-snapdragon/Makefile @@ -6,4 +6,3 @@ obj-y += clock-apq8016.o obj-y += sysmap-apq8016.o -obj-y += reset.o diff --git a/drivers/Kconfig b/drivers/Kconfig index f6003a0..4f84469 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -68,6 +68,8 @@ source "drivers/spi/Kconfig" source "drivers/spmi/Kconfig" +source "drivers/sysreset/Kconfig" + source "drivers/thermal/Kconfig" source "drivers/timer/Kconfig" diff --git a/drivers/Makefile b/drivers/Makefile index ad5cbae..7861d34 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -22,7 +22,7 @@ obj-$(CONFIG_SPL_SERIAL_SUPPORT) += serial/ obj-$(CONFIG_SPL_SPI_SUPPORT) += spi/ obj-$(CONFIG_SPL_POWER_SUPPORT) += power/ power/pmic/ obj-$(CONFIG_SPL_POWER_SUPPORT) += power/regulator/ -obj-$(CONFIG_SPL_DRIVERS_MISC_SUPPORT) += misc/ +obj-$(CONFIG_SPL_DRIVERS_MISC_SUPPORT) += misc/ sysreset/ obj-$(CONFIG_SPL_MTD_SUPPORT) += mtd/ obj-$(CONFIG_SPL_NAND_SUPPORT) += mtd/nand/ obj-$(CONFIG_SPL_ONENAND_SUPPORT) += mtd/onenand/ @@ -59,6 +59,7 @@ obj-$(CONFIG_X86) += pch/ obj-y += rtc/ obj-y += sound/ obj-y += spmi/ +obj-y += sysreset/ obj-y += timer/ obj-y += tpm/ obj-y += twserial/ diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index b84e351..80c1558 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -121,15 +121,6 @@ config PCA9551_I2C_ADDR help The I2C address of the PCA9551 LED controller. -config SYSRESET - bool "Enable support for system reset drivers" - depends on DM - help - Enable system reset drivers which can be used to reset the CPU or - board. Each driver can provide a reset method which will be called - to effect a reset. The uclass will try all available drivers when - reset_walk() is called. - config WINBOND_W83627 bool "Enable Winbond Super I/O driver" help diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index fff6f0c..af541c6 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -27,7 +27,6 @@ obj-$(CONFIG_MXS_OCOTP) += mxs_ocotp.o obj-$(CONFIG_NS87308) += ns87308.o obj-$(CONFIG_PDSP188x) += pdsp188x.o obj-$(CONFIG_$(SPL_)PWRSEQ) += pwrseq-uclass.o -obj-$(CONFIG_SANDBOX) += sysreset_sandbox.o ifdef CONFIG_DM_I2C ifndef CONFIG_SPL_BUILD obj-$(CONFIG_SANDBOX) += i2c_eeprom_emul.o @@ -47,7 +46,6 @@ obj-$(CONFIG_TWL4030_LED) += twl4030_led.o obj-$(CONFIG_FSL_IFC) += fsl_ifc.o obj-$(CONFIG_FSL_SEC_MON) += fsl_sec_mon.o obj-$(CONFIG_PCA9551_LED) += pca9551_led.o -obj-$(CONFIG_SYSRESET) += sysreset-uclass.o obj-$(CONFIG_FSL_DEVICE_DISABLE) += fsl_devdis.o obj-$(CONFIG_WINBOND_W83627) += winbond_w83627.o obj-$(CONFIG_QFW) += qfw.o diff --git a/drivers/sysreset/Kconfig b/drivers/sysreset/Kconfig new file mode 100644 index 0000000..05a37b9 --- /dev/null +++ b/drivers/sysreset/Kconfig @@ -0,0 +1,16 @@ +# +# System reset devices +# + +menu "System reset device drivers" + +config SYSRESET + bool "Enable support for system reset drivers" + depends on DM + help + Enable system reset drivers which can be used to reset the CPU or + board. Each driver can provide a reset method which will be called + to effect a reset. The uclass will try all available drivers when + reset_walk() is called. + +endmenu diff --git a/drivers/sysreset/Makefile b/drivers/sysreset/Makefile new file mode 100644 index 0000000..7db1b69 --- /dev/null +++ b/drivers/sysreset/Makefile @@ -0,0 +1,15 @@ +# +# (C) Copyright 2016 Cadence Design Systems Inc. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-$(CONFIG_SYSRESET) += sysreset-uclass.o + +ifndef CONFIG_SPL_BUILD +obj-$(CONFIG_ROCKCHIP_RK3036) += sysreset_rk3036.o +endif +obj-$(CONFIG_ROCKCHIP_RK3288) += sysreset_rk3288.o +obj-$(CONFIG_ROCKCHIP_RK3399) += sysreset_rk3399.o +obj-$(CONFIG_SANDBOX) += sysreset_sandbox.o +obj-$(CONFIG_ARCH_SNAPDRAGON) += sysreset_snapdragon.o diff --git a/drivers/misc/sysreset-uclass.c b/drivers/sysreset/sysreset-uclass.c similarity index 100% rename from drivers/misc/sysreset-uclass.c rename to drivers/sysreset/sysreset-uclass.c diff --git a/arch/arm/mach-rockchip/rk3036/reset_rk3036.c b/drivers/sysreset/sysreset_rk3036.c similarity index 100% rename from arch/arm/mach-rockchip/rk3036/reset_rk3036.c rename to drivers/sysreset/sysreset_rk3036.c diff --git a/arch/arm/mach-rockchip/rk3288/reset_rk3288.c b/drivers/sysreset/sysreset_rk3288.c similarity index 100% rename from arch/arm/mach-rockchip/rk3288/reset_rk3288.c rename to drivers/sysreset/sysreset_rk3288.c diff --git a/arch/arm/mach-rockchip/rk3399/reset_rk3399.c b/drivers/sysreset/sysreset_rk3399.c similarity index 100% rename from arch/arm/mach-rockchip/rk3399/reset_rk3399.c rename to drivers/sysreset/sysreset_rk3399.c diff --git a/drivers/misc/sysreset_sandbox.c b/drivers/sysreset/sysreset_sandbox.c similarity index 100% rename from drivers/misc/sysreset_sandbox.c rename to drivers/sysreset/sysreset_sandbox.c diff --git a/arch/arm/mach-snapdragon/reset.c b/drivers/sysreset/sysreset_snapdragon.c similarity index 100% rename from arch/arm/mach-snapdragon/reset.c rename to drivers/sysreset/sysreset_snapdragon.c