From: Kevin Hilman <khilman@baylibre.com>
Date: Tue, 22 Aug 2017 22:37:31 +0000 (-0700)
Subject: Merge tag 'v4.13-rc4' into v4.14/dt64
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4db26f83a7a1f8b844e4543cd82a87bee1d224e2;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'v4.13-rc4' into v4.14/dt64

Linux 4.13-rc4
---

4db26f83a7a1f8b844e4543cd82a87bee1d224e2
diff --cc arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
index d537d7c2e8a5,266fbcf3e47f..f5ed386e6591
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
@@@ -53,15 -66,41 +66,48 @@@
  			linux,default-trigger = "heartbeat";
  		};
  	};
+ 
+ 	memory@0 {
+ 		device_type = "memory";
+ 		reg = <0x0 0x0 0x0 0x80000000>;
+ 	};
+ 
+ 	vcc_3v3: regulator-vcc_3v3 {
+ 		compatible = "regulator-fixed";
+ 		regulator-name = "VCC_3V3";
+ 		regulator-min-microvolt = <3300000>;
+ 		regulator-max-microvolt = <3300000>;
+ 	};
+ 
+ 	vcc_card: regulator-vcc-card {
+ 		compatible = "regulator-gpio";
+ 
+ 		regulator-name = "VCC_CARD";
+ 		regulator-min-microvolt = <1800000>;
+ 		regulator-max-microvolt = <3300000>;
+ 
+ 		gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
+ 		gpios-states = <0>;
+ 
+ 		states = <3300000 0>,
+ 			 <1800000 1>;
+ 	};
+ 
+ 	vddio_boot: regulator-vddio_boot {
+ 		compatible = "regulator-fixed";
+ 		regulator-name = "VDDIO_BOOT";
+ 		regulator-min-microvolt = <3300000>;
+ 		regulator-max-microvolt = <3300000>;
+ 	};
  };
  
 +&cec_AO {
 +	status = "okay";
 +	pinctrl-0 = <&ao_cec_pins>;
 +	pinctrl-names = "default";
 +	hdmi-phandle = <&hdmi_tx>;
 +};
 +
  &cvbs_vdac_port {
  	cvbs_vdac_out: endpoint {
  		remote-endpoint = <&cvbs_connector_in>;