mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-04 08:08:54 +00:00
Code Issues Releases Wiki Activity

AT91 DT for 5.4

Browse source 
- style cleanup for at91sam9x5 based boards
  - avoid colliding node and property names
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEycoQi/giopmpPgB12wIijOdRNOUFAl1i7LwACgkQ2wIijOdR
 NOUyHw//VpofYtw7d5C/z7L4l1yYvZBquOTvXMImrTQ1q4XRdiJnVrvwKENYX4IR
 dly/pcEv3HET+tUlZUCwwpNsYa3R3hJRtvKXGXgSxURUG5P/xFbJ7aZzbq+c38Ek
 kTnckDXdYbLd13Rwm8Wr/zWEleoK9S2PmPNN+bJOMJ9d5Si1ROk7UOsjmrFgR7Za
 NVzw5EEAqBRHpDb/ihq/OC+7ESN2q6r8ZvL94uQ2y21ekJJCPqRziG/8SR/mLXi/
 AHcBrochsOqBhsqGCkpOVlncUXwlIi3bx1wKSvNk65gJMCIWnAcD2uJiYTjdu2fM
 ZKNA64Tyw2QCuNUpkIwVtNymTwXQRTcAMKvI2Bo9Ct4fP8cOeV/Hck/8Rp5Hd3sF
 r5NPx0Vuq4akAsaJJ5NqIpQkTnAhTi8olBalQvzrNPRK2mlOkotzYQf1FqSZkV3p
 HZVAUcmbM8His+U/svQMbaU44OsvpCY0YJl8Dyt98w2NhRIjtExx4kPBd0TIsas1
 utp2xho2um0ZiwypkXCvzARdPGu8rbjy6QcgwkDOxuAS2n+R0KYk10ZzAzwIb7T7
 8/L/FbLG3nqiy+qXim/K8xYuQaKecafqWSxynErEOIBcV2uFTr0bPa5zmNt3hZx6
 WX6LQXur6Nh+y7xBLm/bsNZt2OD/HwXCJfibx0EN2R1Et1TR4zM=
 =XH85
 -----END PGP SIGNATURE-----

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

AT91 DT for 5.4

 - style cleanup for at91sam9x5 based boards
 - avoid colliding node and property names

* tag 'at91-5.4-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: at91sam9x5dm.dtsi: Style cleanup
  ARM: dts: at91: at91sam9x5_lcd.dtsi: Style cleanup
  ARM: dts: at91: at91sam9xx5ek: Style cleanup
  ARM: dts: at91: at91sam9g15: Style cleanup
  ARM: dts: at91: kizboxmini: Style cleanup
  ARM: dts: at91: cosino: Style cleanup
  ARM: dts: at91: ariettag25: style cleanup
  ARM: dts: at91: ariag25: Style cleanup
  ARM: dts: at91: Add label for sam9x5's internal RTC
  dt-bindings: add vendor prefix "acme" for "Acme Systems srl"
  ARM: dts: at91: Avoid colliding 'display' node and property names

Link: https://lore.kernel.org/r/20190825202642.GA18853@piout.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2019-09-03 16:12:52 +02:00
commit 7eaeb52fd9
20 changed files with 810 additions and 857 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/devicetree/bindings/vendor-prefixes.yaml
View file

@ -27,6 +27,8 @@ patternProperties:
description: Abilis Systems description: Abilis Systems
"^abracon,.*": "^abracon,.*":
description: Abracon Corporation description: Abracon Corporation
"^acme,.*":
description: Acme Systems srl
"^actions,.*": "^actions,.*":
description: Actions Semiconductor Co., Ltd. description: Actions Semiconductor Co., Ltd.
"^active-semi,.*": "^active-semi,.*":

255
arch/arm/boot/dts/at91-ariag25.dts
View file

