From patchwork Thu Jul 7 02:30:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 951902 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p672ZLun019936 for ; Thu, 7 Jul 2011 02:35:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752769Ab1GGCaU (ORCPT ); Wed, 6 Jul 2011 22:30:20 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:59233 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751971Ab1GGCaU (ORCPT ); Wed, 6 Jul 2011 22:30:20 -0400 Received: by pvg12 with SMTP id 12so123295pvg.19 for ; Wed, 06 Jul 2011 19:30:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=date:sender:message-id:to:cc:subject:from:in-reply-to:references :user-agent:mime-version:content-type; bh=BI7iY2IGkzQDWijPClPjzNmRrWfRWQaFlX32Ya2cz2k=; b=esdxe1Zd7+3n8fcoDfW9LYJWu689LbW1hVp1+DqXrTNE+5DRQUzuETBcPq+qu3DUg2 WNoQDWLUSSBT8O2+8+x01s2aKNJZ5vYIw0iLY7jumM2SVQO9md+Te5MnBZBal7KCb2yE B4WjzCqs8bo9D6SUPutPp9xr9VmyQ6g6pzfcQ= Received: by 10.68.60.105 with SMTP id g9mr416515pbr.86.1310005819732; Wed, 06 Jul 2011 19:30:19 -0700 (PDT) Received: from morimoto-Dell-XPS420.gmail.com (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id x2sm5270656pbn.29.2011.07.06.19.30.18 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 06 Jul 2011 19:30:19 -0700 (PDT) Date: Wed, 06 Jul 2011 19:30:19 -0700 (PDT) Message-ID: <87aacqddqf.wl%kuninori.morimoto.gx@renesas.com> To: Paul Mundt , Magnus Damm , Rafael Cc: Morimoto , Linux-SH Subject: [PATCH 2/2 v2] ARM: mach-shmobile: sh7372 A4MP support From: Kuninori Morimoto In-Reply-To: References: <87fwmidg9k.wl%kuninori.morimoto.gx@renesas.com> User-Agent: SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?ISO-2022-JP-2?B?R29q?= =?ISO-2022-JP-2?B?GyQoRCtXGyhC?=) APEL/10.8 Emacs/23.2 (i686-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") 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 (demeter2.kernel.org [140.211.167.43]); Thu, 07 Jul 2011 02:35:21 +0000 (UTC) Add support for the sh7372 A4MP power domain and hook up the FSI/SPU2 device. Signed-off-by: Kuninori Morimoto Acked-by: Magnus Damm --- Thanks Magnus v1 -> v2 - A3MP -> A4MP arch/arm/mach-shmobile/board-ap4evb.c | 1 + arch/arm/mach-shmobile/board-mackerel.c | 1 + arch/arm/mach-shmobile/include/mach/sh7372.h | 1 + arch/arm/mach-shmobile/pm-sh7372.c | 4 ++++ arch/arm/mach-shmobile/setup-sh7372.c | 3 +++ 5 files changed, 10 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c index 4226db6..b473b8e 100644 --- a/arch/arm/mach-shmobile/board-ap4evb.c +++ b/arch/arm/mach-shmobile/board-ap4evb.c @@ -1410,6 +1410,7 @@ static void __init ap4evb_init(void) sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc1_device); sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc_device); + sh7372_add_device_to_domain(&sh7372_a4mp, &fsi_device); hdmi_init_pm_clock(); fsi_init_pm_clock(); diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index 362b883..5b36b6c 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -1584,6 +1584,7 @@ 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(); diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/include/mach/sh7372.h index 1aed9da..f3ceced 100644 --- a/arch/arm/mach-shmobile/include/mach/sh7372.h +++ b/arch/arm/mach-shmobile/include/mach/sh7372.h @@ -485,6 +485,7 @@ static inline struct sh7372_pm_domain *to_sh7372_pd(struct generic_pm_domain *d) #ifdef CONFIG_PM extern struct sh7372_pm_domain sh7372_a4lc; +extern struct sh7372_pm_domain sh7372_a4mp; extern struct sh7372_pm_domain sh7372_a3rv; extern struct sh7372_pm_domain sh7372_a3ri; extern struct sh7372_pm_domain sh7372_a3sg; diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c index 474a15a..f3bd95f 100644 --- a/arch/arm/mach-shmobile/pm-sh7372.c +++ b/arch/arm/mach-shmobile/pm-sh7372.c @@ -125,6 +125,10 @@ struct sh7372_pm_domain sh7372_a4lc = { .bit_shift = 1, }; +struct sh7372_pm_domain sh7372_a4mp = { + .bit_shift = 2, +}; + struct sh7372_pm_domain sh7372_a3rv = { .bit_shift = 6, }; diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c index b219cea..9b0cd43 100644 --- a/arch/arm/mach-shmobile/setup-sh7372.c +++ b/arch/arm/mach-shmobile/setup-sh7372.c @@ -842,6 +842,7 @@ static struct platform_device *sh7372_late_devices[] __initdata = { void __init sh7372_add_standard_devices(void) { sh7372_init_pm_domain(&sh7372_a4lc); + sh7372_init_pm_domain(&sh7372_a4mp); sh7372_init_pm_domain(&sh7372_a3rv); sh7372_init_pm_domain(&sh7372_a3ri); sh7372_init_pm_domain(&sh7372_a3sg); @@ -853,6 +854,8 @@ void __init sh7372_add_standard_devices(void) ARRAY_SIZE(sh7372_late_devices)); sh7372_add_device_to_domain(&sh7372_a3rv, &vpu_device); + sh7372_add_device_to_domain(&sh7372_a4mp, &spu0_device); + sh7372_add_device_to_domain(&sh7372_a4mp, &spu1_device); } void __init sh7372_add_early_devices(void)