* Re: [PATCH 0/7] ARM: dts: s5pv210: Bugfixes, features, and improvements
2022-03-22 20:11 [PATCH 0/7] ARM: dts: s5pv210: Bugfixes, features, and improvements Jonathan Bakker
@ 2022-03-22 20:21 ` Jonathan Bakker
2022-03-23 10:52 ` Krzysztof Kozlowski
2022-03-27 18:08 ` [PATCH v2 0/5] " Jonathan Bakker
` (5 subsequent siblings)
6 siblings, 1 reply; 10+ messages in thread
From: Jonathan Bakker @ 2022-03-22 20:21 UTC (permalink / raw)
To: krzk, alim.akhtar
Cc: robh+dt, devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel
Sorry, it appears that I ran into connectivity issues part way through sending
the patchset. Should I resend the entire series or is there a way to get
git send-email to retry/continue?
Thanks,
Jonathan
On 2022-03-22 1:11 p.m., Jonathan Bakker wrote:
> Various cleanups to fix warnings when running make dtbs_check are included,
> as are bugfixes for the panel CS pin and bluetooth interrupt name on Aries.
>
> The new feature is charging support for Aries board, note that the galaxys
> (i9000) and fascinate4g (SGH-T959P) have slightly different batteries,
> and so the DTS can't be shared.
>
> Jonathan Bakker (7):
> ARM: dts: s5pv210: Split memory nodes to match spec
> ARM: dts: s5pv210: Adjust I2S entries to match spec
> ARM: dts: s5pv210: Adjust DMA node names to match spec
> ARM: dts: s5pv210: Remove spi-cs-high on panel in Aries
> ARM: dts: s5pv210: Correct interrupt name for bluetooth in Aries
> ARM: dts: s5pv210: Add charger regulator to max8998 in Aries
> ARM: dts: s5pv210: Add charger support in Aries
>
> arch/arm/boot/dts/s5pv210-aquila.dts | 8 +-
> arch/arm/boot/dts/s5pv210-aries.dtsi | 25 +++-
> arch/arm/boot/dts/s5pv210-fascinate4g.dts | 162 ++++++++++++++++++++++
> arch/arm/boot/dts/s5pv210-galaxys.dts | 144 +++++++++++++++++++
> arch/arm/boot/dts/s5pv210-goni.dts | 14 +-
> arch/arm/boot/dts/s5pv210.dtsi | 24 ++--
> 6 files changed, 354 insertions(+), 23 deletions(-)
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/7] ARM: dts: s5pv210: Bugfixes, features, and improvements
2022-03-22 20:21 ` Jonathan Bakker
@ 2022-03-23 10:52 ` Krzysztof Kozlowski
0 siblings, 0 replies; 10+ messages in thread
From: Krzysztof Kozlowski @ 2022-03-23 10:52 UTC (permalink / raw)
To: Jonathan Bakker, alim.akhtar
Cc: robh+dt, devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel
On 22/03/2022 21:21, Jonathan Bakker wrote:
> Sorry, it appears that I ran into connectivity issues part way through sending
> the patchset. Should I resend the entire series or is there a way to get
> git send-email to retry/continue?
With git send-email you can always send remaining patches with
--no-thread and --in-reply-to=XXX, providing valid message ID.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 0/5] ARM: dts: s5pv210: Bugfixes, features, and improvements
2022-03-22 20:11 [PATCH 0/7] ARM: dts: s5pv210: Bugfixes, features, and improvements Jonathan Bakker
2022-03-22 20:21 ` Jonathan Bakker
@ 2022-03-27 18:08 ` Jonathan Bakker
2022-04-09 16:52 ` Krzysztof Kozlowski
2022-03-27 18:08 ` [PATCH v2 1/5] ARM: dts: s5pv210: Remove spi-cs-high on panel in Aries Jonathan Bakker
` (4 subsequent siblings)
6 siblings, 1 reply; 10+ messages in thread
From: Jonathan Bakker @ 2022-03-27 18:08 UTC (permalink / raw)
To: krzk, alim.akhtar
Cc: robh+dt, devicetree, linux-arm-kernel, linux-samsung-soc,
linux-kernel, Jonathan Bakker
Various cleanups to fix warnings when running make dtbs_check are included,
as are bugfixes for the panel CS pin and bluetooth interrupt name on Aries.
Changes in v2:
- Re-ordered patches to include bugfixes at start
- CC Stable where appropriate
- Drop sound-dai-cells changes
- Drop charger-manager and related changes
- Adjust memory reg entries commit to retain one node per device
Jonathan Bakker (4):
ARM: dts: s5pv210: Remove spi-cs-high on panel in Aries
ARM: dts: s5pv210: Correct interrupt name for bluetooth in Aries
ARM: dts: s5pv210: Adjust memory reg entries to match spec
ARM: dts: s5pv210: Adjust DMA node names to match spec
Krzysztof Kozlowski (1):
ARM: dts: s5pv210: align DMA channels with dtschema
arch/arm/boot/dts/s5pv210-aquila.dts | 3 +--
arch/arm/boot/dts/s5pv210-aries.dtsi | 11 +++++------
arch/arm/boot/dts/s5pv210-goni.dts | 6 +++---
arch/arm/boot/dts/s5pv210.dtsi | 18 +++++++++---------
4 files changed, 18 insertions(+), 20 deletions(-)
--
2.20.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/5] ARM: dts: s5pv210: Bugfixes, features, and improvements
2022-03-27 18:08 ` [PATCH v2 0/5] " Jonathan Bakker
@ 2022-04-09 16:52 ` Krzysztof Kozlowski
0 siblings, 0 replies; 10+ messages in thread
From: Krzysztof Kozlowski @ 2022-04-09 16:52 UTC (permalink / raw)
To: krzk, alim.akhtar, Jonathan Bakker
Cc: Krzysztof Kozlowski, linux-arm-kernel, linux-samsung-soc,
devicetree, robh+dt, linux-kernel
On Sun, 27 Mar 2022 11:08:49 -0700, Jonathan Bakker wrote:
> Various cleanups to fix warnings when running make dtbs_check are included,
> as are bugfixes for the panel CS pin and bluetooth interrupt name on Aries.
>
> Changes in v2:
> - Re-ordered patches to include bugfixes at start
> - CC Stable where appropriate
> - Drop sound-dai-cells changes
> - Drop charger-manager and related changes
> - Adjust memory reg entries commit to retain one node per device
>
> [...]
Applied, thanks!
[1/5] ARM: dts: s5pv210: Remove spi-cs-high on panel in Aries
commit: 096f58507374e1293a9e9cff8a1ccd5f37780a20
[2/5] ARM: dts: s5pv210: Correct interrupt name for bluetooth in Aries
commit: 3f5e3d3a8b895c8a11da8b0063ba2022dd9e2045
[3/5] ARM: dts: s5pv210: Adjust memory reg entries to match spec
commit: 9576ec12261c4b639cd802fd9c13e3c9605165da
[4/5] ARM: dts: s5pv210: Adjust DMA node names to match spec
commit: 21e4b7d151af9a3191fb251e2b4044e361a56102
[5/5] ARM: dts: s5pv210: align DMA channels with dtschema
commit: 9e916fb9bc3d16066286f19fc9c51d26a6aec6bd
Best regards,
--
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 1/5] ARM: dts: s5pv210: Remove spi-cs-high on panel in Aries
2022-03-22 20:11 [PATCH 0/7] ARM: dts: s5pv210: Bugfixes, features, and improvements Jonathan Bakker
2022-03-22 20:21 ` Jonathan Bakker
2022-03-27 18:08 ` [PATCH v2 0/5] " Jonathan Bakker
@ 2022-03-27 18:08 ` Jonathan Bakker
2022-03-27 18:08 ` [PATCH v2 2/5] ARM: dts: s5pv210: Correct interrupt name for bluetooth " Jonathan Bakker
` (3 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Jonathan Bakker @ 2022-03-27 18:08 UTC (permalink / raw)
To: krzk, alim.akhtar
Cc: robh+dt, devicetree, linux-arm-kernel, linux-samsung-soc,
linux-kernel, Jonathan Bakker, Stable
Since commit 766c6b63aa04 ("spi: fix client driver breakages when using
GPIO descriptors"), the panel has been blank due to an inverted CS GPIO.
In order to correct this, drop the spi-cs-high from the panel SPI device.
Fixes: 766c6b63aa04 ("spi: fix client driver breakages when using GPIO descriptors")
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
---
Changes in v2
- CC Stable
- Put bugfix at start of series
---
arch/arm/boot/dts/s5pv210-aries.dtsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/boot/dts/s5pv210-aries.dtsi b/arch/arm/boot/dts/s5pv210-aries.dtsi
index 160f8cd9a68d..740036a61c8e 100644
--- a/arch/arm/boot/dts/s5pv210-aries.dtsi
+++ b/arch/arm/boot/dts/s5pv210-aries.dtsi
@@ -564,7 +564,6 @@
reset-gpios = <&mp05 5 GPIO_ACTIVE_LOW>;
vdd3-supply = <&ldo7_reg>;
vci-supply = <&ldo17_reg>;
- spi-cs-high;
spi-max-frequency = <1200000>;
pinctrl-names = "default";
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 2/5] ARM: dts: s5pv210: Correct interrupt name for bluetooth in Aries
2022-03-22 20:11 [PATCH 0/7] ARM: dts: s5pv210: Bugfixes, features, and improvements Jonathan Bakker
` (2 preceding siblings ...)
2022-03-27 18:08 ` [PATCH v2 1/5] ARM: dts: s5pv210: Remove spi-cs-high on panel in Aries Jonathan Bakker
@ 2022-03-27 18:08 ` Jonathan Bakker
2022-03-27 18:08 ` [PATCH v2 3/5] ARM: dts: s5pv210: Adjust memory reg entries to match spec Jonathan Bakker
` (2 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Jonathan Bakker @ 2022-03-27 18:08 UTC (permalink / raw)
To: krzk, alim.akhtar
Cc: robh+dt, devicetree, linux-arm-kernel, linux-samsung-soc,
linux-kernel, Jonathan Bakker, Stable
Correct the name of the bluetooth interrupt from host-wake to
host-wakeup.
Fixes: 1c65b6184441b ("ARM: dts: s5pv210: Correct BCM4329 bluetooth node")
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
---
Changes in v2
- CC Stable
- Correct Fixes tag by adding commit message
- Re-ordered bugfix to start of patchset
---
arch/arm/boot/dts/s5pv210-aries.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/s5pv210-aries.dtsi b/arch/arm/boot/dts/s5pv210-aries.dtsi
index 740036a61c8e..cbd378ac4e18 100644
--- a/arch/arm/boot/dts/s5pv210-aries.dtsi
+++ b/arch/arm/boot/dts/s5pv210-aries.dtsi
@@ -894,7 +894,7 @@
device-wakeup-gpios = <&gpg3 4 GPIO_ACTIVE_HIGH>;
interrupt-parent = <&gph2>;
interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
- interrupt-names = "host-wake";
+ interrupt-names = "host-wakeup";
};
};
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 3/5] ARM: dts: s5pv210: Adjust memory reg entries to match spec
2022-03-22 20:11 [PATCH 0/7] ARM: dts: s5pv210: Bugfixes, features, and improvements Jonathan Bakker
` (3 preceding siblings ...)
2022-03-27 18:08 ` [PATCH v2 2/5] ARM: dts: s5pv210: Correct interrupt name for bluetooth " Jonathan Bakker
@ 2022-03-27 18:08 ` Jonathan Bakker
2022-03-27 18:08 ` [PATCH v2 4/5] ARM: dts: s5pv210: Adjust DMA node names " Jonathan Bakker
2022-03-27 18:08 ` [PATCH v2 5/5] ARM: dts: s5pv210: align DMA channels with dtschema Jonathan Bakker
6 siblings, 0 replies; 10+ messages in thread
From: Jonathan Bakker @ 2022-03-27 18:08 UTC (permalink / raw)
To: krzk, alim.akhtar
Cc: robh+dt, devicetree, linux-arm-kernel, linux-samsung-soc,
linux-kernel, Jonathan Bakker
The reg property of memory nodes should have pairs of offset, size;
not all memory banks lumped in as one.
Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
---
Changes in v2
- Adjusted so that there is still one memory node, but the reg
entries are split into multiple pairs rather than having multiple
memory nodes
---
arch/arm/boot/dts/s5pv210-aquila.dts | 3 +--
arch/arm/boot/dts/s5pv210-aries.dtsi | 6 +++---
arch/arm/boot/dts/s5pv210-goni.dts | 6 +++---
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/s5pv210-aquila.dts b/arch/arm/boot/dts/s5pv210-aquila.dts
index 6423348034b6..79014a624e4a 100644
--- a/arch/arm/boot/dts/s5pv210-aquila.dts
+++ b/arch/arm/boot/dts/s5pv210-aquila.dts
@@ -29,8 +29,7 @@
memory@30000000 {
device_type = "memory";
- reg = <0x30000000 0x05000000
- 0x40000000 0x18000000>;
+ reg = <0x30000000 0x05000000>, <0x40000000 0x18000000>;
};
pmic_ap_clk: clock-0 {
diff --git a/arch/arm/boot/dts/s5pv210-aries.dtsi b/arch/arm/boot/dts/s5pv210-aries.dtsi
index cbd378ac4e18..116c507da028 100644
--- a/arch/arm/boot/dts/s5pv210-aries.dtsi
+++ b/arch/arm/boot/dts/s5pv210-aries.dtsi
@@ -24,9 +24,9 @@
memory@30000000 {
device_type = "memory";
- reg = <0x30000000 0x05000000
- 0x40000000 0x10000000
- 0x50000000 0x08000000>;
+ reg = <0x30000000 0x05000000>,
+ <0x40000000 0x10000000>,
+ <0x50000000 0x08000000>;
};
reserved-memory {
diff --git a/arch/arm/boot/dts/s5pv210-goni.dts b/arch/arm/boot/dts/s5pv210-goni.dts
index c6f39147cb96..d32f42dd1bf5 100644
--- a/arch/arm/boot/dts/s5pv210-goni.dts
+++ b/arch/arm/boot/dts/s5pv210-goni.dts
@@ -30,9 +30,9 @@
memory@30000000 {
device_type = "memory";
- reg = <0x30000000 0x05000000
- 0x40000000 0x10000000
- 0x50000000 0x08000000>;
+ reg = <0x30000000 0x05000000>,
+ <0x40000000 0x10000000>,
+ <0x50000000 0x08000000>;
};
pmic_ap_clk: clock-0 {
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 4/5] ARM: dts: s5pv210: Adjust DMA node names to match spec
2022-03-22 20:11 [PATCH 0/7] ARM: dts: s5pv210: Bugfixes, features, and improvements Jonathan Bakker
` (4 preceding siblings ...)
2022-03-27 18:08 ` [PATCH v2 3/5] ARM: dts: s5pv210: Adjust memory reg entries to match spec Jonathan Bakker
@ 2022-03-27 18:08 ` Jonathan Bakker
2022-03-27 18:08 ` [PATCH v2 5/5] ARM: dts: s5pv210: align DMA channels with dtschema Jonathan Bakker
6 siblings, 0 replies; 10+ messages in thread
From: Jonathan Bakker @ 2022-03-27 18:08 UTC (permalink / raw)
To: krzk, alim.akhtar
Cc: robh+dt, devicetree, linux-arm-kernel, linux-samsung-soc,
linux-kernel, Jonathan Bakker
DMA node names should be dma-controller according to the DT spec,
so rename them from pdma/mdma. Prevents warnings when running
make dtbs_check
Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
---
arch/arm/boot/dts/s5pv210.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/s5pv210.dtsi b/arch/arm/boot/dts/s5pv210.dtsi
index 353ba7b09a0c..0bccfb9d0c0e 100644
--- a/arch/arm/boot/dts/s5pv210.dtsi
+++ b/arch/arm/boot/dts/s5pv210.dtsi
@@ -117,7 +117,7 @@
};
};
- pdma0: dma@e0900000 {
+ pdma0: dma-controller@e0900000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0xe0900000 0x1000>;
interrupt-parent = <&vic0>;
@@ -129,7 +129,7 @@
#dma-requests = <32>;
};
- pdma1: dma@e0a00000 {
+ pdma1: dma-controller@e0a00000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0xe0a00000 0x1000>;
interrupt-parent = <&vic0>;
@@ -528,7 +528,7 @@
clock-names = "sclk_fimg2d", "fimg2d";
};
- mdma1: mdma@fa200000 {
+ mdma1: dma-controller@fa200000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0xfa200000 0x1000>;
interrupt-parent = <&vic0>;
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 5/5] ARM: dts: s5pv210: align DMA channels with dtschema
2022-03-22 20:11 [PATCH 0/7] ARM: dts: s5pv210: Bugfixes, features, and improvements Jonathan Bakker
` (5 preceding siblings ...)
2022-03-27 18:08 ` [PATCH v2 4/5] ARM: dts: s5pv210: Adjust DMA node names " Jonathan Bakker
@ 2022-03-27 18:08 ` Jonathan Bakker
6 siblings, 0 replies; 10+ messages in thread
From: Jonathan Bakker @ 2022-03-27 18:08 UTC (permalink / raw)
To: krzk, alim.akhtar
Cc: robh+dt, devicetree, linux-arm-kernel, linux-samsung-soc,
linux-kernel, Jonathan Bakker
From: Krzysztof Kozlowski <krzk@kernel.org>
dtschema expects DMA channels in specific order (tx, rx and tx-sec).
The order actually should not matter because dma-names is used however
let's make it aligned with dtschema to suppress warnings like:
i2s@eee30000: dma-names: ['rx', 'tx', 'tx-sec'] is not valid under any of the given schemas
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Co-developed-by: Jonathan Bakker <xc-racer2@live.ca>
Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
---
Changes in v2:
- Use pre-existing patch from Krzysztof, adding change to s5pv210-aries.dtsi
which makes it continue to work
- Drop changes to the sound-dai-cells
---
arch/arm/boot/dts/s5pv210-aries.dtsi | 2 +-
arch/arm/boot/dts/s5pv210.dtsi | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/s5pv210-aries.dtsi b/arch/arm/boot/dts/s5pv210-aries.dtsi
index 116c507da028..8f37e34d08a4 100644
--- a/arch/arm/boot/dts/s5pv210-aries.dtsi
+++ b/arch/arm/boot/dts/s5pv210-aries.dtsi
@@ -635,7 +635,7 @@
};
&i2s0 {
- dmas = <&pdma0 9>, <&pdma0 10>, <&pdma0 11>;
+ dmas = <&pdma0 10>, <&pdma0 9>, <&pdma0 11>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/s5pv210.dtsi b/arch/arm/boot/dts/s5pv210.dtsi
index 0bccfb9d0c0e..6a22b899e21d 100644
--- a/arch/arm/boot/dts/s5pv210.dtsi
+++ b/arch/arm/boot/dts/s5pv210.dtsi
@@ -239,8 +239,8 @@
reg = <0xeee30000 0x1000>;
interrupt-parent = <&vic2>;
interrupts = <16>;
- dma-names = "rx", "tx", "tx-sec";
- dmas = <&pdma1 9>, <&pdma1 10>, <&pdma1 11>;
+ dma-names = "tx", "rx", "tx-sec";
+ dmas = <&pdma1 10>, <&pdma1 9>, <&pdma1 11>;
clock-names = "iis",
"i2s_opclk0",
"i2s_opclk1";
@@ -259,8 +259,8 @@
reg = <0xe2100000 0x1000>;
interrupt-parent = <&vic2>;
interrupts = <17>;
- dma-names = "rx", "tx";
- dmas = <&pdma1 12>, <&pdma1 13>;
+ dma-names = "tx", "rx";
+ dmas = <&pdma1 13>, <&pdma1 12>;
clock-names = "iis", "i2s_opclk0";
clocks = <&clocks CLK_I2S1>, <&clocks SCLK_AUDIO1>;
pinctrl-names = "default";
@@ -274,8 +274,8 @@
reg = <0xe2a00000 0x1000>;
interrupt-parent = <&vic2>;
interrupts = <18>;
- dma-names = "rx", "tx";
- dmas = <&pdma1 14>, <&pdma1 15>;
+ dma-names = "tx", "rx";
+ dmas = <&pdma1 15>, <&pdma1 14>;
clock-names = "iis", "i2s_opclk0";
clocks = <&clocks CLK_I2S2>, <&clocks SCLK_AUDIO2>;
pinctrl-names = "default";
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread