This patchset is an attempt to fix device trees and resolve binding
warning for pl022. This requires updation in clock name to keep
alignment with other platforms and spi node properties for integratorap
platform.
This patchset is based on
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git,
master
Kuldeep Singh (4):
ARM: dts: integratorap: Update spi node properties
ARM: dts: realview: Update spi clock name
ARM: dts: versatile: Update spi clock name
ARM: dts: ste-dbx: Update spi clock name
arch/arm/boot/dts/arm-realview-eb.dtsi | 2 +-
arch/arm/boot/dts/arm-realview-pb1176.dts | 2 +-
arch/arm/boot/dts/arm-realview-pb11mp.dts | 2 +-
arch/arm/boot/dts/arm-realview-pbx.dtsi | 2 +-
arch/arm/boot/dts/integratorap-im-pd1.dts | 4 ++--
arch/arm/boot/dts/ste-dbx5x0.dtsi | 12 ++++++------
arch/arm/boot/dts/versatile-ab.dts | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
--
2.25.1
SPI clock for pl022 is "sspclk" and meanwhile ARM versatile platform
specify "SSPCLK" as clock name. Even though binding check don't
differentiate the two names, better to keep same convention throughout
i.e sspclk to align with other platforms.
Signed-off-by: Kuldeep Singh <[email protected]>
---
v2:
- Separate out patches for various platforms
- Rebase to top
arch/arm/boot/dts/versatile-ab.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/versatile-ab.dts b/arch/arm/boot/dts/versatile-ab.dts
index 79f7cc241282..a520615f4d8d 100644
--- a/arch/arm/boot/dts/versatile-ab.dts
+++ b/arch/arm/boot/dts/versatile-ab.dts
@@ -391,7 +391,7 @@ spi@101f4000 {
reg = <0x101f4000 0x1000>;
interrupts = <11>;
clocks = <&xtal24mhz>, <&pclk>;
- clock-names = "SSPCLK", "apb_pclk";
+ clock-names = "sspclk", "apb_pclk";
};
fpga {
--
2.25.1
SPI clock for pl022 is "sspclk" and meanwhile ST Ericsson platform
specify "SSPCLK" as clock name. Even though binding check don't
differentiate the two names, better to keep same convention throughout
i.e sspclk to align with other platforms.
Signed-off-by: Kuldeep Singh <[email protected]>
---
v2:
- Separate out patches for various platforms
- Rebase to top
arch/arm/boot/dts/ste-dbx5x0.dtsi | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi
index dc0bcc7020f1..c28b32640254 100644
--- a/arch/arm/boot/dts/ste-dbx5x0.dtsi
+++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi
@@ -755,7 +755,7 @@ ssp0: spi@80002000 {
#address-cells = <1>;
#size-cells = <0>;
clocks = <&prcc_kclk 3 1>, <&prcc_pclk 3 1>;
- clock-names = "SSPCLK", "apb_pclk";
+ clock-names = "sspclk", "apb_pclk";
dmas = <&dma 8 0 0x2>, /* Logical - DevToMem */
<&dma 8 0 0x0>; /* Logical - MemToDev */
dma-names = "rx", "tx";
@@ -772,7 +772,7 @@ ssp1: spi@80003000 {
#address-cells = <1>;
#size-cells = <0>;
clocks = <&prcc_kclk 3 2>, <&prcc_pclk 3 2>;
- clock-names = "SSPCLK", "apb_pclk";
+ clock-names = "sspclk", "apb_pclk";
dmas = <&dma 9 0 0x2>, /* Logical - DevToMem */
<&dma 9 0 0x0>; /* Logical - MemToDev */
dma-names = "rx", "tx";
@@ -790,7 +790,7 @@ spi0: spi@8011a000 {
#size-cells = <0>;
/* Same clock wired to kernel and pclk */
clocks = <&prcc_pclk 2 8>, <&prcc_pclk 2 8>;
- clock-names = "SSPCLK", "apb_pclk";
+ clock-names = "sspclk", "apb_pclk";
dmas = <&dma 0 0 0x2>, /* Logical - DevToMem */
<&dma 0 0 0x0>; /* Logical - MemToDev */
dma-names = "rx", "tx";
@@ -807,7 +807,7 @@ spi1: spi@80112000 {
#size-cells = <0>;
/* Same clock wired to kernel and pclk */
clocks = <&prcc_pclk 2 2>, <&prcc_pclk 2 2>;
- clock-names = "SSPCLK", "apb_pclk";
+ clock-names = "sspclk", "apb_pclk";
dmas = <&dma 35 0 0x2>, /* Logical - DevToMem */
<&dma 35 0 0x0>; /* Logical - MemToDev */
dma-names = "rx", "tx";
@@ -824,7 +824,7 @@ spi2: spi@80111000 {
#size-cells = <0>;
/* Same clock wired to kernel and pclk */
clocks = <&prcc_pclk 2 1>, <&prcc_pclk 2 1>;
- clock-names = "SSPCLK", "apb_pclk";
+ clock-names = "sspclk", "apb_pclk";
dmas = <&dma 33 0 0x2>, /* Logical - DevToMem */
<&dma 33 0 0x0>; /* Logical - MemToDev */
dma-names = "rx", "tx";
@@ -841,7 +841,7 @@ spi3: spi@80129000 {
#size-cells = <0>;
/* Same clock wired to kernel and pclk */
clocks = <&prcc_pclk 1 7>, <&prcc_pclk 1 7>;
- clock-names = "SSPCLK", "apb_pclk";
+ clock-names = "sspclk", "apb_pclk";
dmas = <&dma 40 0 0x2>, /* Logical - DevToMem */
<&dma 40 0 0x0>; /* Logical - MemToDev */
dma-names = "rx", "tx";
--
2.25.1
SPI clock for pl022 is "sspclk" and meanwhile ARM realview platforms
specify "SSPCLK" as clock name. Even though binding check don't
differentiate the two names, better to keep same convention throughout
i.e sspclk to align with other platforms.
Signed-off-by: Kuldeep Singh <[email protected]>
---
v2:
- Separate out patches for various platforms
- Rebase to top
arch/arm/boot/dts/arm-realview-eb.dtsi | 2 +-
arch/arm/boot/dts/arm-realview-pb1176.dts | 2 +-
arch/arm/boot/dts/arm-realview-pb11mp.dts | 2 +-
arch/arm/boot/dts/arm-realview-pbx.dtsi | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/arm-realview-eb.dtsi b/arch/arm/boot/dts/arm-realview-eb.dtsi
index 2dfb32bf9d48..fbb2258b451f 100644
--- a/arch/arm/boot/dts/arm-realview-eb.dtsi
+++ b/arch/arm/boot/dts/arm-realview-eb.dtsi
@@ -399,7 +399,7 @@ ssp: spi@1000d000 {
compatible = "arm,pl022", "arm,primecell";
reg = <0x1000d000 0x1000>;
clocks = <&sspclk>, <&pclk>;
- clock-names = "SSPCLK", "apb_pclk";
+ clock-names = "sspclk", "apb_pclk";
};
wdog: watchdog@10010000 {
diff --git a/arch/arm/boot/dts/arm-realview-pb1176.dts b/arch/arm/boot/dts/arm-realview-pb1176.dts
index 06b8723b09eb..efed325af88d 100644
--- a/arch/arm/boot/dts/arm-realview-pb1176.dts
+++ b/arch/arm/boot/dts/arm-realview-pb1176.dts
@@ -410,7 +410,7 @@ pb1176_ssp: spi@1010b000 {
interrupt-parent = <&intc_dc1176>;
interrupts = <0 17 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&sspclk>, <&pclk>;
- clock-names = "SSPCLK", "apb_pclk";
+ clock-names = "sspclk", "apb_pclk";
};
pb1176_serial0: serial@1010c000 {
diff --git a/arch/arm/boot/dts/arm-realview-pb11mp.dts b/arch/arm/boot/dts/arm-realview-pb11mp.dts
index 295aef448123..89103d54ecc1 100644
--- a/arch/arm/boot/dts/arm-realview-pb11mp.dts
+++ b/arch/arm/boot/dts/arm-realview-pb11mp.dts
@@ -555,7 +555,7 @@ spi@1000d000 {
interrupt-parent = <&intc_pb11mp>;
interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&sspclk>, <&pclk>;
- clock-names = "SSPCLK", "apb_pclk";
+ clock-names = "sspclk", "apb_pclk";
};
watchdog@1000f000 {
diff --git a/arch/arm/boot/dts/arm-realview-pbx.dtsi b/arch/arm/boot/dts/arm-realview-pbx.dtsi
index 6f61f968d689..ec1507c5147c 100644
--- a/arch/arm/boot/dts/arm-realview-pbx.dtsi
+++ b/arch/arm/boot/dts/arm-realview-pbx.dtsi
@@ -390,7 +390,7 @@ ssp: spi@1000d000 {
compatible = "arm,pl022", "arm,primecell";
reg = <0x1000d000 0x1000>;
clocks = <&sspclk>, <&pclk>;
- clock-names = "SSPCLK", "apb_pclk";
+ clock-names = "sspclk", "apb_pclk";
};
wdog0: watchdog@1000f000 {
--
2.25.1
As per spi pl022 binding, SPI clock name is "sspclk" and not "spiclk".
Fix it.
Also, update ssp node name to spi to enable spi bindings check.
Signed-off-by: Kuldeep Singh <[email protected]>
---
v2:
- Remove ssp alias
- Rebase to tip
arch/arm/boot/dts/integratorap-im-pd1.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/integratorap-im-pd1.dts b/arch/arm/boot/dts/integratorap-im-pd1.dts
index d47bfb66d069..4c22e4436271 100644
--- a/arch/arm/boot/dts/integratorap-im-pd1.dts
+++ b/arch/arm/boot/dts/integratorap-im-pd1.dts
@@ -178,12 +178,12 @@ uart@200000 {
clock-names = "uartclk", "apb_pclk";
};
- ssp@300000 {
+ spi@300000 {
compatible = "arm,pl022", "arm,primecell";
reg = <0x00300000 0x1000>;
interrupts-extended = <&impd1_vic 3>;
clocks = <&impd1_sspclk>, <&sysclk>;
- clock-names = "spiclk", "apb_pclk";
+ clock-names = "sspclk", "apb_pclk";
};
impd1_gpio0: gpio@400000 {
--
2.25.1
On Fri, Mar 11, 2022 at 04:06:31PM +0530, Kuldeep Singh wrote:
> This patchset is an attempt to fix device trees and resolve binding
> warning for pl022. This requires updation in clock name to keep
> alignment with other platforms and spi node properties for integratorap
> platform.
>
> This patchset is based on
> git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git,
> master
>
> Kuldeep Singh (4):
> ARM: dts: integratorap: Update spi node properties
> ARM: dts: realview: Update spi clock name
> ARM: dts: versatile: Update spi clock name
> ARM: dts: ste-dbx: Update spi clock name
>
Hi,
Commit description for patches 2-4 is incorrect.
As 'make dtbs_check' has always been working correctly and can identify
character casing proficiently, it's just that I had some mistake in my
build environment because of which no warning was observed. Kindly
consider this version as obsolete. I will update commit description
properly in next series. Thanks for your time and sorry for
inconvenience.
Regards
Kuldeep
> arch/arm/boot/dts/arm-realview-eb.dtsi | 2 +-
> arch/arm/boot/dts/arm-realview-pb1176.dts | 2 +-
> arch/arm/boot/dts/arm-realview-pb11mp.dts | 2 +-
> arch/arm/boot/dts/arm-realview-pbx.dtsi | 2 +-
> arch/arm/boot/dts/integratorap-im-pd1.dts | 4 ++--
> arch/arm/boot/dts/ste-dbx5x0.dtsi | 12 ++++++------
> arch/arm/boot/dts/versatile-ab.dts | 2 +-
> 7 files changed, 13 insertions(+), 13 deletions(-)
>
> --
> 2.25.1
>