rename m_class spec sd numbers

diff --git a/src/spec/m_class.py b/src/spec/m_class.py
index d91b28390a84ad98492f6e87ca786e26178930c9..07307421def96fd539ea4f021f97bd02379c7144 100644 (file)
--- a/src/spec/m_class.py
+++ b/src/spec/m_class.py
@@ -34,7 +34,7 @@ def pinspec():
     pinouts.spi("2", ('A', 6), "A", 2)
     pinouts.eint("", ('A', 10), "A", 0, 6)
     pinouts.eint("", ('A', 4), "A", 0, 6, mux=3)
-    pinouts.sdmmc("1", ('A', 10), "A", 2)
+    pinouts.sdmmc("0", ('A', 10), "A", 2)
     pinouts.jtag("1", ('A', 10), "A", 3)
     pinouts.uart("2", ('A', 14), "A", 3)
 
@@ -47,7 +47,7 @@ def pinspec():
     pinouts.i2c("3", ('B', 18), "B", 2)
     pinouts.pwm("", ('B', 9), "B", 0, 1, mux=2)
     pinouts.pwm("", ('B', 20), "B", 1, 2, mux=2)
-    pinouts.sdmmc("1", ('B', 22), "B", 2)
+    pinouts.sdmmc("0", ('B', 22), "B", 2)
     pinouts.eint("", ('B', 0), "B", 6, 4, mux=3)
     pinouts.flexbus2("", ('B', 4), "B", 3)
     pinouts.i2c("1", ('B', 0), "B", 2)
@@ -105,13 +105,13 @@ def pinspec():
     pinouts.eint("", ('D', 13), "D", 5, 4, mux=3)
     pinouts.eint("", ('D', 0), "D", 30, 2, mux=3)
     pinouts.i2c("2", ('D', 2), "D", 3)
-    pinouts.sdmmc("2", ('D', 4), "D", 2)
+    pinouts.sdmmc("1", ('D', 4), "D", 2)
 
     # Bank E
     pinouts.gpio("", ('E', 0), "E", 0, 24, 0)
     pinouts.flexbus2("", ('E', 0), "E", 1)
-    pinouts.sdmmc("2", ('E', 0), "E", 2)
-    pinouts.sdmmc("3", ('E', 8), "E", 2)
+    pinouts.sdmmc("1", ('E', 0), "E", 2)
+    pinouts.sdmmc("2", ('E', 8), "E", 2)
     pinouts.quadspi("", ('E', 18), "E", 2)
     pinouts.uartfull("1", ('E', 14), "E", 2)
     pinouts.i2c("2", ('E', 6), "E", 2)
@@ -126,7 +126,7 @@ def pinspec():
     pinouts.pwm("", ('F', 8), "F", 0, 1, mux=2)
     pinouts.pwm("", ('F', 9), "F", 1, 1, mux=2)
     pinouts.uart("4", ('F', 8), "F", 1)
-    pinouts.sdmmc("3", ('F', 0), "F", 2)
+    pinouts.sdmmc("2", ('F', 0), "F", 2)
     pinouts.eint("", ('F', 0), "F", 18, 4, mux=3)
     pinouts.pwm("", ('F', 4), "F", 2, 1, mux=3)
     pinouts.eint("", ('F', 5), "F", 7, 1, mux=3)
@@ -139,8 +139,8 @@ def pinspec():
     pinouts.rgbttl("1", ('G', 0), "G", 2)
     pinouts.quadspi("", ('G', 26), "G", 3)
     pinouts.flexbus2("", ('G', 0), "G", 3)
