Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dts: soc: atmel: sam: cleanup node labels to match SoC docs #24161

Merged
merged 1 commit into from
Apr 9, 2020
Merged

dts: soc: atmel: sam: cleanup node labels to match SoC docs #24161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions boards/arm/arduino_due/arduino_due.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
compatible = "arduino,due", "atmel,sam3x8e", "atmel,sam3x";

aliases {
uart-0 = &uart0;
i2c-0 = &i2c0;
i2c-1 = &i2c1;
uart-0 = &uart;
i2c-0 = &twi0;
i2c-1 = &twi1;
led0 = &yellow_led;
};

chosen {
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &uart0;
zephyr,shell-uart = &uart0;
zephyr,console = &uart;
zephyr,shell-uart = &uart;
};

leds {
Expand All @@ -36,19 +36,19 @@
clock-frequency = <84000000>;
};

&wdog {
&wdt {
status = "okay";
};

&i2c0 {
&twi0 {
status = "okay";
};

&i2c1 {
&twi1 {
status = "okay";
};

&uart0 {
&uart {
status = "okay";
current-speed = <115200>;
};
10 changes: 5 additions & 5 deletions boards/arm/sam4e_xpro/sam4e_xpro.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
compatible = "atmel,sam4e_xpro", "atmel,sam4e16e", "atmel,sam4e";

aliases {
i2c-0 = &i2c0;
i2c-0 = &twi0;
led0 = &yellow_led_1;
sw0 = &user_button;
wdog = &wdog;
wdog = &wdt;
};

chosen {
Expand All @@ -29,7 +29,7 @@
leds {
compatible = "gpio-leds";
yellow_led_1: led_1 {
gpios = <&portd 22 GPIO_ACTIVE_LOW>;
gpios = <&piod 22 GPIO_ACTIVE_LOW>;
label = "LED 1";
};
};
Expand All @@ -38,7 +38,7 @@
compatible = "gpio-keys";
user_button: button_1 {
label = "User Button";
gpios = <&porta 2 (GPIO_PULL_UP |
gpios = <&pioa 2 (GPIO_PULL_UP |
GPIO_ACTIVE_LOW)>;
};
};
Expand All @@ -57,6 +57,6 @@
status = "okay";
};

&wdog {
&wdt {
status = "okay";
};
14 changes: 7 additions & 7 deletions boards/arm/sam4s_xplained/sam4s_xplained.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
compatible = "atmel,sam4s_xplained", "atmel,sam4s16c", "atmel,sam4s";

aliases {
i2c-0 = &i2c0;
i2c-1 = &i2c1;
i2c-0 = &twi0;
i2c-1 = &twi1;
led0 = &yellow_led_1;
led1 = &yellow_led_2;
sw0 = &user_button;
Expand All @@ -29,11 +29,11 @@
leds {
compatible = "gpio-leds";
yellow_led_1: led_1 {
gpios = <&portc 10 GPIO_ACTIVE_LOW>;
gpios = <&pioc 10 GPIO_ACTIVE_LOW>;
label = "LED 1";
};
yellow_led_2: led_2 {
gpios = <&portc 17 GPIO_ACTIVE_LOW>;
gpios = <&pioc 17 GPIO_ACTIVE_LOW>;
label = "LED 2";
};
};
Expand All @@ -42,7 +42,7 @@
compatible = "gpio-keys";
user_button: button_1 {
label = "User Button";
gpios = <&porta 5 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
gpios = <&pioa 5 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
};
};
};
Expand All @@ -51,7 +51,7 @@
clock-frequency = <120000000>;
};

&i2c0 {
&twi0 {
status = "okay";
};

Expand All @@ -69,6 +69,6 @@
status = "okay";
};

&wdog {
&wdt {
status = "okay";
};
20 changes: 10 additions & 10 deletions boards/arm/sam_e70_xplained/sam_e70_xplained-common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
compatible = "atmel,sam_e70_xplained", "atmel,same70q21", "atmel,same70";

aliases {
i2c-0 = &i2c0;
i2c-1 = &i2c1;
i2c-2 = &i2c2;
i2c-0 = &twihs0;
i2c-1 = &twihs1;
i2c-2 = &twihs2;
led0 = &green_led;
sw0 = &sw0_user_button;
};
Expand All @@ -29,7 +29,7 @@
leds {
compatible = "gpio-leds";
green_led: led_0 {
gpios = <&portc 8 GPIO_ACTIVE_LOW>;
gpios = <&pioc 8 GPIO_ACTIVE_LOW>;
label = "User LED";
};
};
Expand All @@ -42,7 +42,7 @@
*/
sw0_user_button: button_1 {
label = "User Button";
gpios = <&porta 11 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
gpios = <&pioa 11 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
};
};
};
Expand All @@ -51,19 +51,19 @@
clock-frequency = <300000000>;
};

&adc0 {
&afec0 {
status = "okay";
};

&adc1 {
&afec1 {
status = "okay";
};

&i2c0 {
&twihs0 {
status = "okay";
};

&i2c2 {
&twihs2 {
status = "okay";
};

Expand All @@ -76,7 +76,7 @@
status = "okay";
};

&wdog {
&wdt {
status = "okay";
};

Expand Down
34 changes: 17 additions & 17 deletions boards/arm/sam_v71_xult/sam_v71_xult-common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
compatible = "atmel,sam_v71_xult", "atmel,samv71q21", "atmel,samv71";

aliases {
i2c-0 = &i2c0;
i2c-1 = &i2c1;
i2c-2 = &i2c2;
i2c-0 = &twihs0;
i2c-1 = &twihs1;
i2c-2 = &twihs2;
led0 = &yellow_led0;
led1 = &yellow_led1;
sw0 = &sw0_user_button;
Expand All @@ -32,11 +32,11 @@
leds {
compatible = "gpio-leds";
yellow_led0: led_0 {
gpios = <&porta 23 GPIO_ACTIVE_LOW>;
gpios = <&pioa 23 GPIO_ACTIVE_LOW>;
label = "User LED 0";
};
yellow_led1: led_1 {
gpios = <&portc 9 GPIO_ACTIVE_LOW>;
gpios = <&pioc 9 GPIO_ACTIVE_LOW>;
label = "User LED 1";
};
};
Expand All @@ -50,11 +50,11 @@
*/
sw0_user_button: button_1 {
label = "User Button 0";
gpios = <&porta 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
gpios = <&pioa 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
};
sw1_user_button: button_2 {
label = "User Button 1";
gpios = <&portb 12 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
gpios = <&piob 12 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
};
};
};
Expand All @@ -63,19 +63,19 @@
clock-frequency = <300000000>;
};

&adc0 {
&afec0 {
status = "okay";
};

&adc1 {
&afec1 {
status = "okay";
};

&i2c0 {
&twihs0 {
status = "okay";
};

&i2c2 {
&twihs2 {
status = "okay";
};

Expand All @@ -88,7 +88,7 @@
status = "okay";
};

&wdog {
&wdt {
status = "okay";
};

Expand All @@ -104,23 +104,23 @@
status = "okay";
};

&porta {
&pioa {
status = "okay";
};

&portb {
&piob {
status = "okay";
};

&portc {
&pioc {
status = "okay";
};

&portd {
&piod {
status = "okay";
};

&porte {
&pioe {
status = "okay";
};

Expand Down
12 changes: 6 additions & 6 deletions dts/arm/atmel/sam3x.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

/ {
aliases {
watchdog0 = &wdog;
watchdog0 = &wdt;
};

cpus {
Expand All @@ -36,7 +36,7 @@

soc {
/* Only used for HWINFO device ID */
flash-controller@400e0a00 {
eefc: flash-controller@400e0a00 {
compatible = "atmel,sam-flash-controller";
label = "FLASH_CTRL";
reg = <0x400e0a00 0x200>;
Expand All @@ -46,7 +46,7 @@
#size-cells = <1>;
};

wdog: watchdog@400e1a50 {
wdt: watchdog@400e1a50 {
compatible = "atmel,sam-watchdog";
reg = <0x400e1a50 0xc>;
interrupts = <4 0>;
Expand All @@ -55,7 +55,7 @@
status = "disabled";
};

i2c0: i2c@4008c000 {
twi0: i2c@4008c000 {
compatible = "atmel,sam-i2c-twi";
clock-frequency = <I2C_BITRATE_STANDARD>;
reg = <0x4008c000 0x128>;
Expand All @@ -67,7 +67,7 @@
#size-cells = <0>;
};

i2c1: i2c@40090000 {
twi1: i2c@40090000 {
compatible = "atmel,sam-i2c-twi";
clock-frequency = <I2C_BITRATE_STANDARD>;
reg = <0x40090000 0x128>;
Expand All @@ -79,7 +79,7 @@
#size-cells = <0>;
};

uart0: uart@400e0800 {
uart: uart@400e0800 {
compatible = "atmel,sam-uart";
reg = <0x400e0800 0x124>;
interrupts = <8 1>;
Expand Down
Loading