lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.4 132/167] ARM: imx: Add MXC_CPU_IMX6ULL and cpu_is_imx6ull
    Date
    From: Leonard Crestez <leonard.crestez@nxp.com>

    [ Upstream commit b3ea575770c7eeb259c77b6861cd14d00eb309df ]

    Support for imx6ull is already present but it's based on
    of_machine_is_compatible("fsl,imx6ull") checks. Add it to the MXC_CPU_*
    enumeration as well.

    This also fixes /sys/devices/soc0/soc_id reading "Unknown".

    Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
    Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
    Signed-off-by: Shawn Guo <shawnguo@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    arch/arm/mach-imx/cpu.c | 3 +++
    arch/arm/mach-imx/mxc.h | 6 ++++++
    2 files changed, 9 insertions(+)

    diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
    index 5b0f752d5507..24be631e487d 100644
    --- a/arch/arm/mach-imx/cpu.c
    +++ b/arch/arm/mach-imx/cpu.c
    @@ -133,6 +133,9 @@ struct device * __init imx_soc_device_init(void)
    case MXC_CPU_IMX6UL:
    soc_id = "i.MX6UL";
    break;
    + case MXC_CPU_IMX6ULL:
    + soc_id = "i.MX6ULL";
    + break;
    case MXC_CPU_IMX7D:
    soc_id = "i.MX7D";
    break;
    diff --git a/arch/arm/mach-imx/mxc.h b/arch/arm/mach-imx/mxc.h
    index a5b1af6d7441..478cd91d0885 100644
    --- a/arch/arm/mach-imx/mxc.h
    +++ b/arch/arm/mach-imx/mxc.h
    @@ -39,6 +39,7 @@
    #define MXC_CPU_IMX6SX 0x62
    #define MXC_CPU_IMX6Q 0x63
    #define MXC_CPU_IMX6UL 0x64
    +#define MXC_CPU_IMX6ULL 0x65
    #define MXC_CPU_IMX7D 0x72

    #define IMX_DDR_TYPE_LPDDR2 1
    @@ -171,6 +172,11 @@ static inline bool cpu_is_imx6ul(void)
    return __mxc_cpu_type == MXC_CPU_IMX6UL;
    }

    +static inline bool cpu_is_imx6ull(void)
    +{
    + return __mxc_cpu_type == MXC_CPU_IMX6ULL;
    +}
    +
    static inline bool cpu_is_imx6q(void)
    {
    return __mxc_cpu_type == MXC_CPU_IMX6Q;
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-19 18:08    [W:4.680 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site