-    pinouts.sdmmc("2", ('G', 24), "G", 3, limit=2)
-    pinouts.sdmmc("2", ('G', 28), "G", 2, start=2)
+    pinouts.sdmmc("1", ('G', 24), "G", 3, limit=2)
+    pinouts.sdmmc("1", ('G', 28), "G", 2, start=2)
 
     print ("""# Pinouts (PinMux)
 auto-generated by [[pinouts.py]]
@@ -349,9 +349,9 @@ auto-generated by [[pinouts.py]]
                       'RG': 'RGMII Ethernet',
                       'MMC': 'eMMC 1/2/4/8 pin',
                       'PWM': 'PWM (pulse-width modulation)',
+                      'SD0': 'SD/MMC 0',
                       'SD1': 'SD/MMC 1',
                       'SD2': 'SD/MMC 2',
-                      'SD3': 'SD/MMC 3',
                       'SPI1': 'SPI (Serial Peripheral Interface) 1',
                       'SPI2': 'SPI (Serial Peripheral Interface) 2',
                       'QSPI': 'Quad SPI (Serial Peripheral Interface) 1',
@@ -383,17 +383,17 @@ auto-generated by [[pinouts.py]]
     # VBUS_EN, OTG_ID etc. are all not included below, there is plenty
     # of spare GPIO.
 
-    eoma68 = ['B1:LCD/22', 'ULPI1/8', 'ULPI2', 'MMC', 'SD1', 'UART3',
-              'TWI3', 'SPI2', 'E2:SD2', ]
+    eoma68 = ['B1:LCD/22', 'ULPI1/8', 'ULPI2', 'MMC', 'SD0', 'UART3',
+              'TWI3', 'SPI2', 'E2:SD1', ]
     eoma68_eint = ['EINT_16', 'EINT_17', 'EINT_18', 'EINT_19']
     eoma68_pwm = ['D1:PWM_2']
     descriptions = {
         'MMC': 'internal (on Card)',
-        'SD1': 'user-facing: internal (on Card), multiplexed with JTAG1\n'
+        'SD0': 'user-facing: internal (on Card), multiplexed with JTAG1\n'
         'and UART2, for debug purposes',
         'TWI3': 'EOMA68-compliance: must be entirely free of devices.\n'
         'Address 0x51 used (externally) for EOMA68 EEPROM Id',
-        'E2:SD2': 'EOMA68-compliance',
+        'E2:SD1': 'EOMA68-compliance',
         'SPI2': 'EOMA68-compliance',
         'UART3': 'EOMA68-compliance',
         'B1:LCD/22': 'EOMA68-compliance, 18-bit RGB/TTL LCD',
@@ -415,9 +415,9 @@ auto-generated by [[pinouts.py]]
     # QSPI could be used in 1-bit (MOSI/MISO) mode (freeing up 2 more).
 
     industrial = ['D1:FB/17', 'E1:FB/8', 'B1:LCD/22', 'ULPI1/8', 'ULPI2/8',
-                  'MMC', 'B2:SD1',
+                  'MMC', 'B2:SD0',
                   'JTAG1', 'A3:UART2', 'E2:UART1', 'C3:UART0',
-                  'F2:TWI1', 'D2:TWI2', 'D2:TWI3', 'SPI2', 'QSPI', 'F2:SD3']
+                  'F2:TWI1', 'D2:TWI2', 'D2:TWI3', 'SPI2', 'QSPI', 'F2:SD2']
     industrial_pwm = ['F2:PWM_0', 'F2:PWM_1', 'D1:PWM_2']
     industrial_eint = ['EINT_24', 'EINT_25', 'EINT_26', 'EINT_27',
                        'EINT_20', 'EINT_21', 'EINT_22', 'EINT_23']
@@ -434,10 +434,10 @@ auto-generated by [[pinouts.py]]
     # also possibility of freeing up FlexBus CS# with a little reorg.
 
     industrial = ['D1:FB/17', 'E1:FB/8', 'B2:SPI1', 'ULPI1/8', 'ULPI2/8',
-                  'MMC', 'B2:SD1',
+                  'MMC', 'B2:SD0',
                   'JTAG1',
                   'A3:UART2', 'E2:UART1', 'C3:UART0', 'B2:UART4', 'B2:UART3',
-                  'F2:TWI1', 'D2:TWI2', 'D2:TWI3', 'SPI2', 'QSPI', 'F2:SD3']
+                  'F2:TWI1', 'D2:TWI2', 'D2:TWI3', 'SPI2', 'QSPI', 'F2:SD2']
     industrial_pwm = ['F2:PWM_0', 'F2:PWM_1', 'D1:PWM_2']
     industrial_eint = ['EINT_24', 'EINT_25', 'EINT_26', 'EINT_27',
                        'EINT_20', 'EINT_21', 'EINT_22', 'EINT_23']
@@ -453,11 +453,11 @@ auto-generated by [[pinouts.py]]
     # Smartphone / Tablet - basically the same thing
 
     tablet = ['B1:LCD/22', 'ULPI1/8', 'ULPI2/8',
-              'MMC', 'SD1',
+              'MMC', 'SD0',
               'F1:IIS',  # I2C Audio
               'TWI2',   # I2C Audio
               'E2:UART1',  # WIFI/BT
-              'E2:SD2',   # WIFI
+              'E2:SD1',   # WIFI
               'C3:UART0',  # GPS
               'D2:UART3',
               'D2:UART4',
@@ -486,12 +486,12 @@ auto-generated by [[pinouts.py]]
         'ULPI2/8': 'USB2 Host, connect to ULPI PHY w/and 4-port USB2 Hub\n'
         'for example GL850G or FE1.1. '
         'Connects to 2/3/4G/LTE Modem, 2x USB-Camera (VC0345)',
-        'SD1': 'internal, multiplexed with JTAG1\n'
+        'SD0': 'internal, multiplexed with JTAG1\n'
                'and UART2, for debug purposes',
         'F1:IIS': 'I2C Audio, connect to AC97 Audio IC',
         'TWI2': 'Connect to AC97 Audio IC',
         'E2:UART1': 'Connect to BT on AP6234/AP6335',
-        'E2:SD2': 'Connect to WIFI on AP6234/AP6335',
+        'E2:SD1': 'Connect to WIFI on AP6234/AP6335',
         'QSPI': 'Boot Storage (connection to companion / debug / boot MCU)\n'
                 'Only actually needs MISO/MOSI, bootstrap loader v. small\n'
                 'Bootstrap loader checks eMMC, USB-OTG, SD/MMC, SPI, etc.',
@@ -534,11 +534,11 @@ auto-generated by [[pinouts.py]]
     # Laptop
 
     laptop = ['D1:FB/17', 'E1:FB/8', 'B1:LCD/22', 'ULPI1/8', 'ULPI2/8',
-              'MMC', 'SD1',
+              'MMC', 'SD0',
               'F1:IIS',  # I2C Audio
               'TWI2',   # I2C Audio
               'E2:UART1',  # WIFI/BT
-              'E2:SD3',   # WIFI
+              'E2:SD2',   # WIFI
               'D2:TWI3', 'QSPI']
     laptop_pwm = ['F2:PWM_0',  # LCD_BACKLIGHT
                   ]
@@ -562,12 +562,12 @@ auto-generated by [[pinouts.py]]
         'ULPI2/8': 'USB2 Host, connect to ULPI PHY w/and 4-port USB2 Hub\n'
         'for example GL850G or FE1.1. '
         'Connects to USB-Camera (VC0345 and 3x external USB Ports)',
-        'SD1': 'internal, multiplexed with JTAG1\n'
+        'SD0': 'internal, multiplexed with JTAG1\n'
         'and UART2, for debug purposes',
         'F1:IIS': 'I2C Audio, connect to AC97 Audio IC',
         'TWI2': 'Connect to AC97 Audio IC',
         'E2:UART1': 'Connect to BT on AP6234/AP6335',
-        'E2:SD3': 'Connect to WIFI on AP6234/AP6335',
+        'E2:SD2': 'Connect to WIFI on AP6234/AP6335',
         'QSPI': 'Boot Storage (connection to companion / debug / boot MCU)\n'
         'Only actually needs MISO/MOSI, bootstrap loader v. small\n'
         'Bootstrap loader checks eMMC, USB-OTG, SD/MMC, SPI, etc.\n'
@@ -590,13 +590,13 @@ auto-generated by [[pinouts.py]]
     # IoT
 
     iot = ['B1:LCD', 'ULPI2/8', 'ULPI1/8',
-           'MMC', 'SD1',
+           'MMC', 'SD0',
            'F1:IIS',  # I2C Audio
            #'TWI2',   # I2C Audio
            'C3:UART0',  # HSPA UART
            'E2:UART1',  # BT UART
            'C2:SPI2',  # HSPI SPI
-           'E2:SD3',   # WIFI
+           'E2:SD2',   # WIFI
            'D3:TWI1',  # sensors CTP,
            'D2:TWI3', 'QSPI']
     iot_pwm = ['F2:PWM_0',  # LCD_BACKLIGHT
@@ -628,11 +628,11 @@ auto-generated by [[pinouts.py]]
         'ULPI2/8': 'USB-OTG, connect to ULPI OTG PHY (for charging)\n'
                    'as well as USB Host or USB Device',
         'ULPI1/8': 'USB2 Host, connect to ULPI PHY',
-        'SD1': 'internal, multiplexed with JTAG1\n'
+        'SD0': 'internal, multiplexed with JTAG1\n'
                'and UART2, for debug purposes',
         'C3:UART0': 'Connect to HSPA UART',
         'E2:UART1': 'Connect to BT UART',
-        'E2:SD3': 'Connect to WIFI',
+        'E2:SD2': 'Connect to WIFI',
         'C2:SPI2': 'HSPA SPI',
         'QSPI': 'Boot Storage (connection to companion / debug / boot MCU)\n'
                 'Only actually needs MISO/MOSI, bootstrap loader v. small\n'