aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/armada-375.dtsi11
-rw-r--r--arch/arm/boot/dts/at91-sama5d4ek.dts4
-rw-r--r--arch/arm/boot/dts/at91sam9260.dtsi14
-rw-r--r--arch/arm/boot/dts/at91sam9261.dtsi14
-rw-r--r--arch/arm/boot/dts/at91sam9263.dtsi21
-rw-r--r--arch/arm/boot/dts/at91sam9g20ek_common.dtsi14
-rw-r--r--arch/arm/boot/dts/at91sam9g45.dtsi46
-rw-r--r--arch/arm/boot/dts/at91sam9m10g45ek.dts9
-rw-r--r--arch/arm/boot/dts/at91sam9rl.dtsi21
-rw-r--r--arch/arm/boot/dts/sama5d4.dtsi75
-rw-r--r--arch/arm/boot/dts/tegra114.dtsi23
-rw-r--r--arch/arm/boot/dts/tegra124.dtsi19
-rw-r--r--arch/arm/boot/dts/tegra30.dtsi25
13 files changed, 267 insertions, 29 deletions
diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi
index 9721e55384ce..50096d3427eb 100644
--- a/arch/arm/boot/dts/armada-375.dtsi
+++ b/arch/arm/boot/dts/armada-375.dtsi
@@ -14,6 +14,7 @@
14#include "skeleton.dtsi" 14#include "skeleton.dtsi"
15#include <dt-bindings/interrupt-controller/arm-gic.h> 15#include <dt-bindings/interrupt-controller/arm-gic.h>
16#include <dt-bindings/interrupt-controller/irq.h> 16#include <dt-bindings/interrupt-controller/irq.h>
17#include <dt-bindings/phy/phy.h>
17 18
18#define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16)) 19#define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
19 20
@@ -348,6 +349,12 @@
348 #clock-cells = <1>; 349 #clock-cells = <1>;
349 }; 350 };
350 351
352 usbcluster: usb-cluster@18400 {
353 compatible = "marvell,armada-375-usb-cluster";
354 reg = <0x18400 0x4>;
355 #phy-cells = <1>;
356 };
357
351 mbusc: mbus-controller@20000 { 358 mbusc: mbus-controller@20000 {
352 compatible = "marvell,mbus-controller"; 359 compatible = "marvell,mbus-controller";
353 reg = <0x20000 0x100>, <0x20180 0x20>; 360 reg = <0x20000 0x100>, <0x20180 0x20>;
@@ -398,6 +405,8 @@
398 reg = <0x50000 0x500>; 405 reg = <0x50000 0x500>;
399 interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; 406 interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
400 clocks = <&gateclk 18>; 407 clocks = <&gateclk 18>;
408 phys = <&usbcluster PHY_TYPE_USB2>;
409 phy-names = "usb";
401 status = "disabled"; 410 status = "disabled";
402 }; 411 };
403 412
@@ -414,6 +423,8 @@
414 reg = <0x58000 0x20000>,<0x5b880 0x80>; 423 reg = <0x58000 0x20000>,<0x5b880 0x80>;
415 interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>; 424 interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
416 clocks = <&gateclk 16>; 425 clocks = <&gateclk 16>;
426 phys = <&usbcluster PHY_TYPE_USB3>;
427 phy-names = "usb";
417 status = "disabled"; 428 status = "disabled";
418 }; 429 };
419 430
diff --git a/arch/arm/boot/dts/at91-sama5d4ek.dts b/arch/arm/boot/dts/at91-sama5d4ek.dts
index b5b84006469e..9198b719d0ef 100644
--- a/arch/arm/boot/dts/at91-sama5d4ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d4ek.dts
@@ -9,12 +9,12 @@
9 * licensing only applies to this file, and not this project as a 9 * licensing only applies to this file, and not this project as a
10 * whole. 10 * whole.
11 * 11 *
12 * a) This library is free software; you can redistribute it and/or 12 * a) This file is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License as 13 * modify it under the terms of the GNU General Public License as
14 * published by the Free Software Foundation; either version 2 of the 14 * published by the Free Software Foundation; either version 2 of the
15 * License, or (at your option) any later version. 15 * License, or (at your option) any later version.
16 * 16 *
17 * This library is distributed in the hope that it will be useful, 17 * This file is distributed in the hope that it will be useful,
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of 18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 * GNU General Public License for more details. 20 * GNU General Public License for more details.
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index cb100b03a362..dd1313cbc314 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -956,6 +956,14 @@
956 }; 956 };
957 }; 957 };
958 958
959 rtc@fffffd20 {
960 compatible = "atmel,at91sam9260-rtt";
961 reg = <0xfffffd20 0x10>;
962 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
963 clocks = <&clk32k>;
964 status = "disabled";
965 };
966
959 watchdog@fffffd40 { 967 watchdog@fffffd40 {
960 compatible = "atmel,at91sam9260-wdt"; 968 compatible = "atmel,at91sam9260-wdt";
961 reg = <0xfffffd40 0x10>; 969 reg = <0xfffffd40 0x10>;
@@ -966,6 +974,12 @@
966 atmel,idle-halt; 974 atmel,idle-halt;
967 status = "disabled"; 975 status = "disabled";
968 }; 976 };
977
978 gpbr: syscon@fffffd50 {
979 compatible = "atmel,at91sam9260-gpbr", "syscon";
980 reg = <0xfffffd50 0x10>;
981 status = "disabled";
982 };
969 }; 983 };
970 984
971 nand0: nand@40000000 { 985 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi
index a81aab4281a7..cdb9ed612109 100644
--- a/arch/arm/boot/dts/at91sam9261.dtsi
+++ b/arch/arm/boot/dts/at91sam9261.dtsi
@@ -828,12 +828,26 @@
828 clocks = <&mck>; 828 clocks = <&mck>;
829 }; 829 };
830 830
831 rtc@fffffd20 {
832 compatible = "atmel,at91sam9260-rtt";
833 reg = <0xfffffd20 0x10>;
834 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
835 clocks = <&slow_xtal>;
836 status = "disabled";
837 };
838
831 watchdog@fffffd40 { 839 watchdog@fffffd40 {
832 compatible = "atmel,at91sam9260-wdt"; 840 compatible = "atmel,at91sam9260-wdt";
833 reg = <0xfffffd40 0x10>; 841 reg = <0xfffffd40 0x10>;
834 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; 842 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
835 status = "disabled"; 843 status = "disabled";
836 }; 844 };
845
846 gpbr: syscon@fffffd50 {
847 compatible = "atmel,at91sam9260-gpbr", "syscon";
848 reg = <0xfffffd50 0x10>;
849 status = "disabled";
850 };
837 }; 851 };
838 }; 852 };
839 853
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index 653e4395b7cb..1467750e3377 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -922,6 +922,27 @@
922 pinctrl-0 = <&pinctrl_can_rx_tx>; 922 pinctrl-0 = <&pinctrl_can_rx_tx>;
923 clocks = <&can_clk>; 923 clocks = <&can_clk>;
924 clock-names = "can_clk"; 924 clock-names = "can_clk";
925 };
926
927 rtc@fffffd20 {
928 compatible = "atmel,at91sam9260-rtt";
929 reg = <0xfffffd20 0x10>;
930 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
931 clocks = <&slow_xtal>;
932 status = "disabled";
933 };
934
935 rtc@fffffd50 {
936 compatible = "atmel,at91sam9260-rtt";
937 reg = <0xfffffd50 0x10>;
938 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
939 clocks = <&slow_xtal>;
940 status = "disabled";
941 };
942