Skip to content

Commit

Permalink
Merge tag 'renesas-arm64-dt-pm-domain-for-v4.7' of git://git.kernel.o…
Browse files Browse the repository at this point in the history
…rg/pub/scm/linux/kernel/git/horms/renesas into next/late

Merge "Renesas ARM64 Based SoC DT PM Domain Updates for v4.7" from Simon Horman:

* Add SYSC PM Domains to DT of r8a7795 SoC

* tag 'renesas-arm64-dt-pm-domain-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  arm64: dts: r8a7795: Use SYSC "always-on" PM Domain
  arm64: dts: r8a7795: Add SYSC PM Domains
  arm64: dts: r8a7795: Don't disable referenced optional clocks
  arm64: dts: salvator-x: populate EXTALR
  arm64: dts: r8a7795: enable PCIe on Salvator-X
  arm64: dts: r8a7795: Add PCIe nodes
  arm64: dts: r8a7795: Use USB3.0 fallback compatibility string
  arm64: dts: r8a7795: Add CAN support
  arm64: dts: r8a7795: Add CAN external clock support
  • Loading branch information
Arnd Bergmann committed May 9, 2016
2 parents 1cf257a + 38dbb45 commit 783fb3c
Show file tree
Hide file tree
Showing 2 changed files with 176 additions and 54 deletions.
17 changes: 17 additions & 0 deletions arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,10 @@
clock-frequency = <16666666>;
};

&extalr_clk {
clock-frequency = <32768>;
};

&pfc {
pinctrl-0 = <&scif_clk_pins>;
pinctrl-names = "default";
Expand Down Expand Up @@ -388,3 +392,16 @@
&ohci2 {
status = "okay";
};

&pcie_bus_clk {
clock-frequency = <100000000>;
status = "okay";
};

&pciec0 {
status = "okay";
};

&pciec1 {
status = "okay";
};
Loading

0 comments on commit 783fb3c

Please sign in to comment.