shinys000114/wiringPi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ODROID-N1: Implement get pin MUX mode

Browse Source 
Because of the update for getting pin MUX, PUPD, DS status, its readall
command on N1 always shows all the alternative mode as ALT1. So it is
the partly update for that but won't update for support of the other new
functions.

Change-Id: If5e2c4894c4513d3b5c164b4918086022c2a3703
This commit is contained in:
joshua-yang
2019-01-10 15:32:42 +09:00
parent ae9a8e9ced
commit 9ffe33a185
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wiringPi/odroidn1.c
View File

@@ -303,8 +303,8 @@ static void pinMode (int pin, int mode)
/*----------------------------------------------------------------------------*/
static int getAlt (int pin)
{
uint32_t offset, target;
uint8_t bank, group;
uint32_t offset;
uint8_t bank, group, shift;
uint8_t ret = 0;
if (lib->mode == MODE_GPIO_SYS)
@@ -316,23 +316,26 @@ static int getAlt (int pin)
bank = pin / 32;
group = (pin - bank * 32) / 8;
offset = 0x10 * (bank > 1 ? bank - 2 : bank) + 0x4 * group;
shift = gpioToShiftGReg(pin) << 1;
setClkState(pin, CLK_ENABLE);
// Check if the pin is GPIO mode on GRF register
if (bank < 2) {
offset += PMUGRF_IOMUX_OFFSET;
if (*(grf[0] + (offset >> 2)) & (3 << (gpioToShiftGReg(pin) * 2)))
ret = 2;
ret = (*(grf[0] + (offset >> 2)) >> shift) & 0b11;
} else {
offset += GRF_IOMUX_OFFSET;
if (*(grf[1] + (offset >> 2)) & (3 << (gpioToShiftGReg(pin) * 2)))
ret = 2;
ret = (*(grf[1] + (offset >> 2)) >> shift) & 0b11;
}
// If it is GPIO mode, check it's direction
if (ret != 2)
if (ret == 0)
ret = *(gpio[bank] + (GPIO_CON_OFFSET >> 2)) & (1 << gpioToShiftReg(pin)) ? 1 : 0;
else {
// ALT1 is GPIO mode(0b00) on this SoC
ret++;
}
setClkState(pin, CLK_DISABLE);