[src/trunk]: src/sys/arch/arm/sunxi "ahb" reset is optional

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1f7afc5318d7
branches:  trunk
changeset: 826306:1f7afc5318d7
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Aug 27 17:53:10 2017 +0000

description:
"ahb" reset is optional

diffstat:

 sys/arch/arm/sunxi/sunxi_mmc.c |  16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diffs (44 lines):

diff -r cda6dfcaebcc -r 1f7afc5318d7 sys/arch/arm/sunxi/sunxi_mmc.c
--- a/sys/arch/arm/sunxi/sunxi_mmc.c    Sun Aug 27 16:05:26 2017 +0000
+++ b/sys/arch/arm/sunxi/sunxi_mmc.c    Sun Aug 27 17:53:10 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_mmc.c,v 1.4 2017/08/25 00:07:03 jmcneill Exp $ */
+/* $NetBSD: sunxi_mmc.c,v 1.5 2017/08/27 17:53:10 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_mmc.c,v 1.4 2017/08/25 00:07:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_mmc.c,v 1.5 2017/08/27 17:53:10 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -209,10 +209,6 @@
        }
 
        sc->sc_rst_ahb = fdtbus_reset_get(phandle, "ahb");
-       if (sc->sc_rst_ahb == NULL) {
-               aprint_error(": couldn't get resets\n");
-               return;
-       }
 
        sc->sc_reg_vqmmc = fdtbus_regulator_acquire(phandle, "vqmmc-supply");
 
@@ -222,9 +218,11 @@
                return;
        }
 
-       if (fdtbus_reset_deassert(sc->sc_rst_ahb) != 0) {
-               aprint_error(": couldn't de-assert resets\n");
-               return;
+       if (sc->sc_rst_ahb != NULL) {
+               if (fdtbus_reset_deassert(sc->sc_rst_ahb) != 0) {
+                       aprint_error(": couldn't de-assert resets\n");
+                       return;
+               }
        }
 
        sc->sc_dev = self;