From patchwork Tue Apr 8 22:23:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 28051 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 02C7D20447 for ; Tue, 8 Apr 2014 22:24:54 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id i8sf4367564qcq.8 for ; Tue, 08 Apr 2014 15:24:54 -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=gRV+hiNqffy9spuc2JI6cTgNxSeQrkvERwPTgoVJl4ldBuOeQxFIFxrmqkfOs0AqAV ibVaw1fuhS8MrFnPpVNs32s5OVCHE2ou2HBBz3bqit6ZC2eQp7TB/mEp62XHi+ndiro+ qx6Doe9zec4m4xiL/hogOAp1a6wUMIjsvkMyDZmcL5IkmufwwXBJ0zsGaLC6oDlGcAJp bOpTAy0Y9jLwg7jKTQYQx7WXu3v6dnR9ZmK1BOV6G17HIZPAB59Xszl0rg7pZno3SwPr x9FeaMfMcKy1wgzUGnP7OVAZprpsFzL77l9yNcBFH7TfbBM32Bvt2HtvwqLvCkkKhk4W YnIQ== X-Gm-Message-State: ALoCoQkpALF3+YUhhKx2jhmk98z2/xj9JeBKmPXfdSL9yVWx8/LWmBIHo46Aii3dKROAB4ScUQ82 X-Received: by 10.236.117.79 with SMTP id i55mr2497586yhh.16.1396995894729; Tue, 08 Apr 2014 15:24:54 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.19.115 with SMTP id 106ls398002qgg.75.gmail; Tue, 08 Apr 2014 15:24:54 -0700 (PDT) X-Received: by 10.220.105.4 with SMTP id r4mr2542098vco.27.1396995894538; Tue, 08 Apr 2014 15:24:54 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id h11si663673veh.50.2014.04.08.15.24.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 08 Apr 2014 15:24:54 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.176 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.176; Received: by mail-vc0-f176.google.com with SMTP id lc6so1376986vcb.35 for ; Tue, 08 Apr 2014 15:24:54 -0700 (PDT) X-Received: by 10.52.69.146 with SMTP id e18mr4472589vdu.15.1396995894452; Tue, 08 Apr 2014 15:24:54 -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 v8csp281899vcv; Tue, 8 Apr 2014 15:24:54 -0700 (PDT) X-Received: by 10.66.141.165 with SMTP id rp5mr7684721pab.90.1396995893198; Tue, 08 Apr 2014 15:24:53 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ic8si1696148pad.423.2014.04.08.15.24.52; Tue, 08 Apr 2014 15:24:52 -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 S1757184AbaDHWXa (ORCPT + 27 others); Tue, 8 Apr 2014 18:23:30 -0400 Received: from mail-ie0-f180.google.com ([209.85.223.180]:46041 "EHLO mail-ie0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756079AbaDHWX0 (ORCPT ); Tue, 8 Apr 2014 18:23:26 -0400 Received: by mail-ie0-f180.google.com with SMTP id as1so1574047iec.25 for ; Tue, 08 Apr 2014 15:23:26 -0700 (PDT) X-Received: by 10.50.109.130 with SMTP id hs2mr6798492igb.29.1396995806264; Tue, 08 Apr 2014 15:23:26 -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 vu3sm113677igc.6.2014.04.08.15.23.24 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 08 Apr 2014 15:23:25 -0700 (PDT) From: Alex Elder To: mturquette@linaro.org, mporter@linaro.org, bcm@fixthebug.org, devicetree@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/5] clk: bcm281xx: move compatible string definitions Date: Tue, 8 Apr 2014 17:23:52 -0500 Message-Id: <1396995836-31111-2-git-send-email-elder@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1396995836-31111-1-git-send-email-elder@linaro.org> References: <1396995836-31111-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.176 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