From patchwork Mon Mar 4 10:53:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10837649 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 1581317E9 for ; Mon, 4 Mar 2019 10:54:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 01CC01FF7E for ; Mon, 4 Mar 2019 10:54:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E6CDD287CE; Mon, 4 Mar 2019 10:54:07 +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 97E251FF7E for ; Mon, 4 Mar 2019 10:54:07 +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: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:In-Reply-To:References: List-Owner; bh=1itqOIfi9738oFz2rdiO4fAYT6Kw+4Uh+TeTIABWhgE=; b=OdpDlEJyqvJyYN luVIuDYXOv3FEQNAtRFrhquUrv9artliX2QJvKCSret6iHeWPEzGiIEsvZ7ubd6NOkjClPbJF/1w2 ucN9Gt4iPyF7+7ROwbrh6TPzkds1rVQEH5Hukkn/1e3NoBIMD+yaLuWMOALRHXMz4KYsWnzIuPSHZ P4MELbse/JtPk786/reL/tfv1WfD7a5Y6WsIutnFG3u/QMQJ26vTXyf9sGOwXgiK+8zKhXAFqQ4or VMNRokukpwvZk8QNX7PKcq//sUW4lrVhPPxZRwZsjs9+MtwECKMi6EWoTtfEc1m0vsxmaWSbQvnRw s8Q6mMJXBpFWEUvwW18g==; 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 1h0lET-0003d9-E3; Mon, 04 Mar 2019 10:54:05 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h0lEQ-0003bp-26 for linux-arm-kernel@lists.infradead.org; Mon, 04 Mar 2019 10:54:03 +0000 Received: by mail-wr1-x444.google.com with SMTP id w17so4989604wrn.12 for ; Mon, 04 Mar 2019 02:54:01 -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:mime-version :content-transfer-encoding; bh=YBMGzFIEHIQ7zv+jwc9v87XTUsS+NaVoQ1+r7qeHMU0=; b=BRmVM0pgR+XnUsEccy9kGG+98Q+d2CQSVst+lIhoYlMhfD3GzbvaoNWx+iMbKhSf2K hid5q9nAyKvYGfgkoWwke8UXwXwwbBWGh9JW/bWtMXpng+GEIQRMjDlEIaBgT8hl+26/ rJpU46HGsfcpqg7ltr23k7L3DW5AQNkOSISM7xzids0CM2Ts89YHMUisRAKsrByCkzH5 xQYTf55l+ltnxizDZONfLT370yQF2CH/HUFt15LVqISjT+MFcOBAuxSPBom9ulK6QT2Q nY8ScJEpT4T+OyfmD0bJUBShNKMvmsG/bDJL2on75EXeknLzXqcHdMTsnyObh8zSPjt2 eI8w== 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:mime-version :content-transfer-encoding; bh=YBMGzFIEHIQ7zv+jwc9v87XTUsS+NaVoQ1+r7qeHMU0=; b=rfsohFToa6c69d6Ey4Q8fSGdBj8hrYciSksD9G0I6SLn+DlN/eCuyj4n4gz13V33d4 DMkdc9sNV/8trWKHbsZ0I+YenGtqNbBykltW9TVwxW04640mp7whrFLCwHuoAtdm7mBT b3wZmwsDWDzV9yQTdXHZi7HJk/QPYOZQCJjfS4KOHJt9wvbCnvJcDNhIaMcTSdCpFeJK fkJGQ2fM4wKKEIn3aKwHxS0h0KdGHEH82m00HsPxs2soJaXbMxIjQuJtp/5+5K89RflR Rq4CsbZ6ib1WMpTS2Gxn9vLWTLxUbQh/h5C2TlPMtm+kuPz4s4PEL0baMV++GIZIQj76 RCVA== X-Gm-Message-State: APjAAAVYzkfxa7eJvoECV/3WPjY/gQj8ZVbZlmxAJWyI11rI/B+To+uS pecGr3ccYICza3hNf8veyPcRoQ== X-Google-Smtp-Source: APXvYqwzyvJ/CENiAa1enYYEUkpI981sn+aj1XtJn7/p5P9NvQVymeZQ1Mv9eb4/SSoNO84bqu4fwA== X-Received: by 2002:adf:d4c6:: with SMTP id w6mr12033156wrk.65.1551696840245; Mon, 04 Mar 2019 02:54:00 -0800 (PST) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id n2sm5915996wrq.58.2019.03.04.02.53.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Mar 2019 02:53:59 -0800 (PST) From: Neil Armstrong To: jbrunet@baylibre.com Subject: [PATCH] clk: g12a-aoclk: re-export CLKID_AO_SAR_ADC_SEL clock id Date: Mon, 4 Mar 2019 11:53:58 +0100 Message-Id: <20190304105358.4987-1-narmstrong@baylibre.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190304_025402_102444_5CB3F4A7 X-CRM114-Status: GOOD ( 12.11 ) 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, Neil Armstrong , linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-clk@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 When submitted v2 of the G12A AO-CLK IDs, the SAR_ADC_SEL ID was moved to the internal non-exported bindings, but this clock is necessary and mandatory for the SAR ADC bindings. Export it back to the public bindings. Fixes: be3d960b0aeb ("dt-bindings: clk: add G12A AO Clock and Reset Bindings") Signed-off-by: Neil Armstrong Acked-by: Jerome Brunet --- drivers/clk/meson/g12a-aoclk.h | 1 - include/dt-bindings/clock/g12a-aoclkc.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/meson/g12a-aoclk.h b/drivers/clk/meson/g12a-aoclk.h index 04b0d5506641..666b4493822c 100644 --- a/drivers/clk/meson/g12a-aoclk.h +++ b/drivers/clk/meson/g12a-aoclk.h @@ -16,7 +16,6 @@ * to expose, such as the internal muxes and dividers of composite clocks, * will remain defined here. */ -#define CLKID_AO_SAR_ADC_SEL 16 #define CLKID_AO_SAR_ADC_DIV 17 #define CLKID_AO_CTS_OSCIN 19 #define CLKID_AO_32K_PRE 20 diff --git a/include/dt-bindings/clock/g12a-aoclkc.h b/include/dt-bindings/clock/g12a-aoclkc.h index 8db01ffbeb06..5ac66a2eee0f 100644 --- a/include/dt-bindings/clock/g12a-aoclkc.h +++ b/include/dt-bindings/clock/g12a-aoclkc.h @@ -26,6 +26,7 @@ #define CLKID_AO_M4_FCLK 13 #define CLKID_AO_M4_HCLK 14 #define CLKID_AO_CLK81 15 +#define CLKID_AO_SAR_ADC_SEL 16 #define CLKID_AO_SAR_ADC_CLK 18 #define CLKID_AO_32K 23 #define CLKID_AO_CEC 27