diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-02-28 15:21:37 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-02-28 15:21:37 +0100 |
| commit | d2717584521a87dd410a408526bdb12b0c1e18f0 (patch) | |
| tree | fc4b263c3196b892e91815f00625a9420bed605d /include/dt-bindings | |
| parent | bb67752b505e269c3d527f8c57d1055235f58a81 (diff) | |
| parent | a033588ec66bffd6cb51f946b2e998a9f9bf598d (diff) | |
Merge tag 'ti-k3-dt-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into arm/dt
TI K3 device tree updates for v5.18
Since (ti-k3-dt-fixes-for-v5.17):
Fixes:
* Cleanups for flash nodes across K3.
* gic-v3 backward compatible registers
* j721s2 interrupt parent fixup for wakeup GPIO
New:
* AM62 SoC and AM62-SK board
* wdt support for am64
* tag 'ti-k3-dt-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux:
arm64: dts: ti: Add support for AM62-SK
arm64: dts: ti: Introduce base support for AM62x SoC
dt-bindings: pinctrl: k3: Introduce pinmux definitions for AM62
dt-bindings: arm: ti: Add bindings for AM625 SoC
arm64: dts: ti: k3-*: Drop address and size cells from flash nodes
arm64: dts: ti: k3-*: Fix whitespace around flash@0 nodes
arm64: dts: ti: k3-j721s2: Fix gic-v3 compatible regs
arm64: dts: ti: k3-am64: Fix gic-v3 compatible regs
arm64: dts: ti: k3-j7200: Fix gic-v3 compatible regs
arm64: dts: ti: k3-j721e: Fix gic-v3 compatible regs
arm64: dts: ti: k3-am65: Fix gic-v3 compatible regs
arm64: dts: ti: k3-j721s2-mcu-wakeup: Fix the interrupt-parent for wkup_gpioX instances
arm64: dts: ti: k3-am64: Add ESM0 to device memory map
arm64: dts: ti: k3-am65*: Remove #address-cells/#size-cells from flash nodes
arm64: dts: ti: k3-am64-main: Add RTI watchdog nodes
arm64: dts: ti: k3-j721s2-common-proc-board: Alias console uart to serial2
arm64: dts: ti: k3-j721s2: Move aliases to board dts
Link: https://lore.kernel.org/r/20220228120711.xdburehxs5gnwxko@capacity
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 63e038e36ca3..a5204ab91d3e 100644 --- a/include/dt-bindings/pinctrl/k3.h +++ b/include/dt-bindings/pinctrl/k3.h @@ -41,4 +41,7 @@ #define J721S2_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode)) #define J721S2_WKUP_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode)) +#define AM62X_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode)) +#define AM62X_MCU_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode)) + #endif |