From patchwork Tue Feb 26 12:13:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10830093 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 542911575 for ; Tue, 26 Feb 2019 12:15:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D13B2A9D4 for ; Tue, 26 Feb 2019 12:15:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 311672B68B; Tue, 26 Feb 2019 12:15:20 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 666D12A9D4 for ; Tue, 26 Feb 2019 12:15:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=kExomc1Hu2X6zUm8fyD3FYw5sSzTvRj/VgfiGDh+UaI=; b=Pxd215zFWAjhGq 0JrTrRjG7ELVhOuDCt5vZG+QL1PwlCGYB+WHTw76i5c86jDSuZ8SugdjKqwT2dItXTRiIu8+ATzFt A0b0QLXT1u1CAeH8VNVp41aUSDZ80YX5qb0AKa28hhUNCUFK5zcmH4Ya8VXANpQEJcwXfn4qtuahh Y4yqIBXnoRuo8/+WF+sZeTkAkMRwqRpdHtLhKwaic25o2ZM+yztS3Hr4ttOlap2MqbqzbAtBdDhHE fwB6mM5DC2egOjwj/vkz/zRW4JhbiFXkG+udcrTI7n7f8SXCy6vCJGpx4OoC7C5/pnNncqpcT4EaK 7GQgyImjXGbbl6/PYqsg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gybdl-00028l-MQ; Tue, 26 Feb 2019 12:15:17 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gybca-00080W-OH for linux-arm-kernel@lists.infradead.org; Tue, 26 Feb 2019 12:14:13 +0000 Received: by mail-wr1-x442.google.com with SMTP id l5so13691799wrw.6 for ; Tue, 26 Feb 2019 04:14:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oxxbbUhLTHAkz6KlJtPO9LrzNvzNzNTQ2I9RnjtFaas=; b=JTMkLaFyqQpv572tgG2A0Doj8Kat6GREO6Nkbd2cze+7fanMv+e+QfzoKyHgbnN1g2 q52KL4TbdeV3/wG/8rvJhZrYbHlcVQrfZIf5rStkZmtiK6dWG4EqyCDuDQ1lDzzXNXrK ZHwpJhma+3x5xcISq5udQxs4l8UPzS5P3+OJ1RcAib6+4IsXHj1BkgWNljk67x9X2NxR 7kZ1To8FvYTaVRsEyR0btcHz15YJWj/cDvkwGCuh2m2VlNOX5gLcqI8kcOihwZayoCaH pGpVd9a0jHJ6pe0EhtsKKzqVo64LdZjSkYtFPvTYQxX8q6yQSY9EOEQ+ymdVOt820c0s cYYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oxxbbUhLTHAkz6KlJtPO9LrzNvzNzNTQ2I9RnjtFaas=; b=OMdEpiw3HHTS8JNW8XBti1LWPBNAuRlYRA57oQxN9wR2AdyBIuXRbtr4wKPy2OPAkb YRS50regp3e3FkIUCtlHXgKjicOWmzK03GmxM7WOQia/S3ofIJz1c0TiS16yhW50C8xH ruq+lA1Mu/XCPQ/Z0L+HoYUkygXpv74Sm2Lm6mo/hy2oF8P/Akqu9i1ETKNcUl7vtMV0 cLGwFirxQzSz9rgCYhOy9RFfDwimAbsD23mZ/D/V5RTYMtv7ZTs1aE5Qj1Gnny5T99ps ZKymTuSkorTxcMpbArj2l2cgOOuVgB5GL+GVJVIE65HUmVbvcs4OwHlxfmw/o6B9Gs8t UMIg== X-Gm-Message-State: AHQUAuYQ1o6bXnbweAh/kWea77P6vwv5DY48QM/Rjt+dqtt2xhuafV0e ZvHbHgXXiuQ91RGiU0s4Xmpm7KbZwfY= X-Google-Smtp-Source: AHgI3IaGK0o6YIrCkS+Jo/OW+XzpNsHS81Fb7usrHztlSSBb0WGvIVV7qvt2vkuJQpVVQSb1oCiyLg== X-Received: by 2002:adf:b648:: with SMTP id i8mr15973249wre.319.1551183242948; Tue, 26 Feb 2019 04:14:02 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id p1sm11401877wrx.50.2019.02.26.04.14.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Feb 2019 04:14:02 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Arnd Bergmann , David Lechner Subject: [PATCH 1/2] ARM: davinci: support multiplatform build for ARM v5 Date: Tue, 26 Feb 2019 13:13:52 +0100 Message-Id: <20190226121353.19413-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190226121353.19413-1-brgl@bgdev.pl> References: <20190226121353.19413-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190226_041404_889096_72CE1E5D X-CRM114-Status: GOOD ( 14.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Add modifications necessary to make davinci part of the ARM v5 multiplatform build. Move the arch-specific configuration out of arch/arm/Kconfig and into mach-davinci/Kconfig. Remove the sub-menu for DaVinci implementations (they'll be visible directly under the system type. Select all necessary options not already selected by ARCH_MULTI_V5. Update davinci_all_defconfig. Explicitly include the mach-specific headers in mach-davinci/Makefile. Signed-off-by: Bartosz Golaszewski --- arch/arm/Kconfig | 21 --------------------- arch/arm/configs/davinci_all_defconfig | 5 +++++ arch/arm/mach-davinci/Kconfig | 16 ++++++++++++---- arch/arm/mach-davinci/Makefile | 2 ++ 4 files changed, 19 insertions(+), 25 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index da414692bd0a..18f0187c8da0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -581,27 +581,6 @@ config ARCH_S3C24XX (), the IPAQ 1940 or the Samsung SMDK2410 development board (and derivatives). -config ARCH_DAVINCI - bool "TI DaVinci" - select ARCH_HAS_HOLES_MEMORYMODEL - select COMMON_CLK - select CPU_ARM926T - select DAVINCI_TIMER - select GENERIC_ALLOCATOR - select GENERIC_CLOCKEVENTS - select GENERIC_IRQ_CHIP - select GENERIC_IRQ_MULTI_HANDLER - select GPIOLIB - select HAVE_IDE - select PM_GENERIC_DOMAINS if PM - select PM_GENERIC_DOMAINS_OF if PM && OF - select RESET_CONTROLLER - select SPARSE_IRQ - select USE_OF - select ZONE_DMA - help - Support for TI's DaVinci platform. - config ARCH_OMAP1 bool "TI OMAP1" depends on MMU diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index 207962a656a2..bbf285dd63e4 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig @@ -17,6 +17,9 @@ CONFIG_MODVERSIONS=y CONFIG_PARTITION_ADVANCED=y # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set +CONFIG_ARCH_MULTIPLATFORM=y +CONFIG_ARCH_MULTI_V7=n +CONFIG_ARCH_MULTI_V5=y CONFIG_ARCH_DAVINCI=y CONFIG_ARCH_DAVINCI_DM644x=y CONFIG_ARCH_DAVINCI_DM355=y @@ -128,9 +131,11 @@ CONFIG_SPI=y CONFIG_SPI_DAVINCI=m CONFIG_PINCTRL_DA850_PUPD=m CONFIG_PINCTRL_SINGLE=y +CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y +CONFIG_RESET_CONTROLLER=y CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO=y CONFIG_SYSCON_REBOOT_MODE=m diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 5a59cebc7d0a..ba6d55590b9d 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -1,11 +1,21 @@ # SPDX-License-Identifier: GPL-2.0 + +menuconfig ARCH_DAVINCI + bool "TI DaVinci" + depends on ARCH_MULTI_V5 + select DAVINCI_TIMER + select ZONE_DMA + select ARCH_HAS_HOLES_MEMORYMODEL + select PM_GENERIC_DOMAINS if PM + select PM_GENERIC_DOMAINS_OF if PM && OF + select HAVE_IDE + select PINCTRL_SINGLE + if ARCH_DAVINCI config ARCH_DAVINCI_DMx bool -menu "TI DaVinci Implementations" - comment "DaVinci Core Type" config ARCH_DAVINCI_DM644x @@ -225,6 +235,4 @@ config DAVINCI_MUX_WARNINGS to change the pin multiplexing setup. When there are no warnings printed, it's safe to deselect DAVINCI_MUX for your product. -endmenu - endif diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile index d9af8c0c0b87..58838a9de651 100644 --- a/arch/arm/mach-davinci/Makefile +++ b/arch/arm/mach-davinci/Makefile @@ -4,6 +4,8 @@ # # +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include + # Common objects obj-y := serial.o usb.o common.o sram.o