UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

UniPhier ARM SoC DT updates for v4.14 (2nd) 

- add AIDET irqchip device nodes
 - fix size of sdctrl node
 - add ethernet pinmux nodes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJZpDJuAAoJED2LAQed4NsGM4IP/2z+izg3mArX6NRJp/RdswKz
 s58bWJpqN/wlerNStLw02RE6AlrgozZiwRfY5nKwgIZRXUIajEshOjZkn41Y8AEq
 bPCCijKz/xfq7hz/E9IHNM7aRRzhjf1PxGPWYzfVp4HZMo1H90rcDEOBwgpoulrJ
 fOZtEJeUyLqe8pj0z35j9kNNpWAeLEfaApD7XwwJSjjWxr6nrMx11p9Fu/GDK5v0
 G+pO1FfoFk3oQsaXiq85olNktUbld4HTja82jtxIShXk5s/p/JiTzsNjHQDYgdU/
 B0U0euVBVlv0Mjx0cREBxCKJpu5V3W+gl85ktiI4keENiQ0e5SjcvqBGIoRZgzzc
 McIgJGqYjiRmF+x9Hrn4Qy/eRtCM9xFmU42FhZk2rqfobCqWcIPVKa2RNfiZc72S
 KuGvgPuD2WTZTD9N0cHobx1UVKVK9ZM0Butd1N38xQyvvefHuol7/mHyolmmdGUk
 qMpfEdP21txQrls0SbdcE8q6EmIcXsKweU4gQ8XEEM+/SSsWZJ8eyuGgItepJV5n
 l16w6O4ZIFMUzxwUaLrF7Vkr+DMFBsxsIGYMKfYz9E+E9HGx/vMst48gWlA7u0+z
 oSCZyIJ+VioOftEsCUdFYBZYFDZycVE0MWZEhhh/3GThw3/SnGTp4rGWniKvKa/M
 B9wCOH7fo9d3fWEXh3ZP
 =rA66
 -----END PGP SIGNATURE-----

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

UniPhier ARM SoC DT updates for v4.14 (2nd)

- add AIDET irqchip device nodes
- fix size of sdctrl node
- add ethernet pinmux nodes

* tag 'uniphier-dt-v4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  ARM: dts: uniphier: add pinctrl groups of ethernet phy mode
  ARM: dts: uniphier: fix size of sdctrl nodes
  ARM: dts: uniphier: add AIDET nodes

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2017-08-29 22:41:34 -07:00
parent 940bf1d6f7 8a7a516afa
commit 983d7c4570
6 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,6 +270,13 @@
interrupt-controller; interrupt-controller;
}; };
aidet: aidet@61830000 {
compatible = "socionext,uniphier-ld4-aidet";
reg = <0x61830000 0x200>;
interrupt-controller;
#interrupt-cells = <2>;
};
sysctrl@61840000 { sysctrl@61840000 {
compatible = "socionext,uniphier-ld4-sysctrl", compatible = "socionext,uniphier-ld4-sysctrl",
"simple-mfd", "syscon"; "simple-mfd", "syscon";

15
arch/arm/boot/dts/uniphier-pinctrl.dtsi
View File

@ -18,6 +18,21 @@
function = "emmc"; function = "emmc";
}; };
pinctrl_ether_mii: ether_mii_grp {
groups = "ether_mii";
function = "ether_mii";
};
pinctrl_ether_rgmii: ether_rgmii_grp {
groups = "ether_rgmii";
function = "ether_rgmii";
};
pinctrl_ether_rmii: ether_rmii_grp {
groups = "ether_rmii";
function = "ether_rmii";
};
pinctrl_i2c0: i2c0_grp { pinctrl_i2c0: i2c0_grp {
groups = "i2c0"; groups = "i2c0";
function = "i2c0"; function = "i2c0";

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

@ -268,6 +268,13 @@
}; };
}; };
aidet: aidet@5fc20000 {
compatible = "socionext,uniphier-pro4-aidet";
reg = <0x5fc20000 0x200>;
interrupt-controller;
#interrupt-cells = <2>;
};
timer@60000200 { timer@60000200 {
compatible = "arm,cortex-a9-global-timer"; compatible = "arm,cortex-a9-global-timer";
reg = <0x60000200 0x20>; reg = <0x60000200 0x20>;

9
arch/arm/boot/dts/uniphier-pro5.dtsi
View File

@ -292,7 +292,7 @@
sdctrl@59810000 { sdctrl@59810000 {
compatible = "socionext,uniphier-pro5-sdctrl", compatible = "socionext,uniphier-pro5-sdctrl",
"simple-mfd", "syscon"; "simple-mfd", "syscon";
reg = <0x59810000 0x800>; reg = <0x59810000 0x400>;
sd_clk: clock { sd_clk: clock {
compatible = "socionext,uniphier-pro5-sd-clock"; compatible = "socionext,uniphier-pro5-sd-clock";
@ -331,6 +331,13 @@
}; };
}; };
aidet: aidet@5fc20000 {
compatible = "socionext,uniphier-pro5-aidet";
reg = <0x5fc20000 0x200>;
interrupt-controller;
#interrupt-cells = <2>;
};
timer@60000200 { timer@60000200 {
compatible = "arm,cortex-a9-global-timer"; compatible = "arm,cortex-a9-global-timer";
reg = <0x60000200 0x20>; reg = <0x60000200 0x20>;

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

@ -276,7 +276,7 @@
sdctrl@59810000 { sdctrl@59810000 {
compatible = "socionext,uniphier-pxs2-sdctrl", compatible = "socionext,uniphier-pxs2-sdctrl",
"simple-mfd", "syscon"; "simple-mfd", "syscon";
reg = <0x59810000 0x800>; reg = <0x59810000 0x400>;
sd_clk: clock { sd_clk: clock {
compatible = "socionext,uniphier-pxs2-sd-clock"; compatible = "socionext,uniphier-pxs2-sd-clock";
@ -315,6 +315,13 @@
}; };
}; };
aidet: aidet@5fc20000 {
compatible = "socionext,uniphier-pxs2-aidet";
reg = <0x5fc20000 0x200>;
interrupt-controller;
#interrupt-cells = <2>;
};
timer@60000200 { timer@60000200 {
compatible = "arm,cortex-a9-global-timer"; compatible = "arm,cortex-a9-global-timer";
reg = <0x60000200 0x20>; reg = <0x60000200 0x20>;

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

@ -270,6 +270,13 @@
interrupt-controller; interrupt-controller;
}; };
aidet: aidet@61830000 {
compatible = "socionext,uniphier-sld8-aidet";
reg = <0x61830000 0x200>;
interrupt-controller;
#interrupt-cells = <2>;
};
sysctrl@61840000 { sysctrl@61840000 {
compatible = "socionext,uniphier-sld8-sysctrl", compatible = "socionext,uniphier-sld8-sysctrl",
"simple-mfd", "syscon"; "simple-mfd", "syscon";