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

Commit f9d6fa5d 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 for 4.4" from Nicolas Ferre:
- removal of a useless defconfig option
- removal of some legacy DT pieces
- use of the proper watchdog compatible string
- addition of some sama5d2 Xplained nodes now that the MFD include is in place
- update of the MAINTAINERS entries for some Atmel drivers

* tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  MAINTAINERS: Atmel drivers: change NAND and ISI entries
  ARM: at91/dt: sama5d2 Xplained: add several devices
  ARM: at91/dt: remove bootargs
  ARM: at91/dt: remove leftovers clock definition
  ARM: at91/dt: replace gpio-key,wakeup with wakeup-source property
  ARM: at91/dt: sama5d4: change watchdog compatible
  ARM: at91/defconfig: remove CONFIG_SSB from Atmel defconfigs
parents a203a2a9 50cb2efa

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -1931,7 +1931,7 @@ S: Supported 
F:	drivers/i2c/busses/i2c-at91.c



ATMEL ISI DRIVER

M:	Josh Wu <josh.wu@atmel.com>

M:	Ludovic Desroches <ludovic.desroches@atmel.com>

L:	linux-media@vger.kernel.org

S:	Supported

F:	drivers/media/platform/soc_camera/atmel-isi.c
@@ -1950,7 +1950,8 @@ S: Supported 
F:	drivers/net/ethernet/cadence/



ATMEL NAND DRIVER

M:	Josh Wu <josh.wu@atmel.com>

M:	Wenyou Yang <wenyou.yang@atmel.com>

M:	Josh Wu <rainyfeeling@outlook.com>

L:	linux-mtd@lists.infradead.org

S:	Supported

F:	drivers/mtd/nand/atmel_nand*

arch/arm/boot/dts/animeo_ip.dts

+3 −3
Original line number Diff line number Diff line
@@ -155,21 +155,21 @@ 
			label = "keyswitch_in";

			gpios = <&pioB 1 GPIO_ACTIVE_HIGH>;

			linux,code = <28>;

			gpio-key,wakeup;

			wakeup-source;

		};



		error_in {

			label = "error_in";

			gpios = <&pioB 2 GPIO_ACTIVE_HIGH>;

			linux,code = <29>;

			gpio-key,wakeup;

			wakeup-source;

		};



		btn {

			label = "btn";

			gpios = <&pioC 23 GPIO_ACTIVE_HIGH>;

			linux,code = <31>;

			gpio-key,wakeup;

			wakeup-source;

		};

	};

};

arch/arm/boot/dts/at91-foxg20.dts

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ 
			label = "Button";

			gpios = <&pioC 4 GPIO_ACTIVE_LOW>;

			linux,code = <0x103>;

			gpio-key,wakeup;

			wakeup-source;

		};

	};

};

arch/arm/boot/dts/at91-kizbox.dts

+2 −11
Original line number Diff line number Diff line
@@ -24,15 +24,6 @@ 
	};



	clocks {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		main_clock: clock@0 {

			compatible = "atmel,osc", "fixed-clock";

			clock-frequency = <18432000>;

		};



		main_xtal {

			clock-frequency = <18432000>;

		};
@@ -94,14 +85,14 @@ 
			label = "PB_RST";

			gpios = <&pioB 30 GPIO_ACTIVE_HIGH>;

			linux,code = <0x100>;

			gpio-key,wakeup;

			wakeup-source;

		};



		user {

			label = "PB_USER";

			gpios = <&pioB 31 GPIO_ACTIVE_HIGH>;

			linux,code = <0x101>;

			gpio-key,wakeup;

			wakeup-source;

		};

	};

arch/arm/boot/dts/at91-kizbox2.dts

+3 −3
Original line number Diff line number Diff line
@@ -171,21 +171,21 @@ 
			label = "PB_PROG";

			gpios = <&pioE 27 GPIO_ACTIVE_LOW>;

			linux,code = <0x102>;

			gpio-key,wakeup;

			wakeup-source;

		};



		reset {

			label = "PB_RST";

			gpios = <&pioE 29 GPIO_ACTIVE_LOW>;

			linux,code = <0x100>;

			gpio-key,wakeup;

			wakeup-source;

		};



		user {

			label = "PB_USER";

			gpios = <&pioE 31 GPIO_ACTIVE_HIGH>;

			linux,code = <0x101>;

			gpio-key,wakeup;

			wakeup-source;

		};

	};