From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 30 Oct 2017 10:46:58 +0000 (+0100)
Subject: Merge tag 'sunxi-dt-for-4.15' of https://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.19~2159^2~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c0dec1ec33d74ac7b07caf32506a84495e0a062f;p=platform%2Fkernel%2Flinux-rpi.git

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

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

The most notable changes are:
  - Conversion to the last SoC (A10, A20) to the new clock framework
  - HDMI and dual pipeline support for the A10, A20 and A31 DRM driver
  - Support for the various power supplies on a number of boards
  - Fix of DTC warnings on a number of SoCs, but most of them still need
    some work
  - New boards: A20-OLinuXino-MICRO-eMMC, TBS A711, Banana Pi M2 Berry,
    Banana Pi M2 Ultra
  - New R40 SoC support

* tag 'sunxi-dt-for-4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (63 commits)
  ARM: sun8i: r40: enable USB host for Banana Pi M2 Ultra
  ARM: sun8i: v40: add 5V regulator for Banana Pi M2 Berry
  ARM: sun8i: r40: add 5V regulator for Banana Pi M2 Ultra
  ARM: sun8i: r40: add USB host port nodes for R40
  ARM: dts: sun4i: Enable HDMI support on some A10 devices
  ARM: dts: sun7i: Enable HDMI support on some A20 devices
  ARM: dts: sun7i: Add device nodes for display pipelines
  ARM: dts: sun4i: Add device nodes for display pipelines
  ARM: dts: sun8i: r40: add watchdog device node
  ARM: dts: sun5i: reference-design-tablet: Enable AXP209 AC and battery
  ARM: dts: sun9i: Change node names to remove underscores
  ARM: dts: sun9i: Change node names to remove underscores
  ARM: dts: sun4i: Remove underscores from nodes names
  ARM: dts: sun4i: Provide default muxing for relevant controllers
  ARM: dts: sun4i: Change pinctrl nodes to avoid warning
  ARM: dts: sun6i: Enable HDMI support on some A31/A31s devices
  ARM: dts: sun6i: Add device node for HDMI controller
  ARM: dts: sun4i: Change LRADC node names to avoid warnings
  ARM: dts: sun4i: Remove skeleton and memory to avoid warnings
  ARM: dts: sun4i: Remove gpio-keys warnings
  ...
---

c0dec1ec33d74ac7b07caf32506a84495e0a062f
diff --cc arch/arm/boot/dts/sun7i-a20.dtsi
index 08bea4f,228c368..68dfa82
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@@ -757,34 -226,12 +226,13 @@@
  			clocks = <&mii_phy_tx_clk>, <&gmac_int_tx_clk>;
  			clock-output-names = "gmac_tx";
  		};
+ 	};
  
- 		/*
- 		 * Dummy clock used by output clocks
- 		 */
- 		osc24M_32k: clk@1 {
- 			#clock-cells = <0>;
- 			compatible = "fixed-factor-clock";
- 			clock-div = <750>;
- 			clock-mult = <1>;
- 			clocks = <&osc24M>;
- 			clock-output-names = "osc24M_32k";
- 		};
 +
- 		clk_out_a: clk@1c201f0 {
- 			#clock-cells = <0>;
- 			compatible = "allwinner,sun7i-a20-out-clk";
- 			reg = <0x01c201f0 0x4>;
- 			clocks = <&osc24M_32k>, <&osc32k>, <&osc24M>;
- 			clock-output-names = "clk_out_a";
- 		};
- 
- 		clk_out_b: clk@1c201f4 {
- 			#clock-cells = <0>;
- 			compatible = "allwinner,sun7i-a20-out-clk";
- 			reg = <0x01c201f4 0x4>;
- 			clocks = <&osc24M_32k>, <&osc32k>, <&osc24M>;
- 			clock-output-names = "clk_out_b";
- 		};
+ 	de: display-engine {
+ 		compatible = "allwinner,sun7i-a20-display-engine";
+ 		allwinner,pipelines = <&fe0>, <&fe1>;
+ 		status = "disabled";
  	};
  
  	soc@1c00000 {