Received: from mail.onstor.com (66.201.51.107) by exch1.onstor.net
 (10.0.0.225) with Microsoft SMTP Server id 8.1.311.2; Mon, 19 Jan 2009
 14:44:24 -0800
Received: from dalesmta2-3.messageone.com ([129.41.169.249]) by
 mail.onstor.com with Microsoft SMTPSVC(6.0.3790.3959);	 Mon, 19 Jan 2009
 14:44:16 -0800
Received: from ftp.linux-mips.org (ftp.linux-mips.org [213.58.128.207])	by
 dalesmta2-3.messageone.com (8.13.8/8.13.8) with ESMTP id n0JMiFew030391	for
 <andy.sharp@onstor.com>; Mon, 19 Jan 2009 16:44:16 -0600
Received: from localhost.localdomain ([127.0.0.1]:53207 "EHLO
	ftp.linux-mips.org") by ftp.linux-mips.org with ESMTP	id S21365788AbZASWnr
 (ORCPT <rfc822;andy.sharp@onstor.com>);	Mon, 19 Jan 2009 22:43:47 +0000
Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 19 Jan 2009 22:43:30
 +0000 (GMT)
Received: from orbit.nwl.cc ([91.121.169.95]:58849 "EHLO mail.nwl.cc")	by
 ftp.linux-mips.org with ESMTP id S21366174AbZASWnK (ORCPT
	<rfc822;linux-mips@linux-mips.org>); Mon, 19 Jan 2009 22:43:10 +0000
Received: from base (localhost [127.0.0.1])	by mail.nwl.cc (Postfix) with
 ESMTP id EAA84400E123;	Mon, 19 Jan 2009 23:43:04 +0100 (CET)
From: Phil Sutter <n0-1@freewrt.org>
To: Linux-Mips List <linux-mips@linux-mips.org>
CC: "ralf@linux-mips.org" <ralf@linux-mips.org>, "florian@openwrt.org"
	<florian@openwrt.org>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Mon, 19 Jan 2009 14:42:54 -0800
Subject: [PATCH 5/5] MIPS: rb532: simplify dev3 init
Thread-Topic: [PATCH 5/5] MIPS: rb532: simplify dev3 init
Thread-Index: Acl6h3pV9hlgId0vSVWopHM3beVnWA==
Message-ID: <20090119224304.EAA84400E123@mail.nwl.cc>
References: <1232404974-18497-1-git-send-email-n0-1@freewrt.org>
 <1232404974-18497-2-git-send-email-n0-1@freewrt.org>
 <1232404974-18497-3-git-send-email-n0-1@freewrt.org>
 <1232404974-18497-4-git-send-email-n0-1@freewrt.org>
In-Reply-To: <1232404974-18497-4-git-send-email-n0-1@freewrt.org>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Internal
X-MS-Exchange-Organization-AuthMechanism: 0b
X-MS-Exchange-Organization-AuthSource: exch1.onstor.net
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-originalarrivaltime: 19 Jan 2009 22:44:17.0058 (UTC)
 FILETIME=[75B29020:01C97A87]
errors-to: linux-mips-bounce@linux-mips.org
x-ems-proccessed: 2K3Xl1OQTInXD6xxuA8z3Q==
x-ems-stamp: hyBgb2zXucgykOILNqc8Sw==
x-messageone-virus-version: vendor=fsecure
 engine=4.65.7400:2.4.4,1.2.40,4.0.164
 definitions=2009-01-19_11:2009-01-18,2009-01-19,2009-01-19 signatures=0
x-messageone-virus-scanned: Clean
x-messageone-envelope-sender: linux-mips-bounce@linux-mips.org
x-messageone-spam-details: rule=m773emszm_notspam policy=m773emszm score=0
 spamscore=0 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam
 adjust=0 reason=mlx engine=3.1.0-0810130000 definitions=main-0901190130
x-messageone-spam-score: 0
x-messageone-spam-bar:
x-list: linux-mips
x-archive-position: 21779
x-ecartis-version: Ecartis v1.0.0
x-original-sender: n0-1@freewrt.org
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

As rb532_dev3_ctl_res is not used by any platform device, it can be
dropped when not used for holding the physical address of the device 3
controller.
Also a size of one byte should suffice when ioremapping the physical
address mentioned above, as only a single byte is being read from and
written to it.

Signed-off-by: Phil Sutter <n0-1@freewrt.org>
---
 arch/mips/rb532/devices.c |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
index 1a0209e..4a5f05b 100644
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
@@ -63,13 +63,6 @@ unsigned char get_latch_u5(void)
 }
 EXPORT_SYMBOL(get_latch_u5);
=20
-static struct resource rb532_dev3_ctl_res[] =3D {
-	{
-		.name	=3D "dev3_ctl",
-		.flags	=3D IORESOURCE_MEM,
-	}
-};
-
 static struct resource korina_dev0_res[] =3D {
 	{
 		.name =3D "korina_regs",
@@ -342,11 +335,8 @@ static int __init plat_setup_devices(void)
 	nand_slot0_res[0].start =3D readl(IDT434_REG_BASE + DEV2BASE);
 	nand_slot0_res[0].end =3D nand_slot0_res[0].start + 0x1000;
=20
-	/* Read the third (multi purpose) resources from the DC */
-	rb532_dev3_ctl_res[0].start =3D readl(IDT434_REG_BASE + DEV3BASE);
-	rb532_dev3_ctl_res[0].end =3D rb532_dev3_ctl_res[0].start + 0x1000;
-
-	dev3.base =3D ioremap_nocache(rb532_dev3_ctl_res[0].start, 0x1000);
+	/* Read and map device controller 3 */
+	dev3.base =3D ioremap_nocache(readl(IDT434_REG_BASE + DEV3BASE), 1);
=20
 	if (!dev3.base) {
 		printk(KERN_ERR "rb532: cannot remap device controller 3\n");
--=20
1.5.6.4


