diff options
| author | Tom Rini <[email protected]> | 2023-10-02 15:19:02 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-10-02 15:19:02 -0400 |
| commit | 65b9b3462bec2966911658836983819ab4e4823e (patch) | |
| tree | 802112030ffc5a2e61cef613da2e65405a557203 /include | |
| parent | ec6f06bddc7f5a5f5d122a56707a10fc4e501b97 (diff) | |
| parent | 30c210b9bee474d3ca5803f866ed07a6bac56fd4 (diff) | |
Merge branch 'next_pinctrl_sync' of https://source.denx.de/u-boot/custodians/u-boot-sh
- pinctrl re-sync for Renesas chips
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/r8a779f0-cpg-mssr.h | 2 | ||||
| -rw-r--r-- | include/dt-bindings/power/r8a7795-sysc.h | 1 | ||||
| -rw-r--r-- | include/dt-bindings/power/r8a779f0-sysc.h | 2 | ||||
| -rw-r--r-- | include/linux/compat.h | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/include/dt-bindings/clock/r8a779f0-cpg-mssr.h b/include/dt-bindings/clock/r8a779f0-cpg-mssr.h index f2ae1c6a82d..c34be562495 100644 --- a/include/dt-bindings/clock/r8a779f0-cpg-mssr.h +++ b/include/dt-bindings/clock/r8a779f0-cpg-mssr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 or MIT) */ +/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */ /* * Copyright (C) 2021 Renesas Electronics Corp. */ diff --git a/include/dt-bindings/power/r8a7795-sysc.h b/include/dt-bindings/power/r8a7795-sysc.h index eea6ad69f0b..ff532385857 100644 --- a/include/dt-bindings/power/r8a7795-sysc.h +++ b/include/dt-bindings/power/r8a7795-sysc.h @@ -30,7 +30,6 @@ #define R8A7795_PD_CA53_SCU 21 #define R8A7795_PD_3DG_E 22 #define R8A7795_PD_A3IR 24 -#define R8A7795_PD_A2VC0 25 /* ES1.x only */ #define R8A7795_PD_A2VC1 26 /* Always-on power area */ diff --git a/include/dt-bindings/power/r8a779f0-sysc.h b/include/dt-bindings/power/r8a779f0-sysc.h index 0ec8ad727ed..cde1536e9ed 100644 --- a/include/dt-bindings/power/r8a779f0-sysc.h +++ b/include/dt-bindings/power/r8a779f0-sysc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 or MIT) */ +/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */ /* * Copyright (C) 2021 Renesas Electronics Corp. */ diff --git a/include/linux/compat.h b/include/linux/compat.h index 921e698f407..f8e3570d1ad 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -271,6 +271,8 @@ typedef int wait_queue_head_t; #define __devinit #define __devinitdata #define __devinitconst +#define __initconst +#define __initdata #define kthread_create(...) __builtin_return_address(0) #define kthread_stop(...) do { } while (0) |