From patchwork Thu Feb 25 13:15:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 62885 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp155369lbc; Thu, 25 Feb 2016 05:17:15 -0800 (PST) X-Received: by 10.98.89.215 with SMTP id k84mr63106863pfj.66.1456406235155; Thu, 25 Feb 2016 05:17:15 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id s80si12540290pfi.55.2016.02.25.05.17.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Feb 2016 05:17:15 -0800 (PST) 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; 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; dkim=neutral (body hash did not verify) header.i=@linaro.org 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 1aYvmG-0003TE-JC; Thu, 25 Feb 2016 13:16:20 +0000 Received: from mail-lb0-x234.google.com ([2a00:1450:4010:c04::234]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aYvlr-00037q-0m for linux-arm-kernel@lists.infradead.org; Thu, 25 Feb 2016 13:15:59 +0000 Received: by mail-lb0-x234.google.com with SMTP id bc4so28596731lbc.2 for ; Thu, 25 Feb 2016 05:15:34 -0800 (PST) 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=bRIybMVtWM1Dc8dR7Iq2SbdVFoPUcWLpY65mk5Eyp0M=; b=L94ZOWg1xKu3DzdFCSXQ7CgrnI+somukJP+yBZ7Rs2lEE0IWcWe7tlZc3u2GK1lBjO 1yoax0JYyhCfFmAmdulSVb/1K2vR685+2ApI+125Up3Gzv4kYlxVMddkKpjmXLvV9IUO 77LYG/u5LzuRb4XsMyxcHomQnMBr6eq4I8Dqc= 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=bRIybMVtWM1Dc8dR7Iq2SbdVFoPUcWLpY65mk5Eyp0M=; b=ksHlogaY/Oz9m4crEnw4GDpqP1uFVsBPeL+AineAuCpDXYOJGf7P7dXIFM7i5/5i39 jUNFBHS2x7wwL3EfCK2N67k+KQYxfh4GGHBAab1uVp7uCPS3khmwtRtjee8hSYl6QiCC flJ7l/g8DB6bz0oiiTqT8c4Fg2oQWAWAd1Y1HNwGDLYv/5u+KeNcIvEsTxtsLaWGcOp4 7NsQzeAAHHJ0bUyBByDf/nXW7JRzx59dIxkJoMcoek8E+sDmXSbZrwTaGsa6b1ETyZBK d+RUDZLMtAxWYOZUwQadpctdEhccSe8m28kT4LkIJZqzdft8LJTEQkS3Bp01wt85WVs9 apMg== X-Gm-Message-State: AG10YOTPvAw1t3N3Aws9xVhiyzADrlxd+dUTdpyAU5QrF5cqibSnYInf4VW+8phw9iUEde9M X-Received: by 10.112.184.133 with SMTP id eu5mr13066441lbc.99.1456406133213; Thu, 25 Feb 2016 05:15:33 -0800 (PST) Received: from localhost.localdomain ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id l129sm1145801lfl.18.2016.02.25.05.15.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Feb 2016 05:15:32 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Arnd Bergmann Subject: [PATCH 3/4] ARM: realview: imply Device Tree config Date: Thu, 25 Feb 2016 14:15:10 +0100 Message-Id: <1456406111-18579-4-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1456406111-18579-1-git-send-email-linus.walleij@linaro.org> References: <1456406111-18579-1-git-send-email-linus.walleij@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160225_051555_467250_D88D78D1 X-CRM114-Status: GOOD ( 14.42 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -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 MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org This cuts the RealView DT Kconfig to be the same as CONFIG_ARCH_REALVIEW and rids one Kconfig option. Signed-off-by: Linus Walleij --- arch/arm/mach-realview/Kconfig | 23 ++++++++--------------- arch/arm/mach-realview/Makefile | 2 +- 2 files changed, 9 insertions(+), 16 deletions(-) -- 2.4.3 _______________________________________________ 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 cfb4c573638f..1706adc5513a 100644 --- a/arch/arm/mach-realview/Kconfig +++ b/arch/arm/mach-realview/Kconfig @@ -1,22 +1,12 @@ menuconfig ARCH_REALVIEW bool "ARM Ltd. RealView family" if 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 ARM_TIMER_SP804 select CLK_SP810 + 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 @@ -24,6 +14,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..75826b2be82e 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-$(CONFIG_ARCH_REALVIEW) += realview-dt.o obj-$(CONFIG_SMP) += platsmp-dt.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o