[v2,2/3] mtd: nand: Let MTD_NAND_GPMI_NAND depend on MXS_DMA

Commit Message

Fabio Estevam July 25, 2012, 11:18 a.m. UTC

From: Fabio Estevam <[e-mail]>

MTD_NAND_GPMI_NAND driver depends on MXS_DMA to be selected, otherwise the following error happens
for imx_v6_v7_defconfig:

drivers/built-in.o: In function `gpmi_dma_filter':
clk-fixed-factor.c:(.text+0xb124c): undefined reference to `mxs_dma_is_apbh'
make: *** [vmlinux] Error 1

Signed-off-by: Fabio Estevam <[e-mail]>
---
Changes since v1:
- Use 'depends' rather than 'select'
 drivers/mtd/nand/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Comments

Huang Shijie July 26, 2012, 2:27 a.m. UTC | #1

I think  we can merget the patch 1 and patch 2 to one patch.

Huang Shijie

On Wed, Jul 25, 2012 at 7:18 PM, Fabio Estevam <[e-mail]> wrote:
> From: Fabio Estevam <[e-mail]>
>
> MTD_NAND_GPMI_NAND driver depends on MXS_DMA to be selected, otherwise the following error happens
> for imx_v6_v7_defconfig:
>
> drivers/built-in.o: In function `gpmi_dma_filter':
> clk-fixed-factor.c:(.text+0xb124c): undefined reference to `mxs_dma_is_apbh'
> make: *** [vmlinux] Error 1
>
> Signed-off-by: Fabio Estevam <[e-mail]>
> ---
> Changes since v1:
> - Use 'depends' rather than 'select'
>  drivers/mtd/nand/Kconfig |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
> index a5d8a1b..da52c7d 100644
> --- a/drivers/mtd/nand/Kconfig
> +++ b/drivers/mtd/nand/Kconfig
> @@ -463,6 +463,7 @@ config MTD_NAND_NANDSIM
>  config MTD_NAND_GPMI_NAND
>          bool "GPMI NAND Flash Controller driver"
>          depends on MTD_NAND && (SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q)
> +       depends on MXS_DMA
>          help
>          Enables NAND Flash support for IMX23, IMX28 or IMX6.
>          The GPMI controller is very powerful, with the help of BCH
> --
> 1.7.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> [e-mail]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Fabio Estevam July 26, 2012, 10:35 a.m. UTC | #2

On Wed, Jul 25, 2012 at 11:27 PM, Huang Shijie <[e-mail]> wrote:
> I think  we can merget the patch 1 and patch 2 to one patch.

I am not sure on this, as they have clearly different purposes.

Patch 1 fixes the text file and include mx6.

Patch 2 fixes a build issue for mx6.

I prefer to keep them as seperate patches.

Regards,

Fabio Estevam

Richard Zhao July 27, 2012, 9:28 a.m. UTC | #3

On Wed, Jul 25, 2012 at 08:18:19AM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <[e-mail]>
> 
> MTD_NAND_GPMI_NAND driver depends on MXS_DMA to be selected, otherwise the following error happens
> for imx_v6_v7_defconfig:
> 
> drivers/built-in.o: In function `gpmi_dma_filter':
> clk-fixed-factor.c:(.text+0xb124c): undefined reference to `mxs_dma_is_apbh'
> make: *** [vmlinux] Error 1
> 
> Signed-off-by: Fabio Estevam <[e-mail]>
Reviewed-by: Richard Zhao <[e-mail]>
> ---
> Changes since v1:
> - Use 'depends' rather than 'select'
>  drivers/mtd/nand/Kconfig |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
> index a5d8a1b..da52c7d 100644
> --- a/drivers/mtd/nand/Kconfig
> +++ b/drivers/mtd/nand/Kconfig
> @@ -463,6 +463,7 @@ config MTD_NAND_NANDSIM
>  config MTD_NAND_GPMI_NAND
>          bool "GPMI NAND Flash Controller driver"
>          depends on MTD_NAND && (SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q)
> +	depends on MXS_DMA
>          help
>  	 Enables NAND Flash support for IMX23, IMX28 or IMX6.
>  	 The GPMI controller is very powerful, with the help of BCH
> -- 
> 1.7.1
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> [e-mail]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>

Sascha Hauer Aug. 3, 2012, 10:07 a.m. UTC | #4

On Wed, Jul 25, 2012 at 08:18:19AM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <[e-mail]>
> 
> MTD_NAND_GPMI_NAND driver depends on MXS_DMA to be selected, otherwise the following error happens
> for imx_v6_v7_defconfig:
> 
> drivers/built-in.o: In function `gpmi_dma_filter':
> clk-fixed-factor.c:(.text+0xb124c): undefined reference to `mxs_dma_is_apbh'
> make: *** [vmlinux] Error 1
> 
> Signed-off-by: Fabio Estevam <[e-mail]>

Acked-by: Sascha Hauer <[e-mail]>

As mentioned elsewhere in this thread: We should not select user visible
options, so this patch is the only thing we can do atm (apart from
'fixing the tools' as David mentioned, but this is out of scope for an
-rc kernel)

Additionally the imx_v6_v7_defconfig should be adjusted so that the gpmi
nand driver actually gets built.

Sascha

> ---
> Changes since v1:
> - Use 'depends' rather than 'select'
>  drivers/mtd/nand/Kconfig |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
> index a5d8a1b..da52c7d 100644
> --- a/drivers/mtd/nand/Kconfig
> +++ b/drivers/mtd/nand/Kconfig
> @@ -463,6 +463,7 @@ config MTD_NAND_NANDSIM
>  config MTD_NAND_GPMI_NAND
>          bool "GPMI NAND Flash Controller driver"
>          depends on MTD_NAND && (SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q)
> +	depends on MXS_DMA
>          help
>  	 Enables NAND Flash support for IMX23, IMX28 or IMX6.
>  	 The GPMI controller is very powerful, with the help of BCH
> -- 
> 1.7.1
> 
>

Dirk Behme Aug. 5, 2012, 6:36 a.m. UTC | #5

On 03.08.2012 12:07, Sascha Hauer wrote:
> On Wed, Jul 25, 2012 at 08:18:19AM -0300, Fabio Estevam wrote:
>> From: Fabio Estevam<[e-mail]>
>>
>> MTD_NAND_GPMI_NAND driver depends on MXS_DMA to be selected, otherwise the following error happens
>> for imx_v6_v7_defconfig:
>>
>> drivers/built-in.o: In function `gpmi_dma_filter':
>> clk-fixed-factor.c:(.text+0xb124c): undefined reference to `mxs_dma_is_apbh'
>> make: *** [vmlinux] Error 1
>>
>> Signed-off-by: Fabio Estevam<[e-mail]>
>
> Acked-by: Sascha Hauer<[e-mail]>
>
> As mentioned elsewhere in this thread: We should not select user visible
> options, so this patch is the only thing we can do atm (apart from
> 'fixing the tools' as David mentioned, but this is out of scope for an
> -rc kernel)

I asked Shawn about this and it seems that this patch is the way to go 
for the moment. So:

Acked-by: Dirk Behme <[e-mail]>

David: Artem: Building recent 3.6-rc1mainline with imx_v6_v7_defconfig 
is broken. We need this patch to get it working, again.

It would be nice if this patch could go as a fix into 3.6-rcX mainline 
asap. Could you help with this?

Many thanks and best regards

Dirk

> Additionally the imx_v6_v7_defconfig should be adjusted so that the gpmi
> nand driver actually gets built.
>
> Sascha
>
>> ---
>> Changes since v1:
>> - Use 'depends' rather than 'select'
>>   drivers/mtd/nand/Kconfig |    1 +
>>   1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
>> index a5d8a1b..da52c7d 100644
>> --- a/drivers/mtd/nand/Kconfig
>> +++ b/drivers/mtd/nand/Kconfig
>> @@ -463,6 +463,7 @@ config MTD_NAND_NANDSIM
>>   config MTD_NAND_GPMI_NAND
>>           bool "GPMI NAND Flash Controller driver"
>>           depends on MTD_NAND&&  (SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q)
>> +	depends on MXS_DMA
>>           help
>>   	 Enables NAND Flash support for IMX23, IMX28 or IMX6.
>>   	 The GPMI controller is very powerful, with the help of BCH
>> --
>> 1.7.1
>>
>>
>

Patch

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index a5d8a1b..da52c7d 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -463,6 +463,7 @@  config MTD_NAND_NANDSIM
 config MTD_NAND_GPMI_NAND
         bool "GPMI NAND Flash Controller driver"
         depends on MTD_NAND && (SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q)
+	depends on MXS_DMA
         help
 	 Enables NAND Flash support for IMX23, IMX28 or IMX6.
 	 The GPMI controller is very powerful, with the help of BCH