diff options
| author | Arnd Bergmann | 2023-02-06 12:05:34 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2023-02-06 12:05:36 +0100 |
| commit | f7401f6bc7ae3fd20581bbf3cfa22f5269d1d5aa (patch) | |
| tree | c8753606958aecf1ac337940c9ad258d96bdd4b7 /include/dt-bindings | |
| parent | 3e47c0dfc70725442a1c0e5767993a01fc9b80f1 (diff) | |
| parent | 47d72bbb6c0f7dc0901d7601d1aa6b1419282049 (diff) | |
Merge tag 'ti-k3-dt-for-v6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into arm/dt
TI K3 device tree updates for v6.3
New features:
J784S4 SoC and EVM support
AM68 and AM69 StarterKit, phyBOARD-Electra-AM642, Siemens IoT2050 M.2
AM62A7 SK additional peripherals
AM62 SK USB support
Non critical fixes
AM62:
McSPI Clock ID fixes
MMC TAP value updates
J7200:
pinmux range update
All:
Cache DT node fixes
Cleanups:
Reorder dts Makefile entries alphabetically
* tag 'ti-k3-dt-for-v6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: (25 commits)
arm64: dts: ti: Makefile: Rearrange entries alphabetically
arch: arm64: dts: Add support for AM69 Starter Kit
dt-bindings: arm: ti: Add binding for AM69 Starter Kit
arm64: dts: ti: iot2050: Add support for M.2 variant
dt-bindings: arm: ti: Add binding for Siemens IOT2050 M.2 variant
arm64: dts: ti: iot2050: Add layout of OSPI flash
arm64: dts: ti: k3-j7200: Fix wakeup pinmux range
arm64: dts: ti: k3-am68-sk: Add support for AM68 SK base board
arm64: dts: ti: Add initial support for AM68 SK System on Module
dt-bindings: arm: ti: Add binding for AM68 SK
arm64: dts: Update cache properties for ti
arm64: dts: ti: Add support for phyBOARD-Electra-AM642
dt-bindings: arm: ti: Add bindings for PHYTEC AM64x based hardware
arm64: dts: ti: k3-am62a7-sk: Enable USB1 node
arm64: dts: ti: k3-am62a7-sk: Enable ethernet port
arm64: dts: ti: k3-am62a-main: Add more peripheral nodes
arm64: dts: ti: k3-am62a-mcu: Add MCU domain peripherals
arm64: dts: ti: Add support for J784S4 EVM board
arm64: dts: ti: Add initial support for J784S4 SoC
dt-bindings: pinctrl: k3: Introduce pinmux definitions for J784s4
...
Link: https://lore.kernel.org/r/642cf238-43e5-d6fa-68b5-a9dfbc0277bf@ti.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/dt-bindings')
| -rw-r--r-- | include/dt-bindings/pinctrl/k3.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/dt-bindings/pinctrl/k3.h b/include/dt-bindings/pinctrl/k3.h index 54df633f9bfe..6bb9df1a264d 100644 --- a/include/dt-bindings/pinctrl/k3.h +++ b/include/dt-bindings/pinctrl/k3.h @@ -47,4 +47,7 @@ #define J721S2_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode)) #define J721S2_WKUP_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode)) +#define J784S4_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode)) +#define J784S4_WKUP_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode)) + #endif |