Describe wifi node for exynos5420-chagall-wifi and
exynos5420-klimt-wifi, and cleanup their dtsi to accurately describe
available memory and adhere to the DTS Coding Style document.
Signed-off-by: Henrik Grimler <[email protected]>
---
Henrik Grimler (3):
ARM: dts: samsung: exynos5420-galaxy-tab-common: sort node properties
ARM: dts: samsung: exynos5420-galaxy-tab-common: add wifi node
ARM: dts: samsung: exynos5420-galaxy-tab-common: decrease available memory
.../dts/samsung/exynos5420-galaxy-tab-common.dtsi | 57 +++++++++++++++++-----
1 file changed, 44 insertions(+), 13 deletions(-)
---
base-commit: 497b447cf89b87c8fb0d0b27994258ed18ac355e
change-id: 20231210-galaxy-tab-s-cleanup-14da98b23606
Best regards,
--
Henrik Grimler <[email protected]>
By using brcm/brcmfmac4354-sdio.bin from linux-firmware together with
nvram.txt from vendor firmware wifi works well on the chagall-wifi and
klimt-lte.
Signed-off-by: Henrik Grimler <[email protected]>
---
.../dts/samsung/exynos5420-galaxy-tab-common.dtsi | 32 ++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi b/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi
index 0c1aeafc025b..d569fac29b18 100644
--- a/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi
+++ b/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi
@@ -30,6 +30,7 @@ / {
aliases {
mmc0 = &mmc_0;
+ mmc1 = &mmc_1;
mmc2 = &mmc_2;
};
@@ -87,6 +88,13 @@ key-volume-down {
linux,code = <KEY_VOLUMEDOWN>;
};
};
+
+ mmc1_pwrseq: pwrseq {
+ compatible = "mmc-pwrseq-simple";
+ reset-gpios = <&gpy7 7 GPIO_ACTIVE_LOW>;
+ clocks = <&s2mps11_osc S2MPS11_CLK_BT>;
+ clock-names = "ext_clock";
+ };
};
&cci {
@@ -619,6 +627,25 @@ &mmc_0 {
status = "okay";
};
+/* WiFi */
+&mmc_1 {
+ bus-width = <4>;
+ cap-sd-highspeed;
+ cap-sdio-irq;
+ card-detect-delay = <200>;
+ keep-power-in-suspend;
+ mmc-pwrseq = <&mmc1_pwrseq>;
+ non-removable;
+ pinctrl-0 = <&sd1_clk>, <&sd1_cmd>, <&sd1_int>, <&sd1_bus1>,
+ <&sd1_bus4>, <&wifi_en>;
+ pinctrl-names = "default";
+ vqmmc-supply = <&ldo2_reg>;
+ samsung,dw-mshc-ciu-div = <1>;
+ samsung,dw-mshc-ddr-timing = <0 2>;
+ samsung,dw-mshc-sdr-timing = <0 1>;
+ status = "okay";
+};
+
/* External sdcard */
&mmc_2 {
bus-width = <4>;
@@ -648,6 +675,11 @@ s2mps11_irq: s2mps11-irq-pins {
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
};
+
+ wifi_en: wifi-en-pins {
+ samsung,pins = "gpy7-7";
+ samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+ };
};
&rtc {
--
2.30.2
Sort all node properties according to dts coding style guidelines, to
make dtsi easier to follow.
Signed-off-by: Henrik Grimler <[email protected]>
---
.../dts/samsung/exynos5420-galaxy-tab-common.dtsi | 23 +++++++++++-----------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi b/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi
index f525b2f5e4e0..0c1aeafc025b 100644
--- a/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi
+++ b/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi
@@ -103,8 +103,8 @@ &cpu4 {
};
&gpu {
- status = "okay";
mali-supply = <&buck4_reg>;
+ status = "okay";
};
&hsi2c_7 {
@@ -113,11 +113,10 @@ &hsi2c_7 {
pmic@66 {
compatible = "samsung,s2mps11-pmic";
reg = <0x66>;
-
interrupt-parent = <&gpx3>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
- pinctrl-names = "default";
pinctrl-0 = <&s2mps11_irq>;
+ pinctrl-names = "default";
s2mps11_osc: clocks {
compatible = "samsung,s2mps11-clk";
@@ -605,7 +604,6 @@ &mixer {
/* Internal storage */
&mmc_0 {
- status = "okay";
bus-width = <8>;
cap-mmc-highspeed;
card-detect-delay = <200>;
@@ -614,27 +612,28 @@ &mmc_0 {
non-removable;
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8>;
pinctrl-names = "default";
+ vqmmc-supply = <&ldo3_reg>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-ddr-timing = <0 2>;
samsung,dw-mshc-sdr-timing = <0 4>;
- vqmmc-supply = <&ldo3_reg>;
+ status = "okay";
};
/* External sdcard */
&mmc_2 {
- status = "okay";
bus-width = <4>;
cap-sd-highspeed;
card-detect-delay = <200>;
cd-gpios = <&gpx2 4 GPIO_ACTIVE_LOW>;
pinctrl-0 = <&sd2_clk &sd2_cmd &mmc2_cd &sd2_bus1 &sd2_bus4>;
pinctrl-names = "default";
- samsung,dw-mshc-ciu-div = <3>;
- samsung,dw-mshc-ddr-timing = <0 2>;
- samsung,dw-mshc-sdr-timing = <0 4>;
sd-uhs-sdr50;
vmmc-supply = <&ldo19_reg>;
vqmmc-supply = <&ldo13_reg>;
+ samsung,dw-mshc-ciu-div = <3>;
+ samsung,dw-mshc-ddr-timing = <0 2>;
+ samsung,dw-mshc-sdr-timing = <0 4>;
+ status = "okay";
};
&pinctrl_0 {
@@ -652,9 +651,9 @@ s2mps11_irq: s2mps11-irq-pins {
};
&rtc {
- status = "okay";
clocks = <&clock CLK_RTC>, <&s2mps11_osc S2MPS11_CLK_AP>;
clock-names = "rtc", "rtc_src";
+ status = "okay";
};
&tmu_cpu0 {
@@ -686,11 +685,11 @@ &usbdrd_dwc3_1 {
};
&usbdrd3_0 {
- vdd33-supply = <&ldo9_reg>;
vdd10-supply = <&ldo11_reg>;
+ vdd33-supply = <&ldo9_reg>;
};
&usbdrd3_1 {
- vdd33-supply = <&ldo9_reg>;
vdd10-supply = <&ldo11_reg>;
+ vdd33-supply = <&ldo9_reg>;
};
--
2.30.2
On 30/01/2024 21:40, Henrik Grimler wrote:
> Sort all node properties according to dts coding style guidelines, to
> make dtsi easier to follow.
>
> Signed-off-by: Henrik Grimler <[email protected]>
> ---
> .../dts/samsung/exynos5420-galaxy-tab-common.dtsi | 23 +++++++++++-----------
> 1 file changed, 11 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi b/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi
> index f525b2f5e4e0..0c1aeafc025b 100644
> --- a/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi
> +++ b/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi
> @@ -103,8 +103,8 @@ &cpu4 {
> };
>
> &gpu {
> - status = "okay";
> mali-supply = <&buck4_reg>;
> + status = "okay";
Such changes should come from a tool, but since we do not have them, I
don't want to bother with properties re-shuffling.
Best regards,
Krzysztof
On 31/01/2024 09:25, Henrik Grimler wrote:
> Hi Krzysztof,
>
> On Wed, Jan 31, 2024 at 08:19:39AM +0100, Krzysztof Kozlowski wrote:
>> On 30/01/2024 21:40, Henrik Grimler wrote:
>>> Sort all node properties according to dts coding style guidelines, to
>>> make dtsi easier to follow.
>>>
>>> Signed-off-by: Henrik Grimler <[email protected]>
>>> ---
>>> .../dts/samsung/exynos5420-galaxy-tab-common.dtsi | 23 +++++++++++-----------
>>> 1 file changed, 11 insertions(+), 12 deletions(-)
>>>
>>> diff --git a/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi b/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi
>>> index f525b2f5e4e0..0c1aeafc025b 100644
>>> --- a/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi
>>> +++ b/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi
>>> @@ -103,8 +103,8 @@ &cpu4 {
>>> };
>>>
>>> &gpu {
>>> - status = "okay";
>>> mali-supply = <&buck4_reg>;
>>> + status = "okay";
>>
>> Such changes should come from a tool, but since we do not have them, I
>> don't want to bother with properties re-shuffling.
>
> Noted, thanks. I will drop this patch and send a v2 in a few hours.
No need for v2, unless some other comments pop up. I will just apply #2
and #3 from this set.
Best regards,
Krzysztof
Hi Krzysztof,
On Wed, Jan 31, 2024 at 08:19:39AM +0100, Krzysztof Kozlowski wrote:
> On 30/01/2024 21:40, Henrik Grimler wrote:
> > Sort all node properties according to dts coding style guidelines, to
> > make dtsi easier to follow.
> >
> > Signed-off-by: Henrik Grimler <[email protected]>
> > ---
> > .../dts/samsung/exynos5420-galaxy-tab-common.dtsi | 23 +++++++++++-----------
> > 1 file changed, 11 insertions(+), 12 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi b/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi
> > index f525b2f5e4e0..0c1aeafc025b 100644
> > --- a/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi
> > +++ b/arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi
> > @@ -103,8 +103,8 @@ &cpu4 {
> > };
> >
> > &gpu {
> > - status = "okay";
> > mali-supply = <&buck4_reg>;
> > + status = "okay";
>
> Such changes should come from a tool, but since we do not have them, I
> don't want to bother with properties re-shuffling.
Noted, thanks. I will drop this patch and send a v2 in a few hours.
> Best regards,
> Krzysztof
Best regards
Henrik Grimler
On 30/01/2024 21:40, Henrik Grimler wrote:
> By using brcm/brcmfmac4354-sdio.bin from linux-firmware together with
> nvram.txt from vendor firmware wifi works well on the chagall-wifi and
> klimt-lte.
>
> Signed-off-by: Henrik Grimler <[email protected]>
> ---
> .../dts/samsung/exynos5420-galaxy-tab-common.dtsi | 32 ++++++++++++++++++++++
> 1 file changed, 32 insertions(+)
This does not apply, maybe because I skipped patch #1. Please resend.
Best regards,
Krzysztof