[PATCH v4 3/4] riscv: dts: starfive: Add mmc node

[William Qiu]

On 2023/2/15 20:22, Emil Renner Berthing wrote:
> On Wed, 15 Feb 2023 at 13:12, Emil Renner Berthing
> <emil.renner.berthing at canonical.com> wrote:
>>
>> On Wed, 15 Feb 2023 at 12:35, William Qiu <william.qiu at starfivetech.com> wrote:
>> >
>> > Add the mmc node for the StarFive JH7110 SoC.
>> > Set mmco node to emmc and set mmc1 node to sd.
>> >
>> > Signed-off-by: William Qiu <william.qiu at starfivetech.com>
>> > ---
>> >  .../jh7110-starfive-visionfive-2.dtsi         | 23 +++++++++
>> >  arch/riscv/boot/dts/starfive/jh7110.dtsi      | 47 +++++++++++++++++++
>> >  2 files changed, 70 insertions(+)
>> >
>> > 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 c60280b89c73..e1a0248e907f 100644
>> > --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
>> > +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
>> > @@ -42,6 +42,29 @@ &rtc_osc {
>> >         clock-frequency = <32768>;
>> >  };
>> >
>> > +&mmc0 {
>> > +       max-frequency = <100000000>;
>> > +       bus-width = <8>;
>> > +       cap-mmc-highspeed;
>> > +       mmc-ddr-1_8v;
>> > +       mmc-hs200-1_8v;
>> > +       non-removable;
>> > +       cap-mmc-hw-reset;
>> > +       post-power-on-delay-ms = <200>;
>> > +       status = "okay";
>> > +};
>> > +
>> > +&mmc1 {
>> > +       max-frequency = <100000000>;
>> > +       bus-width = <4>;
>> > +       no-sdio;
>> > +       no-mmc;
>> > +       broken-cd;
>> > +       cap-sd-highspeed;
>> > +       post-power-on-delay-ms = <200>;
>> > +       status = "okay";
>> > +};
> 
> These nodes are also still oddly placed in the middle of the external
> clocks. Again please keep the external clocks at the top and then
> order the nodes alphabetically to have some sort of system.
> 


Hi Emil,

I'll update it in next version.

Best Regards
William

>> >  &gmac0_rmii_refin {
>> >         clock-frequency = <50000000>;
>> >  };
>> > diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi
>> > index 64d260ea1f29..17f7b3ee6ca3 100644
>> > --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi
>> > +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi
>> > @@ -314,6 +314,11 @@ uart2: serial at 10020000 {
>> >                         status = "disabled";
>> >                 };
>> >
>> > +               stg_syscon: syscon at 10240000 {
>> > +                       compatible = "starfive,jh7110-stg-syscon", "syscon";
>> > +                       reg = <0x0 0x10240000 0x0 0x1000>;
>> > +               };
>> > +
>> >                 uart3: serial at 12000000 {
>> >                         compatible = "snps,dw-apb-uart";
>> >                         reg = <0x0 0x12000000 0x0 0x10000>;
>> > @@ -370,6 +375,11 @@ syscrg: clock-controller at 13020000 {
>> >                         #reset-cells = <1>;
>> >                 };
>> >
>> > +               sys_syscon: syscon at 13030000 {
>> > +                       compatible = "starfive,jh7110-sys-syscon", "syscon";
>> > +                       reg = <0x0 0x13030000 0x0 0x1000>;
>> > +               };
>> > +
>> >                 gpio: gpio at 13040000 {
>> >                         compatible = "starfive,jh7110-sys-pinctrl";
>> >                         reg = <0x0 0x13040000 0x0 0x10000>;
>> > @@ -397,6 +407,11 @@ aoncrg: clock-controller at 17000000 {
>> >                         #reset-cells = <1>;
>> >                 };
>> >
>> > +               aon_syscon: syscon at 17010000 {
>> > +                       compatible = "starfive,jh7110-aon-syscon", "syscon";
>> > +                       reg = <0x0 0x17010000 0x0 0x1000>;
>> > +               };
>> > +
>> >                 gpioa: gpio at 17020000 {
>> >                         compatible = "starfive,jh7110-aon-pinctrl";
>> >                         reg = <0x0 0x17020000 0x0 0x10000>;
>> > @@ -407,5 +422,37 @@ gpioa: gpio at 17020000 {
>> >                         gpio-controller;
>> >                         #gpio-cells = <2>;
>> >                 };
>> > +
>> > +               mmc0: mmc at 16010000 {
>> > +                       compatible = "starfive,jh7110-mmc";
>> > +                       reg = <0x0 0x16010000 0x0 0x10000>;
>> > +                       clocks = <&syscrg JH7110_SYSCLK_SDIO0_AHB>,
>> > +                                <&syscrg JH7110_SYSCLK_SDIO0_SDCARD>;
>> > +                       clock-names = "biu","ciu";
>> > +                       resets = <&syscrg JH7110_SYSRST_SDIO0_AHB>;
>> > +                       reset-names = "reset";
>> > +                       interrupts = <74>;
>> > +                       fifo-depth = <32>;
>> > +                       fifo-watermark-aligned;
>> > +                       data-addr = <0>;
>> > +                       starfive,sysreg = <&sys_syscon 0x14 0x1a 0x7c000000>;
>> > +                       status = "disabled";
>> > +               };
>> > +
>> > +               mmc1: mmc at 16020000 {
>> > +                       compatible = "starfive,jh7110-mmc";
>> > +                       reg = <0x0 0x16020000 0x0 0x10000>;
>> > +                       clocks = <&syscrg JH7110_SYSCLK_SDIO1_AHB>,
>> > +                                <&syscrg JH7110_SYSCLK_SDIO1_SDCARD>;
>> > +                       clock-names = "biu","ciu";
>> > +                       resets = <&syscrg JH7110_SYSRST_SDIO1_AHB>;
>> > +                       reset-names = "reset";
>> > +                       interrupts = <75>;
>> > +                       fifo-depth = <32>;
>> > +                       fifo-watermark-aligned;
>> > +                       data-addr = <0>;
>> > +                       starfive,sysreg = <&sys_syscon 0x9c 0x1 0x3e>;
>> > +                       status = "disabled";
>> > +               };
>>
>> Hi William,
>>
>> These nodes still don't seem to be sorted by address, eg. by the
>> number after the @
>> Also please move the dt-binding patch before this one, so dtb_check
>> won't fail no matter where git bisect happens to land.
>>
>> /Emil
>>
>> >         };
>> >  };
>> > --
>> > 2.34.1
>> >
>> >
>> > _______________________________________________
>> > linux-riscv mailing list
>> > linux-riscv at lists.infradead.org
>> > http://lists.infradead.org/mailman/listinfo/linux-riscv