From: Hartvig Ekner <hartvig@ekner.info>
To: Linux MIPS mailing list <linux-mips@linux-mips.org>
Subject: Patches for all four au1000 setup.c files
Date: Fri, 21 Mar 2003 09:55:10 +0100 [thread overview]
Message-ID: <3E7AD36E.26E2EA94@ekner.info> (raw)
[-- Attachment #1: Type: text/plain, Size: 471 bytes --]
Hi,
the patches below for all four au1000 setup.c files removes the wbflush() routine, as this is no longer necessary
(handled by the generic code now, which does a sync). This also means that it is not necessary to say yes to
CONFIG_CPU_ADVANCED and override the CPU_HAS_WB setting, as the generic MIPS32 code will do just fine.
The patch for the db1x00 setup.c file also fixes a bug which prevented VRA from being used with Audio Codecs
which support it.
/Hartvig
[-- Attachment #2: setup.patch --]
[-- Type: text/plain, Size: 4138 bytes --]
Index: db1x00/setup.c
===================================================================
RCS file: /home/cvs/linux/arch/mips/au1000/db1x00/Attic/setup.c,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 setup.c
--- db1x00/setup.c 7 Jan 2003 10:41:30 -0000 1.1.2.3
+++ db1x00/setup.c 21 Mar 2003 08:44:49 -0000
@@ -61,7 +61,6 @@
extern struct ide_ops *ide_ops;
#endif
-void (*__wbflush) (void);
extern struct rtc_ops no_rtc_ops;
extern char * __init prom_getcmdline(void);
extern void au1000_restart(char *);
@@ -76,11 +75,6 @@
void __init bus_error_init(void) { /* nothing */ }
-void au1x00_wbflush(void)
-{
- __asm__ volatile ("sync");
-}
-
void __init au1x00_setup(void)
{
char *argptr;
@@ -109,14 +103,13 @@
}
#endif
-#if defined(CONFIG_SOUND_AU1000) && !defined(CONFIG_CPU_AU1000)
+#if defined(CONFIG_SOUND_AU1X00) && !defined(CONFIG_CPU_AU1000)
// au1000 does not support vra, au1500 and au1100 do
- strcat(argptr, " au1000_audio=vra");
- argptr = prom_getcmdline();
+ strcat(argptr, " au1000_audio=vra");
+ argptr = prom_getcmdline();
#endif
rtc_ops = &no_rtc_ops;
- __wbflush = au1x00_wbflush;
_machine_restart = au1000_restart;
_machine_halt = au1000_halt;
_machine_power_off = au1000_power_off;
Index: pb1000/setup.c
===================================================================
RCS file: /home/cvs/linux/arch/mips/au1000/pb1000/setup.c,v
retrieving revision 1.8.2.8
diff -u -r1.8.2.8 setup.c
--- pb1000/setup.c 11 Dec 2002 06:12:29 -0000 1.8.2.8
+++ pb1000/setup.c 21 Mar 2003 08:44:50 -0000
@@ -67,7 +67,6 @@
extern struct ide_ops *ide_ops;
#endif
-void (*__wbflush) (void);
extern struct rtc_ops no_rtc_ops;
extern char * __init prom_getcmdline(void);
extern void au1000_restart(char *);
@@ -78,11 +77,6 @@
void __init bus_error_init(void) { /* nothing */ }
-void au1000_wbflush(void)
-{
- __asm__ volatile ("sync");
-}
-
void __init au1x00_setup(void)
{
char *argptr;
@@ -103,7 +97,6 @@
#endif
rtc_ops = &no_rtc_ops;
- __wbflush = au1000_wbflush;
_machine_restart = au1000_restart;
_machine_halt = au1000_halt;
_machine_power_off = au1000_power_off;
Index: pb1100/setup.c
===================================================================
RCS file: /home/cvs/linux/arch/mips/au1000/pb1100/setup.c,v
retrieving revision 1.1.2.6
diff -u -r1.1.2.6 setup.c
--- pb1100/setup.c 31 Dec 2002 05:00:22 -0000 1.1.2.6
+++ pb1100/setup.c 21 Mar 2003 08:44:50 -0000
@@ -71,7 +71,6 @@
extern struct rtc_ops pb1500_rtc_ops;
#endif
-void (*__wbflush) (void);
extern char * __init prom_getcmdline(void);
extern void au1000_restart(char *);
extern void au1000_halt(void);
@@ -82,11 +81,6 @@
void __init bus_error_init(void) { /* nothing */ }
-void au1100_wbflush(void)
-{
- __asm__ volatile ("sync");
-}
-
void __init au1x00_setup(void)
{
char *argptr;
@@ -112,7 +106,6 @@
argptr = prom_getcmdline();
#endif
- __wbflush = au1100_wbflush;
_machine_restart = au1000_restart;
_machine_halt = au1000_halt;
_machine_power_off = au1000_power_off;
Index: pb1500/setup.c
===================================================================
RCS file: /home/cvs/linux/arch/mips/au1000/pb1500/setup.c,v
retrieving revision 1.1.2.10
diff -u -r1.1.2.10 setup.c
--- pb1500/setup.c 29 Dec 2002 10:30:35 -0000 1.1.2.10
+++ pb1500/setup.c 21 Mar 2003 08:44:50 -0000
@@ -43,7 +43,6 @@
#include <asm/mipsregs.h>
#include <asm/reboot.h>
#include <asm/pgtable.h>
-#include <asm/wbflush.h>
#include <asm/au1000.h>
#include <asm/pb1500.h>
@@ -72,7 +71,6 @@
extern struct rtc_ops pb1500_rtc_ops;
#endif
-void (*__wbflush) (void);
extern char * __init prom_getcmdline(void);
extern void au1000_restart(char *);
extern void au1000_halt(void);
@@ -87,11 +85,6 @@
void __init bus_error_init(void) { /* nothing */ }
-void au1500_wbflush(void)
-{
- __asm__ volatile ("sync");
-}
-
void __init au1x00_setup(void)
{
char *argptr;
@@ -117,7 +110,6 @@
argptr = prom_getcmdline();
#endif
- __wbflush = au1500_wbflush;
_machine_restart = au1000_restart;
_machine_halt = au1000_halt;
_machine_power_off = au1000_power_off;
next reply other threads:[~2003-03-21 8:50 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-03-21 8:55 Hartvig Ekner [this message]
2003-03-21 15:58 ` Patches for all four au1000 setup.c files Pete Popov
2003-03-21 19:39 ` Jeff Baitis
2003-03-21 22:12 ` Hartvig Ekner
2003-03-21 22:33 ` Juan Quintela
2003-03-21 22:45 ` Hartvig Ekner
2003-03-25 2:04 ` Jeff Baitis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3E7AD36E.26E2EA94@ekner.info \
--to=hartvig@ekner.info \
--cc=linux-mips@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox