Commit a1858df9 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'sunxi-fixes-for-4.12' of...

Merge tag 'sunxi-fixes-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes

Allwinner fixes for 4.12

A few fixes around the PRCM support that got in 4.12 with a wrong
compatible, and a missing clock in the binding.

* tag 'sunxi-fixes-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: allwinner: a64: Add PLL_PERIPH0 clock to the R_CCU
  ARM: sunxi: h3-h5: Add PLL_PERIPH0 clock to the R_CCU
  arm64: allwinner: h5: Remove syslink to shared DTSI
  ARM: sunxi: h3/h5: fix the compatible of R_CCU
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 51b6e281 f74994a9
...@@ -558,10 +558,11 @@ rtc: rtc@01f00000 { ...@@ -558,10 +558,11 @@ rtc: rtc@01f00000 {
}; };
r_ccu: clock@1f01400 { r_ccu: clock@1f01400 {
compatible = "allwinner,sun50i-a64-r-ccu"; compatible = "allwinner,sun8i-h3-r-ccu";
reg = <0x01f01400 0x100>; reg = <0x01f01400 0x100>;
clocks = <&osc24M>, <&osc32k>, <&iosc>; clocks = <&osc24M>, <&osc32k>, <&iosc>,
clock-names = "hosc", "losc", "iosc"; <&ccu 9>;
clock-names = "hosc", "losc", "iosc", "pll-periph";
#clock-cells = <1>; #clock-cells = <1>;
#reset-cells = <1>; #reset-cells = <1>;
}; };
......
...@@ -406,8 +406,9 @@ rtc: rtc@1f00000 { ...@@ -406,8 +406,9 @@ rtc: rtc@1f00000 {
r_ccu: clock@1f01400 { r_ccu: clock@1f01400 {
compatible = "allwinner,sun50i-a64-r-ccu"; compatible = "allwinner,sun50i-a64-r-ccu";
reg = <0x01f01400 0x100>; reg = <0x01f01400 0x100>;
clocks = <&osc24M>, <&osc32k>, <&iosc>; clocks = <&osc24M>, <&osc32k>, <&iosc>,
clock-names = "hosc", "losc", "iosc"; <&ccu 11>;
clock-names = "hosc", "losc", "iosc", "pll-periph";
#clock-cells = <1>; #clock-cells = <1>;
#reset-cells = <1>; #reset-cells = <1>;
}; };
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include "sunxi-h3-h5.dtsi" #include <arm/sunxi-h3-h5.dtsi>
/ { / {
cpus { cpus {
......
../../../../arm/boot/dts/sunxi-h3-h5.dtsi
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment