From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ralf Baechle Subject: Re: [PATCH 10/14] PM / MIPS: Use struct syscore_ops instead of sysdevs for PM Date: Mon, 18 Apr 2011 11:12:18 +0100 Message-ID: <20110418101218.GA25325@linux-mips.org> References: <201103280125.11750.rjw@sisk.pl> <201104172301.54115.rjw@sisk.pl> <201104172312.35060.rjw@sisk.pl> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <201104172312.35060.rjw@sisk.pl> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: "Rafael J. Wysocki" Cc: Kevin Hilman , Guan Xuetao , Russell King , Konrad Rzeszutek Wilk , Benjamin Herrenschmidt , Greg KH , LKML , Jeremy Fitzhardinge , Ben Dooks , Jiri Kosina , Kay Sievers , Mike Frysinger , Linux PM mailing list , linux-omap@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Hans-Christian Egtvedt , linux-arm-kernel@lists.infradead.org List-Id: linux-omap@vger.kernel.org This patch breaks the Alchemy kernel compile; below patch on top of it fixes that again. Signed-off-by: Ralf Baechle --- arch/mips/alchemy/common/irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-mips/arch/mips/alchemy/common/irq.c =================================================================== --- linux-mips.orig/arch/mips/alchemy/common/irq.c +++ linux-mips/arch/mips/alchemy/common/irq.c @@ -619,8 +619,8 @@ static struct syscore_ops alchemy_ic_sys static int __init alchemy_ic_syscore_init(void) { - alchemy_ic_data[0].base = ioremap(icbase[IC0_PHYS_ADDR], 0x1000); - alchemy_ic_data[1].base = ioremap(icbase[IC1_PHYS_ADDR], 0x1000); + alchemy_ic_data[0].base = ioremap(IC0_PHYS_ADDR, 0x1000); + alchemy_ic_data[1].base = ioremap(IC1_PHYS_ADDR, 0x1000); register_syscore_ops(&alchemy_ic_syscore_ops); From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from duck.linux-mips.net (h5.dl5rb.org.uk [81.2.74.5]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 56764B6FB9 for ; Mon, 18 Apr 2011 20:41:02 +1000 (EST) Date: Mon, 18 Apr 2011 11:12:18 +0100 From: Ralf Baechle To: "Rafael J. Wysocki" Subject: Re: [PATCH 10/14] PM / MIPS: Use struct syscore_ops instead of sysdevs for PM Message-ID: <20110418101218.GA25325@linux-mips.org> References: <201103280125.11750.rjw@sisk.pl> <201104172301.54115.rjw@sisk.pl> <201104172312.35060.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <201104172312.35060.rjw@sisk.pl> Cc: Kevin Hilman , Guan Xuetao , Russell King , Konrad Rzeszutek Wilk , Greg KH , LKML , Jeremy Fitzhardinge , Ben Dooks , Jiri Kosina , Kay Sievers , Mike Frysinger , Linux PM mailing list , linux-omap@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Hans-Christian Egtvedt , linux-arm-kernel@lists.infradead.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , This patch breaks the Alchemy kernel compile; below patch on top of it fixes that again. Signed-off-by: Ralf Baechle --- arch/mips/alchemy/common/irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-mips/arch/mips/alchemy/common/irq.c =================================================================== --- linux-mips.orig/arch/mips/alchemy/common/irq.c +++ linux-mips/arch/mips/alchemy/common/irq.c @@ -619,8 +619,8 @@ static struct syscore_ops alchemy_ic_sys static int __init alchemy_ic_syscore_init(void) { - alchemy_ic_data[0].base = ioremap(icbase[IC0_PHYS_ADDR], 0x1000); - alchemy_ic_data[1].base = ioremap(icbase[IC1_PHYS_ADDR], 0x1000); + alchemy_ic_data[0].base = ioremap(IC0_PHYS_ADDR, 0x1000); + alchemy_ic_data[1].base = ioremap(IC1_PHYS_ADDR, 0x1000); register_syscore_ops(&alchemy_ic_syscore_ops); From mboxrd@z Thu Jan 1 00:00:00 1970 From: ralf@linux-mips.org (Ralf Baechle) Date: Mon, 18 Apr 2011 11:12:18 +0100 Subject: [PATCH 10/14] PM / MIPS: Use struct syscore_ops instead of sysdevs for PM In-Reply-To: <201104172312.35060.rjw@sisk.pl> References: <201103280125.11750.rjw@sisk.pl> <201104172301.54115.rjw@sisk.pl> <201104172312.35060.rjw@sisk.pl> Message-ID: <20110418101218.GA25325@linux-mips.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org This patch breaks the Alchemy kernel compile; below patch on top of it fixes that again. Signed-off-by: Ralf Baechle --- arch/mips/alchemy/common/irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-mips/arch/mips/alchemy/common/irq.c =================================================================== --- linux-mips.orig/arch/mips/alchemy/common/irq.c +++ linux-mips/arch/mips/alchemy/common/irq.c @@ -619,8 +619,8 @@ static struct syscore_ops alchemy_ic_sys static int __init alchemy_ic_syscore_init(void) { - alchemy_ic_data[0].base = ioremap(icbase[IC0_PHYS_ADDR], 0x1000); - alchemy_ic_data[1].base = ioremap(icbase[IC1_PHYS_ADDR], 0x1000); + alchemy_ic_data[0].base = ioremap(IC0_PHYS_ADDR, 0x1000); + alchemy_ic_data[1].base = ioremap(IC1_PHYS_ADDR, 0x1000); register_syscore_ops(&alchemy_ic_syscore_ops); From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754225Ab1DRKlN (ORCPT ); Mon, 18 Apr 2011 06:41:13 -0400 Received: from h5.dl5rb.org.uk ([81.2.74.5]:38987 "EHLO duck.linux-mips.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753072Ab1DRKlH (ORCPT ); Mon, 18 Apr 2011 06:41:07 -0400 X-Greylist: delayed 1515 seconds by postgrey-1.27 at vger.kernel.org; Mon, 18 Apr 2011 06:41:07 EDT Date: Mon, 18 Apr 2011 11:12:18 +0100 From: Ralf Baechle To: "Rafael J. Wysocki" Cc: LKML , Greg KH , Kay Sievers , Linux PM mailing list , Russell King , linux-omap@vger.kernel.org, Kevin Hilman , linux-arm-kernel@lists.infradead.org, Ben Dooks , Mike Frysinger , Hans-Christian Egtvedt , Guan Xuetao , Benjamin Herrenschmidt , linuxppc-dev@lists.ozlabs.org, Jiri Kosina , Konrad Rzeszutek Wilk , Jeremy Fitzhardinge Subject: Re: [PATCH 10/14] PM / MIPS: Use struct syscore_ops instead of sysdevs for PM Message-ID: <20110418101218.GA25325@linux-mips.org> References: <201103280125.11750.rjw@sisk.pl> <201104172301.54115.rjw@sisk.pl> <201104172312.35060.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201104172312.35060.rjw@sisk.pl> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch breaks the Alchemy kernel compile; below patch on top of it fixes that again. Signed-off-by: Ralf Baechle --- arch/mips/alchemy/common/irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-mips/arch/mips/alchemy/common/irq.c =================================================================== --- linux-mips.orig/arch/mips/alchemy/common/irq.c +++ linux-mips/arch/mips/alchemy/common/irq.c @@ -619,8 +619,8 @@ static struct syscore_ops alchemy_ic_sys static int __init alchemy_ic_syscore_init(void) { - alchemy_ic_data[0].base = ioremap(icbase[IC0_PHYS_ADDR], 0x1000); - alchemy_ic_data[1].base = ioremap(icbase[IC1_PHYS_ADDR], 0x1000); + alchemy_ic_data[0].base = ioremap(IC0_PHYS_ADDR, 0x1000); + alchemy_ic_data[1].base = ioremap(IC1_PHYS_ADDR, 0x1000); register_syscore_ops(&alchemy_ic_syscore_ops);