[PATCH 1/4] imx6:mmdc: Move register defines to header file

[Alexander Aring]

Hi,

On Fri, Apr 25, 2014 at 01:54:25PM +0200, Christian Hemp wrote:
> Move mmdc register defines to mmdc header file.
> 
> Signed-off-by: Christian Hemp <c.hemp at phytec.de>
> ---
>  arch/arm/mach-imx/imx6-mmdc.c              |   37 --------------------------
>  arch/arm/mach-imx/include/mach/imx6-mmdc.h |   39 ++++++++++++++++++++++++++++
>  2 files changed, 39 insertions(+), 37 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/imx6-mmdc.c b/arch/arm/mach-imx/imx6-mmdc.c
> index d1de593..9686bee 100644
> --- a/arch/arm/mach-imx/imx6-mmdc.c
> +++ b/arch/arm/mach-imx/imx6-mmdc.c
> @@ -20,43 +20,6 @@
>  #include <mach/imx6-regs.h>
>  #include <mach/imx6-mmdc.h>
>  
> -#define P0_IPS (void __iomem *)MX6_MMDC_P0_BASE_ADDR
> -#define P1_IPS (void __iomem *)MX6_MMDC_P1_BASE_ADDR
> -
> -#define MDCTL		0x000
> -#define MDPDC		0x004
> -#define MDSCR		0x01c
> -#define MDMISC		0x018
> -#define MDREF		0x020
> -#define MAPSR		0x404
> -#define MPZQHWCTRL	0x800
> -#define MPWLGCR		0x808
> -#define MPWLDECTRL0	0x80c
> -#define MPWLDECTRL1	0x810
> -#define MPPDCMPR1	0x88c
> -#define MPSWDAR		0x894
> -#define MPRDDLCTL	0x848
> -#define MPMUR		0x8b8
> -#define MPDGCTRL0	0x83c
> -#define MPDGCTRL1	0x840
> -#define MPRDDLCTL	0x848
> -#define MPWRDLCTL	0x850
> -#define MPRDDLHWCTL	0x860
> -#define MPWRDLHWCTL	0x864
> -#define MPDGHWST0	0x87c
> -#define MPDGHWST1	0x880
> -#define MPDGHWST2	0x884
> -#define MPDGHWST3	0x888
> -
> -#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS0	((void __iomem *)MX6_IOMUXC_BASE_ADDR + 0x5a8)
> -#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS1	((void __iomem *)MX6_IOMUXC_BASE_ADDR + 0x5b0)
> -#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS2	((void __iomem *)MX6_IOMUXC_BASE_ADDR + 0x524)
> -#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS3	((void __iomem *)MX6_IOMUXC_BASE_ADDR + 0x51c)
> -#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS4	((void __iomem *)MX6_IOMUXC_BASE_ADDR + 0x518)
> -#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS5	((void __iomem *)MX6_IOMUXC_BASE_ADDR + 0x50c)
> -#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS6	((void __iomem *)MX6_IOMUXC_BASE_ADDR + 0x5b8)
> -#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS7	((void __iomem *)MX6_IOMUXC_BASE_ADDR + 0x5c0)
> -

are you sure that it doesn't fix the build after applying this patch? I
think you need to add a include of the imx6-mmdc.h header file...

>  int mmdc_do_write_level_calibration(void)
>  {
>  	u32 esdmisc_val, zq_val;
> diff --git a/arch/arm/mach-imx/include/mach/imx6-mmdc.h b/arch/arm/mach-imx/include/mach/imx6-mmdc.h
> index 4ad939e..3152e16 100644
> --- a/arch/arm/mach-imx/include/mach/imx6-mmdc.h
> +++ b/arch/arm/mach-imx/include/mach/imx6-mmdc.h
> @@ -1,6 +1,45 @@
>  #ifndef __MACH_MMDC_H
>  #define __MACH_MMDC_H
> 

You should also include the headers which are necessary for the
following define like MX6_MMDC_P0_BASE_ADDR which are defined in 
<mach/imx6-regs.h> and for all others...

> +
> +#define P0_IPS (void __iomem *)MX6_MMDC_P0_BASE_ADDR
> +#define P1_IPS (void __iomem *)MX6_MMDC_P1_BASE_ADDR
> +
> +#define MDCTL		0x000
> +#define MDPDC		0x004
> +#define MDSCR		0x01c
> +#define MDMISC		0x018
> +#define MDREF		0x020
> +#define MAPSR		0x404
> +#define MPZQHWCTRL	0x800
> +#define MPWLGCR		0x808
> +#define MPWLDECTRL0	0x80c
> +#define MPWLDECTRL1	0x810
> +#define MPPDCMPR1	0x88c
> +#define MPSWDAR		0x894
> +#define MPRDDLCTL	0x848
> +#define MPMUR		0x8b8
> +#define MPDGCTRL0	0x83c
> +#define MPDGCTRL1	0x840
> +#define MPRDDLCTL	0x848
> +#define MPWRDLCTL	0x850
> +#define MPRDDLHWCTL	0x860
> +#define MPWRDLHWCTL	0x864
> +#define MPDGHWST0	0x87c
> +#define MPDGHWST1	0x880
> +#define MPDGHWST2	0x884
> +#define MPDGHWST3	0x888
> +
> +#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS0	((void __iomem *)MX6_IOMUXC_BASE_ADDR + 0x5a8)
> +#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS1	((void __iomem *)MX6_IOMUXC_BASE_ADDR + 0x5b0)
> +#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS2	((void __iomem *)MX6_IOMUXC_BASE_ADDR + 0x524)
> +#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS3	((void __iomem *)MX6_IOMUXC_BASE_ADDR + 0x51c)
> +#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS4	((void __iomem *)MX6_IOMUXC_BASE_ADDR + 0x518)
> +#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS5	((void __iomem *)MX6_IOMUXC_BASE_ADDR + 0x50c)
> +#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS6	((void __iomem *)MX6_IOMUXC_BASE_ADDR + 0x5b8)
> +#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS7	((void __iomem *)MX6_IOMUXC_BASE_ADDR + 0x5c0)
> +
> +

- Alex