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

Merge tag 'at91-dt-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt 

AT91 dt for 5.13:

- two little fixes (typo, W=1)
- a change in gpio button keycode for recent boards

* tag 'at91-dt-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: sama5d2: add ETB and ETM unit name
  ARM: dts: at91: change the key code of the gpio key
  ARM: dts: at91: Fix a typo

Link: https://lore.kernel.org/r/20210407114415.13180-1-nicolas.ferre@microchip.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2ce5e1b0 4d930c42

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

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */

/dts-v1/;

#include "sam9x60.dtsi"

#include <dt-bindings/input/input.h>



/ {

	model = "Microchip SAM9X60-EK";
@@ -84,7 +85,7 @@ 
		sw1 {

			label = "SW1";

			gpios = <&pioD 18 GPIO_ACTIVE_LOW>;

			linux,code=<0x104>;

			linux,code=<KEY_PROG1>;

			wakeup-source;

		};

	};

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

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include "at91-sama5d27_som1.dtsi"

#include <dt-bindings/mfd/atmel-flexcom.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>



/ {

	model = "Atmel SAMA5D27 SOM1 EK";
@@ -466,7 +467,7 @@ 
		pb4 {

			label = "USER";

			gpios = <&pioA PIN_PA29 GPIO_ACTIVE_LOW>;

			linux,code = <0x104>;

			linux,code = <KEY_PROG1>;

			wakeup-source;

		};

	};

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

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */

/dts-v1/;

#include "at91-sama5d27_wlsom1.dtsi"

#include <dt-bindings/input/input.h>



/ {

	model = "Microchip SAMA5D27 WLSOM1 EK";
@@ -35,7 +36,7 @@ 
		sw4 {

			label = "USER BUTTON";

			gpios = <&pioA PIN_PB2 GPIO_ACTIVE_LOW>;

			linux,code = <0x104>;

			linux,code = <KEY_PROG1>;

			wakeup-source;

		};

	};

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

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include "sama5d2.dtsi"

#include "sama5d2-pinfunc.h"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/mfd/atmel-flexcom.h>



/ {
@@ -51,7 +52,7 @@ 
		sw4 {

			label = "USER_PB1";

			gpios = <&pioA PIN_PD0 GPIO_ACTIVE_LOW>;

			linux,code = <0x104>;

			linux,code = <KEY_PROG1>;

			wakeup-source;

		};

	};

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

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include "sama5d2-pinfunc.h"

#include <dt-bindings/mfd/atmel-flexcom.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/pinctrl/at91.h>



/ {
@@ -402,7 +403,7 @@ 
		bp1 {

			label = "PB_USER";

			gpios = <&pioA PIN_PA10 GPIO_ACTIVE_LOW>;

			linux,code = <0x104>;

			linux,code = <KEY_PROG1>;

			wakeup-source;

		};

	};