* [PATCH 1/2] dt-bindings: rockchip: k3566-quartz64-a: fix names entries, refactor
@ 2022-09-16 12:52 Alessandro Carminati
2022-09-16 13:17 ` Heiko Stuebner
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Alessandro Carminati @ 2022-09-16 12:52 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Heiko Stuebner, devicetree,
linux-arm-kernel, linux-rockchip, linux-kernel
Fix esisting "No underscores in node names" general rule, and prepare for
new board versions.
Signed-off-by: Alessandro Carminati <alessandro.carminati@gmail.com>
---
arch/arm64/boot/dts/rockchip/Makefile | 2 +-
...-quartz64-a.dts => rk3566-quartz64-a.dtsi} | 27 ++++++++-----------
.../dts/rockchip/rk3566-quartz64-a.usb3.dts | 9 +++++++
3 files changed, 21 insertions(+), 17 deletions(-)
rename arch/arm64/boot/dts/rockchip/{rk3566-quartz64-a.dts => rk3566-quartz64-a.dtsi} (97%)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.usb3.dts
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index ef79a672804a..97ec6c156346 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -59,7 +59,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb
-dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.usb3.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-b.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-roc-pc.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-soquartz-cm4.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dtsi
similarity index 97%
rename from arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
rename to arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dtsi
index d943559b157c..ac3da5b2c1b2 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dtsi
@@ -28,7 +28,7 @@ gmac1_clkin: external-gmac1-clock {
#clock-cells = <0>;
};
- fan: gpio_fan {
+ fan: fan {
compatible = "gpio-fan";
gpios = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
gpio-fan,speed-map = <0 0
@@ -38,7 +38,7 @@ fan: gpio_fan {
#cooling-cells = <2>;
};
- hdmi-con {
+ hdmi-connector {
compatible = "hdmi-connector";
type = "a";
@@ -116,7 +116,7 @@ simple-audio-card,codec {
};
};
- vcc12v_dcin: vcc12v_dcin {
+ vcc12v_dcin: vcc12v-dcin {
compatible = "regulator-fixed";
regulator-name = "vcc12v_dcin";
regulator-always-on;
@@ -139,7 +139,7 @@ vbus: vbus {
vin-supply = <&vcc12v_dcin>;
};
- vcc3v3_pcie_p: vcc3v3-pcie-p-regulator {
+ vcc3v3_pcie_p: vcc3v3-p {
compatible = "regulator-fixed";
enable-active-high;
gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>;
@@ -151,7 +151,7 @@ vcc3v3_pcie_p: vcc3v3-pcie-p-regulator {
vin-supply = <&vcc_3v3>;
};
- vcc5v0_usb: vcc5v0_usb {
+ vcc5v0_usb: vcc5v0-usb {
compatible = "regulator-fixed";
regulator-name = "vcc5v0_usb";
regulator-always-on;
@@ -165,7 +165,7 @@ vcc5v0_usb: vcc5v0_usb {
* the host ports are sourced from vcc5v0_usb
* the otg port is sourced from vcc5v0_midu
*/
- vcc5v0_usb20_host: vcc5v0_usb20_host {
+ vcc5v0_usb20_host: vcc5v0-usb20-host {
compatible = "regulator-fixed";
enable-active-high;
gpio = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>;
@@ -177,7 +177,7 @@ vcc5v0_usb20_host: vcc5v0_usb20_host {
vin-supply = <&vcc5v0_usb>;
};
- vcc5v0_usb20_otg: vcc5v0_usb20_otg {
+ vcc5v0_usb20_otg: vcc5v0-usb20-otg {
compatible = "regulator-fixed";
enable-active-high;
gpio = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>;
@@ -187,7 +187,7 @@ vcc5v0_usb20_otg: vcc5v0_usb20_otg {
vin-supply = <&dcdc_boost>;
};
- vcc3v3_sd: vcc3v3_sd {
+ vcc3v3_sd: vcc3v3-sd {
compatible = "regulator-fixed";
enable-active-low;
gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
@@ -201,7 +201,7 @@ vcc3v3_sd: vcc3v3_sd {
};
/* sourced from vbus and vcc_bat+ via rk817 sw5 */
- vcc_sys: vcc_sys {
+ vcc_sys: vcc-sys {
compatible = "regulator-fixed";
regulator-name = "vcc_sys";
regulator-always-on;
@@ -212,7 +212,7 @@ vcc_sys: vcc_sys {
};
/* sourced from vcc_sys, sdio module operates internally at 3.3v */
- vcc_wl: vcc_wl {
+ vcc_wl: vcc-wl {
compatible = "regulator-fixed";
regulator-name = "vcc_wl";
regulator-always-on;
@@ -249,7 +249,7 @@ &cpu3 {
&cpu_thermal {
trips {
- cpu_hot: cpu_hot {
+ cpu_hot: cpu-hot {
temperature = <55000>;
hysteresis = <2000>;
type = "active";
@@ -788,11 +788,6 @@ &usb_host0_xhci {
status = "okay";
};
-/* usb3 controller is muxed with sata1 */
-&usb_host1_xhci {
- status = "okay";
-};
-
&usb2phy0 {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.usb3.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.usb3.dts
new file mode 100644
index 000000000000..1739c00ea9e9
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.usb3.dts
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+/dts-v1/;
+
+#include "rk3566-quartz64-a.dtsi"
+
+&usb_host1_xhci {
+ status = "okay";
+};
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] dt-bindings: rockchip: k3566-quartz64-a: fix names entries, refactor
2022-09-16 12:52 [PATCH 1/2] dt-bindings: rockchip: k3566-quartz64-a: fix names entries, refactor Alessandro Carminati
@ 2022-09-16 13:17 ` Heiko Stuebner
2022-09-16 16:46 ` Robin Murphy
2022-09-17 16:42 ` Krzysztof Kozlowski
2 siblings, 0 replies; 4+ messages in thread
From: Heiko Stuebner @ 2022-09-16 13:17 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, devicetree, linux-arm-kernel,
linux-rockchip, linux-kernel, Alessandro Carminati
Hi Alessandro,
Am Freitag, 16. September 2022, 14:52:55 CEST schrieb Alessandro Carminati:
> Fix esisting "No underscores in node names" general rule, and prepare for
> new board versions.
if there is an "and" in your patch message, this always is a strong
indication that things want to be multiple patches, doing things separately.
- regulator node names
- and the separation + move
at least.
> Signed-off-by: Alessandro Carminati <alessandro.carminati@gmail.com>
> ---
> arch/arm64/boot/dts/rockchip/Makefile | 2 +-
> ...-quartz64-a.dts => rk3566-quartz64-a.dtsi} | 27 ++++++++-----------
> .../dts/rockchip/rk3566-quartz64-a.usb3.dts | 9 +++++++
> 3 files changed, 21 insertions(+), 17 deletions(-)
> rename arch/arm64/boot/dts/rockchip/{rk3566-quartz64-a.dts => rk3566-quartz64-a.dtsi} (97%)
> create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.usb3.dts
>
> diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
> index ef79a672804a..97ec6c156346 100644
> --- a/arch/arm64/boot/dts/rockchip/Makefile
> +++ b/arch/arm64/boot/dts/rockchip/Makefile
> @@ -59,7 +59,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb
> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb
> -dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb
> +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.usb3.dtb
I don't think we're using dots to denote separation.
Just use another dash ("-").
> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-b.dtb
> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-roc-pc.dtb
> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-soquartz-cm4.dtb
> diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dtsi
> similarity index 97%
> rename from arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
> rename to arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dtsi
> index d943559b157c..ac3da5b2c1b2 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dtsi
> @@ -28,7 +28,7 @@ gmac1_clkin: external-gmac1-clock {
> #clock-cells = <0>;
> };
>
> - fan: gpio_fan {
> + fan: fan {
I do think "gpio-fan" with a dash might be nicer, as we don't
have an address that indicates which fan it is.
> compatible = "gpio-fan";
> gpios = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
> gpio-fan,speed-map = <0 0
> @@ -38,7 +38,7 @@ fan: gpio_fan {
> #cooling-cells = <2>;
> };
>
> - hdmi-con {
> + hdmi-connector {
> compatible = "hdmi-connector";
> type = "a";
>
> @@ -116,7 +116,7 @@ simple-audio-card,codec {
> };
> };
>
> - vcc12v_dcin: vcc12v_dcin {
> + vcc12v_dcin: vcc12v-dcin {
The newly agreed on scheme is to have "-regulator" at the end
vcc12v_dcin: vcc12v-dcin-regulator {
would be the new name.
Heiko
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] dt-bindings: rockchip: k3566-quartz64-a: fix names entries, refactor
2022-09-16 12:52 [PATCH 1/2] dt-bindings: rockchip: k3566-quartz64-a: fix names entries, refactor Alessandro Carminati
2022-09-16 13:17 ` Heiko Stuebner
@ 2022-09-16 16:46 ` Robin Murphy
2022-09-17 16:42 ` Krzysztof Kozlowski
2 siblings, 0 replies; 4+ messages in thread
From: Robin Murphy @ 2022-09-16 16:46 UTC (permalink / raw)
To: Alessandro Carminati, Rob Herring, Krzysztof Kozlowski,
Heiko Stuebner, devicetree, linux-arm-kernel, linux-rockchip,
linux-kernel
On 2022-09-16 13:52, Alessandro Carminati wrote:
> Fix esisting "No underscores in node names" general rule, and prepare for
> new board versions.
>
> Signed-off-by: Alessandro Carminati <alessandro.carminati@gmail.com>
> ---
> arch/arm64/boot/dts/rockchip/Makefile | 2 +-
> ...-quartz64-a.dts => rk3566-quartz64-a.dtsi} | 27 ++++++++-----------
> .../dts/rockchip/rk3566-quartz64-a.usb3.dts | 9 +++++++
> 3 files changed, 21 insertions(+), 17 deletions(-)
> rename arch/arm64/boot/dts/rockchip/{rk3566-quartz64-a.dts => rk3566-quartz64-a.dtsi} (97%)
> create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.usb3.dts
>
> diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
> index ef79a672804a..97ec6c156346 100644
> --- a/arch/arm64/boot/dts/rockchip/Makefile
> +++ b/arch/arm64/boot/dts/rockchip/Makefile
> @@ -59,7 +59,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb
> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb
> -dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb
> +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.usb3.dtb
Beware that changing the name of an existing DTB is going to break some
people's boot scripts. Since this one was merged several releases ago,
it's a probably bit too late to change now.
Thanks,
Robin.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] dt-bindings: rockchip: k3566-quartz64-a: fix names entries, refactor
2022-09-16 12:52 [PATCH 1/2] dt-bindings: rockchip: k3566-quartz64-a: fix names entries, refactor Alessandro Carminati
2022-09-16 13:17 ` Heiko Stuebner
2022-09-16 16:46 ` Robin Murphy
@ 2022-09-17 16:42 ` Krzysztof Kozlowski
2 siblings, 0 replies; 4+ messages in thread
From: Krzysztof Kozlowski @ 2022-09-17 16:42 UTC (permalink / raw)
To: Alessandro Carminati, Rob Herring, Krzysztof Kozlowski,
Heiko Stuebner, devicetree, linux-arm-kernel, linux-rockchip,
linux-kernel
On 16/09/2022 13:52, Alessandro Carminati wrote:
> Fix esisting "No underscores in node names" general rule, and prepare for
typo - existing
> new board versions.
>
> Signed-off-by: Alessandro Carminati <alessandro.carminati@gmail.com>
Use subject prefixes matching the subsystem (git log --oneline -- ...).
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-09-17 16:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-16 12:52 [PATCH 1/2] dt-bindings: rockchip: k3566-quartz64-a: fix names entries, refactor Alessandro Carminati
2022-09-16 13:17 ` Heiko Stuebner
2022-09-16 16:46 ` Robin Murphy
2022-09-17 16:42 ` Krzysztof Kozlowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).