From nobody Tue Dec 30 09:49:36 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59B70C197A0 for ; Fri, 17 Nov 2023 12:59:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346048AbjKQM75 (ORCPT ); Fri, 17 Nov 2023 07:59:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346027AbjKQM7m (ORCPT ); Fri, 17 Nov 2023 07:59:42 -0500 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3FEF5D59 for ; Fri, 17 Nov 2023 04:59:38 -0800 (PST) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4083f613275so15970645e9.2 for ; Fri, 17 Nov 2023 04:59:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1700225977; x=1700830777; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=92KaagYK4Q6I8Q+kS3VXik470FxeSDcwqV61XGzdHMc=; b=EMN833p6XGQ2rHO/hoLRBK11ewx5wTSnmEhsnPyJE4O1VF53CkrGazwYx/mevyzZ1d WVuUXvkQgFuyIUffEV3Wowo7/ULcAFo22PJKTqpuIv0Tmz3jE3JczzvgecxfuWtll6Bg 5tsP+zJPY9wBgi5qw1J7ez2n8o/Eys0KvQbBMA6FXEd3GflgFYurYbmF5CRStn+3F4Gl ew5HzBsC1B/MkYMVfOs6f3xUWW/SDWmTlG67az9W0f/4p0tZZJwoVgxqJyoOx5Dazfar WmPqooSAS6rcJkugU0sjQW4qe7rKW2ou6HaXlF33cXXsObiszaR0vUtOU7j+/Kxe1puR z1Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700225977; x=1700830777; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=92KaagYK4Q6I8Q+kS3VXik470FxeSDcwqV61XGzdHMc=; b=YeOYIWHqPSjkBZZvrnyHKnXSOy7b2/trnKF+5vt330cl9U/qNk2VhvHpj2KRaoQXhg 55tvq3Q/eTLOpgY/HkscvuQ1qEwBs7Cd3owGpbMC+xghndABSNH+Pf/jzeFBajdUWOsD z7xM/e1LIXofHomGBGah+TlqMKpCwCbZCtEyXPkehdx6HoUCr4WvK5YGbL1xxPIYr3Qw zn/vfeiHYLm+bxlx1njfi9sqhbFQFWYRjWGBYp9keBMtnxeLV9S+OlZwLfu1Q6Ta1fgz XZgG7IB+PAsPw7tmgv5xW4Zm8X/z88HDsSZ2jQ4B8qcM1CvQVCiEomxwG6a+Z4UmSPl8 U57A== X-Gm-Message-State: AOJu0YyyBOMzgnv8ksAIlMjtUvW3XySJ5CRWHruqkMwXkW0av3zLIlfX N7yQbtTaK4ivfQjYSAZYQoYThA== X-Google-Smtp-Source: AGHT+IHJarfDKVM02/KEz4vsEFlQsu9jRbie2N/lyjCIFyQbFZsbgK7Bpgp8NaxTDgyBN/qVE/f4NQ== X-Received: by 2002:a05:600c:3c9b:b0:401:2ee0:7558 with SMTP id bg27-20020a05600c3c9b00b004012ee07558mr4340885wmb.32.1700225976737; Fri, 17 Nov 2023 04:59:36 -0800 (PST) Received: from toaster.lan ([2a01:e0a:3c5:5fb1:8196:e423:38cb:9a09]) by smtp.googlemail.com with ESMTPSA id k21-20020a05600c1c9500b0040a487758dcsm2671343wms.6.2023.11.17.04.59.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 04:59:36 -0800 (PST) From: Jerome Brunet To: Thierry Reding , Neil Armstrong , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Jerome Brunet , Kevin Hilman , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-pwm@vger.kernel.org, JunYi Zhao Subject: [PATCH v2 5/6] arm: dts: amlogic: migrate pwms to new meson8 v2 binding Date: Fri, 17 Nov 2023 13:59:15 +0100 Message-ID: <20231117125919.1696980-6-jbrunet@baylibre.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231117125919.1696980-1-jbrunet@baylibre.com> References: <20231117125919.1696980-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Update Amlogic based SoC PWMs to meson8-pwm-v2 compatible Signed-off-by: Jerome Brunet --- arch/arm/boot/dts/amlogic/meson.dtsi | 4 ++-- arch/arm/boot/dts/amlogic/meson8.dtsi | 16 +++++++++++++--- arch/arm/boot/dts/amlogic/meson8b-ec100.dts | 2 -- arch/arm/boot/dts/amlogic/meson8b-mxq.dts | 2 -- arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts | 2 -- arch/arm/boot/dts/amlogic/meson8b.dtsi | 16 +++++++++++++--- 6 files changed, 28 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/meson.dtsi b/arch/arm/boot/dts/amlog= ic/meson.dtsi index 8e3860d5d916..80cc004ad5fe 100644 --- a/arch/arm/boot/dts/amlogic/meson.dtsi +++ b/arch/arm/boot/dts/amlogic/meson.dtsi @@ -83,14 +83,14 @@ i2c_A: i2c@8500 { }; =20 pwm_ab: pwm@8550 { - compatible =3D "amlogic,meson-pwm"; + compatible =3D "amlogic,meson8-pwm-v2"; reg =3D <0x8550 0x10>; #pwm-cells =3D <3>; status =3D "disabled"; }; =20 pwm_cd: pwm@8650 { - compatible =3D "amlogic,meson-pwm"; + compatible =3D "amlogic,meson8-pwm-v2"; reg =3D <0x8650 0x10>; #pwm-cells =3D <3>; status =3D "disabled"; diff --git a/arch/arm/boot/dts/amlogic/meson8.dtsi b/arch/arm/boot/dts/amlo= gic/meson8.dtsi index 59932fbfd5d5..153b8fe9c506 100644 --- a/arch/arm/boot/dts/amlogic/meson8.dtsi +++ b/arch/arm/boot/dts/amlogic/meson8.dtsi @@ -450,10 +450,14 @@ analog_top: analog-top@81a8 { }; =20 pwm_ef: pwm@86c0 { - compatible =3D "amlogic,meson8-pwm", "amlogic,meson8b-pwm"; + compatible =3D "amlogic,meson8-pwm-v2"; reg =3D <0x86c0 0x10>; #pwm-cells =3D <3>; status =3D "disabled"; + clocks =3D <&xtal>, + <0>, + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; }; =20 clock-measure@8758 { @@ -702,11 +706,17 @@ timer@600 { }; =20 &pwm_ab { - compatible =3D "amlogic,meson8-pwm", "amlogic,meson8b-pwm"; + clocks =3D <&xtal>, + <0>, + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; }; =20 &pwm_cd { - compatible =3D "amlogic,meson8-pwm", "amlogic,meson8b-pwm"; + clocks =3D <&xtal>, + <0>, + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; }; =20 &rtc { diff --git a/arch/arm/boot/dts/amlogic/meson8b-ec100.dts b/arch/arm/boot/dt= s/amlogic/meson8b-ec100.dts index 3da47349eaaf..cdd7d04db256 100644 --- a/arch/arm/boot/dts/amlogic/meson8b-ec100.dts +++ b/arch/arm/boot/dts/amlogic/meson8b-ec100.dts @@ -441,8 +441,6 @@ &pwm_cd { status =3D "okay"; pinctrl-0 =3D <&pwm_c1_pins>, <&pwm_d_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>, <&xtal>; - clock-names =3D "clkin0", "clkin1"; }; =20 &rtc { diff --git a/arch/arm/boot/dts/amlogic/meson8b-mxq.dts b/arch/arm/boot/dts/= amlogic/meson8b-mxq.dts index 7adedd3258c3..68f4f70f4f03 100644 --- a/arch/arm/boot/dts/amlogic/meson8b-mxq.dts +++ b/arch/arm/boot/dts/amlogic/meson8b-mxq.dts @@ -162,8 +162,6 @@ &pwm_cd { status =3D "okay"; pinctrl-0 =3D <&pwm_c1_pins>, <&pwm_d_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>, <&xtal>; - clock-names =3D "clkin0", "clkin1"; }; =20 &uart_AO { diff --git a/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts b/arch/arm/boot= /dts/amlogic/meson8b-odroidc1.dts index 941682844faf..ff955b960688 100644 --- a/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts +++ b/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts @@ -347,8 +347,6 @@ &pwm_cd { status =3D "okay"; pinctrl-0 =3D <&pwm_c1_pins>, <&pwm_d_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>, <&xtal>; - clock-names =3D "clkin0", "clkin1"; }; =20 &rtc { diff --git a/arch/arm/boot/dts/amlogic/meson8b.dtsi b/arch/arm/boot/dts/aml= ogic/meson8b.dtsi index 5198f5177c2c..6c91eda92e8b 100644 --- a/arch/arm/boot/dts/amlogic/meson8b.dtsi +++ b/arch/arm/boot/dts/amlogic/meson8b.dtsi @@ -404,10 +404,14 @@ analog_top: analog-top@81a8 { }; =20 pwm_ef: pwm@86c0 { - compatible =3D "amlogic,meson8b-pwm"; + compatible =3D "amlogic,meson8-pwm-v2"; reg =3D <0x86c0 0x10>; #pwm-cells =3D <3>; status =3D "disabled"; + clocks =3D <&xtal>, + <0>, + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; }; =20 clock-measure@8758 { @@ -677,11 +681,17 @@ timer@600 { }; =20 &pwm_ab { - compatible =3D "amlogic,meson8b-pwm"; + clocks =3D <&xtal>, + <0>, + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; }; =20 &pwm_cd { - compatible =3D "amlogic,meson8b-pwm"; + clocks =3D <&xtal>, + <0>, + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; }; =20 &rtc { --=20 2.42.0