From 3311bdcecbfd9f615726336cd9a4eaa5f6598668 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 2 Apr 2015 18:24:55 -0600
Subject: [PATCH] SAMV7: Fixes to WM8904 build

---
 configs/samv71-xult/src/Makefile      |  4 ++--
 configs/samv71-xult/src/samv71-xult.h | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/configs/samv71-xult/src/Makefile b/configs/samv71-xult/src/Makefile
index 0853d3bbe0..9dddf19659 100644
--- a/configs/samv71-xult/src/Makefile
+++ b/configs/samv71-xult/src/Makefile
@@ -87,8 +87,8 @@ CSRCS += sam_usbmsc.c
 endif
 
 ifeq ($(CONFIG_AUDIO_WM8904),y)
-ifeq ($(CONFIG_SAMA5_TWI0),y)
-ifeq ($(CONFIG_SAMA5_SSC0),y)
+ifeq ($(CONFIG_SAMV7_TWIHS0),y)
+ifeq ($(CONFIG_SAMV7_SSC0),y)
 CSRCS += sam_wm8904.c
 endif
 endif
diff --git a/configs/samv71-xult/src/samv71-xult.h b/configs/samv71-xult/src/samv71-xult.h
index 43a5ba6358..b86aa1a4e4 100644
--- a/configs/samv71-xult/src/samv71-xult.h
+++ b/configs/samv71-xult/src/samv71-xult.h
@@ -189,8 +189,8 @@
 #endif
 
 #ifdef HAVE_WM8904
-#  ifndef CONFIG_SAMV7_TWI0
-#    warning CONFIG_SAMV7_TWI0 is required for audio support
+#  ifndef CONFIG_SAMV7_TWIHS0
+#    warning CONFIG_SAMV7_TWIHS0 is required for audio support
 #    undef HAVE_WM8904
 #  endif
 
@@ -199,8 +199,8 @@
 #    undef HAVE_WM8904
 #  endif
 
-#  if !defined(CONFIG_SAMV7_PIOD_IRQ)
-#    warning CONFIG_SAMV7_PIOD_IRQ is required for audio support
+#  if !defined(CONFIG_SAMV7_GPIOD_IRQ)
+#    warning CONFIG_SAMV7_GPIOD_IRQ is required for audio support
 #    undef HAVE_WM8904
 #  endif
 
@@ -209,15 +209,15 @@
 #    undef HAVE_WM8904
 #  endif
 
-#  ifndef CONFIG_SAMV7D4EK_WM8904_I2CFREQUENCY
+#  ifndef CONFIG_SAMV71XULT_WM8904_I2CFREQUENCY
 #    warning Defaulting to maximum WM8904 I2C frequency
-#    define CONFIG_SAMV7D4EK_WM8904_I2CFREQUENCY 400000
+#    define CONFIG_SAMV71XULT_WM8904_I2CFREQUENCY 400000
 #  endif
 
-#  if CONFIG_SAMV7D4EK_WM8904_I2CFREQUENCY > 400000
+#  if CONFIG_SAMV71XULT_WM8904_I2CFREQUENCY > 400000
 #    warning WM8904 I2C frequency cannot exceed 400KHz
-#    undef CONFIG_SAMV7D4EK_WM8904_I2CFREQUENCY
-#    define CONFIG_SAMV7D4EK_WM8904_I2CFREQUENCY 400000
+#    undef CONFIG_SAMV71XULT_WM8904_I2CFREQUENCY
+#    define CONFIG_SAMV71XULT_WM8904_I2CFREQUENCY 400000
 #  endif
 #endif