Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C1893C433F5 for ; Sat, 16 Apr 2022 07:46:11 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 34D3783AC9; Sat, 16 Apr 2022 09:46:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fjpOWx9y"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9886783BBF; Sat, 16 Apr 2022 09:46:07 +0200 (CEST) Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 84BD283AC9 for ; Sat, 16 Apr 2022 09:46:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jbx6244@gmail.com Received: by mail-ej1-x62b.google.com with SMTP id lc2so18726484ejb.12 for ; Sat, 16 Apr 2022 00:46:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tOATKNXHIDCiQsQTX14aKEAEiyHMP2ntjEKAiOM2TU4=; b=fjpOWx9yLTDgeV/B+nMQgXAQWx3PSlqgahosGZ8KpU1jgz0/nIOt8ffix1zvjdGLeM worjVRtPA+GXs4uzTG89EI6Iy65Tu3Qdk0zapigY1XOL0l94sB6dBcLcq1yhgbemfCmS ybh3hNL+cbA9zC2Wigqftq14gqDPAlCt9hJfpBVwMPmvx9EIp7LvQR1HpyyBiXL+W5ZD wsiFy7veFZlR2aDONOASNaiPkJ1jZostIKEaY3FobMrAfeBV/+6AtycpiQekf6yuwWOu EiZAlOTP9MXyJvCrbiAC5Qy48mbTEhQfv9L2B3uzt8S6/CwybVXKLHW6zMHjW9Y1E6qU yHZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tOATKNXHIDCiQsQTX14aKEAEiyHMP2ntjEKAiOM2TU4=; b=DIJ3++PDmIl3FFe0sEeQLDGS1xFysTSQh5bCVUQOUEmYbYq3ZMtHrC5OFa/5Kik/x+ 9Vpfzosa+sE3GfTouQSXQLMYau19tRygNyFbepUIiVT3sLE4+5WJs63TkRIwWLTuh1er Tq207zuor6vwp5I8nYHkOhRnso/gntOVaic20l5SGqxXOK8BDmv1nlSLy2lAwGw1544B chPPaVTt/91IVDH/3EyC3a6D3x/dRiGoxNRJf74hi7khX9bSxe7Pctv83jMwq5L5GOye 7O0PpGK06GN4pZOjC/698GXabw/xXlhrV+a+yib6T6drSvSVzBBhESzt00wmH7+VF4p0 q8qQ== X-Gm-Message-State: AOAM533bEVaBYlIUZjdfSlvHtZGuXN1swoXG9LasS9vaJLSxs5d3nE56 AnVhdyqOBPVBbOESA4pEfBA= X-Google-Smtp-Source: ABdhPJxKpedbwhIixFDoduWZDv2VGfOQAYDPnTKg2mBDRL2rfLuVvW/5tmHoIyz8rqAgZ03frfG9JA== X-Received: by 2002:a17:907:9621:b0:6d7:355d:6da5 with SMTP id gb33-20020a170907962100b006d7355d6da5mr1902436ejc.195.1650095164044; Sat, 16 Apr 2022 00:46:04 -0700 (PDT) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id lb4-20020a170907784400b006e0d13f65e5sm2400946ejc.167.2022.04.16.00.46.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Apr 2022 00:46:03 -0700 (PDT) From: Johan Jonker To: kever.yang@rock-chips.com Cc: sjg@chromium.org, philipp.tomsich@vrull.eu, hl@rock-chips.com, jernej.skrabec@gmail.com, w.egorov@phytec.de, michael@amarulasolutions.com, agust@denx.de, u-boot@lists.denx.de Subject: [PATCH v1] rockchip: video: rk_edp: add more rk3288 edp node options Date: Sat, 16 Apr 2022 09:45:56 +0200 Message-Id: <20220416074556.15398-1-jbx6244@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean The rk3288 DT synced from Linux contains some different properties in the edp node then origanal used in U-boot. Allow both options to be backwards compatible and to be able to handle recent rk3288.dtsi files. Signed-off-by: Johan Jonker --- Fix for rk3288.dtsi sync from Linux. Not tested with hardware. --- drivers/video/rockchip/rk_edp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c index 0ddf5e02..3697d582 100644 --- a/drivers/video/rockchip/rk_edp.c +++ b/drivers/video/rockchip/rk_edp.c @@ -1070,8 +1070,11 @@ static int rk_edp_probe(struct udevice *dev) ret = reset_get_by_name(dev, "dp", &dp_rst); if (ret) { - dev_err(dev, "failed to get dp reset (ret=%d)\n", ret); - return ret; + ret = reset_get_by_name(dev, "edp", &dp_rst); + if (ret) { + dev_err(dev, "failed to get dp reset (ret=%d)\n", ret); + return ret; + } } ret = reset_assert(&dp_rst); @@ -1156,6 +1159,7 @@ static const struct rockchip_dp_data rk3288_dp = { }; static const struct udevice_id rockchip_dp_ids[] = { + { .compatible = "rockchip,rk3288-dp", .data = (ulong)&rk3288_dp }, { .compatible = "rockchip,rk3288-edp", .data = (ulong)&rk3288_dp }, { .compatible = "rockchip,rk3399-edp", .data = (ulong)&rk3399_edp }, { } -- 2.20.1