diff options
author | Olof Johansson <olof@lixom.net> | 2017-04-07 16:49:43 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2017-04-07 16:49:43 -0700 |
commit | 12d28f94eb35d6309c8d86dad75ece76ee5c392e (patch) | |
tree | fe3c58e0606639f7f696229025caeee4253a6cbb /arch/arm64 | |
parent | d4ee21ef61dfcaeba7542cdc1c9242364a8ca5c0 (diff) | |
parent | 0d98479738b950e30bb4f782d60099d44076ad67 (diff) | |
download | linux-12d28f94eb35d6309c8d86dad75ece76ee5c392e.tar.bz2 |
Merge tag 'sunxi-fixes-for-4.11-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes
Allwinner fixes for 4.11, bis
Two fixes for the recent A33 cpufreq support, and one to fix a missing
register in the A64 USB PHY node.
* tag 'sunxi-fixes-for-4.11-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
arm64: allwinner: a64: add pmu0 regs for USB PHY
ARM: sun8i: a33: add operating-points-v2 property to all nodes
ARM: sun8i: a33: remove highest OPP to fix CPU crashes
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64')
-rw-r--r-- | arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index 1c64ea2d23f9..0565779e66fa 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -179,8 +179,10 @@ usbphy: phy@01c19400 { compatible = "allwinner,sun50i-a64-usb-phy"; reg = <0x01c19400 0x14>, + <0x01c1a800 0x4>, <0x01c1b800 0x4>; reg-names = "phy_ctrl", + "pmu0", "pmu1"; clocks = <&ccu CLK_USB_PHY0>, <&ccu CLK_USB_PHY1>; |