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

Linux 4.13-rc4

diff --cc arch/arm64/boot/dts/amlogic/meson-gx.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
Simple merge

diff --cc arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
index d537d7c2e8a5cc611ee140a9f8dce0290f3eb444,266fbcf3e47f5640b565c09fae289003b7b9e679..f5ed386e659152ea806400e3fc9569914e6682a1
--- 1/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
--- 2/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>;

diff --cc drivers/clk/meson/gxbb.c
Simple merge

diff --cc drivers/clk/meson/meson8b.c
Simple merge