XMC4C: Clean up some naming, fix some comments, add empty PINMUX header file.

arch/arm/src/xmc4/chip/xmc4_flash.h

@@ -200,4 +200,4 @@
 #define FLASH_PROCON2_S12_S13ROM    (1 << 11) /* Bit 11: Sectors 12 and 13 Locked Forever by User 2 */
 #define FLASH_PROCON2_S14_S15ROM    (1 << 12) /* Bit 12: Sectors 14 and 15 Locked Forever by User 2 */
 
-#endif /* __ARCH_ARM_SRC_XMC4_CHIP_XMC4_SCU_H */
+#endif /* __ARCH_ARM_SRC_XMC4_CHIP_XMC4_FLASH_H */

arch/arm/src/xmc4/chip/xmc4_memorymap.h

@@ -228,4 +228,4 @@
 
 #define XMC4_PPB_BASE               0xe000e000
 
-#endif /* __ARCH_ARM_SRC_XMC4_CHIP_XMC4_SCU_H */
+#endif /* __ARCH_ARM_SRC_XMC4_CHIP_XMC4_MEMORYMAP_H */

arch/arm/src/xmc4/chip/xmc4_pinmux.h

@@ -0,0 +1,52 @@
+/************************************************************************************
+ * arch/arm/src/xmc4/chip/xmc4_pinmux.h
+ *
+ *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Reference: XMC4500 Reference Manual V1.5 2014-07 Microcontrollers.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ************************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_XMC4_CHIP_XMC4_PINMUX_H
+#define __ARCH_ARM_SRC_XMC4_CHIP_XMC4_PINMUX_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+
+#endif /* __ARCH_ARM_SRC_XMC4_CHIP_XMC4_PINMXU_H */

arch/arm/src/xmc4/chip/xmc4_ports.h

@@ -447,11 +447,11 @@
 
 /* Hardware select field values */
 
-#define HWSEL_SOFTWARE             0          /* Software control only */
-#define HWSEL_OVERRIDE0            1          /* HWI0/HWO0 control path can override the
-                                               * software configuration */
-#define HWSEL_OVERRIDE1            2          /* HWI1/HWO1 control path can override the
-                                               * software configuration */
+#define HWSEL_SW                   0          /* Software control only */
+#define HWSEL_HW0                  1          /* HWI0/HWO0 control path can override
+                                               * the software configuration */
+#define HWSEL_HW1                  2          /* HWI1/HWO1 control path can override
+                                               * the software configuration */
 
 /* Port Pin Hardware Select Register */
 
@@ -507,4 +507,4 @@
 #define PORT_HWSEL_HW15_MASK        (3 << PORT_HWSEL_HW15_SHIFT)
 #  define PORT_HWSEL_HW15(n)        ((uint32_t)(n) << PORT_HWSEL_HW15_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_XMC4_CHIP_XMC4_SCU_H */
+#endif /* __ARCH_ARM_SRC_XMC4_CHIP_XMC4_PORTS_H */

arch/arm/src/xmc4/chip/xmc4_usic.h

@@ -472,4 +472,4 @@
 /* Transmit FIFO Buffer (32 x 4-bytes) */
 #define USIC_IN_
 
-#endif /* __ARCH_ARM_SRC_XMC4_CHIP_XMC4_SCU_H */
+#endif /* __ARCH_ARM_SRC_XMC4_CHIP_XMC4_USIC_H */

arch/arm/src/xmc4/xmc4_gpio.h

@@ -142,9 +142,9 @@
 
 /* See chip/xmc4_ports.h for the PDR definitions */
 
-#  define GPIO_PINCTRL_SOFTWARE    (HWSEL_SOFTWARE         << GPIO_PINCTRL_SHIFT)
-#  define GPIO_PINCTRL_OVERRIDE0   (HWSEL_OVERRIDE0        << GPIO_PINCTRL_SHIFT)
-#  define GPIO_PINCTRL_OVERRIDE1   (HWSEL_OVERRIDE1        << GPIO_PINCTRL_SHIFT)
+#  define GPIO_PINCTRL_SOFTWARE    (HWSEL_SW         << GPIO_PINCTRL_SHIFT)
+#  define GPIO_PINCTRL_HW0         (HWSEL_HW0        << GPIO_PINCTRL_SHIFT)
+#  define GPIO_PINCTRL_HW1         (HWSEL_HW1        << GPIO_PINCTRL_SHIFT)
 
 /* If the pin is an GPIO output, then this identifies the initial output value:
  *