Skip to content

Commit 4c5bbff

Browse files
committed
Merge branch 'at91-4.14-trunk/dt' into linux-4.14-at91
2 parents 0f64cb9 + 6ac67d5 commit 4c5bbff

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

arch/arm/boot/dts/sama5d4.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1332,13 +1332,13 @@
13321332
};
13331333
};
13341334

1335-
rstc@fc068600 {
1335+
reset_controller: rstc@fc068600 {
13361336
compatible = "atmel,sama5d3-rstc", "atmel,at91sam9g45-rstc";
13371337
reg = <0xfc068600 0x10>;
13381338
clocks = <&clk32k>;
13391339
};
13401340

1341-
shdwc@fc068610 {
1341+
shutdown_controller: shdwc@fc068610 {
13421342
compatible = "atmel,at91sam9x5-shdwc";
13431343
reg = <0xfc068610 0x10>;
13441344
clocks = <&clk32k>;
@@ -1351,7 +1351,7 @@
13511351
clocks = <&h32ck>;
13521352
};
13531353

1354-
watchdog@fc068640 {
1354+
watchdog: watchdog@fc068640 {
13551355
compatible = "atmel,sama5d4-wdt";
13561356
reg = <0xfc068640 0x10>;
13571357
interrupts = <4 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -1385,7 +1385,7 @@
13851385
};
13861386

13871387

1388-
pinctrl@fc06a000 {
1388+
pinctrl: pinctrl@fc06a000 {
13891389
#address-cells = <1>;
13901390
#size-cells = <1>;
13911391
compatible = "atmel,sama5d3-pinctrl", "atmel,at91sam9x5-pinctrl", "simple-bus";

0 commit comments

Comments
 (0)