From patchwork Mon Sep 24 13:58:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 1497741 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 6D8063FC71 for ; Mon, 24 Sep 2012 13:58:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755540Ab2IXN64 (ORCPT ); Mon, 24 Sep 2012 09:58:56 -0400 Received: from na3sys009aog108.obsmtp.com ([74.125.149.199]:59194 "EHLO na3sys009aog108.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755481Ab2IXN6z (ORCPT ); Mon, 24 Sep 2012 09:58:55 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]) (using TLSv1) by na3sys009aob108.postini.com ([74.125.148.12]) with SMTP ID DSNKUGBnHpILMmXuynhavVMI19OMey4UhHj2@postini.com; Mon, 24 Sep 2012 06:58:55 PDT Received: by lbbgj3 with SMTP id gj3so6750180lbb.19 for ; Mon, 24 Sep 2012 06:58:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=dgr1vQkM5XEhiAul2pHk8FX9BVvZy+E/nqAolj4qDYg=; b=iH2fmV/F/F6V95rfnJVbz/B6bLIS3Qq1FeBRU8Kn44rsJ40TU3pcAkLGjnPg86pUg1 irgA0PUFoRWBtyeJXN9X68BR/Qp+VIWeGVQZ2TBIB9P4Kgg4IxHBcbN7BwqpK9BgP/4i FBBnd0FGQ8fEFS25WQixzC4s698TKtyARrBaejSW/EZ5noiNLQ6HzPb5C5VI459+6qoJ XlDrFirVkIC/GRu+Kb/jxrhJoDe9rZu6f7CdBnp/Y3vn7jFD2bUPDp+ksJUvpHy+X4PB VoXbwjgE3CPMAw0pX3AlHsN4QrubiZ3O1ZgjG9xX4sa1IrPpxpQaCbg3zyfzaRSCVJnU EMbg== Received: by 10.152.128.230 with SMTP id nr6mr10812276lab.24.1348495131410; Mon, 24 Sep 2012 06:58:51 -0700 (PDT) Received: from deskari.tieu.ti.com (a91-156-160-115.elisa-laajakaista.fi. [91.156.160.115]) by mx.google.com with ESMTPS id ly17sm4364922lab.2.2012.09.24.06.58.50 (version=SSLv3 cipher=OTHER); Mon, 24 Sep 2012 06:58:50 -0700 (PDT) From: Tomi Valkeinen To: archit@ti.com, linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Cc: Tomi Valkeinen Subject: [PATCH 3/9] OMAPDSS: move dss feats to the end of dss.c Date: Mon, 24 Sep 2012 16:58:33 +0300 Message-Id: <1348495119-8262-4-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348495119-8262-1-git-send-email-tomi.valkeinen@ti.com> References: <1348495119-8262-1-git-send-email-tomi.valkeinen@ti.com> X-Gm-Message-State: ALoCoQlM63tx5c7tmZh514syy2J7d6HHpyQFa5IP9pT6X4zO5uFr9oyBH+PC5ih2rNMldwqGDZVD Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Move dss_features to the end of dss.c the same way they are in dispc.c, so that we don't have to declare prototypes for static feat-related functions. Signed-off-by: Tomi Valkeinen --- drivers/video/omap2/dss/dss.c | 60 ++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c index 4524c17..660813b 100644 --- a/drivers/video/omap2/dss/dss.c +++ b/drivers/video/omap2/dss/dss.c @@ -99,36 +99,6 @@ static const char * const dss_generic_clk_source_names[] = { [OMAP_DSS_CLK_SRC_FCK] = "DSS_FCK", }; -static const struct dss_features omap24xx_dss_feats __initconst = { - .fck_div_max = 16, - .dss_fck_multiplier = 2, - .clk_name = NULL, -}; - -static const struct dss_features omap34xx_dss_feats __initconst = { - .fck_div_max = 16, - .dss_fck_multiplier = 2, - .clk_name = "dpll4_m4_ck", -}; - -static const struct dss_features omap3630_dss_feats __initconst = { - .fck_div_max = 32, - .dss_fck_multiplier = 1, - .clk_name = "dpll4_m4_ck", -}; - -static const struct dss_features omap44xx_dss_feats __initconst = { - .fck_div_max = 32, - .dss_fck_multiplier = 1, - .clk_name = "dpll_per_m5x2_ck", -}; - -static const struct dss_features omap54xx_dss_feats __initconst = { - .fck_div_max = 64, - .dss_fck_multiplier = 1, - .clk_name = "dpll_per_h12x2_ck", -}; - static inline void dss_write_reg(const struct dss_reg idx, u32 val) { __raw_writel(val, dss.base + idx.idx); @@ -727,6 +697,36 @@ void dss_debug_dump_clocks(struct seq_file *s) } #endif +static const struct dss_features omap24xx_dss_feats __initconst = { + .fck_div_max = 16, + .dss_fck_multiplier = 2, + .clk_name = NULL, +}; + +static const struct dss_features omap34xx_dss_feats __initconst = { + .fck_div_max = 16, + .dss_fck_multiplier = 2, + .clk_name = "dpll4_m4_ck", +}; + +static const struct dss_features omap3630_dss_feats __initconst = { + .fck_div_max = 32, + .dss_fck_multiplier = 1, + .clk_name = "dpll4_m4_ck", +}; + +static const struct dss_features omap44xx_dss_feats __initconst = { + .fck_div_max = 32, + .dss_fck_multiplier = 1, + .clk_name = "dpll_per_m5x2_ck", +}; + +static const struct dss_features omap54xx_dss_feats __initconst = { + .fck_div_max = 64, + .dss_fck_multiplier = 1, + .clk_name = "dpll_per_h12x2_ck", +}; + static int __init dss_init_features(struct device *dev) { const struct dss_features *src;