diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-18 20:38:22 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-18 20:40:24 -0700 |
| commit | 0fd5e8526771629e0bf969617fc8a6e40733487f (patch) | |
| tree | bb12f3a25733eab382a0a31ce498c3725c701f8b /net/unix/af_unix.c | |
| parent | 8aba614385fa72c8585ebb049e02656c14431037 (diff) | |
| parent | 27f87bd2900b1a95d9c8e25deeb9768cf3fdcc4e (diff) | |
Merge tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt64
Amlogic 64-bit DT changes for v4.13
- cleanup/reorganize alphabetically to better avoid conflicts
- add HDMI and CVBS nodes for multiple boards
- new pinctrl pins: SPI, HDMI CEC
- SCPI: fix thermal sensor reporting
New board support
- NanoPi K2 (GXBB)
- R-Box Pro (GXM)
* tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: (36 commits)
ARM64: dts: meson-gxl-s905x-p212: Add HDMI and CVBS nodes
ARM64: dts: meson-gxl-s905x-khadas-vim: Add HDMI nodes
ARM64: dts: meson-gxl-s905d-p230: Add HDMI nodes
ARM64: dts: meson-gxbb-wetek-play2: Add HDMI and CVBS Nodes
ARM64: dts: meson-gx: Fix sensors reporting from SCP
ARM64: dts: meson-gxl: Add SPI pinctrl nodes
ARM64: dts: meson-gxbb: Add SPI pinctrl nodes
ARM64: dts: meson-gxl: Add Ethernet PHY LEDS pins nodes
ARM64: dts: meson-gxl: Add CEC pins nodes
ARM64: dts: meson-gxbb: Add CEC pins nodes
ARM64: dts: Fix GXBB periphs pinctrl pull-enable register base
ARM64: dts: Fix GXL periphs pinctrl pull-enable register base
ARM64: dts: meson-gxl: Fix pinctrl periphs gpio-ranges
arm64: dts: amlogic: Add NanoPi K2
dt-bindings: arm: amlogic: Add NanoPi K2
arm64: dts: meson-gxm: Add R-Box Pro
dt-bindings: arm: amlogic: Add R-Box Pro
dt-bindings: Add Kingnovel vendor prefix
arm64: dts: meson-gx-p23x-q20x: Fix node order
arm64: dts: meson-gxm-nexbox-a1: Fix node order
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions