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: 10507365 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 C85FA60325 for ; Wed, 4 Jul 2018 16:55:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B373B28D96 for ; Wed, 4 Jul 2018 16:55:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9CFD428D9C; Wed, 4 Jul 2018 16:55:26 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI 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 4AB1128D7D for ; Wed, 4 Jul 2018 16:55:26 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=27YkDIsZubaos/hqMDGB1UNz/wyFeBde5GdT7oocaTE=; b=ArdoRwWjjlydOuJxP6LHE/x1Yz kVERZwj0naaDqcecBIEHnMHqYaNeu2ZLUCAE2B1FhnyTrOUbbOIaEWN5rp7NuRqixZM8MM22w489O okjjFKqhtqPsHamEKpWyZXxv7jGFpy9lg9dsrj5THb1s45a5ZL2UNcWhcwE6sa2JIecdhhGKDCpvR zJWtOEJTV2US5dJ5g9ggNxipEgTTFSKZiYw1KL8gE24YnTMLwAO8llXQuhLr4Z8lvAt+JDLIoEJQM /zcEJIQKEZ4uoX3RZ/swEaqO2JrCj2Z6BjHhkTZnOglHEs1CeGtCbWoCUybpWJ499lnCvC+kzLwKv x53MZdVg==; 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 1fal3s-0006sw-Ne; Wed, 04 Jul 2018 16:55:24 +0000 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fal3m-0006Iu-TZ for linux-amlogic@lists.infradead.org; Wed, 04 Jul 2018 16:55:20 +0000 Received: by mail-wm0-x243.google.com with SMTP id n17-v6so6874611wmh.2 for ; Wed, 04 Jul 2018 09:55:08 -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=V167YS8Qu7AdX35KTKlIsgHvb8GpQI94ltrgSCiEBZLsGDeYr3IeeXum7CBeV5nZkg ixygsf9chZLf/SxWsDC7PshdVTk7RcYtqUFW+YQWOFa8y+8eb4eKW9QOX2c6yXsWk/N3 YxH3vD9zZvaun7FzQ7wAvbEq98OHo0VcAz2cDNWa8DRBsJNGOYok2oqekd2X8oKt5zcu g+0xReGlkyTDDvmCERQR5Kr9Zdjb5psXGLFFF1SexzLh/uaUhYyHK0GSjCwTwqgQ7EAM NaY6yi5kP6bTjp1OhpKPXze7R8WCFiqUgBvfuCFCx9yG/YBf/t3zn87I//q58vxeBCMy cHXw== X-Gm-Message-State: APt69E2acFRmeCkDuBLYXtEbrgo6eWDGVvu+RSk5Zm9j2xhQzfk28ojH Se68cLT9duXPMkiDnEZK0hQ3eQ== X-Google-Smtp-Source: AAOMgpcPXLMPRcF7QqFRBpfxtUUKHdSKyNOGuHfs8tKf9YcF3OiSg+QIGktXl/pTd7m6tlTafLgZWQ== 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180704_095519_016665_EE86394B X-CRM114-Status: UNSURE ( 9.30 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Jerome Brunet MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Martin Blumenstingl --- drivers/clk/meson/gxbb.h | 1 - 1 file changed, 1 deletion(-) 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 */