AT91 DT for 5.1

- Enable QSPI NOR on sama5d2 SoM1
  - replace deprecated gpio-key,wakeup property
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEXx9Viay1+e7J/aM4AyWl4gNJNJIFAlxjHMkACgkQAyWl4gNJ
 NJLRDA//Y9ObFLwsaMkn5mNilO42hxTQq4A/bd/Vj9gskK/JBqK6d1sWPM7GrOyB
 DgjXnVtiFEithqs6ZVTxMt3rKA4Dc5/R3nN8kzzqeto26GHTSCsb/mGqZdAUWOJ7
 GCN5ycL4I8PMIC9/VhBey4esZIh3iAzienh28+Eq3KKGSveWPKjjWrS8Yj4Z0HcS
 mr5v7h2Uf+4xDp4gF8/Re66X2v9pBpLQWV/sI1RJVppNJPX4XK6owfrb/ZhU8jl4
 3UPoo77yULAfd4Sgcmx1xFE3TGVeIeiuHYYXkWmvkz2bZTsYf4bkuzVGN63pXAVI
 Wtg0mUtMmkAkAvuvVWxRPVIA9qQl6pxeGIyVtmp4XXOE5xVL5njWsTtNYu6yXmMe
 fcC+WKrzTCIJ0leevTiCmaLb5Ky9uivD82KK5TArjc0/gaEWgyUb3/W/R20N9bQU
 k4BEAURklOqp1cNEH1A93S9fnWZYx71zbY75TAJigRF+hOxYl+IaozhqsXK3g1XR
 hMXGGdmh5o54NLdraygzpNkxmCc3B0T4STpfclw26LCE3UU6aOvtZjHjK7KGBz6u
 xFEUnanxiqMTwKwZ83psm7MEqdv1267BIR3sBdTMo067eAqoEhnJ7lmYYP7JDgA7
 mvHEPxvWMIEOjR/+B1/kRRzkb3siLO90Q2NmZfuNxeY3Mti2jf0=
 =NzVr
 -----END PGP SIGNATURE-----

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

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
commit 75ed0b2d2d
5 changed files with 38 additions and 4 deletions

View File

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

View File

@ -62,6 +62,20 @@ main_xtal {
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 @@ ethernet-phy@0 {
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>,

View File

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

View File

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

View File

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