from spec.base import PinSpec
-def pinspec(of):
- pinbanks = {'A': 16,
- 'B': 28,
- 'C': 24,
- 'D': 24,
- 'E': 24,
- 'F': 10,
- 'G': 32,
+def pinspec():
+ pinbanks = {'A': (16, 4),
+ 'B': (28, 4),
+ 'C': (24, 4),
+ 'D': (24, 4),
+ 'E': (24, 4),
+ 'F': (10, 4),
+ 'G': (32, 4),
}
fixedpins = {
'DDR3': [
function_names = {'EINT': 'External Interrupt',
'FB': 'MC68k FlexBus',
'IIS': 'I2S Audio',
- 'JTAG0': 'JTAG (same as JTAG1, JTAG_SEL=LOW)',
- 'JTAG1': 'JTAG (same as JTAG0, JTAG_SEL=HIGH)',
+ 'JTAG': 'JTAG (multiplexed in 2 places)',
'LCD': '24-pin RGB/TTL LCD',
'RG': 'RGMII Ethernet',
- 'MMC': 'eMMC 1/2/4/8 pin',
+ 'EMMC': 'eMMC 1/2/4/8 pin',
'PWM': 'PWM (pulse-width modulation)',
- 'SD0': 'SD/MMC 0',
- 'SD1': 'SD/MMC 1',
- 'SD2': 'SD/MMC 2',
- 'SPI0': 'SPI (Serial Peripheral Interface) 0',
- 'SPI1': 'SPI (Serial Peripheral Interface) 1',
- 'QSPI': 'Quad SPI (Serial Peripheral Interface) 1',
+ 'MMC0': 'SD/MMC 0',
+ 'MMC1': 'SD/MMC 1',
+ 'MMC2': 'SD/MMC 2',
+ 'MSPI0': 'SPI (Serial Peripheral Interface) 0',
+ 'MSPI1': 'SPI (Serial Peripheral Interface) 1',
+ 'MQSPI': 'Quad SPI (Serial Peripheral Interface) 1',
'TWI0': 'I2C 1',
'TWI1': 'I2C 2',
'TWI2': 'I2C 3',
- 'UARTQ0': 'UART (TX/RX/CTS/RTS) 0',
- 'UARTQ1': 'UART (TX/RX/CTS/RTS) 1',
+ 'QUART0': 'UART (TX/RX/CTS/RTS) 0',
+ 'QUART1': 'UART (TX/RX/CTS/RTS) 1',
'UART0': 'UART (TX/RX) 0',
'UART1': 'UART (TX/RX) 1',
'UART2': 'UART (TX/RX) 2',
'ULPI2': 'ULPI (USB Low Pin-count) 3',
}
- ps = PinSpec(pinbanks, fixedpins, function_names)
+ ps = PinSpec(pinbanks, fixedpins, function_names,
+ {'lcd': {'bus': 'fastbus',
+ 'mmap': [['Cfg', 0x20000, 10]
+ ]},
+ 'jtag': {'bus': 'fastbus'},
+ 'fb': {'bus': 'fastbus'},
+ })
# Bank A, 0-15
ps.gpio("", ('A', 0), 0, 0, 16)
- ps.spi("0", ('A', 0), 3)
+ ps.mspi("0", ('A', 0), 3)
ps.uartfull("1", ('A', 0), 2)
ps.i2c("0", ('A', 4), 2)
ps.emmc("", ('A', 0), 1)
#ps.uart("0", ('A', 14), 1)
- ps.spi("1", ('A', 6), 2)
+ ps.mspi("1", ('A', 6), 2)
ps.eint("", ('A', 10), 1, start=0, limit=6)
ps.eint("", ('A', 4), 3, start=0, limit=6)
ps.sdmmc("0", ('A', 10), 2)
- ps.jtag("0", ('A', 10), 3)
+ ps.jtag("", ('A', 10), 3)
ps.uart("0", ('A', 14), 3)
# Bank B, 16-47
ps.gpio("", ('B', 0), 0, 0, 28)
ps.rgbttl("0", ('B', 0), 1)
- ps.spi("0", ('B', 12), 2)
- ps.quadspi("", ('B', 4), 2, limit=4)
+ ps.mspi("0", ('B', 12), 2)
+ ps.mquadspi("", ('B', 4), 2, limit=4)
ps.uart("1", ('B', 16), 2)
ps.i2c("2", ('B', 18), 2)
ps.pwm("", ('B', 9), 2, start=0, limit=1)
ps.gpio("", ("C", 0), 0, 0, 24)
ps.ulpi("0", ('C', 0), 1)
ps.ulpi("1", ('C', 12), 1)
- ps.spi("1", ('C', 8), 2)
- #ps.spi("1", ('C', 28), 2)
+ ps.mspi("1", ('C', 8), 2)
+ #ps.mspi("1", ('C', 28), 2)
ps.uartfull("0", ('C', 20), 3)
ps.eint("", ('C', 0), 3, start=10, limit=8)
- ps.jtag("1", ('C', 8), 3)
+ ps.jtag("", ('C', 8), 3)
ps.eint("", ('C', 12), 3, start=22, limit=8)
ps.uart("0", ('C', 22), 2)
ps.i2s("", ('C', 13), 2)
ps.i2c("2", ('D', 19), 2)
ps.uartfull("0", ('D', 0), 2)
ps.uart("1", ('D', 21), 2)
- ps.uart("2", ('D', 13), 2)
+ ps.uart("2", ('D', 12), 2)
ps.eint("", ('D', 19), 3, start=18, limit=4)
ps.eint("", ('D', 23), 3, start=9, limit=1)
ps.eint("", ('D', 13), 3, start=5, limit=4)
ps.flexbus2("", ('E', 0), 1)
ps.sdmmc("1", ('E', 0), 2)
ps.sdmmc("2", ('E', 8), 2)
- ps.quadspi("", ('E', 18), 2)
+ ps.mquadspi("", ('E', 18), 2)
ps.uartfull("1", ('E', 14), 2)
ps.i2c("1", ('E', 6), 2)
ps.eint("", ('E', 0), 3, start=10, limit=8)
ps.rgmii("", ('G', 0), 1)
ps.ulpi("2", ('G', 20), 1)
ps.rgbttl("1", ('G', 0), 2)
- ps.quadspi("", ('G', 26), 3)
+ ps.mquadspi("", ('G', 26), 3)
ps.flexbus2("", ('G', 0), 3)
ps.sdmmc("1", ('G', 24), 3, limit=2)
ps.sdmmc("1", ('G', 28), 2, start=2)
# VBUS_EN, OTG_ID etc. are all not included below, there is plenty
# of spare GPIO.
- eoma68 = ['B1:LCD/22', 'ULPI0/8', 'ULPI1', 'MMC', 'SD0', 'UART1',
- 'TWI2', 'SPI1', 'E2:SD1', ]
+ eoma68 = ['B1:LCD/22', 'ULPI0/8', 'ULPI1', 'EMMC', 'MMC0', 'UART1',
+ 'TWI2', 'MSPI1', 'E2:MMC1', ]
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 JTAG0\n'
+ 'EMMC': 'internal (on Card)',
+ 'MMC0': 'user-facing: internal (on Card), multiplexed with JTAG0\n'
'and UART0, for debug purposes',
'TWI2': 'EOMA68-compliance: must be entirely free of devices.\n'
'Address 0x51 used (externally) for EOMA68 EEPROM Id',
- 'E2:SD1': 'EOMA68-compliance',
- 'SPI1': 'EOMA68-compliance',
+ 'E2:MMC1': 'EOMA68-compliance',
+ 'MSPI1': 'EOMA68-compliance',
'UART1': 'EOMA68-compliance',
'B1:LCD/22': 'EOMA68-compliance, 18-bit RGB/TTL LCD',
'ULPI0/8': 'user-facing: internal (on Card), USB-OTG ULPI PHY',
# Focus is on getting as many UARTs, SPIs and TWIs as possible.
# OTG_ID (if to be used) would require dropping some functions in order
# to free up GPIO. LCD could be reduced to 15-bit (freeing 3).
- # MMC could be reduced to 4-bit-wide, used as SD/MMC (freeing 4).
+ # EMMC could be reduced to 4-bit-wide, used as SD/MMC (freeing 4).
# QSPI could be used in 1-bit (MOSI/MISO) mode (freeing up 2 more).
industrial = ['D1:FB/17', 'E1:FB/8', 'B1:LCD/22', 'ULPI0/8', 'ULPI1/8',
- 'MMC', 'B2:SD0',
- 'JTAG0', 'A3:UART0', 'E2:UARTQ1', 'C3:UARTQ0',
- 'F2:TWI0', 'D2:TWI1', 'D2:TWI2', 'SPI1', 'QSPI', 'F2:SD2']
+ 'EMMC', 'B2:MMC0',
+ 'JTAG', 'A3:UART0', 'E2:QUART1', 'C3:QUART0',
+ 'F2:TWI0', 'D2:TWI1', 'D2:TWI2', 'MSPI1', 'MQSPI', 'F2:MMC2']
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']
# also possibility of freeing up FlexBus CS# with a little reorg.
industrial = ['D1:FB/17', 'E1:FB/8', 'B2:SPI0', 'ULPI0/8', 'ULPI1/8',
- 'MMC', 'B2:SD0',
- 'JTAG0',
- 'A3:UART0', 'E2:UARTQ1', 'C3:UARTQ0', 'B2:UART2', 'B2:UART1',
- 'F2:TWI0', 'D2:TWI1', 'D2:TWI2', 'SPI1', 'QSPI', 'F2:SD2']
+ 'EMMC', 'B2:MMC0',
+ 'JTAG',
+ 'A3:UART0', 'E2:QUART1', 'C3:QUART0', 'B2:UART2', 'B2:UART1',
+ 'F2:TWI0', 'D2:TWI1', 'D2:TWI2', 'MSPI1', 'MQSPI', 'F2:MMC2']
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']
# Smartphone / Tablet - basically the same thing
tablet = ['B1:LCD/22', 'ULPI0/8', 'ULPI1/8',
- 'MMC', 'SD0',
+ 'EMMC', 'MMC0',
'F1:IIS', # I2C Audio
'TWI1', # I2C Audio
- 'E2:UARTQ1', # WIFI/BT
- 'E2:SD1', # WIFI
- 'C3:UARTQ0', # GPS
+ 'E2:QUART1', # WIFI/BT
+ 'E2:MMC1', # WIFI
+ 'C3:QUART0', # GPS
'D2:UART1',
'D2:UART2',
- 'D3:TWI0', 'D2:TWI2', 'SPI1', 'QSPI']
+ 'D3:TWI0', 'D2:TWI2', 'MSPI1', 'MQSPI']
tablet_pwm = ['F2:PWM_0', # LCD_BACKLIGHT
'F2:PWM_1', 'D1:PWM_2']
tablet_eint = ['EINT_24', # BT_HOST_WAKE
descriptions = {
'B1:LCD/22':
'RGB/TTL LCD, 800x480 or use SN75LVDS83b for up to 1440x900',
- 'MMC': 'eMMC: main internal storage',
+ 'EMMC': 'eMMC: main internal storage',
'ULPI0/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 w/and 4-port USB2 Hub\n'
'for example GL850G or FE1.1. '
'Connects to 2/3/4G/LTE Modem, 2x USB-Camera (VC0345)',
- 'SD0': 'internal, multiplexed with JTAG0\n'
+ 'MMC0': 'internal, multiplexed with JTAG0\n'
'and UART0, for debug purposes',
'F1:IIS': 'I2C Audio, connect to AC97 Audio IC',
'TWI1': 'Connect to AC97 Audio IC',
- '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'
+ 'E2:QUART1': 'Connect to BT on AP6234/AP6335',
+ 'E2:MMC1': 'Connect to WIFI on AP6234/AP6335',
+ 'MQSPI': '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?',
+ 'MSPI1': 'Spare? SPI, connect to higher-speed sensor?',
'D2:UART1': 'Spare? UART (or 2 extra GPIO / EINT)',
'D2:UART2': 'Spare? UART (or 2 extra GPIO)',
'D3:TWI0': 'Connect to PMIC',
'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, UART1-4, PWM1-2 may also be spare (10 extra GPIO).\n'
+ 'MSPI1, 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',
# Laptop
laptop = ['D1:FB/17', 'E1:FB/8', 'B1:LCD/22', 'ULPI0/8', 'ULPI1/8',
- 'MMC', 'SD0',
+ 'EMMC', 'MMC0',
'F1:IIS', # I2C Audio
'TWI1', # I2C Audio
- 'E2:UARTQ1', # WIFI/BT
- 'E2:SD2', # WIFI
- 'D2:TWI2', 'QSPI']
+ 'E2:QUART1', # WIFI/BT
+ 'E2:MMC2', # WIFI
+ 'D2:TWI2', 'MQSPI']
laptop_pwm = ['F2:PWM_0', # LCD_BACKLIGHT
]
laptop_eint = ['EINT_20', # BT_HOST_WAKE
'10/100 Ethernet PHY.',
'E1:FB/8': 'FlexBus bus bits 8-15, needed to make a 16-bit bus width',
'B1:LCD/22': 'RGB/TTL LCD, use SN75LVDS83b for '
- 'LVDS or SSD2828 for MIPI,\n'
+ 'LVDS or SMMC2828 for MIPI,\n'
'or a Chrontel CH7039, CH7038, CH7034 or CH7018 for dual\n'
'display output (eDP/LVDS and HDMI/VGA) '
'conversion.',
- 'MMC': 'eMMC: main internal storage',
+ 'EMMC': 'eMMC: main internal storage',
'ULPI0/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 w/and 4-port USB2 Hub\n'
'for example GL850G or FE1.1. '
'Connects to USB-Camera (VC0345 and 3x external USB Ports)',
- 'SD0': 'internal, multiplexed with JTAG0\n'
+ 'MMC0': 'internal, multiplexed with JTAG0\n'
'and UART0, for debug purposes',
'F1:IIS': 'I2C Audio, connect to AC97 Audio IC',
'TWI1': 'Connect to AC97 Audio IC',
- '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'
+ 'E2:QUART1': 'Connect to BT on AP6234/AP6335',
+ 'E2:MMC2': 'Connect to WIFI on AP6234/AP6335',
+ 'MQSPI': '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'
'MCU implements keyboard-matrix for keyboard (also trackpad?)',
# IoT
iot = ['B1:LCD', 'ULPI1/8', 'ULPI0/8',
- 'MMC', 'SD0',
+ 'EMMC', 'MMC0',
'F1:IIS', # I2C Audio
#'TWI1', # I2C Audio
- 'C3:UARTQ0', # HSPA UART
- 'E2:UARTQ1', # BT UART
+ 'C3:QUART0', # HSPA UART
+ 'E2:QUART1', # BT UART
'C2:SPI1', # HSPI SPI
- 'E2:SD2', # WIFI
+ 'E2:MMC2', # WIFI
'D3:TWI0', # sensors CTP,
- 'D2:TWI2', 'QSPI']
+ 'D2:TWI2', 'MQSPI']
iot_pwm = ['F2:PWM_0', # LCD_BACKLIGHT
]
iot_eint = ['EINT_5', # 'HSPA_MST_RDY',
]
descriptions = {
'B1:LCD':
- 'RGB/TTL LCD, use SN75LVDS83b for LVDS or SSD2828 for MIPI,\n'
+ 'RGB/TTL LCD, use SN75LVDS83b for LVDS or SMMC2828 for MIPI,\n'
'or a Chrontel CH7039, CH7038, CH7034 or CH7018 for dual\n'
'display output (eDP/LVDS and HDMI/VGA) '
'conversion.',
- 'MMC': 'eMMC: main internal storage',
+ 'EMMC': 'eMMC: main internal storage',
'F1:IIS': 'I2C Audio, connect to AC97 Audio IC',
'ULPI1/8': 'USB-OTG, connect to ULPI OTG PHY (for charging)\n'
'as well as USB Host or USB Device',
'ULPI0/8': 'USB2 Host, connect to ULPI PHY',
- 'SD0': 'internal, multiplexed with JTAG0\n'
+ 'MMC0': 'internal, multiplexed with JTAG0\n'
'and UART0, for debug purposes',
- 'C3:UARTQ0': 'Connect to HSPA UART',
- 'E2:UARTQ1': 'Connect to BT UART',
- 'E2:SD2': 'Connect to WIFI',
+ 'C3:QUART0': 'Connect to HSPA UART',
+ 'E2:QUART1': 'Connect to BT UART',
+ 'E2:MMC2': 'Connect to WIFI',
'C2:SPI1': 'HSPA SPI',
- 'QSPI': 'Boot Storage (connection to companion / debug / boot MCU)\n'
+ 'MQSPI': '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'
'MCU implements keyboard-matrix for keyboard (also trackpad?)',
iot, iot_eint, iot_pwm,
descriptions)
- return ps.write(of)
+ return ps