diff options
| author | raj <raj@FreeBSD.org> | 2009-06-25 10:03:51 +0000 |
|---|---|---|
| committer | raj <raj@FreeBSD.org> | 2009-06-25 10:03:51 +0000 |
| commit | 2ee270938d29b16591e1c229a143d7a4fe8ed872 (patch) | |
| tree | c66b9ad04d64d518faf77f08a028cbad83efc549 | |
| parent | e5cea6596071d683ada05a4ac1cf791da41121c6 (diff) | |
| download | FreeBSD-src-2ee270938d29b16591e1c229a143d7a4fe8ed872.zip FreeBSD-src-2ee270938d29b16591e1c229a143d7a4fe8ed872.tar.gz | |
Enable all populated TWSI (I2C) controllers on Marvell SOCs.
Obtained from: Semihalf
| -rw-r--r-- | sys/arm/mv/discovery/discovery.c | 6 | ||||
| -rw-r--r-- | sys/arm/mv/kirkwood/kirkwood.c | 2 | ||||
| -rw-r--r-- | sys/arm/mv/mvwin.h | 3 | ||||
| -rw-r--r-- | sys/arm/mv/orion/orion.c | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/sys/arm/mv/discovery/discovery.c b/sys/arm/mv/discovery/discovery.c index f4535b1..de21804 100644 --- a/sys/arm/mv/discovery/discovery.c +++ b/sys/arm/mv/discovery/discovery.c @@ -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 }, diff --git a/sys/arm/mv/kirkwood/kirkwood.c b/sys/arm/mv/kirkwood/kirkwood.c index 23c9946..1be6d45 100644 --- a/sys/arm/mv/kirkwood/kirkwood.c +++ b/sys/arm/mv/kirkwood/kirkwood.c @@ -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 }, diff --git a/sys/arm/mv/mvwin.h b/sys/arm/mv/mvwin.h index 1aaec28..eb262bc 100644 --- a/sys/arm/mv/mvwin.h +++ b/sys/arm/mv/mvwin.h @@ -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) diff --git a/sys/arm/mv/orion/orion.c b/sys/arm/mv/orion/orion.c index 8fd7551..c4fe18c 100644 --- a/sys/arm/mv/orion/orion.c +++ b/sys/arm/mv/orion/orion.c @@ -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 }, |
