On Wed, 21 Apr 2021 23:16:48 +0200 Jernej Škrabec jernej.skrabec@siol.net wrote:
Hi Jernej,
thanks for having a look!
Dne sreda, 21. april 2021 ob 11:27:12 CEST je Andre Przywara napisal(a):
Import updated devicetree file from Linux v5.12-rc8.
Besides some node and audio port renames this changes the PHY modes to either rgmii-id or rgmii-txid. From the board files the Pinephone sees a lot of updates.
This also adds the long missing USB PHY property for controller 0, which allows the U-Boot PHY driver to eventually use port 0 in host mode (pending another U-Boot patch).
Signed-off-by: Andre Przywara andre.przywara@arm.com
arch/arm/dts/sun50i-a64-bananapi-m64.dts | 16 ++-- arch/arm/dts/sun50i-a64-nanopi-a64.dts | 2 +- arch/arm/dts/sun50i-a64-orangepi-win.dts | 10 +-- arch/arm/dts/sun50i-a64-pine64-lts.dts | 15 ++++ arch/arm/dts/sun50i-a64-pine64-plus.dts | 2 +- arch/arm/dts/sun50i-a64-pine64.dts | 8 +- arch/arm/dts/sun50i-a64-pinebook.dts | 13 ++- arch/arm/dts/sun50i-a64-pinephone-1.0.dts | 7 +- arch/arm/dts/sun50i-a64-pinephone-1.1.dts | 7 +- arch/arm/dts/sun50i-a64-pinephone-1.2.dts | 16 +++- arch/arm/dts/sun50i-a64-pinephone.dtsi | 90 +++++++++++++++---- .../dts/sun50i-a64-pinetab-early-adopter.dts | 26 ++++++ arch/arm/dts/sun50i-a64-pinetab.dts | 13 ++- arch/arm/dts/sun50i-a64-sopine-baseboard.dts | 11 +-- arch/arm/dts/sun50i-a64-sopine.dtsi | 3 +- arch/arm/dts/sun50i-a64-teres-i.dts | 12 +-- arch/arm/dts/sun50i-a64.dtsi | 40 ++++++--- 17 files changed, 215 insertions(+), 76 deletions(-) create mode 100644 arch/arm/dts/sun50i-a64-pinetab-early-adopter.dts
[ ... ]
diff --git a/arch/arm/dts/sun50i-a64-pine64-lts.dts b/arch/arm/dts/sun50i-a64-pine64-lts.dts index 302e24be0a3..e79ce49e7e6 100644 --- a/arch/arm/dts/sun50i-a64-pine64-lts.dts +++ b/arch/arm/dts/sun50i-a64-pine64-lts.dts @@ -1,10 +1,25 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) // Copyright (c) 2018 ARM Ltd.
+#include <dt-bindings/leds/common.h> #include "sun50i-a64-sopine-baseboard.dts"
/ { model = "Pine64 LTS"; compatible = "pine64,pine64-lts", "allwinner,sun50i-r18", "allwinner,sun50i-a64";
- leds {
compatible = "gpio-leds";led {function = LED_FUNCTION_STATUS;color = <LED_COLOR_ID_BLUE>;gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */};- };
+};
+&mmc0 {
- cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 push-push switch */
};
Do you really want to use this version? Today I got another report that this doesn't work. Or do you plan to fix it in -rc release?
Well, this is a verbatim copy of the current Linux mainline tree. I just wanted to post this to see if people have any comments. Yes, there is one patch missing, but ideally this one hits mainline Linux before this update here gets merged (so I merge the updated version), or I push it as a hot fix afterwards.
Cheers, Andre