From 8ca60d1d2dfd9d4dffd6925ef11874a51138433a Mon Sep 17 00:00:00 2001
From: Dmitry Bogdanov <logost.boda@gmail.com>
Date: Mon, 18 May 2015 14:19:37 +0400
Subject: [PATCH] Assign PinNames to peripherals

---
 .../TARGET_LPC2460/PeripheralNames.h          | 44 ++++++++++++-------
 .../hal/TARGET_NXP/TARGET_LPC2460/PinNames.h  | 37 +++++++++-------
 2 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC2460/PeripheralNames.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC2460/PeripheralNames.h
index 492c225759..653aa9ea7c 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC2460/PeripheralNames.h
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC2460/PeripheralNames.h
@@ -75,33 +75,43 @@ typedef enum {
 
 // Default peripherals
 #define MBED_SPI0         p5, p6, p7, p8
-#define MBED_SPI1         p11, p12, p13, p14
+//#define MBED_SPI1         p11, p12, p13, p14
 
 #define MBED_UART0        p9, p10
 #define MBED_UART1        p13, p14
-#define MBED_UART2        p27, p28
+#define MBED_UART2        p15, p16
 #define MBED_UARTUSB      USBTX, USBRX
 
-#define MBED_I2C0         p28, p27
-#define MBED_I2C1         p9, p10
+#define MBED_I2C0         p17, p18
+//#define MBED_I2C1         p9, p10
 
-#define MBED_CAN0         p30, p29
+#define MBED_CAN0         p19, p20
 
-#define MBED_ANALOGOUT0   p18
+#define MBED_ANALOGOUT0   p21
 
-#define MBED_ANALOGIN0    p15
-#define MBED_ANALOGIN1    p16
-#define MBED_ANALOGIN2    p17
-#define MBED_ANALOGIN3    p18
-#define MBED_ANALOGIN4    p19
-#define MBED_ANALOGIN5    p20
+#define MBED_ANALOGIN0    p22
+#define MBED_ANALOGIN1    p23
+//#define MBED_ANALOGIN2    p17
+//#define MBED_ANALOGIN3    p18
+//#define MBED_ANALOGIN4    p19
+//#define MBED_ANALOGIN5    p20
 
-#define MBED_PWMOUT0      p26
+#define MBED_PWMOUT0      p24
 #define MBED_PWMOUT1      p25
-#define MBED_PWMOUT2      p24
-#define MBED_PWMOUT3      p23
-#define MBED_PWMOUT4      p22
-#define MBED_PWMOUT5      p21
+#define MBED_PWMOUT2      p26
+#define MBED_PWMOUT3      p27
+//#define MBED_PWMOUT4      p22
+//#define MBED_PWMOUT5      p21
+
+#define MBED_USB_D_PLUS   p28
+#define MBED_USB_D_MINUS  p29
+
+#define MBED_MCICLK       p30
+#define MBED_MCICMD       p31
+#define MBED_MCIDAT0      p32
+#define MBED_MCIDAT1      p33
+#define MBED_MCIDAT2      p34
+#define MBED_MCIDAT3      p35
 
 #ifdef __cplusplus
 }
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC2460/PinNames.h b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC2460/PinNames.h
index 727c6089e9..27194e0918 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC2460/PinNames.h
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC2460/PinNames.h
@@ -51,22 +51,27 @@ typedef enum {
     p12 = P0_17,
     p13 = P2_0,
     p14 = P2_1,
-    p15 = P0_23,
-    p16 = P0_24,
-    p17 = P0_25,
-    p18 = P0_26,
-    p19 = P1_30,
-    p20 = P1_31,
-    p21 = P2_5,
-    p22 = P2_4,
-    p23 = P2_3,
-    p24 = P2_2,
-    p25 = P2_1,
-    p26 = P2_0,
-    p27 = P2_8,
-    p28 = P2_9,
-    p29 = P0_5,
-    p30 = P0_4,
+    p15 = P4_28,
+    p16 = P4_29,
+    p17 = P2_30,
+    p18 = P2_31,
+    p19 = P0_0,
+    p20 = P0_1,
+    p21 = P0_26,
+    p22 = P0_12,
+    p23 = P0_13,
+    p24 = P1_20,
+    p25 = P1_21,
+    p26 = P1_23,
+    p27 = P1_24,
+    p28 = P0_29,
+    p29 = P0_30,
+    p30 = P1_2,
+    p31 = P1_3,
+    p32 = P1_6,
+    p33 = P1_7,
+    p34 = P1_11,
+    p35 = P1_12,
 
     // Other mbed Pin Names
     LED1 = P1_19,