Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp3145106pxa; Tue, 25 Aug 2020 12:41:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJznWwRdZEuFIatk3z5ESmjttmcKs99nLC6acupFQfQjl2lcBURDJVUdTenCEOmetn5CvDrv X-Received: by 2002:a17:906:2998:: with SMTP id x24mr9394788eje.131.1598384470538; Tue, 25 Aug 2020 12:41:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598384470; cv=none; d=google.com; s=arc-20160816; b=SOhLFwYQjUR+TvWv7SLM8L6w368rIZ3t7NU6B937uKiUS8aIF2tcGmObLnNclx8+M7 jLSr3eXEf5CxJ7sLDdhdyuKWaOAZZGf2V5GH3AO8aZqSjGlOBvJ8IsgQFaYIpK9TPPP8 jYGx8mzEdJBZUy/CoUchXaxhw6u9DoIMJdz5C9U0x49soHvNevxxOxfgCtIEFl+XK5Bd 0u7CBuulgverTo49um2AbOSJx+O3VLpydg23u9enKnedBgbkHXmXFiqKnGO+HE25IigI x6y3WStEpYRHbJPNFaXqRGRWGShhJ4nYi5A54871NYf0YjA0WlS3+d9IeirPF1YEslg5 lOqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=BFoChNGbkAaLWsyF5DN2inOzToArtJ+76xxBmucvBtg=; b=qx/RXYoBcHLhCQgvZ5cOrV8dA1ZTB3DpwBAeKkGfyfVEmwBNCTfvZO4G6oyXNy+Mp/ g4mTslK4JvSHUhScCpJgQfDhKqULpP+OnAOFdRC2hiztCUo9sqBJWzj2ai9LtxBbclSi hywF6zZBTfPWOZo1PI85F9X1DBtD2AAzjZFza3/4eQGx3h53SOAqqum1ah0LP1LEfKon KVLcvKgsFyNJrPPOnyT8D59hZWZATlgaygSobl/5OD4B1ScOV3+lpbciuTIvUfq1YZkF TSwmwUqhphIw2gRJgTKnru4ZesYNtmTPZZGdBvWGcw2GChV7xB92uoohCeYPRd/eYsMD YzzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wZYN9o64; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n8si4358ejj.649.2020.08.25.12.40.46; Tue, 25 Aug 2020 12:41:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wZYN9o64; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727074AbgHYThp (ORCPT + 99 others); Tue, 25 Aug 2020 15:37:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:43046 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726180AbgHYThl (ORCPT ); Tue, 25 Aug 2020 15:37:41 -0400 Received: from localhost.localdomain (unknown [194.230.155.216]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 79B9B2076C; Tue, 25 Aug 2020 19:37:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598384261; bh=oLRBjrakobO00fQoSHuH7N5PbZAoKW+gBHMvclqPiN4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wZYN9o640+VFHGKh1osxq8NjcnAVTCAs0ov9HzZBc6xlW9uvTt88RXvE/chPYzK1A 8Z5yemHpf3GD/1tQGnMTagBv5e1hNVAhv3XYkXtJCM54QXePe9Xq2vdBnkl3U5MbXK CKWDGAtOnMYsoXLtfGVazUeI07XZvl30zs0l+7HU= From: Krzysztof Kozlowski To: Rob Herring , Linus Walleij , Bartosz Golaszewski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Ulf Hansson , Miquel Raynal , Mark Rutland , Thierry Reding , Anson Huang , Li Yang , Han Xu , Frank Li , Fugang Duan , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org, linux-mtd@lists.infradead.org, linux-pwm@vger.kernel.org, linux-serial@vger.kernel.org, linux-pm@vger.kernel.org, linux-watchdog@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v3 12/19] dt-bindings: mmc: fsl-imx-esdhc: Fix i.MX 8 compatible matching Date: Tue, 25 Aug 2020 21:35:29 +0200 Message-Id: <20200825193536.7332-13-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200825193536.7332-1-krzk@kernel.org> References: <20200825193536.7332-1-krzk@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The i.MX 8 DTSes use two compatibles so update the binding to fix dtbs_check warnings like: arch/arm64/boot/dts/freescale/imx8mn-evk.dt.yaml: mmc@30b40000: compatible: ['fsl,imx8mn-usdhc', 'fsl,imx7d-usdhc'] is too long From schema: Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml arch/arm64/boot/dts/freescale/imx8mn-evk.dt.yaml: mmc@30b40000: compatible: Additional items are not allowed ('fsl,imx7d-usdhc' was unexpected) arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dt.yaml: mmc@30b40000: compatible: ['fsl,imx8mn-usdhc', 'fsl,imx7d-usdhc'] is too long Signed-off-by: Krzysztof Kozlowski --- Changes since v2: 1. Remove moved compatibles. Changes since v1: 1. Handle also fsl,imx8mm-usdhc and fsl,imx8qxp-usdhc --- .../bindings/mmc/fsl-imx-esdhc.yaml | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml index 10b45966f1b8..e71d13c2d109 100644 --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml @@ -21,23 +21,26 @@ description: | properties: compatible: - enum: - - fsl,imx25-esdhc - - fsl,imx35-esdhc - - fsl,imx51-esdhc - - fsl,imx53-esdhc - - fsl,imx6q-usdhc - - fsl,imx6sl-usdhc - - fsl,imx6sx-usdhc - - fsl,imx6ull-usdhc - - fsl,imx7d-usdhc - - fsl,imx7ulp-usdhc - - fsl,imx8mq-usdhc - - fsl,imx8mm-usdhc - - fsl,imx8mn-usdhc - - fsl,imx8mp-usdhc - - fsl,imx8qm-usdhc - - fsl,imx8qxp-usdhc + oneOf: + - enum: + - fsl,imx25-esdhc + - fsl,imx35-esdhc + - fsl,imx51-esdhc + - fsl,imx53-esdhc + - fsl,imx6q-usdhc + - fsl,imx6sl-usdhc + - fsl,imx6sx-usdhc + - fsl,imx6ull-usdhc + - fsl,imx7d-usdhc + - fsl,imx7ulp-usdhc + - items: + - enum: + - fsl,imx8mm-usdhc + - fsl,imx8mn-usdhc + - fsl,imx8mp-usdhc + - fsl,imx8mq-usdhc + - fsl,imx8qxp-usdhc + - const: fsl,imx7d-usdhc reg: maxItems: 1 -- 2.17.1