From patchwork Thu Jan 26 16:05:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9539625 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 87F4A6046A for ; Thu, 26 Jan 2017 16:07:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7515126E96 for ; Thu, 26 Jan 2017 16:07:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6808227D4D; Thu, 26 Jan 2017 16:07:51 +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=-1.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_SORBS_SPAM,T_DKIM_INVALID autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 818D626E96 for ; Thu, 26 Jan 2017 16:07:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cWmaK-0004ef-Vg; Thu, 26 Jan 2017 16:07:40 +0000 Received: from mail-wm0-f50.google.com ([74.125.82.50]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cWmZv-0004cB-RV for linux-arm-kernel@lists.infradead.org; Thu, 26 Jan 2017 16:07:17 +0000 Received: by mail-wm0-f50.google.com with SMTP id r126so78531238wmr.0 for ; Thu, 26 Jan 2017 08:06:55 -0800 (PST) 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; bh=DN0Z7Or+Zz+k01Rapy4kr6XY8M0ATUiUFmaFYHq7Z74=; b=gri0Jq+CeoODuR4P/24F3tN7bx9NKk0UE4/2wvJmAwGqaN3bhy0BWoy4JGrOBS0vR+ yhTq/q7t7kNwRGu+uwwW1t7LNHUBzbSNG1jkh7sKrcK327Q1GTMIo2vOz0hXTwUsZ9c2 FGPt1vgoTeGvs0WZFtXoeVGgMDlHaqXeu/7OPmviCskFtKGvUjZB7ig44ZyDCMxLS9gS xCS57XD4DH8oSg/+e3RLd5eizAGwuMC4XhnYpODqwGxQ3SjL80ydsuzemOO7iioTSabM BXqOSU0n5j4kwJfgblQz41Ovh8vRTwBeQJQxrAD3+UxQiPfAMlrYaF1rQRH78mRCyXBH Uu4A== 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; bh=DN0Z7Or+Zz+k01Rapy4kr6XY8M0ATUiUFmaFYHq7Z74=; b=q03PWde+zZMeXEbmp4g7X+hqUmvwaPg9RiXzTSo9ex8+PSmecOx5/Nwq4vED30RNQd tnLspBcaKxflcTJE7891ntxedgWXRyoWhHphiZkokIDNFyWFn7+J5IEH2WJJzUqgh+S+ rxZ4VvlSI+uuGdpPHitiVv0tJnizNeO8E9khx1h/4G39mt75khVyHkyL77VAC6Z+p2a5 fIpxWyLg37sQqyHDn6NH1ocNPCAfPN0w45wKnZMteGch0/AicWSLRNAVPtIZq94FIM72 LQ90cQyP/wcQ4HB9Z7L10UKcjquSWxahp+e/rEg8FsFTbnOaNQ4/rOqRUFvRtSS+YW76 iSjA== X-Gm-Message-State: AIkVDXK8wGTduG+IGgO4bfuEc7WEarhTKBIMcXIrpGtasHdru5wQKV+lLG2+o6wd4YnYO9Xo X-Received: by 10.28.127.73 with SMTP id a70mr28771217wmd.76.1485446754125; Thu, 26 Jan 2017 08:05:54 -0800 (PST) Received: from boomer.localdomain ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id y80sm3281109wrb.12.2017.01.26.08.05.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jan 2017 08:05:53 -0800 (PST) From: Jerome Brunet To: Michael Turquette , Stephen Boyd , Kevin Hilman , Carlo Caione Subject: [PATCH] clk: gxbb: fix CLKID_ETH defined twice Date: Thu, 26 Jan 2017 17:05:49 +0100 Message-Id: <1485446749-12679-1-git-send-email-jbrunet@baylibre.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170126_080716_061596_2A47C7FA X-CRM114-Status: UNSURE ( 9.60 ) X-CRM114-Notice: Please train this message. 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: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet MIME-Version: 1.0 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 CLKID_ETH is define in the dt-bindings but has not be commented out in the clock driver. Just do it now. Fixes: 738f66d3211d ("clk: gxbb: add AmLogic GXBB clk controller driver") Signed-off-by: Jerome Brunet Acked-by: Stephen Boyd --- Patch based on khilman/linux-amlogic.git master branch Tested on the gxxb p200. drivers/clk/meson/gxbb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h index 0252939ba58f..2ede250921f1 100644 --- a/drivers/clk/meson/gxbb.h +++ b/drivers/clk/meson/gxbb.h @@ -204,7 +204,7 @@ #define CLKID_ASSIST_MISC 33 /* CLKID_SPI */ #define CLKID_I2S_SPDIF 35 -#define CLKID_ETH 36 +/* CLKID_ETH */ #define CLKID_DEMUX 37 #define CLKID_AIU_GLUE 38 #define CLKID_IEC958 39