diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-02-29 16:22:09 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-02-29 16:22:09 +0100 |
| commit | ca2942cc6244f058c9b4c2f1557ea6adabce8a62 (patch) | |
| tree | 9582b7134991a5a1f1dcdfdfad3f29c7d5d66f69 /include/dt-bindings | |
| parent | 7aec2fd74add9c4a61d77f51c805b4f7592956da (diff) | |
| parent | d92df7e59909940b2b65523981aa0ddb4327047a (diff) | |
| download | blackbird-op-linux-ca2942cc6244f058c9b4c2f1557ea6adabce8a62.tar.gz blackbird-op-linux-ca2942cc6244f058c9b4c2f1557ea6adabce8a62.zip | |
Merge tag 'renesas-dt2-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Merge "Second Round of Renesas ARM Based SoC DT Updates for v4.6" from
Simon Horman:
* Add L2 cache-controller nodes to r8a779[0134] and r8a73a4
* Add etheravb support to r8a7794
* Correct JP3 jumper description on Porter
* Enable thermal zone on r8a779[013]
* Replace gpio-key, wakeup with wakeup-source property on r8a7794
* Use demuxer for IIC0/I2C0 on lager
* Use fallback etheravb, pci and pcie compatibility strings as appropriate
* tag 'renesas-dt2-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: dts: r8a7790: use fallback etheravb compatibility string
ARM: dts: r8a7790: lager: use demuxer for IIC0/I2C0
ARM: dts: r8a7794: add EtherAVB support
ARM: dts: r8a7794: add EtherAVB clock
ARM: dts: r8a7794: replace gpio-key, wakeup with wakeup-source property
ARM: dts: r8a7794: Add L2 cache-controller node
ARM: dts: r8a7793: Add L2 cache-controller node
ARM: dts: r8a7791: Add L2 cache-controller node
ARM: dts: r8a7790: Add L2 cache-controller nodes
ARM: dts: r8a73a4: Add L2 cache-controller nodes
ARM: dts: r8a7793: enable to use thermal-zone
ARM: dts: r8a7791: enable to use thermal-zone
ARM: dts: r8a7790: enable to use thermal-zone
ARM: dts: porter: fix JP3 jumper description
ARM: dts: r8a7794: use fallback pci compatibility string
ARM: dts: r8a7791: use fallback pci compatibility string
ARM: dts: r8a7790: use fallback pci compatibility string
ARM: dts: r8a7791: use fallback pcie compatibility string
ARM: dts: r8a7790: use fallback pcie compatibility string
Diffstat (limited to 'include/dt-bindings')
| -rw-r--r-- | include/dt-bindings/clock/r8a7794-clock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h index a7a7e0370968..f843de6bf377 100644 --- a/include/dt-bindings/clock/r8a7794-clock.h +++ b/include/dt-bindings/clock/r8a7794-clock.h @@ -84,6 +84,7 @@ /* MSTP8 */ #define R8A7794_CLK_VIN1 10 #define R8A7794_CLK_VIN0 11 +#define R8A7794_CLK_ETHERAVB 12 #define R8A7794_CLK_ETHER 13 /* MSTP9 */ |
