diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-02-02 17:53:02 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-02-02 17:54:06 +0100 |
| commit | 29a6387c4ee7ef0b269c71c62c7b9770b91fa242 (patch) | |
| tree | 428be0711608f1b1378bd3eade483f314527ea8d /arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | |
| parent | c2f76057d3e6ca318d0aac83731d365865907c29 (diff) | |
| parent | 2977fcb7a974e64bdfe43d1114869afaec59d431 (diff) | |
Merge tag 'sunxi-dt-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/dt
Our usual bunch of patches to support the Allwinner SoCs, this time
adding:
- DT fixes spotted through the schemas
- Mali Support for the A10s/A13/GR8/R8
- MMC improvements for the A64 and H6
- New board: SL631 Action Camera, PineTab Early Adopter
* tag 'sunxi-dt-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (47 commits)
ARM: dts: sunxi: Rename nmi_intc to r_intc
ARM: dts: sun8i: h2-plus: bananapi-m2-zero: Increase BT UART speed
ARM: dts: sunxi: bananapi-m2-plus: Increase BT UART speed
arm64: dts: allwinner: pine-h64: Fix typos in BT GPIOs
arm64: dts: allwinner: pinetab: Fix the panel compatible
arm64: dts: allwinner: pinephone: Remove useless light sensor supplies
arm64: dts: allwinner: h6: Use - instead of @ for DT OPP entries
ARM: dts: sun8i-a33: sina33: Add missing panel power supply
ARM: dts: sun8i-a83t: Remove empty CSI port
ARM: dts: sun8i-s3: pinecube: Fix CSI DTC warnings
ARM: dts: sun8i-s3: impetus: Fix the USB PHY ID detect GPIO properties
ARM: dts: sun8i: nanopi-r1: Fix GPIO regulator state array
ARM: dts: sun6i: primo81: Remove useless io-channel-cells
ARM: dts: sunxi: Fix CPU thermal zone node name
ARM: dts: sunxi: Add missing backlight supply
ARM: dts: sunxi: Fix the LED node names
dt-bindings: rtc: sun6i-a31-rtc: Loosen the requirements on the clocks
dt-bindings: iio: adc: Add AXP803 compatible
dt-bindings: sunxi: Fix the pinecube compatible
ARM: dts: sun8i-v3s: Add CSI0 MCLK pin definition
...
Link: https://lore.kernel.org/r/48511540-fdd6-4fbe-8037-ec9fa8436147.lettre@localhost
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index 51cc30e84e26..57786fc120c3 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -514,7 +514,7 @@ resets = <&ccu RST_BUS_MMC2>; reset-names = "ahb"; interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>; - max-frequency = <200000000>; + max-frequency = <150000000>; status = "disabled"; #address-cells = <1>; #size-cells = <0>; @@ -593,6 +593,8 @@ <&ccu CLK_USB_OHCI0>; resets = <&ccu RST_BUS_OHCI0>, <&ccu RST_BUS_EHCI0>; + phys = <&usbphy 0>; + phy-names = "usb"; status = "disabled"; }; @@ -603,6 +605,8 @@ clocks = <&ccu CLK_BUS_OHCI0>, <&ccu CLK_USB_OHCI0>; resets = <&ccu RST_BUS_OHCI0>; + phys = <&usbphy 0>; + phy-names = "usb"; status = "disabled"; }; |