shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'uniphier-dt64-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt64

Browse Source 
Pull "UniPhier ARM64 SoC DT updates for v4.14" from Masahiro Yamada:

- add nodes for NAND, Watchdog
- replace /include/ with #include
- use #include <arm/...> instead of symlinks

* tag 'uniphier-dt64-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  arm64: dts: uniphier: add Denali NAND controller nodes
  arm64: dts: uniphier: use cross-arch include instead of symlinks
  arm64: dts: uniphier: use #include instead of /include/
  arm64: dts: uniphier: add watchdog node for LD11 and LD20
This commit is contained in:
Arnd Bergmann
2017-08-16 23:46:59 +02:00
parent 23f8f601d2 e5aefb380e
commit 029fb7c2e3
9 changed files with 51 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts
View File

@@ -9,7 +9,7 @@
*/
/dts-v1/;
/include/ "uniphier-ld11.dtsi"
#include "uniphier-ld11.dtsi"
/ {
model = "UniPhier LD11 Global Board (REF_LD11_GP)";
@@ -68,3 +68,7 @@
&usb2 {
status = "okay";
};
&nand {
status = "okay";
};

6
arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts
View File

@@ -8,9 +8,9 @@
*/
/dts-v1/;
/include/ "uniphier-ld11.dtsi"
/include/ "uniphier-ref-daughter.dtsi"
/include/ "uniphier-support-card.dtsi"
#include "uniphier-ld11.dtsi"
#include "uniphier-ref-daughter.dtsi"
#include "uniphier-support-card.dtsi"
/ {
model = "UniPhier LD11 Reference Board";

17
arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
View File

@@ -367,8 +367,23 @@
compatible = "socionext,uniphier-ld11-reset";
#reset-cells = <1>;
};
watchdog {
compatible = "socionext,uniphier-wdt";
};
};
nand: nand@68000000 {
compatible = "socionext,uniphier-denali-nand-v5b";
status = "disabled";
reg-names = "nand_data", "denali_reg";
reg = <0x68000000 0x20>, <0x68100000 0x1000>;
interrupts = <0 65 4>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nand>;
clocks = <&sys_clk 2>;
};
};
};
/include/ "uniphier-pinctrl.dtsi"
#include "uniphier-pinctrl.dtsi"

6
arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts
View File

@@ -9,7 +9,7 @@
*/
/dts-v1/;
/include/ "uniphier-ld20.dtsi"
#include "uniphier-ld20.dtsi"
/ {
model = "UniPhier LD20 Global Board (REF_LD20_GP)";
@@ -50,3 +50,7 @@
&i2c0 {
status = "okay";
};
&nand {
status = "okay";
};

6
arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
View File

@@ -8,9 +8,9 @@
*/
/dts-v1/;
/include/ "uniphier-ld20.dtsi"
/include/ "uniphier-ref-daughter.dtsi"
/include/ "uniphier-support-card.dtsi"
#include "uniphier-ld20.dtsi"
#include "uniphier-ref-daughter.dtsi"
#include "uniphier-support-card.dtsi"
/ {
model = "UniPhier LD20 Reference Board";

17
arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
View File

@@ -388,8 +388,23 @@
compatible = "socionext,uniphier-ld20-reset";
#reset-cells = <1>;
};
watchdog {
compatible = "socionext,uniphier-wdt";
};
};
nand: nand@68000000 {
compatible = "socionext,uniphier-denali-nand-v5b";
status = "disabled";
reg-names = "nand_data", "denali_reg";
reg = <0x68000000 0x20>, <0x68100000 0x1000>;
interrupts = <0 65 4>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nand>;
clocks = <&sys_clk 2>;
};
};
};
/include/ "uniphier-pinctrl.dtsi"
#include "uniphier-pinctrl.dtsi"

1
arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi
View File

@@ -1 +0,0 @@
../../../../arm/boot/dts/uniphier-pinctrl.dtsi

1
arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi Normal file
View File

@@ -0,0 +1 @@
#include <arm/uniphier-pinctrl.dtsi>

1
arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi
View File

@@ -1 +0,0 @@
../../../../arm/boot/dts/uniphier-ref-daughter.dtsi

1
arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi Normal file
View File

@@ -0,0 +1 @@
#include <arm/uniphier-ref-daughter.dtsi>

1
arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi
View File

@@ -1 +0,0 @@
../../../../arm/boot/dts/uniphier-support-card.dtsi

1
arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi Normal file
View File

@@ -0,0 +1 @@
#include <arm/uniphier-support-card.dtsi>