diff options
| author | Andrii Pientsov <andrii.pientsov@globallogic.com> | 2021-03-14 14:26:38 +0200 |
|---|---|---|
| committer | Andrii Pientsov <andrii.pientsov@globallogic.com> | 2021-03-14 14:30:14 +0200 |
| commit | ee3586431bed0be0cfeba3b906b0f7d32d89e211 (patch) | |
| tree | 0de0fda50ea07bbcbe1c255a4c94372557c5d97f /io-module/machine | |
| parent | 5f3299b873fb5511caf2dd187253f812ce2e2bbb (diff) | |
| parent | ccdc21ca4c4977edb64ee593e856b6ac5aa2930f (diff) | |
| download | mts-io-ee3586431bed0be0cfeba3b906b0f7d32d89e211.tar.gz mts-io-ee3586431bed0be0cfeba3b906b0f7d32d89e211.tar.bz2 mts-io-ee3586431bed0be0cfeba3b906b0f7d32d89e211.zip | |
Merge branch 'master' into mtre
Diffstat (limited to 'io-module/machine')
| -rw-r--r-- | io-module/machine/mt100eocg.c | 1 | ||||
| -rw-r--r-- | io-module/machine/mtcap.c | 2 | ||||
| -rw-r--r-- | io-module/machine/mtcdt.c | 1 | ||||
| -rw-r--r-- | io-module/machine/mtcpm.c | 6 | ||||
| -rw-r--r-- | io-module/machine/mths.c | 3 | ||||
| -rw-r--r-- | io-module/machine/mtr.c | 1 | ||||
| -rw-r--r-- | io-module/machine/mtre.c | 1 |
7 files changed, 2 insertions, 13 deletions
diff --git a/io-module/machine/mt100eocg.c b/io-module/machine/mt100eocg.c index c9d2961..ac00143 100644 --- a/io-module/machine/mt100eocg.c +++ b/io-module/machine/mt100eocg.c @@ -1,4 +1,3 @@ -#include "at91gpio.h" /* Used for both MT100EOCG 0.0 */ static struct gpio_pin gpio_pins_mt100eocg_0_0[] = { { diff --git a/io-module/machine/mtcap.c b/io-module/machine/mtcap.c index c2a4687..0d4af0f 100644 --- a/io-module/machine/mtcap.c +++ b/io-module/machine/mtcap.c @@ -1,5 +1,3 @@ -#include "at91gpio.h" -#include "mts_supercap.h" /* Used for both MTCAP 0.0 and 0.1 */ static struct gpio_pin gpio_pins_mtcap_0_0[] = { { diff --git a/io-module/machine/mtcdt.c b/io-module/machine/mtcdt.c index 575dd1e..aabbc2d 100644 --- a/io-module/machine/mtcdt.c +++ b/io-module/machine/mtcdt.c @@ -1,4 +1,3 @@ -#include "at91gpio.h" /* * Within a struct gpio_pin, there is only one * occurrence of each pin, so there is only one diff --git a/io-module/machine/mtcpm.c b/io-module/machine/mtcpm.c index 4a55127..8e1c3c2 100644 --- a/io-module/machine/mtcpm.c +++ b/io-module/machine/mtcpm.c @@ -1,5 +1,3 @@ -#include "mts_io.h" - #define OMAP_GPIO(BANK, GPIO) ((BANK*32)+GPIO) /* * Within a struct gpio_pin, there is only one @@ -116,7 +114,7 @@ static struct gpio_pin gpio_pins_mtcpm[] = { { .name = "STATUS_LED", .pin = { - .gpio = OMAP_GPIO(0, 20), + .gpio = OMAP_GPIO(3, 22), .flags = GPIOF_OUT_INIT_LOW, .label = "led-status", }, @@ -124,7 +122,7 @@ static struct gpio_pin gpio_pins_mtcpm[] = { { .name = "CD", .pin = { - .gpio = OMAP_GPIO(0, 21), + .gpio = OMAP_GPIO(3, 23), .flags = GPIOF_OUT_INIT_HIGH, .label = "led-cd", }, diff --git a/io-module/machine/mths.c b/io-module/machine/mths.c index c19598d..1922d88 100644 --- a/io-module/machine/mths.c +++ b/io-module/machine/mths.c @@ -4,9 +4,6 @@ * Created on: Apr 26, 2018 * Author: leonid */ -#include "at91gpio.h" -#include "buttons.h" - static struct gpio_pin gpio_pins_mths_0_0[] = { { .name = "RADIO_POWER_MONITOR", diff --git a/io-module/machine/mtr.c b/io-module/machine/mtr.c index 8664984..9f00be8 100644 --- a/io-module/machine/mtr.c +++ b/io-module/machine/mtr.c @@ -1,4 +1,3 @@ -#include "at91gpio.h" static struct gpio_pin gpio_pins_mtr_0_0[] = { { .name = "ETH_RESET", diff --git a/io-module/machine/mtre.c b/io-module/machine/mtre.c index f14862f..e3df31c 100644 --- a/io-module/machine/mtre.c +++ b/io-module/machine/mtre.c @@ -1,4 +1,3 @@ -#include "at91gpio.h" static struct gpio_pin gpio_pins_mtre_0_0[] = { { .name = "ETH_RESET", |