| Message ID | 20210220121416.15215-5-nicolas@debian.org |
|---|---|
| State | Deferred |
| Delegated to: | Andre Przywara |
| Headers | show |
| Series | arm: dts: sun50i-a64-pinephone: fix random wifi mac address | expand |
On 20/02/2021 12:14, Nicolas Boulenguez wrote: > From: Arnaud Ferraris <arnaud.ferraris@collabora.com> > > The wi-fi mac-address was previously changing at every reboot. This is already part of the kernel .dtsi, which we will sync anyway (with the new merge window). So we can drop this specific patch. Cheers, Andre > > --- > arch/arm/dts/sun50i-a64-pinephone.dtsi | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/arch/arm/dts/sun50i-a64-pinephone.dtsi b/arch/arm/dts/sun50i-a64-pinephone.dtsi > index 25150aba74..86d55e38d8 100644 > --- a/arch/arm/dts/sun50i-a64-pinephone.dtsi > +++ b/arch/arm/dts/sun50i-a64-pinephone.dtsi > @@ -14,6 +14,7 @@ > / { > aliases { > serial0 = &uart0; > + ethernet0 = &rtl8723cs; > }; > > backlight: backlight { > @@ -49,6 +50,13 @@ > }; > }; > > + reg_vbat_wifi: vbat-wifi { > + compatible = "regulator-fixed"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-name = "vbat-wifi"; > + }; > + > speaker_amp: audio-amplifier { > compatible = "simple-audio-amplifier"; > enable-gpios = <&pio 2 7 GPIO_ACTIVE_HIGH>; /* PC7 */ > @@ -195,6 +203,20 @@ > status = "okay"; > }; > > +&mmc1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc1_pins>; > + vmmc-supply = <®_vbat_wifi>; > + vqmmc-supply = <®_dldo4>; > + bus-width = <4>; > + non-removable; > + status = "okay"; > + > + rtl8723cs: wifi@1 { > + reg = <1>; > + }; > +}; > + > &mmc2 { > pinctrl-names = "default"; > pinctrl-0 = <&mmc2_pins>; >
diff --git a/arch/arm/dts/sun50i-a64-pinephone.dtsi b/arch/arm/dts/sun50i-a64-pinephone.dtsi index 25150aba74..86d55e38d8 100644 --- a/arch/arm/dts/sun50i-a64-pinephone.dtsi +++ b/arch/arm/dts/sun50i-a64-pinephone.dtsi @@ -14,6 +14,7 @@ / { aliases { serial0 = &uart0; + ethernet0 = &rtl8723cs; }; backlight: backlight { @@ -49,6 +50,13 @@ }; }; + reg_vbat_wifi: vbat-wifi { + compatible = "regulator-fixed"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vbat-wifi"; + }; + speaker_amp: audio-amplifier { compatible = "simple-audio-amplifier"; enable-gpios = <&pio 2 7 GPIO_ACTIVE_HIGH>; /* PC7 */ @@ -195,6 +203,20 @@ status = "okay"; }; +&mmc1 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pins>; + vmmc-supply = <®_vbat_wifi>; + vqmmc-supply = <®_dldo4>; + bus-width = <4>; + non-removable; + status = "okay"; + + rtl8723cs: wifi@1 { + reg = <1>; + }; +}; + &mmc2 { pinctrl-names = "default"; pinctrl-0 = <&mmc2_pins>;
From: Arnaud Ferraris <arnaud.ferraris@collabora.com> The wi-fi mac-address was previously changing at every reboot. --- arch/arm/dts/sun50i-a64-pinephone.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)