* [PATCH 01/77] ARM: dts: sun4i: Fix gpio-keys warning
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 2:53 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 02/77] ARM: dts: sun4i: Fix HDMI output DTC warning Maxime Ripard
` (76 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Fix the 'unnecessary #address-cells/#size-cells without "ranges" or child
"reg" property' DTC warning for the gpio-keys DT node on A10 boards.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 2 --
arch/arm/boot/dts/sun4i-a10-pcduino.dts | 2 --
2 files changed, 4 deletions(-)
diff --git a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts
index 221acd10f6c8..2f0d966f39ad 100644
--- a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts
+++ b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts
@@ -63,8 +63,6 @@
compatible = "gpio-keys-polled";
pinctrl-names = "default";
pinctrl-0 = <&key_pins_inet9f>;
- #address-cells = <1>;
- #size-cells = <0>;
poll-interval = <20>;
left-joystick-left {
diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
index b97a0f2f20b9..d82a604f3d9c 100644
--- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts
+++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
@@ -76,8 +76,6 @@
gpio-keys {
compatible = "gpio-keys";
- #address-cells = <1>;
- #size-cells = <0>;
back {
label = "Key Back";
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 02/77] ARM: dts: sun4i: Fix HDMI output DTC warning
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
2018-11-27 12:45 ` [PATCH 01/77] ARM: dts: sun4i: Fix gpio-keys warning Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 2:53 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 03/77] ARM: dts: sun5i: Change framebuffer node names to avoid warnings Maxime Ripard
` (75 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Our HDMI output endpoint on the A10 DTSI has a warning under DTC: "graph
node has single child node 'endpoint', #address-cells/#size-cells are not
necessary". Fix this by removing those properties.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun4i-a10.dtsi | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 3d62a8950720..5d46bb0139fa 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -530,8 +530,6 @@
};
hdmi_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
};
};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 03/77] ARM: dts: sun5i: Change framebuffer node names to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
2018-11-27 12:45 ` [PATCH 01/77] ARM: dts: sun4i: Fix gpio-keys warning Maxime Ripard
2018-11-27 12:45 ` [PATCH 02/77] ARM: dts: sun4i: Fix HDMI output DTC warning Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 2:53 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 04/77] ARM: dts: sun5i: Fix display pipeline endpoint warnings in DTC Maxime Ripard
` (74 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
The simple-framebuffer nodes have a unit address, but no reg property which
generates a warning when compiling it with DTC.
Change the simple-framebuffer node names so that there is no warnings on
this anymore.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun5i-a10s.dtsi | 2 +-
arch/arm/boot/dts/sun5i.dtsi | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index 316cb8b2945b..7f76250f4228 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -60,7 +60,7 @@
#size-cells = <1>;
ranges;
- framebuffer at 2 {
+ framebuffer-lcd0-hdmi {
compatible = "allwinner,simple-framebuffer",
"simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0-hdmi";
diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index 9cd65c46720b..14a7d1cf89b4 100644
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -68,7 +68,7 @@
#size-cells = <1>;
ranges;
- framebuffer at 0 {
+ framebuffer-lcd0 {
compatible = "allwinner,simple-framebuffer",
"simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0";
@@ -77,7 +77,7 @@
status = "disabled";
};
- framebuffer at 1 {
+ framebuffer-lcd0-tve0 {
compatible = "allwinner,simple-framebuffer",
"simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0-tve0";
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 03/77] ARM: dts: sun5i: Change framebuffer node names to avoid warnings
2018-11-27 12:45 ` [PATCH 03/77] ARM: dts: sun5i: Change framebuffer node names to avoid warnings Maxime Ripard
@ 2018-11-28 2:53 ` Chen-Yu Tsai
2018-11-28 10:40 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 2:53 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> The simple-framebuffer nodes have a unit address, but no reg property which
> generates a warning when compiling it with DTC.
>
> Change the simple-framebuffer node names so that there is no warnings on
> this anymore.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 03/77] ARM: dts: sun5i: Change framebuffer node names to avoid warnings
2018-11-28 2:53 ` Chen-Yu Tsai
@ 2018-11-28 10:40 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 10:40 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 10:53:40AM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > The simple-framebuffer nodes have a unit address, but no reg property which
> > generates a warning when compiling it with DTC.
> >
> > Change the simple-framebuffer node names so that there is no warnings on
> > this anymore.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/8c74e824/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 04/77] ARM: dts: sun5i: Fix display pipeline endpoint warnings in DTC
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (2 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 03/77] ARM: dts: sun5i: Change framebuffer node names to avoid warnings Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 3:03 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 05/77] ARM: dts: sun5i: Change clock node names to avoid warnings Maxime Ripard
` (73 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Since most of the display IPs have a single endpoint, having a reg
property, a unit-address and #address-cells and #size-cells will emit a
warning.
Let's remove those.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun5i.dtsi | 25 +++++--------------------
1 file changed, 5 insertions(+), 20 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index 14a7d1cf89b4..3e7b251ce7a6 100644
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -238,11 +238,8 @@
status = "disabled";
port {
- #address-cells = <1>;
- #size-cells = <0>;
- tve0_in_tcon0: endpoint at 0 {
- reg = <0>;
+ tve0_in_tcon0: endpoint {
remote-endpoint = <&tcon0_out_tve0>;
};
};
@@ -285,12 +282,9 @@
#size-cells = <0>;
tcon0_in: port at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0>;
- tcon0_in_be0: endpoint at 0 {
- reg = <0>;
+ tcon0_in_be0: endpoint {
remote-endpoint = <&be0_out_tcon0>;
};
};
@@ -726,12 +720,9 @@
#size-cells = <0>;
fe0_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
- fe0_out_be0: endpoint at 0 {
- reg = <0>;
+ fe0_out_be0: endpoint {
remote-endpoint = <&be0_in_fe0>;
};
};
@@ -757,23 +748,17 @@
#size-cells = <0>;
be0_in: port at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0>;
- be0_in_fe0: endpoint at 0 {
- reg = <0>;
+ be0_in_fe0: endpoint {
remote-endpoint = <&fe0_out_be0>;
};
};
be0_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
- be0_out_tcon0: endpoint at 0 {
- reg = <0>;
+ be0_out_tcon0: endpoint {
remote-endpoint = <&tcon0_in_be0>;
};
};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 04/77] ARM: dts: sun5i: Fix display pipeline endpoint warnings in DTC
2018-11-27 12:45 ` [PATCH 04/77] ARM: dts: sun5i: Fix display pipeline endpoint warnings in DTC Maxime Ripard
@ 2018-11-28 3:03 ` Chen-Yu Tsai
0 siblings, 0 replies; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 3:03 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Since most of the display IPs have a single endpoint, having a reg
> property, a unit-address and #address-cells and #size-cells will emit a
> warning.
>
> Let's remove those.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> ---
> arch/arm/boot/dts/sun5i.dtsi | 25 +++++--------------------
> 1 file changed, 5 insertions(+), 20 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
> index 14a7d1cf89b4..3e7b251ce7a6 100644
> --- a/arch/arm/boot/dts/sun5i.dtsi
> +++ b/arch/arm/boot/dts/sun5i.dtsi
[...]
> @@ -726,12 +720,9 @@
> #size-cells = <0>;
>
> fe0_out: port at 1 {
> - #address-cells = <1>;
> - #size-cells = <0>;
> reg = <1>;
>
> - fe0_out_be0: endpoint at 0 {
> - reg = <0>;
Removing this breaks the code used to parse the graph to get the backend's ID.
The code expects a reg property to be present. We need to fix it.
The rest of the changes should be fine though.
ChenYu
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 05/77] ARM: dts: sun5i: Change clock node names to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (3 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 04/77] ARM: dts: sun5i: Fix display pipeline endpoint warnings in DTC Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 3:04 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 06/77] ARM: dts: sun5i: Remove skeleton " Maxime Ripard
` (72 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Our oscillators clock names have a unit address, but no reg property, which
generates a warning in DTC. Change these names to remove those unit
addresses.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun5i.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index 3e7b251ce7a6..97236b112b01 100644
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -93,14 +93,14 @@
#size-cells = <1>;
ranges;
- osc24M: clk at 1c20050 {
+ osc24M: clk-24M {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <24000000>;
clock-output-names = "osc24M";
};
- osc32k: clk at 0 {
+ osc32k: clk-32k {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <32768>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 05/77] ARM: dts: sun5i: Change clock node names to avoid warnings
2018-11-27 12:45 ` [PATCH 05/77] ARM: dts: sun5i: Change clock node names to avoid warnings Maxime Ripard
@ 2018-11-28 3:04 ` Chen-Yu Tsai
2018-11-28 10:41 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 3:04 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Our oscillators clock names have a unit address, but no reg property, which
> generates a warning in DTC. Change these names to remove those unit
> addresses.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 05/77] ARM: dts: sun5i: Change clock node names to avoid warnings
2018-11-28 3:04 ` Chen-Yu Tsai
@ 2018-11-28 10:41 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 10:41 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 11:04:39AM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > Our oscillators clock names have a unit address, but no reg property, which
> > generates a warning in DTC. Change these names to remove those unit
> > addresses.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/3cb56e3f/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 06/77] ARM: dts: sun5i: Remove skeleton to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (4 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 05/77] ARM: dts: sun5i: Change clock node names to avoid warnings Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 3:05 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 07/77] ARM: dts: sun5i: Remove SoC node unit-name " Maxime Ripard
` (71 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Using skeleton.dtsi will create a memory node that will generate a warning
in DTC. However, that node will be created by the bootloader, so we can
just remove it entirely in order to remove that warning.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun5i-a10s.dtsi | 2 --
arch/arm/boot/dts/sun5i-a13.dtsi | 2 --
arch/arm/boot/dts/sun5i.dtsi | 4 ++--
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index 7f76250f4228..0c0c5e08520f 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -42,8 +42,6 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "skeleton.dtsi"
-
#include "sun5i.dtsi"
#include <dt-bindings/dma/sun4i-a10.h>
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index b1d827765530..a75ca4504a75 100644
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -42,8 +42,6 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "skeleton.dtsi"
-
#include "sun5i.dtsi"
#include <dt-bindings/thermal/thermal.h>
diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index 97236b112b01..07b60462356e 100644
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -42,14 +42,14 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "skeleton.dtsi"
-
#include <dt-bindings/clock/sun5i-ccu.h>
#include <dt-bindings/dma/sun4i-a10.h>
#include <dt-bindings/reset/sun5i-ccu.h>
/ {
interrupt-parent = <&intc>;
+ #address-cells = <1>;
+ #size-cells = <1>;
cpus {
#address-cells = <1>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 06/77] ARM: dts: sun5i: Remove skeleton to avoid warnings
2018-11-27 12:45 ` [PATCH 06/77] ARM: dts: sun5i: Remove skeleton " Maxime Ripard
@ 2018-11-28 3:05 ` Chen-Yu Tsai
2018-11-28 10:41 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 3:05 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Using skeleton.dtsi will create a memory node that will generate a warning
> in DTC. However, that node will be created by the bootloader, so we can
> just remove it entirely in order to remove that warning.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 06/77] ARM: dts: sun5i: Remove skeleton to avoid warnings
2018-11-28 3:05 ` Chen-Yu Tsai
@ 2018-11-28 10:41 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 10:41 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 11:05:04AM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > Using skeleton.dtsi will create a memory node that will generate a warning
> > in DTC. However, that node will be created by the bootloader, so we can
> > just remove it entirely in order to remove that warning.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/cbb7b9a5/attachment-0001.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 07/77] ARM: dts: sun5i: Remove SoC node unit-name to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (5 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 06/77] ARM: dts: sun5i: Remove skeleton " Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 3:05 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 08/77] ARM: dts: sun5i: Remove redundant interrupt-controller Maxime Ripard
` (70 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Our main node for all the in-SoC controllers used to have a unit name. The
unit-name, in addition to being actually false, would not match any reg
property, which generates a warning.
Remove it in order to remove those warnings.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun5i-a10s.dtsi | 2 +-
arch/arm/boot/dts/sun5i-a13.dtsi | 2 +-
arch/arm/boot/dts/sun5i-gr8.dtsi | 2 +-
arch/arm/boot/dts/sun5i.dtsi | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index 0c0c5e08520f..a2d0ceacf00e 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -74,7 +74,7 @@
allwinner,pipelines = <&fe0>;
};
- soc at 1c00000 {
+ soc {
hdmi: hdmi at 1c16000 {
compatible = "allwinner,sun5i-a10s-hdmi";
reg = <0x01c16000 0x1000>;
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index a75ca4504a75..ee99f6f23f17 100644
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -86,7 +86,7 @@
allwinner,pipelines = <&fe0>;
};
- soc at 1c00000 {
+ soc {
pwm: pwm at 1c20e00 {
compatible = "allwinner,sun5i-a13-pwm";
reg = <0x01c20e00 0xc>;
diff --git a/arch/arm/boot/dts/sun5i-gr8.dtsi b/arch/arm/boot/dts/sun5i-gr8.dtsi
index ef0b7446a99d..d3eea4cfe442 100644
--- a/arch/arm/boot/dts/sun5i-gr8.dtsi
+++ b/arch/arm/boot/dts/sun5i-gr8.dtsi
@@ -54,7 +54,7 @@
allwinner,pipelines = <&fe0>;
};
- soc at 1c00000 {
+ soc {
pwm: pwm at 1c20e00 {
compatible = "allwinner,sun5i-a10s-pwm";
reg = <0x01c20e00 0xc>;
diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index 07b60462356e..4ea6e1867186 100644
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -123,7 +123,7 @@
};
};
- soc at 1c00000 {
+ soc {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 07/77] ARM: dts: sun5i: Remove SoC node unit-name to avoid warnings
2018-11-27 12:45 ` [PATCH 07/77] ARM: dts: sun5i: Remove SoC node unit-name " Maxime Ripard
@ 2018-11-28 3:05 ` Chen-Yu Tsai
2018-11-28 10:41 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 3:05 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Our main node for all the in-SoC controllers used to have a unit name. The
> unit-name, in addition to being actually false, would not match any reg
> property, which generates a warning.
>
> Remove it in order to remove those warnings.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 07/77] ARM: dts: sun5i: Remove SoC node unit-name to avoid warnings
2018-11-28 3:05 ` Chen-Yu Tsai
@ 2018-11-28 10:41 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 10:41 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 11:05:30AM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > Our main node for all the in-SoC controllers used to have a unit name. The
> > unit-name, in addition to being actually false, would not match any reg
> > property, which generates a warning.
> >
> > Remove it in order to remove those warnings.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/ca0ad244/attachment-0001.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 08/77] ARM: dts: sun5i: Remove redundant interrupt-controller
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (6 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 07/77] ARM: dts: sun5i: Remove SoC node unit-name " Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 3:05 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 09/77] ARM: dts: sun5i: Change LRADC node names to avoid warnings Maxime Ripard
` (69 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
The interrupt-parent property is set in sun5i.dtsi, so there's no need to
repeat it.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun5i-a10s.dtsi | 2 --
arch/arm/boot/dts/sun5i-a13.dtsi | 2 --
2 files changed, 4 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index a2d0ceacf00e..195a6a1d2c49 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -47,8 +47,6 @@
#include <dt-bindings/dma/sun4i-a10.h>
/ {
- interrupt-parent = <&intc>;
-
aliases {
ethernet0 = &emac;
};
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index ee99f6f23f17..ae04955fd9a3 100644
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -47,8 +47,6 @@
#include <dt-bindings/thermal/thermal.h>
/ {
- interrupt-parent = <&intc>;
-
thermal-zones {
cpu_thermal {
/* milliseconds */
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 09/77] ARM: dts: sun5i: Change LRADC node names to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (7 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 08/77] ARM: dts: sun5i: Remove redundant interrupt-controller Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 3:06 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 10/77] ARM: dts: sun5i: Remove all useless pinctrl nodes Maxime Ripard
` (68 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
One of the usage of the LRADC is to implement buttons. The bindings define
that we should have one subnode per button, with their associated voltage
as a property.
However, there was no reg property but we still used the voltage associated
to the button as the unit-address, which eventually generated warnings in
DTC.
Rename the node names to avoid those warnings.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 10 ++++----
arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts | 4 +--
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 4 +--
arch/arm/boot/dts/sun5i-a13-licheepi-one.dts | 2 +-
arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 10 ++++----
arch/arm/boot/dts/sun5i-gr8-evb.dts | 14 +++++------
6 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
index 2c902ed2c87a..243319e98cf7 100644
--- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
@@ -152,35 +152,35 @@
vref-supply = <®_vcc3v0>;
status = "okay";
- button at 191 {
+ button-191 {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
channel = <0>;
voltage = <191274>;
};
- button at 392 {
+ button-392 {
label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>;
channel = <0>;
voltage = <392644>;
};
- button at 601 {
+ button-601 {
label = "Menu";
linux,code = <KEY_MENU>;
channel = <0>;
voltage = <601151>;
};
- button at 795 {
+ button-795 {
label = "Enter";
linux,code = <KEY_ENTER>;
channel = <0>;
voltage = <795090>;
};
- button at 987 {
+ button-987 {
label = "Home";
linux,code = <KEY_HOMEPAGE>;
channel = <0>;
diff --git a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
index 378214d8316e..30a86cadf5a5 100644
--- a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
+++ b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
@@ -105,14 +105,14 @@
vref-supply = <®_ldo2>;
status = "okay";
- button at 200 {
+ button-200 {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
channel = <0>;
voltage = <200000>;
};
- button at 400 {
+ button-400 {
label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>;
channel = <0>;
diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
index 7ee0c3f6d7a1..24ac6f167426 100644
--- a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
+++ b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
@@ -100,14 +100,14 @@
vref-supply = <®_ldo2>;
status = "okay";
- button at 200 {
+ button-200 {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
channel = <0>;
voltage = <200000>;
};
- button at 400 {
+ button-400 {
label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>;
channel = <0>;
diff --git a/arch/arm/boot/dts/sun5i-a13-licheepi-one.dts b/arch/arm/boot/dts/sun5i-a13-licheepi-one.dts
index bc883893f4a4..93a080e7ba2d 100644
--- a/arch/arm/boot/dts/sun5i-a13-licheepi-one.dts
+++ b/arch/arm/boot/dts/sun5i-a13-licheepi-one.dts
@@ -124,7 +124,7 @@
vref-supply = <®_ldo2>;
status = "okay";
- button at 984 {
+ button-984 {
label = "Home";
linux,code = <KEY_HOMEPAGE>;
channel = <0>;
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
index 437ad913a373..49dcef1090d2 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
@@ -153,35 +153,35 @@
vref-supply = <®_vcc3v0>;
status = "okay";
- button at 191 {
+ button-191 {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
channel = <0>;
voltage = <191274>;
};
- button at 392 {
+ button-392 {
label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>;
channel = <0>;
voltage = <392644>;
};
- button at 601 {
+ button-601 {
label = "Menu";
linux,code = <KEY_MENU>;
channel = <0>;
voltage = <601151>;
};
- button at 795 {
+ button-795 {
label = "Enter";
linux,code = <KEY_ENTER>;
channel = <0>;
voltage = <795090>;
};
- button at 987 {
+ button-987 {
label = "Home";
linux,code = <KEY_HOMEPAGE>;
channel = <0>;
diff --git a/arch/arm/boot/dts/sun5i-gr8-evb.dts b/arch/arm/boot/dts/sun5i-gr8-evb.dts
index 5f0adc0f7bb4..e914915e73d7 100644
--- a/arch/arm/boot/dts/sun5i-gr8-evb.dts
+++ b/arch/arm/boot/dts/sun5i-gr8-evb.dts
@@ -181,49 +181,49 @@
vref-supply = <®_ldo2>;
status = "okay";
- button at 190 {
+ button-190 {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
channel = <0>;
voltage = <190000>;
};
- button at 390 {
+ button-390 {
label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>;
channel = <0>;
voltage = <390000>;
};
- button at 600 {
+ button-600 {
label = "Menu";
linux,code = <KEY_MENU>;
channel = <0>;
voltage = <600000>;
};
- button at 800 {
+ button-800 {
label = "Search";
linux,code = <KEY_SEARCH>;
channel = <0>;
voltage = <800000>;
};
- button at 980 {
+ button-980 {
label = "Home";
linux,code = <KEY_HOMEPAGE>;
channel = <0>;
voltage = <980000>;
};
- button at 1180 {
+ button-1180 {
label = "Esc";
linux,code = <KEY_ESC>;
channel = <0>;
voltage = <1180000>;
};
- button at 1400 {
+ button-1400 {
label = "Enter";
linux,code = <KEY_ENTER>;
channel = <0>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 09/77] ARM: dts: sun5i: Change LRADC node names to avoid warnings
2018-11-27 12:45 ` [PATCH 09/77] ARM: dts: sun5i: Change LRADC node names to avoid warnings Maxime Ripard
@ 2018-11-28 3:06 ` Chen-Yu Tsai
2018-11-28 10:41 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 3:06 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> One of the usage of the LRADC is to implement buttons. The bindings define
> that we should have one subnode per button, with their associated voltage
> as a property.
>
> However, there was no reg property but we still used the voltage associated
> to the button as the unit-address, which eventually generated warnings in
> DTC.
>
> Rename the node names to avoid those warnings.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 09/77] ARM: dts: sun5i: Change LRADC node names to avoid warnings
2018-11-28 3:06 ` Chen-Yu Tsai
@ 2018-11-28 10:41 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 10:41 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 11:06:19AM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > One of the usage of the LRADC is to implement buttons. The bindings define
> > that we should have one subnode per button, with their associated voltage
> > as a property.
> >
> > However, there was no reg property but we still used the voltage associated
> > to the button as the unit-address, which eventually generated warnings in
> > DTC.
> >
> > Rename the node names to avoid those warnings.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/5440dbdd/attachment-0001.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 10/77] ARM: dts: sun5i: Remove all useless pinctrl nodes
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (8 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 09/77] ARM: dts: sun5i: Change LRADC node names to avoid warnings Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 3:28 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 11/77] ARM: dts: sun5i: Remove card detect pull-up Maxime Ripard
` (67 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
The gpio pinctrl nodes are redundant and as such useless most of the times.
Since they will also generate warnings in DTC, we can simply remove most of
them.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 6 +---
arch/arm/boot/dts/sun5i-a10s-mk802.dts | 13 +------
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 6 +---
arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 6 +---
arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 14 +-------
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 7 +---
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 12 +------
arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 6 +---
arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 8 +----
arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 16 +--------
arch/arm/boot/dts/sun5i-gr8-evb.dts | 27 +-------------
arch/arm/boot/dts/sun5i-r8-chip.dts | 19 +---------
arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi | 21 +----------
13 files changed, 2 insertions(+), 159 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
index 8d4fb9331212..d5bca68ca6ca 100644
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
@@ -72,7 +72,6 @@
reg_vmmc1: vmmc1 {
compatible = "regulator-fixed";
pinctrl-names = "default";
- pinctrl-0 = <&mmc1_vcc_en_pin_t004>;
regulator-name = "vmmc1";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -139,11 +138,6 @@
bias-pull-up;
};
- mmc1_vcc_en_pin_t004: mmc1_vcc_en_pin at 0 {
- pins = "PB18";
- function = "gpio_out";
- };
-
led_pins_t004: led_pins at 0 {
pins = "PB2";
function = "gpio_out";
diff --git a/arch/arm/boot/dts/sun5i-a10s-mk802.dts b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
index dd7fd5c3d76f..b17c036293d6 100644
--- a/arch/arm/boot/dts/sun5i-a10s-mk802.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
@@ -59,8 +59,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pins_mk802>;
red {
label = "mk802:red:usr";
@@ -114,25 +112,14 @@
};
&pio {
- led_pins_mk802: led_pins at 0 {
- pins = "PB2";
- function = "gpio_out";
- };
-
mmc0_cd_pin_mk802: mmc0_cd_pin at 0 {
pins = "PG1";
function = "gpio_in";
bias-pull-up;
};
-
- usb1_vbus_pin_mk802: usb1_vbus_pin at 0 {
- pins = "PB10";
- function = "gpio_out";
- };
};
®_usb1_vbus {
- pinctrl-0 = <&usb1_vbus_pin_mk802>;
gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
index 243319e98cf7..3ffae227bab3 100644
--- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
@@ -241,11 +241,6 @@
drive-strength = <20>;
};
- usb1_vbus_pin_olinuxino_m: usb1_vbus_pin at 0 {
- pins = "PB10";
- function = "gpio_out";
- };
-
usb0_id_detect_pin: usb0_id_detect_pin at 0 {
pins = "PG12";
function = "gpio_in";
@@ -259,7 +254,6 @@
};
®_usb1_vbus {
- pinctrl-0 = <&usb1_vbus_pin_olinuxino_m>;
gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
index 034853d1c08f..1e713a42e34f 100644
--- a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
@@ -109,15 +109,9 @@
function = "gpio_out";
drive-strength = <20>;
};
-
- usb1_vbus_pin_r7: usb1_vbus_pin at 0 {
- pins = "PG13";
- function = "gpio_out";
- };
};
®_usb1_vbus {
- pinctrl-0 = <&usb1_vbus_pin_r7>;
gpio = <&pio 6 13 GPIO_ACTIVE_HIGH>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
index 3f68ef5d92a0..d8bff29f1049 100644
--- a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
@@ -61,8 +61,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pins_wobo_i5>;
blue {
label = "a10s-wobo-i5:blue:usr";
@@ -73,8 +71,6 @@
reg_emac_3v3: emac-3v3 {
compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <&emac_power_pin_wobo>;
regulator-name = "emac-3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -143,21 +139,11 @@
};
&pio {
- led_pins_wobo_i5: led_pins at 0 {
- pins = "PB2";
- function = "gpio_out";
- };
-
mmc0_cd_pin_wobo_i5: mmc0_cd_pin at 0 {
pins = "PB3";
function = "gpio_in";
bias-pull-up;
};
-
- emac_power_pin_wobo: emac_power_pin at 0 {
- pins = "PA02";
- function = "gpio_out";
- };
};
®_dcdc2 {
diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
index 24ac6f167426..f6211c22e4dc 100644
--- a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
+++ b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
@@ -144,11 +144,6 @@
function = "gpio_in";
bias-pull-up;
};
-
- usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 {
- pins = "PG1";
- function = "gpio_in";
- };
};
#include "axp209.dtsi"
@@ -202,7 +197,7 @@
&usbphy {
pinctrl-names = "default";
- pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
+ pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
usb0_vbus-supply = <®_usb0_vbus>;
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
index aa4b34fd9126..0e107ff5cff0 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
@@ -135,26 +135,14 @@
function = "gpio_in";
bias-pull-down;
};
-
- usb0_vbus_pin_olinuxinom: usb0_vbus_pin at 0 {
- pins = "PG12";
- function = "gpio_out";
- };
-
- usb1_vbus_pin_olinuxinom: usb1_vbus_pin at 0 {
- pins = "PG11";
- function = "gpio_out";
- };
};
®_usb0_vbus {
- pinctrl-0 = <&usb0_vbus_pin_olinuxinom>;
gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>;
status = "okay";
};
®_usb1_vbus {
- pinctrl-0 = <&usb1_vbus_pin_olinuxinom>;
gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
index 49dcef1090d2..d963cac2a04d 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
@@ -230,11 +230,6 @@
function = "gpio_in";
bias-pull-down;
};
-
- usb1_vbus_pin_olinuxino: usb1_vbus_pin at 0 {
- pins = "PG11";
- function = "gpio_out";
- };
};
®_usb0_vbus {
@@ -243,7 +238,6 @@
};
®_usb1_vbus {
- pinctrl-0 = <&usb1_vbus_pin_olinuxino>;
gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
index bfdd38d6bfcc..962ec29b1934 100644
--- a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
+++ b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
@@ -79,10 +79,6 @@
allwinner,pa-gpios = <&pio 6 3 GPIO_ACTIVE_HIGH>; /* PG3 */
};
-&codec_pa_pin {
- pins = "PG3";
-};
-
&mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_a>;
@@ -128,7 +124,3 @@
/* The P66 uses the uart pins as gpios */
status = "disabled";
};
-
-&usb0_vbus_pin_a {
- pins = "PB4";
-};
diff --git a/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts b/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
index c55b11a4d3c7..959dd94c7b79 100644
--- a/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
+++ b/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
@@ -79,8 +79,6 @@
mmc0_pwrseq: mmc0_pwrseq {
compatible = "mmc-pwrseq-simple";
- pinctrl-names = "default";
- pinctrl-0 = <&wifi_reg_on_pin_chip_pro>;
reset-gpios = <&pio 1 10 GPIO_ACTIVE_LOW>; /* PB10 */
};
};
@@ -157,18 +155,6 @@
status = "okay";
};
-&pio {
- usb0_id_pin_chip_pro: usb0-id-pin at 0 {
- pins = "PG2";
- function = "gpio_in";
- };
-
- wifi_reg_on_pin_chip_pro: wifi-reg-on-pin at 0 {
- pins = "PB10";
- function = "gpio_out";
- };
-};
-
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins>, <&pwm1_pins>;
@@ -253,8 +239,6 @@
};
&usbphy {
- pinctrl-names = "default";
- pinctrl-0 = <&usb0_id_pin_chip_pro>;
usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
usb0_vbus_power-supply = <&usb_power_supply>;
usb1_vbus-supply = <®_vcc5v0>;
diff --git a/arch/arm/boot/dts/sun5i-gr8-evb.dts b/arch/arm/boot/dts/sun5i-gr8-evb.dts
index e914915e73d7..5196aeff75aa 100644
--- a/arch/arm/boot/dts/sun5i-gr8-evb.dts
+++ b/arch/arm/boot/dts/sun5i-gr8-evb.dts
@@ -233,7 +233,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_gr8_evb>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -256,28 +256,6 @@
status = "okay";
};
-&pio {
- mmc0_cd_pin_gr8_evb: mmc0-cd-pin at 0 {
- pins = "PG0";
- function = "gpio_in";
- };
-
- usb0_id_pin_gr8_evb: usb0-id-pin at 0 {
- pins = "PG2";
- function = "gpio_in";
- };
-
- usb0_vbus_det_pin_gr8_evb: usb0-vbus-det-pin at 0 {
- pins = "PG1";
- function = "gpio_in";
- };
-
- usb1_vbus_pin_gr8_evb: usb1-vbus-pin at 0 {
- pins = "PG13";
- function = "gpio_out";
- };
-};
-
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins>;
@@ -310,7 +288,6 @@
};
®_usb1_vbus {
- pinctrl-0 = <&usb1_vbus_pin_gr8_evb>;
gpio = <&pio 6 13 GPIO_ACTIVE_HIGH>;
status = "okay";
};
@@ -356,8 +333,6 @@
};
&usbphy {
- pinctrl-names = "default";
- pinctrl-0 = <&usb0_id_pin_gr8_evb>, <&usb0_vbus_det_pin_gr8_evb>;
usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
usb0_vbus_power-supply = <&usb_power_supply>;
diff --git a/arch/arm/boot/dts/sun5i-r8-chip.dts b/arch/arm/boot/dts/sun5i-r8-chip.dts
index 879a4b0f3bd5..c97e46e4bb45 100644
--- a/arch/arm/boot/dts/sun5i-r8-chip.dts
+++ b/arch/arm/boot/dts/sun5i-r8-chip.dts
@@ -79,8 +79,6 @@
mmc0_pwrseq: mmc0_pwrseq {
compatible = "mmc-pwrseq-simple";
- pinctrl-names = "default";
- pinctrl-0 = <&chip_wifi_reg_on_pin>;
reset-gpios = <&pio 2 19 GPIO_ACTIVE_LOW>; /* PC19 */
};
@@ -184,20 +182,6 @@
};
&pio {
- chip_vbus_pin: chip_vbus_pin at 0 {
- pins = "PB10";
- function = "gpio_out";
- };
-
- chip_wifi_reg_on_pin: chip_wifi_reg_on_pin at 0 {
- pins = "PC19";
- function = "gpio_out";
- };
-
- chip_id_det_pin: chip_id_det_pin at 0 {
- pins = "PG2";
- function = "gpio_in";
- };
chip_w1_pin: chip_w1_pin at 0 {
pins = "PD2";
@@ -260,7 +244,6 @@
};
®_usb0_vbus {
- pinctrl-0 = <&chip_vbus_pin>;
vin-supply = <®_vcc5v0>;
gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */
status = "okay";
@@ -303,8 +286,6 @@
};
&usbphy {
- pinctrl-names = "default";
- pinctrl-0 = <&chip_id_det_pin>;
status = "okay";
usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
diff --git a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
index d2a2eb8b3f26..eafb362e3993 100644
--- a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
@@ -63,8 +63,6 @@
};
&codec {
- pinctrl-names = "default";
- pinctrl-0 = <&codec_pa_pin>;
allwinner,pa-gpios = <&pio 6 10 GPIO_ACTIVE_HIGH>; /* PG10 */
status = "okay";
};
@@ -96,8 +94,6 @@
reg = <0x40>;
interrupt-parent = <&pio>;
interrupts = <6 11 IRQ_TYPE_EDGE_FALLING>; /* EINT11 (PG11) */
- pinctrl-names = "default";
- pinctrl-0 = <&ts_power_pin>;
power-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
/* Tablet dts must provide reg and compatible */
status = "disabled";
@@ -137,24 +133,12 @@
};
&pio {
- codec_pa_pin: codec_pa_pin at 0 {
- pins = "PG10";
- function = "gpio_out";
- };
-
mmc0_cd_pin: mmc0_cd_pin at 0 {
pins = "PG0";
function = "gpio_in";
bias-pull-up;
};
- ts_power_pin: ts_power_pin {
- pins = "PB3";
- function = "gpio_out";
- drive-strength = <10>;
- bias-disable;
- };
-
usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 {
pins = "PG1";
function = "gpio_in";
@@ -166,11 +150,6 @@
function = "gpio_in";
bias-pull-up;
};
-
- usb0_vbus_pin_a: usb0_vbus_pin at 0 {
- pins = "PG12";
- function = "gpio_out";
- };
};
®_dcdc2 {
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 10/77] ARM: dts: sun5i: Remove all useless pinctrl nodes
2018-11-27 12:45 ` [PATCH 10/77] ARM: dts: sun5i: Remove all useless pinctrl nodes Maxime Ripard
@ 2018-11-28 3:28 ` Chen-Yu Tsai
2018-11-28 10:42 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 3:28 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> The gpio pinctrl nodes are redundant and as such useless most of the times.
> Since they will also generate warnings in DTC, we can simply remove most of
> them.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> ---
> arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 6 +---
> arch/arm/boot/dts/sun5i-a10s-mk802.dts | 13 +------
> arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 6 +---
> arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 6 +---
> arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 14 +-------
> arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 7 +---
> arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 12 +------
> arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 6 +---
> arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 8 +----
> arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 16 +--------
> arch/arm/boot/dts/sun5i-gr8-evb.dts | 27 +-------------
> arch/arm/boot/dts/sun5i-r8-chip.dts | 19 +---------
> arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi | 21 +----------
> 13 files changed, 2 insertions(+), 159 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
> index 8d4fb9331212..d5bca68ca6ca 100644
> --- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
> +++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
> @@ -72,7 +72,6 @@
> reg_vmmc1: vmmc1 {
> compatible = "regulator-fixed";
> pinctrl-names = "default";
You can also drop pinctrl-names? Or is it actually desired?
IIRC the pinctrl core complains if it can't find a default setting.
> - pinctrl-0 = <&mmc1_vcc_en_pin_t004>;
> regulator-name = "vmmc1";
> regulator-min-microvolt = <3300000>;
> regulator-max-microvolt = <3300000>;
> @@ -139,11 +138,6 @@
> bias-pull-up;
> };
>
> - mmc1_vcc_en_pin_t004: mmc1_vcc_en_pin at 0 {
> - pins = "PB18";
> - function = "gpio_out";
> - };
> -
> led_pins_t004: led_pins at 0 {
> pins = "PB2";
> function = "gpio_out";
> diff --git a/arch/arm/boot/dts/sun5i-a10s-mk802.dts b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
> index dd7fd5c3d76f..b17c036293d6 100644
> --- a/arch/arm/boot/dts/sun5i-a10s-mk802.dts
> +++ b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
> @@ -59,8 +59,6 @@
>
> leds {
> compatible = "gpio-leds";
> - pinctrl-names = "default";
> - pinctrl-0 = <&led_pins_mk802>;
You did remove it here.
The rest looks ok, so
Acked-by: Chen-Yu Tsai <wens@csie.org>
One thing worth noting is that the pinctrl overrides for common vbus regulators
haven't had any effect for a while since I removed the default pinctrl settings
for the GPIO pins.
^ permalink raw reply [flat|nested] 196+ messages in thread* [PATCH 10/77] ARM: dts: sun5i: Remove all useless pinctrl nodes
2018-11-28 3:28 ` Chen-Yu Tsai
@ 2018-11-28 10:42 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 10:42 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 11:28:57AM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > The gpio pinctrl nodes are redundant and as such useless most of the times.
> > Since they will also generate warnings in DTC, we can simply remove most of
> > them.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> > ---
> > arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 6 +---
> > arch/arm/boot/dts/sun5i-a10s-mk802.dts | 13 +------
> > arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 6 +---
> > arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 6 +---
> > arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 14 +-------
> > arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 7 +---
> > arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 12 +------
> > arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 6 +---
> > arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 8 +----
> > arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 16 +--------
> > arch/arm/boot/dts/sun5i-gr8-evb.dts | 27 +-------------
> > arch/arm/boot/dts/sun5i-r8-chip.dts | 19 +---------
> > arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi | 21 +----------
> > 13 files changed, 2 insertions(+), 159 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
> > index 8d4fb9331212..d5bca68ca6ca 100644
> > --- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
> > +++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
> > @@ -72,7 +72,6 @@
> > reg_vmmc1: vmmc1 {
> > compatible = "regulator-fixed";
> > pinctrl-names = "default";
>
> You can also drop pinctrl-names? Or is it actually desired?
> IIRC the pinctrl core complains if it can't find a default setting.
Yeah, I just forgot to remove this one. I've fixed it, and applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/75632566/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 11/77] ARM: dts: sun5i: Remove card detect pull-up
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (9 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 10/77] ARM: dts: sun5i: Remove all useless pinctrl nodes Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 3:29 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 12/77] ARM: dts: sun5i: Change pinctrl nodes to avoid warning Maxime Ripard
` (66 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Boards usually have an external pull-up on the card-detect signal, so
there's no need to add another one.
This also removes a DTC warning.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 8 +------
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 8 +------
arch/arm/boot/dts/sun5i-a10s-mk802.dts | 10 +-------
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 16 +----------
arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 8 +------
arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 10 +-------
arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts | 8 +------
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 8 +------
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 8 +------
arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 8 +------
arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi | 8 +------
11 files changed, 12 insertions(+), 88 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
index 39504d720efc..9e076e748b78 100644
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
@@ -90,7 +90,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_t003>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -106,12 +106,6 @@
};
&pio {
- mmc0_cd_pin_t003: mmc0_cd_pin at 0 {
- pins = "PG1";
- function = "gpio_in";
- bias-pull-up;
- };
-
led_pins_t003: led_pins at 0 {
pins = "PB2";
function = "gpio_out";
diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
index d5bca68ca6ca..61d0bab8cbbd 100644
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
@@ -100,7 +100,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_t004>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -132,12 +132,6 @@
bias-pull-up;
};
- mmc0_cd_pin_t004: mmc0_cd_pin at 0 {
- pins = "PG1";
- function = "gpio_in";
- bias-pull-up;
- };
-
led_pins_t004: led_pins at 0 {
pins = "PB2";
function = "gpio_out";
diff --git a/arch/arm/boot/dts/sun5i-a10s-mk802.dts b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
index b17c036293d6..822f1b2ac6d3 100644
--- a/arch/arm/boot/dts/sun5i-a10s-mk802.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
@@ -87,7 +87,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_mk802>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -111,14 +111,6 @@
status = "okay";
};
-&pio {
- mmc0_cd_pin_mk802: mmc0_cd_pin at 0 {
- pins = "PG1";
- function = "gpio_in";
- bias-pull-up;
- };
-};
-
®_usb1_vbus {
gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */
status = "okay";
diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
index 3ffae227bab3..15889639a841 100644
--- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
@@ -198,7 +198,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino_micro>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -207,7 +207,7 @@
&mmc1 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins_a>, <&mmc1_cd_pin_olinuxino_micro>;
+ pinctrl-0 = <&mmc1_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 13 GPIO_ACTIVE_LOW>; /* PG13 */
@@ -223,18 +223,6 @@
};
&pio {
- mmc0_cd_pin_olinuxino_micro: mmc0_cd_pin at 0 {
- pins = "PG1";
- function = "gpio_in";
- bias-pull-up;
- };
-
- mmc1_cd_pin_olinuxino_micro: mmc1_cd_pin at 0 {
- pins = "PG13";
- function = "gpio_in";
- bias-pull-up;
- };
-
led_pins_olinuxino: led_pins at 0 {
pins = "PE3";
function = "gpio_out";
diff --git a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
index 1e713a42e34f..ba2d2e604d54 100644
--- a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
@@ -77,7 +77,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_r7>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -98,12 +98,6 @@
};
&pio {
- mmc0_cd_pin_r7: mmc0_cd_pin at 0 {
- pins = "PG1";
- function = "gpio_in";
- bias-pull-up;
- };
-
led_pins_r7: led_pins at 0 {
pins = "PB2";
function = "gpio_out";
diff --git a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
index d8bff29f1049..69581f8c4e8f 100644
--- a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
@@ -123,7 +123,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_wobo_i5>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 1 3 GPIO_ACTIVE_LOW>; /* PB3 */
@@ -138,14 +138,6 @@
status = "okay";
};
-&pio {
- mmc0_cd_pin_wobo_i5: mmc0_cd_pin at 0 {
- pins = "PB3";
- function = "gpio_in";
- bias-pull-up;
- };
-};
-
®_dcdc2 {
regulator-always-on;
regulator-min-microvolt = <1000000>;
diff --git a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
index 30a86cadf5a5..4b892f609240 100644
--- a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
+++ b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
@@ -122,7 +122,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_d709>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -134,12 +134,6 @@
};
&pio {
- mmc0_cd_pin_d709: mmc0_cd_pin at 0 {
- pins = "PG0";
- function = "gpio_in";
- bias-pull-up;
- };
-
usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 {
pins = "PG1";
function = "gpio_in";
diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
index f6211c22e4dc..ff845f48c832 100644
--- a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
+++ b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
@@ -117,7 +117,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_h702>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -133,12 +133,6 @@
};
&pio {
- mmc0_cd_pin_h702: mmc0_cd_pin at 0 {
- pins = "PG0";
- function = "gpio_in";
- bias-pull-up;
- };
-
usb0_id_detect_pin: usb0_id_detect_pin at 0 {
pins = "PG2";
function = "gpio_in";
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
index 0e107ff5cff0..8d104a0395dd 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
@@ -96,7 +96,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxinom>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -112,12 +112,6 @@
};
&pio {
- mmc0_cd_pin_olinuxinom: mmc0_cd_pin at 0 {
- pins = "PG0";
- function = "gpio_in";
- bias-pull-up;
- };
-
led_pins_olinuxinom: led_pins at 0 {
pins = "PG9";
function = "gpio_out";
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
index d963cac2a04d..1703b5379f6b 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
@@ -191,7 +191,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -207,12 +207,6 @@
};
&pio {
- mmc0_cd_pin_olinuxino: mmc0_cd_pin at 0 {
- pins = "PG0";
- function = "gpio_in";
- bias-pull-up;
- };
-
led_pins_olinuxino: led_pins at 0 {
pins = "PG9";
function = "gpio_out";
diff --git a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
index eafb362e3993..12c80be63693 100644
--- a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
@@ -121,7 +121,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v0>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -133,12 +133,6 @@
};
&pio {
- mmc0_cd_pin: mmc0_cd_pin at 0 {
- pins = "PG0";
- function = "gpio_in";
- bias-pull-up;
- };
-
usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 {
pins = "PG1";
function = "gpio_in";
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 12/77] ARM: dts: sun5i: Change pinctrl nodes to avoid warning
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (10 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 11/77] ARM: dts: sun5i: Remove card detect pull-up Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 3:34 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 13/77] ARM: dts: sun5i: a10s: Fix HDMI output DTC warning Maxime Ripard
` (65 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
All our pinctrl nodes were using a node name convention with a unit-address
to differentiate the different muxing options. However, since those nodes
didn't have a reg property, they were generating warnings in DTC.
In order to accomodate for this, convert the old nodes to the syntax we've
been using for the new SoCs, including removing the letter suffix of the
node labels to the bank of those pins to make things more readable.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 6 +-
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 8 +-
arch/arm/boot/dts/sun5i-a10s-mk802.dts | 8 +-
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 22 +++---
arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 6 +-
arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 8 +-
arch/arm/boot/dts/sun5i-a10s.dtsi | 12 +--
arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts | 10 +--
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 10 +--
arch/arm/boot/dts/sun5i-a13-licheepi-one.dts | 12 +--
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 10 +--
arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 10 +--
arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 2 +-
arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 18 ++---
arch/arm/boot/dts/sun5i-gr8-evb.dts | 20 ++---
arch/arm/boot/dts/sun5i-gr8.dtsi | 10 +--
arch/arm/boot/dts/sun5i-r8-chip.dts | 18 ++---
arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi | 12 ++-
arch/arm/boot/dts/sun5i.dtsi | 44 +++++------
19 files changed, 127 insertions(+), 119 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
index 9e076e748b78..30c8e7b5fabc 100644
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
@@ -76,7 +76,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp152: pmic at 30 {
@@ -90,7 +90,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -125,7 +125,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
index 61d0bab8cbbd..781be07547a3 100644
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
@@ -86,7 +86,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp152: pmic at 30 {
@@ -100,7 +100,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -109,7 +109,7 @@
&mmc1 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins_a>;
+ pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <®_vmmc1>;
bus-width = <4>;
non-removable;
@@ -146,7 +146,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun5i-a10s-mk802.dts b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
index 822f1b2ac6d3..06b876c50f15 100644
--- a/arch/arm/boot/dts/sun5i-a10s-mk802.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
@@ -73,7 +73,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp152: pmic at 30 {
@@ -87,7 +87,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -96,7 +96,7 @@
&mmc1 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins_a>;
+ pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
non-removable;
@@ -118,7 +118,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
index 15889639a841..b1fe1226cb1e 100644
--- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
@@ -97,7 +97,7 @@
&emac {
pinctrl-names = "default";
- pinctrl-0 = <&emac_pins_b>;
+ pinctrl-0 = <&emac_pa_pins>;
phy = <&phy1>;
status = "okay";
};
@@ -118,7 +118,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp152: pmic at 30 {
@@ -131,7 +131,7 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
at24 at 50 {
@@ -144,7 +144,7 @@
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
@@ -198,7 +198,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -207,7 +207,7 @@
&mmc1 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins_a>;
+ pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 13 GPIO_ACTIVE_LOW>; /* PG13 */
@@ -248,8 +248,8 @@
&spi2 {
pinctrl-names = "default";
- pinctrl-0 = <&spi2_pins_b>,
- <&spi2_cs0_pins_b>;
+ pinctrl-0 = <&spi2_pb_pins>,
+ <&spi2_cs0_pb_pin>;
status = "okay";
};
@@ -259,19 +259,19 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
&uart2 {
pinctrl-names = "default";
- pinctrl-0 = <&uart2_pins_b>;
+ pinctrl-0 = <&uart2_pc_pins>;
status = "okay";
};
&uart3 {
pinctrl-names = "default";
- pinctrl-0 = <&uart3_pins_a>;
+ pinctrl-0 = <&uart3_pg_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
index ba2d2e604d54..a32025e57592 100644
--- a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
@@ -77,7 +77,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -86,7 +86,7 @@
&mmc1 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins_a>;
+ pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
non-removable;
@@ -112,7 +112,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
index 69581f8c4e8f..5683cc483a49 100644
--- a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
@@ -90,7 +90,7 @@
&emac {
pinctrl-names = "default";
- pinctrl-0 = <&emac_pins_a>;
+ pinctrl-0 = <&emac_pd_pins>;
phy = <&phy1>;
status = "okay";
};
@@ -101,7 +101,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -123,7 +123,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 1 3 GPIO_ACTIVE_LOW>; /* PB3 */
@@ -184,7 +184,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index 195a6a1d2c49..7b44a227ba60 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -124,17 +124,17 @@
&pio {
compatible = "allwinner,sun5i-a10s-pinctrl";
- uart0_pins_a: uart0 at 0 {
+ uart0_pb_pins: uart0-pb-pins {
pins = "PB19", "PB20";
function = "uart0";
};
- uart2_pins_b: uart2 at 1 {
+ uart2_pc_pins: uart2-pc-pins {
pins = "PC18", "PC19";
function = "uart2";
};
- emac_pins_b: emac0 at 1 {
+ emac_pa_pins: emac-pa-pins {
pins = "PA0", "PA1", "PA2",
"PA3", "PA4", "PA5", "PA6",
"PA7", "PA8", "PA9", "PA10",
@@ -143,19 +143,19 @@
function = "emac";
};
- mmc1_pins_a: mmc1 at 0 {
+ mmc1_pins: mmc1-pins {
pins = "PG3", "PG4", "PG5",
"PG6", "PG7", "PG8";
function = "mmc1";
drive-strength = <30>;
};
- spi2_pins_b: spi2 at 1 {
+ spi2_pb_pins: spi2-pb-pins {
pins = "PB12", "PB13", "PB14";
function = "spi2";
};
- spi2_cs0_pins_b: spi2_cs0 at 1 {
+ spi2_cs0_pb_pin: spi2-cs0-pb-pin {
pins = "PB11";
function = "spi2";
};
diff --git a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
index 4b892f609240..34c932564daf 100644
--- a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
+++ b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
@@ -79,7 +79,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -92,7 +92,7 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
pcf8563: rtc at 51 {
@@ -122,7 +122,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -149,7 +149,7 @@
&pwm {
pinctrl-names = "default";
- pinctrl-0 = <&pwm0_pins>;
+ pinctrl-0 = <&pwm0_pin>;
status = "okay";
};
@@ -191,7 +191,7 @@
&uart1 {
pinctrl-names = "default";
- pinctrl-0 = <&uart1_pins_b>;
+ pinctrl-0 = <&uart1_pg_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
index ff845f48c832..4f5b1247a427 100644
--- a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
+++ b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
@@ -70,7 +70,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -81,7 +81,7 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
pcf8563: rtc at 51 {
@@ -92,7 +92,7 @@
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
@@ -117,7 +117,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -180,7 +180,7 @@
&uart1 {
pinctrl-names = "default";
- pinctrl-0 = <&uart1_pins_b>;
+ pinctrl-0 = <&uart1_pg_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun5i-a13-licheepi-one.dts b/arch/arm/boot/dts/sun5i-a13-licheepi-one.dts
index 93a080e7ba2d..f2ecd81a3183 100644
--- a/arch/arm/boot/dts/sun5i-a13-licheepi-one.dts
+++ b/arch/arm/boot/dts/sun5i-a13-licheepi-one.dts
@@ -95,7 +95,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -110,13 +110,13 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "disabled";
};
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "disabled";
};
@@ -134,7 +134,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
broken-cd;
@@ -143,7 +143,7 @@
&mmc2 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc2_4bit_pins_a>;
+ pinctrl-0 = <&mmc2_4bit_pc_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
broken-cd;
@@ -204,7 +204,7 @@
&uart1 {
pinctrl-names = "default";
- pinctrl-0 = <&uart1_pins_b>;
+ pinctrl-0 = <&uart1_pg_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
index 8d104a0395dd..70445d28c20a 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
@@ -78,25 +78,25 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
};
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -143,7 +143,7 @@
&uart1 {
pinctrl-names = "default";
- pinctrl-0 = <&uart1_pins_b>;
+ pinctrl-0 = <&uart1_pg_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
index 1703b5379f6b..8855ddb78e0b 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
@@ -124,7 +124,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -139,13 +139,13 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
@@ -191,7 +191,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -251,7 +251,7 @@
&uart1 {
pinctrl-names = "default";
- pinctrl-0 = <&uart1_pins_b>;
+ pinctrl-0 = <&uart1_pg_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
index 962ec29b1934..31a4b61f1d75 100644
--- a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
+++ b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
@@ -81,7 +81,7 @@
&mmc2 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc2_pins_a>;
+ pinctrl-0 = <&mmc2_8bit_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <8>;
non-removable;
diff --git a/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts b/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
index 959dd94c7b79..7a5ba22c7354 100644
--- a/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
+++ b/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
@@ -93,7 +93,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -113,19 +113,19 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "disabled";
};
&i2s0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2s0_mclk_pins_a>, <&i2s0_data_pins_a>;
+ pinctrl-0 = <&i2s0_mclk_pin>, <&i2s0_data_pins>;
status = "disabled";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
mmc-pwrseq = <&mmc0_pwrseq>;
bus-width = <4>;
@@ -135,7 +135,7 @@
&nfc {
pinctrl-names = "default";
- pinctrl-0 = <&nand_pins_a &nand_cs0_pins_a &nand_rb0_pins_a>;
+ pinctrl-0 = <&nand_pins &nand_cs0_pin &nand_rb0_pin>;
status = "okay";
nand at 0 {
@@ -157,7 +157,7 @@
&pwm {
pinctrl-names = "default";
- pinctrl-0 = <&pwm0_pins>, <&pwm1_pins>;
+ pinctrl-0 = <&pwm0_pin>, <&pwm1_pins>;
status = "disabled";
};
@@ -206,19 +206,19 @@
&uart1 {
pinctrl-names = "default";
- pinctrl-0 = <&uart1_pins_b>, <&uart1_cts_rts_pins_a>;
+ pinctrl-0 = <&uart1_pg_pins>, <&uart1_cts_rts_pins>;
status = "okay";
};
&uart2 {
pinctrl-names = "default";
- pinctrl-0 = <&uart2_pins_a>, <&uart2_cts_rts_pins_a>;
+ pinctrl-0 = <&uart2_pd_pins>, <&uart2_cts_rts_pd_pins>;
status = "disabled";
};
&uart3 {
pinctrl-names = "default";
- pinctrl-0 = <&uart3_pins_a>, <&uart3_cts_rts_pins_a>;
+ pinctrl-0 = <&uart3_pg_pins>, <&uart3_cts_rts_pg_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun5i-gr8-evb.dts b/arch/arm/boot/dts/sun5i-gr8-evb.dts
index 5196aeff75aa..ea1711a31cce 100644
--- a/arch/arm/boot/dts/sun5i-gr8-evb.dts
+++ b/arch/arm/boot/dts/sun5i-gr8-evb.dts
@@ -124,7 +124,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -144,7 +144,7 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
wm8978: codec at 1a {
@@ -161,19 +161,19 @@
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
&i2s0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2s0_mclk_pins_a>, <&i2s0_data_pins_a>;
+ pinctrl-0 = <&i2s0_mclk_pin>, <&i2s0_data_pins>;
status = "okay";
};
&ir0 {
pinctrl-names = "default";
- pinctrl-0 = <&ir0_rx_pins_a>;
+ pinctrl-0 = <&ir0_rx_pin>;
status = "okay";
};
@@ -233,7 +233,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -242,7 +242,7 @@
&nfc {
pinctrl-names = "default";
- pinctrl-0 = <&nand_pins_a &nand_cs0_pins_a &nand_rb0_pins_a>;
+ pinctrl-0 = <&nand_pins &nand_cs0_pin &nand_rb0_pin>;
/* MLC Support sucks for now */
status = "disabled";
@@ -258,7 +258,7 @@
&pwm {
pinctrl-names = "default";
- pinctrl-0 = <&pwm0_pins>;
+ pinctrl-0 = <&pwm0_pin>;
status = "okay";
};
@@ -298,7 +298,7 @@
&spdif {
pinctrl-names = "default";
- pinctrl-0 = <&spdif_tx_pins_a>;
+ pinctrl-0 = <&spdif_tx_pin>;
status = "okay";
};
@@ -308,7 +308,7 @@
&uart1 {
pinctrl-names = "default";
- pinctrl-0 = <&uart1_pins_b>, <&uart1_cts_rts_pins_a>;
+ pinctrl-0 = <&uart1_pg_pins>, <&uart1_cts_rts_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun5i-gr8.dtsi b/arch/arm/boot/dts/sun5i-gr8.dtsi
index d3eea4cfe442..98a8fd5e89e8 100644
--- a/arch/arm/boot/dts/sun5i-gr8.dtsi
+++ b/arch/arm/boot/dts/sun5i-gr8.dtsi
@@ -98,28 +98,28 @@
&pio {
compatible = "nextthing,gr8-pinctrl";
- i2s0_data_pins_a: i2s0-data at 0 {
+ i2s0_data_pins: i2s0-data-pins {
pins = "PB6", "PB7", "PB8", "PB9";
function = "i2s0";
};
- i2s0_mclk_pins_a: i2s0-mclk at 0 {
+ i2s0_mclk_pin: i2s0-mclk-pin {
pins = "PB5";
function = "i2s0";
};
- pwm1_pins: pwm1 {
+ pwm1_pins: pwm1-pin {
pins = "PG13";
function = "pwm1";
};
- spdif_tx_pins_a: spdif at 0 {
+ spdif_tx_pin: spdif-tx-pin {
pins = "PB10";
function = "spdif";
bias-pull-up;
};
- uart1_cts_rts_pins_a: uart1-cts-rts at 0 {
+ uart1_cts_rts_pins: uart1-cts-rts-pins {
pins = "PG5", "PG6";
function = "uart1";
};
diff --git a/arch/arm/boot/dts/sun5i-r8-chip.dts b/arch/arm/boot/dts/sun5i-r8-chip.dts
index c97e46e4bb45..a913084c8d20 100644
--- a/arch/arm/boot/dts/sun5i-r8-chip.dts
+++ b/arch/arm/boot/dts/sun5i-r8-chip.dts
@@ -108,7 +108,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -136,13 +136,13 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "disabled";
};
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
xio: gpio at 38 {
@@ -159,13 +159,13 @@
};
};
-&mmc0_pins_a {
+&mmc0_pins {
bias-pull-up;
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
mmc-pwrseq = <&mmc0_pwrseq>;
bus-width = <4>;
@@ -251,7 +251,7 @@
&spi2 {
pinctrl-names = "default";
- pinctrl-0 = <&spi2_pins_a>;
+ pinctrl-0 = <&spi2_pe_pins>;
status = "disabled";
};
@@ -265,14 +265,14 @@
&uart1 {
pinctrl-names = "default";
- pinctrl-0 = <&uart1_pins_b>;
+ pinctrl-0 = <&uart1_pg_pins>;
status = "okay";
};
&uart3 {
pinctrl-names = "default";
- pinctrl-0 = <&uart3_pins_a>,
- <&uart3_cts_rts_pins_a>;
+ pinctrl-0 = <&uart3_pg_pins>,
+ <&uart3_cts_rts_pg_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
index 12c80be63693..ca7556177c1b 100644
--- a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
@@ -76,6 +76,8 @@
};
&i2c0 {
+ pinctrl-0 = <&i2c0_pins>;
+
axp209: pmic at 34 {
reg = <0x34>;
interrupts = <0>;
@@ -83,6 +85,8 @@
};
&i2c1 {
+ pinctrl-0 = <&i2c1_pins>;
+
/*
* The gsl1680 is rated at 400KHz and it will not work reliable at
* 100KHz, this has been confirmed on multiple different q8 tablets.
@@ -121,7 +125,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v0>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -146,6 +150,10 @@
};
};
+&pwm {
+ pinctrl-0 = <&pwm0_pin>;
+};
+
®_dcdc2 {
regulator-always-on;
regulator-min-microvolt = <1000000>;
@@ -184,7 +192,7 @@
&uart1 {
pinctrl-names = "default";
- pinctrl-0 = <&uart1_pins_b>;
+ pinctrl-0 = <&uart1_pg_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index 4ea6e1867186..acf143317540 100644
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -440,7 +440,7 @@
#interrupt-cells = <3>;
#gpio-cells = <3>;
- emac_pins_a: emac0 at 0 {
+ emac_pd_pins: emac-pd-pins {
pins = "PD6", "PD7", "PD10",
"PD11", "PD12", "PD13", "PD14",
"PD15", "PD18", "PD19", "PD20",
@@ -449,27 +449,27 @@
function = "emac";
};
- i2c0_pins_a: i2c0 at 0 {
+ i2c0_pins: i2c0-pins {
pins = "PB0", "PB1";
function = "i2c0";
};
- i2c1_pins_a: i2c1 at 0 {
+ i2c1_pins: i2c1-pins {
pins = "PB15", "PB16";
function = "i2c1";
};
- i2c2_pins_a: i2c2 at 0 {
+ i2c2_pins: i2c2-pins {
pins = "PB17", "PB18";
function = "i2c2";
};
- ir0_rx_pins_a: ir0 at 0 {
+ ir0_rx_pin: ir0-rx-pin {
pins = "PB4";
function = "ir0";
};
- lcd_rgb565_pins: lcd_rgb565 at 0 {
+ lcd_rgb565_pins: lcd-rgb565-pins {
pins = "PD3", "PD4", "PD5", "PD6", "PD7",
"PD10", "PD11", "PD12", "PD13", "PD14", "PD15",
"PD19", "PD20", "PD21", "PD22", "PD23",
@@ -477,7 +477,7 @@
function = "lcd0";
};
- lcd_rgb666_pins: lcd_rgb666 at 0 {
+ lcd_rgb666_pins: lcd-rgb666-pins {
pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7",
"PD10", "PD11", "PD12", "PD13", "PD14", "PD15",
"PD18", "PD19", "PD20", "PD21", "PD22", "PD23",
@@ -485,7 +485,7 @@
function = "lcd0";
};
- mmc0_pins_a: mmc0 at 0 {
+ mmc0_pins: mmc0-pins {
pins = "PF0", "PF1", "PF2", "PF3",
"PF4", "PF5";
function = "mmc0";
@@ -493,7 +493,7 @@
bias-pull-up;
};
- mmc2_pins_a: mmc2 at 0 {
+ mmc2_8bit_pins: mmc2-8bit-pins {
pins = "PC6", "PC7", "PC8", "PC9",
"PC10", "PC11", "PC12", "PC13",
"PC14", "PC15";
@@ -502,7 +502,7 @@
bias-pull-up;
};
- mmc2_4bit_pins_a: mmc2-4bit at 0 {
+ mmc2_4bit_pc_pins: mmc2-4bit-pc-pins {
pins = "PC6", "PC7", "PC8", "PC9",
"PC10", "PC11";
function = "mmc2";
@@ -510,7 +510,7 @@
bias-pull-up;
};
- nand_pins_a: nand-base0 at 0 {
+ nand_pins: nand-pins {
pins = "PC0", "PC1", "PC2",
"PC5", "PC8", "PC9", "PC10",
"PC11", "PC12", "PC13", "PC14",
@@ -518,57 +518,57 @@
function = "nand0";
};
- nand_cs0_pins_a: nand-cs at 0 {
+ nand_cs0_pin: nand-cs0-pin {
pins = "PC4";
function = "nand0";
};
- nand_rb0_pins_a: nand-rb at 0 {
+ nand_rb0_pin: nand-rb0-pin {
pins = "PC6";
function = "nand0";
};
- spi2_pins_a: spi2 at 0 {
+ spi2_pe_pins: spi2-pe-pins {
pins = "PE1", "PE2", "PE3";
function = "spi2";
};
- spi2_cs0_pins_a: spi2-cs0 at 0 {
+ spi2_cs0_pe_pin: spi2-cs0-pe-pin {
pins = "PE0";
function = "spi2";
};
- uart1_pins_a: uart1 at 0 {
+ uart1_pe_pins: uart1-pe-pins {
pins = "PE10", "PE11";
function = "uart1";
};
- uart1_pins_b: uart1 at 1 {
+ uart1_pg_pins: uart1-pg-pins {
pins = "PG3", "PG4";
function = "uart1";
};
- uart2_pins_a: uart2 at 0 {
+ uart2_pd_pins: uart2-pd-pins {
pins = "PD2", "PD3";
function = "uart2";
};
- uart2_cts_rts_pins_a: uart2-cts-rts at 0 {
+ uart2_cts_rts_pd_pins: uart2-cts-rts-pd-pins {
pins = "PD4", "PD5";
function = "uart2";
};
- uart3_pins_a: uart3 at 0 {
+ uart3_pg_pins: uart3-pg-pins {
pins = "PG9", "PG10";
function = "uart3";
};
- uart3_cts_rts_pins_a: uart3-cts-rts at 0 {
+ uart3_cts_rts_pg_pins: uart3-cts-rts-pg-pins {
pins = "PG11", "PG12";
function = "uart3";
};
- pwm0_pins: pwm0 {
+ pwm0_pin: pwm0-pin {
pins = "PB2";
function = "pwm";
};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 12/77] ARM: dts: sun5i: Change pinctrl nodes to avoid warning
2018-11-27 12:45 ` [PATCH 12/77] ARM: dts: sun5i: Change pinctrl nodes to avoid warning Maxime Ripard
@ 2018-11-28 3:34 ` Chen-Yu Tsai
2018-11-28 10:42 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 3:34 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> All our pinctrl nodes were using a node name convention with a unit-address
> to differentiate the different muxing options. However, since those nodes
> didn't have a reg property, they were generating warnings in DTC.
>
> In order to accomodate for this, convert the old nodes to the syntax we've
> been using for the new SoCs, including removing the letter suffix of the
> node labels to the bank of those pins to make things more readable.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 12/77] ARM: dts: sun5i: Change pinctrl nodes to avoid warning
2018-11-28 3:34 ` Chen-Yu Tsai
@ 2018-11-28 10:42 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 10:42 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 11:34:37AM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > All our pinctrl nodes were using a node name convention with a unit-address
> > to differentiate the different muxing options. However, since those nodes
> > didn't have a reg property, they were generating warnings in DTC.
> >
> > In order to accomodate for this, convert the old nodes to the syntax we've
> > been using for the new SoCs, including removing the letter suffix of the
> > node labels to the bank of those pins to make things more readable.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/ffe34c2d/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 13/77] ARM: dts: sun5i: a10s: Fix HDMI output DTC warning
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (11 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 12/77] ARM: dts: sun5i: Change pinctrl nodes to avoid warning Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 3:29 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 14/77] ARM: dts: sunxi: Change default CMA pool node name Maxime Ripard
` (64 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Our HDMI output endpoint on the A10s DTSI has a warning under DTC: "graph
node has single child node 'endpoint', #address-cells/#size-cells are not
necessary". Fix this by removing those properties.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun5i-a10s.dtsi | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index 7b44a227ba60..d9fdcd41faa7 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -100,8 +100,6 @@
};
hdmi_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
};
};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 14/77] ARM: dts: sunxi: Change default CMA pool node name
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (12 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 13/77] ARM: dts: sun5i: a10s: Fix HDMI output DTC warning Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:22 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 15/77] ARM: dts: sunxi: Remove the CMA node label Maxime Ripard
` (63 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
The CMA node has a unit address, but no reg property which generates a
warning in DTC. Change the node name to reflect its usage and drop the unit
address.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
Documentation/devicetree/bindings/media/cedrus.txt | 2 +-
arch/arm/boot/dts/sun5i.dtsi | 2 +-
arch/arm/boot/dts/sun7i-a20.dtsi | 2 +-
arch/arm/boot/dts/sun8i-a33.dtsi | 2 +-
arch/arm/boot/dts/sun8i-h3.dtsi | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/media/cedrus.txt b/Documentation/devicetree/bindings/media/cedrus.txt
index a089a0c1ff05..33833a43fff8 100644
--- a/Documentation/devicetree/bindings/media/cedrus.txt
+++ b/Documentation/devicetree/bindings/media/cedrus.txt
@@ -31,7 +31,7 @@ reserved-memory {
ranges;
/* Address must be kept in the lower 256 MiBs of DRAM for VE. */
- cma_pool: cma at 4a000000 {
+ cma_pool: default-pool {
compatible = "shared-dma-pool";
size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>;
diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index acf143317540..307c6790b227 100644
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -114,7 +114,7 @@
ranges;
/* Address must be kept in the lower 256 MiBs of DRAM for VE. */
- cma_pool: cma at 4a000000 {
+ cma_pool: default-pool {
compatible = "shared-dma-pool";
size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>;
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index b4fd4f5ca66b..f7dcf8d21fd2 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -181,7 +181,7 @@
ranges;
/* Address must be kept in the lower 256 MiBs of DRAM for VE. */
- cma_pool: cma at 4a000000 {
+ cma_pool: default-pool {
compatible = "shared-dma-pool";
size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>;
diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi
index 502de6f44a9a..a8b2c4d14f99 100644
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@ -196,7 +196,7 @@
ranges;
/* Address must be kept in the lower 256 MiBs of DRAM for VE. */
- cma_pool: cma at 4a000000 {
+ cma_pool: default-pool {
compatible = "shared-dma-pool";
size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>;
diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi
index 3ecfabb10151..b3921c5171ed 100644
--- a/arch/arm/boot/dts/sun8i-h3.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi
@@ -124,7 +124,7 @@
#size-cells = <1>;
ranges;
- cma_pool: cma at 4a000000 {
+ cma_pool: default-pool {
compatible = "shared-dma-pool";
size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 15/77] ARM: dts: sunxi: Remove the CMA node label
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (13 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 14/77] ARM: dts: sunxi: Change default CMA pool node name Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:25 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 16/77] ARM: dts: sun5i: Remove underscores from nodes names Maxime Ripard
` (62 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
There's no phandle pointing to the CMA pool, so it's label is unnecessary.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun5i.dtsi | 2 +-
arch/arm/boot/dts/sun7i-a20.dtsi | 2 +-
arch/arm/boot/dts/sun8i-a33.dtsi | 2 +-
arch/arm/boot/dts/sun8i-h3.dtsi | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index 307c6790b227..b6b67d84ddda 100644
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -114,7 +114,7 @@
ranges;
/* Address must be kept in the lower 256 MiBs of DRAM for VE. */
- cma_pool: default-pool {
+ default-pool {
compatible = "shared-dma-pool";
size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>;
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index f7dcf8d21fd2..1ca1fdff2288 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -181,7 +181,7 @@
ranges;
/* Address must be kept in the lower 256 MiBs of DRAM for VE. */
- cma_pool: default-pool {
+ default-pool {
compatible = "shared-dma-pool";
size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>;
diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi
index a8b2c4d14f99..1c4f7e1930d8 100644
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@ -196,7 +196,7 @@
ranges;
/* Address must be kept in the lower 256 MiBs of DRAM for VE. */
- cma_pool: default-pool {
+ default-pool {
compatible = "shared-dma-pool";
size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>;
diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi
index b3921c5171ed..22883f1b80e2 100644
--- a/arch/arm/boot/dts/sun8i-h3.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi
@@ -124,7 +124,7 @@
#size-cells = <1>;
ranges;
- cma_pool: default-pool {
+ default-pool {
compatible = "shared-dma-pool";
size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 16/77] ARM: dts: sun5i: Remove underscores from nodes names
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (14 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 15/77] ARM: dts: sunxi: Remove the CMA node label Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:25 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 17/77] ARM: dts: sunxi: Change LRADC node names to avoid warnings Maxime Ripard
` (61 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Some GPIO pinctrl nodes cannot be easily removed, because they would also
change the pin configuration, for example to add a pull resistor or change
the current delivered by the pin.
Those nodes still have underscores and unit-addresses in their node names
in our DTs, so adjust their name to remove the warnings. Use that occasion
to also fix some poorly chosen node-names.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 2 +-
arch/arm/boot/dts/sun5i-r8-chip.dts | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
index 31a4b61f1d75..abc8402fe04e 100644
--- a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
+++ b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
@@ -58,7 +58,7 @@
/delete-property/stdout-path;
};
- i2c_lcd: i2c at 0 {
+ i2c_lcd: i2c-gpio {
/* The lcd panel i2c interface is hooked up via gpios */
compatible = "i2c-gpio";
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/sun5i-r8-chip.dts b/arch/arm/boot/dts/sun5i-r8-chip.dts
index a913084c8d20..3c9f4f35d43b 100644
--- a/arch/arm/boot/dts/sun5i-r8-chip.dts
+++ b/arch/arm/boot/dts/sun5i-r8-chip.dts
@@ -182,8 +182,7 @@
};
&pio {
-
- chip_w1_pin: chip_w1_pin at 0 {
+ chip_w1_pin: chip-w1-pin {
pins = "PD2";
function = "gpio_in";
bias-pull-up;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 16/77] ARM: dts: sun5i: Remove underscores from nodes names
2018-11-27 12:45 ` [PATCH 16/77] ARM: dts: sun5i: Remove underscores from nodes names Maxime Ripard
@ 2018-11-28 11:25 ` Chen-Yu Tsai
2018-11-28 13:36 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 11:25 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Some GPIO pinctrl nodes cannot be easily removed, because they would also
> change the pin configuration, for example to add a pull resistor or change
> the current delivered by the pin.
>
> Those nodes still have underscores and unit-addresses in their node names
> in our DTs, so adjust their name to remove the warnings. Use that occasion
> to also fix some poorly chosen node-names.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 16/77] ARM: dts: sun5i: Remove underscores from nodes names
2018-11-28 11:25 ` Chen-Yu Tsai
@ 2018-11-28 13:36 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 13:36 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 07:25:43PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > Some GPIO pinctrl nodes cannot be easily removed, because they would also
> > change the pin configuration, for example to add a pull resistor or change
> > the current delivered by the pin.
> >
> > Those nodes still have underscores and unit-addresses in their node names
> > in our DTs, so adjust their name to remove the warnings. Use that occasion
> > to also fix some poorly chosen node-names.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/fbd15558/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 17/77] ARM: dts: sunxi: Change LRADC node names to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (15 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 16/77] ARM: dts: sun5i: Remove underscores from nodes names Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:26 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 18/77] ARM: dts: sun5i: Fix Display Engine DTC warnings Maxime Ripard
` (60 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
One of the usage of the LRADC is to implement buttons. The bindings define
that we should have one subnode per button, with their associated voltage
as a property.
However, there was no reg property but we still used the voltage associated
to the button as the unit-address, which eventually generated warnings in
DTC.
Rename the node names to avoid those warnings.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi b/arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi
index 245d0bcde441..00dc6623f30f 100644
--- a/arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi
@@ -60,14 +60,14 @@
vref-supply = <®_vcc3v0>;
status = "okay";
- button at 200 {
+ button-200 {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
channel = <0>;
voltage = <200000>;
};
- button at 400 {
+ button-400 {
label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>;
channel = <0>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 17/77] ARM: dts: sunxi: Change LRADC node names to avoid warnings
2018-11-27 12:45 ` [PATCH 17/77] ARM: dts: sunxi: Change LRADC node names to avoid warnings Maxime Ripard
@ 2018-11-28 11:26 ` Chen-Yu Tsai
2018-11-28 13:37 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 11:26 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> One of the usage of the LRADC is to implement buttons. The bindings define
> that we should have one subnode per button, with their associated voltage
> as a property.
>
> However, there was no reg property but we still used the voltage associated
> to the button as the unit-address, which eventually generated warnings in
> DTC.
>
> Rename the node names to avoid those warnings.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 17/77] ARM: dts: sunxi: Change LRADC node names to avoid warnings
2018-11-28 11:26 ` Chen-Yu Tsai
@ 2018-11-28 13:37 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 13:37 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 07:26:16PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > One of the usage of the LRADC is to implement buttons. The bindings define
> > that we should have one subnode per button, with their associated voltage
> > as a property.
> >
> > However, there was no reg property but we still used the voltage associated
> > to the button as the unit-address, which eventually generated warnings in
> > DTC.
> >
> > Rename the node names to avoid those warnings.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/d378204a/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 18/77] ARM: dts: sun5i: Fix Display Engine DTC warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (16 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 17/77] ARM: dts: sunxi: Change LRADC node names to avoid warnings Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:30 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 19/77] ARM: dts: sun5i: A10s: Remove empty SRAM node Maxime Ripard
` (59 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Our display engine endpoints trigger some DTC warnings due to the fact that
we're having a single endpoint that doesn't need any reg property, and
since we don't have a reg property, we don't need the address-cells and
size-cells properties anymore.
Fix those
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 2 --
arch/arm/boot/dts/sun5i-a13-q8-tablet.dts | 10 ++--------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
index 8855ddb78e0b..0dafbdb00599 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
@@ -74,8 +74,6 @@
bridge {
compatible = "dumb-vga-dac";
- #address-cells = <1>;
- #size-cells = <0>;
ports {
#address-cells = <1>;
diff --git a/arch/arm/boot/dts/sun5i-a13-q8-tablet.dts b/arch/arm/boot/dts/sun5i-a13-q8-tablet.dts
index a89f29fa3e40..85edbd98f7db 100644
--- a/arch/arm/boot/dts/sun5i-a13-q8-tablet.dts
+++ b/arch/arm/boot/dts/sun5i-a13-q8-tablet.dts
@@ -50,18 +50,12 @@
panel: panel {
compatible = "urt,umsh-8596md-t", "simple-panel";
- #address-cells = <1>;
- #size-cells = <0>;
- port at 0 {
- reg = <0>;
+ port {
/* TODO: lcd panel uses axp gpio0 as enable pin */
backlight = <&backlight>;
- #address-cells = <1>;
- #size-cells = <0>;
- panel_input: endpoint at 0 {
- reg = <0>;
+ panel_input: endpoint {
remote-endpoint = <&tcon0_out_lcd>;
};
};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 18/77] ARM: dts: sun5i: Fix Display Engine DTC warnings
2018-11-27 12:45 ` [PATCH 18/77] ARM: dts: sun5i: Fix Display Engine DTC warnings Maxime Ripard
@ 2018-11-28 11:30 ` Chen-Yu Tsai
2018-11-28 13:38 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 11:30 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Our display engine endpoints trigger some DTC warnings due to the fact that
> we're having a single endpoint that doesn't need any reg property, and
> since we don't have a reg property, we don't need the address-cells and
> size-cells properties anymore.
>
> Fix those
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 18/77] ARM: dts: sun5i: Fix Display Engine DTC warnings
2018-11-28 11:30 ` Chen-Yu Tsai
@ 2018-11-28 13:38 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 13:38 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 07:30:52PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > Our display engine endpoints trigger some DTC warnings due to the fact that
> > we're having a single endpoint that doesn't need any reg property, and
> > since we don't have a reg property, we don't need the address-cells and
> > size-cells properties anymore.
> >
> > Fix those
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/d77fbf6d/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 19/77] ARM: dts: sun5i: A10s: Remove empty SRAM node
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (17 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 18/77] ARM: dts: sun5i: Fix Display Engine DTC warnings Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:31 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 20/77] ARM: dts: sun5i: Remove underscores from nodes names Maxime Ripard
` (58 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
The SRAM node in the A10s DTSI is empty, remove it.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun5i-a10s.dtsi | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index d9fdcd41faa7..cd7119273b80 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -159,9 +159,6 @@
};
};
-&sram_a {
-};
-
&tcon0_out {
tcon0_out_hdmi: endpoint at 2 {
reg = <2>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 20/77] ARM: dts: sun5i: Remove underscores from nodes names
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (18 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 19/77] ARM: dts: sun5i: A10s: Remove empty SRAM node Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:32 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 21/77] ARM: dts: sun5i: Provide default muxing for relevant controllers Maxime Ripard
` (57 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Some GPIO pinctrl nodes cannot be easily removed, because they would also
change the pin configuration, for example to add a pull resistor or change
the current delivered by the pin.
Those nodes still have underscores and unit-addresses in their node names
in our DTs, so adjust their name to remove the warnings. Use that occasion
to also fix some poorly chosen node-names.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 2 +-
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 4 ++--
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 4 ++--
arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 2 +-
arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts | 4 ++--
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 2 +-
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 6 +++---
arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 6 +++---
arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 2 +-
arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi | 4 ++--
10 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
index 30c8e7b5fabc..f5c50b66290a 100644
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
@@ -106,7 +106,7 @@
};
&pio {
- led_pins_t003: led_pins at 0 {
+ led_pins_t003: led-pin {
pins = "PB2";
function = "gpio_out";
drive-strength = <20>;
diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
index 781be07547a3..648f03d2132b 100644
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
@@ -126,13 +126,13 @@
};
&pio {
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PG12";
function = "gpio_in";
bias-pull-up;
};
- led_pins_t004: led_pins at 0 {
+ led_pins_t004: led-pin {
pins = "PB2";
function = "gpio_out";
drive-strength = <20>;
diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
index b1fe1226cb1e..ae6d4a0bb9c9 100644
--- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
@@ -223,13 +223,13 @@
};
&pio {
- led_pins_olinuxino: led_pins at 0 {
+ led_pins_olinuxino: led-pin {
pins = "PE3";
function = "gpio_out";
drive-strength = <20>;
};
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PG12";
function = "gpio_in";
bias-pull-up;
diff --git a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
index a32025e57592..afbda5dd773b 100644
--- a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
@@ -98,7 +98,7 @@
};
&pio {
- led_pins_r7: led_pins at 0 {
+ led_pins_r7: led-pin {
pins = "PB2";
function = "gpio_out";
drive-strength = <20>;
diff --git a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
index 34c932564daf..49eaa1920088 100644
--- a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
+++ b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
@@ -134,13 +134,13 @@
};
&pio {
- usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 {
+ usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PG1";
function = "gpio_in";
bias-pull-down;
};
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PG2";
function = "gpio_in";
bias-pull-up;
diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
index 4f5b1247a427..082a1501eaf1 100644
--- a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
+++ b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
@@ -133,7 +133,7 @@
};
&pio {
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PG2";
function = "gpio_in";
bias-pull-up;
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
index 70445d28c20a..cf5f730d5efa 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
@@ -112,19 +112,19 @@
};
&pio {
- led_pins_olinuxinom: led_pins at 0 {
+ led_pins_olinuxinom: led-pin {
pins = "PG9";
function = "gpio_out";
drive-strength = <20>;
};
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PG2";
function = "gpio_in";
bias-pull-up;
};
- usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 {
+ usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PG1";
function = "gpio_in";
bias-pull-down;
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
index 0dafbdb00599..7c506de4a1ee 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
@@ -205,19 +205,19 @@
};
&pio {
- led_pins_olinuxino: led_pins at 0 {
+ led_pins_olinuxino: led-pin {
pins = "PG9";
function = "gpio_out";
drive-strength = <20>;
};
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PG2";
function = "gpio_in";
bias-pull-up;
};
- usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 {
+ usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PG1";
function = "gpio_in";
bias-pull-down;
diff --git a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
index abc8402fe04e..732873cbeedc 100644
--- a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
+++ b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
@@ -95,7 +95,7 @@
};
&pio {
- i2c_lcd_pins: i2c_lcd_pin at 0 {
+ i2c_lcd_pins: i2c-lcd-pin {
pins = "PG10", "PG12";
function = "gpio_out";
bias-pull-up;
diff --git a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
index ca7556177c1b..b046436ff773 100644
--- a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
@@ -137,13 +137,13 @@
};
&pio {
- usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 {
+ usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PG1";
function = "gpio_in";
bias-pull-down;
};
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PG2";
function = "gpio_in";
bias-pull-up;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 20/77] ARM: dts: sun5i: Remove underscores from nodes names
2018-11-27 12:45 ` [PATCH 20/77] ARM: dts: sun5i: Remove underscores from nodes names Maxime Ripard
@ 2018-11-28 11:32 ` Chen-Yu Tsai
2018-11-28 13:39 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 11:32 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Some GPIO pinctrl nodes cannot be easily removed, because they would also
> change the pin configuration, for example to add a pull resistor or change
> the current delivered by the pin.
>
> Those nodes still have underscores and unit-addresses in their node names
> in our DTs, so adjust their name to remove the warnings. Use that occasion
> to also fix some poorly chosen node-names.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
But you might want to squash it in with patch 16?
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 20/77] ARM: dts: sun5i: Remove underscores from nodes names
2018-11-28 11:32 ` Chen-Yu Tsai
@ 2018-11-28 13:39 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 13:39 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 07:32:36PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > Some GPIO pinctrl nodes cannot be easily removed, because they would also
> > change the pin configuration, for example to add a pull resistor or change
> > the current delivered by the pin.
> >
> > Those nodes still have underscores and unit-addresses in their node names
> > in our DTs, so adjust their name to remove the warnings. Use that occasion
> > to also fix some poorly chosen node-names.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
>
> But you might want to squash it in with patch 16?
I did, thanks for the suggestion!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/731616e2/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 21/77] ARM: dts: sun5i: Provide default muxing for relevant controllers
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (19 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 20/77] ARM: dts: sun5i: Remove underscores from nodes names Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:35 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 22/77] ARM: dts: sun6i: Remove skeleton and memory to avoid warnings Maxime Ripard
` (56 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
The I2C's, MMC0 and MMC1 controllers have only one muxing option in the
SoC. In such a case, we can just move the muxing into the DTSI, and remove
it from the DTS.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 4 ----
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 6 ------
arch/arm/boot/dts/sun5i-a10s-mk802.dts | 6 ------
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 10 ----------
arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 4 ----
arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 4 ----
arch/arm/boot/dts/sun5i-a10s.dtsi | 5 +++++
arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts | 6 ------
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 8 --------
arch/arm/boot/dts/sun5i-a13-licheepi-one.dts | 8 --------
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 8 --------
arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 8 --------
arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 6 ------
arch/arm/boot/dts/sun5i-gr8-evb.dts | 8 --------
arch/arm/boot/dts/sun5i-r8-chip.dts | 8 --------
arch/arm/boot/dts/sun5i.dtsi | 8 ++++++++
16 files changed, 13 insertions(+), 94 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
index f5c50b66290a..64d50fcfcd3a 100644
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
@@ -75,8 +75,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp152: pmic at 30 {
@@ -89,8 +87,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
index 648f03d2132b..fc466e05af23 100644
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
@@ -85,8 +85,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp152: pmic at 30 {
@@ -99,8 +97,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -108,8 +104,6 @@
};
&mmc1 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <®_vmmc1>;
bus-width = <4>;
non-removable;
diff --git a/arch/arm/boot/dts/sun5i-a10s-mk802.dts b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
index 06b876c50f15..6e90ccb267aa 100644
--- a/arch/arm/boot/dts/sun5i-a10s-mk802.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
@@ -72,8 +72,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp152: pmic at 30 {
@@ -86,8 +84,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -95,8 +91,6 @@
};
&mmc1 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
non-removable;
diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
index ae6d4a0bb9c9..262c2ffbdcfa 100644
--- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
@@ -117,8 +117,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp152: pmic at 30 {
@@ -130,8 +128,6 @@
#include "axp152.dtsi"
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
at24 at 50 {
@@ -143,8 +139,6 @@
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
@@ -197,8 +191,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -206,8 +198,6 @@
};
&mmc1 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 13 GPIO_ACTIVE_LOW>; /* PG13 */
diff --git a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
index afbda5dd773b..b2a49a216ebf 100644
--- a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
@@ -76,8 +76,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -85,8 +83,6 @@
};
&mmc1 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
non-removable;
diff --git a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
index 5683cc483a49..b5ee8fb13a92 100644
--- a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
@@ -100,8 +100,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -122,8 +120,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 1 3 GPIO_ACTIVE_LOW>; /* PB3 */
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index cd7119273b80..09c486b608b2 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -119,6 +119,11 @@
compatible = "allwinner,sun5i-a10s-ccu";
};
+&mmc1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc1_pins>;
+};
+
&pio {
compatible = "allwinner,sun5i-a10s-pinctrl";
diff --git a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
index 49eaa1920088..f3cede9beb63 100644
--- a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
+++ b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
@@ -78,8 +78,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -91,8 +89,6 @@
#include "axp209.dtsi"
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
pcf8563: rtc at 51 {
@@ -121,8 +117,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
index 082a1501eaf1..9369f7453beb 100644
--- a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
+++ b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
@@ -69,8 +69,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -80,8 +78,6 @@
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
pcf8563: rtc at 51 {
@@ -91,8 +87,6 @@
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
@@ -116,8 +110,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
diff --git a/arch/arm/boot/dts/sun5i-a13-licheepi-one.dts b/arch/arm/boot/dts/sun5i-a13-licheepi-one.dts
index f2ecd81a3183..ca8f3fd1ddfe 100644
--- a/arch/arm/boot/dts/sun5i-a13-licheepi-one.dts
+++ b/arch/arm/boot/dts/sun5i-a13-licheepi-one.dts
@@ -94,8 +94,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -109,14 +107,10 @@
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "disabled";
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "disabled";
};
@@ -133,8 +127,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
broken-cd;
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
index cf5f730d5efa..943868e495bc 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
@@ -77,26 +77,18 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
index 7c506de4a1ee..54ca140fc258 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
@@ -121,8 +121,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -136,14 +134,10 @@
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
@@ -188,8 +182,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
diff --git a/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts b/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
index 7a5ba22c7354..3f70b8c53132 100644
--- a/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
+++ b/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
@@ -92,8 +92,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -112,8 +110,6 @@
#include "axp209.dtsi"
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "disabled";
};
@@ -124,8 +120,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
mmc-pwrseq = <&mmc0_pwrseq>;
bus-width = <4>;
diff --git a/arch/arm/boot/dts/sun5i-gr8-evb.dts b/arch/arm/boot/dts/sun5i-gr8-evb.dts
index ea1711a31cce..86e46aa59134 100644
--- a/arch/arm/boot/dts/sun5i-gr8-evb.dts
+++ b/arch/arm/boot/dts/sun5i-gr8-evb.dts
@@ -123,8 +123,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -143,8 +141,6 @@
#include "axp209.dtsi"
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
wm8978: codec at 1a {
@@ -160,8 +156,6 @@
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
@@ -232,8 +226,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
diff --git a/arch/arm/boot/dts/sun5i-r8-chip.dts b/arch/arm/boot/dts/sun5i-r8-chip.dts
index 3c9f4f35d43b..f4298facf9dc 100644
--- a/arch/arm/boot/dts/sun5i-r8-chip.dts
+++ b/arch/arm/boot/dts/sun5i-r8-chip.dts
@@ -107,8 +107,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -135,14 +133,10 @@
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "disabled";
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
xio: gpio at 38 {
@@ -164,8 +158,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
mmc-pwrseq = <&mmc0_pwrseq>;
bus-width = <4>;
diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index b6b67d84ddda..ccd793795e58 100644
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -320,6 +320,8 @@
clocks = <&ccu CLK_AHB_MMC0>, <&ccu CLK_MMC0>;
clock-names = "ahb", "mmc";
interrupts = <32>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@@ -672,6 +674,8 @@
reg = <0x01c2ac00 0x400>;
interrupts = <7>;
clocks = <&ccu CLK_APB1_I2C0>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c0_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@@ -682,6 +686,8 @@
reg = <0x01c2b000 0x400>;
interrupts = <8>;
clocks = <&ccu CLK_APB1_I2C1>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c1_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@@ -692,6 +698,8 @@
reg = <0x01c2b400 0x400>;
interrupts = <9>;
clocks = <&ccu CLK_APB1_I2C2>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c2_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 21/77] ARM: dts: sun5i: Provide default muxing for relevant controllers
2018-11-27 12:45 ` [PATCH 21/77] ARM: dts: sun5i: Provide default muxing for relevant controllers Maxime Ripard
@ 2018-11-28 11:35 ` Chen-Yu Tsai
2018-11-28 13:39 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 11:35 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> The I2C's, MMC0 and MMC1 controllers have only one muxing option in the
> SoC. In such a case, we can just move the muxing into the DTSI, and remove
> it from the DTS.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 21/77] ARM: dts: sun5i: Provide default muxing for relevant controllers
2018-11-28 11:35 ` Chen-Yu Tsai
@ 2018-11-28 13:39 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 13:39 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 07:35:38PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > The I2C's, MMC0 and MMC1 controllers have only one muxing option in the
> > SoC. In such a case, we can just move the muxing into the DTSI, and remove
> > it from the DTS.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/5c927eba/attachment-0001.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 22/77] ARM: dts: sun6i: Remove skeleton and memory to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (20 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 21/77] ARM: dts: sun5i: Provide default muxing for relevant controllers Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:39 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 23/77] ARM: dts: sun6i: Change framebuffer node names " Maxime Ripard
` (55 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Using skeleton.dtsi will create a memory node that will generate a warning
in DTC. However, that node will be created by the bootloader, so we can
just remove it entirely in order to remove that warning.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun6i-a31.dtsi | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index 1eaa60cd3218..b60aaacbab5e 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -42,8 +42,6 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "skeleton.dtsi"
-
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/thermal/thermal.h>
@@ -52,6 +50,8 @@
/ {
interrupt-parent = <&gic>;
+ #address-cells = <1>;
+ #size-cells = <1>;
aliases {
ethernet0 = &gmac;
@@ -199,10 +199,6 @@
};
};
- memory {
- reg = <0x40000000 0x80000000>;
- };
-
pmu {
compatible = "arm,cortex-a7-pmu", "arm,cortex-a15-pmu";
interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 22/77] ARM: dts: sun6i: Remove skeleton and memory to avoid warnings
2018-11-27 12:45 ` [PATCH 22/77] ARM: dts: sun6i: Remove skeleton and memory to avoid warnings Maxime Ripard
@ 2018-11-28 11:39 ` Chen-Yu Tsai
2018-11-28 13:39 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 11:39 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Using skeleton.dtsi will create a memory node that will generate a warning
> in DTC. However, that node will be created by the bootloader, so we can
> just remove it entirely in order to remove that warning.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 22/77] ARM: dts: sun6i: Remove skeleton and memory to avoid warnings
2018-11-28 11:39 ` Chen-Yu Tsai
@ 2018-11-28 13:39 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 13:39 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 07:39:56PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > Using skeleton.dtsi will create a memory node that will generate a warning
> > in DTC. However, that node will be created by the bootloader, so we can
> > just remove it entirely in order to remove that warning.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/eb268e57/attachment-0001.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 23/77] ARM: dts: sun6i: Change framebuffer node names to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (21 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 22/77] ARM: dts: sun6i: Remove skeleton and memory to avoid warnings Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:40 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 24/77] ARM: dts: sun6i: Change clock " Maxime Ripard
` (54 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
The simple-framebuffer nodes have a unit address, but no reg property which
generates a warning when compiling it with DTC.
Change the simple-framebuffer node names so that there is no warnings on
this anymore.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun6i-a31.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index b60aaacbab5e..42a963975bde 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -62,7 +62,7 @@
#size-cells = <1>;
ranges;
- simplefb_hdmi: framebuffer at 0 {
+ simplefb_hdmi: framebuffer-lcd0-hdmi {
compatible = "allwinner,simple-framebuffer",
"simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0-hdmi";
@@ -73,7 +73,7 @@
status = "disabled";
};
- simplefb_lcd: framebuffer at 1 {
+ simplefb_lcd: framebuffer-lcd0 {
compatible = "allwinner,simple-framebuffer",
"simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0";
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 23/77] ARM: dts: sun6i: Change framebuffer node names to avoid warnings
2018-11-27 12:45 ` [PATCH 23/77] ARM: dts: sun6i: Change framebuffer node names " Maxime Ripard
@ 2018-11-28 11:40 ` Chen-Yu Tsai
2018-11-28 13:39 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 11:40 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> The simple-framebuffer nodes have a unit address, but no reg property which
> generates a warning when compiling it with DTC.
>
> Change the simple-framebuffer node names so that there is no warnings on
> this anymore.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 23/77] ARM: dts: sun6i: Change framebuffer node names to avoid warnings
2018-11-28 11:40 ` Chen-Yu Tsai
@ 2018-11-28 13:39 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 13:39 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 07:40:32PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > The simple-framebuffer nodes have a unit address, but no reg property which
> > generates a warning when compiling it with DTC.
> >
> > Change the simple-framebuffer node names so that there is no warnings on
> > this anymore.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/ba55afdb/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 24/77] ARM: dts: sun6i: Change clock node names to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (22 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 23/77] ARM: dts: sun6i: Change framebuffer node names " Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:40 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 25/77] ARM: dts: sun6i: Remove SoC node unit-name " Maxime Ripard
` (53 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Our oscillators clock names have a unit address, but no reg property, which
generates a warning in DTC. Change these names to remove those unit
addresses.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun6i-a31.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index 42a963975bde..297055ffafff 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -212,13 +212,13 @@
#size-cells = <1>;
ranges;
- osc24M: osc24M {
+ osc24M: clk-24M {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <24000000>;
};
- osc32k: clk at 0 {
+ osc32k: clk-32k {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <32768>;
@@ -234,14 +234,14 @@
* The actual TX clock rate is not controlled by the
* gmac_tx clock.
*/
- mii_phy_tx_clk: clk at 1 {
+ mii_phy_tx_clk: clk-mii-phy-tx {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <25000000>;
clock-output-names = "mii_phy_tx";
};
- gmac_int_tx_clk: clk at 2 {
+ gmac_int_tx_clk: clk-gmac-int-tx {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <125000000>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 24/77] ARM: dts: sun6i: Change clock node names to avoid warnings
2018-11-27 12:45 ` [PATCH 24/77] ARM: dts: sun6i: Change clock " Maxime Ripard
@ 2018-11-28 11:40 ` Chen-Yu Tsai
2018-11-28 13:40 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 11:40 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Our oscillators clock names have a unit address, but no reg property, which
> generates a warning in DTC. Change these names to remove those unit
> addresses.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 24/77] ARM: dts: sun6i: Change clock node names to avoid warnings
2018-11-28 11:40 ` Chen-Yu Tsai
@ 2018-11-28 13:40 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 13:40 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 07:40:48PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > Our oscillators clock names have a unit address, but no reg property, which
> > generates a warning in DTC. Change these names to remove those unit
> > addresses.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/2f476046/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 25/77] ARM: dts: sun6i: Remove SoC node unit-name to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (23 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 24/77] ARM: dts: sun6i: Change clock " Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:41 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 26/77] ARM: dts: sun6i: Fix Display Engine DTC warnings Maxime Ripard
` (52 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Our main node for all the in-SoC controllers used to have a unit name. The
unit-name, in addition to being actually false, would not match any reg
property, which generates a warning.
Remove it in order to remove those warnings.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun6i-a31.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index 297055ffafff..5355213f73b9 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -263,7 +263,7 @@
status = "disabled";
};
- soc at 1c00000 {
+ soc {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 25/77] ARM: dts: sun6i: Remove SoC node unit-name to avoid warnings
2018-11-27 12:45 ` [PATCH 25/77] ARM: dts: sun6i: Remove SoC node unit-name " Maxime Ripard
@ 2018-11-28 11:41 ` Chen-Yu Tsai
2018-11-28 13:40 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 11:41 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Our main node for all the in-SoC controllers used to have a unit name. The
> unit-name, in addition to being actually false, would not match any reg
> property, which generates a warning.
>
> Remove it in order to remove those warnings.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 25/77] ARM: dts: sun6i: Remove SoC node unit-name to avoid warnings
2018-11-28 11:41 ` Chen-Yu Tsai
@ 2018-11-28 13:40 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 13:40 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 07:41:00PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > Our main node for all the in-SoC controllers used to have a unit name. The
> > unit-name, in addition to being actually false, would not match any reg
> > property, which generates a warning.
> >
> > Remove it in order to remove those warnings.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/cc2b1b32/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 26/77] ARM: dts: sun6i: Fix Display Engine DTC warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (24 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 25/77] ARM: dts: sun6i: Remove SoC node unit-name " Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:41 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 27/77] ARM: dts: sun6i: Change LRADC node names to avoid warnings Maxime Ripard
` (51 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Our display engine endpoints trigger some DTC warnings due to the fact that
we're having a single endpoint that doesn't need any reg property, and
since we don't have a reg property, we don't need the address-cells and
size-cells properties anymore.
Fix those
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 12 ++----------
arch/arm/boot/dts/sun6i-a31.dtsi | 12 ++----------
2 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
index ce4f9e9834bf..4eab94737203 100644
--- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
+++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
@@ -86,31 +86,23 @@
vga-dac {
compatible = "dumb-vga-dac";
vdd-supply = <®_vga_3v3>;
- #address-cells = <1>;
- #size-cells = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0>;
- vga_dac_in: endpoint at 0 {
- reg = <0>;
+ vga_dac_in: endpoint {
remote-endpoint = <&tcon0_out_vga>;
};
};
port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
- vga_dac_out: endpoint at 0 {
- reg = <0>;
+ vga_dac_out: endpoint {
remote-endpoint = <&vga_con_in>;
};
};
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index 5355213f73b9..c5fd97b88b90 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -486,8 +486,6 @@
};
hdmi_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
};
};
@@ -1218,12 +1216,9 @@
};
be0_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
- be0_out_drc0: endpoint at 0 {
- reg = <0>;
+ be0_out_drc0: endpoint {
remote-endpoint = <&drc0_in_be0>;
};
};
@@ -1248,12 +1243,9 @@
#size-cells = <0>;
drc0_in: port at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0>;
- drc0_in_be0: endpoint at 0 {
- reg = <0>;
+ drc0_in_be0: endpoint {
remote-endpoint = <&be0_out_drc0>;
};
};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 26/77] ARM: dts: sun6i: Fix Display Engine DTC warnings
2018-11-27 12:45 ` [PATCH 26/77] ARM: dts: sun6i: Fix Display Engine DTC warnings Maxime Ripard
@ 2018-11-28 11:41 ` Chen-Yu Tsai
2018-11-28 13:40 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 11:41 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Our display engine endpoints trigger some DTC warnings due to the fact that
> we're having a single endpoint that doesn't need any reg property, and
> since we don't have a reg property, we don't need the address-cells and
> size-cells properties anymore.
>
> Fix those
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 26/77] ARM: dts: sun6i: Fix Display Engine DTC warnings
2018-11-28 11:41 ` Chen-Yu Tsai
@ 2018-11-28 13:40 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 13:40 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 07:41:51PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > Our display engine endpoints trigger some DTC warnings due to the fact that
> > we're having a single endpoint that doesn't need any reg property, and
> > since we don't have a reg property, we don't need the address-cells and
> > size-cells properties anymore.
> >
> > Fix those
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/730047f3/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 27/77] ARM: dts: sun6i: Change LRADC node names to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (25 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 26/77] ARM: dts: sun6i: Fix Display Engine DTC warnings Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:42 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 28/77] ARM: dts: sun6i: Remove all useless pinctrl nodes Maxime Ripard
` (50 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
One of the usage of the LRADC is to implement buttons. The bindings define
that we should have one subnode per button, with their associated voltage
as a property.
However, there was no reg property but we still used the voltage associated
to the button as the unit-address, which eventually generated warnings in
DTC.
Rename the node names to avoid those warnings.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts | 2 +-
arch/arm/boot/dts/sun6i-a31s-inet-q972.dts | 6 +++---
arch/arm/boot/dts/sun6i-a31s-primo81.dts | 4 ++--
arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts b/arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts
index 882a4d89fa22..a2ef7846e2c8 100644
--- a/arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts
@@ -53,7 +53,7 @@
vref-supply = <®_aldo3>;
status = "okay";
- button at 1000 {
+ button-1000 {
label = "Home";
linux,code = <KEY_HOMEPAGE>;
channel = <0>;
diff --git a/arch/arm/boot/dts/sun6i-a31s-inet-q972.dts b/arch/arm/boot/dts/sun6i-a31s-inet-q972.dts
index e584e6b186a7..85dab04be261 100644
--- a/arch/arm/boot/dts/sun6i-a31s-inet-q972.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-inet-q972.dts
@@ -73,21 +73,21 @@
vref-supply = <®_aldo3>;
status = "okay";
- button at 200 {
+ button-200 {
label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>;
channel = <0>;
voltage = <200000>;
};
- button at 900 {
+ button-900 {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
channel = <0>;
voltage = <900000>;
};
- button at 1200 {
+ button-1200 {
label = "Back";
linux,code = <KEY_BACK>;
channel = <0>;
diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
index 4cb9664cdb29..ca1c711ed450 100644
--- a/arch/arm/boot/dts/sun6i-a31s-primo81.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
@@ -131,14 +131,14 @@
vref-supply = <®_aldo3>;
status = "okay";
- button at 158 {
+ button-158 {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
channel = <0>;
voltage = <158730>;
};
- button at 349 {
+ button-349 {
label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>;
channel = <0>;
diff --git a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
index da0ccf5a2c44..3a7e68c46ba7 100644
--- a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
@@ -147,14 +147,14 @@
vref-supply = <®_aldo3>;
status = "okay";
- button at 158 {
+ button-158 {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
channel = <0>;
voltage = <158730>;
};
- button at 349 {
+ button-349 {
label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>;
channel = <0>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 27/77] ARM: dts: sun6i: Change LRADC node names to avoid warnings
2018-11-27 12:45 ` [PATCH 27/77] ARM: dts: sun6i: Change LRADC node names to avoid warnings Maxime Ripard
@ 2018-11-28 11:42 ` Chen-Yu Tsai
2018-11-28 13:40 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 11:42 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> One of the usage of the LRADC is to implement buttons. The bindings define
> that we should have one subnode per button, with their associated voltage
> as a property.
>
> However, there was no reg property but we still used the voltage associated
> to the button as the unit-address, which eventually generated warnings in
> DTC.
>
> Rename the node names to avoid those warnings.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 27/77] ARM: dts: sun6i: Change LRADC node names to avoid warnings
2018-11-28 11:42 ` Chen-Yu Tsai
@ 2018-11-28 13:40 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 13:40 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 07:42:24PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > One of the usage of the LRADC is to implement buttons. The bindings define
> > that we should have one subnode per button, with their associated voltage
> > as a property.
> >
> > However, there was no reg property but we still used the voltage associated
> > to the button as the unit-address, which eventually generated warnings in
> > DTC.
> >
> > Rename the node names to avoid those warnings.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/ef566fa5/attachment-0001.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 28/77] ARM: dts: sun6i: Remove all useless pinctrl nodes
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (26 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 27/77] ARM: dts: sun6i: Change LRADC node names to avoid warnings Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:45 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 29/77] ARM: dts: sun6i: Remove card detect pull-up Maxime Ripard
` (49 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
The gpio pinctrl nodes are redundant and as such useless most of the times.
Since they will also generate warnings in DTC, we can simply remove most of
them.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 8 +------
arch/arm/boot/dts/sun6i-a31-colombus.dts | 7 +-----
arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 13 +---------
arch/arm/boot/dts/sun6i-a31-i7.dts | 14 +----------
arch/arm/boot/dts/sun6i-a31-m9.dts | 14 +----------
arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 14 +----------
arch/arm/boot/dts/sun6i-a31s-primo81.dts | 7 +-----
arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 7 +-----
arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 23 +-----------------
9 files changed, 3 insertions(+), 104 deletions(-)
diff --git a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
index 7f34323a668c..f26b84b61daf 100644
--- a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
+++ b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
@@ -65,15 +65,7 @@
status = "okay";
};
-&pio {
- usb1_vbus_pin_a: usb1_vbus_pin at 0 {
- pins = "PH27";
- function = "gpio_out";
- };
-};
-
®_usb1_vbus {
- pinctrl-0 = <&usb1_vbus_pin_a>;
gpio = <&pio 7 27 GPIO_ACTIVE_HIGH>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts
index 939c497a6f70..557d4a988d9a 100644
--- a/arch/arm/boot/dts/sun6i-a31-colombus.dts
+++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts
@@ -132,11 +132,6 @@
bias-pull-up;
};
- usb2_vbus_pin_colombus: usb2_vbus_pin at 0 {
- pins = "PH24";
- function = "gpio_out";
- };
-
i2c_lcd_pins: i2c_lcd_pin at 0 {
pins = "PA23", "PA24";
function = "gpio_out";
@@ -145,8 +140,6 @@
};
®_usb2_vbus {
- pinctrl-names = "default";
- pinctrl-0 = <&usb2_vbus_pin_colombus>;
gpio = <&pio 7 24 GPIO_ACTIVE_HIGH>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
index 4eab94737203..a55291538c59 100644
--- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
+++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
@@ -152,7 +152,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_rgmii_a>, <&gmac_phy_reset_pin_hummingbird>;
+ pinctrl-0 = <&gmac_pins_rgmii_a>;
phy = <&phy1>;
phy-mode = "rgmii";
snps,reset-gpio = <&pio 0 21 GPIO_ACTIVE_HIGH>;
@@ -221,7 +221,7 @@
&mmc1 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins_a>, <&wifi_reset_pin_hummingbird>;
+ pinctrl-0 = <&mmc1_pins_a>;
vmmc-supply = <®_aldo1>;
mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>;
@@ -234,21 +234,12 @@
};
&pio {
- gmac_phy_reset_pin_hummingbird: gmac_phy_reset_pin at 0 {
- pins = "PA21";
- function = "gpio_out";
- };
-
mmc0_cd_pin_hummingbird: mmc0_cd_pin at 0 {
pins = "PA8";
function = "gpio_in";
bias-pull-up;
};
- wifi_reset_pin_hummingbird: wifi_reset_pin at 0 {
- pins = "PG10";
- function = "gpio_out";
- };
};
&p2wi {
diff --git a/arch/arm/boot/dts/sun6i-a31-i7.dts b/arch/arm/boot/dts/sun6i-a31-i7.dts
index d659be9dbc50..679f0fa7e50c 100644
--- a/arch/arm/boot/dts/sun6i-a31-i7.dts
+++ b/arch/arm/boot/dts/sun6i-a31-i7.dts
@@ -71,8 +71,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pins_i7>;
blue {
label = "i7:blue:usr";
@@ -154,26 +152,14 @@
};
&pio {
- led_pins_i7: led_pins at 0 {
- pins = "PH13";
- function = "gpio_out";
- };
-
mmc0_cd_pin_i7: mmc0_cd_pin at 0 {
pins = "PH22";
function = "gpio_in";
bias-pull-up;
};
-
- usb1_vbus_pin_i7: usb1_vbus_pin at 0 {
- pins = "PC27";
- function = "gpio_out";
- };
};
®_usb1_vbus {
- pinctrl-names = "default";
- pinctrl-0 = <&usb1_vbus_pin_i7>;
gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-m9.dts
index 9698f6d38d03..87ae3031aa89 100644
--- a/arch/arm/boot/dts/sun6i-a31-m9.dts
+++ b/arch/arm/boot/dts/sun6i-a31-m9.dts
@@ -60,8 +60,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pins_m9>;
blue {
label = "m9:blue:pwr";
@@ -125,21 +123,11 @@
#include "axp22x.dtsi"
&pio {
- led_pins_m9: led_pins at 0 {
- pins = "PH13";
- function = "gpio_out";
- };
-
mmc0_cd_pin_m9: mmc0_cd_pin at 0 {
pins = "PH22";
function = "gpio_in";
bias-pull-up;
};
-
- usb1_vbus_pin_m9: usb1_vbus_pin at 0 {
- pins = "PC27";
- function = "gpio_out";
- };
};
®_aldo1 {
@@ -215,8 +203,6 @@
};
®_usb1_vbus {
- pinctrl-names = "default";
- pinctrl-0 = <&usb1_vbus_pin_m9>;
gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
index bb14b171b160..0711f55945e0 100644
--- a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
+++ b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
@@ -60,8 +60,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pins_m9>;
blue {
label = "a1000g:blue:pwr";
@@ -125,21 +123,11 @@
#include "axp22x.dtsi"
&pio {
- led_pins_m9: led_pins at 0 {
- pins = "PH13";
- function = "gpio_out";
- };
-
mmc0_cd_pin_m9: mmc0_cd_pin at 0 {
pins = "PH22";
function = "gpio_in";
bias-pull-up;
};
-
- usb1_vbus_pin_m9: usb1_vbus_pin at 0 {
- pins = "PC27";
- function = "gpio_out";
- };
};
®_aldo1 {
@@ -215,8 +203,6 @@
};
®_usb1_vbus {
- pinctrl-names = "default";
- pinctrl-0 = <&usb1_vbus_pin_m9>;
gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
index ca1c711ed450..dd6ede6a8377 100644
--- a/arch/arm/boot/dts/sun6i-a31s-primo81.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
@@ -101,8 +101,6 @@
status = "okay";
ctp at 5d {
- pinctrl-names = "default";
- pinctrl-0 = <>911_int_primo81>;
compatible = "goodix,gt911";
reg = <0x5d>;
interrupt-parent = <&pio>;
@@ -156,11 +154,6 @@
};
&pio {
- gt911_int_primo81: gt911_int_pin at 0 {
- pins = "PA3";
- function = "gpio_in";
- };
-
mma8452_int_primo81: mma8452_int_pin at 0 {
pins = "PA9";
function = "gpio_in";
diff --git a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
index 3a7e68c46ba7..1b07a950cb45 100644
--- a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
@@ -66,8 +66,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pin_sina31s>;
status {
label = "sina31s:status:usr";
@@ -176,11 +174,6 @@
};
&pio {
- led_pin_sina31s: led_pin at 0 {
- pins = "PH13";
- function = "gpio_out";
- };
-
mmc0_cd_pin_sina31s: mmc0_cd_pin at 0 {
pins = "PA4";
function = "gpio_in";
diff --git a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
index b8b79c0e9ee0..ea29af15125b 100644
--- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
@@ -58,8 +58,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pins_bpi_m2>;
blue {
label = "bpi-m2:blue:usr";
@@ -79,8 +77,6 @@
mmc2_pwrseq: mmc2_pwrseq {
compatible = "mmc-pwrseq-simple";
- pinctrl-names = "default";
- pinctrl-0 = <&mmc2_pwrseq_pin_bpi_m2>;
reset-gpios = <&r_pio 0 8 GPIO_ACTIVE_LOW>; /* PL8 WIFI_EN */
};
};
@@ -95,7 +91,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_rgmii_a>, <&gmac_phy_reset_pin_bpi_m2>;
+ pinctrl-0 = <&gmac_pins_rgmii_a>;
phy = <&phy1>;
phy-mode = "rgmii";
phy-supply = <®_dldo1>;
@@ -168,16 +164,6 @@
};
&pio {
- gmac_phy_reset_pin_bpi_m2: gmac_phy_reset_pin at 0 {
- pins = "PA21";
- function = "gpio_out";
- };
-
- led_pins_bpi_m2: led_pins at 0 {
- pins = "PG5", "PG10", "PG11";
- function = "gpio_out";
- };
-
mmc0_cd_pin_bpi_m2: mmc0_cd_pin at 0 {
pins = "PA4";
function = "gpio_in";
@@ -185,13 +171,6 @@
};
};
-&r_pio {
- mmc2_pwrseq_pin_bpi_m2: mmc2_pwrseq_pin at 0 {
- pins = "PL8";
- function = "gpio_out";
- };
-};
-
#include "axp22x.dtsi"
®_aldo1 {
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 29/77] ARM: dts: sun6i: Remove card detect pull-up
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (27 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 28/77] ARM: dts: sun6i: Remove all useless pinctrl nodes Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:46 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 30/77] ARM: dts: sun6i: Remove redundant MMC pinmux tuning Maxime Ripard
` (48 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Boards usually have an external pull-up on the card-detect signal, so
there's no need to add another one.
This also removes a DTC warning.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun6i-a31-colombus.dts | 8 +-------
arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 11 +---------
arch/arm/boot/dts/sun6i-a31-i7.dts | 10 +--------
arch/arm/boot/dts/sun6i-a31-m9.dts | 10 +--------
arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 10 +--------
arch/arm/boot/dts/sun6i-a31s-primo81.dts | 8 +-------
arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 10 +--------
arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 10 +--------
arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 10 +--------
arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi | 8 +-------
10 files changed, 10 insertions(+), 85 deletions(-)
diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts
index 557d4a988d9a..21584c2f968f 100644
--- a/arch/arm/boot/dts/sun6i-a31-colombus.dts
+++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts
@@ -114,7 +114,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_colombus>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v0>;
bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
@@ -126,12 +126,6 @@
};
&pio {
- mmc0_cd_pin_colombus: mmc0_cd_pin at 0 {
- pins = "PA8";
- function = "gpio_in";
- bias-pull-up;
- };
-
i2c_lcd_pins: i2c_lcd_pin at 0 {
pins = "PA23", "PA24";
function = "gpio_out";
diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
index a55291538c59..65b1b6e9180f 100644
--- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
+++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
@@ -207,7 +207,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_hummingbird>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
@@ -233,15 +233,6 @@
status = "okay";
};
-&pio {
- mmc0_cd_pin_hummingbird: mmc0_cd_pin at 0 {
- pins = "PA8";
- function = "gpio_in";
- bias-pull-up;
- };
-
-};
-
&p2wi {
status = "okay";
diff --git a/arch/arm/boot/dts/sun6i-a31-i7.dts b/arch/arm/boot/dts/sun6i-a31-i7.dts
index 679f0fa7e50c..f3e95d08fefc 100644
--- a/arch/arm/boot/dts/sun6i-a31-i7.dts
+++ b/arch/arm/boot/dts/sun6i-a31-i7.dts
@@ -144,21 +144,13 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_i7>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
status = "okay";
};
-&pio {
- mmc0_cd_pin_i7: mmc0_cd_pin at 0 {
- pins = "PH22";
- function = "gpio_in";
- bias-pull-up;
- };
-};
-
®_usb1_vbus {
gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>;
status = "okay";
diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-m9.dts
index 87ae3031aa89..90fb1f603820 100644
--- a/arch/arm/boot/dts/sun6i-a31-m9.dts
+++ b/arch/arm/boot/dts/sun6i-a31-m9.dts
@@ -102,7 +102,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_m9>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
@@ -122,14 +122,6 @@
#include "axp22x.dtsi"
-&pio {
- mmc0_cd_pin_m9: mmc0_cd_pin at 0 {
- pins = "PH22";
- function = "gpio_in";
- bias-pull-up;
- };
-};
-
®_aldo1 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
diff --git a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
index 0711f55945e0..3dcf44580839 100644
--- a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
+++ b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
@@ -102,7 +102,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_m9>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
@@ -122,14 +122,6 @@
#include "axp22x.dtsi"
-&pio {
- mmc0_cd_pin_m9: mmc0_cd_pin at 0 {
- pins = "PH22";
- function = "gpio_in";
- bias-pull-up;
- };
-};
-
®_aldo1 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
index dd6ede6a8377..55d60c68694e 100644
--- a/arch/arm/boot/dts/sun6i-a31s-primo81.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
@@ -146,7 +146,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_primo81>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
@@ -159,12 +159,6 @@
function = "gpio_in";
bias-pull-up;
};
-
- mmc0_cd_pin_primo81: mmc0_cd_pin at 0 {
- pins = "PA8";
- function = "gpio_in";
- bias-pull-up;
- };
};
&p2wi {
diff --git a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
index 1b07a950cb45..02c9a90fe876 100644
--- a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
@@ -162,7 +162,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_sina31s>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
@@ -173,14 +173,6 @@
status = "okay";
};
-&pio {
- mmc0_cd_pin_sina31s: mmc0_cd_pin at 0 {
- pins = "PA4";
- function = "gpio_in";
- bias-pull-up;
- };
-};
-
®_dldo1 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
diff --git a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
index ea29af15125b..016b23831cec 100644
--- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
@@ -113,7 +113,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m2>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
@@ -163,14 +163,6 @@
};
};
-&pio {
- mmc0_cd_pin_bpi_m2: mmc0_cd_pin at 0 {
- pins = "PA4";
- function = "gpio_in";
- bias-pull-up;
- };
-};
-
#include "axp22x.dtsi"
®_aldo1 {
diff --git a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
index aab6c1720ef7..2d8dc4321b7b 100644
--- a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
@@ -89,17 +89,9 @@
status = "okay";
};
-&pio {
- mmc0_cd_pin_bs1078v2: mmc0_cd_pin at 0 {
- pins = "PA8";
- function = "gpio_in";
- bias-pull-up;
- };
-};
-
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bs1078v2>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v0>;
bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
diff --git a/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
index 4e72e4f3ef96..77f952b12188 100644
--- a/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
@@ -66,7 +66,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_e708_q1>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
@@ -74,12 +74,6 @@
};
&pio {
- mmc0_cd_pin_e708_q1: mmc0_cd_pin at 0 {
- pins = "PA8";
- function = "gpio_in";
- bias-pull-up;
- };
-
usb0_id_detect_pin: usb0_id_detect_pin at 0 {
pins = "PA15";
function = "gpio_in";
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 30/77] ARM: dts: sun6i: Remove redundant MMC pinmux tuning
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (28 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 29/77] ARM: dts: sun6i: Remove card detect pull-up Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:46 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 31/77] ARM: dts: sun6i: Change pinctrl nodes to avoid warning Maxime Ripard
` (47 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Some boards override the MMC pin muxing settings in order to enable the
pull-ups and change the drive strength to a value higher than the default.
While this was needed in the earlier days, this is now the default setting
for those pins, and therefore we don't need those board-specific settings
anymore.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun6i-a31-colombus.dts | 4 ----
arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 5 -----
arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 8 --------
arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 4 ----
4 files changed, 21 deletions(-)
diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts
index 21584c2f968f..f9c4169a875d 100644
--- a/arch/arm/boot/dts/sun6i-a31-colombus.dts
+++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts
@@ -121,10 +121,6 @@
status = "okay";
};
-&mmc0_pins_a {
- bias-pull-up;
-};
-
&pio {
i2c_lcd_pins: i2c_lcd_pin at 0 {
pins = "PA23", "PA24";
diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
index 65b1b6e9180f..f38413fd9906 100644
--- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
+++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
@@ -214,11 +214,6 @@
status = "okay";
};
-&mmc0_pins_a {
- /* external pull-ups missing for some pins */
- bias-pull-up;
-};
-
&mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>;
diff --git a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
index 016b23831cec..14e27e81ddf8 100644
--- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
@@ -120,10 +120,6 @@
status = "okay";
};
-&mmc0_pins_a {
- bias-pull-up;
-};
-
&mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_a>;
@@ -142,10 +138,6 @@
};
};
-&mmc2_pins_a {
- bias-pull-up;
-};
-
&ohci0 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
index 2d8dc4321b7b..153e40d6f4c5 100644
--- a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
@@ -98,10 +98,6 @@
status = "okay";
};
-&mmc0_pins_a {
- bias-pull-up;
-};
-
&p2wi {
status = "okay";
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 30/77] ARM: dts: sun6i: Remove redundant MMC pinmux tuning
2018-11-27 12:45 ` [PATCH 30/77] ARM: dts: sun6i: Remove redundant MMC pinmux tuning Maxime Ripard
@ 2018-11-28 11:46 ` Chen-Yu Tsai
2018-11-28 13:41 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 11:46 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Some boards override the MMC pin muxing settings in order to enable the
> pull-ups and change the drive strength to a value higher than the default.
>
> While this was needed in the earlier days, this is now the default setting
> for those pins, and therefore we don't need those board-specific settings
> anymore.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 30/77] ARM: dts: sun6i: Remove redundant MMC pinmux tuning
2018-11-28 11:46 ` Chen-Yu Tsai
@ 2018-11-28 13:41 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 13:41 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 07:46:45PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > Some boards override the MMC pin muxing settings in order to enable the
> > pull-ups and change the drive strength to a value higher than the default.
> >
> > While this was needed in the earlier days, this is now the default setting
> > for those pins, and therefore we don't need those board-specific settings
> > anymore.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/144cc9ee/attachment-0001.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 31/77] ARM: dts: sun6i: Change pinctrl nodes to avoid warning
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (29 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 30/77] ARM: dts: sun6i: Remove redundant MMC pinmux tuning Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:50 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 32/77] ARM: dts: sun6i: Remove underscores from nodes names Maxime Ripard
` (46 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
All our pinctrl nodes were using a node name convention with a unit-address
to differentiate the different muxing options. However, since those nodes
didn't have a reg property, they were generating warnings in DTC.
In order to accomodate for this, convert the old nodes to the syntax we've
been using for the new SoCs, including removing the letter suffix of the
node labels to the bank of those pins to make things more readable.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 2 +-
arch/arm/boot/dts/sun6i-a31-colombus.dts | 12 +--
arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 16 ++--
arch/arm/boot/dts/sun6i-a31-i7.dts | 10 +--
arch/arm/boot/dts/sun6i-a31-m9.dts | 8 +-
arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 8 +-
arch/arm/boot/dts/sun6i-a31.dtsi | 34 ++++-----
arch/arm/boot/dts/sun6i-a31s-cs908.dts | 6 +-
arch/arm/boot/dts/sun6i-a31s-inet-q972.dts | 2 +-
arch/arm/boot/dts/sun6i-a31s-primo81.dts | 8 +-
arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi | 2 +-
arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 8 +-
arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 10 +--
arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 8 +-
arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi | 2 +-
15 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
index f26b84b61daf..32d22025ac99 100644
--- a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
+++ b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
@@ -72,7 +72,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts
index f9c4169a875d..d7a19664bae9 100644
--- a/arch/arm/boot/dts/sun6i-a31-colombus.dts
+++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts
@@ -77,7 +77,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_rgmii_a>;
+ pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>;
phy-mode = "rgmii";
status = "okay";
@@ -89,19 +89,19 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "fail";
};
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
mma8452: mma8452 at 1d {
@@ -114,7 +114,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v0>;
bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
@@ -136,7 +136,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
index f38413fd9906..5b4d89d2989a 100644
--- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
+++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
@@ -152,7 +152,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_rgmii_a>;
+ pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>;
phy-mode = "rgmii";
snps,reset-gpio = <&pio 0 21 GPIO_ACTIVE_HIGH>;
@@ -177,20 +177,20 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
/* pull-ups and devices require AXP221 DLDO3 */
status = "failed";
};
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
pcf8563: rtc at 51 {
@@ -201,13 +201,13 @@
&ir {
pinctrl-names = "default";
- pinctrl-0 = <&ir_pins_a>;
+ pinctrl-0 = <&s_ir_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
@@ -216,7 +216,7 @@
&mmc1 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins_a>;
+ pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <®_aldo1>;
mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>;
@@ -323,7 +323,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun6i-a31-i7.dts b/arch/arm/boot/dts/sun6i-a31-i7.dts
index f3e95d08fefc..6f2bba8b7dd0 100644
--- a/arch/arm/boot/dts/sun6i-a31-i7.dts
+++ b/arch/arm/boot/dts/sun6i-a31-i7.dts
@@ -116,7 +116,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_mii_a>;
+ pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>;
phy-mode = "mii";
status = "okay";
@@ -138,13 +138,13 @@
&ir {
pinctrl-names = "default";
- pinctrl-0 = <&ir_pins_a>;
+ pinctrl-0 = <&s_ir_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
@@ -158,7 +158,7 @@
&spdif {
pinctrl-names = "default";
- pinctrl-0 = <&spdif_pins_a>;
+ pinctrl-0 = <&spdif_tx_pin>;
spdif-out = "okay";
status = "okay";
};
@@ -169,7 +169,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-m9.dts
index 90fb1f603820..b65aa90a9167 100644
--- a/arch/arm/boot/dts/sun6i-a31-m9.dts
+++ b/arch/arm/boot/dts/sun6i-a31-m9.dts
@@ -83,7 +83,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_mii_a>;
+ pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>;
phy-mode = "mii";
phy-supply = <®_dldo1>;
@@ -96,13 +96,13 @@
&ir {
pinctrl-names = "default";
- pinctrl-0 = <&ir_pins_a>;
+ pinctrl-0 = <&s_ir_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
@@ -201,7 +201,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
index 3dcf44580839..c3a85aac44d5 100644
--- a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
+++ b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
@@ -83,7 +83,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_mii_a>;
+ pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>;
phy-mode = "mii";
phy-supply = <®_dldo1>;
@@ -96,13 +96,13 @@
&ir {
pinctrl-names = "default";
- pinctrl-0 = <&ir_pins_a>;
+ pinctrl-0 = <&s_ir_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
@@ -201,7 +201,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index c5fd97b88b90..596ab854da2c 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -604,7 +604,7 @@
#interrupt-cells = <3>;
#gpio-cells = <3>;
- gmac_pins_gmii_a: gmac_gmii at 0 {
+ gmac_gmii_pins: gmac-gmii-pins {
pins = "PA0", "PA1", "PA2", "PA3",
"PA4", "PA5", "PA6", "PA7",
"PA8", "PA9", "PA10", "PA11",
@@ -620,7 +620,7 @@
drive-strength = <30>;
};
- gmac_pins_mii_a: gmac_mii at 0 {
+ gmac_mii_pins: gmac-mii-pins {
pins = "PA0", "PA1", "PA2", "PA3",
"PA8", "PA9", "PA11",
"PA12", "PA13", "PA14", "PA19",
@@ -629,7 +629,7 @@
function = "gmac";
};
- gmac_pins_rgmii_a: gmac_rgmii at 0 {
+ gmac_rgmii_pins: gmac-rgmii-pins {
pins = "PA0", "PA1", "PA2", "PA3",
"PA9", "PA10", "PA11",
"PA12", "PA13", "PA14", "PA19",
@@ -642,22 +642,22 @@
drive-strength = <40>;
};
- i2c0_pins_a: i2c0 at 0 {
+ i2c0_pins: i2c0-pins {
pins = "PH14", "PH15";
function = "i2c0";
};
- i2c1_pins_a: i2c1 at 0 {
+ i2c1_pins: i2c1-pins {
pins = "PH16", "PH17";
function = "i2c1";
};
- i2c2_pins_a: i2c2 at 0 {
+ i2c2_pins: i2c2-pins {
pins = "PH18", "PH19";
function = "i2c2";
};
- lcd0_rgb888_pins: lcd0_rgb888 {
+ lcd0_rgb888_pins: lcd0-rgb888-pins {
pins = "PD0", "PD1", "PD2", "PD3",
"PD4", "PD5", "PD6", "PD7",
"PD8", "PD9", "PD10", "PD11",
@@ -668,7 +668,7 @@
function = "lcd0";
};
- mmc0_pins_a: mmc0 at 0 {
+ mmc0_pins: mmc0-pins {
pins = "PF0", "PF1", "PF2",
"PF3", "PF4", "PF5";
function = "mmc0";
@@ -676,7 +676,7 @@
bias-pull-up;
};
- mmc1_pins_a: mmc1 at 0 {
+ mmc1_pins: mmc1-pins {
pins = "PG0", "PG1", "PG2", "PG3",
"PG4", "PG5";
function = "mmc1";
@@ -684,7 +684,7 @@
bias-pull-up;
};
- mmc2_pins_a: mmc2 at 0 {
+ mmc2_4bit_pins: mmc2-4bit-pins {
pins = "PC6", "PC7", "PC8", "PC9",
"PC10", "PC11";
function = "mmc2";
@@ -692,7 +692,7 @@
bias-pull-up;
};
- mmc2_8bit_emmc_pins: mmc2 at 1 {
+ mmc2_8bit_emmc_pins: mmc2-8bit-emmc-pins {
pins = "PC6", "PC7", "PC8", "PC9",
"PC10", "PC11", "PC12",
"PC13", "PC14", "PC15",
@@ -702,7 +702,7 @@
bias-pull-up;
};
- mmc3_8bit_emmc_pins: mmc3 at 1 {
+ mmc3_8bit_emmc_pins: mmc3-8bit-emmc-pins {
pins = "PC6", "PC7", "PC8", "PC9",
"PC10", "PC11", "PC12",
"PC13", "PC14", "PC15",
@@ -712,12 +712,12 @@
bias-pull-up;
};
- spdif_pins_a: spdif at 0 {
+ spdif_tx_pin: spdif-pin {
pins = "PH28";
function = "spdif";
};
- uart0_pins_a: uart0 at 0 {
+ uart0_ph_pins: uart0-ph-pins {
pins = "PH20", "PH21";
function = "uart0";
};
@@ -1364,12 +1364,12 @@
#size-cells = <0>;
#gpio-cells = <3>;
- ir_pins_a: ir at 0 {
+ s_ir_rx_pin: s-ir-rx-pin {
pins = "PL4";
function = "s_ir";
};
- p2wi_pins: p2wi {
+ s_p2wi_pins: s-p2wi-pins {
pins = "PL0", "PL1";
function = "s_p2wi";
};
@@ -1383,7 +1383,7 @@
clock-frequency = <100000>;
resets = <&apb0_rst 3>;
pinctrl-names = "default";
- pinctrl-0 = <&p2wi_pins>;
+ pinctrl-0 = <&s_p2wi_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/sun6i-a31s-cs908.dts b/arch/arm/boot/dts/sun6i-a31s-cs908.dts
index 75e578159c3a..72a02c045a38 100644
--- a/arch/arm/boot/dts/sun6i-a31s-cs908.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-cs908.dts
@@ -66,7 +66,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_mii_a>;
+ pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>;
phy-mode = "mii";
status = "okay";
@@ -77,7 +77,7 @@
&ir {
pinctrl-names = "default";
- pinctrl-0 = <&ir_pins_a>;
+ pinctrl-0 = <&s_ir_rx_pin>;
status = "okay";
};
@@ -87,7 +87,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun6i-a31s-inet-q972.dts b/arch/arm/boot/dts/sun6i-a31s-inet-q972.dts
index 85dab04be261..cc518740b700 100644
--- a/arch/arm/boot/dts/sun6i-a31s-inet-q972.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-inet-q972.dts
@@ -55,7 +55,7 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
ft5406ee8: touchscreen at 38 {
diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
index 55d60c68694e..645d405fcfcc 100644
--- a/arch/arm/boot/dts/sun6i-a31s-primo81.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
@@ -91,13 +91,13 @@
&i2c0 {
/* pull-ups and device VDDIO use AXP221 DLDO3 */
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "failed";
};
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
ctp at 5d {
@@ -111,7 +111,7 @@
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
accelerometer at 1c {
@@ -146,7 +146,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
diff --git a/arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi b/arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi
index d7325bc4eeb4..3099491de8c4 100644
--- a/arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi
@@ -135,7 +135,7 @@
/* UART0 pads available on core board */
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
index 02c9a90fe876..0be033f4942d 100644
--- a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
@@ -114,7 +114,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_mii_a>;
+ pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>;
phy-mode = "mii";
phy-supply = <®_dldo1>;
@@ -137,7 +137,7 @@
&ir {
pinctrl-names = "default";
- pinctrl-0 = <&ir_pins_a>;
+ pinctrl-0 = <&s_ir_rx_pin>;
status = "okay";
};
@@ -162,7 +162,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
@@ -181,7 +181,7 @@
&spdif {
pinctrl-names = "default";
- pinctrl-0 = <&spdif_pins_a>;
+ pinctrl-0 = <&spdif_tx_pin>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
index 14e27e81ddf8..4ee496c531d7 100644
--- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
@@ -91,7 +91,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_rgmii_a>;
+ pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>;
phy-mode = "rgmii";
phy-supply = <®_dldo1>;
@@ -107,13 +107,13 @@
&ir {
pinctrl-names = "default";
- pinctrl-0 = <&ir_pins_a>;
+ pinctrl-0 = <&s_ir_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
@@ -122,7 +122,7 @@
&mmc2 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc2_pins_a>;
+ pinctrl-0 = <&mmc2_4bit_pins>;
vmmc-supply = <®_aldo1>;
mmc-pwrseq = <&mmc2_pwrseq>;
bus-width = <4>;
@@ -254,7 +254,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
index 153e40d6f4c5..13525620bab5 100644
--- a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
@@ -63,13 +63,13 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
@@ -91,7 +91,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v0>;
bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
@@ -177,7 +177,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
index 77f952b12188..a506d740dee3 100644
--- a/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
@@ -66,7 +66,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 31/77] ARM: dts: sun6i: Change pinctrl nodes to avoid warning
2018-11-27 12:45 ` [PATCH 31/77] ARM: dts: sun6i: Change pinctrl nodes to avoid warning Maxime Ripard
@ 2018-11-28 11:50 ` Chen-Yu Tsai
2018-11-28 13:41 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 11:50 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> All our pinctrl nodes were using a node name convention with a unit-address
> to differentiate the different muxing options. However, since those nodes
> didn't have a reg property, they were generating warnings in DTC.
>
> In order to accomodate for this, convert the old nodes to the syntax we've
> been using for the new SoCs, including removing the letter suffix of the
> node labels to the bank of those pins to make things more readable.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
[...]
> diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
> index c5fd97b88b90..596ab854da2c 100644
> --- a/arch/arm/boot/dts/sun6i-a31.dtsi
> +++ b/arch/arm/boot/dts/sun6i-a31.dtsi
[...]
> @@ -712,12 +712,12 @@
> bias-pull-up;
> };
>
> - spdif_pins_a: spdif at 0 {
> + spdif_tx_pin: spdif-pin {
Node name should be spdif-tx-pin, since this SoC also has
SPDIF input.
Otherwise,
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread* [PATCH 31/77] ARM: dts: sun6i: Change pinctrl nodes to avoid warning
2018-11-28 11:50 ` Chen-Yu Tsai
@ 2018-11-28 13:41 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 13:41 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 07:50:31PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > All our pinctrl nodes were using a node name convention with a unit-address
> > to differentiate the different muxing options. However, since those nodes
> > didn't have a reg property, they were generating warnings in DTC.
> >
> > In order to accomodate for this, convert the old nodes to the syntax we've
> > been using for the new SoCs, including removing the letter suffix of the
> > node labels to the bank of those pins to make things more readable.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> [...]
>
> > diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
> > index c5fd97b88b90..596ab854da2c 100644
> > --- a/arch/arm/boot/dts/sun6i-a31.dtsi
> > +++ b/arch/arm/boot/dts/sun6i-a31.dtsi
>
> [...]
>
> > @@ -712,12 +712,12 @@
> > bias-pull-up;
> > };
> >
> > - spdif_pins_a: spdif at 0 {
> > + spdif_tx_pin: spdif-pin {
>
> Node name should be spdif-tx-pin, since this SoC also has
> SPDIF input.
>
> Otherwise,
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
I fixed it up while applying, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/c7138bab/attachment-0001.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 32/77] ARM: dts: sun6i: Remove underscores from nodes names
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (30 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 31/77] ARM: dts: sun6i: Change pinctrl nodes to avoid warning Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:51 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 33/77] ARM: dts: sun6i: colombus: Change i2c node name to avoid warnings Maxime Ripard
` (45 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Some GPIO pinctrl nodes cannot be easily removed, because they would also
change the pin configuration, for example to add a pull resistor or change
the current delivered by the pin.
Those nodes still have underscores and unit-addresses in their node names
in our DTs, so adjust their name to remove the warnings. Use that occasion
to also fix some poorly chosen node-names.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun6i-a31-colombus.dts | 2 +-
arch/arm/boot/dts/sun6i-a31s-primo81.dts | 2 +-
arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts
index d7a19664bae9..99f25b2d5189 100644
--- a/arch/arm/boot/dts/sun6i-a31-colombus.dts
+++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts
@@ -122,7 +122,7 @@
};
&pio {
- i2c_lcd_pins: i2c_lcd_pin at 0 {
+ i2c_lcd_pins: i2c-lcd-pins {
pins = "PA23", "PA24";
function = "gpio_out";
bias-pull-up;
diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
index 645d405fcfcc..ba378affd497 100644
--- a/arch/arm/boot/dts/sun6i-a31s-primo81.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
@@ -154,7 +154,7 @@
};
&pio {
- mma8452_int_primo81: mma8452_int_pin at 0 {
+ mma8452_int_primo81: mma8452-int-pin {
pins = "PA9";
function = "gpio_in";
bias-pull-up;
diff --git a/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
index a506d740dee3..86143de21c22 100644
--- a/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
@@ -74,7 +74,7 @@
};
&pio {
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PA15";
function = "gpio_in";
bias-pull-up;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 32/77] ARM: dts: sun6i: Remove underscores from nodes names
2018-11-27 12:45 ` [PATCH 32/77] ARM: dts: sun6i: Remove underscores from nodes names Maxime Ripard
@ 2018-11-28 11:51 ` Chen-Yu Tsai
2018-11-28 13:42 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 11:51 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Some GPIO pinctrl nodes cannot be easily removed, because they would also
> change the pin configuration, for example to add a pull resistor or change
> the current delivered by the pin.
>
> Those nodes still have underscores and unit-addresses in their node names
> in our DTs, so adjust their name to remove the warnings. Use that occasion
> to also fix some poorly chosen node-names.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 32/77] ARM: dts: sun6i: Remove underscores from nodes names
2018-11-28 11:51 ` Chen-Yu Tsai
@ 2018-11-28 13:42 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 13:42 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 07:51:05PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > Some GPIO pinctrl nodes cannot be easily removed, because they would also
> > change the pin configuration, for example to add a pull resistor or change
> > the current delivered by the pin.
> >
> > Those nodes still have underscores and unit-addresses in their node names
> > in our DTs, so adjust their name to remove the warnings. Use that occasion
> > to also fix some poorly chosen node-names.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/996997c8/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 33/77] ARM: dts: sun6i: colombus: Change i2c node name to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (31 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 32/77] ARM: dts: sun6i: Remove underscores from nodes names Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:51 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 34/77] ARM: dts: sun6i: Provide default muxing for relevant controllers Maxime Ripard
` (44 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Our I2C GPIO bus node name has a unit address, but no reg property, which
generates a warning in DTC. Change the name to remove that unit address.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun6i-a31-colombus.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts
index 99f25b2d5189..6aa3f5d074bd 100644
--- a/arch/arm/boot/dts/sun6i-a31-colombus.dts
+++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts
@@ -60,7 +60,7 @@
stdout-path = "serial0:115200n8";
};
- i2c_lcd: i2c at 0 {
+ i2c_lcd: i2c {
/* The lcd panel i2c interface is hooked up via gpios */
compatible = "i2c-gpio";
pinctrl-names = "default";
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 33/77] ARM: dts: sun6i: colombus: Change i2c node name to avoid warnings
2018-11-27 12:45 ` [PATCH 33/77] ARM: dts: sun6i: colombus: Change i2c node name to avoid warnings Maxime Ripard
@ 2018-11-28 11:51 ` Chen-Yu Tsai
2018-11-28 13:42 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 11:51 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Our I2C GPIO bus node name has a unit address, but no reg property, which
> generates a warning in DTC. Change the name to remove that unit address.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 33/77] ARM: dts: sun6i: colombus: Change i2c node name to avoid warnings
2018-11-28 11:51 ` Chen-Yu Tsai
@ 2018-11-28 13:42 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 13:42 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 07:51:52PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > Our I2C GPIO bus node name has a unit address, but no reg property, which
> > generates a warning in DTC. Change the name to remove that unit address.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/0890ca87/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 34/77] ARM: dts: sun6i: Provide default muxing for relevant controllers
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (32 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 33/77] ARM: dts: sun6i: colombus: Change i2c node name to avoid warnings Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:53 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 35/77] ARM: dts: sun7i: Remove skeleton and memory to avoid warnings Maxime Ripard
` (43 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
The I2C and MMC controllers have only one muxing option in the SoC. In such a
case, we can just move the muxing into the DTSI, and remove it from
the DTS.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun6i-a31-colombus.dts | 8 +-------
arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 10 +---------
arch/arm/boot/dts/sun6i-a31-i7.dts | 2 +--
arch/arm/boot/dts/sun6i-a31-m9.dts | 2 +--
arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 2 +--
arch/arm/boot/dts/sun6i-a31.dtsi | 10 +++++++++-
arch/arm/boot/dts/sun6i-a31s-inet-q972.dts | 2 +--
arch/arm/boot/dts/sun6i-a31s-primo81.dts | 8 +-------
arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 2 +--
arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 2 +--
arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 6 +-----
11 files changed, 10 insertions(+), 44 deletions(-)
diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts
index 6aa3f5d074bd..0b7bedf85fb9 100644
--- a/arch/arm/boot/dts/sun6i-a31-colombus.dts
+++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts
@@ -88,20 +88,14 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "fail";
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
mma8452: mma8452 at 1d {
@@ -113,8 +107,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v0>;
bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
index 5b4d89d2989a..63b84327f4e9 100644
--- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
+++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
@@ -176,21 +176,15 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
/* pull-ups and devices require AXP221 DLDO3 */
status = "failed";
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
pcf8563: rtc at 51 {
@@ -206,8 +200,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
@@ -215,8 +207,6 @@
};
&mmc1 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <®_aldo1>;
mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>;
diff --git a/arch/arm/boot/dts/sun6i-a31-i7.dts b/arch/arm/boot/dts/sun6i-a31-i7.dts
index 6f2bba8b7dd0..0832ac5ae3ec 100644
--- a/arch/arm/boot/dts/sun6i-a31-i7.dts
+++ b/arch/arm/boot/dts/sun6i-a31-i7.dts
@@ -143,8 +143,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-m9.dts
index b65aa90a9167..6eafb6361a26 100644
--- a/arch/arm/boot/dts/sun6i-a31-m9.dts
+++ b/arch/arm/boot/dts/sun6i-a31-m9.dts
@@ -101,8 +101,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
diff --git a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
index c3a85aac44d5..ca036f97923a 100644
--- a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
+++ b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
@@ -101,8 +101,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index 596ab854da2c..14ff7491fb7a 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -388,6 +388,8 @@
resets = <&ccu RST_AHB1_MMC0>;
reset-names = "ahb";
interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@@ -407,6 +409,8 @@
resets = <&ccu RST_AHB1_MMC1>;
reset-names = "ahb";
interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc1_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@@ -876,6 +880,8 @@
interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_APB2_I2C0>;
resets = <&ccu RST_APB2_I2C0>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c0_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@@ -887,6 +893,8 @@
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_APB2_I2C1>;
resets = <&ccu RST_APB2_I2C1>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c1_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@@ -898,6 +906,8 @@
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_APB2_I2C2>;
resets = <&ccu RST_APB2_I2C2>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c2_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/sun6i-a31s-inet-q972.dts b/arch/arm/boot/dts/sun6i-a31s-inet-q972.dts
index cc518740b700..c5e2c55cdc63 100644
--- a/arch/arm/boot/dts/sun6i-a31s-inet-q972.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-inet-q972.dts
@@ -54,8 +54,6 @@
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
ft5406ee8: touchscreen at 38 {
diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
index ba378affd497..60b355f7184c 100644
--- a/arch/arm/boot/dts/sun6i-a31s-primo81.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
@@ -90,14 +90,10 @@
&i2c0 {
/* pull-ups and device VDDIO use AXP221 DLDO3 */
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "failed";
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
ctp at 5d {
@@ -110,8 +106,6 @@
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
accelerometer at 1c {
@@ -145,8 +139,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
diff --git a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
index 0be033f4942d..4865c3271ab0 100644
--- a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
@@ -161,8 +161,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
diff --git a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
index 4ee496c531d7..8e724c52feff 100644
--- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
@@ -112,8 +112,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
diff --git a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
index 13525620bab5..2504e7189c54 100644
--- a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
@@ -62,14 +62,10 @@
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
@@ -90,8 +86,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v0>;
bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 34/77] ARM: dts: sun6i: Provide default muxing for relevant controllers
2018-11-27 12:45 ` [PATCH 34/77] ARM: dts: sun6i: Provide default muxing for relevant controllers Maxime Ripard
@ 2018-11-28 11:53 ` Chen-Yu Tsai
2018-11-28 13:42 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 11:53 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> The I2C and MMC controllers have only one muxing option in the SoC. In such a
> case, we can just move the muxing into the DTSI, and remove it from
> the DTS.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 34/77] ARM: dts: sun6i: Provide default muxing for relevant controllers
2018-11-28 11:53 ` Chen-Yu Tsai
@ 2018-11-28 13:42 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 13:42 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 07:53:35PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > The I2C and MMC controllers have only one muxing option in the SoC. In such a
> > case, we can just move the muxing into the DTSI, and remove it from
> > the DTS.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/e682008a/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 35/77] ARM: dts: sun7i: Remove skeleton and memory to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (33 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 34/77] ARM: dts: sun6i: Provide default muxing for relevant controllers Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:54 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 36/77] ARM: dts: sun7i: Remove SoC node unit-name " Maxime Ripard
` (42 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Using skeleton.dtsi will create a memory node that will generate a warning
in DTC. However, that node will be created by the bootloader, so we can
just remove it entirely in order to remove that warning.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 1ca1fdff2288..3ed0575ed301 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -42,8 +42,6 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "skeleton.dtsi"
-
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/thermal/thermal.h>
#include <dt-bindings/dma/sun4i-a10.h>
@@ -52,6 +50,8 @@
/ {
interrupt-parent = <&gic>;
+ #address-cells = <1>;
+ #size-cells = <1>;
aliases {
ethernet0 = &gmac;
@@ -171,10 +171,6 @@
};
};
- memory {
- reg = <0x40000000 0x80000000>;
- };
-
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 35/77] ARM: dts: sun7i: Remove skeleton and memory to avoid warnings
2018-11-27 12:45 ` [PATCH 35/77] ARM: dts: sun7i: Remove skeleton and memory to avoid warnings Maxime Ripard
@ 2018-11-28 11:54 ` Chen-Yu Tsai
2018-11-28 13:49 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 11:54 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Using skeleton.dtsi will create a memory node that will generate a warning
> in DTC. However, that node will be created by the bootloader, so we can
> just remove it entirely in order to remove that warning.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 35/77] ARM: dts: sun7i: Remove skeleton and memory to avoid warnings
2018-11-28 11:54 ` Chen-Yu Tsai
@ 2018-11-28 13:49 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 13:49 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 07:54:00PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > Using skeleton.dtsi will create a memory node that will generate a warning
> > in DTC. However, that node will be created by the bootloader, so we can
> > just remove it entirely in order to remove that warning.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/15a0655d/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 36/77] ARM: dts: sun7i: Remove SoC node unit-name to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (34 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 35/77] ARM: dts: sun7i: Remove skeleton and memory to avoid warnings Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:54 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 37/77] ARM: dts: sun7i: Change clock node names " Maxime Ripard
` (41 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Our main node for all the in-SoC controllers used to have a unit name. The
unit-name, in addition to being actually false, would not match any reg
property, which generates a warning.
Remove it in order to remove those warnings.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun7i-a20.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 3ed0575ed301..2a88ff58fee4 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -258,7 +258,7 @@
status = "disabled";
};
- soc at 1c00000 {
+ soc {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 37/77] ARM: dts: sun7i: Change clock node names to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (35 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 36/77] ARM: dts: sun7i: Remove SoC node unit-name " Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:54 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 38/77] ARM: dts: sun7i: Change framebuffer " Maxime Ripard
` (40 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Our oscillators clock names have a unit address, but no reg property, which
generates a warning in DTC. Change these names to remove those unit
addresses.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 2a88ff58fee4..9e84dcffc978 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -205,14 +205,14 @@
#size-cells = <1>;
ranges;
- osc24M: clk at 1c20050 {
+ osc24M: clk-24M {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <24000000>;
clock-output-names = "osc24M";
};
- osc32k: clk at 0 {
+ osc32k: clk-32k {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <32768>;
@@ -228,14 +228,14 @@
* The actual TX clock rate is not controlled by the
* gmac_tx clock.
*/
- mii_phy_tx_clk: clk at 1 {
+ mii_phy_tx_clk: clk-mii-phy-tx {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <25000000>;
clock-output-names = "mii_phy_tx";
};
- gmac_int_tx_clk: clk at 2 {
+ gmac_int_tx_clk: clk-gmac-int-tx {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <125000000>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 38/77] ARM: dts: sun7i: Change framebuffer node names to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (36 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 37/77] ARM: dts: sun7i: Change clock node names " Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 11:54 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 39/77] ARM: dts: sun7i: Remove all useless pinctrl nodes Maxime Ripard
` (39 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
The simple-framebuffer nodes have a unit address, but no reg property which
generates a warning when compiling it with DTC.
Change the simple-framebuffer node names so that there is no warnings on
this anymore.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun7i-a20.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 9e84dcffc978..c5a6b7a65c52 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -62,7 +62,7 @@
#size-cells = <1>;
ranges;
- framebuffer at 0 {
+ framebuffer-lcd0-hdmi {
compatible = "allwinner,simple-framebuffer",
"simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0-hdmi";
@@ -73,7 +73,7 @@
status = "disabled";
};
- framebuffer at 1 {
+ framebuffer-lcd0 {
compatible = "allwinner,simple-framebuffer",
"simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0";
@@ -83,7 +83,7 @@
status = "disabled";
};
- framebuffer at 2 {
+ framebuffer-lcd0-tve0 {
compatible = "allwinner,simple-framebuffer",
"simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0-tve0";
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 39/77] ARM: dts: sun7i: Remove all useless pinctrl nodes
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (37 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 38/77] ARM: dts: sun7i: Change framebuffer " Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 12:00 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 40/77] ARM: dts: sun7i: Remove card detect pull-up Maxime Ripard
` (38 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
The gpio pinctrl nodes are redundant and as such useless most of the times.
Since they will also generate warnings in DTC, we can simply remove most of
them.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 21 +-------
arch/arm/boot/dts/sun7i-a20-bananapi.dts | 14 +-----
arch/arm/boot/dts/sun7i-a20-bananapro.dts | 33 +-----------
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 7 +--
arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 40 +-------------
arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 28 +---------
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 30 +----------
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 14 +-----
arch/arm/boot/dts/sun7i-a20-m3.dts | 9 +---
arch/arm/boot/dts/sun7i-a20-mk808c.dts | 14 +-----
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 20 +-------
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 6 +--
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts | 9 +---
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 12 +----
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 26 +--------
arch/arm/boot/dts/sun7i-a20-orangepi.dts | 26 +--------
arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 19 +------
arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 14 +-----
arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 21 +-------
arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 7 +--
20 files changed, 370 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
index 763cb03033c4..a0483bedb6a1 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
@@ -73,8 +73,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pins_bpi_m1p>;
green {
label = "bananapi-m1-plus:green:usr";
@@ -90,15 +88,11 @@
mmc3_pwrseq: mmc3_pwrseq {
compatible = "mmc-pwrseq-simple";
- pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pwrseq_pin_bpi_m1p>;
reset-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 WL-PMU-EN */
};
reg_gmac_3v3: gmac-3v3 {
compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <&gmac_power_pin_bpi_m1p>;
regulator-name = "gmac-3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -227,26 +221,11 @@
};
&pio {
- gmac_power_pin_bpi_m1p: gmac_power_pin at 0 {
- pins = "PH23";
- function = "gpio_out";
- };
-
- led_pins_bpi_m1p: led_pins at 0 {
- pins = "PH24", "PH25";
- function = "gpio_out";
- };
-
mmc0_cd_pin_bpi_m1p: mmc0_cd_pin at 0 {
pins = "PH10";
function = "gpio_in";
bias-pull-up;
};
-
- mmc3_pwrseq_pin_bpi_m1p: mmc3_pwrseq_pin at 0 {
- pins = "PH22";
- function = "gpio_out";
- };
};
®_dcdc2 {
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
index 70dfc4ac0bb5..c5c183a4c0d8 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
@@ -76,8 +76,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pins_bananapi>;
green {
label = "bananapi:green:usr";
@@ -87,8 +85,6 @@
reg_gmac_3v3: gmac-3v3 {
compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <&gmac_power_pin_bananapi>;
regulator-name = "gmac-3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -263,16 +259,6 @@
function = "gpio_in";
bias-pull-up;
};
-
- gmac_power_pin_bananapi: gmac_power_pin at 0 {
- pins = "PH23";
- function = "gpio_out";
- };
-
- led_pins_bananapi: led_pins at 0 {
- pins = "PH24";
- function = "gpio_out";
- };
};
#include "axp209.dtsi"
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
index 0898eb6162f5..f442caf91435 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
@@ -62,8 +62,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pins_bananapro>;
blue {
label = "bananapro:blue:usr";
@@ -78,15 +76,11 @@
wifi_pwrseq: wifi-pwrseq {
compatible = "mmc-pwrseq-simple";
- pinctrl-names = "default";
- pinctrl-0 = <&vmmc3_pin_bananapro>;
reset-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>;
};
reg_gmac_3v3: gmac-3v3 {
compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <&gmac_power_pin_bananapro>;
regulator-name = "gmac-3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -189,46 +183,19 @@
};
&pio {
- gmac_power_pin_bananapro: gmac_power_pin at 0 {
- pins = "PH23";
- function = "gpio_out";
- };
-
- led_pins_bananapro: led_pins at 0 {
- pins = "PH24", "PG2";
- function = "gpio_out";
- };
-
mmc0_cd_pin_bananapro: mmc0_cd_pin at 0 {
pins = "PH10";
function = "gpio_in";
bias-pull-up;
};
-
- usb1_vbus_pin_bananapro: usb1_vbus_pin at 0 {
- pins = "PH0";
- function = "gpio_out";
- };
-
- usb2_vbus_pin_bananapro: usb2_vbus_pin at 0 {
- pins = "PH1";
- function = "gpio_out";
- };
-
- vmmc3_pin_bananapro: vmmc3_pin at 0 {
- pins = "PH22";
- function = "gpio_out";
- };
};
®_usb1_vbus {
- pinctrl-0 = <&usb1_vbus_pin_bananapro>;
gpio = <&pio 7 0 GPIO_ACTIVE_HIGH>; /* PH0 */
status = "okay";
};
®_usb2_vbus {
- pinctrl-0 = <&usb2_vbus_pin_bananapro>;
gpio = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
index 942ac9dfd4a5..849244e03f3a 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
@@ -74,8 +74,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pins_cubieboard2>;
blue {
label = "cubieboard2:blue:usr";
@@ -182,11 +180,6 @@
};
&pio {
- led_pins_cubieboard2: led_pins at 0 {
- pins = "PH20", "PH21";
- function = "gpio_out";
- };
-
usb0_id_detect_pin: usb0_id_detect_pin at 0 {
pins = "PH4";
function = "gpio_in";
diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
index 5649161de1d7..0adcd0aab0aa 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -74,8 +74,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pins_cubietruck>;
blue {
label = "cubietruck:blue:usr";
@@ -100,8 +98,6 @@
mmc3_pwrseq: mmc3_pwrseq {
compatible = "mmc-pwrseq-simple";
- pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pwrseq_pin_cubietruck>;
reset-gpios = <&pio 7 9 GPIO_ACTIVE_LOW>; /* PH9 WIFI_EN */
};
@@ -245,38 +241,6 @@
status = "okay";
};
-&pio {
- ahci_pwr_pin_cubietruck: ahci_pwr_pin at 1 {
- pins = "PH12";
- function = "gpio_out";
- };
-
- led_pins_cubietruck: led_pins at 0 {
- pins = "PH7", "PH11", "PH20", "PH21";
- function = "gpio_out";
- };
-
- mmc3_pwrseq_pin_cubietruck: mmc3_pwrseq_pin at 0 {
- pins = "PH9";
- function = "gpio_out";
- };
-
- usb0_vbus_pin_a: usb0_vbus_pin at 0 {
- pins = "PH17";
- function = "gpio_out";
- };
-
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
- pins = "PH19";
- function = "gpio_in";
- };
-
- usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 {
- pins = "PH22";
- function = "gpio_in";
- };
-};
-
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins_a>, <&pwm1_pins_a>;
@@ -284,7 +248,6 @@
};
®_ahci_5v {
- pinctrl-0 = <&ahci_pwr_pin_cubietruck>;
gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>;
status = "okay";
};
@@ -325,7 +288,6 @@
};
®_usb0_vbus {
- pinctrl-0 = <&usb0_vbus_pin_a>;
gpio = <&pio 7 17 GPIO_ACTIVE_HIGH>;
status = "okay";
};
@@ -360,8 +322,6 @@
};
&usbphy {
- pinctrl-names = "default";
- pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
usb0_id_det-gpios = <&pio 7 19 GPIO_ACTIVE_HIGH>; /* PH19 */
usb0_vbus_det-gpios = <&pio 7 22 GPIO_ACTIVE_HIGH>; /* PH22 */
usb0_vbus_power-supply = <&usb_power_supply>;
diff --git a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
index 1f0e5ecbf0c4..6ba689354f22 100644
--- a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
+++ b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
@@ -67,8 +67,6 @@
reg_mmc3_vdd: mmc3_vdd {
compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <&mmc3_vdd_pin_a20_hummingbird>;
regulator-name = "mmc3_vdd";
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
@@ -78,8 +76,6 @@
reg_gmac_vdd: gmac_vdd {
compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <&gmac_vdd_pin_a20_hummingbird>;
regulator-name = "gmac_vdd";
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
@@ -184,28 +180,6 @@
status = "okay";
};
-&pio {
- ahci_pwr_pin_a20_hummingbird: ahci_pwr_pin at 0 {
- pins = "PH15";
- function = "gpio_out";
- };
-
- usb1_vbus_pin_a20_hummingbird: usb1_vbus_pin at 0 {
- pins = "PH2";
- function = "gpio_out";
- };
-
- mmc3_vdd_pin_a20_hummingbird: mmc3_vdd_pin at 0 {
- pins = "PH9";
- function = "gpio_out";
- };
-
- gmac_vdd_pin_a20_hummingbird: gmac_vdd_pin at 0 {
- pins = "PH16";
- function = "gpio_out";
- };
-};
-
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins_a>;
@@ -213,13 +187,11 @@
};
®_ahci_5v {
- pinctrl-0 = <&ahci_pwr_pin_a20_hummingbird>;
gpio = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */
status = "okay";
};
®_usb1_vbus {
- pinctrl-0 = <&usb1_vbus_pin_a20_hummingbird>;
gpio = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
index 2e3f2f29d124..fe2b827cfa76 100644
--- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
+++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
@@ -61,8 +61,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pins_i12_tvbox>;
red {
label = "i12_tvbox:red:usr";
@@ -77,8 +75,6 @@
reg_vmmc3: vmmc3 {
compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <&vmmc3_pin_i12_tvbox>;
regulator-name = "vmmc3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -88,8 +84,6 @@
reg_vmmc3_io: vmmc3-io {
compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <&vmmc3_io_pin_i12_tvbox>;
regulator-name = "vmmc3-io";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -101,8 +95,6 @@
reg_gmac_3v3: gmac-3v3 {
compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <&gmac_power_pin_i12_tvbox>;
regulator-name = "gmac-3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -194,28 +186,6 @@
status = "okay";
};
-&pio {
- vmmc3_pin_i12_tvbox: vmmc3_pin at 0 {
- pins = "PH2";
- function = "gpio_out";
- };
-
- vmmc3_io_pin_i12_tvbox: vmmc3_io_pin at 0 {
- pins = "PH12";
- function = "gpio_out";
- };
-
- gmac_power_pin_i12_tvbox: gmac_power_pin at 0 {
- pins = "PH21";
- function = "gpio_out";
- };
-
- led_pins_i12_tvbox: led_pins at 0 {
- pins = "PH9", "PH20";
- function = "gpio_out";
- };
-};
-
®_usb1_vbus {
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
index b1ab7c1c33e3..66bc413e846b 100644
--- a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
+++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
@@ -74,8 +74,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pins_lamobo_r1>;
green {
label = "lamobo_r1:green:usr";
@@ -85,8 +83,6 @@
reg_gmac_3v3: gmac-3v3 {
compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <&gmac_power_pin_lamobo_r1>;
regulator-name = "gmac-3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -251,16 +247,6 @@
function = "gpio_in";
bias-pull-up;
};
-
- gmac_power_pin_lamobo_r1: gmac_power_pin at 0 {
- pins = "PH23";
- function = "gpio_out";
- };
-
- led_pins_lamobo_r1: led_pins at 0 {
- pins = "PH24";
- function = "gpio_out";
- };
};
#include "axp209.dtsi"
diff --git a/arch/arm/boot/dts/sun7i-a20-m3.dts b/arch/arm/boot/dts/sun7i-a20-m3.dts
index e91a209850bc..cb8725d95e2b 100644
--- a/arch/arm/boot/dts/sun7i-a20-m3.dts
+++ b/arch/arm/boot/dts/sun7i-a20-m3.dts
@@ -63,8 +63,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pins_m3>;
blue {
label = "m3:blue:usr";
@@ -141,13 +139,6 @@
status = "okay";
};
-&pio {
- led_pins_m3: led_pins at 0 {
- pins = "PH20";
- function = "gpio_out";
- };
-};
-
®_usb1_vbus {
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-mk808c.dts b/arch/arm/boot/dts/sun7i-a20-mk808c.dts
index 6109f794a9c1..a4c5da733fbc 100644
--- a/arch/arm/boot/dts/sun7i-a20-mk808c.dts
+++ b/arch/arm/boot/dts/sun7i-a20-mk808c.dts
@@ -153,18 +153,6 @@
status = "okay";
};
-&pio {
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
- pins = "PH4";
- function = "gpio_in";
- };
-
- usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 {
- pins = "PH5";
- function = "gpio_in";
- };
-};
-
®_usb0_vbus {
status = "okay";
};
@@ -195,8 +183,6 @@
};
&usbphy {
- pinctrl-names = "default";
- pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
usb0_vbus-supply = <®_usb0_vbus>;
diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
index f080f82b58ef..f54820d9b2d9 100644
--- a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
@@ -74,8 +74,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pins_olimex_som_evb>;
green {
label = "a20-olimex-som-evb:green:usr";
@@ -241,11 +239,6 @@
};
&pio {
- ahci_pwr_pin_olimex_som_evb: ahci_pwr_pin at 1 {
- pins = "PC3";
- function = "gpio_out";
- };
-
led_pins_olimex_som_evb: led_pins at 0 {
pins = "PH2";
function = "gpio_out";
@@ -257,20 +250,9 @@
function = "gpio_in";
bias-pull-up;
};
-
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
- pins = "PH4";
- function = "gpio_in";
- };
-
- usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 {
- pins = "PH5";
- function = "gpio_in";
- };
};
®_ahci_5v {
- pinctrl-0 = <&ahci_pwr_pin_olimex_som_evb>;
gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>;
status = "okay";
};
@@ -352,8 +334,6 @@
};
&usbphy {
- pinctrl-names = "default";
- pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH04 */
usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH05 */
usb0_vbus-supply = <®_usb0_vbus>;
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
index d20fd03596e9..46cd00ba8a74 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
@@ -175,11 +175,6 @@
};
&pio {
- ahci_pwr_pin_olinuxinolime: ahci_pwr_pin at 1 {
- pins = "PC3";
- function = "gpio_out";
- };
-
led_pins_olinuxinolime: led_pins at 0 {
pins = "PH2";
function = "gpio_out";
@@ -200,7 +195,6 @@
};
®_ahci_5v {
- pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>;
gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
index 81f376f2a44d..727dffe1db05 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
@@ -48,20 +48,11 @@
compatible = "olimex,a20-olinuxino-lime2-emmc", "allwinner,sun7i-a20";
mmc2_pwrseq: pwrseq {
- pinctrl-0 = <&mmc2_pins_nrst>;
- pinctrl-names = "default";
compatible = "mmc-pwrseq-emmc";
reset-gpios = <&pio 2 16 GPIO_ACTIVE_LOW>;
};
};
-&pio {
- mmc2_pins_nrst: mmc2-rst-pin {
- pins = "PC16";
- function = "gpio_out";
- };
-};
-
&mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_a>;
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
index fbdb6faffcd4..ed6f4e1e94b3 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
@@ -180,11 +180,6 @@
};
&pio {
- ahci_pwr_pin_olinuxinolime: ahci_pwr_pin at 1 {
- pins = "PC3";
- function = "gpio_out";
- };
-
led_pins_olinuxinolime: led_pins at 0 {
pins = "PH2";
function = "gpio_out";
@@ -202,15 +197,9 @@
function = "gpio_in";
bias-pull-down;
};
-
- usb0_vbus_pin_lime2: usb0_vbus_pin at 0 {
- pins = "PC17";
- function = "gpio_out";
- };
};
®_ahci_5v {
- pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>;
gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>;
status = "okay";
};
@@ -258,7 +247,6 @@
};
®_usb0_vbus {
- pinctrl-0 = <&usb0_vbus_pin_lime2>;
gpio = <&pio 2 17 GPIO_ACTIVE_HIGH>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
index f5c7178eb063..b45a61dea108 100644
--- a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
+++ b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
@@ -74,8 +74,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pins_orangepi>;
green {
label = "orangepi:green:usr";
@@ -90,8 +88,6 @@
reg_gmac_3v3: gmac-3v3 {
compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <&gmac_power_pin_orangepi>;
regulator-name = "gmac-3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -204,26 +200,6 @@
function = "gpio_in";
bias-pull-up;
};
-
- usb2_vbus_pin_bananapro: usb2_vbus_pin at 0 {
- pins = "PH22";
- function = "gpio_out";
- };
-
- gmac_power_pin_orangepi: gmac_power_pin at 0 {
- pins = "PH23";
- function = "gpio_out";
- };
-
- led_pins_orangepi: led_pins at 0 {
- pins = "PH24", "PH25";
- function = "gpio_out";
- };
-
- usb1_vbus_pin_bananapro: usb1_vbus_pin at 0 {
- pins = "PH26";
- function = "gpio_out";
- };
};
®_dcdc2 {
@@ -256,13 +232,11 @@
};
®_usb1_vbus {
- pinctrl-0 = <&usb1_vbus_pin_bananapro>;
gpio = <&pio 7 26 GPIO_ACTIVE_HIGH>; /* PH26 */
status = "okay";
};
®_usb2_vbus {
- pinctrl-0 = <&usb2_vbus_pin_bananapro>;
gpio = <&pio 7 22 GPIO_ACTIVE_HIGH>; /* PH22 */
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi.dts b/arch/arm/boot/dts/sun7i-a20-orangepi.dts
index 7a4244e57589..a5c5948e44f7 100644
--- a/arch/arm/boot/dts/sun7i-a20-orangepi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-orangepi.dts
@@ -63,8 +63,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pins_orangepi>;
green {
label = "orangepi:green:usr";
@@ -74,8 +72,6 @@
reg_gmac_3v3: gmac-3v3 {
compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <&gmac_power_pin_orangepi>;
regulator-name = "gmac-3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -155,26 +151,6 @@
function = "gpio_in";
bias-pull-up;
};
-
- usb2_vbus_pin_bananapro: usb2_vbus_pin at 0 {
- pins = "PH22";
- function = "gpio_out";
- };
-
- gmac_power_pin_orangepi: gmac_power_pin at 0 {
- pins = "PH23";
- function = "gpio_out";
- };
-
- led_pins_orangepi: led_pins at 0 {
- pins = "PH24";
- function = "gpio_out";
- };
-
- usb1_vbus_pin_bananapro: usb1_vbus_pin at 0 {
- pins = "PH26";
- function = "gpio_out";
- };
};
®_dcdc2 {
@@ -207,13 +183,11 @@
};
®_usb1_vbus {
- pinctrl-0 = <&usb1_vbus_pin_bananapro>;
gpio = <&pio 7 26 GPIO_ACTIVE_HIGH>; /* PH26 */
status = "okay";
};
®_usb2_vbus {
- pinctrl-0 = <&usb2_vbus_pin_bananapro>;
gpio = <&pio 7 22 GPIO_ACTIVE_HIGH>; /* PH22 */
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
index bfca960b03e0..5e538a23476c 100644
--- a/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
+++ b/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
@@ -71,8 +71,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pins_pcduino3_nano>;
/* Marked "LED3" on the PCB. */
usr1 {
@@ -175,30 +173,14 @@
};
&pio {
- ahci_pwr_pin_pcduino3_nano: ahci_pwr_pin at 0 {
- pins = "PH2";
- function = "gpio_out";
- };
-
- led_pins_pcduino3_nano: led_pins at 0 {
- pins = "PH16", "PH15";
- function = "gpio_out";
- };
-
usb0_id_detect_pin: usb0_id_detect_pin at 0 {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
-
- usb1_vbus_pin_pcduino3_nano: usb1_vbus_pin at 0 {
- pins = "PD2";
- function = "gpio_out";
- };
};
®_ahci_5v {
- pinctrl-0 = <&ahci_pwr_pin_pcduino3_nano>;
gpio = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */
status = "okay";
};
@@ -232,7 +214,6 @@
/* A single regulator (U24) powers both USB host ports. */
®_usb1_vbus {
- pinctrl-0 = <&usb1_vbus_pin_pcduino3_nano>;
gpio = <&pio 3 2 GPIO_ACTIVE_HIGH>; /* PD2 */
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
index c576f101fbde..fc5319836752 100644
--- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
+++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
@@ -63,8 +63,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pins_pcduino3>;
tx {
label = "pcduino3:green:tx";
@@ -79,8 +77,6 @@
gpio_keys {
compatible = "gpio-keys";
- pinctrl-names = "default";
- pinctrl-0 = <&key_pins_pcduino3>;
#address-cells = <1>;
#size-cells = <0>;
button at 0 {
@@ -176,16 +172,6 @@
};
&pio {
- led_pins_pcduino3: led_pins at 0 {
- pins = "PH15", "PH16";
- function = "gpio_out";
- };
-
- key_pins_pcduino3: key_pins at 0 {
- pins = "PH17", "PH18", "PH19";
- function = "gpio_in";
- };
-
usb0_id_detect_pin: usb0_id_detect_pin at 0 {
pins = "PH4";
function = "gpio_in";
diff --git a/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts b/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
index 8202c87ca6a3..b526890a3203 100644
--- a/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
+++ b/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
@@ -63,8 +63,6 @@
pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;
brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;
default-brightness-level = <8>;
- pinctrl-names = "default";
- pinctrl-0 = <&bl_enable_pin>;
enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
};
@@ -74,8 +72,6 @@
};
&codec {
- pinctrl-names = "default";
- pinctrl-0 = <&codec_pa_pin>;
allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */
status = "okay";
};
@@ -122,8 +118,6 @@
reg = <0x5d>;
interrupt-parent = <&pio>;
interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>; /* EINT21 (PH21) */
- pinctrl-names = "default";
- pinctrl-0 = <&ts_reset_pin>;
irq-gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>; /* INT (PH21) */
reset-gpios = <&pio 1 13 GPIO_ACTIVE_HIGH>; /* RST (PB13) */
touchscreen-swapped-x-y;
@@ -171,21 +165,6 @@
};
&pio {
- bl_enable_pin: bl_enable_pin at 0 {
- pins = "PH7";
- function = "gpio_out";
- };
-
- codec_pa_pin: codec_pa_pin at 0 {
- pins = "PH15";
- function = "gpio_out";
- };
-
- ts_reset_pin: ts_reset_pin at 0 {
- pins = "PB13";
- function = "gpio_out";
- };
-
usb0_id_detect_pin: usb0_id_detect_pin at 0 {
pins = "PH4";
function = "gpio_in";
diff --git a/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts b/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
index ff5c1086585c..bf4f51160737 100644
--- a/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
+++ b/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
@@ -62,8 +62,6 @@
mmc3_pwrseq: mmc3_pwrseq {
compatible = "mmc-pwrseq-simple";
- pinctrl-names = "default";
- pinctrl-0 = <&vmmc3_pin_ap6xxx_wl_regon>;
reset-gpios = <&pio 7 9 GPIO_ACTIVE_LOW>; /* PH9 WIFI_EN */
};
};
@@ -158,11 +156,6 @@
};
&pio {
- vmmc3_pin_ap6xxx_wl_regon: vmmc3_pin at 0 {
- pins = "PH9";
- function = "gpio_out";
- };
-
usb0_id_detect_pin: usb0_id_detect_pin at 0 {
pins = "PH4";
function = "gpio_in";
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 40/77] ARM: dts: sun7i: Remove card detect pull-up
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (38 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 39/77] ARM: dts: sun7i: Remove all useless pinctrl nodes Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 12:01 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 41/77] ARM: dts: sun7i: Change LRADC node names to avoid warnings Maxime Ripard
` (37 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Boards usually have an external pull-up on the card-detect signal, so
there's no need to add another one.
This also removes a DTC warning.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 10 +---------
arch/arm/boot/dts/sun7i-a20-bananapi.dts | 8 +-------
arch/arm/boot/dts/sun7i-a20-bananapro.dts | 10 +---------
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 8 +-------
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 8 +-------
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 8 +-------
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 16 ++--------------
arch/arm/boot/dts/sun7i-a20-orangepi.dts | 8 +-------
8 files changed, 9 insertions(+), 67 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
index a0483bedb6a1..ccd7b313448e 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
@@ -175,7 +175,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m1p>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -220,14 +220,6 @@
status = "okay";
};
-&pio {
- mmc0_cd_pin_bpi_m1p: mmc0_cd_pin at 0 {
- pins = "PH10";
- function = "gpio_in";
- bias-pull-up;
- };
-};
-
®_dcdc2 {
regulator-always-on;
regulator-min-microvolt = <1000000>;
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
index c5c183a4c0d8..339c48a477f5 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
@@ -177,7 +177,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -253,12 +253,6 @@
function = "gpio_in";
bias-pull-up;
};
-
- mmc0_cd_pin_bananapi: mmc0_cd_pin at 0 {
- pins = "PH10";
- function = "gpio_in";
- bias-pull-up;
- };
};
#include "axp209.dtsi"
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
index f442caf91435..a4c0a38e1262 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
@@ -149,7 +149,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapro>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -182,14 +182,6 @@
status = "okay";
};
-&pio {
- mmc0_cd_pin_bananapro: mmc0_cd_pin at 0 {
- pins = "PH10";
- function = "gpio_in";
- bias-pull-up;
- };
-};
-
®_usb1_vbus {
gpio = <&pio 7 0 GPIO_ACTIVE_HIGH>; /* PH0 */
status = "okay";
diff --git a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
index 66bc413e846b..cccfee6add35 100644
--- a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
+++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
@@ -220,7 +220,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_lamobo_r1>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -241,12 +241,6 @@
function = "gpio_in";
bias-pull-up;
};
-
- mmc0_cd_pin_lamobo_r1: mmc0_cd_pin at 0 {
- pins = "PH10";
- function = "gpio_in";
- bias-pull-up;
- };
};
#include "axp209.dtsi"
diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
index f54820d9b2d9..892b84bbf357 100644
--- a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
@@ -219,7 +219,7 @@
&mmc3 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_olimex_som_evb>;
+ pinctrl-0 = <&mmc3_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 0 GPIO_ACTIVE_LOW>; /* PH0 */
@@ -244,12 +244,6 @@
function = "gpio_out";
drive-strength = <20>;
};
-
- mmc3_cd_pin_olimex_som_evb: mmc3_cd_pin at 0 {
- pins = "PH0";
- function = "gpio_in";
- bias-pull-up;
- };
};
®_ahci_5v {
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
index 866d230593be..50e7229727a6 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
@@ -232,7 +232,7 @@
&mmc3 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_olinuxinom>;
+ pinctrl-0 = <&mmc3_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */
@@ -257,12 +257,6 @@
function = "gmac";
};
- mmc3_cd_pin_olinuxinom: mmc3_cd_pin at 0 {
- pins = "PH11";
- function = "gpio_in";
- bias-pull-up;
- };
-
led_pins_olinuxino: led_pins at 0 {
pins = "PH2";
function = "gpio_out";
diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
index b45a61dea108..c138e39ac072 100644
--- a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
+++ b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
@@ -162,7 +162,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_orangepi>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -171,7 +171,7 @@
&mmc3 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_orangepi>;
+ pinctrl-0 = <&mmc3_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */
@@ -188,18 +188,6 @@
function = "gpio_in";
bias-pull-up;
};
-
- mmc0_cd_pin_orangepi: mmc0_cd_pin at 0 {
- pins = "PH10";
- function = "gpio_in";
- bias-pull-up;
- };
-
- mmc3_cd_pin_orangepi: mmc3_cd_pin at 0 {
- pins = "PH11";
- function = "gpio_in";
- bias-pull-up;
- };
};
®_dcdc2 {
diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi.dts b/arch/arm/boot/dts/sun7i-a20-orangepi.dts
index a5c5948e44f7..4f4821d6466d 100644
--- a/arch/arm/boot/dts/sun7i-a20-orangepi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-orangepi.dts
@@ -128,7 +128,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_orangepi>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -145,12 +145,6 @@
function = "gpio_in";
bias-pull-up;
};
-
- mmc0_cd_pin_orangepi: mmc0_cd_pin at 0 {
- pins = "PH10";
- function = "gpio_in";
- bias-pull-up;
- };
};
®_dcdc2 {
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 41/77] ARM: dts: sun7i: Change LRADC node names to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (39 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 40/77] ARM: dts: sun7i: Remove card detect pull-up Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 12:02 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 42/77] ARM: dts: sun7i: Remove gpio-keys warnings Maxime Ripard
` (36 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
One of the usage of the LRADC is to implement buttons. The bindings define
that we should have one subnode per button, with their associated voltage
as a property.
However, there was no reg property but we still used the voltage associated
to the button as the unit-address, which eventually generated warnings in
DTC.
Rename the node names to avoid those warnings.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 14 +++++++-------
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 14 +++++++-------
arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 4 ++--
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
index 892b84bbf357..2aa719338dac 100644
--- a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
@@ -158,49 +158,49 @@
vref-supply = <®_vcc3v0>;
status = "okay";
- button at 190 {
+ button-190 {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
channel = <0>;
voltage = <190000>;
};
- button at 390 {
+ button-390 {
label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>;
channel = <0>;
voltage = <390000>;
};
- button at 600 {
+ button-600 {
label = "Menu";
linux,code = <KEY_MENU>;
channel = <0>;
voltage = <600000>;
};
- button at 800 {
+ button-800 {
label = "Search";
linux,code = <KEY_SEARCH>;
channel = <0>;
voltage = <800000>;
};
- button at 980 {
+ button-980 {
label = "Home";
linux,code = <KEY_HOMEPAGE>;
channel = <0>;
voltage = <980000>;
};
- button at 1180 {
+ button-1180 {
label = "Esc";
linux,code = <KEY_ESC>;
channel = <0>;
voltage = <1180000>;
};
- button at 1400 {
+ button-1400 {
label = "Enter";
linux,code = <KEY_ENTER>;
channel = <0>;
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
index 50e7229727a6..f78f18fd7c1c 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
@@ -171,49 +171,49 @@
vref-supply = <®_vcc3v0>;
status = "okay";
- button at 191 {
+ button-191 {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
channel = <0>;
voltage = <191274>;
};
- button at 392 {
+ button-392 {
label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>;
channel = <0>;
voltage = <392644>;
};
- button at 601 {
+ button-601 {
label = "Menu";
linux,code = <KEY_MENU>;
channel = <0>;
voltage = <601151>;
};
- button at 795 {
+ button-795 {
label = "Search";
linux,code = <KEY_SEARCH>;
channel = <0>;
voltage = <795090>;
};
- button at 987 {
+ button-987 {
label = "Home";
linux,code = <KEY_HOMEPAGE>;
channel = <0>;
voltage = <987387>;
};
- button at 1184 {
+ button-1184 {
label = "Esc";
linux,code = <KEY_ESC>;
channel = <0>;
voltage = <1184678>;
};
- button at 1398 {
+ button-1398 {
label = "Enter";
linux,code = <KEY_ENTER>;
channel = <0>;
diff --git a/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts b/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
index b526890a3203..8fd85c6597bf 100644
--- a/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
+++ b/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
@@ -128,14 +128,14 @@
vref-supply = <®_vcc3v0>;
status = "okay";
- button at 571 {
+ button-571 {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
channel = <0>;
voltage = <571428>;
};
- button at 761 {
+ button-761 {
label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>;
channel = <0>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 41/77] ARM: dts: sun7i: Change LRADC node names to avoid warnings
2018-11-27 12:45 ` [PATCH 41/77] ARM: dts: sun7i: Change LRADC node names to avoid warnings Maxime Ripard
@ 2018-11-28 12:02 ` Chen-Yu Tsai
0 siblings, 0 replies; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 12:02 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> One of the usage of the LRADC is to implement buttons. The bindings define
> that we should have one subnode per button, with their associated voltage
> as a property.
>
> However, there was no reg property but we still used the voltage associated
> to the button as the unit-address, which eventually generated warnings in
> DTC.
>
> Rename the node names to avoid those warnings.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 42/77] ARM: dts: sun7i: Remove gpio-keys warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (40 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 41/77] ARM: dts: sun7i: Change LRADC node names to avoid warnings Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 12:02 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 43/77] ARM: dts: sun7i: Change pinctrl nodes to avoid warning Maxime Ripard
` (35 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Some gpio-keys definitions in our DTs were having buttons defined with a
unit-address and that would generate a DTC warning.
Change the buttons node names to remove the warnings.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
index fc5319836752..0c0997effdf7 100644
--- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
+++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
@@ -75,21 +75,22 @@
};
};
- gpio_keys {
+ gpio-keys {
compatible = "gpio-keys";
- #address-cells = <1>;
- #size-cells = <0>;
- button at 0 {
+
+ back {
label = "Key Back";
linux,code = <KEY_BACK>;
gpios = <&pio 7 17 GPIO_ACTIVE_LOW>;
};
- button at 1 {
+
+ home {
label = "Key Home";
linux,code = <KEY_HOME>;
gpios = <&pio 7 18 GPIO_ACTIVE_LOW>;
};
- button at 2 {
+
+ menu {
label = "Key Menu";
linux,code = <KEY_MENU>;
gpios = <&pio 7 19 GPIO_ACTIVE_LOW>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 43/77] ARM: dts: sun7i: Change pinctrl nodes to avoid warning
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (41 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 42/77] ARM: dts: sun7i: Remove gpio-keys warnings Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 12:10 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 44/77] ARM: dts: sun7i: Split the RTS and CTS pins out of the UART nodes Maxime Ripard
` (34 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
All our pinctrl nodes were using a node name convention with a unit-address
to differentiate the different muxing options. However, since those nodes
didn't have a reg property, they were generating warnings in DTC.
In order to accomodate for this, convert the old nodes to the syntax we've
been using for the new SoCs, including removing the letter suffix of the
node labels to the bank of those pins to make things more readable.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 14 +-
arch/arm/boot/dts/sun7i-a20-bananapi.dts | 22 +--
arch/arm/boot/dts/sun7i-a20-bananapro.dts | 24 +--
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 12 +-
arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 22 +--
arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 32 ++--
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 14 +-
arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 10 +-
arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 8 +-
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 22 +--
arch/arm/boot/dts/sun7i-a20-m3.dts | 12 +-
arch/arm/boot/dts/sun7i-a20-mk808c.dts | 12 +-
arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 26 +--
arch/arm/boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 30 ++--
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 10 +-
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 10 +-
arch/arm/boot/dts/sun7i-a20-olinuxino-micro-emmc.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 26 +--
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 12 +-
arch/arm/boot/dts/sun7i-a20-orangepi.dts | 10 +-
arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 10 +-
arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 10 +-
arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 12 +-
arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 14 +-
arch/arm/boot/dts/sun7i-a20.dtsi | 88 +++++------
arch/arm/boot/dts/sunxi-itead-core-common.dtsi | 2 +-
29 files changed, 236 insertions(+), 236 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
index ccd7b313448e..af4418de57be 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
@@ -128,7 +128,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_rgmii_a>;
+ pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>;
phy-mode = "rgmii";
phy-supply = <®_gmac_3v3>;
@@ -151,7 +151,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -169,13 +169,13 @@
&ir0 {
pinctrl-names = "default";
- pinctrl-0 = <&ir0_rx_pins_a>;
+ pinctrl-0 = <&ir0_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -186,7 +186,7 @@
#address-cells = <1>;
#size-cells = <0>;
pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins_a>;
+ pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <®_vcc3v3>;
mmc-pwrseq = <&mmc3_pwrseq>;
bus-width = <4>;
@@ -203,7 +203,7 @@
};
};
-&mmc3_pins_a {
+&mmc3_pins {
/* AP6210 requires pull-up */
bias-pull-up;
};
@@ -251,7 +251,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
index 339c48a477f5..af56ae95c63f 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
@@ -130,7 +130,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_rgmii_a>;
+ pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>;
phy-mode = "rgmii";
phy-supply = <®_gmac_3v3>;
@@ -153,7 +153,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -165,19 +165,19 @@
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
&ir0 {
pinctrl-names = "default";
- pinctrl-0 = <&ir0_rx_pins_a>;
+ pinctrl-0 = <&ir0_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -296,27 +296,27 @@
&spi0 {
pinctrl-names = "default";
- pinctrl-0 = <&spi0_pins_a>,
- <&spi0_cs0_pins_a>,
- <&spi0_cs1_pins_a>;
+ pinctrl-0 = <&spi0_pi_pins>,
+ <&spi0_cs0_pi_pin>,
+ <&spi0_cs1_pi_pin>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
&uart3 {
pinctrl-names = "default";
- pinctrl-0 = <&uart3_pins_b>;
+ pinctrl-0 = <&uart3_ph_pins>;
status = "okay";
};
&uart7 {
pinctrl-names = "default";
- pinctrl-0 = <&uart7_pins_a>;
+ pinctrl-0 = <&uart7_pi_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
index a4c0a38e1262..567bf6d493f9 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
@@ -108,7 +108,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_rgmii_a>;
+ pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>;
phy-mode = "rgmii";
phy-supply = <®_gmac_3v3>;
@@ -121,7 +121,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -137,19 +137,19 @@
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
&ir0 {
pinctrl-names = "default";
- pinctrl-0 = <&ir0_rx_pins_a>;
+ pinctrl-0 = <&ir0_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -158,7 +158,7 @@
&mmc3 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins_a>;
+ pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <®_vcc3v3>;
mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>;
@@ -194,27 +194,27 @@
&spi0 {
pinctrl-names = "default";
- pinctrl-0 = <&spi0_pins_a>,
- <&spi0_cs0_pins_a>,
- <&spi0_cs1_pins_a>;
+ pinctrl-0 = <&spi0_pi_pins>,
+ <&spi0_cs0_pi_pin>,
+ <&spi0_cs1_pi_pin>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
&uart4 {
pinctrl-names = "default";
- pinctrl-0 = <&uart4_pins_b>;
+ pinctrl-0 = <&uart4_ph_pins>;
status = "okay";
};
&uart7 {
pinctrl-names = "default";
- pinctrl-0 = <&uart7_pins_a>;
+ pinctrl-0 = <&uart7_pi_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
index 849244e03f3a..9a027764cda4 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
@@ -114,7 +114,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_mii_a>;
+ pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>;
phy-mode = "mii";
status = "okay";
@@ -136,7 +136,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -148,19 +148,19 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&ir0 {
pinctrl-names = "default";
- pinctrl-0 = <&ir0_rx_pins_a>;
+ pinctrl-0 = <&ir0_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -232,7 +232,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
index 0adcd0aab0aa..20069542336f 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -147,7 +147,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_rgmii_a>;
+ pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>;
phy-mode = "rgmii";
status = "okay";
@@ -169,7 +169,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -181,25 +181,25 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
&ir0 {
pinctrl-names = "default";
- pinctrl-0 = <&ir0_rx_pins_a>;
+ pinctrl-0 = <&ir0_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -208,7 +208,7 @@
&mmc3 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins_a>;
+ pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <®_vcc3v3>;
mmc-pwrseq = <&mmc3_pwrseq>;
bus-width = <4>;
@@ -224,7 +224,7 @@
};
};
-&mmc3_pins_a {
+&mmc3_pins {
/* AP6210 requires pull-up */
bias-pull-up;
};
@@ -243,7 +243,7 @@
&pwm {
pinctrl-names = "default";
- pinctrl-0 = <&pwm0_pins_a>, <&pwm1_pins_a>;
+ pinctrl-0 = <&pwm0_pin>, <&pwm1_pin>;
status = "okay";
};
@@ -302,13 +302,13 @@
&spdif {
pinctrl-names = "default";
- pinctrl-0 = <&spdif_tx_pins_a>;
+ pinctrl-0 = <&spdif_tx_pin>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
index 6ba689354f22..9ce59d49cf49 100644
--- a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
+++ b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
@@ -99,7 +99,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_rgmii_a>;
+ pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>;
phy-mode = "rgmii";
phy-supply = <®_gmac_vdd>;
@@ -117,7 +117,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -132,31 +132,31 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
&i2c3 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c3_pins_a>;
+ pinctrl-0 = <&i2c3_pins>;
status = "okay";
};
&ir0 {
pinctrl-names = "default";
- pinctrl-0 = <&ir0_rx_pins_a>;
+ pinctrl-0 = <&ir0_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v0>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -165,7 +165,7 @@
&mmc3 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins_a>;
+ pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <®_mmc3_vdd>;
bus-width = <4>;
non-removable;
@@ -182,7 +182,7 @@
&pwm {
pinctrl-names = "default";
- pinctrl-0 = <&pwm0_pins_a>;
+ pinctrl-0 = <&pwm0_pin>;
status = "okay";
};
@@ -202,38 +202,38 @@
&spi2 {
pinctrl-names = "default";
- pinctrl-0 = <&spi2_pins_b>,
- <&spi2_cs0_pins_b>;
+ pinctrl-0 = <&spi2_pb_pins>,
+ <&spi2_cs0_pb_pin>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
&uart2 {
pinctrl-names = "default";
- pinctrl-0 = <&uart2_pins_a>;
+ pinctrl-0 = <&uart2_pi_pins>;
status = "okay";
};
&uart3 {
pinctrl-names = "default";
- pinctrl-0 = <&uart3_pins_a>;
+ pinctrl-0 = <&uart3_pg_pins>;
status = "okay";
};
&uart4 {
pinctrl-names = "default";
- pinctrl-0 = <&uart4_pins_a>;
+ pinctrl-0 = <&uart4_pg_pins>;
status = "okay";
};
&uart5 {
pinctrl-names = "default";
- pinctrl-0 = <&uart5_pins_a>;
+ pinctrl-0 = <&uart5_pi_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
index fe2b827cfa76..db708332616e 100644
--- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
+++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
@@ -114,7 +114,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_mii_a>;
+ pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>;
phy-mode = "mii";
phy-supply = <®_gmac_3v3>;
@@ -127,7 +127,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -143,13 +143,13 @@
&ir0 {
pinctrl-names = "default";
- pinctrl-0 = <&ir0_rx_pins_a>;
+ pinctrl-0 = <&ir0_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -158,7 +158,7 @@
&mmc3 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins_a>;
+ pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <®_vmmc3>;
bus-width = <4>;
non-removable;
@@ -173,7 +173,7 @@
};
};
-&mmc3_pins_a {
+&mmc3_pins {
/* AP6210 / AP6330 requires pull-up */
bias-pull-up;
};
@@ -196,7 +196,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-icnova-swac.dts b/arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
index 926fa194eb1b..0bf70b22bac4 100644
--- a/arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
+++ b/arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
@@ -74,7 +74,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_mii_a>;
+ pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>;
phy-mode = "mii";
status = "okay";
@@ -86,7 +86,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -98,13 +98,13 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 8 5 GPIO_ACTIVE_LOW>; /* PI5 */
@@ -156,7 +156,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts b/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
index 1b05ba466e7d..ad97f6f2cc2c 100644
--- a/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
+++ b/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
@@ -96,7 +96,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_mii_a>;
+ pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>;
phy-mode = "mii";
status = "okay";
@@ -115,13 +115,13 @@
&ir0 {
pinctrl-names = "default";
- pinctrl-0 = <&ir0_rx_pins_a>;
+ pinctrl-0 = <&ir0_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -142,6 +142,6 @@
&spdif {
pinctrl-names = "default";
- pinctrl-0 = <&spdif_tx_pins_a>;
+ pinctrl-0 = <&spdif_tx_pin>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
index cccfee6add35..32e204fe8c15 100644
--- a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
+++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
@@ -119,7 +119,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_rgmii_a>;
+ pinctrl-0 = <&gmac_rgmii_pins>;
phy-mode = "rgmii";
phy-supply = <®_gmac_3v3>;
status = "okay";
@@ -196,7 +196,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -208,19 +208,19 @@
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
&ir0 {
pinctrl-names = "default";
- pinctrl-0 = <&ir0_rx_pins_a>;
+ pinctrl-0 = <&ir0_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -294,27 +294,27 @@
&spi0 {
pinctrl-names = "default";
- pinctrl-0 = <&spi0_pins_a>,
- <&spi0_cs0_pins_a>,
- <&spi0_cs1_pins_a>;
+ pinctrl-0 = <&spi0_pi_pins>,
+ <&spi0_cs0_pi_pin>,
+ <&spi0_cs1_pi_pin>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
&uart3 {
pinctrl-names = "default";
- pinctrl-0 = <&uart3_pins_b>;
+ pinctrl-0 = <&uart3_ph_pins>;
status = "okay";
};
&uart7 {
pinctrl-names = "default";
- pinctrl-0 = <&uart7_pins_a>;
+ pinctrl-0 = <&uart7_pi_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-m3.dts b/arch/arm/boot/dts/sun7i-a20-m3.dts
index cb8725d95e2b..1207e0d897b7 100644
--- a/arch/arm/boot/dts/sun7i-a20-m3.dts
+++ b/arch/arm/boot/dts/sun7i-a20-m3.dts
@@ -81,7 +81,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_mii_a>;
+ pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>;
phy-mode = "mii";
status = "okay";
@@ -93,7 +93,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -109,13 +109,13 @@
&ir0 {
pinctrl-names = "default";
- pinctrl-0 = <&ir0_rx_pins_a>;
+ pinctrl-0 = <&ir0_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -124,7 +124,7 @@
&mmc2 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc2_pins_a>;
+ pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
non-removable;
@@ -149,7 +149,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-mk808c.dts b/arch/arm/boot/dts/sun7i-a20-mk808c.dts
index a4c5da733fbc..a8d15d01ac1a 100644
--- a/arch/arm/boot/dts/sun7i-a20-mk808c.dts
+++ b/arch/arm/boot/dts/sun7i-a20-mk808c.dts
@@ -107,7 +107,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -122,19 +122,19 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v0>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -167,13 +167,13 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
&uart2 {
pinctrl-names = "default";
- pinctrl-0 = <&uart2_pins_a>;
+ pinctrl-0 = <&uart2_pi_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts
index 81ebc97b76ee..ea0d620119cb 100644
--- a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts
@@ -22,7 +22,7 @@
&mmc2 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc2_pins_a>;
+ pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <®_vcc3v3>;
mmc-pwrseq = <&mmc2_pwrseq>;
bus-width = <4>;
diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
index 2aa719338dac..8f8a77121e80 100644
--- a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
@@ -110,7 +110,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_rgmii_a>;
+ pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>;
phy-mode = "rgmii";
status = "okay";
@@ -132,7 +132,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -144,13 +144,13 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
@@ -210,7 +210,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -219,7 +219,7 @@
&mmc3 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins_a>;
+ pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 0 GPIO_ACTIVE_LOW>; /* PH0 */
@@ -292,33 +292,33 @@
&spi1 {
pinctrl-names = "default";
- pinctrl-0 = <&spi1_pins_a>,
- <&spi1_cs0_pins_a>;
+ pinctrl-0 = <&spi1_pi_pins>,
+ <&spi1_cs0_pi_pin>;
status = "okay";
};
&spi2 {
pinctrl-names = "default";
- pinctrl-0 = <&spi2_pins_a>,
- <&spi2_cs0_pins_a>;
+ pinctrl-0 = <&spi2_pc_pins>,
+ <&spi2_cs0_pc_pin>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
&uart6 {
pinctrl-names = "default";
- pinctrl-0 = <&uart6_pins_a>;
+ pinctrl-0 = <&uart6_pi_pins>;
status = "okay";
};
&uart7 {
pinctrl-names = "default";
- pinctrl-0 = <&uart7_pins_a>;
+ pinctrl-0 = <&uart7_pi_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts
index c56620a8fb20..093cd32c9a1c 100644
--- a/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts
@@ -21,7 +21,7 @@
&mmc2 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc2_pins_a>;
+ pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <®_vcc3v3>;
mmc-pwrseq = <&mmc2_pwrseq>;
bus-width = <4>;
diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
index 3d7b5c848fef..631a80ae958e 100644
--- a/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
@@ -78,7 +78,7 @@
&can0 {
pinctrl-names = "default";
- pinctrl-0 = <&can0_pins_a>;
+ pinctrl-0 = <&can_ph_pins>;
status = "okay";
};
@@ -104,7 +104,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_rgmii_a>;
+ pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy3>;
phy-mode = "rgmii";
phy-supply = <®_vcc3v3>;
@@ -131,7 +131,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -144,7 +144,7 @@
/* Exposed to UEXT1 */
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
eeprom: eeprom at 50 {
@@ -157,19 +157,19 @@
/* Exposed to UEXT2 */
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
&ir0 {
pinctrl-names = "default";
- pinctrl-0 = <&ir0_rx_pins_a>;
+ pinctrl-0 = <&ir0_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>;
@@ -178,7 +178,7 @@
&mmc3 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins_a>;
+ pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <®_vcc3v3>;
mmc-pwrseq = <&rtl_pwrseq>;
bus-width = <4>;
@@ -274,22 +274,22 @@
/* Exposed to UEXT1 */
&spi1 {
pinctrl-names = "default";
- pinctrl-0 = <&spi1_pins_a>,
- <&spi1_cs0_pins_a>;
+ pinctrl-0 = <&spi1_pi_pins>,
+ <&spi1_cs0_pi_pin>;
status = "okay";
};
/* Exposed to UEXT2 */
&spi2 {
pinctrl-names = "default";
- pinctrl-0 = <&spi2_pins_a>,
- <&spi2_cs0_pins_a>;
+ pinctrl-0 = <&spi2_pc_pins>,
+ <&spi2_cs0_pc_pin>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
@@ -303,14 +303,14 @@
/* Exposed to UEXT1 */
&uart4 {
pinctrl-names = "default";
- pinctrl-0 = <&uart4_pins_a>;
+ pinctrl-0 = <&uart4_pg_pins>;
status = "okay";
};
/* Exposed to UEXT2 */
&uart7 {
pinctrl-names = "default";
- pinctrl-0 = <&uart7_pins_a>;
+ pinctrl-0 = <&uart7_pi_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
index 46cd00ba8a74..7d6a90678025 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
@@ -105,7 +105,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_mii_a>;
+ pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>;
phy-mode = "mii";
status = "okay";
@@ -127,7 +127,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -143,7 +143,7 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
eeprom: eeprom at 50 {
@@ -155,7 +155,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -213,7 +213,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
index 727dffe1db05..0a2a26f9a5fb 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
@@ -55,7 +55,7 @@
&mmc2 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc2_pins_a>;
+ pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <®_vcc3v3>;
vqmmc-supply = <®_vcc3v3>;
bus-width = <4>;
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
index ed6f4e1e94b3..9ea84cf6437b 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
@@ -110,7 +110,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_rgmii_a>;
+ pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>;
phy-mode = "rgmii";
status = "okay";
@@ -132,7 +132,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -144,7 +144,7 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
eeprom: eeprom at 50 {
@@ -160,7 +160,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -261,7 +261,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro-emmc.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro-emmc.dts
index d99e7b193efe..58fd3519ab7d 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro-emmc.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro-emmc.dts
@@ -55,7 +55,7 @@
&mmc2 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc2_pins_a>;
+ pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
non-removable;
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
index f78f18fd7c1c..4cef69e90b2f 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
@@ -117,7 +117,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_mii_a>, <&gmac_txerr>;
+ pinctrl-0 = <&gmac_mii_pins>, <&gmac_txerr>;
phy = <&phy1>;
phy-mode = "mii";
status = "okay";
@@ -139,7 +139,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -151,7 +151,7 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
eeprom: eeprom at 50 {
@@ -163,7 +163,7 @@
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
@@ -223,7 +223,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -232,7 +232,7 @@
&mmc3 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins_a>;
+ pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */
@@ -325,33 +325,33 @@
&spi1 {
pinctrl-names = "default";
- pinctrl-0 = <&spi1_pins_a>,
- <&spi1_cs0_pins_a>;
+ pinctrl-0 = <&spi1_pi_pins>,
+ <&spi1_cs0_pi_pin>;
status = "okay";
};
&spi2 {
pinctrl-names = "default";
- pinctrl-0 = <&spi2_pins_a>,
- <&spi2_cs0_pins_a>;
+ pinctrl-0 = <&spi2_pc_pins>,
+ <&spi2_cs0_pc_pin>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
&uart6 {
pinctrl-names = "default";
- pinctrl-0 = <&uart6_pins_a>;
+ pinctrl-0 = <&uart6_pi_pins>;
status = "okay";
};
&uart7 {
pinctrl-names = "default";
- pinctrl-0 = <&uart7_pins_a>;
+ pinctrl-0 = <&uart7_pi_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
index c138e39ac072..192d907fee71 100644
--- a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
+++ b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
@@ -119,7 +119,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_rgmii_a>;
+ pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>;
phy-mode = "rgmii";
phy-supply = <®_gmac_3v3>;
@@ -142,7 +142,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -156,13 +156,13 @@
&ir0 {
pinctrl-names = "default";
- pinctrl-0 = <&ir0_rx_pins_a>;
+ pinctrl-0 = <&ir0_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -171,7 +171,7 @@
&mmc3 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins_a>;
+ pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */
@@ -231,7 +231,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi.dts b/arch/arm/boot/dts/sun7i-a20-orangepi.dts
index 4f4821d6466d..c71d819cd0af 100644
--- a/arch/arm/boot/dts/sun7i-a20-orangepi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-orangepi.dts
@@ -95,7 +95,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_rgmii_a>;
+ pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>;
phy-mode = "rgmii";
phy-supply = <®_gmac_3v3>;
@@ -108,7 +108,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -122,13 +122,13 @@
&ir0 {
pinctrl-names = "default";
- pinctrl-0 = <&ir0_rx_pins_a>;
+ pinctrl-0 = <&ir0_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -188,7 +188,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
index 5e538a23476c..1ba1dd6de244 100644
--- a/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
+++ b/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
@@ -113,7 +113,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_rgmii_a>;
+ pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>;
phy-mode = "rgmii";
status = "okay";
@@ -135,7 +135,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -147,13 +147,13 @@
&ir0 {
pinctrl-names = "default";
- pinctrl-0 = <&ir0_rx_pins_a>;
+ pinctrl-0 = <&ir0_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -220,7 +220,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
index 0c0997effdf7..77a49e8b3d20 100644
--- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
+++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
@@ -121,7 +121,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_mii_a>;
+ pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>;
phy-mode = "mii";
status = "okay";
@@ -133,7 +133,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -147,13 +147,13 @@
&ir0 {
pinctrl-names = "default";
- pinctrl-0 = <&ir0_rx_pins_a>;
+ pinctrl-0 = <&ir0_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -220,7 +220,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts b/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
index 8fd85c6597bf..23b7d127e14f 100644
--- a/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
+++ b/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
@@ -90,7 +90,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -104,13 +104,13 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
gt911: touchscreen at 5d {
@@ -145,7 +145,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -174,7 +174,7 @@
&pwm {
pinctrl-names = "default";
- pinctrl-0 = <&pwm0_pins_a>;
+ pinctrl-0 = <&pwm0_pin>;
status = "okay";
};
@@ -217,7 +217,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts b/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
index bf4f51160737..1df18959d2a9 100644
--- a/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
+++ b/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
@@ -80,7 +80,7 @@
&gmac {
pinctrl-names = "default";
- pinctrl-0 = <&gmac_pins_rgmii_a>;
+ pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>;
phy-mode = "rgmii";
status = "okay";
@@ -92,7 +92,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -104,13 +104,13 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
@@ -118,7 +118,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -127,7 +127,7 @@
&mmc3 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins_a>;
+ pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <®_vcc3v3>;
mmc-pwrseq = <&mmc3_pwrseq>;
bus-width = <4>;
@@ -202,7 +202,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index c5a6b7a65c52..75669fc51de5 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -747,22 +747,22 @@
#interrupt-cells = <3>;
#gpio-cells = <3>;
- can0_pins_a: can0 at 0 {
+ can_ph_pins: can-ph-pins {
pins = "PH20", "PH21";
function = "can";
};
- clk_out_a_pins_a: clk_out_a at 0 {
+ clk_out_a_pin: clk-out-a-pin {
pins = "PI12";
function = "clk_out_a";
};
- clk_out_b_pins_a: clk_out_b at 0 {
+ clk_out_b_pin: clk-out-b-pin {
pins = "PI13";
function = "clk_out_b";
};
- emac_pins_a: emac0 at 0 {
+ emac_pa_pins: emac-pa-pins {
pins = "PA0", "PA1", "PA2",
"PA3", "PA4", "PA5", "PA6",
"PA7", "PA8", "PA9", "PA10",
@@ -771,7 +771,7 @@
function = "emac";
};
- gmac_pins_mii_a: gmac_mii at 0 {
+ gmac_mii_pins: gmac-mii-pins {
pins = "PA0", "PA1", "PA2",
"PA3", "PA4", "PA5", "PA6",
"PA7", "PA8", "PA9", "PA10",
@@ -780,7 +780,7 @@
function = "gmac";
};
- gmac_pins_rgmii_a: gmac_rgmii at 0 {
+ gmac_rgmii_pins: gmac-rgmii-pins {
pins = "PA0", "PA1", "PA2",
"PA3", "PA4", "PA5", "PA6",
"PA7", "PA8", "PA10",
@@ -794,47 +794,47 @@
drive-strength = <40>;
};
- i2c0_pins_a: i2c0 at 0 {
+ i2c0_pins: i2c0-pins {
pins = "PB0", "PB1";
function = "i2c0";
};
- i2c1_pins_a: i2c1 at 0 {
+ i2c1_pins: i2c1-pins {
pins = "PB18", "PB19";
function = "i2c1";
};
- i2c2_pins_a: i2c2 at 0 {
+ i2c2_pins: i2c2-pins {
pins = "PB20", "PB21";
function = "i2c2";
};
- i2c3_pins_a: i2c3 at 0 {
+ i2c3_pins: i2c3-pins {
pins = "PI0", "PI1";
function = "i2c3";
};
- ir0_rx_pins_a: ir0 at 0 {
+ ir0_rx_pin: ir0-rx-pin {
pins = "PB4";
function = "ir0";
};
- ir0_tx_pins_a: ir0 at 1 {
+ ir0_tx_pin: ir0-tx-pin {
pins = "PB3";
function = "ir0";
};
- ir1_rx_pins_a: ir1 at 0 {
+ ir1_rx_pin: ir1-rx-pin {
pins = "PB23";
function = "ir1";
};
- ir1_tx_pins_a: ir1 at 1 {
+ ir1_tx_pin: ir1-tx-pin {
pins = "PB22";
function = "ir1";
};
- mmc0_pins_a: mmc0 at 0 {
+ mmc0_pins: mmc0-pins {
pins = "PF0", "PF1", "PF2",
"PF3", "PF4", "PF5";
function = "mmc0";
@@ -842,7 +842,7 @@
bias-pull-up;
};
- mmc2_pins_a: mmc2 at 0 {
+ mmc2_pins: mmc2-pins {
pins = "PC6", "PC7", "PC8",
"PC9", "PC10", "PC11";
function = "mmc2";
@@ -850,7 +850,7 @@
bias-pull-up;
};
- mmc3_pins_a: mmc3 at 0 {
+ mmc3_pins: mmc3-pins {
pins = "PI4", "PI5", "PI6",
"PI7", "PI8", "PI9";
function = "mmc3";
@@ -858,118 +858,118 @@
bias-pull-up;
};
- ps20_pins_a: ps20 at 0 {
+ ps2_0_pins: ps2-0-pins {
pins = "PI20", "PI21";
function = "ps2";
};
- ps21_pins_a: ps21 at 0 {
+ ps2_1_ph_pins: ps2-1-ph-pins {
pins = "PH12", "PH13";
function = "ps2";
};
- pwm0_pins_a: pwm0 at 0 {
+ pwm0_pin: pwm0-pin {
pins = "PB2";
function = "pwm";
};
- pwm1_pins_a: pwm1 at 0 {
+ pwm1_pin: pwm1-pin {
pins = "PI3";
function = "pwm";
};
- spdif_tx_pins_a: spdif at 0 {
+ spdif_tx_pin: spdif-tx-pin {
pins = "PB13";
function = "spdif";
bias-pull-up;
};
- spi0_pins_a: spi0 at 0 {
+ spi0_pi_pins: spi0-pi-pins {
pins = "PI11", "PI12", "PI13";
function = "spi0";
};
- spi0_cs0_pins_a: spi0_cs0 at 0 {
+ spi0_cs0_pi_pin: spi0-cs0-pi-pin {
pins = "PI10";
function = "spi0";
};
- spi0_cs1_pins_a: spi0_cs1 at 0 {
+ spi0_cs1_pi_pin: spi0-cs1-pi-pin {
pins = "PI14";
function = "spi0";
};
- spi1_pins_a: spi1 at 0 {
+ spi1_pi_pins: spi1-pi-pins {
pins = "PI17", "PI18", "PI19";
function = "spi1";
};
- spi1_cs0_pins_a: spi1_cs0 at 0 {
+ spi1_cs0_pi_pin: spi1-cs0-pi-pin {
pins = "PI16";
function = "spi1";
};
- spi2_pins_a: spi2 at 0 {
- pins = "PC20", "PC21", "PC22";
+ spi2_pb_pins: spi2-pb-pins {
+ pins = "PB15", "PB16", "PB17";
function = "spi2";
};
- spi2_pins_b: spi2 at 1 {
- pins = "PB15", "PB16", "PB17";
+ spi2_cs0_pb_pin: spi2-cs0-pb-pin {
+ pins = "PB14";
function = "spi2";
};
- spi2_cs0_pins_a: spi2_cs0 at 0 {
- pins = "PC19";
+ spi2_pc_pins: spi2-pc-pins {
+ pins = "PC20", "PC21", "PC22";
function = "spi2";
};
- spi2_cs0_pins_b: spi2_cs0 at 1 {
- pins = "PB14";
+ spi2_cs0_pc_pin: spi2-cs0-pc-pin {
+ pins = "PC19";
function = "spi2";
};
- uart0_pins_a: uart0 at 0 {
+ uart0_pb_pins: uart0-pb-pins {
pins = "PB22", "PB23";
function = "uart0";
};
- uart2_pins_a: uart2 at 0 {
+ uart2_pi_pins: uart2-pi-pins {
pins = "PI16", "PI17", "PI18", "PI19";
function = "uart2";
};
- uart3_pins_a: uart3 at 0 {
+ uart3_pg_pins: uart3-pg-pins {
pins = "PG6", "PG7", "PG8", "PG9";
function = "uart3";
};
- uart3_pins_b: uart3 at 1 {
+ uart3_ph_pins: uart3-ph-pins {
pins = "PH0", "PH1";
function = "uart3";
};
- uart4_pins_a: uart4 at 0 {
+ uart4_pg_pins: uart4-pg-pins {
pins = "PG10", "PG11";
function = "uart4";
};
- uart4_pins_b: uart4 at 1 {
+ uart4_ph_pins: uart4-ph-pins {
pins = "PH4", "PH5";
function = "uart4";
};
- uart5_pins_a: uart5 at 0 {
+ uart5_pi_pins: uart5-pi-pins {
pins = "PI10", "PI11";
function = "uart5";
};
- uart6_pins_a: uart6 at 0 {
+ uart6_pi_pins: uart6-pi-pins {
pins = "PI12", "PI13";
function = "uart6";
};
- uart7_pins_a: uart7 at 0 {
+ uart7_pi_pins: uart7-pi-pins {
pins = "PI20", "PI21";
function = "uart7";
};
diff --git a/arch/arm/boot/dts/sunxi-itead-core-common.dtsi b/arch/arm/boot/dts/sunxi-itead-core-common.dtsi
index ddf4e722ea93..0d002f83a259 100644
--- a/arch/arm/boot/dts/sunxi-itead-core-common.dtsi
+++ b/arch/arm/boot/dts/sunxi-itead-core-common.dtsi
@@ -121,7 +121,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 43/77] ARM: dts: sun7i: Change pinctrl nodes to avoid warning
2018-11-27 12:45 ` [PATCH 43/77] ARM: dts: sun7i: Change pinctrl nodes to avoid warning Maxime Ripard
@ 2018-11-28 12:10 ` Chen-Yu Tsai
0 siblings, 0 replies; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 12:10 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> All our pinctrl nodes were using a node name convention with a unit-address
> to differentiate the different muxing options. However, since those nodes
> didn't have a reg property, they were generating warnings in DTC.
>
> In order to accomodate for this, convert the old nodes to the syntax we've
> been using for the new SoCs, including removing the letter suffix of the
> node labels to the bank of those pins to make things more readable.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
I only looked at the .dtsi file.
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 44/77] ARM: dts: sun7i: Split the RTS and CTS pins out of the UART nodes
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (42 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 43/77] ARM: dts: sun7i: Change pinctrl nodes to avoid warning Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 12:12 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 45/77] ARM: dts: sun7i: som204: Use the UART3 TX and RX pin group Maxime Ripard
` (33 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Some UART nodes on the A20 DTSI do not share the same pattern that we use
everywhere else, with the RTS and CTS pins split away from the TX and RX
pins. Make those pin groups consistent with the rest of our DT.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 4 ++--
arch/arm/boot/dts/sun7i-a20-mk808c.dts | 2 +-
arch/arm/boot/dts/sun7i-a20.dtsi | 14 ++++++++++++--
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
index 9ce59d49cf49..a1af7d6726e2 100644
--- a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
+++ b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
@@ -215,13 +215,13 @@
&uart2 {
pinctrl-names = "default";
- pinctrl-0 = <&uart2_pi_pins>;
+ pinctrl-0 = <&uart2_pi_pins>, <&uart2_cts_rts_pi_pins>;
status = "okay";
};
&uart3 {
pinctrl-names = "default";
- pinctrl-0 = <&uart3_pg_pins>;
+ pinctrl-0 = <&uart3_pg_pins>, <&uart3_cts_rts_pg_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-mk808c.dts b/arch/arm/boot/dts/sun7i-a20-mk808c.dts
index a8d15d01ac1a..b4143a91086b 100644
--- a/arch/arm/boot/dts/sun7i-a20-mk808c.dts
+++ b/arch/arm/boot/dts/sun7i-a20-mk808c.dts
@@ -173,7 +173,7 @@
&uart2 {
pinctrl-names = "default";
- pinctrl-0 = <&uart2_pi_pins>;
+ pinctrl-0 = <&uart2_pi_pins>, <&uart2_cts_rts_pi_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 75669fc51de5..bffd3a21bee3 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -935,12 +935,22 @@
};
uart2_pi_pins: uart2-pi-pins {
- pins = "PI16", "PI17", "PI18", "PI19";
+ pins = "PI18", "PI19";
+ function = "uart2";
+ };
+
+ uart2_cts_rts_pi_pins: uart2-cts-rts-pi-pins {
+ pins = "PI16", "PI17";
function = "uart2";
};
uart3_pg_pins: uart3-pg-pins {
- pins = "PG6", "PG7", "PG8", "PG9";
+ pins = "PG6", "PG7";
+ function = "uart3";
+ };
+
+ uart3_cts_rts_pg_pins: uart3-cts-rts-pg-pins {
+ pins = "PG8", "PG9";
function = "uart3";
};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 45/77] ARM: dts: sun7i: som204: Use the UART3 TX and RX pin group
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (43 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 44/77] ARM: dts: sun7i: Split the RTS and CTS pins out of the UART nodes Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 12:12 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 46/77] ARM: dts: sun7i: Remove underscores from nodes names Maxime Ripard
` (32 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
The SOM204-EVB doesn't use the CTS pin, and thus was defining its own
pinctrl node for the UART3 muxing. Since we split away the TX and RX pin,
we can use the global node now, and only have the RTS pin in our local
node.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
index 631a80ae958e..249bb57d50e0 100644
--- a/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
@@ -203,8 +203,8 @@
};
&pio {
- bt_uart_pins: bt_uart_pins at 0 {
- pins = "PG6", "PG7", "PG8";
+ uart3_rts_pin: uart3-rts-pin {
+ pins = "PG8";
function = "uart3";
};
};
@@ -296,7 +296,7 @@
/* Used for RTL8723BS bluetooth */
&uart3 {
pinctrl-names = "default";
- pinctrl-0 = <&bt_uart_pins>;
+ pinctrl-0 = <&uart3_pg_pins>, <&uart3_rts_pin>;
status = "okay";
};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 46/77] ARM: dts: sun7i: Remove underscores from nodes names
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (44 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 45/77] ARM: dts: sun7i: som204: Use the UART3 TX and RX pin group Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 12:13 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 47/77] ARM: dts: sun7i: Fix HDMI output DTC warning Maxime Ripard
` (31 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Some GPIO pinctrl nodes cannot be easily removed, because they would also
change the pin configuration, for example to add a pull resistor or change
the current delivered by the pin.
Those nodes still have underscores and unit-addresses in their node names
in our DTs, so adjust their name to remove the warnings. Use that occasion
to also fix some poorly chosen node-names.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun7i-a20-bananapi.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 6 +++---
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 6 +++---
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 8 ++++----
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-orangepi.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 2 +-
14 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
index af56ae95c63f..c14c517a35af 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
@@ -248,7 +248,7 @@
"IO-6", "IO-3", "IO-2", "IO-0", "", "", "", "",
"", "", "", "", "", "", "", "";
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
index 9a027764cda4..2982d0521f06 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
@@ -180,7 +180,7 @@
};
&pio {
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
diff --git a/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts b/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
index ad97f6f2cc2c..2bd4f281f31a 100644
--- a/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
+++ b/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
@@ -129,7 +129,7 @@
};
&pio {
- led_pins_itead_core: led_pins at 0 {
+ led_pins_itead_core: led-pins {
pins = "PH20","PH21";
function = "gpio_out";
drive-strength = <20>;
diff --git a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
index 32e204fe8c15..3d4cd05813e8 100644
--- a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
+++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
@@ -236,7 +236,7 @@
};
&pio {
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
index 8f8a77121e80..cf3a61eed691 100644
--- a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
@@ -239,7 +239,7 @@
};
&pio {
- led_pins_olimex_som_evb: led_pins at 0 {
+ led_pins_olimex_som_evb: led-pins {
pins = "PH2";
function = "gpio_out";
drive-strength = <20>;
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
index 7d6a90678025..454b0c433e75 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
@@ -175,19 +175,19 @@
};
&pio {
- led_pins_olinuxinolime: led_pins at 0 {
+ led_pins_olinuxinolime: led-pins {
pins = "PH2";
function = "gpio_out";
drive-strength = <20>;
};
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
- usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 {
+ usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5";
function = "gpio_in";
bias-pull-down;
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
index 9ea84cf6437b..0a8e243d8e7b 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
@@ -180,19 +180,19 @@
};
&pio {
- led_pins_olinuxinolime: led_pins at 0 {
+ led_pins_olinuxinolime: led-pins {
pins = "PH2";
function = "gpio_out";
drive-strength = <20>;
};
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
- usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 {
+ usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5";
function = "gpio_in";
bias-pull-down;
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
index 4cef69e90b2f..718b5209643b 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
@@ -252,24 +252,24 @@
};
&pio {
- gmac_txerr: gmac_txerr at 0 {
+ gmac_txerr: gmac-txerr-pin {
pins = "PA17";
function = "gmac";
};
- led_pins_olinuxino: led_pins at 0 {
+ led_pins_olinuxino: led-pins {
pins = "PH2";
function = "gpio_out";
drive-strength = <20>;
};
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
- usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 {
+ usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5";
function = "gpio_in";
bias-pull-down;
diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
index 192d907fee71..ddb713209bb2 100644
--- a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
+++ b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
@@ -183,7 +183,7 @@
};
&pio {
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi.dts b/arch/arm/boot/dts/sun7i-a20-orangepi.dts
index c71d819cd0af..d35705345c10 100644
--- a/arch/arm/boot/dts/sun7i-a20-orangepi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-orangepi.dts
@@ -140,7 +140,7 @@
};
&pio {
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
index 1ba1dd6de244..6e64315d1a8b 100644
--- a/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
+++ b/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
@@ -173,7 +173,7 @@
};
&pio {
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
index 77a49e8b3d20..b6a9cef86c31 100644
--- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
+++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
@@ -173,7 +173,7 @@
};
&pio {
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
diff --git a/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts b/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
index 23b7d127e14f..3b1fc4cb61d3 100644
--- a/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
+++ b/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
@@ -165,7 +165,7 @@
};
&pio {
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
diff --git a/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts b/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
index 1df18959d2a9..ae4febdea552 100644
--- a/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
+++ b/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
@@ -156,7 +156,7 @@
};
&pio {
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 46/77] ARM: dts: sun7i: Remove underscores from nodes names
2018-11-27 12:45 ` [PATCH 46/77] ARM: dts: sun7i: Remove underscores from nodes names Maxime Ripard
@ 2018-11-28 12:13 ` Chen-Yu Tsai
0 siblings, 0 replies; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 12:13 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Some GPIO pinctrl nodes cannot be easily removed, because they would also
> change the pin configuration, for example to add a pull resistor or change
> the current delivered by the pin.
>
> Those nodes still have underscores and unit-addresses in their node names
> in our DTs, so adjust their name to remove the warnings. Use that occasion
> to also fix some poorly chosen node-names.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 47/77] ARM: dts: sun7i: Fix HDMI output DTC warning
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (45 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 46/77] ARM: dts: sun7i: Remove underscores from nodes names Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 12:27 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 48/77] ARM: dts: sun7i: Provide default muxing for relevant controllers Maxime Ripard
` (30 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Our HDMI output endpoint on the A10s DTSI has a warning under DTC: "graph
node has single child node 'endpoint', #address-cells/#size-cells are not
necessary". Fix this by removing those properties.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun7i-a20.dtsi | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index bffd3a21bee3..1b247369ec86 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -662,8 +662,6 @@
};
hdmi_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
};
};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 48/77] ARM: dts: sun7i: Provide default muxing for relevant controllers
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (46 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 47/77] ARM: dts: sun7i: Fix HDMI output DTC warning Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 12:28 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 49/77] ARM: dts: sun7i: Remove redundant MMC pinmux tuning Maxime Ripard
` (29 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
The I2C and MMC controllers have only one muxing option in the SoC. In such a
case, we can just move the muxing into the DTSI, and remove it from
the DTS.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 6 +-----
arch/arm/boot/dts/sun7i-a20-bananapi.dts | 6 +-----
arch/arm/boot/dts/sun7i-a20-bananapro.dts | 8 +------
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 6 +-----
arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 9 +-------
arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 12 +---------
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 6 +-----
arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 6 +-----
arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 2 +--
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 6 +-----
arch/arm/boot/dts/sun7i-a20-m3.dts | 6 +-----
arch/arm/boot/dts/sun7i-a20-mk808c.dts | 8 +------
arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts | 2 +--
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 10 +--------
arch/arm/boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts | 2 +--
arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 10 +--------
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 6 +-----
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts | 2 +--
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 6 +-----
arch/arm/boot/dts/sun7i-a20-olinuxino-micro-emmc.dts | 2 +--
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 10 +--------
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 6 +-----
arch/arm/boot/dts/sun7i-a20-orangepi.dts | 4 +---
arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 4 +---
arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 4 +---
arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 8 +------
arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 10 +--------
arch/arm/boot/dts/sun7i-a20.dtsi | 14 +++++++++++-
28 files changed, 14 insertions(+), 167 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
index af4418de57be..e2e540380c6e 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
@@ -150,8 +150,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -174,8 +172,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -185,8 +181,6 @@
&mmc3 {
#address-cells = <1>;
#size-cells = <0>;
- pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <®_vcc3v3>;
mmc-pwrseq = <&mmc3_pwrseq>;
bus-width = <4>;
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
index c14c517a35af..556b1b591c5d 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
@@ -152,8 +152,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -164,8 +162,6 @@
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
@@ -176,8 +172,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
index 567bf6d493f9..0176e9de0180 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
@@ -120,8 +120,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -136,8 +134,6 @@
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
@@ -148,8 +144,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -157,8 +151,6 @@
};
&mmc3 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <®_vcc3v3>;
mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>;
diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
index 2982d0521f06..200685b0b1cb 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
@@ -135,8 +135,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -147,8 +145,6 @@
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
@@ -159,8 +155,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
index 20069542336f..95da354cecb7 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -168,8 +168,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -181,13 +179,10 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
@@ -198,8 +193,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -207,8 +200,6 @@
};
&mmc3 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <®_vcc3v3>;
mmc-pwrseq = <&mmc3_pwrseq>;
bus-width = <4>;
diff --git a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
index a1af7d6726e2..fd0153f65685 100644
--- a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
+++ b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
@@ -116,8 +116,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -131,20 +129,14 @@
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
&i2c3 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c3_pins>;
status = "okay";
};
@@ -155,8 +147,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v0>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -164,8 +154,6 @@
};
&mmc3 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <®_mmc3_vdd>;
bus-width = <4>;
non-removable;
diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
index db708332616e..6313d8a8a37c 100644
--- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
+++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
@@ -126,8 +126,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -148,8 +146,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -157,8 +153,6 @@
};
&mmc3 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <®_vmmc3>;
bus-width = <4>;
non-removable;
diff --git a/arch/arm/boot/dts/sun7i-a20-icnova-swac.dts b/arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
index 0bf70b22bac4..949494730aee 100644
--- a/arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
+++ b/arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
@@ -85,8 +85,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -97,14 +95,10 @@
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 8 5 GPIO_ACTIVE_LOW>; /* PI5 */
diff --git a/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts b/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
index 2bd4f281f31a..b90a7607d069 100644
--- a/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
+++ b/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
@@ -120,8 +120,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
diff --git a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
index 3d4cd05813e8..6f8dfa717994 100644
--- a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
+++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
@@ -195,8 +195,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -207,8 +205,6 @@
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
@@ -219,8 +215,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
diff --git a/arch/arm/boot/dts/sun7i-a20-m3.dts b/arch/arm/boot/dts/sun7i-a20-m3.dts
index 1207e0d897b7..b8a1aaaf3976 100644
--- a/arch/arm/boot/dts/sun7i-a20-m3.dts
+++ b/arch/arm/boot/dts/sun7i-a20-m3.dts
@@ -92,8 +92,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -114,8 +112,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -123,8 +119,6 @@
};
&mmc2 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
non-removable;
diff --git a/arch/arm/boot/dts/sun7i-a20-mk808c.dts b/arch/arm/boot/dts/sun7i-a20-mk808c.dts
index b4143a91086b..1491c603f661 100644
--- a/arch/arm/boot/dts/sun7i-a20-mk808c.dts
+++ b/arch/arm/boot/dts/sun7i-a20-mk808c.dts
@@ -106,8 +106,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -121,20 +119,14 @@
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v0>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts
index ea0d620119cb..20bf09b2226c 100644
--- a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts
@@ -21,8 +21,6 @@
};
&mmc2 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <®_vcc3v3>;
mmc-pwrseq = <&mmc2_pwrseq>;
bus-width = <4>;
diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
index cf3a61eed691..f0e6a96e5785 100644
--- a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
@@ -131,8 +131,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -143,14 +141,10 @@
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
@@ -209,8 +203,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -218,8 +210,6 @@
};
&mmc3 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 0 GPIO_ACTIVE_LOW>; /* PH0 */
diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts
index 093cd32c9a1c..a59755a2e7a9 100644
--- a/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts
@@ -20,8 +20,6 @@
};
&mmc2 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <®_vcc3v3>;
mmc-pwrseq = <&mmc2_pwrseq>;
bus-width = <4>;
diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
index 249bb57d50e0..823aabce0462 100644
--- a/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
@@ -130,8 +130,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -143,8 +141,6 @@
/* Exposed to UEXT1 */
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
eeprom: eeprom at 50 {
@@ -156,8 +152,6 @@
/* Exposed to UEXT2 */
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
@@ -168,8 +162,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>;
@@ -177,8 +169,6 @@
};
&mmc3 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <®_vcc3v3>;
mmc-pwrseq = <&rtl_pwrseq>;
bus-width = <4>;
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
index 454b0c433e75..5e411194bf62 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
@@ -126,8 +126,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -142,8 +140,6 @@
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
eeprom: eeprom at 50 {
@@ -154,8 +150,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
index 0a2a26f9a5fb..decb014a382b 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
@@ -54,8 +54,6 @@
};
&mmc2 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <®_vcc3v3>;
vqmmc-supply = <®_vcc3v3>;
bus-width = <4>;
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
index 0a8e243d8e7b..55c9086e9344 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
@@ -131,8 +131,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -143,8 +141,6 @@
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
eeprom: eeprom at 50 {
@@ -159,8 +155,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro-emmc.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro-emmc.dts
index 58fd3519ab7d..2337b44a88aa 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro-emmc.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro-emmc.dts
@@ -54,8 +54,6 @@
};
&mmc2 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
non-removable;
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
index 718b5209643b..840ae1194a66 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
@@ -138,8 +138,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -150,8 +148,6 @@
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
eeprom: eeprom at 50 {
@@ -162,8 +158,6 @@
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
@@ -222,8 +216,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -231,8 +223,6 @@
};
&mmc3 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */
diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
index ddb713209bb2..15881081cac4 100644
--- a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
+++ b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
@@ -141,8 +141,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -161,8 +159,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -170,8 +166,6 @@
};
&mmc3 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */
diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi.dts b/arch/arm/boot/dts/sun7i-a20-orangepi.dts
index d35705345c10..d64de2e73a9f 100644
--- a/arch/arm/boot/dts/sun7i-a20-orangepi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-orangepi.dts
@@ -107,8 +107,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -127,8 +125,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
index 6e64315d1a8b..538ea15fa32f 100644
--- a/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
+++ b/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
@@ -134,8 +134,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -152,8 +150,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
index b6a9cef86c31..a72ed4318d04 100644
--- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
+++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
@@ -132,8 +132,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -152,8 +150,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
diff --git a/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts b/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
index 3b1fc4cb61d3..ffade253d129 100644
--- a/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
+++ b/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
@@ -89,8 +89,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -103,14 +101,10 @@
#include "axp209.dtsi"
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
gt911: touchscreen at 5d {
@@ -144,8 +138,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
diff --git a/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts b/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
index ae4febdea552..c27e56091fb1 100644
--- a/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
+++ b/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
@@ -91,8 +91,6 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic at 34 {
@@ -103,22 +101,16 @@
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
#include "axp209.dtsi"
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
@@ -126,8 +118,6 @@
};
&mmc3 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <®_vcc3v3>;
mmc-pwrseq = <&mmc3_pwrseq>;
bus-width = <4>;
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 1b247369ec86..86158528ed93 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -514,6 +514,8 @@
"output",
"sample";
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@@ -548,6 +550,8 @@
"output",
"sample";
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc2_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@@ -565,6 +569,8 @@
"output",
"sample";
interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc3_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@@ -1218,6 +1224,8 @@
reg = <0x01c2ac00 0x400>;
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_APB1_I2C0>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c0_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@@ -1229,6 +1237,8 @@
reg = <0x01c2b000 0x400>;
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_APB1_I2C1>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c1_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@@ -1240,6 +1250,8 @@
reg = <0x01c2b400 0x400>;
interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_APB1_I2C2>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c2_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@@ -1251,6 +1263,8 @@
reg = <0x01c2b800 0x400>;
interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_APB1_I2C3>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c3_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 49/77] ARM: dts: sun7i: Remove redundant MMC pinmux tuning
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (47 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 48/77] ARM: dts: sun7i: Provide default muxing for relevant controllers Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 12:29 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 50/77] ARM: dts: sun7i: lamobo-r1: Remove unused address-cells/size-cells Maxime Ripard
` (28 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Some boards override the MMC pin muxing settings in order to enable the
pull-ups and change the drive strength to a value higher than the default.
While this was needed in the earlier days, this is now the default setting
for those pins, and therefore we don't need those board-specific settings
anymore.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 5 -----
arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 5 -----
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 5 -----
3 files changed, 15 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
index e2e540380c6e..e2bfe0058830 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
@@ -197,11 +197,6 @@
};
};
-&mmc3_pins {
- /* AP6210 requires pull-up */
- bias-pull-up;
-};
-
&ohci0 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
index 95da354cecb7..15c5eae4ca7b 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -215,11 +215,6 @@
};
};
-&mmc3_pins {
- /* AP6210 requires pull-up */
- bias-pull-up;
-};
-
&ohci0 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
index 6313d8a8a37c..5f1c4f573d3e 100644
--- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
+++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
@@ -167,11 +167,6 @@
};
};
-&mmc3_pins {
- /* AP6210 / AP6330 requires pull-up */
- bias-pull-up;
-};
-
&ohci0 {
status = "okay";
};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 49/77] ARM: dts: sun7i: Remove redundant MMC pinmux tuning
2018-11-27 12:45 ` [PATCH 49/77] ARM: dts: sun7i: Remove redundant MMC pinmux tuning Maxime Ripard
@ 2018-11-28 12:29 ` Chen-Yu Tsai
0 siblings, 0 replies; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 12:29 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Some boards override the MMC pin muxing settings in order to enable the
> pull-ups and change the drive strength to a value higher than the default.
>
> While this was needed in the earlier days, this is now the default setting
> for those pins, and therefore we don't need those board-specific settings
> anymore.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 50/77] ARM: dts: sun7i: lamobo-r1: Remove unused address-cells/size-cells
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (48 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 49/77] ARM: dts: sun7i: Remove redundant MMC pinmux tuning Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 12:29 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 51/77] ARM: dts: sun8i: a23/a33: Remove skeleton and memory to avoid warnings Maxime Ripard
` (27 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
The #address-cells and #size-cells are only relevant for nodes that have
childs with reg properties. Otherwise, DTC will emit a warning saying that
those properties are unnecessary.
Remove them when needed.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
index 6f8dfa717994..f91e1bee44e8 100644
--- a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
+++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
@@ -123,6 +123,8 @@
phy-mode = "rgmii";
phy-supply = <®_gmac_3v3>;
status = "okay";
+ /delete-property/#address-cells;
+ /delete-property/#size-cells;
fixed-link {
speed = <1000>;
@@ -137,8 +139,6 @@
switch: ethernet-switch at 1e {
compatible = "brcm,bcm53125";
reg = <30>;
- #address-cells = <1>;
- #size-cells = <0>;
ports {
#address-cells = <1>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 51/77] ARM: dts: sun8i: a23/a33: Remove skeleton and memory to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (49 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 50/77] ARM: dts: sun7i: lamobo-r1: Remove unused address-cells/size-cells Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 12:34 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 52/77] ARM: dts: sun8i: a23/a33: Remove SoC node unit-name " Maxime Ripard
` (26 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Using skeleton.dtsi will create a memory node that will generate a warning
in DTC. However, that node will be created by the bootloader, so we can
just remove it entirely in order to remove that warning.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-a23-a33.dtsi | 4 ++--
arch/arm/boot/dts/sun8i-a23.dtsi | 4 ----
arch/arm/boot/dts/sun8i-a33.dtsi | 4 ----
3 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
index c16ffcc4db7d..a198894a33fd 100644
--- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@ -42,8 +42,6 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "skeleton.dtsi"
-
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/sun8i-a23-a33-ccu.h>
@@ -51,6 +49,8 @@
/ {
interrupt-parent = <&gic>;
+ #address-cells = <1>;
+ #size-cells = <1>;
chosen {
#address-cells = <1>;
diff --git a/arch/arm/boot/dts/sun8i-a23.dtsi b/arch/arm/boot/dts/sun8i-a23.dtsi
index 58e6585b504b..7751c43fc806 100644
--- a/arch/arm/boot/dts/sun8i-a23.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23.dtsi
@@ -45,10 +45,6 @@
#include "sun8i-a23-a33.dtsi"
/ {
- memory {
- reg = <0x40000000 0x40000000>;
- };
-
soc at 1c00000 {
codec: codec at 1c22c00 {
#sound-dai-cells = <0>;
diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi
index 1c4f7e1930d8..163c3ff7f670 100644
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@ -186,10 +186,6 @@
};
};
- memory {
- reg = <0x40000000 0x80000000>;
- };
-
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 52/77] ARM: dts: sun8i: a23/a33: Remove SoC node unit-name to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (50 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 51/77] ARM: dts: sun8i: a23/a33: Remove skeleton and memory to avoid warnings Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 12:30 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 53/77] ARM: dts: sun8i: a23/a33: Fix Display Engine DTC warnings Maxime Ripard
` (25 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Our main node for all the in-SoC controllers used to have a unit name. The
unit-name, in addition to being actually false, would not match any reg
property, which generates a warning.
Remove it in order to remove those warnings.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-a23-a33.dtsi | 2 +-
arch/arm/boot/dts/sun8i-a23.dtsi | 2 +-
arch/arm/boot/dts/sun8i-a33.dtsi | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
index a198894a33fd..bd8d9e7afcdf 100644
--- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@ -118,7 +118,7 @@
};
};
- soc at 1c00000 {
+ soc {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/arm/boot/dts/sun8i-a23.dtsi b/arch/arm/boot/dts/sun8i-a23.dtsi
index 7751c43fc806..d00055e9eef5 100644
--- a/arch/arm/boot/dts/sun8i-a23.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23.dtsi
@@ -45,7 +45,7 @@
#include "sun8i-a23-a33.dtsi"
/ {
- soc at 1c00000 {
+ soc {
codec: codec at 1c22c00 {
#sound-dai-cells = <0>;
compatible = "allwinner,sun8i-a23-codec";
diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi
index 163c3ff7f670..17d725bd6654 100644
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@ -223,7 +223,7 @@
};
};
- soc at 1c00000 {
+ soc {
tcon0: lcd-controller at 1c0c000 {
compatible = "allwinner,sun8i-a33-tcon";
reg = <0x01c0c000 0x1000>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 53/77] ARM: dts: sun8i: a23/a33: Fix Display Engine DTC warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (51 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 52/77] ARM: dts: sun8i: a23/a33: Remove SoC node unit-name " Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 13:17 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 54/77] ARM: dts: sun8i: a23/a33: Fix OPP " Maxime Ripard
` (24 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Our display engine endpoints trigger some DTC warnings due to the fact that
we're having a single endpoint that doesn't need any reg property, and
since we don't have a reg property, we don't need the address-cells and
size-cells properties anymore.
Fix those
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 11 +-----
arch/arm/boot/dts/sun8i-a33.dtsi | 45 +++----------------
2 files changed, 11 insertions(+), 45 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
index 541acb4d2b91..b343153948f4 100644
--- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
+++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
@@ -63,16 +63,9 @@
panel {
compatible = "netron-dy,e231732";
- #address-cells = <1>;
- #size-cells = <0>;
- port at 0 {
- reg = <0>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- panel_input: endpoint at 0 {
- reg = <0>;
+ port {
+ panel_input: endpoint {
remote-endpoint = <&tcon0_out_panel>;
};
};
diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi
index 17d725bd6654..d74cd95afe6d 100644
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@ -242,12 +242,9 @@
#size-cells = <0>;
tcon0_in: port at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0>;
- tcon0_in_drc0: endpoint at 0 {
- reg = <0>;
+ tcon0_in_drc0: endpoint {
remote-endpoint = <&drc0_out_tcon0>;
};
};
@@ -328,18 +325,9 @@
phy-names = "dphy";
status = "disabled";
- ports {
- #address-cells = <1>;
- #size-cells = <0>;
-
- port at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <0>;
-
- dsi_in_tcon0: endpoint {
- remote-endpoint = <&tcon0_out_dsi>;
- };
+ port {
+ dsi_in_tcon0: endpoint {
+ remote-endpoint = <&tcon0_out_dsi>;
};
};
};
@@ -370,12 +358,9 @@
#size-cells = <0>;
fe0_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
- fe0_out_be0: endpoint at 0 {
- reg = <0>;
+ fe0_out_be0: endpoint {
remote-endpoint = <&be0_in_fe0>;
};
};
@@ -401,23 +386,17 @@
#size-cells = <0>;
be0_in: port at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0>;
- be0_in_fe0: endpoint at 0 {
- reg = <0>;
+ be0_in_fe0: endpoint {
remote-endpoint = <&fe0_out_be0>;
};
};
be0_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
- be0_out_drc0: endpoint at 0 {
- reg = <0>;
+ be0_out_drc0: endpoint {
remote-endpoint = <&drc0_in_be0>;
};
};
@@ -441,23 +420,17 @@
#size-cells = <0>;
drc0_in: port at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0>;
- drc0_in_be0: endpoint at 0 {
- reg = <0>;
+ drc0_in_be0: endpoint {
remote-endpoint = <&be0_out_drc0>;
};
};
drc0_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
- drc0_out_tcon0: endpoint at 0 {
- reg = <0>;
+ drc0_out_tcon0: endpoint {
remote-endpoint = <&tcon0_in_drc0>;
};
};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 53/77] ARM: dts: sun8i: a23/a33: Fix Display Engine DTC warnings
2018-11-27 12:45 ` [PATCH 53/77] ARM: dts: sun8i: a23/a33: Fix Display Engine DTC warnings Maxime Ripard
@ 2018-11-28 13:17 ` Chen-Yu Tsai
0 siblings, 0 replies; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 13:17 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Our display engine endpoints trigger some DTC warnings due to the fact that
> we're having a single endpoint that doesn't need any reg property, and
> since we don't have a reg property, we don't need the address-cells and
> size-cells properties anymore.
>
> Fix those
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
[...]
> @@ -370,12 +358,9 @@
> #size-cells = <0>;
>
> fe0_out: port at 1 {
> - #address-cells = <1>;
> - #size-cells = <0>;
> reg = <1>;
>
> - fe0_out_be0: endpoint at 0 {
> - reg = <0>;
The backend driver gets its ID from here. We need to teach it about missing reg
properties where reg was 0, otherwise the driver will refuse to bind.
Otherwise,
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 54/77] ARM: dts: sun8i: a23/a33: Fix OPP DTC warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (52 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 53/77] ARM: dts: sun8i: a23/a33: Fix Display Engine DTC warnings Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 12:34 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 55/77] ARM: dts: sun8i: a23/a33: Remove unused address-cells/size-cells Maxime Ripard
` (23 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
DTC will emit a warning on our OPPs nodes for the common DTSI between the
A23 and A33 since those nodes use the frequency as unit addresses, but
don't have a matching reg property.
Fix this by moving the frequency to the node name instead.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-h3.dtsi | 6 +++---
arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi
index 22883f1b80e2..9db1f58a47de 100644
--- a/arch/arm/boot/dts/sun8i-h3.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi
@@ -47,19 +47,19 @@
compatible = "operating-points-v2";
opp-shared;
- opp at 648000000 {
+ opp-648000000 {
opp-hz = /bits/ 64 <648000000>;
opp-microvolt = <1040000 1040000 1300000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
- opp at 816000000 {
+ opp-816000000 {
opp-hz = /bits/ 64 <816000000>;
opp-microvolt = <1100000 1100000 1300000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
- opp at 1008000000 {
+ opp-1008000000 {
opp-hz = /bits/ 64 <1008000000>;
opp-microvolt = <1200000 1200000 1300000>;
clock-latency-ns = <244144>; /* 8 32k periods */
diff --git a/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
index 0dbdb29a8fff..ee7ce3752581 100644
--- a/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
+++ b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
@@ -103,13 +103,13 @@
};
&cpu0_opp_table {
- opp at 1104000000 {
+ opp-1104000000 {
opp-hz = /bits/ 64 <1104000000>;
opp-microvolt = <1320000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
- opp at 1200000000 {
+ opp-1200000000 {
opp-hz = /bits/ 64 <1200000000>;
opp-microvolt = <1320000>;
clock-latency-ns = <244144>; /* 8 32k periods */
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 54/77] ARM: dts: sun8i: a23/a33: Fix OPP DTC warnings
2018-11-27 12:45 ` [PATCH 54/77] ARM: dts: sun8i: a23/a33: Fix OPP " Maxime Ripard
@ 2018-11-28 12:34 ` Chen-Yu Tsai
0 siblings, 0 replies; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 12:34 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> DTC will emit a warning on our OPPs nodes for the common DTSI between the
> A23 and A33 since those nodes use the frequency as unit addresses, but
> don't have a matching reg property.
>
> Fix this by moving the frequency to the node name instead.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 55/77] ARM: dts: sun8i: a23/a33: Remove unused address-cells/size-cells
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (53 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 54/77] ARM: dts: sun8i: a23/a33: Fix OPP " Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 12:34 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 56/77] ARM: dts: sun8i: a23/a33: Remove leading zeros from unit-addresses Maxime Ripard
` (22 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
The #address-cells and #size-cells are only relevant for nodes that have
childs with reg properties. Otherwise, DTC will emit a warning saying that
those properties are unnecessary.
Remove them when needed.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-a23-a33.dtsi | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
index bd8d9e7afcdf..5d79860bef88 100644
--- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@ -656,8 +656,6 @@
gpio-controller;
interrupt-controller;
#interrupt-cells = <3>;
- #address-cells = <1>;
- #size-cells = <0>;
#gpio-cells = <3>;
r_rsb_pins: r_rsb {
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 56/77] ARM: dts: sun8i: a23/a33: Remove leading zeros from unit-addresses
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (54 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 55/77] ARM: dts: sun8i: a23/a33: Remove unused address-cells/size-cells Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 12:35 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 57/77] ARM: dts: sun8i: a23/a33: Change framebuffer node names to avoid warnings Maxime Ripard
` (21 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Most of our device trees have had leading zeros for padding as part of
the nodes unit-addresses.
Remove all these useless zeros that generate warnings
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-a33.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi
index d74cd95afe6d..0036309e2c50 100644
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@ -262,7 +262,7 @@
};
};
- video-codec at 01c0e000 {
+ video-codec at 1c0e000 {
compatible = "allwinner,sun8i-a33-video-engine";
reg = <0x01c0e000 0x1000>;
clocks = <&ccu CLK_BUS_VE>, <&ccu CLK_VE>,
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 57/77] ARM: dts: sun8i: a23/a33: Change framebuffer node names to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (55 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 56/77] ARM: dts: sun8i: a23/a33: Remove leading zeros from unit-addresses Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 12:35 ` Chen-Yu Tsai
2018-11-27 12:45 ` [PATCH 58/77] ARM: dts: sun8i: a23/a33: Remove redundant MMC pinmux tuning Maxime Ripard
` (20 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
The simple-framebuffer nodes have a unit address, but no reg property which
generates a warning when compiling it with DTC.
Change the simple-framebuffer node names so that there is no warnings on
this anymore.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-a23-a33.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
index 5d79860bef88..b76b88a45e99 100644
--- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@ -57,7 +57,7 @@
#size-cells = <1>;
ranges;
- simplefb_lcd: framebuffer at 0 {
+ simplefb_lcd: framebuffer-lcd0 {
compatible = "allwinner,simple-framebuffer",
"simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0";
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 58/77] ARM: dts: sun8i: a23/a33: Remove redundant MMC pinmux tuning
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (56 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 57/77] ARM: dts: sun8i: a23/a33: Change framebuffer node names to avoid warnings Maxime Ripard
@ 2018-11-27 12:45 ` Maxime Ripard
2018-11-28 12:36 ` Chen-Yu Tsai
2018-11-27 12:46 ` [PATCH 59/77] ARM: dts: sun8i: a23/a33: Remove all useless pinctrl nodes Maxime Ripard
` (19 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Some boards override the MMC pin muxing settings in order to enable the
pull-ups and change the drive strength to a value higher than the default.
While this was needed in the earlier days, this is now the default setting
for those pins, and therefore we don't need those board-specific settings
anymore.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 4 ----
arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 4 ----
arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts | 4 ----
arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 7 -------
arch/arm/boot/dts/sun8i-q8-common.dtsi | 4 ----
arch/arm/boot/dts/sun8i-r16-parrot.dts | 5 -----
6 files changed, 28 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
index 649e31339662..61a4702b63c1 100644
--- a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
+++ b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
@@ -85,10 +85,6 @@
};
};
-&mmc1_pins_a {
- bias-pull-up;
-};
-
&r_pio {
wifi_pwrseq_pin_mid2407: wifi_pwrseq_pin at 0 {
pins = "PL6";
diff --git a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts
index 6b3bcae089f2..29a032164e3d 100644
--- a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts
+++ b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts
@@ -78,10 +78,6 @@
};
};
-&mmc1_pins_a {
- bias-pull-up;
-};
-
&r_pio {
wifi_pwrseq_pin_mid2809: wifi_pwrseq_pin at 0 {
pins = "PL6";
diff --git a/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts b/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
index 3e05959104f1..f8a72d07467c 100644
--- a/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
+++ b/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
@@ -70,10 +70,6 @@
};
};
-&mmc1_pins_a {
- bias-pull-up;
-};
-
&mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>;
diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
index b343153948f4..7e006d0fbf27 100644
--- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
+++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
@@ -151,13 +151,6 @@
status = "okay";
};
-&mmc2_8bit_pins {
- /* Increase drive strength for DDR modes */
- drive-strength = <40>;
- /* eMMC is missing pull-ups */
- bias-pull-up;
-};
-
&ohci0 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun8i-q8-common.dtsi b/arch/arm/boot/dts/sun8i-q8-common.dtsi
index c676940a96da..0b3db925254b 100644
--- a/arch/arm/boot/dts/sun8i-q8-common.dtsi
+++ b/arch/arm/boot/dts/sun8i-q8-common.dtsi
@@ -82,10 +82,6 @@
};
};
-&mmc1_pins_a {
- bias-pull-up;
-};
-
&r_pio {
wifi_pwrseq_pin_q8: wifi_pwrseq_pin at 0 {
pins = "PL6", "PL7", "PL11";
diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts
index 472c03b7aeab..5d93a2711dc3 100644
--- a/arch/arm/boot/dts/sun8i-r16-parrot.dts
+++ b/arch/arm/boot/dts/sun8i-r16-parrot.dts
@@ -156,11 +156,6 @@
status = "okay";
};
-&mmc2_8bit_pins {
- drive-strength = <40>;
- bias-pull-up;
-};
-
&ohci0 {
status = "okay";
};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 58/77] ARM: dts: sun8i: a23/a33: Remove redundant MMC pinmux tuning
2018-11-27 12:45 ` [PATCH 58/77] ARM: dts: sun8i: a23/a33: Remove redundant MMC pinmux tuning Maxime Ripard
@ 2018-11-28 12:36 ` Chen-Yu Tsai
2018-11-28 13:59 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 12:36 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Some boards override the MMC pin muxing settings in order to enable the
> pull-ups and change the drive strength to a value higher than the default.
>
> While this was needed in the earlier days, this is now the default setting
> for those pins, and therefore we don't need those board-specific settings
> anymore.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> ---
> arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 4 ----
> arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 4 ----
> arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts | 4 ----
> arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 7 -------
> arch/arm/boot/dts/sun8i-q8-common.dtsi | 4 ----
> arch/arm/boot/dts/sun8i-r16-parrot.dts | 5 -----
> 6 files changed, 28 deletions(-)
>
[...]
> diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
> index b343153948f4..7e006d0fbf27 100644
> --- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
> +++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
> @@ -151,13 +151,6 @@
> status = "okay";
> };
>
> -&mmc2_8bit_pins {
> - /* Increase drive strength for DDR modes */
> - drive-strength = <40>;
This is not the default. Maybe we should make it the default?
> - /* eMMC is missing pull-ups */
> - bias-pull-up;
> -};
> -
> &ohci0 {
> status = "okay";
> };
> diff --git a/arch/arm/boot/dts/sun8i-q8-common.dtsi b/arch/arm/boot/dts/sun8i-q8-common.dtsi
> index c676940a96da..0b3db925254b 100644
> --- a/arch/arm/boot/dts/sun8i-q8-common.dtsi
> +++ b/arch/arm/boot/dts/sun8i-q8-common.dtsi
> @@ -82,10 +82,6 @@
> };
> };
>
> -&mmc1_pins_a {
> - bias-pull-up;
> -};
> -
> &r_pio {
> wifi_pwrseq_pin_q8: wifi_pwrseq_pin at 0 {
> pins = "PL6", "PL7", "PL11";
> diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts
> index 472c03b7aeab..5d93a2711dc3 100644
> --- a/arch/arm/boot/dts/sun8i-r16-parrot.dts
> +++ b/arch/arm/boot/dts/sun8i-r16-parrot.dts
> @@ -156,11 +156,6 @@
> status = "okay";
> };
>
> -&mmc2_8bit_pins {
> - drive-strength = <40>;
Same here. Otherwise,
Acked-by: Chen-Yu Tsai <wens@csie.org>
> - bias-pull-up;
> -};
> -
> &ohci0 {
> status = "okay";
> };
> --
> git-series 0.9.1
^ permalink raw reply [flat|nested] 196+ messages in thread* [PATCH 58/77] ARM: dts: sun8i: a23/a33: Remove redundant MMC pinmux tuning
2018-11-28 12:36 ` Chen-Yu Tsai
@ 2018-11-28 13:59 ` Maxime Ripard
2018-11-28 14:30 ` Chen-Yu Tsai
0 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 13:59 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Wed, Nov 28, 2018 at 08:36:33PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > Some boards override the MMC pin muxing settings in order to enable the
> > pull-ups and change the drive strength to a value higher than the default.
> >
> > While this was needed in the earlier days, this is now the default setting
> > for those pins, and therefore we don't need those board-specific settings
> > anymore.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> > ---
> > arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 4 ----
> > arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 4 ----
> > arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts | 4 ----
> > arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 7 -------
> > arch/arm/boot/dts/sun8i-q8-common.dtsi | 4 ----
> > arch/arm/boot/dts/sun8i-r16-parrot.dts | 5 -----
> > 6 files changed, 28 deletions(-)
> >
>
> [...]
>
> > diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
> > index b343153948f4..7e006d0fbf27 100644
> > --- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
> > +++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
> > @@ -151,13 +151,6 @@
> > status = "okay";
> > };
> >
> > -&mmc2_8bit_pins {
> > - /* Increase drive strength for DDR modes */
> > - drive-strength = <40>;
>
> This is not the default. Maybe we should make it the default?
IIRC, you looked into the emmc standard some time ago, and you
concluded that the default was 30mA.
I don't really want to make it the default if only a couple of boards
need it though. I've droped that part from the patch.
Thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/8b1e2841/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread* [PATCH 58/77] ARM: dts: sun8i: a23/a33: Remove redundant MMC pinmux tuning
2018-11-28 13:59 ` Maxime Ripard
@ 2018-11-28 14:30 ` Chen-Yu Tsai
2018-11-28 15:43 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 14:30 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 9:59 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> On Wed, Nov 28, 2018 at 08:36:33PM +0800, Chen-Yu Tsai wrote:
> > On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> > >
> > > Some boards override the MMC pin muxing settings in order to enable the
> > > pull-ups and change the drive strength to a value higher than the default.
> > >
> > > While this was needed in the earlier days, this is now the default setting
> > > for those pins, and therefore we don't need those board-specific settings
> > > anymore.
> > >
> > > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> > > ---
> > > arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 4 ----
> > > arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 4 ----
> > > arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts | 4 ----
> > > arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 7 -------
> > > arch/arm/boot/dts/sun8i-q8-common.dtsi | 4 ----
> > > arch/arm/boot/dts/sun8i-r16-parrot.dts | 5 -----
> > > 6 files changed, 28 deletions(-)
> > >
> >
> > [...]
> >
> > > diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
> > > index b343153948f4..7e006d0fbf27 100644
> > > --- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
> > > +++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
> > > @@ -151,13 +151,6 @@
> > > status = "okay";
> > > };
> > >
> > > -&mmc2_8bit_pins {
> > > - /* Increase drive strength for DDR modes */
> > > - drive-strength = <40>;
> >
> > This is not the default. Maybe we should make it the default?
>
> IIRC, you looked into the emmc standard some time ago, and you
> concluded that the default was 30mA.
>
> I don't really want to make it the default if only a couple of boards
> need it though. I've droped that part from the patch.
IIRC you have both boards that have it? Could you test dropping
the drive strength down to 30 mA?
ChenYu
^ permalink raw reply [flat|nested] 196+ messages in thread* [PATCH 58/77] ARM: dts: sun8i: a23/a33: Remove redundant MMC pinmux tuning
2018-11-28 14:30 ` Chen-Yu Tsai
@ 2018-11-28 15:43 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 15:43 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 10:30:55PM +0800, Chen-Yu Tsai wrote:
> On Wed, Nov 28, 2018 at 9:59 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> > On Wed, Nov 28, 2018 at 08:36:33PM +0800, Chen-Yu Tsai wrote:
> > > On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> > > >
> > > > Some boards override the MMC pin muxing settings in order to enable the
> > > > pull-ups and change the drive strength to a value higher than the default.
> > > >
> > > > While this was needed in the earlier days, this is now the default setting
> > > > for those pins, and therefore we don't need those board-specific settings
> > > > anymore.
> > > >
> > > > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> > > > ---
> > > > arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 4 ----
> > > > arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 4 ----
> > > > arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts | 4 ----
> > > > arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 7 -------
> > > > arch/arm/boot/dts/sun8i-q8-common.dtsi | 4 ----
> > > > arch/arm/boot/dts/sun8i-r16-parrot.dts | 5 -----
> > > > 6 files changed, 28 deletions(-)
> > > >
> > >
> > > [...]
> > >
> > > > diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
> > > > index b343153948f4..7e006d0fbf27 100644
> > > > --- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
> > > > +++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
> > > > @@ -151,13 +151,6 @@
> > > > status = "okay";
> > > > };
> > > >
> > > > -&mmc2_8bit_pins {
> > > > - /* Increase drive strength for DDR modes */
> > > > - drive-strength = <40>;
> > >
> > > This is not the default. Maybe we should make it the default?
> >
> > IIRC, you looked into the emmc standard some time ago, and you
> > concluded that the default was 30mA.
> >
> > I don't really want to make it the default if only a couple of boards
> > need it though. I've droped that part from the patch.
>
> IIRC you have both boards that have it? Could you test dropping
> the drive strength down to 30 mA?
I think I still do, I'll try to find the time to test this.
Thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/4d05cb50/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 59/77] ARM: dts: sun8i: a23/a33: Remove all useless pinctrl nodes
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (57 preceding siblings ...)
2018-11-27 12:45 ` [PATCH 58/77] ARM: dts: sun8i: a23/a33: Remove redundant MMC pinmux tuning Maxime Ripard
@ 2018-11-27 12:46 ` Maxime Ripard
2018-11-28 12:37 ` Chen-Yu Tsai
2018-11-27 12:46 ` [PATCH 60/77] ARM: dts: sun8i: a23/a33: Change LRADC node names to avoid warnings Maxime Ripard
` (18 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:46 UTC (permalink / raw)
To: linux-arm-kernel
The gpio pinctrl nodes are redundant and as such useless most of the times.
Since they will also generate warnings in DTC, we can simply remove most of
them.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 9 +-----
arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 9 +-----
arch/arm/boot/dts/sun8i-r16-parrot.dts | 23 +------------
arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi | 7 +----
4 files changed, 1 insertion(+), 47 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
index 61a4702b63c1..4a318faa462a 100644
--- a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
+++ b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
@@ -54,8 +54,6 @@
wifi_pwrseq: wifi_pwrseq {
compatible = "mmc-pwrseq-simple";
- pinctrl-names = "default";
- pinctrl-0 = <&wifi_pwrseq_pin_mid2407>;
reset-gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL6 */
/* The esp8089 needs 200 ms after driving wifi-en high */
post-power-on-delay-ms = <200>;
@@ -85,13 +83,6 @@
};
};
-&r_pio {
- wifi_pwrseq_pin_mid2407: wifi_pwrseq_pin at 0 {
- pins = "PL6";
- function = "gpio_out";
- };
-};
-
&touchscreen {
reg = <0x40>;
compatible = "silead,gsl1680";
diff --git a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts
index 29a032164e3d..22e153d50523 100644
--- a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts
+++ b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts
@@ -54,8 +54,6 @@
wifi_pwrseq: wifi_pwrseq {
compatible = "mmc-pwrseq-simple";
- pinctrl-names = "default";
- pinctrl-0 = <&wifi_pwrseq_pin_mid2809>;
reset-gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL6 */
/* The esp8089 needs 200 ms after driving wifi-en high */
post-power-on-delay-ms = <200>;
@@ -78,13 +76,6 @@
};
};
-&r_pio {
- wifi_pwrseq_pin_mid2809: wifi_pwrseq_pin at 0 {
- pins = "PL6";
- function = "gpio_out";
- };
-};
-
&touchscreen {
reg = <0x40>;
compatible = "silead,gsl3670";
diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts
index 5d93a2711dc3..16b38bd7a779 100644
--- a/arch/arm/boot/dts/sun8i-r16-parrot.dts
+++ b/arch/arm/boot/dts/sun8i-r16-parrot.dts
@@ -63,8 +63,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&led_pins_parrot>;
led1 {
label = "parrot:led1:usr";
@@ -138,7 +136,7 @@
&mmc1 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins_a>, <&wifi_reset_pin_parrot>;
+ pinctrl-0 = <&mmc1_pins_a>;
vmmc-supply = <®_aldo1>;
mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>;
@@ -167,28 +165,11 @@
bias-pull-up;
};
- led_pins_parrot: led_pins at 0 {
- pins = "PE16", "PE17";
- function = "gpio_out";
- };
-
usb0_id_det: usb0_id_detect_pin at 0 {
pins = "PD10";
function = "gpio_in";
bias-pull-up;
};
-
- usb1_vbus_pin_parrot: usb1_vbus_pin at 0 {
- pins = "PD12";
- function = "gpio_out";
- };
-};
-
-&r_pio {
- wifi_reset_pin_parrot: wifi_reset_pin at 0 {
- pins = "PL6";
- function = "gpio_out";
- };
};
&r_rsb {
@@ -314,8 +295,6 @@
};
®_usb1_vbus {
- pinctrl-names = "default";
- pinctrl-0 = <&usb1_vbus_pin_parrot>;
gpio = <&pio 3 12 GPIO_ACTIVE_HIGH>; /* PD12 */
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
index 5e8a95af89b8..c5f0f2e627bf 100644
--- a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
@@ -73,8 +73,6 @@
reg = <0x40>;
interrupt-parent = <&pio>;
interrupts = <1 5 IRQ_TYPE_EDGE_FALLING>; /* PB5 */
- pinctrl-names = "default";
- pinctrl-0 = <&ts_power_pin>;
power-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
/* Tablet dts must provide reg and compatible */
status = "disabled";
@@ -97,11 +95,6 @@
bias-pull-up;
};
- ts_power_pin: ts_power_pin at 0 {
- pins = "PH1";
- function = "gpio_out";
- };
-
usb0_id_detect_pin: usb0_id_detect_pin at 0 {
pins = "PH8";
function = "gpio_in";
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 60/77] ARM: dts: sun8i: a23/a33: Change LRADC node names to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (58 preceding siblings ...)
2018-11-27 12:46 ` [PATCH 59/77] ARM: dts: sun8i: a23/a33: Remove all useless pinctrl nodes Maxime Ripard
@ 2018-11-27 12:46 ` Maxime Ripard
2018-11-28 12:37 ` Chen-Yu Tsai
2018-11-27 12:46 ` [PATCH 61/77] ARM: dts: sun8i: a23/a33: Reorder the pin groups Maxime Ripard
` (17 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:46 UTC (permalink / raw)
To: linux-arm-kernel
One of the usage of the LRADC is to implement buttons. The bindings define
that we should have one subnode per button, with their associated voltage
as a property.
However, there was no reg property but we still used the voltage associated
to the button as the unit-address, which eventually generated warnings in
DTC.
Rename the node names to avoid those warnings.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun8i-a23-evb.dts | 6 +++---
arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts | 2 +-
arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts | 2 +-
arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 6 +++---
arch/arm/boot/dts/sun8i-r16-parrot.dts | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-a23-evb.dts b/arch/arm/boot/dts/sun8i-a23-evb.dts
index 8a93697df3a5..b6aeb23b6ee9 100644
--- a/arch/arm/boot/dts/sun8i-a23-evb.dts
+++ b/arch/arm/boot/dts/sun8i-a23-evb.dts
@@ -80,21 +80,21 @@
vref-supply = <®_vcc3v0>;
status = "okay";
- button at 190 {
+ button-190 {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
channel = <0>;
voltage = <190000>;
};
- button at 390 {
+ button-390 {
label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>;
channel = <0>;
voltage = <390000>;
};
- button at 600 {
+ button-600 {
label = "Home";
linux,code = <KEY_HOME>;
channel = <0>;
diff --git a/arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts b/arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts
index e3c7a25ca37d..bcbc9b0758f9 100644
--- a/arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts
+++ b/arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts
@@ -63,7 +63,7 @@
};
&lradc {
- button at 600 {
+ button-600 {
label = "Back";
linux,code = <KEY_BACK>;
channel = <0>;
diff --git a/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts b/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts
index f71159987cac..9ead5e1b7b65 100644
--- a/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts
+++ b/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts
@@ -69,7 +69,7 @@
};
&lradc {
- button at 600 {
+ button-600 {
label = "Back";
linux,code = <KEY_BACK>;
channel = <0>;
diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
index 7e006d0fbf27..a2b8948393fc 100644
--- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
+++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
@@ -110,21 +110,21 @@
vref-supply = <®_dcdc1>;
status = "okay";
- button at 200 {
+ button-200 {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
channel = <0>;
voltage = <191011>;
};
- button at 400 {
+ button-400 {
label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>;
channel = <0>;
voltage = <391304>;
};
- button at 600 {
+ button-600 {
label = "Home";
linux,code = <KEY_HOME>;
channel = <0>;
diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts
index 16b38bd7a779..ffb3a5b6b043 100644
--- a/arch/arm/boot/dts/sun8i-r16-parrot.dts
+++ b/arch/arm/boot/dts/sun8i-r16-parrot.dts
@@ -109,14 +109,14 @@
vref-supply = <®_aldo3>;
status = "okay";
- button at 0 {
+ button-190 {
label = "V+";
linux,code = <KEY_VOLUMEUP>;
channel = <0>;
voltage = <190000>;
};
- button at 1 {
+ button-390 {
label = "V-";
linux,code = <KEY_VOLUMEDOWN>;
channel = <0>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 60/77] ARM: dts: sun8i: a23/a33: Change LRADC node names to avoid warnings
2018-11-27 12:46 ` [PATCH 60/77] ARM: dts: sun8i: a23/a33: Change LRADC node names to avoid warnings Maxime Ripard
@ 2018-11-28 12:37 ` Chen-Yu Tsai
0 siblings, 0 replies; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 12:37 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> One of the usage of the LRADC is to implement buttons. The bindings define
> that we should have one subnode per button, with their associated voltage
> as a property.
>
> However, there was no reg property but we still used the voltage associated
> to the button as the unit-address, which eventually generated warnings in
> DTC.
>
> Rename the node names to avoid those warnings.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 61/77] ARM: dts: sun8i: a23/a33: Reorder the pin groups
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (59 preceding siblings ...)
2018-11-27 12:46 ` [PATCH 60/77] ARM: dts: sun8i: a23/a33: Change LRADC node names to avoid warnings Maxime Ripard
@ 2018-11-27 12:46 ` Maxime Ripard
2018-11-28 12:38 ` Chen-Yu Tsai
2018-11-27 12:46 ` [PATCH 62/77] ARM: dts: sun8i: a23/a33: Remove card detect pull-up Maxime Ripard
` (16 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:46 UTC (permalink / raw)
To: linux-arm-kernel
The pin groups are supposed to be in alphabetical order, and they aren't.
Fix this.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-a23-a33.dtsi | 52 ++++++++++++++---------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
index b76b88a45e99..43978625df21 100644
--- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@ -298,19 +298,27 @@
#interrupt-cells = <3>;
#gpio-cells = <3>;
- uart0_pins_a: uart0 at 0 {
- pins = "PF2", "PF4";
- function = "uart0";
+ i2c0_pins_a: i2c0 at 0 {
+ pins = "PH2", "PH3";
+ function = "i2c0";
};
- uart1_pins_a: uart1 at 0 {
- pins = "PG6", "PG7";
- function = "uart1";
+ i2c1_pins_a: i2c1 at 0 {
+ pins = "PH4", "PH5";
+ function = "i2c1";
};
- uart1_pins_cts_rts_a: uart1-cts-rts at 0 {
- pins = "PG8", "PG9";
- function = "uart1";
+ i2c2_pins_a: i2c2 at 0 {
+ pins = "PE12", "PE13";
+ function = "i2c2";
+ };
+
+ lcd_rgb666_pins: lcd-rgb666 at 0 {
+ pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7",
+ "PD10", "PD11", "PD12", "PD13", "PD14", "PD15",
+ "PD18", "PD19", "PD20", "PD21", "PD22", "PD23",
+ "PD24", "PD25", "PD26", "PD27";
+ function = "lcd0";
};
mmc0_pins_a: mmc0 at 0 {
@@ -375,27 +383,19 @@
function = "pwm0";
};
- i2c0_pins_a: i2c0 at 0 {
- pins = "PH2", "PH3";
- function = "i2c0";
- };
-
- i2c1_pins_a: i2c1 at 0 {
- pins = "PH4", "PH5";
- function = "i2c1";
+ uart0_pins_a: uart0 at 0 {
+ pins = "PF2", "PF4";
+ function = "uart0";
};
- i2c2_pins_a: i2c2 at 0 {
- pins = "PE12", "PE13";
- function = "i2c2";
+ uart1_pins_a: uart1 at 0 {
+ pins = "PG6", "PG7";
+ function = "uart1";
};
- lcd_rgb666_pins: lcd-rgb666 at 0 {
- pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7",
- "PD10", "PD11", "PD12", "PD13", "PD14", "PD15",
- "PD18", "PD19", "PD20", "PD21", "PD22", "PD23",
- "PD24", "PD25", "PD26", "PD27";
- function = "lcd0";
+ uart1_pins_cts_rts_a: uart1-cts-rts at 0 {
+ pins = "PG8", "PG9";
+ function = "uart1";
};
};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 62/77] ARM: dts: sun8i: a23/a33: Remove card detect pull-up
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (60 preceding siblings ...)
2018-11-27 12:46 ` [PATCH 61/77] ARM: dts: sun8i: a23/a33: Reorder the pin groups Maxime Ripard
@ 2018-11-27 12:46 ` Maxime Ripard
2018-11-28 12:30 ` Chen-Yu Tsai
2018-11-27 12:46 ` [PATCH 63/77] ARM: dts: sun8i: a23/a33: Change pinctrl nodes to avoid warning Maxime Ripard
` (15 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:46 UTC (permalink / raw)
To: linux-arm-kernel
Boards usually have an external pull-up on the card-detect signal, so
there's no need to add another one.
This also removes a DTC warning.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-a23-evb.dts | 10 +---------
arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 10 +---------
arch/arm/boot/dts/sun8i-r16-parrot.dts | 8 +-------
arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi | 8 +-------
4 files changed, 4 insertions(+), 32 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-a23-evb.dts b/arch/arm/boot/dts/sun8i-a23-evb.dts
index b6aeb23b6ee9..3c994df0ffdf 100644
--- a/arch/arm/boot/dts/sun8i-a23-evb.dts
+++ b/arch/arm/boot/dts/sun8i-a23-evb.dts
@@ -104,21 +104,13 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_evb>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v0>;
bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
status = "okay";
};
-&pio {
- mmc0_cd_pin_evb: mmc0_cd_pin at 0 {
- pins = "PB4";
- function = "gpio_in";
- bias-pull-up;
- };
-};
-
/*
* The RX line has a non-populated resistance. In order to use it, you
* need to solder R207 on the back of the board in order to close the
diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
index a2b8948393fc..035c4d8006cd 100644
--- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
+++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
@@ -134,7 +134,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_sina33>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
@@ -155,14 +155,6 @@
status = "okay";
};
-&pio {
- mmc0_cd_pin_sina33: mmc0_cd_pin at 0 {
- pins = "PB4";
- function = "gpio_in";
- bias-pull-up;
- };
-};
-
&r_rsb {
status = "okay";
diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts
index ffb3a5b6b043..0465863743c2 100644
--- a/arch/arm/boot/dts/sun8i-r16-parrot.dts
+++ b/arch/arm/boot/dts/sun8i-r16-parrot.dts
@@ -127,7 +127,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_parrot>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_dcdc1>;
cd-gpios = <&pio 3 14 GPIO_ACTIVE_LOW>; /* PD14 */
bus-width = <4>;
@@ -159,12 +159,6 @@
};
&pio {
- mmc0_cd_pin_parrot: mmc0_cd_pin at 0 {
- pins = "PD14";
- function = "gpio_in";
- bias-pull-up;
- };
-
usb0_id_det: usb0_id_detect_pin at 0 {
pins = "PD10";
function = "gpio_in";
diff --git a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
index c5f0f2e627bf..6838bce7dd4e 100644
--- a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
@@ -81,7 +81,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
@@ -89,12 +89,6 @@
};
&pio {
- mmc0_cd_pin: mmc0_cd_pin at 0 {
- pins = "PB4";
- function = "gpio_in";
- bias-pull-up;
- };
-
usb0_id_detect_pin: usb0_id_detect_pin at 0 {
pins = "PH8";
function = "gpio_in";
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 63/77] ARM: dts: sun8i: a23/a33: Change pinctrl nodes to avoid warning
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (61 preceding siblings ...)
2018-11-27 12:46 ` [PATCH 62/77] ARM: dts: sun8i: a23/a33: Remove card detect pull-up Maxime Ripard
@ 2018-11-27 12:46 ` Maxime Ripard
2018-11-28 12:33 ` Chen-Yu Tsai
2018-11-27 12:46 ` [PATCH 64/77] ARM: dts: sun8i: a23/a33: Remove underscores from nodes names Maxime Ripard
` (14 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:46 UTC (permalink / raw)
To: linux-arm-kernel
All our pinctrl nodes were using a node name convention with a unit-address
to differentiate the different muxing options. However, since those nodes
didn't have a reg property, they were generating warnings in DTC.
In order to accomodate for this, convert the old nodes to the syntax we've
been using for the new SoCs, including removing the letter suffix of the
node labels to the bank of those pins to make things more readable.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-a23-a33.dtsi | 26 ++++++------
arch/arm/boot/dts/sun8i-a23-evb.dts | 6 +--
arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 2 +-
arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 2 +-
arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts | 2 +-
arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts | 6 +--
arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 4 +-
arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 4 +-
arch/arm/boot/dts/sun8i-a33.dtsi | 2 +-
arch/arm/boot/dts/sun8i-q8-common.dtsi | 2 +-
arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts | 14 +++---
arch/arm/boot/dts/sun8i-r16-nintendo-nes-classic.dts | 2 +-
arch/arm/boot/dts/sun8i-r16-parrot.dts | 8 ++--
arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi | 11 ++++-
14 files changed, 50 insertions(+), 41 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
index 43978625df21..bcb5b30a02f0 100644
--- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@ -298,22 +298,22 @@
#interrupt-cells = <3>;
#gpio-cells = <3>;
- i2c0_pins_a: i2c0 at 0 {
+ i2c0_pins: i2c0-pins {
pins = "PH2", "PH3";
function = "i2c0";
};
- i2c1_pins_a: i2c1 at 0 {
+ i2c1_pins: i2c1-pins {
pins = "PH4", "PH5";
function = "i2c1";
};
- i2c2_pins_a: i2c2 at 0 {
+ i2c2_pins: i2c2-pins {
pins = "PE12", "PE13";
function = "i2c2";
};
- lcd_rgb666_pins: lcd-rgb666 at 0 {
+ lcd_rgb666_pins: lcd-rgb666-pins {
pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7",
"PD10", "PD11", "PD12", "PD13", "PD14", "PD15",
"PD18", "PD19", "PD20", "PD21", "PD22", "PD23",
@@ -321,7 +321,7 @@
function = "lcd0";
};
- mmc0_pins_a: mmc0 at 0 {
+ mmc0_pins: mmc0-pins {
pins = "PF0", "PF1", "PF2",
"PF3", "PF4", "PF5";
function = "mmc0";
@@ -329,7 +329,7 @@
bias-pull-up;
};
- mmc1_pins_a: mmc1 at 0 {
+ mmc1_pg_pins: mmc1-pg-pins {
pins = "PG0", "PG1", "PG2",
"PG3", "PG4", "PG5";
function = "mmc1";
@@ -337,7 +337,7 @@
bias-pull-up;
};
- mmc2_8bit_pins: mmc2_8bit {
+ mmc2_8bit_pins: mmc2-8bit-pins {
pins = "PC5", "PC6", "PC8",
"PC9", "PC10", "PC11",
"PC12", "PC13", "PC14",
@@ -378,22 +378,22 @@
bias-pull-up;
};
- pwm0_pins: pwm0 {
+ pwm0_pin: pwm0-pin {
pins = "PH0";
function = "pwm0";
};
- uart0_pins_a: uart0 at 0 {
+ uart0_pf_pins: uart0-pf-pins {
pins = "PF2", "PF4";
function = "uart0";
};
- uart1_pins_a: uart1 at 0 {
+ uart1_pg_pins: uart1-pg-pins {
pins = "PG6", "PG7";
function = "uart1";
};
- uart1_pins_cts_rts_a: uart1-cts-rts at 0 {
+ uart1_cts_rts_pg_pins: uart1-cts-rts-pg-pins {
pins = "PG8", "PG9";
function = "uart1";
};
@@ -658,14 +658,14 @@
#interrupt-cells = <3>;
#gpio-cells = <3>;
- r_rsb_pins: r_rsb {
+ r_rsb_pins: r-rsb-pins {
pins = "PL0", "PL1";
function = "s_rsb";
drive-strength = <20>;
bias-pull-up;
};
- r_uart_pins_a: r_uart at 0 {
+ r_uart_pins_a: r-uart-pins {
pins = "PL2", "PL3";
function = "s_uart";
};
diff --git a/arch/arm/boot/dts/sun8i-a23-evb.dts b/arch/arm/boot/dts/sun8i-a23-evb.dts
index 3c994df0ffdf..36896155f2b9 100644
--- a/arch/arm/boot/dts/sun8i-a23-evb.dts
+++ b/arch/arm/boot/dts/sun8i-a23-evb.dts
@@ -66,13 +66,13 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
};
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
@@ -104,7 +104,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v0>;
bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
diff --git a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
index 4a318faa462a..d5f6aebd7216 100644
--- a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
+++ b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
@@ -69,7 +69,7 @@
&mmc1 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins_a>;
+ pinctrl-0 = <&mmc1_pg_pins>;
vmmc-supply = <®_dldo1>;
mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>;
diff --git a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts
index 22e153d50523..9f9232a2fefb 100644
--- a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts
+++ b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts
@@ -62,7 +62,7 @@
&mmc1 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins_a>;
+ pinctrl-0 = <&mmc1_pg_pins>;
vmmc-supply = <®_dldo1>;
mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>;
diff --git a/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts b/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts
index 9ead5e1b7b65..2dfdd0a3151e 100644
--- a/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts
+++ b/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts
@@ -79,7 +79,7 @@
&mmc1 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins_a>;
+ pinctrl-0 = <&mmc1_pg_pins>;
vmmc-supply = <®_dldo1>;
bus-width = <4>;
non-removable;
diff --git a/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts b/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
index f8a72d07467c..42726576a6a9 100644
--- a/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
+++ b/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
@@ -72,7 +72,7 @@
&mmc1 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins_a>;
+ pinctrl-0 = <&mmc1_pg_pins>;
vmmc-supply = <®_dldo1>;
bus-width = <4>;
non-removable;
@@ -97,7 +97,7 @@
&uart1 {
pinctrl-names = "default";
- pinctrl-0 = <&uart1_pins_a>,
- <&uart1_pins_cts_rts_a>;
+ pinctrl-0 = <&uart1_pg_pins>,
+ <&uart1_cts_rts_pg_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
index a1a1eb64caeb..9ad7eeba9df4 100644
--- a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
+++ b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
@@ -83,7 +83,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
@@ -207,7 +207,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_b>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
index 035c4d8006cd..b161a0ce03af 100644
--- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
+++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
@@ -134,7 +134,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
@@ -256,7 +256,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_b>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi
index 0036309e2c50..d03493d92618 100644
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@ -525,7 +525,7 @@
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
- uart0_pins_b: uart0 at 1 {
+ uart0_pb_pins: uart0-pb-pins {
pins = "PB0", "PB1";
function = "uart0";
};
diff --git a/arch/arm/boot/dts/sun8i-q8-common.dtsi b/arch/arm/boot/dts/sun8i-q8-common.dtsi
index 0b3db925254b..e3ca8a94d690 100644
--- a/arch/arm/boot/dts/sun8i-q8-common.dtsi
+++ b/arch/arm/boot/dts/sun8i-q8-common.dtsi
@@ -70,7 +70,7 @@
&mmc1 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins_a>;
+ pinctrl-0 = <&mmc1_pg_pins>;
vmmc-supply = <®_dldo1>;
mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>;
diff --git a/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
index ee7ce3752581..a44d80c24416 100644
--- a/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
+++ b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
@@ -127,27 +127,27 @@
/* This is the i2c bus exposed on the DSI connector for the touch panel */
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "disabled";
};
/* This is the i2c bus exposed on the GPIO header */
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "disabled";
};
/* This is the i2c bus exposed on the CSI connector to control the sensor */
&i2c2 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
+ pinctrl-0 = <&i2c2_pins>;
status = "disabled";
};
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
@@ -156,7 +156,7 @@
&mmc1 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins_a>;
+ pinctrl-0 = <&mmc1_pg_pins>;
vmmc-supply = <®_aldo1>;
mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>;
@@ -292,13 +292,13 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_b>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
&uart1 {
pinctrl-names = "default";
- pinctrl-0 = <&uart1_pins_a>, <&uart1_pins_cts_rts_a>;
+ pinctrl-0 = <&uart1_pg_pins>, <&uart1_cts_rts_pg_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun8i-r16-nintendo-nes-classic.dts b/arch/arm/boot/dts/sun8i-r16-nintendo-nes-classic.dts
index fc0658cfa319..32cf1ab33aab 100644
--- a/arch/arm/boot/dts/sun8i-r16-nintendo-nes-classic.dts
+++ b/arch/arm/boot/dts/sun8i-r16-nintendo-nes-classic.dts
@@ -25,7 +25,7 @@
* PF can also be used for the SD card so PB is preferred.
*/
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pf_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts
index 0465863743c2..62f53291ff22 100644
--- a/arch/arm/boot/dts/sun8i-r16-parrot.dts
+++ b/arch/arm/boot/dts/sun8i-r16-parrot.dts
@@ -96,7 +96,7 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
/*
@@ -127,7 +127,7 @@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
cd-gpios = <&pio 3 14 GPIO_ACTIVE_LOW>; /* PD14 */
bus-width = <4>;
@@ -136,7 +136,7 @@
&mmc1 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins_a>;
+ pinctrl-0 = <&mmc1_pg_pins>;
vmmc-supply = <®_aldo1>;
mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>;
@@ -299,7 +299,7 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_b>;
+ pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
index 6838bce7dd4e..12a2ad67844e 100644
--- a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
@@ -62,6 +62,7 @@
};
&i2c0 {
+ pinctrl-0 = <&i2c0_pins>;
/*
* The gsl1680 is rated at 400KHz and it will not work reliable at
* 100KHz, this has been confirmed on multiple different q8 tablets.
@@ -79,9 +80,13 @@
};
};
+&i2c1 {
+ pinctrl-0 = <&i2c1_pins>;
+};
+
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
@@ -96,6 +101,10 @@
};
};
+&pwm {
+ pinctrl-0 = <&pwm0_pin>;
+};
+
&r_rsb {
status = "okay";
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 63/77] ARM: dts: sun8i: a23/a33: Change pinctrl nodes to avoid warning
2018-11-27 12:46 ` [PATCH 63/77] ARM: dts: sun8i: a23/a33: Change pinctrl nodes to avoid warning Maxime Ripard
@ 2018-11-28 12:33 ` Chen-Yu Tsai
0 siblings, 0 replies; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 12:33 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> All our pinctrl nodes were using a node name convention with a unit-address
> to differentiate the different muxing options. However, since those nodes
> didn't have a reg property, they were generating warnings in DTC.
>
> In order to accomodate for this, convert the old nodes to the syntax we've
> been using for the new SoCs, including removing the letter suffix of the
> node labels to the bank of those pins to make things more readable.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 64/77] ARM: dts: sun8i: a23/a33: Remove underscores from nodes names
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (62 preceding siblings ...)
2018-11-27 12:46 ` [PATCH 63/77] ARM: dts: sun8i: a23/a33: Change pinctrl nodes to avoid warning Maxime Ripard
@ 2018-11-27 12:46 ` Maxime Ripard
2018-11-28 12:38 ` Chen-Yu Tsai
2018-11-27 12:46 ` [PATCH 65/77] ARM: dts: sunxi: reference: Move the muxing back to the common DTSI Maxime Ripard
` (13 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:46 UTC (permalink / raw)
To: linux-arm-kernel
Some GPIO pinctrl nodes cannot be easily removed, because they would also
change the pin configuration, for example to add a pull resistor or change
the current delivered by the pin.
Those nodes still have underscores and unit-addresses in their node names
in our DTs, so adjust their name to remove the warnings. Use that occasion
to also fix some poorly chosen node-names.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts | 2 +-
arch/arm/boot/dts/sun8i-q8-common.dtsi | 2 +-
arch/arm/boot/dts/sun8i-r16-parrot.dts | 2 +-
arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts b/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
index 42726576a6a9..317763069c0a 100644
--- a/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
+++ b/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
@@ -84,7 +84,7 @@
};
&r_pio {
- led_pin_d978: led_pin_d978 at 0 {
+ led_pin_d978: led-pin {
pins = "PL5";
function = "gpio_out";
drive-strength = <20>;
diff --git a/arch/arm/boot/dts/sun8i-q8-common.dtsi b/arch/arm/boot/dts/sun8i-q8-common.dtsi
index e3ca8a94d690..719ad769b837 100644
--- a/arch/arm/boot/dts/sun8i-q8-common.dtsi
+++ b/arch/arm/boot/dts/sun8i-q8-common.dtsi
@@ -83,7 +83,7 @@
};
&r_pio {
- wifi_pwrseq_pin_q8: wifi_pwrseq_pin at 0 {
+ wifi_pwrseq_pin_q8: wifi-pwrseq-pins {
pins = "PL6", "PL7", "PL11";
function = "gpio_in";
bias-pull-up;
diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts
index 62f53291ff22..85576092f5d9 100644
--- a/arch/arm/boot/dts/sun8i-r16-parrot.dts
+++ b/arch/arm/boot/dts/sun8i-r16-parrot.dts
@@ -159,7 +159,7 @@
};
&pio {
- usb0_id_det: usb0_id_detect_pin at 0 {
+ usb0_id_det: usb0-id-detect-pin {
pins = "PD10";
function = "gpio_in";
bias-pull-up;
diff --git a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
index 12a2ad67844e..787a3121e179 100644
--- a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
@@ -94,7 +94,7 @@
};
&pio {
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+ usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH8";
function = "gpio_in";
bias-pull-up;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 64/77] ARM: dts: sun8i: a23/a33: Remove underscores from nodes names
2018-11-27 12:46 ` [PATCH 64/77] ARM: dts: sun8i: a23/a33: Remove underscores from nodes names Maxime Ripard
@ 2018-11-28 12:38 ` Chen-Yu Tsai
0 siblings, 0 replies; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 12:38 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Some GPIO pinctrl nodes cannot be easily removed, because they would also
> change the pin configuration, for example to add a pull resistor or change
> the current delivered by the pin.
>
> Those nodes still have underscores and unit-addresses in their node names
> in our DTs, so adjust their name to remove the warnings. Use that occasion
> to also fix some poorly chosen node-names.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 65/77] ARM: dts: sunxi: reference: Move the muxing back to the common DTSI
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (63 preceding siblings ...)
2018-11-27 12:46 ` [PATCH 64/77] ARM: dts: sun8i: a23/a33: Remove underscores from nodes names Maxime Ripard
@ 2018-11-27 12:46 ` Maxime Ripard
2018-11-28 12:41 ` Chen-Yu Tsai
2018-11-27 12:46 ` [PATCH 66/77] ARM: dts: sun8i: a23/a33: Provide default muxing for relevant controllers Maxime Ripard
` (12 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:46 UTC (permalink / raw)
To: linux-arm-kernel
Now that all the SoCs using the tablet reference design DTSI are using the
same pinctrl naming scheme, we can move back the pinctrl phandles to the
main DTSI.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi | 8 --------
arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi | 9 ---------
arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi | 6 +++---
3 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
index b046436ff773..6202aabedbfe 100644
--- a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
@@ -76,8 +76,6 @@
};
&i2c0 {
- pinctrl-0 = <&i2c0_pins>;
-
axp209: pmic at 34 {
reg = <0x34>;
interrupts = <0>;
@@ -85,8 +83,6 @@
};
&i2c1 {
- pinctrl-0 = <&i2c1_pins>;
-
/*
* The gsl1680 is rated at 400KHz and it will not work reliable at
* 100KHz, this has been confirmed on multiple different q8 tablets.
@@ -150,10 +146,6 @@
};
};
-&pwm {
- pinctrl-0 = <&pwm0_pin>;
-};
-
®_dcdc2 {
regulator-always-on;
regulator-min-microvolt = <1000000>;
diff --git a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
index 787a3121e179..0111e6c6f177 100644
--- a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
@@ -62,7 +62,6 @@
};
&i2c0 {
- pinctrl-0 = <&i2c0_pins>;
/*
* The gsl1680 is rated at 400KHz and it will not work reliable at
* 100KHz, this has been confirmed on multiple different q8 tablets.
@@ -80,10 +79,6 @@
};
};
-&i2c1 {
- pinctrl-0 = <&i2c1_pins>;
-};
-
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;
@@ -101,10 +96,6 @@
};
};
-&pwm {
- pinctrl-0 = <&pwm0_pin>;
-};
-
&r_rsb {
status = "okay";
diff --git a/arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi b/arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi
index 00dc6623f30f..117198c52e1f 100644
--- a/arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi
@@ -46,13 +46,13 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
};
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
+ pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
@@ -77,6 +77,6 @@
&pwm {
pinctrl-names = "default";
- pinctrl-0 = <&pwm0_pins>;
+ pinctrl-0 = <&pwm0_pin>;
status = "okay";
};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 65/77] ARM: dts: sunxi: reference: Move the muxing back to the common DTSI
2018-11-27 12:46 ` [PATCH 65/77] ARM: dts: sunxi: reference: Move the muxing back to the common DTSI Maxime Ripard
@ 2018-11-28 12:41 ` Chen-Yu Tsai
2018-11-28 14:02 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 12:41 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Now that all the SoCs using the tablet reference design DTSI are using the
> same pinctrl naming scheme, we can move back the pinctrl phandles to the
> main DTSI.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> ---
> arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi | 8 --------
> arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi | 9 ---------
> arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi | 6 +++---
> 3 files changed, 3 insertions(+), 20 deletions(-)
[...]
> diff --git a/arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi b/arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi
> index 00dc6623f30f..117198c52e1f 100644
> --- a/arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi
> +++ b/arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi
> @@ -46,13 +46,13 @@
>
> &i2c0 {
> pinctrl-names = "default";
> - pinctrl-0 = <&i2c0_pins_a>;
> + pinctrl-0 = <&i2c0_pins>;
> status = "okay";
> };
>
> &i2c1 {
> pinctrl-names = "default";
> - pinctrl-0 = <&i2c1_pins_a>;
> + pinctrl-0 = <&i2c1_pins>;
I assume a build break was avoided because we were overriding these?
Acked-by: Chen-Yu Tsai <wens@csie.org>
> status = "okay";
> };
>
> @@ -77,6 +77,6 @@
>
> &pwm {
> pinctrl-names = "default";
> - pinctrl-0 = <&pwm0_pins>;
> + pinctrl-0 = <&pwm0_pin>;
> status = "okay";
> };
> --
> git-series 0.9.1
^ permalink raw reply [flat|nested] 196+ messages in thread* [PATCH 65/77] ARM: dts: sunxi: reference: Move the muxing back to the common DTSI
2018-11-28 12:41 ` Chen-Yu Tsai
@ 2018-11-28 14:02 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 14:02 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 08:41:46PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > Now that all the SoCs using the tablet reference design DTSI are using the
> > same pinctrl naming scheme, we can move back the pinctrl phandles to the
> > main DTSI.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> > ---
> > arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi | 8 --------
> > arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi | 9 ---------
> > arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi | 6 +++---
> > 3 files changed, 3 insertions(+), 20 deletions(-)
>
> [...]
>
> > diff --git a/arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi b/arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi
> > index 00dc6623f30f..117198c52e1f 100644
> > --- a/arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi
> > +++ b/arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi
> > @@ -46,13 +46,13 @@
> >
> > &i2c0 {
> > pinctrl-names = "default";
> > - pinctrl-0 = <&i2c0_pins_a>;
> > + pinctrl-0 = <&i2c0_pins>;
> > status = "okay";
> > };
> >
> > &i2c1 {
> > pinctrl-names = "default";
> > - pinctrl-0 = <&i2c1_pins_a>;
> > + pinctrl-0 = <&i2c1_pins>;
>
> I assume a build break was avoided because we were overriding these?
Yep, exactly.
> Acked-by: Chen-Yu Tsai <wens@csie.org>
Thanks!
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/69d8f386/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 66/77] ARM: dts: sun8i: a23/a33: Provide default muxing for relevant controllers
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (64 preceding siblings ...)
2018-11-27 12:46 ` [PATCH 65/77] ARM: dts: sunxi: reference: Move the muxing back to the common DTSI Maxime Ripard
@ 2018-11-27 12:46 ` Maxime Ripard
2018-11-28 12:42 ` Chen-Yu Tsai
2018-11-27 12:46 ` [PATCH 67/77] ARM: dts: sun8i: BPI-M2M: Remove i2c nodes Maxime Ripard
` (11 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:46 UTC (permalink / raw)
To: linux-arm-kernel
The I2C's and MMC0 controllers have only one muxing option in the SoC. In
such a case, we can just move the muxing into the DTSI, and remove it from
the DTS.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-a23-a33.dtsi | 8 ++++++++
arch/arm/boot/dts/sun8i-a23-evb.dts | 6 ------
arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 2 --
arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 2 --
arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts | 8 --------
arch/arm/boot/dts/sun8i-r16-parrot.dts | 4 ----
arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi | 2 --
7 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
index bcb5b30a02f0..c2ff8975ac60 100644
--- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@ -169,6 +169,8 @@
resets = <&ccu RST_BUS_MMC0>;
reset-names = "ahb";
interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@@ -499,6 +501,8 @@
interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_BUS_I2C0>;
resets = <&ccu RST_BUS_I2C0>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c0_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@@ -510,6 +514,8 @@
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_BUS_I2C1>;
resets = <&ccu RST_BUS_I2C1>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c1_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@@ -521,6 +527,8 @@
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_BUS_I2C2>;
resets = <&ccu RST_BUS_I2C2>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c2_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/sun8i-a23-evb.dts b/arch/arm/boot/dts/sun8i-a23-evb.dts
index 36896155f2b9..53fb1be0401a 100644
--- a/arch/arm/boot/dts/sun8i-a23-evb.dts
+++ b/arch/arm/boot/dts/sun8i-a23-evb.dts
@@ -65,14 +65,10 @@
};
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "okay";
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
@@ -103,8 +99,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_vcc3v0>;
bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
diff --git a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
index 9ad7eeba9df4..3d78169cdeed 100644
--- a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
+++ b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
@@ -82,8 +82,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
index b161a0ce03af..577144d953e0 100644
--- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
+++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
@@ -133,8 +133,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
diff --git a/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
index a44d80c24416..f613889f445b 100644
--- a/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
+++ b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
@@ -126,28 +126,20 @@
/* This is the i2c bus exposed on the DSI connector for the touch panel */
&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
status = "disabled";
};
/* This is the i2c bus exposed on the GPIO header */
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "disabled";
};
/* This is the i2c bus exposed on the CSI connector to control the sensor */
&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins>;
status = "disabled";
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts
index 85576092f5d9..058bc84bbfa5 100644
--- a/arch/arm/boot/dts/sun8i-r16-parrot.dts
+++ b/arch/arm/boot/dts/sun8i-r16-parrot.dts
@@ -95,8 +95,6 @@
};
&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
status = "okay";
/*
@@ -126,8 +124,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
cd-gpios = <&pio 3 14 GPIO_ACTIVE_LOW>; /* PD14 */
bus-width = <4>;
diff --git a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
index 0111e6c6f177..189e479eb95a 100644
--- a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
@@ -80,8 +80,6 @@
};
&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 67/77] ARM: dts: sun8i: BPI-M2M: Remove i2c nodes
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (65 preceding siblings ...)
2018-11-27 12:46 ` [PATCH 66/77] ARM: dts: sun8i: a23/a33: Provide default muxing for relevant controllers Maxime Ripard
@ 2018-11-27 12:46 ` Maxime Ripard
2018-11-28 13:10 ` Chen-Yu Tsai
2018-11-27 12:46 ` [PATCH 68/77] ARM: dts: sun8i: h3: Remove leading zeros from unit-addresses Maxime Ripard
` (10 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:46 UTC (permalink / raw)
To: linux-arm-kernel
The i2c nodes were pre-populated to ease the use of overlays. However, now
that we provide default muxing options for those nodes, the one in the DTS
don't provide any content at all.
Remove them.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
index f613889f445b..83d32a1a2a63 100644
--- a/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
+++ b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
@@ -124,21 +124,6 @@
status = "okay";
};
-/* This is the i2c bus exposed on the DSI connector for the touch panel */
-&i2c0 {
- status = "disabled";
-};
-
-/* This is the i2c bus exposed on the GPIO header */
-&i2c1 {
- status = "disabled";
-};
-
-/* This is the i2c bus exposed on the CSI connector to control the sensor */
-&i2c2 {
- status = "disabled";
-};
-
&mmc0 {
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 68/77] ARM: dts: sun8i: h3: Remove leading zeros from unit-addresses
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (66 preceding siblings ...)
2018-11-27 12:46 ` [PATCH 67/77] ARM: dts: sun8i: BPI-M2M: Remove i2c nodes Maxime Ripard
@ 2018-11-27 12:46 ` Maxime Ripard
2018-11-28 12:42 ` Chen-Yu Tsai
2018-11-27 12:46 ` [PATCH 69/77] ARM: dts: sun8i: v3s: Change LRADC node names to avoid warnings Maxime Ripard
` (9 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:46 UTC (permalink / raw)
To: linux-arm-kernel
Most of our device trees have had leading zeros for padding as part of
the nodes unit-addresses.
Remove all these useless zeros that generate warnings
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-h3.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi
index 9db1f58a47de..c2da3a3d373a 100644
--- a/arch/arm/boot/dts/sun8i-h3.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi
@@ -156,7 +156,7 @@
};
};
- video-codec at 01c0e000 {
+ video-codec at 1c0e000 {
compatible = "allwinner,sun8i-h3-video-engine";
reg = <0x01c0e000 0x1000>;
clocks = <&ccu CLK_BUS_VE>, <&ccu CLK_VE>,
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 69/77] ARM: dts: sun8i: v3s: Change LRADC node names to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (67 preceding siblings ...)
2018-11-27 12:46 ` [PATCH 68/77] ARM: dts: sun8i: h3: Remove leading zeros from unit-addresses Maxime Ripard
@ 2018-11-27 12:46 ` Maxime Ripard
2018-11-28 12:43 ` Chen-Yu Tsai
2018-11-27 12:46 ` [PATCH 70/77] ARM: dts: sun8i: v3s: Change pinctrl nodes to avoid warning Maxime Ripard
` (8 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:46 UTC (permalink / raw)
To: linux-arm-kernel
One of the usage of the LRADC is to implement buttons. The bindings define
that we should have one subnode per button, with their associated voltage
as a property.
However, there was no reg property but we still used the voltage associated
to the button as the unit-address, which eventually generated warnings in
DTC.
Rename the node names to avoid those warnings.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts b/arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts
index ad173605b1b8..db5cd0b8574b 100644
--- a/arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts
+++ b/arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts
@@ -66,28 +66,28 @@
vref-supply = <®_vcc3v0>;
status = "okay";
- button at 200 {
+ button-200 {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
channel = <0>;
voltage = <200000>;
};
- button at 400 {
+ button-400 {
label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>;
channel = <0>;
voltage = <400000>;
};
- button at 600 {
+ button-600 {
label = "Select";
linux,code = <KEY_SELECT>;
channel = <0>;
voltage = <600000>;
};
- button at 800 {
+ button-800 {
label = "Start";
linux,code = <KEY_OK>;
channel = <0>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 69/77] ARM: dts: sun8i: v3s: Change LRADC node names to avoid warnings
2018-11-27 12:46 ` [PATCH 69/77] ARM: dts: sun8i: v3s: Change LRADC node names to avoid warnings Maxime Ripard
@ 2018-11-28 12:43 ` Chen-Yu Tsai
0 siblings, 0 replies; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 12:43 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> One of the usage of the LRADC is to implement buttons. The bindings define
> that we should have one subnode per button, with their associated voltage
> as a property.
>
> However, there was no reg property but we still used the voltage associated
> to the button as the unit-address, which eventually generated warnings in
> DTC.
>
> Rename the node names to avoid those warnings.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 70/77] ARM: dts: sun8i: v3s: Change pinctrl nodes to avoid warning
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (68 preceding siblings ...)
2018-11-27 12:46 ` [PATCH 69/77] ARM: dts: sun8i: v3s: Change LRADC node names to avoid warnings Maxime Ripard
@ 2018-11-27 12:46 ` Maxime Ripard
2018-11-28 12:43 ` Chen-Yu Tsai
2018-11-27 12:46 ` [PATCH 71/77] ARM: dts: sun8i: v3s: Provide default muxing for relevant controllers Maxime Ripard
` (7 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:46 UTC (permalink / raw)
To: linux-arm-kernel
All our pinctrl nodes were using a node name convention with a unit-address
to differentiate the different muxing options. However, since those nodes
didn't have a reg property, they were generating warnings in DTC.
In order to accomodate for this, convert the old nodes to the syntax we've
been using for the new SoCs, including removing the letter suffix of the
node labels to the bank of those pins to make things more readable.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts | 4 ++--
arch/arm/boot/dts/sun8i-v3s.dtsi | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts b/arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts
index 387fc2aa546d..333df90e8037 100644
--- a/arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts
+++ b/arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts
@@ -78,7 +78,7 @@
};
&mmc0 {
- pinctrl-0 = <&mmc0_pins_a>;
+ pinctrl-0 = <&mmc0_pins>;
pinctrl-names = "default";
broken-cd;
bus-width = <4>;
@@ -87,7 +87,7 @@
};
&uart0 {
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pb_pins>;
pinctrl-names = "default";
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi
index 443b083c6adc..92fcb756a08a 100644
--- a/arch/arm/boot/dts/sun8i-v3s.dtsi
+++ b/arch/arm/boot/dts/sun8i-v3s.dtsi
@@ -292,17 +292,17 @@
interrupt-controller;
#interrupt-cells = <3>;
- i2c0_pins: i2c0 {
+ i2c0_pins: i2c0-pins {
pins = "PB6", "PB7";
function = "i2c0";
};
- uart0_pins_a: uart0 at 0 {
+ uart0_pb_pins: uart0-pb-pins {
pins = "PB8", "PB9";
function = "uart0";
};
- mmc0_pins_a: mmc0 at 0 {
+ mmc0_pins: mmc0-pins {
pins = "PF0", "PF1", "PF2", "PF3",
"PF4", "PF5";
function = "mmc0";
@@ -310,7 +310,7 @@
bias-pull-up;
};
- mmc1_pins: mmc1 {
+ mmc1_pins: mmc1-pins {
pins = "PG0", "PG1", "PG2", "PG3",
"PG4", "PG5";
function = "mmc1";
@@ -318,7 +318,7 @@
bias-pull-up;
};
- spi0_pins: spi0 {
+ spi0_pins: spi0-pins {
pins = "PC0", "PC1", "PC2", "PC3";
function = "spi0";
};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 70/77] ARM: dts: sun8i: v3s: Change pinctrl nodes to avoid warning
2018-11-27 12:46 ` [PATCH 70/77] ARM: dts: sun8i: v3s: Change pinctrl nodes to avoid warning Maxime Ripard
@ 2018-11-28 12:43 ` Chen-Yu Tsai
0 siblings, 0 replies; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 12:43 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> All our pinctrl nodes were using a node name convention with a unit-address
> to differentiate the different muxing options. However, since those nodes
> didn't have a reg property, they were generating warnings in DTC.
>
> In order to accomodate for this, convert the old nodes to the syntax we've
> been using for the new SoCs, including removing the letter suffix of the
> node labels to the bank of those pins to make things more readable.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 71/77] ARM: dts: sun8i: v3s: Provide default muxing for relevant controllers
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (69 preceding siblings ...)
2018-11-27 12:46 ` [PATCH 70/77] ARM: dts: sun8i: v3s: Change pinctrl nodes to avoid warning Maxime Ripard
@ 2018-11-27 12:46 ` Maxime Ripard
2018-11-28 12:43 ` Chen-Yu Tsai
2018-11-27 12:46 ` [PATCH 72/77] ARM: dts: sun8i: v3s: Remove skeleton and memory to avoid warnings Maxime Ripard
` (6 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:46 UTC (permalink / raw)
To: linux-arm-kernel
The MMC0 controllers have only one muxing option in the SoC. In such a
case, we can just move the muxing into the DTSI, and remove it from
the DTS.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts | 2 --
arch/arm/boot/dts/sun8i-v3s.dtsi | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts b/arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts
index 333df90e8037..99c8cf7bb86c 100644
--- a/arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts
+++ b/arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts
@@ -78,8 +78,6 @@
};
&mmc0 {
- pinctrl-0 = <&mmc0_pins>;
- pinctrl-names = "default";
broken-cd;
bus-width = <4>;
vmmc-supply = <®_vcc3v3>;
diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi
index 92fcb756a08a..21e1806ca509 100644
--- a/arch/arm/boot/dts/sun8i-v3s.dtsi
+++ b/arch/arm/boot/dts/sun8i-v3s.dtsi
@@ -192,6 +192,8 @@
resets = <&ccu RST_BUS_MMC0>;
reset-names = "ahb";
interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 72/77] ARM: dts: sun8i: v3s: Remove skeleton and memory to avoid warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (70 preceding siblings ...)
2018-11-27 12:46 ` [PATCH 71/77] ARM: dts: sun8i: v3s: Provide default muxing for relevant controllers Maxime Ripard
@ 2018-11-27 12:46 ` Maxime Ripard
2018-11-28 12:44 ` Chen-Yu Tsai
2018-11-27 12:46 ` [PATCH 73/77] ARM: dts: sun8i: v3s: Fix Display Engine DTC warnings Maxime Ripard
` (5 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:46 UTC (permalink / raw)
To: linux-arm-kernel
Our memory node will generate a warning in DTC since the unit address is
not matching the reg property. However, that node will be created by the
bootloader, so we can just remove it entirely in order to remove that
warning.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-a83t.dtsi | 5 -----
1 file changed, 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi
index 5617dd387fd3..b099d2fbb5cd 100644
--- a/arch/arm/boot/dts/sun8i-a83t.dtsi
+++ b/arch/arm/boot/dts/sun8i-a83t.dtsi
@@ -187,11 +187,6 @@
status = "disabled";
};
- memory {
- reg = <0x40000000 0x80000000>;
- device_type = "memory";
- };
-
cpu0_opp_table: opp_table0 {
compatible = "operating-points-v2";
opp-shared;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 73/77] ARM: dts: sun8i: v3s: Fix Display Engine DTC warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (71 preceding siblings ...)
2018-11-27 12:46 ` [PATCH 72/77] ARM: dts: sun8i: v3s: Remove skeleton and memory to avoid warnings Maxime Ripard
@ 2018-11-27 12:46 ` Maxime Ripard
2018-11-28 12:49 ` Chen-Yu Tsai
2018-11-27 12:46 ` [PATCH 74/77] ARM: dts: sun8i: a83t: " Maxime Ripard
` (4 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:46 UTC (permalink / raw)
To: linux-arm-kernel
Our display engine endpoints trigger some DTC warnings due to the fact that
we're having a single endpoint that doesn't need any reg property, and
since we don't have a reg property, we don't need the address-cells and
size-cells properties anymore.
Fix those
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-v3s.dtsi | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi
index 21e1806ca509..7918064e0940 100644
--- a/arch/arm/boot/dts/sun8i-v3s.dtsi
+++ b/arch/arm/boot/dts/sun8i-v3s.dtsi
@@ -129,12 +129,9 @@
#size-cells = <0>;
mixer0_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
- mixer0_out_tcon0: endpoint at 0 {
- reg = <0>;
+ mixer0_out_tcon0: endpoint {
remote-endpoint = <&tcon0_in_mixer0>;
};
};
@@ -159,12 +156,9 @@
#size-cells = <0>;
tcon0_in: port at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0>;
- tcon0_in_mixer0: endpoint at 0 {
- reg = <0>;
+ tcon0_in_mixer0: endpoint {
remote-endpoint = <&mixer0_out_tcon0>;
};
};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 74/77] ARM: dts: sun8i: a83t: Fix Display Engine DTC warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (72 preceding siblings ...)
2018-11-27 12:46 ` [PATCH 73/77] ARM: dts: sun8i: v3s: Fix Display Engine DTC warnings Maxime Ripard
@ 2018-11-27 12:46 ` Maxime Ripard
2018-11-28 12:50 ` Chen-Yu Tsai
2018-11-27 12:46 ` [PATCH 75/77] ARM: dts: sun8i: r40: " Maxime Ripard
` (3 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:46 UTC (permalink / raw)
To: linux-arm-kernel
Our display engine endpoints trigger some DTC warnings due to the fact that
we're having a single endpoint that doesn't need any reg property, and
since we don't have a reg property, we don't need the address-cells and
size-cells properties anymore.
Fix those
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 3 +--
arch/arm/boot/dts/sun8i-a83t.dtsi | 12 ++----------
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts b/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
index 98e8cea26dbe..4bda2f9372cb 100644
--- a/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
+++ b/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
@@ -391,8 +391,7 @@
};
&tcon0_out {
- tcon0_out_lcd: endpoint at 0 {
- reg = <0>;
+ tcon0_out_lcd: endpoint {
remote-endpoint = <&panel_input>;
};
};
diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi
index b099d2fbb5cd..c32d74083d10 100644
--- a/arch/arm/boot/dts/sun8i-a83t.dtsi
+++ b/arch/arm/boot/dts/sun8i-a83t.dtsi
@@ -325,12 +325,9 @@
#size-cells = <0>;
mixer0_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
- mixer0_out_tcon0: endpoint at 0 {
- reg = <0>;
+ mixer0_out_tcon0: endpoint {
remote-endpoint = <&tcon0_in_mixer0>;
};
};
@@ -428,19 +425,14 @@
#size-cells = <0>;
tcon0_in: port at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0>;
- tcon0_in_mixer0: endpoint at 0 {
- reg = <0>;
+ tcon0_in_mixer0: endpoint {
remote-endpoint = <&mixer0_out_tcon0>;
};
};
tcon0_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
};
};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 74/77] ARM: dts: sun8i: a83t: Fix Display Engine DTC warnings
2018-11-27 12:46 ` [PATCH 74/77] ARM: dts: sun8i: a83t: " Maxime Ripard
@ 2018-11-28 12:50 ` Chen-Yu Tsai
0 siblings, 0 replies; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 12:50 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Our display engine endpoints trigger some DTC warnings due to the fact that
> we're having a single endpoint that doesn't need any reg property, and
> since we don't have a reg property, we don't need the address-cells and
> size-cells properties anymore.
>
> Fix those
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 75/77] ARM: dts: sun8i: r40: Fix Display Engine DTC warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (73 preceding siblings ...)
2018-11-27 12:46 ` [PATCH 74/77] ARM: dts: sun8i: a83t: " Maxime Ripard
@ 2018-11-27 12:46 ` Maxime Ripard
2018-11-28 13:00 ` Chen-Yu Tsai
2018-11-27 12:46 ` [PATCH 76/77] ARM: dts: sun9i: " Maxime Ripard
` (2 subsequent siblings)
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:46 UTC (permalink / raw)
To: linux-arm-kernel
Our display engine endpoints trigger some DTC warnings due to the fact that
we're having a single endpoint that doesn't need any reg property, and
since we don't have a reg property, we don't need the address-cells and
size-cells properties anymore.
Fix those
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun8i-r40.dtsi | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi
index 6f4c9ca5a3ee..0a5ca0168a0c 100644
--- a/arch/arm/boot/dts/sun8i-r40.dtsi
+++ b/arch/arm/boot/dts/sun8i-r40.dtsi
@@ -587,12 +587,9 @@
#size-cells = <0>;
tcon_top_mixer0_in: port at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0>;
- tcon_top_mixer0_in_mixer0: endpoint at 0 {
- reg = <0>;
+ tcon_top_mixer0_in_mixer0: endpoint {
remote-endpoint = <&mixer0_out_tcon_top>;
};
};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 75/77] ARM: dts: sun8i: r40: Fix Display Engine DTC warnings
2018-11-27 12:46 ` [PATCH 75/77] ARM: dts: sun8i: r40: " Maxime Ripard
@ 2018-11-28 13:00 ` Chen-Yu Tsai
0 siblings, 0 replies; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 13:00 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Our display engine endpoints trigger some DTC warnings due to the fact that
> we're having a single endpoint that doesn't need any reg property, and
> since we don't have a reg property, we don't need the address-cells and
> size-cells properties anymore.
>
> Fix those
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> ---
> arch/arm/boot/dts/sun8i-r40.dtsi | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi
> index 6f4c9ca5a3ee..0a5ca0168a0c 100644
> --- a/arch/arm/boot/dts/sun8i-r40.dtsi
> +++ b/arch/arm/boot/dts/sun8i-r40.dtsi
> @@ -587,12 +587,9 @@
> #size-cells = <0>;
>
> tcon_top_mixer0_in: port at 0 {
> - #address-cells = <1>;
> - #size-cells = <0>;
> reg = <0>;
>
> - tcon_top_mixer0_in_mixer0: endpoint at 0 {
> - reg = <0>;
> + tcon_top_mixer0_in_mixer0: endpoint {
> remote-endpoint = <&mixer0_out_tcon_top>;
> };
> };
So it doesn't complain for tcon_top_mixer1_in, which also only has
one child node? The reg property in both these nodes are used to
identify which mixer is connected. We need to teach the sun8i-mixer
driver to deal with an absent reg property first.
ChenYu
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 76/77] ARM: dts: sun9i: Fix Display Engine DTC warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (74 preceding siblings ...)
2018-11-27 12:46 ` [PATCH 75/77] ARM: dts: sun8i: r40: " Maxime Ripard
@ 2018-11-27 12:46 ` Maxime Ripard
2018-11-28 13:05 ` Chen-Yu Tsai
2018-11-27 12:46 ` [PATCH 77/77] ARM: dts: sun9i: Add missing unit address Maxime Ripard
2018-11-28 13:25 ` [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Chen-Yu Tsai
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:46 UTC (permalink / raw)
To: linux-arm-kernel
Our display engine endpoints trigger some DTC warnings due to the fact that
we're having a single endpoint that doesn't need any reg property, and
since we don't have a reg property, we don't need the address-cells and
size-cells properties anymore.
Fix those
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 15 +----
arch/arm/boot/dts/sun9i-a80.dtsi | 64 ++++------------------
2 files changed, 15 insertions(+), 64 deletions(-)
diff --git a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
index 85da85faf869..2701d3446b6c 100644
--- a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
+++ b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
@@ -89,31 +89,23 @@
vga-dac {
compatible = "corpro,gm7123", "adi,adv7123", "dumb-vga-dac";
vdd-supply = <®_dcdc1>;
- #address-cells = <1>;
- #size-cells = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0>;
- vga_dac_in: endpoint at 0 {
- reg = <0>;
+ vga_dac_in: endpoint {
remote-endpoint = <&tcon0_out_vga>;
};
};
port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
- vga_dac_out: endpoint at 0 {
- reg = <0>;
+ vga_dac_out: endpoint {
remote-endpoint = <&vga_con_in>;
};
};
@@ -464,8 +456,7 @@
};
&tcon0_out {
- tcon0_out_vga: endpoint at 0 {
- reg = <0>;
+ tcon0_out_vga: endpoint {
remote-endpoint = <&vga_dac_in>;
};
};
diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi
index d9532fb1ef65..27c2ad6bf002 100644
--- a/arch/arm/boot/dts/sun9i-a80.dtsi
+++ b/arch/arm/boot/dts/sun9i-a80.dtsi
@@ -544,12 +544,9 @@
#size-cells = <0>;
fe0_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
- fe0_out_deu0: endpoint at 0 {
- reg = <0>;
+ fe0_out_deu0: endpoint {
remote-endpoint = <&deu0_in_fe0>;
};
};
@@ -571,12 +568,9 @@
#size-cells = <0>;
fe1_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
- fe1_out_deu1: endpoint at 0 {
- reg = <0>;
+ fe1_out_deu1: endpoint {
remote-endpoint = <&deu1_in_fe1>;
};
};
@@ -614,12 +608,9 @@
};
be0_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
- be0_out_drc0: endpoint at 0 {
- reg = <0>;
+ be0_out_drc0: endpoint {
remote-endpoint = <&drc0_in_be0>;
};
};
@@ -657,12 +648,9 @@
};
be1_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
- be1_out_drc1: endpoint at 0 {
- reg = <0>;
+ be1_out_drc1: endpoint {
remote-endpoint = <&drc1_in_be1>;
};
};
@@ -686,12 +674,9 @@
#size-cells = <0>;
deu0_in: port at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0>;
- deu0_in_fe0: endpoint at 0 {
- reg = <0>;
+ deu0_in_fe0: endpoint {
remote-endpoint = <&fe0_out_deu0>;
};
};
@@ -731,12 +716,9 @@
#size-cells = <0>;
deu1_in: port at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0>;
- deu1_in_fe1: endpoint at 0 {
- reg = <0>;
+ deu1_in_fe1: endpoint {
remote-endpoint = <&fe1_out_deu1>;
};
};
@@ -776,23 +758,17 @@
#size-cells = <0>;
drc0_in: port at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0>;
- drc0_in_be0: endpoint at 0 {
- reg = <0>;
+ drc0_in_be0: endpoint {
remote-endpoint = <&be0_out_drc0>;
};
};
drc0_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
- drc0_out_tcon0: endpoint at 0 {
- reg = <0>;
+ drc0_out_tcon0: endpoint {
remote-endpoint = <&tcon0_in_drc0>;
};
};
@@ -816,23 +792,17 @@
#size-cells = <0>;
drc1_in: port at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0>;
- drc1_in_be1: endpoint at 0 {
- reg = <0>;
+ drc1_in_be1: endpoint {
remote-endpoint = <&be1_out_drc1>;
};
};
drc1_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
- drc1_out_tcon1: endpoint at 0 {
- reg = <0>;
+ drc1_out_tcon1: endpoint {
remote-endpoint = <&tcon1_in_drc1>;
};
};
@@ -854,19 +824,14 @@
#size-cells = <0>;
tcon0_in: port at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0>;
- tcon0_in_drc0: endpoint at 0 {
- reg = <0>;
+ tcon0_in_drc0: endpoint {
remote-endpoint = <&drc0_out_tcon0>;
};
};
tcon0_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
};
};
@@ -886,19 +851,14 @@
#size-cells = <0>;
tcon1_in: port at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0>;
- tcon1_in_drc1: endpoint at 0 {
- reg = <0>;
+ tcon1_in_drc1: endpoint {
remote-endpoint = <&drc1_out_tcon1>;
};
};
tcon1_out: port at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
};
};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 76/77] ARM: dts: sun9i: Fix Display Engine DTC warnings
2018-11-27 12:46 ` [PATCH 76/77] ARM: dts: sun9i: " Maxime Ripard
@ 2018-11-28 13:05 ` Chen-Yu Tsai
0 siblings, 0 replies; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 13:05 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Our display engine endpoints trigger some DTC warnings due to the fact that
> we're having a single endpoint that doesn't need any reg property, and
> since we don't have a reg property, we don't need the address-cells and
> size-cells properties anymore.
>
> Fix those
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 77/77] ARM: dts: sun9i: Add missing unit address
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (75 preceding siblings ...)
2018-11-27 12:46 ` [PATCH 76/77] ARM: dts: sun9i: " Maxime Ripard
@ 2018-11-27 12:46 ` Maxime Ripard
2018-11-28 13:07 ` Chen-Yu Tsai
2018-11-28 13:25 ` [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Chen-Yu Tsai
77 siblings, 1 reply; 196+ messages in thread
From: Maxime Ripard @ 2018-11-27 12:46 UTC (permalink / raw)
To: linux-arm-kernel
The soc node in the A80 DTSI has a ranges property, but no matching unit
address, which results in a DTC warning. Add the unit address to remove
that warning.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
arch/arm/boot/dts/sun9i-a80.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi
index 27c2ad6bf002..ec504cea1b3e 100644
--- a/arch/arm/boot/dts/sun9i-a80.dtsi
+++ b/arch/arm/boot/dts/sun9i-a80.dtsi
@@ -254,7 +254,7 @@
status = "disabled";
};
- soc {
+ soc at 20000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 196+ messages in thread* [PATCH 77/77] ARM: dts: sun9i: Add missing unit address
2018-11-27 12:46 ` [PATCH 77/77] ARM: dts: sun9i: Add missing unit address Maxime Ripard
@ 2018-11-28 13:07 ` Chen-Yu Tsai
2018-11-28 14:23 ` Maxime Ripard
0 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 13:07 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> The soc node in the A80 DTSI has a ranges property, but no matching unit
> address, which results in a DTC warning. Add the unit address to remove
> that warning.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> ---
> arch/arm/boot/dts/sun9i-a80.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi
> index 27c2ad6bf002..ec504cea1b3e 100644
> --- a/arch/arm/boot/dts/sun9i-a80.dtsi
> +++ b/arch/arm/boot/dts/sun9i-a80.dtsi
> @@ -254,7 +254,7 @@
> status = "disabled";
> };
>
> - soc {
> + soc at 20000 {
Shouldn't it be 0? The BROM, though unlisted, is at 0x0.
ChenYu
^ permalink raw reply [flat|nested] 196+ messages in thread* [PATCH 77/77] ARM: dts: sun9i: Add missing unit address
2018-11-28 13:07 ` Chen-Yu Tsai
@ 2018-11-28 14:23 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 14:23 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 09:07:24PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:47 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > The soc node in the A80 DTSI has a ranges property, but no matching unit
> > address, which results in a DTC warning. Add the unit address to remove
> > that warning.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> > ---
> > arch/arm/boot/dts/sun9i-a80.dtsi | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi
> > index 27c2ad6bf002..ec504cea1b3e 100644
> > --- a/arch/arm/boot/dts/sun9i-a80.dtsi
> > +++ b/arch/arm/boot/dts/sun9i-a80.dtsi
> > @@ -254,7 +254,7 @@
> > status = "disabled";
> > };
> >
> > - soc {
> > + soc at 20000 {
>
> Shouldn't it be 0? The BROM, though unlisted, is at 0x0.
Hmm, I don't know what happened here, you're obviously right :)
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/9f7c684d/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread
* [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings
2018-11-27 12:45 [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Maxime Ripard
` (76 preceding siblings ...)
2018-11-27 12:46 ` [PATCH 77/77] ARM: dts: sun9i: Add missing unit address Maxime Ripard
@ 2018-11-28 13:25 ` Chen-Yu Tsai
2018-11-28 14:15 ` Maxime Ripard
77 siblings, 1 reply; 196+ messages in thread
From: Chen-Yu Tsai @ 2018-11-28 13:25 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Here is a (rather big) series that fixes most of our DTC warnings. The
> number of warnings when compiled with W=1 after applying this series
> goes from 3343 to 23, 21 of them being the same warning, which would
> be fixed by the current series adding support for the Cedrus driver on
> H3/H5.
>
> The two remaining one are on the A80 and would require some change in
> the clock driver. Given how little activity there is on the A80, we
> can expect it to not happen in a near future, but I can live with two
> warnings.
>
> I also took the occasion to convert all the arm SoCs to our newer
> syntax and rules when applicable.
>
> Let me know what you think,
> Maxime
This series looks pretty good. Only bits I'm concerned about are the
removal of "reg = <0>" for the display pipeline. This is likely to
cause the backend and mixer drivers to not bind.
Also, I think we can get rid of the pull-ups for the USB ID pin. All
the reference designs show an external pull-up for that.
As for the GPIO LED drive current bits, I'd really like an alternative.
I need something like that for the Orange Pi Lite 2 (H6).
ChenYu
^ permalink raw reply [flat|nested] 196+ messages in thread* [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings
2018-11-28 13:25 ` [PATCH 00/77] ARM: dts: sunxi: Cleanup DTC warnings Chen-Yu Tsai
@ 2018-11-28 14:15 ` Maxime Ripard
0 siblings, 0 replies; 196+ messages in thread
From: Maxime Ripard @ 2018-11-28 14:15 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 28, 2018 at 09:25:00PM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 27, 2018 at 8:46 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > Here is a (rather big) series that fixes most of our DTC warnings. The
> > number of warnings when compiled with W=1 after applying this series
> > goes from 3343 to 23, 21 of them being the same warning, which would
> > be fixed by the current series adding support for the Cedrus driver on
> > H3/H5.
> >
> > The two remaining one are on the A80 and would require some change in
> > the clock driver. Given how little activity there is on the A80, we
> > can expect it to not happen in a near future, but I can live with two
> > warnings.
> >
> > I also took the occasion to convert all the arm SoCs to our newer
> > syntax and rules when applicable.
> >
> > Let me know what you think,
> > Maxime
>
> This series looks pretty good. Only bits I'm concerned about are the
> removal of "reg = <0>" for the display pipeline. This is likely to
> cause the backend and mixer drivers to not bind.
I've dropped them for now.
> Also, I think we can get rid of the pull-ups for the USB ID pin. All
> the reference designs show an external pull-up for that.
Yeah, I was wondering that too, but I ended up being conservative
about it. I'll send a patch.
> As for the GPIO LED drive current bits, I'd really like an alternative.
> I need something like that for the Orange Pi Lite 2 (H6).
There was some effort a few months ago, maybe we should ping Linus
about this.
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181128/90452766/attachment.sig>
^ permalink raw reply [flat|nested] 196+ messages in thread