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

Commit d7c82daf authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-cleanup' of... 

Merge tag 'at91-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/cleanup

Merge "First batch of cleanup for 4.2" from Alexandre Belloni:

 - use syscon in the ata and cf drivers to configure the SMC and drop
 sam9_smc.c
 - switch the at91rm9200 memory controller to syscon
 - remove last useless headers
 - remove now useless Makefile.boot

* tag 'at91-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: at91: remove useless Makefile.boot
  ARM: at91: remove at91rm9200_sdramc.h
  ARM: at91: remove mach/at91_ramc.h and mach/at91rm9200_mc.h
  ARM: at91/pm: use the atmel-mc syscon defines
  pcmcia: at91_cf: Use syscon to configure the MC/smc
  ARM: at91: declare the at91rm9200 memory controller as a syscon
  mfd: syscon: Add Atmel MC (Memory Controller) registers definition
  ARM: at91: drop sam9_smc.c
  ata: at91: use syscon to configure the smc
parents 2ed25580 196b44ea

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

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ Example: 
	};



RAMC SDRAM/DDR Controller required properties:

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

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

			"atmel,at91sam9260-sdramc",

			"atmel,at91sam9g45-ddramc",

			"atmel,sama5d3-ddramc",

arch/arm/boot/dts/at91rm9200.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ 
			};



			ramc0: ramc@ffffff00 {

				compatible = "atmel,at91rm9200-sdramc";

				compatible = "atmel,at91rm9200-sdramc", "syscon";

				reg = <0xffffff00 0x100>;

			};

arch/arm/mach-at91/Makefile

+0 −5
Original line number Diff line number Diff line 
#

# Makefile for the linux kernel.

#

ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include

asflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include



obj-y		:= soc.o



obj-$(CONFIG_SOC_AT91SAM9)	+= sam9_smc.o



# CPU-specific support

obj-$(CONFIG_SOC_AT91RM9200)	+= at91rm9200.o

obj-$(CONFIG_SOC_AT91SAM9)	+= at91sam9.o

arch/arm/mach-at91/Makefile.boot

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
# Note: the following conditions must always be true:

#   ZRELADDR == virt_to_phys(TEXTADDR)

#   PARAMS_PHYS must be within 4MB of ZRELADDR

#   INITRD_PHYS must be in RAM



   zreladdr-y	+= 0x20008000

params_phys-y	:= 0x20000100

initrd_phys-y	:= 0x20410000

arch/arm/mach-at91/include/mach/at91_ramc.h

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
/*

 * Header file for the Atmel RAM Controller

 *

 * Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

 *

 * Under GPLv2 only

 */



#ifndef __AT91_RAMC_H__

#define __AT91_RAMC_H__



#ifndef __ASSEMBLY__

extern void __iomem *at91_ramc_base[];



#define at91_ramc_read(id, field) \

	__raw_readl(at91_ramc_base[id] + field)



#define at91_ramc_write(id, field, value) \

	__raw_writel(value, at91_ramc_base[id] + field)

#else

.extern at91_ramc_base

#endif



#include <soc/at91/at91rm9200_sdramc.h>

#include <soc/at91/at91sam9_ddrsdr.h>

#include <soc/at91/at91sam9_sdramc.h>



#endif /* __AT91_RAMC_H__ */