Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jmcneill 2014-12-07 13:06:39 +00:00
parent 91f0b1a898
commit 42ed0f6432
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/arch/arm/allwinner/awin_p2wi.c
View File

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