[PATCH] ARM: shmobile: r8a7794: Add MMCIF clock to device tree

[Geert Uytterhoeven]

On Sat, Dec 13, 2014 at 1:09 AM, Simon Horman
<horms+renesas at verge.net.au> wrote:
> From: Shinobu Uehara <shinobu.uehara.xc at renesas.com>
>
> Signed-off-by: Shinobu Uehara <shinobu.uehara.xc at renesas.com>
> [horms: omitted device node; only add clock]
> Signed-off-by: Simon Horman <horms+renesas at verge.net.au>
>
> ---
> Based on the renesas-devel-20141212-v3.18 tag of my renesas tree
>
> Depends on
> "[PATCH v2] ARM: shmobile: r8a7794: Add SDHI clocks to device tree"
> to apply cleanly.
>
> v1 [Simon Horman]
> * Removed portion of patch which adds device node
> * Renamed patch from
>   "ARM: shmobile: r8a7794: Add MMCIF clock and device to device tree" to
>   "ARM: shmobile: r8a7794: Add MMCIF clock to device tree"
> ---
>  arch/arm/boot/dts/r8a7794.dtsi            | 15 +++++++++++----
>  include/dt-bindings/clock/r8a7794-clock.h |  1 +
>  2 files changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
> index 8794df8..fd8a19c 100644
> --- a/arch/arm/boot/dts/r8a7794.dtsi
> +++ b/arch/arm/boot/dts/r8a7794.dtsi
> @@ -308,6 +308,13 @@
>                         #clock-cells = <0>;
>                         clock-output-names = "sd2";
>                 };
> +               mmc0_clk: mmc0_clk at e6150240 {
> +                       compatible = "renesas,r8a7794-div6-clock", "renesas,cpg-div6-clock";
> +                       reg = <0 0xe6150240 0 4>;
> +                       clocks = <&pll1_div2_clk>;
> +                       #clock-cells = <0>;
> +                       clock-output-names = "mmc0";
> +               };
>
>                 /* Fixed factor clocks */
>                 pll1_div2_clk: pll1_div2_clk {
> @@ -512,16 +519,16 @@
>                         compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
>                         reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>;
>                         clocks = <&sd2_clk>, <&sd1_clk>, <&cpg_clocks R8A7794_CLK_SD0>,
> -                                <&rclk_clk>, <&hp_clk>, <&hp_clk>;
> +                                <&mmc0_clk>, <&rclk_clk>, <&hp_clk>, <&hp_clk>;
>                         #clock-cells = <1>;
>                         clock-indices = <
>                                 R8A7794_CLK_SDHI2 R8A7794_CLK_SDHI1 R8A7794_CLK_SDHI0
> -                               R8A7794_CLK_CMT1 R8A7794_CLK_USBDMAC0
> -                               R8A7794_CLK_USBDMAC1
> +                               R8A7794_CLK_CMT1 R8A7794_CLK_MMCIF0

R8A7794_CLK_MMCIF0 R8A7794_CLK_CMT1

> +                               R8A7794_CLK_USBDMAC0 R8A7794_CLK_USBDMAC1
>                         >;
>                         clock-output-names =
>                                 "sdhi2", "sdhi1", "sdhi0",
> -                               "cmt1", "usbdmac0", "usbdmac1";
> +                               "mmcif0", "cmt1", "usbdmac0", "usbdmac1";
>                 };
>                 mstp7_clks: mstp7_clks at e615014c {
>                         compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
> diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h
> index f013cdc..4555b0f 100644
> --- a/include/dt-bindings/clock/r8a7794-clock.h
> +++ b/include/dt-bindings/clock/r8a7794-clock.h
> @@ -55,6 +55,7 @@
>  #define R8A7794_CLK_SDHI2              11
>  #define R8A7794_CLK_SDHI1              12
>  #define R8A7794_CLK_SDHI0              14
> +#define R8A7794_CLK_MMCIF0             15
>  #define R8A7794_CLK_CMT1               29
>  #define R8A7794_CLK_USBDMAC0           30
>  #define R8A7794_CLK_USBDMAC1           31

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds