chg: OR in values.

iceman1001 · Jul 2, 2018 · 35b7989 · 35b7989
1 parent dfa4f62
commit 35b7989
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
@@ -29,7 +29,7 @@ static void ConfigClocks(void) {
  // slow clock runs at 32Khz typical regardless of crystal
 
  // enable system clock and USB clock
- AT91C_BASE_PMC->PMC_SCER = AT91C_PMC_PCK | AT91C_PMC_UDP;
+ AT91C_BASE_PMC->PMC_SCER |= AT91C_PMC_PCK | AT91C_PMC_UDP;
 
  // enable the clock to the following peripherals
  AT91C_BASE_PMC->PMC_PCER =

diff --git a/common/usb_cdc.c b/common/usb_cdc.c
@@ -489,7 +489,7 @@ void usb_enable() {
 
  // Specific Chip USB Initialisation
  // Enables the 48MHz USB clock UDPCK and System Peripheral USB Clock
- AT91C_BASE_PMC->PMC_SCER = AT91C_PMC_UDP;
+ AT91C_BASE_PMC->PMC_SCER |= AT91C_PMC_UDP;
  AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_UDP);
 
  AT91C_BASE_UDP->UDP_FADDR = 0;

diff --git a/include/config_gpio.h b/include/config_gpio.h
@@ -36,16 +36,10 @@
 #define GPIO_MUXSEL_HIPKD AT91C_PIO_PA19
 #define GPIO_MUXSEL_LOPKD AT91C_PIO_PA20
 
-
+// RDV40 has no HIRAW/LORAW, its used for FPC
 #define GPIO_MUXSEL_HIRAW AT91C_PIO_PA21
 #define GPIO_MUXSEL_LORAW AT91C_PIO_PA22
 
-// RDV40 has no HIRAW/LORAW, its used for FPC
-#ifdef WITH_FPC
-#define GPIO_FPC_RDX AT91C_PA21_RXD1
-#define GPIO_FPC_TDX AT91C_PA22_TXD1
-#endif
-
 #define GPIO_BUTTON AT91C_PIO_PA23
 #define GPIO_USB_PU AT91C_PIO_PA24
 #define GPIO_RELAY AT91C_PIO_PA25