From patchwork Thu Jun 6 08:48:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13688049 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 63EEDC25B75 for ; Thu, 6 Jun 2024 08:48:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XTMt2lhY6YHYMVWPuDxjF5hXqXvPtxm6UQolu/WjU68=; b=1Yhj9xMTJdVPTL gTRirwpBO8WgjXI8HzHyNQmSypX5w67Fs89tF7yvp0pWM6mnT5tIDkWTg7mrS+GP2awCNTd7ym9ip bTh/0YxThlGy0Lv7WZktiIHk22n3U9+FneUXOZBISLA2nOYGkIzEwCqk6zWBXFLjyYnvGhuJHLg2z O119Cz3XhZIaVuXCSjoTqVl5eiJt5+FiXF9qXEsi2IMMh+atql9/xfqRpaRMr+hfFrpJyw7w7XTas GsJnh7Wk1NI36kpkwO4MiHoC1V0smeQveUjSZvAsO7cdUzqY+FNkENzDxt77JItcu0fk26SqUKBNW ug0A1BaCw1c8DvlMll4A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8nI-00000008uKx-3K3R; Thu, 06 Jun 2024 08:48:24 +0000 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8nC-00000008uEz-1zV1 for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 08:48:20 +0000 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4213b94b7e7so3700425e9.0 for ; Thu, 06 Jun 2024 01:48:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717663697; x=1718268497; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=/LxuYDmiq5fzmLpnOdguSgqEOVkFSy/ReEuW4nl1vrk=; b=P7gYZAaNG0njeUmQJhC95PeSd5oKVk8vnrfBqYX1cIUa9ksIdrzet9X3RAkSu4rQ3g IZrzz6nBRKFH9erNur6QVdRPdeOlk6k8yB+5o27My1REzFK1F+xQFejVEiyVyPsrwh78 z5eox+nXNk8p3DaJHaiBy7yvFs/J3gBLU4q0gNIsxt8aBe+b6COKQsEL45R8K/G2DpIY LW8Bim2KYRwdCdDrRl58rp0UFVLA6uXM+7Ky2/d5tntzwMk19DgVKxgQOcYr4t6on6Dg 0Wsn5JEGec9wKy2NHmvUGEtuGVIkQhagq9O4w9oVvmY397KJTn4SQKgM2uPxzjqeMet4 0Oaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717663697; x=1718268497; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/LxuYDmiq5fzmLpnOdguSgqEOVkFSy/ReEuW4nl1vrk=; b=g8WfwfvmCUvPT5umiHkQMfGXXrLmtmwhFJ6irWQlvtlH6erBnnzRPR4722shLv34kB svFgVd3purLha6cKBHJ0xB9j9jzYMmS82cETkULbgYY03Xh/Cete8hB9l/XU0bBpy8FG WSEqlpRPMjUvPuI8djwHnY//YXtzdKhjP1nXEsvCqQcLOuqHGFHL4JvwbNyomMM/2aPw p3rEaQxMb//ViIBI+frSO1NA33S+VMYrc2vJq9NmiZim+bH4qEbvV6zD5gyF4HHwZtK6 twMk3gkdN1AQ06rYcY6EpZR5cF+rSrzsFQAps6aqPOUvPrCKzeAGmCgwRUgQd5Qtk5R6 SasA== X-Forwarded-Encrypted: i=1; AJvYcCXOdVmNkD2ufVzEOdKMSizXFH6ZV04kupVnxeeGjhhEQ1NsF7qDKUNjXphz0bd9J2yCE+PCl9+OEp7Urjs7hVOoMVI6ZHjWPbb5Qyg1yFVoJZDKtNA= X-Gm-Message-State: AOJu0Yz8vMs46+xSm0nPKkblHKAlBKFh0P2msfXH5mUvfI+fa7nkyQ7Y RWU6wXccYr4XkLMoqlxyhRJBKE0DH4eYUahF5MVvczaB7DbGz+NifgIlDV6ZsGk= X-Google-Smtp-Source: AGHT+IGC737hhQwCtbzi2qs+Nh+6AjJoMmHhd/AfeVEaoCfNGjCA+xScDrwx8kHLuR4jh5SnacBuHg== X-Received: by 2002:a05:600c:310f:b0:421:561f:4c with SMTP id 5b1f17b1804b1-4215acc489amr16495415e9.3.1717663696902; Thu, 06 Jun 2024 01:48:16 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4215c2c690dsm14227445e9.34.2024.06.06.01.48.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 01:48:16 -0700 (PDT) From: Neil Armstrong Date: Thu, 06 Jun 2024 10:48:08 +0200 Subject: [PATCH 01/12] arm64: dts: amlogic: meson-g12b-bananapi: remove invalid fan on wrong pwm_cd controller MIME-Version: 1.0 Message-Id: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-1-62e812729541@linaro.org> References: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> In-Reply-To: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> To: Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1595; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=sNilSTNy7onJWc0uTbgdd1uABdsGCQf5JooGVu7ReN0=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBmYXfKQPRopuS1pMiyV9+ZLfIj26wDhYO3PqW1iXz2 +i3LHL6JAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZmF3ygAKCRB33NvayMhJ0VkRD/ 99mZuq73pGJa/SRpIhLugkV4LvE3hGxTpfUwrwtJN1NP5QpuMWc49wdVZzkQK3FoVWTZt4KoTdZHdZ yYfUTimcGVwuawK1TQ4taISgd1GKmnp1xUWGpuDSL9OrAM95eIZgb12bcb4txpN4aVpQpkitda77h7 tF/2q+427ZwOP6+wToxyEafMcpw9VC+2ZZv63aP+FOEKs5W8AtZZqIKV6dNUcbaBEYvUjD1Cqy4GQf /VOcwTBM1m8KEEnq3dlTUc4oaHJLwdAc/LJKGjK57X8cJKnd/teem9kTtAeIvnL9vrEmTgdsH6mqLh NfizZqa9NBmVE4TRkU+NsA88+nIL933VVUGF4U3xA0ykMC+4siGZeElFIOlyB6DuW/fi21f40LHtBe vdCySEGWcmntFSAeRTOSau3MjQfEzoaX9z2WUKCwef2Zq5Qm72Aq38DGDtPrg1RmXu/DapWXnA3paL CEhwYqrnPnte4B/F7lF2vj4MIjEc3PXQAWYMvMcuZOj0X5ffT0hA2I3xgmq9GtSQJ+MaVL8fT9iOdu DniQwCaPFLKpD2Y4pGdX6uqDXMyqS3C4oYAC2rCACX3YiwW9bvS6v/VuOemCemYG0nORXWER0EwtNy 0qdt0PSZ65lEJiH5+9qWizGRVQeP9ZFgK4QEEu5LA41CEYN/sspZGpuXdbsQ== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_014818_580693_05282B6D X-CRM114-Status: GOOD ( 11.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The fan is connected to the GPIOAO_10 pin, which can be connected to the pwm_AO_cd controller, but this one is already used for the vddcpu_b regulator. The fan was wrongly described as using the pwm_cd with the invalid "pwm-gpios" property, both are wrong so remove the fan until we find an acceptable solution. This fixes the following error: pwm@1a000: 'pwm-gpios' does not match any of the regexes: 'pinctrl-[0-9]+' from schema $id: http://devicetree.org/schemas/pwm/pwm-amlogic.yaml# Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi index 4b8db872bbf3..6a346cb86a53 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi @@ -44,13 +44,6 @@ emmc_pwrseq: emmc-pwrseq { reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; }; - fan0: pwm-fan { - compatible = "pwm-fan"; - #cooling-cells = <2>; - cooling-levels = <0 120 170 220>; - pwms = <&pwm_cd 1 40000 0>; - }; - hdmi-connector { compatible = "hdmi-connector"; type = "a"; @@ -374,13 +367,6 @@ &pwm_ab { clock-names = "clkin0"; }; -&pwm_cd { - status = "okay"; - pinctrl-0 = <&pwm_d_x6_pins>; - pinctrl-names = "default"; - pwm-gpios = <&gpio GPIOAO_10 GPIO_ACTIVE_HIGH>; -}; - &pwm_ef { status = "okay"; pinctrl-0 = <&pwm_e_pins>; From patchwork Thu Jun 6 08:48:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13688051 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 91811C25B75 for ; Thu, 6 Jun 2024 08:48:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5hpuua8BPS0v/qDQb9y6oxiprKKv0irOdFuDj/7mzHQ=; b=tLA989MdMNVC5C tqRgucULppnedAkPQHkDHIWVZ4yuksy2iVWj0/Oit8z53JgGyty+gGJQTF0rEi0lGRYSOvkYFjRh2 kXSHW5Y1v8YzhUQNgeFvXsN6I+3fvkVYTvR2xFcSJZKCjynfL7ZxXQxQaWSbe52BnwwrZ+WQdyJKg wEhPihjNrCbc9hidNdeo9ClGIy6ypa9e9IiDYkupDpXqI7UXY4WCqydPAYgqRKwCBtDlsC7krnLNj AQ7cbfGAONT5n+DOunfVRfEOlxQHdAICpMP+vFpZotcwhDXXWreOo9RfS3gaWyfmcoBqfJnhlzxEH MSharIawwKN8lFVkA0Pg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8nM-00000008uOF-2C6m; Thu, 06 Jun 2024 08:48:28 +0000 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8nD-00000008uFZ-3ZNc for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 08:48:21 +0000 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4215b0c4b7dso8264905e9.0 for ; Thu, 06 Jun 2024 01:48:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717663698; x=1718268498; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Y6OHHCCXmw/6bmz1M3IfcTnLr1KRtx4diLLcV5lamp0=; b=uHZvxkg6lIXTSREYKLlUscQmpelx7V9FRMd9Rg4xckrkNOSUyrJBT0dQrBWjQ45b/5 vmM2xgf4aQ24kDQPN3bGbYT7ndFKF97RKHZ+fpXKhGzYqSBqdALacsGdvMp5eooNHWvW Kt7gEKMUikMhI1LeYAXhxBWeIMvzIT6e4t9umY933Wb2hTDWSCVwp15XVJKXNREVZJE5 G84P8UrDT5Lt3plOp/mY/uHsUxOl/EI2sV98AmyW1kuD7TL9TnxdLRmiJq/oMeFecNle pQiXKnT8CRx9BJI/caD6JvSD+vJtKFyTl9yMZqbAH7qC4YaAQR6Cv5/N9EeTvRu5LkT4 4ZlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717663698; x=1718268498; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y6OHHCCXmw/6bmz1M3IfcTnLr1KRtx4diLLcV5lamp0=; b=edshZ9vZpk/CfAQ7dtqjMJq29JzmZ8kOMgjA+9IzFjj5+pacbZAIiLRZMyFYzl3Eiq 9WQr17SpGpyrv1fSkHZvfNsRjlO9YW51M/MRzgmuqn/I0BKhfLlkUudy1WKMFpifUorM 4wyF5aEyG/cT2cFlAxlh2/YoLl5zm7vMEwyBpY2SlfkQY2m/fkOzfpm4NNjldiUGLeOF sC7GafUkw2p8rk9cSW9/u4PdlYcgex9HtynCcoJRDiPH0YcnROl+ft28DtiUPz0MoNA0 nr8i09Oa6+Vt51LE1FQU25OWADvq+44nwTxEHJK9HKGU174WkZPh1JeN7iQVRvj0V6VA Ag1A== X-Forwarded-Encrypted: i=1; AJvYcCV11yT2Mk2nZkKQT+syZHeXhW1YCWeCI+sD+LYTunxYchN/8sCpeyatqdeOf09oPPoeng0Dfr8jkeSYgfTPx8Vdudq77UA5bNUHnwIfCf2Z09DVooY= X-Gm-Message-State: AOJu0YyuNdZdKxqCz46RAUYSXaPdlBzeWfUSTAlya5h1CAtHfdpChW5+ wsE10F2igc8BzRVT9lXmCgN+FXraU6BAKdFOO1BBLKkbkvKYP38qYdALwOqIxj4= X-Google-Smtp-Source: AGHT+IH+f9N41jKu7yGAWRjAEjcoye90s8RyP3e82L51Lfe+HhWRkITUaejtLiPLrCN/vvA0R4rDKA== X-Received: by 2002:a05:600c:19c9:b0:421:52ce:6878 with SMTP id 5b1f17b1804b1-4215632d091mr41108525e9.29.1717663697734; Thu, 06 Jun 2024 01:48:17 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4215c2c690dsm14227445e9.34.2024.06.06.01.48.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 01:48:17 -0700 (PDT) From: Neil Armstrong Date: Thu, 06 Jun 2024 10:48:09 +0200 Subject: [PATCH 02/12] arm64: dts: amlogic: move ao_pinctrl into aobus MIME-Version: 1.0 Message-Id: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-2-62e812729541@linaro.org> References: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> In-Reply-To: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> To: Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=12903; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=tl3H+UTcHVmPxt9zBws9MAHMOmP/ihRvaabSVS/9m/s=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBmYXfKtjTh/6E7KMQquhZx7uNekZ5DQr5QRH9o7BLD r0EezK2JAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZmF3ygAKCRB33NvayMhJ0b9tD/ 0fN6N7nyG9gvaI7iirKChzsj1lg5p/BEKaQXnl5QXXAklJ4Ad8d6N/dIitOIKQebgr+QZlAmOK6O1U yt8gRv6QaIu/IobE/Ay+3ZwDGo74hCPALHihKMeHMkxpu3oZYliBrD3o9Y0KVyid8MAmtvNphwCorA n79aUDM07CxugvSLRQSjMOqO3WMyD2C4FLxnDkSU7kBhI5MDeEtWYAf76WvT517YnCWfknLxBIcZtj NKWtS0Vm0CrjeugQYlxjyj2DfCIaXLWJApjpv3iC+iecg2L939Sjk7xZunkqdGeFohidsG9T+yn110 zLagKPxCMFSDE70R8yZwTWztndqrB5bsFTEHBZ9gXFES+3bl+I+mp7cuYTfp9dEfIeOad6a0u/16NV fUOsI5kgUvNks4rDWcMwHagR4Dg+tXjbUT6ei2IYmLyVO2Uv0EcbaQ+ML+J1+xRnrTv1y5IiQoerOz TTjNdEKoDQ4D3lRp5yvubRvAxgJTtv1WivsCMx0/DCRutwguwTO+PQMYSbuFbIJOn8nA1n8m00sMeK 1uCkrWPsrKC+56clITaGR7dRKdGcbSbjlzVnbv531F/wxfX60ZPNzAEIN+ju+LA81Kwh6zpojDtwQL 6FKOa2DQmmhdM+Mm8pLcHFtwhwY4m0odlUj+DRzJXzGhZ0ocE7anNzgs3R7A== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_014819_984667_B5FD9D26 X-CRM114-Status: GOOD ( 11.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The AO pinctrl was mis-described as beeing part of AO rti sysctrl, move it it into aobus like it's also done in GX SoCs, and remove the now invalid '#address-cells', '#size-cells' & 'ranges from the sys-ctrl@0 node. This fixes: sys-ctrl@0: '#address-cells', '#size-cells', 'ranges' do not match any of the regexes: 'pinctrl-[0-9]+' Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 427 +++++++++++----------- 1 file changed, 212 insertions(+), 215 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi index b058ed78faf0..138fb18c6480 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -1741,9 +1741,6 @@ rti: sys-ctrl@0 { compatible = "amlogic,meson-gx-ao-sysctrl", "simple-mfd", "syscon"; reg = <0x0 0x0 0x0 0x100>; - #address-cells = <2>; - #size-cells = <2>; - ranges = <0x0 0x0 0x0 0x0 0x0 0x100>; clkc_AO: clock-controller { compatible = "amlogic,meson-g12a-aoclkc"; @@ -1752,278 +1749,278 @@ clkc_AO: clock-controller { clocks = <&xtal>, <&clkc CLKID_CLK81>; clock-names = "xtal", "mpeg-clk"; }; + }; - ao_pinctrl: pinctrl { - compatible = "amlogic,meson-g12a-aobus-pinctrl"; - #address-cells = <2>; - #size-cells = <2>; - ranges; + ao_pinctrl: pinctrl@14 { + compatible = "amlogic,meson-g12a-aobus-pinctrl"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + gpio_ao: bank@14 { + reg = <0x0 0x14 0x0 0x8>, + <0x0 0x1c 0x0 0x8>, + <0x0 0x24 0x0 0x14>; + reg-names = "mux", + "ds", + "gpio"; + gpio-controller; + #gpio-cells = <2>; + gpio-ranges = <&ao_pinctrl 0 0 15>; + }; - gpio_ao: bank@14 { - reg = <0x0 0x14 0x0 0x8>, - <0x0 0x1c 0x0 0x8>, - <0x0 0x24 0x0 0x14>; - reg-names = "mux", - "ds", - "gpio"; - gpio-controller; - #gpio-cells = <2>; - gpio-ranges = <&ao_pinctrl 0 0 15>; + i2c_ao_sck_pins: i2c_ao_sck_pins { + mux { + groups = "i2c_ao_sck"; + function = "i2c_ao"; + bias-disable; + drive-strength-microamp = <3000>; }; + }; - i2c_ao_sck_pins: i2c_ao_sck_pins { - mux { - groups = "i2c_ao_sck"; - function = "i2c_ao"; - bias-disable; - drive-strength-microamp = <3000>; - }; + i2c_ao_sda_pins: i2c_ao_sda { + mux { + groups = "i2c_ao_sda"; + function = "i2c_ao"; + bias-disable; + drive-strength-microamp = <3000>; }; + }; - i2c_ao_sda_pins: i2c_ao_sda { - mux { - groups = "i2c_ao_sda"; - function = "i2c_ao"; - bias-disable; - drive-strength-microamp = <3000>; - }; + i2c_ao_sck_e_pins: i2c_ao_sck_e { + mux { + groups = "i2c_ao_sck_e"; + function = "i2c_ao"; + bias-disable; + drive-strength-microamp = <3000>; }; + }; - i2c_ao_sck_e_pins: i2c_ao_sck_e { - mux { - groups = "i2c_ao_sck_e"; - function = "i2c_ao"; - bias-disable; - drive-strength-microamp = <3000>; - }; + i2c_ao_sda_e_pins: i2c_ao_sda_e { + mux { + groups = "i2c_ao_sda_e"; + function = "i2c_ao"; + bias-disable; + drive-strength-microamp = <3000>; }; + }; - i2c_ao_sda_e_pins: i2c_ao_sda_e { - mux { - groups = "i2c_ao_sda_e"; - function = "i2c_ao"; - bias-disable; - drive-strength-microamp = <3000>; - }; - }; - - mclk0_ao_pins: mclk0-ao { - mux { - groups = "mclk0_ao"; - function = "mclk0_ao"; - bias-disable; - drive-strength-microamp = <3000>; - }; + mclk0_ao_pins: mclk0-ao { + mux { + groups = "mclk0_ao"; + function = "mclk0_ao"; + bias-disable; + drive-strength-microamp = <3000>; }; + }; - tdm_ao_b_din0_pins: tdm-ao-b-din0 { - mux { - groups = "tdm_ao_b_din0"; - function = "tdm_ao_b"; - bias-disable; - }; + tdm_ao_b_din0_pins: tdm-ao-b-din0 { + mux { + groups = "tdm_ao_b_din0"; + function = "tdm_ao_b"; + bias-disable; }; + }; - spdif_ao_out_pins: spdif-ao-out { - mux { - groups = "spdif_ao_out"; - function = "spdif_ao_out"; - drive-strength-microamp = <500>; - bias-disable; - }; + spdif_ao_out_pins: spdif-ao-out { + mux { + groups = "spdif_ao_out"; + function = "spdif_ao_out"; + drive-strength-microamp = <500>; + bias-disable; }; + }; - tdm_ao_b_din1_pins: tdm-ao-b-din1 { - mux { - groups = "tdm_ao_b_din1"; - function = "tdm_ao_b"; - bias-disable; - }; + tdm_ao_b_din1_pins: tdm-ao-b-din1 { + mux { + groups = "tdm_ao_b_din1"; + function = "tdm_ao_b"; + bias-disable; }; + }; - tdm_ao_b_din2_pins: tdm-ao-b-din2 { - mux { - groups = "tdm_ao_b_din2"; - function = "tdm_ao_b"; - bias-disable; - }; + tdm_ao_b_din2_pins: tdm-ao-b-din2 { + mux { + groups = "tdm_ao_b_din2"; + function = "tdm_ao_b"; + bias-disable; }; + }; - tdm_ao_b_dout0_pins: tdm-ao-b-dout0 { - mux { - groups = "tdm_ao_b_dout0"; - function = "tdm_ao_b"; - bias-disable; - drive-strength-microamp = <3000>; - }; + tdm_ao_b_dout0_pins: tdm-ao-b-dout0 { + mux { + groups = "tdm_ao_b_dout0"; + function = "tdm_ao_b"; + bias-disable; + drive-strength-microamp = <3000>; }; + }; - tdm_ao_b_dout1_pins: tdm-ao-b-dout1 { - mux { - groups = "tdm_ao_b_dout1"; - function = "tdm_ao_b"; - bias-disable; - drive-strength-microamp = <3000>; - }; + tdm_ao_b_dout1_pins: tdm-ao-b-dout1 { + mux { + groups = "tdm_ao_b_dout1"; + function = "tdm_ao_b"; + bias-disable; + drive-strength-microamp = <3000>; }; + }; - tdm_ao_b_dout2_pins: tdm-ao-b-dout2 { - mux { - groups = "tdm_ao_b_dout2"; - function = "tdm_ao_b"; - bias-disable; - drive-strength-microamp = <3000>; - }; + tdm_ao_b_dout2_pins: tdm-ao-b-dout2 { + mux { + groups = "tdm_ao_b_dout2"; + function = "tdm_ao_b"; + bias-disable; + drive-strength-microamp = <3000>; }; + }; - tdm_ao_b_fs_pins: tdm-ao-b-fs { - mux { - groups = "tdm_ao_b_fs"; - function = "tdm_ao_b"; - bias-disable; - drive-strength-microamp = <3000>; - }; + tdm_ao_b_fs_pins: tdm-ao-b-fs { + mux { + groups = "tdm_ao_b_fs"; + function = "tdm_ao_b"; + bias-disable; + drive-strength-microamp = <3000>; }; + }; - tdm_ao_b_sclk_pins: tdm-ao-b-sclk { - mux { - groups = "tdm_ao_b_sclk"; - function = "tdm_ao_b"; - bias-disable; - drive-strength-microamp = <3000>; - }; + tdm_ao_b_sclk_pins: tdm-ao-b-sclk { + mux { + groups = "tdm_ao_b_sclk"; + function = "tdm_ao_b"; + bias-disable; + drive-strength-microamp = <3000>; }; + }; - tdm_ao_b_slv_fs_pins: tdm-ao-b-slv-fs { - mux { - groups = "tdm_ao_b_slv_fs"; - function = "tdm_ao_b"; - bias-disable; - }; + tdm_ao_b_slv_fs_pins: tdm-ao-b-slv-fs { + mux { + groups = "tdm_ao_b_slv_fs"; + function = "tdm_ao_b"; + bias-disable; }; + }; - tdm_ao_b_slv_sclk_pins: tdm-ao-b-slv-sclk { - mux { - groups = "tdm_ao_b_slv_sclk"; - function = "tdm_ao_b"; - bias-disable; - }; + tdm_ao_b_slv_sclk_pins: tdm-ao-b-slv-sclk { + mux { + groups = "tdm_ao_b_slv_sclk"; + function = "tdm_ao_b"; + bias-disable; }; + }; - uart_ao_a_pins: uart-a-ao { - mux { - groups = "uart_ao_a_tx", - "uart_ao_a_rx"; - function = "uart_ao_a"; - bias-disable; - }; + uart_ao_a_pins: uart-a-ao { + mux { + groups = "uart_ao_a_tx", + "uart_ao_a_rx"; + function = "uart_ao_a"; + bias-disable; }; + }; - uart_ao_a_cts_rts_pins: uart-ao-a-cts-rts { - mux { - groups = "uart_ao_a_cts", - "uart_ao_a_rts"; - function = "uart_ao_a"; - bias-disable; - }; + uart_ao_a_cts_rts_pins: uart-ao-a-cts-rts { + mux { + groups = "uart_ao_a_cts", + "uart_ao_a_rts"; + function = "uart_ao_a"; + bias-disable; }; + }; - uart_ao_b_2_3_pins: uart-ao-b-2-3 { - mux { - groups = "uart_ao_b_tx_2", - "uart_ao_b_rx_3"; - function = "uart_ao_b"; - bias-disable; - }; + uart_ao_b_2_3_pins: uart-ao-b-2-3 { + mux { + groups = "uart_ao_b_tx_2", + "uart_ao_b_rx_3"; + function = "uart_ao_b"; + bias-disable; }; + }; - uart_ao_b_8_9_pins: uart-ao-b-8-9 { - mux { - groups = "uart_ao_b_tx_8", - "uart_ao_b_rx_9"; - function = "uart_ao_b"; - bias-disable; - }; + uart_ao_b_8_9_pins: uart-ao-b-8-9 { + mux { + groups = "uart_ao_b_tx_8", + "uart_ao_b_rx_9"; + function = "uart_ao_b"; + bias-disable; }; + }; - uart_ao_b_cts_rts_pins: uart-ao-b-cts-rts { - mux { - groups = "uart_ao_b_cts", - "uart_ao_b_rts"; - function = "uart_ao_b"; - bias-disable; - }; + uart_ao_b_cts_rts_pins: uart-ao-b-cts-rts { + mux { + groups = "uart_ao_b_cts", + "uart_ao_b_rts"; + function = "uart_ao_b"; + bias-disable; }; + }; - pwm_a_e_pins: pwm-a-e { - mux { - groups = "pwm_a_e"; - function = "pwm_a_e"; - bias-disable; - }; + pwm_a_e_pins: pwm-a-e { + mux { + groups = "pwm_a_e"; + function = "pwm_a_e"; + bias-disable; }; + }; - pwm_ao_a_pins: pwm-ao-a { - mux { - groups = "pwm_ao_a"; - function = "pwm_ao_a"; - bias-disable; - }; + pwm_ao_a_pins: pwm-ao-a { + mux { + groups = "pwm_ao_a"; + function = "pwm_ao_a"; + bias-disable; }; + }; - pwm_ao_b_pins: pwm-ao-b { - mux { - groups = "pwm_ao_b"; - function = "pwm_ao_b"; - bias-disable; - }; + pwm_ao_b_pins: pwm-ao-b { + mux { + groups = "pwm_ao_b"; + function = "pwm_ao_b"; + bias-disable; }; + }; - pwm_ao_c_4_pins: pwm-ao-c-4 { - mux { - groups = "pwm_ao_c_4"; - function = "pwm_ao_c"; - bias-disable; - }; + pwm_ao_c_4_pins: pwm-ao-c-4 { + mux { + groups = "pwm_ao_c_4"; + function = "pwm_ao_c"; + bias-disable; }; + }; - pwm_ao_c_6_pins: pwm-ao-c-6 { - mux { - groups = "pwm_ao_c_6"; - function = "pwm_ao_c"; - bias-disable; - }; + pwm_ao_c_6_pins: pwm-ao-c-6 { + mux { + groups = "pwm_ao_c_6"; + function = "pwm_ao_c"; + bias-disable; }; + }; - pwm_ao_d_5_pins: pwm-ao-d-5 { - mux { - groups = "pwm_ao_d_5"; - function = "pwm_ao_d"; - bias-disable; - }; + pwm_ao_d_5_pins: pwm-ao-d-5 { + mux { + groups = "pwm_ao_d_5"; + function = "pwm_ao_d"; + bias-disable; }; + }; - pwm_ao_d_10_pins: pwm-ao-d-10 { - mux { - groups = "pwm_ao_d_10"; - function = "pwm_ao_d"; - bias-disable; - }; + pwm_ao_d_10_pins: pwm-ao-d-10 { + mux { + groups = "pwm_ao_d_10"; + function = "pwm_ao_d"; + bias-disable; }; + }; - pwm_ao_d_e_pins: pwm-ao-d-e { - mux { - groups = "pwm_ao_d_e"; - function = "pwm_ao_d"; - }; + pwm_ao_d_e_pins: pwm-ao-d-e { + mux { + groups = "pwm_ao_d_e"; + function = "pwm_ao_d"; }; + }; - remote_input_ao_pins: remote-input-ao { - mux { - groups = "remote_ao_input"; - function = "remote_ao_input"; - bias-disable; - }; + remote_input_ao_pins: remote-input-ao { + mux { + groups = "remote_ao_input"; + function = "remote_ao_input"; + bias-disable; }; }; }; From patchwork Thu Jun 6 08:48:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13688059 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9ACC4C27C55 for ; Thu, 6 Jun 2024 08:49:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=F2VI2gjYZ5EdAFBT0gVhAYMwb6HMOnMJ/Ks/gjxk38A=; b=pZSCvXQhAKcZRd bM0EIoLSdNLGMNCJ+duBXrEKZrjDkywjP4wPhYrlsPnpWYYTYkbItFaaeSZKkF/kH/7UZAt6xEILe 4aQLa9uqGFQe2e4HLb+LYQh/XbTG7A7qXG1Xk1iKNTSsJjZlpSRp3az7n/KrhYmQt70gk/D4R+3WA oi50FE3EFZh/1FB4vcN9PAXhRQjNeyiz3Fb6fxV9w6WWTAcYC6HmQ/TrgUc+HyefcIahzn2nXWinp TEIskO7iD0C2OhE5fSsQ63n1TytMeauxw1bTX4l8HXjQzBUE+qBlOHUYUR6ZkFNhvzwXQwrzat3P6 3rDNltn4LSjTEtsHCw3w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8oF-00000008v75-22BH; Thu, 06 Jun 2024 08:49:24 +0000 Received: from mail-lf1-x12e.google.com ([2a00:1450:4864:20::12e]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8nF-00000008uGg-15mb for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 08:48:36 +0000 Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-52b936c958dso817645e87.0 for ; Thu, 06 Jun 2024 01:48:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717663699; x=1718268499; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=RAnDJiP7cTVeCPXJfvrA1fpwOyQJAjUS/6zRfn4q49o=; b=QOrdz+fFf45pffwZPvxZjvD+yXeDitBAPslFkX1P6RQG5d9kLJ8B3lO8NpiGjI6Xe7 SPkGWHe2eHU1BN3Tep/BObPYu3/mR+VGo3U0f28jkBYrkMosmJJjW+xZCRvlx7ae1kTs 82fEvNlk+yPRNrGd7G31WY+8A1IGhcJHT/YPZ0cBJXk6L3RR122mEHf4PQxDXdaerAVF jHpA4PX15NjTnywaGjuxoUl8O36/FmeDv49SQPevYJ4Im4i33SVUsW+5QTbXGEBW2x8H 5YLt29q/Jjn25Jov4GLdGWUZ/+l3Ikk748rZESFdqKxTriGsSaps++rTSp09ajILF+WD 4amQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717663699; x=1718268499; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RAnDJiP7cTVeCPXJfvrA1fpwOyQJAjUS/6zRfn4q49o=; b=N/4Zmv6zzenXcQJo7vrquffR6SxDtWOxfRH+F5O9UDgiyyJO6Q2HcUO2GAdKqkP2Fe mS6estz0gZ/WqQyWlV7FfRwhO8nqfWpp9sTQmFsGelln0IUaHlgalVKkRoPoA3QHmvKP s8ICzEn6l4TWHPjmYe6EVyYy/vEo5FwKMLUvMCKJn3NogUwPJhJtAyi4oF5rrVYD6bJ7 W+kf63vIGmicO6ZfTii/xzGOZLikBZ4ZkAbSMIdC1QSsgQ52noQG5sE/BYIQHlgsL5E9 Ur/Gl7D32SY7IID697vmXeLHK/pn2jlgdd5uPgLFUEq4lRu1wdJSLZGNPNFG0BpSnoEY ETGQ== X-Forwarded-Encrypted: i=1; AJvYcCXclROiI7IMMCJCQvp5WT4N+A+HMWjkwSa0aa6hoFTAqsYCrrcaAkVFyvIMPc4trvAJY58bhh0RdJyU12zrfjxS1KHFYUXBoeErKwxSIc4LZ7fYp90= X-Gm-Message-State: AOJu0Yx/JSWtygW0PrWt59jeKdtPRKrkJV38/Fbf5naxjnZkBoHk7RY8 S/4J3/fp7RTYORv6c/daNGRpABbILrj41fsbvf/OgbG40pvYpjQHBqEtOtb6oN0= X-Google-Smtp-Source: AGHT+IFRdLts4Tbq85Qu00ekuZ3qTqx8v4ZNG1T6UCMGiruAFL1iJTMynZkOqCsvxFMkpK+HvrQUcQ== X-Received: by 2002:a05:6512:1598:b0:52b:ad6e:87ac with SMTP id 2adb3069b0e04-52bad6e8912mr2863100e87.41.1717663698626; Thu, 06 Jun 2024 01:48:18 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4215c2c690dsm14227445e9.34.2024.06.06.01.48.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 01:48:18 -0700 (PDT) From: Neil Armstrong Date: Thu, 06 Jun 2024 10:48:10 +0200 Subject: [PATCH 03/12] arm64: dts: amlogic: move assigned-clocks* from sound to clkc_audio node MIME-Version: 1.0 Message-Id: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-3-62e812729541@linaro.org> References: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> In-Reply-To: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> To: Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=55250; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=0TohGnuQeBHNDJwQSEZKdG+a4qamZCrJvgFKppueMTc=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBmYXfL0V08Uu3pLm2cryN0HUB3gT2wLUfJrAjuuPgM k4MPVtyJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZmF3ywAKCRB33NvayMhJ0WP0D/ 99y1E9Acq0tGA2CVzCjQgX4SWbAZKDhiyMFSOyMpTCVmNuBfSts7dHN5lozt4IPTfdxrV5/IY/3LdN W8qRdXc+Tc9xSqFbfAuGRhhSAp2VnUxn/PA0ltHZhjOm6k5VHZkhd3v24pgNl5leFefHGi1s3gBAe+ bV7ZtYRnaPEfq68pRF+Alazw8jF2m295RWJ4uZFuDKPcAXN9Fw47Te1yRqWQJtTPoNe98fcmSUTEAs 7u96cC8MOhcW6S6yS9c1ohCoFllXv8UXuAz2M0ptNFVx0JhcCdZZKejkCx/E0TQtm/jXWyg5aNf1Ry HiEjlqP78dTfLESYkrleUHexjMavuTeyFhD0usUR3X7PzvoTkAIFFuJsl3RvNUlyN939wLk7zA1WGm I8+1lKACIyMaYjTqzJi8RqeWsXXtJNdt5mB54Ftp3b1rSn1vptX0GN/fLr5Y7gWpObtWhL6udWr0nr qm8WdmxHM4LlV1QWADO3uTUOYHjklFzU5Q/5dlICxS/WSPJBWifitMALgk5HdOz5mqvxAZBewtwB8Q 3a1XZCdyNBSiBw8VNJw/OhjkoCNQBXAmdhSRMKbSROmVIlvMZLakTC4EQn+zshD9L03D7MoHwvT3WO S6jiz9sDp0ZYnz4GQYkvcs965elF19Wq6Cny3LVmOuFQy57A+qmd+NE3xcRA== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_014821_477239_0F4A0EE1 X-CRM114-Status: GOOD ( 11.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The assigne-clocks* properties should be used in nodes depending or sharing those clocks, so move tose properties from the sound node to either: - clkc on GX* SoCs - clkc_audio on AXG/G12*/SM1 SoCs This fixes all the following errors: sound: Unevaluated properties are not allowed ('assigned-clock-parents', 'assigned-clock-rates', 'assigned-clocks' were unexpected) from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-sound-card.yaml# sound: Unevaluated properties are not allowed ('assigned-clock-parents', 'assigned-clock-rates', 'assigned-clocks' were unexpected) from schema $id: http://devicetree.org/schemas/sound/amlogic,gx-sound-card.yaml# sound: 'anyOf' conditional failed, one must be fixed: 'clocks' is a required property '#clock-cells' is a required property from schema $id: http://devicetree.org/schemas/clock/clock.yaml# Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 17 ++++++++++------- arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts | 16 ++++++++-------- arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts | 16 ++++++++-------- arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 16 ++++++++-------- arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 16 ++++++++-------- arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 16 ++++++++-------- .../boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 18 ++++++++++-------- .../amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts | 18 ++++++++++-------- arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | 16 ++++++++-------- arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts | 16 ++++++++-------- arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts | 16 ++++++++-------- arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts | 16 ++++++++-------- .../boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts | 16 ++++++++-------- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 18 ++++++++++-------- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts | 18 ++++++++++-------- arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 16 ++++++++-------- arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 16 ++++++++-------- arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 17 ++++++++++------- arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 18 +++++++++++------- arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 17 ++++++++++------- arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 17 ++++++++++------- arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 17 ++++++++++------- arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 17 ++++++++++------- arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 17 ++++++++++------- arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts | 17 ++++++++++------- arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 17 ++++++++++------- arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 17 ++++++++++------- arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 17 ++++++++++------- .../boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 17 ++++++++++------- arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts | 17 ++++++++++------- .../boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 17 ++++++++++------- .../dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 17 ++++++++++------- .../boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 17 ++++++++++------- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts | 17 ++++++++++------- arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 17 ++++++++++------- arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 17 ++++++++++------- arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 17 ++++++++++------- arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 16 ++++++++-------- .../boot/dts/amlogic/meson-libretech-cottonwood.dtsi | 16 ++++++++-------- .../boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts | 16 ++++++++-------- arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts | 16 ++++++++-------- .../boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts | 16 ++++++++-------- arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 16 ++++++++-------- arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts | 16 ++++++++-------- arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 16 ++++++++-------- arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 16 ++++++++-------- arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts | 16 ++++++++-------- arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts | 16 ++++++++-------- 48 files changed, 435 insertions(+), 363 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts index 7ed526f45175..b2ff20737914 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts @@ -268,13 +268,6 @@ sound { "Speaker1 Right", "SPK1 OUT_D", "Linein AINL", "Linein", "Linein AINR", "Linein"; - assigned-clocks = <&clkc CLKID_HIFI_PLL>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <589824000>, - <270950400>, - <393216000>; dai-link-0 { sound-dai = <&frddr_a>; @@ -354,6 +347,16 @@ wifi32k: wifi32k { }; }; +&clkc_audio { + assigned-clocks = <&clkc CLKID_HIFI_PLL>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <589824000>, + <270950400>, + <393216000>; +}; + ðmac { status = "okay"; pinctrl-0 = <ð_rgmii_y_pins>; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts index af211d8f3952..6b2e4cf52ca9 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts @@ -176,14 +176,6 @@ sound { "SPDIFOUT_A IN 1", "FRDDR_B OUT 3", "SPDIFOUT_A IN 2", "FRDDR_C OUT 3"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -256,6 +248,14 @@ &cecb_AO { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts index 15b9bc280706..0c1cf498e9de 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts @@ -138,14 +138,6 @@ sound { "TDMOUT_B IN 2", "FRDDR_C OUT 1", "TDM_B Playback", "TDMOUT_B OUT"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -209,6 +201,14 @@ &cecb_AO { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts index 61cb8135a392..bb30e087b7e1 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts @@ -201,14 +201,6 @@ sound { "TODDR_B IN 1", "TDMIN_B OUT", "TODDR_C IN 1", "TDMIN_B OUT"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -303,6 +295,14 @@ &cecb_AO { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts index 3da7922d83f1..17c38bb3368c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts @@ -239,14 +239,6 @@ sound { "Lineout", "10U2 OUTL", "Lineout", "10U2 OUTR"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -396,6 +388,14 @@ &cecb_AO { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts index 05c7a1e3f1b7..f7deeac4fe1a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts @@ -158,14 +158,6 @@ sound { "SPDIFOUT_A IN 1", "FRDDR_B OUT 3", "SPDIFOUT_A IN 2", "FRDDR_C OUT 3"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -252,6 +244,14 @@ &cecb_AO { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts index 13d478f9c891..18085a5bf065 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts @@ -70,14 +70,6 @@ sound { "TDMOUT_B IN 2", "FRDDR_C OUT 1", "TDM_B Playback", "TDMOUT_B OUT"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -120,6 +112,16 @@ &cecb_AO { status = "okay"; }; +&clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + ðmac { status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts index 003efed529ba..a53d30692842 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts @@ -79,14 +79,6 @@ sound { "LINPUT1", "Mic Jack", "Mic Jack", "MICB"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -253,6 +245,16 @@ &cecb_AO { status = "okay"; }; +&clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + ðmac { status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi index 6a346cb86a53..f6615e5c8d92 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi @@ -194,14 +194,6 @@ sound { "TDMOUT_B IN 2", "FRDDR_C OUT 1", "TDM_B Playback", "TDMOUT_B OUT"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -245,6 +237,14 @@ &arb { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts index bb73e10b5e74..c7cd7894239c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts @@ -48,14 +48,6 @@ sound { "TDMOUT_A IN 2", "FRDDR_C OUT 1", "TDM_A Playback", "TDMOUT_A OUT"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -98,6 +90,14 @@ &arb { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts index 6eeedd54ab91..8257a4e2b0f4 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts @@ -49,14 +49,6 @@ sound { "TDMOUT_B IN 2", "FRDDR_C OUT 1", "TDM_B Playback", "TDMOUT_B OUT"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -99,6 +91,14 @@ &arb { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts index 0da386cabe1a..3dbd42f13fb3 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts @@ -37,14 +37,6 @@ sound { "SPDIFOUT_A IN 1", "FRDDR_B OUT 3", "SPDIFOUT_A IN 2", "FRDDR_C OUT 3"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -110,6 +102,14 @@ &arb { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts index eed2a23047ca..b05d6a5fe15d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts @@ -234,14 +234,6 @@ sound { "Internal Speakers", "Speaker Amplifier OUTL", "Internal Speakers", "Speaker Amplifier OUTR"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -608,6 +600,14 @@ regulator-state-mem { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi index d80dd9a3da31..2d341c256d7a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi @@ -71,14 +71,6 @@ sound { "Lineout", "U19 OUTL", "Lineout", "U19 OUTR"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -163,6 +155,16 @@ &acodec { status = "okay"; }; +&clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + ðmac { pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts index e26f3e3258e1..9fed17bec9ea 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts @@ -39,14 +39,6 @@ sound { "TODDR_B IN 6", "TDMIN_LB OUT", "TODDR_C IN 6", "TDMIN_LB OUT"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -97,6 +89,16 @@ codec { }; }; +&clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + ð_phy { status = "disabled"; }; 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 890f5bfebb03..aeb288aaf27a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts @@ -169,14 +169,6 @@ sound { "TDMOUT_B IN 2", "FRDDR_C OUT 1", "TDM_B Playback", "TDMOUT_B OUT"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -241,6 +233,14 @@ &cecb_AO { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts index 6396f190d703..81ba35e4bd7c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts @@ -32,14 +32,6 @@ sound { "SPDIFOUT_A IN 1", "FRDDR_B OUT 3", "SPDIFOUT_A IN 2", "FRDDR_C OUT 3"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -105,6 +97,14 @@ &arb { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; 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 efd662a452e8..d7b95d9f8bcd 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi @@ -194,13 +194,6 @@ sound { "AU2 INR", "ACODEC LORN", "7J4-14 LEFT", "AU2 OUTL", "7J4-11 RIGHT", "AU2 OUTR"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; dai-link-0 { sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; @@ -254,6 +247,16 @@ &cec_AO { status = "okay"; }; +&clkc { + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + &cvbs_vdac_port { cvbs_vdac_out: endpoint { remote-endpoint = <&cvbs_connector_in>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi index 08d6b69ba469..4206bf1baddd 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi @@ -129,13 +129,7 @@ sound { "AU2 INR", "ACODEC LORN", "Lineout", "AU2 OUTL", "Lineout", "AU2 OUTR"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; + dai-link-0 { sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; }; @@ -203,6 +197,16 @@ &cec_AO { hdmi-phandle = <&hdmi_tx>; }; +&clkc { + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + &cvbs_vdac_port { cvbs_vdac_out: endpoint { remote-endpoint = <&cvbs_connector_in>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts index f28452b9f00f..1da38008241a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts @@ -45,13 +45,6 @@ button-reset { sound { compatible = "amlogic,gx-sound-card"; model = "KII-PRO"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; dai-link-0 { sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; @@ -95,6 +88,16 @@ &aiu { pinctrl-names = "default"; }; +&clkc { + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + ðmac { status = "okay"; pinctrl-0 = <ð_rmii_pins>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts index 1fd2e56e6b08..5c7f78e011f9 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts @@ -135,13 +135,6 @@ hdmi_connector_in: endpoint { sound { compatible = "amlogic,gx-sound-card"; model = "NANOPI-K2"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; dai-link-0 { sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; @@ -178,6 +171,16 @@ &cec_AO { hdmi-phandle = <&hdmi_tx>; }; +&clkc { + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + &cvbs_vdac_port { cvbs_vdac_out: endpoint { remote-endpoint = <&cvbs_connector_in>; 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 cca129ce2c58..79d87943b2b6 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts @@ -142,13 +142,6 @@ hdmi_connector_in: endpoint { sound { compatible = "amlogic,gx-sound-card"; model = "NEXBOX-A95X"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; dai-link-0 { sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; @@ -178,6 +171,16 @@ &aiu { status = "okay"; }; +&clkc { + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + &cvbs_vdac_port { cvbs_vdac_out: endpoint { remote-endpoint = <&cvbs_connector_in>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts index c431986e6a33..d4e5c960d4cd 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts @@ -177,13 +177,6 @@ hdmi_connector_in: endpoint { sound { compatible = "amlogic,gx-sound-card"; model = "ODROID-C2"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; dai-link-0 { sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; @@ -220,6 +213,16 @@ &cec_AO { hdmi-phandle = <&hdmi_tx>; }; +&clkc { + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + ðmac { status = "okay"; pinctrl-0 = <ð_rgmii_pins>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts index 7f94716876d3..d00a579be5d1 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts @@ -68,13 +68,6 @@ button-menu { sound { compatible = "amlogic,gx-sound-card"; model = "P200"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; dai-link-0 { sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; @@ -118,6 +111,16 @@ &aiu { pinctrl-names = "default"; }; +&clkc { + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + ðmac { status = "okay"; pinctrl-0 = <ð_rgmii_pins>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts index 6f81eed83bec..b5bce8b56022 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts @@ -17,13 +17,6 @@ / { sound { compatible = "amlogic,gx-sound-card"; model = "P201"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; dai-link-0 { sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; @@ -53,6 +46,16 @@ &aiu { status = "okay"; }; +&clkc { + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + ðmac { status = "okay"; pinctrl-0 = <ð_rmii_pins>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi index 255e93a0b36d..87d639c06b3b 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi @@ -108,13 +108,6 @@ sdio_pwrseq: sdio-pwrseq { sound { compatible = "amlogic,gx-sound-card"; model = "VEGA-S95"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; dai-link-0 { sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; @@ -165,6 +158,16 @@ &cec_AO { hdmi-phandle = <&hdmi_tx>; }; +&clkc { + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + ðmac { status = "okay"; pinctrl-0 = <ð_rgmii_pins>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts index af9ea32a2876..0bcca84e85e2 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts @@ -16,13 +16,6 @@ / { sound { compatible = "amlogic,gx-sound-card"; model = "WETEK-HUB"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; dai-link-0 { sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; @@ -52,6 +45,16 @@ &aiu { status = "okay"; }; +&clkc { + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + &ir { linux,rc-map-name = "rc-wetek-hub"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts index 376760d86766..72b2937e291f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts @@ -48,13 +48,6 @@ button { sound { compatible = "amlogic,gx-sound-card"; model = "WETEK-PLAY2"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; dai-link-0 { sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; @@ -98,6 +91,16 @@ &aiu { pinctrl-names = "default"; }; +&clkc { + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + &i2c_A { status = "okay"; pinctrl-0 = <&i2c_a_pins>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts index 90ef9c17d80b..cad577f7c9c6 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts @@ -123,13 +123,6 @@ sound { "Speaker", "9J5-2 RIGHT"; audio-routing = "9J5-3 LEFT", "ACODEC LOLN", "9J5-2 RIGHT", "ACODEC LORN"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; dai-link-0 { sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; @@ -183,6 +176,16 @@ &cec_AO { hdmi-phandle = <&hdmi_tx>; }; +&clkc { + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + &cvbs_vdac_port { cvbs_vdac_out: endpoint { remote-endpoint = <&cvbs_connector_in>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts index 08a4718219b1..a08f3555ac4a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts @@ -128,13 +128,6 @@ sound { "AU2 INR", "ACODEC LORN", "Lineout", "AU2 OUTL", "Lineout", "AU2 OUTR"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; dai-link-0 { sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; @@ -188,6 +181,16 @@ &cec_AO { hdmi-phandle = <&hdmi_tx>; }; +&clkc { + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + &cvbs_vdac_port { cvbs_vdac_out: endpoint { remote-endpoint = <&cvbs_connector_in>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts index fea65f20523a..9625111b8517 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 @@ -67,13 +67,6 @@ hdmi_connector_in: endpoint { sound { compatible = "amlogic,gx-sound-card"; model = "KHADAS-VIM"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; dai-link-0 { sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; @@ -110,6 +103,16 @@ &cec_AO { hdmi-phandle = <&hdmi_tx>; }; +&clkc { + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + &hdmi_tx { status = "okay"; pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts index 63b20860067c..5c2a2b55506f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts @@ -160,13 +160,6 @@ vcc_1v8: regulator-vcc-1v8 { sound { compatible = "amlogic,gx-sound-card"; model = "LIBRETECH-CC-V2"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; dai-link-0 { sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; @@ -203,6 +196,16 @@ &cec_AO { hdmi-phandle = <&hdmi_tx>; }; +&clkc { + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + ðmac { status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts index 8b26c9661be1..4f4d1546fa05 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts @@ -142,13 +142,6 @@ sound { "AU2 INR", "ACODEC LORN", "Lineout", "AU2 OUTL", "Lineout", "AU2 OUTR"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; dai-link-0 { sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; @@ -202,6 +195,16 @@ &cec_AO { hdmi-phandle = <&hdmi_tx>; }; +&clkc { + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + &cvbs_vdac_port { cvbs_vdac_out: endpoint { remote-endpoint = <&cvbs_connector_in>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts index 9b4ea6a49398..c8c7d9d2a020 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts @@ -50,13 +50,6 @@ sound { "AU2 INR", "ACODEC LORN", "Lineout", "AU2 OUTL", "Lineout", "AU2 OUTR"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; dai-link-0 { sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; }; @@ -109,6 +102,16 @@ &cec_AO { hdmi-phandle = <&hdmi_tx>; }; +&clkc { + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + &cvbs_vdac_port { cvbs_vdac_out: endpoint { remote-endpoint = <&cvbs_connector_in>; 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 07e7c3bedea0..b5e925b212ce 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts @@ -150,13 +150,6 @@ wifi32k: wifi32k { sound { compatible = "amlogic,gx-sound-card"; model = "KHADAS-VIM2"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; dai-link-0 { sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; @@ -193,6 +186,16 @@ &cec_AO { hdmi-phandle = <&hdmi_tx>; }; +&clkc { + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + &cpu_cooling_maps { map0 { cooling-device = <&gpio_fan THERMAL_NO_LIMIT 1>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts index ad2dd4ad0a31..73248cc4edde 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts @@ -86,13 +86,6 @@ hdmi_connector_in: endpoint { sound { compatible = "amlogic,gx-sound-card"; model = "NEXBOX-A1"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; dai-link-0 { sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; @@ -143,6 +136,16 @@ &cec_AO { hdmi-phandle = <&hdmi_tx>; }; +&clkc { + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + &cvbs_vdac_port { cvbs_vdac_out: endpoint { remote-endpoint = <&cvbs_connector_in>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts index d05dde8da5c5..a126fb057e0f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts @@ -101,13 +101,6 @@ sdio_pwrseq: sdio-pwrseq { sound { compatible = "amlogic,gx-sound-card"; model = "RBOX-PRO"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; dai-link-0 { sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; @@ -151,6 +144,16 @@ &aiu { pinctrl-names = "default"; }; +&clkc { + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; +}; + ðmac { status = "okay"; diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi index e78cc9b577a0..028d58702003 100644 --- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi @@ -182,14 +182,6 @@ sound { "TODDR_B IN 0", "TDMIN_A OUT", "TODDR_C IN 0", "TDMIN_A OUT"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -252,6 +244,14 @@ &arb { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi b/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi index 082b72703cdf..784b816f7ef8 100644 --- a/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi @@ -200,14 +200,6 @@ sound { <&tdmin_a>, <&tdmin_b>, <&tdmin_c>, <&dioo2133>; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -353,6 +345,14 @@ &cecb_AO { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts index 9b2eb6e42651..72319430737b 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts @@ -22,14 +22,6 @@ sound { "TDMOUT_B IN 2", "FRDDR_C OUT 1", "TDM_B Playback", "TDMOUT_B OUT"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -73,6 +65,14 @@ &arb { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts index 6e34fd80ed71..b42bcfae43b9 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts @@ -22,14 +22,6 @@ sound { "TDMOUT_B IN 2", "FRDDR_C OUT 1", "TDM_B Playback", "TDMOUT_B OUT"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -73,6 +65,14 @@ &arb { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts index 586034316ec3..f98953340645 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts @@ -22,14 +22,6 @@ sound { "TDMOUT_B IN 2", "FRDDR_C OUT 1", "TDM_B Playback", "TDMOUT_B OUT"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -69,6 +61,14 @@ codec { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts index f045bf851638..a1dfee63e158 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts @@ -57,14 +57,6 @@ sound { "Lineout", "ACODEC LOLP", "Lineout", "ACODEC LORP"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -151,6 +143,14 @@ &acodec { &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts index e6e9410d40cb..de7ee1d2d911 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts @@ -22,14 +22,6 @@ sound { "TDMOUT_B IN 2", "FRDDR_C OUT 1", "TDM_B Playback", "TDMOUT_B OUT"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -73,6 +65,14 @@ &arb { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi index 951eb8e3f0c0..b3b30041324f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi @@ -174,14 +174,6 @@ sound { "TDMOUT_B IN 2", "FRDDR_C OUT 1", "TDM_B Playback", "TDMOUT_B OUT"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -239,6 +231,14 @@ &cecb_AO { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts index 3581e14cbf18..27e480873767 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts @@ -239,14 +239,6 @@ sound { "TODDR_B IN 1", "TDMIN_B OUT", "TODDR_C IN 1", "TDMIN_B OUT"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -348,6 +340,14 @@ &cecb_AO { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts index fc9b961133cd..50c4c56f6359 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts @@ -22,14 +22,6 @@ sound { "TDMOUT_B IN 2", "FRDDR_C OUT 1", "TDM_B Playback", "TDMOUT_B OUT"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -73,6 +65,14 @@ &arb { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts index 9ea969255b4f..59269dcd47e0 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts @@ -22,14 +22,6 @@ sound { "TDMOUT_B IN 2", "FRDDR_C OUT 1", "TDM_B Playback", "TDMOUT_B OUT"; - assigned-clocks = <&clkc CLKID_MPLL2>, - <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - dai-link-0 { sound-dai = <&frddr_a>; }; @@ -73,6 +65,14 @@ &arb { }; &clkc_audio { + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; }; From patchwork Thu Jun 6 08:48:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13688052 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 238E6C27C52 for ; Thu, 6 Jun 2024 08:48:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OZXjDBt04Azvmrvwdpazc9ISM+pR/DwZcuqOoFyZsbY=; b=T2G55zIokfEAVF naXRX0e3xPt4+DY/cqGzDuYTNfCAJkvCxuL1LeJ8g4to9jO/RwFrNSV4kVQrrvGTDmUh9YBq/Y2kH AuLP6FepkMlUoIvXbH0NkNnGE6Ed2/K9mtQoFkwO0TrcDYJWbwlkstuJRpDJ1dU8UKu5Dem6SN7S5 pOf03AnyX79MXjfMkK/esdFBO3FDHXMArWdJ10O9O8o0RhkXDSVz4QSnqx5qLg7wd+A/Uhus++vE9 o8BqXw56UctfcDUGlPh4u0YK4+fJCJLhvo8Mg+jgPhQWzOX7WCyteY9dN7OdxHdsX3ESLrGXQkzqe mtaCLBYEihIWth+MiEAw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8nY-00000008uWi-0Ltl; Thu, 06 Jun 2024 08:48:40 +0000 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8nE-00000008uGt-35Ad for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 08:48:23 +0000 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-42158db02c3so8684605e9.2 for ; Thu, 06 Jun 2024 01:48:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717663699; x=1718268499; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=I11GCmwbwTQWJnggMYRy+IvcpltjoVwOcfxWgF2WTsg=; b=ffCA24T1VpV9QawNgFo8NmUP4M63v+UJIjoaRuRNn6PmmLVKS3Oriqg6MIJklVfBpB u5+BLIDvPFqluho3v540lVLV0vAOl47UFqDHlUhOC0EzoPvV1xTmarGm0pzhfkpzCem6 Kmo5ybD2PbE6XkdbL9rvP8GHcMfaSd+DbaZcDIURxLcPkqGfBMfPr1Qw/o9UweuA5Qjo K/qnUwVn8ch65V0xdJLJh9N8Y0D0AhJiiR1CWW6YCGkpJaW1LdaFPLzxJslo4JLCzOen Mn6xdp1uO+ynBAsqJ1kBH8G/bZdIQsxH4wq0R7J8DnZayKrCwAo94LnlL0Oe1RiJ2ceD sZHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717663699; x=1718268499; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I11GCmwbwTQWJnggMYRy+IvcpltjoVwOcfxWgF2WTsg=; b=l+2s4B82wBoTlKhYqja90j9PgqF6N/SxnpNhdDoDLuqHdO0gNY3nbN8Vc33HSL9Azv sCIAU9Ia6K5LSR7Xp7yWVnk8oEhE8sCLZ3I2uvmn7k2AsjboZ5tcqFgLpqCl8PMUuEKn TG1DEtKbwviwaygRF4iBjojpvQo4eTGdDZzVdYys8Db7P9PTw1VSkx9zjPpWa4q9Yalz LzlomdOPHuH31YpxXD8uluRvZdwHzCpyB5oiOThVMxYl5G4eYRur6XDBZL31C3sF6OGp 6QrVpbk/sly9uBlDrVpKhqukYcQzHi/XQ3WciVxoU9f6CzKKynxQSbpvQKfdG32TDW90 OwdA== X-Forwarded-Encrypted: i=1; AJvYcCVt8tfEoRO3JIfmvML9ccfo2a/RE6VmJod4MHF/uqD/sS59v66hCow2wFSPqqo7MyJRoq+GCgZ31HTvw/tWSPy0V5PgWrbAEKmrclIgQIB8NR0UYio= X-Gm-Message-State: AOJu0Yw+Vfa6yNBe0VrSn1Iqm08vW5iF2Yznb/oowAw3ktQ1CehnxPz3 LI/fhGkD79Zb0kHMHjxqrBoe3ZygV2udtVV93D+1DynvH5KlPbDAgPjvMChZ8MM= X-Google-Smtp-Source: AGHT+IHXNskKx96eAveDBrVtdYp/2X22ILbdY24ts/HP9hnKmVYhMiCzDPYXHNWBqE8KmW8CLvFx1Q== X-Received: by 2002:a05:600c:b85:b0:421:2edb:d207 with SMTP id 5b1f17b1804b1-4215632eb27mr45552835e9.28.1717663699425; Thu, 06 Jun 2024 01:48:19 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4215c2c690dsm14227445e9.34.2024.06.06.01.48.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 01:48:19 -0700 (PDT) From: Neil Armstrong Date: Thu, 06 Jun 2024 10:48:11 +0200 Subject: [PATCH 04/12] arm64: dts: amlogic: sm1: fix tdm audio-controller clock order MIME-Version: 1.0 Message-Id: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-4-62e812729541@linaro.org> References: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> In-Reply-To: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> To: Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3425; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=ZbE2vLa8S9lvPjkvME7nqfkOHEOptRs807yC/TclS54=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBmYXfLxLYrVWx88kK9rLfSbTE4DHKxGZePo9EX4BNc N8QPGlOJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZmF3ywAKCRB33NvayMhJ0TaFD/ 0VbGVTEtlallTWLLyKR/zCiWlQXmvjToJXlCheIxQSQKdLvSRWDv85LNyDUkPmOXq1gBwHNai3/is8 tTgsWatCbxKm2V5r8Hwoy5Tm6zm6+P4V7uxCMP3W7TrdNRS7SKW/bqBvAtaSviLlKBRAjqOimEl7x1 trIJfw86VACmLRWuRQx7RcQ5wChwIMu+DUy0ejeUFCUuZUk0PacElcQjxKy4i+TA9o/9Dm3/R/As10 umrNj9LUtdfxio+TNIYY/ZT9K3MzkZZs1LlM+cYZB+vBd8UuEiHnaW26PnQOo5utjN233REotdKIyl tioawwMea5ZtMM3qO6/H2b+vR1mBosVpFrMqYoOatoaxJaJIdvB5eGO+qFPko4cMxD6CMNxZJmahBg Y25CKAppqTP19cFPExsKzsjLYCiRgirQQ2cDdcbvGmXHIIle7tctYQQVMBOil1YYapNaa3kGZBoSk3 emnjlBFDWRYlfYrD/4O23UNsiP6R4v4yNK31kojoOYRWSOq9qDs446jXWY8MRxb/mDUugJtyeKoqwN pvZYppHURcF+4bP92sutL0C0ZkpJmnn81WlIfmw9VuNVifBbOroxVOZqL2Rn6MZI+38/vZMi2Rxtx6 d/GGsFPQ5aDK2NBUKLqCBYpVEgArqtSuyCrcouu5KhuK8yLUWWpAPvPMORFQ== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_014820_918520_C11F9CE9 X-CRM114-Status: GOOD ( 10.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Fix the clock order in the tdm audio-controller nodes, this fixes the following errors: audio-controller-0: clock-names:0: 'sclk' was expected from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml# audio-controller-0: clock-names:1: 'lrclk' was expected from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml# audio-controller-0: clock-names:2: 'mclk' was expected from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml# audio-controller-1: clock-names:0: 'sclk' was expected from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml# audio-controller-1: clock-names:1: 'lrclk' was expected from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml# audio-controller-1: clock-names:2: 'mclk' was expected from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml# audio-controller-2: clock-names:0: 'sclk' was expected from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml# audio-controller-2: clock-names:1: 'lrclk' was expected from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml# audio-controller-2: clock-names:2: 'mclk' was expected from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml# Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi index 643f94d9d08e..6822c2f3cfed 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi @@ -17,10 +17,10 @@ tdmif_a: audio-controller-0 { compatible = "amlogic,axg-tdm-iface"; #sound-dai-cells = <0>; sound-name-prefix = "TDM_A"; - clocks = <&clkc_audio AUD_CLKID_MST_A_MCLK>, - <&clkc_audio AUD_CLKID_MST_A_SCLK>, - <&clkc_audio AUD_CLKID_MST_A_LRCLK>; - clock-names = "mclk", "sclk", "lrclk"; + clocks = <&clkc_audio AUD_CLKID_MST_A_SCLK>, + <&clkc_audio AUD_CLKID_MST_A_LRCLK>, + <&clkc_audio AUD_CLKID_MST_A_MCLK>; + clock-names = "sclk", "lrclk", "mclk"; status = "disabled"; }; @@ -28,10 +28,10 @@ tdmif_b: audio-controller-1 { compatible = "amlogic,axg-tdm-iface"; #sound-dai-cells = <0>; sound-name-prefix = "TDM_B"; - clocks = <&clkc_audio AUD_CLKID_MST_B_MCLK>, - <&clkc_audio AUD_CLKID_MST_B_SCLK>, - <&clkc_audio AUD_CLKID_MST_B_LRCLK>; - clock-names = "mclk", "sclk", "lrclk"; + clocks = <&clkc_audio AUD_CLKID_MST_B_SCLK>, + <&clkc_audio AUD_CLKID_MST_B_LRCLK>, + <&clkc_audio AUD_CLKID_MST_B_MCLK>; + clock-names = "sclk", "lrclk", "mclk"; status = "disabled"; }; @@ -39,10 +39,10 @@ tdmif_c: audio-controller-2 { compatible = "amlogic,axg-tdm-iface"; #sound-dai-cells = <0>; sound-name-prefix = "TDM_C"; - clocks = <&clkc_audio AUD_CLKID_MST_C_MCLK>, - <&clkc_audio AUD_CLKID_MST_C_SCLK>, - <&clkc_audio AUD_CLKID_MST_C_LRCLK>; - clock-names = "mclk", "sclk", "lrclk"; + clocks = <&clkc_audio AUD_CLKID_MST_C_SCLK>, + <&clkc_audio AUD_CLKID_MST_C_LRCLK>, + <&clkc_audio AUD_CLKID_MST_C_MCLK>; + clock-names = "sclk", "lrclk", "mclk"; status = "disabled"; }; From patchwork Thu Jun 6 08:48:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13688054 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 79C23C27C5E for ; Thu, 6 Jun 2024 08:49:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/hGUjZmrC9sUDssaaQ5XuwSYvLbfDUyd+EfE1z4fXcQ=; b=QW+71TaG45FFPg KLMTaz8EJKSniqlcf2E26iyi5v1CNyH6VcGzm5xJWyr3HZXILDJQZLDw7MgfYT3h1XQGgs7YoLoxm 2uEefvzj+FjpRlYjuZJ03eCYc/09ZdNTKOpqHIK497soLz9AoD2edI2k7YoBHz0jXXG2UhQJva6Q0 NUttBuQgRir2dUPDn0levHWEGNjPF2+DqEZqCZw88w2eJ807WG070s0cLzL1L94iMmyvgFlIzgres JBAbXZN8yHK04OQ4kNo9DtR16312sALJHWDY49L6zwlCaGmUB/6DwLDijIJ3s5UHl/e01ssGKbqRf vASKwts9B9Utllw+27ug==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8ni-00000008uel-3Jns; Thu, 06 Jun 2024 08:48:50 +0000 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8nG-00000008uHY-3wEn for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 08:48:27 +0000 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-35ef1e928c9so816270f8f.3 for ; Thu, 06 Jun 2024 01:48:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717663700; x=1718268500; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ZnzrYhtyWZtGZAeRI1cKgoE7VfeX1i9ErTFoBPCkmqo=; b=oB87K6Vy1KVGC7ogngJXc1va1NAM0epJpG54KeNLJ2PrHrlLcJbjfNLT7d1LUEgc+L Djy2m5oHUdj0UdeKkuiLzRGI1eW8y22xXVOVgeaVnnNuOayUcMf2s4q3TZyVN3M9WFAU GRZCQaA8KK0hMXlqbzYMxwhqOzEZna07B6x875BigFpB5YC+IqMz6+L+RtrVG+H8WJ8p eDtO4/4Pg9MvyG2Y9pVGIkAcaJ+Cw3UshCdXDbQLl8fd5hDhzYZ0x0K0RiBWoPbRLg2m +sFVoHxFWqOEjBf5AibpejVYJ2BOOs7eHJIrGfxutM+Ljyrlabb/gTV8GzgLdpSGoTYM C25w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717663700; x=1718268500; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZnzrYhtyWZtGZAeRI1cKgoE7VfeX1i9ErTFoBPCkmqo=; b=umUK3QYFHigq/LmCyWW2cKMilvKk3m/P+PvTCpdQlZlpJ7hmJ5D59TQo9fhdGALaA6 BDpX1ttepYCD4A1RXEz+xQOeEj4Hpbmm5MBHiafkUtg2Fe43FrMJZFyJ+a4mABb/Lp6e dHHCONM7oKUJ81B2Bkg22RhqsQ62fLKSwLAA26d/TFFnAscekPH9N79OlbzdatdT0KjP TOleLXw6eANk/+RQaR740PamAzpWGTPtFGsddWY3yF2PlkiaV2R3F6d3DfmXNK6iQH/n NISoPdKziSNTPB29qr2N5UCiG6Nnsqg6am8WH2lG2lTWfYGuYt2dT3g2ta1dYEjRwa2y 4Q9g== X-Forwarded-Encrypted: i=1; AJvYcCWOGvEcGKoDGxJ8pL5GSkwutJYV0eScd2//mgpZrmTq1ARXXvSKsX4azV1CUwUHKfNQfrRZoqKfshOAhopQ7wAOJ/DODvOUCawNccXENExWyQnJRYU= X-Gm-Message-State: AOJu0YxqU4kXxzxbouoEvYUgcPksBaSX3DxgXdSqsBhJ56Xh1VUnufUZ HmRXGg5klDdxXe7mzOog3KI6uuBeye3GlnF3CijyaaQEHdn242/gAnPtei0mZ8o= X-Google-Smtp-Source: AGHT+IG0BYg8K/c4KQaRBp1EUc+GvZgM8axaFHE4i1jfIJetCHXj272C1ENl7iKjvIyI47e6l1NdOg== X-Received: by 2002:a05:6000:1d93:b0:35e:ec99:77ce with SMTP id ffacd0b85a97d-35eec997812mr4343277f8f.22.1717663700253; Thu, 06 Jun 2024 01:48:20 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4215c2c690dsm14227445e9.34.2024.06.06.01.48.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 01:48:19 -0700 (PDT) From: Neil Armstrong Date: Thu, 06 Jun 2024 10:48:12 +0200 Subject: [PATCH 05/12] arm64: dts: amlogic: sm1: fix tdm controllers compatible MIME-Version: 1.0 Message-Id: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-5-62e812729541@linaro.org> References: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> In-Reply-To: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> To: Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2472; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=39vRtYwQYEqRtQHSzA7n3fy3WwXerX7uCL5YXSWhBzg=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBmYXfLG+HbYBIAmTUEl0ylD8D+ogCR9+kGUPijqzl9 PktHmhOJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZmF3ywAKCRB33NvayMhJ0YHqEA CvUi5i3wSgl93xNoeNepN5W+1OOMgpo+kxK8rbUTf14l+5gou6zj/XcFER3vtR65wo51Za2D4bmzy1 mBmmFX19ciNIcpQwhxOf8VFrRVmpF5fVUqkIrw04G7qGR4+/twNjqF3zhbcVrlTXyEEDfJ2eqjsqgq 8uL0m/nSvr+nnHDAdBrFwWPM3Pw+riSaRTozWOXzJcMuCSGqXwvmSIma4wrUwyeYvOrEk4ftKh58CC mvcAFsVzZkO3DTmH7Ic3uNv8Lql/l/briLqCiUwCIX4e5/HdGe3gx6X53roXPSLC5O5P9TJft6Xhfy Ug3JdAYDumQqNFV1Iip6j38HIMFEhR73gUbyw8kD4ofojscj8RUCVueYPvk6bACR8LQf16GbO6lNbY 7YALkBcrNzAKuEHOcEUaldbSMppfc0xBJizC5ScUITlGMOZDff9tIiGtneyjxKmizAhBZwnRW2Yngl fPoVbG8+R+GFc7jUqjaArt4bt6BlYeUxlo9dVJ62HoLgK1P4edKgrSnedPd7kJSwenKhE97SAag/F4 G+13o/UMUuQaWKbds8lJJyq6vuBEVN0A32h5fsVQN2AOahxEhiYRuKaL1B1X7TetUvjn0MCbih/axY Hoqai+OdzCo8Uio8oD1WP2O8z41CvTHpwspZkp1RFuUXW84U8xdzMrYacZnA== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_014823_138734_3875EC57 X-CRM114-Status: UNSURE ( 9.40 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Fixes the following: audio-controller@300: compatible: ['amlogic,sm1-tdmin', 'amlogic,axg-tdmin'] is too long from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-formatters.yaml# audio-controller@340: compatible: ['amlogic,sm1-tdmin', 'amlogic,axg-tdmin'] is too long from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-formatters.yaml# audio-controller@380: compatible: ['amlogic,sm1-tdmin', 'amlogic,axg-tdmin'] is too long from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-formatters.yaml# audio-controller@3c0: compatible: ['amlogic,sm1-tdmin', 'amlogic,axg-tdmin'] is too long from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-formatters.yaml# Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi index 6822c2f3cfed..d13cf5b4aac7 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi @@ -275,8 +275,7 @@ arb: reset-controller@280 { }; tdmin_a: audio-controller@300 { - compatible = "amlogic,sm1-tdmin", - "amlogic,axg-tdmin"; + compatible = "amlogic,sm1-tdmin"; reg = <0x0 0x300 0x0 0x40>; sound-name-prefix = "TDMIN_A"; resets = <&clkc_audio AUD_RESET_TDMIN_A>; @@ -291,8 +290,7 @@ tdmin_a: audio-controller@300 { }; tdmin_b: audio-controller@340 { - compatible = "amlogic,sm1-tdmin", - "amlogic,axg-tdmin"; + compatible = "amlogic,sm1-tdmin"; reg = <0x0 0x340 0x0 0x40>; sound-name-prefix = "TDMIN_B"; resets = <&clkc_audio AUD_RESET_TDMIN_B>; @@ -307,8 +305,7 @@ tdmin_b: audio-controller@340 { }; tdmin_c: audio-controller@380 { - compatible = "amlogic,sm1-tdmin", - "amlogic,axg-tdmin"; + compatible = "amlogic,sm1-tdmin"; reg = <0x0 0x380 0x0 0x40>; sound-name-prefix = "TDMIN_C"; resets = <&clkc_audio AUD_RESET_TDMIN_C>; @@ -323,8 +320,7 @@ tdmin_c: audio-controller@380 { }; tdmin_lb: audio-controller@3c0 { - compatible = "amlogic,sm1-tdmin", - "amlogic,axg-tdmin"; + compatible = "amlogic,sm1-tdmin"; reg = <0x0 0x3c0 0x0 0x40>; sound-name-prefix = "TDMIN_LB"; resets = <&clkc_audio AUD_RESET_TDMIN_LB>; From patchwork Thu Jun 6 08:48:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13688053 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 95E5DC27C52 for ; Thu, 6 Jun 2024 08:49:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=iykGS7M5mrHWgl3n96BgkG+c/cqfyqf7UkLaQYOpAYI=; b=gUvHINm8X9CUFM oyfAtsDq4cBSsDFLXnNUaSvi+Q3aKO7k78IW90WoS8q4VnY2mgWiwtxWehYFGjYih/9l88amyC9Jr IC4AnXldYjDqF2odRpTQLDrKvL1uFXQnULiepCAXZzbI5cOel25sWuZEh0Ey+XoCd8OKZIlq/17D4 U5n6TW05ttuL+v9bpEXQPXetPh1cZvgA/azkKTuOeZwyXZTKAGilNYps1QRaTTXovvxN5Tkk5SonE IMIKN9bLkIw8Sl2w/AFMsTupG2vcKkyned4HmMVOyysfvS9oaWhYU7TeRH4RaqsX6UOwlJRch9a8J j6W0ZIvCDzwizx0YxmNQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8nf-00000008ucP-2vBT; Thu, 06 Jun 2024 08:48:47 +0000 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8nG-00000008uIL-37vQ for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 08:48:24 +0000 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-42138eadf64so8356045e9.3 for ; Thu, 06 Jun 2024 01:48:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717663701; x=1718268501; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=+IWuxffXrg4LQwBLFnoOeZEokseDHoUki1HFBLSFSBM=; b=ajgooW76Ol5/axkNHwktvpeziiJGLe/eyuh10YQpG1Sgkjgc9iWv4DSdiuPzIUwlqU 4pTtivgd9JimJQPh7LYbsMZdte0cEBhazTf5mbO7rpnVE8IfLdQ7P9tb9OBQibqth3Bu 8aKQuoXU5HOj2bSn66rC3dR/M0lOquRInuhqsr+xyq1bxOMPgQ8kRxuRdO4scXXRZNZB UGIny4gsIPRv4qShhZxeU4af+6lpaAhARKxTK7QUlPlgSTz8J/MTLBLTfDiXH+6k8Yar ofVuHgS8mjQyGMno0AbTaxZtrgnlHaAE24o/taBkRQwbpd/JZMhM4nBPm2ceaw1uY/uy EH9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717663701; x=1718268501; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+IWuxffXrg4LQwBLFnoOeZEokseDHoUki1HFBLSFSBM=; b=i5Y5usexhmXkAS5ZdABEdZ+x/ojIyp0eoNN2fGyz3efhOj3ujygRK6F+abW0xNDVHn aB2awIhyrRWs5rgSi6wtpioRgdwoa4y3B29yTls8gf5cXyIp72XsOIkDW4A2HqcHValf s78VQmZoVnfD0geexpaH/6kjJU2C5z/BABvuz6RiUoeqyWxHKPzcqZuvZqvTDqdMra/V amzSH+Udu1pY7QQcJbeoIzmg+PmHYibUeVkzyHSho281F+eOjtoXNDWembKHIURrKc8b ZMezxVA6Lr6fWHpLnJ73nsM3P7S7/MgYfphmyGVsshh2eESV+2psg05dFZYwXFcKT10v Dm4Q== X-Forwarded-Encrypted: i=1; AJvYcCVS/YOhliRxmSzl/QTWoeiFjYGPLfkDhhbS3IdrOCFL57ZlNe5OO4swjA1lvRcpThayW6UQt1L7Af3t/StCGVpdEIu2HowVAUZJZCt5/IFapnHzdMA= X-Gm-Message-State: AOJu0YwiNlnCLfdKIaxyb136uN/pvRGtPqRLgoBQkpVWVx3cBzym/gym pcpOUrOifN5vjwTj/oGWEp5XrLNTrZtuck03A0eEopIWegDVuiMPVw5PZCokK8w= X-Google-Smtp-Source: AGHT+IGalqseq3iSUyoZ1rDpRKcx8jiSTVA95CddC3u6Wzo2fIiN7QpZR/sxDIygQnEaSIhb84DOGA== X-Received: by 2002:a05:600c:4254:b0:421:55e6:d4fe with SMTP id 5b1f17b1804b1-421562e7748mr38548195e9.19.1717663701048; Thu, 06 Jun 2024 01:48:21 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4215c2c690dsm14227445e9.34.2024.06.06.01.48.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 01:48:20 -0700 (PDT) From: Neil Armstrong Date: Thu, 06 Jun 2024 10:48:13 +0200 Subject: [PATCH 06/12] arm64: dts: amlogic: g12a-u200: drop invalid sound-dai-cells MIME-Version: 1.0 Message-Id: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-6-62e812729541@linaro.org> References: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> In-Reply-To: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> To: Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=798; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=EXGEWAhKpF7QnohcFYB5Y1PiMZfbRrYfXGdvRy+dRzk=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBmYXfMxNcVWAzCvmfhczk/oa52KNH8pz/V974sJxZP zqYfDwqJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZmF3zAAKCRB33NvayMhJ0Rq8EA Cu8y+nE/eTc41AHaN4QELvpQlLweEg095Ph0hOo2cdNBpmZ4KJTAF9JavC985V9svwTtKY9mB3wxPN tZo8p+6s0z7IVzxtlnxGw4wY1bVudbvxU8Xgp4Pfn+IvV+d8UKOKNNrGLZ3Db3pUaOFRis+1qR2tI0 p+sqNS/LwW5kbXzwgStosHdh4cR6s98BD7RNb65dMCkGr5fQwpaPs7vzNpNz2smvoiJtAAqWC2v62G w/8hTjqDyD+gh2dl4abMQtAM+lOLNtnezkoOBJ9HCIP7Ewd/Jq4m26wPo6t7a2M6NGOF+euSzOxCqV xDRzPWIoXrL46RUhF3fN8244TrlDww9mwFYVTf9NMlwsrUrZKaj17RA65sbe8RGbKykL4Jtqif9CNW DIiqaYqxdnBnVcXoyZS7MEm8hoCEcUZHM4pdXdq49POIYJBK+L3fekQMK07OToNPvC9u+Kx2DJjKRF ddIO1yHtCEDZAgi5YF7bxGn+sHXVyxs8niOg7upYzS0gs57AIAlOfSaUipkG5nRoiT5rRYqIu/jW+m HjH0QTjM4CRcsDnuV2aIVN7/bzjU2NGr5RlJ1j5wQx2uEfXy9rm0zGiaFHpKkj9m+p7ESvldLwiKRQ qqYeFOpOJ/bqRBTnbygUt6h1MtE/8/jlmOxo/RWHfrakoyfp+gtvOTxS0SkA== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_014822_902457_A4CC5086 X-CRM114-Status: GOOD ( 10.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This fixes the following: audio-amplifier-0: '#sound-dai-cells' does not match any of the regexes: 'pinctrl-[0-9]+' Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts index 17c38bb3368c..e0f15d824249 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts @@ -24,7 +24,6 @@ dioo2133: audio-amplifier-0 { compatible = "simple-audio-amplifier"; enable-gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>; VCC-supply = <&vcc_5v>; - #sound-dai-cells = <0>; sound-name-prefix = "10U2"; }; From patchwork Thu Jun 6 08:48:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13688055 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9964EC25B75 for ; Thu, 6 Jun 2024 08:49:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=KX7GCFsgPRgxMmaOc9ZbqQiYdQoYVvSWqg7uuR1jqNU=; b=r2F7GljMXWrvuJ E6XhTmtZZjC2UO2jDNoL1kayh1zfZG8SrXaF0fzC3SvCmGgjvQd5FJREbxBWFVvcxymdzQPWEj785 KJbtltuNYLxKyssXpirF1TbJ0ZLcTsfQPbC5XK1vulCaHK+fIWdYh7bnPM8XgJvSjNBvAa7a5xnDs GeJDhR8RH3RnSlTqAZiTKOcEB0xDTzzuSoEl5tBF42OnYr9tUIboiRxyNTnVj4Rq7Nidcl0EK2Cdo GLGkNwd+K1LO5FlPDifXLrUJCglNiazhxxlmbZeOqoNsdXBMuRqTbsI9TShQQnu5EARlI+ma7qocB 6hHc75Az6woYP1qpWoBw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8np-00000008uk6-0z3Q; Thu, 06 Jun 2024 08:48:57 +0000 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8nH-00000008uIg-3LGu for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 08:48:29 +0000 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-42121d27861so8271165e9.0 for ; Thu, 06 Jun 2024 01:48:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717663702; x=1718268502; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=uLN9fK/Q1IJ4qkUSkkhIFN2WinWIfdWij0oNshXV/Tg=; b=hAyA2utswy3ft4VzYLKj5812v+I9sdyz6sb+o/szmnOaEkKZpqCCqzjgn6Q+ppnffU cb0Ar2VPPlcuPIKJYng3J2pJs+sWuZb83nVykUUtWBSpEPCCRVJ9BJAW7pdoNcPoBXJX ZxhtI6x+VvqSFHImPwpyY4pyofiur03MeCudsx7djsF+lKR4COUnoa8LKKetACLMEcB/ XEQazVktGOz1NkmuLH6smohox9xWJZIhr5rmXd8LzFm92/+MwG2qi1e+MYNm45+myPAQ 8onZVVT8wWXoqxa/y/oV5oaXxGD7HuI6qc5ujLOiHiOe5cZros+IMcO+yEM/arnsVnfe npRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717663702; x=1718268502; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uLN9fK/Q1IJ4qkUSkkhIFN2WinWIfdWij0oNshXV/Tg=; b=VIykPUCbE1YuqordlgOy7T3c8W3jcVTb+p8IggjobbPpZco5ejPuRefdWnoBvh+NBo V4mvilRDvbnxdwsqtrDi/zWvhPcTtxP/ng2iVED6AZT5cylwVa3rAAt90indT4Ee/7+s X5vI93sdXK0d0a+/m+A+tM9Hoog009m3pM2K5LvnlVn2oo3qFesbXW9KpVvmeovpyuhg oXq+uEQqFvT+osPt/VV+RtuZfwBDdGjHBgE1C/2vQGcPJjeTuanqOCys/+QZgadNlHJ0 rYrmf4+CCyxt/0CTcG3rzr+RJ9N7nQtVPmdXy4F2+rfO4RVh/g5O7eDL2RbSnpmdT8rH yQFw== X-Forwarded-Encrypted: i=1; AJvYcCUdVP1az87RWzI6dQB+osKHfl+NvSXi3ZaAojeDwTkgxiwGMOhUgYWZMENeTzGalu1JG04OONJp3xx1JdND0NEBITmoGuJgRztVdTMR5gAFflgoX9c= X-Gm-Message-State: AOJu0YwcdsXPxehKqi9E/ENbc9MucCqGD5jsoUxQsOr1ZxJxRJKgHQpc cYtDVjNQfxya8QMjyzrBW/NSJoZQ+3tUqfZLZeTlply3BkWHrb/kHrlpAydMrBM= X-Google-Smtp-Source: AGHT+IGSktBg3igi8GWb9dMcYgXr4zEw/a/r8SvoK8C+S3AVdKHbOjSJxzo4An/FUE+mEFAirB1IAw== X-Received: by 2002:a05:600c:1f93:b0:421:b79:93fd with SMTP id 5b1f17b1804b1-421562e7053mr41861205e9.21.1717663701851; Thu, 06 Jun 2024 01:48:21 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4215c2c690dsm14227445e9.34.2024.06.06.01.48.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 01:48:21 -0700 (PDT) From: Neil Armstrong Date: Thu, 06 Jun 2024 10:48:14 +0200 Subject: [PATCH 07/12] arm64: dts: amlogic: g12a-u200: add missing AVDD-supply to acodec MIME-Version: 1.0 Message-Id: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-7-62e812729541@linaro.org> References: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> In-Reply-To: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> To: Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=632; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=QM5KvwfkUBuCDEX5LFM5kIWXkN8IDPDmIiueKWnAI5s=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBmYXfMvEjLwITtzgzOM1XlPBOixFpTSMM8sfqbyqdF jR8DHTSJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZmF3zAAKCRB33NvayMhJ0Z/0D/ 0bRThBlCqq1W0Khr0Zfszttq737tMTpibC2xEl0q2XEFXFkrAaBCa8Zwl8TWdE0Xqb/xuP1IXUFs/3 pXnRqbQU8sdjX2t/kSCFK+mTC8wh0hO0aeJS1ZICcTyJB84VFBN6Rr0rK3bfXHJEZ041r4m25gRmXn ZnYCO165uSStzXf2YCZr+aKjWI8M0nA03xQGKo+98t5IlK3+05GeTvWm0+2ec6eXWcNYEgUwmRsu44 1OawnEzUKdYmsuRqFVNDR6TMIH4NpGirQmXU2Tci8wUEB7062XLYEyz63r77f46ED6i5w94S90ef4d UhTpSZYQX0Py0VsMu8kg1h+uDI2+jLQz10L3a8C0NE+v11Wy0kq6lSOprWFZboK0g0FP0YffEW3IZ1 ruDJQm6B0bjYwavT+yDWItMCLy61OJWbCTgS5lH/EESO1ZYWAJrPvmOO2onkNyHPmhuYa0p988Omi3 bCJqx7hcNcVsvGaRbs2obDkfnHhN1Yodh3KnjcsrH1p3PEvMfcW/MUW9yThsoyxldfdfrk0RB9hUgB 6kTY4auJ4Wr9VC5S5rr1jj9u6glDRJ5tbv4I9jW/BbAQyGRr+i26KBYlo6zoVazkR7GBHWCfT9BoqP a6LLIe9yfEqabV1Mx/R+zMwKyP+LA8CBKXVfipCS9x8IjYhE23UKrKax6WWQ== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_014823_948604_3F1CED62 X-CRM114-Status: UNSURE ( 9.45 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This fixes the following: audio-controller@32000: 'AVDD-supply' is a required property Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts index e0f15d824249..7560e471c56e 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts @@ -365,6 +365,7 @@ codec { }; &acodec { + AVDD-supply = <&vddao_1v8>; status = "okay"; }; From patchwork Thu Jun 6 08:48:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13688056 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A91D8C25B75 for ; Thu, 6 Jun 2024 08:49:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4vUAWDdbKL68PuzMJD/RylDcj3Y/3izdQ1YX1chLWrY=; b=wQ8hb1WY7kL4M7 DxSIDFQgX2/wMBtejErWxHGBFlG8UNS4OuyyM1Z9iXQDeHyyPwVo1Rad9XuOBk+qP1IngkKyZXrJo r5BYVK7pbAdn8/jSlIPcLC/8ielw6rfb+Rk0pP6NmRpDEjTjid6DMkPo39lAR/bHJYt6EwU0V8K0q 3/b0NdKTSOTpIaj37T0ry96cnb3dONfE3qeKnWbMrtSbmNWojAo1u9VI4Vmo6+QiIO2VJp3+xW1ne SfifSbqqXXUURjG7v0W7vuq1pRNaEapiZYi2Wci7kwC3tnRL484s0tM8MdtFGIz56V7jsHBHCySLH HGxtip9ujy2Y7oVHZPLw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8nu-00000008uoD-1y3I; Thu, 06 Jun 2024 08:49:02 +0000 Received: from mail-lf1-x134.google.com ([2a00:1450:4864:20::134]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8nI-00000008uJn-40nq for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 08:48:32 +0000 Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-52b7ffd9f6eso752983e87.3 for ; Thu, 06 Jun 2024 01:48:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717663703; x=1718268503; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=27gmnNsoJ6HXtUPU106pR+r/c1X658WZeUED3nGHh/Y=; b=SduKQ6zqDw7OjVSYZSArkILhz44vwd3Y+rvMPSO/zhaVvCxzQYoTyMaF1McZtqevRV v1xFwrypCVDy/njaatpkgbiSsjS5xe6rRfQvR/NHogUQRS5sIgMt2XYqf1R9+aNfSz0Y d52xoReIzn5u0whD/gSzQmreQ9JzV3SrI2kpcHAvgGj+cqJj/Mt4RYcJaAmOSSPpj8nu /VWcmDJuHEjmc3mDHDHi6dcwkkxrjCgx/sZao7rv4Orcc7gbAQYsECcxfAWR/bLkoqQd RZpudqRezNyEBkFsG29BibJaoUQXRsDhqSBlKy+IvBv2sd3ERoyd1Q5OKEzraVZwhbvD 7saQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717663703; x=1718268503; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=27gmnNsoJ6HXtUPU106pR+r/c1X658WZeUED3nGHh/Y=; b=gnoJzLhuNj45l3PBnPpoEQ92GRfWHxavLei5cjABxid3iA1eaCXdVnIZ8xCm34sXFM nB/1SRhh0psDMJKcF7AtfuKk3TJW9OArf0nzm7FR7FuwzNLAuhWr0RmRW1SqROa214Pp 7QpA72qM5JxpLJqIM79OiTPbU5zMzEbKFzmh3GyZYjRZqpXlvbEkui29furPW/0SusiN e2HuCPRn0G4+99XhtjwPYBeoG1Y/xmpMlCPhwPMRy/JMlx5wF9kHOoSlY3Es8WVW6PzX 1KG8ZiVHhtUX6POMB4WfgLD+q52t3WLYz5wt+ctl5BCRxyO2BZ9MwPwvZRfsbbd4z65O s/AA== X-Forwarded-Encrypted: i=1; AJvYcCXDwSiWV/fEyCiA20f0GNa/gSQmm1+yFBCZEH8iQtcYAo0Nqvwm3i4vF98X2RZ/d9Cxkc5y1iW2N3RZQjahjniR2SZ/NFoXvFnxZoUXkuMmcbvm2IQ= X-Gm-Message-State: AOJu0YziYFAUywcYKViXm5qJii7nb6ed1cqazOMvv9viV4Ijz8nxlVq7 Mrx4p0e+0CWQcgBsT1BXZlN8ZImhamX31aMav5P4ANRioJDCi2DORJQK9EuIrPw= X-Google-Smtp-Source: AGHT+IGXDaDltuNvg0lnLePu7p+2cIQ5/S3LaYhvqarTkyBrf/S+D5/CYg6sscw7EIkStVWmrItywg== X-Received: by 2002:a05:6512:2255:b0:52b:7a10:4690 with SMTP id 2adb3069b0e04-52bab4f94abmr3324133e87.61.1717663702699; Thu, 06 Jun 2024 01:48:22 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4215c2c690dsm14227445e9.34.2024.06.06.01.48.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 01:48:22 -0700 (PDT) From: Neil Armstrong Date: Thu, 06 Jun 2024 10:48:15 +0200 Subject: [PATCH 08/12] arm64: dts: amlogic: axg: fix tdm audio-controller clock order MIME-Version: 1.0 Message-Id: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-8-62e812729541@linaro.org> References: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> In-Reply-To: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> To: Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3277; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=23uf+y06e6zrelJODSL+O1c7OCV/TWnd4Br3Dn6tpoE=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBmYXfNU8ucarOPkFh8o6TGaQoMaB26+xAPHT38nBTg Rbm/AjuJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZmF3zQAKCRB33NvayMhJ0Q3CEA Ckw9qqht8eI238qxR5P1bCG3tBQVZ0hC4gZzckFjYm6TJLzPl96awB59aa7kt8FWbTPVe5qVW3udqy tsgd1aH8Q1GTlNe8264ESOtPHHZq1XF0VbTicSVj41ZAgurVbquyo2rkboJzWOQOn8VoBUQIJ+vzCf UKpSmpTe6xBdnJnYkyZn7bKFlqJS9wFpEmTZQb64/seSm7Dk9h+Eh3pd/pSHjtblCY0zDsKtoxNRvq u/P74ZSsIbp2W2hPleyoICoDek+DpzkoJsdpJUfTioLLLzY82xoskn280TyXHgGqPRTdLz0y5QOT+g v6Y9IRzaOr+nv/qQe1bm60S7tezZktoUnm8ZySrXjVpf/TYnvAFjbHh+SMXpD1/0YVcX0Fn5R6uG+v bu5u08e2QtTVConfEsXOfYEZsPi2J08mLSwOoZfrxge7BrgIQSr3ZIiRX6n4n6R1VGlbUtyNri0SJ6 f5eX8lxYvq44yH1jRKJ289IxNCd9R1upvE9IsvXS1mdMC6zlW6bSgiyLQs50mSIwG9aBZeAmHL5bYd S7cRU9FatM2XX67118sXNYaJl2wUBDY6mVThirWBkaKliCg4QacmRdoFJdULbjPrWoLF9V7q7s+hCn ygBodb8/DQh9Q+FpOkU96+6ewosL6jNsk1Dk6YZ5NXEfeMqMdD7GKbZIbFzQ== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_014825_189543_D0072C50 X-CRM114-Status: UNSURE ( 9.87 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This fixes the following: audio-controller-0: clock-names:0: 'sclk' was expected from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml# audio-controller-0: clock-names:1: 'lrclk' was expected from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml# audio-controller-0: clock-names:2: 'mclk' was expected from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml# audio-controller-1: clock-names:0: 'sclk' was expected from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml# audio-controller-1: clock-names:1: 'lrclk' was expected from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml# audio-controller-1: clock-names:2: 'mclk' was expected from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml# audio-controller-2: clock-names:0: 'sclk' was expected from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml# audio-controller-2: clock-names:1: 'lrclk' was expected from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-tdm-iface.yaml# audio-controller-2: clock-names:2: 'mclk' was expected Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index 6d12b760b90f..e9b22868983d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -25,10 +25,10 @@ tdmif_a: audio-controller-0 { compatible = "amlogic,axg-tdm-iface"; #sound-dai-cells = <0>; sound-name-prefix = "TDM_A"; - clocks = <&clkc_audio AUD_CLKID_MST_A_MCLK>, - <&clkc_audio AUD_CLKID_MST_A_SCLK>, - <&clkc_audio AUD_CLKID_MST_A_LRCLK>; - clock-names = "mclk", "sclk", "lrclk"; + clocks = <&clkc_audio AUD_CLKID_MST_A_SCLK>, + <&clkc_audio AUD_CLKID_MST_A_LRCLK>, + <&clkc_audio AUD_CLKID_MST_A_MCLK>; + clock-names = "sclk", "lrclk", "mclk"; status = "disabled"; }; @@ -36,10 +36,10 @@ tdmif_b: audio-controller-1 { compatible = "amlogic,axg-tdm-iface"; #sound-dai-cells = <0>; sound-name-prefix = "TDM_B"; - clocks = <&clkc_audio AUD_CLKID_MST_B_MCLK>, - <&clkc_audio AUD_CLKID_MST_B_SCLK>, - <&clkc_audio AUD_CLKID_MST_B_LRCLK>; - clock-names = "mclk", "sclk", "lrclk"; + clocks = <&clkc_audio AUD_CLKID_MST_B_SCLK>, + <&clkc_audio AUD_CLKID_MST_B_LRCLK>, + <&clkc_audio AUD_CLKID_MST_B_MCLK>; + clock-names = "sclk", "lrclk", "mclk"; status = "disabled"; }; @@ -47,10 +47,10 @@ tdmif_c: audio-controller-2 { compatible = "amlogic,axg-tdm-iface"; #sound-dai-cells = <0>; sound-name-prefix = "TDM_C"; - clocks = <&clkc_audio AUD_CLKID_MST_C_MCLK>, - <&clkc_audio AUD_CLKID_MST_C_SCLK>, - <&clkc_audio AUD_CLKID_MST_C_LRCLK>; - clock-names = "mclk", "sclk", "lrclk"; + clocks = <&clkc_audio AUD_CLKID_MST_C_SCLK>, + <&clkc_audio AUD_CLKID_MST_C_LRCLK>, + <&clkc_audio AUD_CLKID_MST_C_MCLK>; + clock-names = "sclk", "lrclk", "mclk"; status = "disabled"; }; From patchwork Thu Jun 6 08:48:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13688057 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AE63DC25B75 for ; Thu, 6 Jun 2024 08:49:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=iGTD/qSjgx+u/s89bbgUbShOCIsN1l2OM+p7lFBgA3k=; b=qhY03ZmaWXU7Lr 2TtOXdVaGEVVP+DMEf0higII5yzOAY8+7uJaQbmakinu9bkF6i7/ZjmpI5SYQnivfxfV64PkeD91F /Hcjh7pfV9K7ytyrThlGZqVmQ646DmH9MGaCdcAsYSlLpQnLgUqou2dGWn1W4CgtA5pIcnoHj7Yp6 d7NJ1nrBMMoBV9OIXWrhPLyj/1vnDpbafWvjrCLkFA+8Z+vQXlYOQ5zuk182v2bPLcQDubj7Xeye2 Zdys8Tla7bT9uD3RvNRcwO+5HhKJk7n4KDimxt3RqP2VlJTuWHaAkjo9RadXGwjzsmQKX+RXH+PlL fRc4vN/dwvlLSJ5l/ecw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8o4-00000008uxE-2iFT; Thu, 06 Jun 2024 08:49:12 +0000 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8nJ-00000008uKS-2YNx for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 08:48:34 +0000 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4215afa33b7so7710605e9.2 for ; Thu, 06 Jun 2024 01:48:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717663703; x=1718268503; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=whthHnnAV0riUU9YI5GKHGEVmsmBElqPPF6sWdWzQJE=; b=uJnMDADxf7cYWtSlf7ZeAujAwaOoh87mB6EqQ+mAon4LR4LSLO2FY19Ncym/ZFQU3C qM/3VygQMDxcMSNZsKCexMLMIoaRw1zhG84TNxuUZR8kKtvM067Pv8QNaOlqRPa7hguT CTukr0eRSwdbdcbzw7HArZ/ZZVyWg/zOQUmmO+KlduWaTfvbfzxc/OL0mMGLAjh46xzR +98O6O6ZmnuFxjyT2wNQ1pQ2dje97suDlCfseIMlKh+t/rszXEfbeLPv8odkcEYPuDnS Y0fVlLAkpLig+sJ+tn3U4NnmsBTegV/J2pNUkjrWiSCrnlFM1SQ9D4C8ktSyFktjuXcd 9rYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717663703; x=1718268503; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=whthHnnAV0riUU9YI5GKHGEVmsmBElqPPF6sWdWzQJE=; b=IkIrLIaTzv6rfNDAUDXvzc+cnOQ8Z8alQUWDU/TkZLMlUlYpW2cgbUJWVnL/jtIxyQ 2+gjWKAgNTuUIe8bTqVSeCqEokISYYOXisHEXqwQ0F5hIYDRIGwDxEN3hWrJxsNnDz/Z SyZwAGXgH4xL9oL5JV03zVDI6UFpPEC0koTyDMABZtZj1Cg9u9/7DNSohq79sJagB+t/ KYNEQ824yvfwkGLSeftR0DZk/L5RZ9SBAwcr9NkCuqq32V56i8eNUTMulLw8B1wYFTvh IIv+Db4AXp2L1HBMu/uCHBxWVW98/Z7YzK2R9QQ7Har7nFYlRvHpuECyqli5UCTPUdh0 o60A== X-Forwarded-Encrypted: i=1; AJvYcCVTXXMvun6n0sCTPCOZ2j0YaAy6q8/ZwbvzkhplJ8UWS0CK8az8J3oAXIz8xPQHn7vysXj9+kyUSqHUbdoOy6WN8Yebn/5tvdH3d9IpYM+bjgyeP8A= X-Gm-Message-State: AOJu0YyBHWdFS0QELmx9rav6X4+3yBEk9XIOiEOuxF5/v5kzmezvpJ/T hLeBsBIZSL6rSrlAm8OQhY7KBlzrkMyI2xh/YP03nAsp4143m0ZH16pctCRGRZg= X-Google-Smtp-Source: AGHT+IHu9gterr3sxhxkdqJc5Qs+YCT5HRh4tbwy1mr9JObTnqFltnf5YOEZ1L7+4uLq7kG+fY0Zsw== X-Received: by 2002:a05:600c:3108:b0:419:d5cd:5ba with SMTP id 5b1f17b1804b1-421562c7de5mr43085835e9.7.1717663703498; Thu, 06 Jun 2024 01:48:23 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4215c2c690dsm14227445e9.34.2024.06.06.01.48.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 01:48:23 -0700 (PDT) From: Neil Armstrong Date: Thu, 06 Jun 2024 10:48:16 +0200 Subject: [PATCH 09/12] arm64: dts: amlogic: c3: use correct compatible for gpio_intc node MIME-Version: 1.0 Message-Id: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-9-62e812729541@linaro.org> References: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> In-Reply-To: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> To: Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1360; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=JAb6Muut5KHcHBna9lqyRERkBmnN5hdIffo6dmjjMoM=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBmYXfNVIBKe2IvSZ6gQuVXIN5vKTJ3pwx4qJvciHA0 3AAwnYCJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZmF3zQAKCRB33NvayMhJ0QqjD/ 98Nzxe2ojQV6/tCKNgn41bVNKl6EeN2XuOF8cgyikF4ikKDLr3ZXy2up1mw7VOhMf01UbwSjgr1C4P piW84JnlGWrLfXCpayYik2PNUIdiukP0GML4QSFI3ocSm4R3X8Ckym73SJ0OiPSmrZ+RLk1VjMle3Y S1+Woo5F8rZyqTm7dsUU6zrc9QALRO+Kq8YxJGDsjtgtCvIg77bfVxeEc6NuIhPLJLM0aofdPX1xsL rvnbM/3srKQJowTvAHnLJ/zwqH7bkjUWMQtBs4VeOW5RxRSZ26GATIOnFMzxWYCPgZflqGm4vYjQrG 5b+FwpjdiLceVA9K3bOVzexw5ZQShZlq+CNkurR71kKkKtUHtqAui4ZhlhhJAFHLR6deX9pkEa6rgl Pz9iQkbeEcFZVv8koL2ayhN4h8TNvZ3J9Ea5U7vE/nNHE/1QugpUhPg6uB8KMU6u4gP08ScHoWapCP SFHCwJJ686Syjqs1v4teMvOlxosixnc3UKc5ehxN8kE7K15z/ulxkMkP6SoRaG2n4nc7WVOvBQDDZx 5Dm32dCvBr4cyUu/4pUu+lyCOw/gyC5YYEwie3Dmzj3Aju7kmo0owozHrCJAYMwZIV8lOs5l8f9O76 hGj3E9qnpgegW8OFm+BBo5IjuxETEBf93ahUQVJT1DATJWw8kjiZyRnkkT7Q== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_014825_835654_4D80C6F7 X-CRM114-Status: GOOD ( 10.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This fixes the following: interrupt-controller@4080: compatible: 'oneOf' conditional failed, one must be fixed: ['amlogic,meson-gpio-intc', 'amlogic,c3-gpio-intc'] is too long 'amlogic,meson-gpio-intc' is not one of ['amlogic,meson8-gpio-intc', 'amlogic,meson8b-gpio-intc', 'amlogic,meson-gxbb-gpio-intc', 'amlogic,meson-gxl-gpio-intc', 'amlogic,meson-axg-gpio-intc', 'amlogic,meson-g12a-gpio-intc', 'amlogic,meson-sm1-gpio-intc', 'amlogic,meson-a1-gpio-intc', 'amlogic,meson-s4-gpio-intc', 'amlogic,c3-gpio-intc', 'amlogic,t7-gpio-intc'] 'amlogic,meson-gpio-intc' was expected Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi index 32a754fe7990..f8fb060c49ae 100644 --- a/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi +++ b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi @@ -111,8 +111,7 @@ gpio: bank@4000 { }; gpio_intc: interrupt-controller@4080 { - compatible = "amlogic,meson-gpio-intc", - "amlogic,c3-gpio-intc"; + compatible = "amlogic,c3-gpio-intc", "amlogic,meson-gpio-intc"; reg = <0x0 0x4080 0x0 0x0020>; interrupt-controller; #interrupt-cells = <2>; From patchwork Thu Jun 6 08:48:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13688058 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 53971C25B75 for ; Thu, 6 Jun 2024 08:49:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vOg8w1UEWy1FE2wBr7gwx15rx4r8SCWCBKC2CG00ePo=; b=ASqAgNdqegmgzi cBLl+YTTGQzFdivRShkR4k2WhEHkKLcb1KkuMMyb/ZB19UaYnVUYc8S+7KP34iV9Tc76loG0aepPb KaPINBT4xbs2yOeCgZqPqgcLbWwdm5f8+pXaj8Qa+gmiaXkDgn8lUPzsKwU4k2f1slX/LX3bBjelp JNl5XVkIpEc17t5aukl8RpBr4uv9OKngq1YdSnGtji40C6HfmPsTJ/FPq06oGLU+rCyh9LMjrObVP /LC83waVPXQuqc8sGzO8YAO4hwi3Jj3FcyOEKWqSy8HMmQi1CXeJa2L5AeAcHUMvKCOGfxop/i9o1 DSFBE6+/j3847cLZPnYQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8oM-00000008vCM-1mJs; Thu, 06 Jun 2024 08:49:30 +0000 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8nK-00000008uL2-1Lkn for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 08:48:37 +0000 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4214fe0067fso8117885e9.1 for ; Thu, 06 Jun 2024 01:48:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717663704; x=1718268504; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=md2vfydVbKRQKv8woiaMeh18dxE+BvhZ3JaDmoNvYf0=; b=OkTm8CbEKDcdQYgkfB/6wUeAgrZrbbxnndsmiH49B7UpMttLTMAXAWOloytMpdL3NX jliNUQ6GlJu2/V/jmN4bcSJaRCTOM5ljb4C7w6KekFHIz+7Y5c1Pjemb2qE9q032pK0s +1BgM2LVVyv9RffmqPx7sHQ9uJ7RgqlcNhJZeM/yn5CeptsuoYfWcOSbk1gojUT3rguc a2XtzU4kXX2N9msErEk5zBO2GximoFcl6aAwId1BzjnbUpGY+13QcWF90176gr/IuMIc fvw/ZqzdgUJ/Nx9cF2Xo/JaojdrIpTZ0zetda673yuPkyjKjeIupdZj82r+Zv9LM8T8s 9hIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717663704; x=1718268504; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=md2vfydVbKRQKv8woiaMeh18dxE+BvhZ3JaDmoNvYf0=; b=VqT1YVoWaiSEriKN0tayzec4M9dfZAqjX4QhqJrNW7kZU18Z3HJlErjQ2mGFJnc2cr 0EGN7WkUMY+F0EM45+iQq9SrNVqyMPM84RNdNX9kb1X3lsJPov9LA50EeSkN+jizXTZ1 sz1upOhVuMIsNKA4coO3IfETcZI8suWr9ZDXP+/u8HiD+Co3FkS+P5veU+p6t9WKqC1N Mqw87LzwBTe5h5sucM7Mz+6OR0vU6/wvdvn6AtVOxgHFpBFRRaNGTmvUWGHuIrNO/fvN qnSXu6ZBq+qXCXCX5rGnbiuEwOpn8A8tMrYKU4MuI7T5zXiDIdPvWGP90b9HINNKOEVm i/4w== X-Forwarded-Encrypted: i=1; AJvYcCXy72bGOCMzTguNqkXIf0pgxWNkDlPi2+SXr4XMNsL1GkHiiCt3KkS/GA+shlyolxvI8LH0uw43o5u15nWg57ZH6/Jfx2EyswdlLI5ODvoLOP1gfhs= X-Gm-Message-State: AOJu0YzheRSyOuF/zqoDHgyC8MWtJfldwHAihG62G5QgESXNAVLmExI8 y/oMCk67t6omNCFTwgBUEtnUhUglawlGgm/9srQ5wpH9EEqxeRJtfruinjNVRAE= X-Google-Smtp-Source: AGHT+IHjqikyO2a2r3mJKCcsb9JEmLNmKaMvv1xJrL/lxQZAcEccnBqavzwKFkxKLV+bqKvAAFyDqQ== X-Received: by 2002:a1c:4b15:0:b0:421:497c:b5d9 with SMTP id 5b1f17b1804b1-42156338836mr41812145e9.29.1717663704270; Thu, 06 Jun 2024 01:48:24 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4215c2c690dsm14227445e9.34.2024.06.06.01.48.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 01:48:23 -0700 (PDT) From: Neil Armstrong Date: Thu, 06 Jun 2024 10:48:17 +0200 Subject: [PATCH 10/12] arm64: dts: amlogic: a1: use correct node name for mmc controller MIME-Version: 1.0 Message-Id: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-10-62e812729541@linaro.org> References: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> In-Reply-To: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> To: Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=814; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=kKhJhZf74EGQXvkurWzqim/0Eg8JJMF38UR74hRhQLQ=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBmYXfOYScb8JqlWb2OYfUPRFA3UVIVOPnwKpb63Oac RwvPvG2JAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZmF3zgAKCRB33NvayMhJ0aY8D/ 9QxzooU3G1/kRr1f9KNPw9mPI5WJXraQKb043yFOjGM3Z4LS/gHT/L3zcJalbJu9oAS2BEf0UDIyb4 6Y+0Y9FL/A0mkYplSF2dpHe8b1zmvZSsDIPT0bsJ+LVbDoDR+Yl5pv/eCpzsc2qE/7bUuzSj0uGTk9 R4N6Ury8OraFMCTBhuzTnki46GttXQRVDLgyHXoWdU2m73sbGRn/yFhVdpxZWwopZsH7OZK8k77La+ v/1gx7quJa7fgzn5dN/Iw50wuWBzVAJi1Md5hDAAQvUs4Dgqn1VRC1XdkLlNGT+uli3T6sKhkvSmr8 F2iAWcXRendQjCzuH+N47uRhDNq0b1DiWqyv21Zbefw3NlM/UzWRAbttgWsvLHzSTWBWbznhJrRDFZ vv/XObpgirGyW3mP8Obe0EW2RBPeftYB66gyAXZV9jHeNGGRAOAKwBDYzc4Q8ULp0qsOt6TvRlNNR4 e2Co6NnuOLR14P7WBsr7nYmAAi0wSgIlKM0brve+E+nmDjhcMU9HyaiHR/EXoSbFAW1UB3GZjsfnK8 6gKAy5JtpLE+ty6Ds8EqpAiXMAZqUeiSnfVzF4dwPFwdiuFAWHbO89ySf3xcmr7gngWzjgMuKqOj64 KF8HJpbBx6x5fN894JLD+ydBScpR/+xpQsRCCCYkfr7jHkGL0dvbcG7LpiSA== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_014826_861981_57F1CE97 X-CRM114-Status: GOOD ( 11.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This fixes the following: sd@10000: $nodename:0: 'sd@10000' does not match '^mmc(@.*)?$' Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi index c03e207ea6c5..4be801d12c4b 100644 --- a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi @@ -419,7 +419,7 @@ clkc_pll: pll-clock-controller@7c80 { clock-names = "fixpll_in", "hifipll_in"; }; - sd_emmc: sd@10000 { + sd_emmc: mmc@10000 { compatible = "amlogic,meson-axg-mmc"; reg = <0x0 0x10000 0x0 0x800>; interrupts = ; From patchwork Thu Jun 6 08:48:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13688228 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0AAA7C25B75 for ; Thu, 6 Jun 2024 10:02:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=pRfWRkEQdjUI4l1/3/E7rGCURVOX2raULW8eK3m4SP0=; b=kl1JnO5e6YkHwH 51XyA1z5Fh47z/qR3og0INj+U7At3Y9SyV6MmdMXTCHvrDkXLCtX4XgrTqLpAR5L7SH5hAsUAXm8O OuAyuqNy6CpsUEUFRhxIMsQXB0Fgo8HkCCWnTDUJfWpQVTe00R2lgkWKEeKufy44BKAGEyfQkEEoH 7qIvn2Jj2X19swAeU1iimoqsKll2d8S2+xbh2bT4kdhfeghVd5+MVaRgxTh6z15vRgd2XVAqdM4xc CNB6DLfeIkCHpdIMTU1wxClM9Muyy6RBhhWmDaaGjVmCCg2zzBAugLS4HUb6Xnpbtvc7JOpxYUzzI av2FNFEG4f/LkbWfk8eQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF9wU-00000009JcO-3fuP; Thu, 06 Jun 2024 10:01:58 +0000 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8nK-00000008uMG-2Dc7 for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 08:48:37 +0000 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4214fe0067fso8118015e9.1 for ; Thu, 06 Jun 2024 01:48:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717663705; x=1718268505; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=JdxVYMQSwsBjETYXUb/TiJR6/kX0EA1fzEmOgzqhPuQ=; b=JYU8T06mgbGOsIppW/FRSTcH/IHGJHbUkb4Rj2cG4piMnRPaaZbnfjnOGBqZZAYef0 yJ0/0M4oJBHOlZrrDQpdpixa/CgTYj/mv9HLu2yzqMv9Y0sbRLbUVed2EkHlg7Vbnfmi z51eVI6s5/gDFkvSeRBt/SrpPBWAbKAkHUmwa5V8HMODYZDe4VGss9nBniRD2Qr3mxg/ tMCA7AjtOAsqhhOSbxDUY1p+h4m7QhvZw2SNAv+bVpdXtbVrCYTf9Q0HUvcfjleE9X2T 6jpXp3Giex3cb4EMifnuwPsmJTHqNiaC+xw4/gGTECSu3hgbU++Rv9e2PYS/E1mlcb1j OoCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717663705; x=1718268505; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JdxVYMQSwsBjETYXUb/TiJR6/kX0EA1fzEmOgzqhPuQ=; b=IfeozNqe/TQXayAt+uVAaMWCRNjLGXeOPO/+QOCQ+JBkMW71yrjbtcDeoC4Y8GKKON ontM8yhXbLain7PFSiWq0Ekein76hwt9T/EQimYE6mLz/hUAM2LSWI1CAwZYcZwFprP8 iHEZUcPoEiDEcV1as/fy8ux8gxw16ra20rvPyU/BVL2ebN97vmFv5dgZ1Fjo1ozsuK88 Rfj7J+k8IV3rUOnEBxw7/dmvY+snk99/1kDoMUT91JoynIp+a88Qz1TiRYWUTAdO05Tw GuL3dJ4YqB7q/1+qY5ycxrYbSI7xA//sg6kgvw3UzYHbdxqjgSm/0FrPRk5uu+XRlEXx uuvA== X-Forwarded-Encrypted: i=1; AJvYcCUnmW142kOFXxXd68253omnKtWUXsZ8zOwYnFaS91KAwIL9J8Y4RaSHYNKXWo8MzOFRB3tNJ5cYAFC28GslNqdwgcBlUgYmMTPp5Z+ZutkG9IkmhJQ= X-Gm-Message-State: AOJu0Yz9XRaptoaNLuBSzwUYzTfLt70mh6hU83kU20tqZ2yMhXmoFQgZ Qjh5039jCdMOAUYcMh7CBQlSB2Hd2Ay1JUSVC6CxqKt0ZB4pYkGaYbsjp3O52LQ= X-Google-Smtp-Source: AGHT+IFgBJznRwWmXlhoTzwqKs7ghgTMjkOwyXK3mR+0BcfvkTEQacyLBQZBl3X+FE+uIo7F0zE8eg== X-Received: by 2002:a05:600c:19cf:b0:41b:e406:5ae6 with SMTP id 5b1f17b1804b1-421562cf319mr39231825e9.9.1717663705084; Thu, 06 Jun 2024 01:48:25 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4215c2c690dsm14227445e9.34.2024.06.06.01.48.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 01:48:24 -0700 (PDT) From: Neil Armstrong Date: Thu, 06 Jun 2024 10:48:18 +0200 Subject: [PATCH 11/12] arm64: dts: amlogic: a1: drop the invalid reset-name for usb@fe004400 MIME-Version: 1.0 Message-Id: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-11-62e812729541@linaro.org> References: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> In-Reply-To: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> To: Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=761; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=zlmLcdUmYl0S4n0pRhWJV5tV26JKeT3szLzZNHMzvlI=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBmYXfOhMzyc+h9+JVkIjeLiJwkC5RIgnBGzlwVjY/q 6rUuKkiJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZmF3zgAKCRB33NvayMhJ0RrOD/ 4hoFGbYDtDrSzDp/8RkgMNtJHyHQbgjQoe8bid5k3WIoTSIs2HT4OsTd+NVWYzoHxpcwiO9dKp6hRG DxZHkkv2qdyh0FGFAqP2tqInuS7ZzCmC0+7YMKNPbZRiBtMSomUfS0g0jFmVaE74GoYS+FT+sL18BH YeTOeDcsggbJFR/wpTLGj7bcNobfkWSrmN0RGgpVYWmbUcX4+Gfsj8JpKggUOa/QzBHeaDT4qD4qUh q3sJjsxEaM6jK79ATjh+HOf38oWIM+xg5LwghNEvUT2L+awNu7Uwo2CwLhGJucU9BPLB4y1MX7HuMV tSZOI4gre04jo8nRU8YSal5o/q093SVDfa8u+SRApA29LbBLjEx45jXOQ+FrsnV4YAAIY7A7fuomCV X6GurODT2X33NcdkQzt4zonX/5rZ7deD4zy0qpFnU7fH0/zcoTrwshlXyRKyLaKDqYHp9flB6pTCOd OLN5DVQt8VfKLSvk1pzTetHpxToRpIjg4sEeJ9aRpR1Rj5uO/6yfX5p3K0I16sWWGK6ima5ZLHjJRO /8/P06M6sYEt++JkHo99VuSxDkDF0eZL2BT9LBrwNrN7clHqHLHonTMoDhGEaGrWNTRCcBvqUF1wds vxJlrpMzP1MrD7ek0tmVFKItmHGE/k0mgg32p9F+FdARyNPthG+VCNw1hG/w== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_014827_167217_899A32E5 X-CRM114-Status: GOOD ( 10.03 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This fixes the following: usb@fe004400: 'reset-name' does not match any of the regexes: '^usb@[0-9a-f]+$', 'pinctrl-[0-9]+' Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi index 4be801d12c4b..ade3a51ce89d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi @@ -453,7 +453,6 @@ usb: usb@fe004400 { assigned-clocks = <&clkc_periphs CLKID_USB_BUS>; assigned-clock-rates = <64000000>; resets = <&reset RESET_USBCTRL>; - reset-name = "usb_ctrl"; dr_mode = "otg"; From patchwork Thu Jun 6 08:48:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13688060 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E20CAC27C52 for ; Thu, 6 Jun 2024 08:49:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4q60TXRLNxrObNnvWr6y0Hri23c1Btl3dJyLaQ4FkKI=; b=KpGv+s2ZDoQEkY Csh15va4MMRHrFISOBeohJz/pxJCYjayaJw+glZlMq6hwi/ItHmpe6HdYoOduS09zi1Jh+WJLDRhr TQNazDdomICNWx1C47fdYraHnvB82tO4XE2jCt2xfwAqwPsrdPwnZZJm8/BU4vO4HlVgHlbVHxtee 9C/sBiy6XbR9HIuZDIREZ75agLGob6U/AjY/UQ6EwZIB6fmyi5p1T9hXyyTHoOTu0r93ERhakkGt2 hYH3Tmr9JWcyzVFlL4q5buxMoTIhbHYKCdOlJ/wFHmHkZ9MGJt7Krn+NNZ3eT4pPlxq1defxUTHfA Ej0fNP4gvahhk1yDw3zw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8oR-00000008vGt-41Gj; Thu, 06 Jun 2024 08:49:35 +0000 Received: from mail-lj1-x232.google.com ([2a00:1450:4864:20::232]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sF8nN-00000008uMx-0L6C for linux-arm-kernel@lists.infradead.org; Thu, 06 Jun 2024 08:48:40 +0000 Received: by mail-lj1-x232.google.com with SMTP id 38308e7fff4ca-2ead2c6b553so6777421fa.0 for ; Thu, 06 Jun 2024 01:48:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717663706; x=1718268506; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=pUKn7nRoMeLL5mqRvKldIOdmuSCawvGpeoUFhl6OTCA=; b=T3ew1f0W2JsVbl4KysuMGxJZwndM8FhsrIDFFLCoCOV8CJAA928eOpzHrBggx5BaZe hMQUiQRdt9d0Sfc0sJsVmaUcikO4r82mZl9IeYdYKAGT3YBeBcz+iX+TI6liyDbN3Bz1 tGk4thQTdw9RvuvsxFmpqOsc3iOAhge8yzZsOY45oA3TsHk+WHwJMBo6QUJobw9mo5t7 eu65UigmJtdpijtBkULgB8VFJ8SsJ8Vd0nohAY3X3heqOjEzTIsUm0XCUWb7pILDskEn uKlLukScTzSkl7Zbkp8FqfALqSwN7OK6bpqLSEQ22GmqqE4vXGHEBbSkKuD7NrBK2uBn n8bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717663706; x=1718268506; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pUKn7nRoMeLL5mqRvKldIOdmuSCawvGpeoUFhl6OTCA=; b=mWdyBJPs4+Rje2nJzD7BaPtJASnBPoKv70dlw9vd75fXnCfKhukEvnV3GmfRnSA1D1 GbicRTC6azn6vgyNsEmk3RbWXXfdBg59G55rRygJqJNHiB8N3mP9LvyUEyTyH4UqOxqN OnDtYjbWQ338QtZYp+VWuJJxdgYCnAj0GsVaSWWKnavs3dQkvtCqhWywghvcMSJkCReL sxA3lhjhQyPUSjMWSZEtvX5p5fRdkw8ZoM4YuhOdIYxPCCxr7F3GWmnxxhHMUF3EZYSj 5aVmrCVpoh8CouFQd0UETmNqPY7N4EK+ax2ml2Qog/nI9FqAHjc+kL/P/XzL3ozNR8i8 EuLg== X-Forwarded-Encrypted: i=1; AJvYcCXdIi+OaVt8nQ5lhn0MKT24LYLOA2DPy2I9EQziIrEPC48X2QQPrjVnodARaB1Zp5X6etmDM1egsOnVZHXoropmejOTa5rc7JycoswTacdBRqqY7c8= X-Gm-Message-State: AOJu0Yxs0lMbRm2ueKKjnM0CvdLj4nzXVy1a434CDXlGn44H2JNHHc3A vDJDtpXklCwgSW59D0W0uFzhEiSNMDP7C5a+41MQcpOa6jyS0L6lHMBwBX7a8gY= X-Google-Smtp-Source: AGHT+IHrdV+x4TijqSa/FABtkOHGZVw6OnDi1dAynF+1M0R/1Oxx2xSnUnffhNF9+XNMmeVoZm9OrQ== X-Received: by 2002:a05:6512:3da8:b0:52b:b4d7:ba55 with SMTP id 2adb3069b0e04-52bb4d7bb5bmr912193e87.29.1717663705942; Thu, 06 Jun 2024 01:48:25 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4215c2c690dsm14227445e9.34.2024.06.06.01.48.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 01:48:25 -0700 (PDT) From: Neil Armstrong Date: Thu, 06 Jun 2024 10:48:19 +0200 Subject: [PATCH 12/12] arm64: dts: amlogic: gxbb-odroidc2: fix invalid reset-gpio property MIME-Version: 1.0 Message-Id: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-12-62e812729541@linaro.org> References: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> In-Reply-To: <20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-0-62e812729541@linaro.org> To: Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=866; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=CB2bPtaDpU75ktGs22gfMyRNjffoEcH2n3mjNBAk7PQ=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBmYXfO/q9TsnRTODhpmyAtqQzWilWXGX5QAleIeFCi DdjYcruJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZmF3zgAKCRB33NvayMhJ0UsFD/ 972tFQmlu+yOj3Y3cb41aRStMfvlb1KNBydlDb4519AfovBO9UKgEg2eC9x0DxUYuocvuaqshslDMu 8Jl48g6wGafXwyIuemsdnD5bdnKFrJnSgztIo/j010AMW2FrNTOHm30iN0HkTB9Jzv2eZyvhTSXmZM mlxpjEmqTRRhiyhSJbFjio3EqeGnaf79jtlqEq/cx9voSEOxsNDPo21Ru3+H0Le1mIWs350NhJzVzf UHUZQmFk/d5Nwy+k8iab+mCWwk2/OvVEtnPROWR2xDj5xxorBA5qwGMqofLtRTBLvZu1/hfBplDJpy taK5Fc6sNCBVvw2L3lt4jZ4NdbkEzzTCl5/pawmpls13eIBzKPcKS8oclR86HbkxIubZoZN4YiKsaj 1QPPDrPJdKvFqUzfJLA+zosKqFEJkTfEfA5U/sWRBY+2fJXZf1XAeZBl62cWAL0P/Bez22+1bLTtsj G89uXpy2VhYLqEv6eMlYmoWfWsTF1tfZEBno75A5KLWczU7IFPJ7t+GcDH0do3wZjeL+RBF1O96SxH vvpvBnec20o1WZs+DWereAy8ZUeLZI8KOAJdeedPPeTMGATc9rqMufHW4+949yUW/IasisYiCLk+gn gan55yYYfRzcbVROlstDGHRL8OAlgGP/Yce3Usl5+SJO9AppT+agJHTwgDRg== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240606_014829_279913_320BC3E0 X-CRM114-Status: GOOD ( 11.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This fixes the following: hub@1: 'reset-gpio' does not match any of the regexes: 'pinctrl-[0-9]+' from schema $id: http://devicetree.org/schemas/usb/genesys,gl850g.yaml# Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts index d4e5c960d4cd..cafbd5f5b913 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts @@ -411,6 +411,6 @@ hub@1 { compatible = "usb5e3,610"; reg = <1>; vdd-supply = <&p5v0>; - reset-gpio = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_LOW>; }; };