diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-18 23:42:21 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-18 23:42:21 -0400 |
| commit | a1858df975edf6706e7a5a3ae000e52d81076807 (patch) | |
| tree | eaf87b65e85908c470143203768085df8880a727 | |
| parent | 51b6e2813ca1d7cb530d5f834ea22f1ae52b7e35 (diff) | |
| parent | f74994a94063bc85ac1d6ad677ed06b5279c101f (diff) | |
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: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/boot/dts/sunxi-h3-h5.dtsi | 7 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 2 | ||||
| l--------- | arch/arm64/boot/dts/allwinner/sunxi-h3-h5.dtsi | 1 |
4 files changed, 8 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi index 1aeeacb3a884..d4f600dbb7eb 100644 --- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi +++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi | |||
| @@ -558,10 +558,11 @@ | |||
| 558 | }; | 558 | }; |
| 559 | 559 | ||
| 560 | r_ccu: clock@1f01400 { | 560 | r_ccu: clock@1f01400 { |
| 561 | compatible = "allwinner,sun50i-a64-r-ccu"; | 561 | compatible = "allwinner,sun8i-h3-r-ccu"; |
| 562 | reg = <0x01f01400 0x100>; | 562 | reg = <0x01f01400 0x100>; |
| 563 | clocks = <&osc24M>, <&osc32k>, <&iosc>; | 563 | clocks = <&osc24M>, <&osc32k>, <&iosc>, |
| 564 | clock-names = "hosc", "losc", "iosc"; | 564 | <&ccu 9>; |
| 565 | clock-names = "hosc", "losc", "iosc", "pll-periph"; | ||
| 565 | #clock-cells = <1>; | 566 | #clock-cells = <1>; |
| 566 | #reset-cells = <1>; | 567 | #reset-cells = <1>; |
| 567 | }; | 568 | }; |
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index c7f669f5884f..166c9ef884dc 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | |||
| @@ -406,8 +406,9 @@ | |||
| 406 | r_ccu: clock@1f01400 { | 406 | r_ccu: clock@1f01400 { |
| 407 | compatible = "allwinner,sun50i-a64-r-ccu"; | 407 | compatible = "allwinner,sun50i-a64-r-ccu"; |
| 408 | reg = <0x01f01400 0x100>; | 408 | reg = <0x01f01400 0x100>; |
| 409 | clocks = <&osc24M>, <&osc32k>, <&iosc>; | 409 | clocks = <&osc24M>, <&osc32k>, <&iosc>, |
| 410 | clock-names = "hosc", "losc", "iosc"; | 410 | <&ccu 11>; |
| 411 | clock-names = "hosc", "losc", "iosc", "pll-periph"; | ||
| 411 | #clock-cells = <1>; | 412 | #clock-cells = <1>; |
| 412 | #reset-cells = <1>; | 413 | #reset-cells = <1>; |
| 413 | }; | 414 | }; |
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi index 4d314a253fd9..732e2e06f503 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | * OTHER DEALINGS IN THE SOFTWARE. | 40 | * OTHER DEALINGS IN THE SOFTWARE. |
| 41 | */ | 41 | */ |
| 42 | 42 | ||
| 43 | #include "sunxi-h3-h5.dtsi" | 43 | #include <arm/sunxi-h3-h5.dtsi> |
| 44 | 44 | ||
| 45 | / { | 45 | / { |
| 46 | cpus { | 46 | cpus { |
diff --git a/arch/arm64/boot/dts/allwinner/sunxi-h3-h5.dtsi b/arch/arm64/boot/dts/allwinner/sunxi-h3-h5.dtsi deleted file mode 120000 index 036f01dc2b9b..000000000000 --- a/arch/arm64/boot/dts/allwinner/sunxi-h3-h5.dtsi +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | ../../../../arm/boot/dts/sunxi-h3-h5.dtsi \ No newline at end of file | ||