2008-02-17 20:12:33

by Adrian Bunk

Subject: mips SMBUS_PSC_BASE compile errors

Commit 8b798c4d16b762d15f4055597ff8d87f73b35552 causes compile errors
like the following for several system types:

<-- snip -->

...
CC arch/mips/au1000/common/platform.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/au1000/common/platform.c:277: error: 'PSC0_BASE_ADDR' undeclared here (not in a function)
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/au1000/common/platform.c:314: warning: no previous prototype for 'au1xxx_platform_init'
make[2]: *** [arch/mips/au1000/common/platform.o] Error 1

<-- snip -->

One or more #include <asm/mach-au1x00/au1xxx_psc.h>'s at the right
places seem to be the correct solution, but I don't understand the mips
subarch setup good enough for knowing where to place them.

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

2008-02-18 10:21:57

by Manuel Lauss

Subject: Re: mips SMBUS_PSC_BASE compile errors

> ...
> CC arch/mips/au1000/common/platform.o
> /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/au1000/common/platform.c:277: error: 'PSC0_BASE_ADDR' undeclared here (not in a function)
> /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/au1000/common/platform.c:314: warning: no previous prototype for 'au1xxx_platform_init'
> make[2]: *** [arch/mips/au1000/common/platform.o] Error 1

Thanks, here's a patch. The db1200/pb1550 defconfigs (+ i2c enabled) compile
fine with it:

---

>From 0300b5b756561de57e09d49b06f608f2d541c3f3 Mon Sep 17 00:00:00 2001
From: Manuel Lauss <[email protected]>
Date: Mon, 18 Feb 2008 11:12:20 +0100
Subject: [PATCH] Alchemy: compile fix

Commit 8b798c4d16b762d15f4055597ff8d87f73b35552 broke
alchemy build, fix it. Pointed out by Adrian Bunk.

Signed-off-by: Manuel Lauss <[email protected]>
---
include/asm-mips/mach-db1x00/db1200.h | 1 +
include/asm-mips/mach-db1x00/db1x00.h | 1 +
include/asm-mips/mach-pb1x00/pb1200.h | 1 +
include/asm-mips/mach-pb1x00/pb1550.h | 1 +
4 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/include/asm-mips/mach-db1x00/db1200.h b/include/asm-mips/mach-db1x00/db1200.h
index 050eae8..a6bdac6 100644
--- a/include/asm-mips/mach-db1x00/db1200.h
+++ b/include/asm-mips/mach-db1x00/db1200.h
@@ -25,6 +25,7 @@
#define __ASM_DB1200_H

#include <linux/types.h>
+#include <asm/mach-au1x00/au1xxx_psc.h>

// This is defined in au1000.h with bogus value
#undef AU1X00_EXTERNAL_INT
diff --git a/include/asm-mips/mach-db1x00/db1x00.h b/include/asm-mips/mach-db1x00/db1x00.h
index 0f5f4c2..e7a88ba 100644
--- a/include/asm-mips/mach-db1x00/db1x00.h
+++ b/include/asm-mips/mach-db1x00/db1x00.h
@@ -28,6 +28,7 @@
#ifndef __ASM_DB1X00_H
#define __ASM_DB1X00_H

+#include <asm/mach-au1x00/au1xxx_psc.h>

#ifdef CONFIG_MIPS_DB1550

diff --git a/include/asm-mips/mach-pb1x00/pb1200.h b/include/asm-mips/mach-pb1x00/pb1200.h
index d9f384a..ed5fd73 100644
--- a/include/asm-mips/mach-pb1x00/pb1200.h
+++ b/include/asm-mips/mach-pb1x00/pb1200.h
@@ -25,6 +25,7 @@
#define __ASM_PB1200_H

#include <linux/types.h>
+#include <asm/mach-au1x00/au1xxx_psc.h>

// This is defined in au1000.h with bogus value
#undef AU1X00_EXTERNAL_INT
diff --git a/include/asm-mips/mach-pb1x00/pb1550.h b/include/asm-mips/mach-pb1x00/pb1550.h
index 9a4955c..c2ab0e2 100644
--- a/include/asm-mips/mach-pb1x00/pb1550.h
+++ b/include/asm-mips/mach-pb1x00/pb1550.h
@@ -28,6 +28,7 @@
#define __ASM_PB1550_H

#include <linux/types.h>
+#include <asm/mach-au1x00/au1xxx_psc.h>

#define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX
#define DBDMA_AC97_RX_CHAN DSCR_CMD0_PSC1_RX
--
1.5.4

2008-02-18 11:50:00

by Jean Delvare

Subject: Re: mips SMBUS_PSC_BASE compile errors

