diff mbox series

[V2,5/9] arm64: dts: renesas: beacon: Cleanup USB References

Message ID 20201224170502.2254683-5-aford173@gmail.com
State New
Headers show
Series None | expand

Commit Message

Adam Ford Dec. 24, 2020, 5:04 p.m. UTC
The programmable versaclock is used for the usb_extal reference clock for
the EHCI driver instead of a fixed-clock.  Because the versaclock needs to
be enabled, the clock reference needs to be added to the clocks list.

For the USB3 Phy, the perferred clock reference is usb3s_clk, so
remove the usb_extal reference.

Signed-off-by: Adam Ford <aford173@gmail.com>
---
V2:  Split this off into its own patch.

Comments

Sergei Shtylyov Dec. 25, 2020, 9:10 a.m. UTC | #1
On 24.12.2020 20:04, Adam Ford wrote:

> The programmable versaclock is used for the usb_extal reference clock for

> the EHCI driver instead of a fixed-clock.  Because the versaclock needs to

> be enabled, the clock reference needs to be added to the clocks list.

> 

> For the USB3 Phy, the perferred clock reference is usb3s_clk, so


    PHY. Preferred.

> remove the usb_extal reference.

> 

> Signed-off-by: Adam Ford <aford173@gmail.com>

[...]
> diff --git a/arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi b/arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi

> index ade2f58ad99b..a6f7193e4d97 100644

> --- a/arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi

> +++ b/arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi

[...]
> @@ -315,16 +306,12 @@ &sdhi3 {

>   	vmmc-supply = <&reg_3p3v>;

>   	vqmmc-supply = <&reg_1p8v>;

>   	bus-width = <8>;

> -	mmc-hs200-1_8v;

> +	mmc-hs400-1_8v;


    Unrelated?

>   	non-removable;

>   	fixed-emmc-driver-type = <1>;

>   	status = "okay";

>   };

[...]

MBR, Sergei
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/renesas/beacon-renesom-baseboard.dtsi b/arch/arm64/boot/dts/renesas/beacon-renesom-baseboard.dtsi
index a54ec36c69e4..3b3efaf749bb 100644
--- a/arch/arm64/boot/dts/renesas/beacon-renesom-baseboard.dtsi
+++ b/arch/arm64/boot/dts/renesas/beacon-renesom-baseboard.dtsi
@@ -263,12 +263,22 @@  &du_out_rgb {
 &ehci0 {
 	dr_mode = "otg";
 	status = "okay";
-	clocks = <&cpg CPG_MOD 703>, <&cpg CPG_MOD 704>;
+	clocks = <&cpg CPG_MOD 703>, <&cpg CPG_MOD 704>, <&versaclock5 3>;
 };
 
 &ehci1 {
 	status = "okay";
-	clocks = <&cpg CPG_MOD 703>, <&cpg CPG_MOD 704>;
+	clocks = <&cpg CPG_MOD 702>, <&versaclock5 3>;
+};
+
+&gpio6 {
+
+	usb_hub_reset {
+		gpio-hog;
+		gpios = <10 GPIO_ACTIVE_HIGH>;
+		output-high;
+		line-name = "usb-hub-reset";
+	};
 };
 
 &hdmi0 {
diff --git a/arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi b/arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi
index ade2f58ad99b..a6f7193e4d97 100644
--- a/arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi
+++ b/arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi
@@ -75,15 +75,6 @@  &extalr_clk {
 	clock-frequency = <32768>;
 };
 
-&gpio6 {
-	usb_hub_reset {
-		gpio-hog;
-		gpios = <10 GPIO_ACTIVE_HIGH>;
-		output-high;
-		line-name = "usb-hub-reset";
-	};
-};
-
 &hscif0 {
 	pinctrl-0 = <&hscif0_pins>;
 	pinctrl-names = "default";
@@ -315,16 +306,12 @@  &sdhi3 {
 	vmmc-supply = <&reg_3p3v>;
 	vqmmc-supply = <&reg_1p8v>;
 	bus-width = <8>;
-	mmc-hs200-1_8v;
+	mmc-hs400-1_8v;
 	non-removable;
 	fixed-emmc-driver-type = <1>;
 	status = "okay";
 };
 
-&usb_extal_clk {
-	clock-frequency = <50000000>;
-};
-
 &usb3s0_clk {
 	clock-frequency = <100000000>;
 };