@ -14,11 +14,6 @@ / {
"atmel,at91sam9x5", "atmel,at91sam9"; "atmel,at91sam9x5", "atmel,at91sam9";
aliases { aliases {
serial0 = &dbgu;
serial1 = &usart0;
serial2 = &usart1;
serial3 = &usart2;
serial4 = &usart3;
serial5 = &uart0; serial5 = &uart0;
serial6 = &uart1; serial6 = &uart1;
}; };
@ -42,132 +37,6 @@ main_xtal {
}; };
}; };
ahb {
apb {
mmc0: mmc@f0008000 {
/* N.B. Aria has no SD card detect (CD), assumed present */
pinctrl-0 = <
&pinctrl_mmc0_slot0_clk_cmd_dat0
&pinctrl_mmc0_slot0_dat1_3>;
status = "okay";
slot@0 {
reg = <0>;
bus-width = <4>;
};
};
tcb0: timer@f8008000 {
timer@0 {
compatible = "atmel,tcb-timer";
reg = <0>;
};
timer@1 {
compatible = "atmel,tcb-timer";
reg = <1>;
};
};
i2c0: i2c@f8010000 {
status = "okay";
};
i2c1: i2c@f8014000 {
status = "okay";
};
/* TWD2+TCLK2 hidden behind ethernet, so no i2c2 */
usart0: serial@f801c000 {
pinctrl-0 = <&pinctrl_usart0
&pinctrl_usart0_rts
&pinctrl_usart0_cts>;
status = "okay";
};
usart1: serial@f8020000 {
pinctrl-0 = <&pinctrl_usart1
/* &pinctrl_usart1_rts */
/* &pinctrl_usart1_cts */
>;
status = "okay";
};
usart2: serial@f8024000 {
/* cannot activate RTS2+CTS2, clash with
* ethernet on PB0 and PB1 */
pinctrl-0 = <&pinctrl_usart2>;
status = "okay";
};
usart3: serial@f8028000 {
compatible = "atmel,at91sam9260-usart";
reg = <0xf8028000 0x200>;
interrupts = <8 4 5>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usart3
/* &pinctrl_usart3_rts */
/* &pinctrl_usart3_cts */
>;
status = "okay";
};
macb0: ethernet@f802c000 {
phy-mode = "rmii";
/*
* following can be overwritten by bootloader:
* for example u-boot 'ftd set' command
*/
local-mac-address = [00 00 00 00 00 00];
status = "okay";
};
/*
* UART0/1 pins are marked as GPIO on
* Aria documentation.
* Change to "okay" if you need additional serial ports
*/
uart0: serial@f8040000 {
status = "disabled";
};
uart1: serial@f8044000 {
status = "disabled";
};
adc0: adc@f804c000 {
status = "okay";
atmel,adc-channels-used = <0xf>;
};
dbgu: serial@fffff200 {
status = "okay";
};
pinctrl@fffff400 {
w1_0 {
pinctrl_w1_0: w1_0-0 {
atmel,pins = <0 21 0x0 0x1>; /* PA21 PIO, pull-up */
};
};
};
rtc@fffffeb0 {
status = "okay";
};
};
usb0: ohci@600000 {
status = "okay";
num-ports = <3>;
};
usb1: ehci@700000 {
status = "okay";
};
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
@ -187,3 +56,127 @@ onewire {
pinctrl-0 = <&pinctrl_w1_0>; pinctrl-0 = <&pinctrl_w1_0>;
}; };
}; };
&adc0 {
status = "okay";
atmel,adc-channels-used = <0xf>;
};
&dbgu {
status = "okay";
};
&i2c0 {
status = "okay";
};
&i2c1 {
status = "okay";
};
/* TWD2+TCLK2 hidden behind ethernet, so no i2c2 */
&macb0 {
phy-mode = "rmii";
/*
* following can be overwritten by bootloader:
* for example u-boot 'ftd set' command
*/
local-mac-address = [00 00 00 00 00 00];
status = "okay";
};
&mmc0 {
/* N.B. Aria has no SD card detect (CD), assumed present */
pinctrl-0 = <
&pinctrl_mmc0_slot0_clk_cmd_dat0
&pinctrl_mmc0_slot0_dat1_3>;
status = "okay";
slot@0 {
reg = <0>;
bus-width = <4>;
};
};
&pinctrl {
w1_0 {
pinctrl_w1_0: w1_0-0 {
atmel,pins = <0 21 0x0 0x1>; /* PA21 PIO, pull-up */
};
};
};
&rtc {
status = "okay";
};
&tcb0 {
timer@0 {
compatible = "atmel,tcb-timer";
reg = <0>;
};
timer@1 {
compatible = "atmel,tcb-timer";
reg = <1>;
};
};
/*
* UART0/1 pins are marked as GPIO on
* Aria documentation.
* Change to "okay" if you need additional serial ports
*/
&uart0 {
status = "disabled";
};
&uart1 {
status = "disabled";
};
&usart0 {
pinctrl-0 = <&pinctrl_usart0
&pinctrl_usart0_rts
&pinctrl_usart0_cts>;
status = "okay";
};
&usart1 {
pinctrl-0 = <&pinctrl_usart1
/* &pinctrl_usart1_rts */
/* &pinctrl_usart1_cts */
>;
status = "okay";
};
&usart2 {
/* cannot activate RTS2+CTS2, clash with
* ethernet on PB0 and PB1 */
pinctrl-0 = <&pinctrl_usart2>;
status = "okay";
};
&usart3 {
compatible = "atmel,at91sam9260-usart";
reg = <0xf8028000 0x200>;
interrupts = <8 4 5>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usart3
/* &pinctrl_usart3_rts */
/* &pinctrl_usart3_cts */
>;
status = "okay";
};
&usb0 {
status = "okay";
num-ports = <3>;
};
&usb1 {
status = "okay";
};

78
arch/arm/boot/dts/at91-ariettag25.dts
View file

