Skip to content

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

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

From Nicolas Ferre:
Adding the DT support to USB gadget High-Speed aka usba.

* tag 'at91-drivers' of git://github.com/at91linux/linux-at91:
  USB: gadget: atmel_usba: add DT support
  USB: gadget: atmel_usba: allow multi instance
  USB: gadget: atmel_usba: move global struct usba_ep usba_ep to struct usba_udc
  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>

Conflicts:
	arch/arm/boot/dts/at91sam9260.dtsi
	arch/arm/boot/dts/sama5d3.dtsi
parents 38d77ff9 4a3ae932
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1676 additions and 1698 deletions
Documentation/devicetree/bindings/usb/atmel-usb.txt
View file @ 1247034e
...@@ -47,3 +47,85 @@ usb1: gadget@fffa4000 { ...@@ -47,3 +47,85 @@ usb1: gadget@fffa4000 {
interrupts = <10 4>; interrupts = <10 4>;
atmel,vbus-gpio = <&pioC 5 0>; atmel,vbus-gpio = <&pioC 5 0>;
}; };
Atmel High-Speed USB device controller
Required properties:
- compatible: Should be "atmel,at91sam9rl-udc"
- reg: Address and length of the register set for the device
- interrupts: Should contain usba interrupt
- ep childnode: To specify the number of endpoints and their properties.
Optional properties:
- atmel,vbus-gpio: If present, specifies a gpio that needs to be
activated for the bus to be powered.
Required child node properties:
- name: Name of the endpoint.
- reg: Num of the endpoint.
- atmel,fifo-size: Size of the fifo.
- atmel,nb-banks: Number of banks.
- atmel,can-dma: Boolean to specify if the endpoint support DMA.
- atmel,can-isoc: Boolean to specify if the endpoint support ISOC.
usb2: gadget@fff78000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "atmel,at91sam9rl-udc";
reg = <0x00600000 0x80000
0xfff78000 0x400>;
interrupts = <27 4 0>;
atmel,vbus-gpio = <&pioB 19 0>;
ep0 {
reg = <0>;
atmel,fifo-size = <64>;
atmel,nb-banks = <1>;
};
ep1 {
reg = <1>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep2 {
reg = <2>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-dma;
atmel,can-isoc;
};
ep3 {
reg = <3>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
};
ep4 {
reg = <4>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
};
ep5 {
reg = <5>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
atmel,can-isoc;
};
ep6 {
reg = <6>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
atmel,can-isoc;
};
};
arch/arm/boot/dts/aks-cdu.dts
View file @ 1247034e
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
/dts-v1/; /dts-v1/;
/include/ "ge863-pro3.dtsi" #include "ge863-pro3.dtsi"
/ { / {
chosen { chosen {
...@@ -46,7 +46,7 @@ macb0: ethernet@fffc4000 { ...@@ -46,7 +46,7 @@ macb0: ethernet@fffc4000 {
}; };
usb1: gadget@fffa4000 { usb1: gadget@fffa4000 {
atmel,vbus-gpio = <&pioC 15 0>; atmel,vbus-gpio = <&pioC 15 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
}; };
...@@ -90,23 +90,23 @@ leds { ...@@ -90,23 +90,23 @@ leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
red { red {
gpios = <&pioC 10 0>; gpios = <&pioC 10 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "none"; linux,default-trigger = "none";
}; };
green { green {
gpios = <&pioA 5 1>; gpios = <&pioA 5 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none"; linux,default-trigger = "none";
default-state = "on"; default-state = "on";
}; };
yellow { yellow {
gpios = <&pioB 20 1>; gpios = <&pioB 20 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none"; linux,default-trigger = "none";
}; };
blue { blue {
gpios = <&pioB 21 1>; gpios = <&pioB 21 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none"; linux,default-trigger = "none";
}; };
}; };
......
arch/arm/boot/dts/animeo_ip.dts
View file @ 1247034e
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9260.dtsi" #include "at91sam9260.dtsi"
/ { / {
model = "Somfy Animeo IP"; model = "Somfy Animeo IP";
...@@ -123,7 +123,7 @@ root@2b0000 { ...@@ -123,7 +123,7 @@ root@2b0000 {
usb0: ohci@00500000 { usb0: ohci@00500000 {
num-ports = <2>; num-ports = <2>;
atmel,vbus-gpio = <&pioB 15 1>; atmel,vbus-gpio = <&pioB 15 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
}; };
}; };
...@@ -133,23 +133,23 @@ leds { ...@@ -133,23 +133,23 @@ leds {
power_green { power_green {
label = "power_green"; label = "power_green";
gpios = <&pioC 17 0>; gpios = <&pioC 17 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
power_red { power_red {
label = "power_red"; label = "power_red";
gpios = <&pioA 2 0>; gpios = <&pioA 2 GPIO_ACTIVE_HIGH>;
}; };
tx_green { tx_green {
label = "tx_green"; label = "tx_green";
gpios = <&pioC 19 0>; gpios = <&pioC 19 GPIO_ACTIVE_HIGH>;
}; };
tx_red { tx_red {
label = "tx_red"; label = "tx_red";
gpios = <&pioC 18 0>; gpios = <&pioC 18 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -160,21 +160,21 @@ gpio_keys { ...@@ -160,21 +160,21 @@ gpio_keys {
keyswitch_in { keyswitch_in {
label = "keyswitch_in"; label = "keyswitch_in";
gpios = <&pioB 1 0>; gpios = <&pioB 1 GPIO_ACTIVE_HIGH>;
linux,code = <28>; linux,code = <28>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
error_in { error_in {
label = "error_in"; label = "error_in";
gpios = <&pioB 2 0>; gpios = <&pioB 2 GPIO_ACTIVE_HIGH>;
linux,code = <29>; linux,code = <29>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
btn { btn {
label = "btn"; label = "btn";
gpios = <&pioC 23 0>; gpios = <&pioC 23 GPIO_ACTIVE_HIGH>;
linux,code = <31>; linux,code = <31>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
......
arch/arm/boot/dts/at91-ariag25.dts
View file @ 1247034e
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9g25.dtsi" #include "at91sam9g25.dtsi"
/ { / {
model = "Acme Systems Aria G25"; model = "Acme Systems Aria G25";
...@@ -156,7 +156,7 @@ leds { ...@@ -156,7 +156,7 @@ leds {
/* little green LED in middle of Aria G25 module */ /* little green LED in middle of Aria G25 module */
aria_led { aria_led {
label = "aria_led"; label = "aria_led";
gpios = <&pioB 8 0>; /* PB8 */ gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
...@@ -164,7 +164,7 @@ aria_led { ...@@ -164,7 +164,7 @@ aria_led {
onewire@0 { onewire@0 {
compatible = "w1-gpio"; compatible = "w1-gpio";
gpios = <&pioA 21 1>; gpios = <&pioA 21 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_w1_0>; pinctrl-0 = <&pinctrl_w1_0>;
}; };
......
arch/arm/boot/dts/at91rm9200.dtsi
View file @ 1247034e
This diff is collapsed.
arch/arm/boot/dts/at91rm9200ek.dts
View file @ 1247034e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Licensed under GPLv2 only * Licensed under GPLv2 only
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91rm9200.dtsi" #include "at91rm9200.dtsi"
/ { / {
model = "Atmel AT91RM9200 evaluation kit"; model = "Atmel AT91RM9200 evaluation kit";
...@@ -50,7 +50,7 @@ macb0: ethernet@fffbc000 { ...@@ -50,7 +50,7 @@ macb0: ethernet@fffbc000 {
}; };
usb1: gadget@fffb0000 { usb1: gadget@fffb0000 {
atmel,vbus-gpio = <&pioD 4 0>; atmel,vbus-gpio = <&pioD 4 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
}; };
...@@ -66,19 +66,19 @@ leds { ...@@ -66,19 +66,19 @@ leds {
ds2 { ds2 {
label = "green"; label = "green";
gpios = <&pioB 0 0x1>; gpios = <&pioB 0 GPIO_ACTIVE_LOW>;
linux,default-trigger = "mmc0"; linux,default-trigger = "mmc0";
}; };
ds4 { ds4 {
label = "yellow"; label = "yellow";
gpios = <&pioB 1 0x1>; gpios = <&pioB 1 GPIO_ACTIVE_LOW>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
ds6 { ds6 {
label = "red"; label = "red";
gpios = <&pioB 2 0x1>; gpios = <&pioB 2 GPIO_ACTIVE_LOW>;
}; };
}; };
}; };
arch/arm/boot/dts/at91sam9260.dtsi
View file @ 1247034e
This diff is collapsed.
arch/arm/boot/dts/at91sam9263.dtsi
View file @ 1247034e
This diff is collapsed.
arch/arm/boot/dts/at91sam9263ek.dts
View file @ 1247034e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Licensed under GPLv2 only * Licensed under GPLv2 only
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9263.dtsi" #include "at91sam9263.dtsi"
/ { / {
model = "Atmel at91sam9263ek"; model = "Atmel at91sam9263ek";
...@@ -51,7 +51,7 @@ macb0: ethernet@fffbc000 { ...@@ -51,7 +51,7 @@ macb0: ethernet@fffbc000 {
}; };
usb1: gadget@fff78000 { usb1: gadget@fff78000 {
atmel,vbus-gpio = <&pioA 25 0>; atmel,vbus-gpio = <&pioA 25 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -65,8 +65,8 @@ &pinctrl_mmc0_slot0_cmd_dat0 ...@@ -65,8 +65,8 @@ &pinctrl_mmc0_slot0_cmd_dat0
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pioE 18 0>; cd-gpios = <&pioE 18 GPIO_ACTIVE_HIGH>;
wp-gpios = <&pioE 19 0>; wp-gpios = <&pioE 19 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -74,8 +74,8 @@ pinctrl@fffff200 { ...@@ -74,8 +74,8 @@ pinctrl@fffff200 {
mmc0 { mmc0 {
pinctrl_board_mmc0: mmc0-board { pinctrl_board_mmc0: mmc0-board {
atmel,pins = atmel,pins =
<5 18 0x0 0x5 /* PE18 gpio CD pin pull up and deglitch */ <AT91_PIOE 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH /* PE18 gpio CD pin pull up and deglitch */
5 19 0x0 0x1>; /* PE19 gpio WP pin pull up */ AT91_PIOE 19 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PE19 gpio WP pin pull up */
}; };
}; };
}; };
...@@ -141,8 +141,8 @@ data@7ca0000 { ...@@ -141,8 +141,8 @@ data@7ca0000 {
usb0: ohci@00a00000 { usb0: ohci@00a00000 {
num-ports = <2>; num-ports = <2>;
status = "okay"; status = "okay";
atmel,vbus-gpio = <&pioA 24 0 atmel,vbus-gpio = <&pioA 24 GPIO_ACTIVE_HIGH
&pioA 21 0 &pioA 21 GPIO_ACTIVE_HIGH
>; >;
}; };
}; };
...@@ -152,13 +152,13 @@ leds { ...@@ -152,13 +152,13 @@ leds {
d3 { d3 {
label = "d3"; label = "d3";
gpios = <&pioB 7 0>; gpios = <&pioB 7 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
d2 { d2 {
label = "d2"; label = "d2";
gpios = <&pioC 29 1>; gpios = <&pioC 29 GPIO_ACTIVE_LOW>;
linux,default-trigger = "nand-disk"; linux,default-trigger = "nand-disk";
}; };
}; };
...@@ -168,14 +168,14 @@ gpio_keys { ...@@ -168,14 +168,14 @@ gpio_keys {
left_click { left_click {
label = "left_click"; label = "left_click";
gpios = <&pioC 5 1>; gpios = <&pioC 5 GPIO_ACTIVE_LOW>;
linux,code = <272>; linux,code = <272>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
right_click { right_click {
label = "right_click"; label = "right_click";
gpios = <&pioC 4 1>; gpios = <&pioC 4 GPIO_ACTIVE_LOW>;
linux,code = <273>; linux,code = <273>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
......
arch/arm/boot/dts/at91sam9g15.dtsi
View file @ 1247034e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Licensed under GPLv2. * Licensed under GPLv2.
*/ */
/include/ "at91sam9x5.dtsi" #include "at91sam9x5.dtsi"
/ { / {
model = "Atmel AT91SAM9G15 SoC"; model = "Atmel AT91SAM9G15 SoC";
......
arch/arm/boot/dts/at91sam9g15ek.dts
View file @ 1247034e
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9g15.dtsi" #include "at91sam9g15.dtsi"
/include/ "at91sam9x5ek.dtsi" #include "at91sam9x5ek.dtsi"
/ { / {
model = "Atmel AT91SAM9G15-EK"; model = "Atmel AT91SAM9G15-EK";
......
arch/arm/boot/dts/at91sam9g20.dtsi
View file @ 1247034e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Licensed under GPLv2. * Licensed under GPLv2.
*/ */
/include/ "at91sam9260.dtsi" #include "at91sam9260.dtsi"
/ { / {
model = "Atmel AT91SAM9G20 family SoC"; model = "Atmel AT91SAM9G20 family SoC";
......
arch/arm/boot/dts/at91sam9g20ek.dts
View file @ 1247034e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Licensed under GPLv2. * Licensed under GPLv2.
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9g20ek_common.dtsi" #include "at91sam9g20ek_common.dtsi"
/ { / {
model = "Atmel at91sam9g20ek"; model = "Atmel at91sam9g20ek";
...@@ -17,13 +17,13 @@ leds { ...@@ -17,13 +17,13 @@ leds {
ds1 { ds1 {
label = "ds1"; label = "ds1";
gpios = <&pioA 9 0>; gpios = <&pioA 9 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
ds5 { ds5 {
label = "ds5"; label = "ds5";
gpios = <&pioA 6 1>; gpios = <&pioA 6 GPIO_ACTIVE_LOW>;
}; };
}; };
}; };
arch/arm/boot/dts/at91sam9g20ek_2mmc.dts
View file @ 1247034e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Licensed under GPLv2. * Licensed under GPLv2.
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9g20ek_common.dtsi" #include "at91sam9g20ek_common.dtsi"
/ { / {
model = "Atmel at91sam9g20ek 2 mmc"; model = "Atmel at91sam9g20ek 2 mmc";
...@@ -23,7 +23,7 @@ &pinctrl_mmc0_slot0_cmd_dat0 ...@@ -23,7 +23,7 @@ &pinctrl_mmc0_slot0_cmd_dat0
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pioC 2 0>; cd-gpios = <&pioC 2 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -31,7 +31,7 @@ pinctrl@fffff400 { ...@@ -31,7 +31,7 @@ pinctrl@fffff400 {
mmc0_slot0 { mmc0_slot0 {
pinctrl_board_mmc0_slot0: mmc0_slot0-board { pinctrl_board_mmc0_slot0: mmc0_slot0-board {
atmel,pins = 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 { ...@@ -43,13 +43,13 @@ leds {
ds1 { ds1 {
label = "ds1"; label = "ds1";
gpios = <&pioB 9 0>; gpios = <&pioB 9 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
ds5 { ds5 {
label = "ds5"; label = "ds5";
gpios = <&pioB 8 1>; gpios = <&pioB 8 GPIO_ACTIVE_LOW>;
}; };
}; };
}; };
arch/arm/boot/dts/at91sam9g20ek_common.dtsi
View file @ 1247034e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* *
* Licensed under GPLv2. * Licensed under GPLv2.
*/ */
/include/ "at91sam9g20.dtsi" #include "at91sam9g20.dtsi"
/ { / {
...@@ -34,10 +34,17 @@ pinctrl@fffff400 { ...@@ -34,10 +34,17 @@ pinctrl@fffff400 {
board { board {
pinctrl_pck0_as_mck: pck0_as_mck { pinctrl_pck0_as_mck: pck0_as_mck {
atmel,pins = 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 { dbgu: serial@fffff200 {
...@@ -65,7 +72,7 @@ macb0: ethernet@fffc4000 { ...@@ -65,7 +72,7 @@ macb0: ethernet@fffc4000 {
}; };
usb1: gadget@fffa4000 { usb1: gadget@fffa4000 {
atmel,vbus-gpio = <&pioC 5 0>; atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -79,16 +86,7 @@ &pinctrl_mmc0_slot1_cmd_dat0 ...@@ -79,16 +86,7 @@ &pinctrl_mmc0_slot1_cmd_dat0
slot@1 { slot@1 {
reg = <1>; reg = <1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pioC 9 0>; cd-gpios = <&pioC 9 GPIO_ACTIVE_HIGH>;
};
};
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 */
};
}; };
}; };
...@@ -180,14 +178,14 @@ gpio_keys { ...@@ -180,14 +178,14 @@ gpio_keys {
btn3 { btn3 {
label = "Button 3"; label = "Button 3";
gpios = <&pioA 30 1>; gpios = <&pioA 30 GPIO_ACTIVE_LOW>;
linux,code = <0x103>; linux,code = <0x103>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
btn4 { btn4 {
label = "Button 4"; label = "Button 4";
gpios = <&pioA 31 1>; gpios = <&pioA 31 GPIO_ACTIVE_LOW>;
linux,code = <0x104>; linux,code = <0x104>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
......
arch/arm/boot/dts/at91sam9g25.dtsi
View file @ 1247034e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Licensed under GPLv2. * Licensed under GPLv2.
*/ */
/include/ "at91sam9x5.dtsi" #include "at91sam9x5.dtsi"
/ { / {
model = "Atmel AT91SAM9G25 SoC"; model = "Atmel AT91SAM9G25 SoC";
......
arch/arm/boot/dts/at91sam9g25ek.dts
View file @ 1247034e
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9g25.dtsi" #include "at91sam9g25.dtsi"
/include/ "at91sam9x5ek.dtsi" #include "at91sam9x5ek.dtsi"
/ { / {
model = "Atmel AT91SAM9G25-EK"; model = "Atmel AT91SAM9G25-EK";
......
arch/arm/boot/dts/at91sam9g35.dtsi
View file @ 1247034e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Licensed under GPLv2. * Licensed under GPLv2.
*/ */
/include/ "at91sam9x5.dtsi" #include "at91sam9x5.dtsi"
/ { / {
model = "Atmel AT91SAM9G35 SoC"; model = "Atmel AT91SAM9G35 SoC";
......
arch/arm/boot/dts/at91sam9g35ek.dts
View file @ 1247034e
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9g35.dtsi" #include "at91sam9g35.dtsi"
/include/ "at91sam9x5ek.dtsi" #include "at91sam9x5ek.dtsi"
/ { / {
model = "Atmel AT91SAM9G35-EK"; model = "Atmel AT91SAM9G35-EK";
......
arch/arm/boot/dts/at91sam9g45.dtsi
View file @ 1247034e
This diff is collapsed.
arch/arm/boot/dts/at91sam9m10g45ek.dts
View file @ 1247034e
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9g45.dtsi" #include "at91sam9g45.dtsi"
/ { / {
model = "Atmel AT91SAM9M10G45-EK"; model = "Atmel AT91SAM9M10G45-EK";
...@@ -68,7 +68,7 @@ &pinctrl_mmc0_slot0_clk_cmd_dat0 ...@@ -68,7 +68,7 @@ &pinctrl_mmc0_slot0_clk_cmd_dat0
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; 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 ...@@ -81,8 +81,8 @@ &pinctrl_mmc1_slot0_clk_cmd_dat0
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pioD 11 0>; cd-gpios = <&pioD 11 GPIO_ACTIVE_HIGH>;
wp-gpios = <&pioD 29 0>; wp-gpios = <&pioD 29 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -90,15 +90,15 @@ pinctrl@fffff200 { ...@@ -90,15 +90,15 @@ pinctrl@fffff200 {
mmc0 { mmc0 {
pinctrl_board_mmc0: mmc0-board { pinctrl_board_mmc0: mmc0-board {
atmel,pins = 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 { mmc1 {
pinctrl_board_mmc1: mmc1-board { pinctrl_board_mmc1: mmc1-board {
atmel,pins = atmel,pins =
<3 11 0x0 0x5 /* PD11 gpio CD pin pull up and deglitch */ <AT91_PIOD 11 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH /* PD11 gpio CD pin pull up and deglitch */
3 29 0x0 0x1>; /* PD29 gpio WP pin pull up */ AT91_PIOD 29 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PD29 gpio WP pin pull up */
}; };
}; };
}; };
...@@ -139,8 +139,8 @@ data@4000000 { ...@@ -139,8 +139,8 @@ data@4000000 {
usb0: ohci@00700000 { usb0: ohci@00700000 {
status = "okay"; status = "okay";
num-ports = <2>; num-ports = <2>;
atmel,vbus-gpio = <&pioD 1 1 atmel,vbus-gpio = <&pioD 1 GPIO_ACTIVE_LOW
&pioD 3 1>; &pioD 3 GPIO_ACTIVE_LOW>;
}; };
usb1: ehci@00800000 { usb1: ehci@00800000 {
...@@ -153,19 +153,19 @@ leds { ...@@ -153,19 +153,19 @@ leds {
d8 { d8 {
label = "d8"; label = "d8";
gpios = <&pioD 30 0>; gpios = <&pioD 30 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
d6 { d6 {
label = "d6"; label = "d6";
gpios = <&pioD 0 1>; gpios = <&pioD 0 GPIO_ACTIVE_LOW>;
linux,default-trigger = "nand-disk"; linux,default-trigger = "nand-disk";
}; };
d7 { d7 {
label = "d7"; label = "d7";
gpios = <&pioD 31 1>; gpios = <&pioD 31 GPIO_ACTIVE_LOW>;
linux,default-trigger = "mmc0"; linux,default-trigger = "mmc0";
}; };
}; };
...@@ -175,45 +175,45 @@ gpio_keys { ...@@ -175,45 +175,45 @@ gpio_keys {
left_click { left_click {
label = "left_click"; label = "left_click";
gpios = <&pioB 6 1>; gpios = <&pioB 6 GPIO_ACTIVE_LOW>;
linux,code = <272>; linux,code = <272>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
right_click { right_click {
label = "right_click"; label = "right_click";
gpios = <&pioB 7 1>; gpios = <&pioB 7 GPIO_ACTIVE_LOW>;
linux,code = <273>; linux,code = <273>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
left { left {
label = "Joystick Left"; label = "Joystick Left";
gpios = <&pioB 14 1>; gpios = <&pioB 14 GPIO_ACTIVE_LOW>;
linux,code = <105>; linux,code = <105>;
}; };
right { right {
label = "Joystick Right"; label = "Joystick Right";
gpios = <&pioB 15 1>; gpios = <&pioB 15 GPIO_ACTIVE_LOW>;
linux,code = <106>; linux,code = <106>;
}; };
up { up {
label = "Joystick Up"; label = "Joystick Up";
gpios = <&pioB 16 1>; gpios = <&pioB 16 GPIO_ACTIVE_LOW>;
linux,code = <103>; linux,code = <103>;
}; };
down { down {
label = "Joystick Down"; label = "Joystick Down";
gpios = <&pioB 17 1>; gpios = <&pioB 17 GPIO_ACTIVE_LOW>;
linux,code = <108>; linux,code = <108>;
}; };
enter { enter {
label = "Joystick Press"; label = "Joystick Press";
gpios = <&pioB 18 1>; gpios = <&pioB 18 GPIO_ACTIVE_LOW>;
linux,code = <28>; linux,code = <28>;
}; };
}; };
......
arch/arm/boot/dts/at91sam9n12.dtsi
View file @ 1247034e
This diff is collapsed.
arch/arm/boot/dts/at91sam9n12ek.dts
View file @ 1247034e
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9n12.dtsi" #include "at91sam9n12.dtsi"
/ { / {
model = "Atmel AT91SAM9N12-EK"; model = "Atmel AT91SAM9N12-EK";
...@@ -55,7 +55,7 @@ &pinctrl_mmc0_slot0_clk_cmd_dat0 ...@@ -55,7 +55,7 @@ &pinctrl_mmc0_slot0_clk_cmd_dat0
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pioA 7 0>; cd-gpios = <&pioA 7 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -63,7 +63,7 @@ pinctrl@fffff400 { ...@@ -63,7 +63,7 @@ pinctrl@fffff400 {
mmc0 { mmc0 {
pinctrl_board_mmc0: mmc0-board { pinctrl_board_mmc0: mmc0-board {
atmel,pins = 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 { ...@@ -95,19 +95,19 @@ leds {
d8 { d8 {
label = "d8"; label = "d8";
gpios = <&pioB 4 1>; gpios = <&pioB 4 GPIO_ACTIVE_LOW>;
linux,default-trigger = "mmc0"; linux,default-trigger = "mmc0";
}; };
d9 { d9 {
label = "d6"; label = "d6";
gpios = <&pioB 5 1>; gpios = <&pioB 5 GPIO_ACTIVE_LOW>;
linux,default-trigger = "nand-disk"; linux,default-trigger = "nand-disk";
}; };
d10 { d10 {
label = "d7"; label = "d7";
gpios = <&pioB 6 0>; gpios = <&pioB 6 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
}; };
...@@ -117,7 +117,7 @@ gpio_keys { ...@@ -117,7 +117,7 @@ gpio_keys {
enter { enter {
label = "Enter"; label = "Enter";
gpios = <&pioB 4 1>; gpios = <&pioB 4 GPIO_ACTIVE_LOW>;
linux,code = <28>; linux,code = <28>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
......
arch/arm/boot/dts/at91sam9x25.dtsi
View file @ 1247034e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Licensed under GPLv2. * Licensed under GPLv2.
*/ */
/include/ "at91sam9x5.dtsi" #include "at91sam9x5.dtsi"
/ { / {
model = "Atmel AT91SAM9X25 SoC"; model = "Atmel AT91SAM9X25 SoC";
...@@ -26,16 +26,16 @@ pinctrl@fffff400 { ...@@ -26,16 +26,16 @@ pinctrl@fffff400 {
macb1 { macb1 {
pinctrl_macb1_rmii: macb1_rmii-0 { pinctrl_macb1_rmii: macb1_rmii-0 {
atmel,pins = atmel,pins =
<2 16 0x2 0x0 /* PC16 periph B */ <AT91_PIOC 16 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC16 periph B */
2 18 0x2 0x0 /* PC18 periph B */ AT91_PIOC 18 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC18 periph B */
2 19 0x2 0x0 /* PC19 periph B */ AT91_PIOC 19 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC19 periph B */
2 20 0x2 0x0 /* PC20 periph B */ AT91_PIOC 20 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC20 periph B */
2 21 0x2 0x0 /* PC21 periph B */ AT91_PIOC 21 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC21 periph B */
2 27 0x2 0x0 /* PC27 periph B */ AT91_PIOC 27 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC27 periph B */
2 28 0x2 0x0 /* PC28 periph B */ AT91_PIOC 28 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC28 periph B */
2 29 0x2 0x0 /* PC29 periph B */ AT91_PIOC 29 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC29 periph B */
2 30 0x2 0x0 /* PC30 periph B */ AT91_PIOC 30 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC30 periph B */
2 31 0x2 0x0>; /* PC31 periph B */ AT91_PIOC 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC31 periph B */
}; };
}; };
}; };
......
arch/arm/boot/dts/at91sam9x25ek.dts
View file @ 1247034e
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9x25.dtsi" #include "at91sam9x25.dtsi"
/include/ "at91sam9x5ek.dtsi" #include "at91sam9x5ek.dtsi"
/ { / {
model = "Atmel AT91SAM9X25-EK"; model = "Atmel AT91SAM9X25-EK";
......
arch/arm/boot/dts/at91sam9x35.dtsi
View file @ 1247034e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Licensed under GPLv2. * Licensed under GPLv2.
*/ */
/include/ "at91sam9x5.dtsi" #include "at91sam9x5.dtsi"
/ { / {
model = "Atmel AT91SAM9X35 SoC"; model = "Atmel AT91SAM9X35 SoC";
......
arch/arm/boot/dts/at91sam9x35ek.dts
View file @ 1247034e
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9x35.dtsi" #include "at91sam9x35.dtsi"
/include/ "at91sam9x5ek.dtsi" #include "at91sam9x5ek.dtsi"
/ { / {
model = "Atmel AT91SAM9X35-EK"; model = "Atmel AT91SAM9X35-EK";
......
arch/arm/boot/dts/at91sam9x5.dtsi
View file @ 1247034e
This diff is collapsed.
arch/arm/boot/dts/at91sam9x5cm.dtsi
View file @ 1247034e
...@@ -28,7 +28,7 @@ apb { ...@@ -28,7 +28,7 @@ apb {
pinctrl@fffff400 { pinctrl@fffff400 {
1wire_cm { 1wire_cm {
pinctrl_1wire_cm: 1wire_cm-0 { 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 { ...@@ -75,19 +75,19 @@ leds {
pb18 { pb18 {
label = "pb18"; label = "pb18";
gpios = <&pioB 18 1>; gpios = <&pioB 18 GPIO_ACTIVE_LOW>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
pd21 { pd21 {
label = "pd21"; label = "pd21";
gpios = <&pioD 21 0>; gpios = <&pioD 21 GPIO_ACTIVE_HIGH>;
}; };
}; };
1wire_cm { 1wire_cm {
compatible = "w1-gpio"; compatible = "w1-gpio";
gpios = <&pioB 18 0>; gpios = <&pioB 18 GPIO_ACTIVE_HIGH>;
linux,open-drain; linux,open-drain;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_1wire_cm>; pinctrl-0 = <&pinctrl_1wire_cm>;
......
arch/arm/boot/dts/at91sam9x5ek.dtsi
View file @ 1247034e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/include/ "at91sam9x5cm.dtsi" #include "at91sam9x5cm.dtsi"
/ { / {
model = "Atmel AT91SAM9X5-EK"; model = "Atmel AT91SAM9X5-EK";
...@@ -27,7 +27,7 @@ &pinctrl_mmc0_slot0_clk_cmd_dat0 ...@@ -27,7 +27,7 @@ &pinctrl_mmc0_slot0_clk_cmd_dat0
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; 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 ...@@ -40,7 +40,7 @@ &pinctrl_mmc1_slot0_clk_cmd_dat0
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pioD 14 0>; cd-gpios = <&pioD 14 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -60,14 +60,14 @@ pinctrl@fffff400 { ...@@ -60,14 +60,14 @@ pinctrl@fffff400 {
mmc0 { mmc0 {
pinctrl_board_mmc0: mmc0-board { pinctrl_board_mmc0: mmc0-board {
atmel,pins = 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 { mmc1 {
pinctrl_board_mmc1: mmc1-board { pinctrl_board_mmc1: mmc1-board {
atmel,pins = 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 { ...@@ -86,8 +86,8 @@ m25p80@0 {
usb0: ohci@00600000 { usb0: ohci@00600000 {
status = "okay"; status = "okay";
num-ports = <2>; num-ports = <2>;
atmel,vbus-gpio = <&pioD 19 1 atmel,vbus-gpio = <&pioD 19 GPIO_ACTIVE_LOW
&pioD 20 1 &pioD 20 GPIO_ACTIVE_LOW
>; >;
}; };
......
arch/arm/boot/dts/ethernut5.dts
View file @ 1247034e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Licensed under GPLv2. * Licensed under GPLv2.
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9260.dtsi" #include "at91sam9260.dtsi"
/ { / {
model = "Ethernut 5"; model = "Ethernut 5";
...@@ -40,7 +40,7 @@ macb0: ethernet@fffc4000 { ...@@ -40,7 +40,7 @@ macb0: ethernet@fffc4000 {
}; };
usb1: gadget@fffa4000 { usb1: gadget@fffa4000 {
atmel,vbus-gpio = <&pioC 5 0>; atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
}; };
...@@ -52,7 +52,7 @@ nand0: nand@40000000 { ...@@ -52,7 +52,7 @@ nand0: nand@40000000 {
status = "okay"; status = "okay";
gpios = <0 gpios = <0
&pioC 14 0 &pioC 14 GPIO_ACTIVE_HIGH
0 0
>; >;
......
arch/arm/boot/dts/evk-pro3.dts
View file @ 1247034e
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
/dts-v1/; /dts-v1/;
/include/ "ge863-pro3.dtsi" #include "ge863-pro3.dtsi"
/ { / {
model = "Telit EVK-PRO3 for Telit GE863-PRO3"; model = "Telit EVK-PRO3 for Telit GE863-PRO3";
...@@ -31,7 +31,7 @@ usart2: serial@fffb8000 { ...@@ -31,7 +31,7 @@ usart2: serial@fffb8000 {
}; };
usb1: gadget@fffa4000 { usb1: gadget@fffa4000 {
atmel,vbus-gpio = <&pioC 5 0>; atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/ge863-pro3.dtsi
View file @ 1247034e
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/include/ "at91sam9260.dtsi" #include "at91sam9260.dtsi"
/ { / {
clocks { clocks {
......
arch/arm/boot/dts/kizbox.dts
View file @ 1247034e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Licensed under GPLv2. * Licensed under GPLv2.
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9g20.dtsi" #include "at91sam9g20.dtsi"
/ { / {
...@@ -94,26 +94,26 @@ leds { ...@@ -94,26 +94,26 @@ leds {
led1g { led1g {
label = "led1:green"; label = "led1:green";
gpios = <&pioB 0 1>; gpios = <&pioB 0 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none"; linux,default-trigger = "none";
}; };
led1r { led1r {
label = "led1:red"; label = "led1:red";
gpios = <&pioB 1 1>; gpios = <&pioB 1 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none"; linux,default-trigger = "none";
}; };
led2g { led2g {
label = "led2:green"; label = "led2:green";
gpios = <&pioB 2 1>; gpios = <&pioB 2 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none"; linux,default-trigger = "none";
default-state = "on"; default-state = "on";
}; };
led2r { led2r {
label = "led2:red"; label = "led2:red";
gpios = <&pioB 3 1>; gpios = <&pioB 3 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none"; linux,default-trigger = "none";
}; };
}; };
...@@ -125,14 +125,14 @@ gpio_keys { ...@@ -125,14 +125,14 @@ gpio_keys {
reset { reset {
label = "reset"; label = "reset";
gpios = <&pioB 30 1>; gpios = <&pioB 30 GPIO_ACTIVE_LOW>;
linux,code = <0x100>; linux,code = <0x100>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
mode { mode {
label = "mode"; label = "mode";
gpios = <&pioB 31 1>; gpios = <&pioB 31 GPIO_ACTIVE_LOW>;
linux,code = <0x101>; linux,code = <0x101>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
......
arch/arm/boot/dts/mpa1600.dts
View file @ 1247034e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Licensed under GPLv2 only * Licensed under GPLv2 only
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91rm9200.dtsi" #include "at91rm9200.dtsi"
/ { / {
model = "Phontech MPA 1600"; model = "Phontech MPA 1600";
...@@ -62,7 +62,7 @@ gpio_keys { ...@@ -62,7 +62,7 @@ gpio_keys {
monitor_mute { monitor_mute {
label = "Monitor mute"; label = "Monitor mute";
gpios = <&pioC 1 1>; gpios = <&pioC 1 GPIO_ACTIVE_LOW>;
linux,code = <113>; linux,code = <113>;
}; };
}; };
......
arch/arm/boot/dts/pm9g45.dts
View file @ 1247034e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Licensed under GPLv2. * Licensed under GPLv2.
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9g45.dtsi" #include "at91sam9g45.dtsi"
/ { / {
model = "Ronetix pm9g45"; model = "Ronetix pm9g45";
...@@ -42,15 +42,15 @@ pinctrl@fffff200 { ...@@ -42,15 +42,15 @@ pinctrl@fffff200 {
board { board {
pinctrl_board_nand: nand0-board { pinctrl_board_nand: nand0-board {
atmel,pins = atmel,pins =
<3 3 0x0 0x1 /* PD3 gpio RDY pin pull_up*/ <AT91_PIOD 3 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP /* PD3 gpio RDY pin pull_up*/
2 14 0x0 0x1>; /* PC14 gpio enable pin pull_up */ AT91_PIOC 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PC14 gpio enable pin pull_up */
}; };
}; };
mmc { mmc {
pinctrl_board_mmc: mmc0-board { pinctrl_board_mmc: mmc0-board {
atmel,pins = 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 ...@@ -64,7 +64,7 @@ &pinctrl_mmc0_slot0_clk_cmd_dat0
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pioD 6 0>; cd-gpios = <&pioD 6 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -81,8 +81,8 @@ nand0: nand@40000000 { ...@@ -81,8 +81,8 @@ nand0: nand@40000000 {
nand-on-flash-bbt; nand-on-flash-bbt;
pinctrl-0 = <&pinctrl_board_nand>; pinctrl-0 = <&pinctrl_board_nand>;
gpios = <&pioD 3 0 gpios = <&pioD 3 GPIO_ACTIVE_HIGH
&pioC 14 0 &pioC 14 GPIO_ACTIVE_HIGH
0 0
>; >;
...@@ -134,13 +134,13 @@ leds { ...@@ -134,13 +134,13 @@ leds {
led0 { led0 {
label = "led0"; label = "led0";
gpios = <&pioD 0 1>; gpios = <&pioD 0 GPIO_ACTIVE_LOW>;
linux,default-trigger = "nand-disk"; linux,default-trigger = "nand-disk";
}; };
led1 { led1 {
label = "led1"; label = "led1";
gpios = <&pioD 31 0>; gpios = <&pioD 31 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
}; };
...@@ -152,13 +152,13 @@ gpio_keys { ...@@ -152,13 +152,13 @@ gpio_keys {
right { right {
label = "SW4"; label = "SW4";
gpios = <&pioE 7 1>; gpios = <&pioE 7 GPIO_ACTIVE_LOW>;
linux,code = <106>; linux,code = <106>;
}; };
up { up {
label = "SW3"; label = "SW3";
gpios = <&pioE 8 1>; gpios = <&pioE 8 GPIO_ACTIVE_LOW>;
linux,code = <103>; linux,code = <103>;
}; };
}; };
......
arch/arm/boot/dts/sama5d3.dtsi
View file @ 1247034e
This diff is collapsed.
arch/arm/boot/dts/sama5d31ek.dts
View file @ 1247034e
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/dts-v1/; /dts-v1/;
/include/ "sama5d3xmb.dtsi" #include "sama5d3xmb.dtsi"
/include/ "sama5d3xdm.dtsi" #include "sama5d3xdm.dtsi"
/ { / {
model = "Atmel SAMA5D31-EK"; model = "Atmel SAMA5D31-EK";
...@@ -41,7 +41,7 @@ macb1: ethernet@f802c000 { ...@@ -41,7 +41,7 @@ macb1: ethernet@f802c000 {
leds { leds {
d3 { d3 {
label = "d3"; label = "d3";
gpios = <&pioE 24 0>; gpios = <&pioE 24 GPIO_ACTIVE_HIGH>;
}; };
}; };
......
arch/arm/boot/dts/sama5d33ek.dts
View file @ 1247034e
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/dts-v1/; /dts-v1/;
/include/ "sama5d3xmb.dtsi" #include "sama5d3xmb.dtsi"
/include/ "sama5d3xdm.dtsi" #include "sama5d3xdm.dtsi"
/ { / {
model = "Atmel SAMA5D33-EK"; model = "Atmel SAMA5D33-EK";
......
arch/arm/boot/dts/sama5d34ek.dts
View file @ 1247034e
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/dts-v1/; /dts-v1/;
/include/ "sama5d3xmb.dtsi" #include "sama5d3xmb.dtsi"
/include/ "sama5d3xdm.dtsi" #include "sama5d3xdm.dtsi"
/ { / {
model = "Atmel SAMA5D34-EK"; model = "Atmel SAMA5D34-EK";
...@@ -51,7 +51,7 @@ macb0: ethernet@f0028000 { ...@@ -51,7 +51,7 @@ macb0: ethernet@f0028000 {
leds { leds {
d3 { d3 {
label = "d3"; label = "d3";
gpios = <&pioE 24 0>; gpios = <&pioE 24 GPIO_ACTIVE_HIGH>;
}; };
}; };
......
arch/arm/boot/dts/sama5d35ek.dts
View file @ 1247034e
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/dts-v1/; /dts-v1/;
/include/ "sama5d3xmb.dtsi" #include "sama5d3xmb.dtsi"
/ { / {
model = "Atmel SAMA5D35-EK"; model = "Atmel SAMA5D35-EK";
...@@ -48,7 +48,7 @@ gpio_keys { ...@@ -48,7 +48,7 @@ gpio_keys {
pb_user1 { pb_user1 {
label = "pb_user1"; label = "pb_user1";
gpios = <&pioE 27 0>; gpios = <&pioE 27 GPIO_ACTIVE_HIGH>;
linux,code = <0x100>; linux,code = <0x100>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
......
arch/arm/boot/dts/sama5d3xcm.dtsi
View file @ 1247034e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/include/ "sama5d3.dtsi" #include "sama5d3.dtsi"
/ { / {
compatible = "atmel,samad3xcm", "atmel,sama5d3", "atmel,sama5"; compatible = "atmel,samad3xcm", "atmel,sama5d3", "atmel,sama5";
...@@ -89,7 +89,7 @@ leds { ...@@ -89,7 +89,7 @@ leds {
d2 { d2 {
label = "d2"; label = "d2";
gpios = <&pioE 25 1>; /* PE25, conflicts with A25, RXD2 */ gpios = <&pioE 25 GPIO_ACTIVE_LOW>; /* PE25, conflicts with A25, RXD2 */
}; };
}; };
}; };
arch/arm/boot/dts/sama5d3xdm.dtsi
View file @ 1247034e
...@@ -33,7 +33,7 @@ pinctrl@fffff200 { ...@@ -33,7 +33,7 @@ pinctrl@fffff200 {
board { board {
pinctrl_qt1070_irq: qt1070_irq { pinctrl_qt1070_irq: qt1070_irq {
atmel,pins = atmel,pins =
<4 31 0x0 0x5>; /* PE31 GPIO with pull up deglith */ <AT91_PIOE 31 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PE31 GPIO with pull up deglith */
}; };
}; };
}; };
......
arch/arm/boot/dts/sama5d3xmb.dtsi
View file @ 1247034e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/include/ "sama5d3xcm.dtsi" #include "sama5d3xcm.dtsi"
/ { / {
compatible = "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5"; compatible = "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5";
...@@ -20,7 +20,7 @@ mmc0: mmc@f0000000 { ...@@ -20,7 +20,7 @@ mmc0: mmc@f0000000 {
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pioD 17 0>; cd-gpios = <&pioD 17 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -62,7 +62,7 @@ mmc1: mmc@f8000000 { ...@@ -62,7 +62,7 @@ mmc1: mmc@f8000000 {
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pioD 18 0>; cd-gpios = <&pioD 18 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -87,32 +87,32 @@ pinctrl@fffff200 { ...@@ -87,32 +87,32 @@ pinctrl@fffff200 {
board { board {
pinctrl_mmc0_cd: mmc0_cd { pinctrl_mmc0_cd: mmc0_cd {
atmel,pins = atmel,pins =
<3 17 0x0 0x5>; /* PD17 GPIO with pullup deglitch */ <AT91_PIOD 17 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD17 GPIO with pullup deglitch */
}; };
pinctrl_mmc1_cd: mmc1_cd { pinctrl_mmc1_cd: mmc1_cd {
atmel,pins = atmel,pins =
<3 18 0x0 0x5>; /* PD18 GPIO with pullup deglitch */ <AT91_PIOD 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD18 GPIO with pullup deglitch */
}; };
pinctrl_pck0_as_audio_mck: pck0_as_audio_mck { pinctrl_pck0_as_audio_mck: pck0_as_audio_mck {
atmel,pins = atmel,pins =
<3 30 0x2 0x0>; /* PD30 periph B */ <AT91_PIOD 30 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD30 periph B */
}; };
pinctrl_isi_reset: isi_reset-0 { pinctrl_isi_reset: isi_reset-0 {
atmel,pins = atmel,pins =
<4 24 0x0 0x0>; /* PE24 gpio */ <AT91_PIOE 24 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>; /* PE24 gpio */
}; };
pinctrl_isi_power: isi_power-0 { pinctrl_isi_power: isi_power-0 {
atmel,pins = atmel,pins =
<4 29 0x0 0x0>; /* PE29 gpio */ <AT91_PIOE 29 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>; /* PE29 gpio */
}; };
pinctrl_usba_vbus: usba_vbus { pinctrl_usba_vbus: usba_vbus {
atmel,pins = atmel,pins =
<3 29 0x0 0x4>; /* PD29 GPIO with deglitch */ <AT91_PIOD 29 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>; /* PD29 GPIO with deglitch */
}; };
}; };
}; };
...@@ -127,7 +127,7 @@ watchdog@fffffe40 { ...@@ -127,7 +127,7 @@ watchdog@fffffe40 {
}; };
usb0: gadget@00500000 { usb0: gadget@00500000 {
atmel,vbus-gpio = <&pioD 29 0>; atmel,vbus-gpio = <&pioD 29 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usba_vbus>; pinctrl-0 = <&pinctrl_usba_vbus>;
status = "okay"; status = "okay";
...@@ -135,9 +135,9 @@ usb0: gadget@00500000 { ...@@ -135,9 +135,9 @@ usb0: gadget@00500000 {
usb1: ohci@00600000 { usb1: ohci@00600000 {
num-ports = <3>; num-ports = <3>;
atmel,vbus-gpio = <&pioD 25 0 atmel,vbus-gpio = <&pioD 25 GPIO_ACTIVE_HIGH
&pioD 26 1 &pioD 26 GPIO_ACTIVE_LOW
&pioD 27 1 &pioD 27 GPIO_ACTIVE_LOW
>; >;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/tny_a9260.dts
View file @ 1247034e
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
* Licensed under GPLv2. * Licensed under GPLv2.
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9260.dtsi" #include "at91sam9260.dtsi"
/include/ "tny_a9260_common.dtsi" #include "tny_a9260_common.dtsi"
/ { / {
model = "Calao TNY A9260"; model = "Calao TNY A9260";
......
arch/arm/boot/dts/tny_a9263.dts
View file @ 1247034e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Licensed under GPLv2 only * Licensed under GPLv2 only
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9263.dtsi" #include "at91sam9263.dtsi"
/ { / {
model = "Calao TNY A9263"; model = "Calao TNY A9263";
...@@ -38,7 +38,7 @@ dbgu: serial@ffffee00 { ...@@ -38,7 +38,7 @@ dbgu: serial@ffffee00 {
}; };
usb1: gadget@fff78000 { usb1: gadget@fff78000 {
atmel,vbus-gpio = <&pioB 11 0>; atmel,vbus-gpio = <&pioB 11 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
}; };
......
arch/arm/boot/dts/tny_a9g20.dts
View file @ 1247034e
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
* Licensed under GPLv2. * Licensed under GPLv2.
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9g20.dtsi" #include "at91sam9g20.dtsi"
/include/ "tny_a9260_common.dtsi" #include "tny_a9260_common.dtsi"
/ { / {
model = "Calao TNY A9G20"; model = "Calao TNY A9G20";
......
arch/arm/boot/dts/usb_a9260.dts
View file @ 1247034e
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9260.dtsi" #include "at91sam9260.dtsi"
/include/ "usb_a9260_common.dtsi" #include "usb_a9260_common.dtsi"
/ { / {
model = "Calao USB A9260"; model = "Calao USB A9260";
......
arch/arm/boot/dts/usb_a9260_common.dtsi
View file @ 1247034e
...@@ -30,7 +30,7 @@ macb0: ethernet@fffc4000 { ...@@ -30,7 +30,7 @@ macb0: ethernet@fffc4000 {
}; };
usb1: gadget@fffa4000 { usb1: gadget@fffa4000 {
atmel,vbus-gpio = <&pioC 5 0>; atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
}; };
...@@ -93,7 +93,7 @@ leds { ...@@ -93,7 +93,7 @@ leds {
user_led { user_led {
label = "user_led"; label = "user_led";
gpios = <&pioB 21 1>; gpios = <&pioB 21 GPIO_ACTIVE_LOW>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
}; };
...@@ -105,7 +105,7 @@ gpio_keys { ...@@ -105,7 +105,7 @@ gpio_keys {
user_pb { user_pb {
label = "user_pb"; label = "user_pb";
gpios = <&pioB 10 1>; gpios = <&pioB 10 GPIO_ACTIVE_LOW>;
linux,code = <28>; linux,code = <28>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
......
arch/arm/boot/dts/usb_a9263.dts
View file @ 1247034e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Licensed under GPLv2 only * Licensed under GPLv2 only
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9263.dtsi" #include "at91sam9263.dtsi"
/ { / {
model = "Calao USB A9263"; model = "Calao USB A9263";
...@@ -43,7 +43,7 @@ macb0: ethernet@fffbc000 { ...@@ -43,7 +43,7 @@ macb0: ethernet@fffbc000 {
}; };
usb1: gadget@fff78000 { usb1: gadget@fff78000 {
atmel,vbus-gpio = <&pioB 11 0>; atmel,vbus-gpio = <&pioB 11 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -107,7 +107,7 @@ leds { ...@@ -107,7 +107,7 @@ leds {
user_led { user_led {
label = "user_led"; label = "user_led";
gpios = <&pioB 21 0>; gpios = <&pioB 21 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
}; };
...@@ -119,7 +119,7 @@ gpio_keys { ...@@ -119,7 +119,7 @@ gpio_keys {
user_pb { user_pb {
label = "user_pb"; label = "user_pb";
gpios = <&pioB 10 1>; gpios = <&pioB 10 GPIO_ACTIVE_LOW>;
linux,code = <28>; linux,code = <28>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
......
arch/arm/boot/dts/usb_a9g20-dab-mmx.dtsi
View file @ 1247034e
...@@ -28,39 +28,39 @@ leds { ...@@ -28,39 +28,39 @@ leds {
user_led1 { user_led1 {
label = "user_led1"; label = "user_led1";
gpios = <&pioB 20 1>; gpios = <&pioB 20 GPIO_ACTIVE_LOW>;
}; };
/* /*
* led already used by mother board but active as high * led already used by mother board but active as high
* user_led2 { * user_led2 {
* label = "user_led2"; * label = "user_led2";
* gpios = <&pioB 21 1>; * gpios = <&pioB 21 GPIO_ACTIVE_LOW>;
* }; * };
*/ */
user_led3 { user_led3 {
label = "user_led3"; label = "user_led3";
gpios = <&pioB 22 1>; gpios = <&pioB 22 GPIO_ACTIVE_LOW>;
}; };
user_led4 { user_led4 {
label = "user_led4"; label = "user_led4";
gpios = <&pioB 23 1>; gpios = <&pioB 23 GPIO_ACTIVE_LOW>;
}; };
red { red {
label = "red"; label = "red";
gpios = <&pioB 24 1>; gpios = <&pioB 24 GPIO_ACTIVE_LOW>;
}; };
orange { orange {
label = "orange"; label = "orange";
gpios = <&pioB 30 1>; gpios = <&pioB 30 GPIO_ACTIVE_LOW>;
}; };
green { green {
label = "green"; label = "green";
gpios = <&pioB 31 1>; gpios = <&pioB 31 GPIO_ACTIVE_LOW>;
}; };
}; };
...@@ -71,25 +71,25 @@ gpio_keys { ...@@ -71,25 +71,25 @@ gpio_keys {
user_pb1 { user_pb1 {
label = "user_pb1"; label = "user_pb1";
gpios = <&pioB 25 1>; gpios = <&pioB 25 GPIO_ACTIVE_LOW>;
linux,code = <0x100>; linux,code = <0x100>;
}; };
user_pb2 { user_pb2 {
label = "user_pb2"; label = "user_pb2";
gpios = <&pioB 13 1>; gpios = <&pioB 13 GPIO_ACTIVE_LOW>;
linux,code = <0x101>; linux,code = <0x101>;
}; };
user_pb3 { user_pb3 {
label = "user_pb3"; label = "user_pb3";
gpios = <&pioA 26 1>; gpios = <&pioA 26 GPIO_ACTIVE_LOW>;
linux,code = <0x102>; linux,code = <0x102>;
}; };
user_pb4 { user_pb4 {
label = "user_pb4"; label = "user_pb4";
gpios = <&pioC 9 1>; gpios = <&pioC 9 GPIO_ACTIVE_LOW>;
linux,code = <0x103>; linux,code = <0x103>;
}; };
}; };
......
arch/arm/boot/dts/usb_a9g20.dts
View file @ 1247034e
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/dts-v1/; /dts-v1/;
/include/ "at91sam9g20.dtsi" #include "at91sam9g20.dtsi"
/include/ "usb_a9260_common.dtsi" #include "usb_a9260_common.dtsi"
/ { / {
model = "Calao USB A9G20"; model = "Calao USB A9G20";
......
arch/arm/configs/at91_dt_defconfig
View file @ 1247034e
CONFIG_EXPERIMENTAL=y
# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_LOCALVERSION_AUTO is not set
# CONFIG_SWAP is not set # CONFIG_SWAP is not set
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
...@@ -25,8 +24,6 @@ CONFIG_AT91_PROGRAMMABLE_CLOCKS=y ...@@ -25,8 +24,6 @@ CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
CONFIG_AT91_TIMER_HZ=128 CONFIG_AT91_TIMER_HZ=128
CONFIG_AEABI=y CONFIG_AEABI=y
# CONFIG_OABI_COMPAT is not set # CONFIG_OABI_COMPAT is not set
CONFIG_LEDS=y
CONFIG_LEDS_CPU=y
CONFIG_UACCESS_WITH_MEMCPY=y CONFIG_UACCESS_WITH_MEMCPY=y
CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_BSS=0x0
...@@ -42,6 +39,9 @@ CONFIG_UNIX=y ...@@ -42,6 +39,9 @@ CONFIG_UNIX=y
CONFIG_INET=y CONFIG_INET=y
CONFIG_IP_MULTICAST=y CONFIG_IP_MULTICAST=y
CONFIG_IP_PNP=y CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y
CONFIG_IP_PNP_BOOTP=y
CONFIG_IP_PNP_RARP=y
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
# CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set
# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_XFRM_MODE_BEET is not set
...@@ -51,7 +51,8 @@ CONFIG_IPV6=y ...@@ -51,7 +51,8 @@ CONFIG_IPV6=y
# CONFIG_INET6_XFRM_MODE_TUNNEL is not set # CONFIG_INET6_XFRM_MODE_TUNNEL is not set
# CONFIG_INET6_XFRM_MODE_BEET is not set # CONFIG_INET6_XFRM_MODE_BEET is not set
CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_SIT_6RD=y
# CONFIG_WIRELESS is not set CONFIG_CFG80211=y
CONFIG_MAC80211=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y CONFIG_DEVTMPFS_MOUNT=y
...@@ -72,7 +73,6 @@ CONFIG_BLK_DEV_RAM_COUNT=4 ...@@ -72,7 +73,6 @@ CONFIG_BLK_DEV_RAM_COUNT=4
CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_RAM_SIZE=8192
CONFIG_ATMEL_PWM=y CONFIG_ATMEL_PWM=y
CONFIG_ATMEL_TCLIB=y CONFIG_ATMEL_TCLIB=y
CONFIG_EEPROM_93CX6=m
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_MULTI_LUN=y
...@@ -81,7 +81,6 @@ CONFIG_NETDEVICES=y ...@@ -81,7 +81,6 @@ CONFIG_NETDEVICES=y
CONFIG_MII=y CONFIG_MII=y
CONFIG_MACB=y CONFIG_MACB=y
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_VENDOR_CHELSIO is not set
# CONFIG_NET_VENDOR_FARADAY is not set # CONFIG_NET_VENDOR_FARADAY is not set
# CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_INTEL is not set
# CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MARVELL is not set
...@@ -92,7 +91,23 @@ CONFIG_MACB=y ...@@ -92,7 +91,23 @@ CONFIG_MACB=y
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
CONFIG_DAVICOM_PHY=y CONFIG_DAVICOM_PHY=y
CONFIG_MICREL_PHY=y CONFIG_MICREL_PHY=y
# CONFIG_WLAN is not set CONFIG_RTL8187=m
CONFIG_LIBERTAS=m
CONFIG_LIBERTAS_SDIO=m
CONFIG_LIBERTAS_SPI=m
CONFIG_RT2X00=m
CONFIG_RT2500USB=m
CONFIG_RT73USB=m
CONFIG_RT2800USB=m
CONFIG_RT2800USB_RT53XX=y
CONFIG_RT2800USB_RT55XX=y
CONFIG_RT2800USB_UNKNOWN=y
CONFIG_RTLWIFI=m
# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTL8192CU=m
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
CONFIG_MWIFIEX_USB=m
CONFIG_INPUT_POLLDEV=y CONFIG_INPUT_POLLDEV=y
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_MOUSEDEV_SCREEN_X=480 CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
...@@ -112,13 +127,11 @@ CONFIG_I2C=y ...@@ -112,13 +127,11 @@ CONFIG_I2C=y
CONFIG_I2C_GPIO=y CONFIG_I2C_GPIO=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_SPI_ATMEL=y CONFIG_SPI_ATMEL=y
CONFIG_PINCTRL_AT91=y
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_AT91SAM9X_WATCHDOG=y CONFIG_AT91SAM9X_WATCHDOG=y
CONFIG_SSB=m CONFIG_SSB=m
CONFIG_FB=y CONFIG_FB=y
CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_ATMEL=y CONFIG_FB_ATMEL=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_LCD_CLASS_DEVICE is not set # CONFIG_LCD_CLASS_DEVICE is not set
...@@ -132,11 +145,8 @@ CONFIG_FONT_8x8=y ...@@ -132,11 +145,8 @@ CONFIG_FONT_8x8=y
CONFIG_FONT_ACORN_8x8=y CONFIG_FONT_ACORN_8x8=y
CONFIG_FONT_MINI_4x6=y CONFIG_FONT_MINI_4x6=y
CONFIG_LOGO=y CONFIG_LOGO=y
# CONFIG_HID_SUPPORT is not set
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_DEVICEFS=y
# CONFIG_USB_DEVICE_CLASS is not set
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD=y
CONFIG_USB_ACM=y CONFIG_USB_ACM=y
...@@ -146,14 +156,9 @@ CONFIG_USB_SERIAL_GENERIC=y ...@@ -146,14 +156,9 @@ CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_FTDI_SIO=y CONFIG_USB_SERIAL_FTDI_SIO=y
CONFIG_USB_SERIAL_PL2303=y CONFIG_USB_SERIAL_PL2303=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_AT91=m CONFIG_USB_AT91=y
CONFIG_USB_ATMEL_USBA=m CONFIG_USB_ATMEL_USBA=y
CONFIG_USB_ETH=m CONFIG_USB_G_SERIAL=y
CONFIG_USB_GADGETFS=m
CONFIG_USB_CDC_COMPOSITE=m
CONFIG_USB_G_ACM_MS=m
CONFIG_USB_G_MULTI=m
CONFIG_USB_G_MULTI_CDC=y
CONFIG_MMC=y CONFIG_MMC=y
CONFIG_MMC_ATMELMCI=y CONFIG_MMC_ATMELMCI=y
CONFIG_NEW_LEDS=y CONFIG_NEW_LEDS=y
...@@ -168,16 +173,18 @@ CONFIG_RTC_DRV_AT91RM9200=y ...@@ -168,16 +173,18 @@ CONFIG_RTC_DRV_AT91RM9200=y
CONFIG_RTC_DRV_AT91SAM9=y CONFIG_RTC_DRV_AT91SAM9=y
CONFIG_DMADEVICES=y CONFIG_DMADEVICES=y
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_EXT2_FS=y CONFIG_EXT4_FS=y
CONFIG_FANOTIFY=y CONFIG_FANOTIFY=y
CONFIG_VFAT_FS=y CONFIG_VFAT_FS=y
CONFIG_TMPFS=y CONFIG_TMPFS=y
CONFIG_UBIFS_FS=y
CONFIG_UBIFS_FS_ADVANCED_COMPR=y
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_NFS_V3=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_CODEPAGE_850=y CONFIG_NLS_CODEPAGE_850=y
CONFIG_NLS_ISO8859_1=y CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_UTF8=y
CONFIG_STRIP_ASM_SYMS=y CONFIG_STRIP_ASM_SYMS=y
CONFIG_DEBUG_FS=y CONFIG_DEBUG_FS=y
# CONFIG_SCHED_DEBUG is not set # CONFIG_SCHED_DEBUG is not set
...@@ -192,7 +199,7 @@ CONFIG_CRYPTO_ARC4=y ...@@ -192,7 +199,7 @@ CONFIG_CRYPTO_ARC4=y
CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC_CCITT=m CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=m CONFIG_CRC_ITU_T=y
CONFIG_CRC7=m CONFIG_CRC7=m
CONFIG_AVERAGE=y CONFIG_AVERAGE=y
arch/arm/configs/at91rm9200_defconfig
View file @ 1247034e
CONFIG_EXPERIMENTAL=y
# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_LOCALVERSION_AUTO is not set
# CONFIG_SWAP is not set # CONFIG_SWAP is not set
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_IKCONFIG=y CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_USER_NS=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
CONFIG_MODULES=y CONFIG_MODULES=y
CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_FORCE_LOAD=y
...@@ -35,49 +37,37 @@ CONFIG_AT91_TIMER_HZ=100 ...@@ -35,49 +37,37 @@ CONFIG_AT91_TIMER_HZ=100
# CONFIG_ARM_THUMB is not set # CONFIG_ARM_THUMB is not set
CONFIG_PCCARD=y CONFIG_PCCARD=y
CONFIG_AT91_CF=y CONFIG_AT91_CF=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y CONFIG_AEABI=y
CONFIG_LEDS=y # CONFIG_COMPACTION is not set
CONFIG_LEDS_CPU=y
CONFIG_ZBOOT_ROM_TEXT=0x10000000 CONFIG_ZBOOT_ROM_TEXT=0x10000000
CONFIG_ZBOOT_ROM_BSS=0x20040000 CONFIG_ZBOOT_ROM_BSS=0x20040000
CONFIG_KEXEC=y CONFIG_KEXEC=y
CONFIG_AUTO_ZRELADDR=y
CONFIG_FPE_NWFPE=y CONFIG_FPE_NWFPE=y
CONFIG_BINFMT_MISC=y CONFIG_BINFMT_MISC=y
CONFIG_NET=y CONFIG_NET=y
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_UNIX=y CONFIG_UNIX=y
CONFIG_XFRM_USER=m
CONFIG_INET=y CONFIG_INET=y
CONFIG_IP_MULTICAST=y CONFIG_IP_MULTICAST=y
CONFIG_IP_PNP=y CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_DHCP=y
CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_BOOTP=y
CONFIG_NET_IPIP=m # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
CONFIG_INET_AH=m # CONFIG_INET_XFRM_MODE_TUNNEL is not set
CONFIG_INET_ESP=m # CONFIG_INET_XFRM_MODE_BEET is not set
CONFIG_INET_IPCOMP=m # CONFIG_INET_DIAG is not set
CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_IPV6=y
CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET_XFRM_MODE_BEET=m
CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTER_PREF=y
CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_ROUTE_INFO=y
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m
CONFIG_IPV6_MIP6=m
CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
CONFIG_IPV6_TUNNEL=m
CONFIG_BRIDGE=m
CONFIG_VLAN_8021Q=m
CONFIG_BT=m
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
CONFIG_MTD=y CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_AFS_PARTS=y
CONFIG_MTD_CHAR=y CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y CONFIG_MTD_CFI=y
...@@ -94,55 +84,21 @@ CONFIG_MTD_NAND_PLATFORM=y ...@@ -94,55 +84,21 @@ CONFIG_MTD_NAND_PLATFORM=y
CONFIG_MTD_UBI=y CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_GLUEBI=y CONFIG_MTD_UBI_GLUEBI=y
CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_NBD=y
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_RAM_SIZE=8192
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SR=m
CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m
CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_LOWLEVEL is not set
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_TUN=m CONFIG_MII=y
CONFIG_ARM_AT91_ETHER=y CONFIG_ARM_AT91_ETHER=y
CONFIG_PHYLIB=y
CONFIG_DAVICOM_PHY=y CONFIG_DAVICOM_PHY=y
CONFIG_SMSC_PHY=y CONFIG_SMSC_PHY=y
CONFIG_MICREL_PHY=y CONFIG_MICREL_PHY=y
CONFIG_PPP=y # CONFIG_WLAN is not set
CONFIG_PPP_BSDCOMP=y # CONFIG_INPUT_MOUSEDEV is not set
CONFIG_PPP_DEFLATE=y
CONFIG_PPP_FILTER=y
CONFIG_PPP_MPPE=m
CONFIG_PPP_MULTILINK=y
CONFIG_PPPOE=m
CONFIG_PPP_ASYNC=y
CONFIG_SLIP=m
CONFIG_SLIP_COMPRESSED=y
CONFIG_SLIP_SMART=y
CONFIG_SLIP_MODE_SLIP6=y
CONFIG_USB_CATC=m
CONFIG_USB_KAWETH=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_RTL8150=m
CONFIG_USB_USBNET=m
CONFIG_USB_NET_DM9601=m
CONFIG_USB_NET_GL620A=m
CONFIG_USB_NET_PLUSB=m
CONFIG_USB_NET_RNDIS_HOST=m
CONFIG_USB_ALI_M5632=y
CONFIG_USB_AN2720=y
CONFIG_USB_EPSON2888=y
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_GPIO=y
# CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_LEGACY_PTY_COUNT=32 # CONFIG_LEGACY_PTYS is not set
CONFIG_SERIAL_ATMEL=y CONFIG_SERIAL_ATMEL=y
CONFIG_SERIAL_ATMEL_CONSOLE=y CONFIG_SERIAL_ATMEL_CONSOLE=y
CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM=y
...@@ -151,38 +107,8 @@ CONFIG_I2C_CHARDEV=y ...@@ -151,38 +107,8 @@ CONFIG_I2C_CHARDEV=y
CONFIG_I2C_GPIO=y CONFIG_I2C_GPIO=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_SPI_ATMEL=y CONFIG_SPI_ATMEL=y
CONFIG_SPI_BITBANG=y
CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SYSFS=y
CONFIG_HWMON=m # CONFIG_HWMON is not set
CONFIG_SENSORS_ADM1021=m
CONFIG_SENSORS_ADM1025=m
CONFIG_SENSORS_ADM1026=m
CONFIG_SENSORS_ADM1029=m
CONFIG_SENSORS_ADM1031=m
CONFIG_SENSORS_ADM9240=m
CONFIG_SENSORS_DS1621=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_LM63=m
CONFIG_SENSORS_LM73=m
CONFIG_SENSORS_LM75=m
CONFIG_SENSORS_LM77=m
CONFIG_SENSORS_LM78=m
CONFIG_SENSORS_LM80=m
CONFIG_SENSORS_LM83=m
CONFIG_SENSORS_LM85=m
CONFIG_SENSORS_LM87=m
CONFIG_SENSORS_LM90=m
CONFIG_SENSORS_LM92=m
CONFIG_SENSORS_MAX1619=m
CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_SMSC47B397=m
CONFIG_SENSORS_W83781D=m
CONFIG_SENSORS_W83791D=m
CONFIG_SENSORS_W83792D=m
CONFIG_SENSORS_W83793=m
CONFIG_SENSORS_W83L785TS=m
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_NOWAYOUT=y CONFIG_WATCHDOG_NOWAYOUT=y
CONFIG_AT91RM9200_WATCHDOG=y CONFIG_AT91RM9200_WATCHDOG=y
...@@ -194,43 +120,14 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y ...@@ -194,43 +120,14 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_CLASS_DEVICE=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set # CONFIG_BACKLIGHT_GENERIC is not set
CONFIG_DISPLAY_SUPPORT=y
CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FONTS=y CONFIG_FONTS=y
CONFIG_FONT_MINI_4x6=y
CONFIG_LOGO=y CONFIG_LOGO=y
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_DEVICEFS=y
# CONFIG_USB_DEVICE_CLASS is not set
CONFIG_USB_MON=y
CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD=y
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
CONFIG_USB_STORAGE=y
CONFIG_USB_SERIAL=y
CONFIG_USB_SERIAL_CONSOLE=y
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_FTDI_SIO=y
CONFIG_USB_SERIAL_KEYSPAN=y
CONFIG_USB_SERIAL_KEYSPAN_MPR=y
CONFIG_USB_SERIAL_KEYSPAN_USA28=y
CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
CONFIG_USB_SERIAL_KEYSPAN_USA19=y
CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
CONFIG_USB_SERIAL_MCT_U232=y
CONFIG_USB_SERIAL_PL2303=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_ETH=m CONFIG_USB_AT91=y
CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=y
CONFIG_MMC=y CONFIG_MMC=y
CONFIG_MMC_ATMELMCI=y CONFIG_MMC_ATMELMCI=y
CONFIG_NEW_LEDS=y CONFIG_NEW_LEDS=y
...@@ -240,84 +137,27 @@ CONFIG_LEDS_TRIGGERS=y ...@@ -240,84 +137,27 @@ CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_LEDS_TRIGGER_GPIO=y CONFIG_LEDS_TRIGGER_GPIO=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
# CONFIG_RTC_HCTOSYS is not set
CONFIG_RTC_DRV_DS1307=y
CONFIG_RTC_DRV_PCF8563=y
CONFIG_RTC_DRV_AT91RM9200=y CONFIG_RTC_DRV_AT91RM9200=y
CONFIG_EXT2_FS=y CONFIG_EXT4_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT3_FS=y
# CONFIG_EXT3_FS_XATTR is not set
CONFIG_REISERFS_FS=y
CONFIG_AUTOFS4_FS=y CONFIG_AUTOFS4_FS=y
CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y
CONFIG_ZISOFS=y
CONFIG_UDF_FS=y
CONFIG_MSDOS_FS=y
CONFIG_VFAT_FS=y CONFIG_VFAT_FS=y
CONFIG_NTFS_FS=m
CONFIG_TMPFS=y CONFIG_TMPFS=y
CONFIG_CONFIGFS_FS=y CONFIG_UBIFS_FS=y
CONFIG_JFFS2_FS=y CONFIG_UBIFS_FS_ADVANCED_COMPR=y
CONFIG_JFFS2_SUMMARY=y
CONFIG_JFFS2_COMPRESSION_OPTIONS=y
CONFIG_JFFS2_LZO=y
CONFIG_JFFS2_RUBIN=y
CONFIG_CRAMFS=y
CONFIG_MINIX_FS=y
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_NFS_V3=y
CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_NFSD=y
CONFIG_CIFS=m
CONFIG_PARTITION_ADVANCED=y
CONFIG_MAC_PARTITION=y
CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_CODEPAGE_737=m CONFIG_NLS_CODEPAGE_850=y
CONFIG_NLS_CODEPAGE_775=m
CONFIG_NLS_CODEPAGE_850=m
CONFIG_NLS_CODEPAGE_852=m
CONFIG_NLS_CODEPAGE_855=m
CONFIG_NLS_CODEPAGE_857=m
CONFIG_NLS_CODEPAGE_860=m
CONFIG_NLS_CODEPAGE_861=m
CONFIG_NLS_CODEPAGE_862=m
CONFIG_NLS_CODEPAGE_863=m
CONFIG_NLS_CODEPAGE_864=m
CONFIG_NLS_CODEPAGE_865=m
CONFIG_NLS_CODEPAGE_866=m
CONFIG_NLS_CODEPAGE_869=m
CONFIG_NLS_CODEPAGE_936=m
CONFIG_NLS_CODEPAGE_950=m
CONFIG_NLS_CODEPAGE_932=m
CONFIG_NLS_CODEPAGE_949=m
CONFIG_NLS_CODEPAGE_874=m
CONFIG_NLS_ISO8859_8=m
CONFIG_NLS_CODEPAGE_1250=m
CONFIG_NLS_CODEPAGE_1251=m
CONFIG_NLS_ASCII=m
CONFIG_NLS_ISO8859_1=y CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_ISO8859_2=m
CONFIG_NLS_ISO8859_3=m
CONFIG_NLS_ISO8859_4=m
CONFIG_NLS_ISO8859_5=m
CONFIG_NLS_ISO8859_6=m
CONFIG_NLS_ISO8859_7=m
CONFIG_NLS_ISO8859_9=m
CONFIG_NLS_ISO8859_13=m
CONFIG_NLS_ISO8859_14=m
CONFIG_NLS_ISO8859_15=m
CONFIG_NLS_KOI8_R=m
CONFIG_NLS_KOI8_U=m
CONFIG_NLS_UTF8=y CONFIG_NLS_UTF8=y
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_FS=y CONFIG_DEBUG_FS=y
CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KERNEL=y
# CONFIG_FTRACE is not set # CONFIG_FTRACE is not set
CONFIG_DEBUG_USER=y
CONFIG_DEBUG_LL=y
CONFIG_EARLY_PRINTK=y
CONFIG_CRYPTO_PCBC=y CONFIG_CRYPTO_PCBC=y
CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA1=y
CONFIG_XZ_DEC_ARMTHUMB=y
arch/arm/configs/at91sam9260_defconfig deleted 100644 → 0
View file @ 38d77ff9
CONFIG_EXPERIMENTAL=y
# CONFIG_LOCALVERSION_AUTO is not set
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_BLK_DEV_INITRD=y
CONFIG_SLAB=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_AT91=y
CONFIG_ARCH_AT91SAM9260=y
CONFIG_ARCH_AT91SAM9260_SAM9XE=y
CONFIG_MACH_AT91SAM9260EK=y
CONFIG_MACH_CAM60=y
CONFIG_MACH_SAM9_L9260=y
CONFIG_MACH_AFEB9260=y
CONFIG_MACH_USB_A9260=y
CONFIG_MACH_QIL_A9260=y
CONFIG_MACH_CPU9260=y
CONFIG_MACH_FLEXIBITY=y
CONFIG_MACH_SNAPPER_9260=y
CONFIG_MACH_AT91SAM9_DT=y
CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
# CONFIG_ARM_THUMB is not set
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_ARM_APPENDED_DTB=y
CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
CONFIG_FPE_NWFPE=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y
CONFIG_IP_PNP=y
CONFIG_IP_PNP_BOOTP=y
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
# CONFIG_INET_XFRM_MODE_BEET is not set
# CONFIG_INET_LRO is not set
# CONFIG_IPV6 is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=8192
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
CONFIG_SCSI_MULTI_LUN=y
CONFIG_NETDEVICES=y
CONFIG_MII=y
CONFIG_MACB=y
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
# CONFIG_INPUT_KEYBOARD is not set
# CONFIG_INPUT_MOUSE is not set
# CONFIG_SERIO is not set
CONFIG_SERIAL_ATMEL=y
CONFIG_SERIAL_ATMEL_CONSOLE=y
# CONFIG_HW_RANDOM is not set
CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_GPIO=y
# CONFIG_HWMON is not set
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_NOWAYOUT=y
CONFIG_AT91SAM9X_WATCHDOG=y
# CONFIG_USB_HID is not set
CONFIG_USB=y
CONFIG_USB_DEVICEFS=y
CONFIG_USB_MON=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_STORAGE_DEBUG=y
CONFIG_USB_GADGET=y
CONFIG_USB_ZERO=m
CONFIG_USB_GADGETFS=m
CONFIG_USB_MASS_STORAGE=m
CONFIG_USB_G_SERIAL=m
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_AT91SAM9=y
CONFIG_EXT2_FS=y
CONFIG_VFAT_FS=y
CONFIG_TMPFS=y
CONFIG_CRAMFS=y
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_CODEPAGE_850=y
CONFIG_NLS_ISO8859_1=y
CONFIG_DEBUG_KERNEL=y
CONFIG_DEBUG_USER=y
CONFIG_DEBUG_LL=y
arch/arm/configs/at91sam9263_defconfig
View file @ 1247034e
This diff is collapsed.
arch/arm/configs/at91sam9g45_defconfig
View file @ 1247034e
This diff is collapsed.
arch/arm/configs/sama5_defconfig
View file @ 1247034e
This diff is collapsed.
arch/arm/mach-at91/Kconfig.non_dt
View file @ 1247034e
This diff is collapsed.
arch/arm/mach-at91/Makefile
View file @ 1247034e
...@@ -27,10 +27,8 @@ obj-$(CONFIG_SOC_SAMA5D3) += sama5d3.o ...@@ -27,10 +27,8 @@ obj-$(CONFIG_SOC_SAMA5D3) += sama5d3.o
obj-$(CONFIG_ARCH_AT91RM9200) += at91rm9200_devices.o obj-$(CONFIG_ARCH_AT91RM9200) += at91rm9200_devices.o
obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260_devices.o obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260_devices.o
obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261_devices.o obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261_devices.o
obj-$(CONFIG_ARCH_AT91SAM9G10) += at91sam9261_devices.o
obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263_devices.o obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263_devices.o
obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl_devices.o obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl_devices.o
obj-$(CONFIG_ARCH_AT91SAM9G20) += at91sam9260_devices.o
obj-$(CONFIG_ARCH_AT91SAM9G45) += at91sam9g45_devices.o obj-$(CONFIG_ARCH_AT91SAM9G45) += at91sam9g45_devices.o
obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o
......
arch/arm/mach-at91/board-sam9261ek.c
View file @ 1247034e
This diff is collapsed.
drivers/usb/gadget/Kconfig
View file @ 1247034e
...@@ -155,7 +155,7 @@ config USB_LPC32XX ...@@ -155,7 +155,7 @@ config USB_LPC32XX
config USB_ATMEL_USBA config USB_ATMEL_USBA
tristate "Atmel USBA" tristate "Atmel USBA"
depends on AVR32 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45 depends on AVR32 || ARCH_AT91
help help
USBA is the integrated high-speed USB Device controller on USBA is the integrated high-speed USB Device controller on
the AT32AP700x, some AT91SAM9 and AT91CAP9 processors from Atmel. the AT32AP700x, some AT91SAM9 and AT91CAP9 processors from Atmel.
......
drivers/usb/gadget/atmel_usba_udc.c
View file @ 1247034e
This diff is collapsed.
drivers/usb/gadget/atmel_usba_udc.h
View file @ 1247034e
This diff is collapsed.
include/dt-bindings/pinctrl/at91.h 0 → 100644
View file @ 1247034e
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