diff options
| author | Olof Johansson <olof@lixom.net> | 2021-06-12 17:25:17 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2021-06-12 17:25:18 +0200 |
| commit | b7c8bde730a8d3561f6a2ea5b9551b36640a10ea (patch) | |
| tree | 0157d504eeed3f6cc7ac601dee22b6d578c6d276 /MAINTAINERS | |
| parent | Merge tag 'ixp4xx-dts-v5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | ARM: dts: gemini: remove xxx-cells from display (diff) | |
| download | linux-b7c8bde730a8d3561f6a2ea5b9551b36640a10ea.tar.xz linux-b7c8bde730a8d3561f6a2ea5b9551b36640a10ea.zip | |
Merge tag 'gemini-dts-v5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/dt
Gemini device tree updates for the v5.14 kernel:
- MAINTAINERS fix for the DTS files
- Drop a duplicate ethernet node on the RUT1xx DTS
- Add device_type to the PCI node
- Fix up some DTS syntax so it agrees with the schemas merged
for the v5.14 merge window
* tag 'gemini-dts-v5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
ARM: dts: gemini: remove xxx-cells from display
ARM: dts: gemini-dlink-dir-685: Remove address from display port
ARM: dts: gemini-dlink-dir-685: rename gpio-i2c to i2c
ARM: dts: gemini-dlink-dns-313: rename gpio-i2c to i2c
ARM: dts: gemini: convert obsolete SPI properties
ARM: dts: gemini: use the right rtc compatible
ARM: dts: gemini: add device_type on pci
ARM: dts: gemini-rut1xx: remove duplicate ethernet node
ARM: dts: gemini: rename mdio to the right name
MAINTAINERS: gemini: add missing dts pattern
Link: https://lore.kernel.org/r/CACRpkdZWpLAcAStq8dEyGL_d9Bvp-WNPu-2EuJw1eTL4kyvgig@mail.gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 81e1edeceae4..c6364972653d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1810,6 +1810,7 @@ F: Documentation/devicetree/bindings/arm/gemini.txt F: Documentation/devicetree/bindings/net/cortina,gemini-ethernet.txt F: Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt F: Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt +F: arch/arm/boot/dts/gemini* F: arch/arm/mach-gemini/ F: drivers/net/ethernet/cortina/ F: drivers/pinctrl/pinctrl-gemini.c |