On Monday 18 November 2013 06:35 AM, Grygorii Strashko wrote:On 11/12/2013 06:13 PM, Santosh Shilimkar wrote:Thats more or less what I proposed in another reply. Lets clearlyOn Monday 11 November 2013 12:10 PM, Khoronzhuk, Ivan wrote:If Davinci AEMIF is used we don't need to set timings and bus width.Instead above #if, just use a variable.
It is done by AEMIF driver (drivers/memory/davinci-aemfi.c).
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@xxxxxx>
---
drivers/mtd/nand/davinci_nand.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index 4705214..879e915 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -742,27 +742,35 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
goto err_clk_enable;
}
+#if !IS_ENABLED(CONFIG_TI_DAVINCI_AEMIF)
bool aemif = IS_ENABLED(CONFIG_TI_DAVINCI_AEMIF) and then skip
the below code. #if block in the middle of the code looks ugly.
Yes, this is the hack.
The problem is that this part of code contains the call of Davinci platform function davinci_aemif_setup_timing() which is not accessible if Kernel is built for Keystone only.
That's why "#if" has been used.
This part of code has to be removed together with Davinci aemif platform code (aemif.c), once Davinci will be converted to DT and use
new driver.
The corresponding comment can be added here. Is it ok?
document it on why such a check was added.
Regards,
Santosh