Re: marvell final patch

[Lwazi Dub <lwazidub%gmail.com@localhost>]

>
> ---------- Forwarded message ----------
> From: KIYOHARA Takashi <kiyohara%kk.iij4u.or.jp@localhost>
> Date: Sat, Sep 25, 2010 at 1:06 AM
> Subject: marvell final patch
> To: current-users%netbsd.org@localhost, port-arm%netbsd.org@localhost
>
>
> Hi! all,
>
>
> I put newer(final) patch and files.
>
> ftp://ftp.netbsd.org/pub/NetBSD/misc/kiyohara/marvell/marvell-20100922.diff
> ftp://ftp.netbsd.org/pub/NetBSD/misc/kiyohara/marvell/marvell-20100922.tar.gz
>
> Also extracted tar.gz file.
>
> ftp://ftp.netbsd.org/pub/NetBSD/misc/kiyohara/marvell/marvell-20100922.tar.gz-extracted/
>
..
>
> I plan to merge this patch and files on the next weekend.  ;-)
> # By the way, DNS323 is not tested for a long time.  Is this necessary
> # for us?
It is important to me :) I will be testing this patch on DNS323 after
I build userland. I applied your patch to the 201009240000Z snapshot
but it had minor compile time errors.
Here are the changes I made to force it to build.

diff --git a/src/sys/arch/arm/marvell/mvsocgpp.c
b/src/sys/arch/arm/marvell/mvsocgpp.c
--- a/src/sys/arch/arm/marvell/mvsocgpp.c
+++ b/src/sys/arch/arm/marvell/mvsocgpp.c
@@ -153,7 +153,7 @@
        }

        if (gpp_npins > 0)
-               aprint_normal_dev(self, "%s gpio pins\n", gpp_npins);
+               aprint_normal_dev(self, "%d gpio pins\n", gpp_npins);
        else {
                aprint_error_dev(self, "gpp_npins not initialized\n");
                return;
diff --git a/src/sys/arch/arm/marvell/pci_machdep.c
b/src/sys/arch/arm/marvell/pci_machdep.c
--- a/src/sys/arch/arm/marvell/pci_machdep.c
+++ b/src/sys/arch/arm/marvell/pci_machdep.c
@@ -252,7 +252,7 @@
        int2gpp = prop_dictionary_get(device_properties(sc->sc_dev), "int2gpp");
        gpp = prop_array_get(int2gpp, int_pin);
        gpp_pin = prop_number_integer_value(gpp);
-       return mvsocgpp_intr_establish(gpp_pin, ipl, intrhand, intrarg);
+    return mvsocgpp_intr_establish(gpp_pin, ipl,  0 /*type? FIXME*/,
intrhand,  intrarg);
 }

 static void
diff --git a/src/sys/dev/i2c/m41t80.c b/src/sys/dev/i2c/m41t80.c
--- a/src/sys/dev/i2c/m41t80.c
+++ b/src/sys/dev/i2c/m41t80.c
@@ -61,5 +61,5 @@
 static int m41t80rtc_clock_write(struct m41t80rtc_softc *,
                                 struct clock_ymdhms *);
 static int m41t80rtc_gettime(struct todr_chip_handle *,
-                            volatile struct timeval *);
+                             struct timeval *);
 static int m41t80rtc_settime(struct todr_chip_handle *,
@@ -65,5 +65,5 @@
 static int m41t80rtc_settime(struct todr_chip_handle *,
-                            volatile struct timeval *);
+                             struct timeval *);

 static int
 m41t80rtc_match(device_t parent, struct cfdata *cf, void *arg)
@@ -99,7 +99,7 @@


 static int
-m41t80rtc_gettime(struct todr_chip_handle *ch, volatile struct timeval *tv)
+m41t80rtc_gettime(struct todr_chip_handle *ch,  struct timeval *tv)
 {
        struct m41t80rtc_softc *sc;
        struct clock_ymdhms dt;
@@ -116,7 +116,7 @@
 }

 static int
-m41t80rtc_settime(struct todr_chip_handle *ch, volatile struct timeval *tv)
+m41t80rtc_settime(struct todr_chip_handle *ch,  struct timeval *tv)
 {
        struct m41t80rtc_softc *sc = ch->cookie;
        struct clock_ymdhms dt;