From patchwork Tue Feb 26 12:06:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10830099 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 B4C941669 for ; Tue, 26 Feb 2019 12:24:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FFDD2B3C5 for ; Tue, 26 Feb 2019 12:24:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9390B2B921; Tue, 26 Feb 2019 12:24:48 +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 3A1A22B3C5 for ; Tue, 26 Feb 2019 12:24:48 +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=YxJ+pj8JOgvoO7dSezAk22x6RChVVBKWPd37NUc9RYk=; b=GaMN2D8iEs+rtk wPvSggv/Sf5LCzYtmatrEmSCs9r8sRIMCV+Ds8H+i43SJQtA5/yp/kCD6iXSkvynaRQyuZO5lQthJ hL3S965YLCUN9kCwf2AD0829wGcvAVPk4TvDmunJ/VqV5t0wD7bfj88u7YqlLcLSyRYNI6Kjcc8U0 yBfQA/yTOp2A3JJCmbvJVV497VVfqk/kUtwBH48jCFxajtUCSdIHaXmkOPEi/d+6rZLmiU+DgZ65D pDA98cTX9oDd5cCj9KC9FlsE+5ywz3XPCL0WgbPAnaR1j2DbtuZEZJqqYrjwFGDq+7A/ZYMpye+Gb hN763ZNtHJmcx1l1eBfQ==; 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 1gybms-0005UG-1d; Tue, 26 Feb 2019 12:24:42 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gybmK-0004P4-Jz for linux-arm-kernel@bombadil.infradead.org; Tue, 26 Feb 2019 12:24:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=2FgZZ1EvXiQW14YwhWJkkZvTKvqMw94PKF0P4G+L3sE=; b=IPs0GLz45FYUbTkyIBDLF9JlcZ zmzz9QoDWUDnOEz6f9JOWKYPylvC64ywYZaU/5vxqS5NQ4OHf3YmV0qQOH3BjAjW3n1qP9i4bihvy Qox8+haUVmEuNHFC6Cw4F2QEkaKaZyiGUyimYI9tBIxmTzGe05GJqrGa16xImfblSP8VH/N7TUAeZ A5PrjvKN70ppDi8b19NmxeWjbL/tTKuzyGp2KG62tNXPtwq58T98EGpWXBr94ez9YlGHO4xcySxDo fsqbO83l1kQj2laHSBThkcaLaxPCMau+PmFkV5g9/oZFRTWAQ9I0YUk/E+W3Mr5uFRPGIodCg6351 zI8XcZYA==; Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gybWN-0002lh-TQ for linux-arm-kernel@lists.infradead.org; Tue, 26 Feb 2019 12:07:41 +0000 Received: by mail-wm1-x342.google.com with SMTP id n19so2140772wmi.1 for ; Tue, 26 Feb 2019 04:07:38 -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=2FgZZ1EvXiQW14YwhWJkkZvTKvqMw94PKF0P4G+L3sE=; b=tzgS+uF9F9GSsACIgXXYU2lRUlanElCpH5tzyt9UCVDqcpYHelyOhBsWKfgV3W51TR lGkJj8jXQvLV4thwQVkP2pjdiXM37aOOIbY3cq+KL99Bbl1sAozH/3RUzeAhpv0kmShk ArGVNM97OcKuqoI/YOC/Sf4v78fPBkN+YeTyUg74salDIN2vXte8Toqx8ff1s+xUH/lD SzI3H30QfS0s90mMoON8tfbPFrWKE1SVLUEF+zPqSZfBe2fm4EwzW/eZ/XHZcmoEOkyH lSMp6HBlmhatZ/Lcbk3L5sxzP1UJpJKBi+SoISwfT+asVFTnPA2EnszGW1g8AnXSza74 Qmpg== 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=2FgZZ1EvXiQW14YwhWJkkZvTKvqMw94PKF0P4G+L3sE=; b=NgZspADgEZJ7EgDy191IpfHlTdx2pQ7RRcJakn3S/pqNXPtD6YiGm+BusLan7d2isL i6eKLofapPYR9e8myAIoSQvzbm8V1la04DJfDjeuEdYQSt83NsWvWiG178kjjs9pqY8F VCNOv9RxXCehvGOnx1nBuG6iastZQIeXDUERFtfgXZBasigJY7CEqeAvVm09ThyESQy5 6m2nHVqIA5ttbMr//JqU+tk43Rh3nYe0GoMWb40EtPdYcTFdUQzwswKl4sU6QMadhHT3 fLH2+U6PZzl7uN149RVF7dIjdXiDQWWyyMKJYD4BjQxGqb4v20Oj8ZFNe6Kh2FzYYXmf bOEA== X-Gm-Message-State: AHQUAuahSLn91o3b0nE1fhiKIT8UNRL71wIHfWLb3sWoNbRsRcwKGMLq nH/QWlwa+GSdDYxnhvxH/qJaRw== X-Google-Smtp-Source: AHgI3IZmEmWsQKkR1jNbodwtQrYqFRnzcqSd/SNj1IlIflOSuOgG64Ml7NHqeFRmExoUFJkPA5GU4w== X-Received: by 2002:a1c:6788:: with SMTP id b130mr2589872wmc.102.1551182857584; Tue, 26 Feb 2019 04:07:37 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id a8sm12642158wmh.26.2019.02.26.04.07.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Feb 2019 04:07:36 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Daniel Lezcano , Thomas Gleixner , David Lechner Subject: [PATCH v3 06/11] ARM: davinci: move timer definitions to davinci.h Date: Tue, 26 Feb 2019 13:06:28 +0100 Message-Id: <20190226120633.18200-7-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190226120633.18200-1-brgl@bgdev.pl> References: <20190226120633.18200-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_120740_005960_162E9402 X-CRM114-Status: GOOD ( 14.24 ) 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: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski 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 Boards from the dm* family rely on register offset definitions from arch/arm/mach-davinci/include/mach/time.h. We'll be removing this file soon, so move the required defines to davinci.h where the rest of such constants live. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/davinci.h | 3 +++ arch/arm/mach-davinci/include/mach/time.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h index 56c1835c42e5..208d7a4d3597 100644 --- a/arch/arm/mach-davinci/davinci.h +++ b/arch/arm/mach-davinci/davinci.h @@ -60,6 +60,9 @@ void davinci_map_sysmod(void); #define DAVINCI_GPIO_BASE 0x01C67000 int davinci_gpio_register(struct resource *res, int size, void *pdata); +#define DAVINCI_TIMER0_BASE (IO_PHYS + 0x21400) +#define DAVINCI_WDOG_BASE (IO_PHYS + 0x21C00) + /* DM355 base addresses */ #define DM355_ASYNC_EMIF_CONTROL_BASE 0x01e10000 #define DM355_ASYNC_EMIF_DATA_CE0_BASE 0x02000000 diff --git a/arch/arm/mach-davinci/include/mach/time.h b/arch/arm/mach-davinci/include/mach/time.h index 1c971d8d8ba8..ba913736990f 100644 --- a/arch/arm/mach-davinci/include/mach/time.h +++ b/arch/arm/mach-davinci/include/mach/time.h @@ -11,9 +11,7 @@ #ifndef __ARCH_ARM_MACH_DAVINCI_TIME_H #define __ARCH_ARM_MACH_DAVINCI_TIME_H -#define DAVINCI_TIMER0_BASE (IO_PHYS + 0x21400) #define DAVINCI_TIMER1_BASE (IO_PHYS + 0x21800) -#define DAVINCI_WDOG_BASE (IO_PHYS + 0x21C00) enum { T0_BOT,