shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
AT91 DT for 5.1

 - Enable QSPI NOR on sama5d2 SoM1
 - replace deprecated gpio-key,wakeup property

* tag 'at91-5.1-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: replace gpio-key,wakeup with wakeup-source property
  ARM: dts: at91: at91-sama5d27_som1_ek: enable qspi1 memory
  ARM: dts: at91: at91-sama5d27_som1: add QSPI1 + SPI NOR memory nodes

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2019-02-15 16:13:31 +01:00
parent e1a38b7504 31f031f73a
commit 75ed0b2d2d
5 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/at91-nattis-2-natte-2.dts
View File

@@ -22,7 +22,7 @@
wakeup {
label = "Wakeup";
linux,code = <10>;
gpio-key,wakeup;
wakeup-source;
gpios = <&pioB 27 GPIO_ACTIVE_LOW>;
};
};

30
arch/arm/boot/dts/at91-sama5d27_som1.dtsi
View File

@@ -62,6 +62,20 @@
ahb {
apb {
qspi1: spi@f0024000 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_qspi1_default>;
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <80000000>;
spi-tx-bus-width = <4>;
spi-rx-bus-width = <4>;
m25p,fast-read;
};
};
macb0: ethernet@f8008000 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_macb0_default>;
@@ -78,6 +92,22 @@
pinctrl@fc038000 {
pinctrl_qspi1_default: qspi1_default {
sck_cs {
pinmux = <PIN_PB5__QSPI1_SCK>,
<PIN_PB6__QSPI1_CS>;
bias-disable;
};
data {
pinmux = <PIN_PB7__QSPI1_IO0>,
<PIN_PB8__QSPI1_IO1>,
<PIN_PB9__QSPI1_IO2>,
<PIN_PB10__QSPI1_IO3>;
bias-pull-up;
};
};
pinctrl_macb0_default: macb0_default {
pinmux = <PIN_PD9__GTXCK>,
<PIN_PD10__GTXEN>,

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

@@ -109,6 +109,10 @@
status = "okay";
};
qspi1: spi@f0024000 {
status = "okay";
};
spi0: spi@f8000000 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_spi0_default>;

2
arch/arm/boot/dts/at91-wb45n.dts
View File

@@ -22,7 +22,7 @@
label = "IRQBTN";
linux,code = <99>;
gpios = <&pioB 18 GPIO_ACTIVE_LOW>;
gpio-key,wakeup = <1>;
wakeup-source;
};
};
};

4
arch/arm/boot/dts/at91-wb50n.dts
View File

@@ -23,7 +23,7 @@
label = "BTNESC";
linux,code = <1>; /* ESC button */
gpios = <&pioA 10 GPIO_ACTIVE_LOW>;
gpio-key,wakeup = <1>;
wakeup-source;
};
irqbtn@31 {
@@ -31,7 +31,7 @@
label = "IRQBTN";
linux,code = <99>; /* SysReq button */
gpios = <&pioE 31 GPIO_ACTIVE_LOW>;
gpio-key,wakeup = <1>;
wakeup-source;
};
};