diff options
| author |   Olof Johansson <olof@lixom.net> | 2019-04-28 12:46:39 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-04-28 12:46:39 -0700 |
| commit | ea1b42170f7b19bc845f974e3d76b7358db5d575 (patch) | |
| tree | ab655b025672911d5e6862e52ad902375d93dcc2 | |
| parent | Merge tag 'renesas-arm-dt-for-v5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into arm/dt (diff) | |
| parent | dt-bindings: power: r8a77965: Remove non-existent A3IR power domain (diff) | |
| download | linux-dev-ea1b42170f7b19bc845f974e3d76b7358db5d575.tar.xz linux-dev-ea1b42170f7b19bc845f974e3d76b7358db5d575.zip | |
Merge tag 'renesas-dt-bindings-for-v5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into arm/dt
Renesas ARM Based SoC DT Bindings Updates for v5.2
* R-Car M3-N (r8a77965) SoC
- Remove non-existent A3IR power domain
* Add vendor prefix for Silicon Linux
* tag 'renesas-dt-bindings-for-v5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
dt-bindings: power: r8a77965: Remove non-existent A3IR power domain
dt-bindings: Add vendor prefix for Silicon Linux.
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 | ||||
| -rw-r--r-- | include/dt-bindings/power/r8a77965-sysc.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 06a722ba8626..bbd96fa30a96 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -364,6 +364,7 @@ sgx SGX Sensortech sharp Sharp Corporation shimafuji Shimafuji Electric, Inc. si-en Si-En Technology Ltd. +si-linux Silicon Linux Corporation sifive SiFive, Inc. sigma Sigma Designs, Inc. sii Seiko Instruments, Inc. diff --git a/include/dt-bindings/power/r8a77965-sysc.h b/include/dt-bindings/power/r8a77965-sysc.h index 05a4b5917314..de82d8a15ea1 100644 --- a/include/dt-bindings/power/r8a77965-sysc.h +++ b/include/dt-bindings/power/r8a77965-sysc.h @@ -21,7 +21,6 @@ #define R8A77965_PD_A3VC 14 #define R8A77965_PD_3DG_A 17 #define R8A77965_PD_3DG_B 18 -#define R8A77965_PD_A3IR 24 #define R8A77965_PD_A2VC1 26 /* Always-on power area */ |