[PATCH v2 2/3] arm64: dts: make dts use gpio-fan matrix instead of array
Shawn Guo
shawnguo at kernel.org
Sun Nov 21 00:55:00 PST 2021
On Fri, Oct 29, 2021 at 01:49:45PM +0200, David Heidelberg wrote:
> No functional changes.
>
> Adjust to comply with dt-schema requirements
> and make possible to validate values.
>
> Signed-off-by: David Heidelberg <david at ixit.cz>
> ---
> arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 9 +++++----
> arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts | 2 +-
You may want to split it per platform, so that corresponding platform
maintainer can pick them up.
Shawn
> arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 2 +-
> arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 5 +++--
> 4 files changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
> index 86bdc0baf032..fbbcacf24f2e 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
> @@ -52,10 +52,11 @@ gpio_fan: gpio-fan {
> gpios = <&gpio GPIODV_14 GPIO_ACTIVE_HIGH
> &gpio GPIODV_15 GPIO_ACTIVE_HIGH>;
> /* Dummy RPM values since fan is optional */
> - gpio-fan,speed-map = <0 0
> - 1 1
> - 2 2
> - 3 3>;
> + gpio-fan,speed-map =
> + <0 0>,
> + <1 1>,
> + <2 2>,
> + <3 3>;
> #cooling-cells = <2>;
> };
>
> diff --git a/arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts b/arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts
> index a3b9d615a3b4..e34045d10a12 100644
> --- a/arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts
> +++ b/arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts
> @@ -39,7 +39,7 @@ reg_usdhc2_vmmc: regulator-usdhc2-vmmc {
>
> fan: gpio-fan {
> compatible = "gpio-fan";
> - gpio-fan,speed-map = <0 0 8600 1>;
> + gpio-fan,speed-map = <0 0>, <8600 1>;
> gpios = <&gpio3 5 GPIO_ACTIVE_HIGH>;
> #cooling-cells = <2>;
> pinctrl-names = "default";
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
> index 46b0f97a0b1c..4af535866d1f 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
> @@ -44,7 +44,7 @@ dc_12v: dc-12v {
> fan0: gpio-fan {
> #cooling-cells = <2>;
> compatible = "gpio-fan";
> - gpio-fan,speed-map = <0 0 3000 1>;
> + gpio-fan,speed-map = <0 0>, <3000 1>;
> gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;
> status = "okay";
> };
> diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
> index 4d4b2a301b1a..8af3763daaba 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
> @@ -30,8 +30,9 @@ gmac1_clkin: external-gmac1-clock {
> fan: gpio_fan {
> compatible = "gpio-fan";
> gpios = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
> - gpio-fan,speed-map = <0 0
> - 4500 1>;
> + gpio-fan,speed-map =
> + < 0 0>,
> + <4500 1>;
> #cooling-cells = <2>;
> };
>
> --
> 2.33.0
>
More information about the linux-amlogic
mailing list