From patchwork Mon Oct 17 08:43:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 9378753 X-Patchwork-Delegate: neil.armstrong@linaro.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 81E486086B for ; Mon, 17 Oct 2016 08:43:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7527C29025 for ; Mon, 17 Oct 2016 08:43:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 69DDE29028; Mon, 17 Oct 2016 08:43:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mx1.tuxfamily.net (mail.tuxfamily.net [212.85.158.8]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C4AB729027 for ; Mon, 17 Oct 2016 08:43:20 +0000 (UTC) Received: from listengine (helo=tuxfamily.org) by mx1.tuxfamily.net with local-bsmtp (Exim 4.84_2) (envelope-from ) id 1bw3Vv-00011Y-3M for patchwork-linux-oxnas@patchwork.kernel.org; Mon, 17 Oct 2016 10:43:19 +0200 Received: from mail-qk0-x232.google.com ([2607:f8b0:400d:c09::232]) by mx1.tuxfamily.net with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1bw3Vr-00010a-0t for linux-oxnas@lists.tuxfamily.org; Mon, 17 Oct 2016 10:43:15 +0200 Received: by mail-qk0-x232.google.com with SMTP id f128so212440163qkb.1 for ; Mon, 17 Oct 2016 01:43:14 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=v50fwVYepJyMrUDFUZxY1e9GhEd9cjQJ0D8vAtiVwcA=; b=FprrSE/NpPvFMWEdfExXmqQu3zxU3U/saA2ttW5JFrDbtjwtRU8s++h/AhJgvABiP1 hvkmgC3Pdw4NfMA/xPbKZtdUiK6pHTjGbeIJX6ucBwpAsS+c+UNzJW5Kl3XZ3ixVldCI 5remli1Ci9R321n0PCDY/+yS3alco94rBGu9Az6P3LidpT/bivns/oYMTTVbE8WaretU V1sHB9iq0vhNDFSsaLve5606gGJwGSN9Z3FRiI4dplVk1ZyEyHa5HFNXynMJAi8YIe/l d4WbEt7XSTp1DY54K9tOJGSIUipZqaWgQV5aGYF5VdfAhMwGxOdxu4ErIdwuB/zCTS4w B1lw== 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=v50fwVYepJyMrUDFUZxY1e9GhEd9cjQJ0D8vAtiVwcA=; b=TqvW8dwnGRbdJVYlmbMF0QMRiRK++aVOC1xYaAFRl6Nz1wSG7znbpn2girtaYfE2zI vSpmzjAKWS7HAy1i/SHluFtQrR4I0VzO7P4KzafFTbIl914tS+ZSTuB3MInzwZwH0px0 iDEWXgR4Mr6NSYAA5jtHMSM5RO+w5q98FIijMl2Po8mdj0l4qOoxo56bbRiuSUXLJx7L 98vkFvPrEweqhJAuo7zUecV5GbQF4yaTc/t+7b1bUpkXDcMhX15ZFmg6Da/WFLB7KNsj oskt0GQpF6mBc8lPLFTWy3pn4KWHI0S+yxlJ3BKTTB3eHINZuH0GpRq3A9L4kDyev4Ex a+Mg== X-GM-Message-State: AA6/9Rm73uKWdYI4ePbHRWzageRjdKMuA/pLesu2N7urPob2c9AvDCNa7sGgBN0KquEu4Sqd X-Received: by 10.195.17.165 with SMTP id gf5mr10378824wjd.114.1476693793537; Mon, 17 Oct 2016 01:43:13 -0700 (PDT) Received: from build.net (build.baylibre.com. [37.187.146.144]) by smtp.gmail.com with ESMTPSA id y2sm51136827wjx.20.2016.10.17.01.43.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Oct 2016 01:43:13 -0700 (PDT) From: Neil Armstrong To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-oxnas@lists.tuxfamily.org CC: Neil Armstrong Subject: [linux-oxnas] [PATCH 2/2] ARM: oxnas: Add OX820 config and makefile entry Date: Mon, 17 Oct 2016 10:43:03 +0200 Message-ID: <20161017084303.20078-3-narmstrong@baylibre.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161017084303.20078-1-narmstrong@baylibre.com> References: <20161017084303.20078-1-narmstrong@baylibre.com> List-Unsubscribe: List-Subscribe: List-Help: List-Software: Listengine, VHFFS 4.7-dev-4c39578052 List-ID: List-Post: List-Archive: Precedence: list Reply-To: linux-oxnas@lists.tuxfamily.org X-Virus-Scanned: ClamAV using ClamSMTP Refactor the oxnas Kconfig entries among the OX810SE and OX820 configs, and add the files to support the OX820 SMP feature. Signed-off-by: Neil Armstrong --- arch/arm/Makefile | 1 + arch/arm/mach-oxnas/Kconfig | 30 +++++++++++++++++++++--------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 6be9ee1..68312a9 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -191,6 +191,7 @@ machine-$(CONFIG_ARCH_MXS) += mxs machine-$(CONFIG_ARCH_NETX) += netx machine-$(CONFIG_ARCH_NOMADIK) += nomadik machine-$(CONFIG_ARCH_NSPIRE) += nspire +machine-$(CONFIG_ARCH_OXNAS) += oxnas machine-$(CONFIG_ARCH_OMAP1) += omap1 machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2 machine-$(CONFIG_ARCH_ORION5X) += orion5x diff --git a/arch/arm/mach-oxnas/Kconfig b/arch/arm/mach-oxnas/Kconfig index 29100be..8fa4557 100644 --- a/arch/arm/mach-oxnas/Kconfig +++ b/arch/arm/mach-oxnas/Kconfig @@ -1,9 +1,16 @@ menuconfig ARCH_OXNAS bool "Oxford Semiconductor OXNAS Family SoCs" select ARCH_HAS_RESET_CONTROLLER + select COMMON_CLK_OXNAS select GPIOLIB + select MFD_SYSCON + select OXNAS_RPS_TIMER + select PINCTRL_OXNAS + select RESET_CONTROLLER + select RESET_OXNAS + select VERSATILE_FPGA_IRQ select PINCTRL - depends on ARCH_MULTI_V5 + depends on ARCH_MULTI_V5 || ARCH_MULTI_V6 help Support for OxNas SoC family developed by Oxford Semiconductor. @@ -11,16 +18,21 @@ if ARCH_OXNAS config MACH_OX810SE bool "Support OX810SE Based Products" - select ARCH_HAS_RESET_CONTROLLER - select COMMON_CLK_OXNAS + depends on ARCH_MULTI_V5 select CPU_ARM926T - select MFD_SYSCON - select OXNAS_RPS_TIMER - select PINCTRL_OXNAS - select RESET_CONTROLLER - select RESET_OXNAS - select VERSATILE_FPGA_IRQ help Include Support for the Oxford Semiconductor OX810SE SoC Based Products. +config MACH_OX820 + bool "Support OX820 Based Products" + depends on ARCH_MULTI_V6 + select ARM_GIC + select DMA_CACHE_RWFO if SMP + select CPU_V6K + select HAVE_SMP + select HAVE_ARM_SCU if SMP + select HAVE_ARM_TWD if SMP + help + Include Support for the Oxford Semiconductor OX820 SoC Based Products. + endif