@ -6,14 +6,11 @@
*/ */
/dts-v1/; /dts-v1/;
#include "at91sam9g25.dtsi" #include "at91sam9g25.dtsi"
/ { / {
model = "Acme Systems Arietta G25"; model = "Acme Systems Arietta G25";
compatible = "acme,ariettag25", "atmel,at91sam9x5", "atmel,at91sam9"; compatible = "acme,ariettag25", "atmel,at91sam9x5", "atmel,at91sam9";
aliases {
serial0 = &dbgu;
};
chosen { chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
@ -32,9 +29,22 @@ main_xtal {
}; };
}; };
ahb { leds {
apb { compatible = "gpio-leds";
mmc0: mmc@f0008000 {
arietta_led {
label = "arietta_led";
gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */
linux,default-trigger = "heartbeat";
};
};
};
&dbgu {
status = "okay";
};
&mmc0 {
pinctrl-0 = < pinctrl-0 = <
&pinctrl_mmc0_slot0_clk_cmd_dat0 &pinctrl_mmc0_slot0_clk_cmd_dat0
&pinctrl_mmc0_slot0_dat1_3>; &pinctrl_mmc0_slot0_dat1_3>;
@ -44,9 +54,13 @@ slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
}; };
}; };
tcb0: timer@f8008000 { &rtc {
status = "okay";
};
&tcb0 {
timer@0 { timer@0 {
compatible = "atmel,tcb-timer"; compatible = "atmel,tcb-timer";
reg = <0>; reg = <0>;
@ -56,37 +70,17 @@ timer@1 {
compatible = "atmel,tcb-timer"; compatible = "atmel,tcb-timer";
reg = <1>; reg = <1>;
}; };
}; };
usb2: gadget@f803c000 { &usb0 {
status = "okay"; num-ports = <3>;
}; status = "okay";
};
dbgu: serial@fffff200 {
status = "okay"; &usb1 {
}; status = "okay";
};
rtc@fffffeb0 {
status = "okay"; &usb2 {
}; status = "okay";
};
usb0: ohci@600000 {
status = "okay";
num-ports = <3>;
};
usb1: ehci@700000 {
status = "okay";
};
};
leds {
compatible = "gpio-leds";
arietta_led {
label = "arietta_led";
gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */
linux,default-trigger = "heartbeat";
};
};
}; };

109
arch/arm/boot/dts/at91-cosino.dtsi
View file

@ -33,78 +33,30 @@ main_xtal {
clock-frequency = <12000000>; clock-frequency = <12000000>;
}; };
}; };
};
ahb { &adc0 {
apb {
tcb0: timer@f8008000 {
timer@0 {
compatible = "atmel,tcb-timer";
reg = <0>;
};
timer@1 {
compatible = "atmel,tcb-timer";
reg = <1>;
};
};
mmc0: mmc@f0008000 {
pinctrl-0 = <
&pinctrl_board_mmc0
&pinctrl_mmc0_slot0_clk_cmd_dat0
&pinctrl_mmc0_slot0_dat1_3>;
status = "okay";
slot@0 {
reg = <0>;
bus-width = <4>;
cd-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
};
};
dbgu: serial@fffff200 {
status = "okay";
};
usart0: serial@f801c000 {
status = "okay";
};
i2c0: i2c@f8010000 {
status = "okay";
};
adc0: adc@f804c000 {
atmel,adc-ts-wires = <4>; atmel,adc-ts-wires = <4>;
atmel,adc-ts-pressure-threshold = <10000>; atmel,adc-ts-pressure-threshold = <10000>;
status = "okay"; status = "okay";
}; };
pinctrl@fffff400 { &dbgu {
mmc0 {
pinctrl_board_mmc0: mmc0-board {
atmel,pins =
<AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD15 gpio CD pin pull up and deglitch */
};
};
};
watchdog@fffffe40 {
status = "okay"; status = "okay";
}; };
};
ebi: ebi@10000000 { &ebi {
pinctrl-0 = <&pinctrl_ebi_addr_nand pinctrl-0 = <&pinctrl_ebi_addr_nand
&pinctrl_ebi_data_0_7>; &pinctrl_ebi_data_0_7>;
pinctrl-names = "default"; pinctrl-names = "default";
status = "okay"; status = "okay";
nand_controller: nand-controller { nand-controller {
status = "okay";
pinctrl-0 = <&pinctrl_nand_oe_we pinctrl-0 = <&pinctrl_nand_oe_we
&pinctrl_nand_cs &pinctrl_nand_cs
&pinctrl_nand_rb>; &pinctrl_nand_rb>;
pinctrl-names = "default"; pinctrl-names = "default";
status = "okay";
nand@3 { nand@3 {
reg = <0x3 0x0 0x800000>; reg = <0x3 0x0 0x800000>;
@ -149,6 +101,51 @@ rootfs@800000 {
}; };
}; };
}; };
};
&i2c0 {
status = "okay";
};
&mmc0 {
pinctrl-0 = <
&pinctrl_board_mmc0
&pinctrl_mmc0_slot0_clk_cmd_dat0
&pinctrl_mmc0_slot0_dat1_3>;
status = "okay";
slot@0 {
reg = <0>;
bus-width = <4>;
cd-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
};
};
&pinctrl {
mmc0 {
pinctrl_board_mmc0: mmc0-board {
atmel,pins =
<AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD15 gpio CD pin pull up and deglitch */
}; };
}; };
}; };
&tcb0 {
timer@0 {
compatible = "atmel,tcb-timer";
reg = <0>;
};
timer@1 {
compatible = "atmel,tcb-timer";
reg = <1>;
};
};
&usart0 {
status = "okay";
};
&watchdog {
status = "okay";
};

