From c8f79641a66f4c743a3c21ffde253a2a91e481be Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 31 Jul 2014 11:09:56 -0600 Subject: SAMA5: Changes needed for a clean SAMA5D3 build after all of the recent SAMA5D4 changes. --- nuttx/arch/arm/src/sama5/sam_dmac.c | 2 +- nuttx/arch/arm/src/sama5/sam_pio.c | 2 +- nuttx/arch/arm/src/sama5/sam_pioirq.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'nuttx') diff --git a/nuttx/arch/arm/src/sama5/sam_dmac.c b/nuttx/arch/arm/src/sama5/sam_dmac.c index 3b0234d44..9cf4a6c02 100644 --- a/nuttx/arch/arm/src/sama5/sam_dmac.c +++ b/nuttx/arch/arm/src/sama5/sam_dmac.c @@ -1426,7 +1426,7 @@ sam_allocdesc(struct sam_dmach_s *dmach, struct dma_linklist_s *prev, * via AHB IF0. */ - prev->dscr = (uint32_t)sam_physramaddr((uintptr_t)descr); + prev->dscr = (uint32_t)sam_physramaddr((uintptr_t)desc); } /* In any event, this is the new tail of the list. The source diff --git a/nuttx/arch/arm/src/sama5/sam_pio.c b/nuttx/arch/arm/src/sama5/sam_pio.c index eb280cc2e..1048bc278 100644 --- a/nuttx/arch/arm/src/sama5/sam_pio.c +++ b/nuttx/arch/arm/src/sama5/sam_pio.c @@ -245,7 +245,7 @@ static void sam_pio_disableclk(pio_pinset_t cfgset) { /* Get the base address of the PIO port */ - base = g_piobase[port]; + base = sam_pion_vbase(port); /* Are any pins configured as PIO inputs? * diff --git a/nuttx/arch/arm/src/sama5/sam_pioirq.c b/nuttx/arch/arm/src/sama5/sam_pioirq.c index 019b9f6b1..649f1736a 100644 --- a/nuttx/arch/arm/src/sama5/sam_pioirq.c +++ b/nuttx/arch/arm/src/sama5/sam_pioirq.c @@ -53,11 +53,12 @@ #include "up_arch.h" #include "up_internal.h" -#include "sam_pio.h" -#include "sam_periphclks.h" #include "chip/sam_pio.h" #include "chip/sam_pmc.h" +#include "sam_pio.h" +#include "sam_periphclks.h" + #ifdef CONFIG_SAMA5_PIO_IRQ /**************************************************************************** -- cgit v1.2.3