From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 7 Feb 2017 15:08:58 +0000 (+0100)
Subject: Merge tag 'sunxi-dt-for-4.11' of https://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.11-rc1~87^2~4
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=2bad7f862ef8dba5e10191f68d874231d6620ede;p=linux-2.6-block.git

Merge tag 'sunxi-dt-for-4.11' of https://git./linux/kernel/git/mripard/linux into next/dt

Pull "Allwinner DT changes for 4.11" from Maxime Ripard:

The usual chunk of DT changes, most notably:
  - Support for the H2+ and the V3s
  - CPUFreq support for the A33
  - SPDIF support for the A31 and H3
  - New boards: Beelink X2, Lichee Pi One, Lichee Pi Zero,
    Orange Pi Zero

* tag 'sunxi-dt-for-4.11' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (42 commits)
  ARM: dts: sun8i-h3: Add SPDIF to the Beelink X2
  ARM: dts: sun8i-h3: Add the SPDIF block to the H3
  ARM: dts: sun8i-h3: Add SPDIF TX pin to the H3
  ARM: dts: sun8i-h3: Add dts for the Beelink X2 STB
  ARM: sun8i: sina33: Enable display
  ARM: sun8i: a23/a33: Add the oscillators accuracy
  ARM: sun8i: a23/a33: Enable the real LOSC and use it
  ARM: dts: sunxi: add support for Lichee Pi Zero board
  ARM: dts: sunxi: add dtsi file for V3s SoC
  ARM: dts: sun6i: sina31s: Enable USB OTG controller in peripheral mode
  ARM: dts: sun8i: reference-design: use AXP223 DTSI
  ARM: dts: sun8i: parrot: use AXP223 DTSI
  ARM: dts: sun8i: sina33: use AXP223 DTSI
  ARM: dts: sun8i: a33-olinuxino: use AXP223 DTSI
  ARM: dts: add DTSI for AXP223
  dt-bindings: power: axp20x-usb: add axp223 compatible
  ARM: dts: sun7i: Add wifi dt node on Banana Pro
  ARM: dts: sun6i: Add SPDIF to the Mele I7
  devicetree: bindings: Add vendor prefix for Shenzhen Xunlong Software
  ARM: dts: sun8i-h3: orange-pi-pc: Enable audio codec
  ...
---

2bad7f862ef8dba5e10191f68d874231d6620ede
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 8800b43d707b,ddd4c6e5a468..c1ccfd4c41d8
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -159,9 -159,9 +159,10 @@@ kosagi	Sutajio Ko-Usagi PTE Ltd
  kyo	Kyocera Corporation
  lacie	LaCie
  lantiq	Lantiq Semiconductor
 +lego	LEGO Systems A/S
  lenovo	Lenovo Group Ltd.
  lg	LG Corporation
+ licheepi	Lichee Pi
  linux	Linux-specific binding
  lltc	Linear Technology Corporation
  lsi	LSI Corp. (LSI Logic)