| Message ID | IA1PR20MB4953CA5D46EA8913B130D502BB052@IA1PR20MB4953.namprd20.prod.outlook.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | riscv: dts: sophgo: use real clock for sdhci | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
On 2024/4/11 20:21, Inochi Amaoto wrote: > As the clk patch is merged, Use real clocks for sdhci0. > > Signed-off-by: Inochi Amaoto <inochiama@outlook.com> > --- > arch/riscv/boot/dts/sophgo/cv18xx.dtsi | 12 +++--------- > 1 file changed, 3 insertions(+), 9 deletions(-) > > diff --git a/arch/riscv/boot/dts/sophgo/cv18xx.dtsi b/arch/riscv/boot/dts/sophgo/cv18xx.dtsi > index 75d0c57f4ffb..891932ae470f 100644 > --- a/arch/riscv/boot/dts/sophgo/cv18xx.dtsi > +++ b/arch/riscv/boot/dts/sophgo/cv18xx.dtsi > @@ -47,13 +47,6 @@ osc: oscillator { > #clock-cells = <0>; > }; > > - sdhci_clk: sdhci-clock { > - compatible = "fixed-clock"; > - clock-frequency = <375000000>; > - clock-output-names = "sdhci_clk"; > - #clock-cells = <0>; > - }; > - > soc { > compatible = "simple-bus"; > interrupt-parent = <&plic>; > @@ -298,8 +291,9 @@ sdhci0: mmc@4310000 { > compatible = "sophgo,cv1800b-dwcmshc"; > reg = <0x4310000 0x1000>; > interrupts = <36 IRQ_TYPE_LEVEL_HIGH>; > - clocks = <&sdhci_clk>; > - clock-names = "core"; > + clocks = <&clk CLK_AXI4_SD0>, > + <&clk CLK_SD0>; > + clock-names = "core", "bus"; > status = "disabled"; > }; Reviewed-by: Chen Wang <unicorn_wang@outlook.com> Thanks. > > -- > 2.44.0 >
On Thu, 11 Apr 2024 20:21:35 +0800, Inochi Amaoto wrote: > As the clk patch is merged, Use real clocks for sdhci0. > > Applied to sophgo/for-next, thanks! [1/1] riscv: dts: sophgo: use real clock for sdhci https://github.com/sophgo/linux/commit/886776ca23f2433eb69c0f95e0abadb7dfffd789 Thanks, Inochi
diff --git a/arch/riscv/boot/dts/sophgo/cv18xx.dtsi b/arch/riscv/boot/dts/sophgo/cv18xx.dtsi index 75d0c57f4ffb..891932ae470f 100644 --- a/arch/riscv/boot/dts/sophgo/cv18xx.dtsi +++ b/arch/riscv/boot/dts/sophgo/cv18xx.dtsi @@ -47,13 +47,6 @@ osc: oscillator { #clock-cells = <0>; }; - sdhci_clk: sdhci-clock { - compatible = "fixed-clock"; - clock-frequency = <375000000>; - clock-output-names = "sdhci_clk"; - #clock-cells = <0>; - }; - soc { compatible = "simple-bus"; interrupt-parent = <&plic>; @@ -298,8 +291,9 @@ sdhci0: mmc@4310000 { compatible = "sophgo,cv1800b-dwcmshc"; reg = <0x4310000 0x1000>; interrupts = <36 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&sdhci_clk>; - clock-names = "core"; + clocks = <&clk CLK_AXI4_SD0>, + <&clk CLK_SD0>; + clock-names = "core", "bus"; status = "disabled"; };
As the clk patch is merged, Use real clocks for sdhci0. Signed-off-by: Inochi Amaoto <inochiama@outlook.com> --- arch/riscv/boot/dts/sophgo/cv18xx.dtsi | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) -- 2.44.0