[src/trunk]: src/sys/arch/arm/allwinner Only need to SRTA if the device addre...

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

details:   https://anonhg.NetBSD.org/src/rev/a6ac5dad6781
branches:  trunk
changeset: 334798:a6ac5dad6781
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Dec 07 13:06:39 2014 +0000

description:
Only need to SRTA if the device address is changing. Add AC100 device address.

diffstat:

 sys/arch/arm/allwinner/awin_p2wi.c |  15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diffs (69 lines):

diff -r 0ea1192aee48 -r a6ac5dad6781 sys/arch/arm/allwinner/awin_p2wi.c
--- a/sys/arch/arm/allwinner/awin_p2wi.c        Sun Dec 07 12:44:24 2014 +0000
+++ b/sys/arch/arm/allwinner/awin_p2wi.c        Sun Dec 07 13:06:39 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_p2wi.c,v 1.2 2014/12/07 00:36:26 jmcneill Exp $ */
+/* $NetBSD: awin_p2wi.c,v 1.3 2014/12/07 13:06:39 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_p2wi.c,v 1.2 2014/12/07 00:36:26 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_p2wi.c,v 1.3 2014/12/07 13:06:39 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -45,9 +45,11 @@
 
 #define AWIN_RSB_ADDR_AXP809   0x3a3
 #define AWIN_RSB_ADDR_AXP806   0x745
+#define AWIN_RSB_ADDR_AC100    0xe89
 
 #define AWIN_RSB_RTA_AXP809    0x2d
 #define AWIN_RSB_RTA_AXP806    0x3a
+#define AWIN_RSB_RTA_AC100     0x4e
 
 struct awin_p2wi_softc {
        device_t sc_dev;
@@ -61,6 +63,7 @@
        uint32_t sc_stat;
 
        bool sc_rsb_p;
+       uint16_t sc_rsb_last_da;
 };
 
 #define P2WI_READ(sc, reg) \
@@ -283,7 +286,7 @@
        if (cmdlen != 1 || len != 1)
                return EINVAL;
 
-       if (sc->sc_rsb_p) {
+       if (sc->sc_rsb_p && sc->sc_rsb_last_da != addr) {
                switch (addr) {
                case AWIN_RSB_ADDR_AXP809:
                        rta = AWIN_RSB_RTA_AXP809;
@@ -291,6 +294,9 @@
                case AWIN_RSB_ADDR_AXP806:
                        rta = AWIN_RSB_RTA_AXP806;
                        break;
+               case AWIN_RSB_ADDR_AC100:
+                       rta = AWIN_RSB_RTA_AC100;
+                       break;
                default:
                        return ENXIO;
                }
@@ -299,8 +305,11 @@
                        device_printf(sc->sc_dev,
                            "SRTA failed, flags = %x, error = %d\n",
                            flags, error);
+                       sc->sc_rsb_last_da = 0;
                        return error;
                }
+
+               sc->sc_rsb_last_da = addr;
        }
 
        /* Data byte register */