From patchwork Tue Jun 25 23:56:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 2781471 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 22C6C9F245 for ; Tue, 25 Jun 2013 23:56:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2956F20320 for ; Tue, 25 Jun 2013 23:56:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EE20120319 for ; Tue, 25 Jun 2013 23:56:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752383Ab3FYX4K (ORCPT ); Tue, 25 Jun 2013 19:56:10 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:44426 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752148Ab3FYX4J (ORCPT ); Tue, 25 Jun 2013 19:56:09 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id r5PNu3fC004945; Tue, 25 Jun 2013 18:56:03 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id r5PNu3wj004207; Tue, 25 Jun 2013 18:56:03 -0500 Received: from dlelxv22.itg.ti.com (172.17.1.197) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.2.342.3; Tue, 25 Jun 2013 18:56:03 -0500 Received: from localhost (kahuna.am.dhcp.ti.com [128.247.91.59]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r5PNu3MV022464; Tue, 25 Jun 2013 18:56:03 -0500 From: Nishanth Menon To: Arnd Bergmann , Paul Walmsley CC: Nishanth Menon , Kevin Hilman , Benoit Cousson , Santosh Shilimkar , Tony Lindgren , Subject: [PATCH] ARM: OMAP5: voltagedomain data: remove temporary OMAP4 voltage data Date: Tue, 25 Jun 2013 18:56:00 -0500 Message-ID: <1372204560-1304-1-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP commit 20d49e9ccfece526db755940721aa13e331936d4 (ARM: OMAP5: voltagedomain data: Add OMAP5 voltage domain data) Introduced dummy volt data for OMAP5 with OMAP4460 voltage information. However with the fixes introduced in later patches commit cd8abed1da91a3250aa4b3857479613a2b446f84 (ARM: OMAP2+: Powerdomain: Remove the need to always have a voltdm associated to a pwrdm) We are no longer restricted in that respect. Further, OPP voltage information is supposed to be provided by dts information. This needs to be added in future patches as various voltage modules are converted to dts. This also fixes the build breakage for voltagedomains54xx_data.c when just OMAP5 SoC is enabled: https://patchwork.kernel.org/patch/2764191/ Reported-by: Arnd Bergmann Signed-off-by: Nishanth Menon Cc: Kevin Hilman Cc: Benoit Cousson Cc: Santosh Shilimkar Cc: Paul Walmsley Cc: Tony Lindgren Cc: linux-omap@vger.kernel.org Acked-by: Santosh Shilimkar --- Discussed in thread: http://marc.info/?t=137184664400002&r=1&w=2 Tested against linux-next-20130625 + git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux.git for_3.11/out_of_tree/omap5_clk_data with omap2plus_defconfig on OMAP5432 uEVM. NOTE: we still have the issue reported in https://patchwork.kernel.org/patch/2568091/ and "ARM: OMAP2+: AM43x: resolve SMP related build error" does not help solve the problem either for OMAP5. arch/arm/mach-omap2/voltagedomains54xx_data.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/arch/arm/mach-omap2/voltagedomains54xx_data.c b/arch/arm/mach-omap2/voltagedomains54xx_data.c index 72b8971..33d22b8 100644 --- a/arch/arm/mach-omap2/voltagedomains54xx_data.c +++ b/arch/arm/mach-omap2/voltagedomains54xx_data.c @@ -85,16 +85,6 @@ void __init omap54xx_voltagedomains_init(void) struct voltagedomain *voltdm; int i; - /* - * XXX Will depend on the process, validation, and binning - * for the currently-running IC. Use OMAP4 data for time being. - */ -#ifdef CONFIG_PM_OPP - omap5_voltdm_mpu.volt_data = omap446x_vdd_mpu_volt_data; - omap5_voltdm_mm.volt_data = omap446x_vdd_iva_volt_data; - omap5_voltdm_core.volt_data = omap446x_vdd_core_volt_data; -#endif - for (i = 0; voltdm = voltagedomains_omap5[i], voltdm; i++) voltdm->sys_clk.name = sys_clk_name;