Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

up: various fixes in pin naming on up1 and up2

Browse Source 
fixes naming in up and up2 platform
- changed the name of the i2c function
- add a warning in the log if a name is not found

Signed-off-by: Nicola Lunghi <nicola.lunghi@emutex.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Nicola Lunghi
2017-09-08 18:12:41 +01:00
committed by Brendan Le Foll
parent 04a40ed63f
commit 64a0db6a50
4 changed files with 122 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
docs/up.md
View File

@@ -43,45 +43,45 @@ model 2 and B+ numbering scheme.
Note that there is an enum to use wiringPi style numbers.
| MRAA Number | Physical Pin | Function | Sysfs GPIO | Notes |
|-------------|--------------|----------|------------|----------------------|
| 1 | P1-01 | 3V3 VCC | | |
| 2 | P1-02 | 5V VCC | | |
| 3 | P1-03 | I2C SDA1 | 2 | I2C1 (/dev/i2c-1) |
| 4 | P1-04 | 5V VCC | | |
| 5 | P1-05 | I2C SCL1 | 3 | I2C1 (/dev/i2c-1) |
| 6 | P1-06 | GND | | |
| 7 | P1-07 | GPIO(4) | 4 | ADC0 (iio:device0) |
| 8 | P1-08 | UART TX1 | 14 | UART1 (/dev/ttyS1) |
| 9 | P1-09 | GND | | |
| 10 | P1-10 | UART RX1 | 15 | UART1 (/dev/ttyS1) |
| 11 | P1-11 | GPIO(17) | 17 | |
| 12 | P1-12 | I2S CLK | 18 | I2S0 (PCM Audio) |
| 13 | P1-13 | GPIO(27) | 27 | |
| 14 | P1-14 | GND | | |
| 15 | P1-15 | GPIO(22) | 22 | |
| 16 | P1-16 | GPIO(23) | 23 | |
| 17 | P1-17 | 3V3 VCC | | |
| 18 | P1-18 | GPIO(24) | 24 | |
| 19 | P1-19 | SPI MOSI | 10 | SPI2 (/dev/spidev2.x)|
| 20 | P1-20 | GND | | |
| 21 | P1-21 | SPI MISO | 9 | SPI2 (/dev/spidev2.x)|
| 22 | P1-22 | GPIO(25) | 25 | |
| 23 | P1-23 | SPI SCL | 11 | SPI2 (/dev/spidev2.x)|
| 24 | P1-24 | SPI CS0 | 8 | SPI2 (/dev/spidev2.0)|
| 25 | P1-25 | GND | | |
| 26 | P1-26 | SPI CS1 | 7 | SPI2 (/dev/spidev2.1)|
| 27 | P1-27 | I2C SDA0 | 0 | I2C0 (/dev/i2c-0) |
| 28 | P1-28 | I2C SCL0 | 1 | I2C0 (/dev/i2c-0) |
| 29 | P1-29 | GPIO(5) | 5 | |
| 30 | P1-30 | GND | | |
| 31 | P1-31 | GPIO(6) | 6 | |
| 32 | P1-32 | PWM0 | 12 | PWM Chip 0 Channel 0 |
| 33 | P1-33 | PWM1 | 13 | PWM Chip 1 Channel 0 |
| 34 | P1-34 | GND | | |
| 35 | P1-35 | I2S FRM | 19 | I2S0 (PCM Audio) |
| 36 | P1-36 | GPIO(16) | 16 | |
| 37 | P1-37 | GPIO(26) | 26 | |
| 38 | P1-38 | I2S DIN | 20 | I2S0 (PCM Audio) |
| 39 | P1-39 | GND | | |
| 40 | P1-40 | I2S DOUT | 21 | I2S0 (PCM Audio) |
| MRAA Number | Physical Pin | Function | Sysfs GPIO | mraa device |
|-------------|--------------|-------------|------------|----------------------|
| 1 | P1-01 | 3V3 VCC | | |
| 2 | P1-02 | 5V VCC | | |
| 3 | P1-03 | I2C SDA | 2 | I2C0 |
| 4 | P1-04 | 5V VCC | | |
| 5 | P1-05 | I2C SCL | 3 | I2C0 |
| 6 | P1-06 | GND | | |
| 7 | P1-07 | GPIO(4) | 4 | ADC0 (iio:device0) |
| 8 | P1-08 | UART TX | 14 | UART0 |
| 9 | P1-09 | GND | | |
| 10 | P1-10 | UART RX | 15 | UART0 |
| 11 | P1-11 | GPIO(17) | 17 | |
| 12 | P1-12 | I2S CLK | 18 | |
| 13 | P1-13 | GPIO(27) | 27 | |
| 14 | P1-14 | GND | | |
| 15 | P1-15 | GPIO(22) | 22 | |
| 16 | P1-16 | GPIO(23) | 23 | |
| 17 | P1-17 | 3V3 VCC | | |
| 18 | P1-18 | GPIO(24) | 24 | |
| 19 | P1-19 | SPI MOSI | 10 | SPI0,1 |
| 20 | P1-20 | GND | | |
| 21 | P1-21 | SPI MISO | 9 | SPI0,1 |
| 22 | P1-22 | GPIO(25) | 25 | |
| 23 | P1-23 | SPI SCL | 11 | SPI0,1 |
| 24 | P1-24 | SPI CS0 | 8 | SPI0 |
| 25 | P1-25 | GND | | |
| 26 | P1-26 | SPI CS1 | 7 | SPI1 |
| 27 | P1-27 | I2C SDA0 | 0 | I2C1 |
| 28 | P1-28 | I2C SCL0 | 1 | I2C1 |
| 29 | P1-29 | GPIO(5) | 5 | |
| 30 | P1-30 | GND | | |
| 31 | P1-31 | GPIO(6) | 6 | |
| 32 | P1-32 | PWM0 | 12 | PWM0 |
| 33 | P1-33 | PWM1 | 13 | PWM1 |
| 34 | P1-34 | GND | | |
| 35 | P1-35 | I2S FRM | 19 | |
| 36 | P1-36 | GPIO(16) | 16 | |
| 37 | P1-37 | GPIO(26) | 26 | |
| 38 | P1-38 | I2S DIN | 20 | |
| 39 | P1-39 | GND | | |
| 40 | P1-40 | I2S DOUT | 21 | |

