diff options
Diffstat (limited to 'board/cr50')
| -rw-r--r-- | board/cr50/board.c | 6 | ||||
| -rw-r--r-- | board/cr50/board.h | 4 | ||||
| -rw-r--r-- | board/cr50/gpio.inc | 14 | ||||
| -rw-r--r-- | board/cr50/usb_i2c.c | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/board/cr50/board.c b/board/cr50/board.c index 6968ac44bb..1f5ad35e3b 100644 --- a/board/cr50/board.c +++ b/board/cr50/board.c @@ -570,7 +570,7 @@ void pmu_wakeup_interrupt(void) reset_wake_logic(); /* - * Delay sleep long enough for a SPI slave transaction to start + * Delay sleep long enough for a SPI periph transaction to start * or for the system to be reset. */ delay_sleep_by(5 * SECOND); @@ -589,7 +589,7 @@ DECLARE_IRQ(GC_IRQNUM_PMU_INTR_WAKEUP_INT, pmu_wakeup_interrupt, 1); void board_configure_deep_sleep_wakepins(void) { /* - * Disable the i2c and spi slave wake sources since the TPM is + * Disable the i2c and spi periph wake sources since the TPM is * not being used and reenable them in their init functions on * resume. */ @@ -1591,7 +1591,7 @@ void i2cp_set_pinmux(void) /* * Provide access to the SDA line to be able to detect 'hosed i2c - * slave' condition. + * periph' condition. */ GWRITE(PINMUX, GPIO0_GPIO14_SEL, GC_PINMUX_DIOA1_SEL); diff --git a/board/cr50/board.h b/board/cr50/board.h index bf54ba7c9f..6817751699 100644 --- a/board/cr50/board.h +++ b/board/cr50/board.h @@ -426,8 +426,8 @@ void board_start_ite_sync(void); /* * Board specific function (needs information about pinmux settings) which - * allows to take the i2cp controller out of the 'wedged' state where the - * master stopped i2c access mid transaction and the slave is holding SDA low, + * allows to take the i2cp driver out of the 'wedged' state where the controller + * stopped i2c access mid transaction and the periph is holding SDA low. */ void board_unwedge_i2cp(void); diff --git a/board/cr50/gpio.inc b/board/cr50/gpio.inc index ec09d88a4c..3c01e4199e 100644 --- a/board/cr50/gpio.inc +++ b/board/cr50/gpio.inc @@ -14,15 +14,15 @@ * Ports' architecture and programmig is described in "ARM Cortex-M System * Design Kit TRM" DDIO47B. * - * - a set of peripherals - slave and master SPI and I2C controllers, UARTs, - * interrupt controller, etc. + * - a set of modules - SPI and I2C controller and peripheral interfaces, + * UARTs, interrupt controller, etc. * * - 28 pins on the package named DIOA0..14, DIOB0..7 and DIOM0..4 * * - a PINMUX - a unit which allows to interconnect objects from the three - * groups listed above. Note that some peripherals are attached to some - * pins directly, so in case those peripherals are used the pins should - * not be connected by PINMUX to any other outputs. + * groups listed above. Note that some modules are attached to some pins + * directly, so in case those modules are used the pins should not be + * connected by PINMUX to any other outputs. * * The below macros are somewhat misleading (apparently for historical * reasons), as PIN(p, b) component in fact refers not to the external pin, @@ -293,7 +293,7 @@ PINMUX(GPIO(DETECT_SERVO), B5, DIO_INPUT) * I2CP pins are bi-directional and would be configured here as shown. However, * A1 is also used as a strapping option GPIO input which is configured * above. If a board is configured (via the strapping pins) to support the I2CP - * interface, then the connection of A1 and A9 to/from the I2C0_SDA and I2C0_SCL + * driver, then the connection of A1 and A9 to/from the I2C0_SDA and I2C0_SCL * lines is done in the function i2cp_set_pinmux() which lives in board.c. * * PINMUX(FUNC(I2C0_SCL), A9, DIO_INPUT) @@ -315,7 +315,7 @@ PINMUX(GPIO(DETECT_SERVO), B5, DIO_INPUT) * DIOA8 = SPI_CLK (output) * DIOA11 = SPI_MISO (input) * DIOA14 = SPI_CS_L (output) - * The pads are only connected to the peripheral outputs when SPI is enabled to + * The pads are only connected to the module outputs when SPI is enabled to * avoid interfering with other things on the board. * Note: Double-check to be sure these are configured in spi_master.c */ diff --git a/board/cr50/usb_i2c.c b/board/cr50/usb_i2c.c index 39e4a4f27c..1e875a3b8f 100644 --- a/board/cr50/usb_i2c.c +++ b/board/cr50/usb_i2c.c @@ -60,7 +60,7 @@ static void ina_connect(void) GWRITE(PINMUX, I2C0_SDA_SEL, GC_PINMUX_DIOB1_SEL); GWRITE(PINMUX, I2C0_SCL_SEL, GC_PINMUX_DIOB0_SEL); - /* Connect I2CS SDA/SCL output to B1/B0 pads */ + /* Connect i2cp SDA/SCL output to B1/B0 pads */ GWRITE(PINMUX, DIOB1_SEL, GC_PINMUX_I2C0_SDA_SEL); GWRITE(PINMUX, DIOB0_SEL, GC_PINMUX_I2C0_SCL_SEL); |