mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-22 23:45:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2021-04-07 20:48:17 +02:00
parent 2ce5e1b010 4d930c421e
commit e2b064fec8
11 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/boot/dts/at91-sam9x60ek.dts
View File

@@ -8,6 +8,7 @@
*/
/dts-v1/;
#include "sam9x60.dtsi"
#include <dt-bindings/input/input.h>
/ {
model = "Microchip SAM9X60-EK";
@@ -84,7 +85,7 @@ gpio_keys {
sw1 {
label = "SW1";
gpios = <&pioD 18 GPIO_ACTIVE_LOW>;
linux,code=<0x104>;
linux,code=<KEY_PROG1>;
wakeup-source;
};
};

3
arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
View File

@@ -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 @@ gpio_keys {
pb4 {
label = "USER";
gpios = <&pioA PIN_PA29 GPIO_ACTIVE_LOW>;
linux,code = <0x104>;
linux,code = <KEY_PROG1>;
wakeup-source;
};
};

3
arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts
View File

@@ -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 @@ gpio_keys {
sw4 {
label = "USER BUTTON";
gpios = <&pioA PIN_PB2 GPIO_ACTIVE_LOW>;
linux,code = <0x104>;
linux,code = <KEY_PROG1>;
wakeup-source;
};
};

3
arch/arm/boot/dts/at91-sama5d2_icp.dts
View File

@@ -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 @@ gpio_keys {
sw4 {
label = "USER_PB1";
gpios = <&pioA PIN_PD0 GPIO_ACTIVE_LOW>;
linux,code = <0x104>;
linux,code = <KEY_PROG1>;
wakeup-source;
};
};

3
arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
View File

@@ -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 @@ gpio_keys {
bp1 {
label = "PB_USER";
gpios = <&pioA PIN_PA10 GPIO_ACTIVE_LOW>;
linux,code = <0x104>;
linux,code = <KEY_PROG1>;
wakeup-source;
};
};

3
arch/arm/boot/dts/at91-sama5d2_xplained.dts
View File

@@ -10,6 +10,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/regulator/active-semi,8945a-regulator.h>
/ {
@@ -712,7 +713,7 @@ gpio_keys {
bp1 {
label = "PB_USER";
gpios = <&pioA PIN_PB9 GPIO_ACTIVE_LOW>;
linux,code = <0x104>;
linux,code = <KEY_PROG1>;
wakeup-source;
};
};

3
arch/arm/boot/dts/at91-sama5d3_xplained.dts
View File

@@ -7,6 +7,7 @@
*/
/dts-v1/;
#include "sama5d36.dtsi"
#include <dt-bindings/input/input.h>
/ {
model = "SAMA5D3 Xplained";
@@ -354,7 +355,7 @@ gpio_keys {
bp3 {
label = "PB_USER";
gpios = <&pioE 29 GPIO_ACTIVE_LOW>;
linux,code = <0x104>;
linux,code = <KEY_PROG1>;
wakeup-source;
};
};

3
arch/arm/boot/dts/at91sam9260ek.dts
View File

@@ -7,6 +7,7 @@
*/
/dts-v1/;
#include "at91sam9260.dtsi"
#include <dt-bindings/input/input.h>
/ {
model = "Atmel at91sam9260ek";
@@ -156,7 +157,7 @@ btn3 {
btn4 {
label = "Button 4";
gpios = <&pioA 31 GPIO_ACTIVE_LOW>;
linux,code = <0x104>;
linux,code = <KEY_PROG1>;
wakeup-source;
};
};

3
arch/arm/boot/dts/at91sam9g20ek_common.dtsi
View File

@@ -5,6 +5,7 @@
* Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
*/
#include "at91sam9g20.dtsi"
#include <dt-bindings/input/input.h>
/ {
@@ -234,7 +235,7 @@ btn3 {
btn4 {
label = "Button 4";
gpios = <&pioA 31 GPIO_ACTIVE_LOW>;
linux,code = <0x104>;
linux,code = <KEY_PROG1>;
wakeup-source;
};
};

4
arch/arm/boot/dts/sama5d2.dtsi
View File

@@ -40,7 +40,7 @@ pmu {
interrupts = <2 IRQ_TYPE_LEVEL_HIGH 0>;
};
etb {
etb@740000 {
compatible = "arm,coresight-etb10", "arm,primecell";
reg = <0x740000 0x1000>;
@@ -56,7 +56,7 @@ etb_in: endpoint {
};
};
etm {
etm@73C000 {
compatible = "arm,coresight-etm3x", "arm,primecell";
reg = <0x73C000 0x1000>;

2
arch/arm/boot/dts/sama5d3.dtsi
View File

@@ -709,7 +709,7 @@ pinctrl_mmc0_dat4_7: mmc0_dat4_7 {
atmel,pins =
<AT91_PIOD 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD5 periph A MCI0_DA4 with pullup, conflicts with TIOA0, PWMH2 */
AT91_PIOD 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD6 periph A MCI0_DA5 with pullup, conflicts with TIOB0, PWML2 */
AT91_PIOD 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD7 periph A MCI0_DA6 with pullup, conlicts with TCLK0, PWMH3 */
AT91_PIOD 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD7 periph A MCI0_DA6 with pullup, conflicts with TCLK0, PWMH3 */
AT91_PIOD 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PD8 periph A MCI0_DA7 with pullup, conflicts with PWML3 */
};
};