Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eaaa4a9a authored by Ivan Khoronzhuk's avatar Ivan Khoronzhuk Committed by Brian Norris
Browse files

mtd: nand: davinci: fix driver registration 



When kernel is booted using DT, there is no guarantee that Davinci
NAND device has been created already at the time when driver init
function is executed. Therefore, platform_driver_probe() can't be used
because this may result the Davinci NAND driver will never be probed.
The driver probing has to be made with core mechanism.

Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Reviewed-by: default avatarTaras Kondratiuk <taras@ti.com>
Signed-off-by: default avatarIvan Khoronzhuk <ivan.khoronzhuk@ti.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent a1d7994e

drivers/mtd/nand/davinci_nand.c

+7 −6
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ static int nand_davinci_dev_ready(struct mtd_info *mtd) 
 * ten ECC bytes plus the manufacturer's bad block marker byte, and

 * and not overlapping the default BBT markers.

 */

static struct nand_ecclayout hwecc4_small __initconst = {

static struct nand_ecclayout hwecc4_small = {

	.eccbytes = 10,

	.eccpos = { 0, 1, 2, 3, 4,

		/* offset 5 holds the badblock marker */
@@ -503,7 +503,7 @@ static struct nand_ecclayout hwecc4_small __initconst = { 
 * storing ten ECC bytes plus the manufacturer's bad block marker byte,

 * and not overlapping the default BBT markers.

 */

static struct nand_ecclayout hwecc4_2048 __initconst = {

static struct nand_ecclayout hwecc4_2048 = {

	.eccbytes = 40,

	.eccpos = {

		/* at the end of spare sector */
@@ -585,7 +585,7 @@ static struct davinci_nand_pdata 
}

#endif



static int __init nand_davinci_probe(struct platform_device *pdev)

static int nand_davinci_probe(struct platform_device *pdev)

{

	struct davinci_nand_pdata	*pdata;

	struct davinci_nand_info	*info;
@@ -860,7 +860,7 @@ static int __init nand_davinci_probe(struct platform_device *pdev) 
	return ret;

}



static int __exit nand_davinci_remove(struct platform_device *pdev)

static int nand_davinci_remove(struct platform_device *pdev)

{

	struct davinci_nand_info *info = platform_get_drvdata(pdev);
@@ -877,7 +877,8 @@ static int __exit nand_davinci_remove(struct platform_device *pdev) 
}



static struct platform_driver nand_davinci_driver = {

	.remove		= __exit_p(nand_davinci_remove),

	.probe		= nand_davinci_probe,

	.remove		= nand_davinci_remove,

	.driver		= {

		.name	= "davinci_nand",

		.owner	= THIS_MODULE,
@@ -886,7 +887,7 @@ static struct platform_driver nand_davinci_driver = { 
};

MODULE_ALIAS("platform:davinci_nand");



module_platform_driver_probe(nand_davinci_driver, nand_davinci_probe);

module_platform_driver(nand_davinci_driver);



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Texas Instruments");