summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Gilles <jgilles@multitech.com>2014-09-04 13:35:32 -0500
committerJesse Gilles <jgilles@multitech.com>2014-09-04 13:35:32 -0500
commitfc543eac11fbeb87fe226b8f7921725c4139bb33 (patch)
tree1ce02120852ba10c2650be04a4e6856c49ff186b
parent1e563fc723ad8a44850b92f9c6e8c0bb41178215 (diff)
downloadmts-io-fc543eac11fbeb87fe226b8f7921725c4139bb33.tar.gz
mts-io-fc543eac11fbeb87fe226b8f7921725c4139bb33.tar.bz2
mts-io-fc543eac11fbeb87fe226b8f7921725c4139bb33.zip
mtr2d2: fix reset pins, update LEDs, add AP GPS_PPS pins
-rw-r--r--io-module/mtr2d2.c70
1 files changed, 33 insertions, 37 deletions
diff --git a/io-module/mtr2d2.c b/io-module/mtr2d2.c
index b2fc03f..0926952 100644
--- a/io-module/mtr2d2.c
+++ b/io-module/mtr2d2.c
@@ -3,7 +3,7 @@ static struct gpio_pin gpio_pins_mtr2d2_0_0[] = {
{
.name = "RADIO_RESET",
.pin = {
- .gpio = AT91_PIN_PC5,
+ .gpio = AT91_PIN_PC3,
.flags = GPIOF_OUT_INIT_HIGH,
.label = "radio-reset",
},
@@ -11,7 +11,7 @@ static struct gpio_pin gpio_pins_mtr2d2_0_0[] = {
{
.name = "RADIO_RESET",
.pin = {
- .gpio = AT91_PIN_PC5,
+ .gpio = AT91_PIN_PC3,
.flags = GPIOF_OUT_INIT_HIGH,
.label = "radio-power",
},
@@ -19,14 +19,14 @@ static struct gpio_pin gpio_pins_mtr2d2_0_0[] = {
{
.name = "DEVICE_RESET",
.pin = {
- .gpio = AT91_PIN_PC4,
+ .gpio = AT91_PIN_PC2,
.flags = GPIOF_IN,
.label = "reset",
},
.active_low = 1,
},
{
- .name = "LS_LED",
+ .name = "LS_LED", /* LED7 */
.pin = {
.gpio = AT91_PIN_PA14,
#if LED_LS_CONTROLLABLE
@@ -39,7 +39,7 @@ static struct gpio_pin gpio_pins_mtr2d2_0_0[] = {
.active_low = 1,
},
{
- .name = "STATUS_LED",
+ .name = "STATUS_LED", /* LED2 */
.pin = {
.gpio = AT91_PIN_PA24,
.flags = GPIOF_OUT_INIT_LOW,
@@ -57,7 +57,7 @@ static struct gpio_pin gpio_pins_mtr2d2_0_0[] = {
.active_low = 1,
},
{
- .name = "LED7",
+ .name = "LED5",
.pin = {
.gpio = AT91_PIN_PA25,
.flags = GPIOF_OUT_INIT_HIGH,
@@ -66,16 +66,16 @@ static struct gpio_pin gpio_pins_mtr2d2_0_0[] = {
.active_low = 1,
},
{
- .name = "LED7",
+ .name = "LED5",
.pin = {
.gpio = AT91_PIN_PA25,
.flags = GPIOF_OUT_INIT_HIGH,
- .label = "led-c",
+ .label = "led-b",
},
.active_low = 1,
},
{
- .name = "LED10",
+ .name = "LED1",
.pin = {
.gpio = AT91_PIN_PA26,
.flags = GPIOF_OUT_INIT_HIGH,
@@ -84,16 +84,16 @@ static struct gpio_pin gpio_pins_mtr2d2_0_0[] = {
.active_low = 1,
},
{
- .name = "LED10",
+ .name = "LED1",
.pin = {
.gpio = AT91_PIN_PA26,
.flags = GPIOF_OUT_INIT_HIGH,
- .label = "led-d",
+ .label = "led-c",
},
.active_low = 1,
},
{
- .name = "LED11",
+ .name = "LED4",
.pin = {
.gpio = AT91_PIN_PA27,
.flags = GPIOF_OUT_INIT_HIGH,
@@ -102,16 +102,16 @@ static struct gpio_pin gpio_pins_mtr2d2_0_0[] = {
.active_low = 1,
},
{
- .name = "LED11",
+ .name = "LED4",
.pin = {
.gpio = AT91_PIN_PA27,
.flags = GPIOF_OUT_INIT_HIGH,
- .label = "led-e",
+ .label = "led-d",
},
.active_low = 1,
},
{
- .name = "LED12",
+ .name = "LED3",
.pin = {
.gpio = AT91_PIN_PA28,
.flags = GPIOF_OUT_INIT_HIGH,
@@ -120,29 +120,11 @@ static struct gpio_pin gpio_pins_mtr2d2_0_0[] = {
.active_low = 1,
},
{
- .name = "LED12",
+ .name = "LED3",
.pin = {
.gpio = AT91_PIN_PA28,
.flags = GPIOF_OUT_INIT_HIGH,
- .label = "led-f",
- },
- .active_low = 1,
- },
- {
- .name = "LED13",
- .pin = {
- .gpio = AT91_PIN_PA29,
- .flags = GPIOF_OUT_INIT_HIGH,
- .label = "led-wifi",
- },
- .active_low = 1,
- },
- {
- .name = "LED13",
- .pin = {
- .gpio = AT91_PIN_PA29,
- .flags = GPIOF_OUT_INIT_HIGH,
- .label = "led-b",
+ .label = "led-e",
},
.active_low = 1,
},
@@ -205,6 +187,14 @@ static struct gpio_pin gpio_pins_mtr2d2_0_0[] = {
.label = "ap1-interrupt2",
}
},
+ {
+ .name = "AP1_GPS_PPS",
+ .pin = {
+ .gpio = AT91_PIN_PA29,
+ .flags = GPIOF_IN,
+ .label = "ap1-gps-pps",
+ }
+ },
// gpio pins for Accessory Card 2
{
@@ -264,6 +254,14 @@ static struct gpio_pin gpio_pins_mtr2d2_0_0[] = {
.label = "ap2-interrupt2",
}
},
+ {
+ .name = "AP2_GPS_PPS",
+ .pin = {
+ .gpio = AT91_PIN_PA6,
+ .flags = GPIOF_IN,
+ .label = "ap2-gps-pps",
+ }
+ },
{ },
};
@@ -283,7 +281,6 @@ static struct attribute *mtr2d2_platform_attributes[] = {
&dev_attr_radio_reset.attr,
&dev_attr_led_status.attr,
- &dev_attr_led_wifi_gpio.attr,
&dev_attr_led_cd_gpio.attr,
&dev_attr_led_sig1_gpio.attr,
&dev_attr_led_sig2_gpio.attr,
@@ -294,7 +291,6 @@ static struct attribute *mtr2d2_platform_attributes[] = {
&dev_attr_led_c_gpio.attr,
&dev_attr_led_d_gpio.attr,
&dev_attr_led_e_gpio.attr,
- &dev_attr_led_f_gpio.attr,
&dev_attr_board_temperature.attr,