p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

UniPhier ARM SoC DT updates for v4.21 

- Add bindings for all SoCs/boards of UniPhier platform
 
 - Move binding docs to socionext directory
 
 - Add all CPUs in cooling maps
 
 - Add MIO DMAC nodes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJcDpUOAAoJED2LAQed4NsGF5UP+QFPDavs9f3HYR+WJIP9FAk/
 yztsRuaygRuJdGwi7xHw1fDdi5N5u4O5olDTiULYDxd+GjlCgbgXB9MKLoVktB0z
 81MvrcAsh4d/NvU22R2QadsbeQdGLPRlfyRtwxi0DPzx/LAvUEGA29rFF4fTqYXw
 4Lm8UVJl+3yyfl8ysVHhgALmgwYGG/oC9wF/b2Y2/KuO6qm68yxYPX952G3j/AaH
 HXiWXdQzkYAP7nND8VcN8KBnlV/lJH/HanYVFgWzpV6Kwo7sUbNdMssePZQSsr+J
 6Fl36/VtzGTeUlP3tX07Hu4v1i4V09kmG3TLAB6XsIAohpq0g9LRGSrVIohShZGE
 lNiv2qrXUHUHBq+UoJQDjD/QEvaLTEo3g7S8hWBnPgMyPF8CyMsUYs6EhOuIiinM
 wtwtAE/EmigvY4xbElJG2WQ/svJmd3qrMazqot8nzPnIKz0FtMmA4jqAyhlmAs3K
 grH4hG5G0THpX2Netei1mCfb060CMvlabWRFZNjaFk6oxQN4n1J0AUXGeFiHK2Eg
 FkkVp5PiEg2dn1lhLiUyeauOVzrUKum2CBrLO9war4GLHaUynu4/8ZP+fVgJa3gb
 DMUh+j4ky/+iZcB5id59OIpALVZvpFk6FfgpFN5d2x4LpRmd1M0oPi+K9FYrmIQb
 kDx41tyCAx9npRmYN979
 =zPKy
 -----END PGP SIGNATURE-----

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

UniPhier ARM SoC DT updates for v4.21

- Add bindings for all SoCs/boards of UniPhier platform

- Move binding docs to socionext directory

- Add all CPUs in cooling maps

- Add MIO DMAC nodes

* tag 'uniphier-dt-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  ARM: dts: uniphier: add MIO DMAC nodes
  arm64: dts: uniphier: Add all CPUs in cooling maps
  ARM: dts: uniphier: Add all CPUs in cooling maps
  dt-bindings: uniphier: move cache-uniphier.txt to vendor directory
  dt-bindings: uniphier: add bindings for UniPhier SoC family

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-12-12 13:01:24 -08:00
parent dd980900e2 5fd98eb7e8
commit ba97d019fc
8 changed files with 100 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Documentation/devicetree/bindings/arm/uniphier/cache-uniphier.txt → Documentation/devicetree/bindings/arm/socionext/cache-uniphier.txt
View File

47
Documentation/devicetree/bindings/arm/socionext/uniphier.txt Normal file
View File

@ -0,0 +1,47 @@
Socionext UniPhier SoC family
-----------------------------
Required properties in the root node:
- compatible: should contain board and SoC compatible strings
SoC and board compatible strings:
(sorted chronologically)
- LD4 SoC: "socionext,uniphier-ld4"
- Reference Board: "socionext,uniphier-ld4-ref"
- Pro4 SoC: "socionext,uniphier-pro4"
- Reference Board: "socionext,uniphier-pro4-ref"
- Ace Board: "socionext,uniphier-pro4-ace"
- Sanji Board: "socionext,uniphier-pro4-sanji"
- sLD8 SoC: "socionext,uniphier-sld8"
- Reference Board: "socionext,uniphier-sld8-ref"
- PXs2 SoC: "socionext,uniphier-pxs2"
- Gentil Board: "socionext,uniphier-pxs2-gentil"
- Vodka Board: "socionext,uniphier-pxs2-vodka"
- LD6b SoC: "socionext,uniphier-ld6b"
- Reference Board: "socionext,uniphier-ld6b-ref"
- LD11 SoC: "socionext,uniphier-ld11"
- Reference Board: "socionext,uniphier-ld11-ref"
- Global Board: "socionext,uniphier-ld11-global"
- LD20 SoC: "socionext,uniphier-ld20"
- Reference Board: "socionext,uniphier-ld20-ref"
- Global Board: "socionext,uniphier-ld20-global"
- PXs3 SoC: "socionext,uniphier-pxs3"
- Reference Board: "socionext,uniphier-pxs3-ref"
Example:
/dts-v1/;
/ {
compatible = "socionext,uniphier-ld20-ref", "socionext,uniphier-ld20";
...
};

1
MAINTAINERS
View File

@ -2247,6 +2247,7 @@ M: Masahiro Yamada <yamada.masahiro@socionext.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
T: git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git
S: Maintained
F: Documentation/devicetree/bindings/arm/socionext/uniphier.txt
F: Documentation/devicetree/bindings/gpio/gpio-uniphier.txt
F: Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.txt
F: arch/arm/boot/dts/uniphier*

14
arch/arm/boot/dts/uniphier-ld4.dtsi
View File

