Fix pin names and lower pin order issue

The pin numbering gets off as the lower level pin numbers 2 of them are deleted as such
that the pins after that are off by 2 from the different documents

Author: KurtE

variants/arduino_portenta_h7_stm32h747xx_m7/PinNames.h

@@ -7,11 +7,6 @@
 #ifndef ZEPHYR_PINNAMES_H
 #define ZEPHYR_PINNAMES_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define DUAL_PAD 0x800
 
 typedef enum {
     PH_15=0,
@@ -94,15 +89,6 @@ typedef enum {
     PJ_9 = 77,
     PJ_10 = 78,
 
-    WL_REG_ON = PJ_1,
-    WL_HOST_WAKE = PJ_5,
-    WL_SDIO_0 = PC_8,
-    WL_SDIO_1 = PC_9,
-    WL_SDIO_2 = PC_10,
-    WL_SDIO_3 = PC_11,
-    WL_SDIO_CMD = PD_2,
-    WL_SDIO_CLK = PC_12,
-
     /**** ADC internal channels ****/
 
     ADC_TEMP = 0xF0, // Internal pin virtual value
@@ -113,94 +99,11 @@ typedef enum {
     LED_RED = PK_5,  //Red
     LED_GREEN = PK_6,  //Green
     LED_BLUE = PK_7,  //Blue
-
-    CYBSP_BT_UART_RX = PF_6,
-    CYBSP_BT_UART_TX = PA_15,
-    CYBSP_BT_UART_RTS = PF_8,
-    CYBSP_BT_UART_CTS = PF_9,
-
-    CYBSP_BT_POWER = PJ_12,
-    CYBSP_BT_HOST_WAKE = PJ_13,
-    CYBSP_BT_DEVICE_WAKE = PJ_14,
-
-    /**** QSPI FLASH pins ****/
-    QSPI_FLASH1_IO0 = PD_11,
-    QSPI_FLASH1_IO1 = PD_12,
-    QSPI_FLASH1_IO2 = PF_7,
-    QSPI_FLASH1_IO3 = PD_13,
-    QSPI_FLASH1_SCK = PF_10,
-    QSPI_FLASH1_CSN = PG_6,
-
-    /**** USB FS pins ****/
-    USB_OTG_FS_DM = PA_11,
-    USB_OTG_FS_DP = PA_12,
-    USB_OTG_FS_ID = PA_10,
-    USB_OTG_FS_SOF = PA_8,
-    USB_OTG_FS_VBUS = PA_9,
-
-    /**** USB HS pins ****/
-    USB_OTG_HS_DM = PB_14,
-    USB_OTG_HS_DP = PB_15,
-    USB_OTG_HS_ID = PB_12,
-    USB_OTG_HS_SOF = PA_4,
-    USB_OTG_HS_ULPI_CK = PA_5,
-    USB_OTG_HS_ULPI_D0 = PA_3,
-    USB_OTG_HS_ULPI_D1 = PB_0,
-    USB_OTG_HS_ULPI_D2 = PB_1,
-    USB_OTG_HS_ULPI_D3 = PB_10,
-    USB_OTG_HS_ULPI_D4 = PB_11,
-    USB_OTG_HS_ULPI_D5 = PB_12,
-    USB_OTG_HS_ULPI_D6 = PB_13,
-    USB_OTG_HS_ULPI_D7 = PB_5,
-    USB_OTG_HS_ULPI_DIR = PC_2,
-    USB_OTG_HS_ULPI_NXT = PC_3,
-    USB_OTG_HS_ULPI_STP = PC_0,
-    USB_OTG_HS_VBUS = PB_13,
-
-    /**** ETHERNET pins ****/
-    ETH_MDC = PC_1,
-    ETH_MDIO = PA_2,
-    ETH_CRS_DV = PA_7,
-    ETH_REF_CLK = PA_1,
-    ETH_RXD0 = PC_4,
-    ETH_RXD1 = PC_5,
-    ETH_RX_CLK = PA_1,
-    ETH_TXD0 = PG_13,
-    ETH_TXD1 = PG_12,
-    ETH_TX_EN = PG_11,
-
-    /**** OSCILLATOR pins ****/
-    RCC_OSC32_IN = PC_14,
-    RCC_OSC32_OUT = PC_15,
-    RCC_OSC_IN = PH_0,
-    RCC_OSC_OUT = PH_1,
-
-    /**** DEBUG pins ****/
-    SYS_JTCK_SWCLK = PA_14,
-    SYS_JTDI = PA_15,
-    SYS_JTDO_SWO = PB_3,
-    SYS_JTMS_SWDIO = PA_13,
-    SYS_JTRST = PB_4,
-    SYS_PVD_IN = PB_7,
-    SYS_TRACECLK = PE_2,
-    SYS_TRACED0 = PE_3,
-    SYS_TRACED0_ALT0 = PC_1,
-    SYS_TRACED0_ALT1 = PG_13,
-    SYS_TRACED1 = PE_4,
-    SYS_TRACED1_ALT0 = PC_8,
-    SYS_TRACED1_ALT1 = PG_14,
-    SYS_TRACED2 = PE_5,
-    SYS_TRACED2_ALT0 = PD_2,
-    SYS_TRACED3 = PE_6,
-    SYS_TRACED3_ALT0 = PC_12,
-    SYS_TRGIO = PC_7,
-    SYS_WKUP0 = PA_0,
-    SYS_WKUP1 = PA_2,
-    SYS_WKUP2 = PC_13,
-    SYS_WKUP5 = PC_1,
-
     // Not connected
     NC = (int)0xFFFFFFFF
 } PinName;
 
+inline pin_size_t PinNameToIndex(PinName pn) {return (pin_size_t)pn;}
+inline PinName digitalPinToPinName(pin_size_t pin) {return (PinName)pin;}
+
 #endif

variants/arduino_portenta_h7_stm32h747xx_m7/arduino_portenta_h7_stm32h747xx_m7.overlay

@@ -314,8 +314,8 @@
 				    <&gpioz 3 GPIO_ACTIVE_LOW>,		/* A3	 ADC3_INP1 */
 				    <&gpioz 4 GPIO_ACTIVE_LOW>,		/* A4 hack for duplicate PC_2 */
 				    <&gpioz 5 GPIO_ACTIVE_LOW>,		/* A5 hack for duplicate PC_3 */
-				    /* <&gpioc 2 GPIO_ACTIVE_LOW>,	A4 _ALT0?   ADC1_INP12 */
-				    /* <&gpioc 3 GPIO_ACTIVE_LOW>,	A5 _ALT0?   ADC1_INP13 */
+				    <&gpioz 12 GPIO_ACTIVE_LOW>,		/* PC2	A4 _ALT0?   ADC1_INP12 */
+				    <&gpioz 13 GPIO_ACTIVE_LOW>,		/* PC3 A5 _ALT0?   ADC1_INP13 */
 				    <&gpioa 4 GPIO_ACTIVE_LOW>,		/* A6	 ADC1_INP18 */
 				    <&gpioa 6 GPIO_ACTIVE_LOW>,		/* A7	 ADC1_INP7 */