D4422.id12513.diff
No OneTemporary
Actions

Size

1010 B

Referenced Files

None

Subscribers

None

D4422.id12513.diff
View Options

	Index: head/sys/arm/conf/ARMADA38X
	===================================================================
	--- head/sys/arm/conf/ARMADA38X
	+++ head/sys/arm/conf/ARMADA38X
	@@ -72,6 +72,10 @@
	device pass
	device da

	+# I2C
	+device iic
	+device iicbus
	+
	#FDT
	options FDT
	options FDT_DTB_STATIC
	Index: head/sys/arm/mv/twsi.c
	===================================================================
	--- head/sys/arm/mv/twsi.c
	+++ head/sys/arm/mv/twsi.c
	@@ -141,6 +141,12 @@
	{ -1, 0 }
	};

	+static struct ofw_compat_data compat_data[] = {
	+ { "mrvl,twsi", true },
	+ { "marvell,mv64xxx-i2c", true },
	+ { NULL, false }
	+};
	+
	static device_method_t mv_twsi_methods[] = {
	/* device interface */
	DEVMETHOD(device_probe, mv_twsi_probe),
	@@ -308,7 +314,7 @@
	if (!ofw_bus_status_okay(dev))
	return (ENXIO);

	- if (!ofw_bus_is_compatible(dev, "mrvl,twsi"))
	+ if (!ofw_bus_search_compatible(dev, compat_data)->ocd_data)
	return (ENXIO);

	device_set_desc(dev, "Marvell Integrated I2C Bus Controller");