From nobody Sun May 10 07:14:52 2026 Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4A3581F8AD9; Fri, 27 Dec 2024 21:25:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735334744; cv=none; b=YatsQy58BYzH5QknRknZYYoZ3zWVms+iSfThjfxXGUwzVGTHZTPqgIMuTuMGSuYXJwnwetPQ/8yt5uL8BT/BJCnPLliRNkgA8P1iVPiUDvwk0Z041YfxZYLr8Ubjfcg0vz5VQdUJNhBKJkXDxGPGcKy2OagYXt/6uw/bhgElKS4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735334744; c=relaxed/simple; bh=NLc+gBO0mXFiFL/JfYwhVh/crpuda1C5BaGVEZO54pI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fbngQP2g10pSg+Gm7DlycmjZfk/nSpTss5pk1IxDpaFSHg8v31825aAP3EglD+6Pj0jEfVpGjYWkKmkUZX5iGfHWrGnzEuN5q1/Yd6MzYY6+RtTfqipW6+dXwFfCpFbhXqlKmN7VK0eXc2A3+JS/D7twRlqt1gGIzPVln5z2H+o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com; spf=pass smtp.mailfrom=googlemail.com; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b=E1ltNCNA; arc=none smtp.client-ip=209.85.208.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=googlemail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b="E1ltNCNA" Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-5d3e9f60bf4so12690504a12.3; Fri, 27 Dec 2024 13:25:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20230601; t=1735334740; x=1735939540; 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=XuEfX3Ewgynh74qzGhwC9wGI75Nk7P15rmSnoDhYmYY=; b=E1ltNCNAdDHaGfxbYA9crVow+0Rw9ngr7B5bKQQeyDyRsWb5Lt1CecUFBrcMSaeEpB HmuyzLPatfya8nNIESsdMeop/aX2k+F1aNqj6X7PA0+/480BwcYQTD2EO4S1OeNNbNEd 8GP3Px4l1+rrvDsjEWIX77T/VjasHmbFR4rG6jdrUfymbprg5dc5hxAPLwDh0IKK15TO KagMCI+6DqDyik5kD6EQLYbMkSm22E099Tt+IheQ2/hQogwsvw88Bd4UCWjXx4H4vISO H/wsnw1xTU0UZzUyesWWGFgPUCMv3zBNqSYwQHtxH/C0V1S7z/ipKVB3v2Qvh2urkh5h CEVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735334740; x=1735939540; 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=XuEfX3Ewgynh74qzGhwC9wGI75Nk7P15rmSnoDhYmYY=; b=IMW2Gl8vaVFE9vY5i0jF9UgLXp2qLLmsqRI9Mg8JOOPnfLLtr8+vLWatwM9vPit3DR z1pLa1781Nn4lyFcpddzCB0Vdsc898rGaKRwVlxLuP8yvSzjYWJGGJ1fTtxUWQKQG9ay Rl18jsEwwf+PNP1lIdVn+PAnn7IVfgFmlFG8fFfvZn52NIJPdm4yte+3Vg8huRBF307/ h/aXeshisXrNEZ8AMki8MmLhm994j1EGSEGnkVilxTwF30dtcq3PH1ByrI6Giq9Fvw6o otPHAhMTqwfttT0krv0qvbukKhAWFkYlhP+OtVOSuHqaDUc/U3sZNNFSbc6z8C7f0N85 PwUA== X-Forwarded-Encrypted: i=1; AJvYcCUay6jxYdb3VUphIPWiZjk00QpOPQa2qPMQaCoq7pRR7kxQrwI/H3+vSsJI/UFVqrHKEI32LW0miRQJSRea@vger.kernel.org, AJvYcCVjIWOtzwFRdfoHDzl8CkhD0ZN+fz8BMWln481otP/hn/mAwB/qdETebZJ4E3xWXIk9/BJev4Jj4aWN@vger.kernel.org X-Gm-Message-State: AOJu0YxYV3BVNcjbZNqKSIJbMzm+a4n//QsU98ytwQ9TjXfY9wcNThJc 4vM9dT7bkIXoNio19sg+vTIk0LZsuDi8/Ynq3SkLVlIl836IVmXk X-Gm-Gg: ASbGnctB9uKTVUKLKAqSu3HvbMnBnnZ8F+6xJWBQkB5+/KAm3Ovg3WPpvWuFFS5c2qk 6WgbNxR+zMyUtERLq1ZAYbgcOREmwY6rMwBJAynv2I2lAYBs7i/oaChd5x17g2Tm6QaNSrwwstL N6g7iDlOBFDME8kDfkpjZvqg9Pdrus7XiMEh8UKnC/llePIAN5vkC8H4ZH1b3s+YP5L2vKCeuiT zPk0T22/3tN9X7rWcB8HlRdpFl/co91+HFg6rJ0Ac867Sby2A2E0Pm9Sf9/PWrFPHLRjhULhKKm bhzZfjqpX8Tj8pnLqkfEeC3IPybEQhWjZagznSJLuM8GkgISaCC365eilCdPaZQOydnvZmPDjv2 zVZgwLRwC5V1AlqDz8yRTGMosYg== X-Google-Smtp-Source: AGHT+IGIRdqN3NMSeNKnzm+t5nflmyeCDYFa8M6A9qcMMvGFit5klKIhBrwkQezskzj/4W8YueNKig== X-Received: by 2002:a05:6402:5109:b0:5d3:e766:6140 with SMTP id 4fb4d7f45d1cf-5d81de22cb7mr23864338a12.24.1735334740432; Fri, 27 Dec 2024 13:25:40 -0800 (PST) Received: from localhost.localdomain (dynamic-2a02-3100-b2be-ba00-1e86-0bff-fe2f-57b7.310.pool.telefonica.de. [2a02:3100:b2be:ba00:1e86:bff:fe2f:57b7]) by smtp.googlemail.com with ESMTPSA id 4fb4d7f45d1cf-5d806fedbc5sm11627950a12.60.2024.12.27.13.25.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 13:25:38 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, jbrunet@baylibre.com, neil.armstrong@linaro.org, Martin Blumenstingl Subject: [PATCH 1/5] ARM: dts: amlogic: meson8: switch to the new PWM controller binding Date: Fri, 27 Dec 2024 22:25:10 +0100 Message-ID: <20241227212514.1376682-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241227212514.1376682-1-martin.blumenstingl@googlemail.com> References: <20241227212514.1376682-1-martin.blumenstingl@googlemail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use the new PWM controller binding which now relies on passing all clock inputs available on the SoC (instead of passing the "wanted" clock input for a given board). Signed-off-by: Martin Blumenstingl Reviewed-by: Neil Armstrong --- arch/arm/boot/dts/amlogic/meson8.dtsi | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/meson8.dtsi b/arch/arm/boot/dts/amlo= gic/meson8.dtsi index 9ff142d9fe3f..847f7b1f1e96 100644 --- a/arch/arm/boot/dts/amlogic/meson8.dtsi +++ b/arch/arm/boot/dts/amlogic/meson8.dtsi @@ -449,7 +449,11 @@ analog_top: analog-top@81a8 { }; =20 pwm_ef: pwm@86c0 { - compatible =3D "amlogic,meson8-pwm", "amlogic,meson8b-pwm"; + compatible =3D "amlogic,meson8-pwm-v2"; + clocks =3D <&xtal>, + <>, /* unknown/untested, the datasheet calls it "Video PLL" */ + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; reg =3D <0x86c0 0x10>; #pwm-cells =3D <3>; status =3D "disabled"; @@ -699,11 +703,19 @@ timer@600 { }; =20 &pwm_ab { - compatible =3D "amlogic,meson8-pwm", "amlogic,meson8b-pwm"; + compatible =3D "amlogic,meson8-pwm-v2"; + clocks =3D <&xtal>, + <>, /* unknown/untested, the datasheet calls it "Video PLL" */ + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; }; =20 &pwm_cd { - compatible =3D "amlogic,meson8-pwm", "amlogic,meson8b-pwm"; + compatible =3D "amlogic,meson8-pwm-v2"; + clocks =3D <&xtal>, + <>, /* unknown/untested, the datasheet calls it "Video PLL" */ + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; }; =20 &rtc { --=20 2.47.1 From nobody Sun May 10 07:14:52 2026 Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 373791F9402; Fri, 27 Dec 2024 21:25:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735334747; cv=none; b=MAdTC3R2cyhJyJXc8Sxrj2yurnZtD49Eb8qU2kcirvwe1aaFHeTIEsQZ23pe2MV2EYyMVrsJNofkyQklzB5P/h4hFdzgi4ChMs/ccEAjStJHFfadCPR03EI+m5s3jTNZpNHuTkvuTXWGHy2/qtFSMUhzr+tt1+R27QiFdctbh0U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735334747; c=relaxed/simple; bh=mLPi3jqeewBZ2cP46YNAgQJjn6ldyZgsUrRfQWC/ERY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NvhYnOhyK7tPRgUhtMkgTySdEyrDDS8f35DD0Syu7PQ9BzdopTLAn7AnvmaCxzHof7tt3x/qwOWhEcVxkDJFf167HSG67+t/9EAwRU3R/dgHzF/2wbt8iD4zEYHS0Kz5DxDv5JzyV0Cmgb/MiHu7O6BibD2vmRmtlEGmg8vLa9k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com; spf=pass smtp.mailfrom=googlemail.com; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b=EW70SCRM; arc=none smtp.client-ip=209.85.208.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=googlemail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b="EW70SCRM" Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-5d84179ef26so9026260a12.3; Fri, 27 Dec 2024 13:25:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20230601; t=1735334743; x=1735939543; 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=Hq3Pp51rFwOFBTS6gKQVsSs8Eps1DcwhteoxOcUWwbU=; b=EW70SCRMYM1WG9HY09CRe4pCPPpWK/TSlnYjZTbFb2ACFqw+4bCchhl5i7EO3BJRxr IRV0EmkyRvPtppSFa3xs8VQbCJl62yHK7jvuzLSEyNqG8OOyoRyvorDWpnwPJwP+HVxu ebn/BcQhNF01wrKD4+3NON/YrtyfybgfCNecEK1au/YEgONic7ezEMgBw//YYNYdroYc c44ihh8DF+fqf2YHDEpo7WWmXuPbl33pNfDoNpe37TkpT8HgMvycOhDrRFVhEDpdOar/ LzdAw8gU/RDFsnLtKNp51JbXyjzMDQzgMmco7O9/OIXyHCJAjyXS10+8tgiApm+zo4Ar n1zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735334743; x=1735939543; 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=Hq3Pp51rFwOFBTS6gKQVsSs8Eps1DcwhteoxOcUWwbU=; b=c4LB5dy8Uwj5plyhskAGm7of4AYx4n2Q3Bk2oF7pRD7dWsvOkQPukfsOPDn8u8pslx W7wj9SiHHcnZlGCrya1aKYufqohxE1pvXMxjLn50Xz5gqA+Tn4CVM/dq6Rkz4PfOFu+v 2qE2LE25UzRyRjYKH+4azIHC86uehdfGC85qRxeLOV0tbVoBtzMGY5x0rgH4/5/pJvh+ y4wWODGei2PyQfcoQz4vF3lQlgQ5sLm4yBDig1XJR/AUSIEy2QKyPo9k4hxSTws1ycBz Ve6EbJGh6IBIBaQnTRD0mX/vAQCO+S9yj4qYQA8UGmguoWQbchMO8Mk+oAOSiPE7QoTP Cp4Q== X-Forwarded-Encrypted: i=1; AJvYcCUCiFOmnl+gFohmZTlCwMzwwxKGjzFYrvEgZTIuBwZ+yrl3MX4I19VxWrTA3mVOCZCClBP+yql33oHzNNqh@vger.kernel.org, AJvYcCXcKnOQCDOiyM10BWyyMhm5myQn6ooplZOvXfheZkTACeyn1dgjIHfai8sK4tnKgfXp6REJodFkLs6+@vger.kernel.org X-Gm-Message-State: AOJu0YzdTk1x4qXBzB1unfXd2m1QDce+TPtbDS9hUd7uSdnw6byzGCsB t1QGPZKH2whiovonHhObqbbTLRJFN8D+nPg37+NXCMH9+aLfqFec X-Gm-Gg: ASbGncvm3MPBYSsTdlL8ul5uUYhqSMJq3LqN04zyuLvcBM82yrr5LJoEUUzE1qXbIR8 z6Qs6VUnKf+3ysrBtrOGfMx0pDSldYDruUh8LW3ahMSrKKZFDFL5jvBdZp3rPjDz7YoxCtbdo31 yv+LWKiCB4fLyE11EnyOrW4Vw1o5/P+P5TXiZHLuCz/uGEFPhhRp78Yz9CRp54u39m2QFC0LJz2 oyii3xYawC5QeFaHKn2cwWtynTedNrK7qChgiICOKzu1aqKAmYYdlpyV1u3J5V9InWdPetxmOIR sZb4VlaRhEfmv+TinpCajRgWcXFjrcwPUqn0mqf5Hfs/iBMzGC9/yykcX1uyKYwsSYYsqdfKl0F gPhnntk47KJaUaMOnr2GsSvMLEQ== X-Google-Smtp-Source: AGHT+IE/gPijdoDzjjoUUMlREXLzOGk06s31fEZOuaqJ+0cfbP2MBhEf0Ezj2q/xZiBbAGE9sVR33Q== X-Received: by 2002:a05:6402:2790:b0:5d3:ba42:e9d5 with SMTP id 4fb4d7f45d1cf-5d81dd8fef8mr22819469a12.9.1735334743258; Fri, 27 Dec 2024 13:25:43 -0800 (PST) Received: from localhost.localdomain (dynamic-2a02-3100-b2be-ba00-1e86-0bff-fe2f-57b7.310.pool.telefonica.de. [2a02:3100:b2be:ba00:1e86:bff:fe2f:57b7]) by smtp.googlemail.com with ESMTPSA id 4fb4d7f45d1cf-5d806fedbc5sm11627950a12.60.2024.12.27.13.25.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 13:25:41 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, jbrunet@baylibre.com, neil.armstrong@linaro.org, Martin Blumenstingl Subject: [PATCH 2/5] ARM: dts: amlogic: meson8b: switch to the new PWM controller binding Date: Fri, 27 Dec 2024 22:25:11 +0100 Message-ID: <20241227212514.1376682-3-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241227212514.1376682-1-martin.blumenstingl@googlemail.com> References: <20241227212514.1376682-1-martin.blumenstingl@googlemail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use the new PWM controller binding which now relies on passing all clock inputs available on the SoC (instead of passing the "wanted" clock input for a given board). Signed-off-by: Martin Blumenstingl Reviewed-by: Neil Armstrong --- 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 | 18 +++++++++++++++--- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/meson8b-ec100.dts b/arch/arm/boot/dt= s/amlogic/meson8b-ec100.dts index 18ea6592b7d7..236999548094 100644 --- a/arch/arm/boot/dts/amlogic/meson8b-ec100.dts +++ b/arch/arm/boot/dts/amlogic/meson8b-ec100.dts @@ -443,8 +443,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 fb28cb330f17..0bca0b33eea2 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 2aa012f38a3b..1cd2093202ca 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 9e02a97f86a0..0876611ce26a 100644 --- a/arch/arm/boot/dts/amlogic/meson8b.dtsi +++ b/arch/arm/boot/dts/amlogic/meson8b.dtsi @@ -403,8 +403,12 @@ analog_top: analog-top@81a8 { }; =20 pwm_ef: pwm@86c0 { - compatible =3D "amlogic,meson8b-pwm"; + compatible =3D "amlogic,meson8b-pwm-v2", "amlogic,meson8-pwm-v2"; reg =3D <0x86c0 0x10>; + clocks =3D <&xtal>, + <>, /* unknown/untested, the datasheet calls it "Video PLL" */ + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; #pwm-cells =3D <3>; status =3D "disabled"; }; @@ -674,11 +678,19 @@ timer@600 { }; =20 &pwm_ab { - compatible =3D "amlogic,meson8b-pwm"; + compatible =3D "amlogic,meson8b-pwm-v2", "amlogic,meson8-pwm-v2"; + clocks =3D <&xtal>, + <>, /* unknown/untested, the datasheet calls it "Video PLL" */ + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; }; =20 &pwm_cd { - compatible =3D "amlogic,meson8b-pwm"; + compatible =3D "amlogic,meson8b-pwm-v2", "amlogic,meson8-pwm-v2"; + clocks =3D <&xtal>, + <>, /* unknown/untested, the datasheet calls it "Video PLL" */ + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; }; =20 &rtc { --=20 2.47.1 From nobody Sun May 10 07:14:52 2026 Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2DA801F9425; Fri, 27 Dec 2024 21:25:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735334750; cv=none; b=PAQf/Ni/8QO5y9gQsnNf4Fzwza4hP13EN/4VH9IEvauEgJ/fVQQtdQ3LnjKC7jr/RsDGc3mwco05SRQuTHKrfXzCKhp47UiIDKCTUvn2RjfupgDhNGGE4TtzXIEk7sDuXQAO7bUyupiOVdbahsfcL/63bW8/go0Vu1ngdT6w+aw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735334750; c=relaxed/simple; bh=8e36OEl8kPP1IBH4MXmd05Ah7BRA4IKZcK3NEjorO/4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X1GIBH89NNVhhEufT1GulxDCWAPOagya4aoAQpf3jOrKTd2nS35gvxQozomPwW95wXMDLnqiGFIf7zVZ3/7WyEaCJ5rrkAeMiRP45/yBMdCDVdajTF+kUj0iHMRzDoHefWMSCezybql1cJOs57X90yAFdr+acrwi2b46KmrEKi8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com; spf=pass smtp.mailfrom=googlemail.com; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b=A+N6lGan; arc=none smtp.client-ip=209.85.208.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=googlemail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b="A+N6lGan" Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-5d0d32cd31aso10641248a12.0; Fri, 27 Dec 2024 13:25:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20230601; t=1735334746; x=1735939546; 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=cPy7o890B1hnetKOjzEFvvu1NGrPASXvtZeeRfzkmm0=; b=A+N6lGanuwY8sWjXNBWDJnSAgJN1HtZilFU61COx5qaVD/kECrAUTy/VwNilfx3ZSC fa61SWO2Ko+7Q2PVMEzZZLqlLvq7k9wkyWeIuFFGBvmUMlmZZpG5hrukD3Noqcr3tvNQ cvpC6ZFxs8Rzv8OgxSn4iL0ysqGglyMIDHn4Rg2uePK6yScMVz1eMwqeylRcWoCjI2m9 w/6zz7mPxrF60H8relIMEGobkBStcI4tu4vOhy3Hp/53n5iGlGohbKPJHkD5hjGKWHSi dsS+0+kY6kE8DfO4cagBarTzlzFK5mJMiUQ0nVh3rpxu+Va9fND6IZnyVfMiIB7Du+z1 YgbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735334746; x=1735939546; 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=cPy7o890B1hnetKOjzEFvvu1NGrPASXvtZeeRfzkmm0=; b=m57mHaPxrWzDYpzWSkpfi+iTaTGwPfHFiJd6y7/SZrvNLUuZz20HmGOVkU5JY7RYnw H+C19ovYvCQlKWqRNPzXNSQrxUlXXTzE2dTXfWzRbpgSo/6lp/YGma1gehGJvZvCrcSP 2ycxGBVSupek6PigADEoSzYBLXcH3QFR/rWlhLVjTFLZZMArP9zdm1qjn+NlRGsNs57U QUIWIo/Gr9ec2ZO1QAGYGfsH/CTmigF6BPJUXo0B03KpgsS7C4IyjPDT+g+2MS32+xkp XMLmhrFPGLxQoS0taPBn2RAqaheP7itI1c57241xqw2m3WZxXVShW9WavvJaHibLCny+ fkUg== X-Forwarded-Encrypted: i=1; AJvYcCXQj1iEnyp1a8sOxKo8SiaD6Vks96Ga11YSiRTZrRoLh9g1SUbowD6wCnWEE9+WvBqLOvWoUsgGq5yj@vger.kernel.org, AJvYcCXwAJEZD3FEgutYO1M+OPO3gyWudfATQHI1aDPu45wgnlOiXvV0dPrDbcyCTHB0HOX1iFCnHxmVoXp8z2eC@vger.kernel.org X-Gm-Message-State: AOJu0YyOfT3NQZLKAz5yAmJsKCR1Z1tTjyTExfk6yQsPW0I6u9CQJ2Xm 4kKdqXTM7COfMSzOqzADN/WQ27CTDpNXcpXwAvliAKHoYA5X9zKy X-Gm-Gg: ASbGncsYqNHRtCo8rQDo9Q5ZtuXaTKjvi/3FXFZibpGqaettVChdgJJox5tJXRulFe2 niMx7WRc0ODT7ge9DNpGvPqYdFDqW3m+O18XPOD40YpwBDQvNOGrGJHShUp8FzDtLYvuh1FUAZl WQRXuT8jvSjD3GJQtERHstW5kozaoXJqKnVTqxSA6YVVBS/CoCXZHes2iFhQkzE3I+SshO83Xxm E16H0SwUjz1gh7LdhIIyD6BKIMiy/gP24iim5jmoAyHLHVJP1KJYA+n9x0RqlQpbtKT6KHkgW6w 8VZxEoif5iaJH9UqT+T3jrE8yF4NHsh2QWKpHWiRNDpRKDoSkpUviZ958y4dpE82wLOWEjx3FBB 4bODOKkYUA2Z6PM2gYRwtYUpOTw== X-Google-Smtp-Source: AGHT+IGwvkeINNYEAGKLq0cWzHRLbP1E84zmmITYv95ShFIlDCkszjudHI/QU5ZyJkd2tqERiNT0Uw== X-Received: by 2002:a05:6402:2345:b0:5d0:d491:2d5e with SMTP id 4fb4d7f45d1cf-5d81dd83ad1mr56585606a12.7.1735334746094; Fri, 27 Dec 2024 13:25:46 -0800 (PST) Received: from localhost.localdomain (dynamic-2a02-3100-b2be-ba00-1e86-0bff-fe2f-57b7.310.pool.telefonica.de. [2a02:3100:b2be:ba00:1e86:bff:fe2f:57b7]) by smtp.googlemail.com with ESMTPSA id 4fb4d7f45d1cf-5d806fedbc5sm11627950a12.60.2024.12.27.13.25.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 13:25:44 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, jbrunet@baylibre.com, neil.armstrong@linaro.org, Martin Blumenstingl Subject: [PATCH 3/5] arm64: dts: amlogic: gx: switch to the new PWM controller binding Date: Fri, 27 Dec 2024 22:25:12 +0100 Message-ID: <20241227212514.1376682-4-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241227212514.1376682-1-martin.blumenstingl@googlemail.com> References: <20241227212514.1376682-1-martin.blumenstingl@googlemail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use the new PWM controller binding which now relies on passing all clock inputs available on the SoC (instead of passing the "wanted" clock input for a given board). Signed-off-by: Martin Blumenstingl Reviewed-by: Neil Armstrong --- .../dts/amlogic/meson-gx-libretech-pc.dtsi | 6 ----- .../boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 2 -- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 8 +++--- .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 2 -- .../dts/amlogic/meson-gxbb-nexbox-a95x.dts | 2 -- .../boot/dts/amlogic/meson-gxbb-p20x.dtsi | 2 -- .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 2 -- .../boot/dts/amlogic/meson-gxbb-wetek.dtsi | 2 -- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 25 +++++++++++++++++++ .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 2 -- .../meson-gxl-s905w-jethome-jethub-j80.dts | 2 -- .../meson-gxl-s905x-hwacom-amazetv.dts | 2 -- .../amlogic/meson-gxl-s905x-khadas-vim.dts | 2 -- .../amlogic/meson-gxl-s905x-nexbox-a95x.dts | 2 -- .../dts/amlogic/meson-gxl-s905x-p212.dtsi | 2 -- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 25 +++++++++++++++++++ .../dts/amlogic/meson-gxm-khadas-vim2.dts | 4 --- .../boot/dts/amlogic/meson-gxm-rbox-pro.dts | 2 -- 18 files changed, 54 insertions(+), 40 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi b/arch/= arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi index d38c3a224fbe..2da49cfbde77 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi @@ -345,24 +345,18 @@ rtc: rtc@51 { &pwm_AO_ab { pinctrl-0 =3D <&pwm_ao_a_3_pins>; pinctrl-names =3D "default"; - clocks =3D <&clkc CLKID_FCLK_DIV4>; - clock-names =3D "clkin0"; status =3D "okay"; }; =20 &pwm_ab { pinctrl-0 =3D <&pwm_b_pins>; pinctrl-names =3D "default"; - clocks =3D <&clkc CLKID_FCLK_DIV4>; - clock-names =3D "clkin0"; status =3D "okay"; }; =20 &pwm_ef { pinctrl-0 =3D <&pwm_e_pins>, <&pwm_f_clk_pins>; pinctrl-names =3D "default"; - clocks =3D <&clkc CLKID_FCLK_DIV4>; - clock-names =3D "clkin0"; status =3D "okay"; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm= 64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi index 45ccddd1aaf0..6da1316d97c6 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi @@ -240,8 +240,6 @@ &pwm_ef { status =3D "okay"; pinctrl-0 =3D <&pwm_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&clkc CLKID_FCLK_DIV4>; - clock-names =3D "clkin0"; }; =20 &saradc { diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dt= s/amlogic/meson-gx.dtsi index 2673f0dbafe7..7d99ca44e660 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -329,14 +329,14 @@ i2c_A: i2c@8500 { }; =20 pwm_ab: pwm@8550 { - compatible =3D "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm"; + compatible =3D "amlogic,meson-gxbb-pwm-v2", "amlogic,meson8-pwm-v2"; reg =3D <0x0 0x08550 0x0 0x10>; #pwm-cells =3D <3>; status =3D "disabled"; }; =20 pwm_cd: pwm@8650 { - compatible =3D "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm"; + compatible =3D "amlogic,meson-gxbb-pwm-v2", "amlogic,meson8-pwm-v2"; reg =3D <0x0 0x08650 0x0 0x10>; #pwm-cells =3D <3>; status =3D "disabled"; @@ -351,7 +351,7 @@ saradc: adc@8680 { }; =20 pwm_ef: pwm@86c0 { - compatible =3D "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm"; + compatible =3D "amlogic,meson-gxbb-pwm-v2", "amlogic,meson8-pwm-v2"; reg =3D <0x0 0x086c0 0x0 0x10>; #pwm-cells =3D <3>; status =3D "disabled"; @@ -498,7 +498,7 @@ i2c_AO: i2c@500 { }; =20 pwm_AO_ab: pwm@550 { - compatible =3D "amlogic,meson-gx-ao-pwm", "amlogic,meson-gxbb-ao-pwm"; + compatible =3D "amlogic,meson-gxbb-pwm-v2", "amlogic,meson8-pwm-v2"; reg =3D <0x0 0x00550 0x0 0x10>; #pwm-cells =3D <3>; status =3D "disabled"; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/ar= m64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts index cf2e2ef81680..2ecc6ebd5a43 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts @@ -298,8 +298,6 @@ &pwm_ef { status =3D "okay"; pinctrl-0 =3D <&pwm_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&clkc CLKID_FCLK_DIV4>; - clock-names =3D "clkin0"; }; =20 &saradc { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/= arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts index 7d7dde93fff3..c09da40ff7b0 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts @@ -241,8 +241,6 @@ &pwm_ef { status =3D "okay"; pinctrl-0 =3D <&pwm_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&clkc CLKID_FCLK_DIV4>; - clock-names =3D "clkin0"; }; =20 /* Wireless SDIO Module */ diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/= boot/dts/amlogic/meson-gxbb-p20x.dtsi index 52d57773a77f..b463d03c3ed9 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi @@ -150,8 +150,6 @@ &pwm_ef { status =3D "okay"; pinctrl-0 =3D <&pwm_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&clkc CLKID_FCLK_DIV4>; - clock-names =3D "clkin0"; }; =20 /* Wireless SDIO Module */ diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/ar= m64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi index 3807a184810b..6ff567225fee 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi @@ -222,8 +222,6 @@ &pwm_ef { status =3D "okay"; pinctrl-0 =3D <&pwm_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&clkc CLKID_FCLK_DIV4>; - clock-names =3D "clkin0"; }; =20 &saradc { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64= /boot/dts/amlogic/meson-gxbb-wetek.dtsi index deb295227189..bfedfc1472ec 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi @@ -185,8 +185,6 @@ &pwm_ef { status =3D "okay"; pinctrl-0 =3D <&pwm_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&clkc CLKID_FCLK_DIV4>; - clock-names =3D "clkin0"; }; =20 &saradc { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/= dts/amlogic/meson-gxbb.dtsi index ed00e67e6923..8ebce7114a60 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -739,6 +739,31 @@ mux { }; }; =20 +&pwm_ab { + clocks =3D <&xtal>, + <>, /* unknown/untested, the datasheet calls it "vid_pll" */ + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; +}; + +&pwm_AO_ab { + clocks =3D <&xtal>, <&clkc CLKID_CLK81>; +}; + +&pwm_cd { + clocks =3D <&xtal>, + <>, /* unknown/untested, the datasheet calls it "vid_pll" */ + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; +}; + +&pwm_ef { + clocks =3D <&xtal>, + <>, /* unknown/untested, the datasheet calls it "vid_pll" */ + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; +}; + &pwrc { resets =3D <&reset RESET_VIU>, <&reset RESET_VENC>, diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts b/arch/ar= m64/boot/dts/amlogic/meson-gxl-s805x-p241.dts index c5e2306ad7a4..ca7c4e8e7cac 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts @@ -280,8 +280,6 @@ &pwm_ef { status =3D "okay"; pinctrl-0 =3D <&pwm_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&clkc CLKID_FCLK_DIV4>; - clock-names =3D "clkin0"; }; =20 /* This is connected to the Bluetooth module: */ diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80= .dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts index 2b94b6e5285e..4ca90ac947b7 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts @@ -116,8 +116,6 @@ &pwm_ef { status =3D "okay"; pinctrl-0 =3D <&pwm_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&clkc CLKID_FCLK_DIV4>; - clock-names =3D "clkin0"; }; =20 &saradc { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts= b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts index 89fe5110f7a2..62a2da766a00 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts @@ -115,8 +115,6 @@ &pwm_ef { status =3D "okay"; pinctrl-0 =3D <&pwm_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&clkc CLKID_FCLK_DIV4>; - clock-names =3D "clkin0"; }; =20 /* SD card */ diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/a= rch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts index a80f0ea2773b..4e89d6f6bb57 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts @@ -211,8 +211,6 @@ &pwm_AO_ab { status =3D "okay"; pinctrl-0 =3D <&pwm_ao_a_3_pins>, <&pwm_ao_b_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal> , <&xtal>; - clock-names =3D "clkin0", "clkin1" ; }; =20 &pwm_ef { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts b/= arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts index c79f9f2099bf..236cedec9f19 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts @@ -145,8 +145,6 @@ &pwm_ef { status =3D "okay"; pinctrl-0 =3D <&pwm_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&clkc CLKID_FCLK_DIV4>; - clock-names =3D "clkin0"; }; =20 /* Wireless SDIO Module */ diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/a= rm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi index 7e7dc87ede2d..b295f97021de 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi @@ -101,8 +101,6 @@ &pwm_ef { status =3D "okay"; pinctrl-0 =3D <&pwm_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&clkc CLKID_FCLK_DIV4>; - clock-names =3D "clkin0"; }; =20 &saradc { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/d= ts/amlogic/meson-gxl.dtsi index f58d1790de1c..2dc2fdaecf9f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -809,6 +809,31 @@ internal_phy: ethernet-phy@8 { }; }; =20 +&pwm_ab { + clocks =3D <&xtal>, + <>, /* unknown/untested, the datasheet calls it "vid_pll" */ + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; +}; + +&pwm_AO_ab { + clocks =3D <&xtal>, <&clkc CLKID_CLK81>; +}; + +&pwm_cd { + clocks =3D <&xtal>, + <>, /* unknown/untested, the datasheet calls it "vid_pll" */ + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; +}; + +&pwm_ef { + clocks =3D <&xtal>, + <>, /* unknown/untested, the datasheet calls it "vid_pll" */ + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; +}; + &pwrc { resets =3D <&reset RESET_VIU>, <&reset RESET_VENC>, diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/a= rm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts index 96a3dd2d8a99..2a09b3d550e2 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts @@ -289,16 +289,12 @@ &pwm_AO_ab { status =3D "okay"; pinctrl-0 =3D <&pwm_ao_a_3_pins>, <&pwm_ao_b_pins>; pinctrl-names =3D "default"; - clocks =3D <&clkc CLKID_FCLK_DIV4>; - clock-names =3D "clkin0"; }; =20 &pwm_ef { status =3D "okay"; pinctrl-0 =3D <&pwm_e_pins>, <&pwm_f_clk_pins>; pinctrl-names =3D "default"; - clocks =3D <&clkc CLKID_FCLK_DIV4>; - clock-names =3D "clkin0"; }; =20 &sd_emmc_a { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm6= 4/boot/dts/amlogic/meson-gxm-rbox-pro.dts index 7356d3b628b1..ecaf678b23dd 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts @@ -192,8 +192,6 @@ &pwm_ef { status =3D "okay"; pinctrl-0 =3D <&pwm_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&clkc CLKID_FCLK_DIV4>; - clock-names =3D "clkin0"; }; =20 /* Wireless SDIO Module */ --=20 2.47.1 From nobody Sun May 10 07:14:52 2026 Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BE8F01F892E; Fri, 27 Dec 2024 21:25:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735334750; cv=none; b=YhmDcsHOdIZeKgI0C+KOugxQgpYmIGQP3Bn9HQvlLhC1Akrpu0D/X76aAyCmkf59tQGTZF2LJcMESpih+FBA5x/5OY2uLp8PRYcBfQw81oNSvWQ96Ok3DSb1DmuOKtQWEFGNt5JsIjEBZOcyF4/KnaRveX2FBqvxvgpgXDSAPG0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735334750; c=relaxed/simple; bh=5oHMcGAOEe08omAMOA+SUtPgxp0ApYrUHPNw1JHCy8k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QR/wlHb19feBUjlnssmwwOe116FlcIIA6BAUEwN55PjeHvooqx3k85TWVx4dq1LcUV3N22rqQPOlCLSOVyxzhFkTUKU5rap2c5t8EFXAg6WZoG1ZBf/Lq+pmha3oAHWJUz7UjhpfGQ+gF6PP82VdtyC8aa2o4UsQ945x1h5Lm2A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com; spf=pass smtp.mailfrom=googlemail.com; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b=XaMZ1kzJ; arc=none smtp.client-ip=209.85.208.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=googlemail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b="XaMZ1kzJ" Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-5d122cf8e52so12648704a12.1; Fri, 27 Dec 2024 13:25:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20230601; t=1735334747; x=1735939547; 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=ZExEvvNEuW3dV0zU0cRZTKoF2QfayutIaMaf9y7ttFk=; b=XaMZ1kzJh4sqD+Pulc8D3eJunKyj4ctbsKxEkJ01+w5IgGFdOKA/uCrCqYaK16mSON NGgXyZXL4uHtxnHjV4YPss1nMrnG6rHYDpNmT7KSEALjk7W+CUzWlYK60+gONFOVODiA e5eFig5gXbcoWFcZdTTMXMo+mkbJ4Olmsh9tC9JlGK9MsL8Uo/2v41JT6+y3Zz1EM1Mb dCqKHgeXLUcnKgP8TIfjZORnMlSmUxt/R40NlSIZaITesD7j1SkriUz+5zq3Zs3eXX7W dAmfw3JfEqhtstm6VB1H75XzTxgqg4G97cvWBIwrWqfVTgFVHS/HAdc2YzUDCNqu2Y+y AixA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735334747; x=1735939547; 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=ZExEvvNEuW3dV0zU0cRZTKoF2QfayutIaMaf9y7ttFk=; b=BT8Mo37dEu4nd+HNrIiXV34D4IJWKZ40hWAnLfnrmWpIEMmKruFuSgFSJAD1aVVjAf CMbtBS1Djji+zGDHPnb+uetJ8wpuF8J7H+a2HLZrXVUX4hJmu6bmBxiECG38df5TGlLT vkIIUlrwtmEfOrYtECKkWk5AoOWb3IG9Nz/ZCAxWyrIirTJZ7wWnIQko6QaQ0tpcl4DW hprD6xfLGeOvOfaDHqz3LM5rdAo2rurhIKlpyvnVhhsUTm/hnt6J75cVt3IwPut3EXt+ O2gkDUbEq7BGQpz6DHMOtjpgI8Q0fAQqcgUswsypFZqQKd+XxYp81NPcg/dud5jb34oA CwtA== X-Forwarded-Encrypted: i=1; AJvYcCVhqPE6+M6OCR8CkB5wpbtN1tjbVvc58FrmNx0BnavwA6XiCYvxmDrNxdMgvZC50b55JbBlKPzIKeUF@vger.kernel.org, AJvYcCXSkM99rGzn4TyIkHI1ioY4bK8y9uwsShRjhFa42ZOq58sfMHIpDJkfAeVl2aUY5+xUMk3aI26VNMwpnvrO@vger.kernel.org X-Gm-Message-State: AOJu0YzvaE3bkH/1Q6+mHwpk2jsn8tJGBmr0TXqf3Y1nf5WqUabP2Wtl 76IWFpojSJdkXOAHBVBQplc4WnDES4k8d1olDDfB+CIxvphW+RiS X-Gm-Gg: ASbGncv85vI8mg50qXr8dxDWyBuKBTvMTtKXi8XhRFxw6ef70T/gHN4PipK4XPKLTS9 wDIiJZMPTQPnK3HNcmTmdItLQ37/oie4IdH13AZai7r0ZGDVA3hvCCyiVAJjh+eBA6LX6ruOLBI XzgCSzePefP3KdeBRq96VuC7T5dGQLSl+8a6Zvlxx/LuO4bjl65cTEtSXg9EtZrHaSyYo+Vbuah QRy8F0slfKFKMi2UqH5dFEZK/uuitgerf1yo6egGcvfmE5t88gxKoHvaalwLP37SPI165K41yrF JYp5B2c+/9ReR2qAmG8Q8j7aguzH6Qfq472YIzdgvA2E+4EaJZot1je0kGjvEqRwf+rwtbWi382 XQhBYUSQ0L1qjbV22Fi4HTLYavg== X-Google-Smtp-Source: AGHT+IFexFOv7Agh8zbrzXXZCyg5le3bhbK9E3nZVfHuFx7ohPUZ1y5ALrIUcLf5zBtqatdc4/rIYw== X-Received: by 2002:a05:6402:27d4:b0:5d3:e8d1:a43 with SMTP id 4fb4d7f45d1cf-5d81de22353mr24717574a12.27.1735334747043; Fri, 27 Dec 2024 13:25:47 -0800 (PST) Received: from localhost.localdomain (dynamic-2a02-3100-b2be-ba00-1e86-0bff-fe2f-57b7.310.pool.telefonica.de. [2a02:3100:b2be:ba00:1e86:bff:fe2f:57b7]) by smtp.googlemail.com with ESMTPSA id 4fb4d7f45d1cf-5d806fedbc5sm11627950a12.60.2024.12.27.13.25.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 13:25:46 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, jbrunet@baylibre.com, neil.armstrong@linaro.org, Martin Blumenstingl Subject: [PATCH 4/5] arm64: dts: amlogic: axg: switch to the new PWM controller binding Date: Fri, 27 Dec 2024 22:25:13 +0100 Message-ID: <20241227212514.1376682-5-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241227212514.1376682-1-martin.blumenstingl@googlemail.com> References: <20241227212514.1376682-1-martin.blumenstingl@googlemail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use the new PWM controller binding which now relies on passing all clock inputs available on the SoC (instead of passing the "wanted" clock input for a given board). Signed-off-by: Martin Blumenstingl Reviewed-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 24 ++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/d= ts/amlogic/meson-axg.dtsi index e9b22868983d..a6924d246bb1 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -1693,8 +1693,12 @@ sec_AO: ao-secure@140 { }; =20 pwm_AO_cd: pwm@2000 { - compatible =3D "amlogic,meson-axg-ao-pwm"; + compatible =3D "amlogic,meson-axg-pwm-v2", "amlogic,meson8-pwm-v2"; reg =3D <0x0 0x02000 0x0 0x20>; + clocks =3D <&xtal>, + <&clkc_AO CLKID_AO_CLK81>, + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV5>; #pwm-cells =3D <3>; status =3D "disabled"; }; @@ -1728,8 +1732,12 @@ i2c_AO: i2c@5000 { }; =20 pwm_AO_ab: pwm@7000 { - compatible =3D "amlogic,meson-axg-ao-pwm"; + compatible =3D "amlogic,meson-axg-pwm-v2", "amlogic,meson8-pwm-v2"; reg =3D <0x0 0x07000 0x0 0x20>; + clocks =3D <&xtal>, + <&clkc_AO CLKID_AO_CLK81>, + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV5>; #pwm-cells =3D <3>; status =3D "disabled"; }; @@ -1806,15 +1814,23 @@ watchdog@f0d0 { }; =20 pwm_ab: pwm@1b000 { - compatible =3D "amlogic,meson-axg-ee-pwm"; + compatible =3D "amlogic,meson-axg-pwm-v2", "amlogic,meson8-pwm-v2"; reg =3D <0x0 0x1b000 0x0 0x20>; + clocks =3D <&xtal>, + <&clkc CLKID_FCLK_DIV5>, + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; #pwm-cells =3D <3>; status =3D "disabled"; }; =20 pwm_cd: pwm@1a000 { - compatible =3D "amlogic,meson-axg-ee-pwm"; + compatible =3D "amlogic,meson-axg-pwm-v2", "amlogic,meson8-pwm-v2"; reg =3D <0x0 0x1a000 0x0 0x20>; + clocks =3D <&xtal>, + <&clkc CLKID_FCLK_DIV5>, + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; #pwm-cells =3D <3>; status =3D "disabled"; }; --=20 2.47.1 From nobody Sun May 10 07:14:52 2026 Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C14321F9A92; Fri, 27 Dec 2024 21:25:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735334754; cv=none; b=rPpOIl/SAA2oChYv56gzQoBc9F2GWoLquQrSLb5wMUdoHtxFlvAmAADop2apHEiTqGKDiArEAq12dhT+HIjtYdEde6x53gAtvHDsUM13i5w3fsacvYEJNhN3eJOEfkGda7z0rOtgnYqYXZK6ooo/NckXJA9hvbaiqWaJeCorVPM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735334754; c=relaxed/simple; bh=68CQAuo2WOgiQ4X6etZ5iP4MlC9W3jyojls49bi3+3Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LyhmOpqX5AqOGe5dU+GmHh2YYG3ErR2CJ6QUKAtonuyE1p5IuJJ6a4XJyImhq2el9jCTcAKCEV/hLKB+K2jEPOPZY/Ch0JJZUsbHr9kLdSgUplkGY6+Foi8zfWc+6a4sohMjpTFjyeC1KAAsmROGWfIw5KwGwNfLHtpnyvAXmWg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com; spf=pass smtp.mailfrom=googlemail.com; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b=JBTckvef; arc=none smtp.client-ip=209.85.208.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=googlemail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b="JBTckvef" Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-5d437235769so6771871a12.2; Fri, 27 Dec 2024 13:25:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20230601; t=1735334750; x=1735939550; 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=P/YsWsOqAMtNvIu897gqcQnKG+shOLRHZK6FrlkT4Sg=; b=JBTckvefM9aPnn+fWUTzPdHBiHBVzwsVpwBEtfJ1rptSwz/DQi1sQlDDc3UEqc3X5e eY2mS7X9pMgAUHeEKLdSbrCcLb+VgS6KLm10zXBYmjDvW9LrqVjw2hUNA9R9tVBcMow3 lhNOpRMNXviHu1wScxrNtgu0Wo3vypKsMfp9b812xOdV4Gol5htqv0/s0fNI/6Bcujv/ fwEA1Y+7uiGItNpqJ4f1UsYIgGbwAvUdskMpiKAoOjHk6p/jy07L/uGykvdIxzRrY4sV 9aggBXKskQI4pPrsnofzxw1Ft/FKMca03DRfD988kVDwf/eVrfYzZriALLu+0iUGKWjK kSBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735334750; x=1735939550; 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=P/YsWsOqAMtNvIu897gqcQnKG+shOLRHZK6FrlkT4Sg=; b=w/7NmMpOSA9OTobPdmxRlt6x9rGKngXCYTQupTUFViDOQQddJ+FJr5sEce8bcNxRqs lUNCbOsCJCjmuUOHkqweaajepgPzUJ1zig30HtyxP11Gr7oIXAIxWcLdTnn7Uys9PK48 lhkRsK7zFb03nKS63Gq2lC4rA2h0l7ggr+Y38bF1xm/3cpjmYEgF5kjJ7N8TwunaCKJj by6hABNFcpD5e1pCgZsqr1/UBufmd2BHqwTgnPuyYOvSUIqeGhecmbBJHgB2J3MBWX3k ejT5VckU4FGvEjbXXWdn9tFRn/9WsoWy9JRy6YH3WXHeya0xutnVccdJirN1R2fJ2r+M Te2w== X-Forwarded-Encrypted: i=1; AJvYcCVnv7o7TkSM0/Aly/F8/y+p0q8pUAsgmAZm62KY/TNX+5GG2JT7tbZposuZYYNmtkW1GTxuQ+Yo0HPU@vger.kernel.org, AJvYcCVvYHNyt27TqtW7TIl0qzqqNx857aXkHCbOShLOw6cC3DyD8ZiddxxcU2d+tLV9CN6q9UpvBX6wxRCk8hO6@vger.kernel.org X-Gm-Message-State: AOJu0YyKVrg4htFK3VTmFov6rP9vlykzJp41x8QUguWWRtFMGsO4AgfF TiQlXXv+msqlhlSimLfkF4nXLqf9c797J0A34TFC3QKGJw+Su45n X-Gm-Gg: ASbGncsu3AU/fSGWsGlpXCbXY7J83QM3X93PxhDb6wyia+v/OVZn3QkaCu6oP8H6N1/ GEpy8pM3oS8II4meHxKhMPhtkY1qSY2LimInNXpKGz0qRgrR2bE9VqwHYXTmfvBq8QV3i6dE9lo O/Ps7tL4V4+vortrkfefayZ4K2ljW2AMGXQg9U8o7CdWP5KS+65pFGBtdqJSpJCWij0mGdwDlAN vV6nSUM8bkgnGUeq6VS3Hf7+bCHOkoBAEcl5Yg9N+OQdeXD9x04lVBdsFDeSZa7wKW1zkaxCdIC i5lAjNBCy4TDJ0IlnJhZNuUFLPrj7XgCBIquybjZ8eRUo/lfysmdK8wHB5eLajkn+pS9di0mlfK rLE0WrLlqevprRH33HytNRlcTrA== X-Google-Smtp-Source: AGHT+IGS35CBFfUkjXBJVTZ2CH8LPXiRMhje99tYL6BMtvITy8TeGIghmB+xfrmEI5V9RHl31jOL2g== X-Received: by 2002:a05:6402:278c:b0:5d0:214b:9d15 with SMTP id 4fb4d7f45d1cf-5d81dd54620mr22041877a12.5.1735334749863; Fri, 27 Dec 2024 13:25:49 -0800 (PST) Received: from localhost.localdomain (dynamic-2a02-3100-b2be-ba00-1e86-0bff-fe2f-57b7.310.pool.telefonica.de. [2a02:3100:b2be:ba00:1e86:bff:fe2f:57b7]) by smtp.googlemail.com with ESMTPSA id 4fb4d7f45d1cf-5d806fedbc5sm11627950a12.60.2024.12.27.13.25.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 13:25:48 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, jbrunet@baylibre.com, neil.armstrong@linaro.org, Martin Blumenstingl Subject: [PATCH 5/5] arm64: dts: amlogic: g12: switch to the new PWM controller binding Date: Fri, 27 Dec 2024 22:25:14 +0100 Message-ID: <20241227212514.1376682-6-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241227212514.1376682-1-martin.blumenstingl@googlemail.com> References: <20241227212514.1376682-1-martin.blumenstingl@googlemail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use the new PWM controller binding which now relies on passing all clock inputs available on the SoC (instead of passing the "wanted" clock input for a given board). Signed-off-by: Martin Blumenstingl Reviewed-by: Neil Armstrong --- .../boot/dts/amlogic/meson-g12-common.dtsi | 33 ++++++++++++++++--- .../boot/dts/amlogic/meson-g12a-fbx8am.dts | 4 --- .../dts/amlogic/meson-g12a-radxa-zero.dts | 4 --- .../boot/dts/amlogic/meson-g12a-sei510.dts | 4 --- .../boot/dts/amlogic/meson-g12a-u200.dts | 2 -- .../boot/dts/amlogic/meson-g12a-x96-max.dts | 4 --- .../amlogic/meson-g12b-a311d-libretech-cc.dts | 2 -- .../dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 4 --- .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 4 --- .../dts/amlogic/meson-g12b-khadas-vim3.dtsi | 4 --- .../boot/dts/amlogic/meson-g12b-odroid.dtsi | 4 --- .../dts/amlogic/meson-g12b-radxa-zero2.dts | 8 ----- .../boot/dts/amlogic/meson-g12b-w400.dtsi | 6 ---- .../amlogic/meson-libretech-cottonwood.dtsi | 6 ---- .../boot/dts/amlogic/meson-sm1-ac2xx.dtsi | 6 ---- .../boot/dts/amlogic/meson-sm1-bananapi.dtsi | 2 -- .../dts/amlogic/meson-sm1-khadas-vim3l.dts | 2 -- .../boot/dts/amlogic/meson-sm1-odroid.dtsi | 2 -- .../boot/dts/amlogic/meson-sm1-sei610.dts | 6 ---- 19 files changed, 28 insertions(+), 79 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64= /boot/dts/amlogic/meson-g12-common.dtsi index 49b51c54013f..ab2b3f15ef19 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -2060,8 +2060,11 @@ cecb_AO: cec@280 { }; =20 pwm_AO_cd: pwm@2000 { - compatible =3D "amlogic,meson-g12a-ao-pwm-cd"; + compatible =3D "amlogic,meson-g12-pwm-v2", + "amlogic,meson8-pwm-v2"; reg =3D <0x0 0x2000 0x0 0x20>; + clocks =3D <&xtal>, + <&clkc_AO CLKID_AO_CLK81>; #pwm-cells =3D <3>; status =3D "disabled"; }; @@ -2099,8 +2102,13 @@ i2c_AO: i2c@5000 { }; =20 pwm_AO_ab: pwm@7000 { - compatible =3D "amlogic,meson-g12a-ao-pwm-ab"; + compatible =3D "amlogic,meson-g12-pwm-v2", + "amlogic,meson8-pwm-v2"; reg =3D <0x0 0x7000 0x0 0x20>; + clocks =3D <&xtal>, + <&clkc_AO CLKID_AO_CLK81>, + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV5>; #pwm-cells =3D <3>; status =3D "disabled"; }; @@ -2301,22 +2309,37 @@ spifc: spi@14000 { }; =20 pwm_ef: pwm@19000 { - compatible =3D "amlogic,meson-g12a-ee-pwm"; + compatible =3D "amlogic,meson-g12-pwm-v2", + "amlogic,meson8-pwm-v2"; reg =3D <0x0 0x19000 0x0 0x20>; + clocks =3D <&xtal>, + <>, /* unknown/untested, the datasheet calls it "vid_pll" */ + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; #pwm-cells =3D <3>; status =3D "disabled"; }; =20 pwm_cd: pwm@1a000 { - compatible =3D "amlogic,meson-g12a-ee-pwm"; + compatible =3D "amlogic,meson-g12-pwm-v2", + "amlogic,meson8-pwm-v2"; reg =3D <0x0 0x1a000 0x0 0x20>; + clocks =3D <&xtal>, + <>, /* unknown/untested, the datasheet calls it "vid_pll" */ + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; #pwm-cells =3D <3>; status =3D "disabled"; }; =20 pwm_ab: pwm@1b000 { - compatible =3D "amlogic,meson-g12a-ee-pwm"; + compatible =3D "amlogic,meson-g12-pwm-v2", + "amlogic,meson8-pwm-v2"; reg =3D <0x0 0x1b000 0x0 0x20>; + clocks =3D <&xtal>, + <>, /* unknown/untested, the datasheet calls it "vid_pll" */ + <&clkc CLKID_FCLK_DIV4>, + <&clkc CLKID_FCLK_DIV3>; #pwm-cells =3D <3>; status =3D "disabled"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts b/arch/arm64= /boot/dts/amlogic/meson-g12a-fbx8am.dts index a457b3f4397b..9aa36f17ffa2 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts @@ -346,8 +346,6 @@ &ir { &pwm_AO_cd { pinctrl-0 =3D <&pwm_ao_d_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin1"; status =3D "okay"; }; =20 @@ -355,8 +353,6 @@ &pwm_ef { status =3D "okay"; pinctrl-0 =3D <&pwm_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin0"; }; =20 &pdm { diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/a= rm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts index c779a5da7d1e..952b8d02e5c2 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts @@ -284,8 +284,6 @@ &ir { &pwm_AO_cd { pinctrl-0 =3D <&pwm_ao_d_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin1"; status =3D "okay"; }; =20 @@ -293,8 +291,6 @@ &pwm_ef { status =3D "okay"; pinctrl-0 =3D <&pwm_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin0"; }; =20 &saradc { diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts b/arch/arm64= /boot/dts/amlogic/meson-g12a-sei510.dts index ea51341f031b..52fbc5103e45 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts @@ -389,8 +389,6 @@ &ir { &pwm_AO_cd { pinctrl-0 =3D <&pwm_ao_d_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin1"; status =3D "okay"; }; =20 @@ -398,8 +396,6 @@ &pwm_ef { status =3D "okay"; pinctrl-0 =3D <&pwm_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin0"; }; =20 &pdm { diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/b= oot/dts/amlogic/meson-g12a-u200.dts index f70a46967e2b..5407049d2647 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts @@ -502,8 +502,6 @@ &i2c3 { &pwm_AO_cd { pinctrl-0 =3D <&pwm_ao_d_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin1"; status =3D "okay"; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts b/arch/arm6= 4/boot/dts/amlogic/meson-g12a-x96-max.dts index 32f98a192494..01da83658ae3 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts @@ -328,8 +328,6 @@ &ir { &pwm_AO_cd { pinctrl-0 =3D <&pwm_ao_d_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin1"; status =3D "okay"; }; =20 @@ -363,8 +361,6 @@ &pwm_ef { status =3D "okay"; pinctrl-0 =3D <&pwm_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin0"; }; =20 &uart_A { diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts = b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts index 65b963d794cd..adedc1340c78 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts @@ -116,6 +116,4 @@ &cpu103 { =20 &pwm_ab { pinctrl-0 =3D <&pwm_a_e_pins>, <&pwm_b_x7_pins>; - clocks =3D <&xtal>, <&xtal>; - clock-names =3D "clkin0", "clkin1"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arc= h/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi index 08c33ec7e9f1..92e8b26ecccc 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi @@ -257,8 +257,6 @@ &pcie { &pwm_ab { pinctrl-0 =3D <&pwm_a_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin0"; =20 status =3D "okay"; }; @@ -273,8 +271,6 @@ &pwm_ef { &pwm_AO_cd { pinctrl-0 =3D <&pwm_ao_d_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin1"; =20 status =3D "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/ar= m64/boot/dts/amlogic/meson-g12b-bananapi.dtsi index d4e1990b5f26..54663c55a20e 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi @@ -367,8 +367,6 @@ &pwm_ab { status =3D "okay"; pinctrl-0 =3D <&pwm_a_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin0"; }; =20 &pwm_ef { @@ -380,8 +378,6 @@ &pwm_ef { &pwm_AO_cd { pinctrl-0 =3D <&pwm_ao_d_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin1"; status =3D "okay"; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi b/arch= /arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi index 16dd409051b4..48650bad230d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi @@ -92,16 +92,12 @@ &cpu103 { &pwm_ab { pinctrl-0 =3D <&pwm_a_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin0"; status =3D "okay"; }; =20 &pwm_AO_cd { pinctrl-0 =3D <&pwm_ao_d_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin1"; status =3D "okay"; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi b/arch/arm6= 4/boot/dts/amlogic/meson-g12b-odroid.dtsi index 09d959aefb18..7e8964bacfce 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi @@ -327,16 +327,12 @@ hdmi_tx_tmds_out: endpoint { &pwm_ab { pinctrl-0 =3D <&pwm_a_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin0"; status =3D "okay"; }; =20 &pwm_AO_cd { pinctrl-0 =3D <&pwm_ao_d_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin1"; status =3D "okay"; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts b/arch/= arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts index 39feba7f2d08..fc05ecf90714 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts @@ -379,32 +379,24 @@ &ir { &pwm_ab { pinctrl-0 =3D <&pwm_a_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin0"; status =3D "okay"; }; =20 &pwm_ef { pinctrl-0 =3D <&pwm_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin0"; status =3D "okay"; }; =20 &pwm_AO_ab { pinctrl-0 =3D <&pwm_ao_a_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin0"; status =3D "okay"; }; =20 &pwm_AO_cd { pinctrl-0 =3D <&pwm_ao_d_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin1"; status =3D "okay"; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi b/arch/arm64/= boot/dts/amlogic/meson-g12b-w400.dtsi index 4cb6930ffb19..a7a0fc264cdc 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi @@ -304,24 +304,18 @@ &ir { &pwm_ab { pinctrl-0 =3D <&pwm_a_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin0"; status =3D "okay"; }; =20 &pwm_AO_cd { pinctrl-0 =3D <&pwm_ao_d_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin1"; status =3D "okay"; }; =20 &pwm_ef { pinctrl-0 =3D <&pwm_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin0"; status =3D "okay"; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi b/= arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi index 929e4720ae76..ac9c4c2673b1 100644 --- a/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi @@ -458,24 +458,18 @@ &pwm_AO_cd { status =3D "okay"; pinctrl-0 =3D <&pwm_ao_d_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin1"; }; =20 &pwm_ab { status =3D "okay"; pinctrl-0 =3D <&pwm_b_x7_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin1"; }; =20 &pwm_cd { status =3D "okay"; pinctrl-0 =3D <&pwm_d_x3_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin1"; }; =20 &saradc { diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi b/arch/arm64/= boot/dts/amlogic/meson-sm1-ac2xx.dtsi index d1fa8b8bf795..a3463149db3d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi @@ -199,15 +199,11 @@ &pwm_AO_ab { status =3D "okay"; pinctrl-0 =3D <&pwm_ao_a_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin0"; }; =20 &pwm_AO_cd { pinctrl-0 =3D <&pwm_ao_d_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin1"; status =3D "okay"; }; =20 @@ -215,8 +211,6 @@ &pwm_ef { status =3D "okay"; pinctrl-0 =3D <&pwm_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin0"; }; =20 &saradc { diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi b/arch/arm= 64/boot/dts/amlogic/meson-sm1-bananapi.dtsi index 81dce862902a..40db95f64636 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi @@ -367,8 +367,6 @@ &ir { &pwm_AO_cd { pinctrl-0 =3D <&pwm_ao_d_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin1"; status =3D "okay"; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts b/arch/= arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts index 9c0b544e2209..5d75ad3f3e46 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts @@ -78,8 +78,6 @@ &cpu3 { &pwm_AO_cd { pinctrl-0 =3D <&pwm_ao_d_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin1"; status =3D "okay"; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64= /boot/dts/amlogic/meson-sm1-odroid.dtsi index 7b0e9817a615..ad8d07883760 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi @@ -392,8 +392,6 @@ &ir { &pwm_AO_cd { pinctrl-0 =3D <&pwm_ao_d_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin1"; status =3D "okay"; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts b/arch/arm64/= boot/dts/amlogic/meson-sm1-sei610.dts index 2e3397e55da2..37d7f64b6d5d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts @@ -435,15 +435,11 @@ &pwm_AO_ab { status =3D "okay"; pinctrl-0 =3D <&pwm_ao_a_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin0"; }; =20 &pwm_AO_cd { pinctrl-0 =3D <&pwm_ao_d_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin1"; status =3D "okay"; }; =20 @@ -451,8 +447,6 @@ &pwm_ef { status =3D "okay"; pinctrl-0 =3D <&pwm_e_pins>; pinctrl-names =3D "default"; - clocks =3D <&xtal>; - clock-names =3D "clkin0"; }; =20 &saradc { --=20 2.47.1