 @@ -1,14 +1,14 @@
-/* $NetBSD: pxa2x0_lcd.c,v 1.26 2007/10/17 19:53:44 garbled Exp $ */
+/* $NetBSD: pxa2x0_lcd.c,v 1.27 2009/01/29 12:28:15 nonaka Exp $ */
 /*
  * Copyright (c) 2002  Genetec Corporation.  All rights reserved.
  * Written by Hiroyuki Bessho for Genetec Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -28,27 +28,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Support PXA2[15]0's integrated LCD controller.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_lcd.c,v 1.26 2007/10/17 19:53:44 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_lcd.c,v 1.27 2009/01/29 12:28:15 nonaka Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>			/* for cold */
 #include <uvm/uvm_extern.h>
 #include <dev/cons.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 @@ -127,26 +127,28 @@ pxa2x0_lcd_geometry(struct pxa2x0_lcd_so
 	    | (info->vsync_pulse_width<<10)
 	    | (info->end_frame_wait<<16)
 	    | (info->beg_frame_wait<<24));
 	bus_space_write_4(iot, ioh, LCDC_LCCR3,
 	    (info->pixel_clock_div<<0)
 	    | (info->ac_bias << 8)
 	    | ((info->panel_info &
 		(LCDPANEL_VSP|LCDPANEL_HSP|LCDPANEL_PCP|LCDPANEL_OEP))
 		<<20)
 	    | (4 << 24) /* 16bpp */
 	    | ((info->panel_info & LCDPANEL_DPC) ? (1<<27) : 0)
 	    );
 	bus_space_write_4(iot, ioh, LCDC_LCCR4, (info->pcd_div << 31));
+}
 /*
  * Initialize the LCD controller.
  */
 void
 pxa2x0_lcd_initialize(struct pxa2x0_lcd_softc *sc,
     const struct lcd_panel_geometry *geom)
