Message ID | 20230604145642.200577-6-paul@crapouillou.net (mailing list archive) |
---|---|
State | Accepted |
Commit | 5fe60d3b680106109fd5c8b5270ef83f076b0c65 |
Headers | show |
Series | MIPS: CI20: Add WiFi / Bluetooth support | expand |
Please find a more useful subject. > Am 04.06.2023 um 16:56 schrieb Paul Cercueil <paul@crapouillou.net>: > > - Use the standard "ecc-engine" property instead of the custom > "ingenic,bch-controller" to get a handle to the BCH controller. > > - Respect cell sizes in the Ethernet controller node. > > - Use proper macro for interrupt type instead of hardcoding magic > values. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > --- > arch/mips/boot/dts/ingenic/ci20.dts | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts > index 7f6e7a4e3915..b7dbafa1f85d 100644 > --- a/arch/mips/boot/dts/ingenic/ci20.dts > +++ b/arch/mips/boot/dts/ingenic/ci20.dts > @@ -356,7 +356,7 @@ nandc: nand-controller@1 { > #address-cells = <1>; > #size-cells = <0>; > > - ingenic,bch-controller = <&bch>; > + ecc-engine = <&bch>; > > ingenic,nemc-tAS = <10>; > ingenic,nemc-tAH = <5>; > @@ -422,8 +422,8 @@ dm9000@6 { > pinctrl-names = "default"; > pinctrl-0 = <&pins_nemc_cs6>; > > - reg = <6 0 1 /* addr */ > - 6 2 1>; /* data */ > + reg = <6 0 1>, /* addr */ > + <6 2 1>; /* data */ > > ingenic,nemc-tAS = <15>; > ingenic,nemc-tAH = <10>; > @@ -435,7 +435,7 @@ dm9000@6 { > vcc-supply = <ð0_power>; > > interrupt-parent = <&gpe>; > - interrupts = <19 4>; > + interrupts = <19 IRQ_TYPE_EDGE_RISING>; > > nvmem-cells = <ð0_addr>; > nvmem-cell-names = "mac-address"; For better bisecting it would be helpful to split this into 3 patches. And they are not really related to WiFi/Bluetooth.
diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts index 7f6e7a4e3915..b7dbafa1f85d 100644 --- a/arch/mips/boot/dts/ingenic/ci20.dts +++ b/arch/mips/boot/dts/ingenic/ci20.dts @@ -356,7 +356,7 @@ nandc: nand-controller@1 { #address-cells = <1>; #size-cells = <0>; - ingenic,bch-controller = <&bch>; + ecc-engine = <&bch>; ingenic,nemc-tAS = <10>; ingenic,nemc-tAH = <5>; @@ -422,8 +422,8 @@ dm9000@6 { pinctrl-names = "default"; pinctrl-0 = <&pins_nemc_cs6>; - reg = <6 0 1 /* addr */ - 6 2 1>; /* data */ + reg = <6 0 1>, /* addr */ + <6 2 1>; /* data */ ingenic,nemc-tAS = <15>; ingenic,nemc-tAH = <10>; @@ -435,7 +435,7 @@ dm9000@6 { vcc-supply = <ð0_power>; interrupt-parent = <&gpe>; - interrupts = <19 4>; + interrupts = <19 IRQ_TYPE_EDGE_RISING>; nvmem-cells = <ð0_addr>; nvmem-cell-names = "mac-address";
- Use the standard "ecc-engine" property instead of the custom "ingenic,bch-controller" to get a handle to the BCH controller. - Respect cell sizes in the Ethernet controller node. - Use proper macro for interrupt type instead of hardcoding magic values. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- arch/mips/boot/dts/ingenic/ci20.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)