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

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

Merge tag 'at91-fixes' of... 

Merge tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into fixes

Merge "First fixes batch for AT91 on 4.0" from Nicolas Ferre:

- PM slowclock fixes for DDR and timeouts
- fix some DT entries
- little defconfig updates
- the removal of a harmful watchdog option + its detailed documentation

* tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/dt: keep watchdog running in idle mode
  dts: Documentation: AT91 Watchdog, explain what atmel,idle-halt property really do
  ARM: at91/defconfig: add at91rm9200 ethernet support
  ARM: at91/defconfig: remove CONFIG_SYSFS_DEPRECATED
  ARM: at91/dt: at91sam9260: fix usart pinctrl
  ARM: at91/dt: sama5d4: add missing alias for i2c0
  ARM: at91/dt: at91sam9263: Fixup sram1 device tree node
  ARM: at91: pm: fix SRAM allocation
  ARM: at91: pm: fix at91rm9200 standby
  pm: at91: Workaround DDRSDRC self-refresh bug with LPDDR1 memories.
  pm: at91: pm_slowclock: fix suspend/resume hang up in timeouts
parents 0be32d2f 2141102e

Documentation/devicetree/bindings/watchdog/atmel-wdt.txt

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,11 @@ Optional properties: 
- atmel,disable : Should be present if you want to disable the watchdog.

- atmel,idle-halt : Should be present if you want to stop the watchdog when

	entering idle state.

	CAUTION: This property should be used with care, it actually makes the

	watchdog not counting when the CPU is in idle state, therefore the

	watchdog reset time depends on mean CPU usage and will not reset at all

	if the CPU stop working while it is in idle state, which is probably

	not what you want.

- atmel,dbg-halt : Should be present if you want to stop the watchdog when

	entering debug state.

arch/arm/boot/dts/at91sam9260.dtsi

+2 −3
Original line number Diff line number Diff line
@@ -494,12 +494,12 @@ 


					pinctrl_usart3_rts: usart3_rts-0 {

						atmel,pins =

							<AT91_PIOB 8 AT91_PERIPH_B AT91_PINCTRL_NONE>;	/* PC8 periph B */

							<AT91_PIOC 8 AT91_PERIPH_B AT91_PINCTRL_NONE>;

					};



					pinctrl_usart3_cts: usart3_cts-0 {

						atmel,pins =

							<AT91_PIOB 10 AT91_PERIPH_B AT91_PINCTRL_NONE>;	/* PC10 periph B */

							<AT91_PIOC 10 AT91_PERIPH_B AT91_PINCTRL_NONE>;

					};

				};
@@ -976,7 +976,6 @@ 
				atmel,watchdog-type = "hardware";

				atmel,reset-type = "all";

				atmel,dbg-halt;

				atmel,idle-halt;

				status = "disabled";

			};

arch/arm/boot/dts/at91sam9263.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 


	sram1: sram@00500000 {

		compatible = "mmio-sram";

		reg = <0x00300000 0x4000>;

		reg = <0x00500000 0x4000>;

	};



	ahb {
@@ -905,7 +905,6 @@ 
				atmel,watchdog-type = "hardware";

				atmel,reset-type = "all";

				atmel,dbg-halt;

				atmel,idle-halt;

				status = "disabled";

			};

arch/arm/boot/dts/at91sam9g45.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -1116,7 +1116,6 @@ 
				atmel,watchdog-type = "hardware";

				atmel,reset-type = "all";

				atmel,dbg-halt;

				atmel,idle-halt;

				status = "disabled";

			};

arch/arm/boot/dts/at91sam9n12.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -894,7 +894,6 @@ 
				atmel,watchdog-type = "hardware";

				atmel,reset-type = "all";

				atmel,dbg-halt;

				atmel,idle-halt;

				status = "disabled";

			};