From patchwork Wed Apr 2 19:29:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 27654 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f71.google.com (mail-pb0-f71.google.com [209.85.160.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3866120341 for ; Wed, 2 Apr 2014 19:31:53 +0000 (UTC) Received: by mail-pb0-f71.google.com with SMTP id up15sf2388716pbc.10 for ; Wed, 02 Apr 2014 12:31:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=Dz/LGq9io7kHifgoYB7HDobmSg0cmqzzo8WmhRrOCoA=; b=Kj5XNmvtqPObINrzs3YS5+fGzVnN5qY1TdU80S5UNDTH3G7fUu/60/DO2EtmbzbtW+ e71j0F+ddhDpy43DLi2cYrFE/nmlncBYv9Fhkk6VHmP0kQu+p2Un6ZBLfhXHwEhHXWXU /hGB+YWjaCtafh8b7xfYabZgR8/cnfWmt95JpL2F9scT6W/2qZS1GjATx/NVsnh3Wrrz eJhZ0gSzE4LYUCUhd6/IYUfW1tRMDRP/Ybrd5pjyycXYpcenvYeknVstZIpYGUFlIGSt ghJT+jlnVLE1TNVnFmlapFrpX01ngowXowJ92n1CbzgwoBWk/sUJj/Ea7vhreQHEc5Vw 0IEQ== X-Gm-Message-State: ALoCoQl7CXTk4BCRi1FzZTkEru1aPXpXU+s7FjuV0vfU+IDa/GLQmYt01Nx/X9O6t1SqQOzEmHsM X-Received: by 10.66.216.167 with SMTP id or7mr16371667pac.44.1396467112517; Wed, 02 Apr 2014 12:31:52 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.97.230 with SMTP id m93ls426357qge.87.gmail; Wed, 02 Apr 2014 12:31:52 -0700 (PDT) X-Received: by 10.52.119.178 with SMTP id kv18mr2594752vdb.39.1396467112266; Wed, 02 Apr 2014 12:31:52 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id sh5si800183vdc.14.2014.04.02.12.31.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Apr 2014 12:31:52 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id ld13so982259vcb.5 for ; Wed, 02 Apr 2014 12:31:52 -0700 (PDT) X-Received: by 10.52.175.166 with SMTP id cb6mr2559837vdc.1.1396467111908; Wed, 02 Apr 2014 12:31:51 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.12.8 with SMTP id v8csp349473vcv; Wed, 2 Apr 2014 12:31:51 -0700 (PDT) X-Received: by 10.68.216.101 with SMTP id op5mr2129559pbc.148.1396467111145; Wed, 02 Apr 2014 12:31:51 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qj1si1806294pbb.342.2014.04.02.12.31.49; Wed, 02 Apr 2014 12:31:49 -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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030199AbaDBT3j (ORCPT + 27 others); Wed, 2 Apr 2014 15:29:39 -0400 Received: from mail-ie0-f177.google.com ([209.85.223.177]:47906 "EHLO mail-ie0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933016AbaDBT3g (ORCPT ); Wed, 2 Apr 2014 15:29:36 -0400 Received: by mail-ie0-f177.google.com with SMTP id rl12so742519iec.22 for ; Wed, 02 Apr 2014 12:29:36 -0700 (PDT) X-Received: by 10.42.43.136 with SMTP id x8mr2204958ice.85.1396466976415; Wed, 02 Apr 2014 12:29:36 -0700 (PDT) Received: from localhost.localdomain (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPSA id ie20sm7229373igb.10.2014.04.02.12.29.35 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Apr 2014 12:29:35 -0700 (PDT) From: Alex Elder To: mturquette@linaro.org, bcm@fixthebug.org, mporter@linaro.org, devicetree@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH RESEND 1/5] clk: bcm281xx: move compatible string definitions Date: Wed, 2 Apr 2014 14:29:57 -0500 Message-Id: <1396467001-3551-2-git-send-email-elder@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1396467001-3551-1-git-send-email-elder@linaro.org> References: <1396467001-3551-1-git-send-email-elder@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: elder@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The Broadcom 281xx clock code uses a #define for the compatible string for it's clock control units (CCUs). Rather than defining those in the C source file, define them in the header file that's shared by both the code and the device tree source file (along with all the clock ids). Signed-off-by: Alex Elder --- drivers/clk/bcm/clk-bcm281xx.c | 12 ------------ include/dt-bindings/clock/bcm281xx.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/clk/bcm/clk-bcm281xx.c b/drivers/clk/bcm/clk-bcm281xx.c index 71a65a4..502a487 100644 --- a/drivers/clk/bcm/clk-bcm281xx.c +++ b/drivers/clk/bcm/clk-bcm281xx.c @@ -18,18 +18,6 @@ #define BCM281XX_CCU_COMMON(_name, _ucase_name) \ KONA_CCU_COMMON(BCM281XX, _name, _ucase_name) -/* - * These are the bcm281xx CCU device tree "compatible" strings. - * We're stuck with using "bcm11351" in the string because wild - * cards aren't allowed, and that name was the first one defined - * in this family of devices. - */ -#define BCM281XX_DT_ROOT_CCU_COMPAT "brcm,bcm11351-root-ccu" -#define BCM281XX_DT_AON_CCU_COMPAT "brcm,bcm11351-aon-ccu" -#define BCM281XX_DT_HUB_CCU_COMPAT "brcm,bcm11351-hub-ccu" -#define BCM281XX_DT_MASTER_CCU_COMPAT "brcm,bcm11351-master-ccu" -#define BCM281XX_DT_SLAVE_CCU_COMPAT "brcm,bcm11351-slave-ccu" - /* Root CCU */ static struct peri_clk_data frac_1m_data = { diff --git a/include/dt-bindings/clock/bcm281xx.h b/include/dt-bindings/clock/bcm281xx.h index e009694..a763460 100644 --- a/include/dt-bindings/clock/bcm281xx.h +++ b/include/dt-bindings/clock/bcm281xx.h @@ -20,6 +20,18 @@ * the clock control units (CCUs) on Broadcom BCM281XX family SoCs. */ +/* + * These are the bcm281xx CCU device tree "compatible" strings. + * We're stuck with using "bcm11351" in the string because wild + * cards aren't allowed, and that name was the first one defined + * in this family of devices. + */ +#define BCM281XX_DT_ROOT_CCU_COMPAT "brcm,bcm11351-root-ccu" +#define BCM281XX_DT_AON_CCU_COMPAT "brcm,bcm11351-aon-ccu" +#define BCM281XX_DT_HUB_CCU_COMPAT "brcm,bcm11351-hub-ccu" +#define BCM281XX_DT_MASTER_CCU_COMPAT "brcm,bcm11351-master-ccu" +#define BCM281XX_DT_SLAVE_CCU_COMPAT "brcm,bcm11351-slave-ccu" + /* root CCU clock ids */ #define BCM281XX_ROOT_CCU_FRAC_1M 0