63
arch/arm/boot/dts/at91-cosino_mega2560.dts
View file

@ -17,61 +17,58 @@
/ { / {
model = "HCE Cosino Mega 2560"; model = "HCE Cosino Mega 2560";
compatible = "hce,cosino_mega2560", "atmel,at91sam9x5", "atmel,at91sam9"; compatible = "hce,cosino_mega2560", "atmel,at91sam9x5", "atmel,at91sam9";
};
ahb { &adc0 {
apb {
macb0: ethernet@f802c000 {
phy-mode = "rmii";
status = "okay";
};
adc0: adc@f804c000 {
atmel,adc-ts-wires = <4>; atmel,adc-ts-wires = <4>;
atmel,adc-ts-pressure-threshold = <10000>; atmel,adc-ts-pressure-threshold = <10000>;
status = "okay"; status = "okay";
}; };
rtc@fffffeb0 { &macb0 {
phy-mode = "rmii";
status = "okay"; status = "okay";
}; };
usart1: serial@f8020000 { &mmc1 {
status = "okay";
};
usart2: serial@f8024000 {
status = "okay";
};
usb2: gadget@f803c000 {
atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;
status = "okay";
};
mmc1: mmc@f000c000 {
pinctrl-0 = < pinctrl-0 = <
&pinctrl_mmc1_slot0_clk_cmd_dat0 &pinctrl_mmc1_slot0_clk_cmd_dat0
&pinctrl_mmc1_slot0_dat1_3>; &pinctrl_mmc1_slot0_dat1_3>;
status = "okay"; status = "okay";
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;
}; };
}; };
};
usb0: ohci@600000 { &rtc {
status = "okay"; status = "okay";
};
&usart1 {
status = "okay";
};
&usart2 {
status = "okay";
};
&usb0 {
num-ports = <3>; num-ports = <3>;
atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW */ atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW */
&pioD 19 GPIO_ACTIVE_LOW &pioD 19 GPIO_ACTIVE_LOW
&pioD 20 GPIO_ACTIVE_LOW &pioD 20 GPIO_ACTIVE_LOW
>; >;
};
usb1: ehci@700000 {
status = "okay"; status = "okay";
}; };
};
&usb1 {
status = "okay";
};
&usb2 {
atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;
status = "okay";
}; };

179
arch/arm/boot/dts/at91-kizboxmini.dts
View file

