openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Add dt-bindings includes for OX820 and OX810SE dtsi 

- Replace reset and clock magic numbers for OX820 and OX810SE
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJYbMKYAAoJEHfc29rIyEnRJg4P/3rpFk+Y2sPr/Pp26+bRKH8a
 VXyherqd2I4ymsYvDMfMiTrmH626Vf2pOoJoyz9FhNHjua/yZ9RiYYAZRogP4wMh
 1VXYCujjD9uCaY1AP1XFSV12ZSkxbBkfBroUbD/jWjU5fM81lS2jLd9duDvUJLWr
 KpkQe7Fl1MnRr86ECewgTk5wk7BwVLJrjOKoPPug2RT6jy2H5Syldv46JA0ybzHp
 g9j48xg8DpfUzzDXxsObOVXcl3Q4789Ii1+0YBHseYkFWh7/rX06WtPSnHLcoiKv
 Qp1HiCYHVb0CyusD0U7DoomH+9o9G9k2j/Fdqv4AbWWh3b+u65LU8d338KLyHrRd
 Bi3ONTlOQ9BLesfqKkF1cQYM//rkugQ4EIAhcfxn9kCnd4gfYj+Q6PlmBTydM9AB
 MUjJRWlWcmgxvL2TLFYMEoRHzrlXs/jtcW+uMgUkL0kjv0Ap/iMgInKVGbVZhgIM
 QqI01G1T3uyYiiebYA3bQnHTqbbGv77pwSwQZaF7M4OxPzbGrmegSuVIRGb326MD
 2IzC650v++auUmtwOh02PtrZJvA6Y3BmnaogetTjLDc+DTy3tDKVQiG5T3Kb7BCL
 zq1T4Xc34RQAekY/OKxEgS+7FyhgWEDRrrksTEkObx/qD9ClOKXAlwbWr032GuDx
 xD+0Et+RFpTWzu8BfmNC
 =yu88
 -----END PGP SIGNATURE-----

Merge tag 'oxnas-arm-soc-dt-for-4.11' of https://github.com/OXNAS/linux into next/dt

- Add dt-bindings includes for OX820 and OX810SE dtsi
- Replace reset and clock magic numbers for OX820 and OX810SE

* tag 'oxnas-arm-soc-dt-for-4.11' of https://github.com/OXNAS/linux:
  ARM: dts: OX820: Update with dt-bindings includes
  ARM: dts: OX810: Update with dt-bindings includes

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2017-01-09 19:18:45 -08:00
parent 70c6420cad 0c5987d3e3
commit d01300a62c
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/boot/dts/ox810se.dtsi
View File

@ -7,6 +7,8 @@
*/
/include/ "skeleton.dtsi"
#include <dt-bindings/clock/oxsemi,ox810se.h>
#include <dt-bindings/reset/oxsemi,ox810se.h>
/ {
compatible = "oxsemi,ox810se";
@ -242,7 +244,7 @@ uart0: serial@200000 {
current-speed = <115200>;
no-loopback-test;
status = "disabled";
resets = <&reset 17>;
resets = <&reset RESET_UART1>;
};
uart1: serial@300000 {
@ -256,7 +258,7 @@ uart1: serial@300000 {
current-speed = <115200>;
no-loopback-test;
status = "disabled";
resets = <&reset 18>;
resets = <&reset RESET_UART2>;
};
uart2: serial@900000 {
@ -270,7 +272,7 @@ uart2: serial@900000 {
current-speed = <115200>;
no-loopback-test;
status = "disabled";
resets = <&reset 22>;
resets = <&reset RESET_UART3>;
};
uart3: serial@a00000 {
@ -284,7 +286,7 @@ uart3: serial@a00000 {
current-speed = <115200>;
no-loopback-test;
status = "disabled";
resets = <&reset 23>;
resets = <&reset RESET_UART4>;
};
};

14
arch/arm/boot/dts/ox820.dtsi
View File

@ -8,6 +8,8 @@
/include/ "skeleton.dtsi"
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/oxsemi,ox820.h>
#include <dt-bindings/reset/oxsemi,ox820.h>
/ {
compatible = "oxsemi,ox820";
@ -83,8 +85,8 @@ soc {
nandc: nand-controller@41000000 {
compatible = "oxsemi,ox820-nand";
reg = <0x41000000 0x100000>;
clocks = <&stdclk 11>;
resets = <&reset 15>;
clocks = <&stdclk CLK_820_NAND>;
resets = <&reset RESET_NAND>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@ -99,9 +101,9 @@ etha: ethernet@40400000 {
mac-address = [000000000000]; /* Filled in by U-Boot */
phy-mode = "rgmii";
clocks = <&stdclk 9>, <&gmacclk>;
clocks = <&stdclk CLK_820_ETHA>, <&gmacclk>;
clock-names = "gmac", "stmmaceth";
resets = <&reset 6>;
resets = <&reset RESET_MAC>;
/* Regmap for sys registers */
oxsemi,sys-ctrl = <&sys>;
@ -208,7 +210,7 @@ uart0: serial@200000 {
no-loopback-test;
status = "disabled";
clocks = <&sysclk>;
resets = <&reset 17>;
resets = <&reset RESET_UART1>;
};
uart1: serial@300000 {
@ -222,7 +224,7 @@ uart1: serial@300000 {
no-loopback-test;
status = "disabled";
clocks = <&sysclk>;
resets = <&reset 18>;
resets = <&reset RESET_UART2>;
};
rps@400000 {