projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2019-07-12-master-imports'
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
exynos4.dtsi
diff --git
a/arch/arm/dts/exynos4.dtsi
b/arch/arm/dts/exynos4.dtsi
index 77fad48fb4bd72614d575660af1ae81d2188f9c1..61ade443b166c437aed13678fe43bcbbe2aa5332 100644
(file)
--- a/
arch/arm/dts/exynos4.dtsi
+++ b/
arch/arm/dts/exynos4.dtsi
@@
-1,15
+1,25
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Samsung's Exynos4 SoC common device tree source
*
* Copyright (c) 2014 Samsung Electronics Co., Ltd.
* http://www.samsung.com
/*
* Samsung's Exynos4 SoC common device tree source
*
* Copyright (c) 2014 Samsung Electronics Co., Ltd.
* http://www.samsung.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include "skeleton.dtsi"
/ {
*/
#include "skeleton.dtsi"
/ {
+ aliases {
+ i2c0 = &i2c_0;
+ i2c1 = &i2c_1;
+ i2c2 = &i2c_2;
+ i2c3 = &i2c_3;
+ i2c4 = &i2c_4;
+ i2c5 = &i2c_5;
+ i2c6 = &i2c_6;
+ i2c7 = &i2c_7;
+ };
+
combiner: interrupt-controller@10440000 {
compatible = "samsung,exynos4210-combiner";
#interrupt-cells = <2>;
combiner: interrupt-controller@10440000 {
compatible = "samsung,exynos4210-combiner";
#interrupt-cells = <2>;
@@
-17,137
+27,164
@@
reg = <0x10440000 0x1000>;
};
reg = <0x10440000 0x1000>;
};
- serial@13800000 {
+ gic: interrupt-controller@10490000 {
+ compatible = "arm,cortex-a9-gic";
+ #interrupt-cells = <3>;
+ interrupt-controller;
+ cpu-offset = <0x4000>;
+ reg = <0x10490000 0x10000>, <0x10480000 0x10000>;
+ };
+
+ serial_0: serial@13800000 {
compatible = "samsung,exynos4210-uart";
reg = <0x13800000 0x3c>;
id = <0>;
};
compatible = "samsung,exynos4210-uart";
reg = <0x13800000 0x3c>;
id = <0>;
};
- serial@13810000 {
+ ser
ail_1: ser
ial@13810000 {
compatible = "samsung,exynos4210-uart";
reg = <0x13810000 0x3c>;
id = <1>;
};
compatible = "samsung,exynos4210-uart";
reg = <0x13810000 0x3c>;
id = <1>;
};
- serial@13820000 {
+ serial
_2: serial
@13820000 {
compatible = "samsung,exynos4210-uart";
reg = <0x13820000 0x3c>;
id = <2>;
};
compatible = "samsung,exynos4210-uart";
reg = <0x13820000 0x3c>;
id = <2>;
};
- serial@13830000 {
+ serial
_3: serial
@13830000 {
compatible = "samsung,exynos4210-uart";
reg = <0x13830000 0x3c>;
id = <3>;
};
compatible = "samsung,exynos4210-uart";
reg = <0x13830000 0x3c>;
id = <3>;
};
- serial@13840000 {
+ serial
_4: serial
@13840000 {
compatible = "samsung,exynos4210-uart";
reg = <0x13840000 0x3c>;
id = <4>;
};
compatible = "samsung,exynos4210-uart";
reg = <0x13840000 0x3c>;
id = <4>;
};
- i2c@13860000 {
+ i2c
_0: i2c
@13860000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "samsung,s3c2440-i2c";
#address-cells = <1>;
#size-cells = <0>;
compatible = "samsung,s3c2440-i2c";
- interrupts = <0 0 0>;
+ reg = <0x13860000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 56 0>;
};
};
- i2c@13870000 {
+ i2c
_1: i2c
@13870000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "samsung,s3c2440-i2c";
#address-cells = <1>;
#size-cells = <0>;
compatible = "samsung,s3c2440-i2c";
- interrupts = <1 1 0>;
+ reg = <0x13870000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <1 57 0>;
};
};
- i2c@13880000 {
+ i2c
_2: i2c
@13880000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "samsung,s3c2440-i2c";
#address-cells = <1>;
#size-cells = <0>;
compatible = "samsung,s3c2440-i2c";
- interrupts = <2 2 0>;
+ reg = <0x13880000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <2 58 0>;
};
};
- i2c@13890000 {
+ i2c
_3: i2c
@13890000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "samsung,s3c2440-i2c";
#address-cells = <1>;
#size-cells = <0>;
compatible = "samsung,s3c2440-i2c";
- interrupts = <3 3 0>;
+ reg = <0x13890000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <3 59 0>;
};
};
- i2c@138a0000 {
+ i2c
_4: i2c
@138a0000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "samsung,s3c2440-i2c";
#address-cells = <1>;
#size-cells = <0>;
compatible = "samsung,s3c2440-i2c";
- interrupts = <4 4 0>;
+ reg = <0x138a0000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <4 60 0>;
};
};
- i2c@138b0000 {
+ i2c
_5: i2c
@138b0000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "samsung,s3c2440-i2c";
#address-cells = <1>;
#size-cells = <0>;
compatible = "samsung,s3c2440-i2c";
- interrupts = <5 5 0>;
+ reg = <0x138b0000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <5 61 0>;
};
};
- i2c@138c0000 {
+ i2c
_6: i2c
@138c0000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "samsung,s3c2440-i2c";
#address-cells = <1>;
#size-cells = <0>;
compatible = "samsung,s3c2440-i2c";
- interrupts = <6 6 0>;
+ reg = <0x138c0000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <6 62 0>;
};
};
- i2c@138d0000 {
+ i2c
_7: i2c
@138d0000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "samsung,s3c2440-i2c";
#address-cells = <1>;
#size-cells = <0>;
compatible = "samsung,s3c2440-i2c";
- interrupts = <7 7 0>;
+ reg = <0x138d0000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <7 63 0>;
};
};
- sdhci@12510000 {
+ sdhci
0: sdhci
@12510000 {
#address-cells = <1>;
#size-cells = <0>;
#address-cells = <1>;
#size-cells = <0>;
- compatible = "samsung,exynos
-mmc
";
+ compatible = "samsung,exynos
4412-sdhci
";
reg = <0x12510000 0x1000>;
reg = <0x12510000 0x1000>;
+ interrupt-parent = <&gic>;
interrupts = <0 75 0>;
interrupts = <0 75 0>;
+ status = "disabled";
};
};
- sdhci@12520000 {
+ sdhci
1: sdhci
@12520000 {
#address-cells = <1>;
#size-cells = <0>;
#address-cells = <1>;
#size-cells = <0>;
- compatible = "samsung,exynos
-mmc
";
+ compatible = "samsung,exynos
4412-sdhci
";
reg = <0x12520000 0x1000>;
reg = <0x12520000 0x1000>;
+ interrupt-parent = <&gic>;
interrupts = <0 76 0>;
interrupts = <0 76 0>;
+ status = "disabled";
};
};
- sdhci@12530000 {
+ sdhci
2: sdhci
@12530000 {
#address-cells = <1>;
#size-cells = <0>;
#address-cells = <1>;
#size-cells = <0>;
- compatible = "samsung,exynos
-mmc
";
+ compatible = "samsung,exynos
4412-sdhci
";
reg = <0x12530000 0x1000>;
reg = <0x12530000 0x1000>;
+ interrupt-parent = <&gic>;
interrupts = <0 77 0>;
interrupts = <0 77 0>;
+ status = "disabled";
};
};
- sdhci@12540000 {
+ sdhci
3: sdhci
@12540000 {
#address-cells = <1>;
#size-cells = <0>;
#address-cells = <1>;
#size-cells = <0>;
- compatible = "samsung,exynos
-mmc
";
+ compatible = "samsung,exynos
4412-sdhci
";
reg = <0x12540000 0x1000>;
reg = <0x12540000 0x1000>;
+ interrupt-parent = <&gic>;
interrupts = <0 78 0>;
interrupts = <0 78 0>;
+ status = "disabled";
};
};
- dwmmc@12550000 {
+
mshc_0:
dwmmc@12550000 {
#address-cells = <1>;
#size-cells = <0>;
#address-cells = <1>;
#size-cells = <0>;
- compatible = "samsung,exynos
-dwmm
c";
+ compatible = "samsung,exynos
4412-dw-msh
c";
reg = <0x12550000 0x1000>;
reg = <0x12550000 0x1000>;
+ interrupt-parent = <&gic>;
interrupts = <0 131 0>;
interrupts = <0 131 0>;
+ status = "disabled";
};
};
- gpio: gpio {
- gpio-controller;
- #gpio-cells = <2>;
-
- interrupt-controller;
- #interrupt-cells = <2>;
- };
};
};