@ -32,96 +32,6 @@ main_xtal {
}; };
ahb { ahb {
apb {
tcb0: timer@f8008000 {
timer@0 {
compatible = "atmel,tcb-timer";
reg = <0>;
};
timer@1 {
compatible = "atmel,tcb-timer";
reg = <1>;
};
};
usart0: serial@f801c000 {
status = "okay";
};
macb0: ethernet@f802c000 {
phy-mode = "rmii";
status = "okay";
};
pwm0: pwm@f8034000 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm0_pwm0_1
&pinctrl_pwm0_pwm1_1>;
status = "okay";
};
dbgu: serial@fffff200 {
status = "okay";
};
watchdog@fffffe40 {
status = "okay";
};
};
usb0: ohci@600000 {
num-ports = <1>;
status = "okay";
};
usb1: ehci@700000 {
status = "okay";
};
ebi: ebi@10000000 {
pinctrl-0 = <&pinctrl_ebi_addr_nand
&pinctrl_ebi_data_0_7>;
pinctrl-names = "default";
status = "okay";
nand_controller: nand-controller {
status = "okay";
pinctrl-0 = <&pinctrl_nand_oe_we
&pinctrl_nand_cs
&pinctrl_nand_rb>;
pinctrl-names = "default";
nand@3 {
reg = <0x3 0x0 0x800000>;
rb-gpios = <&pioD 5 GPIO_ACTIVE_HIGH>;
cs-gpios = <&pioD 4 GPIO_ACTIVE_HIGH>;
nand-bus-width = <8>;
nand-ecc-mode = "hw";
nand-ecc-strength = <4>;
nand-ecc-step-size = <512>;
nand-on-flash-bbt;
label = "atmel_nand";
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
bootstrap@0 {
label = "bootstrap";
reg = <0x0 0x20000>;
};
ubi@20000 {
label = "ubi";
reg = <0x20000 0x7fe0000>;
};
};
};
};
};
nand0: nand@40000000 { nand0: nand@40000000 {
nand-bus-width = <8>; nand-bus-width = <8>;
nand-ecc-mode = "hw"; nand-ecc-mode = "hw";
@ -130,7 +40,6 @@ nand0: nand@40000000 {
atmel,pmecc-sector-size = <512>; atmel,pmecc-sector-size = <512>;
nand-on-flash-bbt; nand-on-flash-bbt;
status = "okay"; status = "okay";
}; };
}; };
@ -172,3 +81,91 @@ red {
}; };
}; };
}; };
&dbgu {
status = "okay";
};
&ebi {
pinctrl-0 = <&pinctrl_ebi_addr_nand
&pinctrl_ebi_data_0_7>;
pinctrl-names = "default";
status = "okay";
nand-controller {
pinctrl-0 = <&pinctrl_nand_oe_we
&pinctrl_nand_cs
&pinctrl_nand_rb>;
pinctrl-names = "default";
status = "okay";
nand@3 {
reg = <0x3 0x0 0x800000>;
rb-gpios = <&pioD 5 GPIO_ACTIVE_HIGH>;
cs-gpios = <&pioD 4 GPIO_ACTIVE_HIGH>;
nand-bus-width = <8>;
nand-ecc-mode = "hw";
nand-ecc-strength = <4>;
nand-ecc-step-size = <512>;
nand-on-flash-bbt;
label = "atmel_nand";
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
bootstrap@0 {
label = "bootstrap";
reg = <0x0 0x20000>;
};
ubi@20000 {
label = "ubi";
reg = <0x20000 0x7fe0000>;
};
};
};
};
};
&macb0 {
phy-mode = "rmii";
status = "okay";
};
&pwm0 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm0_pwm0_1
&pinctrl_pwm0_pwm1_1>;
status = "okay";
};
&tcb0 {
timer@0 {
compatible = "atmel,tcb-timer";
reg = <0>;
};
timer@1 {
compatible = "atmel,tcb-timer";
reg = <1>;
};
};
&usart0 {
status = "okay";
};
&usb0 {
num-ports = <1>;
status = "okay";
};
&usb1 {
status = "okay";
};
&watchdog {
status = "okay";
};

2
arch/arm/boot/dts/at91sam9261ek.dts
View file

