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

Commit 6ce041ab authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-drivers' of git://github.com/at91linux/linux-at91 into next/drivers 



Merge "First batch of AT91 drivers for 3.18" from Nicolas Ferre:

- reset, poweroff and ram drivers are moved to their proper
  location instead of being in mach-at91 directory. They now use
  the appropriate frameworks.
- big amount of removal of these machine specific drivers and use
  of the newly created drivers. This lead to an overhaul of the setup.c AT91
  startup code.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>

* tag 'at91-drivers' of git://github.com/at91linux/linux-at91: (31 commits)
  power: reset: at91-poweroff: fix wakeup status register index
  ARM: at91/power/reset: fix Kconfig "depends on" directive
  ARM: at91: fix ramc standby function registration
  ARM: at91: Remove rstc and shdwc headers
  ARM: at91: Remove rstc and shdwnc global base addresses
  ARM: at91/pm: Remove show_reset_status function
  ARM: at91: Remove poweroff code
  ARM: at91: Register the poweroff driver
  ARM: at91: Remove poweroff DT probing
  ARM: at91: Remove reset code from the machine code
  ARM: at91: Call at91_register_devices in the board files
  ARM: at91: Probe the reset driver
  ARM: at91/soc: Introduce register_devices callback
  ARM: at91: Remove the old-style reset probing
  ARM: at91: Rework ramc mapping code
  ARM: at91: setup: Switch to pr_fmt
  ARM: at91: remove old irq material
  ARM: at91: make use of the new AIC driver for dt enabled boards
  ARM: at91: enclose at91_aic_xx calls in IS_ENABLED(CONFIG_OLD_IRQ_AT91) blocks
  ARM: at91: introduce OLD_IRQ_AT91 Kconfig option
  ...
parents 52addcf9 405a72c5

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

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

			"atmel,at91sam9260-sdramc",

			"atmel,at91sam9g45-ddramc",

			"atmel,sama5d3-ddramc",

- reg: Should contain registers location and length

  For at91sam9263 and at91sam9g45 you must specify 2 entries.



Examples:
@@ -71,12 +71,6 @@ Examples: 
		reg = <0xffffe800 0x200>;

	};



	ramc0: ramc@ffffe400 {

		compatible = "atmel,at91sam9g45-ddramc";

		reg = <0xffffe400 0x200

		       0xffffe600 0x200>;

	};



SHDWC Shutdown Controller



required properties:

arch/arm/boot/dts/at91sam9263.dtsi

+7 −3
Original line number Diff line number Diff line
@@ -345,10 +345,14 @@ 
				};

			};



			ramc: ramc@ffffe200 {

			ramc0: ramc@ffffe200 {

				compatible = "atmel,at91sam9260-sdramc";

				reg = <0xffffe200 0x200

				       0xffffe800 0x200>;

				reg = <0xffffe200 0x200>;

			};



			ramc1: ramc@ffffe800 {

				compatible = "atmel,at91sam9260-sdramc";

				reg = <0xffffe800 0x200>;

			};



			pit: timer@fffffd30 {

arch/arm/boot/dts/at91sam9g45.dtsi

+8 −2
Original line number Diff line number Diff line
@@ -96,8 +96,14 @@ 


			ramc0: ramc@ffffe400 {

				compatible = "atmel,at91sam9g45-ddramc";

				reg = <0xffffe400 0x200

				       0xffffe600 0x200>;

				reg = <0xffffe400 0x200>;

				clocks = <&ddrck>;

				clock-names = "ddrck";

			};



			ramc1: ramc@ffffe600 {

				compatible = "atmel,at91sam9g45-ddramc";

				reg = <0xffffe600 0x200>;

				clocks = <&ddrck>;

				clock-names = "ddrck";

			};

arch/arm/boot/dts/at91sam9n12.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ 
			ramc0: ramc@ffffe800 {

				compatible = "atmel,at91sam9g45-ddramc";

				reg = <0xffffe800 0x200>;

				clocks = <&ddrck>;

				clock-names = "ddrck";

			};



			pmc: pmc@fffffc00 {

arch/arm/boot/dts/at91sam9x5.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@ 
			ramc0: ramc@ffffe800 {

				compatible = "atmel,at91sam9g45-ddramc";

				reg = <0xffffe800 0x200>;

				clocks = <&ddrck>;

				clock-names = "ddrck";

			};



			pmc: pmc@fffffc00 {