diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-04-07 18:28:11 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-04-07 18:28:11 +0300 |
| commit | 4b8cf90637f295ff1cb1f4bdfde134dab1196296 (patch) | |
| tree | ab2f7c9f70c854f25829cae23dfca0630637adaf /include/dt-bindings | |
| parent | a3c1086c17e44b571410c2594dc54c94779dc918 (diff) | |
| parent | 112e5934ff3a7505e583365213a27f990922b76b (diff) | |
| download | linux-4b8cf90637f295ff1cb1f4bdfde134dab1196296.tar.xz | |
Merge tag 'ti-k3-dt-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux into arm/dt
Devicetree changes for TI K3 platforms for v5.13 merge window:
* New SoCs:
- AM642 mean for industrial control, motor control, remote IO, IoT gateway etc.
* New Boards:
- AM65: Siemens SIMATIC IOT2050 advanced and basic boards
- AM64: EVM and SK boards
* New peripherals:
- AM65: watchdog
- AM65,J721E: ICSSG
- J7200: OSPI, GPIO
* Fixes:
- AM65: pcie node fixup, ospi speed updates
- J721e, J7200: MMC speed updates, ospi speed updates and compatibles fixups.
* tag 'ti-k3-dt-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux: (39 commits)
arm64: dts: ti: k3-am64-main: Fix ospi compatible
arm64: dts: ti: k3-j7200-mcu: Fix ospi compatible
arm64: dts: ti: k3-j721e-mcu: Fix ospi compatible
arm64: dts: ti: k3-j7200: Add support for higher speed modes and update delay select values for MMCSD subsystems
arm64: dts: ti: k3-j7200-common-proc-board: Disable unused gpio modules
arm64: dts: ti: k3-j7200: Add gpio nodes
arm64: dts: ti: k3-am642-evm/sk: Add IPC sub-mailbox nodes
arm64: dts: ti: k3-am64-main: Add mailbox cluster nodes
arm64: dts: ti: k3-am64-main: Add hwspinlock node
arm64: dts: ti: k3-am642: reserve gpio in mcu domain for firmware usage
arm64: dts: ti: k3-am64: Add GPIO DT nodes
arm64: dts: ti: k3-am64-evm/sk: Add OSPI flash DT node
arm64: dts: ti: k3-am64-main: Add OSPI node
arm64: dts: ti: k3-am64-main: Add ADC nodes
arm64: dts: ti: k3-am642-evm: Add USB support
arm64: dts: ti: k3-am64-main: Add DT node for USB subsystem
arm64: dts: ti: Add support for Siemens IOT2050 boards
dt-bindings: arm: ti: Add bindings for Siemens IOT2050 boards
dt-bindings: Add Siemens vendor prefix
arm64: dts: ti: k3-am642-evm: Add support for SPI EEPROM
...
Link: https://lore.kernel.org/r/20210405155336.smohb7uzkperqwuz@reflex
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/dt-bindings')
| -rw-r--r-- | include/dt-bindings/pinctrl/k3.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/dt-bindings/pinctrl/k3.h b/include/dt-bindings/pinctrl/k3.h index b0eea7cc6e23..e085f102b283 100644 --- a/include/dt-bindings/pinctrl/k3.h +++ b/include/dt-bindings/pinctrl/k3.h @@ -3,7 +3,7 @@ * This header provides constants for pinctrl bindings for TI's K3 SoC * family. * - * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com/ + * Copyright (C) 2018-2021 Texas Instruments Incorporated - https://www.ti.com/ */ #ifndef _DT_BINDINGS_PINCTRL_TI_K3_H #define _DT_BINDINGS_PINCTRL_TI_K3_H @@ -35,4 +35,7 @@ #define J721E_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode)) #define J721E_WKUP_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode)) +#define AM64X_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode)) +#define AM64X_MCU_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode)) + #endif |