@ -40,7 +40,7 @@ fb0: fb@600000 {
atmel,power-control-gpio = <&pioA 12 GPIO_ACTIVE_LOW>; atmel,power-control-gpio = <&pioA 12 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
display0: display { display0: panel {
bits-per-pixel = <16>; bits-per-pixel = <16>;
atmel,lcdcon-backlight; atmel,lcdcon-backlight;
atmel,dmacon = <0x1>; atmel,dmacon = <0x1>;

2
arch/arm/boot/dts/at91sam9263ek.dts
View file

@ -110,7 +110,7 @@ fb0: fb@700000 {
display = <&display0>; display = <&display0>;
status = "okay"; status = "okay";
display0: display { display0: panel {
bits-per-pixel = <16>; bits-per-pixel = <16>;
atmel,lcdcon-backlight; atmel,lcdcon-backlight;
atmel,dmacon = <0x1>; atmel,dmacon = <0x1>;

16
arch/arm/boot/dts/at91sam9g15.dtsi
View file

@ -11,10 +11,9 @@
/ { / {
model = "Atmel AT91SAM9G15 SoC"; model = "Atmel AT91SAM9G15 SoC";
compatible = "atmel,at91sam9g15", "atmel,at91sam9x5"; compatible = "atmel,at91sam9g15", "atmel,at91sam9x5";
};
ahb { &pinctrl {
apb {
pinctrl@fffff400 {
atmel,mux-mask = < atmel,mux-mask = <
/* A B C */ /* A B C */
0xffffffff 0xffe0399f 0x00000000 /* pioA */ 0xffffffff 0xffe0399f 0x00000000 /* pioA */
@ -22,11 +21,8 @@ pinctrl@fffff400 {
0xfdffffff 0x00000000 0xb83fffff /* pioC */ 0xfdffffff 0x00000000 0xb83fffff /* pioC */
0x003fffff 0x003f8000 0x00000000 /* pioD */ 0x003fffff 0x003f8000 0x00000000 /* pioD */
>; >;
}; };
pmc: pmc@fffffc00 { &pmc {
compatible = "atmel,at91sam9g15-pmc", "atmel,at91sam9x5-pmc", "syscon"; compatible = "atmel,at91sam9g15-pmc", "atmel,at91sam9x5-pmc", "syscon";
};
};
};
}; };

12
arch/arm/boot/dts/at91sam9g15ek.dts
View file

@ -14,14 +14,6 @@ / {
model = "Atmel AT91SAM9G15-EK"; model = "Atmel AT91SAM9G15-EK";
compatible = "atmel,at91sam9g15ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; compatible = "atmel,at91sam9g15ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
ahb {
apb {
hlcdc: hlcdc@f8038000 {
status = "okay";
};
};
};
backlight: backlight { backlight: backlight {
status = "okay"; status = "okay";
}; };
@ -38,3 +30,7 @@ panel_reg: panel_regulator {
status = "okay"; status = "okay";
}; };
}; };
&hlcdc {
status = "okay";
};

39
arch/arm/boot/dts/at91sam9g25ek.dts
View file

@ -12,19 +12,10 @@
/ { / {
model = "Atmel AT91SAM9G25-EK"; model = "Atmel AT91SAM9G25-EK";
compatible = "atmel,at91sam9g25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; compatible = "atmel,at91sam9g25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
};
ahb { &i2c0 {
apb { camera@30 {
spi0: spi@f0000000 {
status = "disabled";
};
mmc1: mmc@f000c000 {
status = "disabled";
};
i2c0: i2c@f8010000 {
ov2640: camera@30 {
compatible = "ovti,ov2640"; compatible = "ovti,ov2640";
reg = <0x30>; reg = <0x30>;
pinctrl-names = "default"; pinctrl-names = "default";
@ -44,15 +35,11 @@ ov2640_0: endpoint {
}; };
}; };
}; };
}; };
macb0: ethernet@f802c000 { &isi {
phy-mode = "rmii";
status = "okay"; status = "okay";
};
isi: isi@f8048000 {
status = "okay";
port { port {
isi_0: endpoint@0 { isi_0: endpoint@0 {
reg = <0>; reg = <0>;
@ -62,7 +49,17 @@ isi_0: endpoint@0 {
hsync-active = <1>; hsync-active = <1>;
}; };
}; };
}; };
};
}; &macb0 {
phy-mode = "rmii";
status = "okay";
};
&mmc1 {
status = "disabled";
};
&spi0 {
status = "disabled";
}; };

22
arch/arm/boot/dts/at91sam9g35ek.dts
View file

@ -14,19 +14,6 @@ / {
model = "Atmel AT91SAM9G35-EK"; model = "Atmel AT91SAM9G35-EK";
compatible = "atmel,at91sam9g35ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; compatible = "atmel,at91sam9g35ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
ahb {
apb {
macb0: ethernet@f802c000 {
phy-mode = "rmii";
status = "okay";
};
hlcdc: hlcdc@f8038000 {
status = "okay";
};
};
};
backlight: backlight { backlight: backlight {
status = "okay"; status = "okay";
}; };
@ -43,3 +30,12 @@ panel_reg: panel_regulator {
status = "okay"; status = "okay";
}; };
}; };
&hlcdc {
status = "okay";
};
&macb0 {
phy-mode = "rmii";
status = "okay";
};

2
arch/arm/boot/dts/at91sam9m10g45ek.dts
View file

@ -235,7 +235,7 @@ fb0: fb@500000 {
display = <&display0>; display = <&display0>;
status = "okay"; status = "okay";
display0: display { display0: panel {
bits-per-pixel = <32>; bits-per-pixel = <32>;
atmel,lcdcon-backlight; atmel,lcdcon-backlight;
atmel,dmacon = <0x1>; atmel,dmacon = <0x1>;

2
arch/arm/boot/dts/at91sam9rlek.dts
View file

@ -36,7 +36,7 @@ fb0: fb@500000 {
display = <&display0>; display = <&display0>;
status = "okay"; status = "okay";
display0: display { display0: panel {
bits-per-pixel = <16>; bits-per-pixel = <16>;
atmel,lcdcon-backlight; atmel,lcdcon-backlight;
atmel,dmacon = <0x1>; atmel,dmacon = <0x1>;

20
arch/arm/boot/dts/at91sam9x25ek.dts
View file

@ -12,28 +12,24 @@
/ { / {
model = "Atmel AT91SAM9X25-EK"; model = "Atmel AT91SAM9X25-EK";
compatible = "atmel,at91sam9x25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; compatible = "atmel,at91sam9x25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
};
ahb { &can1 {
apb {
can1: can@f8004000 {
status = "okay"; status = "okay";
}; };
macb0: ethernet@f802c000 { &macb0 {
phy-mode = "rmii"; phy-mode = "rmii";
status = "okay"; status = "okay";
}; };
macb1: ethernet@f8030000 { &macb1 {
phy-mode = "rmii"; phy-mode = "rmii";
status = "okay"; status = "okay";
}; };
pwm0: pwm@f8034000 { &pwm0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm0_pwm0_1>; pinctrl-0 = <&pinctrl_pwm0_pwm0_1>;
status = "okay"; status = "okay";
};
};
};
}; };

47
arch/arm/boot/dts/at91sam9x35ek.dts
View file

@ -13,32 +13,29 @@
/ { / {
model = "Atmel AT91SAM9X35-EK"; model = "Atmel AT91SAM9X35-EK";
compatible = "atmel,at91sam9x35ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; compatible = "atmel,at91sam9x35ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
};
ahb { &backlight {
apb { status = "okay";
macb0: ethernet@f802c000 { };
&bl_reg {
status = "okay";
};
&hlcdc {
status = "okay";
};
&macb0 {
phy-mode = "rmii"; phy-mode = "rmii";
status = "okay"; status = "okay";
}; };
hlcdc: hlcdc@f8038000 {
status = "okay"; &panel {
}; status = "okay";
}; };
};
&panel_reg {
backlight: backlight { status = "okay";
status = "okay";
};
bl_reg: backlight_regulator {
status = "okay";
};
panel: panel {
status = "okay";
};
panel_reg: panel_regulator {
status = "okay";
};
}; };

2
arch/arm/boot/dts/at91sam9x5.dtsi
View file

@ -941,7 +941,7 @@ watchdog: watchdog@fffffe40 {
status = "disabled"; status = "disabled";
}; };
rtc@fffffeb0 { rtc: rtc@fffffeb0 {
compatible = "atmel,at91sam9x5-rtc"; compatible = "atmel,at91sam9x5-rtc";
reg = <0xfffffeb0 0x40>; reg = <0xfffffeb0 0x40>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

8
arch/arm/boot/dts/at91sam9x5_lcd.dtsi
View file

@ -39,8 +39,11 @@ hlcdc_pwm: hlcdc-pwm {
#pwm-cells = <3>; #pwm-cells = <3>;
}; };
}; };
};
};
};
pinctrl@fffff400 { &pinctrl {
lcd { lcd {
pinctrl_lcd_base: lcd-base-0 { pinctrl_lcd_base: lcd-base-0 {
atmel,pins = atmel,pins =
@ -141,7 +144,4 @@ AT91_PIOC 22 AT91_PERIPH_A AT91_PINCTRL_NONE /* LCDD22 pin */
AT91_PIOC 23 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* LCDD23 pin */ AT91_PIOC 23 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* LCDD23 pin */
}; };
}; };
};
};
};
}; };

