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

Commit e657ce68 authored by Nicolas Ferre's avatar Nicolas Ferre
Browse files

Merge tag 'at91-drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux 

Pull AT91 reset, poweroff and ram drivers from Maxime Ripard:
 "This tag holds the various new drivers introduced to move code that used to be
  in mach-at91 over to the proper frameworks.

  These files are the reboot and poweroff code for all AT91 SoCs but the RM9200,
  and the ram controller driver is not doing much at the time, except for grabing
  the RAM clock in order to leave it always enabled."

Conflicts:
	arch/arm/mach-at91/Kconfig
parents 39333610 ae499f0f

Documentation/devicetree/bindings/arm/atmel-at91.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -61,6 +61,7 @@ RAMC SDRAM/DDR Controller required properties: 
- compatible: Should be "atmel,at91rm9200-sdramc",

- compatible: Should be "atmel,at91rm9200-sdramc",

			"atmel,at91sam9260-sdramc",

			"atmel,at91sam9260-sdramc",

			"atmel,at91sam9g45-ddramc",

			"atmel,at91sam9g45-ddramc",

			"atmel,sama5d3-ddramc",

- reg: Should contain registers location and length

- reg: Should contain registers location and length

  For at91sam9263 and at91sam9g45 you must specify 2 entries.

  For at91sam9263 and at91sam9g45 you must specify 2 entries.

arch/arm/mach-at91/Kconfig

+4 −0
Original line number Original line Diff line number Diff line
@@ -53,6 +53,8 @@ config SOC_AT91SAM9 
	select ATMEL_AIC_IRQ if !OLD_IRQ_AT91

	select ATMEL_AIC_IRQ if !OLD_IRQ_AT91

	select CPU_ARM926T

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select MEMORY if USE_OF

	select ATMEL_SDRAMC if USE_OF





config SOC_SAMA5

config SOC_SAMA5

	bool

	bool
@@ -61,6 +63,8 @@ config SOC_SAMA5 
	select CPU_V7

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select USE_OF

	select USE_OF

	select MEMORY

	select ATMEL_SDRAMC





menu "Atmel AT91 System-on-Chip"

menu "Atmel AT91 System-on-Chip"

arch/arm/mach-at91/setup.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -385,6 +385,7 @@ static struct of_device_id ramc_ids[] = { 
	{ .compatible = "atmel,at91rm9200-sdramc", .data = at91rm9200_standby },

	{ .compatible = "atmel,at91rm9200-sdramc", .data = at91rm9200_standby },

	{ .compatible = "atmel,at91sam9260-sdramc", .data = at91sam9_sdram_standby },

	{ .compatible = "atmel,at91sam9260-sdramc", .data = at91sam9_sdram_standby },

	{ .compatible = "atmel,at91sam9g45-ddramc", .data = at91_ddr_standby },

	{ .compatible = "atmel,at91sam9g45-ddramc", .data = at91_ddr_standby },

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

	{ /*sentinel*/ }

	{ /*sentinel*/ }

};

};

drivers/clk/at91/clk-system.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -119,13 +119,7 @@ at91_clk_register_system(struct at91_pmc *pmc, const char *name, 
	init.ops = &system_ops;

	init.ops = &system_ops;

	init.parent_names = &parent_name;

	init.parent_names = &parent_name;

	init.num_parents = 1;

	init.num_parents = 1;

	/*

	init.flags = CLK_SET_RATE_PARENT;

	 * CLK_IGNORE_UNUSED is used to avoid ddrck switch off.

	 * TODO : we should implement a driver supporting at91 ddr controller

	 * (see drivers/memory) which would request and enable the ddrck clock.

	 * When this is done we will be able to remove CLK_IGNORE_UNUSED flag.

	 */

	init.flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED;





	sys->id = id;

	sys->id = id;

	sys->hw.init = &init;

	sys->hw.init = &init;

drivers/memory/Kconfig

+10 −0
Original line number Original line Diff line number Diff line
@@ -7,6 +7,16 @@ menuconfig MEMORY 




if MEMORY

if MEMORY





config ATMEL_SDRAMC

	bool "Atmel (Multi-port DDR-)SDRAM Controller"

	default y

	depends on ARCH_AT91 && OF

	help

	  This driver is for Atmel SDRAM Controller or Atmel Multi-port

	  DDR-SDRAM Controller available on Atmel AT91SAM9 and SAMA5 SoCs.

	  Starting with the at91sam9g45, this controller supports SDR, DDR and

	  LP-DDR memories.



config TI_AEMIF

config TI_AEMIF

	tristate "Texas Instruments AEMIF driver"

	tristate "Texas Instruments AEMIF driver"

	depends on (ARCH_DAVINCI || ARCH_KEYSTONE) && OF

	depends on (ARCH_DAVINCI || ARCH_KEYSTONE) && OF