Merge tag 'renesas-dt-fixes2-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel...

Merge "Second Round of Renesas ARM Based SoC DT Fixes for v4.5" from Simon Horman:

* remove enable prop from HS-USB device node on porter board

* tag 'renesas-dt-fixes2-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: dts: porter: remove enable prop from HS-USB device node

diff --combined arch/arm/boot/dts/r8a7791-porter.dts
index bf3a0d1,01d239c..6c08314
--- 1/arch/arm/boot/dts/r8a7791-porter.dts
--- 2/arch/arm/boot/dts/r8a7791-porter.dts
+++ b/arch/arm/boot/dts/r8a7791-porter.dts
@@@ -8,17 -8,6 +8,17 @@@
   * kind, whether express or implied.
   */
  
 +/*
 + * SSI-AK4642
 + *
 + * JP3: 2-1: AK4642
 + *      2-3: ADV7511
 + *
 + * This command is required before playback/capture:
 + *
 + *    amixer set "LINEOUT Mixer DACL" on
 + */
 +
  /dts-v1/;
  #include "r8a7791.dtsi"
  #include <dt-bindings/gpio/gpio.h>
@@@ -89,53 -78,6 +89,53 @@@
                states = <3300000 1
                          1800000 0>;
        };
 +
 +      hdmi-out {
 +              compatible = "hdmi-connector";
 +              type = "a";
 +
 +              port {
 +                      hdmi_con: endpoint {
 +                              remote-endpoint = <&adv7511_out>;
 +                      };
 +              };
 +      };
 +
 +      x3_clk: x3-clock {
 +              compatible = "fixed-clock";
 +              #clock-cells = <0>;
 +              clock-frequency = <148500000>;
 +      };
 +
 +      x16_clk: x16-clock {
 +              compatible = "fixed-clock";
 +              #clock-cells = <0>;
 +              clock-frequency = <74250000>;
 +      };
 +
 +      x14_clk: x14-clock {
 +              compatible = "fixed-clock";
 +              #clock-cells = <0>;
 +              clock-frequency = <11289600>;
 +              clock-output-names = "audio_clock";
 +      };
 +
 +      sound {
 +              compatible = "simple-audio-card";
 +
 +              simple-audio-card,format = "left_j";
 +              simple-audio-card,bitclock-master = <&soundcodec>;
 +              simple-audio-card,frame-master = <&soundcodec>;
 +
 +              simple-audio-card,cpu {
 +                      sound-dai = <&rcar_sound>;
 +              };
 +
 +              soundcodec: simple-audio-card,codec {
 +                      sound-dai = <&ak4642>;
 +                      clocks = <&x14_clk>;
 +              };
 +      };
  };
  
  &extal_clk {
@@@ -143,19 -85,11 +143,19 @@@
  };
  
  &pfc {
 +      pinctrl-0 = <&scif_clk_pins>;
 +      pinctrl-names = "default";
 +
        scif0_pins: serial0 {
                renesas,groups = "scif0_data_d";
                renesas,function = "scif0";
        };
  
 +      scif_clk_pins: scif_clk {
 +              renesas,groups = "scif_clk";
 +              renesas,function = "scif_clk";
 +      };
 +
        ether_pins: ether {
                renesas,groups = "eth_link", "eth_mdio", "eth_rmii";
                renesas,function = "eth";
@@@ -205,21 -139,6 +205,21 @@@
                renesas,groups = "can0_data";
                renesas,function = "can0";
        };
 +
 +      du_pins: du {
 +              renesas,groups = "du_rgb888", "du_sync", "du_disp", "du_clk_out_0";
 +              renesas,function = "du";
 +      };
 +
 +      ssi_pins: sound {
 +              renesas,groups = "ssi0129_ctrl", "ssi0_data", "ssi1_data";
 +              renesas,function = "ssi";
 +      };
 +
 +      audio_clk_pins: audio_clk {
 +              renesas,groups = "audio_clk_a";
 +              renesas,function = "audio_clk";
 +      };
  };
  
  &scif0 {
@@@ -229,11 -148,6 +229,11 @@@
        status = "okay";
  };
  
 +&scif_clk {
 +      clock-frequency = <14745600>;
 +      status = "okay";
 +};
 +
  &ether {
        pinctrl-0 = <&ether_pins &phy1_pins>;
        pinctrl-names = "default";
@@@ -315,12 -229,6 +315,12 @@@
        status = "okay";
        clock-frequency = <400000>;
  
 +      ak4642: codec@12 {
 +              compatible = "asahi-kasei,ak4642";
 +              #sound-dai-cells = <0>;
 +              reg = <0x12>;
 +      };
 +
        composite-in@20 {
                compatible = "adi,adv7180";
                reg = <0x20>;
@@@ -333,38 -241,6 +333,38 @@@
                        };
                };
        };
 +
 +      hdmi@39 {
 +              compatible = "adi,adv7511w";
 +              reg = <0x39>;
 +              interrupt-parent = <&gpio3>;
 +              interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
 +
 +              adi,input-depth = <8>;
 +              adi,input-colorspace = "rgb";
 +              adi,input-clock = "1x";
 +              adi,input-style = <1>;
 +              adi,input-justification = "evenly";
 +
 +              ports {
 +                      #address-cells = <1>;
 +                      #size-cells = <0>;
 +
 +                      port@0 {
 +                              reg = <0>;
 +                              adv7511_in: endpoint {
 +                                      remote-endpoint = <&du_out_rgb>;
 +                              };
 +                      };
 +
 +                      port@1 {
 +                              reg = <1>;
 +                              adv7511_out: endpoint {
 +                                      remote-endpoint = <&hdmi_con>;
 +                              };
 +                      };
 +              };
 +      };
  };
  
  &sata0 {
@@@ -407,7 -283,6 +407,6 @@@
        pinctrl-names = "default";
  
        status = "okay";
-       renesas,enable-gpio = <&gpio5 31 GPIO_ACTIVE_HIGH>;
  };
  
  &usbphy {
@@@ -428,44 -303,3 +427,44 @@@
  
        status = "okay";
  };
 +
 +&du {
 +      pinctrl-0 = <&du_pins>;
 +      pinctrl-names = "default";
 +      status = "okay";
 +
 +      clocks = <&mstp7_clks R8A7791_CLK_DU0>,
 +               <&mstp7_clks R8A7791_CLK_DU1>,
 +               <&mstp7_clks R8A7791_CLK_LVDS0>,
 +               <&x3_clk>, <&x16_clk>;
 +      clock-names = "du.0", "du.1", "lvds.0",
 +                    "dclkin.0", "dclkin.1";
 +
 +      ports {
 +              port@1 {
 +                      endpoint {
 +                              remote-endpoint = <&adv7511_in>;
 +                      };
 +              };
 +      };
 +};
 +
 +&rcar_sound {
 +      pinctrl-0 = <&ssi_pins &audio_clk_pins>;
 +      pinctrl-names = "default";
 +      status = "okay";
 +
 +      /* Single DAI */
 +      #sound-dai-cells = <0>;
 +
 +      rcar_sound,dai {
 +              dai0 {
 +                      playback = <&ssi0>;
 +                      capture  = <&ssi1>;
 +              };
 +      };
 +};
 +
 +&ssi1 {
 +      shared-pin;
 +};