| Message ID | 20240429001317.432-6-jszhang@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | riscv: dts: starfive: add Milkv Mars board device tree | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
Jisheng Zhang wrote: > Per VisionFive 2 1.2B, and 1.3A boards' SCH, GPIO 41 is used as > card detect. So add "cd-gpios" property for this. > > Signed-off-by: Jisheng Zhang <jszhang@kernel.org> > --- > arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > index 910c07bd4af9..b6030d63459d 100644 > --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > @@ -303,7 +303,7 @@ &mmc1 { > bus-width = <4>; > no-sdio; > no-mmc; > - broken-cd; > + cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; nit if you need to respin this anyway: i know the properties are already not sorted, but i'd prefer to not add more properties out of order. In any case Reviewed-by: Emil Renner Berthing <emil.renner.berthing@canonical.com> > cap-sd-highspeed; > post-power-on-delay-ms = <200>; > pinctrl-names = "default"; > -- > 2.43.0 >
diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi index 910c07bd4af9..b6030d63459d 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi @@ -303,7 +303,7 @@ &mmc1 { bus-width = <4>; no-sdio; no-mmc; - broken-cd; + cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; cap-sd-highspeed; post-power-on-delay-ms = <200>; pinctrl-names = "default";
Per VisionFive 2 1.2B, and 1.3A boards' SCH, GPIO 41 is used as card detect. So add "cd-gpios" property for this. Signed-off-by: Jisheng Zhang <jszhang@kernel.org> --- arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)