[{"id":1773943,"web_url":"http://patchwork.ozlabs.org/comment/1773943/","msgid":"<CABMQnVLpBn9VR6fCM4ikiP53mmy4mrUBmiFWej0AxhycbSKU6A@mail.gmail.com>","list_archive_url":null,"date":"2017-09-22T22:18:29","subject":"Re: [U-Boot] [PATCH] ARM: dts: rmobile: Update DTS to match Linux\n\t4.13","submitter":{"id":1028,"url":"http://patchwork.ozlabs.org/api/people/1028/","name":"Nobuhiro Iwamatsu","email":"iwamatsu@nigauri.org"},"content":"Hi,\n\n2017-09-13 6:01 GMT+09:00 Marek Vasut <marek.vasut@gmail.com>:\n> Import the RCar Gen3 DTS and headers from upstream Linux kernel v4.13,\n> commit 569dbb88e80deb68974ef6fdd6a13edb9d686261 . This includes both M3\n> and H3 ULCB and Salvator-X boards.\n>\n> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>\n> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>\n\nApplied to rmobile branch.\n\nThanks,\n  Nobuhiro\n\n> ---\n>  arch/arm/dts/r8a7795-h3ulcb.dts     | 342 +-------------------\n>  arch/arm/dts/r8a7795-salvator-x.dts | 565 +++-----------------------------\n>  arch/arm/dts/r8a7795.dtsi           | 133 ++++----\n>  arch/arm/dts/r8a7796-m3ulcb.dts     | 168 +---------\n>  arch/arm/dts/r8a7796-salvator-x.dts | 244 +-------------\n>  arch/arm/dts/r8a7796.dtsi           | 421 ++++++++++++++++++++++++\n>  arch/arm/dts/salvator-common.dtsi   | 629 ++++++++++++++++++++++++++++++++++++\n>  arch/arm/dts/salvator-x.dtsi        |  30 ++\n>  arch/arm/dts/ulcb.dtsi              | 367 +++++++++++++++++++++\n>  9 files changed, 1572 insertions(+), 1327 deletions(-)\n>  create mode 100644 arch/arm/dts/salvator-common.dtsi\n>  create mode 100644 arch/arm/dts/salvator-x.dtsi\n>  create mode 100644 arch/arm/dts/ulcb.dtsi\n>\n> diff --git a/arch/arm/dts/r8a7795-h3ulcb.dts b/arch/arm/dts/r8a7795-h3ulcb.dts\n> index ab352159de..0426f41765 100644\n> --- a/arch/arm/dts/r8a7795-h3ulcb.dts\n> +++ b/arch/arm/dts/r8a7795-h3ulcb.dts\n> @@ -9,24 +9,16 @@\n>   * kind, whether express or implied.\n>   */\n>\n> +#define CPG_AUDIO_CLK_I                R8A7795_CLK_S0D4\n> +\n>  /dts-v1/;\n>  #include \"r8a7795.dtsi\"\n> -#include <dt-bindings/gpio/gpio.h>\n> -#include <dt-bindings/input/input.h>\n> +#include \"ulcb.dtsi\"\n>\n>  / {\n> -       model = \"Renesas H3ULCB board based on r8a7795\";\n> +       model = \"Renesas H3ULCB board based on r8a7795 ES2.0+\";\n>         compatible = \"renesas,h3ulcb\", \"renesas,r8a7795\";\n>\n> -       aliases {\n> -               serial0 = &scif2;\n> -               ethernet0 = &avb;\n> -       };\n> -\n> -       chosen {\n> -               stdout-path = \"serial0:115200n8\";\n> -       };\n> -\n>         memory@48000000 {\n>                 device_type = \"memory\";\n>                 /* first 128MB is reserved for secure area. */\n> @@ -47,330 +39,4 @@\n>                 device_type = \"memory\";\n>                 reg = <0x7 0x00000000 0x0 0x40000000>;\n>         };\n> -\n> -       leds {\n> -               compatible = \"gpio-leds\";\n> -\n> -               led5 {\n> -                       gpios = <&gpio6 12 GPIO_ACTIVE_HIGH>;\n> -               };\n> -               led6 {\n> -                       gpios = <&gpio6 13 GPIO_ACTIVE_HIGH>;\n> -               };\n> -       };\n> -\n> -       keyboard {\n> -               compatible = \"gpio-keys\";\n> -\n> -               key-1 {\n> -                       linux,code = <KEY_1>;\n> -                       label = \"SW3\";\n> -                       wakeup-source;\n> -                       debounce-interval = <20>;\n> -                       gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;\n> -               };\n> -       };\n> -\n> -       x12_clk: x12 {\n> -               compatible = \"fixed-clock\";\n> -               #clock-cells = <0>;\n> -               clock-frequency = <24576000>;\n> -       };\n> -\n> -       reg_1p8v: regulator0 {\n> -               compatible = \"regulator-fixed\";\n> -               regulator-name = \"fixed-1.8V\";\n> -               regulator-min-microvolt = <1800000>;\n> -               regulator-max-microvolt = <1800000>;\n> -               regulator-boot-on;\n> -               regulator-always-on;\n> -       };\n> -\n> -       reg_3p3v: regulator1 {\n> -               compatible = \"regulator-fixed\";\n> -               regulator-name = \"fixed-3.3V\";\n> -               regulator-min-microvolt = <3300000>;\n> -               regulator-max-microvolt = <3300000>;\n> -               regulator-boot-on;\n> -               regulator-always-on;\n> -       };\n> -\n> -       vcc_sdhi0: regulator-vcc-sdhi0 {\n> -               compatible = \"regulator-fixed\";\n> -\n> -               regulator-name = \"SDHI0 Vcc\";\n> -               regulator-min-microvolt = <3300000>;\n> -               regulator-max-microvolt = <3300000>;\n> -\n> -               gpio = <&gpio5 2 GPIO_ACTIVE_HIGH>;\n> -               enable-active-high;\n> -       };\n> -\n> -       vccq_sdhi0: regulator-vccq-sdhi0 {\n> -               compatible = \"regulator-gpio\";\n> -\n> -               regulator-name = \"SDHI0 VccQ\";\n> -               regulator-min-microvolt = <1800000>;\n> -               regulator-max-microvolt = <3300000>;\n> -\n> -               gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;\n> -               gpios-states = <1>;\n> -               states = <3300000 1\n> -                         1800000 0>;\n> -       };\n> -\n> -       audio_clkout: audio-clkout {\n> -               /*\n> -                * This is same as <&rcar_sound 0>\n> -                * but needed to avoid cs2000/rcar_sound probe dead-lock\n> -                */\n> -               compatible = \"fixed-clock\";\n> -               #clock-cells = <0>;\n> -               clock-frequency = <11289600>;\n> -       };\n> -\n> -       rsnd_ak4613: sound {\n> -               compatible = \"simple-audio-card\";\n> -\n> -               simple-audio-card,format = \"left_j\";\n> -               simple-audio-card,bitclock-master = <&sndcpu>;\n> -               simple-audio-card,frame-master = <&sndcpu>;\n> -\n> -               sndcpu: simple-audio-card,cpu {\n> -                       sound-dai = <&rcar_sound>;\n> -               };\n> -\n> -               sndcodec: simple-audio-card,codec {\n> -                       sound-dai = <&ak4613>;\n> -               };\n> -       };\n> -};\n> -\n> -&extal_clk {\n> -       clock-frequency = <16666666>;\n> -};\n> -\n> -&extalr_clk {\n> -       clock-frequency = <32768>;\n> -};\n> -\n> -&pfc {\n> -       pinctrl-0 = <&scif_clk_pins>;\n> -       pinctrl-names = \"default\";\n> -\n> -       scif2_pins: scif2 {\n> -               groups = \"scif2_data_a\";\n> -               function = \"scif2\";\n> -       };\n> -\n> -       scif_clk_pins: scif_clk {\n> -               groups = \"scif_clk_a\";\n> -               function = \"scif_clk\";\n> -       };\n> -\n> -       i2c2_pins: i2c2 {\n> -               groups = \"i2c2_a\";\n> -               function = \"i2c2\";\n> -       };\n> -\n> -       avb_pins: avb {\n> -               groups = \"avb_mdc\";\n> -               function = \"avb\";\n> -       };\n> -\n> -       sdhi0_pins: sd0 {\n> -               groups = \"sdhi0_data4\", \"sdhi0_ctrl\";\n> -               function = \"sdhi0\";\n> -               power-source = <3300>;\n> -       };\n> -\n> -       sdhi0_pins_uhs: sd0_uhs {\n> -               groups = \"sdhi0_data4\", \"sdhi0_ctrl\";\n> -               function = \"sdhi0\";\n> -               power-source = <1800>;\n> -       };\n> -\n> -       sdhi2_pins: sd2 {\n> -               groups = \"sdhi2_data8\", \"sdhi2_ctrl\";\n> -               function = \"sdhi2\";\n> -               power-source = <3300>;\n> -       };\n> -\n> -       sdhi2_pins_uhs: sd2_uhs {\n> -               groups = \"sdhi2_data8\", \"sdhi2_ctrl\";\n> -               function = \"sdhi2\";\n> -               power-source = <1800>;\n> -       };\n> -\n> -       sound_pins: sound {\n> -               groups = \"ssi01239_ctrl\", \"ssi0_data\", \"ssi1_data_a\";\n> -               function = \"ssi\";\n> -       };\n> -\n> -       sound_clk_pins: sound-clk {\n> -               groups = \"audio_clk_a_a\", \"audio_clk_b_a\", \"audio_clk_c_a\",\n> -                        \"audio_clkout_a\", \"audio_clkout3_a\";\n> -               function = \"audio_clk\";\n> -       };\n> -\n> -       usb1_pins: usb1 {\n> -               groups = \"usb1\";\n> -               function = \"usb1\";\n> -       };\n> -};\n> -\n> -&scif2 {\n> -       pinctrl-0 = <&scif2_pins>;\n> -       pinctrl-names = \"default\";\n> -\n> -       status = \"okay\";\n> -};\n> -\n> -&scif_clk {\n> -       clock-frequency = <14745600>;\n> -};\n> -\n> -&i2c2 {\n> -       pinctrl-0 = <&i2c2_pins>;\n> -       pinctrl-names = \"default\";\n> -\n> -       status = \"okay\";\n> -\n> -       clock-frequency = <100000>;\n> -\n> -       ak4613: codec@10 {\n> -               compatible = \"asahi-kasei,ak4613\";\n> -               #sound-dai-cells = <0>;\n> -               reg = <0x10>;\n> -               clocks = <&rcar_sound 3>;\n> -\n> -               asahi-kasei,in1-single-end;\n> -               asahi-kasei,in2-single-end;\n> -               asahi-kasei,out1-single-end;\n> -               asahi-kasei,out2-single-end;\n> -               asahi-kasei,out3-single-end;\n> -               asahi-kasei,out4-single-end;\n> -               asahi-kasei,out5-single-end;\n> -               asahi-kasei,out6-single-end;\n> -       };\n> -\n> -       cs2000: clk-multiplier@4f {\n> -               #clock-cells = <0>;\n> -               compatible = \"cirrus,cs2000-cp\";\n> -               reg = <0x4f>;\n> -               clocks = <&audio_clkout>, <&x12_clk>;\n> -               clock-names = \"clk_in\", \"ref_clk\";\n> -\n> -               assigned-clocks = <&cs2000>;\n> -               assigned-clock-rates = <24576000>; /* 1/1 divide */\n> -       };\n> -};\n> -\n> -&rcar_sound {\n> -       pinctrl-0 = <&sound_pins &sound_clk_pins>;\n> -       pinctrl-names = \"default\";\n> -\n> -       /* Single DAI */\n> -       #sound-dai-cells = <0>;\n> -\n> -       /* audio_clkout0/1/2/3 */\n> -       #clock-cells = <1>;\n> -       clock-frequency = <11289600>;\n> -\n> -       status = \"okay\";\n> -\n> -       /* update <audio_clk_b> to <cs2000> */\n> -       clocks = <&cpg CPG_MOD 1005>,\n> -                <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,\n> -                <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,\n> -                <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,\n> -                <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,\n> -                <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,\n> -                <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>,\n> -                <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>,\n> -                <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>,\n> -                <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>,\n> -                <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>,\n> -                <&cpg CPG_MOD 1020>, <&cpg CPG_MOD 1021>,\n> -                <&cpg CPG_MOD 1020>, <&cpg CPG_MOD 1021>,\n> -                <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,\n> -                <&audio_clk_a>, <&cs2000>,\n> -                <&audio_clk_c>,\n> -                <&cpg CPG_CORE R8A7795_CLK_S0D4>;\n> -\n> -       rcar_sound,dai {\n> -               dai0 {\n> -                       playback = <&ssi0 &src0 &dvc0>;\n> -                       capture  = <&ssi1 &src1 &dvc1>;\n> -               };\n> -       };\n> -};\n> -\n> -&sdhi0 {\n> -       pinctrl-0 = <&sdhi0_pins>;\n> -       pinctrl-1 = <&sdhi0_pins_uhs>;\n> -       pinctrl-names = \"default\", \"state_uhs\";\n> -\n> -       vmmc-supply = <&vcc_sdhi0>;\n> -       vqmmc-supply = <&vccq_sdhi0>;\n> -       cd-gpios = <&gpio3 12 GPIO_ACTIVE_LOW>;\n> -       bus-width = <4>;\n> -       sd-uhs-sdr50;\n> -       status = \"okay\";\n> -};\n> -\n> -&sdhi2 {\n> -       /* used for on-board 8bit eMMC */\n> -       pinctrl-0 = <&sdhi2_pins>;\n> -       pinctrl-1 = <&sdhi2_pins_uhs>;\n> -       pinctrl-names = \"default\", \"state_uhs\";\n> -\n> -       vmmc-supply = <&reg_3p3v>;\n> -       vqmmc-supply = <&reg_1p8v>;\n> -       bus-width = <8>;\n> -       non-removable;\n> -       status = \"okay\";\n> -};\n> -\n> -&ssi1 {\n> -       shared-pin;\n> -};\n> -\n> -&wdt0 {\n> -       timeout-sec = <60>;\n> -       status = \"okay\";\n> -};\n> -\n> -&audio_clk_a {\n> -       clock-frequency = <22579200>;\n> -};\n> -\n> -&avb {\n> -       pinctrl-0 = <&avb_pins>;\n> -       pinctrl-names = \"default\";\n> -       renesas,no-ether-link;\n> -       phy-handle = <&phy0>;\n> -       status = \"okay\";\n> -\n> -       phy0: ethernet-phy@0 {\n> -               rxc-skew-ps = <1500>;\n> -               reg = <0>;\n> -               interrupt-parent = <&gpio2>;\n> -               interrupts = <11 IRQ_TYPE_LEVEL_LOW>;\n> -       };\n> -};\n> -\n> -&usb2_phy1 {\n> -       pinctrl-0 = <&usb1_pins>;\n> -       pinctrl-names = \"default\";\n> -\n> -       status = \"okay\";\n> -};\n> -\n> -&ehci1 {\n> -       status = \"okay\";\n> -};\n> -\n> -&ohci1 {\n> -       status = \"okay\";\n>  };\n> diff --git a/arch/arm/dts/r8a7795-salvator-x.dts b/arch/arm/dts/r8a7795-salvator-x.dts\n> index 639aa085d9..684fb3b9d1 100644\n> --- a/arch/arm/dts/r8a7795-salvator-x.dts\n> +++ b/arch/arm/dts/r8a7795-salvator-x.dts\n> @@ -8,577 +8,108 @@\n>   * kind, whether express or implied.\n>   */\n>\n> -/*\n> - * SSI-AK4613\n> - *\n> - * This command is required when Playback/Capture\n> - *\n> - *     amixer set \"DVC Out\" 100%\n> - *     amixer set \"DVC In\" 100%\n> - *\n> - * You can use Mute\n> - *\n> - *     amixer set \"DVC Out Mute\" on\n> - *     amixer set \"DVC In Mute\" on\n> - *\n> - * You can use Volume Ramp\n> - *\n> - *     amixer set \"DVC Out Ramp Up Rate\"   \"0.125 dB/64 steps\"\n> - *     amixer set \"DVC Out Ramp Down Rate\" \"0.125 dB/512 steps\"\n> - *     amixer set \"DVC Out Ramp\" on\n> - *     aplay xxx.wav &\n> - *     amixer set \"DVC Out\"  80%  // Volume Down\n> - *     amixer set \"DVC Out\" 100%  // Volume Up\n> - */\n> +#define CPG_AUDIO_CLK_I                R8A7795_CLK_S0D4\n>\n>  /dts-v1/;\n>  #include \"r8a7795.dtsi\"\n> -#include <dt-bindings/gpio/gpio.h>\n> +#include \"salvator-x.dtsi\"\n>\n>  / {\n> -       model = \"Renesas Salvator-X board based on r8a7795\";\n> +       model = \"Renesas Salvator-X board based on r8a7795 ES2.0+\";\n>         compatible = \"renesas,salvator-x\", \"renesas,r8a7795\";\n>\n> -       aliases {\n> -               serial0 = &scif2;\n> -               serial1 = &scif1;\n> -               ethernet0 = &avb;\n> -       };\n> -\n> -       chosen {\n> -               bootargs = \"ignore_loglevel rw root=/dev/nfs ip=dhcp\";\n> -               stdout-path = \"serial0:115200n8\";\n> -       };\n> -\n>         memory@48000000 {\n>                 device_type = \"memory\";\n>                 /* first 128MB is reserved for secure area. */\n>                 reg = <0x0 0x48000000 0x0 0x38000000>;\n>         };\n>\n> -       x12_clk: x12 {\n> -               compatible = \"fixed-clock\";\n> -               #clock-cells = <0>;\n> -               clock-frequency = <24576000>;\n> -       };\n> -\n> -       reg_1p8v: regulator0 {\n> -               compatible = \"regulator-fixed\";\n> -               regulator-name = \"fixed-1.8V\";\n> -               regulator-min-microvolt = <1800000>;\n> -               regulator-max-microvolt = <1800000>;\n> -               regulator-boot-on;\n> -               regulator-always-on;\n> -       };\n> -\n> -       reg_3p3v: regulator1 {\n> -               compatible = \"regulator-fixed\";\n> -               regulator-name = \"fixed-3.3V\";\n> -               regulator-min-microvolt = <3300000>;\n> -               regulator-max-microvolt = <3300000>;\n> -               regulator-boot-on;\n> -               regulator-always-on;\n> -       };\n> -\n> -       vcc_sdhi0: regulator-vcc-sdhi0 {\n> -               compatible = \"regulator-fixed\";\n> -\n> -               regulator-name = \"SDHI0 Vcc\";\n> -               regulator-min-microvolt = <3300000>;\n> -               regulator-max-microvolt = <3300000>;\n> -\n> -               gpio = <&gpio5 2 GPIO_ACTIVE_HIGH>;\n> -               enable-active-high;\n> -       };\n> -\n> -       vccq_sdhi0: regulator-vccq-sdhi0 {\n> -               compatible = \"regulator-gpio\";\n> -\n> -               regulator-name = \"SDHI0 VccQ\";\n> -               regulator-min-microvolt = <1800000>;\n> -               regulator-max-microvolt = <3300000>;\n> -\n> -               gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;\n> -               gpios-states = <1>;\n> -               states = <3300000 1\n> -                         1800000 0>;\n> -       };\n> -\n> -       vcc_sdhi3: regulator-vcc-sdhi3 {\n> -               compatible = \"regulator-fixed\";\n> -\n> -               regulator-name = \"SDHI3 Vcc\";\n> -               regulator-min-microvolt = <3300000>;\n> -               regulator-max-microvolt = <3300000>;\n> -\n> -               gpio = <&gpio3 15 GPIO_ACTIVE_HIGH>;\n> -               enable-active-high;\n> -       };\n> -\n> -       vccq_sdhi3: regulator-vccq-sdhi3 {\n> -               compatible = \"regulator-gpio\";\n> -\n> -               regulator-name = \"SDHI3 VccQ\";\n> -               regulator-min-microvolt = <1800000>;\n> -               regulator-max-microvolt = <3300000>;\n> -\n> -               gpios = <&gpio3 14 GPIO_ACTIVE_HIGH>;\n> -               gpios-states = <1>;\n> -               states = <3300000 1\n> -                         1800000 0>;\n> +       memory@500000000 {\n> +               device_type = \"memory\";\n> +               reg = <0x5 0x00000000 0x0 0x40000000>;\n>         };\n>\n> -       vbus0_usb2: regulator-vbus0-usb2 {\n> -               compatible = \"regulator-fixed\";\n> -\n> -               regulator-name = \"USB20_VBUS0\";\n> -               regulator-min-microvolt = <5000000>;\n> -               regulator-max-microvolt = <5000000>;\n> -\n> -               gpio = <&gpio6 16 GPIO_ACTIVE_HIGH>;\n> -               enable-active-high;\n> +       memory@600000000 {\n> +               device_type = \"memory\";\n> +               reg = <0x6 0x00000000 0x0 0x40000000>;\n>         };\n>\n> -       audio_clkout: audio_clkout {\n> -               /*\n> -                * This is same as <&rcar_sound 0>\n> -                * but needed to avoid cs2000/rcar_sound probe dead-lock\n> -                */\n> -               compatible = \"fixed-clock\";\n> -               #clock-cells = <0>;\n> -               clock-frequency = <11289600>;\n> +       memory@700000000 {\n> +               device_type = \"memory\";\n> +               reg = <0x7 0x00000000 0x0 0x40000000>;\n>         };\n> +};\n>\n> -       rsnd_ak4613: sound {\n> -               compatible = \"simple-audio-card\";\n> -\n> -               simple-audio-card,format = \"left_j\";\n> -               simple-audio-card,bitclock-master = <&sndcpu>;\n> -               simple-audio-card,frame-master = <&sndcpu>;\n> -\n> -               sndcpu: simple-audio-card,cpu {\n> -                       sound-dai = <&rcar_sound>;\n> -               };\n> -\n> -               sndcodec: simple-audio-card,codec {\n> -                       sound-dai = <&ak4613>;\n> -               };\n> -       };\n> +&du {\n> +       clocks = <&cpg CPG_MOD 724>,\n> +                <&cpg CPG_MOD 723>,\n> +                <&cpg CPG_MOD 722>,\n> +                <&cpg CPG_MOD 721>,\n> +                <&cpg CPG_MOD 727>,\n> +                <&versaclock5 1>,\n> +                <&x21_clk>,\n> +                <&x22_clk>,\n> +                <&versaclock5 2>;\n> +       clock-names = \"du.0\", \"du.1\", \"du.2\", \"du.3\", \"lvds.0\",\n> +                     \"dclkin.0\", \"dclkin.1\", \"dclkin.2\", \"dclkin.3\";\n> +};\n>\n> -       vga-encoder {\n> -               compatible = \"adi,adv7123\";\n> +&ehci2 {\n> +       status = \"okay\";\n> +};\n>\n> -               ports {\n> -                       #address-cells = <1>;\n> -                       #size-cells = <0>;\n> +&hdmi0 {\n> +       status = \"okay\";\n>\n> -                       port@0 {\n> -                               reg = <0>;\n> -                               adv7123_in: endpoint {\n> -                                       remote-endpoint = <&du_out_rgb>;\n> -                               };\n> -                       };\n> -                       port@1 {\n> -                               reg = <1>;\n> -                               adv7123_out: endpoint {\n> -                                       remote-endpoint = <&vga_in>;\n> -                               };\n> +       ports {\n> +               port@1 {\n> +                       reg = <1>;\n> +                       rcar_dw_hdmi0_out: endpoint {\n> +                               remote-endpoint = <&hdmi0_con>;\n>                         };\n>                 };\n>         };\n> +};\n>\n> -       vga {\n> -               compatible = \"vga-connector\";\n> -\n> -               port {\n> -                       vga_in: endpoint {\n> -                               remote-endpoint = <&adv7123_out>;\n> -                       };\n> -               };\n> -       };\n> +&hdmi0_con {\n> +       remote-endpoint = <&rcar_dw_hdmi0_out>;\n>  };\n>\n> -&du {\n> -       pinctrl-0 = <&du_pins>;\n> -       pinctrl-names = \"default\";\n> +&hdmi1 {\n>         status = \"okay\";\n>\n>         ports {\n> -               port@0 {\n> -                       endpoint {\n> -                               remote-endpoint = <&adv7123_in>;\n> -                       };\n> -               };\n> -               port@3 {\n> -                       lvds_connector: endpoint {\n> +               port@1 {\n> +                       reg = <1>;\n> +                       rcar_dw_hdmi1_out: endpoint {\n> +                               remote-endpoint = <&hdmi1_con>;\n>                         };\n>                 };\n>         };\n>  };\n>\n> -&extal_clk {\n> -       clock-frequency = <16666666>;\n> +&hdmi1_con {\n> +       remote-endpoint = <&rcar_dw_hdmi1_out>;\n>  };\n>\n> -&extalr_clk {\n> -       clock-frequency = <32768>;\n> +&ohci2 {\n> +       status = \"okay\";\n>  };\n>\n>  &pfc {\n> -       pinctrl-0 = <&scif_clk_pins>;\n> -       pinctrl-names = \"default\";\n> -\n> -       scif1_pins: scif1 {\n> -               groups = \"scif1_data_a\", \"scif1_ctrl\";\n> -               function = \"scif1\";\n> -       };\n> -       scif2_pins: scif2 {\n> -               groups = \"scif2_data_a\";\n> -               function = \"scif2\";\n> -       };\n> -       scif_clk_pins: scif_clk {\n> -               groups = \"scif_clk_a\";\n> -               function = \"scif_clk\";\n> -       };\n> -\n> -       i2c2_pins: i2c2 {\n> -               groups = \"i2c2_a\";\n> -               function = \"i2c2\";\n> -       };\n> -\n> -       avb_pins: avb {\n> -               mux {\n> -                       groups = \"avb_link\", \"avb_phy_int\", \"avb_mdc\",\n> -                                \"avb_mii\";\n> -                       function = \"avb\";\n> -               };\n> -\n> -               pins_mdc {\n> -                       groups = \"avb_mdc\";\n> -                       drive-strength = <24>;\n> -               };\n> -\n> -               pins_mii_tx {\n> -                       pins = \"PIN_AVB_TX_CTL\", \"PIN_AVB_TXC\", \"PIN_AVB_TD0\",\n> -                              \"PIN_AVB_TD1\", \"PIN_AVB_TD2\", \"PIN_AVB_TD3\";\n> -                       drive-strength = <12>;\n> -               };\n> -       };\n> -\n> -       du_pins: du {\n> -               groups = \"du_rgb888\", \"du_sync\", \"du_oddf\", \"du_clk_out_0\";\n> -               function = \"du\";\n> -       };\n> -\n> -       sdhi0_pins: sd0 {\n> -               groups = \"sdhi0_data4\", \"sdhi0_ctrl\";\n> -               function = \"sdhi0\";\n> -               power-source = <3300>;\n> -       };\n> -\n> -       sdhi0_pins_uhs: sd0_uhs {\n> -               groups = \"sdhi0_data4\", \"sdhi0_ctrl\";\n> -               function = \"sdhi0\";\n> -               power-source = <1800>;\n> -       };\n> -\n> -       sdhi2_pins: sd2 {\n> -               groups = \"sdhi2_data8\", \"sdhi2_ctrl\";\n> -               function = \"sdhi2\";\n> -               power-source = <3300>;\n> -       };\n> -\n> -       sdhi2_pins_uhs: sd2_uhs {\n> -               groups = \"sdhi2_data8\", \"sdhi2_ctrl\";\n> -               function = \"sdhi2\";\n> -               power-source = <1800>;\n> -       };\n> -\n> -       sdhi3_pins: sd3 {\n> -               groups = \"sdhi3_data4\", \"sdhi3_ctrl\";\n> -               function = \"sdhi3\";\n> -               power-source = <3300>;\n> -       };\n> -\n> -       sdhi3_pins_uhs: sd3_uhs {\n> -               groups = \"sdhi3_data4\", \"sdhi3_ctrl\";\n> -               function = \"sdhi3\";\n> -               power-source = <1800>;\n> -       };\n> -\n> -       sound_pins: sound {\n> -               groups = \"ssi01239_ctrl\", \"ssi0_data\", \"ssi1_data_a\";\n> -               function = \"ssi\";\n> -       };\n> -\n> -       sound_clk_pins: sound_clk {\n> -               groups = \"audio_clk_a_a\", \"audio_clk_b_a\", \"audio_clk_c_a\",\n> -                        \"audio_clkout_a\", \"audio_clkout3_a\";\n> -               function = \"audio_clk\";\n> -       };\n> -\n> -       usb0_pins: usb0 {\n> -               groups = \"usb0\";\n> -               function = \"usb0\";\n> -       };\n> -\n> -       usb1_pins: usb1 {\n> -               mux {\n> -                       groups = \"usb1\";\n> -                       function = \"usb1\";\n> -               };\n> -\n> -               ovc {\n> -                       pins = \"GP_6_27\";\n> -                       bias-pull-up;\n> -               };\n> -\n> -               pwen {\n> -                       pins = \"GP_6_26\";\n> -                       bias-pull-down;\n> -               };\n> -       };\n> -\n>         usb2_pins: usb2 {\n>                 groups = \"usb2\";\n>                 function = \"usb2\";\n>         };\n>  };\n>\n> -&scif1 {\n> -       pinctrl-0 = <&scif1_pins>;\n> -       pinctrl-names = \"default\";\n> -\n> -       uart-has-rtscts;\n> -       status = \"okay\";\n> -};\n> -\n> -&scif2 {\n> -       pinctrl-0 = <&scif2_pins>;\n> -       pinctrl-names = \"default\";\n> -\n> -       status = \"okay\";\n> -};\n> -\n> -&scif_clk {\n> -       clock-frequency = <14745600>;\n> -};\n> -\n> -&i2c2 {\n> -       pinctrl-0 = <&i2c2_pins>;\n> -       pinctrl-names = \"default\";\n> -\n> -       status = \"okay\";\n> -\n> -       clock-frequency = <100000>;\n> -\n> -       ak4613: codec@10 {\n> -               compatible = \"asahi-kasei,ak4613\";\n> -               #sound-dai-cells = <0>;\n> -               reg = <0x10>;\n> -               clocks = <&rcar_sound 3>;\n> -\n> -               asahi-kasei,in1-single-end;\n> -               asahi-kasei,in2-single-end;\n> -               asahi-kasei,out1-single-end;\n> -               asahi-kasei,out2-single-end;\n> -               asahi-kasei,out3-single-end;\n> -               asahi-kasei,out4-single-end;\n> -               asahi-kasei,out5-single-end;\n> -               asahi-kasei,out6-single-end;\n> -       };\n> -\n> -       cs2000: clk_multiplier@4f {\n> -               #clock-cells = <0>;\n> -               compatible = \"cirrus,cs2000-cp\";\n> -               reg = <0x4f>;\n> -               clocks = <&audio_clkout>, <&x12_clk>;\n> -               clock-names = \"clk_in\", \"ref_clk\";\n> -\n> -               assigned-clocks = <&cs2000>;\n> -               assigned-clock-rates = <24576000>; /* 1/1 divide */\n> -       };\n> -};\n> -\n> -&rcar_sound {\n> -       pinctrl-0 = <&sound_pins &sound_clk_pins>;\n> -       pinctrl-names = \"default\";\n> -\n> -       /* Single DAI */\n> -       #sound-dai-cells = <0>;\n> -\n> -       /* audio_clkout0/1/2/3 */\n> -       #clock-cells = <1>;\n> -       clock-frequency = <11289600>;\n> -\n> -       status = \"okay\";\n> -\n> -       /* update <audio_clk_b> to <cs2000> */\n> -       clocks = <&cpg CPG_MOD 1005>,\n> -                <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,\n> -                <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,\n> -                <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,\n> -                <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,\n> -                <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,\n> -                <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>,\n> -                <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>,\n> -                <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>,\n> -                <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>,\n> -                <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>,\n> -                <&cpg CPG_MOD 1020>, <&cpg CPG_MOD 1021>,\n> -                <&cpg CPG_MOD 1020>, <&cpg CPG_MOD 1021>,\n> -                <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,\n> -                <&audio_clk_a>, <&cs2000>,\n> -                <&audio_clk_c>,\n> -                <&cpg CPG_CORE R8A7795_CLK_S0D4>;\n> -\n> -       rcar_sound,dai {\n> -               dai0 {\n> -                       playback = <&ssi0 &src0 &dvc0>;\n> -                       capture  = <&ssi1 &src1 &dvc1>;\n> -               };\n> -       };\n> -};\n> -\n>  &sata {\n>         status = \"okay\";\n>  };\n>\n> -&sdhi0 {\n> -       pinctrl-0 = <&sdhi0_pins>;\n> -       pinctrl-1 = <&sdhi0_pins_uhs>;\n> -       pinctrl-names = \"default\", \"state_uhs\";\n> -\n> -       vmmc-supply = <&vcc_sdhi0>;\n> -       vqmmc-supply = <&vccq_sdhi0>;\n> -       cd-gpios = <&gpio3 12 GPIO_ACTIVE_LOW>;\n> -       wp-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>;\n> -       bus-width = <4>;\n> -       sd-uhs-sdr50;\n> -       status = \"okay\";\n> -};\n> -\n> -&sdhi2 {\n> -       /* used for on-board 8bit eMMC */\n> -       pinctrl-0 = <&sdhi2_pins>;\n> -       pinctrl-1 = <&sdhi2_pins_uhs>;\n> -       pinctrl-names = \"default\", \"state_uhs\";\n> -\n> -       vmmc-supply = <&reg_3p3v>;\n> -       vqmmc-supply = <&reg_1p8v>;\n> -       bus-width = <8>;\n> -       non-removable;\n> -       status = \"okay\";\n> -};\n> -\n> -&sdhi3 {\n> -       pinctrl-0 = <&sdhi3_pins>;\n> -       pinctrl-1 = <&sdhi3_pins_uhs>;\n> -       pinctrl-names = \"default\", \"state_uhs\";\n> -\n> -       vmmc-supply = <&vcc_sdhi3>;\n> -       vqmmc-supply = <&vccq_sdhi3>;\n> -       cd-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;\n> -       wp-gpios = <&gpio4 16 GPIO_ACTIVE_HIGH>;\n> -       bus-width = <4>;\n> -       sd-uhs-sdr50;\n> -       status = \"okay\";\n> -};\n> -\n> -&ssi1 {\n> -       shared-pin;\n> -};\n> -\n> -&wdt0 {\n> -       timeout-sec = <60>;\n> -       status = \"okay\";\n> -};\n> -\n> -&audio_clk_a {\n> -       clock-frequency = <22579200>;\n> -};\n> -\n> -&i2c_dvfs {\n> -       status = \"okay\";\n> -};\n> -\n> -&avb {\n> -       pinctrl-0 = <&avb_pins>;\n> -       pinctrl-names = \"default\";\n> -       renesas,no-ether-link;\n> -       phy-handle = <&phy0>;\n> -       status = \"okay\";\n> -\n> -       phy0: ethernet-phy@0 {\n> -               rxc-skew-ps = <1500>;\n> -               reg = <0>;\n> -               interrupt-parent = <&gpio2>;\n> -               interrupts = <11 IRQ_TYPE_LEVEL_LOW>;\n> -       };\n> -};\n> -\n> -&xhci0 {\n> -       status = \"okay\";\n> -};\n> -\n> -&usb2_phy0 {\n> -       pinctrl-0 = <&usb0_pins>;\n> -       pinctrl-names = \"default\";\n> -\n> -       vbus-supply = <&vbus0_usb2>;\n> -       status = \"okay\";\n> -};\n> -\n> -&usb2_phy1 {\n> -       pinctrl-0 = <&usb1_pins>;\n> -       pinctrl-names = \"default\";\n> -\n> -       status = \"okay\";\n> -};\n> -\n>  &usb2_phy2 {\n>         pinctrl-0 = <&usb2_pins>;\n>         pinctrl-names = \"default\";\n>\n>         status = \"okay\";\n>  };\n> -\n> -&ehci0 {\n> -       status = \"okay\";\n> -};\n> -\n> -&ehci1 {\n> -       status = \"okay\";\n> -};\n> -\n> -&ehci2 {\n> -       status = \"okay\";\n> -};\n> -\n> -&ohci0 {\n> -       status = \"okay\";\n> -};\n> -\n> -&ohci1 {\n> -       status = \"okay\";\n> -};\n> -\n> -&ohci2 {\n> -       status = \"okay\";\n> -};\n> -\n> -&hsusb {\n> -       status = \"okay\";\n> -};\n> -\n> -&pcie_bus_clk {\n> -       clock-frequency = <100000000>;\n> -};\n> -\n> -&pciec0 {\n> -       status = \"okay\";\n> -};\n> -\n> -&pciec1 {\n> -       status = \"okay\";\n> -};\n> diff --git a/arch/arm/dts/r8a7795.dtsi b/arch/arm/dts/r8a7795.dtsi\n> index 110d0681c8..615b652131 100644\n> --- a/arch/arm/dts/r8a7795.dtsi\n> +++ b/arch/arm/dts/r8a7795.dtsi\n> @@ -184,7 +184,7 @@\n>                 clock-frequency = <0>;\n>         };\n>\n> -       soc {\n> +       soc: soc {\n>                 compatible = \"simple-bus\";\n>                 interrupt-parent = <&gic>;\n>\n> @@ -402,7 +402,7 @@\n>                         #power-domain-cells = <1>;\n>                 };\n>\n> -               pfc: pfc@e6060000 {\n> +               pfc: pin-controller@e6060000 {\n>                         compatible = \"renesas,pfc-r8a7795\";\n>                         reg = <0 0xe6060000 0 0x50c>;\n>                 };\n> @@ -887,6 +887,8 @@\n>                         clocks = <&cpg CPG_MOD 926>;\n>                         power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;\n>                         resets = <&cpg 926>;\n> +                       dmas = <&dmac0 0x11>, <&dmac0 0x10>;\n> +                       dma-names = \"tx\", \"rx\";\n>                         status = \"disabled\";\n>                 };\n>\n> @@ -1122,6 +1124,16 @@\n>                                       \"dvc.0\", \"dvc.1\",\n>                                       \"clk_a\", \"clk_b\", \"clk_c\", \"clk_i\";\n>                         power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;\n> +                       resets = <&cpg 1005>,\n> +                                <&cpg 1006>, <&cpg 1007>,\n> +                                <&cpg 1008>, <&cpg 1009>,\n> +                                <&cpg 1010>, <&cpg 1011>,\n> +                                <&cpg 1012>, <&cpg 1013>,\n> +                                <&cpg 1014>, <&cpg 1015>;\n> +                       reset-names = \"ssi-all\",\n> +                                     \"ssi.9\", \"ssi.8\", \"ssi.7\", \"ssi.6\",\n> +                                     \"ssi.5\", \"ssi.4\", \"ssi.3\", \"ssi.2\",\n> +                                     \"ssi.1\", \"ssi.0\";\n>                         status = \"disabled\";\n>\n>                         rcar_sound,dvc {\n> @@ -1278,16 +1290,6 @@\n>                         status = \"disabled\";\n>                 };\n>\n> -               xhci1: usb@ee0400000 {\n> -                       compatible = \"renesas,xhci-r8a7795\", \"renesas,rcar-gen3-xhci\";\n> -                       reg = <0 0xee040000 0 0xc00>;\n> -                       interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;\n> -                       clocks = <&cpg CPG_MOD 327>;\n> -                       power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;\n> -                       resets = <&cpg 327>;\n> -                       status = \"disabled\";\n> -               };\n> -\n>                 usb_dmac0: dma-controller@e65a0000 {\n>                         compatible = \"renesas,r8a7795-usb-dmac\",\n>                                      \"renesas,usb-dmac\";\n> @@ -1572,14 +1574,6 @@\n>                         resets = <&cpg 614>;\n>                 };\n>\n> -               fcpf2: fcp@fe952000 {\n> -                       compatible = \"renesas,fcpf\";\n> -                       reg = <0 0xfe952000 0 0x200>;\n> -                       clocks = <&cpg CPG_MOD 613>;\n> -                       power-domains = <&sysc R8A7795_PD_A3VP>;\n> -                       resets = <&cpg 613>;\n> -               };\n> -\n>                 vspbd: vsp@fe960000 {\n>                         compatible = \"renesas,vsp2\";\n>                         reg = <0 0xfe960000 0 0x8000>;\n> @@ -1637,25 +1631,6 @@\n>                         resets = <&cpg 610>;\n>                 };\n>\n> -               vspi2: vsp@fe9c0000 {\n> -                       compatible = \"renesas,vsp2\";\n> -                       reg = <0 0xfe9c0000 0 0x8000>;\n> -                       interrupts = <GIC_SPI 446 IRQ_TYPE_LEVEL_HIGH>;\n> -                       clocks = <&cpg CPG_MOD 629>;\n> -                       power-domains = <&sysc R8A7795_PD_A3VP>;\n> -                       resets = <&cpg 629>;\n> -\n> -                       renesas,fcp = <&fcpvi2>;\n> -               };\n> -\n> -               fcpvi2: fcp@fe9cf000 {\n> -                       compatible = \"renesas,fcpv\";\n> -                       reg = <0 0xfe9cf000 0 0x200>;\n> -                       clocks = <&cpg CPG_MOD 609>;\n> -                       power-domains = <&sysc R8A7795_PD_A3VP>;\n> -                       resets = <&cpg 609>;\n> -               };\n> -\n>                 vspd0: vsp@fea20000 {\n>                         compatible = \"renesas,vsp2\";\n>                         reg = <0 0xfea20000 0 0x4000>;\n> @@ -1713,25 +1688,6 @@\n>                         resets = <&cpg 601>;\n>                 };\n>\n> -               vspd3: vsp@fea38000 {\n> -                       compatible = \"renesas,vsp2\";\n> -                       reg = <0 0xfea38000 0 0x4000>;\n> -                       interrupts = <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>;\n> -                       clocks = <&cpg CPG_MOD 620>;\n> -                       power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;\n> -                       resets = <&cpg 620>;\n> -\n> -                       renesas,fcp = <&fcpvd3>;\n> -               };\n> -\n> -               fcpvd3: fcp@fea3f000 {\n> -                       compatible = \"renesas,fcpv\";\n> -                       reg = <0 0xfea3f000 0 0x200>;\n> -                       clocks = <&cpg CPG_MOD 600>;\n> -                       power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;\n> -                       resets = <&cpg 600>;\n> -               };\n> -\n>                 fdp1@fe940000 {\n>                         compatible = \"renesas,fdp1\";\n>                         reg = <0 0xfe940000 0 0x2400>;\n> @@ -1752,18 +1708,57 @@\n>                         renesas,fcp = <&fcpf1>;\n>                 };\n>\n> -               fdp1@fe948000 {\n> -                       compatible = \"renesas,fdp1\";\n> -                       reg = <0 0xfe948000 0 0x2400>;\n> -                       interrupts = <GIC_SPI 264 IRQ_TYPE_LEVEL_HIGH>;\n> -                       clocks = <&cpg CPG_MOD 117>;\n> -                       power-domains = <&sysc R8A7795_PD_A3VP>;\n> -                       resets = <&cpg 117>;\n> -                       renesas,fcp = <&fcpf2>;\n> +               hdmi0: hdmi0@fead0000 {\n> +                       compatible = \"renesas,r8a7795-hdmi\", \"renesas,rcar-gen3-hdmi\";\n> +                       reg = <0 0xfead0000 0 0x10000>;\n> +                       interrupts = <GIC_SPI 389 IRQ_TYPE_LEVEL_HIGH>;\n> +                       clocks = <&cpg CPG_MOD 729>, <&cpg CPG_CORE R8A7795_CLK_HDMI>;\n> +                       clock-names = \"iahb\", \"isfr\";\n> +                       power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;\n> +                       resets = <&cpg 729>;\n> +                       status = \"disabled\";\n> +\n> +                       ports {\n> +                               #address-cells = <1>;\n> +                               #size-cells = <0>;\n> +                               port@0 {\n> +                                       reg = <0>;\n> +                                       dw_hdmi0_in: endpoint {\n> +                                               remote-endpoint = <&du_out_hdmi0>;\n> +                                       };\n> +                               };\n> +                               port@1 {\n> +                                       reg = <1>;\n> +                               };\n> +                       };\n> +               };\n> +\n> +               hdmi1: hdmi1@feae0000 {\n> +                       compatible = \"renesas,r8a7795-hdmi\", \"renesas,rcar-gen3-hdmi\";\n> +                       reg = <0 0xfeae0000 0 0x10000>;\n> +                       interrupts = <GIC_SPI 436 IRQ_TYPE_LEVEL_HIGH>;\n> +                       clocks = <&cpg CPG_MOD 728>, <&cpg CPG_CORE R8A7795_CLK_HDMI>;\n> +                       clock-names = \"iahb\", \"isfr\";\n> +                       power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;\n> +                       resets = <&cpg 728>;\n> +                       status = \"disabled\";\n> +\n> +                       ports {\n> +                               #address-cells = <1>;\n> +                               #size-cells = <0>;\n> +                               port@0 {\n> +                                       reg = <0>;\n> +                                       dw_hdmi1_in: endpoint {\n> +                                               remote-endpoint = <&du_out_hdmi1>;\n> +                                       };\n> +                               };\n> +                               port@1 {\n> +                                       reg = <1>;\n> +                               };\n> +                       };\n>                 };\n>\n>                 du: display@feb00000 {\n> -                       compatible = \"renesas,du-r8a7795\";\n>                         reg = <0 0xfeb00000 0 0x80000>,\n>                               <0 0xfeb90000 0 0x14>;\n>                         reg-names = \"du\", \"lvds.0\";\n> @@ -1779,8 +1774,6 @@\n>                         clock-names = \"du.0\", \"du.1\", \"du.2\", \"du.3\", \"lvds.0\";\n>                         status = \"disabled\";\n>\n> -                       vsps = <&vspd0 &vspd1 &vspd2 &vspd3>;\n> -\n>                         ports {\n>                                 #address-cells = <1>;\n>                                 #size-cells = <0>;\n> @@ -1793,11 +1786,13 @@\n>                                 port@1 {\n>                                         reg = <1>;\n>                                         du_out_hdmi0: endpoint {\n> +                                               remote-endpoint = <&dw_hdmi0_in>;\n>                                         };\n>                                 };\n>                                 port@2 {\n>                                         reg = <2>;\n>                                         du_out_hdmi1: endpoint {\n> +                                               remote-endpoint = <&dw_hdmi1_in>;\n>                                         };\n>                                 };\n>                                 port@3 {\n> diff --git a/arch/arm/dts/r8a7796-m3ulcb.dts b/arch/arm/dts/r8a7796-m3ulcb.dts\n> index 372b2a9447..38b58b7fca 100644\n> --- a/arch/arm/dts/r8a7796-m3ulcb.dts\n> +++ b/arch/arm/dts/r8a7796-m3ulcb.dts\n> @@ -9,180 +9,24 @@\n>   * kind, whether express or implied.\n>   */\n>\n> +#define CPG_AUDIO_CLK_I                R8A7796_CLK_S0D4\n> +\n>  /dts-v1/;\n>  #include \"r8a7796.dtsi\"\n> -#include <dt-bindings/gpio/gpio.h>\n> -#include <dt-bindings/input/input.h>\n> +#include \"ulcb.dtsi\"\n>\n>  / {\n>         model = \"Renesas M3ULCB board based on r8a7796\";\n>         compatible = \"renesas,m3ulcb\", \"renesas,r8a7796\";\n>\n> -       aliases {\n> -               serial0 = &scif2;\n> -       };\n> -\n> -       chosen {\n> -               stdout-path = \"serial0:115200n8\";\n> -       };\n> -\n>         memory@48000000 {\n>                 device_type = \"memory\";\n>                 /* first 128MB is reserved for secure area. */\n>                 reg = <0x0 0x48000000 0x0 0x38000000>;\n>         };\n>\n> -       leds {\n> -               compatible = \"gpio-leds\";\n> -\n> -               led5 {\n> -                       gpios = <&gpio6 12 GPIO_ACTIVE_HIGH>;\n> -               };\n> -               led6 {\n> -                       gpios = <&gpio6 13 GPIO_ACTIVE_HIGH>;\n> -               };\n> -       };\n> -\n> -       keyboard {\n> -               compatible = \"gpio-keys\";\n> -\n> -               key-1 {\n> -                       linux,code = <KEY_1>;\n> -                       label = \"SW3\";\n> -                       wakeup-source;\n> -                       debounce-interval = <20>;\n> -                       gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;\n> -               };\n> -       };\n> -\n> -       reg_1p8v: regulator0 {\n> -               compatible = \"regulator-fixed\";\n> -               regulator-name = \"fixed-1.8V\";\n> -               regulator-min-microvolt = <1800000>;\n> -               regulator-max-microvolt = <1800000>;\n> -               regulator-boot-on;\n> -               regulator-always-on;\n> -       };\n> -\n> -       reg_3p3v: regulator1 {\n> -               compatible = \"regulator-fixed\";\n> -               regulator-name = \"fixed-3.3V\";\n> -               regulator-min-microvolt = <3300000>;\n> -               regulator-max-microvolt = <3300000>;\n> -               regulator-boot-on;\n> -               regulator-always-on;\n> -       };\n> -\n> -       vcc_sdhi0: regulator-vcc-sdhi0 {\n> -               compatible = \"regulator-fixed\";\n> -\n> -               regulator-name = \"SDHI0 Vcc\";\n> -               regulator-min-microvolt = <3300000>;\n> -               regulator-max-microvolt = <3300000>;\n> -\n> -               gpio = <&gpio5 2 GPIO_ACTIVE_HIGH>;\n> -               enable-active-high;\n> -       };\n> -\n> -       vccq_sdhi0: regulator-vccq-sdhi0 {\n> -               compatible = \"regulator-gpio\";\n> -\n> -               regulator-name = \"SDHI0 VccQ\";\n> -               regulator-min-microvolt = <1800000>;\n> -               regulator-max-microvolt = <3300000>;\n> -\n> -               gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;\n> -               gpios-states = <1>;\n> -               states = <3300000 1\n> -                         1800000 0>;\n> -       };\n> -};\n> -\n> -&extal_clk {\n> -       clock-frequency = <16666666>;\n> -};\n> -\n> -&extalr_clk {\n> -       clock-frequency = <32768>;\n> -};\n> -\n> -&pfc {\n> -       pinctrl-0 = <&scif_clk_pins>;\n> -       pinctrl-names = \"default\";\n> -\n> -       scif2_pins: scif2 {\n> -               groups = \"scif2_data_a\";\n> -               function = \"scif2\";\n> -       };\n> -\n> -       scif_clk_pins: scif_clk {\n> -               groups = \"scif_clk_a\";\n> -               function = \"scif_clk\";\n> -       };\n> -\n> -       sdhi0_pins: sd0 {\n> -               groups = \"sdhi0_data4\", \"sdhi0_ctrl\";\n> -               function = \"sdhi0\";\n> -               power-source = <3300>;\n> -       };\n> -\n> -       sdhi0_pins_uhs: sd0_uhs {\n> -               groups = \"sdhi0_data4\", \"sdhi0_ctrl\";\n> -               function = \"sdhi0\";\n> -               power-source = <1800>;\n> -       };\n> -\n> -       sdhi2_pins: sd2 {\n> -               groups = \"sdhi2_data8\", \"sdhi2_ctrl\";\n> -               function = \"sdhi2\";\n> -               power-source = <3300>;\n> -       };\n> -\n> -       sdhi2_pins_uhs: sd2_uhs {\n> -               groups = \"sdhi2_data8\", \"sdhi2_ctrl\";\n> -               function = \"sdhi2\";\n> -               power-source = <1800>;\n> +       memory@600000000 {\n> +               device_type = \"memory\";\n> +               reg = <0x6 0x00000000 0x0 0x40000000>;\n>         };\n>  };\n> -\n> -&sdhi0 {\n> -       pinctrl-0 = <&sdhi0_pins>;\n> -       pinctrl-1 = <&sdhi0_pins_uhs>;\n> -       pinctrl-names = \"default\", \"state_uhs\";\n> -\n> -       vmmc-supply = <&vcc_sdhi0>;\n> -       vqmmc-supply = <&vccq_sdhi0>;\n> -       cd-gpios = <&gpio3 12 GPIO_ACTIVE_LOW>;\n> -       bus-width = <4>;\n> -       sd-uhs-sdr50;\n> -       status = \"okay\";\n> -};\n> -\n> -&sdhi2 {\n> -       /* used for on-board 8bit eMMC */\n> -       pinctrl-0 = <&sdhi2_pins>;\n> -       pinctrl-1 = <&sdhi2_pins_uhs>;\n> -       pinctrl-names = \"default\", \"state_uhs\";\n> -\n> -       vmmc-supply = <&reg_3p3v>;\n> -       vqmmc-supply = <&reg_1p8v>;\n> -       bus-width = <8>;\n> -       non-removable;\n> -       status = \"okay\";\n> -};\n> -\n> -&scif2 {\n> -       pinctrl-0 = <&scif2_pins>;\n> -       pinctrl-names = \"default\";\n> -\n> -       status = \"okay\";\n> -};\n> -\n> -&scif_clk {\n> -       clock-frequency = <14745600>;\n> -};\n> -\n> -&wdt0 {\n> -       timeout-sec = <60>;\n> -       status = \"okay\";\n> -};\n> diff --git a/arch/arm/dts/r8a7796-salvator-x.dts b/arch/arm/dts/r8a7796-salvator-x.dts\n> index c9f59b6ce3..db4f162d6b 100644\n> --- a/arch/arm/dts/r8a7796-salvator-x.dts\n> +++ b/arch/arm/dts/r8a7796-salvator-x.dts\n> @@ -8,25 +8,16 @@\n>   * kind, whether express or implied.\n>   */\n>\n> +#define CPG_AUDIO_CLK_I                R8A7796_CLK_S0D4\n> +\n>  /dts-v1/;\n>  #include \"r8a7796.dtsi\"\n> -#include <dt-bindings/gpio/gpio.h>\n> +#include \"salvator-x.dtsi\"\n>\n>  / {\n>         model = \"Renesas Salvator-X board based on r8a7796\";\n>         compatible = \"renesas,salvator-x\", \"renesas,r8a7796\";\n>\n> -       aliases {\n> -               serial0 = &scif2;\n> -               serial1 = &scif1;\n> -               ethernet0 = &avb;\n> -       };\n> -\n> -       chosen {\n> -               bootargs = \"ignore_loglevel\";\n> -               stdout-path = \"serial0:115200n8\";\n> -       };\n> -\n>         memory@48000000 {\n>                 device_type = \"memory\";\n>                 /* first 128MB is reserved for secure area. */\n> @@ -37,233 +28,4 @@\n>                 device_type = \"memory\";\n>                 reg = <0x6 0x00000000 0x0 0x80000000>;\n>         };\n> -\n> -       reg_1p8v: regulator0 {\n> -               compatible = \"regulator-fixed\";\n> -               regulator-name = \"fixed-1.8V\";\n> -               regulator-min-microvolt = <1800000>;\n> -               regulator-max-microvolt = <1800000>;\n> -               regulator-boot-on;\n> -               regulator-always-on;\n> -       };\n> -\n> -       reg_3p3v: regulator1 {\n> -               compatible = \"regulator-fixed\";\n> -               regulator-name = \"fixed-3.3V\";\n> -               regulator-min-microvolt = <3300000>;\n> -               regulator-max-microvolt = <3300000>;\n> -               regulator-boot-on;\n> -               regulator-always-on;\n> -       };\n> -\n> -       vcc_sdhi0: regulator-vcc-sdhi0 {\n> -               compatible = \"regulator-fixed\";\n> -\n> -               regulator-name = \"SDHI0 Vcc\";\n> -               regulator-min-microvolt = <3300000>;\n> -               regulator-max-microvolt = <3300000>;\n> -\n> -               gpio = <&gpio5 2 GPIO_ACTIVE_HIGH>;\n> -               enable-active-high;\n> -       };\n> -\n> -       vccq_sdhi0: regulator-vccq-sdhi0 {\n> -               compatible = \"regulator-gpio\";\n> -\n> -               regulator-name = \"SDHI0 VccQ\";\n> -               regulator-min-microvolt = <1800000>;\n> -               regulator-max-microvolt = <3300000>;\n> -\n> -               gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;\n> -               gpios-states = <1>;\n> -               states = <3300000 1\n> -                         1800000 0>;\n> -       };\n> -\n> -       vcc_sdhi3: regulator-vcc-sdhi3 {\n> -               compatible = \"regulator-fixed\";\n> -\n> -               regulator-name = \"SDHI3 Vcc\";\n> -               regulator-min-microvolt = <3300000>;\n> -               regulator-max-microvolt = <3300000>;\n> -\n> -               gpio = <&gpio3 15 GPIO_ACTIVE_HIGH>;\n> -               enable-active-high;\n> -       };\n> -\n> -       vccq_sdhi3: regulator-vccq-sdhi3 {\n> -               compatible = \"regulator-gpio\";\n> -\n> -               regulator-name = \"SDHI3 VccQ\";\n> -               regulator-min-microvolt = <1800000>;\n> -               regulator-max-microvolt = <3300000>;\n> -\n> -               gpios = <&gpio3 14 GPIO_ACTIVE_HIGH>;\n> -               gpios-states = <1>;\n> -               states = <3300000 1\n> -                         1800000 0>;\n> -       };\n> -};\n> -\n> -&pfc {\n> -       pinctrl-0 = <&scif_clk_pins>;\n> -       pinctrl-names = \"default\";\n> -\n> -       avb_pins: avb {\n> -               groups = \"avb_mdc\";\n> -               function = \"avb\";\n> -       };\n> -\n> -       scif1_pins: scif1 {\n> -               groups = \"scif1_data_a\", \"scif1_ctrl\";\n> -               function = \"scif1\";\n> -       };\n> -\n> -       scif2_pins: scif2 {\n> -               groups = \"scif2_data_a\";\n> -               function = \"scif2\";\n> -       };\n> -       scif_clk_pins: scif_clk {\n> -               groups = \"scif_clk_a\";\n> -               function = \"scif_clk\";\n> -       };\n> -\n> -       i2c2_pins: i2c2 {\n> -               groups = \"i2c2_a\";\n> -               function = \"i2c2\";\n> -       };\n> -\n> -       sdhi0_pins: sd0 {\n> -               groups = \"sdhi0_data4\", \"sdhi0_ctrl\";\n> -               function = \"sdhi0\";\n> -               power-source = <3300>;\n> -       };\n> -\n> -       sdhi0_pins_uhs: sd0_uhs {\n> -               groups = \"sdhi0_data4\", \"sdhi0_ctrl\";\n> -               function = \"sdhi0\";\n> -               power-source = <1800>;\n> -       };\n> -\n> -       sdhi2_pins: sd2 {\n> -               groups = \"sdhi2_data8\", \"sdhi2_ctrl\";\n> -               function = \"sdhi2\";\n> -               power-source = <3300>;\n> -       };\n> -\n> -       sdhi2_pins_uhs: sd2_uhs {\n> -               groups = \"sdhi2_data8\", \"sdhi2_ctrl\";\n> -               function = \"sdhi2\";\n> -               power-source = <1800>;\n> -       };\n> -\n> -       sdhi3_pins: sd3 {\n> -               groups = \"sdhi3_data4\", \"sdhi3_ctrl\";\n> -               function = \"sdhi3\";\n> -               power-source = <3300>;\n> -       };\n> -\n> -       sdhi3_pins_uhs: sd3_uhs {\n> -               groups = \"sdhi3_data4\", \"sdhi3_ctrl\";\n> -               function = \"sdhi3\";\n> -               power-source = <1800>;\n> -       };\n> -};\n> -\n> -&avb {\n> -       pinctrl-0 = <&avb_pins>;\n> -       pinctrl-names = \"default\";\n> -       renesas,no-ether-link;\n> -       phy-handle = <&phy0>;\n> -       status = \"okay\";\n> -\n> -       phy0: ethernet-phy@0 {\n> -               rxc-skew-ps = <1500>;\n> -               reg = <0>;\n> -               interrupt-parent = <&gpio2>;\n> -               interrupts = <11 IRQ_TYPE_LEVEL_LOW>;\n> -       };\n> -};\n> -\n> -&extal_clk {\n> -       clock-frequency = <16666666>;\n> -};\n> -\n> -&extalr_clk {\n> -       clock-frequency = <32768>;\n> -};\n> -\n> -&sdhi0 {\n> -       pinctrl-0 = <&sdhi0_pins>;\n> -       pinctrl-1 = <&sdhi0_pins_uhs>;\n> -       pinctrl-names = \"default\", \"state_uhs\";\n> -\n> -       vmmc-supply = <&vcc_sdhi0>;\n> -       vqmmc-supply = <&vccq_sdhi0>;\n> -       cd-gpios = <&gpio3 12 GPIO_ACTIVE_LOW>;\n> -       wp-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>;\n> -       bus-width = <4>;\n> -       sd-uhs-sdr50;\n> -       status = \"okay\";\n> -};\n> -\n> -&sdhi2 {\n> -       /* used for on-board 8bit eMMC */\n> -       pinctrl-0 = <&sdhi2_pins>;\n> -       pinctrl-1 = <&sdhi2_pins_uhs>;\n> -       pinctrl-names = \"default\", \"state_uhs\";\n> -\n> -       vmmc-supply = <&reg_3p3v>;\n> -       vqmmc-supply = <&reg_1p8v>;\n> -       bus-width = <8>;\n> -       non-removable;\n> -       status = \"okay\";\n> -};\n> -\n> -&sdhi3 {\n> -       pinctrl-0 = <&sdhi3_pins>;\n> -       pinctrl-1 = <&sdhi3_pins_uhs>;\n> -       pinctrl-names = \"default\", \"state_uhs\";\n> -\n> -       vmmc-supply = <&vcc_sdhi3>;\n> -       vqmmc-supply = <&vccq_sdhi3>;\n> -       cd-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;\n> -       wp-gpios = <&gpio4 16 GPIO_ACTIVE_HIGH>;\n> -       bus-width = <4>;\n> -       sd-uhs-sdr50;\n> -       status = \"okay\";\n> -};\n> -\n> -&scif1 {\n> -       pinctrl-0 = <&scif1_pins>;\n> -       pinctrl-names = \"default\";\n> -\n> -       uart-has-rtscts;\n> -       status = \"okay\";\n> -};\n> -\n> -&scif2 {\n> -       pinctrl-0 = <&scif2_pins>;\n> -       pinctrl-names = \"default\";\n> -       status = \"okay\";\n> -};\n> -\n> -&scif_clk {\n> -       clock-frequency = <14745600>;\n> -};\n> -\n> -&i2c2 {\n> -       pinctrl-0 = <&i2c2_pins>;\n> -       pinctrl-names = \"default\";\n> -\n> -       status = \"okay\";\n> -};\n> -\n> -&wdt0 {\n> -       timeout-sec = <60>;\n> -       status = \"okay\";\n> -};\n> -\n> -&i2c_dvfs {\n> -       status = \"okay\";\n>  };\n> diff --git a/arch/arm/dts/r8a7796.dtsi b/arch/arm/dts/r8a7796.dtsi\n> index 298df5db9f..c0cb4a952f 100644\n> --- a/arch/arm/dts/r8a7796.dtsi\n> +++ b/arch/arm/dts/r8a7796.dtsi\n> @@ -122,6 +122,29 @@\n>                 u-boot,dm-pre-reloc;\n>         };\n>\n> +       /*\n> +        * The external audio clocks are configured as 0 Hz fixed frequency\n> +        * clocks by default.\n> +        * Boards that provide audio clocks should override them.\n> +        */\n> +       audio_clk_a: audio_clk_a {\n> +               compatible = \"fixed-clock\";\n> +               #clock-cells = <0>;\n> +               clock-frequency = <0>;\n> +       };\n> +\n> +       audio_clk_b: audio_clk_b {\n> +               compatible = \"fixed-clock\";\n> +               #clock-cells = <0>;\n> +               clock-frequency = <0>;\n> +       };\n> +\n> +       audio_clk_c: audio_clk_c {\n> +               compatible = \"fixed-clock\";\n> +               #clock-cells = <0>;\n> +               clock-frequency = <0>;\n> +       };\n> +\n>         /* External CAN clock - to be overridden by boards that provide it */\n>         can_clk: can {\n>                 compatible = \"fixed-clock\";\n> @@ -136,6 +159,13 @@\n>                 clock-frequency = <0>;\n>         };\n>\n> +       /* External PCIe clock - can be overridden by the board */\n> +       pcie_bus_clk: pcie_bus {\n> +               compatible = \"fixed-clock\";\n> +               #clock-cells = <0>;\n> +               clock-frequency = <0>;\n> +       };\n> +\n>         soc {\n>                 compatible = \"simple-bus\";\n>                 interrupt-parent = <&gic>;\n> @@ -366,6 +396,78 @@\n>                         clocks = <&cpg CPG_MOD 926>;\n>                         power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;\n>                         resets = <&cpg 926>;\n> +                       dmas = <&dmac0 0x11>, <&dmac0 0x10>;\n> +                       dma-names = \"tx\", \"rx\";\n> +                       status = \"disabled\";\n> +               };\n> +\n> +               pwm0: pwm@e6e30000 {\n> +                       compatible = \"renesas,pwm-r8a7796\", \"renesas,pwm-rcar\";\n> +                       reg = <0 0xe6e30000 0 8>;\n> +                       #pwm-cells = <2>;\n> +                       clocks = <&cpg CPG_MOD 523>;\n> +                       resets = <&cpg 523>;\n> +                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;\n> +                       status = \"disabled\";\n> +               };\n> +\n> +               pwm1: pwm@e6e31000 {\n> +                       compatible = \"renesas,pwm-r8a7796\", \"renesas,pwm-rcar\";\n> +                       reg = <0 0xe6e31000 0 8>;\n> +                       #pwm-cells = <2>;\n> +                       clocks = <&cpg CPG_MOD 523>;\n> +                       resets = <&cpg 523>;\n> +                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;\n> +                       status = \"disabled\";\n> +               };\n> +\n> +               pwm2: pwm@e6e32000 {\n> +                       compatible = \"renesas,pwm-r8a7796\", \"renesas,pwm-rcar\";\n> +                       reg = <0 0xe6e32000 0 8>;\n> +                       #pwm-cells = <2>;\n> +                       clocks = <&cpg CPG_MOD 523>;\n> +                       resets = <&cpg 523>;\n> +                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;\n> +                       status = \"disabled\";\n> +               };\n> +\n> +               pwm3: pwm@e6e33000 {\n> +                       compatible = \"renesas,pwm-r8a7796\", \"renesas,pwm-rcar\";\n> +                       reg = <0 0xe6e33000 0 8>;\n> +                       #pwm-cells = <2>;\n> +                       clocks = <&cpg CPG_MOD 523>;\n> +                       resets = <&cpg 523>;\n> +                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;\n> +                       status = \"disabled\";\n> +               };\n> +\n> +               pwm4: pwm@e6e34000 {\n> +                       compatible = \"renesas,pwm-r8a7796\", \"renesas,pwm-rcar\";\n> +                       reg = <0 0xe6e34000 0 8>;\n> +                       #pwm-cells = <2>;\n> +                       clocks = <&cpg CPG_MOD 523>;\n> +                       resets = <&cpg 523>;\n> +                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;\n> +                       status = \"disabled\";\n> +               };\n> +\n> +               pwm5: pwm@e6e35000 {\n> +                       compatible = \"renesas,pwm-r8a7796\", \"renesas,pwm-rcar\";\n> +                       reg = <0 0xe6e35000 0 8>;\n> +                       #pwm-cells = <2>;\n> +                       clocks = <&cpg CPG_MOD 523>;\n> +                       resets = <&cpg 523>;\n> +                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;\n> +                       status = \"disabled\";\n> +               };\n> +\n> +               pwm6: pwm@e6e36000 {\n> +                       compatible = \"renesas,pwm-r8a7796\", \"renesas,pwm-rcar\";\n> +                       reg = <0 0xe6e36000 0 8>;\n> +                       #pwm-cells = <2>;\n> +                       clocks = <&cpg CPG_MOD 523>;\n> +                       resets = <&cpg 523>;\n> +                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;\n>                         status = \"disabled\";\n>                 };\n>\n> @@ -935,6 +1037,106 @@\n>                         dma-channels = <16>;\n>                 };\n>\n> +               audma0: dma-controller@ec700000 {\n> +                       compatible = \"renesas,dmac-r8a7796\",\n> +                                    \"renesas,rcar-dmac\";\n> +                       reg = <0 0xec700000 0 0x10000>;\n> +                       interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>;\n> +                       interrupt-names = \"error\",\n> +                                       \"ch0\", \"ch1\", \"ch2\", \"ch3\",\n> +                                       \"ch4\", \"ch5\", \"ch6\", \"ch7\",\n> +                                       \"ch8\", \"ch9\", \"ch10\", \"ch11\",\n> +                                       \"ch12\", \"ch13\", \"ch14\", \"ch15\";\n> +                       clocks = <&cpg CPG_MOD 502>;\n> +                       clock-names = \"fck\";\n> +                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;\n> +                       resets = <&cpg 502>;\n> +                       #dma-cells = <1>;\n> +                       dma-channels = <16>;\n> +               };\n> +\n> +               audma1: dma-controller@ec720000 {\n> +                       compatible = \"renesas,dmac-r8a7796\",\n> +                                    \"renesas,rcar-dmac\";\n> +                       reg = <0 0xec720000 0 0x10000>;\n> +                       interrupts = <GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 348 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH\n> +                                     GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH>;\n> +                       interrupt-names = \"error\",\n> +                                       \"ch0\", \"ch1\", \"ch2\", \"ch3\",\n> +                                       \"ch4\", \"ch5\", \"ch6\", \"ch7\",\n> +                                       \"ch8\", \"ch9\", \"ch10\", \"ch11\",\n> +                                       \"ch12\", \"ch13\", \"ch14\", \"ch15\";\n> +                       clocks = <&cpg CPG_MOD 501>;\n> +                       clock-names = \"fck\";\n> +                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;\n> +                       resets = <&cpg 501>;\n> +                       #dma-cells = <1>;\n> +                       dma-channels = <16>;\n> +               };\n> +\n> +               hsusb: usb@e6590000 {\n> +                       /* placeholder */\n> +               };\n> +\n> +               xhci0: usb@ee000000 {\n> +                       /* placeholder */\n> +               };\n> +\n> +               ohci0: usb@ee080000 {\n> +                       /* placeholder */\n> +               };\n> +\n> +               ehci0: usb@ee080100 {\n> +                       /* placeholder */\n> +               };\n> +\n> +               usb2_phy0: usb-phy@ee080200 {\n> +                       /* placeholder */\n> +               };\n> +\n> +               ohci1: usb@ee0a0000 {\n> +                       /* placeholder */\n> +               };\n> +\n> +               ehci1: usb@ee0a0100 {\n> +                       /* placeholder */\n> +               };\n> +\n> +               usb2_phy1: usb-phy@ee0a0200 {\n> +                       /* placeholder */\n> +               };\n> +\n>                 sdhi0: sd@ee100000 {\n>                         compatible = \"renesas,sdhi-r8a7796\";\n>                         reg = <0 0xee100000 0 0x2000>;\n> @@ -1037,5 +1239,224 @@\n>                                 };\n>                         };\n>                 };\n> +\n> +               rcar_sound: sound@ec500000 {\n> +                       /*\n> +                        * #sound-dai-cells is required\n> +                        *\n> +                        * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>;\n> +                        * Multi  DAI : #sound-dai-cells = <1>; <&rcar_sound N>;\n> +                        */\n> +                       /*\n> +                        * #clock-cells is required for audio_clkout0/1/2/3\n> +                        *\n> +                        * clkout       : #clock-cells = <0>;   <&rcar_sound>;\n> +                        * clkout0/1/2/3: #clock-cells = <1>;   <&rcar_sound N>;\n> +                        */\n> +                       compatible =  \"renesas,rcar_sound-r8a7796\", \"renesas,rcar_sound-gen3\";\n> +                       reg =   <0 0xec500000 0 0x1000>, /* SCU */\n> +                               <0 0xec5a0000 0 0x100>,  /* ADG */\n> +                               <0 0xec540000 0 0x1000>, /* SSIU */\n> +                               <0 0xec541000 0 0x280>,  /* SSI */\n> +                               <0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/\n> +                       reg-names = \"scu\", \"adg\", \"ssiu\", \"ssi\", \"audmapp\";\n> +\n> +                       clocks = <&cpg CPG_MOD 1005>,\n> +                                <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,\n> +                                <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,\n> +                                <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,\n> +                                <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,\n> +                                <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,\n> +                                <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>,\n> +                                <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>,\n> +                                <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>,\n> +                                <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>,\n> +                                <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>,\n> +                                <&cpg CPG_MOD 1020>, <&cpg CPG_MOD 1021>,\n> +                                <&cpg CPG_MOD 1020>, <&cpg CPG_MOD 1021>,\n> +                                <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,\n> +                                <&audio_clk_a>, <&audio_clk_b>,\n> +                                <&audio_clk_c>,\n> +                                <&cpg CPG_CORE R8A7796_CLK_S0D4>;\n> +                       clock-names = \"ssi-all\",\n> +                                     \"ssi.9\", \"ssi.8\", \"ssi.7\", \"ssi.6\",\n> +                                     \"ssi.5\", \"ssi.4\", \"ssi.3\", \"ssi.2\",\n> +                                     \"ssi.1\", \"ssi.0\",\n> +                                     \"src.9\", \"src.8\", \"src.7\", \"src.6\",\n> +                                     \"src.5\", \"src.4\", \"src.3\", \"src.2\",\n> +                                     \"src.1\", \"src.0\",\n> +                                     \"mix.1\", \"mix.0\",\n> +                                     \"ctu.1\", \"ctu.0\",\n> +                                     \"dvc.0\", \"dvc.1\",\n> +                                     \"clk_a\", \"clk_b\", \"clk_c\", \"clk_i\";\n> +                       power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;\n> +                       resets = <&cpg 1005>,\n> +                                <&cpg 1006>, <&cpg 1007>,\n> +                                <&cpg 1008>, <&cpg 1009>,\n> +                                <&cpg 1010>, <&cpg 1011>,\n> +                                <&cpg 1012>, <&cpg 1013>,\n> +                                <&cpg 1014>, <&cpg 1015>;\n> +                       reset-names = \"ssi-all\",\n> +                                     \"ssi.9\", \"ssi.8\", \"ssi.7\", \"ssi.6\",\n> +                                     \"ssi.5\", \"ssi.4\", \"ssi.3\", \"ssi.2\",\n> +                                     \"ssi.1\", \"ssi.0\";\n> +                       status = \"disabled\";\n> +\n> +                       rcar_sound,dvc {\n> +                               dvc0: dvc-0 {\n> +                                       dmas = <&audma1 0xbc>;\n> +                                       dma-names = \"tx\";\n> +                               };\n> +                               dvc1: dvc-1 {\n> +                                       dmas = <&audma1 0xbe>;\n> +                                       dma-names = \"tx\";\n> +                               };\n> +                       };\n> +\n> +                       rcar_sound,mix {\n> +                               mix0: mix-0 { };\n> +                               mix1: mix-1 { };\n> +                       };\n> +\n> +                       rcar_sound,ctu {\n> +                               ctu00: ctu-0 { };\n> +                               ctu01: ctu-1 { };\n> +                               ctu02: ctu-2 { };\n> +                               ctu03: ctu-3 { };\n> +                               ctu10: ctu-4 { };\n> +                               ctu11: ctu-5 { };\n> +                               ctu12: ctu-6 { };\n> +                               ctu13: ctu-7 { };\n> +                       };\n> +\n> +                       rcar_sound,src {\n> +                               src0: src-0 {\n> +                                       interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;\n> +                                       dmas = <&audma0 0x85>, <&audma1 0x9a>;\n> +                                       dma-names = \"rx\", \"tx\";\n> +                               };\n> +                               src1: src-1 {\n> +                                       interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;\n> +                                       dmas = <&audma0 0x87>, <&audma1 0x9c>;\n> +                                       dma-names = \"rx\", \"tx\";\n> +                               };\n> +                               src2: src-2 {\n> +                                       interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;\n> +                                       dmas = <&audma0 0x89>, <&audma1 0x9e>;\n> +                                       dma-names = \"rx\", \"tx\";\n> +                               };\n> +                               src3: src-3 {\n> +                                       interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;\n> +                                       dmas = <&audma0 0x8b>, <&audma1 0xa0>;\n> +                                       dma-names = \"rx\", \"tx\";\n> +                               };\n> +                               src4: src-4 {\n> +                                       interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;\n> +                                       dmas = <&audma0 0x8d>, <&audma1 0xb0>;\n> +                                       dma-names = \"rx\", \"tx\";\n> +                               };\n> +                               src5: src-5 {\n> +                                       interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;\n> +                                       dmas = <&audma0 0x8f>, <&audma1 0xb2>;\n> +                                       dma-names = \"rx\", \"tx\";\n> +                               };\n> +                               src6: src-6 {\n> +                                       interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;\n> +                                       dmas = <&audma0 0x91>, <&audma1 0xb4>;\n> +                                       dma-names = \"rx\", \"tx\";\n> +                               };\n> +                               src7: src-7 {\n> +                                       interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>;\n> +                                       dmas = <&audma0 0x93>, <&audma1 0xb6>;\n> +                                       dma-names = \"rx\", \"tx\";\n> +                               };\n> +                               src8: src-8 {\n> +                                       interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>;\n> +                                       dmas = <&audma0 0x95>, <&audma1 0xb8>;\n> +                                       dma-names = \"rx\", \"tx\";\n> +                               };\n> +                               src9: src-9 {\n> +                                       interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>;\n> +                                       dmas = <&audma0 0x97>, <&audma1 0xba>;\n> +                                       dma-names = \"rx\", \"tx\";\n> +                               };\n> +                       };\n> +\n> +                       rcar_sound,ssi {\n> +                               ssi0: ssi-0 {\n> +                                       interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;\n> +                                       dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;\n> +                                       dma-names = \"rx\", \"tx\", \"rxu\", \"txu\";\n> +                               };\n> +                               ssi1: ssi-1 {\n> +                                       interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;\n> +                                       dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;\n> +                                       dma-names = \"rx\", \"tx\", \"rxu\", \"txu\";\n> +                               };\n> +                               ssi2: ssi-2 {\n> +                                       interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;\n> +                                       dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;\n> +                                       dma-names = \"rx\", \"tx\", \"rxu\", \"txu\";\n> +                               };\n> +                               ssi3: ssi-3 {\n> +                                       interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;\n> +                                       dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;\n> +                                       dma-names = \"rx\", \"tx\", \"rxu\", \"txu\";\n> +                               };\n> +                               ssi4: ssi-4 {\n> +                                       interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;\n> +                                       dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;\n> +                                       dma-names = \"rx\", \"tx\", \"rxu\", \"txu\";\n> +                               };\n> +                               ssi5: ssi-5 {\n> +                                       interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;\n> +                                       dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;\n> +                                       dma-names = \"rx\", \"tx\", \"rxu\", \"txu\";\n> +                               };\n> +                               ssi6: ssi-6 {\n> +                                       interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;\n> +                                       dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;\n> +                                       dma-names = \"rx\", \"tx\", \"rxu\", \"txu\";\n> +                               };\n> +                               ssi7: ssi-7 {\n> +                                       interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;\n> +                                       dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;\n> +                                       dma-names = \"rx\", \"tx\", \"rxu\", \"txu\";\n> +                               };\n> +                               ssi8: ssi-8 {\n> +                                       interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;\n> +                                       dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;\n> +                                       dma-names = \"rx\", \"tx\", \"rxu\", \"txu\";\n> +                               };\n> +                               ssi9: ssi-9 {\n> +                                       interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;\n> +                                       dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;\n> +                                       dma-names = \"rx\", \"tx\", \"rxu\", \"txu\";\n> +                               };\n> +                       };\n> +               };\n> +\n> +               pciec0: pcie@fe000000 {\n> +                       /* placeholder */\n> +               };\n> +\n> +               pciec1: pcie@ee800000 {\n> +                       /* placeholder */\n> +               };\n> +\n> +               du: display@feb00000 {\n> +                       /* placeholder */\n> +\n> +                       ports {\n> +                               #address-cells = <1>;\n> +                               #size-cells = <0>;\n> +\n> +                               port@0 {\n> +                                       reg = <0>;\n> +                                       du_out_rgb: endpoint {\n> +                                       };\n> +                               };\n> +                       };\n> +               };\n>         };\n>  };\n> diff --git a/arch/arm/dts/salvator-common.dtsi b/arch/arm/dts/salvator-common.dtsi\n> new file mode 100644\n> index 0000000000..f903957da5\n> --- /dev/null\n> +++ b/arch/arm/dts/salvator-common.dtsi\n> @@ -0,0 +1,629 @@\n> +/*\n> + * Device Tree Source for common parts of Salvator-X board variants\n> + *\n> + * Copyright (C) 2015-2016 Renesas Electronics Corp.\n> + *\n> + * This file is licensed under the terms of the GNU General Public License\n> + * version 2.  This program is licensed \"as is\" without any warranty of any\n> + * kind, whether express or implied.\n> + */\n> +\n> +/*\n> + * SSI-AK4613\n> + *\n> + * This command is required when Playback/Capture\n> + *\n> + *     amixer set \"DVC Out\" 100%\n> + *     amixer set \"DVC In\" 100%\n> + *\n> + * You can use Mute\n> + *\n> + *     amixer set \"DVC Out Mute\" on\n> + *     amixer set \"DVC In Mute\" on\n> + *\n> + * You can use Volume Ramp\n> + *\n> + *     amixer set \"DVC Out Ramp Up Rate\"   \"0.125 dB/64 steps\"\n> + *     amixer set \"DVC Out Ramp Down Rate\" \"0.125 dB/512 steps\"\n> + *     amixer set \"DVC Out Ramp\" on\n> + *     aplay xxx.wav &\n> + *     amixer set \"DVC Out\"  80%  // Volume Down\n> + *     amixer set \"DVC Out\" 100%  // Volume Up\n> + */\n> +\n> +#include <dt-bindings/gpio/gpio.h>\n> +\n> +/ {\n> +       aliases {\n> +               serial0 = &scif2;\n> +               serial1 = &scif1;\n> +               ethernet0 = &avb;\n> +       };\n> +\n> +       chosen {\n> +               bootargs = \"ignore_loglevel rw root=/dev/nfs ip=dhcp\";\n> +               stdout-path = \"serial0:115200n8\";\n> +       };\n> +\n> +       audio_clkout: audio-clkout {\n> +               /*\n> +                * This is same as <&rcar_sound 0>\n> +                * but needed to avoid cs2000/rcar_sound probe dead-lock\n> +                */\n> +               compatible = \"fixed-clock\";\n> +               #clock-cells = <0>;\n> +               clock-frequency = <11289600>;\n> +       };\n> +\n> +       backlight: backlight {\n> +               compatible = \"pwm-backlight\";\n> +               pwms = <&pwm1 0 50000>;\n> +\n> +               brightness-levels = <256 128 64 16 8 4 0>;\n> +               default-brightness-level = <6>;\n> +\n> +               enable-gpios = <&gpio6 7 GPIO_ACTIVE_HIGH>;\n> +       };\n> +\n> +       reg_1p8v: regulator0 {\n> +               compatible = \"regulator-fixed\";\n> +               regulator-name = \"fixed-1.8V\";\n> +               regulator-min-microvolt = <1800000>;\n> +               regulator-max-microvolt = <1800000>;\n> +               regulator-boot-on;\n> +               regulator-always-on;\n> +       };\n> +\n> +       reg_3p3v: regulator1 {\n> +               compatible = \"regulator-fixed\";\n> +               regulator-name = \"fixed-3.3V\";\n> +               regulator-min-microvolt = <3300000>;\n> +               regulator-max-microvolt = <3300000>;\n> +               regulator-boot-on;\n> +               regulator-always-on;\n> +       };\n> +\n> +       rsnd_ak4613: sound {\n> +               compatible = \"simple-audio-card\";\n> +\n> +               simple-audio-card,format = \"left_j\";\n> +               simple-audio-card,bitclock-master = <&sndcpu>;\n> +               simple-audio-card,frame-master = <&sndcpu>;\n> +\n> +               sndcpu: simple-audio-card,cpu {\n> +                       sound-dai = <&rcar_sound>;\n> +               };\n> +\n> +               sndcodec: simple-audio-card,codec {\n> +                       sound-dai = <&ak4613>;\n> +               };\n> +       };\n> +\n> +       vbus0_usb2: regulator-vbus0-usb2 {\n> +               compatible = \"regulator-fixed\";\n> +\n> +               regulator-name = \"USB20_VBUS0\";\n> +               regulator-min-microvolt = <5000000>;\n> +               regulator-max-microvolt = <5000000>;\n> +\n> +               gpio = <&gpio6 16 GPIO_ACTIVE_HIGH>;\n> +               enable-active-high;\n> +       };\n> +\n> +       vcc_sdhi0: regulator-vcc-sdhi0 {\n> +               compatible = \"regulator-fixed\";\n> +\n> +               regulator-name = \"SDHI0 Vcc\";\n> +               regulator-min-microvolt = <3300000>;\n> +               regulator-max-microvolt = <3300000>;\n> +\n> +               gpio = <&gpio5 2 GPIO_ACTIVE_HIGH>;\n> +               enable-active-high;\n> +       };\n> +\n> +       vccq_sdhi0: regulator-vccq-sdhi0 {\n> +               compatible = \"regulator-gpio\";\n> +\n> +               regulator-name = \"SDHI0 VccQ\";\n> +               regulator-min-microvolt = <1800000>;\n> +               regulator-max-microvolt = <3300000>;\n> +\n> +               gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;\n> +               gpios-states = <1>;\n> +               states = <3300000 1\n> +                         1800000 0>;\n> +       };\n> +\n> +       vcc_sdhi3: regulator-vcc-sdhi3 {\n> +               compatible = \"regulator-fixed\";\n> +\n> +               regulator-name = \"SDHI3 Vcc\";\n> +               regulator-min-microvolt = <3300000>;\n> +               regulator-max-microvolt = <3300000>;\n> +\n> +               gpio = <&gpio3 15 GPIO_ACTIVE_HIGH>;\n> +               enable-active-high;\n> +       };\n> +\n> +       vccq_sdhi3: regulator-vccq-sdhi3 {\n> +               compatible = \"regulator-gpio\";\n> +\n> +               regulator-name = \"SDHI3 VccQ\";\n> +               regulator-min-microvolt = <1800000>;\n> +               regulator-max-microvolt = <3300000>;\n> +\n> +               gpios = <&gpio3 14 GPIO_ACTIVE_HIGH>;\n> +               gpios-states = <1>;\n> +               states = <3300000 1\n> +                         1800000 0>;\n> +       };\n> +\n> +       hdmi0-out {\n> +               compatible = \"hdmi-connector\";\n> +               label = \"HDMI0 OUT\";\n> +               type = \"a\";\n> +\n> +               port {\n> +                       hdmi0_con: endpoint {\n> +                       };\n> +               };\n> +       };\n> +\n> +       hdmi1-out {\n> +               compatible = \"hdmi-connector\";\n> +               label = \"HDMI1 OUT\";\n> +               type = \"a\";\n> +\n> +               port {\n> +                       hdmi1_con: endpoint {\n> +                       };\n> +               };\n> +       };\n> +\n> +       vga {\n> +               compatible = \"vga-connector\";\n> +\n> +               port {\n> +                       vga_in: endpoint {\n> +                               remote-endpoint = <&adv7123_out>;\n> +                       };\n> +               };\n> +       };\n> +\n> +       vga-encoder {\n> +               compatible = \"adi,adv7123\";\n> +\n> +               ports {\n> +                       #address-cells = <1>;\n> +                       #size-cells = <0>;\n> +\n> +                       port@0 {\n> +                               reg = <0>;\n> +                               adv7123_in: endpoint {\n> +                                       remote-endpoint = <&du_out_rgb>;\n> +                               };\n> +                       };\n> +                       port@1 {\n> +                               reg = <1>;\n> +                               adv7123_out: endpoint {\n> +                                       remote-endpoint = <&vga_in>;\n> +                               };\n> +                       };\n> +               };\n> +       };\n> +\n> +       x12_clk: x12 {\n> +               compatible = \"fixed-clock\";\n> +               #clock-cells = <0>;\n> +               clock-frequency = <24576000>;\n> +       };\n> +\n> +       /* External DU dot clocks */\n> +       x21_clk: x21-clock {\n> +               compatible = \"fixed-clock\";\n> +               #clock-cells = <0>;\n> +               clock-frequency = <33000000>;\n> +       };\n> +\n> +       x22_clk: x22-clock {\n> +               compatible = \"fixed-clock\";\n> +               #clock-cells = <0>;\n> +               clock-frequency = <33000000>;\n> +       };\n> +\n> +       x23_clk: x23-clock {\n> +               compatible = \"fixed-clock\";\n> +               #clock-cells = <0>;\n> +               clock-frequency = <25000000>;\n> +       };\n> +};\n> +\n> +&audio_clk_a {\n> +       clock-frequency = <22579200>;\n> +};\n> +\n> +&avb {\n> +       pinctrl-0 = <&avb_pins>;\n> +       pinctrl-names = \"default\";\n> +       renesas,no-ether-link;\n> +       phy-handle = <&phy0>;\n> +       status = \"okay\";\n> +\n> +       phy0: ethernet-phy@0 {\n> +               rxc-skew-ps = <1500>;\n> +               reg = <0>;\n> +               interrupt-parent = <&gpio2>;\n> +               interrupts = <11 IRQ_TYPE_LEVEL_LOW>;\n> +       };\n> +};\n> +\n> +&du {\n> +       pinctrl-0 = <&du_pins>;\n> +       pinctrl-names = \"default\";\n> +       status = \"okay\";\n> +\n> +       ports {\n> +               port@0 {\n> +                       endpoint {\n> +                               remote-endpoint = <&adv7123_in>;\n> +                       };\n> +               };\n> +               port@3 {\n> +                       lvds_connector: endpoint {\n> +                       };\n> +               };\n> +       };\n> +};\n> +\n> +&ehci0 {\n> +       status = \"okay\";\n> +};\n> +\n> +&ehci1 {\n> +       status = \"okay\";\n> +};\n> +\n> +&extalr_clk {\n> +       clock-frequency = <32768>;\n> +};\n> +\n> +&hsusb {\n> +       status = \"okay\";\n> +};\n> +\n> +&i2c2 {\n> +       pinctrl-0 = <&i2c2_pins>;\n> +       pinctrl-names = \"default\";\n> +\n> +       status = \"okay\";\n> +\n> +       clock-frequency = <100000>;\n> +\n> +       ak4613: codec@10 {\n> +               compatible = \"asahi-kasei,ak4613\";\n> +               #sound-dai-cells = <0>;\n> +               reg = <0x10>;\n> +               clocks = <&rcar_sound 3>;\n> +\n> +               asahi-kasei,in1-single-end;\n> +               asahi-kasei,in2-single-end;\n> +               asahi-kasei,out1-single-end;\n> +               asahi-kasei,out2-single-end;\n> +               asahi-kasei,out3-single-end;\n> +               asahi-kasei,out4-single-end;\n> +               asahi-kasei,out5-single-end;\n> +               asahi-kasei,out6-single-end;\n> +       };\n> +\n> +       cs2000: clk_multiplier@4f {\n> +               #clock-cells = <0>;\n> +               compatible = \"cirrus,cs2000-cp\";\n> +               reg = <0x4f>;\n> +               clocks = <&audio_clkout>, <&x12_clk>;\n> +               clock-names = \"clk_in\", \"ref_clk\";\n> +\n> +               assigned-clocks = <&cs2000>;\n> +               assigned-clock-rates = <24576000>; /* 1/1 divide */\n> +       };\n> +};\n> +\n> +&i2c4 {\n> +       status = \"okay\";\n> +\n> +       csa_vdd: adc@7c {\n> +               compatible = \"maxim,max9611\";\n> +               reg = <0x7c>;\n> +\n> +               shunt-resistor-micro-ohms = <5000>;\n> +       };\n> +\n> +       csa_dvfs: adc@7f {\n> +               compatible = \"maxim,max9611\";\n> +               reg = <0x7f>;\n> +\n> +               shunt-resistor-micro-ohms = <5000>;\n> +       };\n> +};\n> +\n> +&i2c_dvfs {\n> +       status = \"okay\";\n> +};\n> +\n> +&ohci0 {\n> +       status = \"okay\";\n> +};\n> +\n> +&ohci1 {\n> +       status = \"okay\";\n> +};\n> +\n> +&pcie_bus_clk {\n> +       clock-frequency = <100000000>;\n> +};\n> +\n> +&pciec0 {\n> +       status = \"okay\";\n> +};\n> +\n> +&pciec1 {\n> +       status = \"okay\";\n> +};\n> +\n> +&pfc {\n> +       pinctrl-0 = <&scif_clk_pins>;\n> +       pinctrl-names = \"default\";\n> +\n> +       avb_pins: avb {\n> +               mux {\n> +                       groups = \"avb_link\", \"avb_phy_int\", \"avb_mdc\",\n> +                                \"avb_mii\";\n> +                       function = \"avb\";\n> +               };\n> +\n> +               pins_mdc {\n> +                       groups = \"avb_mdc\";\n> +                       drive-strength = <24>;\n> +               };\n> +\n> +               pins_mii_tx {\n> +                       pins = \"PIN_AVB_TX_CTL\", \"PIN_AVB_TXC\", \"PIN_AVB_TD0\",\n> +                              \"PIN_AVB_TD1\", \"PIN_AVB_TD2\", \"PIN_AVB_TD3\";\n> +                       drive-strength = <12>;\n> +               };\n> +       };\n> +\n> +       du_pins: du {\n> +               groups = \"du_rgb888\", \"du_sync\", \"du_oddf\", \"du_clk_out_0\";\n> +               function = \"du\";\n> +       };\n> +\n> +       i2c2_pins: i2c2 {\n> +               groups = \"i2c2_a\";\n> +               function = \"i2c2\";\n> +       };\n> +\n> +       pwm1_pins: pwm1 {\n> +               groups = \"pwm1_a\";\n> +               function = \"pwm1\";\n> +       };\n> +\n> +       scif1_pins: scif1 {\n> +               groups = \"scif1_data_a\", \"scif1_ctrl\";\n> +               function = \"scif1\";\n> +       };\n> +\n> +       scif2_pins: scif2 {\n> +               groups = \"scif2_data_a\";\n> +               function = \"scif2\";\n> +       };\n> +\n> +       scif_clk_pins: scif_clk {\n> +               groups = \"scif_clk_a\";\n> +               function = \"scif_clk\";\n> +       };\n> +\n> +       sdhi0_pins: sd0 {\n> +               groups = \"sdhi0_data4\", \"sdhi0_ctrl\";\n> +               function = \"sdhi0\";\n> +               power-source = <3300>;\n> +       };\n> +\n> +       sdhi0_pins_uhs: sd0_uhs {\n> +               groups = \"sdhi0_data4\", \"sdhi0_ctrl\";\n> +               function = \"sdhi0\";\n> +               power-source = <1800>;\n> +       };\n> +\n> +       sdhi2_pins: sd2 {\n> +               groups = \"sdhi2_data8\", \"sdhi2_ctrl\";\n> +               function = \"sdhi2\";\n> +               power-source = <3300>;\n> +       };\n> +\n> +       sdhi2_pins_uhs: sd2_uhs {\n> +               groups = \"sdhi2_data8\", \"sdhi2_ctrl\";\n> +               function = \"sdhi2\";\n> +               power-source = <1800>;\n> +       };\n> +\n> +       sdhi3_pins: sd3 {\n> +               groups = \"sdhi3_data4\", \"sdhi3_ctrl\";\n> +               function = \"sdhi3\";\n> +               power-source = <3300>;\n> +       };\n> +\n> +       sdhi3_pins_uhs: sd3_uhs {\n> +               groups = \"sdhi3_data4\", \"sdhi3_ctrl\";\n> +               function = \"sdhi3\";\n> +               power-source = <1800>;\n> +       };\n> +\n> +       sound_pins: sound {\n> +               groups = \"ssi01239_ctrl\", \"ssi0_data\", \"ssi1_data_a\";\n> +               function = \"ssi\";\n> +       };\n> +\n> +       sound_clk_pins: sound_clk {\n> +               groups = \"audio_clk_a_a\", \"audio_clk_b_a\", \"audio_clk_c_a\",\n> +                        \"audio_clkout_a\", \"audio_clkout3_a\";\n> +               function = \"audio_clk\";\n> +       };\n> +\n> +       usb0_pins: usb0 {\n> +               groups = \"usb0\";\n> +               function = \"usb0\";\n> +       };\n> +\n> +       usb1_pins: usb1 {\n> +               mux {\n> +                       groups = \"usb1\";\n> +                       function = \"usb1\";\n> +               };\n> +\n> +               ovc {\n> +                       pins = \"GP_6_27\";\n> +                       bias-pull-up;\n> +               };\n> +\n> +               pwen {\n> +                       pins = \"GP_6_26\";\n> +                       bias-pull-down;\n> +               };\n> +       };\n> +};\n> +\n> +&pwm1 {\n> +       pinctrl-0 = <&pwm1_pins>;\n> +       pinctrl-names = \"default\";\n> +\n> +       status = \"okay\";\n> +};\n> +\n> +&rcar_sound {\n> +       pinctrl-0 = <&sound_pins &sound_clk_pins>;\n> +       pinctrl-names = \"default\";\n> +\n> +       /* Single DAI */\n> +       #sound-dai-cells = <0>;\n> +\n> +       /* audio_clkout0/1/2/3 */\n> +       #clock-cells = <1>;\n> +       clock-frequency = <12288000 11289600>;\n> +\n> +       status = \"okay\";\n> +\n> +       /* update <audio_clk_b> to <cs2000> */\n> +       clocks = <&cpg CPG_MOD 1005>,\n> +                <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,\n> +                <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,\n> +                <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,\n> +                <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,\n> +                <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,\n> +                <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>,\n> +                <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>,\n> +                <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>,\n> +                <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>,\n> +                <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>,\n> +                <&cpg CPG_MOD 1020>, <&cpg CPG_MOD 1021>,\n> +                <&cpg CPG_MOD 1020>, <&cpg CPG_MOD 1021>,\n> +                <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,\n> +                <&audio_clk_a>, <&cs2000>,\n> +                <&audio_clk_c>,\n> +                <&cpg CPG_CORE CPG_AUDIO_CLK_I>;\n> +\n> +       rcar_sound,dai {\n> +               dai0 {\n> +                       playback = <&ssi0 &src0 &dvc0>;\n> +                       capture  = <&ssi1 &src1 &dvc1>;\n> +               };\n> +       };\n> +};\n> +\n> +&scif1 {\n> +       pinctrl-0 = <&scif1_pins>;\n> +       pinctrl-names = \"default\";\n> +\n> +       uart-has-rtscts;\n> +       status = \"okay\";\n> +};\n> +\n> +&scif2 {\n> +       pinctrl-0 = <&scif2_pins>;\n> +       pinctrl-names = \"default\";\n> +\n> +       status = \"okay\";\n> +};\n> +\n> +&scif_clk {\n> +       clock-frequency = <14745600>;\n> +};\n> +\n> +&sdhi0 {\n> +       pinctrl-0 = <&sdhi0_pins>;\n> +       pinctrl-1 = <&sdhi0_pins_uhs>;\n> +       pinctrl-names = \"default\", \"state_uhs\";\n> +\n> +       vmmc-supply = <&vcc_sdhi0>;\n> +       vqmmc-supply = <&vccq_sdhi0>;\n> +       cd-gpios = <&gpio3 12 GPIO_ACTIVE_LOW>;\n> +       wp-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>;\n> +       bus-width = <4>;\n> +       sd-uhs-sdr50;\n> +       status = \"okay\";\n> +};\n> +\n> +&sdhi2 {\n> +       /* used for on-board 8bit eMMC */\n> +       pinctrl-0 = <&sdhi2_pins>;\n> +       pinctrl-1 = <&sdhi2_pins_uhs>;\n> +       pinctrl-names = \"default\", \"state_uhs\";\n> +\n> +       vmmc-supply = <&reg_3p3v>;\n> +       vqmmc-supply = <&reg_1p8v>;\n> +       bus-width = <8>;\n> +       mmc-hs200-1_8v;\n> +       non-removable;\n> +       status = \"okay\";\n> +};\n> +\n> +&sdhi3 {\n> +       pinctrl-0 = <&sdhi3_pins>;\n> +       pinctrl-1 = <&sdhi3_pins_uhs>;\n> +       pinctrl-names = \"default\", \"state_uhs\";\n> +\n> +       vmmc-supply = <&vcc_sdhi3>;\n> +       vqmmc-supply = <&vccq_sdhi3>;\n> +       cd-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;\n> +       wp-gpios = <&gpio4 16 GPIO_ACTIVE_HIGH>;\n> +       bus-width = <4>;\n> +       sd-uhs-sdr50;\n> +       status = \"okay\";\n> +};\n> +\n> +&ssi1 {\n> +       shared-pin;\n> +};\n> +\n> +&usb2_phy0 {\n> +       pinctrl-0 = <&usb0_pins>;\n> +       pinctrl-names = \"default\";\n> +\n> +       vbus-supply = <&vbus0_usb2>;\n> +       status = \"okay\";\n> +};\n> +\n> +&usb2_phy1 {\n> +       pinctrl-0 = <&usb1_pins>;\n> +       pinctrl-names = \"default\";\n> +\n> +       status = \"okay\";\n> +};\n> +\n> +&wdt0 {\n> +       timeout-sec = <60>;\n> +       status = \"okay\";\n> +};\n> +\n> +&xhci0 {\n> +       status = \"okay\";\n> +};\n> diff --git a/arch/arm/dts/salvator-x.dtsi b/arch/arm/dts/salvator-x.dtsi\n> new file mode 100644\n> index 0000000000..468868c8ed\n> --- /dev/null\n> +++ b/arch/arm/dts/salvator-x.dtsi\n> @@ -0,0 +1,30 @@\n> +/*\n> + * Device Tree Source for the Salvator-X board\n> + *\n> + * Copyright (C) 2015-2016 Renesas Electronics Corp.\n> + *\n> + * This file is licensed under the terms of the GNU General Public License\n> + * version 2.  This program is licensed \"as is\" without any warranty of any\n> + * kind, whether express or implied.\n> + */\n> +\n> +#include \"salvator-common.dtsi\"\n> +\n> +/ {\n> +       model = \"Renesas Salvator-X board\";\n> +       compatible = \"renesas,salvator-x\";\n> +};\n> +\n> +&extal_clk {\n> +       clock-frequency = <16666666>;\n> +};\n> +\n> +&i2c4 {\n> +       versaclock5: clock-generator@6a {\n> +               compatible = \"idt,5p49v5923\";\n> +               reg = <0x6a>;\n> +               #clock-cells = <1>;\n> +               clocks = <&x23_clk>;\n> +               clock-names = \"xin\";\n> +       };\n> +};\n> diff --git a/arch/arm/dts/ulcb.dtsi b/arch/arm/dts/ulcb.dtsi\n> new file mode 100644\n> index 0000000000..d1a3f3b7a0\n> --- /dev/null\n> +++ b/arch/arm/dts/ulcb.dtsi\n> @@ -0,0 +1,367 @@\n> +/*\n> + * Device Tree Source for the R-Car Gen3 ULCB board\n> + *\n> + * Copyright (C) 2016 Renesas Electronics Corp.\n> + * Copyright (C) 2016 Cogent Embedded, Inc.\n> + *\n> + * This file is licensed under the terms of the GNU General Public License\n> + * version 2.  This program is licensed \"as is\" without any warranty of any\n> + * kind, whether express or implied.\n> + */\n> +\n> +#include <dt-bindings/gpio/gpio.h>\n> +#include <dt-bindings/input/input.h>\n> +\n> +/ {\n> +       model = \"Renesas R-Car Gen3 ULCB board\";\n> +\n> +       aliases {\n> +               serial0 = &scif2;\n> +               ethernet0 = &avb;\n> +       };\n> +\n> +       chosen {\n> +               stdout-path = \"serial0:115200n8\";\n> +       };\n> +\n> +       audio_clkout: audio-clkout {\n> +               /*\n> +                * This is same as <&rcar_sound 0>\n> +                * but needed to avoid cs2000/rcar_sound probe dead-lock\n> +                */\n> +               compatible = \"fixed-clock\";\n> +               #clock-cells = <0>;\n> +               clock-frequency = <11289600>;\n> +       };\n> +\n> +       keyboard {\n> +               compatible = \"gpio-keys\";\n> +\n> +               key-1 {\n> +                       linux,code = <KEY_1>;\n> +                       label = \"SW3\";\n> +                       wakeup-source;\n> +                       debounce-interval = <20>;\n> +                       gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;\n> +               };\n> +       };\n> +\n> +       leds {\n> +               compatible = \"gpio-leds\";\n> +\n> +               led5 {\n> +                       gpios = <&gpio6 12 GPIO_ACTIVE_HIGH>;\n> +               };\n> +               led6 {\n> +                       gpios = <&gpio6 13 GPIO_ACTIVE_HIGH>;\n> +               };\n> +       };\n> +\n> +       reg_1p8v: regulator0 {\n> +               compatible = \"regulator-fixed\";\n> +               regulator-name = \"fixed-1.8V\";\n> +               regulator-min-microvolt = <1800000>;\n> +               regulator-max-microvolt = <1800000>;\n> +               regulator-boot-on;\n> +               regulator-always-on;\n> +       };\n> +\n> +       reg_3p3v: regulator1 {\n> +               compatible = \"regulator-fixed\";\n> +               regulator-name = \"fixed-3.3V\";\n> +               regulator-min-microvolt = <3300000>;\n> +               regulator-max-microvolt = <3300000>;\n> +               regulator-boot-on;\n> +               regulator-always-on;\n> +       };\n> +\n> +       rsnd_ak4613: sound {\n> +               compatible = \"simple-audio-card\";\n> +\n> +               simple-audio-card,format = \"left_j\";\n> +               simple-audio-card,bitclock-master = <&sndcpu>;\n> +               simple-audio-card,frame-master = <&sndcpu>;\n> +\n> +               sndcpu: simple-audio-card,cpu {\n> +                       sound-dai = <&rcar_sound>;\n> +               };\n> +\n> +               sndcodec: simple-audio-card,codec {\n> +                       sound-dai = <&ak4613>;\n> +               };\n> +       };\n> +\n> +       vcc_sdhi0: regulator-vcc-sdhi0 {\n> +               compatible = \"regulator-fixed\";\n> +\n> +               regulator-name = \"SDHI0 Vcc\";\n> +               regulator-min-microvolt = <3300000>;\n> +               regulator-max-microvolt = <3300000>;\n> +\n> +               gpio = <&gpio5 2 GPIO_ACTIVE_HIGH>;\n> +               enable-active-high;\n> +       };\n> +\n> +       vccq_sdhi0: regulator-vccq-sdhi0 {\n> +               compatible = \"regulator-gpio\";\n> +\n> +               regulator-name = \"SDHI0 VccQ\";\n> +               regulator-min-microvolt = <1800000>;\n> +               regulator-max-microvolt = <3300000>;\n> +\n> +               gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;\n> +               gpios-states = <1>;\n> +               states = <3300000 1\n> +                         1800000 0>;\n> +       };\n> +\n> +       x12_clk: x12 {\n> +               compatible = \"fixed-clock\";\n> +               #clock-cells = <0>;\n> +               clock-frequency = <24576000>;\n> +       };\n> +};\n> +\n> +&audio_clk_a {\n> +       clock-frequency = <22579200>;\n> +};\n> +\n> +&avb {\n> +       pinctrl-0 = <&avb_pins>;\n> +       pinctrl-names = \"default\";\n> +       renesas,no-ether-link;\n> +       phy-handle = <&phy0>;\n> +       status = \"okay\";\n> +\n> +       phy0: ethernet-phy@0 {\n> +               rxc-skew-ps = <1500>;\n> +               reg = <0>;\n> +               interrupt-parent = <&gpio2>;\n> +               interrupts = <11 IRQ_TYPE_LEVEL_LOW>;\n> +       };\n> +};\n> +\n> +&ehci1 {\n> +       status = \"okay\";\n> +};\n> +\n> +&extal_clk {\n> +       clock-frequency = <16666666>;\n> +};\n> +\n> +&extalr_clk {\n> +       clock-frequency = <32768>;\n> +};\n> +\n> +&i2c2 {\n> +       pinctrl-0 = <&i2c2_pins>;\n> +       pinctrl-names = \"default\";\n> +\n> +       status = \"okay\";\n> +\n> +       clock-frequency = <100000>;\n> +\n> +       ak4613: codec@10 {\n> +               compatible = \"asahi-kasei,ak4613\";\n> +               #sound-dai-cells = <0>;\n> +               reg = <0x10>;\n> +               clocks = <&rcar_sound 3>;\n> +\n> +               asahi-kasei,in1-single-end;\n> +               asahi-kasei,in2-single-end;\n> +               asahi-kasei,out1-single-end;\n> +               asahi-kasei,out2-single-end;\n> +               asahi-kasei,out3-single-end;\n> +               asahi-kasei,out4-single-end;\n> +               asahi-kasei,out5-single-end;\n> +               asahi-kasei,out6-single-end;\n> +       };\n> +\n> +       cs2000: clk-multiplier@4f {\n> +               #clock-cells = <0>;\n> +               compatible = \"cirrus,cs2000-cp\";\n> +               reg = <0x4f>;\n> +               clocks = <&audio_clkout>, <&x12_clk>;\n> +               clock-names = \"clk_in\", \"ref_clk\";\n> +\n> +               assigned-clocks = <&cs2000>;\n> +               assigned-clock-rates = <24576000>; /* 1/1 divide */\n> +       };\n> +};\n> +\n> +&ohci1 {\n> +       status = \"okay\";\n> +};\n> +\n> +&pfc {\n> +       pinctrl-0 = <&scif_clk_pins>;\n> +       pinctrl-names = \"default\";\n> +\n> +       avb_pins: avb {\n> +               mux {\n> +                       groups = \"avb_link\", \"avb_phy_int\", \"avb_mdc\",\n> +                                \"avb_mii\";\n> +                       function = \"avb\";\n> +               };\n> +\n> +               pins_mdc {\n> +                       groups = \"avb_mdc\";\n> +                       drive-strength = <24>;\n> +               };\n> +\n> +               pins_mii_tx {\n> +                       pins = \"PIN_AVB_TX_CTL\", \"PIN_AVB_TXC\", \"PIN_AVB_TD0\",\n> +                              \"PIN_AVB_TD1\", \"PIN_AVB_TD2\", \"PIN_AVB_TD3\";\n> +                       drive-strength = <12>;\n> +               };\n> +       };\n> +\n> +       i2c2_pins: i2c2 {\n> +               groups = \"i2c2_a\";\n> +               function = \"i2c2\";\n> +       };\n> +\n> +       scif2_pins: scif2 {\n> +               groups = \"scif2_data_a\";\n> +               function = \"scif2\";\n> +       };\n> +\n> +       scif_clk_pins: scif_clk {\n> +               groups = \"scif_clk_a\";\n> +               function = \"scif_clk\";\n> +       };\n> +\n> +       sdhi0_pins: sd0 {\n> +               groups = \"sdhi0_data4\", \"sdhi0_ctrl\";\n> +               function = \"sdhi0\";\n> +               power-source = <3300>;\n> +       };\n> +\n> +       sdhi0_pins_uhs: sd0_uhs {\n> +               groups = \"sdhi0_data4\", \"sdhi0_ctrl\";\n> +               function = \"sdhi0\";\n> +               power-source = <1800>;\n> +       };\n> +\n> +       sdhi2_pins: sd2 {\n> +               groups = \"sdhi2_data8\", \"sdhi2_ctrl\";\n> +               function = \"sdhi2\";\n> +               power-source = <3300>;\n> +       };\n> +\n> +       sdhi2_pins_uhs: sd2_uhs {\n> +               groups = \"sdhi2_data8\", \"sdhi2_ctrl\";\n> +               function = \"sdhi2\";\n> +               power-source = <1800>;\n> +       };\n> +\n> +       sound_pins: sound {\n> +               groups = \"ssi01239_ctrl\", \"ssi0_data\", \"ssi1_data_a\";\n> +               function = \"ssi\";\n> +       };\n> +\n> +       sound_clk_pins: sound-clk {\n> +               groups = \"audio_clk_a_a\", \"audio_clk_b_a\", \"audio_clk_c_a\",\n> +                        \"audio_clkout_a\", \"audio_clkout3_a\";\n> +               function = \"audio_clk\";\n> +       };\n> +\n> +       usb1_pins: usb1 {\n> +               groups = \"usb1\";\n> +               function = \"usb1\";\n> +       };\n> +};\n> +\n> +&rcar_sound {\n> +       pinctrl-0 = <&sound_pins &sound_clk_pins>;\n> +       pinctrl-names = \"default\";\n> +\n> +       /* Single DAI */\n> +       #sound-dai-cells = <0>;\n> +\n> +       /* audio_clkout0/1/2/3 */\n> +       #clock-cells = <1>;\n> +       clock-frequency = <12288000 11289600>;\n> +\n> +       status = \"okay\";\n> +\n> +       /* update <audio_clk_b> to <cs2000> */\n> +       clocks = <&cpg CPG_MOD 1005>,\n> +                <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,\n> +                <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,\n> +                <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,\n> +                <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,\n> +                <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,\n> +                <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>,\n> +                <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>,\n> +                <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>,\n> +                <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>,\n> +                <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>,\n> +                <&cpg CPG_MOD 1020>, <&cpg CPG_MOD 1021>,\n> +                <&cpg CPG_MOD 1020>, <&cpg CPG_MOD 1021>,\n> +                <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,\n> +                <&audio_clk_a>, <&cs2000>,\n> +                <&audio_clk_c>,\n> +                <&cpg CPG_CORE CPG_AUDIO_CLK_I>;\n> +\n> +       rcar_sound,dai {\n> +               dai0 {\n> +                       playback = <&ssi0 &src0 &dvc0>;\n> +                       capture  = <&ssi1 &src1 &dvc1>;\n> +               };\n> +       };\n> +};\n> +\n> +&scif2 {\n> +       pinctrl-0 = <&scif2_pins>;\n> +       pinctrl-names = \"default\";\n> +\n> +       status = \"okay\";\n> +};\n> +\n> +&scif_clk {\n> +       clock-frequency = <14745600>;\n> +};\n> +\n> +&sdhi0 {\n> +       pinctrl-0 = <&sdhi0_pins>;\n> +       pinctrl-1 = <&sdhi0_pins_uhs>;\n> +       pinctrl-names = \"default\", \"state_uhs\";\n> +\n> +       vmmc-supply = <&vcc_sdhi0>;\n> +       vqmmc-supply = <&vccq_sdhi0>;\n> +       cd-gpios = <&gpio3 12 GPIO_ACTIVE_LOW>;\n> +       bus-width = <4>;\n> +       sd-uhs-sdr50;\n> +       status = \"okay\";\n> +};\n> +\n> +&sdhi2 {\n> +       /* used for on-board 8bit eMMC */\n> +       pinctrl-0 = <&sdhi2_pins>;\n> +       pinctrl-1 = <&sdhi2_pins_uhs>;\n> +       pinctrl-names = \"default\", \"state_uhs\";\n> +\n> +       vmmc-supply = <&reg_3p3v>;\n> +       vqmmc-supply = <&reg_1p8v>;\n> +       bus-width = <8>;\n> +       mmc-hs200-1_8v;\n> +       non-removable;\n> +       status = \"okay\";\n> +};\n> +\n> +&ssi1 {\n> +       shared-pin;\n> +};\n> +\n> +&usb2_phy1 {\n> +       pinctrl-0 = <&usb1_pins>;\n> +       pinctrl-names = \"default\";\n> +\n> +       status = \"okay\";\n> +};\n> +\n> +&wdt0 {\n> +       timeout-sec = <60>;\n> +       status = \"okay\";\n> +};\n> --\n> 2.11.0\n>","headers":{"Return-Path":"<u-boot-bounces@lists.denx.de>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=<UNKNOWN>)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=nigauri-org.20150623.gappssmtp.com\n\theader.i=@nigauri-org.20150623.gappssmtp.com\n\theader.b=\"wGuOaERq\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xzVvG5rrLz9sNw\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 23 Sep 2017 10:04:10 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 90513C21F77; Sat, 23 Sep 2017 00:04:09 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 1CD91C21C39;\n\tSat, 23 Sep 2017 00:03:51 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 7B3C8C21DEF; Fri, 22 Sep 2017 22:19:04 +0000 (UTC)","from mail-it0-f65.google.com (mail-it0-f65.google.com\n\t[209.85.214.65])\n\tby lists.denx.de (Postfix) with ESMTPS id AC4DEC21F8E\n\tfor <u-boot@lists.denx.de>; Fri, 22 Sep 2017 22:19:02 +0000 (UTC)","by mail-it0-f65.google.com with SMTP id d6so1411689itc.4\n\tfor <u-boot@lists.denx.de>; Fri, 22 Sep 2017 15:19:02 -0700 (PDT)","by 10.107.29.5 with HTTP; Fri, 22 Sep 2017 15:18:29 -0700 (PDT)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE,\n\tRCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,\n\tT_DKIM_INVALID autolearn=unavailable\n\tautolearn_force=no version=3.4.0","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=nigauri-org.20150623.gappssmtp.com; s=20150623;\n\th=mime-version:in-reply-to:references:from:date:message-id:subject:to\n\t:cc; bh=3IxsKWcJ5IvjxGwHPVlhVNOaQjU3rYYhGqW4wE0zXQc=;\n\tb=wGuOaERqZfDsw0HhnKRfZYiNC00A/LFkbB5XJS3U02ByyV+1jvH2cm34nozd5PNP1I\n\tXvJssmU9jN4VczaqGS3qs3zR5XxpkkB3KajA7micQi86p7GNVUIkChybL1QPqS/2+kf9\n\tUSKti84sZKBGOlITz8adoQlSIdz6JNs+X59FKX0RUmTFAja3mrx+3KctuBf9NW8VrAGX\n\tr79Qeb53MXe99uP+6bDKdxbEVuzEnrFDweJit20IxaNpFMJloM+Huui6HVPWaYl4I7R4\n\tX/w9OlkvyID49oHgGs7++bJ1WRW5ccp2rUcbEQGe6QPtgnEQw53o7kcSguiU1tEY6g9Z\n\t0pxg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:in-reply-to:references:from:date\n\t:message-id:subject:to:cc;\n\tbh=3IxsKWcJ5IvjxGwHPVlhVNOaQjU3rYYhGqW4wE0zXQc=;\n\tb=W2wgtxZ/2NRSQk35EtAJ4bWhMwKN3Lru9jEuC2hoXX9JiTItX4J4u7iA/46YSHn342\n\tC1GCUtKM/iZylTNaL16wZm0zP6YuAfkn7mHwBdfT4oseGxjG4GKJ4HgR6ElcwxqtJKsL\n\tgHlHxOifXgMbGgQj5xCt96wPgLnJFbjmmpm5BL27WuyuBGVn62absV4fe1YOJE7QpV13\n\t9h5acdqVYjvHg1auf+sgK4hl2VbparpzCdnQk+JnGOTBFEr7+6RLa/+Ll1+AIjbTQ44E\n\tlCp+e4siFpz59XBxou4QV/Dyw4l0j1T9A1LNGdZQPcFRSJwHym4upmTGXkB32GL+atLz\n\txv5Q==","X-Gm-Message-State":"AHPjjUiuO3j6k5k5TUlGOlh9T4pkTq8D6iF1fGOsjSLpW5Zj9ULUqQMX\n\tFf4cwonP1oTtI8U3zsYva0gutqwD0tsgzkUSqX14EDY=","X-Google-Smtp-Source":"AOwi7QDzVSyCLr6xSdiaz67OBazN5XnWU6fP6ZFFQTvIC1aockGv5+Y9xzzgLiCZ4OSHVh+s1SKKLsDZy89HpjBqpeU=","X-Received":"by 10.36.165.8 with SMTP id k8mr8630963itf.83.1506118740289; Fri,\n\t22 Sep 2017 15:19:00 -0700 (PDT)","MIME-Version":"1.0","In-Reply-To":"<20170912210151.12213-1-marek.vasut+renesas@gmail.com>","References":"<20170912210151.12213-1-marek.vasut+renesas@gmail.com>","From":"Nobuhiro Iwamatsu <iwamatsu@nigauri.org>","Date":"Sat, 23 Sep 2017 07:18:29 +0900","Message-ID":"<CABMQnVLpBn9VR6fCM4ikiP53mmy4mrUBmiFWej0AxhycbSKU6A@mail.gmail.com>","To":"Marek Vasut <marek.vasut@gmail.com>","X-Mailman-Approved-At":"Sat, 23 Sep 2017 00:03:49 +0000","Cc":"U-Boot <u-boot@lists.denx.de>,\n\tMarek Vasut <marek.vasut+renesas@gmail.com>","Subject":"Re: [U-Boot] [PATCH] ARM: dts: rmobile: Update DTS to match Linux\n\t4.13","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion <u-boot.lists.denx.de>","List-Unsubscribe":"<https://lists.denx.de/options/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>","List-Archive":"<http://lists.denx.de/pipermail/u-boot/>","List-Post":"<mailto:u-boot@lists.denx.de>","List-Help":"<mailto:u-boot-request@lists.denx.de?subject=help>","List-Subscribe":"<https://lists.denx.de/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" <u-boot-bounces@lists.denx.de>"}}]