84
docs/up2.md
View File

@@ -42,45 +42,45 @@ NOTE: the i2c device numbering depend on various factor and cannot be trusted:
the right way of determining i2c (and other devices) numbering is through PCI
physical device names. See the source code in src/x86/up2.c for details.
| MRAA no. | Function | Rpi GPIO | Sysfs GPIO | Notes |
|----------|--------------|------------|------------|--------------------------------|
| 1 | 3V3 VCC | | | |
| 2 | 5V VCC | | | |
| 3 | I2C1_SDA | 2 | 462 | I2C1 (/dev/i2c-1) |
| 4 | 5V VCC | | | |
| 5 | I2C1_SCL | 3 | 463 | I2C1 (/dev/i2c-1) |
| 6 | GND | | | |
| 7 | GPIO(4) | 4 | 433 | |
| 8 | UART1_TX | 14 | 477 | UART1 (/dev/ttyS1) |
| 9 | GND | | | |
| 10 | UART1_RX | 15 | 476 | UART1 (/dev/ttyS1) |
| 11 | UART1_RTS | 17 | 478 | |
| 12 | I2S_CLK | 18 | 326 | I2S0 (PCM Audio) |
| 13 | GPIO(27) | 27 | 432 | |
| 14 | GND | | | |
| 15 | GPIO(22) | 22 | 431 | |
| 16 | PWM3 | 23 | 471 | PWM Chip 0 Channel 4 |
| 17 | 3V3 VCC | | | |
| 18 | GPIO(24) | 24 | 405 | |
| 19 | SPI0_MOSI | 10 | 422 | SPI2 (/dev/spidev1.x) |
| 20 | GND | | | |
| 21 | SPI0_MISO | 9 | 421 | SPI2 (/dev/spidev1.x) |
| 22 | GPIO(25) | 25 | 402 | |
| 23 | SPI0_SCL | 11 | 418 | SPI2 (/dev/spidev1.x) |
| 24 | SPI0_CS0 | 8 | 419 | SPI2 (/dev/spidev1.0) |
| 25 | GND | | | |
| 26 | SPI0_CS1 | 7 | 420 | SPI2 (/dev/spidev1.1) |
| 27 | I2C0_SDA | 0 | 464 | I2C0 (/dev/i2c-0) |
| 28 | I2C0_SCL | 1 | 465 | I2C0 (/dev/i2c-0) |
| 29 | GPIO(5) | 5 | 430 | |
| 30 | GND | | | |
| 31 | GPIO(6) | 6 | 404 | |
| 32 | PWM0 | 12 | 468 | PWM Chip 0 Channel 0 |
| 33 | PWM1 | 13 | 469 | PWM Chip 1 Channel 0 |
| 34 | GND | | | |
| 35 | I2S_FRM | 19 | 327 | I2S0 (PCM Audio) |
| 36 | UART1_CTS | 16 | 479 | |
| 37 | GPIO(26) | 26 | 403 | |
| 38 | I2S_DIN | 20 | 328 | I2S0 (PCM Audio) |
| 39 | GND | | | |
| 40 | I2S_DOUT | 21 | 329 | I2S0 (PCM Audio) |
| MRAA no. | Function | Rpi GPIO | Sysfs GPIO | mraa device |
|----------|--------------|------------|------------|-----------------|
| 1 | 3V3 VCC | | | |
| 2 | 5V VCC | | | |
| 3 | I2C_SDA | 2 | 462 | I2C0 |
| 4 | 5V VCC | | | |
| 5 | I2C_SCL | 3 | 463 | I2C0 |
| 6 | GND | | | |
| 7 | GPIO(4) | 4 | 433 | |
| 8 | UART_TX | 14 | 477 | UART0 |
| 9 | GND | | | |
| 10 | UART_RX | 15 | 476 | UART0 |
| 11 | UART_RTS | 17 | 478 | |
| 12 | I2S_CLK | 18 | 326 | |
| 13 | GPIO(27) | 27 | 432 | |
| 14 | GND | | | |
| 15 | GPIO(22) | 22 | 431 | |
| 16 | PWM3 | 23 | 471 | PWM3 |
| 17 | 3V3 VCC | | | |
| 18 | GPIO(24) | 24 | 405 | |
| 19 | SPI0_MOSI | 10 | 422 | SPI0 |
| 20 | GND | | | |
| 21 | SPI0_MISO | 9 | 421 | SPI0 |
| 22 | GPIO(25) | 25 | 402 | |
| 23 | SPI0_SCL | 11 | 418 | SPI0 |
| 24 | SPI0_CS0 | 8 | 419 | SPI0 |
| 25 | GND | | | |
| 26 | SPI0_CS1 | 7 | 420 | SPI0 |
| 27 | ID_SD | 0 | 464 | I2C1 |
| 28 | ID_SC | 1 | 465 | I2C1 |
| 29 | GPIO(5) | 5 | 430 | |
| 30 | GND | | | |
| 31 | GPIO(6) | 6 | 404 | |
| 32 | PWM0 | 12 | 468 | PWM0 |
| 33 | PWM1 | 13 | 469 | PWM1 |
| 34 | GND | | | |
| 35 | I2S_FRM | 19 | 327 | |
| 36 | UART_CTS | 16 | 479 | |
| 37 | GPIO(26) | 26 | 403 | |
| 38 | I2S_DIN | 20 | 328 | |
| 39 | GND | | | |
| 40 | I2S_DOUT | 21 | 329 | |