From patchwork Tue Jun 11 07:42:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 2700331 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 8F64F40213 for ; Tue, 11 Jun 2013 07:43:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754061Ab3FKHn0 (ORCPT ); Tue, 11 Jun 2013 03:43:26 -0400 Received: from mail-la0-f46.google.com ([209.85.215.46]:42558 "EHLO mail-la0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753918Ab3FKHnK (ORCPT ); Tue, 11 Jun 2013 03:43:10 -0400 Received: by mail-la0-f46.google.com with SMTP id eg20so6574210lab.19 for ; Tue, 11 Jun 2013 00:43:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:content-type; bh=Do/Lpid/1zTe5VQpsEKM3hmWeTKMCN5RBSA5OwAbeaw=; b=gzdqz4L+fFc9OhnimRGESgMM6hFC+zVEtZldgicG+GPfx81W/ErOzk5TtbuuHJU3nq Rymy2GN7iM5tdXI/UuatwWgVsAFmOyS4MKSJte9cx5CRN9TSGttwzO6XHPD0irpD1AJH T7MSIaqlOdxQRYEUuYEHwPSTjWrwv6QA+dVleRJ9Ob2VR+ZmS7GZvN5wThKdmUuZGCX5 tXwVbvaK020m8BgoTbxg+H2zmFbSOtGX/2WlHpLhX2mSVwZXvgCpJtKnw3TrHRQLnW1v sUbJTjHJ2U1LCqfcBjxUTmJymhzwCP6dkGEzo7exPn0tRKekaU3DifO2AO8c9Drmx55E tGQA== X-Received: by 10.112.142.66 with SMTP id ru2mr6549533lbb.7.1370936588917; Tue, 11 Jun 2013 00:43:08 -0700 (PDT) Received: from [192.168.1.3] (a91-156-160-115.elisa-laajakaista.fi. [91.156.160.115]) by mx.google.com with ESMTPSA id n1sm5760850lae.0.2013.06.11.00.43.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Jun 2013 00:43:07 -0700 (PDT) Message-ID: <51B6D502.5010208@iki.fi> Date: Tue, 11 Jun 2013 10:42:58 +0300 From: Tomi Valkeinen User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-Version: 1.0 To: Tony Lindgren CC: Paul Walmsley , Sricharan R , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, santosh.shilimkar@ti.com, rnayak@ti.com, b-cousson@ti.com, t-kristo@ti.com, ambresh@ti.com Subject: Re: [PATCH V2 14/14] ARM: OMAP4: hwmod data: Clean up the data file References: <1370606175-22599-1-git-send-email-r.sricharan@ti.com> <20130607162927.GA3331@atomide.com> <20130607175005.GB3331@atomide.com> <51B5ACA6.2010101@iki.fi> <20130610141451.GE8164@atomide.com> In-Reply-To: <20130610141451.GE8164@atomide.com> X-Enigmail-Version: 1.5.1 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org On 10/06/13 17:14, Tony Lindgren wrote: > * Tomi Valkeinen [130610 03:44]: >> DSS does not have DT bindings, and removing DSS from hwmod data will >> break DSS for omap4. > > Ah that's right. Care to post a patch reverting the minimal parts that > you need for omap4 against omap-for-v3.11/cleanup? This one adds back the DSS data. Tomi From e23a18fe14cbfebf9b08e3004aec92e05a86a117 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Tue, 11 Jun 2013 10:37:19 +0300 Subject: [PATCH] ARM: OMAP4: hwmod data: add DSS data back Commit 3b9b10151c6838af52244cec4af41a938bb5b7ec (ARM: OMAP4: hwmod data: Clean up the data file) removes hwmod data for omap4, including DSS data. DSS has not yet been converted to DT, so the hwmod data is still needed. This patch adds back the DSS parts of the hwmod data. Signed-off-by: Tomi Valkeinen --- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 54 ++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 5f5d631..c8d4957 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -619,6 +619,16 @@ static struct omap_hwmod_class omap44xx_dispc_hwmod_class = { }; /* dss_dispc */ +static struct omap_hwmod_irq_info omap44xx_dss_dispc_irqs[] = { + { .irq = 25 + OMAP44XX_IRQ_GIC_START }, + { .irq = -1 } +}; + +static struct omap_hwmod_dma_info omap44xx_dss_dispc_sdma_reqs[] = { + { .dma_req = 5 + OMAP44XX_DMA_REQ_START }, + { .dma_req = -1 } +}; + static struct omap_dss_dispc_dev_attr omap44xx_dss_dispc_dev_attr = { .manager_count = 3, .has_framedonetv_irq = 1 @@ -628,6 +638,8 @@ static struct omap_hwmod omap44xx_dss_dispc_hwmod = { .name = "dss_dispc", .class = &omap44xx_dispc_hwmod_class, .clkdm_name = "l3_dss_clkdm", + .mpu_irqs = omap44xx_dss_dispc_irqs, + .sdma_reqs = omap44xx_dss_dispc_sdma_reqs, .main_clk = "dss_dss_clk", .prcm = { .omap4 = { @@ -660,6 +672,16 @@ static struct omap_hwmod_class omap44xx_dsi_hwmod_class = { }; /* dss_dsi1 */ +static struct omap_hwmod_irq_info omap44xx_dss_dsi1_irqs[] = { + { .irq = 53 + OMAP44XX_IRQ_GIC_START }, + { .irq = -1 } +}; + +static struct omap_hwmod_dma_info omap44xx_dss_dsi1_sdma_reqs[] = { + { .dma_req = 74 + OMAP44XX_DMA_REQ_START }, + { .dma_req = -1 } +}; + static struct omap_hwmod_opt_clk dss_dsi1_opt_clks[] = { { .role = "sys_clk", .clk = "dss_sys_clk" }, }; @@ -668,6 +690,8 @@ static struct omap_hwmod omap44xx_dss_dsi1_hwmod = { .name = "dss_dsi1", .class = &omap44xx_dsi_hwmod_class, .clkdm_name = "l3_dss_clkdm", + .mpu_irqs = omap44xx_dss_dsi1_irqs, + .sdma_reqs = omap44xx_dss_dsi1_sdma_reqs, .main_clk = "dss_dss_clk", .prcm = { .omap4 = { @@ -680,6 +704,16 @@ static struct omap_hwmod omap44xx_dss_dsi1_hwmod = { }; /* dss_dsi2 */ +static struct omap_hwmod_irq_info omap44xx_dss_dsi2_irqs[] = { + { .irq = 84 + OMAP44XX_IRQ_GIC_START }, + { .irq = -1 } +}; + +static struct omap_hwmod_dma_info omap44xx_dss_dsi2_sdma_reqs[] = { + { .dma_req = 83 + OMAP44XX_DMA_REQ_START }, + { .dma_req = -1 } +}; + static struct omap_hwmod_opt_clk dss_dsi2_opt_clks[] = { { .role = "sys_clk", .clk = "dss_sys_clk" }, }; @@ -688,6 +722,8 @@ static struct omap_hwmod omap44xx_dss_dsi2_hwmod = { .name = "dss_dsi2", .class = &omap44xx_dsi_hwmod_class, .clkdm_name = "l3_dss_clkdm", + .mpu_irqs = omap44xx_dss_dsi2_irqs, + .sdma_reqs = omap44xx_dss_dsi2_sdma_reqs, .main_clk = "dss_dss_clk", .prcm = { .omap4 = { @@ -720,6 +756,16 @@ static struct omap_hwmod_class omap44xx_hdmi_hwmod_class = { }; /* dss_hdmi */ +static struct omap_hwmod_irq_info omap44xx_dss_hdmi_irqs[] = { + { .irq = 101 + OMAP44XX_IRQ_GIC_START }, + { .irq = -1 } +}; + +static struct omap_hwmod_dma_info omap44xx_dss_hdmi_sdma_reqs[] = { + { .dma_req = 75 + OMAP44XX_DMA_REQ_START }, + { .dma_req = -1 } +}; + static struct omap_hwmod_opt_clk dss_hdmi_opt_clks[] = { { .role = "sys_clk", .clk = "dss_sys_clk" }, }; @@ -733,6 +779,8 @@ static struct omap_hwmod omap44xx_dss_hdmi_hwmod = { * set idle mode by software. */ .flags = HWMOD_SWSUP_SIDLE, + .mpu_irqs = omap44xx_dss_hdmi_irqs, + .sdma_reqs = omap44xx_dss_hdmi_sdma_reqs, .main_clk = "dss_48mhz_clk", .prcm = { .omap4 = { @@ -765,6 +813,11 @@ static struct omap_hwmod_class omap44xx_rfbi_hwmod_class = { }; /* dss_rfbi */ +static struct omap_hwmod_dma_info omap44xx_dss_rfbi_sdma_reqs[] = { + { .dma_req = 13 + OMAP44XX_DMA_REQ_START }, + { .dma_req = -1 } +}; + static struct omap_hwmod_opt_clk dss_rfbi_opt_clks[] = { { .role = "ick", .clk = "dss_fck" }, }; @@ -773,6 +826,7 @@ static struct omap_hwmod omap44xx_dss_rfbi_hwmod = { .name = "dss_rfbi", .class = &omap44xx_rfbi_hwmod_class, .clkdm_name = "l3_dss_clkdm", + .sdma_reqs = omap44xx_dss_rfbi_sdma_reqs, .main_clk = "dss_dss_clk", .prcm = { .omap4 = {