From patchwork Wed Jul 4 16:54:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 141078 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1013116ljj; Wed, 4 Jul 2018 09:55:41 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe0yPpG9UtBaa+F7IghoKrOemkE4k79byp5oBGiKIqAxNQF+sip68jaF2yCIs4dDPk6i12k X-Received: by 2002:a17:902:d807:: with SMTP id a7-v6mr2812180plz.214.1530723341764; Wed, 04 Jul 2018 09:55:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530723341; cv=none; d=google.com; s=arc-20160816; b=cXJw/mvwYP9lherYm3gjetNIiYeEur3/M8UPP/r8QHAU39IkJ5Y5FcbqLuAGnIw4Aw kHZAoCPDRUbK626anIAtyN2gol9kZZTKt3WFvJQ/8HTLF600PY0e7xqoKwwLew74zzhm wquq1TrswRA+DPtwEeDKZYALR5AiH32UkK1FpqnZqhUQvO/EAx2p01fUmkCsP6BxUJro QnF8WS2SWYg8fQNRcBPOichUU7n9QIBCiButZLUyEZinorD1XoEK25hXLBC8Io5kf+6n TentkEBSbRqavqP+GcbhrsLjCQjMnC8q1EucD6KN4Py00LkrVycUCcEiLF7OwGb1oVjD gerA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=PvOudz6RyIskSJn6PgLe79Ph0X6+vNBqQoUnWH/mtIo=; b=olKuhdHGVkQMpYRBWj83BbrU/7Qmd1F92NJx42GSSQByHb6gL2TganoLapFw905wEN UbTXgu12syHAPzq+6B/5fiSMfmOjVyyJKx8/a+EobpLP3dDCKPVnKyGvjAf0/xrRalG8 W7K1BDcGURg1KRaSDOOeJYrAFtTGxK64PcM0U+lTiqJFNAWMCLtlZEB1YKQUY8t5FMGg CiOpobIWoTRhgZn4vZBLApGj09n16OByRvK8BunQWb5hFLpZpYC2FXJeOE80giAORxYo znJomFvzhqYWkZbfPe9VjR0TvCAs96pobCrtP6g146V07Ax5Evdn5rPidmLC5cyudotq LNag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=hNzyrZ2N; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p14-v6si3836232pgd.342.2018.07.04.09.55.41; Wed, 04 Jul 2018 09:55:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=hNzyrZ2N; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753167AbeGDQzj (ORCPT + 31 others); Wed, 4 Jul 2018 12:55:39 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:52528 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752899AbeGDQzI (ORCPT ); Wed, 4 Jul 2018 12:55:08 -0400 Received: by mail-wm0-f67.google.com with SMTP id w16-v6so6928684wmc.2 for ; Wed, 04 Jul 2018 09:55:07 -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=PvOudz6RyIskSJn6PgLe79Ph0X6+vNBqQoUnWH/mtIo=; b=hNzyrZ2NfoHgzWz+LMdC8LhydMUimXfDODOg6p/yjPhkb5f1GWIXcpc4VAttlTJZQB opVtW50hoLRXHm1OdUf/+gbx1Z0u73DrMHfzPAkpQKy94Fq4aXhoMJMoMWbL/a65dxK0 VSx/89i+RcNRCXQDl2llQFqHKBvWofe0FHl3u+YucQcxpi8s64xsYkzrOMYk1Tc39jkK JkI6+CHgEcJunlyty0Qd6P2k8D9FSGuCaERHWqYMdLyKCIfVi638xpCF4j4tStOSHKDM nEOOCzFuRMCNICrRKQOZl89Wqy/XPsQZddkdPU1SOoN3UvyEe+2Uookn7kKWKMA76/g9 h5dw== 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; bh=PvOudz6RyIskSJn6PgLe79Ph0X6+vNBqQoUnWH/mtIo=; b=Sa9uNVbh/hITykrTDt9/TT5tQlIjNkyzL8f/juBUUmIBJ9e5QCSi5Cx52yT29qJ9X9 ydMU9hCXdKXE6BSSiEKxFFmi6K2aeejbnuy0eoQRhVtNuNS3+5kA+PI5HjJzmoYkmoIT HnMMHNxtCfuxZ0BSpHs1YwJzbTJadDSrnK87b6ewgOX7xFUnTlWDvCme+oK/GOT9me8s 3ayUWY5NqX7z9eigSSIU5kPs45Ocg+S4HANLWrWarZ+fvsLwPlm6omIA5CdEnGjAteYA VqG5lUAIdLYpQiLjnQ5B5NFNaDCvgGiYAFjUG6axVe+BPttNvrY4xa4pNyjU1/0IEDB6 fdvA== X-Gm-Message-State: APt69E1Wg63jeYOS3TcHqI9Qv5ZvFq7xUwHhQUiNIyrWxnw5lzvzVmR2 GERkMhrQ4EbhVp89U2gY/wpchw== X-Received: by 2002:a1c:ec06:: with SMTP id k6-v6mr2223557wmh.39.1530723307289; Wed, 04 Jul 2018 09:55:07 -0700 (PDT) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id d102-v6sm7927618wma.10.2018.07.04.09.55.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Jul 2018 09:55:06 -0700 (PDT) From: Jerome Brunet To: Neil Armstrong , Kevin Hilman , Carlo Caione Cc: Jerome Brunet , linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] clk: meson: gxbb: remove HHI_GEN_CLK_CTNL duplicate definition Date: Wed, 4 Jul 2018 18:54:56 +0200 Message-Id: <20180704165458.24149-2-jbrunet@baylibre.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180704165458.24149-1-jbrunet@baylibre.com> References: <20180704165458.24149-1-jbrunet@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org HHI_GEN_CLK_CTNL is defined twice, just remove the duplicate definition Fixes: 738f66d3211d ("clk: gxbb: add AmLogic GXBB clk controller driver") Signed-off-by: Jerome Brunet --- drivers/clk/meson/gxbb.h | 1 - 1 file changed, 1 deletion(-) -- 2.14.4 Acked-by: Martin Blumenstingl diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h index ec1a812bf1fd..df6c21d368c6 100644 --- a/drivers/clk/meson/gxbb.h +++ b/drivers/clk/meson/gxbb.h @@ -66,7 +66,6 @@ #define HHI_USB_CLK_CNTL 0x220 /* 0x88 offset in data sheet */ #define HHI_32K_CLK_CNTL 0x224 /* 0x89 offset in data sheet */ #define HHI_GEN_CLK_CNTL 0x228 /* 0x8a offset in data sheet */ -#define HHI_GEN_CLK_CNTL 0x228 /* 0x8a offset in data sheet */ #define HHI_PCM_CLK_CNTL 0x258 /* 0x96 offset in data sheet */ #define HHI_NAND_CLK_CNTL 0x25C /* 0x97 offset in data sheet */