From patchwork Wed Aug 10 12:40:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 73635 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp382647qga; Wed, 10 Aug 2016 05:43:22 -0700 (PDT) X-Received: by 10.98.192.144 with SMTP id g16mr6910916pfk.55.1470833002657; Wed, 10 Aug 2016 05:43:22 -0700 (PDT) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id n89si48460062pfa.261.2016.08.10.05.43.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Aug 2016 05:43:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bXSpx-0005fe-HL; Wed, 10 Aug 2016 12:42:21 +0000 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bXSp0-0005GS-K4 for linux-arm-kernel@lists.infradead.org; Wed, 10 Aug 2016 12:41:24 +0000 Received: by mail-wm0-x22e.google.com with SMTP id o80so101111450wme.1 for ; Wed, 10 Aug 2016 05:41:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TViQ7/DxcHGWHdHeqOxg1Cz5C3ISF0hdB94W9szwExI=; b=AdVfburxjcUpN04XFtNKq5r7K0cLwLQYq0K30GYtR7CD0zdDJWt5lo5Qp2n7O9kU5S UlZH5N+8570tvfVg1PIEr/J7BYXFBqG8dmJbiyS1cjdj8WubOX2boQl8couD6HWHBUHK iX4VCIsiIIB5F4cUr/naKN+3zss79iG/cdvZI= 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:in-reply-to :references; bh=TViQ7/DxcHGWHdHeqOxg1Cz5C3ISF0hdB94W9szwExI=; b=N10TK1TPOw/EA1i16teOgPM/f7hnwbUuvGXjlYGInu4Fy2w1K3i6qIy/H0jSdxkDkx dGQuFnX1RmzWMwbj+riaibZtVDNygzFzm9Vzb+R9fDTJ/PbFeNnBSwqaz6FqaBmLaiYi xP98NSjwxUKV/7DQszOAFA5/50ACNJXhYPfQ1hvKin3a29F1MyCBB840mLSf6+LnHlhu JvJI3l0ondpS9aOipC4WdhXSNTsnUKxhwsOMpseiWamBfR5J32dZv/8N9136S280HfXN aidzgT5xsLe7VX2URhMRo8jeILRP1kbrhdkJJjSEVZCsAEH14K1WugeQWcgqJRMNFsAn +S+A== X-Gm-Message-State: AEkooutkkLXzM59HP8M28U61fx3PrY3xaGrwhR+syv3TYAUOEYS3p+eeX6OiSxKH9HTTE+Hx X-Received: by 10.25.21.32 with SMTP id l32mr678098lfi.158.1470832860847; Wed, 10 Aug 2016 05:41:00 -0700 (PDT) Received: from linuslaptop.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id g88sm7548309ljg.26.2016.08.10.05.40.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Aug 2016 05:41:00 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Arnd Bergmann Subject: [PATCH 5/5] ARM: realview: imply device tree boot Date: Wed, 10 Aug 2016 14:40:30 +0200 Message-Id: <1470832830-10274-6-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1470832830-10274-1-git-send-email-linus.walleij@linaro.org> References: <1470832830-10274-1-git-send-email-linus.walleij@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160810_054122_857426_980BABAC X-CRM114-Status: GOOD ( 14.28 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:22e listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Russell King , Pawel Moll , Marc Zyngier , Linus Walleij , Will Deacon , Thomas Gleixner , Brian Norris MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org This reduces the Kconfig for the RealView by assuming we are always booting from the device tree, and removing all the uses of CONFIG_REALVIEW_DT and replacing with CONFIG_ARCH_REALVIEW. Cc: Brian Norris Cc: Marc Zyngier Cc: Thomas Gleixner Signed-off-by: Linus Walleij --- MTD, irqchip folks: please ACK this so we can merge the entire cleanup series through ARM SoC. --- arch/arm/mach-realview/Kconfig | 23 ++++++++--------------- arch/arm/mach-realview/Makefile | 2 +- drivers/irqchip/Makefile | 2 +- drivers/mtd/maps/Kconfig | 2 +- 4 files changed, 11 insertions(+), 18 deletions(-) -- 2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig index 5f194c42bbdf..f25940fcbe61 100644 --- a/arch/arm/mach-realview/Kconfig +++ b/arch/arm/mach-realview/Kconfig @@ -2,22 +2,12 @@ menuconfig ARCH_REALVIEW bool "ARM Ltd. RealView family" depends on ARCH_MULTI_V5 || ARCH_MULTI_V6 || ARCH_MULTI_V7 select ARM_AMBA - select ARM_TIMER_SP804 - select COMMON_CLK_VERSATILE - select GPIO_PL061 if GPIOLIB - select ICST - select PLAT_VERSATILE - select PLAT_VERSATILE_SCHED_CLOCK - help - This enables support for ARM Ltd RealView boards. - -if ARCH_REALVIEW - -config REALVIEW_DT - bool "Support RealView(R) Device Tree based boot" select ARM_GIC select CLK_SP810 + select ARM_TIMER_SP804 + select COMMON_CLK_VERSATILE select CPU_ARM926T if ARCH_MULTI_V5 + select GPIO_PL061 if GPIOLIB select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select HAVE_PATA_PLATFORM @@ -25,6 +15,8 @@ config REALVIEW_DT select HAVE_TCM select ICST select MFD_SYSCON + select PLAT_VERSATILE + select PLAT_VERSATILE_SCHED_CLOCK select POWER_RESET select POWER_RESET_VERSATILE select POWER_SUPPLY @@ -32,8 +24,9 @@ config REALVIEW_DT select USE_OF select ZONE_DMA help - Include support for booting the ARM(R) RealView(R) evaluation - boards using a device tree machine description. + This enables support for ARM Ltd RealView boards. + +if ARCH_REALVIEW config REALVIEW_HIGH_PHYS_OFFSET bool "High physical base address for the RealView platform" diff --git a/arch/arm/mach-realview/Makefile b/arch/arm/mach-realview/Makefile index 97dab53daaf1..6df86c29bbc3 100644 --- a/arch/arm/mach-realview/Makefile +++ b/arch/arm/mach-realview/Makefile @@ -4,6 +4,6 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ -I$(srctree)/arch/arm/plat-versatile/include -obj-$(CONFIG_REALVIEW_DT) += realview-dt.o +obj-y += realview-dt.o obj-$(CONFIG_SMP) += platsmp-dt.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 4c203b6b8163..92fa06e16a17 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -25,7 +25,7 @@ obj-$(CONFIG_ARCH_SUNXI) += irq-sunxi-nmi.o obj-$(CONFIG_ARCH_SPEAR3XX) += spear-shirq.o obj-$(CONFIG_ARM_GIC) += irq-gic.o irq-gic-common.o obj-$(CONFIG_ARM_GIC_PM) += irq-gic-pm.o -obj-$(CONFIG_REALVIEW_DT) += irq-gic-realview.o +obj-$(CONFIG_ARCH_REALVIEW) += irq-gic-realview.o obj-$(CONFIG_ARM_GIC_V2M) += irq-gic-v2m.o obj-$(CONFIG_ARM_GIC_V3) += irq-gic-v3.o irq-gic-common.o obj-$(CONFIG_ARM_GIC_V3_ITS) += irq-gic-v3-its.o irq-gic-v3-its-pci-msi.o irq-gic-v3-its-platform-msi.o diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 392f9eff5fb7..5bcc896a48c3 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig @@ -78,7 +78,7 @@ config MTD_PHYSMAP_OF_VERSATILE bool "Support ARM Versatile physmap OF" depends on MTD_PHYSMAP_OF depends on MFD_SYSCON - default y if (ARCH_INTEGRATOR || ARCH_VERSATILE || REALVIEW_DT) + default y if (ARCH_INTEGRATOR || ARCH_VERSATILE || ARCH_REALVIEW) help This provides some extra DT physmap parsing for the ARM Versatile platforms, basically to add a VPP (write protection) callback so