svn commit: r194949 - in head/sys/arm/mv: . discovery kirkwood orion
Rafal Jaworowski
raj at FreeBSD.org
Thu Jun 25 10:03:54 UTC 2009
Author: raj
Date: Thu Jun 25 10:03:51 2009
New Revision: 194949
URL: http://svn.freebsd.org/changeset/base/194949
Log:
Enable all populated TWSI (I2C) controllers on Marvell SOCs.
Obtained from: Semihalf
Modified:
head/sys/arm/mv/discovery/discovery.c
head/sys/arm/mv/kirkwood/kirkwood.c
head/sys/arm/mv/mvwin.h
head/sys/arm/mv/orion/orion.c
Modified: head/sys/arm/mv/discovery/discovery.c
==============================================================================
--- head/sys/arm/mv/discovery/discovery.c Thu Jun 25 09:28:44 2009 (r194948)
+++ head/sys/arm/mv/discovery/discovery.c Thu Jun 25 10:03:51 2009 (r194949)
@@ -126,7 +126,11 @@ struct obio_device obio_devices[] = {
{ -1 },
CPU_PM_CTRL_GE1
},
- { "twsi", MV_TWSI_BASE, MV_TWSI_SIZE,
+ { "twsi", MV_TWSI0_BASE, MV_TWSI_SIZE,
+ { -1 }, { -1 },
+ CPU_PM_CTRL_NONE
+ },
+ { "twsi", MV_TWSI1_BASE, MV_TWSI_SIZE,
{ -1 }, { -1 },
CPU_PM_CTRL_NONE
},
Modified: head/sys/arm/mv/kirkwood/kirkwood.c
==============================================================================
--- head/sys/arm/mv/kirkwood/kirkwood.c Thu Jun 25 09:28:44 2009 (r194948)
+++ head/sys/arm/mv/kirkwood/kirkwood.c Thu Jun 25 10:03:51 2009 (r194949)
@@ -95,7 +95,7 @@ struct obio_device obio_devices[] = {
{ -1 },
CPU_PM_CTRL_GE0
},
- { "twsi", MV_TWSI_BASE, MV_TWSI_SIZE,
+ { "twsi", MV_TWSI0_BASE, MV_TWSI_SIZE,
{ -1 }, { -1 },
CPU_PM_CTRL_NONE
},
Modified: head/sys/arm/mv/mvwin.h
==============================================================================
--- head/sys/arm/mv/mvwin.h Thu Jun 25 09:28:44 2009 (r194948)
+++ head/sys/arm/mv/mvwin.h Thu Jun 25 10:03:51 2009 (r194949)
@@ -91,7 +91,8 @@
#define MV_GPIO_SIZE 0x20
#define MV_RTC_BASE (MV_BASE + 0x10300)
#define MV_RTC_SIZE 0x08
-#define MV_TWSI_BASE (MV_BASE + 0x11000)
+#define MV_TWSI0_BASE (MV_BASE + 0x11000)
+#define MV_TWSI1_BASE (MV_BASE + 0x11100)
#define MV_TWSI_SIZE 0x20
#define MV_UART0_BASE (MV_BASE + 0x12000)
#define MV_UART1_BASE (MV_BASE + 0x12100)
Modified: head/sys/arm/mv/orion/orion.c
==============================================================================
--- head/sys/arm/mv/orion/orion.c Thu Jun 25 09:28:44 2009 (r194948)
+++ head/sys/arm/mv/orion/orion.c Thu Jun 25 10:03:51 2009 (r194949)
@@ -88,7 +88,7 @@ struct obio_device obio_devices[] = {
{ -1 },
CPU_PM_CTRL_NONE
},
- { "twsi", MV_TWSI_BASE, MV_TWSI_SIZE,
+ { "twsi", MV_TWSI0_BASE, MV_TWSI_SIZE,
{ -1 }, { -1 },
CPU_PM_CTRL_NONE
},
More information about the svn-src-head
mailing list