From 61f27ca3e4e1509ccb5abb01e9892ab90b8bc0cf Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 10 Mar 2016 19:11:28 +0000 Subject: [PATCH] oxnas: clean-up NAND driver to fix probing issue A re-write of the driver based on xway_nand.c and constants as well as the cmd_ctrl() function from the original oxnas_nand.c resulted in a extremely similar looking file (see diffsize), and fixes the issue of NAND not being detected on newer kernels. Signed-off-by: Daniel Golle SVN-Revision: 48986 --- .../oxnas/files/drivers/mtd/nand/oxnas_nand.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/target/linux/oxnas/files/drivers/mtd/nand/oxnas_nand.c b/target/linux/oxnas/files/drivers/mtd/nand/oxnas_nand.c index 55eb009bac..9536e5179c 100644 --- a/target/linux/oxnas/files/drivers/mtd/nand/oxnas_nand.c +++ b/target/linux/oxnas/files/drivers/mtd/nand/oxnas_nand.c @@ -2,15 +2,18 @@ * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published * by the Free Software Foundation. + * + * based on xway_nand.c + * Copyright © 2012 John Crispin + * and oxnas_nand.c "NAND glue for Oxnas platforms" + * written by Ma Haijun */ -#include #include #include #include #include #include -#include /* nand commands */ #define NAND_CMD_ALE BIT(18) @@ -89,14 +92,3 @@ static int __init oxnas_register_nand(void) } subsys_initcall(oxnas_register_nand); - -static const struct of_device_id oxnas_nand_ids[] = { - { .compatible = "plxtech,nand-nas782x"}, - { /* sentinel */ } -}; -MODULE_DEVICE_TABLE(of, oxnas_nand_ids); - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Ma Haijun"); -MODULE_DESCRIPTION("NAND glue for Oxnas platforms"); -MODULE_ALIAS("platform:oxnas_nand"); -- 2.25.1