From patchwork Mon Dec 18 10:55:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Yan X-Patchwork-Id: 755642 Received: from m15.mail.163.com (m15.mail.163.com [45.254.50.220]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 11806199A6; Mon, 18 Dec 2023 10:56:27 +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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="IDSAkXb/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=M+QB+ W4x0XaSH0qLHe9p44+VE5HHYX/QVSrXFOkfL7o=; b=IDSAkXb/r7PmhAbB6wrqP dm7J/h/5wrYDHVhkqiHK9iF1mpkD5B+j/J6V33NtCGo1iTOzaG10Jsm+Y7KFgv8B NDG+Bszdy8pdy11I0nvlBA76ViS61kAsWM1FhMTiCjYMfvupBFjVsrgdb6nUOClG hIwLRpT3tijujTO29c27Rc= Received: from ProDesk.. (unknown [58.22.7.114]) by zwqz-smtp-mta-g2-2 (Coremail) with SMTP id _____wDn72EdJYBln1v+Bg--.7214S3; Mon, 18 Dec 2023 18:55:29 +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 1/3] ARM: dts: rockchip: Add psci for rk3036 Date: Mon, 18 Dec 2023 18:55:21 +0800 Message-Id: <20231218105523.2478315-2-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: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: _____wDn72EdJYBln1v+Bg--.7214S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7Gw1kAF47Jr48Kr17KrW3KFg_yoW3XFc_t3 WfW3W5Ga1rAr9Iq34DGw48u347Cw40kFZ3Ww18uF1UJF1Sva1kAFWktayxJr15CFW2grZ3 GFWrXa1Sk3W3ujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUnAHUDUUUUU== X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/xtbBEgVKXmVOBAp8owAAs5 From: Andy Yan The system will hang at bringup secondary CPUs without psci node. Signed-off-by: Andy Yan --- (no changes since v1) arch/arm/boot/dts/rockchip/rk3036.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/rockchip/rk3036.dtsi b/arch/arm/boot/dts/rockchip/rk3036.dtsi index 78686fc72ce6..5344803442a1 100644 --- a/arch/arm/boot/dts/rockchip/rk3036.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3036.dtsi @@ -67,6 +67,11 @@ display-subsystem { ports = <&vop_out>; }; + psci { + compatible = "arm,psci-1.0"; + method = "smc"; + }; + timer { compatible = "arm,armv7-timer"; arm,cpu-registers-not-fw-configured; From patchwork Mon Dec 18 10:55:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Yan X-Patchwork-Id: 755641 Received: from m15.mail.163.com (m15.mail.163.com [45.254.50.220]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CB8ED199A5; Mon, 18 Dec 2023 10:56:28 +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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="ZewPbAys" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=fBHGN YITHW0NUuAbOpjQ5mbFub8s+SVFwFReNTMyTxo=; b=ZewPbAysTlmLbeW5F4VHM wvF+qvlZ05kVH+g6wTcli2otts+H/iGV/7HgOBc2SaCL2FgMCtl6MO0bchd4TzNU N+f13jXv2iIFGmoBNQll6Di2SC1aKTDXVu5fLAZNxHd2Lq76U5IX+TQKOr4VlVhc xRUiTp/UbYDWBa4rHxwxRA= Received: from ProDesk.. (unknown [58.22.7.114]) by zwqz-smtp-mta-g2-2 (Coremail) with SMTP id _____wDn72EdJYBln1v+Bg--.7214S4; Mon, 18 Dec 2023 18:55:30 +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 2/3] ARM: dts: rockchip: Add stdout-path for rk3036 kylin Date: Mon, 18 Dec 2023 18:55:22 +0800 Message-Id: <20231218105523.2478315-3-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: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: _____wDn72EdJYBln1v+Bg--.7214S4 X-Coremail-Antispam: 1Uf129KBjvdXoWruw1fKr45Zry8uF45JFy8AFb_yoWfGrX_ta 43Kas5KFs7Gr15Xw1Dt3yxW343CwnakanxJryvyr1UJF1qqw4kXF4vyas3tw1YkFWUKrZ7 AFW5Xa1qqa1akjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU0puWJUUUUU== X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/xtbBEAdKXmVOBAprAwAAsO From: Andy Yan Add stdout-path to get a uart console when system boot. Signed-off-by: Andy Yan --- Changes in v2: - Fix typo s/patch/path/ - Change subjet s/arm/ARM/ arch/arm/boot/dts/rockchip/rk3036-kylin.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/rockchip/rk3036-kylin.dts b/arch/arm/boot/dts/rockchip/rk3036-kylin.dts index 67e1e04139e7..f12fa3831bbf 100644 --- a/arch/arm/boot/dts/rockchip/rk3036-kylin.dts +++ b/arch/arm/boot/dts/rockchip/rk3036-kylin.dts @@ -8,6 +8,10 @@ / { model = "Rockchip RK3036 KylinBoard"; compatible = "rockchip,rk3036-kylin", "rockchip,rk3036"; + chosen { + stdout-path = "serial2:115200n8"; + }; + memory@60000000 { device_type = "memory"; reg = <0x60000000 0x20000000>; 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: 756212 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="XPqW6oTY" 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: devicetree@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 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 --- (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";