D36456.diff
No OneTemporary
Actions

Size

920 B

Referenced Files

None

Subscribers

None

D36456.diff
View Options

	diff --git a/sys/dev/iicbus/twsi/mv_twsi.c b/sys/dev/iicbus/twsi/mv_twsi.c
	--- a/sys/dev/iicbus/twsi/mv_twsi.c
	+++ b/sys/dev/iicbus/twsi/mv_twsi.c
	@@ -157,11 +157,7 @@
	/* Calculate baud rate. */
	m0 = n0 = 4; /* Default values on reset */
	diff0 = 0xffffffff;
	-#ifdef __aarch64__
	clk_get_freq(sc->clk_core, &clk);
	-#else
	- clk = get_tclk();
	-#endif

	for (n = 0; n < 8; n++) {
	for (m = 0; m < 16; m++) {
	@@ -184,14 +180,11 @@
	mv_twsi_attach(device_t dev)
	{
	struct twsi_softc *sc;
	-#ifdef __aarch64__
	int error;
	-#endif

	sc = device_get_softc(dev);
	sc->dev = dev;

	-#ifdef __aarch64__
	/* Activate clock */
	error = clk_get_by_ofw_index(dev, 0, 0, &sc->clk_core);
	if (error != 0) {
	@@ -211,7 +204,6 @@
	return (error);
	}
	}
	-#endif

	mv_twsi_cal_baud_rate(sc, TWSI_BAUD_RATE_SLOW, &sc->baud_rate[IIC_SLOW]);
	mv_twsi_cal_baud_rate(sc, TWSI_BAUD_RATE_FAST, &sc->baud_rate[IIC_FAST]);