From patchwork Fri May 27 23:19:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 825702 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4RNKXPQ004051 for ; Fri, 27 May 2011 23:20:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757552Ab1E0XUH (ORCPT ); Fri, 27 May 2011 19:20:07 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:35722 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932126Ab1E0XTj (ORCPT ); Fri, 27 May 2011 19:19:39 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 4B20B1B0479; Sat, 28 May 2011 01:07:15 +0200 (CEST) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 21545-10; Sat, 28 May 2011 01:06:46 +0200 (CEST) Received: from ferrari.rjw.lan (220-bem-13.acn.waw.pl [82.210.184.220]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id E231A1B07BD; Sat, 28 May 2011 01:06:39 +0200 (CEST) From: "Rafael J. Wysocki" To: Linux PM mailing list Subject: [PATCH 5/5] ARM / shmobile: Support for power domain A4MP on SH7372 Date: Sat, 28 May 2011 01:19:27 +0200 User-Agent: KMail/1.13.6 (Linux/2.6.39+; KDE/4.6.0; x86_64; ; ) Cc: Greg KH , LKML , Kevin Hilman , Grant Likely , Magnus Damm , linux-sh@vger.kernel.org, MyungJoo Ham , Guennadi Liakhovetski , Alan Stern References: <201104290154.12966.rjw@sisk.pl> <201105160117.46927.rjw@sisk.pl> <201105280115.14556.rjw@sisk.pl> In-Reply-To: <201105280115.14556.rjw@sisk.pl> MIME-Version: 1.0 Message-Id: <201105280119.27410.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 27 May 2011 23:20:55 +0000 (UTC) From: Rafael J. Wysocki Use the power domains support code added by the previous patches to implement support for power domain A4MP on SH7372. Signed-off-by: Rafael J. Wysocki --- arch/arm/mach-shmobile/board-mackerel.c | 2 ++ arch/arm/mach-shmobile/include/mach/sh7372.h | 3 +++ arch/arm/mach-shmobile/pm-sh7372.c | 7 +++++++ 3 files changed, 12 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-2.6/arch/arm/mach-shmobile/pm-sh7372.c =================================================================== --- linux-2.6.orig/arch/arm/mach-shmobile/pm-sh7372.c +++ linux-2.6/arch/arm/mach-shmobile/pm-sh7372.c @@ -104,9 +104,16 @@ static struct sh7372_domain_data sh7372_ struct generic_power_domain sh7372_a4lc_domain; +static struct sh7372_domain_data sh7372_a4mp_domain_data = { + .bit_shift = 2, +}; + +struct generic_power_domain sh7372_a4mp_domain; + static int __init sh7372_power_domains_init(void) { sh7372_init_domain(&sh7372_a4lc_domain, &sh7372_a4lc_domain_data); + sh7372_init_domain(&sh7372_a4mp_domain, &sh7372_a4mp_domain_data); return 0; } core_initcall(sh7372_power_domains_init); Index: linux-2.6/arch/arm/mach-shmobile/include/mach/sh7372.h =================================================================== --- linux-2.6.orig/arch/arm/mach-shmobile/include/mach/sh7372.h +++ linux-2.6/arch/arm/mach-shmobile/include/mach/sh7372.h @@ -476,11 +476,14 @@ struct platform_device; #ifdef CONFIG_PM extern struct generic_power_domain sh7372_a4lc_domain; #define SH7372_A4LC (&sh7372_a4lc_domain) +extern struct generic_power_domain sh7372_a4mp_domain; +#define SH7372_A4MP (&sh7372_a4mp_domain) extern void sh7372_add_device_to_domain(struct generic_power_domain *domain, struct platform_device *pdev); #else #define SH7372_A4LC NULL +#define SH7372_A4PM NULL static inline void sh7372_add_device_to_domain(struct generic_power_domain *dom, struct platform_device *pd) {} Index: linux-2.6/arch/arm/mach-shmobile/board-mackerel.c =================================================================== --- linux-2.6.orig/arch/arm/mach-shmobile/board-mackerel.c +++ linux-2.6/arch/arm/mach-shmobile/board-mackerel.c @@ -1421,6 +1421,8 @@ static void __init mackerel_init(void) sh7372_add_device_to_domain(SH7372_A4LC, &lcdc_device); sh7372_add_device_to_domain(SH7372_A4LC, &hdmi_lcdc_device); + sh7372_add_device_to_domain(SH7372_A4MP, &fsi_device); + hdmi_init_pm_clock(); sh7372_pm_init(); }