From patchwork Mon Jul 9 13:11:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 1172981 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 14B4040B21 for ; Mon, 9 Jul 2012 13:14:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753503Ab2GINMV (ORCPT ); Mon, 9 Jul 2012 09:12:21 -0400 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:11547 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753457Ab2GINMU (ORCPT ); Mon, 9 Jul 2012 09:12:20 -0400 Received: from c-98-234-237-12.hsd1.ca.comcast.net ([98.234.237.12] helo=localhost.localdomain) by mho-02-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1SoDku-0002yv-5U; Mon, 09 Jul 2012 13:12:00 +0000 Received: from Mutt by mutt-smtp-wrapper.pl 1.2 (www.zdo.com/articles/mutt-smtp-wrapper.shtml) X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 98.234.237.12 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1/ebkGEXzNS44wKhFcf/I5d Date: Mon, 9 Jul 2012 06:11:58 -0700 From: Tony Lindgren To: Vaibhav Hiremath , Paul Walmsley Cc: Santosh Shilimkar , linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, R Sricharan Subject: Re: [PATCH v2 04/14] ARM: OMAP5: Add minimal support for OMAP5430 SOC Message-ID: <20120709131156.GH1122@atomide.com> References: <1341566515-22665-1-git-send-email-santosh.shilimkar@ti.com> <1341566515-22665-5-git-send-email-santosh.shilimkar@ti.com> <4FFA9B61.8030808@ti.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4FFA9B61.8030808@ti.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org * Vaibhav Hiremath [120709 01:55]: > On 7/6/2012 2:51 PM, Santosh Shilimkar wrote: > > --- a/arch/arm/plat-omap/include/plat/clkdev_omap.h > > +++ b/arch/arm/plat-omap/include/plat/clkdev_omap.h > > @@ -39,6 +39,7 @@ struct omap_clk { > > #define CK_443X (1 << 11) > > #define CK_TI816X (1 << 12) > > #define CK_446X (1 << 13) > > +#define CK_54XX (1 << 14) > > This is conflicting with AM33XX, you may want to rebase it again, since > AM33xx clock tree is already pushed and available in > linux-omap/devel-am33xx-part2. Heh these CK_XXXX defines are now running out of the u16 cpu_mask. They really should be replaced with SoC specific lists of clocks rather than bloating the cpu_mask and repeating it for every clock that's compiled in for 800+ times. Below (untested) is what could be done in the short term. I wonder if we could #define CK_OMAP_DUMMY 0 that's always set for non-shared clocks if they only get set in some *_data.c file in a unique way? Paul got any better ideas? Regards, Tony --- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/arch/arm/plat-omap/include/plat/clkdev_omap.h +++ b/arch/arm/plat-omap/include/plat/clkdev_omap.h @@ -26,26 +26,29 @@ struct omap_clk { } /* Platform flags for the clkdev-OMAP integration code */ + +#ifdef CONFIG_ARCH_OMAP1 #define CK_310 (1 << 0) #define CK_7XX (1 << 1) /* 7xx, 850 */ #define CK_1510 (1 << 2) #define CK_16XX (1 << 3) /* 16xx, 17xx, 5912 */ -#define CK_242X (1 << 4) -#define CK_243X (1 << 5) /* 243x, 253x */ -#define CK_3430ES1 (1 << 6) /* 34xxES1 only */ -#define CK_3430ES2PLUS (1 << 7) /* 34xxES2, ES3, non-Sitara 35xx only */ -#define CK_AM35XX (1 << 9) /* Sitara AM35xx */ -#define CK_36XX (1 << 10) /* 36xx/37xx-specific clocks */ -#define CK_443X (1 << 11) -#define CK_TI816X (1 << 12) -#define CK_446X (1 << 13) -#define CK_AM33XX (1 << 14) /* AM33xx specific clocks */ -#define CK_1710 (1 << 15) /* 1710 extra for rate selection */ - +#define CK_1710 (1 << 4) /* 1710 extra for rate selection */ +#endif +#ifdef CONFIG_ARCH_OMAP2PLUS +#define CK_242X (1 << 0) +#define CK_243X (1 << 1) /* 243x, 253x */ +#define CK_3430ES1 (1 << 2) /* 34xxES1 only */ +#define CK_3430ES2PLUS (1 << 3) /* 34xxES2, ES3, non-Sitara 35xx only */ +#define CK_AM35XX (1 << 4) /* Sitara AM35xx */ +#define CK_36XX (1 << 5) /* 36xx/37xx-specific clocks */ +#define CK_443X (1 << 6) +#define CK_TI816X (1 << 7) +#define CK_446X (1 << 8) +#define CK_AM33XX (1 << 9) /* AM33xx specific clocks */ #define CK_34XX (CK_3430ES1 | CK_3430ES2PLUS) #define CK_3XXX (CK_34XX | CK_AM35XX | CK_36XX) - +#endif #endif