@ -235,6 +235,16 @@ peri_rst: reset {
};
};
dmac: dma-controller@5a000000 {
compatible = "socionext,uniphier-mio-dmac";
reg = <0x5a000000 0x1000>;
interrupts = <0 68 4>, <0 68 4>, <0 69 4>, <0 70 4>,
<0 71 4>, <0 72 4>, <0 73 4>;
clocks = <&mio_clk 7>;
resets = <&mio_rst 7>;
#dma-cells = <1>;
};
sd: sdhc@5a400000 {
compatible = "socionext,uniphier-sd-v2.91";
status = "disabled";
@ -246,6 +256,8 @@ sd: sdhc@5a400000 {
clocks = <&mio_clk 0>;
reset-names = "host", "bridge";
resets = <&mio_rst 0>, <&mio_rst 3>;
dma-names = "rx-tx";
dmas = <&dmac 4>;
bus-width = <4>;
cap-sd-highspeed;
sd-uhs-sdr12;
@ -263,6 +275,8 @@ emmc: sdhc@5a500000 {
clocks = <&mio_clk 1>;
reset-names = "host", "bridge", "hw";
resets = <&mio_rst 1>, <&mio_rst 4>, <&mio_rst 6>;
dma-names = "rx-tx";
dmas = <&dmac 6>;
bus-width = <8>;
cap-mmc-highspeed;
cap-mmc-hw-reset;

16
arch/arm/boot/dts/uniphier-pro4.dtsi
View File

@ -269,6 +269,16 @@ peri_rst: reset {
};
};
dmac: dma-controller@5a000000 {
compatible = "socionext,uniphier-mio-dmac";
reg = <0x5a000000 0x1000>;
interrupts = <0 68 4>, <0 68 4>, <0 69 4>, <0 70 4>,
<0 71 4>, <0 72 4>, <0 73 4>, <0 74 4>;
clocks = <&mio_clk 7>;
resets = <&mio_rst 7>;
#dma-cells = <1>;
};
sd: sdhc@5a400000 {
compatible = "socionext,uniphier-sd-v2.91";
status = "disabled";
@ -280,6 +290,8 @@ sd: sdhc@5a400000 {
clocks = <&mio_clk 0>;
reset-names = "host", "bridge";
resets = <&mio_rst 0>, <&mio_rst 3>;
dma-names = "rx-tx";
dmas = <&dmac 4>;
bus-width = <4>;
cap-sd-highspeed;
sd-uhs-sdr12;
@ -297,6 +309,8 @@ emmc: sdhc@5a500000 {
clocks = <&mio_clk 1>;
reset-names = "host", "bridge", "hw";
resets = <&mio_rst 1>, <&mio_rst 4>, <&mio_rst 6>;
dma-names = "rx-tx";
dmas = <&dmac 5>;
bus-width = <8>;
cap-mmc-highspeed;
cap-mmc-hw-reset;
@ -313,6 +327,8 @@ sd1: sdhc@5a600000 {
clocks = <&mio_clk 2>;
reset-names = "host", "bridge";
resets = <&mio_rst 2>, <&mio_rst 5>;
dma-names = "rx-tx";
dmas = <&dmac 6>;
bus-width = <4>;
cap-sd-highspeed;
};

6
arch/arm/boot/dts/uniphier-pxs2.dtsi
View File

@ -141,8 +141,10 @@ cpu_alert: cpu-alert {
cooling-maps {
map {
trip = <&cpu_alert>;
cooling-device = <&cpu0
THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
};
};

14
arch/arm/boot/dts/uniphier-sld8.dtsi
View File

@ -239,6 +239,16 @@ peri_rst: reset {
};
};
dmac: dma-controller@5a000000 {
compatible = "socionext,uniphier-mio-dmac";
reg = <0x5a000000 0x1000>;
interrupts = <0 68 4>, <0 68 4>, <0 69 4>, <0 70 4>,
<0 71 4>, <0 72 4>, <0 73 4>;
clocks = <&mio_clk 7>;
resets = <&mio_rst 7>;
#dma-cells = <1>;
};
sd: sdhc@5a400000 {
compatible = "socionext,uniphier-sd-v2.91";
status = "disabled";
@ -250,6 +260,8 @@ sd: sdhc@5a400000 {
clocks = <&mio_clk 0>;
reset-names = "host", "bridge";
resets = <&mio_rst 0>, <&mio_rst 3>;
dma-names = "rx-tx";
dmas = <&dmac 4>;
bus-width = <4>;
cap-sd-highspeed;
sd-uhs-sdr12;
@ -267,6 +279,8 @@ emmc: sdhc@5a500000 {
clocks = <&mio_clk 1>;
reset-names = "host", "bridge", "hw";
resets = <&mio_rst 1>, <&mio_rst 4>, <&mio_rst 6>;
dma-names = "rx-tx";
dmas = <&dmac 6>;
bus-width = <8>;
cap-mmc-highspeed;
cap-mmc-hw-reset;

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

@ -206,13 +206,10 @@ cpu_alert: cpu-alert {
cooling-maps {
map0 {
trip = <&cpu_alert>;
cooling-device = <&cpu0
THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
map1 {
trip = <&cpu_alert>;
cooling-device = <&cpu2
THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
};
};