From patchwork Mon Sep 20 16:41:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 514342 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp2264904jao; Mon, 20 Sep 2021 10:19:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMBhNpK8qCIAIvVKoFq/kLpuXM6JqMuGKxLo5oEXdIWbHEreCBeKdh760Fy2LhZU7ySxMo X-Received: by 2002:a05:6638:3890:: with SMTP id b16mr20824317jav.65.1632158349939; Mon, 20 Sep 2021 10:19:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632158349; cv=none; d=google.com; s=arc-20160816; b=oouSrEgK7/KSvhp3AR1n1dbkr/ROYxLMs1MZXUsxoUBqFM0HoTRoS+r026YDgP0+Hl X5e8aOsZp5U9swhf+ZMj5lI+ihCzZcNcYpOXqv13VbZIafvApmxqJFs3sSfV7ewo4Oqc nEVBrgACryT//RgIGJiZus7uaAyy28Inwm80tWDU3otpU3LdJbdrWraiu8waWOrWedmi e1pMhQr7X4EKGeE99WrG2DV5t+q1LARjttGhu1BKufi11VN3ixMt+APCSms24TX0TP5N ne8ou/UVFEY7uJVc+DPgEKzdudyYeRI6tCddgxm94uK6n8u0mmm4aM8vjYq0i2Bf9VE6 EsWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=CiL9Uu5ukrq679jxxyvJEYqR4BtEvB31JRawFUvvCgI=; b=NtTR+F6pb+Vifk7RFciavo9ZuboMwKm29LJwZxED0dBAMMzFnoZOG6ceuIHgm8ckq2 /jjAtGzNect9jKIF1EjnI2P7e8KHaEqw3WIbb1qODpAm2ncWFBYWi7lRk2eJOmMkdirf jNMUFX8bFEokA1+y514t0aeq/6SXJ7zrvOP6BUBnDKVlcvoWXjy6Ffd0wX3wmULbvBz2 wnpGOlfQAuxqvajWsBhkQX0FdTKWMWQ2K/30Y6Fa1ts5cyHeOMoVTU2fdgDVCQbz9Qdp hvYTofp73+7pHsHyvr1ZP7qP1WGv5MnlncDhRjiYe3S1iHkLsGiVKY8ATT57K4uC0g2J PsNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=djneZY6G; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h22si13620601jal.57.2021.09.20.10.19.09; Mon, 20 Sep 2021 10:19:09 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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=@linuxfoundation.org header.s=korg header.b=djneZY6G; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348892AbhITRUf (ORCPT + 11 others); Mon, 20 Sep 2021 13:20:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:46190 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346711AbhITRSn (ORCPT ); Mon, 20 Sep 2021 13:18:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6053761A2F; Mon, 20 Sep 2021 16:59:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632157191; bh=HPXnj/Qb0YFHLsTSz6Kt0aSpTtygeDnH2kVS/uy0QYE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=djneZY6GIbJrdwKfonZLsUL5lUpDdX/fCaewfMehtTA0DNsXDEjtOOkyGyefvcS6V 1hXZM4JcwpDsvafesHNHGT3mEd1iujl9d1gFp+icYA63p5nk0BB3nsyGc8mKEz59W5 YZb7NCEFu+7njwiTSxbeta+6TVHabSmiO4efe9r0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marek Vasut , Daniel Thompson , Lee Jones Subject: [PATCH 4.14 095/217] backlight: pwm_bl: Improve bootloader/kernel device handover Date: Mon, 20 Sep 2021 18:41:56 +0200 Message-Id: <20210920163927.857122329@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210920163924.591371269@linuxfoundation.org> References: <20210920163924.591371269@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Daniel Thompson commit 79fad92f2e596f5a8dd085788a24f540263ef887 upstream. Currently there are (at least) two problems in the way pwm_bl starts managing the enable_gpio pin. Both occur when the backlight is initially off and the driver finds the pin not already in output mode and, as a result, unconditionally switches it to output-mode and asserts the signal. Problem 1: This could cause the backlight to flicker since, at this stage in driver initialisation, we have no idea what the PWM and regulator are doing (an unconfigured PWM could easily "rest" at 100% duty cycle). Problem 2: This will cause us not to correctly honour the post_pwm_on_delay (which also risks flickers). Fix this by moving the code to configure the GPIO output mode until after we have examines the handover state. That allows us to initialize enable_gpio to off if the backlight is currently off and on if the backlight is on. Cc: stable@vger.kernel.org Reported-by: Marek Vasut Signed-off-by: Daniel Thompson Acked-by: Marek Vasut Tested-by: Marek Vasut Signed-off-by: Lee Jones Signed-off-by: Greg Kroah-Hartman --- drivers/video/backlight/pwm_bl.c | 54 ++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 26 deletions(-) --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -199,6 +199,33 @@ static int pwm_backlight_parse_dt(struct static int pwm_backlight_initial_power_state(const struct pwm_bl_data *pb) { struct device_node *node = pb->dev->of_node; + bool active = true; + + /* + * If the enable GPIO is present, observable (either as input + * or output) and off then the backlight is not currently active. + * */ + if (pb->enable_gpio && gpiod_get_value_cansleep(pb->enable_gpio) == 0) + active = false; + + if (!regulator_is_enabled(pb->power_supply)) + active = false; + + if (!pwm_is_enabled(pb->pwm)) + active = false; + + /* + * Synchronize the enable_gpio with the observed state of the + * hardware. + */ + if (pb->enable_gpio) + gpiod_direction_output(pb->enable_gpio, active); + + /* + * Do not change pb->enabled here! pb->enabled essentially + * tells us if we own one of the regulator's use counts and + * right now we do not. + */ /* Not booted with device tree or no phandle link to the node */ if (!node || !node->phandle) @@ -210,20 +237,7 @@ static int pwm_backlight_initial_power_s * assume that another driver will enable the backlight at the * appropriate time. Therefore, if it is disabled, keep it so. */ - - /* if the enable GPIO is disabled, do not enable the backlight */ - if (pb->enable_gpio && gpiod_get_value_cansleep(pb->enable_gpio) == 0) - return FB_BLANK_POWERDOWN; - - /* The regulator is disabled, do not enable the backlight */ - if (!regulator_is_enabled(pb->power_supply)) - return FB_BLANK_POWERDOWN; - - /* The PWM is disabled, keep it like this */ - if (!pwm_is_enabled(pb->pwm)) - return FB_BLANK_POWERDOWN; - - return FB_BLANK_UNBLANK; + return active ? FB_BLANK_UNBLANK: FB_BLANK_POWERDOWN; } static int pwm_backlight_probe(struct platform_device *pdev) @@ -300,18 +314,6 @@ static int pwm_backlight_probe(struct pl pb->enable_gpio = gpio_to_desc(data->enable_gpio); } - /* - * If the GPIO is not known to be already configured as output, that - * is, if gpiod_get_direction returns either 1 or -EINVAL, change the - * direction to output and set the GPIO as active. - * Do not force the GPIO to active when it was already output as it - * could cause backlight flickering or we would enable the backlight too - * early. Leave the decision of the initial backlight state for later. - */ - if (pb->enable_gpio && - gpiod_get_direction(pb->enable_gpio) != 0) - gpiod_direction_output(pb->enable_gpio, 1); - pb->power_supply = devm_regulator_get(&pdev->dev, "power"); if (IS_ERR(pb->power_supply)) { ret = PTR_ERR(pb->power_supply); From patchwork Mon Sep 20 16:41:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 514343 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp2264912jao; Mon, 20 Sep 2021 10:19:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyHqoLAX61lrsyKJcLYJrJimbJin4gio2nPy+mksAATWzcHtCwCmgjVl4Lhg2NzUdGHlkw+ X-Received: by 2002:a92:ce48:: with SMTP id a8mr18405732ilr.115.1632158358613; Mon, 20 Sep 2021 10:19:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632158358; cv=none; d=google.com; s=arc-20160816; b=GaDu5V8RmEwJoP4hm8fc99nYyOxG88J71QB8TvvW2TTmELUP42WzHfoFlQdboX+3bm pZfB2zbZfDwESJAxW8fuuzsPzk07pipH4YuaRiD9mzuO8vFG9vJbcbV6+UuGrREs1qfe vDn6PoK3DWYZ++hwQfHjrUV1/BnO3n+fW277Y0N4sr43ql62gQjmcf0yza7k8jl0NrSe eK1+oiWfxegYvohOLIQNe51gF7pu5FhdHjcJ80xcg4fp5Q/qlnSGnKY4J7IK3Hp45BlU BeSOFsgaQyQQvpyD+1GNkBOAShCWYXxKbR4G/0rCxamF2x97FYcp25aJI27Wnss6oeRT eacw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=4Cx/80a6QwNfQ3OTcfHgdKUL4h7zU0pKU0Xgh9Xyy9Q=; b=ByFHDx1R4vDis4EhqMcoW1XndrbLX6hRXTkfzaS5KYoOAiyr4hiW3MsCKjaH4ExmIv E1APyShkJ1uVg9kwjpFwF1eyCYq1E45M1S969K/4N8F7WsSMeLqOPUVh4TKKcPMtGsuK KX/OBf563j+IiRUNcm0pzGZtoHEvBHYB1qpX4/RnFkhNkEwk/KMFwLzxXEudw6eQjV93 eKlqMX0N00UfnDNNGgjdmbeAFKA4CievQ1x6rq/qVzRivMDasFYqRYZCzxtkxHa1QtyW tvL4Lzq9HTwer8rKJG7sTn8AEp0Ui40hSHVK3/HPBVHTy2d1mo7xhasc4x5XZPyxb3ht ZacQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zuWjJydH; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h22si13620601jal.57.2021.09.20.10.19.18; Mon, 20 Sep 2021 10:19:18 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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=@linuxfoundation.org header.s=korg header.b=zuWjJydH; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346957AbhITRUf (ORCPT + 11 others); Mon, 20 Sep 2021 13:20:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:48844 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348313AbhITRSq (ORCPT ); Mon, 20 Sep 2021 13:18:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8F86B61A56; Mon, 20 Sep 2021 16:59:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632157194; bh=2+69YOaFMQV3IeG+2xp7JYf6jg/oriN58muh/MO/R1w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zuWjJydHLAJmuJXAAm86qeMSZKpRY3A17YvA+IAs/nhp78FlXO0xT1Wt1eK9ofMoy sE/9pqVF/JsZE6ee3gPRbLay3WbVhLlGLqYJ8NxTsfvOzzi6XvGZidS8CKT3OFS6g5 acEqm7k2Q1fRO7iQWidFjZ80cf+E9Xa1vsAYkgrA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrew Lunn , Chris Packham , Gregory CLEMENT , Sebastian Hesselbarth , Linus Walleij , Stephen Boyd Subject: [PATCH 4.14 096/217] clk: kirkwood: Fix a clocking boot regression Date: Mon, 20 Sep 2021 18:41:57 +0200 Message-Id: <20210920163927.892559131@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210920163924.591371269@linuxfoundation.org> References: <20210920163924.591371269@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij commit aaedb9e00e5400220a8871180d23a83e67f29f63 upstream. Since a few kernel releases the Pogoplug 4 has crashed like this during boot: Unable to handle kernel NULL pointer dereference at virtual address 00000002 (...) [] (strlen) from [] (kstrdup+0x1c/0x4c) [] (kstrdup) from [] (__clk_register+0x44/0x37c) [] (__clk_register) from [] (clk_hw_register+0x20/0x44) [] (clk_hw_register) from [] (__clk_hw_register_mux+0x198/0x1e4) [] (__clk_hw_register_mux) from [] (clk_register_mux_table+0x5c/0x6c) [] (clk_register_mux_table) from [] (kirkwood_clk_muxing_setup.constprop.0+0x13c/0x1ac) [] (kirkwood_clk_muxing_setup.constprop.0) from [] (of_clk_init+0x12c/0x214) [] (of_clk_init) from [] (time_init+0x20/0x2c) [] (time_init) from [] (start_kernel+0x3dc/0x56c) [] (start_kernel) from [<00000000>] (0x0) Code: e3130020 1afffffb e12fff1e c08a1078 (e5d03000) This is because the "powersave" mux clock 0 was provided in an unterminated array, which is required by the loop in the driver: /* Count, allocate, and register clock muxes */ for (n = 0; desc[n].name;) n++; Here n will go out of bounds and then call clk_register_mux() on random memory contents after the mux clock. Fix this by terminating the array with a blank entry. Fixes: 105299381d87 ("cpufreq: kirkwood: use the powersave multiplexer") Cc: stable@vger.kernel.org Cc: Andrew Lunn Cc: Chris Packham Cc: Gregory CLEMENT Cc: Sebastian Hesselbarth Signed-off-by: Linus Walleij Link: https://lore.kernel.org/r/20210814235514.403426-1-linus.walleij@linaro.org Reviewed-by: Andrew Lunn Signed-off-by: Stephen Boyd Signed-off-by: Greg Kroah-Hartman --- drivers/clk/mvebu/kirkwood.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/clk/mvebu/kirkwood.c +++ b/drivers/clk/mvebu/kirkwood.c @@ -254,6 +254,7 @@ static const char *powersave_parents[] = static const struct clk_muxing_soc_desc kirkwood_mux_desc[] __initconst = { { "powersave", powersave_parents, ARRAY_SIZE(powersave_parents), 11, 1, 0 }, + { } }; static struct clk *clk_muxing_get_src( From patchwork Mon Sep 20 16:43:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 514344 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp2270157jao; Mon, 20 Sep 2021 10:25:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxG8XrzS/SZ8ZXUqRHFxxJ7iA5ubmhxsDM0sWOq/Pl34RWZ0GKADceVsaWdVMjVgbkNvGpr X-Received: by 2002:a6b:f302:: with SMTP id m2mr12119128ioh.180.1632158743473; Mon, 20 Sep 2021 10:25:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632158743; cv=none; d=google.com; s=arc-20160816; b=wF8PCylkZlrH/wynV8aLtt+JNW3fVwAN9jwj/5WmNDm8aGbe5MP2fn80eRYenieVt+ 9iHOHHPK3TrEKh0KU1JLspu6q9fbMSfMX/SlaxEfk7PV6iVeIuOOAi5DOprq9mdcg1wK sYmt1Fh1a4vqup4pm2lcJtAsc93o4Pb1wOJvrVcx87GeP3iowkKuwSmgm6FZEwxMviDa hl1ZpkPeuPnZ9XmZivlJ1/hf5+6KjwS1jxoUfXtO+0p2YG0g5cwekbf4jQ7ZPm0h7NNM 9xlgxPy//YiL/+mAdfQzvlHvyR36+gubQmNhVTTmwbCI7iMmTd5+g811W4yauMAVJojX G2bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8+G82qKyy3vNwDZI4h0d5W/77Ul+8WaeD9fY0jq09HY=; b=WIAqgBJdnHrhCGLkurYNPWQHuLKJLisz7PEZr0dlNB/caB/tFbXYSaRoY19pOY44Ip TWHT9l0KJKCuzaTrXn/EWKLTPnOx1DMPdvyNmBX8XJ56hE6NLGhbgmeVRH5cuw/NDgAN B8FHwndtZf/5YlWOpRouwEKvtyti6ig2bX66Lkbzkex2F8qdwuPVSfFe+uwpxQCnY/5u g2jZ/XMguWzIQ9tEvOxayICl9S7G4aXKALxV2syCH20pf9j3xCPBoCVFHrg4MXB2uyaB s1jylLyCXJsV4NjE/2jBc9OmLOMrUDLU96UwubtsBKfaGjy8Bn7egGnENA1LP4a0GK+1 zAlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=m687PDiR; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d16si3876421ile.92.2021.09.20.10.25.43; Mon, 20 Sep 2021 10:25:43 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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=@linuxfoundation.org header.s=korg header.b=m687PDiR; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347886AbhITR1J (ORCPT + 11 others); Mon, 20 Sep 2021 13:27:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:54874 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349912AbhITRZJ (ORCPT ); Mon, 20 Sep 2021 13:25:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E14656126A; Mon, 20 Sep 2021 17:02:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632157335; bh=mJMmkxwxd9M8+jmz6WOQ+szENOwFVOrm9qIV68A5zwg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m687PDiRtRigsSQ7VcqNffERw/dGjqcqU9nJF8EJQSfip8G6vokn6zdf796LSELbx ESULcQrieM4IZHYXe5hMiCe8WA6JNZJCI+50Lpa/usi1tI9MrZtHSQuEmz22FjZorA t71nj1Ov8re541vvsbfdAnR4M2stvF9MImFHejJg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vinod Koul , Bjorn Andersson , Sasha Levin Subject: [PATCH 4.14 161/217] arm64: dts: qcom: sdm660: use reg value for memory node Date: Mon, 20 Sep 2021 18:43:02 +0200 Message-Id: <20210920163930.098618277@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210920163924.591371269@linuxfoundation.org> References: <20210920163924.591371269@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vinod Koul [ Upstream commit c81210e38966cfa1c784364e4035081c3227cf5b ] memory node like other node should be node@reg, which is missing in this case, so fix it up arch/arm64/boot/dts/qcom/ipq8074-hk01.dt.yaml: /: memory: False schema does not allow {'device_type': ['memory'], 'reg': [[0, 1073741824, 0, 536870912]]} Signed-off-by: Vinod Koul Link: https://lore.kernel.org/r/20210308060826.3074234-18-vkoul@kernel.org Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts b/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts index 6a838b5d321e..1ab7deeb2497 100644 --- a/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts +++ b/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts @@ -27,7 +27,7 @@ chosen { stdout-path = "serial0"; }; - memory { + memory@40000000 { device_type = "memory"; reg = <0x0 0x40000000 0x0 0x20000000>; };