On Mon, 18 Feb 2008 11:21:46 +0100, Manuel Lauss wrote:
> > ...
> > CC arch/mips/au1000/common/platform.o
> > /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/au1000/common/platform.c:277: error: 'PSC0_BASE_ADDR' undeclared here (not in a function)
> > /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/au1000/common/platform.c:314: warning: no previous prototype for 'au1xxx_platform_init'
> > make[2]: *** [arch/mips/au1000/common/platform.o] Error 1
>
> Thanks, here's a patch. The db1200/pb1550 defconfigs (+ i2c enabled) compile
> fine with it:
>
> ---
>
> From 0300b5b756561de57e09d49b06f608f2d541c3f3 Mon Sep 17 00:00:00 2001
> From: Manuel Lauss <[email protected]>
> Date: Mon, 18 Feb 2008 11:12:20 +0100
> Subject: [PATCH] Alchemy: compile fix
>
> Commit 8b798c4d16b762d15f4055597ff8d87f73b35552 broke
> alchemy build, fix it. Pointed out by Adrian Bunk.
>
> Signed-off-by: Manuel Lauss <[email protected]>
> ---
> include/asm-mips/mach-db1x00/db1200.h | 1 +
> include/asm-mips/mach-db1x00/db1x00.h | 1 +
> include/asm-mips/mach-pb1x00/pb1200.h | 1 +
> include/asm-mips/mach-pb1x00/pb1550.h | 1 +
> 4 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/include/asm-mips/mach-db1x00/db1200.h b/include/asm-mips/mach-db1x00/db1200.h
> index 050eae8..a6bdac6 100644
> --- a/include/asm-mips/mach-db1x00/db1200.h
> +++ b/include/asm-mips/mach-db1x00/db1200.h
> @@ -25,6 +25,7 @@
> #define __ASM_DB1200_H
>
> #include <linux/types.h>
> +#include <asm/mach-au1x00/au1xxx_psc.h>
>
> // This is defined in au1000.h with bogus value
> #undef AU1X00_EXTERNAL_INT
> diff --git a/include/asm-mips/mach-db1x00/db1x00.h b/include/asm-mips/mach-db1x00/db1x00.h
> index 0f5f4c2..e7a88ba 100644
> --- a/include/asm-mips/mach-db1x00/db1x00.h
> +++ b/include/asm-mips/mach-db1x00/db1x00.h
> @@ -28,6 +28,7 @@
> #ifndef __ASM_DB1X00_H
> #define __ASM_DB1X00_H
>
> +#include <asm/mach-au1x00/au1xxx_psc.h>
>
> #ifdef CONFIG_MIPS_DB1550
>
> diff --git a/include/asm-mips/mach-pb1x00/pb1200.h b/include/asm-mips/mach-pb1x00/pb1200.h
> index d9f384a..ed5fd73 100644
> --- a/include/asm-mips/mach-pb1x00/pb1200.h
> +++ b/include/asm-mips/mach-pb1x00/pb1200.h
> @@ -25,6 +25,7 @@
> #define __ASM_PB1200_H
>
> #include <linux/types.h>
> +#include <asm/mach-au1x00/au1xxx_psc.h>
>
> // This is defined in au1000.h with bogus value
> #undef AU1X00_EXTERNAL_INT
> diff --git a/include/asm-mips/mach-pb1x00/pb1550.h b/include/asm-mips/mach-pb1x00/pb1550.h
> index 9a4955c..c2ab0e2 100644
> --- a/include/asm-mips/mach-pb1x00/pb1550.h
> +++ b/include/asm-mips/mach-pb1x00/pb1550.h
> @@ -28,6 +28,7 @@
> #define __ASM_PB1550_H
>
> #include <linux/types.h>
> +#include <asm/mach-au1x00/au1xxx_psc.h>
>
> #define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX
> #define DBDMA_AC97_RX_CHAN DSCR_CMD0_PSC1_RX

As the breakage came through my i2c tree, I guess I am supposed to push
this fix as well?

--
Jean Delvare

2008-02-18 17:51:41

by Manuel Lauss

Subject: Re: mips SMBUS_PSC_BASE compile errors

Hi Jean,

On Mon, Feb 18, 2008 at 12:49:47PM +0100, Jean Delvare wrote:
> On Mon, 18 Feb 2008 11:21:46 +0100, Manuel Lauss wrote:
> > > ...
> > > CC arch/mips/au1000/common/platform.o
> > > /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/au1000/common/platform.c:277: error: 'PSC0_BASE_ADDR' undeclared here (not in a function)
> > > /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/au1000/common/platform.c:314: warning: no previous prototype for 'au1xxx_platform_init'
> > > make[2]: *** [arch/mips/au1000/common/platform.o] Error 1
> >
> > Thanks, here's a patch. The db1200/pb1550 defconfigs (+ i2c enabled) compile

[...]

> As the breakage came through my i2c tree, I guess I am supposed to push
> this fix as well?

Yes, please do.

Thank you!
Manuel Lauss