From patchwork Mon Apr 21 21:26:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 28728 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 324CA203F3 for ; Mon, 21 Apr 2014 21:26:44 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id a41sf24971363yho.6 for ; Mon, 21 Apr 2014 14:26:43 -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=92EksPPq7X1hndlvDwPAlSaBenTQawYolo0UVlKB0aw=; b=LWAY0imDJhfh7+aJ5S3jzsmhYiZ9KwShPJhUCxLPaOEJY5tPrtxuSI4gKNGIYjpKi7 CXcvJ/8GpthFcf6l4tweuP0Tl+9j/T5ohFtvpCv62D7X/gmcG2+P2cTHbwRY6tnqlVea lWt5kRpxLjzQhrPt3B4MdZn03vqw49HuJLCOhpGkwANAAspAAnCCLWbkmCLW0S8ajwLe VQ3auX51XuNXeZyu3gRkuJCvlEfCPUmWN2zpmVHrAiZkpImU9z13ssQ3pD0UouxldQFP 3f5q/AZOeRk8dR6UyRXgbDhHkZvb/YiMgd2SKleoqPajwFZvLzGJge4BwIDbpd20oaxz 9c9A== X-Gm-Message-State: ALoCoQl259JPXsHQIRRYMUN1VabpL2XynZVzI+rzslupDsFgJ4BEQU9I1NbD673vF9RxtJG2ge8s X-Received: by 10.58.127.66 with SMTP id ne2mr19024772veb.27.1398115603799; Mon, 21 Apr 2014 14:26:43 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.48.210 with SMTP id o76ls626652qga.66.gmail; Mon, 21 Apr 2014 14:26:43 -0700 (PDT) X-Received: by 10.58.207.74 with SMTP id lu10mr35869498vec.15.1398115603685; Mon, 21 Apr 2014 14:26:43 -0700 (PDT) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id dy7si6462572vec.72.2014.04.21.14.26.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Apr 2014 14:26:43 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.171; Received: by mail-ve0-f171.google.com with SMTP id jy13so8378136veb.2 for ; Mon, 21 Apr 2014 14:26:43 -0700 (PDT) X-Received: by 10.52.78.231 with SMTP id e7mr3752147vdx.28.1398115603609; Mon, 21 Apr 2014 14:26:43 -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.221.72 with SMTP id ib8csp319661vcb; Mon, 21 Apr 2014 14:26:43 -0700 (PDT) X-Received: by 10.66.232.68 with SMTP id tm4mr5918137pac.114.1398115602122; Mon, 21 Apr 2014 14:26:42 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wt1si21506205pbc.118.2014.04.21.14.26.40; Mon, 21 Apr 2014 14:26:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-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 S1754701AbaDUV0i (ORCPT + 9 others); Mon, 21 Apr 2014 17:26:38 -0400 Received: from mail-yk0-f176.google.com ([209.85.160.176]:40378 "EHLO mail-yk0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754672AbaDUV0g (ORCPT ); Mon, 21 Apr 2014 17:26:36 -0400 Received: by mail-yk0-f176.google.com with SMTP id 19so3844799ykq.7 for ; Mon, 21 Apr 2014 14:26:35 -0700 (PDT) X-Received: by 10.236.170.37 with SMTP id o25mr3228325yhl.145.1398115595658; Mon, 21 Apr 2014 14:26:35 -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 t63sm73674397yhm.32.2014.04.21.14.26.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Apr 2014 14:26:34 -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 RESEND 1/5] clk: bcm281xx: move compatible string definitions Date: Mon, 21 Apr 2014 16:26:23 -0500 Message-Id: <1398115587-32529-2-git-send-email-elder@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1398115587-32529-1-git-send-email-elder@linaro.org> References: <1398115587-32529-1-git-send-email-elder@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@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.128.171 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