Page MenuHomeFreeBSD
Files F142572245

D33823.id101258.diff
No OneTemporary
Actions

D33823.id101258.diff
View Options

Index: sys/dev/iicbus/twsi/mv_twsi.c
===================================================================
--- sys/dev/iicbus/twsi/mv_twsi.c
+++ sys/dev/iicbus/twsi/mv_twsi.c
@@ -61,9 +61,7 @@
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
-#ifdef EXT_RESOURCES
#include <dev/extres/clk/clk.h>
-#endif
#include <arm/mv/mvreg.h>
#include <arm/mv/mvvar.h>
Index: sys/dev/iicbus/twsi/twsi.h
===================================================================
--- sys/dev/iicbus/twsi/twsi.h
+++ sys/dev/iicbus/twsi/twsi.h
@@ -34,9 +34,7 @@
#ifndef _TWSI_H_
#define _TWSI_H_
-#ifdef EXT_RESOURCES
#include <dev/extres/clk/clk.h>
-#endif
struct twsi_baud_rate {
uint32_t raw;
@@ -50,10 +48,8 @@
struct resource *res[2];
struct mtx mutex;
device_t iicbus;
-#ifdef EXT_RESOURCES
clk_t clk_core;
clk_t clk_reg;
-#endif
void * intrhand;
bool have_intr;
Index: sys/dev/iicbus/twsi/twsi.c
===================================================================
--- sys/dev/iicbus/twsi/twsi.c
+++ sys/dev/iicbus/twsi/twsi.c
@@ -246,7 +246,6 @@
return (IIC_NOERR);
}
-#ifdef EXT_RESOURCES
#define TWSI_BAUD_RATE_RAW(C,M,N) ((C)/((10*(M+1))<<(N)))
#define ABSSUB(a,b) (((a) > (b)) ? (a) - (b) : (b) - (a))
@@ -281,7 +280,6 @@
return (0);
}
-#endif /* EXT_RESOURCES */
/*
* Only slave mode supported, disregard [old]addr
@@ -291,17 +289,13 @@
{
struct twsi_softc *sc;
uint32_t param;
-#ifdef EXT_RESOURCES
u_int busfreq;
-#endif
sc = device_get_softc(dev);
-#ifdef EXT_RESOURCES
busfreq = IICBUS_GET_FREQUENCY(sc->iicbus, speed);
if (twsi_calc_baud_rate(sc, busfreq, &param) == -1) {
-#endif
switch (speed) {
case IIC_SLOW:
case IIC_FAST:
@@ -315,9 +309,7 @@
debugf(sc, "Using IIC_FASTEST/UNKNOWN mode with speed param=%x\n", param);
break;
}
-#ifdef EXT_RESOURCES
}
-#endif
debugf(sc, "Using clock param=%x\n", param);

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 22, 3:53 AM (13 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27828599
Default Alt Text
D33823.id101258.diff (1 KB)

Event Timeline