33c413c679
* Rework patches for sunxi 5.15.4
* Rework patches sunxi for 5.15.5
* Kernel switch tag=v5.15.5 for sunxi EDGE
* Temporarily disabled, requires rework.
drivers/clk/sunxi-ng/sun8i-de33.c: In function ‘sunxi_de33_clk_probe’:
drivers/clk/sunxi-ng/sun8i-de33.c:155:8:
error: implicit declaration of function ‘sunxi_ccu_probe’;
did you mean ‘of_sunxi_ccu_probe’? [-Werror=implicit-function-declarati>
ret = sunxi_ccu_probe(pdev->dev.of_node, reg, ccu_desc);
^~~~~~~~~~~~~~~
of_sunxi_ccu_probe
cc1: some warnings being treated as errors
make[3]: *** [scripts/Makefile.build:277:
drivers/clk/sunxi-ng/sun8i-de33.o] Error 1
make[2]: *** [scripts/Makefile.build:540: drivers/clk/sunxi-ng] Error 2
* Correct the comment.
53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
From 4c36177b6f2efbf67ecc55656d405812b3ef4a9a Mon Sep 17 00:00:00 2001
|
|
From: Johan Jonker <jbx6244@gmail.com>
|
|
Date: Sat, 28 Aug 2021 13:12:18 +0200
|
|
Subject: [PATCH 084/467] ARM: dts: rockchip: remove usb-phy fallback string
|
|
from rk3066a/rk3188
|
|
|
|
With the conversion of rockchip-usb-phy.yaml a long time used fallback
|
|
string for rk3066a/rk3188 was added. The linux driver doesn't do much with
|
|
the GRF phy address range, however the u-boot driver rockchip_usb2_phy.c
|
|
does. The bits in GRF_UOC0_CON2 for rk3066a/rk3188 and rk3288 for example
|
|
don't match. Remove the usb-phy fallback string for rk3066a/rk3188
|
|
to prevent possible strange side effects.
|
|
|
|
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
|
|
Link: https://lore.kernel.org/r/20210828111218.10026-2-jbx6244@gmail.com
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
---
|
|
arch/arm/boot/dts/rk3066a.dtsi | 3 +--
|
|
arch/arm/boot/dts/rk3188.dtsi | 3 +--
|
|
2 files changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
|
|
index 94982894f..c25b9695d 100644
|
|
--- a/arch/arm/boot/dts/rk3066a.dtsi
|
|
+++ b/arch/arm/boot/dts/rk3066a.dtsi
|
|
@@ -681,8 +681,7 @@ &grf {
|
|
compatible = "rockchip,rk3066-grf", "syscon", "simple-mfd";
|
|
|
|
usbphy: usbphy {
|
|
- compatible = "rockchip,rk3066a-usb-phy",
|
|
- "rockchip,rk3288-usb-phy";
|
|
+ compatible = "rockchip,rk3066a-usb-phy";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
status = "disabled";
|
|
diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
|
|
index d294c0f0f..a94321e90 100644
|
|
--- a/arch/arm/boot/dts/rk3188.dtsi
|
|
+++ b/arch/arm/boot/dts/rk3188.dtsi
|
|
@@ -647,8 +647,7 @@ io_domains: io-domains {
|
|
};
|
|
|
|
usbphy: usbphy {
|
|
- compatible = "rockchip,rk3188-usb-phy",
|
|
- "rockchip,rk3288-usb-phy";
|
|
+ compatible = "rockchip,rk3188-usb-phy";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
status = "disabled";
|
|
--
|
|
2.34.0
|
|
|