The properties "pl022,hierarchy" and "pl022,slave-tx-disable" were
initially proposed till patch V4 [1] but then discarded in V5 [2]
when the patch set was taken over by another developer, as
explained in patch history in [3].
The above properties never landed in mainline code but were then
listed in the binding example by a following commit dc715452e914
("spi: pl022: use generic DMA slave configuration if possible")
and later on they were copy-paste in some board's DT.
Remove the nonexistent properties from the example.
Also remove a spaces-only line at the end of the file.
[1] https://lkml.org/lkml/2012/7/9/421
[2] https://lkml.org/lkml/2012/8/21/427
[3] https://lkml.org/lkml/2012/8/21/436
Signed-off-by: Antonio Borneo <[email protected]>
---
To: Mark Brown <[email protected]>
To: Rob Herring <[email protected]>
To: Mark Rutland <[email protected]>
Cc: Viresh Kumar <[email protected]>
Cc: Shiraz Hashim <[email protected]>
Cc: Russell King <[email protected]>
Cc: Brijesh Singh <[email protected]>
Cc: Suravee Suthikulpanit <[email protected]>
Cc: Tom Lendacky <[email protected]>
Cc: Catalin Marinas <[email protected]>
Cc: Will Deacon <[email protected]>
Cc: Ray Jui <[email protected]>
Cc: Scott Branden <[email protected]>
Cc: Jon Mason <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
Documentation/devicetree/bindings/spi/spi_pl022.txt | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/spi/spi_pl022.txt b/Documentation/devicetree/bindings/spi/spi_pl022.txt
index 4d1673ca8cf8..2692a5726c3f 100644
--- a/Documentation/devicetree/bindings/spi/spi_pl022.txt
+++ b/Documentation/devicetree/bindings/spi/spi_pl022.txt
@@ -56,9 +56,7 @@ Example:
spi-max-frequency = <12000000>;
spi-cpol;
spi-cpha;
- pl022,hierarchy = <0>;
pl022,interface = <0>;
- pl022,slave-tx-disable;
pl022,com-mode = <0x2>;
pl022,rx-level-trig = <0>;
pl022,tx-level-trig = <0>;
@@ -67,4 +65,3 @@ Example:
pl022,duplex = <0>;
};
};
-
--
2.12.0
The property "pl022,hierarchy" is not documented in DT binding
and doesn't exist in the driver code.
It has no effect and can be removed.
Signed-off-by: Antonio Borneo <[email protected]>
---
Cc: Mark Brown <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Mark Rutland <[email protected]>
Cc: Viresh Kumar <[email protected]>
Cc: Shiraz Hashim <[email protected]>
Cc: Russell King <[email protected]>
To: Brijesh Singh <[email protected]>
To: Suravee Suthikulpanit <[email protected]>
To: Tom Lendacky <[email protected]>
Cc: Catalin Marinas <[email protected]>
Cc: Will Deacon <[email protected]>
Cc: Ray Jui <[email protected]>
Cc: Scott Branden <[email protected]>
Cc: Jon Mason <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts | 1 -
arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts | 1 -
arch/arm64/boot/dts/amd/amd-overdrive.dts | 1 -
arch/arm64/boot/dts/amd/husky.dts | 1 -
4 files changed, 4 deletions(-)
diff --git a/arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts b/arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts
index 8e3074a4947d..399baf4040e3 100644
--- a/arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts
+++ b/arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts
@@ -70,7 +70,6 @@
reg = <0>;
spi-max-frequency = <20000000>;
voltage-ranges = <3200 3400>;
- pl022,hierarchy = <0>;
pl022,interface = <0>;
pl022,com-mode = <0x0>;
pl022,rx-level-trig = <0>;
diff --git a/arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts b/arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts
index ed5e043f37aa..be60accbcaf7 100644
--- a/arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts
+++ b/arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts
@@ -74,7 +74,6 @@
reg = <0>;
spi-max-frequency = <20000000>;
voltage-ranges = <3200 3400>;
- pl022,hierarchy = <0>;
pl022,interface = <0>;
pl022,com-mode = <0x0>;
pl022,rx-level-trig = <0>;
diff --git a/arch/arm64/boot/dts/amd/amd-overdrive.dts b/arch/arm64/boot/dts/amd/amd-overdrive.dts
index 128fa942f09e..940cc33f3a69 100644
--- a/arch/arm64/boot/dts/amd/amd-overdrive.dts
+++ b/arch/arm64/boot/dts/amd/amd-overdrive.dts
@@ -51,7 +51,6 @@
gpios = <&gpio0 7 0>;
interrupt-parent = <&gpio0>;
interrupts = <7 3>;
- pl022,hierarchy = <0>;
pl022,interface = <0>;
pl022,com-mode = <0x0>;
pl022,rx-level-trig = <0>;
diff --git a/arch/arm64/boot/dts/amd/husky.dts b/arch/arm64/boot/dts/amd/husky.dts
index 1381d4b2bf1b..e4a6a9122671 100644
--- a/arch/arm64/boot/dts/amd/husky.dts
+++ b/arch/arm64/boot/dts/amd/husky.dts
@@ -70,7 +70,6 @@
reg = <0>;
spi-max-frequency = <20000000>;
voltage-ranges = <3200 3400>;
- pl022,hierarchy = <0>;
pl022,interface = <0>;
pl022,com-mode = <0x0>;
pl022,rx-level-trig = <0>;
--
2.12.0
The properties "pl022,hierarchy" and "pl022,slave-tx-disable" are
not documented in DT binding and don't exist in the driver code.
They have no effect and can be removed.
Signed-off-by: Antonio Borneo <[email protected]>
---
Cc: Mark Brown <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Mark Rutland <[email protected]>
Cc: Viresh Kumar <[email protected]>
Cc: Shiraz Hashim <[email protected]>
Cc: Russell King <[email protected]>
Cc: Brijesh Singh <[email protected]>
Cc: Suravee Suthikulpanit <[email protected]>
Cc: Tom Lendacky <[email protected]>
Cc: Catalin Marinas <[email protected]>
Cc: Will Deacon <[email protected]>
To: Ray Jui <[email protected]>
To: Scott Branden <[email protected]>
To: Jon Mason <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
arch/arm64/boot/dts/broadcom/ns2-svk.dts | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/arm64/boot/dts/broadcom/ns2-svk.dts b/arch/arm64/boot/dts/broadcom/ns2-svk.dts
index 5ae08161649e..2fbd3cd40def 100644
--- a/arch/arm64/boot/dts/broadcom/ns2-svk.dts
+++ b/arch/arm64/boot/dts/broadcom/ns2-svk.dts
@@ -113,9 +113,7 @@
spi-max-frequency = <5000000>;
spi-cpha = <1>;
spi-cpol = <1>;
- pl022,hierarchy = <0>;
pl022,interface = <0>;
- pl022,slave-tx-disable = <0>;
pl022,com-mode = <0>;
pl022,rx-level-trig = <1>;
pl022,tx-level-trig = <1>;
@@ -137,9 +135,7 @@
at25,page-size = <64>;
spi-cpha = <1>;
spi-cpol = <1>;
- pl022,hierarchy = <0>;
pl022,interface = <0>;
- pl022,slave-tx-disable = <0>;
pl022,com-mode = <0>;
pl022,rx-level-trig = <1>;
pl022,tx-level-trig = <1>;
--
2.12.0
The properties "pl022,hierarchy" and "pl022,slave-tx-disable" are
not documented in DT binding and don't exist in the driver code.
They have no effect and can be removed.
Signed-off-by: Antonio Borneo <[email protected]>
---
Cc: Mark Brown <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Mark Rutland <[email protected]>
To: Viresh Kumar <[email protected]>
To: Shiraz Hashim <[email protected]>
Cc: Russell King <[email protected]>
Cc: Brijesh Singh <[email protected]>
Cc: Suravee Suthikulpanit <[email protected]>
Cc: Tom Lendacky <[email protected]>
Cc: Catalin Marinas <[email protected]>
Cc: Will Deacon <[email protected]>
Cc: Ray Jui <[email protected]>
Cc: Scott Branden <[email protected]>
Cc: Jon Mason <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
arch/arm/boot/dts/spear1310-evb.dts | 6 ------
arch/arm/boot/dts/spear1340-evb.dts | 6 ------
2 files changed, 12 deletions(-)
diff --git a/arch/arm/boot/dts/spear1310-evb.dts b/arch/arm/boot/dts/spear1310-evb.dts
index 84101e4eebbf..e70f78b7eaf4 100644
--- a/arch/arm/boot/dts/spear1310-evb.dts
+++ b/arch/arm/boot/dts/spear1310-evb.dts
@@ -358,9 +358,7 @@
#size-cells = <0>;
spi-max-frequency = <1000000>;
spi-cpha;
- pl022,hierarchy = <0>;
pl022,interface = <0>;
- pl022,slave-tx-disable;
pl022,com-mode = <0>;
pl022,rx-level-trig = <0>;
pl022,tx-level-trig = <0>;
@@ -391,9 +389,7 @@
spi-max-frequency = <12000000>;
spi-cpol;
spi-cpha;
- pl022,hierarchy = <0>;
pl022,interface = <0>;
- pl022,slave-tx-disable;
pl022,com-mode = <0x2>;
pl022,rx-level-trig = <0>;
pl022,tx-level-trig = <0>;
@@ -407,9 +403,7 @@
reg = <2>;
spi-max-frequency = <25000000>;
spi-cpha;
- pl022,hierarchy = <0>;
pl022,interface = <0>;
- pl022,slave-tx-disable;
pl022,com-mode = <0x2>;
pl022,rx-level-trig = <0>;
pl022,tx-level-trig = <0>;
diff --git a/arch/arm/boot/dts/spear1340-evb.dts b/arch/arm/boot/dts/spear1340-evb.dts
index 6565f3cb866f..f31d2e83fae5 100644
--- a/arch/arm/boot/dts/spear1340-evb.dts
+++ b/arch/arm/boot/dts/spear1340-evb.dts
@@ -451,9 +451,7 @@
spi-max-frequency = <12000000>;
spi-cpol;
spi-cpha;
- pl022,hierarchy = <0>;
pl022,interface = <0>;
- pl022,slave-tx-disable;
pl022,com-mode = <0x2>;
pl022,rx-level-trig = <0>;
pl022,tx-level-trig = <0>;
@@ -467,9 +465,7 @@
spi-max-frequency = <1000000>;
spi-cpha;
reg = <1>;
- pl022,hierarchy = <0>;
pl022,interface = <0>;
- pl022,slave-tx-disable;
pl022,com-mode = <0>;
pl022,rx-level-trig = <0>;
pl022,tx-level-trig = <0>;
@@ -501,9 +497,7 @@
reg = <2>;
spi-max-frequency = <25000000>;
spi-cpha;
- pl022,hierarchy = <0>;
pl022,interface = <0>;
- pl022,slave-tx-disable;
pl022,com-mode = <0x2>;
pl022,rx-level-trig = <0>;
pl022,tx-level-trig = <0>;
--
2.12.0
On 20-03-17, 10:57, Antonio Borneo wrote:
> The properties "pl022,hierarchy" and "pl022,slave-tx-disable" are
> not documented in DT binding and don't exist in the driver code.
> They have no effect and can be removed.
>
> Signed-off-by: Antonio Borneo <[email protected]>
> ---
> Cc: Mark Brown <[email protected]>
> Cc: Rob Herring <[email protected]>
> Cc: Mark Rutland <[email protected]>
> To: Viresh Kumar <[email protected]>
> To: Shiraz Hashim <[email protected]>
> Cc: Russell King <[email protected]>
> Cc: Brijesh Singh <[email protected]>
> Cc: Suravee Suthikulpanit <[email protected]>
> Cc: Tom Lendacky <[email protected]>
> Cc: Catalin Marinas <[email protected]>
> Cc: Will Deacon <[email protected]>
> Cc: Ray Jui <[email protected]>
> Cc: Scott Branden <[email protected]>
> Cc: Jon Mason <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
> arch/arm/boot/dts/spear1310-evb.dts | 6 ------
> arch/arm/boot/dts/spear1340-evb.dts | 6 ------
> 2 files changed, 12 deletions(-)
Acked-by: Viresh Kumar <[email protected]>
--
viresh
On Mon, Mar 20, 2017 at 10:57:18AM +0100, Antonio Borneo wrote:
> The properties "pl022,hierarchy" and "pl022,slave-tx-disable" were
> initially proposed till patch V4 [1] but then discarded in V5 [2]
> when the patch set was taken over by another developer, as
> explained in patch history in [3].
> The above properties never landed in mainline code but were then
> listed in the binding example by a following commit dc715452e914
> ("spi: pl022: use generic DMA slave configuration if possible")
> and later on they were copy-paste in some board's DT.
>
> Remove the nonexistent properties from the example.
> Also remove a spaces-only line at the end of the file.
>
> [1] https://lkml.org/lkml/2012/7/9/421
> [2] https://lkml.org/lkml/2012/8/21/427
> [3] https://lkml.org/lkml/2012/8/21/436
>
> Signed-off-by: Antonio Borneo <[email protected]>
For the series:
Acked-by: Mark Rutland <[email protected]>
Mark.
> diff --git a/Documentation/devicetree/bindings/spi/spi_pl022.txt b/Documentation/devicetree/bindings/spi/spi_pl022.txt
> index 4d1673ca8cf8..2692a5726c3f 100644
> --- a/Documentation/devicetree/bindings/spi/spi_pl022.txt
> +++ b/Documentation/devicetree/bindings/spi/spi_pl022.txt
> @@ -56,9 +56,7 @@ Example:
> spi-max-frequency = <12000000>;
> spi-cpol;
> spi-cpha;
> - pl022,hierarchy = <0>;
> pl022,interface = <0>;
> - pl022,slave-tx-disable;
> pl022,com-mode = <0x2>;
> pl022,rx-level-trig = <0>;
> pl022,tx-level-trig = <0>;
> @@ -67,4 +65,3 @@ Example:
> pl022,duplex = <0>;
> };
> };
> -
> --
> 2.12.0
>
The patch
spi: pl022: remove nonexistent properties from DT binding example
has been applied to the spi tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From e6a72e057fa3e0ad38ec59c4779647a7bd390a37 Mon Sep 17 00:00:00 2001
From: Antonio Borneo <[email protected]>
Date: Mon, 20 Mar 2017 10:57:18 +0100
Subject: [PATCH] spi: pl022: remove nonexistent properties from DT binding
example
The properties "pl022,hierarchy" and "pl022,slave-tx-disable" were
initially proposed till patch V4 [1] but then discarded in V5 [2]
when the patch set was taken over by another developer, as
explained in patch history in [3].
The above properties never landed in mainline code but were then
listed in the binding example by a following commit dc715452e914
("spi: pl022: use generic DMA slave configuration if possible")
and later on they were copy-paste in some board's DT.
Remove the nonexistent properties from the example.
Also remove a spaces-only line at the end of the file.
[1] https://lkml.org/lkml/2012/7/9/421
[2] https://lkml.org/lkml/2012/8/21/427
[3] https://lkml.org/lkml/2012/8/21/436
Signed-off-by: Antonio Borneo <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
---
Documentation/devicetree/bindings/spi/spi_pl022.txt | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/spi/spi_pl022.txt b/Documentation/devicetree/bindings/spi/spi_pl022.txt
index 4d1673ca8cf8..2692a5726c3f 100644
--- a/Documentation/devicetree/bindings/spi/spi_pl022.txt
+++ b/Documentation/devicetree/bindings/spi/spi_pl022.txt
@@ -56,9 +56,7 @@ Example:
spi-max-frequency = <12000000>;
spi-cpol;
spi-cpha;
- pl022,hierarchy = <0>;
pl022,interface = <0>;
- pl022,slave-tx-disable;
pl022,com-mode = <0x2>;
pl022,rx-level-trig = <0>;
pl022,tx-level-trig = <0>;
@@ -67,4 +65,3 @@ Example:
pl022,duplex = <0>;
};
};
-
--
2.11.0