Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp3117391rwb; Mon, 15 Aug 2022 18:32:28 -0700 (PDT) X-Google-Smtp-Source: AA6agR7TbUwc505Iodd7qhv5Va8S/UGZjRfrolpwe68wt0b0JHeOyLLjxJLCtvwXdvbwNHncXfw/ X-Received: by 2002:a17:90a:2948:b0:1f3:1b42:a810 with SMTP id x8-20020a17090a294800b001f31b42a810mr21562589pjf.203.1660613547932; Mon, 15 Aug 2022 18:32:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660613547; cv=none; d=google.com; s=arc-20160816; b=gJbfrwgYQyjqpwm09dogJXx4N/v6jLF1yl/0g9pZwVSU9KnCvHDeLZeUESQJ20YB+v g0NPQm3JrlhqqKe2hUqCq7i3hmU3ZamQV5kMxu4Ru/8a+vD7O9JiUyj7ZXzAnFL1/p8y RnZ48DNF5XuPCysf2sdxFS/IcX69pbbiqNz4LyVdiX8nCW8IJac9WmF8BETCBYPkfibr 6xWWQsFFX2LXTR6HXPloI9lUDr/2oTiUjUoZoSODGC9a1t4jcoAPX1BulK4FiirZhgbg Gyfpum8VJS6MpMFxh174T1P9kvV3Cnf97FdVKuS1vRCnDLXGyfUz/PU+Twn/AYlcPcof gDzg== 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=+8ZMIi7AMmijkgQMEa94GpFLE2DkwQe8GNmhDej8J1g=; b=bIrYWOQF+KcycO0i7+3QSF2451WMlWkkXQ98YrNY0lcxSs8beYguPS/9cTysAiEUNC j9HT2Bc/pR8dE9LJx9Nnfsp3uCs1HOXODZs4pK7nX562znGHe1X+VcYqEOfM/kPADk4J +nZbCxBdAmKOgroK5Gx4WNMCeGnuaGzoehXCCm7oww2sp5BBkbMLV1IB0jWuSLbRoHkT LcAOXtvUq846xPn+mSf4lrzQlQ2bA0trEU2R6nRoUNEWV4AAxLumrJ31FucaHGliKFjj P9jg/meGt31fxuno66/MpnGFCr7ucvuBre/v2Nzwj1iN3yxPJDreqWOTukQffhmdBNxM cDpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="viKG7/Zi"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k17-20020a056a00169100b005284d10c1d3si12445189pfc.333.2022.08.15.18.32.17; Mon, 15 Aug 2022 18:32:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="viKG7/Zi"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S1344499AbiHPBHW (ORCPT + 99 others); Mon, 15 Aug 2022 21:07:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348613AbiHPBCT (ORCPT ); Mon, 15 Aug 2022 21:02:19 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78CD2BA9C3; Mon, 15 Aug 2022 13:50:57 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id CB5236103F; Mon, 15 Aug 2022 20:50:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BA4F2C433D7; Mon, 15 Aug 2022 20:50:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660596626; bh=AjhUCMvw3Djg5sxJuPyH8xLqMY0x5dcD4IG5ow8tdvg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=viKG7/Zii5XM6dE4atX+U376OAQEi4W/A11TnjjYUluePkwy41G+oFbTGvQe9xlGk yQa3FnrxnBXYmozwJOXMuK9wr/V61dT6V4G39DlRem/UrtgdE49fl5aHsKjGxMunGV WowmzLrGbfNr2ZVDgu5J96JQWvlkD3Dk2XyWF5Qc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Robert Foss , Daniel Vetter Subject: [PATCH 5.19 1139/1157] Revert "drm/bridge: anx7625: Use DPI bus type" Date: Mon, 15 Aug 2022 20:08:15 +0200 Message-Id: <20220815180526.020681384@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Robert Foss commit 61922beba36adea8702fe8069b309c806f6608af upstream. This reverts commit a77c2af0994e24ee36c7ffb6dc852770bdf06fb1. This patch depends on the patches just aplied to the media tree, and will not build without them, which leaves drm-misc-next in a broken state. Let's revert the two latter patches until rc1 has been branched, and rc1 has been backmerged into drm-misc-next. Signed-off-by: Robert Foss Acked-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20220523161520.354687-1-robert.foss@linaro.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/bridge/analogix/anx7625.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/drivers/gpu/drm/bridge/analogix/anx7625.c +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c @@ -1623,14 +1623,14 @@ static int anx7625_parse_dt(struct devic anx7625_get_swing_setting(dev, pdata); - pdata->is_dpi = 0; /* default dsi mode */ + pdata->is_dpi = 1; /* default dpi mode */ pdata->mipi_host_node = of_graph_get_remote_node(np, 0, 0); if (!pdata->mipi_host_node) { DRM_DEV_ERROR(dev, "fail to get internal panel.\n"); return -ENODEV; } - bus_type = 0; + bus_type = V4L2_FWNODE_BUS_TYPE_PARALLEL; mipi_lanes = MAX_LANES_SUPPORT; ep0 = of_graph_get_endpoint_by_regs(np, 0, 0); if (ep0) { @@ -1640,8 +1640,8 @@ static int anx7625_parse_dt(struct devic mipi_lanes = of_property_count_u32_elems(ep0, "data-lanes"); } - if (bus_type == V4L2_FWNODE_BUS_TYPE_DPI) /* bus type is DPI */ - pdata->is_dpi = 1; + if (bus_type == V4L2_FWNODE_BUS_TYPE_PARALLEL) /* bus type is Parallel(DSI) */ + pdata->is_dpi = 0; pdata->mipi_lanes = mipi_lanes; if (pdata->mipi_lanes > MAX_LANES_SUPPORT || pdata->mipi_lanes <= 0)