86
arch/arm/boot/dts/at91sam9x5dm.dtsi
View file

@ -9,51 +9,6 @@
*/ */
/ { / {
ahb {
apb {
i2c0: i2c@f8010000 {
qt1070: keyboard@1b {
compatible = "qt1070";
reg = <0x1b>;
interrupt-parent = <&pioA>;
interrupts = <7 0x0>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_qt1070_irq>;
wakeup-source;
};
};
hlcdc: hlcdc@f8038000 {
hlcdc-display-controller {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_rgb888>;
port@0 {
hlcdc_panel_output: endpoint@0 {
reg = <0>;
remote-endpoint = <&panel_input>;
};
};
};
};
adc0: adc@f804c000 {
atmel,adc-ts-wires = <4>;
atmel,adc-ts-pressure-threshold = <10000>;
status = "okay";
};
pinctrl@fffff400 {
board {
pinctrl_qt1070_irq: qt1070_irq {
atmel,pins =
<AT91_PIOA 7 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
};
};
};
};
};
backlight: backlight { backlight: backlight {
compatible = "pwm-backlight"; compatible = "pwm-backlight";
pwms = <&hlcdc_pwm 0 50000 0>; pwms = <&hlcdc_pwm 0 50000 0>;
@ -98,3 +53,44 @@ panel_reg: panel_regulator {
status = "disabled"; status = "disabled";
}; };
}; };
&adc0 {
atmel,adc-ts-wires = <4>;
atmel,adc-ts-pressure-threshold = <10000>;
status = "okay";
};
&i2c0 {
keyboard@1b {
compatible = "qt1070";
reg = <0x1b>;
interrupt-parent = <&pioA>;
interrupts = <7 0x0>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_qt1070_irq>;
wakeup-source;
};
};
&hlcdc {
hlcdc-display-controller {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_rgb888>;
port@0 {
hlcdc_panel_output: endpoint@0 {
reg = <0>;
remote-endpoint = <&panel_input>;
};
};
};
};
&pinctrl {
board {
pinctrl_qt1070_irq: qt1070_irq {
atmel,pins =
<AT91_PIOA 7 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
};
};
};

151
arch/arm/boot/dts/at91sam9x5ek.dtsi
View file

@ -16,67 +16,70 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
ahb { sound {
apb { compatible = "atmel,sam9x5-wm8731-audio";
mmc0: mmc@f0008000 {
pinctrl-0 = <
&pinctrl_board_mmc0
&pinctrl_mmc0_slot0_clk_cmd_dat0
&pinctrl_mmc0_slot0_dat1_3>;
status = "okay";
slot@0 {
reg = <0>;
bus-width = <4>;
cd-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
};
};
mmc1: mmc@f000c000 { atmel,model = "wm8731 @ AT91SAM9X5EK";
pinctrl-0 = <
&pinctrl_board_mmc1
&pinctrl_mmc1_slot0_clk_cmd_dat0
&pinctrl_mmc1_slot0_dat1_3>;
status = "okay";
slot@0 {
reg = <0>;
bus-width = <4>;
cd-gpios = <&pioD 14 GPIO_ACTIVE_HIGH>;
};
};
dbgu: serial@fffff200 { atmel,audio-routing =
status = "okay"; "Headphone Jack", "RHPOUT",
}; "Headphone Jack", "LHPOUT",
"LLINEIN", "Line In Jack",
"RLINEIN", "Line In Jack";
usart0: serial@f801c000 { atmel,ssc-controller = <&ssc0>;
atmel,use-dma-rx; atmel,audio-codec = <&wm8731>;
atmel,use-dma-tx;
status = "okay";
}; };
};
usb2: gadget@f803c000 { &adc0 {
pinctrl-names = "default"; atmel,adc-ts-wires = <4>;
pinctrl-0 = <&pinctrl_board_usb2>; atmel,adc-ts-pressure-threshold = <10000>;
atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
i2c0: i2c@f8010000 { &dbgu {
status = "okay";
};
&i2c0 {
status = "okay"; status = "okay";
wm8731: wm8731@1a { wm8731: wm8731@1a {
compatible = "wm8731"; compatible = "wm8731";
reg = <0x1a>; reg = <0x1a>;
}; };
}; };
adc0: adc@f804c000 { &mmc0 {
atmel,adc-ts-wires = <4>; pinctrl-0 = <
atmel,adc-ts-pressure-threshold = <10000>; &pinctrl_board_mmc0
&pinctrl_mmc0_slot0_clk_cmd_dat0
&pinctrl_mmc0_slot0_dat1_3>;
status = "okay"; status = "okay";
};
pinctrl@fffff400 { slot@0 {
reg = <0>;
bus-width = <4>;
cd-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
};
};
&mmc1 {
pinctrl-0 = <
&pinctrl_board_mmc1
&pinctrl_mmc1_slot0_clk_cmd_dat0
&pinctrl_mmc1_slot0_dat1_3>;
status = "okay";
slot@0 {
reg = <0>;
bus-width = <4>;
cd-gpios = <&pioD 14 GPIO_ACTIVE_HIGH>;
};
};
&pinctrl {
camera_sensor { camera_sensor {
pinctrl_pck0_as_isi_mck: pck0_as_isi_mck-0 { pinctrl_pck0_as_isi_mck: pck0_as_isi_mck-0 {
atmel,pins = atmel,pins =
@ -114,53 +117,49 @@ pinctrl_board_usb2: usb2-board {
<AT91_PIOB 16 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>; /* PB16 gpio vbus sense, deglitch */ <AT91_PIOB 16 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>; /* PB16 gpio vbus sense, deglitch */
}; };
}; };
}; };
spi0: spi@f0000000 { &spi0 {
status = "disabled"; /* conflicts with mmc1 */
cs-gpios = <&pioA 14 0>, <0>, <0>, <0>; cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
status = "disabled"; /* conflicts with mmc1 */
m25p80@0 { m25p80@0 {
compatible = "atmel,at25df321a"; compatible = "atmel,at25df321a";
spi-max-frequency = <50000000>; spi-max-frequency = <50000000>;
reg = <0>; reg = <0>;
}; };
}; };
watchdog@fffffe40 { &ssc0 {
status = "okay"; status = "okay";
}; };
ssc0: ssc@f0010000 { &usart0 {
atmel,use-dma-rx;
atmel,use-dma-tx;
status = "okay"; status = "okay";
}; };
};
usb0: ohci@600000 { &usb0 {
status = "okay";
num-ports = <3>; num-ports = <3>;
atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW *//* Activate to have access to port A */ atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW *//* Activate to have access to port A */
&pioD 19 GPIO_ACTIVE_LOW &pioD 19 GPIO_ACTIVE_LOW
&pioD 20 GPIO_ACTIVE_LOW &pioD 20 GPIO_ACTIVE_LOW
>; >;
};
usb1: ehci@700000 {
status = "okay"; status = "okay";
}; };
};
&usb1 {
sound { status = "okay";
compatible = "atmel,sam9x5-wm8731-audio"; };
atmel,model = "wm8731 @ AT91SAM9X5EK"; &usb2 {
pinctrl-names = "default";
atmel,audio-routing = pinctrl-0 = <&pinctrl_board_usb2>;
"Headphone Jack", "RHPOUT", atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;
"Headphone Jack", "LHPOUT", status = "okay";
"LLINEIN", "Line In Jack", };
"RLINEIN", "Line In Jack";
&watchdog {
atmel,ssc-controller = <&ssc0>; status = "okay";
atmel,audio-codec = <&wm8731>;
};
}; };