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

Commit c8b2da0e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-ab-4.8-drivers2' of... 

Merge tag 'at91-ab-4.8-drivers2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/drivers

Drivers for 4.8 #2:
 - Make memory drivers explicitly non-modular

* tag 'at91-ab-4.8-drivers2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

:
  memory: atmel-ebi: make it explicitly non-modular
  memory: atmel-sdramc: make it explicitly non-modular

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 13d0b76b 8a86a093

drivers/memory/atmel-ebi.c

+2 −7
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/mfd/syscon.h>

#include <linux/mfd/syscon.h>

#include <linux/mfd/syscon/atmel-matrix.h>

#include <linux/mfd/syscon/atmel-matrix.h>

#include <linux/mfd/syscon/atmel-smc.h>

#include <linux/mfd/syscon/atmel-smc.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/of_device.h>

#include <linux/of_device.h>

#include <linux/regmap.h>

#include <linux/regmap.h>
@@ -648,7 +648,6 @@ static const struct of_device_id at91_ebi_id_table[] = { 
	},

	},

	{ /* sentinel */ }

	{ /* sentinel */ }

};

};

MODULE_DEVICE_TABLE(of, at91_ebi_id_table);





static int at91_ebi_dev_disable(struct at91_ebi *ebi, struct device_node *np)

static int at91_ebi_dev_disable(struct at91_ebi *ebi, struct device_node *np)

{

{
@@ -764,8 +763,4 @@ static struct platform_driver at91_ebi_driver = { 
		.of_match_table	= at91_ebi_id_table,

		.of_match_table	= at91_ebi_id_table,

	},

	},

};

};

module_platform_driver_probe(at91_ebi_driver, at91_ebi_probe);

builtin_platform_driver_probe(at91_ebi_driver, at91_ebi_probe);
 


MODULE_AUTHOR("Jean-Jacques Hiblot <jjhiblot@traphandler.com>");

MODULE_DESCRIPTION("Atmel EBI driver");

MODULE_LICENSE("GPL");

drivers/memory/atmel-sdramc.c

+4 −7
Original line number Original line Diff line number Diff line 
/*

/*

 * Atmel (Multi-port DDR-)SDRAM Controller driver

 * Atmel (Multi-port DDR-)SDRAM Controller driver

 *

 *

 * Author: Alexandre Belloni <alexandre.belloni@free-electrons.com>

 *

 * Copyright (C) 2014 Atmel

 * Copyright (C) 2014 Atmel

 *

 *

 * This program is free software: you can redistribute it and/or modify

 * This program is free software: you can redistribute it and/or modify
@@ -20,7 +22,7 @@ 
#include <linux/clk.h>

#include <linux/clk.h>

#include <linux/err.h>

#include <linux/err.h>

#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>
@@ -48,7 +50,6 @@ static const struct of_device_id atmel_ramc_of_match[] = { 
	{ .compatible = "atmel,sama5d3-ddramc", .data = &sama5d3_caps, },

	{ .compatible = "atmel,sama5d3-ddramc", .data = &sama5d3_caps, },

	{},

	{},

};

};

MODULE_DEVICE_TABLE(of, atmel_ramc_of_match);





static int atmel_ramc_probe(struct platform_device *pdev)

static int atmel_ramc_probe(struct platform_device *pdev)

{

{
@@ -90,8 +91,4 @@ static int __init atmel_ramc_init(void) 
{

{

	return platform_driver_register(&atmel_ramc_driver);

	return platform_driver_register(&atmel_ramc_driver);

}

}

module_init(atmel_ramc_init);

device_initcall(atmel_ramc_init);
 


MODULE_LICENSE("GPL v2");

MODULE_AUTHOR("Alexandre Belloni <alexandre.belloni@free-electrons.com>");

MODULE_DESCRIPTION("Atmel (Multi-port DDR-)SDRAM Controller");