From 41e54058fd67f6897d2e45d13f2bf446d183403e Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Fri, 30 Mar 2018 10:42:12 +0100 Subject: [PATCH] rename m_class spec uart numbers --- src/spec/m_class.py | 66 ++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/src/spec/m_class.py b/src/spec/m_class.py index 8803e46..84639bc 100644 --- a/src/spec/m_class.py +++ b/src/spec/m_class.py @@ -30,20 +30,20 @@ def pinspec(): pinouts.uartfull("1", ('A', 0), "A", 2) pinouts.i2c("1", ('A', 4), "A", 2) pinouts.emmc("", ('A', 0), "A", 1) - #pinouts.uart("2", ('A', 14), "A", 1) + #pinouts.uart("0", ('A', 14), "A", 1) pinouts.spi("1", ('A', 6), "A", 2) pinouts.eint("", ('A', 10), "A", 0, 6) pinouts.eint("", ('A', 4), "A", 0, 6, mux=3) pinouts.sdmmc("0", ('A', 10), "A", 2) pinouts.jtag("1", ('A', 10), "A", 3) - pinouts.uart("2", ('A', 14), "A", 3) + pinouts.uart("0", ('A', 14), "A", 3) # Bank B, 16-47 pinouts.gpio("", ('B', 0), "B", 0, 28, 0) pinouts.rgbttl("0", ('B', 0), "B", 1) pinouts.spi("0", ('B', 12), "B", 2) pinouts.quadspi("", ('B', 4), "B", 2, limit=4) - pinouts.uart("3", ('B', 16), "B", 2) + pinouts.uart("1", ('B', 16), "B", 2) 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) @@ -51,8 +51,8 @@ def pinspec(): pinouts.eint("", ('B', 0), "B", 6, 4, mux=3) pinouts.flexbus2("", ('B', 4), "B", 3) pinouts.i2c("1", ('B', 0), "B", 2) - pinouts.uart("2", ('B', 2), "B", 2) - pinouts.uart("4", ('B', 10), "B", 2) + pinouts.uart("0", ('B', 2), "B", 2) + pinouts.uart("2", ('B', 10), "B", 2) # Bank C, 48-71 pinouts.gpio("", ("C", 0), "C", 0, 24, 0) @@ -64,7 +64,7 @@ def pinspec(): pinouts.eint("", ('C', 0), "C", 10, 8, mux=3) pinouts.jtag("2", ('C', 8), "C", 3) pinouts.eint("", ('C', 12), "C", 22, 8, mux=3) - pinouts.uart("2", ('C', 22), "C", 2) + pinouts.uart("0", ('C', 22), "C", 2) pinouts.i2s("", ('C', 13), "C", 2) pinouts.pwm("", ('C', 21), "C", 2, 1, mux=2) @@ -98,8 +98,8 @@ def pinspec(): pinouts.i2c("1", ('D', 10), "D", 3) pinouts.i2c("3", ('D', 19), "D", 2) pinouts.uartfull("0", ('D', 0), "D", 2) - pinouts.uart("3", ('D', 21), "D", 2) - pinouts.uart("4", ('D', 13), "D", 2) + pinouts.uart("1", ('D', 21), "D", 2) + pinouts.uart("2", ('D', 13), "D", 2) pinouts.eint("", ('D', 19), "D", 18, 4, mux=3) pinouts.eint("", ('D', 23), "D", 9, 1, mux=3) pinouts.eint("", ('D', 13), "D", 5, 4, mux=3) @@ -125,7 +125,7 @@ def pinspec(): pinouts.i2c("1", ('F', 6), "F", 2) 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.uart("2", ('F', 8), "F", 1) 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) @@ -360,9 +360,9 @@ auto-generated by [[pinouts.py]] 'TWI3': 'I2C 3', 'UARTQ0': 'UART (TX/RX/CTS/RTS) 0', 'UARTQ1': 'UART (TX/RX/CTS/RTS) 1', + 'UART0': 'UART (TX/RX) 0', + 'UART1': 'UART (TX/RX) 1', 'UART2': 'UART (TX/RX) 2', - 'UART3': 'UART (TX/RX) 3', - 'UART4': 'UART (TX/RX) 4', 'ULPI1': 'ULPI (USB Low Pin-count) 1', 'ULPI2': 'ULPI (USB Low Pin-count) 2', 'ULPI3': 'ULPI (USB Low Pin-count) 3', @@ -383,19 +383,19 @@ 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', 'SD0', 'UART3', + eoma68 = ['B1:LCD/22', 'ULPI1/8', 'ULPI2', 'MMC', 'SD0', 'UART1', 'TWI3', 'SPI1', 'E2:SD1', ] eoma68_eint = ['EINT_16', 'EINT_17', 'EINT_18', 'EINT_19'] eoma68_pwm = ['D1:PWM_2'] descriptions = { 'MMC': 'internal (on Card)', 'SD0': 'user-facing: internal (on Card), multiplexed with JTAG1\n' - 'and UART2, for debug purposes', + 'and UART0, for debug purposes', 'TWI3': 'EOMA68-compliance: must be entirely free of devices.\n' 'Address 0x51 used (externally) for EOMA68 EEPROM Id', 'E2:SD1': 'EOMA68-compliance', 'SPI1': 'EOMA68-compliance', - 'UART3': 'EOMA68-compliance', + 'UART1': 'EOMA68-compliance', 'B1:LCD/22': 'EOMA68-compliance, 18-bit RGB/TTL LCD', 'ULPI1/8': 'user-facing: internal (on Card), USB-OTG ULPI PHY', 'ULPI2': 'EOMA68-compliance: dual USB2 Host ULPI PHY' @@ -416,7 +416,7 @@ auto-generated by [[pinouts.py]] industrial = ['D1:FB/17', 'E1:FB/8', 'B1:LCD/22', 'ULPI1/8', 'ULPI2/8', 'MMC', 'B2:SD0', - 'JTAG1', 'A3:UART2', 'E2:UART1', 'C3:UART0', + 'JTAG1', 'A3:UART0', 'E2:UARTQ1', 'C3:UART0', 'F2:TWI1', 'D2:TWI2', 'D2:TWI3', 'SPI1', 'QSPI', 'F2:SD2'] industrial_pwm = ['F2:PWM_0', 'F2:PWM_1', 'D1:PWM_2'] industrial_eint = ['EINT_24', 'EINT_25', 'EINT_26', 'EINT_27', @@ -436,7 +436,7 @@ auto-generated by [[pinouts.py]] industrial = ['D1:FB/17', 'E1:FB/8', 'B2:SPI0', 'ULPI1/8', 'ULPI2/8', 'MMC', 'B2:SD0', 'JTAG1', - 'A3:UART2', 'E2:UART1', 'C3:UART0', 'B2:UART4', 'B2:UART3', + 'A3:UART0', 'E2:UARTQ1', 'C3:UART0', 'B2:UART2', 'B2:UART1', 'F2:TWI1', 'D2:TWI2', 'D2:TWI3', 'SPI1', 'QSPI', 'F2:SD2'] industrial_pwm = ['F2:PWM_0', 'F2:PWM_1', 'D1:PWM_2'] industrial_eint = ['EINT_24', 'EINT_25', 'EINT_26', 'EINT_27', @@ -456,11 +456,11 @@ auto-generated by [[pinouts.py]] 'MMC', 'SD0', 'F1:IIS', # I2C Audio 'TWI2', # I2C Audio - 'E2:UART1', # WIFI/BT + 'E2:UARTQ1', # WIFI/BT 'E2:SD1', # WIFI - 'C3:UART0', # GPS - 'D2:UART3', - 'D2:UART4', + 'C3:UARTQ0', # GPS + 'D2:UART1', + 'D2:UART2', 'D3:TWI1', 'D2:TWI3', 'SPI1', 'QSPI'] tablet_pwm = ['F2:PWM_0', # LCD_BACKLIGHT 'F2:PWM_1', 'D1:PWM_2'] @@ -487,17 +487,17 @@ auto-generated by [[pinouts.py]] 'for example GL850G or FE1.1. ' 'Connects to 2/3/4G/LTE Modem, 2x USB-Camera (VC0345)', 'SD0': 'internal, multiplexed with JTAG1\n' - 'and UART2, for debug purposes', + 'and UART0, 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:UARTQ1': 'Connect to BT 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.', 'SPI1': 'Spare? SPI, connect to higher-speed sensor?', - 'D2:UART3': 'Spare? UART (or 2 extra GPIO / EINT)', - 'D2:UART4': 'Spare? UART (or 2 extra GPIO)', + 'D2:UART1': 'Spare? UART (or 2 extra GPIO / EINT)', + 'D2:UART2': 'Spare? UART (or 2 extra GPIO)', 'D3:TWI1': 'Connect to PMIC', 'D2:TWI3': 'Connect to sensors (Trackpad? CTP GSENSOR TILT COMPASS)', 'GPIO': '9 spare GPIO pins for miscellaneous functions:\n' @@ -507,7 +507,7 @@ auto-generated by [[pinouts.py]] 'Some phones may have clam-shell or lid switch.\n' 'Some Modems have spare GPIO (over AT commandset).\n' 'AXP209 PMIC has 4x GPIO, accessible over I2C.\n' - 'SPI1, UART3-4, PWM1-2 may also be spare (10 extra GPIO).\n' + 'SPI1, UART1-4, PWM1-2 may also be spare (10 extra GPIO).\n' 'If more needed, companion MCU may be used (48+ pin variant)\n' 'which also includes ADC, DAC, more PWM etc.', 'F2:PWM_0': 'LCD Backlight', @@ -537,7 +537,7 @@ auto-generated by [[pinouts.py]] 'MMC', 'SD0', 'F1:IIS', # I2C Audio 'TWI2', # I2C Audio - 'E2:UART1', # WIFI/BT + 'E2:UARTQ1', # WIFI/BT 'E2:SD2', # WIFI 'D2:TWI3', 'QSPI'] laptop_pwm = ['F2:PWM_0', # LCD_BACKLIGHT @@ -563,10 +563,10 @@ auto-generated by [[pinouts.py]] 'for example GL850G or FE1.1. ' 'Connects to USB-Camera (VC0345 and 3x external USB Ports)', 'SD0': 'internal, multiplexed with JTAG1\n' - 'and UART2, for debug purposes', + 'and UART0, 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:UARTQ1': 'Connect to BT 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' @@ -593,8 +593,8 @@ auto-generated by [[pinouts.py]] 'MMC', 'SD0', 'F1:IIS', # I2C Audio #'TWI2', # I2C Audio - 'C3:UART0', # HSPA UART - 'E2:UART1', # BT UART + 'C3:UARTQ0', # HSPA UART + 'E2:UARTQ1', # BT UART 'C2:SPI1', # HSPI SPI 'E2:SD2', # WIFI 'D3:TWI1', # sensors CTP, @@ -629,9 +629,9 @@ auto-generated by [[pinouts.py]] 'as well as USB Host or USB Device', 'ULPI1/8': 'USB2 Host, connect to ULPI PHY', 'SD0': 'internal, multiplexed with JTAG1\n' - 'and UART2, for debug purposes', - 'C3:UART0': 'Connect to HSPA UART', - 'E2:UART1': 'Connect to BT UART', + 'and UART0, for debug purposes', + 'C3:UARTQ0': 'Connect to HSPA UART', + 'E2:UARTQ1': 'Connect to BT UART', 'E2:SD2': 'Connect to WIFI', 'C2:SPI1': 'HSPA SPI', 'QSPI': 'Boot Storage (connection to companion / debug / boot MCU)\n' -- 2.30.2