From patchwork Mon Mar 18 12:10:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10857507 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 7412B1669 for ; Mon, 18 Mar 2019 12:12:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4DA6729423 for ; Mon, 18 Mar 2019 12:12:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4171329427; Mon, 18 Mar 2019 12:12: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=-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 D91D029423 for ; Mon, 18 Mar 2019 12:12:21 +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=a9kW/n63KlcQDPI86owxi5O41dt8n8F8XCoPVU3TBHo=; b=TAbcCu+M4OvURt Ir1242nM1G2pfhkmCWTphdy/7LAn4hNUq4rV8OQt0lJXoeWVQGqfX1Hjp9lf28J6fzdUuDaPGbgHo 3W4pNrlJzGESq4wXK7krWZnzrTidytaQD3XFyk9TqSiKIVTpuXXzp4D/xhJGqBJjAKIQkKxcsqZUA EwFGOmbVQjrPBWC+Ty4H+N2OM1C1rs7kM5TJWCecrhTGPlHIl9EdvRNl43JPXSjwgEuHBXkfarqy3 3NA9MlDne9IdF0gCMe0Ju8uPXWYSAWB4NSENmX+Wirxr+A2VLw2O9KcJxqjPfhuSwYWQAl4YQlecY IqQY8IAZ+o7S8PmERCSw==; 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 1h5r7r-0006mz-7q; Mon, 18 Mar 2019 12:12:19 +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 1h5r6w-0005dB-KU for linux-arm-kernel@lists.infradead.org; Mon, 18 Mar 2019 12:11:25 +0000 Received: by mail-wr1-x442.google.com with SMTP id y15so16758657wro.4 for ; Mon, 18 Mar 2019 05:11:22 -0700 (PDT) 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=33HPIiJ1xn7gSPPKGm5upaCUrdFSVFtH5Uv/YxnmZAo=; b=KupBVptHUCrwtmS27D5ZtqrIHcvOcGLmo54YcQypQUE1BcrAXVfMRZNAoFPm1ANuo9 mtdZbh64anxQczl7mYe+c+DVhSghjDqb7Afizrti0EQJ4YWvzfEAQgTSAhAOolqk1rgZ A9nJ7QiBDdrwA37Woiewh9xw7Oigvv6gvasdMklR/Aq8OmR3eoxZGHhwIIxGMg5l7T4e IL/CQD7yd4LQkV0lxuVG1J5D5kUgvQKCmMKdUtF/UzyrzBDNrY1cAU9OzdKXT3FmsGbL Ok8LuEUcyvIiLaDgBvl9xLayx/QcNCs6laJnmBIVuv+DccN+p89nllc17JVh4UmR5cVF VRuQ== 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=33HPIiJ1xn7gSPPKGm5upaCUrdFSVFtH5Uv/YxnmZAo=; b=o2x427lcQ9Qiw781/URQyiHKFVi1EQIwR2KV9TV88oPJPa7whRhPOTBB8/mrkZLtj6 Jgiqe+5Y3zP+kGay15zwOsjJzzKPxu1pAK/SsUtixTXBDUo+bFUvRiXMPSY2kwvPk54q 4OiIYTUky/64iJKn0nwiQDU74Mn6tjvUm86DXBGElgFiL6PwNt0YRbL3PtzrVolHhhw7 Z9/oY7LMhbSpjXmKYIfAQZMJ/GW9X38WsG4k/O1m6vz3ByjDyzseXXDLbirI8B2ErkKA PYh1SfLVSLadi99UE1fQIGwnbiZBom/g1NXIQwul8x6/vHWtb22bNFaumw8RDC1ABFCN mw2w== X-Gm-Message-State: APjAAAUoXd55F1uwg+ILUBKutdT5rf8J1xS7Gpk1BSGQPPxJeQ4dk2jJ v+1dwXWMrT10t8chyIcHVN1j8A== X-Google-Smtp-Source: APXvYqy15uASYC0i/Ub2/LYjetNCxw7DHTLvkpKWePw8QCvnG0j963NtpAr5lq2gRHHTESxJb42rIQ== X-Received: by 2002:a05:6000:124a:: with SMTP id j10mr11553647wrx.26.1552911081296; Mon, 18 Mar 2019 05:11:21 -0700 (PDT) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id n13sm8220132wrw.67.2019.03.18.05.11.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:11:20 -0700 (PDT) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Daniel Lezcano , Thomas Gleixner , David Lechner Subject: [PATCH v4 06/11] ARM: davinci: move timer definitions to davinci.h Date: Mon, 18 Mar 2019 13:10:55 +0100 Message-Id: <20190318121100.28132-7-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190318121100.28132-1-brgl@bgdev.pl> References: <20190318121100.28132-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190318_051123_196466_8B32F637 X-CRM114-Status: GOOD ( 12.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 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,