diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-28 22:00:24 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-28 22:00:24 -0500 |
| commit | 9735326fff8488663e27350917ccf01f2e71730a (patch) | |
| tree | b9ddf50bc81aec6f8223e244f9ccb22d4639cf6e /arch/arm/dts/uniphier-ld4.dtsi | |
| parent | bea3d826203f90507ff32ed24bd0a3c53479e55c (diff) | |
| parent | 2001a81cba9554ee8b7f6d2ecd53510640ce4f35 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Please pull UniPhier updates v2019.01
- import DIV_ROUND_CLOSEST_ULL macro from Linux
- import improvement and fix of Denali NAND driver from Linux
- add NAND 200MHz clock to clk driver
- allow CONFIG_BOOTCOMMAND to run custom boot command/script
- sync DT with Linux 4.20
Diffstat (limited to 'arch/arm/dts/uniphier-ld4.dtsi')
| -rw-r--r-- | arch/arm/dts/uniphier-ld4.dtsi | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/dts/uniphier-ld4.dtsi b/arch/arm/dts/uniphier-ld4.dtsi index f505f643f7..b73d594b6d 100644 --- a/arch/arm/dts/uniphier-ld4.dtsi +++ b/arch/arm/dts/uniphier-ld4.dtsi @@ -63,6 +63,17 @@ cache-level = <2>; }; + spi: spi@54006000 { + compatible = "socionext,uniphier-scssi"; + status = "disabled"; + reg = <0x54006000 0x100>; + interrupts = <0 39 4>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi0>; + clocks = <&peri_clk 11>; + resets = <&peri_rst 11>; + }; + serial0: serial@54006800 { compatible = "socionext,uniphier-uart"; status = "disabled"; @@ -381,7 +392,8 @@ interrupts = <0 65 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_nand2cs>; - clocks = <&sys_clk 2>; + clock-names = "nand", "nand_x", "ecc"; + clocks = <&sys_clk 2>, <&sys_clk 3>, <&sys_clk 3>; resets = <&sys_rst 2>; }; }; |