Skip to content

L
linux
Commit b891e30e authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup 

From Nicolas Ferre:
Big update converting pinctrl to use macros and header files. Increases
readability and avoids typos.
Update of AT91 defconfigs and merge of defconfigs for the similar SoCs
sam9260/9g20 and sam9261/9g10.

* tag 'at91-cleanup' of git://github.com/at91linux/linux-at91:
  ARM: at91: udpate defconfigs
  ARM: at91: dt: switch to standard IRQ flag defines
  ARM: at91: dt: switch to pinctrl to pre-processor
  ARM: at91: dt: add pinctrl pre-processor define
  ARM: at91: dt: switch to standard GPIO flag defines.
  ARM: at91: dt: use #include for all device trees
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e4aa937e b3f442b0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1407 additions and 1617 deletions
arch/arm/boot/dts/aks-cdu.dts
View file @ b891e30e
......@@ -9,7 +9,7 @@
/dts-v1/;
/include/ "ge863-pro3.dtsi"
#include "ge863-pro3.dtsi"
/ {
chosen {
......@@ -46,7 +46,7 @@ macb0: ethernet@fffc4000 {
};
usb1: gadget@fffa4000 {
atmel,vbus-gpio = <&pioC 15 0>;
atmel,vbus-gpio = <&pioC 15 GPIO_ACTIVE_HIGH>;
status = "okay";
};
};
......@@ -90,23 +90,23 @@ leds {
compatible = "gpio-leds";
red {
gpios = <&pioC 10 0>;
gpios = <&pioC 10 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "none";
};
green {
gpios = <&pioA 5 1>;
gpios = <&pioA 5 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none";
default-state = "on";
};
yellow {
gpios = <&pioB 20 1>;
gpios = <&pioB 20 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none";
};
blue {
gpios = <&pioB 21 1>;
gpios = <&pioB 21 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none";
};
};
......
arch/arm/boot/dts/animeo_ip.dts
View file @ b891e30e
......@@ -7,7 +7,7 @@
*/
/dts-v1/;
/include/ "at91sam9260.dtsi"
#include "at91sam9260.dtsi"
/ {
model = "Somfy Animeo IP";
......@@ -123,7 +123,7 @@ root@2b0000 {
usb0: ohci@00500000 {
num-ports = <2>;
atmel,vbus-gpio = <&pioB 15 1>;
atmel,vbus-gpio = <&pioB 15 GPIO_ACTIVE_LOW>;
status = "okay";
};
};
......@@ -133,23 +133,23 @@ leds {
power_green {
label = "power_green";
gpios = <&pioC 17 0>;
gpios = <&pioC 17 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
};
power_red {
label = "power_red";
gpios = <&pioA 2 0>;
gpios = <&pioA 2 GPIO_ACTIVE_HIGH>;
};
tx_green {
label = "tx_green";
gpios = <&pioC 19 0>;
gpios = <&pioC 19 GPIO_ACTIVE_HIGH>;
};
tx_red {
label = "tx_red";
gpios = <&pioC 18 0>;
gpios = <&pioC 18 GPIO_ACTIVE_HIGH>;
};
};
......@@ -160,21 +160,21 @@ gpio_keys {
keyswitch_in {
label = "keyswitch_in";
gpios = <&pioB 1 0>;
gpios = <&pioB 1 GPIO_ACTIVE_HIGH>;
linux,code = <28>;
gpio-key,wakeup;
};
error_in {
label = "error_in";
gpios = <&pioB 2 0>;
gpios = <&pioB 2 GPIO_ACTIVE_HIGH>;
linux,code = <29>;
gpio-key,wakeup;
};
btn {
label = "btn";
gpios = <&pioC 23 0>;
gpios = <&pioC 23 GPIO_ACTIVE_HIGH>;
linux,code = <31>;
gpio-key,wakeup;
};
......
arch/arm/boot/dts/at91-ariag25.dts
View file @ b891e30e
......@@ -7,7 +7,7 @@
* Licensed under GPLv2 or later.
*/
/dts-v1/;
/include/ "at91sam9g25.dtsi"
#include "at91sam9g25.dtsi"
/ {
model = "Acme Systems Aria G25";
......@@ -156,7 +156,7 @@ leds {
/* little green LED in middle of Aria G25 module */
aria_led {
label = "aria_led";
gpios = <&pioB 8 0>; /* PB8 */
gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */
linux,default-trigger = "heartbeat";
};
......@@ -164,7 +164,7 @@ aria_led {
onewire@0 {
compatible = "w1-gpio";
gpios = <&pioA 21 1>;
gpios = <&pioA 21 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_w1_0>;
};
......
arch/arm/boot/dts/at91rm9200.dtsi
View file @ b891e30e
This diff is collapsed.
arch/arm/boot/dts/at91rm9200ek.dts
View file @ b891e30e
......@@ -6,7 +6,7 @@
* Licensed under GPLv2 only
*/
/dts-v1/;
/include/ "at91rm9200.dtsi"
#include "at91rm9200.dtsi"
/ {
model = "Atmel AT91RM9200 evaluation kit";
......@@ -50,7 +50,7 @@ macb0: ethernet@fffbc000 {
};
usb1: gadget@fffb0000 {
atmel,vbus-gpio = <&pioD 4 0>;
atmel,vbus-gpio = <&pioD 4 GPIO_ACTIVE_HIGH>;
status = "okay";
};
};
......@@ -66,19 +66,19 @@ leds {
ds2 {
label = "green";
gpios = <&pioB 0 0x1>;
gpios = <&pioB 0 GPIO_ACTIVE_LOW>;
linux,default-trigger = "mmc0";
};
ds4 {
label = "yellow";
gpios = <&pioB 1 0x1>;
gpios = <&pioB 1 GPIO_ACTIVE_LOW>;
linux,default-trigger = "heartbeat";
};
ds6 {
label = "red";
gpios = <&pioB 2 0x1>;
gpios = <&pioB 2 GPIO_ACTIVE_LOW>;
};
};
};
arch/arm/boot/dts/at91sam9260.dtsi
View file @ b891e30e
This diff is collapsed.
arch/arm/boot/dts/at91sam9263.dtsi
View file @ b891e30e
This diff is collapsed.
arch/arm/boot/dts/at91sam9263ek.dts
View file @ b891e30e
......@@ -6,7 +6,7 @@
* Licensed under GPLv2 only
*/
/dts-v1/;
/include/ "at91sam9263.dtsi"
#include "at91sam9263.dtsi"
/ {
model = "Atmel at91sam9263ek";
......@@ -51,7 +51,7 @@ macb0: ethernet@fffbc000 {
};
usb1: gadget@fff78000 {
atmel,vbus-gpio = <&pioA 25 0>;
atmel,vbus-gpio = <&pioA 25 GPIO_ACTIVE_HIGH>;
status = "okay";
};
......@@ -65,8 +65,8 @@ &pinctrl_mmc0_slot0_cmd_dat0
slot@0 {
reg = <0>;
bus-width = <4>;
cd-gpios = <&pioE 18 0>;
wp-gpios = <&pioE 19 0>;
cd-gpios = <&pioE 18 GPIO_ACTIVE_HIGH>;
wp-gpios = <&pioE 19 GPIO_ACTIVE_HIGH>;
};
};
......@@ -74,8 +74,8 @@ pinctrl@fffff200 {
mmc0 {
pinctrl_board_mmc0: mmc0-board {
atmel,pins =
<5 18 0x0 0x5 /* PE18 gpio CD pin pull up and deglitch */
5 19 0x0 0x1>; /* PE19 gpio WP pin pull up */
<AT91_PIOE 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH /* PE18 gpio CD pin pull up and deglitch */
AT91_PIOE 19 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PE19 gpio WP pin pull up */
};
};
};
......@@ -141,8 +141,8 @@ data@7ca0000 {
usb0: ohci@00a00000 {
num-ports = <2>;
status = "okay";
atmel,vbus-gpio = <&pioA 24 0
&pioA 21 0
atmel,vbus-gpio = <&pioA 24 GPIO_ACTIVE_HIGH
&pioA 21 GPIO_ACTIVE_HIGH
>;
};
};
......@@ -152,13 +152,13 @@ leds {
d3 {
label = "d3";
gpios = <&pioB 7 0>;
gpios = <&pioB 7 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
};
d2 {
label = "d2";
gpios = <&pioC 29 1>;
gpios = <&pioC 29 GPIO_ACTIVE_LOW>;
linux,default-trigger = "nand-disk";
};
};
......@@ -168,14 +168,14 @@ gpio_keys {
left_click {
label = "left_click";
gpios = <&pioC 5 1>;
gpios = <&pioC 5 GPIO_ACTIVE_LOW>;
linux,code = <272>;
gpio-key,wakeup;
};
right_click {
label = "right_click";
gpios = <&pioC 4 1>;
gpios = <&pioC 4 GPIO_ACTIVE_LOW>;
linux,code = <273>;
gpio-key,wakeup;
};
......
arch/arm/boot/dts/at91sam9g15.dtsi
View file @ b891e30e
......@@ -6,7 +6,7 @@
* Licensed under GPLv2.
*/
/include/ "at91sam9x5.dtsi"
#include "at91sam9x5.dtsi"
/ {
model = "Atmel AT91SAM9G15 SoC";
......
arch/arm/boot/dts/at91sam9g15ek.dts
View file @ b891e30e
......@@ -7,8 +7,8 @@
* Licensed under GPLv2 or later.
*/
/dts-v1/;
/include/ "at91sam9g15.dtsi"
/include/ "at91sam9x5ek.dtsi"
#include "at91sam9g15.dtsi"
#include "at91sam9x5ek.dtsi"
/ {
model = "Atmel AT91SAM9G15-EK";
......
arch/arm/boot/dts/at91sam9g20.dtsi
View file @ b891e30e
......@@ -6,7 +6,7 @@
* Licensed under GPLv2.
*/
/include/ "at91sam9260.dtsi"
#include "at91sam9260.dtsi"
/ {
model = "Atmel AT91SAM9G20 family SoC";
......
arch/arm/boot/dts/at91sam9g20ek.dts
View file @ b891e30e
......@@ -6,7 +6,7 @@
* Licensed under GPLv2.
*/
/dts-v1/;
/include/ "at91sam9g20ek_common.dtsi"
#include "at91sam9g20ek_common.dtsi"
/ {
model = "Atmel at91sam9g20ek";
......@@ -17,13 +17,13 @@ leds {
ds1 {
label = "ds1";
gpios = <&pioA 9 0>;
gpios = <&pioA 9 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
};
ds5 {
label = "ds5";
gpios = <&pioA 6 1>;
gpios = <&pioA 6 GPIO_ACTIVE_LOW>;
};
};
};
arch/arm/boot/dts/at91sam9g20ek_2mmc.dts
View file @ b891e30e
......@@ -6,7 +6,7 @@
* Licensed under GPLv2.
*/
/dts-v1/;
/include/ "at91sam9g20ek_common.dtsi"
#include "at91sam9g20ek_common.dtsi"
/ {
model = "Atmel at91sam9g20ek 2 mmc";
......@@ -23,7 +23,7 @@ &pinctrl_mmc0_slot0_cmd_dat0
slot@0 {
reg = <0>;
bus-width = <4>;
cd-gpios = <&pioC 2 0>;
cd-gpios = <&pioC 2 GPIO_ACTIVE_HIGH>;
};
};
......@@ -31,7 +31,7 @@ pinctrl@fffff400 {
mmc0_slot0 {
pinctrl_board_mmc0_slot0: mmc0_slot0-board {
atmel,pins =
<2 2 0x0 0x5>; /* PC2 gpio CD pin pull up and deglitch */
<AT91_PIOC 2 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PC2 gpio CD pin pull up and deglitch */
};
};
};
......@@ -43,13 +43,13 @@ leds {
ds1 {
label = "ds1";
gpios = <&pioB 9 0>;
gpios = <&pioB 9 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
};
ds5 {
label = "ds5";
gpios = <&pioB 8 1>;
gpios = <&pioB 8 GPIO_ACTIVE_LOW>;
};
};
};
arch/arm/boot/dts/at91sam9g20ek_common.dtsi
View file @ b891e30e
......@@ -5,7 +5,7 @@
*
* Licensed under GPLv2.
*/
/include/ "at91sam9g20.dtsi"
#include "at91sam9g20.dtsi"
/ {
......@@ -34,10 +34,17 @@ pinctrl@fffff400 {
board {
pinctrl_pck0_as_mck: pck0_as_mck {
atmel,pins =
<2 1 0x2 0x0>; /* PC1 periph B */
<AT91_PIOC 1 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC1 periph B */
};
};
mmc0_slot1 {
pinctrl_board_mmc0_slot1: mmc0_slot1-board {
atmel,pins =
<AT91_PIOC 9 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PC9 gpio CD pin pull up and deglitch */
};
};
};
dbgu: serial@fffff200 {
......@@ -65,7 +72,7 @@ macb0: ethernet@fffc4000 {
};
usb1: gadget@fffa4000 {
atmel,vbus-gpio = <&pioC 5 0>;
atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
status = "okay";
};
......@@ -79,16 +86,7 @@ &pinctrl_mmc0_slot1_cmd_dat0
slot@1 {
reg = <1>;
bus-width = <4>;
cd-gpios = <&pioC 9 0>;
};
};
pinctrl@fffff400 {
mmc0_slot1 {
pinctrl_board_mmc0_slot1: mmc0_slot1-board {
atmel,pins =
<2 9 0x0 0x5>; /* PC9 gpio CD pin pull up and deglitch */
};
cd-gpios = <&pioC 9 GPIO_ACTIVE_HIGH>;
};
};
......@@ -180,14 +178,14 @@ gpio_keys {
btn3 {
label = "Button 3";
gpios = <&pioA 30 1>;
gpios = <&pioA 30 GPIO_ACTIVE_LOW>;
linux,code = <0x103>;
gpio-key,wakeup;
};
btn4 {
label = "Button 4";
gpios = <&pioA 31 1>;
gpios = <&pioA 31 GPIO_ACTIVE_LOW>;
linux,code = <0x104>;
gpio-key,wakeup;
};
......
arch/arm/boot/dts/at91sam9g25.dtsi
View file @ b891e30e
......@@ -6,7 +6,7 @@
* Licensed under GPLv2.
*/
/include/ "at91sam9x5.dtsi"
#include "at91sam9x5.dtsi"
/ {
model = "Atmel AT91SAM9G25 SoC";
......
arch/arm/boot/dts/at91sam9g25ek.dts
View file @ b891e30e
......@@ -7,8 +7,8 @@
* Licensed under GPLv2 or later.
*/
/dts-v1/;
/include/ "at91sam9g25.dtsi"
/include/ "at91sam9x5ek.dtsi"
#include "at91sam9g25.dtsi"
#include "at91sam9x5ek.dtsi"
/ {
model = "Atmel AT91SAM9G25-EK";
......
arch/arm/boot/dts/at91sam9g35.dtsi
View file @ b891e30e
......@@ -6,7 +6,7 @@
* Licensed under GPLv2.
*/
/include/ "at91sam9x5.dtsi"
#include "at91sam9x5.dtsi"
/ {
model = "Atmel AT91SAM9G35 SoC";
......
arch/arm/boot/dts/at91sam9g35ek.dts
View file @ b891e30e
......@@ -7,8 +7,8 @@
* Licensed under GPLv2 or later.
*/
/dts-v1/;
/include/ "at91sam9g35.dtsi"
/include/ "at91sam9x5ek.dtsi"
#include "at91sam9g35.dtsi"
#include "at91sam9x5ek.dtsi"
/ {
model = "Atmel AT91SAM9G35-EK";
......
arch/arm/boot/dts/at91sam9g45.dtsi
View file @ b891e30e
This diff is collapsed.
arch/arm/boot/dts/at91sam9m10g45ek.dts
View file @ b891e30e
......@@ -7,7 +7,7 @@
* Licensed under GPLv2 or later.
*/
/dts-v1/;
/include/ "at91sam9g45.dtsi"
#include "at91sam9g45.dtsi"
/ {
model = "Atmel AT91SAM9M10G45-EK";
......@@ -68,7 +68,7 @@ &pinctrl_mmc0_slot0_clk_cmd_dat0
slot@0 {
reg = <0>;
bus-width = <4>;
cd-gpios = <&pioD 10 0>;
cd-gpios = <&pioD 10 GPIO_ACTIVE_HIGH>;
};
};
......@@ -81,8 +81,8 @@ &pinctrl_mmc1_slot0_clk_cmd_dat0
slot@0 {
reg = <0>;
bus-width = <4>;
cd-gpios = <&pioD 11 0>;
wp-gpios = <&pioD 29 0>;
cd-gpios = <&pioD 11 GPIO_ACTIVE_HIGH>;
wp-gpios = <&pioD 29 GPIO_ACTIVE_HIGH>;
};
};
......@@ -90,15 +90,15 @@ pinctrl@fffff200 {
mmc0 {
pinctrl_board_mmc0: mmc0-board {
atmel,pins =
<3 10 0x0 0x5>; /* PD10 gpio CD pin pull up and deglitch */
<AT91_PIOD 10 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD10 gpio CD pin pull up and deglitch */
};
};
mmc1 {
pinctrl_board_mmc1: mmc1-board {
atmel,pins =
<3 11 0x0 0x5 /* PD11 gpio CD pin pull up and deglitch */
3 29 0x0 0x1>; /* PD29 gpio WP pin pull up */
<AT91_PIOD 11 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH /* PD11 gpio CD pin pull up and deglitch */
AT91_PIOD 29 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PD29 gpio WP pin pull up */
};
};
};
......@@ -139,8 +139,8 @@ data@4000000 {
usb0: ohci@00700000 {
status = "okay";
num-ports = <2>;
atmel,vbus-gpio = <&pioD 1 1
&pioD 3 1>;
atmel,vbus-gpio = <&pioD 1 GPIO_ACTIVE_LOW
&pioD 3 GPIO_ACTIVE_LOW>;
};
usb1: ehci@00800000 {
......@@ -153,19 +153,19 @@ leds {
d8 {
label = "d8";
gpios = <&pioD 30 0>;
gpios = <&pioD 30 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
};
d6 {
label = "d6";
gpios = <&pioD 0 1>;
gpios = <&pioD 0 GPIO_ACTIVE_LOW>;
linux,default-trigger = "nand-disk";
};
d7 {
label = "d7";
gpios = <&pioD 31 1>;
gpios = <&pioD 31 GPIO_ACTIVE_LOW>;
linux,default-trigger = "mmc0";
};
};
......@@ -175,45 +175,45 @@ gpio_keys {
left_click {
label = "left_click";
gpios = <&pioB 6 1>;
gpios = <&pioB 6 GPIO_ACTIVE_LOW>;
linux,code = <272>;
gpio-key,wakeup;
};
right_click {
label = "right_click";
gpios = <&pioB 7 1>;
gpios = <&pioB 7 GPIO_ACTIVE_LOW>;
linux,code = <273>;
gpio-key,wakeup;
};
left {
label = "Joystick Left";
gpios = <&pioB 14 1>;
gpios = <&pioB 14 GPIO_ACTIVE_LOW>;
linux,code = <105>;
};
right {
label = "Joystick Right";
gpios = <&pioB 15 1>;
gpios = <&pioB 15 GPIO_ACTIVE_LOW>;
linux,code = <106>;
};
up {
label = "Joystick Up";
gpios = <&pioB 16 1>;
gpios = <&pioB 16 GPIO_ACTIVE_LOW>;
linux,code = <103>;
};
down {
label = "Joystick Down";
gpios = <&pioB 17 1>;
gpios = <&pioB 17 GPIO_ACTIVE_LOW>;
linux,code = <108>;
};
enter {
label = "Joystick Press";
gpios = <&pioB 18 1>;
gpios = <&pioB 18 GPIO_ACTIVE_LOW>;
linux,code = <28>;
};
};
......
arch/arm/boot/dts/at91sam9n12.dtsi
View file @ b891e30e
This diff is collapsed.
arch/arm/boot/dts/at91sam9n12ek.dts
View file @ b891e30e
......@@ -7,7 +7,7 @@
* Licensed under GPLv2 or later.
*/
/dts-v1/;
/include/ "at91sam9n12.dtsi"
#include "at91sam9n12.dtsi"
/ {
model = "Atmel AT91SAM9N12-EK";
......@@ -55,7 +55,7 @@ &pinctrl_mmc0_slot0_clk_cmd_dat0
slot@0 {
reg = <0>;
bus-width = <4>;
cd-gpios = <&pioA 7 0>;
cd-gpios = <&pioA 7 GPIO_ACTIVE_HIGH>;
};
};
......@@ -63,7 +63,7 @@ pinctrl@fffff400 {
mmc0 {
pinctrl_board_mmc0: mmc0-board {
atmel,pins =
<0 7 0x0 0x5>; /* PA7 gpio CD pin pull up and deglitch */
<AT91_PIOA 7 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PA7 gpio CD pin pull up and deglitch */
};
};
};
......@@ -95,19 +95,19 @@ leds {
d8 {
label = "d8";
gpios = <&pioB 4 1>;
gpios = <&pioB 4 GPIO_ACTIVE_LOW>;
linux,default-trigger = "mmc0";
};
d9 {
label = "d6";
gpios = <&pioB 5 1>;
gpios = <&pioB 5 GPIO_ACTIVE_LOW>;
linux,default-trigger = "nand-disk";
};
d10 {
label = "d7";
gpios = <&pioB 6 0>;
gpios = <&pioB 6 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
};
};
......@@ -117,7 +117,7 @@ gpio_keys {
enter {
label = "Enter";
gpios = <&pioB 4 1>;
gpios = <&pioB 4 GPIO_ACTIVE_LOW>;
linux,code = <28>;
gpio-key,wakeup;
};
......
arch/arm/boot/dts/at91sam9x25.dtsi
View file @ b891e30e
......@@ -6,7 +6,7 @@
* Licensed under GPLv2.
*/
/include/ "at91sam9x5.dtsi"
#include "at91sam9x5.dtsi"
/ {
model = "Atmel AT91SAM9X25 SoC";
......@@ -26,16 +26,16 @@ pinctrl@fffff400 {
macb1 {
pinctrl_macb1_rmii: macb1_rmii-0 {
atmel,pins =
<2 16 0x2 0x0 /* PC16 periph B */
2 18 0x2 0x0 /* PC18 periph B */
2 19 0x2 0x0 /* PC19 periph B */
2 20 0x2 0x0 /* PC20 periph B */
2 21 0x2 0x0 /* PC21 periph B */
2 27 0x2 0x0 /* PC27 periph B */
2 28 0x2 0x0 /* PC28 periph B */
2 29 0x2 0x0 /* PC29 periph B */
2 30 0x2 0x0 /* PC30 periph B */
2 31 0x2 0x0>; /* PC31 periph B */
<AT91_PIOC 16 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC16 periph B */
AT91_PIOC 18 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC18 periph B */
AT91_PIOC 19 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC19 periph B */
AT91_PIOC 20 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC20 periph B */
AT91_PIOC 21 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC21 periph B */
AT91_PIOC 27 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC27 periph B */
AT91_PIOC 28 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC28 periph B */
AT91_PIOC 29 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC29 periph B */
AT91_PIOC 30 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC30 periph B */
AT91_PIOC 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC31 periph B */
};
};
};
......
arch/arm/boot/dts/at91sam9x25ek.dts
View file @ b891e30e
......@@ -7,8 +7,8 @@
* Licensed under GPLv2 or later.
*/
/dts-v1/;
/include/ "at91sam9x25.dtsi"
/include/ "at91sam9x5ek.dtsi"
#include "at91sam9x25.dtsi"
#include "at91sam9x5ek.dtsi"
/ {
model = "Atmel AT91SAM9X25-EK";
......
arch/arm/boot/dts/at91sam9x35.dtsi
View file @ b891e30e
......@@ -6,7 +6,7 @@
* Licensed under GPLv2.
*/
/include/ "at91sam9x5.dtsi"
#include "at91sam9x5.dtsi"
/ {
model = "Atmel AT91SAM9X35 SoC";
......
arch/arm/boot/dts/at91sam9x35ek.dts
View file @ b891e30e
......@@ -7,8 +7,8 @@
* Licensed under GPLv2 or later.
*/
/dts-v1/;
/include/ "at91sam9x35.dtsi"
/include/ "at91sam9x5ek.dtsi"
#include "at91sam9x35.dtsi"
#include "at91sam9x5ek.dtsi"
/ {
model = "Atmel AT91SAM9X35-EK";
......
arch/arm/boot/dts/at91sam9x5.dtsi
View file @ b891e30e
This diff is collapsed.
arch/arm/boot/dts/at91sam9x5cm.dtsi
View file @ b891e30e
......@@ -28,7 +28,7 @@ apb {
pinctrl@fffff400 {
1wire_cm {
pinctrl_1wire_cm: 1wire_cm-0 {
atmel,pins = <1 18 0x0 0x2>; /* PB18 multidrive, conflicts with led */
atmel,pins = <AT91_PIOB 18 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE>; /* PB18 multidrive, conflicts with led */
};
};
};
......@@ -75,19 +75,19 @@ leds {
pb18 {
label = "pb18";
gpios = <&pioB 18 1>;
gpios = <&pioB 18 GPIO_ACTIVE_LOW>;
linux,default-trigger = "heartbeat";
};
pd21 {
label = "pd21";
gpios = <&pioD 21 0>;
gpios = <&pioD 21 GPIO_ACTIVE_HIGH>;
};
};
1wire_cm {
compatible = "w1-gpio";
gpios = <&pioB 18 0>;
gpios = <&pioB 18 GPIO_ACTIVE_HIGH>;
linux,open-drain;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_1wire_cm>;
......
arch/arm/boot/dts/at91sam9x5ek.dtsi
View file @ b891e30e
......@@ -6,7 +6,7 @@
*
* Licensed under GPLv2 or later.
*/
/include/ "at91sam9x5cm.dtsi"
#include "at91sam9x5cm.dtsi"
/ {
model = "Atmel AT91SAM9X5-EK";
......@@ -27,7 +27,7 @@ &pinctrl_mmc0_slot0_clk_cmd_dat0
slot@0 {
reg = <0>;
bus-width = <4>;
cd-gpios = <&pioD 15 0>;
cd-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
};
};
......@@ -40,7 +40,7 @@ &pinctrl_mmc1_slot0_clk_cmd_dat0
slot@0 {
reg = <0>;
bus-width = <4>;
cd-gpios = <&pioD 14 0>;
cd-gpios = <&pioD 14 GPIO_ACTIVE_HIGH>;
};
};
......@@ -60,14 +60,14 @@ pinctrl@fffff400 {
mmc0 {
pinctrl_board_mmc0: mmc0-board {
atmel,pins =
<3 15 0x0 0x5>; /* PD15 gpio CD pin pull up and deglitch */
<AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD15 gpio CD pin pull up and deglitch */
};
};
mmc1 {
pinctrl_board_mmc1: mmc1-board {
atmel,pins =
<3 14 0x0 0x5>; /* PD14 gpio CD pin pull up and deglitch */
<AT91_PIOD 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD14 gpio CD pin pull up and deglitch */
};
};
};
......@@ -86,8 +86,8 @@ m25p80@0 {
usb0: ohci@00600000 {
status = "okay";
num-ports = <2>;
atmel,vbus-gpio = <&pioD 19 1
&pioD 20 1
atmel,vbus-gpio = <&pioD 19 GPIO_ACTIVE_LOW
&pioD 20 GPIO_ACTIVE_LOW
>;
};
......
arch/arm/boot/dts/ethernut5.dts
View file @ b891e30e
......@@ -6,7 +6,7 @@
* Licensed under GPLv2.
*/
/dts-v1/;
/include/ "at91sam9260.dtsi"
#include "at91sam9260.dtsi"
/ {
model = "Ethernut 5";
......@@ -40,7 +40,7 @@ macb0: ethernet@fffc4000 {
};
usb1: gadget@fffa4000 {
atmel,vbus-gpio = <&pioC 5 0>;
atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
status = "okay";
};
};
......@@ -52,7 +52,7 @@ nand0: nand@40000000 {
status = "okay";
gpios = <0
&pioC 14 0
&pioC 14 GPIO_ACTIVE_HIGH
0
>;
......
arch/arm/boot/dts/evk-pro3.dts
View file @ b891e30e
......@@ -9,7 +9,7 @@
/dts-v1/;
/include/ "ge863-pro3.dtsi"
#include "ge863-pro3.dtsi"
/ {
model = "Telit EVK-PRO3 for Telit GE863-PRO3";
......@@ -31,7 +31,7 @@ usart2: serial@fffb8000 {
};
usb1: gadget@fffa4000 {
atmel,vbus-gpio = <&pioC 5 0>;
atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
status = "okay";
};
......@@ -50,4 +50,4 @@ i2c@0 {
status = "okay";
};
};
\ No newline at end of file
};
arch/arm/boot/dts/ge863-pro3.dtsi
View file @ b891e30e
......@@ -7,7 +7,7 @@
* Licensed under GPLv2 or later.
*/
/include/ "at91sam9260.dtsi"
#include "at91sam9260.dtsi"
/ {
clocks {
......
arch/arm/boot/dts/kizbox.dts
View file @ b891e30e
......@@ -6,7 +6,7 @@
* Licensed under GPLv2.
*/
/dts-v1/;
/include/ "at91sam9g20.dtsi"
#include "at91sam9g20.dtsi"
/ {
......@@ -94,26 +94,26 @@ leds {
led1g {
label = "led1:green";
gpios = <&pioB 0 1>;
gpios = <&pioB 0 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none";
};
led1r {
label = "led1:red";
gpios = <&pioB 1 1>;
gpios = <&pioB 1 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none";
};
led2g {
label = "led2:green";
gpios = <&pioB 2 1>;
gpios = <&pioB 2 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none";
default-state = "on";
};
led2r {
label = "led2:red";
gpios = <&pioB 3 1>;
gpios = <&pioB 3 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none";
};
};
......@@ -125,16 +125,16 @@ gpio_keys {
reset {
label = "reset";
gpios = <&pioB 30 1>;
gpios = <&pioB 30 GPIO_ACTIVE_LOW>;
linux,code = <0x100>;
gpio-key,wakeup;
};
mode {
label = "mode";
gpios = <&pioB 31 1>;
gpios = <&pioB 31 GPIO_ACTIVE_LOW>;
linux,code = <0x101>;
gpio-key,wakeup;
};
};
};
\ No newline at end of file
};
arch/arm/boot/dts/mpa1600.dts
View file @ b891e30e
......@@ -6,7 +6,7 @@
* Licensed under GPLv2 only
*/
/dts-v1/;
/include/ "at91rm9200.dtsi"
#include "at91rm9200.dtsi"
/ {
model = "Phontech MPA 1600";
......@@ -62,7 +62,7 @@ gpio_keys {
monitor_mute {
label = "Monitor mute";
gpios = <&pioC 1 1>;
gpios = <&pioC 1 GPIO_ACTIVE_LOW>;
linux,code = <113>;
};
};
......
arch/arm/boot/dts/pm9g45.dts
View file @ b891e30e
......@@ -6,7 +6,7 @@
* Licensed under GPLv2.
*/
/dts-v1/;
/include/ "at91sam9g45.dtsi"
#include "at91sam9g45.dtsi"
/ {
model = "Ronetix pm9g45";
......@@ -42,15 +42,15 @@ pinctrl@fffff200 {
board {
pinctrl_board_nand: nand0-board {
atmel,pins =
<3 3 0x0 0x1 /* PD3 gpio RDY pin pull_up*/
2 14 0x0 0x1>; /* PC14 gpio enable pin pull_up */
<AT91_PIOD 3 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP /* PD3 gpio RDY pin pull_up*/
AT91_PIOC 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PC14 gpio enable pin pull_up */
};
};
mmc {
pinctrl_board_mmc: mmc0-board {
atmel,pins =
<3 6 0x0 0x5>; /* PD6 gpio CD pin pull_up and deglitch */
<AT91_PIOD 6 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD6 gpio CD pin pull_up and deglitch */
};
};
};
......@@ -64,7 +64,7 @@ &pinctrl_mmc0_slot0_clk_cmd_dat0
slot@0 {
reg = <0>;
bus-width = <4>;
cd-gpios = <&pioD 6 0>;
cd-gpios = <&pioD 6 GPIO_ACTIVE_HIGH>;
};
};
......@@ -81,8 +81,8 @@ nand0: nand@40000000 {
nand-on-flash-bbt;
pinctrl-0 = <&pinctrl_board_nand>;
gpios = <&pioD 3 0
&pioC 14 0
gpios = <&pioD 3 GPIO_ACTIVE_HIGH
&pioC 14 GPIO_ACTIVE_HIGH
0
>;
......@@ -134,13 +134,13 @@ leds {
led0 {
label = "led0";
gpios = <&pioD 0 1>;
gpios = <&pioD 0 GPIO_ACTIVE_LOW>;
linux,default-trigger = "nand-disk";
};
led1 {
label = "led1";
gpios = <&pioD 31 0>;
gpios = <&pioD 31 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
};
};
......@@ -152,13 +152,13 @@ gpio_keys {
right {
label = "SW4";
gpios = <&pioE 7 1>;
gpios = <&pioE 7 GPIO_ACTIVE_LOW>;
linux,code = <106>;
};
up {
label = "SW3";
gpios = <&pioE 8 1>;
gpios = <&pioE 8 GPIO_ACTIVE_LOW>;
linux,code = <103>;
};
};
......
arch/arm/boot/dts/sama5d3.dtsi
View file @ b891e30e
This diff is collapsed.
arch/arm/boot/dts/sama5d31ek.dts
View file @ b891e30e
......@@ -7,8 +7,8 @@
* Licensed under GPLv2 or later.
*/
/dts-v1/;
/include/ "sama5d3xmb.dtsi"
/include/ "sama5d3xdm.dtsi"
#include "sama5d3xmb.dtsi"
#include "sama5d3xdm.dtsi"
/ {
model = "Atmel SAMA5D31-EK";
......@@ -41,7 +41,7 @@ macb1: ethernet@f802c000 {
leds {
d3 {
label = "d3";
gpios = <&pioE 24 0>;
gpios = <&pioE 24 GPIO_ACTIVE_HIGH>;
};
};
......
arch/arm/boot/dts/sama5d33ek.dts
View file @ b891e30e
......@@ -7,8 +7,8 @@
* Licensed under GPLv2 or later.
*/
/dts-v1/;
/include/ "sama5d3xmb.dtsi"
/include/ "sama5d3xdm.dtsi"
#include "sama5d3xmb.dtsi"
#include "sama5d3xdm.dtsi"
/ {
model = "Atmel SAMA5D33-EK";
......
arch/arm/boot/dts/sama5d34ek.dts
View file @ b891e30e
This diff is collapsed.
arch/arm/boot/dts/sama5d35ek.dts
View file @ b891e30e
This diff is collapsed.
arch/arm/boot/dts/sama5d3xcm.dtsi
View file @ b891e30e
This diff is collapsed.
arch/arm/boot/dts/sama5d3xdm.dtsi
View file @ b891e30e
This diff is collapsed.
arch/arm/boot/dts/sama5d3xmb.dtsi
View file @ b891e30e
This diff is collapsed.
arch/arm/boot/dts/tny_a9260.dts
View file @ b891e30e
This diff is collapsed.
arch/arm/boot/dts/tny_a9263.dts
View file @ b891e30e
This diff is collapsed.
arch/arm/boot/dts/tny_a9g20.dts
View file @ b891e30e
This diff is collapsed.
arch/arm/boot/dts/usb_a9260.dts
View file @ b891e30e
This diff is collapsed.
arch/arm/boot/dts/usb_a9260_common.dtsi
View file @ b891e30e
This diff is collapsed.
arch/arm/boot/dts/usb_a9263.dts
View file @ b891e30e
This diff is collapsed.
arch/arm/boot/dts/usb_a9g20-dab-mmx.dtsi
View file @ b891e30e
This diff is collapsed.
arch/arm/boot/dts/usb_a9g20.dts
View file @ b891e30e
This diff is collapsed.
arch/arm/configs/at91_dt_defconfig
View file @ b891e30e
This diff is collapsed.
arch/arm/configs/at91rm9200_defconfig
View file @ b891e30e
This diff is collapsed.
arch/arm/configs/at91sam9260_defconfig deleted 100644 → 0
View file @ e4aa937e
This diff is collapsed.
arch/arm/configs/at91sam9263_defconfig
View file @ b891e30e
This diff is collapsed.
arch/arm/configs/at91sam9g45_defconfig
View file @ b891e30e
This diff is collapsed.
arch/arm/configs/sama5_defconfig
View file @ b891e30e
This diff is collapsed.
arch/arm/mach-at91/Kconfig.non_dt
View file @ b891e30e
This diff is collapsed.
arch/arm/mach-at91/Makefile
View file @ b891e30e
This diff is collapsed.
arch/arm/mach-at91/board-sam9261ek.c
View file @ b891e30e
This diff is collapsed.
include/dt-bindings/pinctrl/at91.h 0 → 100644
View file @ b891e30e
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7