summaryrefslogtreecommitdiffstats
path: root/sys/arm
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2015-10-21 15:41:16 +0000
committerian <ian@FreeBSD.org>2015-10-21 15:41:16 +0000
commit12b6417dccaba29e144de3019a1c3a5fa83c801c (patch)
tree8f5d039b00bc89ed68c8aacffacffdd1b910f5f3 /sys/arm
parent1a70c15562fe5ea01866874423bd73fe5f32b9ea (diff)
downloadFreeBSD-src-12b6417dccaba29e144de3019a1c3a5fa83c801c.zip
FreeBSD-src-12b6417dccaba29e144de3019a1c3a5fa83c801c.tar.gz
Fix parsing of I2C addresses properties in fdt data. I2C address is
represented in 7-bits format in DT files, but system expect it in 8-bit format. Also, fix two drivers that locally hack around this bug. Submitted by: Michal Meloun <meloun@miracle.cz>
Diffstat (limited to 'sys/arm')
-rw-r--r--sys/arm/ti/am335x/am335x_pmic.c2
-rw-r--r--sys/arm/ti/am335x/tda19988.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/arm/ti/am335x/am335x_pmic.c b/sys/arm/ti/am335x/am335x_pmic.c
index eefece8..8bb272b 100644
--- a/sys/arm/ti/am335x/am335x_pmic.c
+++ b/sys/arm/ti/am335x/am335x_pmic.c
@@ -147,7 +147,7 @@ am335x_pmic_probe(device_t dev)
sc = device_get_softc(dev);
sc->sc_dev = dev;
/* Convert to 8-bit addressing */
- sc->sc_addr = iicbus_get_addr(dev) << 1;
+ sc->sc_addr = iicbus_get_addr(dev);
device_set_desc(dev, "TI TPS65217 Power Management IC");
diff --git a/sys/arm/ti/am335x/tda19988.c b/sys/arm/ti/am335x/tda19988.c
index 18bc18b..c77874d 100644
--- a/sys/arm/ti/am335x/tda19988.c
+++ b/sys/arm/ti/am335x/tda19988.c
@@ -731,7 +731,7 @@ tda19988_attach(device_t dev)
sc = device_get_softc(dev);
sc->sc_dev = dev;
- sc->sc_addr = iicbus_get_addr(dev) << 1;
+ sc->sc_addr = iicbus_get_addr(dev);
sc->sc_cec_addr = (0x34 << 1); /* hardcoded */
sc->sc_edid = malloc(EDID_LENGTH, M_DEVBUF, M_WAITOK | M_ZERO);
sc->sc_edid_len = EDID_LENGTH;
OpenPOWER on IntegriCloud