From owner-svn-src-all@FreeBSD.ORG Thu May 15 16:11:23 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 87EA0CD7; Thu, 15 May 2014 16:11:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 70A1427C0; Thu, 15 May 2014 16:11:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4FGBNva070031; Thu, 15 May 2014 16:11:23 GMT (envelope-from ian@svn.freebsd.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4FGB6E1069906; Thu, 15 May 2014 16:11:06 GMT (envelope-from ian@svn.freebsd.org) Message-Id: <201405151611.s4FGB6E1069906@svn.freebsd.org> From: Ian Lepore Date: Thu, 15 May 2014 16:11:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r266152 - in stable/10/sys: arm/allwinner arm/allwinner/a20 arm/arm arm/broadcom/bcm2835 arm/freescale/imx arm/freescale/vybrid arm/lpc arm/mv arm/rockchip arm/samsung/exynos arm/ti arm... X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 May 2014 16:11:23 -0000 Author: ian Date: Thu May 15 16:11:06 2014 New Revision: 266152 URL: http://svnweb.freebsd.org/changeset/base/266152 Log: MFC r261410 Follow r261352 by updating all drivers which are children of simplebus to check the status property in their probe routines. Modified: stable/10/sys/arm/allwinner/a10_clk.c stable/10/sys/arm/allwinner/a10_ehci.c stable/10/sys/arm/allwinner/a10_gpio.c stable/10/sys/arm/allwinner/a10_wdog.c stable/10/sys/arm/allwinner/a20/a20_cpu_cfg.c stable/10/sys/arm/allwinner/aintc.c stable/10/sys/arm/arm/generic_timer.c stable/10/sys/arm/arm/gic.c stable/10/sys/arm/arm/mpcore_timer.c stable/10/sys/arm/arm/pl190.c stable/10/sys/arm/arm/pl310.c stable/10/sys/arm/broadcom/bcm2835/bcm2835_bsc.c stable/10/sys/arm/broadcom/bcm2835/bcm2835_dma.c stable/10/sys/arm/broadcom/bcm2835/bcm2835_gpio.c stable/10/sys/arm/broadcom/bcm2835/bcm2835_intr.c stable/10/sys/arm/broadcom/bcm2835/bcm2835_mbox.c stable/10/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c stable/10/sys/arm/broadcom/bcm2835/bcm2835_spi.c stable/10/sys/arm/broadcom/bcm2835/bcm2835_systimer.c stable/10/sys/arm/broadcom/bcm2835/bcm2835_wdog.c stable/10/sys/arm/freescale/imx/i2c.c stable/10/sys/arm/freescale/imx/imx51_ccm.c stable/10/sys/arm/freescale/imx/imx51_gpio.c stable/10/sys/arm/freescale/imx/imx51_iomux.c stable/10/sys/arm/freescale/imx/imx51_ipuv3.c stable/10/sys/arm/freescale/imx/imx51_ipuv3_fbd.c stable/10/sys/arm/freescale/imx/imx6_anatop.c stable/10/sys/arm/freescale/imx/imx6_ccm.c stable/10/sys/arm/freescale/imx/imx6_usbphy.c stable/10/sys/arm/freescale/imx/imx_gpt.c stable/10/sys/arm/freescale/imx/imx_nop_usbphy.c stable/10/sys/arm/freescale/imx/imx_sdhci.c stable/10/sys/arm/freescale/imx/imx_wdog.c stable/10/sys/arm/freescale/imx/tzic.c stable/10/sys/arm/freescale/vybrid/vf_anadig.c stable/10/sys/arm/freescale/vybrid/vf_ccm.c stable/10/sys/arm/freescale/vybrid/vf_ehci.c stable/10/sys/arm/freescale/vybrid/vf_gpio.c stable/10/sys/arm/freescale/vybrid/vf_iomuxc.c stable/10/sys/arm/freescale/vybrid/vf_mscm.c stable/10/sys/arm/freescale/vybrid/vf_nfc.c stable/10/sys/arm/freescale/vybrid/vf_src.c stable/10/sys/arm/lpc/if_lpe.c stable/10/sys/arm/lpc/lpc_dmac.c stable/10/sys/arm/lpc/lpc_fb.c stable/10/sys/arm/lpc/lpc_gpio.c stable/10/sys/arm/lpc/lpc_intc.c stable/10/sys/arm/lpc/lpc_mmc.c stable/10/sys/arm/lpc/lpc_ohci.c stable/10/sys/arm/lpc/lpc_pwr.c stable/10/sys/arm/lpc/lpc_rtc.c stable/10/sys/arm/lpc/lpc_spi.c stable/10/sys/arm/lpc/lpc_timer.c stable/10/sys/arm/mv/gpio.c stable/10/sys/arm/mv/ic.c stable/10/sys/arm/mv/mpic.c stable/10/sys/arm/mv/mv_sata.c stable/10/sys/arm/mv/mv_ts.c stable/10/sys/arm/mv/rtc.c stable/10/sys/arm/mv/timer.c stable/10/sys/arm/mv/twsi.c stable/10/sys/arm/rockchip/rk30xx_gpio.c stable/10/sys/arm/rockchip/rk30xx_grf.c stable/10/sys/arm/rockchip/rk30xx_pmu.c stable/10/sys/arm/rockchip/rk30xx_wdog.c stable/10/sys/arm/samsung/exynos/arch_timer.c stable/10/sys/arm/samsung/exynos/ehci_exynos5.c stable/10/sys/arm/ti/aintc.c stable/10/sys/arm/ti/am335x/am335x_dmtimer.c stable/10/sys/arm/ti/am335x/am335x_lcd.c stable/10/sys/arm/ti/am335x/am335x_prcm.c stable/10/sys/arm/ti/am335x/am335x_pwm.c stable/10/sys/arm/ti/am335x/am335x_usbss.c stable/10/sys/arm/ti/cpsw/if_cpsw.c stable/10/sys/arm/ti/omap4/omap4_prcm_clks.c stable/10/sys/arm/ti/ti_edma3.c stable/10/sys/arm/ti/ti_gpio.c stable/10/sys/arm/ti/ti_i2c.c stable/10/sys/arm/ti/ti_mbox.c stable/10/sys/arm/ti/ti_mmchs.c stable/10/sys/arm/ti/ti_pruss.c stable/10/sys/arm/ti/ti_scm.c stable/10/sys/arm/ti/ti_sdhci.c stable/10/sys/arm/ti/ti_sdma.c stable/10/sys/arm/ti/usb/omap_ehci.c stable/10/sys/arm/versatile/if_smc_fdt.c stable/10/sys/arm/versatile/pl050.c stable/10/sys/arm/versatile/sp804.c stable/10/sys/arm/versatile/versatile_clcd.c stable/10/sys/arm/versatile/versatile_pci.c stable/10/sys/arm/versatile/versatile_sic.c stable/10/sys/arm/xilinx/zy7_devcfg.c stable/10/sys/arm/xilinx/zy7_ehci.c stable/10/sys/arm/xilinx/zy7_gpio.c stable/10/sys/arm/xilinx/zy7_slcr.c stable/10/sys/dev/altera/atse/if_atse_fdt.c stable/10/sys/dev/altera/avgen/altera_avgen_fdt.c stable/10/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c stable/10/sys/dev/altera/sdcard/altera_sdcard_fdt.c stable/10/sys/dev/ata/chipsets/ata-fsl.c stable/10/sys/dev/cesa/cesa.c stable/10/sys/dev/cfi/cfi_bus_fdt.c stable/10/sys/dev/fdt/simplebus.c stable/10/sys/dev/ffec/if_ffec.c stable/10/sys/dev/mge/if_mge.c stable/10/sys/dev/mvs/mvs_soc.c stable/10/sys/dev/quicc/quicc_bfe_fdt.c stable/10/sys/dev/sdhci/sdhci_fdt.c stable/10/sys/dev/sec/sec.c stable/10/sys/dev/terasic/de4led/terasic_de4led_fdt.c stable/10/sys/dev/terasic/mtl/terasic_mtl_fdt.c stable/10/sys/dev/tsec/if_tsec_fdt.c stable/10/sys/dev/uart/uart_bus_fdt.c stable/10/sys/dev/usb/controller/dwc_otg_fdt.c stable/10/sys/dev/usb/controller/ehci_fsl.c stable/10/sys/dev/usb/controller/ehci_imx.c stable/10/sys/dev/usb/controller/ehci_mv.c stable/10/sys/mips/beri/beri_pic.c stable/10/sys/mips/beri/beri_simplebus.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/arm/allwinner/a10_clk.c ============================================================================== --- stable/10/sys/arm/allwinner/a10_clk.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/allwinner/a10_clk.c Thu May 15 16:11:06 2014 (r266152) @@ -69,6 +69,10 @@ static struct a10_ccm_softc *a10_ccm_sc static int a10_ccm_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "allwinner,sun4i-ccm")) { device_set_desc(dev, "Allwinner Clock Control Module"); return(BUS_PROBE_DEFAULT); Modified: stable/10/sys/arm/allwinner/a10_ehci.c ============================================================================== --- stable/10/sys/arm/allwinner/a10_ehci.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/allwinner/a10_ehci.c Thu May 15 16:11:06 2014 (r266152) @@ -93,6 +93,10 @@ bs_w_1_proto(reversed); static int a10_ehci_probe(device_t self) { + + if (!ofw_bus_status_okay(self)) + return (ENXIO); + if (!ofw_bus_is_compatible(self, "allwinner,usb-ehci")) return (ENXIO); Modified: stable/10/sys/arm/allwinner/a10_gpio.c ============================================================================== --- stable/10/sys/arm/allwinner/a10_gpio.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/allwinner/a10_gpio.c Thu May 15 16:11:06 2014 (r266152) @@ -410,6 +410,10 @@ a10_gpio_pin_toggle(device_t dev, uint32 static int a10_gpio_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "allwinner,sun4i-gpio")) return (ENXIO); Modified: stable/10/sys/arm/allwinner/a10_wdog.c ============================================================================== --- stable/10/sys/arm/allwinner/a10_wdog.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/allwinner/a10_wdog.c Thu May 15 16:11:06 2014 (r266152) @@ -93,6 +93,9 @@ static int a10wd_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "allwinner,sun4i-wdt")) { device_set_desc(dev, "Allwinner A10 Watchdog"); return (BUS_PROBE_DEFAULT); Modified: stable/10/sys/arm/allwinner/a20/a20_cpu_cfg.c ============================================================================== --- stable/10/sys/arm/allwinner/a20/a20_cpu_cfg.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/allwinner/a20/a20_cpu_cfg.c Thu May 15 16:11:06 2014 (r266152) @@ -70,6 +70,9 @@ static int a20_cpu_cfg_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "allwinner,sun7i-cpu-cfg")) { device_set_desc(dev, "A20 CPU Configuration Module"); return(BUS_PROBE_DEFAULT); Modified: stable/10/sys/arm/allwinner/aintc.c ============================================================================== --- stable/10/sys/arm/allwinner/aintc.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/allwinner/aintc.c Thu May 15 16:11:06 2014 (r266152) @@ -97,6 +97,10 @@ static struct a10_aintc_softc *a10_aintc static int a10_aintc_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "allwinner,sun4i-ic")) return (ENXIO); device_set_desc(dev, "A10 AINTC Interrupt Controller"); Modified: stable/10/sys/arm/arm/generic_timer.c ============================================================================== --- stable/10/sys/arm/arm/generic_timer.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/arm/generic_timer.c Thu May 15 16:11:06 2014 (r266152) @@ -244,6 +244,9 @@ static int arm_tmr_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "arm,armv7-timer")) return (ENXIO); Modified: stable/10/sys/arm/arm/gic.c ============================================================================== --- stable/10/sys/arm/arm/gic.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/arm/gic.c Thu May 15 16:11:06 2014 (r266152) @@ -129,6 +129,9 @@ static int arm_gic_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "arm,gic")) return (ENXIO); device_set_desc(dev, "ARM Generic Interrupt Controller"); Modified: stable/10/sys/arm/arm/mpcore_timer.c ============================================================================== --- stable/10/sys/arm/arm/mpcore_timer.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/arm/mpcore_timer.c Thu May 15 16:11:06 2014 (r266152) @@ -247,6 +247,10 @@ arm_tmr_intr(void *arg) static int arm_tmr_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "arm,mpcore-timers")) return (ENXIO); Modified: stable/10/sys/arm/arm/pl190.c ============================================================================== --- stable/10/sys/arm/arm/pl190.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/arm/pl190.c Thu May 15 16:11:06 2014 (r266152) @@ -78,6 +78,10 @@ static struct pl190_intc_softc *pl190_in static int pl190_intc_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "arm,versatile-vic")) return (ENXIO); device_set_desc(dev, "ARM PL190 VIC"); Modified: stable/10/sys/arm/arm/pl310.c ============================================================================== --- stable/10/sys/arm/arm/pl310.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/arm/pl310.c Thu May 15 16:11:06 2014 (r266152) @@ -281,6 +281,9 @@ static int pl310_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "arm,pl310")) return (ENXIO); device_set_desc(dev, "PL310 L2 cache controller"); Modified: stable/10/sys/arm/broadcom/bcm2835/bcm2835_bsc.c ============================================================================== --- stable/10/sys/arm/broadcom/bcm2835/bcm2835_bsc.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/broadcom/bcm2835/bcm2835_bsc.c Thu May 15 16:11:06 2014 (r266152) @@ -222,6 +222,9 @@ static int bcm_bsc_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "broadcom,bcm2835-bsc")) return (ENXIO); Modified: stable/10/sys/arm/broadcom/bcm2835/bcm2835_dma.c ============================================================================== --- stable/10/sys/arm/broadcom/bcm2835/bcm2835_dma.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/broadcom/bcm2835/bcm2835_dma.c Thu May 15 16:11:06 2014 (r266152) @@ -637,6 +637,9 @@ static int bcm_dma_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "broadcom,bcm2835-dma")) return (ENXIO); Modified: stable/10/sys/arm/broadcom/bcm2835/bcm2835_gpio.c ============================================================================== --- stable/10/sys/arm/broadcom/bcm2835/bcm2835_gpio.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/broadcom/bcm2835/bcm2835_gpio.c Thu May 15 16:11:06 2014 (r266152) @@ -674,6 +674,10 @@ bcm_gpio_get_reserved_pins(struct bcm_gp static int bcm_gpio_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "broadcom,bcm2835-gpio")) return (ENXIO); Modified: stable/10/sys/arm/broadcom/bcm2835/bcm2835_intr.c ============================================================================== --- stable/10/sys/arm/broadcom/bcm2835/bcm2835_intr.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/broadcom/bcm2835/bcm2835_intr.c Thu May 15 16:11:06 2014 (r266152) @@ -90,6 +90,10 @@ static struct bcm_intc_softc *bcm_intc_s static int bcm_intc_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "broadcom,bcm2835-armctrl-ic")) return (ENXIO); device_set_desc(dev, "BCM2835 Interrupt Controller"); Modified: stable/10/sys/arm/broadcom/bcm2835/bcm2835_mbox.c ============================================================================== --- stable/10/sys/arm/broadcom/bcm2835/bcm2835_mbox.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/broadcom/bcm2835/bcm2835_mbox.c Thu May 15 16:11:06 2014 (r266152) @@ -128,6 +128,9 @@ static int bcm_mbox_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "broadcom,bcm2835-mbox")) { device_set_desc(dev, "BCM2835 VideoCore Mailbox"); return(BUS_PROBE_DEFAULT); Modified: stable/10/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c ============================================================================== --- stable/10/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c Thu May 15 16:11:06 2014 (r266152) @@ -151,6 +151,10 @@ bcm_dmamap_cb(void *arg, bus_dma_segment static int bcm_sdhci_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "broadcom,bcm2835-sdhci")) return (ENXIO); Modified: stable/10/sys/arm/broadcom/bcm2835/bcm2835_spi.c ============================================================================== --- stable/10/sys/arm/broadcom/bcm2835/bcm2835_spi.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/broadcom/bcm2835/bcm2835_spi.c Thu May 15 16:11:06 2014 (r266152) @@ -231,6 +231,9 @@ static int bcm_spi_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "broadcom,bcm2835-spi")) return (ENXIO); Modified: stable/10/sys/arm/broadcom/bcm2835/bcm2835_systimer.c ============================================================================== --- stable/10/sys/arm/broadcom/bcm2835/bcm2835_systimer.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/broadcom/bcm2835/bcm2835_systimer.c Thu May 15 16:11:06 2014 (r266152) @@ -186,6 +186,9 @@ static int bcm_systimer_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "broadcom,bcm2835-system-timer")) { device_set_desc(dev, "BCM2835 System Timer"); return (BUS_PROBE_DEFAULT); Modified: stable/10/sys/arm/broadcom/bcm2835/bcm2835_wdog.c ============================================================================== --- stable/10/sys/arm/broadcom/bcm2835/bcm2835_wdog.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/broadcom/bcm2835/bcm2835_wdog.c Thu May 15 16:11:06 2014 (r266152) @@ -86,6 +86,9 @@ static int bcmwd_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "broadcom,bcm2835-wdt")) { device_set_desc(dev, "BCM2708/2835 Watchdog"); return (BUS_PROBE_DEFAULT); Modified: stable/10/sys/arm/freescale/imx/i2c.c ============================================================================== --- stable/10/sys/arm/freescale/imx/i2c.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/imx/i2c.c Thu May 15 16:11:06 2014 (r266152) @@ -224,6 +224,9 @@ i2c_probe(device_t dev) { struct i2c_softc *sc; + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "fsl,imx-i2c")) return (ENXIO); Modified: stable/10/sys/arm/freescale/imx/imx51_ccm.c ============================================================================== --- stable/10/sys/arm/freescale/imx/imx51_ccm.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/imx/imx51_ccm.c Thu May 15 16:11:06 2014 (r266152) @@ -141,6 +141,9 @@ static int imxccm_match(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "fsl,imx51-ccm") && !ofw_bus_is_compatible(dev, "fsl,imx53-ccm")) return (ENXIO); Modified: stable/10/sys/arm/freescale/imx/imx51_gpio.c ============================================================================== --- stable/10/sys/arm/freescale/imx/imx51_gpio.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/imx/imx51_gpio.c Thu May 15 16:11:06 2014 (r266152) @@ -370,6 +370,9 @@ static int imx51_gpio_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "fsl,imx51-gpio") || ofw_bus_is_compatible(dev, "fsl,imx53-gpio")) { device_set_desc(dev, "i.MX515 GPIO Controller"); Modified: stable/10/sys/arm/freescale/imx/imx51_iomux.c ============================================================================== --- stable/10/sys/arm/freescale/imx/imx51_iomux.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/imx/imx51_iomux.c Thu May 15 16:11:06 2014 (r266152) @@ -106,6 +106,9 @@ static int iomux_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "fsl,imx51-iomux") && !ofw_bus_is_compatible(dev, "fsl,imx53-iomux")) return (ENXIO); Modified: stable/10/sys/arm/freescale/imx/imx51_ipuv3.c ============================================================================== --- stable/10/sys/arm/freescale/imx/imx51_ipuv3.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/imx/imx51_ipuv3.c Thu May 15 16:11:06 2014 (r266152) @@ -254,6 +254,9 @@ ipu3_fb_probe(device_t dev) { int error; + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "fsl,ipu3")) return (ENXIO); Modified: stable/10/sys/arm/freescale/imx/imx51_ipuv3_fbd.c ============================================================================== --- stable/10/sys/arm/freescale/imx/imx51_ipuv3_fbd.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/imx/imx51_ipuv3_fbd.c Thu May 15 16:11:06 2014 (r266152) @@ -184,6 +184,9 @@ static int ipu3_fb_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "fsl,ipu3")) return (ENXIO); Modified: stable/10/sys/arm/freescale/imx/imx6_anatop.c ============================================================================== --- stable/10/sys/arm/freescale/imx/imx6_anatop.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/imx/imx6_anatop.c Thu May 15 16:11:06 2014 (r266152) @@ -126,6 +126,9 @@ static int imx6_anatop_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "fsl,imx6q-anatop") == 0) return (ENXIO); Modified: stable/10/sys/arm/freescale/imx/imx6_ccm.c ============================================================================== --- stable/10/sys/arm/freescale/imx/imx6_ccm.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/imx/imx6_ccm.c Thu May 15 16:11:06 2014 (r266152) @@ -121,6 +121,9 @@ static int ccm_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "fsl,imx6q-ccm") == 0) return (ENXIO); Modified: stable/10/sys/arm/freescale/imx/imx6_usbphy.c ============================================================================== --- stable/10/sys/arm/freescale/imx/imx6_usbphy.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/imx/imx6_usbphy.c Thu May 15 16:11:06 2014 (r266152) @@ -160,6 +160,9 @@ static int usbphy_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "fsl,imx6q-usbphy") == 0) return (ENXIO); Modified: stable/10/sys/arm/freescale/imx/imx_gpt.c ============================================================================== --- stable/10/sys/arm/freescale/imx/imx_gpt.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/imx/imx_gpt.c Thu May 15 16:11:06 2014 (r266152) @@ -121,6 +121,9 @@ static int imx_gpt_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data != 0) { device_set_desc(dev, "Freescale i.MX GPT timer"); return (BUS_PROBE_DEFAULT); Modified: stable/10/sys/arm/freescale/imx/imx_nop_usbphy.c ============================================================================== --- stable/10/sys/arm/freescale/imx/imx_nop_usbphy.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/imx/imx_nop_usbphy.c Thu May 15 16:11:06 2014 (r266152) @@ -89,6 +89,9 @@ static int usbphy_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data != 0) { device_set_desc(dev, "Freescale USB PHY"); return (BUS_PROBE_DEFAULT); Modified: stable/10/sys/arm/freescale/imx/imx_sdhci.c ============================================================================== --- stable/10/sys/arm/freescale/imx/imx_sdhci.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/imx/imx_sdhci.c Thu May 15 16:11:06 2014 (r266152) @@ -643,6 +643,9 @@ static int imx_sdhci_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + switch (ofw_bus_search_compatible(dev, compat_data)->ocd_data) { case HWTYPE_ESDHC: device_set_desc(dev, "Freescale eSDHC controller"); Modified: stable/10/sys/arm/freescale/imx/imx_wdog.c ============================================================================== --- stable/10/sys/arm/freescale/imx/imx_wdog.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/imx/imx_wdog.c Thu May 15 16:11:06 2014 (r266152) @@ -130,6 +130,9 @@ static int imx_wdog_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "fsl,imx51-wdt") && !ofw_bus_is_compatible(dev, "fsl,imx53-wdt")) return (ENXIO); Modified: stable/10/sys/arm/freescale/imx/tzic.c ============================================================================== --- stable/10/sys/arm/freescale/imx/tzic.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/imx/tzic.c Thu May 15 16:11:06 2014 (r266152) @@ -76,6 +76,10 @@ static void tzic_post_filter(void *); static int tzic_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "fsl,tzic")) { device_set_desc(dev, "TrustZone Interrupt Controller"); return (BUS_PROBE_DEFAULT); Modified: stable/10/sys/arm/freescale/vybrid/vf_anadig.c ============================================================================== --- stable/10/sys/arm/freescale/vybrid/vf_anadig.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/vybrid/vf_anadig.c Thu May 15 16:11:06 2014 (r266152) @@ -114,6 +114,9 @@ static int anadig_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "fsl,mvf600-anadig")) return (ENXIO); Modified: stable/10/sys/arm/freescale/vybrid/vf_ccm.c ============================================================================== --- stable/10/sys/arm/freescale/vybrid/vf_ccm.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/vybrid/vf_ccm.c Thu May 15 16:11:06 2014 (r266152) @@ -339,6 +339,9 @@ static int ccm_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "fsl,mvf600-ccm")) return (ENXIO); Modified: stable/10/sys/arm/freescale/vybrid/vf_ehci.c ============================================================================== --- stable/10/sys/arm/freescale/vybrid/vf_ehci.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/vybrid/vf_ehci.c Thu May 15 16:11:06 2014 (r266152) @@ -176,6 +176,9 @@ static int vybrid_ehci_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "fsl,mvf600-usb-ehci") == 0) return (ENXIO); Modified: stable/10/sys/arm/freescale/vybrid/vf_gpio.c ============================================================================== --- stable/10/sys/arm/freescale/vybrid/vf_gpio.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/vybrid/vf_gpio.c Thu May 15 16:11:06 2014 (r266152) @@ -123,6 +123,9 @@ static int vf_gpio_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "fsl,mvf600-gpio")) return (ENXIO); Modified: stable/10/sys/arm/freescale/vybrid/vf_iomuxc.c ============================================================================== --- stable/10/sys/arm/freescale/vybrid/vf_iomuxc.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/vybrid/vf_iomuxc.c Thu May 15 16:11:06 2014 (r266152) @@ -90,6 +90,9 @@ static int iomuxc_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "fsl,mvf600-iomuxc")) return (ENXIO); Modified: stable/10/sys/arm/freescale/vybrid/vf_mscm.c ============================================================================== --- stable/10/sys/arm/freescale/vybrid/vf_mscm.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/vybrid/vf_mscm.c Thu May 15 16:11:06 2014 (r266152) @@ -75,6 +75,9 @@ static int mscm_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "fsl,mvf600-mscm")) return (ENXIO); Modified: stable/10/sys/arm/freescale/vybrid/vf_nfc.c ============================================================================== --- stable/10/sys/arm/freescale/vybrid/vf_nfc.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/vybrid/vf_nfc.c Thu May 15 16:11:06 2014 (r266152) @@ -171,6 +171,9 @@ static int vf_nand_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "fsl,mvf600-nand")) return (ENXIO); Modified: stable/10/sys/arm/freescale/vybrid/vf_src.c ============================================================================== --- stable/10/sys/arm/freescale/vybrid/vf_src.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/freescale/vybrid/vf_src.c Thu May 15 16:11:06 2014 (r266152) @@ -102,6 +102,9 @@ static int src_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "fsl,mvf600-src")) return (ENXIO); Modified: stable/10/sys/arm/lpc/if_lpe.c ============================================================================== --- stable/10/sys/arm/lpc/if_lpe.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/lpc/if_lpe.c Thu May 15 16:11:06 2014 (r266152) @@ -190,6 +190,9 @@ static int lpe_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "lpc,ethernet")) return (ENXIO); Modified: stable/10/sys/arm/lpc/lpc_dmac.c ============================================================================== --- stable/10/sys/arm/lpc/lpc_dmac.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/lpc/lpc_dmac.c Thu May 15 16:11:06 2014 (r266152) @@ -90,6 +90,10 @@ static void lpc_dmac_intr(void *); static int lpc_dmac_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "lpc,dmac")) return (ENXIO); Modified: stable/10/sys/arm/lpc/lpc_fb.c ============================================================================== --- stable/10/sys/arm/lpc/lpc_fb.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/lpc/lpc_fb.c Thu May 15 16:11:06 2014 (r266152) @@ -138,6 +138,10 @@ static struct cdevsw lpc_fb_cdevsw = { static int lpc_fb_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "lpc,fb")) return (ENXIO); Modified: stable/10/sys/arm/lpc/lpc_gpio.c ============================================================================== --- stable/10/sys/arm/lpc/lpc_gpio.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/lpc/lpc_gpio.c Thu May 15 16:11:06 2014 (r266152) @@ -160,6 +160,10 @@ static struct lpc_gpio_softc *lpc_gpio_s static int lpc_gpio_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "lpc,gpio")) return (ENXIO); Modified: stable/10/sys/arm/lpc/lpc_intc.c ============================================================================== --- stable/10/sys/arm/lpc/lpc_intc.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/lpc/lpc_intc.c Thu May 15 16:11:06 2014 (r266152) @@ -68,6 +68,9 @@ static int lpc_intc_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "lpc,pic")) return (ENXIO); Modified: stable/10/sys/arm/lpc/lpc_mmc.c ============================================================================== --- stable/10/sys/arm/lpc/lpc_mmc.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/lpc/lpc_mmc.c Thu May 15 16:11:06 2014 (r266152) @@ -166,6 +166,10 @@ static struct lpc_dmac_channel_config lp static int lpc_mmc_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "lpc,mmc")) return (ENXIO); Modified: stable/10/sys/arm/lpc/lpc_ohci.c ============================================================================== --- stable/10/sys/arm/lpc/lpc_ohci.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/lpc/lpc_ohci.c Thu May 15 16:11:06 2014 (r266152) @@ -98,6 +98,10 @@ static void lpc_isp3101_configure(device static int lpc_ohci_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "lpc,usb-ohci")) return (ENXIO); Modified: stable/10/sys/arm/lpc/lpc_pwr.c ============================================================================== --- stable/10/sys/arm/lpc/lpc_pwr.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/lpc/lpc_pwr.c Thu May 15 16:11:06 2014 (r266152) @@ -65,6 +65,9 @@ static int lpc_pwr_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "lpc,pwr")) return (ENXIO); Modified: stable/10/sys/arm/lpc/lpc_rtc.c ============================================================================== --- stable/10/sys/arm/lpc/lpc_rtc.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/lpc/lpc_rtc.c Thu May 15 16:11:06 2014 (r266152) @@ -63,6 +63,9 @@ static int lpc_rtc_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "lpc,rtc")) return (ENXIO); Modified: stable/10/sys/arm/lpc/lpc_spi.c ============================================================================== --- stable/10/sys/arm/lpc/lpc_spi.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/lpc/lpc_spi.c Thu May 15 16:11:06 2014 (r266152) @@ -85,6 +85,10 @@ static int lpc_spi_transfer(device_t, de static int lpc_spi_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "lpc,spi")) return (ENXIO); Modified: stable/10/sys/arm/lpc/lpc_timer.c ============================================================================== --- stable/10/sys/arm/lpc/lpc_timer.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/lpc/lpc_timer.c Thu May 15 16:11:06 2014 (r266152) @@ -111,6 +111,9 @@ static int lpc_timer_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "lpc,timer")) return (ENXIO); Modified: stable/10/sys/arm/mv/gpio.c ============================================================================== --- stable/10/sys/arm/mv/gpio.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/mv/gpio.c Thu May 15 16:11:06 2014 (r266152) @@ -125,6 +125,9 @@ static int mv_gpio_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "mrvl,gpio")) return (ENXIO); Modified: stable/10/sys/arm/mv/ic.c ============================================================================== --- stable/10/sys/arm/mv/ic.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/mv/ic.c Thu May 15 16:11:06 2014 (r266152) @@ -80,6 +80,9 @@ static int mv_ic_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "mrvl,pic")) return (ENXIO); Modified: stable/10/sys/arm/mv/mpic.c ============================================================================== --- stable/10/sys/arm/mv/mpic.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/mv/mpic.c Thu May 15 16:11:06 2014 (r266152) @@ -127,6 +127,9 @@ static int mv_mpic_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "mrvl,mpic")) return (ENXIO); Modified: stable/10/sys/arm/mv/mv_sata.c ============================================================================== --- stable/10/sys/arm/mv/mv_sata.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/mv/mv_sata.c Thu May 15 16:11:06 2014 (r266152) @@ -185,6 +185,9 @@ sata_probe(device_t dev) struct sata_softc *sc; uint32_t d, r; + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "mrvl,sata")) return (ENXIO); Modified: stable/10/sys/arm/mv/mv_ts.c ============================================================================== --- stable/10/sys/arm/mv/mv_ts.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/mv/mv_ts.c Thu May 15 16:11:06 2014 (r266152) @@ -59,6 +59,9 @@ ts_probe(device_t dev) { uint32_t d, r; + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "mrvl,ts")) return (ENXIO); soc_id(&d, &r); Modified: stable/10/sys/arm/mv/rtc.c ============================================================================== --- stable/10/sys/arm/mv/rtc.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/mv/rtc.c Thu May 15 16:11:06 2014 (r266152) @@ -97,6 +97,9 @@ static int mv_rtc_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "mrvl,rtc")) return (ENXIO); Modified: stable/10/sys/arm/mv/timer.c ============================================================================== --- stable/10/sys/arm/mv/timer.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/mv/timer.c Thu May 15 16:11:06 2014 (r266152) @@ -108,6 +108,9 @@ static int mv_timer_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "mrvl,timer")) return (ENXIO); Modified: stable/10/sys/arm/mv/twsi.c ============================================================================== --- stable/10/sys/arm/mv/twsi.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/mv/twsi.c Thu May 15 16:11:06 2014 (r266152) @@ -305,6 +305,9 @@ static int mv_twsi_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "mrvl,twsi")) return (ENXIO); Modified: stable/10/sys/arm/rockchip/rk30xx_gpio.c ============================================================================== --- stable/10/sys/arm/rockchip/rk30xx_gpio.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/rockchip/rk30xx_gpio.c Thu May 15 16:11:06 2014 (r266152) @@ -421,6 +421,9 @@ static int rk30_gpio_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "rockchip,rk30xx-gpio")) return (ENXIO); Modified: stable/10/sys/arm/rockchip/rk30xx_grf.c ============================================================================== --- stable/10/sys/arm/rockchip/rk30xx_grf.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/rockchip/rk30xx_grf.c Thu May 15 16:11:06 2014 (r266152) @@ -70,6 +70,9 @@ static int rk30_grf_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "rockchip,rk30xx-grf")) { device_set_desc(dev, "RK30XX General Register File"); return(BUS_PROBE_DEFAULT); Modified: stable/10/sys/arm/rockchip/rk30xx_pmu.c ============================================================================== --- stable/10/sys/arm/rockchip/rk30xx_pmu.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/rockchip/rk30xx_pmu.c Thu May 15 16:11:06 2014 (r266152) @@ -70,6 +70,9 @@ static int rk30_pmu_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "rockchip,rk30xx-pmu")) { device_set_desc(dev, "RK30XX PMU"); return(BUS_PROBE_DEFAULT); Modified: stable/10/sys/arm/rockchip/rk30xx_wdog.c ============================================================================== --- stable/10/sys/arm/rockchip/rk30xx_wdog.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/rockchip/rk30xx_wdog.c Thu May 15 16:11:06 2014 (r266152) @@ -84,6 +84,9 @@ static int rk30_wd_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "rockchip,rk30xx-wdt")) { device_set_desc(dev, "Rockchip RK30XX Watchdog"); return (BUS_PROBE_DEFAULT); Modified: stable/10/sys/arm/samsung/exynos/arch_timer.c ============================================================================== --- stable/10/sys/arm/samsung/exynos/arch_timer.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/samsung/exynos/arch_timer.c Thu May 15 16:11:06 2014 (r266152) @@ -71,6 +71,10 @@ static struct resource_spec arm_tmr_spec static int arm_tmr_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "exynos,mct")) return (ENXIO); Modified: stable/10/sys/arm/samsung/exynos/ehci_exynos5.c ============================================================================== --- stable/10/sys/arm/samsung/exynos/ehci_exynos5.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/samsung/exynos/ehci_exynos5.c Thu May 15 16:11:06 2014 (r266152) @@ -147,6 +147,9 @@ static int exynos_ehci_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "exynos,usb-ehci") == 0) return (ENXIO); Modified: stable/10/sys/arm/ti/aintc.c ============================================================================== --- stable/10/sys/arm/ti/aintc.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/ti/aintc.c Thu May 15 16:11:06 2014 (r266152) @@ -81,6 +81,10 @@ static struct ti_aintc_softc *ti_aintc_s static int ti_aintc_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + if (!ofw_bus_is_compatible(dev, "ti,aintc")) return (ENXIO); device_set_desc(dev, "TI AINTC Interrupt Controller"); Modified: stable/10/sys/arm/ti/am335x/am335x_dmtimer.c ============================================================================== --- stable/10/sys/arm/ti/am335x/am335x_dmtimer.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/ti/am335x/am335x_dmtimer.c Thu May 15 16:11:06 2014 (r266152) @@ -528,6 +528,9 @@ static int am335x_dmtimer_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "ti,am335x-dmtimer")) { device_set_desc(dev, "AM335x DMTimer"); return(BUS_PROBE_DEFAULT); Modified: stable/10/sys/arm/ti/am335x/am335x_lcd.c ============================================================================== --- stable/10/sys/arm/ti/am335x/am335x_lcd.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/ti/am335x/am335x_lcd.c Thu May 15 16:11:06 2014 (r266152) @@ -404,6 +404,9 @@ am335x_lcd_probe(device_t dev) { int err; + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "ti,am335x-lcd")) return (ENXIO); Modified: stable/10/sys/arm/ti/am335x/am335x_prcm.c ============================================================================== --- stable/10/sys/arm/ti/am335x/am335x_prcm.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/ti/am335x/am335x_prcm.c Thu May 15 16:11:06 2014 (r266152) @@ -370,6 +370,10 @@ void am335x_prcm_setup_dmtimer(int); static int am335x_prcm_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "am335x,prcm")) { device_set_desc(dev, "AM335x Power and Clock Management"); return(BUS_PROBE_DEFAULT); Modified: stable/10/sys/arm/ti/am335x/am335x_pwm.c ============================================================================== --- stable/10/sys/arm/ti/am335x/am335x_pwm.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/ti/am335x/am335x_pwm.c Thu May 15 16:11:06 2014 (r266152) @@ -309,6 +309,10 @@ am335x_pwm_sysctl_period(SYSCTL_HANDLER_ static int am335x_pwm_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "ti,am335x-pwm")) return (ENXIO); Modified: stable/10/sys/arm/ti/am335x/am335x_usbss.c ============================================================================== --- stable/10/sys/arm/ti/am335x/am335x_usbss.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/ti/am335x/am335x_usbss.c Thu May 15 16:11:06 2014 (r266152) @@ -250,6 +250,10 @@ musbotg_wrapper_interrupt(void *arg) static int musbotg_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "ti,musb-am33xx")) return (ENXIO); Modified: stable/10/sys/arm/ti/cpsw/if_cpsw.c ============================================================================== --- stable/10/sys/arm/ti/cpsw/if_cpsw.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/ti/cpsw/if_cpsw.c Thu May 15 16:11:06 2014 (r266152) @@ -445,6 +445,9 @@ static int cpsw_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "ti,cpsw")) return (ENXIO); Modified: stable/10/sys/arm/ti/omap4/omap4_prcm_clks.c ============================================================================== --- stable/10/sys/arm/ti/omap4/omap4_prcm_clks.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/ti/omap4/omap4_prcm_clks.c Thu May 15 16:11:06 2014 (r266152) @@ -1363,6 +1363,10 @@ omap4_prcm_reset(void) static int omap4_prcm_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "ti,omap4_prcm")) return (ENXIO); Modified: stable/10/sys/arm/ti/ti_edma3.c ============================================================================== --- stable/10/sys/arm/ti/ti_edma3.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/ti/ti_edma3.c Thu May 15 16:11:06 2014 (r266152) @@ -142,6 +142,10 @@ static struct { static int ti_edma3_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "ti,edma3")) return (ENXIO); Modified: stable/10/sys/arm/ti/ti_gpio.c ============================================================================== --- stable/10/sys/arm/ti/ti_gpio.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/ti/ti_gpio.c Thu May 15 16:11:06 2014 (r266152) @@ -650,6 +650,10 @@ ti_gpio_intr(void *arg) static int ti_gpio_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "ti,gpio")) return (ENXIO); Modified: stable/10/sys/arm/ti/ti_i2c.c ============================================================================== --- stable/10/sys/arm/ti/ti_i2c.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/ti/ti_i2c.c Thu May 15 16:11:06 2014 (r266152) @@ -1020,6 +1020,10 @@ ti_i2c_deactivate(device_t dev) static int ti_i2c_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "ti,i2c")) return (ENXIO); Modified: stable/10/sys/arm/ti/ti_mbox.c ============================================================================== --- stable/10/sys/arm/ti/ti_mbox.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/ti/ti_mbox.c Thu May 15 16:11:06 2014 (r266152) @@ -119,6 +119,10 @@ ti_mbox_reg_write(struct ti_mbox_softc * static int ti_mbox_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "ti,system-mbox")) { device_set_desc(dev, "TI System Mailbox"); return (BUS_PROBE_DEFAULT); Modified: stable/10/sys/arm/ti/ti_mmchs.c ============================================================================== --- stable/10/sys/arm/ti/ti_mmchs.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/ti/ti_mmchs.c Thu May 15 16:11:06 2014 (r266152) @@ -1656,6 +1656,10 @@ errout: static int ti_mmchs_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "ti,mmchs")) return (ENXIO); Modified: stable/10/sys/arm/ti/ti_pruss.c ============================================================================== --- stable/10/sys/arm/ti/ti_pruss.c Thu May 15 15:50:37 2014 (r266151) +++ stable/10/sys/arm/ti/ti_pruss.c Thu May 15 16:11:06 2014 (r266152) @@ -145,6 +145,10 @@ ti_pruss_reg_write(struct ti_pruss_softc static int ti_pruss_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "ti,pruss-v1") || ofw_bus_is_compatible(dev, "ti,pruss-v2")) { device_set_desc(dev, "TI Programmable Realtime Unit Subsystem"); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***