From patchwork Mon Mar 22 00:39:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 12153443 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09AA2C433C1 for ; Mon, 22 Mar 2021 00:41:31 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8FF3C6148E for ; Mon, 22 Mar 2021 00:41:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8FF3C6148E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=semihalf.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=wxQh16IOaJTRIVpWXS1KrPNpMXxEqdciuJf6ii0j0ow=; b=E5PjPETGQNZVMD+CdTX3wNxUCF YxSXm3a4PfAAk6h+zxLE8ZBoLIdElqi11DvKZo/Ko6KJuEnSoijlphN91NhwRPmiH6blI6d8zvlDd l7lGTHX6NMMLPyD50ZH+oYDZfsVxPu8334a8eIwaxS11CNavAXQYHzsSsbrMNU5Fd7kOSEaKjtN0+ Otn647p5fwwGQltHqDPU148D5Xy4XW3uXsSUDj2TfTNPD/4NcEX8E5eeUjb+X67gFbRvlECtrkiv7 sMThLxQJ/46ua7v0mcm4D6b+LrrY2zJ0tVxwdKT2YcmZORutZmgIlFNP+4H6TS6s8Y3xG8bVDu+pC ajIZ0/hQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lO8bp-00AcPa-W6; Mon, 22 Mar 2021 00:39:54 +0000 Received: from mail-lj1-x232.google.com ([2a00:1450:4864:20::232]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lO8bj-00AcPC-Vc for linux-arm-kernel@lists.infradead.org; Mon, 22 Mar 2021 00:39:49 +0000 Received: by mail-lj1-x232.google.com with SMTP id r20so18982284ljk.4 for ; Sun, 21 Mar 2021 17:39:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BgZ7HgNTm/UP99/YoRuqdj9+3TXma4Ehz1JtkcBaT5Q=; b=HokPlg6gMGIZVQ4DU3bzd0RTLuMjlseq3sDQ4OyN87nORSN83HFNDj5GkksY46/M2e RyfpOc7i7MwU5lKpuds78vAkNb3vLDvYNbuwaVIR8I8tzIzWjpHX0VVZdOxzOt2p8n35 XnBYSmJVIVrWxqMbah2EiPTQcZBsp7lpE8ucG4r3lce3VAuls+64rqhQSuhzrHSBpKdd 8cgXjTgdhVaaZwrc0Yu1pqcp3gLp1kRoyzMtnYw/UTHoKskR+A9ld1NnDddYEDlDexrR FTlD1p0vfoBzGoz2j6ztI+JvPUY9VwuyaGQKEiXAmPT0TOXA/0yHKp1Rb+8vYPwoGDbd qgYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BgZ7HgNTm/UP99/YoRuqdj9+3TXma4Ehz1JtkcBaT5Q=; b=DeKOSaJztxFMePli5Rf/JMiN4ritip0Tf3zk8Jpb1gSYV1t41wghzGTukxMsyXcYwI /pKuKQdY+JiCfo6oZpN4572EIm3/m1dvjwoQkfRBmapP7eW9wKvTb/PsykafJM1s7dtg TigNwoUCsBvFTYjiXs0RMrF5puusmjKvk1sN7D1B0e14OmvDuq1b8h2yZWQL5s1YwNxv 3AIzLeMn6eoahb3iv2t6KkCT25/0szXR0rdU+gMACFWv6JwN2zVLNIIdFSLlVaAmDmKX oZIlkTH1eMNNsUAhXzRWVXGDPFQQgHjPJLwG9FaVSiu6Hz1gB9lfUYtUlJam678648zp 9AtA== X-Gm-Message-State: AOAM531DG0oJ6Y8wJGRrAHuTLbv/EiQyWmQMyGdqVtWVgeIuCTVKxTgu ajDJlC7MyAIDq3S6l6yhfj31YMlKK45wHYvR X-Google-Smtp-Source: ABdhPJzF6sSQk4GqGecvPY0obUYGBn4a8JXhCfM6eH/VIQYzkT4p/77yJ81+X+dUVdeywWYQXSx6iQ== X-Received: by 2002:a2e:8185:: with SMTP id e5mr8020563ljg.138.1616373585692; Sun, 21 Mar 2021 17:39:45 -0700 (PDT) Received: from gilgamesh.int.semihalf.com (host-193.106.246.138.static.3s.pl. [193.106.246.138]) by smtp.gmail.com with ESMTPSA id a10sm1381964lfu.263.2021.03.21.17.39.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Mar 2021 17:39:45 -0700 (PDT) From: Marcin Wojtas To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: andrew@lunn.ch, gregory.clement@bootlin.com, robh+dt@kernel.org, Marcin Wojtas Subject: [PATCH] arm64: dts: ensure backward compatibility of the AP807 Xenon Date: Mon, 22 Mar 2021 01:39:15 +0100 Message-Id: <20210322003915.3199775-1-mw@semihalf.com> X-Mailer: git-send-email 2.29.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210322_003948_177743_FF42C11F X-CRM114-Status: GOOD ( 12.77 ) 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 A recent switch to a dedicated AP807 compatible string for the Xenon SD/MMC controller result in the driver not being probed when using updated device tree with the older kernel revisions. It may also be problematic for other OSs/firmware that use Linux device tree sources as a reference. Resolve the problem with backward compatibility by restoring a previous compatible string as secondary one. Signed-off-by: Marcin Wojtas Reviewed-by: Andrew Lunn --- arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi index d9bbbfa4b4eb..4a23f65d475f 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi @@ -29,6 +29,7 @@ cpu_clk: clock-cpu { }; &ap_sdhci0 { - compatible = "marvell,armada-ap807-sdhci"; + compatible = "marvell,armada-ap807-sdhci", + "marvell,armada-ap806-sdhci"; /* Backward compatibility */ };