* [PATCH v4 1/4] PCI: rockchip: Make 'ep-gpios' DT property optional
2021-01-21 16:23 [PATCH v4 0/4] arm64: rockchip: Fix PCIe ep-gpios requirement and Add Nanopi M4B Chen-Yu Tsai
@ 2021-01-21 16:23 ` Chen-Yu Tsai
2021-01-21 16:23 ` [PATCH v4 2/4] dt-bindings: arm: rockchip: Add FriendlyARM NanoPi M4B Chen-Yu Tsai
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Chen-Yu Tsai @ 2021-01-21 16:23 UTC (permalink / raw)
To: Shawn Lin, Lorenzo Pieralisi, Bjorn Helgaas, Heiko Stuebner
Cc: Chen-Yu Tsai, Rob Herring, Robin Murphy, Johan Jonker, linux-pci,
linux-rockchip, linux-arm-kernel, linux-kernel, devicetree
From: Chen-Yu Tsai <wens@csie.org>
The Rockchip PCIe controller DT binding clearly states that 'ep-gpios' is
an optional property. And indeed there are boards that don't require it.
Make the driver follow the binding by using devm_gpiod_get_optional()
instead of devm_gpiod_get().
Fixes: e77f847df54c ("PCI: rockchip: Add Rockchip PCIe controller support")
Fixes: 956cd99b35a8 ("PCI: rockchip: Separate common code from RC driver")
Fixes: 964bac9455be ("PCI: rockchip: Split out rockchip_pcie_parse_dt() to parse DT")
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
Changes since v3:
- Directly return dev_err_probe() instead of having a separate return
statement
Changes since v2:
- Fix error message for failed GPIO
Changes since v1:
- Rewrite subject to match existing convention and reference
'ep-gpios' DT property instead of the 'ep_gpio' field
---
drivers/pci/controller/pcie-rockchip.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c
index 904dec0d3a88..a2ad0b7614a4 100644
--- a/drivers/pci/controller/pcie-rockchip.c
+++ b/drivers/pci/controller/pcie-rockchip.c
@@ -118,11 +118,10 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip)
}
if (rockchip->is_rc) {
- rockchip->ep_gpio = devm_gpiod_get(dev, "ep", GPIOD_OUT_HIGH);
- if (IS_ERR(rockchip->ep_gpio)) {
- dev_err(dev, "missing ep-gpios property in node\n");
- return PTR_ERR(rockchip->ep_gpio);
- }
+ rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep", GPIOD_OUT_HIGH);
+ if (IS_ERR(rockchip->ep_gpio))
+ return dev_err_probe(dev, PTR_ERR(rockchip->ep_gpio),
+ "failed to get ep GPIO\n");
}
rockchip->aclk_pcie = devm_clk_get(dev, "aclk");
--
2.29.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v4 2/4] dt-bindings: arm: rockchip: Add FriendlyARM NanoPi M4B
2021-01-21 16:23 [PATCH v4 0/4] arm64: rockchip: Fix PCIe ep-gpios requirement and Add Nanopi M4B Chen-Yu Tsai
2021-01-21 16:23 ` [PATCH v4 1/4] PCI: rockchip: Make 'ep-gpios' DT property optional Chen-Yu Tsai
@ 2021-01-21 16:23 ` Chen-Yu Tsai
2021-01-21 16:23 ` [PATCH v4 3/4] arm64: dts: rockchip: nanopi4: Move ep-gpios property to nanopc-t4 Chen-Yu Tsai
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Chen-Yu Tsai @ 2021-01-21 16:23 UTC (permalink / raw)
To: Shawn Lin, Lorenzo Pieralisi, Bjorn Helgaas, Heiko Stuebner
Cc: Chen-Yu Tsai, Rob Herring, Robin Murphy, Johan Jonker, linux-pci,
linux-rockchip, linux-arm-kernel, linux-kernel, devicetree
From: Chen-Yu Tsai <wens@csie.org>
The NanoPi M4B is a minor revision of the original M4.
The differences against the original Nanopi M4 that are common with the
other M4V2 revision include:
- microphone header removed
- power button added
- recovery button added
Additional changes specific to the M4B:
- USB 3.0 hub removed; board now has 2x USB 3.0 type-A ports and 2x
USB 2.0 ports
- ADB toggle switch added; this changes the top USB 3.0 host port to
a peripheral port
- Type-C port no longer supports data or PD
- WiFi/Bluetooth combo chip switched to AP6256, which supports BT 5.0
but only 1T1R (down from 2T2R) for WiFi
Add a compatible string for the new board revision.
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
Documentation/devicetree/bindings/arm/rockchip.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
index 8a2dd9f1cff2..c3036f95c7bc 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
@@ -132,6 +132,7 @@ properties:
- enum:
- friendlyarm,nanopc-t4
- friendlyarm,nanopi-m4
+ - friendlyarm,nanopi-m4b
- friendlyarm,nanopi-neo4
- const: rockchip,rk3399
--
2.29.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v4 3/4] arm64: dts: rockchip: nanopi4: Move ep-gpios property to nanopc-t4
2021-01-21 16:23 [PATCH v4 0/4] arm64: rockchip: Fix PCIe ep-gpios requirement and Add Nanopi M4B Chen-Yu Tsai
2021-01-21 16:23 ` [PATCH v4 1/4] PCI: rockchip: Make 'ep-gpios' DT property optional Chen-Yu Tsai
2021-01-21 16:23 ` [PATCH v4 2/4] dt-bindings: arm: rockchip: Add FriendlyARM NanoPi M4B Chen-Yu Tsai
@ 2021-01-21 16:23 ` Chen-Yu Tsai
2021-01-21 16:23 ` [PATCH v4 4/4] arm64: dts: rockchip: rk3399: Add NanoPi M4B Chen-Yu Tsai
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Chen-Yu Tsai @ 2021-01-21 16:23 UTC (permalink / raw)
To: Shawn Lin, Lorenzo Pieralisi, Bjorn Helgaas, Heiko Stuebner
Cc: Chen-Yu Tsai, Rob Herring, Robin Murphy, Johan Jonker, linux-pci,
linux-rockchip, linux-arm-kernel, linux-kernel, devicetree
From: Chen-Yu Tsai <wens@csie.org>
Only the NanoPC T4 hs the PCIe reset pin routed to the SoC. For the
NanoPi M4 family, no such signal is routed to the expansion header on
the base board.
As the schematics for the expansion board were not released, it is
unclear how this is handled, but the likely answer is that the signal
is always pulled high.
Move the ep-gpios property from the common nanopi4.dtsi file to the
board level nanopc-t4.dts file. This makes the nanopi-m4 lack ep-gpios,
matching the board design.
A companion patch "PCI: rockchip: make ep_gpio optional" for the Linux
driver is required, as the driver currently requires the property to be
present.
Fixes: e7a095908227 ("arm64: dts: rockchip: Add devicetree for NanoPC-T4")
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts | 1 +
arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts
index e0d75617bb7e..452728b82e42 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts
@@ -95,6 +95,7 @@ map3 {
};
&pcie0 {
+ ep-gpios = <&gpio2 RK_PA4 GPIO_ACTIVE_HIGH>;
num-lanes = <4>;
vpcie3v3-supply = <&vcc3v3_sys>;
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
index 76a8b40a93c6..48ed4aaa37f3 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
@@ -504,7 +504,6 @@ &pcie_phy {
};
&pcie0 {
- ep-gpios = <&gpio2 RK_PA4 GPIO_ACTIVE_HIGH>;
max-link-speed = <2>;
num-lanes = <2>;
vpcie0v9-supply = <&vcca0v9_s3>;
--
2.29.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v4 4/4] arm64: dts: rockchip: rk3399: Add NanoPi M4B
2021-01-21 16:23 [PATCH v4 0/4] arm64: rockchip: Fix PCIe ep-gpios requirement and Add Nanopi M4B Chen-Yu Tsai
` (2 preceding siblings ...)
2021-01-21 16:23 ` [PATCH v4 3/4] arm64: dts: rockchip: nanopi4: Move ep-gpios property to nanopc-t4 Chen-Yu Tsai
@ 2021-01-21 16:23 ` Chen-Yu Tsai
2021-01-25 17:10 ` [PATCH v4 0/4] arm64: rockchip: Fix PCIe ep-gpios requirement and Add Nanopi M4B Lorenzo Pieralisi
2021-01-25 23:56 ` (subset) " Heiko Stuebner
5 siblings, 0 replies; 7+ messages in thread
From: Chen-Yu Tsai @ 2021-01-21 16:23 UTC (permalink / raw)
To: Shawn Lin, Lorenzo Pieralisi, Bjorn Helgaas, Heiko Stuebner
Cc: Chen-Yu Tsai, Rob Herring, Robin Murphy, Johan Jonker, linux-pci,
linux-rockchip, linux-arm-kernel, linux-kernel, devicetree
From: Chen-Yu Tsai <wens@csie.org>
The NanoPi M4B is a minor revision of the original M4.
The differences against the original Nanopi M4 that are common with the
other M4V2 revision include:
- microphone header removed
- power button added
- recovery button added
Additional changes specific to the M4B:
- USB 3.0 hub removed; board now has 2x USB 3.0 type-A ports and 2x
USB 2.0 ports
- ADB toggle switch added; this changes the top USB 3.0 host port to
a peripheral port
- Type-C port no longer supports data or PD
- WiFi/Bluetooth combo chip switched to AP6256, which supports BT 5.0
but only 1T1R (down from 2T2R) for WiFi
Add a new dts file for the new board revision that shows the difference
against the original.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
arch/arm64/boot/dts/rockchip/Makefile | 1 +
.../boot/dts/rockchip/rk3399-nanopi-m4b.dts | 52 +++++++++++++++++++
2 files changed, 53 insertions(+)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4b.dts
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index b29a445b355a..62d3abc17a24 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -34,6 +34,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-kobol-helios64.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-leez-p710.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopc-t4.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4b.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4b.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4b.dts
new file mode 100644
index 000000000000..72182c58cc46
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4b.dts
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * FriendlyElec NanoPi M4B board device tree source
+ *
+ * Copyright (c) 2020 Chen-Yu Tsai <wens@csie.org>
+ */
+
+/dts-v1/;
+#include "rk3399-nanopi-m4.dts"
+
+/ {
+ model = "FriendlyElec NanoPi M4B";
+ compatible = "friendlyarm,nanopi-m4b", "rockchip,rk3399";
+
+ adc-keys {
+ compatible = "adc-keys";
+ io-channels = <&saradc 1>;
+ io-channel-names = "buttons";
+ keyup-threshold-microvolt = <1500000>;
+ poll-interval = <100>;
+
+ recovery {
+ label = "Recovery";
+ linux,code = <KEY_VENDOR>;
+ press-threshold-microvolt = <18000>;
+ };
+ };
+};
+
+/* No USB type-C PD power manager */
+/delete-node/ &fusb0;
+
+&i2c4 {
+ status = "disabled";
+};
+
+&u2phy0_host {
+ phy-supply = <&vcc5v0_usb2>;
+};
+
+&u2phy0_otg {
+ phy-supply = <&vbus_typec>;
+};
+
+&u2phy1_otg {
+ phy-supply = <&vcc5v0_usb1>;
+};
+
+&vbus_typec {
+ enable-active-high;
+ gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
+};
--
2.29.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v4 0/4] arm64: rockchip: Fix PCIe ep-gpios requirement and Add Nanopi M4B
2021-01-21 16:23 [PATCH v4 0/4] arm64: rockchip: Fix PCIe ep-gpios requirement and Add Nanopi M4B Chen-Yu Tsai
` (3 preceding siblings ...)
2021-01-21 16:23 ` [PATCH v4 4/4] arm64: dts: rockchip: rk3399: Add NanoPi M4B Chen-Yu Tsai
@ 2021-01-25 17:10 ` Lorenzo Pieralisi
2021-01-25 23:56 ` (subset) " Heiko Stuebner
5 siblings, 0 replies; 7+ messages in thread
From: Lorenzo Pieralisi @ 2021-01-25 17:10 UTC (permalink / raw)
To: Chen-Yu Tsai, Shawn Lin, Heiko Stuebner, Bjorn Helgaas
Cc: Lorenzo Pieralisi, Rob Herring, Chen-Yu Tsai, devicetree,
linux-kernel, linux-pci, Robin Murphy, linux-rockchip,
linux-arm-kernel, Johan Jonker
On Fri, 22 Jan 2021 00:23:17 +0800, Chen-Yu Tsai wrote:
> This is v4 of my Nanopi M4B series.
>
> Changes since v3 include:
>
> - Directly return dev_err_probe() instead of having a separate return
> statement
>
> [...]
Applied to pci/rockchip (dropped dts patches 3-4), thanks!
[1/2] PCI: rockchip: Make 'ep-gpios' DT property optional
https://git.kernel.org/lpieralisi/pci/c/96f760cc00
[2/2] dt-bindings: arm: rockchip: Add FriendlyARM NanoPi M4B
https://git.kernel.org/lpieralisi/pci/c/b205659626
Thanks,
Lorenzo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: (subset) [PATCH v4 0/4] arm64: rockchip: Fix PCIe ep-gpios requirement and Add Nanopi M4B
2021-01-21 16:23 [PATCH v4 0/4] arm64: rockchip: Fix PCIe ep-gpios requirement and Add Nanopi M4B Chen-Yu Tsai
` (4 preceding siblings ...)
2021-01-25 17:10 ` [PATCH v4 0/4] arm64: rockchip: Fix PCIe ep-gpios requirement and Add Nanopi M4B Lorenzo Pieralisi
@ 2021-01-25 23:56 ` Heiko Stuebner
5 siblings, 0 replies; 7+ messages in thread
From: Heiko Stuebner @ 2021-01-25 23:56 UTC (permalink / raw)
To: Chen-Yu Tsai, Lorenzo Pieralisi, Bjorn Helgaas, Shawn Lin
Cc: Heiko Stuebner, linux-arm-kernel, Johan Jonker, Robin Murphy,
linux-rockchip, linux-pci, linux-kernel, Chen-Yu Tsai,
devicetree
On Fri, 22 Jan 2021 00:23:17 +0800, Chen-Yu Tsai wrote:
> This is v4 of my Nanopi M4B series.
>
> Changes since v3 include:
>
> - Directly return dev_err_probe() instead of having a separate return
> statement
>
> [...]
Applied, thanks!
[3/4] arm64: dts: rockchip: nanopi4: Move ep-gpios property to nanopc-t4
commit: 3503376d6cc385b6266f93c24ead9a33d8dfe8cb
[4/4] arm64: dts: rockchip: rk3399: Add NanoPi M4B
commit: c7b03115003f7f337ab165542cee37148cf30a8a
Best regards,
--
Heiko Stuebner <heiko@sntech.de>
^ permalink raw reply [flat|nested] 7+ messages in thread