lkml.org 
[lkml]   [2018]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.15 060/102] pinctrl: sh-pfc: r8a7791: Add can_clk function
    Date
    From: Fabrizio Castro <fabrizio.castro@bp.renesas.com>

    [ Upstream commit 57eec02caee60332b8052615e7257f932ae07abc ]

    This patch adds can_clk function to r8a7743/r8a7791 which is cleaner,
    and allows for independent configuration.
    We keep the can_clk* pins definitions from within can0_groups and
    can1_groups for uniformity and backwards compatibility.

    Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
    Reviewed-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
    Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 22 +++++++++++++++++++++-
    1 file changed, 21 insertions(+), 1 deletion(-)

    diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
    index 10bd35f8c894..c01ef02d326b 100644
    --- a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
    +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
    @@ -4826,6 +4826,10 @@ static const char * const can0_groups[] = {
    "can0_data_d",
    "can0_data_e",
    "can0_data_f",
    + /*
    + * Retained for backwards compatibility, use can_clk_groups in new
    + * designs.
    + */
    "can_clk",
    "can_clk_b",
    "can_clk_c",
    @@ -4837,6 +4841,21 @@ static const char * const can1_groups[] = {
    "can1_data_b",
    "can1_data_c",
    "can1_data_d",
    + /*
    + * Retained for backwards compatibility, use can_clk_groups in new
    + * designs.
    + */
    + "can_clk",
    + "can_clk_b",
    + "can_clk_c",
    + "can_clk_d",
    +};
    +
    +/*
    + * can_clk_groups allows for independent configuration, use can_clk function
    + * in new designs.
    + */
    +static const char * const can_clk_groups[] = {
    "can_clk",
    "can_clk_b",
    "can_clk_c",
    @@ -5308,7 +5327,7 @@ static const char * const vin2_groups[] = {
    };

    static const struct {
    - struct sh_pfc_function common[56];
    + struct sh_pfc_function common[57];
    struct sh_pfc_function r8a779x[2];
    } pinmux_functions = {
    .common = {
    @@ -5316,6 +5335,7 @@ static const struct {
    SH_PFC_FUNCTION(avb),
    SH_PFC_FUNCTION(can0),
    SH_PFC_FUNCTION(can1),
    + SH_PFC_FUNCTION(can_clk),
    SH_PFC_FUNCTION(du),
    SH_PFC_FUNCTION(du0),
    SH_PFC_FUNCTION(du1),
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-04 01:39    [W:4.235 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site