From patchwork Mon Dec 18 10:55:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Yan X-Patchwork-Id: 180276 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp1156551dyi; Mon, 18 Dec 2023 02:58:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IGEJXAW6Wd7N7CIyZ6r1QrPwVyv4ZUaRsfVrzOtyv5wmOfmGcMOoOYpBP02ADkDn8oPN76U X-Received: by 2002:a17:90b:1286:b0:28b:6209:8346 with SMTP id fw6-20020a17090b128600b0028b62098346mr483179pjb.90.1702897085007; Mon, 18 Dec 2023 02:58:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702897084; cv=none; d=google.com; s=arc-20160816; b=NaVDllbrwi7zn4kTHvpZDjpPiMLAkoR60JGmDr2g3GX+XeFgdIYKEKTW2/Ap/INEeI 1qvp2A/4T+Hdd4V5WEQqnXbhUSU/RZdekk7wZKBgFyaFt/vk8pZW2naVwnFuI6EIC7wm N1s2VXcJNM/HuCp1rN1xAjiU1MvBj+0n6KwHBUnx8KDvZPm5jqWnGU1vnt92Ae8r32nJ C7zPIsfCYo6PZCqcy8jYynh+71szjKPArTcXn4QqZdZ6pAZkeL+hOuBY9b5BymyQr802 JkxBOfJVgpooxgb64EqtE6HmEWHw2btvj26bs4M/GFTclUHM5OyKt3stJI7PUNo2ST90 kZkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=gwe4zCDjtQz1QKeidqQfolK+ZN+4nQnHqxy78omjQGE=; fh=7bz9NiPhHc8Sm8oLn2h0LU1iRiy3RnhVWzCCFWFUq0M=; b=zI7Ul9Hc5c0NdLfTUH5cqWd9xgYnlK9DT35brlnnrRdy5KA5K8nkp+qNUJF+x9PR7v I0FBh5pOmhmssDVKlSMn4WtTdqcGRzBdmXjJqX5AwHcewNEDHrl0rio81aYZXLg1Vkwy JypKAU4/w9J4CzuKvrH+sk+L/Jso9Ua5u7bD5FhHsLHGM618AvQUfmj7j22SOI7Zg+XF gyLN+377dCjbdi6IVVGpuaz/4IT4JtJ0tFam1wvCNt+ub5U3r5bFZNXPJvX9qnlWczzc N3UqYd6CYczULJxm0Bo1Vbi2qIj2UdRIxEYm6d+wBYiJEzf0xkQV8MGUGYkgF4Wxu5sm jhPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=XPqW6oTY; spf=pass (google.com: domain of linux-kernel+bounces-3391-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3391-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id s20-20020a17090aad9400b0028b3b607137si4965899pjq.116.2023.12.18.02.58.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 02:58:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-3391-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=XPqW6oTY; spf=pass (google.com: domain of linux-kernel+bounces-3391-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3391-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 85604B218EC for ; Mon, 18 Dec 2023 10:57:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 285A91A723; Mon, 18 Dec 2023 10:56:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="XPqW6oTY" X-Original-To: linux-kernel@vger.kernel.org Received: from m15.mail.163.com (m15.mail.163.com [45.254.50.219]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EFB6419447; Mon, 18 Dec 2023 10:56:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=gwe4z CDjtQz1QKeidqQfolK+ZN+4nQnHqxy78omjQGE=; b=XPqW6oTYieu8ROm5Akl3l jMmVSzu99c8+QMhO68cwiIQmDLML2nrU38ZjLiJNFalFhCN1/oFL6Xsm+galhFIZ BmFvUDtAvVmMZB/Hz3K8RZjbXpKHKNXmDju3R4uZbUFJHd6GqjrSCMG6b1mLItm0 Twq1MXzgRS3/zyoTvJs0bs= Received: from ProDesk.. (unknown [58.22.7.114]) by zwqz-smtp-mta-g2-2 (Coremail) with SMTP id _____wDn72EdJYBln1v+Bg--.7214S5; Mon, 18 Dec 2023 18:55:31 +0800 (CST) From: Andy Yan To: heiko@sntech.de Cc: krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, zhengxing@rock-chips.com, Andy Yan Subject: [PATCH v2 3/3] ARM: dts: rockchip: Remove rockchip,default-sample-phase from rk3036.dtsi Date: Mon, 18 Dec 2023 18:55:23 +0800 Message-Id: <20231218105523.2478315-4-andyshrk@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231218105523.2478315-1-andyshrk@163.com> References: <20231218105523.2478315-1-andyshrk@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: _____wDn72EdJYBln1v+Bg--.7214S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7Cw15tr48GFy8uF4kWF1fXrb_yoW8Cryxpw 13ZrZrGw4xKr1fZasrtwn5Ca9Yyrn8Ga1F9r4xJw1Iqr12qr95GF1a9rZ3XFyUXw42vayY 9F43Xry2ya9rZaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jdZ23UUUUU= X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/xtbBEgVKXmVOBAp8owABs4 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785617013758188562 X-GMAIL-MSGID: 1785617013758188562 From: Andy Yan This should be a per board property, should not be put in a soc core dtsi. And when this property convert from default-sample-phase in linux-5.7 by commit 8a385eb57296 ("ARM: dts: rockchip: fix rockchip,default-sample-phase property names"), the emmc on rk3036 kylin board get a initialising error: [ 4.512797] Freeing unused kernel memory: 8192K [ 4.519500] mmc_host mmc1: Bus speed (slot 0) = 37125000Hz (slot req 37500000Hz, actual 37125000HZ div = 0) [ 4.530971] mmc1: error -84 whilst initialising MMC card [ 4.537277] Run /init as init process [ 4.550932] mmc_host mmc1: Bus speed (slot 0) = 300000Hz (slot req 300000Hz, actual 300000HZ div = 0) [ 4.664717] mmc_host mmc1: Bus speed (slot 0) = 37125000Hz (slot req 37500000Hz, actual 37125000HZ div = 0) [ 4.676156] mmc1: error -84 whilst initialising MMC card I think the reason why the emmc on rk3036 kylin board was able to work before linux-5.7 was that the illegal property was not correctly identified by the rockchip dw_mmc driver. Fixes: faea098e1808 ("ARM: dts: rockchip: add core rk3036 dtsi") Signed-off-by: Andy Yan Reviewed-by: Shawn Lin --- (no changes since v1) arch/arm/boot/dts/rockchip/rk3036.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/boot/dts/rockchip/rk3036.dtsi b/arch/arm/boot/dts/rockchip/rk3036.dtsi index 5344803442a1..466952bf9db4 100644 --- a/arch/arm/boot/dts/rockchip/rk3036.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3036.dtsi @@ -287,7 +287,6 @@ emmc: mmc@1021c000 { clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>, <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>; clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; - rockchip,default-sample-phase = <158>; disable-wp; dmas = <&pdma 12>; dma-names = "rx-tx";