diff mbox series

ramips: overwrite reset gpio properties in DIR-860L DTS

Message ID 20210213094841.414647-1-foss@volatilesystems.org
State Superseded
Headers show
Series ramips: overwrite reset gpio properties in DIR-860L DTS | expand

Commit Message

Stijn Segers Feb. 13, 2021, 9:48 a.m. UTC
As suggested by Sergio, this adds GPIOs 19 and 8 explicitly into the
DIR-860L DTS, so the PCI-E ports get reset and the N radio (radio1)
on PCI-E port 1 comes up reliably.

Fixes the following error that popped up in dmesg:

    [    1.638942] mt7621-pci 1e140000.pcie: pcie1 no card, disable it (RST & CLK)

Suggested-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
---
 target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Sergio Paracuellos Feb. 13, 2021, 10:01 a.m. UTC | #1
On Sat, Feb 13, 2021 at 10:51 AM Stijn Segers <foss@volatilesystems.org> wrote:
>
> As suggested by Sergio, this adds GPIOs 19 and 8 explicitly into the
> DIR-860L DTS, so the PCI-E ports get reset and the N radio (radio1)
> on PCI-E port 1 comes up reliably.
>
> Fixes the following error that popped up in dmesg:
>
>     [    1.638942] mt7621-pci 1e140000.pcie: pcie1 no card, disable it (RST & CLK)
>
> Suggested-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
> Signed-off-by: Stijn Segers <foss@volatilesystems.org>
> ---
>  target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts | 6 ++++++
>  1 file changed, 6 insertions(+)

Looks good to me:

Reviewed-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Chuanhong Guo Feb. 13, 2021, 10:23 a.m. UTC | #2
Hi!

On Sat, Feb 13, 2021 at 5:55 PM Stijn Segers <foss@volatilesystems.org> wrote:
>
> As suggested by Sergio, this adds GPIOs 19 and 8 explicitly into the
> DIR-860L DTS, so the PCI-E ports get reset and the N radio (radio1)
> on PCI-E port 1 comes up reliably.
>
> Fixes the following error that popped up in dmesg:
>
>     [    1.638942] mt7621-pci 1e140000.pcie: pcie1 no card, disable it (RST & CLK)
>
> Suggested-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
> Signed-off-by: Stijn Segers <foss@volatilesystems.org>
> ---
>  target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
> index 5d1c336736..65d53e4ef4 100644
> --- a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
> +++ b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
> @@ -142,6 +142,12 @@
>  };
>
>  &pcie {
> +       pinctrl-names = "default";

pinctrl-names is already "default" in mt7621.dtsi.

> +       pinctrl-0 = <&pcie_pins>;

pinctrl-0 is already pcie_pins in mt7621.dtsi as well.
I'm fine with just dropping these two lines due to the fact that
we mainly used state_default to set up pinctrl in ramips.
(Ideally a separated pinctrl node with uart3 as gpio should be
defined and referenced here.)

> +
> +       reset-gpios = <&gpio 19 GPIO_ACTIVE_LOW>,
> +                     <&gpio 8 GPIO_ACTIVE_LOW>;
> +
>         status = "okay";
>  };
>
Stijn Segers Feb. 13, 2021, 12:04 p.m. UTC | #3
Hi,

Op zaterdag 13 februari 2021 om 18u23 schreef Chuanhong Guo 
<gch981213@gmail.com>:
> Hi!
> 
> On Sat, Feb 13, 2021 at 5:55 PM Stijn Segers 
> <foss@volatilesystems.org> wrote:
>> 
>>  As suggested by Sergio, this adds GPIOs 19 and 8 explicitly into the
>>  DIR-860L DTS, so the PCI-E ports get reset and the N radio (radio1)
>>  on PCI-E port 1 comes up reliably.
>> 
>>  Fixes the following error that popped up in dmesg:
>> 
>>      [    1.638942] mt7621-pci 1e140000.pcie: pcie1 no card, disable 
>> it (RST & CLK)
>> 
>>  Suggested-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
>>  Signed-off-by: Stijn Segers <foss@volatilesystems.org>
>>  ---
>>   target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts | 6 ++++++
>>   1 file changed, 6 insertions(+)
>> 
>>  diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts 
>> b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
>>  index 5d1c336736..65d53e4ef4 100644
>>  --- a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
>>  +++ b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
>>  @@ -142,6 +142,12 @@
>>   };
>> 
>>   &pcie {
>>  +       pinctrl-names = "default";
> 
> pinctrl-names is already "default" in mt7621.dtsi.
> 
>>  +       pinctrl-0 = <&pcie_pins>;
> 
> pinctrl-0 is already pcie_pins in mt7621.dtsi as well.
> I'm fine with just dropping these two lines due to the fact that
> we mainly used state_default to set up pinctrl in ramips.

Noted, will remove both in v2.

> (Ideally a separated pinctrl node with uart3 as gpio should be
> defined and referenced here.)


Not completely familiar with that, so I looked at other MT7621 DTSes. 
Would this be how it should be done?

 &pinctrl {
         uart3_gpio: uart3-gpio {
                 uart3 {
                         groups = "uart3";
                         function = "gpio";
                 };
         };
 };


Would this still go together with the code below from the DIR-860L DTS 
though? Or would that need adapting as well?

 &state_default {
         gpio {
                 groups = "uart3", "jtag", "wdt";
                 function = "gpio";
         };
 };


Thanks

Stijn


> 
>>  +
>>  +       reset-gpios = <&gpio 19 GPIO_ACTIVE_LOW>,
>>  +                     <&gpio 8 GPIO_ACTIVE_LOW>;
>>  +
>>          status = "okay";
>>   };
>> 
> 
> --
> Regards,
> Chuanhong Guo
Adrian Schmutzler Feb. 13, 2021, 5:03 p.m. UTC | #4
Hi,

 
>  &pcie {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&pcie_pins>;
> +
> +	reset-gpios = <&gpio 19 GPIO_ACTIVE_LOW>,
> +		      <&gpio 8 GPIO_ACTIVE_LOW>;
> +
>  	status = "okay";
>  };

Please add the new content _after_ status=okay and an empty line in your v2.

Best

Adrian

> 
> --
> 2.30.0
> 
> 
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
diff mbox series

Patch

diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
index 5d1c336736..65d53e4ef4 100644
--- a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
@@ -142,6 +142,12 @@ 
 };
 
 &pcie {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pcie_pins>;
+
+	reset-gpios = <&gpio 19 GPIO_ACTIVE_LOW>,
+		      <&gpio 8 GPIO_ACTIVE_LOW>;
+
 	status = "okay";
 };