+{
 	bus_space_tag_t iot;
 	bus_space_handle_t ioh;
 	uint32_t lccr0, lscr;
 	int nldd;
 @@ -175,27 +177,28 @@ pxa2x0_lcd_initialize(struct pxa2x0_lcd_
 	lccr0 = LCCR0_IMASK;
 	if (CPU_IS_PXA270)
 		lccr0 |= LCCR0_CMDIM|LCCR0_RDSTM;
 	bus_space_write_4(iot, ioh, LCDC_LCCR0, lccr0);
 	/*
 	 * setup GP[77:58] for LCD
 	 */
 	/* Always use [FLP]CLK, ACBIAS */
 	pxa2x0_gpio_set_function(74, GPIO_ALT_FN_2_OUT);
 	pxa2x0_gpio_set_function(75, GPIO_ALT_FN_2_OUT);
 	pxa2x0_gpio_set_function(76, GPIO_ALT_FN_2_OUT);
-	pxa2x0_gpio_set_function(77, GPIO_ALT_FN_2_OUT);
+	if (!ISSET(sc->flags, FLAG_NOUSE_ACBIAS))
 		pxa2x0_gpio_set_function(77, GPIO_ALT_FN_2_OUT);
 	if ((geom->panel_info & LCDPANEL_ACTIVE) ||
 	    ((geom->panel_info & (LCDPANEL_MONOCHROME|LCDPANEL_DUAL)) ==
 	    LCDPANEL_DUAL)) {
 		/* active and color dual panel need L_DD[15:0] */
 		nldd = 16;
 	} else if ((geom->panel_info & LCDPANEL_DUAL) ||
 	    !(geom->panel_info & LCDPANEL_MONOCHROME)) {
 		/* dual or color need L_DD[7:0] */
 		nldd = 8;
 	} else {
 		/* Otherwise just L_DD[3:0] */
 		nldd = 4;
 @@ -208,80 +211,82 @@ pxa2x0_lcd_initialize(struct pxa2x0_lcd_
+}
 /*
  * Common driver attachment code.
  */
 void
 pxa2x0_lcd_attach_sub(struct pxa2x0_lcd_softc *sc,
     struct pxaip_attach_args *pxa, const struct lcd_panel_geometry *geom)
+{
 	bus_space_tag_t iot = pxa->pxa_iot;
 	bus_space_handle_t ioh;
 	int error;
 	aprint_normal(": PXA2x0 LCD controller\n");
 	aprint_naive("\n");
 	sc->n_screens = 0;
 	LIST_INIT(&sc->screens);
 	/* map controller registers */
-	error = bus_space_map(iot, PXA2X0_LCDC_BASE,
+	error = bus_space_map(iot, PXA2X0_LCDC_BASE, PXA2X0_LCDC_SIZE, 0, &ioh);
 			       PXA2X0_LCDC_SIZE, 0, &ioh);
 	if (error) {
-		printf(": failed to map registers (errno=%d)\n", error);
+		aprint_error_dev(sc->dev,
 		    "failed to map registers (errno=%d)\n", error);
 		return;
+	}
 	sc->iot = iot;
 	sc->ioh = ioh;
 	sc->dma_tag = &pxa2x0_bus_dma_tag;
 	sc->ih = pxa2x0_intr_establish(PXA2X0_INT_LCD, IPL_BIO, lcdintr, sc);
 	if (sc->ih == NULL) {
-		printf(": unable to establish interrupt at irq %d\n",
+		aprint_error_dev(sc->dev,
 		    "unable to establish interrupt at irq %d\n",
 		    PXA2X0_INT_LCD);
 		return;
+	}
 	printf(": PXA2x0 LCD controller\n");
 	pxa2x0_lcd_initialize(sc, geom);
 	if (pxa2x0_lcd_console.is_console) {
 		struct pxa2x0_wsscreen_descr *descr = pxa2x0_lcd_console.descr;
 		struct pxa2x0_lcd_screen *scr;
 		struct rasops_info *ri;
 		long defattr;
 		error = pxa2x0_lcd_new_screen(sc, descr->depth, &scr);
 		if (error) {
-			printf("%s: unable to create new screen (errno=%d)",
+			aprint_error_dev(sc->dev,
-			    sc->dev.dv_xname, error);
+			"unable to create new screen (errno=%d)", error);
 			return;
+		}
 		ri = &scr->rinfo;
 		ri->ri_hw = (void *)scr;
 		ri->ri_bits = scr->buf_va;
 		pxa2x0_lcd_setup_rasops(sc, ri, descr, geom);
 		/* assumes 16 bpp */
 		(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
 		pxa2x0_lcd_start_dma(sc, scr);
 		sc->active = scr;
 		wsdisplay_cnattach(&descr->c, ri, ri->ri_ccol, ri->ri_crow,
 		    defattr);
-		printf("%s: console\n", sc->dev.dv_xname);
+		aprint_normal_dev(sc->dev, "console\n");
+	}
+}
 int
 pxa2x0_lcd_cnattach(struct pxa2x0_wsscreen_descr *descr,
     const struct lcd_panel_geometry *geom)
+{
 	pxa2x0_lcd_console.descr = descr;
 	pxa2x0_lcd_console.geom = geom;
 	pxa2x0_lcd_console.is_console = 1;
 	return 0;
 @@ -481,32 +486,30 @@ pxa2x0_lcd_new_screen(struct pxa2x0_lcd_
 	case 4:
 	case 8:
 		palette_size = (1<<depth) * sizeof (uint16_t);
 		/* FALLTHROUGH */
 	case 16:
 		size = roundup(width,4) * 2 * height;
 		break;
 	case 18:
 	case 24:
 		size = roundup(width,4) * 4 * height;
 		break;
 	case 19:
 	case 25:
-		printf("%s: Not supported depth (%d)\n",
+		aprint_error_dev(sc->dev, "Not supported depth (%d)\n", depth);
 		    sc->dev.dv_xname, depth);
 		return EINVAL;
 	default:
-		printf("%s: Unknown depth (%d)\n",
+		aprint_error_dev(sc->dev, "Unknown depth (%d)\n", depth);
 		    sc->dev.dv_xname, depth);
 		return EINVAL;
+	}
 	scr = malloc(sizeof(*scr), M_DEVBUF, M_NOWAIT);
 	if (scr == NULL)
 		return ENOMEM;
 	memset(scr, 0, sizeof(*scr));
 	scr->nsegs = 0;
 	scr->depth = depth;
 	scr->buf_size = size;
 	scr->buf_va = NULL;

 @@ -1,14 +1,14 @@
-/* $NetBSD: pxa2x0_lcd.h,v 1.8 2007/03/04 05:59:39 christos Exp $ */
+/* $NetBSD: pxa2x0_lcd.h,v 1.9 2009/01/29 12:28:15 nonaka Exp $ */
 /*
  * Copyright (c) 2002  Genetec Corporation.  All rights reserved.
  * Written by Hiroyuki Bessho for Genetec Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -63,31 +63,34 @@ struct pxa2x0_lcd_screen {
 	size_t  map_size;
 	void 	*buf_va;
 	int	depth;
 	/* DMA frame descriptor */
 	struct	lcd_dma_descriptor *dma_desc;
 	paddr_t	dma_desc_pa;
 	/* rasterop */
 	struct rasops_info rinfo;
 };
 struct pxa2x0_lcd_softc {
-	struct device  dev;
+	device_t		dev;
 	/* control register */
 	bus_space_tag_t  	iot;
 	bus_space_handle_t	ioh;
 	bus_dma_tag_t    	dma_tag;
 	uint32_t		flags;
 #define FLAG_NOUSE_ACBIAS	(1U<<0)
 	const struct lcd_panel_geometry *geometry;
 	int n_screens;
 	LIST_HEAD(, pxa2x0_lcd_screen) screens;
 	struct pxa2x0_lcd_screen *active;
 	void *ih;			/* interrupt handler */
 };
 struct lcd_panel_geometry {
 	short panel_width;
 	short panel_height;
 	short extra_lines;
 @@ -105,26 +108,28 @@ struct lcd_panel_geometry {
 #define LCDPANEL_PASSIVE 0
 #define LCDPANEL_MONOCHROME (1<<7)	/* depth=1 */
 	short pixel_clock_div;		/* pixel clock divider */
 	short ac_bias;			/* AC bias pin frequency */
 	short hsync_pulse_width;	/* Horizontao sync pulse width */
 	short beg_line_wait;		/* beginning of line wait (BLW) */
 	short end_line_wait;		/* end of line pxel wait (ELW) */
 	short vsync_pulse_width;	/* vertical sync pulse width */
 	short beg_frame_wait;		/* beginning of frame wait (BFW) */
 	short end_frame_wait;		/* end of frame wait (EFW) */
 	short pcd_div;			/* PCD divisor selection */
 };
 /*
  * we need bits-per-pixel value to configure wsdisplay screen
  */
 struct pxa2x0_wsscreen_descr {
 	struct wsscreen_descr  c;	/* standard descriptor */
 	int depth;			/* bits per pixel */
 	int flags;			/* rasops flags */
 };
 void	pxa2x0_lcd_attach_sub(struct pxa2x0_lcd_softc *,
 	    struct pxaip_attach_args *, const struct lcd_panel_geometry *);

 @@ -1,34 +1,34 @@
-/*	$NetBSD: pxa2x0_pcic.c,v 1.4 2007/10/17 19:53:44 garbled Exp $	*/
+/*	$NetBSD: pxa2x0_pcic.c,v 1.5 2009/01/29 12:28:15 nonaka Exp $	*/
 /*	$OpenBSD: pxa2x0_pcic.c,v 1.17 2005/12/14 15:08:51 uwe Exp $	*/
 /*
  * Copyright (c) 2005 Dale Rahn <drahn@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_pcic.c,v 1.4 2007/10/17 19:53:44 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_pcic.c,v 1.5 2009/01/29 12:28:15 nonaka Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/malloc.h>
 #include <uvm/uvm.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 @@ -331,33 +331,33 @@ pxapcic_print(void *aux, const char *nam
 void
 pxapcic_attach_common(struct pxapcic_softc *sc,
     void (*socket_setup_hook)(struct pxapcic_socket *))
+{
 	struct pcmciabus_attach_args paa;
 	struct pxapcic_socket *so;
 	int s[PXAPCIC_NSLOT];
 	u_int cs;
 	int i;
 	printf(": %d slot%s\n", sc->sc_nslots, sc->sc_nslots < 2 ? "" : "s");
 	if (sc->sc_nslots == 0) {
-		aprint_error("%s: can't attach\n", sc->sc_dev.dv_xname);
+		aprint_error_dev(sc->sc_dev, "can't attach\n");
 		return;
+	}
 	if (bus_space_map(sc->sc_iot, PXA2X0_MEMCTL_BASE, PXA2X0_MEMCTL_SIZE,
 , &sc->sc_memctl_ioh)) {
-		aprint_error("%s: failed to map MEMCTL\n", sc->sc_dev.dv_xname);
+		aprint_error_dev(sc->sc_dev, "failed to map MEMCTL\n");
 		return;
+	}
 	/* Clear CIT (card present) and set NOS correctly. */
 	bus_space_write_4(sc->sc_iot, sc->sc_memctl_ioh, MEMCTL_MECR,
 	    (sc->sc_nslots == 2) ? MECR_NOS : 0);
 	if (sc->sc_flags & PPF_REVERSE_ORDER) {
 		for (i = 0; i < sc->sc_nslots; i++) {
 			s[i] = sc->sc_nslots - 1 - i;
+		}
 	} else {
 		for (i = 0; i < sc->sc_nslots; i++) {
 @@ -369,49 +369,50 @@ pxapcic_attach_common(struct pxapcic_sof
 		so = &sc->sc_socket[s[i]];
 		so->sc = sc;
 		so->socket = s[i];
 		so->flags = 0;
 		(*socket_setup_hook)(so);
 		paa.paa_busname = "pcmcia";
 		paa.pct = (pcmcia_chipset_tag_t)&pxapcic_pcmcia_functions;
 		paa.pch = (pcmcia_chipset_handle_t)so;
 		paa.iobase = 0;
 		paa.iosize = 0x4000000;
-		so->pcmcia = config_found_ia(&sc->sc_dev, "pcmciabus", &paa,
+		so->pcmcia = config_found_ia(sc->sc_dev, "pcmciabus", &paa,
 		    pxapcic_print);
 		pxa2x0_gpio_set_function(sc->sc_irqpin[s[i]], GPIO_IN);
 		pxa2x0_gpio_set_function(sc->sc_irqcfpin[s[i]], GPIO_IN);
 		/* Card slot interrupt */
 		so->irq = pxa2x0_gpio_intr_establish(sc->sc_irqcfpin[s[i]],
 		    IST_EDGE_BOTH, IPL_BIO /* XXX */, pxapcic_intr, so);
 		/* GPIO pin for interrupt */
 		so->irqpin = sc->sc_irqpin[s[i]];
 		/* If there's a card there, attach it. */
 		cs = (*so->pcictag->read)(so, PXAPCIC_CARD_STATUS);
 		if (cs == PXAPCIC_CARD_VALID)
 			pxapcic_attach_card(so);
 		if (kthread_create(PRI_NONE, 0, NULL, pxapcic_event_thread,
-		    so, &so->event_thread, "%s,%d", sc->sc_dev.dv_xname,
+		    so, &so->event_thread, "%s,%d", device_xname(sc->sc_dev),
 		    so->socket)) {
-			printf("%s: unable to create event thread for %d\n",
+			aprint_error_dev(sc->sc_dev,
-			     sc->sc_dev.dv_xname, so->socket);
+			    "unable to create event thread for %d\n",
 			    so->socket);
+		}
+	}
+}
 /*
  * Card slot interrupt handling
  */
 int
 pxapcic_intr(void *arg)
+{
 	struct pxapcic_socket *so = (struct pxapcic_socket *)arg;
 	(*so->pcictag->clear_intr)(so);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pxa2x0_pcic.h,v 1.3 2007/10/17 19:53:44 garbled Exp $	*/
+/*	$NetBSD: pxa2x0_pcic.h,v 1.4 2009/01/29 12:28:15 nonaka Exp $	*/
 /*	$OpenBSD: pxapcicvar.h,v 1.7 2005/12/14 15:08:51 uwe Exp $ */
 /*
  * Copyright (c) 2005 Dale Rahn <drahn@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 @@ -58,27 +58,27 @@ struct pxapcic_tag {
 #define PXAPCIC_CARD_STATUS	0
 #define  PXAPCIC_CARD_INVALID	0
 #define  PXAPCIC_CARD_VALID	1
 #define PXAPCIC_CARD_READY	1
 #define PXAPCIC_CARD_POWER	2
 #define  PXAPCIC_POWER_OFF	0
 #define  PXAPCIC_POWER_3V	1
 #define  PXAPCIC_POWER_5V	2
 #define PXAPCIC_CARD_RESET	3
 #define PXAPCIC_NSLOT	2
 struct pxapcic_softc {
-	struct device sc_dev;
+	device_t sc_dev;
 	struct pxapcic_socket sc_socket[PXAPCIC_NSLOT];
 	bus_space_tag_t sc_iot;
 	bus_space_handle_t sc_memctl_ioh;
 	void *sc_irq;
 	int sc_shutdown;
 	int sc_nslots;
 	int sc_irqpin[PXAPCIC_NSLOT];
 	int sc_irqcfpin[PXAPCIC_NSLOT];
 	u_int sc_flags;
 #define	PPF_REVERSE_ORDER	(1 << 0)

 @@ -1,14 +1,14 @@
-/* $NetBSD: g42xxeb_lcd.c,v 1.11 2008/06/11 23:24:43 cegger Exp $ */
+/* $NetBSD: g42xxeb_lcd.c,v 1.12 2009/01/29 12:28:15 nonaka Exp $ */
 /*-
  * Copyright (c) 2001, 2002, 2005 Genetec corp.
  * All rights reserved.
+ *
  * LCD driver for Genetec G4250EB-X002.
  * Written by Hiroyuki Bessho for Genetec corp.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -46,28 +46,28 @@
 #include <machine/bus.h>
 #include <arm/sa11x0/sa11x0_var.h>
 #include <arm/xscale/pxa2x0var.h>
 #include <arm/xscale/pxa2x0reg.h>
 #include <arm/xscale/pxa2x0_lcd.h>
 #include <arch/evbarm/g42xxeb/g42xxeb_reg.h>
 #include <arch/evbarm/g42xxeb/g42xxeb_var.h>
 #include "wsdisplay.h"
 #include "ioconf.h"
-int	lcd_match( struct device *, struct cfdata *, void *);
+int	lcd_match(device_t, cfdata_t, void *);
-void	lcd_attach( struct device *, struct device *, void *);
+void	lcd_attach(device_t, device_t, void *);
 int	lcdintr(void *);
 #if NWSDISPLAY > 0
 /*
  * wsdisplay glue
  */
 struct pxa2x0_wsscreen_descr lcd_bpp16_screen = {
+	{
 		"bpp16", 0, 0,
 		&pxa2x0_lcd_emulops,
 , 0,
 		WSSCREEN_WSCOLORS,
 @@ -122,31 +122,31 @@ const struct wsdisplay_accessops lcd_acc
  * Interface to LCD framebuffer without wscons
  */
 dev_type_open(lcdopen);
 dev_type_close(lcdclose);
 dev_type_ioctl(lcdioctl);
 dev_type_mmap(lcdmmap);
 const struct cdevsw lcd_cdevsw = {
 	lcdopen, lcdclose, noread, nowrite,
 	lcdioctl, nostop, notty, nopoll, lcdmmap, D_TTY
 };
 #endif
-CFATTACH_DECL(lcd_obio, sizeof (struct pxa2x0_lcd_softc), lcd_match, lcd_attach,
+CFATTACH_DECL_NEW(lcd_obio, sizeof (struct pxa2x0_lcd_softc),
-    NULL, NULL);
+    lcd_match, lcd_attach, NULL, NULL);
 int
-lcd_match( struct device *parent, struct cfdata *cf, void *aux )
+lcd_match( device_t parent, cfdata_t cf, void *aux )
+{
 	return 1;
+}
 #ifdef G4250_LCD_NEC_NL3224BC35
 /* NEC's QVGA LCD */
 static const struct lcd_panel_geometry nec_NL3224BC35 =
+{
 ,			/* Width */
 ,			/* Height */
 ,				/* No extra lines */
     LCDPANEL_SINGLE|LCDPANEL_ACTIVE|LCDPANEL_PCP|
 @@ -178,29 +178,31 @@ const struct lcd_panel_geometry toshiba_
 xff,			/* AC bias pin freq */
 ,				/* horizontal sync pulse width */
 ,				/* BLW (back porch) */
 ,				/* ELW (front porch) */
 ,				/* vertical sync pulse width */
 ,				/* BFW (back porch) */
 ,				/* EFW (front porch) */
 };
 #endif /* G4250_LCD_TOSHIBA_LTM035 */
-void lcd_attach( struct device *parent, struct device *self, void *aux )
+void lcd_attach( device_t parent, device_t self, void *aux )
+{
-	struct pxa2x0_lcd_softc *sc = (struct pxa2x0_lcd_softc *)self;
+	struct pxa2x0_lcd_softc *sc = device_private(self);
 	sc->dev = self;
 #ifdef G4250_LCD_TOSHIBA_LTM035
 # define PANEL	toshiba_LTM035
 #else
 # define PANEL	nec_NL3224BC35
 #endif
 	pxa2x0_lcd_attach_sub(sc, aux, &PANEL);
 #if NWSDISPLAY > 0
+	{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: gxpcic.c,v 1.8 2008/05/11 08:23:17 kiyohara Exp $ */
+/*	$NetBSD: gxpcic.c,v 1.9 2009/01/29 12:28:15 nonaka Exp $ */
 /*
  * Copyright (C) 2005, 2006 WIDE Project and SOUM Corporation.
  * All rights reserved.
+ *
  * Written by Takashi Kiyohara and Susumu Miki for WIDE Project and SOUM
  * Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -105,27 +105,27 @@ static	void  	gxpcic_attach(device_t, de
 static	void	gxpcic_pcic_socket_setup(struct pxapcic_socket *);
 static	u_int	gxpcic_read(struct pxapcic_socket *, int);
 static	void	gxpcic_write(struct pxapcic_socket *, int, u_int);
 static	void	gxpcic_set_power(struct pxapcic_socket *, int);
 static	void	gxpcic_clear_intr(struct pxapcic_socket *);
 static	void	*gxpcic_intr_establish(struct pxapcic_socket *, int,
 				       int (*)(void *), void *);
 static	void	gxpcic_intr_disestablish(struct pxapcic_socket *, void *);
 __inline void gxpcic_cpld_clk(void);
 __inline u_char gxpcic_cpld_read_bits(int bits);
 static	int	gxpcic_count_slot(struct pxapcic_softc *);
-CFATTACH_DECL(pxapcic_gxpcic, sizeof(struct pxapcic_softc),
+CFATTACH_DECL_NEW(pxapcic_gxpcic, sizeof(struct pxapcic_softc),
     gxpcic_match, gxpcic_attach, NULL, NULL);
 static struct pxapcic_tag gxpcic_pcic_functions = {
 	gxpcic_read,
 	gxpcic_write,
 	gxpcic_set_power,
 	gxpcic_clear_intr,
 	gxpcic_intr_establish,
 	gxpcic_intr_disestablish,
 };
 static struct {
 	int cd;
 @@ -156,26 +156,27 @@ gxpcic_match(device_t parent, struct cfd
 			return (0);
+	}
 	return	1;	/* match */
+}
 static void
 gxpcic_attach(device_t parent, device_t self, void *aux)
+{
 	struct pxapcic_softc *sc = device_private(self);
 	struct pxaip_attach_args *pxa = (struct pxaip_attach_args *)aux;
 	int nslot, i;
 	sc->sc_dev = self;
 	sc->sc_iot = pxa->pxa_iot;
 	nslot = gxpcic_count_slot(sc);
 	for (i = 0; i < nslot; i++) {
 		sc->sc_irqpin[i] = gxpcic_slot_irqs[i].prdy;
 		sc->sc_irqcfpin[i] = gxpcic_slot_irqs[i].cd;
+	}
 	sc->sc_nslots = nslot;
 	pxapcic_attach_common(sc, &gxpcic_pcic_socket_setup);
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: lubbock_lcd.c,v 1.8 2008/06/11 23:24:43 cegger Exp $ */
+/* $NetBSD: lubbock_lcd.c,v 1.9 2009/01/29 12:28:15 nonaka Exp $ */
 /*
  * Copyright (c) 2002, 2003  Genetec Corporation.  All rights reserved.
  * Written by Hiroyuki Bessho for Genetec Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -30,51 +30,51 @@
  */
 /*
  * LCD driver for Intel Lubbock.
+ *
  * Controlling LCD is almost completely done through PXA2X0's
  * integrated LCD controller.  Codes for it is arm/xscale/pxa2x0_lcd.c.
+ *
  * Codes in this file provide platform specific things including:
  *   LCD on/off switch in on-board PLD register.
  *   LCD panel geometry
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lubbock_lcd.c,v 1.8 2008/06/11 23:24:43 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_lcd.c,v 1.9 2009/01/29 12:28:15 nonaka Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
 #include <dev/cons.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wscons_callbacks.h>
 #include <machine/bus.h>
 #include <arm/xscale/pxa2x0var.h>
 #include <arm/xscale/pxa2x0reg.h>
 #include <arm/xscale/pxa2x0_lcd.h>
 #include <arch/evbarm/lubbock/lubbock_reg.h>
 #include <arch/evbarm/lubbock/lubbock_var.h>
 #include "wsdisplay.h"
-int	lcd_match( struct device *, struct cfdata *, void *);
+int	lcd_match(device_t, cfdata_t, void *);
-void	lcd_attach( struct device *, struct device *, void *);
+void	lcd_attach(device_t, device_t, void *);
 int	lcdintr(void *);
 #if NWSDISPLAY > 0
 /*
  * wsdisplay glue
  */
 struct pxa2x0_wsscreen_descr lcd_bpp16_screen = {
+	{
 		"bpp16", 0, 0,
 		&pxa2x0_lcd_emulops,
 , 0,
 		WSSCREEN_WSCOLORS,
 @@ -132,58 +132,60 @@ const struct wsdisplay_accessops lcd_acc
  * Interface to LCD framebuffer without wscons
  */
 dev_type_open(lcdopen);
 dev_type_close(lcdclose);
 dev_type_ioctl(lcdioctl);
 dev_type_mmap(lcdmmap);
 const struct cdevsw lcd_cdevsw = {
 	lcdopen, lcdclose, noread, nowrite,
 	lcdioctl, nostop, notty, nopoll, lcdmmap, D_TTY
 };
 #endif
-CFATTACH_DECL(lcd_obio, sizeof (struct pxa2x0_lcd_softc),  lcd_match,
+CFATTACH_DECL_NEW(lcd_obio, sizeof (struct pxa2x0_lcd_softc),  lcd_match,
     lcd_attach, NULL, NULL);
 int
-lcd_match( struct device *parent, struct cfdata *cf, void *aux )
+lcd_match( device_t parent, cfdata_t cf, void *aux )
+{
 	return 1;
+}
 static const struct lcd_panel_geometry sharp_LM8V31 =
+{
 ,			/* Width */
 ,			/* Height */
 ,				/* No extra lines */
     LCDPANEL_DUAL|LCDPANEL_PASSIVE|LCDPANEL_PCP,
 ,				/* clock divider */
 xff,			/* AC bias pin freq */
 ,				/* horizontal sync pulse width */
 ,				/* BLW */
 ,				/* ELW */
 ,				/* vertical sync pulse width */
 ,				/* BFW */
 ,				/* EFW */
 };
-void lcd_attach( struct device *parent, struct device *self, void *aux )
+void lcd_attach( device_t parent, device_t self, void *aux )
+{
-	struct pxa2x0_lcd_softc *sc = (struct pxa2x0_lcd_softc *)self;
+	struct pxa2x0_lcd_softc *sc = device_private(self);
 	sc->dev = self;
 	pxa2x0_lcd_attach_sub(sc, aux, &sharp_LM8V31);
 #if NWSDISPLAY > 0
+	{
 		struct wsemuldisplaydev_attach_args aa;
 		/* make wsdisplay screen list */
 		pxa2x0_lcd_setup_wsscreen( &lcd_bpp16_screen, &sharp_LM8V31, NULL );
 		pxa2x0_lcd_setup_wsscreen( &lcd_bpp8_screen, &sharp_LM8V31, NULL );
 		pxa2x0_lcd_setup_wsscreen( &lcd_bpp4_screen, &sharp_LM8V31, NULL );

 @@ -1,126 +1,129 @@
-/*	$NetBSD: scoop.c,v 1.5 2008/06/13 13:58:21 cegger Exp $	*/
+/*	$NetBSD: scoop.c,v 1.6 2009/01/29 12:28:15 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_scoop.c,v 1.12 2005/11/17 05:26:31 uwe Exp $	*/
 /*
  * Copyright (c) 2005 Uwe Stuehler <uwe@bsdx.de>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scoop.c,v 1.5 2008/06/13 13:58:21 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scoop.c,v 1.6 2009/01/29 12:28:15 nonaka Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/gpio.h>
 #include <machine/bus.h>
 #include <arm/xscale/pxa2x0var.h>
 #include <zaurus/zaurus/zaurus_reg.h>
 #include <zaurus/zaurus/zaurus_var.h>
 #include <zaurus/dev/scoopreg.h>
 #include <zaurus/dev/scoopvar.h>
 #include "ioconf.h"
 struct scoop_softc {
-	struct device		sc_dev;
+	device_t		sc_dev;
 	bus_space_tag_t		sc_iot;
 	bus_space_handle_t	sc_ioh;
 	uint16_t		sc_gpwr;	/* GPIO state before suspend */
 };
-static int	scoopmatch(struct device *, struct cfdata *, void *);
+static int	scoopmatch(device_t, cfdata_t, void *);
-static void	scoopattach(struct device *, struct device *, void *);
+static void	scoopattach(device_t, device_t, void *);
-CFATTACH_DECL(scoop, sizeof(struct scoop_softc),
+CFATTACH_DECL_NEW(scoop, sizeof(struct scoop_softc),
-	scoopmatch, scoopattach, NULL, NULL);
+    scoopmatch, scoopattach, NULL, NULL);
 #if 0
-static int	scoop_gpio_pin_read(struct scoop_softc *sc, int);
+static int	scoop_gpio_pin_read(struct scoop_softc *, int);
 #endif
-static void	scoop_gpio_pin_write(struct scoop_softc *sc, int, int);
+static void	scoop_gpio_pin_write(struct scoop_softc *, int, int);
-static void	scoop_gpio_pin_ctl(struct scoop_softc *sc, int, int);
+static void	scoop_gpio_pin_ctl(struct scoop_softc *, int, int);
 enum scoop_card {
 	SD_CARD,
 	CF_CARD		/* socket 0 (external) */
 };
 static void	scoop0_set_card_power(enum scoop_card card, int new_cpr);
 static int
-scoopmatch(struct device *parent, struct cfdata *cf, void *aux)
+scoopmatch(device_t parent, cfdata_t cf, void *aux)
+{
 	/*
 	 * Only C3000-like models are known to have two SCOOPs.
 	 */
         if (ZAURUS_ISC3000)
 		return (cf->cf_unit < 2);
 	return (cf->cf_unit == 0);
+}
 static void
-scoopattach(struct device *parent, struct device *self, void *aux)
+scoopattach(device_t parent, device_t self, void *aux)
+{
 	struct scoop_softc *sc = device_private(self);
 	struct pxaip_attach_args *pxa = (struct pxaip_attach_args *)aux;
 	struct scoop_softc *sc = (struct scoop_softc *)self;
 	bus_addr_t addr;
 	bus_size_t size;
 	sc->sc_dev = self;
 	sc->sc_iot = pxa->pxa_iot;
 	aprint_normal(": PCMCIA/GPIO controller\n");
 	aprint_naive("\n");
 	if (pxa->pxa_addr != -1)
 		addr = pxa->pxa_addr;
-	else if (sc->sc_dev.dv_unit == 0)
+	else if (sc->sc_dev->dv_unit == 0)
 		addr = C3000_SCOOP0_BASE;
 	else
 		addr = C3000_SCOOP1_BASE;
 	size = pxa->pxa_size < SCOOP_SIZE ? SCOOP_SIZE : pxa->pxa_size;
 	if (bus_space_map(sc->sc_iot, addr, size, 0, &sc->sc_ioh) != 0) {
-		printf(": failed to map %s\n", sc->sc_dev.dv_xname);
+		aprint_error_dev(sc->sc_dev, "couldn't map registers\n");
 		return;
+	}
-	if (ZAURUS_ISC3000 && sc->sc_dev.dv_unit == 1) {
+	if (ZAURUS_ISC3000 && sc->sc_dev->dv_unit == 1) {
 		scoop_gpio_pin_ctl(sc, SCOOP1_AKIN_PULLUP, GPIO_PIN_OUTPUT);
 		scoop_gpio_pin_write(sc, SCOOP1_AKIN_PULLUP, GPIO_PIN_LOW);
 	} else if (!ZAURUS_ISC3000) {
 		scoop_gpio_pin_ctl(sc, SCOOP0_AKIN_PULLUP, GPIO_PIN_OUTPUT);
 		scoop_gpio_pin_write(sc, SCOOP0_AKIN_PULLUP, GPIO_PIN_LOW);
+	}
 	printf(": PCMCIA/GPIO controller\n");
+}
 #if 0
 static int
 scoop_gpio_pin_read(struct scoop_softc *sc, int pin)
+{
 	uint16_t bit = (1 << pin);
 	uint16_t rv;
 	rv = bus_space_read_2(sc->sc_iot, sc->sc_ioh, SCOOP_GPWR);
 	return (rv & bit) ? 1 : 0;
+}
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: zaudio.c,v 1.5 2007/10/17 19:58:34 garbled Exp $	*/
+/*	$NetBSD: zaudio.c,v 1.6 2009/01/29 12:28:15 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_audio.c,v 1.8 2005/08/18 13:23:02 robert Exp $	*/
 /*
  * Copyright (c) 2005 Christopher Pascoe <pascoe@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 @@ -48,69 +48,69 @@ __KERNEL_RCSID(0, "$NetBSD");
 #include <dev/mulaw.h>
 #include <dev/auconv.h>
 #include <zaurus/dev/wm8750reg.h>
 #include <zaurus/dev/scoopvar.h>
 #define WM8750_ADDRESS  0x1B
 #define SPKR_VOLUME	112
 #define wm8750_write(sc, reg, val) \
 	pxa2x0_i2c_write_2(&sc->sc_i2c, WM8750_ADDRESS, \
 	    (((reg) << 9) | ((val) & 0x1ff)))
-static int	zaudio_match(struct device *, struct cfdata *, void *);
+static int	zaudio_match(device_t, cfdata_t, void *);
-static void	zaudio_attach(struct device *, struct device *, void *);
+static void	zaudio_attach(device_t, device_t, void *);
-static int	zaudio_detach(struct device *, int);
+static int	zaudio_detach(device_t, int);
 static void	zaudio_power(int, void *);
 #define ZAUDIO_OP_SPKR	0
 #define ZAUDIO_OP_HP	1
 #define ZAUDIO_JACK_STATE_OUT	0
 #define ZAUDIO_JACK_STATE_IN	1
 #define ZAUDIO_JACK_STATE_INS	2
 #define ZAUDIO_JACK_STATE_REM	3
 /* GPIO pins */
 #define GPIO_HP_IN_C3000	116
 struct zaudio_volume {
 	u_int8_t		left;
 	u_int8_t		right;
 };
 struct zaudio_softc {
-	struct device		sc_dev;
+	device_t		sc_dev;
 	/* i2s device softc */
 	/* NB: pxa2x0_i2s requires this to be the second struct member */
 	struct pxa2x0_i2s_softc	sc_i2s;
 	/* i2c device softc */
 	struct pxa2x0_i2c_softc	sc_i2c;
 	void			*sc_powerhook;
 	int			sc_playing;
 	struct zaudio_volume	sc_volume[2];
 	char			sc_unmute[2];
 	int			sc_state;
 	int			sc_icount;
 	struct callout		sc_to;
 };
-CFATTACH_DECL(zaudio, sizeof(struct zaudio_softc),
+CFATTACH_DECL_NEW(zaudio, sizeof(struct zaudio_softc),
     zaudio_match, zaudio_attach, zaudio_detach, NULL);
 static struct audio_device wm8750_device = {
 	"WM8750",
 	"1.0",
 	"wm"
 };
 #define ZAUDIO_NFORMATS	4
 static const struct audio_format zaudio_formats[ZAUDIO_NFORMATS] = {
 	{NULL, AUMODE_PLAY | AUMODE_RECORD, AUDIO_ENCODING_SLINEAR_LE, 16, 16,
 , AUFMT_STEREO, 0, {4000, 48000}},
 	{NULL, AUMODE_PLAY | AUMODE_RECORD, AUDIO_ENCODING_SLINEAR_LE, 16, 16,
 @@ -193,106 +193,109 @@ static const uint16_t playback_registers
 	/* Set DAC voltage references */
 	{ PWRMGMT1_REG, PWRMGMT1_SET_VMIDSEL(1) | PWRMGMT1_VREF },
 	/* Direct DACs to output mixers */
 	{ LOUTMIX1_REG, LOUTMIX1_LD2LO },
 	{ ROUTMIX2_REG, ROUTMIX2_RD2RO },
 	/* End of list */
 	{ 0xffff, 0xffff }
 };
 static int
-zaudio_match(struct device *parent, struct cfdata *cf, void *aux)
+zaudio_match(device_t parent, cfdata_t cf, void *aux)
+{
 	return 1;
+}
 static void
-zaudio_attach(struct device *parent, struct device *self, void *aux)
+zaudio_attach(device_t parent, device_t self, void *aux)
+{
-	struct zaudio_softc *sc = (struct zaudio_softc *)self;
+	struct zaudio_softc *sc = device_private(self);
 	struct pxaip_attach_args *pxa = aux;
 	int rv;
-	sc->sc_powerhook = powerhook_establish(sc->sc_dev.dv_xname,
+	sc->sc_dev = self;
 	aprint_normal(": I2C, I2S, WM8750 Audio\n");
 	aprint_naive("\n");
 	sc->sc_powerhook = powerhook_establish(device_xname(sc->sc_dev),
 	    zaudio_power, sc);
 	if (sc->sc_powerhook == NULL) {
-		printf(": unable to establish powerhook\n");
+		aprint_error_dev(sc->sc_dev, "unable to establish powerhook\n");
 		return;
+	}
 	sc->sc_i2s.sc_iot = pxa->pxa_iot;
 	sc->sc_i2s.sc_dmat = pxa->pxa_dmat;
 	sc->sc_i2s.sc_size = PXA2X0_I2S_SIZE;
 	if (pxa2x0_i2s_attach_sub(&sc->sc_i2s)) {
-		printf(": unable to attach I2S\n");
+		aprint_error_dev(sc->sc_dev, "unable to attach I2S\n");
 		goto fail_i2s;
+	}
 	sc->sc_i2c.sc_iot = pxa->pxa_iot;
 	sc->sc_i2c.sc_size = PXA2X0_I2C_SIZE;
 	if (pxa2x0_i2c_attach_sub(&sc->sc_i2c)) {
-		printf(": unable to attach I2C\n");
+		aprint_error_dev(sc->sc_dev, "unable to attach I2C\n");
 		goto fail_i2c;
+	}
 	/* Check for an I2C response from the wm8750 */
 	pxa2x0_i2c_open(&sc->sc_i2c);
 	rv = wm8750_write(sc, RESET_REG, 0);
 	pxa2x0_i2c_close(&sc->sc_i2c);
 	if (rv) {
-		printf(": codec failed to respond\n");
+		aprint_error_dev(sc->sc_dev, "codec failed to respond\n");
 		goto fail_probe;
+	}
 	delay(100);
 	/* Speaker on, headphones off by default. */
 	sc->sc_volume[ZAUDIO_OP_SPKR].left = 240;
 	sc->sc_unmute[ZAUDIO_OP_SPKR] = 1;
 	sc->sc_volume[ZAUDIO_OP_HP].left = 180;
 	sc->sc_volume[ZAUDIO_OP_HP].right = 180;
 	sc->sc_unmute[ZAUDIO_OP_HP] = 0;
 	/* Configure headphone jack state change handling. */
 	callout_init(&sc->sc_to, 0);
 	callout_setfunc(&sc->sc_to, zaudio_jack, sc);
 	pxa2x0_gpio_set_function(GPIO_HP_IN_C3000, GPIO_IN);
 	(void)pxa2x0_gpio_intr_establish(GPIO_HP_IN_C3000,
 	    IST_EDGE_BOTH, IPL_BIO, zaudio_jack_intr, sc);
 	zaudio_init(sc);
-	printf(": I2C, I2S, WM8750 Audio\n");
+	audio_attach_mi(&wm8750_hw_if, sc, sc->sc_dev);
 	audio_attach_mi(&wm8750_hw_if, sc, &sc->sc_dev);
 	return;
 fail_probe:
 	pxa2x0_i2c_detach_sub(&sc->sc_i2c);
 fail_i2c:
 	pxa2x0_i2s_detach_sub(&sc->sc_i2s);
 fail_i2s:
 	powerhook_disestablish(sc->sc_powerhook);
+}
 static int
-zaudio_detach(struct device *self, int flags)
+zaudio_detach(device_t self, int flags)
+{
-	struct zaudio_softc *sc = (struct zaudio_softc *)self;
+	struct zaudio_softc *sc = device_private(self);
 	if (sc->sc_powerhook != NULL) {
 		powerhook_disestablish(sc->sc_powerhook);
 		sc->sc_powerhook = NULL;
+	}
 	pxa2x0_i2c_detach_sub(&sc->sc_i2c);
 	pxa2x0_i2s_detach_sub(&sc->sc_i2s);
 	return 0;
+}
 static void

 @@ -1,34 +1,34 @@
-/*	$NetBSD: zrc.c,v 1.5 2007/10/17 19:58:35 garbled Exp $	*/
+/*	$NetBSD: zrc.c,v 1.6 2009/01/29 12:28:15 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_remote.c,v 1.1 2005/11/17 05:26:31 uwe Exp $	*/
 /*
  * Copyright (c) 2005 Uwe Stuehler <uwe@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zrc.c,v 1.5 2007/10/17 19:58:35 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zrc.c,v 1.6 2009/01/29 12:28:15 nonaka Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/callout.h>
 #include <sys/systm.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wskbdvar.h>
 #include <dev/wscons/wsksymdef.h>
 #include <dev/wscons/wsksymvar.h>
 #include <arm/xscale/pxa2x0reg.h>
 @@ -71,43 +71,43 @@ static const struct zrc_akey zrc_akeytab
 	{ 202,		KEY_VOL_DOWN },
 	{ 168,		KEY_MUTE     },
 	{ 135,		KEY_REWIND   },
 	{ 105,		KEY_VOL_UP   },
 	{ 74,		KEY_FORWARD  },
 	{ 42,		KEY_PLAY     },
 	{ 12,		KEY_STOP     },
 	{ INT_MIN,	KEY_EARPHONE }
 };
 static const struct zrc_akey *zrc_akeytab = zrc_akeytab_c3000;
 struct zrc_softc {
-	struct device	 sc_dev;
+	device_t	 sc_dev;
 	struct callout	 sc_to;
 	void		*sc_ih;
 	int		 sc_key;	/* being scanned */
 	int		 sc_scans;	/* rescan counter */
 	int		 sc_noise;	/* discard if too noisy? */
 	int		 sc_keydown;	/* currently pressed key */
 	struct device   *sc_wskbddev;
 #ifdef WSDISPLAY_COMPAT_RAWKBD
 	int		 sc_rawkbd;
 #endif
 };
 static int	zrc_match(struct device *, struct cfdata *, void *);
 static void	zrc_attach(struct device *, struct device *, void *);
-CFATTACH_DECL(zrc, sizeof(struct zrc_softc),
+CFATTACH_DECL_NEW(zrc, sizeof(struct zrc_softc),
     zrc_match, zrc_attach, NULL, NULL);
 static int	zrc_intr(void *);
 static void	zrc_timeout(void *);
 static int	zrc_scan(void);
 static void	zrc_input(struct zrc_softc *, int, int);
 static int	zrc_enable(void *, int);
 static void	zrc_set_leds(void *, int);
 static int	zrc_ioctl(void *, u_long, void *, int, struct lwp *);
 struct wskbd_accessops zrc_accessops = {
 	zrc_enable,
 @@ -147,54 +147,63 @@ static const keysym_t zrc_xt_keymap[] =
 static const struct wscons_keydesc zrc_keydesctab[] = {
         {KB_US, 0, sizeof(zrc_keydesc)/sizeof(keysym_t), zrc_keydesc},
         {0, 0, 0, 0}
 };
 struct wskbd_mapdata zrc_keymapdata = {
 	zrc_keydesctab, KB_US
 };
 #undef	KC
 static int
-zrc_match(struct device *parent, struct cfdata *cf, void *aux)
+zrc_match(device_t parent, cfdata_t cf, void *aux)
+{
 	if (ZAURUS_ISC3000)
 		return 1;
 	return 0;
+}
 static void
-zrc_attach(struct device *parent, struct device *self, void *aux)
+zrc_attach(device_t parent, device_t self, void *aux)
+{
-	struct zrc_softc *sc = (struct zrc_softc *)self;
+	struct zrc_softc *sc = device_private(self);
 	struct wskbddev_attach_args a;
 	sc->sc_dev = self;
 	aprint_normal(": CE-RH2 remote control\n");
 	aprint_naive("\n");
 	/* Configure remote control interrupt handling. */
 	callout_init(&sc->sc_to, 0);
 	callout_setfunc(&sc->sc_to, zrc_timeout, sc);
 	/* Establish interrput */
 	pxa2x0_gpio_set_function(C3000_RC_IRQ_PIN, GPIO_IN);
 	sc->sc_ih = pxa2x0_gpio_intr_establish(C3000_RC_IRQ_PIN,
 	    IST_EDGE_BOTH, IPL_BIO, zrc_intr, sc);
 	if (sc->sc_ih == NULL) {
 		aprint_error_dev(sc->sc_dev, "couldn't establish interrupt.\n");
 		return;
+	}
 	/* Enable the pullup while waiting for an interrupt. */
 	scoop_akin_pullup(1);
 	sc->sc_keydown = KEY_RELEASE;
 	printf(": CE-RH2 remote control\n");
 	a.console = 0;
 	a.keymap = &zrc_keymapdata;
 	a.accessops = &zrc_accessops;
 	a.accesscookie = sc;
 	sc->sc_wskbddev = config_found(self, &a, wskbddevprint);
+}
 static int
 zrc_intr(void *v)
+{
 	struct zrc_softc *sc = v;
 @@ -235,53 +244,55 @@ zrc_timeout(void *v)
 		/* generate key press event */
 		if (sc->sc_key != key) {
 			key = sc->sc_key;
 			sc->sc_noise++;
+		}
 		sc->sc_scans++;
 		switch (key) {
 		case KEY_EARPHONE:
 		case KEY_RELEASE:
 			sc->sc_scans = 6;
 			break;
 		default:
 #ifdef DEBUG
-			printf("%s pressed (%d noise)\n", zrc_keyname[key],
+			printf("%s: %s pressed (%d noise)\n",
-			    sc->sc_noise);
+			    device_xname(sc->sc_dev),
 			    zrc_keyname[key], sc->sc_noise);
 #endif
 			sc->sc_keydown = key;
 			sc->sc_noise = 0;
 			zrc_input(sc, key, 1);
 			break;
+		}
 		callout_schedule(&sc->sc_to, RESCAN_INTERVAL);
 		break;
 	case 4:
 	case 5:
 		/* wait for key release, permit noise */
 		if (sc->sc_key == key) {
 			if (sc->sc_scans == 5)
 				sc->sc_noise++;
 			sc->sc_scans = 4;
 		} else
 			sc->sc_scans++;
 		callout_schedule(&sc->sc_to, RESCAN_INTERVAL);
 		break;
 	case 6:
 		/* generate key release event */
 		if (sc->sc_keydown != KEY_RELEASE) {
 			zrc_input(sc, sc->sc_keydown, 0);
 #ifdef DEBUG
-			printf("%s released (%d noise)\n",
+			printf("%s: %s released (%d noise)\n",
 			    device_xname(sc->sc_dev),
 			    zrc_keyname[sc->sc_keydown], sc->sc_noise);
 #endif
 			sc->sc_keydown = KEY_RELEASE;
+		}
 		/* FALLTHROUGH */
 	default:
 		/* unmask interrupt again */
 		callout_stop(&sc->sc_to);
 		sc->sc_scans = 7;
 		scoop_akin_pullup(1);
 		pxa2x0_gpio_intr_unmask(sc->sc_ih);
+	}
+}

 @@ -1,34 +1,34 @@
-/*	$NetBSD: ztp.c,v 1.5 2007/10/17 19:58:35 garbled Exp $	*/
+/*	$NetBSD: ztp.c,v 1.6 2009/01/29 12:28:15 nonaka Exp $	*/
 /* $OpenBSD: zts.c,v 1.9 2005/04/24 18:55:49 uwe Exp $ */
 /*
  * Copyright (c) 2005 Dale Rahn <drahn@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ztp.c,v 1.5 2007/10/17 19:58:35 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ztp.c,v 1.6 2009/01/29 12:28:15 nonaka Exp $");
 #include "lcd.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/callout.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsmousevar.h>
 @@ -86,72 +86,75 @@ static const struct wsmouse_calibcoords
 		{ 3308, 3452,  48, 576 },
 		{ 2854,  768, 432, 576 },
 		{  542,  593, 432,  64 }
+	}
 };
 struct ztp_pos {
 	int x;
 	int y;
 	int z;			/* touch pressure */
 };
 struct ztp_softc {
-	struct device sc_dev;
+	device_t sc_dev;
 	struct callout sc_tp_poll;
 	void *sc_gh;
 	void *sc_powerhook;
 	int sc_enabled;
 	int sc_buttons; /* button emulation ? */
 	struct device *sc_wsmousedev;
 	struct ztp_pos sc_oldpos;
 	int sc_resx;
 	int sc_resy;
 	struct tpcalib_softc sc_tpcalib;
 };
-static int	ztp_match(struct device *, struct cfdata *, void *);
+static int	ztp_match(device_t, cfdata_t, void *);
-static void	ztp_attach(struct device *, struct device *, void *);
+static void	ztp_attach(device_t, device_t, void *);
-CFATTACH_DECL(ztp, sizeof(struct ztp_softc),
+CFATTACH_DECL_NEW(ztp, sizeof(struct ztp_softc),
 	ztp_match, ztp_attach, NULL, NULL);
 static int	ztp_enable(void *);
 static void	ztp_disable(void *);
 static void	ztp_power(int, void *);
 static void	ztp_poll(void *);
 static int	ztp_irq(void *);
 static int	ztp_ioctl(void *, u_long, void *, int, struct lwp *);
 static const struct wsmouse_accessops ztp_accessops = {
         ztp_enable,
 	ztp_ioctl,
 	ztp_disable
 };
 static int
-ztp_match(struct device *parent, struct cfdata *cf, void *aux)
+ztp_match(device_t parent, cfdata_t cf, void *aux)
+{
 	return 1;
+}
 static void
-ztp_attach(struct device *parent, struct device *self, void *aux)
+ztp_attach(device_t parent, device_t self, void *aux)
+{
-	struct ztp_softc *sc = (struct ztp_softc *)self;
+	struct ztp_softc *sc = device_private(self);
 	struct wsmousedev_attach_args a;
-	printf("\n");
+	sc->sc_dev = self;
 	aprint_normal("\n");
 	aprint_naive("\n");
 	callout_init(&sc->sc_tp_poll, 0);
 	callout_setfunc(&sc->sc_tp_poll, ztp_poll, sc);
 	/* Initialize ADS7846 Difference Reference mode */
 	(void)zssp_ic_send(ZSSP_IC_ADS7846,
 	    (1<<ADSCTRL_ADR_SH) | (1<<ADSCTRL_STS_SH));
 	delay(5000);
 	(void)zssp_ic_send(ZSSP_IC_ADS7846,
 	    (3<<ADSCTRL_ADR_SH) | (1<<ADSCTRL_STS_SH));
 	delay(5000);
 	(void)zssp_ic_send(ZSSP_IC_ADS7846,
 	    (4<<ADSCTRL_ADR_SH) | (1<<ADSCTRL_STS_SH));
 @@ -174,92 +177,92 @@ ztp_attach(struct device *parent, struct
 	sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint);
 	/* Initialize calibration, set default parameters. */
 	tpcalib_init(&sc->sc_tpcalib);
 	tpcalib_ioctl(&sc->sc_tpcalib, WSMOUSEIO_SCALIBCOORDS,
 	    __UNCONST(&ztp_default_calib), 0, 0);
+}
 static int
 ztp_enable(void *v)
+{
 	struct ztp_softc *sc = (struct ztp_softc *)v;
-	DPRINTF(("%s: ztp_enable()\n", sc->sc_dev.dv_xname));
+	DPRINTF(("%s: ztp_enable()\n", device_xname(sc->sc_dev)));
 	if (sc->sc_enabled) {
-		DPRINTF(("%s: already enabled\n", sc->sc_dev.dv_xname));
+		DPRINTF(("%s: already enabled\n", device_xname(sc->sc_dev)));
 		return EBUSY;
+	}
 	callout_stop(&sc->sc_tp_poll);
-	sc->sc_powerhook = powerhook_establish(sc->sc_dev.dv_xname, ztp_power,
+	sc->sc_powerhook = powerhook_establish(device_xname(sc->sc_dev),
-	    sc);
+	    ztp_power, sc);
 	if (sc->sc_powerhook == NULL) {
-		printf("%s: enable failed\n", sc->sc_dev.dv_xname);
+		aprint_error_dev(sc->sc_dev, "couldn't establish powerhook\n");
 		return ENOMEM;
+	}
 	pxa2x0_gpio_set_function(GPIO_TP_INT_C3K, GPIO_IN);
 	/* XXX */
 	if (sc->sc_gh == NULL) {
 		sc->sc_gh = pxa2x0_gpio_intr_establish(GPIO_TP_INT_C3K,
 		    IST_EDGE_FALLING, IPL_TTY, ztp_irq, sc);
 	} else {
 		pxa2x0_gpio_intr_unmask(sc->sc_gh);
+	}
 	/* enable interrupts */
 	sc->sc_enabled = 1;
 	sc->sc_buttons = 0;
 	return 0;
+}
 static void
 ztp_disable(void *v)
+{
 	struct ztp_softc *sc = (struct ztp_softc *)v;
-	DPRINTF(("%s: ztp_disable()\n", sc->sc_dev.dv_xname));
+	DPRINTF(("%s: ztp_disable()\n", device_xname(sc->sc_dev)));
 	callout_stop(&sc->sc_tp_poll);
 	if (sc->sc_powerhook != NULL) {
 		powerhook_disestablish(sc->sc_powerhook);
 		sc->sc_powerhook = NULL;
+	}
 	if (sc->sc_gh) {
 #if 0
 		pxa2x0_gpio_intr_disestablish(sc->sc_gh);
 		sc->sc_gh = NULL;
 #else
 		pxa2x0_gpio_intr_mask(sc->sc_gh);
 #endif
+	}
 	/* disable interrupts */
 	sc->sc_enabled = 0;
+}
 static void
 ztp_power(int why, void *v)
+{
 	struct ztp_softc *sc = (struct ztp_softc *)v;
-	DPRINTF(("%s: ztp_power()\n", sc->sc_dev.dv_xname));
+	DPRINTF(("%s: ztp_power()\n", device_xname(sc->sc_dev)));
 	switch (why) {
 	case PWR_STANDBY:
 	case PWR_SUSPEND:
 		sc->sc_enabled = 0;
 #if 0
 		pxa2x0_gpio_intr_disestablish(sc->sc_gh);
 #endif
 		callout_stop(&sc->sc_tp_poll);
 		pxa2x0_gpio_intr_mask(sc->sc_gh);
 		/* Turn off reference voltage but leave ADC on. */
 @@ -459,49 +462,49 @@ ztp_irq(void *v)
 	struct ztp_softc *sc = (struct ztp_softc *)v;
 	struct ztp_pos tp = { 0, 0, 0 };
 	int pindown;
 	int down;
 	int x, y;
 	int s;
 	if (!sc->sc_enabled)
 		return 0;
 	s = splhigh();
 	pindown = pxa2x0_gpio_get_bit(GPIO_TP_INT_C3K) ? 0 : 1;
-	DPRINTF(("%s: pindown = %d\n", sc->sc_dev.dv_xname, pindown));
+	DPRINTF(("%s: pindown = %d\n", device_xname(sc->sc_dev), pindown));
 	if (pindown) {
 		pxa2x0_gpio_intr_mask(sc->sc_gh);
 		callout_schedule(&sc->sc_tp_poll, POLL_TIMEOUT_RATE1);
+	}
 	down = ztp_readpos(&tp);
-	DPRINTF(("%s: x = %d, y = %d, z = %d, down = %d\n", sc->sc_dev.dv_xname,
+	DPRINTF(("%s: x = %d, y = %d, z = %d, down = %d\n",
-	    tp.x, tp.y, tp.z, down));
+	    device_xname(sc->sc_dev), tp.x, tp.y, tp.z, down));
 	if (!pindown) {
 		pxa2x0_gpio_intr_unmask(sc->sc_gh);
 		callout_schedule(&sc->sc_tp_poll, POLL_TIMEOUT_RATE0);
+	}
 	pxa2x0_gpio_clear_intr(GPIO_TP_INT_C3K);
 	splx(s);
 	if (down) {
 		if (!ztp_rawmode) {
 			tpcalib_trans(&sc->sc_tpcalib, tp.x, tp.y, &x, &y);
-			DPRINTF(("%s: x = %d, y = %d\n", sc->sc_dev.dv_xname,
+			DPRINTF(("%s: x = %d, y = %d\n",
-			    x, y));
+			    device_xname(sc->sc_dev), x, y));
 			tp.x = x;
 			tp.y = y;
+		}
+	}
 	if (zkbd_modstate != 0 && down) {
 		if (zkbd_modstate & (1 << 1)) {
 			/* Fn */
 			down = 2;
 		} else if (zkbd_modstate & (1 << 2)) {
 			/* 'Alt' */
 			down = 4;
+		}

 @@ -1,87 +1,88 @@
-/*	$NetBSD: scoop_pcic.c,v 1.2 2006/12/17 16:07:11 peter Exp $	*/
+/*	$NetBSD: scoop_pcic.c,v 1.3 2009/01/29 12:28:15 nonaka Exp $	*/
 /*	$OpenBSD: scoop_pcic.c,v 1.1 2005/07/01 23:51:55 uwe Exp $	*/
 /*
  * Copyright (c) 2005 Uwe Stuehler <uwe@bsdx.de>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scoop_pcic.c,v 1.2 2006/12/17 16:07:11 peter Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scoop_pcic.c,v 1.3 2009/01/29 12:28:15 nonaka Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <uvm/uvm.h>
 #include <arch/arm/xscale/pxa2x0var.h>
 #include <arch/arm/xscale/pxa2x0_gpio.h>
 #include <arch/arm/xscale/pxa2x0_pcic.h>
 #include <zaurus/zaurus/zaurus_reg.h>
 #include <zaurus/zaurus/zaurus_var.h>
 #include <zaurus/dev/scoopreg.h>
-static int	scoop_pcic_match(struct device *, struct cfdata *, void *);
+static int	scoop_pcic_match(device_t, cfdata_t, void *);
-static void	scoop_pcic_attach(struct device *, struct device *, void *);
+static void	scoop_pcic_attach(device_t, device_t, void *);
-CFATTACH_DECL(pxapcic_scoop, sizeof(struct pxapcic_softc),
+CFATTACH_DECL_NEW(pxapcic_scoop, sizeof(struct pxapcic_softc),
-	scoop_pcic_match, scoop_pcic_attach, NULL, NULL);
+    scoop_pcic_match, scoop_pcic_attach, NULL, NULL);
 static void	scoop_pcic_socket_setup(struct pxapcic_socket *);
 static u_int	scoop_pcic_read(struct pxapcic_socket *, int);
 static void	scoop_pcic_write(struct pxapcic_socket *, int, u_int);
 static void	scoop_pcic_set_power(struct pxapcic_socket *, int);
 static void	scoop_pcic_clear_intr(struct pxapcic_socket *);
 static void 	*scoop_pcic_intr_establish(struct pxapcic_socket *, int,
 		    int (*)(void *), void *);
 static void	scoop_pcic_intr_disestablish(struct pxapcic_socket *, void *);
-struct pxapcic_tag scoop_pcic_functions = {
+static struct pxapcic_tag scoop_pcic_functions = {
 	scoop_pcic_read,
 	scoop_pcic_write,
 	scoop_pcic_set_power,
 	scoop_pcic_clear_intr,
 	scoop_pcic_intr_establish,
 	scoop_pcic_intr_disestablish
 };
 static int
-scoop_pcic_match(struct device *parent, struct cfdata *cf, void *aux)
+scoop_pcic_match(device_t parent, cfdata_t cf, void *aux)
+{
 	return (ZAURUS_ISC860 || ZAURUS_ISC3000);
+}
 static void
-scoop_pcic_attach(struct device *parent, struct device *self, void *aux)
+scoop_pcic_attach(device_t parent, device_t self, void *aux)
+{
-	struct pxapcic_softc *sc = (struct pxapcic_softc *)self;
+	struct pxapcic_softc *sc = device_private(self);
 	struct pxaip_attach_args *pxa = (struct pxaip_attach_args *)aux;
 	sc->sc_dev = self;
 	sc->sc_iot = pxa->pxa_iot;
 	if (ZAURUS_ISC860) {
 		sc->sc_nslots = 1;
 		sc->sc_irqpin[0] = C860_CF0_IRQ;
 		sc->sc_irqcfpin[0] = C860_CF0_IRQ_PIN;
 	} else if (ZAURUS_ISC3000) {
 		sc->sc_nslots = 2;
 		sc->sc_irqpin[0] = C3000_CF0_IRQ;
 		sc->sc_irqcfpin[0] = C3000_CF0_IRQ_PIN;
 		sc->sc_irqpin[1] = C3000_CF1_IRQ;
 		sc->sc_irqcfpin[1] = C3000_CF1_IRQ_PIN;
+	}
 @@ -98,35 +99,35 @@ scoop_pcic_socket_setup(struct pxapcic_s
 	bus_size_t size = SCOOP_SIZE;
 	bus_space_tag_t iot;
 	bus_space_handle_t scooph;
 	int error;
 	sc = so->sc;
 	iot = sc->sc_iot;
 	if (so->socket == 0) {
 		pa = C3000_SCOOP0_BASE;
 	} else if (so->socket == 1) {
 		pa = C3000_SCOOP1_BASE;
 	} else {
-		panic("%s: invalid CF slot %d", sc->sc_dev.dv_xname,
+		panic("%s: invalid CF slot %d", device_xname(sc->sc_dev),
 		    so->socket);
+	}
 	error = bus_space_map(iot, trunc_page(pa), round_page(size),
 , &scooph);
 	if (error) {
 		panic("%s: failed to map memory %x for scoop",
-		    sc->sc_dev.dv_xname, (uint32_t)pa);
+		    device_xname(sc->sc_dev), (uint32_t)pa);
+	}
 	scooph += pa - trunc_page(pa);
 	bus_space_write_2(iot, scooph, SCOOP_IMR,
 	    SCP_IMR_UNKN0 | SCP_IMR_UNKN1);
 	/* setup */
 	bus_space_write_2(iot, scooph, SCOOP_MCR, 0x0100);
 	bus_space_write_2(iot, scooph, SCOOP_CDR, 0x0000);
 	bus_space_write_2(iot, scooph, SCOOP_CPR, 0x0000);
 	bus_space_write_2(iot, scooph, SCOOP_IMR, 0x0000);
 	bus_space_write_2(iot, scooph, SCOOP_IRM, 0x00ff);
 	bus_space_write_2(iot, scooph, SCOOP_ISR, 0x0000);

 @@ -1,34 +1,34 @@
-/*	$NetBSD: zapm.c,v 1.3 2007/07/29 14:31:24 nonaka Exp $	*/
+/*	$NetBSD: zapm.c,v 1.4 2009/01/29 12:28:15 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_apm.c,v 1.13 2006/12/12 23:14:28 dim Exp $	*/
 /*
  * Copyright (c) 2005 Uwe Stuehler <uwe@bsdx.de>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zapm.c,v 1.3 2007/07/29 14:31:24 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zapm.c,v 1.4 2009/01/29 12:28:15 nonaka Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/callout.h>
 #include <dev/hpc/apm/apmvar.h>
 #include <arm/xscale/pxa2x0reg.h>
 #include <arm/xscale/pxa2x0var.h>
 #include <arm/xscale/pxa2x0cpu.h>
 #include <arm/xscale/pxa2x0_gpio.h>
 @@ -36,27 +36,27 @@ __KERNEL_RCSID(0, "$NetBSD: zapm.c,v 1.3
 #include <zaurus/dev/scoopvar.h>
 #include <zaurus/dev/zsspvar.h>
 #include <zaurus/zaurus/zaurus_reg.h>
 #include <zaurus/zaurus/zaurus_var.h>
 #ifdef APMDEBUG
 #define DPRINTF(x)	printf x
 #else
 #define	DPRINTF(x)	do { } while (/*CONSTCOND*/0)
 #endif
 struct zapm_softc {
-	struct device sc_dev;
+	device_t sc_dev;
 	void *sc_apmdev;
 	struct callout sc_cyclic_poll;
 	struct callout sc_discharge_poll;
 	struct timeval sc_lastbattchk;
 	volatile int suspended;
 	volatile int charging;
 	volatile int discharging;
 	int battery_volt;
 	int battery_full_cnt;
 	/* GPIO pin */
 	int sc_ac_detect_pin;
 @@ -66,30 +66,30 @@ struct zapm_softc {
 	/* machine-independent part */
 	volatile u_int events;
 	volatile int power_state;
 	volatile int battery_state;
 	volatile int ac_state;
 	config_hook_tag sc_standby_hook;
 	config_hook_tag sc_suspend_hook;
 	config_hook_tag sc_battery_hook;
 	config_hook_tag sc_ac_hook;
 	int battery_life;
 	int minutes_left;
 };
-static int	zapm_match(struct device *, struct cfdata *, void *);
+static int	zapm_match(device_t, cfdata_t, void *);
-static void	zapm_attach(struct device *, struct device *, void *);
+static void	zapm_attach(device_t, device_t, void *);
-CFATTACH_DECL(zapm, sizeof(struct zapm_softc),
+CFATTACH_DECL_NEW(zapm, sizeof(struct zapm_softc),
     zapm_match, zapm_attach, NULL, NULL);
 static int	zapm_hook(void *, int, long, void *);
 static void     zapm_disconnect(void *);
 static void     zapm_enable(void *, int);
 static int      zapm_set_powstate(void *, u_int, u_int);
 static int      zapm_get_powstat(void *, struct apm_power_info *);
 static int      zapm_get_event(void *, u_int *, u_int *);
 static void     zapm_cpu_busy(void *);
 static void     zapm_cpu_idle(void *);
 static void     zapm_get_capabilities(void *, u_int *, u_int *);
 static struct apm_accessops zapm_accessops = {
 @@ -108,41 +108,44 @@ static int	zapm_bcintr(void *);
 static void	zapm_cyclic(void *);
 static void	zapm_poll(void *);
 static void	zapm_poll1(void *, int);
 /* battery-related GPIO pins */
 #define GPIO_AC_IN_C3000	115	/* 0=AC connected */
 #define GPIO_CHRG_CO_C3000	101	/* 1=battery full */
 #define GPIO_BATT_COVER_C3000	90	/* 0=unlocked */
 /* Cyclic timer value */
 #define	CYCLIC_TIME	(60 * hz)	/* 60s */
 static int
-zapm_match(struct device *parent, struct cfdata *cf, void *aux)
+zapm_match(device_t parent, cfdata_t cf, void *aux)
+{
 	if (!ZAURUS_ISC3000)
 		return 0;
 	return 1;
+}
 static void
-zapm_attach(struct device *parent, struct device *self, void *aux)
+zapm_attach(device_t parent, device_t self, void *aux)
+{
 	struct zapm_softc *sc = device_private(self);
 	struct apmdev_attach_args aaa;
 	sc->sc_dev = self;
 	aprint_normal(": pseudo power management module\n");
 	aprint_naive("\n");
 	/* machine-depent part */
 	callout_init(&sc->sc_cyclic_poll, 0);
 	callout_setfunc(&sc->sc_cyclic_poll, zapm_cyclic, sc);
 	callout_init(&sc->sc_discharge_poll, 0);
 	callout_setfunc(&sc->sc_discharge_poll, zapm_poll, sc);
 	if (ZAURUS_ISC3000) {
 		sc->sc_ac_detect_pin = GPIO_AC_IN_C3000;
 		sc->sc_batt_cover_pin = GPIO_BATT_COVER_C3000;
 		sc->sc_charge_comp_pin = GPIO_CHRG_CO_C3000;
 	} else {
 		/* XXX */

 @@ -1,103 +1,104 @@
-/*	$NetBSD: zssp.c,v 1.3 2007/10/17 19:58:35 garbled Exp $	*/
+/*	$NetBSD: zssp.c,v 1.4 2009/01/29 12:28:15 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_ssp.c,v 1.6 2005/04/08 21:58:49 uwe Exp $	*/
 /*
  * Copyright (c) 2005 Uwe Stuehler <uwe@bsdx.de>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zssp.c,v 1.3 2007/10/17 19:58:35 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zssp.c,v 1.4 2009/01/29 12:28:15 nonaka Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/bus.h>
 #include <arm/xscale/pxa2x0reg.h>
 #include <arm/xscale/pxa2x0var.h>
 #include <arm/xscale/pxa2x0_gpio.h>
 #include <zaurus/dev/zsspvar.h>
 #include <zaurus/zaurus/zaurus_var.h>
 #define GPIO_ADS7846_CS_C3000	14	/* SSP SFRM */
 #define GPIO_MAX1111_CS_C3000	20
 #define GPIO_TG_CS_C3000	53
 #define SSCR0_ADS7846_C3000	0x06ab /* 12bit/Microwire/div by 7 */
 #define SSCR0_MAX1111		0x0387
 #define	SSCR0_LZ9JG18		0x01ab
 struct zssp_softc {
-	struct device sc_dev;
+	device_t sc_dev;
 	bus_space_tag_t sc_iot;
 	bus_space_handle_t sc_ioh;
 };
-static int	zssp_match(struct device *, struct cfdata *, void *);
+static int	zssp_match(device_t, cfdata_t, void *);
-static void	zssp_attach(struct device *, struct device *, void *);
+static void	zssp_attach(device_t, device_t, void *);
-CFATTACH_DECL(zssp, sizeof(struct zssp_softc),
+CFATTACH_DECL_NEW(zssp, sizeof(struct zssp_softc),
 	zssp_match, zssp_attach, NULL, NULL);
 static void	zssp_init(void);
 static void	zssp_powerhook(int, void *);
 static struct zssp_softc *zssp_sc;
 static int
-zssp_match(struct device *parent, struct cfdata *cf, void *aux)
+zssp_match(device_t parent, cfdata_t cf, void *aux)
+{
 	if (zssp_sc != NULL)
 		return 0;
 	return 1;
+}
 static void
-zssp_attach(struct device *parent, struct device *self, void *aux)
+zssp_attach(device_t parent, device_t self, void *aux)
+{
-	struct zssp_softc *sc = (struct zssp_softc *)self;
+	struct zssp_softc *sc = device_private(self);
 	sc->sc_dev = self;
 	zssp_sc = sc;
 	aprint_normal("\n");
 	aprint_naive("\n");
 	sc->sc_iot = &pxa2x0_bs_tag;
 	if (bus_space_map(sc->sc_iot, PXA2X0_SSP1_BASE, PXA2X0_SSP_SIZE,
 , &sc->sc_ioh)) {
-		printf(": can't map bus space\n");
+		aprint_error_dev(sc->sc_dev, "can't map bus space\n");
 		return;
+	}
-	zssp_sc = sc;
+	if (powerhook_establish(device_xname(sc->sc_dev), zssp_powerhook, sc)
 	printf("\n");
 	if (powerhook_establish(sc->sc_dev.dv_xname, zssp_powerhook, sc)
 	    == NULL) {
-		printf("%s: can't establish power hook\n",
+		aprint_error_dev(sc->sc_dev, "can't establish power hook\n");
 		    sc->sc_dev.dv_xname);
+	}
 	zssp_init();
+}
 /*
  * Initialize the dedicated SSP unit and disable all chip selects.
  * This function is called with interrupts disabled.
  */
 static void
 zssp_init(void)
+{
 	struct zssp_softc *sc;
 @@ -201,37 +202,42 @@ zssp_ic_stop(int ic)
 	pxa2x0_gpio_set_bit(GPIO_TG_CS_C3000);
 	pxa2x0_gpio_set_bit(GPIO_MAX1111_CS_C3000);
 	return rv;
+}
 /*
  * Activate one of the chip-select lines, transmit one word value in
  * each direction, and deactivate the chip-select again.
  */
 uint32_t
 zssp_ic_send(int ic, uint32_t data)
+{
 	struct zssp_softc *sc;
 	KASSERT(zssp_sc != NULL);
 	sc = zssp_sc;
 	switch (ic) {
 	case ZSSP_IC_MAX1111:
 		return (zssp_read_max1111(data));
 	case ZSSP_IC_ADS7846:
 		return (zssp_read_ads7846(data));
 	case ZSSP_IC_LZ9JG18:
 		zssp_write_lz9jg18(data);
 		return 0;
 	default:
-		printf("zssp_ic_send: invalid IC %d\n", ic);
+		aprint_error_dev(sc->sc_dev,
 		    "zssp_ic_send: invalid IC %d\n", ic);
 		return 0;
+	}
+}
 int
 zssp_read_max1111(uint32_t cmd)
+{
 	struct zssp_softc *sc;
 	int voltage[2];
 	int i;
 	int s;
 	KASSERT(zssp_sc != NULL);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: zusb.c,v 1.3 2009/01/28 14:15:56 nonaka Exp $	*/
+/*	$NetBSD: zusb.c,v 1.4 2009/01/29 12:28:15 nonaka Exp $	*/
 /*
  * Copyright (c) 2008 Christopher Gilbert
  * All rights reserved.
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the company nor the name of the author may be used to
  *    endorse or promote products derived from this software without specific
  *    prior written permission.
 @@ -17,27 +17,27 @@
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zusb.c,v 1.3 2009/01/28 14:15:56 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zusb.c,v 1.4 2009/01/29 12:28:15 nonaka Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <arm/xscale/pxa2x0reg.h>
 #include <arm/xscale/pxa2x0var.h>
 #include <arm/xscale/pxa2x0_gpio.h>
 #include <machine/intr.h>
 #include <machine/bus.h>
 #include <zaurus/zaurus/zaurus_reg.h>
 @@ -51,52 +51,53 @@ __KERNEL_RCSID(0, "$NetBSD: zusb.c,v 1.3
 #endif
 struct zusb_softc {
 	device_t sc_dev;
 	bus_space_tag_t sc_iot;
 	bus_space_handle_t sc_ioh;
 	void *sc_client_ih;
 	void *sc_host_ih;
 };
-static int	zusb_match(struct device *, struct cfdata *, void *);
+static int	zusb_match(device_t, cfdata_t, void *);
-static void	zusb_attach(struct device *, struct device *, void *);
+static void	zusb_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(zusb, sizeof(struct zusb_softc),
     zusb_match, zusb_attach, NULL, NULL);
 static int	zusb_client_intr(void *);
 static int	zusb_host_intr(void *);
 static void	zusb_test_and_enabled_host_port(struct zusb_softc *);
 static int
 zusb_match(device_t parent, cfdata_t cf, void *aux)
+{
 	if (ZAURUS_ISC3000)
 		return 1;
 	return 0;
+}
 static void
 zusb_attach(device_t parent, device_t self, void *aux)
+{
 	struct zusb_softc *sc = device_private(self);
 	struct pxaip_attach_args *pxa = aux;
 	aprint_normal(": USB Mode detection\n");
 	aprint_naive("\n");
 	sc->sc_dev = self;
 	sc->sc_iot = pxa->pxa_iot;
 	/* Map I/O space */
 	if (bus_space_map(sc->sc_iot, PXA2X0_USBDC_BASE, PXA270_USBDC_SIZE, 0,
 				&sc->sc_ioh)) {
 		aprint_error_dev(sc->sc_dev, "couldn't map memory space\n");
 		return;
+	}
 	pxa2x0_gpio_set_function(C3000_USB_DEVICE_PIN, GPIO_IN);
 	sc->sc_client_ih = pxa2x0_gpio_intr_establish(C3000_USB_DEVICE_PIN,

 @@ -1,34 +1,34 @@
-/*	$NetBSD: zkbd.c,v 1.7 2007/10/17 19:58:34 garbled Exp $	*/
+/*	$NetBSD: zkbd.c,v 1.8 2009/01/29 12:28:15 nonaka Exp $	*/
 /* $OpenBSD: zaurus_kbd.c,v 1.28 2005/12/21 20:36:03 deraadt Exp $ */
 /*
  * Copyright (c) 2005 Dale Rahn <drahn@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.7 2007/10/17 19:58:34 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.8 2009/01/29 12:28:15 nonaka Exp $");
 #include "opt_wsdisplay_compat.h"
 #include "lcd.h"
 #if 0	/* XXX */
 #include "apm.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 @@ -73,27 +73,27 @@ static const int gpio_strobe_pins_c3000[
 };
 static const int stuck_keys[] = {
 ,
 ,
 ,
 };
 #define REP_DELAY1 400
 #define REP_DELAYN 100
 struct zkbd_softc {
-	struct device sc_dev;
+	device_t sc_dev;
 	const int *sc_sense_array;
 	const int *sc_strobe_array;
 	int sc_nsense;
 	int sc_nstrobe;
 	short sc_onkey_pin;
 	short sc_sync_pin;
 	short sc_swa_pin;
 	short sc_swb_pin;
 	char *sc_okeystate;
 	char *sc_keystate;
 	char sc_hinge;		/* 0=open, 1=nonsense, 2=backwards, 3=closed */
 @@ -111,30 +111,30 @@ struct zkbd_softc {
 	int sc_rawkbd;
 #ifdef WSDISPLAY_COMPAT_RAWKBD
 	const char *sc_xt_keymap;
 	struct callout sc_rawrepeat_ch;
 #define MAXKEYS 20
 	char sc_rep[MAXKEYS];
 	int sc_nrep;
 #endif
 	void *sc_powerhook;
 };
 static struct zkbd_softc *zkbd_sc;
-static int	zkbd_match(struct device *, struct cfdata *, void *);
+static int	zkbd_match(device_t, cfdata_t, void *);
-static void	zkbd_attach(struct device *, struct device *, void *);
+static void	zkbd_attach(device_t, device_t, void *);
-CFATTACH_DECL(zkbd, sizeof(struct zkbd_softc),
+CFATTACH_DECL_NEW(zkbd, sizeof(struct zkbd_softc),
 	zkbd_match, zkbd_attach, NULL, NULL);
 static int	zkbd_irq(void *v);
 static void	zkbd_poll(void *v);
 static int	zkbd_on(void *v);
 static int	zkbd_sync(void *v);
 static int	zkbd_hinge(void *v);
 static void	zkbd_power(int why, void *arg);
 int zkbd_modstate;
 static int	zkbd_enable(void *, int);
 static void	zkbd_set_leds(void *, int);
 @@ -153,45 +153,47 @@ static void	zkbd_cngetc(void *, u_int *,
 static void	zkbd_cnpollc(void *, int);
 static struct wskbd_consops zkbd_consops = {
 	zkbd_cngetc,
 	zkbd_cnpollc,
 };
 static struct wskbd_mapdata zkbd_keymapdata = {
 	zkbd_keydesctab,
 	KB_US,
 };
 static int
-zkbd_match(struct device *parent, struct cfdata *cf, void *aux)
+zkbd_match(device_t parent, cfdata_t cf, void *aux)
+{
 	if (zkbd_sc)
 		return 0;
 	return 1;
+}
 static void
-zkbd_attach(struct device *parent, struct device *self, void *aux)
+zkbd_attach(device_t parent, device_t self, void *aux)
+{
-	struct zkbd_softc *sc = (struct zkbd_softc *)self;
+	struct zkbd_softc *sc = device_private(self);
 	struct wskbddev_attach_args a;
 	int pin, i;
 	sc->sc_dev = self;
 	zkbd_sc = sc;
-	printf("\n");
+	aprint_normal("\n");
 	aprint_naive("\n");
 	sc->sc_polling = 0;
 #ifdef WSDISPLAY_COMPAT_RAWKBD
 	sc->sc_rawkbd = 0;
 #endif
 	callout_init(&sc->sc_roll_to, 0);
 	callout_setfunc(&sc->sc_roll_to, zkbd_poll, sc);
 #ifdef WSDISPLAY_COMPAT_RAWKBD
 	callout_init(&sc->sc_rawrepeat_ch, 0);
 	callout_setfunc(&sc->sc_rawrepeat_ch, zkbd_rawrepeat, sc);
 #endif
 @@ -203,31 +205,30 @@ zkbd_attach(struct device *parent, struc
 		sc->sc_maxkbdcol = 10;
 		sc->sc_onkey_pin = 95;
 		sc->sc_sync_pin = 16;
 		sc->sc_swa_pin = 97;
 		sc->sc_swb_pin = 96;
 #ifdef WSDISPLAY_COMPAT_RAWKBD
 		sc->sc_xt_keymap = xt_keymap;
 #endif
 	} else {
 		/* XXX */
 		return;
+	}
-	sc->sc_powerhook = powerhook_establish(sc->sc_dev.dv_xname,
+	sc->sc_powerhook = powerhook_establish(device_xname(sc->sc_dev),
 	    zkbd_power, sc);
 	if (sc->sc_powerhook == NULL) {
-		printf("%s: unable to establish powerhook\n",
+		aprint_error_dev(sc->sc_dev, "unable to establish powerhook\n");
 		    sc->sc_dev.dv_xname);
 		return;
+	}
 	sc->sc_okeystate = malloc(sc->sc_nsense * sc->sc_nstrobe,
 	    M_DEVBUF, M_NOWAIT);
 	memset(sc->sc_okeystate, 0, sc->sc_nsense * sc->sc_nstrobe);
 	sc->sc_keystate = malloc(sc->sc_nsense * sc->sc_nstrobe,
 	    M_DEVBUF, M_NOWAIT);
 	memset(sc->sc_keystate, 0, sc->sc_nsense * sc->sc_nstrobe);
 	/* set all the strobe bits */
 	for (i = 0; i < sc->sc_nstrobe; i++) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: zlcd.c,v 1.7 2007/10/17 19:58:35 garbled Exp $	*/
+/*	$NetBSD: zlcd.c,v 1.8 2009/01/29 12:28:15 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_lcd.c,v 1.20 2006/06/02 20:50:14 miod Exp $	*/
 /* NetBSD: lubbock_lcd.c,v 1.1 2003/08/09 19:38:53 bsh Exp */
 /*
  * Copyright (c) 2002, 2003  Genetec Corporation.  All rights reserved.
  * Written by Hiroyuki Bessho for Genetec Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -33,27 +33,27 @@
 /*
  * LCD driver for Sharp Zaurus (based on the Intel Lubbock driver).
+ *
  * Controlling LCD is almost completely done through PXA2X0's
  * integrated LCD controller.  Codes for it is arm/xscale/pxa2x0_lcd.c.
+ *
  * Codes in this file provide platform specific things including:
  *   LCD on/off switch and backlight brightness
  *   LCD panel geometry
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zlcd.c,v 1.7 2007/10/17 19:58:35 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zlcd.c,v 1.8 2009/01/29 12:28:15 nonaka Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
 #include <dev/cons.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wscons_callbacks.h>
 #include <dev/hpc/hpcfbio.h>
 @@ -138,68 +138,70 @@ struct sharp_lcd_backlight {
 #define CURRENT_BACKLIGHT sharp_zaurus_C3000_bl
 const struct sharp_lcd_backlight sharp_zaurus_C3000_bl[] = {
 	{ 0x00, 0,  0 },	/* 0:     Off */
 	{ 0x00, 0,  1 },	/* 1:      0% */
 	{ 0x01, 0,  1 },	/* 2:     20% */
 	{ 0x07, 0,  1 },	/* 3:     40% */
 	{ 0x01, 1,  1 },	/* 4:     60% */
 	{ 0x07, 1,  1 },	/* 5:     80% */
 	{ 0x11, 1,  1 },	/* 6:    100% */
 	{  -1, -1, -1 },	/* 7: Invalid */
 };
-static int	lcd_match(struct device *, struct cfdata *, void *);
+static int	lcd_match(device_t, cfdata_t, void *);
-static void	lcd_attach(struct device *, struct device *, void *);
+static void	lcd_attach(device_t, device_t, void *);
-CFATTACH_DECL(zlcd, sizeof(struct pxa2x0_lcd_softc),
+CFATTACH_DECL_NEW(zlcd, sizeof(struct pxa2x0_lcd_softc),
 	lcd_match, lcd_attach, NULL, NULL);
 void	lcd_cnattach(void);
 int	lcd_max_brightness(void);
 int	lcd_get_brightness(void);
 void	lcd_set_brightness(int);
 void	lcd_set_brightness_internal(int);
 int	lcd_get_backlight(void);
 void	lcd_set_backlight(int);
 void	lcd_blank(int);
 void	lcd_power(int, void *);
 static int
-lcd_match(struct device *parent, struct cfdata *cf, void *aux)
+lcd_match(device_t parent, cfdata_t cf, void *aux)
+{
 	return 1;
+}
 static void
-lcd_attach(struct device *parent, struct device *self, void *aux)
+lcd_attach(device_t parent, device_t self, void *aux)
+{
-	struct pxa2x0_lcd_softc *sc = (struct pxa2x0_lcd_softc *)self;
+	struct pxa2x0_lcd_softc *sc = device_private(self);
 	struct wsemuldisplaydev_attach_args aa;
 	sc->dev = self;
 	pxa2x0_lcd_attach_sub(sc, aux, CURRENT_DISPLAY);
 	aa.console = glass_console;
 	aa.scrdata = &lcd_screen_list;
 	aa.accessops = &lcd_accessops;
 	aa.accesscookie = sc;
 	(void) config_found(self, &aa, wsemuldisplaydevprint);
 	/* Start with approximately 40% of full brightness. */
 	lcd_set_brightness(3);
-	(void) powerhook_establish(sc->dev.dv_xname, lcd_power, sc);
+	(void) powerhook_establish(device_xname(sc->dev), lcd_power, sc);
+}
 void
 lcd_cnattach(void)
+{
 	pxa2x0_lcd_cnattach(&lcd_std_screen, CURRENT_DISPLAY);
+}
 /*
  * wsdisplay accessops overrides
  */
 static int