Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

samd21: Fix gpio in support 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-11-30 22:36:18 -05:00
parent e505ab0df1
commit 6df7356baa
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/samd21/gpio.c
View File

@ -18,7 +18,7 @@
****************************************************************/ ****************************************************************/
void void
gpio_peripheral(uint32_t gpio, char ptype, uint32_t pull_up) gpio_peripheral(uint32_t gpio, char ptype, int32_t pull_up)
{ {
uint32_t bank = GPIO2PORT(gpio), bit = gpio % 32; uint32_t bank = GPIO2PORT(gpio), bit = gpio % 32;
PortGroup *pg = &PORT->Group[bank]; PortGroup *pg = &PORT->Group[bank];
@ -27,6 +27,13 @@ gpio_peripheral(uint32_t gpio, char ptype, uint32_t pull_up)
uint8_t shift = (bit & 1) ? 4 : 0, mask = ~(0xf << shift); uint8_t shift = (bit & 1) ? 4 : 0, mask = ~(0xf << shift);
*pmux = (*pmux & mask) | ((ptype - 'A') << shift); *pmux = (*pmux & mask) | ((ptype - 'A') << shift);
} }
if (pull_up) {
if (pull_up > 0)
pg->OUTSET.reg = (1<<bit);
else
pg->OUTCLR.reg = (1<<bit);
}
pg->PINCFG[bit].reg = ((ptype ? PORT_PINCFG_PMUXEN : 0) pg->PINCFG[bit].reg = ((ptype ? PORT_PINCFG_PMUXEN : 0)
| (pull_up ? PORT_PINCFG_PULLEN : 0)); | (pull_up ? PORT_PINCFG_PULLEN : 0));
} }
@ -113,7 +120,15 @@ gpio_in_reset(struct gpio_in g, int8_t pull_up)
{ {
PortGroup *pg = g.regs; PortGroup *pg = g.regs;
irqstatus_t flag = irq_save(); irqstatus_t flag = irq_save();
set_pincfg(pg, g.bit, pull_up > 0 ? PORT_PINCFG_PULLEN : 0); uint32_t cfg = PORT_PINCFG_INEN;
if (pull_up) {
cfg |= PORT_PINCFG_PULLEN;
if (pull_up > 0)
pg->OUTSET.reg = g.bit;
else
pg->OUTCLR.reg = g.bit;
}
set_pincfg(pg, g.bit, cfg);
pg->DIRCLR.reg = g.bit; pg->DIRCLR.reg = g.bit;
irq_restore(flag); irq_restore(flag);
} }

2
src/samd21/internal.h
View File

@ -9,6 +9,6 @@
#define GPIO2BIT(PIN) (1<<((PIN) % 32)) #define GPIO2BIT(PIN) (1<<((PIN) % 32))
void enable_pclock(uint32_t clock_id, uint32_t pmask); void enable_pclock(uint32_t clock_id, uint32_t pmask);
void gpio_peripheral(uint32_t gpio, char ptype, uint32_t pull_up); void gpio_peripheral(uint32_t gpio, char ptype, int32_t pull_up);
#endif // internal.h #endif // internal.h