From nobody Mon Oct 6 04:57:05 2025 Received: from out-182.mta0.migadu.com (out-182.mta0.migadu.com [91.218.175.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C53E2066CE for ; Thu, 24 Jul 2025 18:51:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753383094; cv=none; b=Fuwe5H+Oox4zD802VPhWoNPcwQW31X3UrMCdzbkhuOLI6lO/ix37SbcpmdEsCFWE0j+KxY701ZluLbIHduIVNMPCOooKk1Y8jXGFw5/EwaGLCm3QfA5D8kwDeL/D/zPmB5FWYSvY1W/9daZCe27CEvaWq8eyY4Ldr8g/Vi/wXAs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753383094; c=relaxed/simple; bh=x7ArkJEJ9UcO+6C4Ru2GjqQ1KuSGnTuAjOfKTce7MBE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YDKXuljXsFCzgW3upSoTQiHSQjN47HKNr0edrEZNw0Eos5aBmZLVW6ibk6bJ2WMG/lKnqwJFZOyaG9buYwpGr9wPts7IV0+hmMyhUOWJ8k0mosCX5JTRFSK8Omnkw0jLszEwq//M2qpjL++cIYdVtYARYNgA7YOTIj4yS+73XLE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=grimler.se; spf=pass smtp.mailfrom=grimler.se; dkim=pass (1024-bit key) header.d=grimler.se header.i=@grimler.se header.b=h8U+1wbM; arc=none smtp.client-ip=91.218.175.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=grimler.se Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=grimler.se Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=grimler.se header.i=@grimler.se header.b="h8U+1wbM" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=grimler.se; s=key1; t=1753383088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sk/dubggUrsZRv18JEnxLLB6/IJr310Fql5axFV4e5U=; b=h8U+1wbMYDv9Gf6u/u3z/hX0EVU0H4ilBeJpZMlFyewcM1+vzqzVK7zcwJLjNsmE6NXuPY EwP7dIrJzzzHnVnB7Zm6OEVGSuMzJCdHw3q5WPBdEIYDbp7yko/khz3CiWZxPJZmOhpAxV 330XfEXxHjjBMGffK+HjmVCPjpfCmCc= From: Henrik Grimler Date: Thu, 24 Jul 2025 20:50:51 +0200 Subject: [PATCH v2 1/3] drm/bridge: sii9234: fix some typos in comments and messages Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250724-exynos4-sii9234-driver-v2-1-faee244f1d40@grimler.se> References: <20250724-exynos4-sii9234-driver-v2-0-faee244f1d40@grimler.se> In-Reply-To: <20250724-exynos4-sii9234-driver-v2-0-faee244f1d40@grimler.se> To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, replicant@osuosl.org, linux-kernel@vger.kernel.org, Henrik Grimler X-Developer-Signature: v=1; a=openpgp-sha256; l=2337; i=henrik@grimler.se; h=from:subject:message-id; bh=x7ArkJEJ9UcO+6C4Ru2GjqQ1KuSGnTuAjOfKTce7MBE=; b=owEBbQGS/pANAwAKAbAHbkkLcWFrAcsmYgBogoCjJ9/3h8Wky1TRWhdX3OOfB+G5JpWthPsCV w440zNhYqKJATMEAAEKAB0WIQQsfymul4kfZBmp4s2wB25JC3FhawUCaIKAowAKCRCwB25JC3Fh a9npCADHWTJz3xTyDqFUzn3hB/3tLJFw8GxSEj0e+QRnCpw/CKXNg5ylY7zfogUgWnla48cjNzQ OQfvrAjIreTRs5OjMyliwSiBU3Hf43FzDbahNZ/DNLVgKmmaAe6JX8Ue+jH1Zbhr0ZNkLCLxlve WViOyl7ljdRecRVi+/EzudbtLa09Ve6A6zaTtdcEXUPy+DOsNGDfz0LPUlMTanQBEFCi4JpgrmP I62kuosZ1XoPH8fO04ycNyd5hqs+gt2CKk2kG3Qd2jsl/YcpXQrXT7ODt1bwdk+o292+NALeNSE yOewobZJ008mh/A5wmNHSJgR1/xAkH4yb0CHpigj2vl4/HRm X-Developer-Key: i=henrik@grimler.se; a=openpgp; fpr=2C7F29AE97891F6419A9E2CDB0076E490B71616B X-Migadu-Flow: FLOW_OUT Fix spelling and formatting so that the code is easier to follow, and so that it is more searchable. Signed-off-by: Henrik Grimler Reviewed-by: Dmitry Baryshkov --- v2: no changes --- drivers/gpu/drm/bridge/sii9234.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/bridge/sii9234.c b/drivers/gpu/drm/bridge/sii9= 234.c index bb1bed03eb5b7ae67f752c0d593dc54131e9e370..930117bbba87285e62107389606= 897740516eb0a 100644 --- a/drivers/gpu/drm/bridge/sii9234.c +++ b/drivers/gpu/drm/bridge/sii9234.c @@ -339,7 +339,7 @@ static int sii9234_cbus_reset(struct sii9234 *ctx) return sii9234_clear_error(ctx); } =20 -/* Require to chek mhl imformation of samsung in cbus_init_register */ +/* Require to check mhl information of samsung in cbus_init_register */ static int sii9234_cbus_init(struct sii9234 *ctx) { cbus_writeb(ctx, 0x07, 0xF2); @@ -614,7 +614,7 @@ static void sii9234_cable_out(struct sii9234 *ctx) =20 disable_irq(to_i2c_client(ctx->dev)->irq); tpi_writeb(ctx, TPI_DPD_REG, 0); - /* Turn on&off hpd festure for only QCT HDMI */ + /* Turn on&off hpd feature for only QCT HDMI */ sii9234_hw_off(ctx); =20 ctx->state =3D ST_OFF; @@ -708,7 +708,7 @@ static enum sii9234_state sii9234_rsen_change(struct si= i9234 *ctx) { int value; =20 - /* Work_around code to handle wrong interrupt */ + /* Workaround code to handle wrong interrupt */ if (ctx->state !=3D ST_RGND_1K) { dev_err(ctx->dev, "RSEN_HIGH without RGND_1K\n"); return ST_FAILURE; @@ -723,9 +723,9 @@ static enum sii9234_state sii9234_rsen_change(struct si= i9234 *ctx) } dev_dbg(ctx->dev, "RSEN lost\n"); /* - * Once RSEN loss is confirmed,we need to check - * based on cable status and chip power status,whether - * it is SINK Loss(HDMI cable not connected, TV Off) + * Once RSEN loss is confirmed, we need to check + * based on cable status and chip power status, whether + * it is SINK Loss (HDMI cable not connected, TV Off) * or MHL cable disconnection * TODO: Define the below mhl_disconnection() */ @@ -820,7 +820,7 @@ static int sii9234_init_resources(struct sii9234 *ctx, int ret; =20 if (!ctx->dev->of_node) { - dev_err(ctx->dev, "not DT device\n"); + dev_err(ctx->dev, "no DT device\n"); return -ENODEV; } =20 --=20 2.50.1 From nobody Mon Oct 6 04:57:05 2025 Received: from out-178.mta0.migadu.com (out-178.mta0.migadu.com [91.218.175.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40A9A2116F6 for ; Thu, 24 Jul 2025 18:51:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753383096; cv=none; b=DBSQNejb66RBrPxYGAfQBPqgArX1z3zA9q0SKLnYGW7wVg3Y3510Jfv5o/gW5ndlfj1bswfSqwZ0rg49aJhevojvPIDJwt1ukUP9NqowzWQ9Reg5t0hYOL7w3OodgIf/601D6o2e/9WyYSQUeXqOxNILY5eMdBTWsWv8HiomtC4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753383096; c=relaxed/simple; bh=ZZmsQxNSXVSlKbD4hblSWDN+9ZTkdbUjQl3Id3eEgog=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IulquPJLVTPe8FkYKDKaA2rf1w+pApafiTM61tz+WY7Kb4MIz7kNiMkTFQW8Q0S2s65GIgZsjOh1jPSp7Es5PKraTkAkrFJczGfTBtWrICkpzp+H5uITBcqlu68KRWiG+lp9+Tkl4b2u8uYkppDGp4mx/MZFlZ8gQuQ3DQqbCus= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=grimler.se; spf=pass smtp.mailfrom=grimler.se; dkim=pass (1024-bit key) header.d=grimler.se header.i=@grimler.se header.b=d+4z05Es; arc=none smtp.client-ip=91.218.175.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=grimler.se Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=grimler.se Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=grimler.se header.i=@grimler.se header.b="d+4z05Es" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=grimler.se; s=key1; t=1753383091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8FW//f7wNjk6myGF7GHWZ1mveETa44O0KLrX1cwlSIQ=; b=d+4z05EsoHp3A9zKEA1xISr3Uhg6aDfhZ3gujhjXQgDbBUeb6Mh065VqRc0TmQF4uvJ2Bd O8R45M1hOq5nx8TIRubv26yf9GVIjFGKsMqJyvPNHZnoasS3lEtMHIKvCztrrc3nbYBoEU XRIMVtivAOpQd5yPxGuGyp9za7m9yAc= From: Henrik Grimler Date: Thu, 24 Jul 2025 20:50:52 +0200 Subject: [PATCH v2 2/3] drm/bridge: sii9234: use dev_err_probe where applicable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250724-exynos4-sii9234-driver-v2-2-faee244f1d40@grimler.se> References: <20250724-exynos4-sii9234-driver-v2-0-faee244f1d40@grimler.se> In-Reply-To: <20250724-exynos4-sii9234-driver-v2-0-faee244f1d40@grimler.se> To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, replicant@osuosl.org, linux-kernel@vger.kernel.org, Henrik Grimler X-Developer-Signature: v=1; a=openpgp-sha256; l=2016; i=henrik@grimler.se; h=from:subject:message-id; bh=ZZmsQxNSXVSlKbD4hblSWDN+9ZTkdbUjQl3Id3eEgog=; b=owEBbQGS/pANAwAKAbAHbkkLcWFrAcsmYgBogoCmRmfOnqSJs0gNwRXGMh1B9WLaJnlt4ZUHi gR22U6FtyuJATMEAAEKAB0WIQQsfymul4kfZBmp4s2wB25JC3FhawUCaIKApgAKCRCwB25JC3Fh a+t1B/wNatsEVxbiPHGP5Kd8Ya1L8+tIjsXa6O0VnAUFeTgnSgjKrEA10zxUtQjOwU2riHYfF7/ iPV1voGFqnfSasDLb+PBd/5EoymKF1tszPsh1qdSykbk80Z/4/ghjHO5BDU3gk6f9YHzRbwOOca dvKknWOS0fLRTByvXAlo1cHdWVxAE/3eOyOZb5HWy40YHgUTHdPFkZ6KiIK3EZRTK2vjZF/rYdQ b0zW+tf9Ff1lic1GKwJyb8tJGvKkBFDppHQTybUH4XvlpIOow/zZStTpMKVKyGp7+d8IRcOVZGO UYrbv6REXX15BtEsBP946uEMiCRWiDMEqh05PrdLKLuRZ94y X-Developer-Key: i=henrik@grimler.se; a=openpgp; fpr=2C7F29AE97891F6419A9E2CDB0076E490B71616B X-Migadu-Flow: FLOW_OUT In case of error during resource acquisition the driver should print an error message only if it is not deferred probe. Use dev_err_probe helper to handle this, which will also record defer probe reason for debugging. Signed-off-by: Henrik Grimler --- v2: no changes --- drivers/gpu/drm/bridge/sii9234.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/bridge/sii9234.c b/drivers/gpu/drm/bridge/sii9= 234.c index 930117bbba87285e62107389606897740516eb0a..0e0bb1bf71fdcef788715cfd6fa= 158a6992def33 100644 --- a/drivers/gpu/drm/bridge/sii9234.c +++ b/drivers/gpu/drm/bridge/sii9234.c @@ -825,10 +825,9 @@ static int sii9234_init_resources(struct sii9234 *ctx, } =20 ctx->gpio_reset =3D devm_gpiod_get(ctx->dev, "reset", GPIOD_OUT_LOW); - if (IS_ERR(ctx->gpio_reset)) { - dev_err(ctx->dev, "failed to get reset gpio from DT\n"); - return PTR_ERR(ctx->gpio_reset); - } + if (IS_ERR(ctx->gpio_reset)) + return dev_err_probe(ctx->dev, PTR_ERR(ctx->gpio_reset), + "failed to get reset gpio from DT\n"); =20 ctx->supplies[0].supply =3D "avcc12"; ctx->supplies[1].supply =3D "avcc33"; @@ -836,9 +835,7 @@ static int sii9234_init_resources(struct sii9234 *ctx, ctx->supplies[3].supply =3D "cvcc12"; ret =3D devm_regulator_bulk_get(ctx->dev, 4, ctx->supplies); if (ret) { - if (ret !=3D -EPROBE_DEFER) - dev_err(ctx->dev, "regulator_bulk failed\n"); - return ret; + dev_err_probe(ctx->dev, ret, "regulator_bulk failed\n"); } =20 ctx->client[I2C_MHL] =3D client; @@ -911,10 +908,9 @@ static int sii9234_probe(struct i2c_client *client) sii9234_irq_thread, IRQF_TRIGGER_HIGH | IRQF_ONESHOT, "sii9234", ctx); - if (ret < 0) { - dev_err(dev, "failed to install IRQ handler\n"); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, + "failed to install IRQ handler\n"); =20 ret =3D sii9234_init_resources(ctx, client); if (ret < 0) --=20 2.50.1 From nobody Mon Oct 6 04:57:05 2025 Received: from out-177.mta0.migadu.com (out-177.mta0.migadu.com [91.218.175.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2F5A92EA462 for ; Thu, 24 Jul 2025 18:51:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753383097; cv=none; b=M+txcrFD2U7KVTfb2j5gjcDTWchLpd1LAjDhRnOEhxIc0IXQmavcWVinSAOJr8xpUE39TUd/ZWcw4pI/dt1zB+RzYrKANqWPJsM9rSNftd/qdwRRv68k1dNIfMSKILfZpzSev3yC4RKVjnZEwUZ2gNMls7G3QNFBI/sQB1N9Ss0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753383097; c=relaxed/simple; bh=2W4tp0oa2XQwld7BwY7rhkBMwuoZwKS4j+VSjCp8d7Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=h2ZmPwc3s03e9d0a8vk8/kUzlBx4GbdkuGwroyWjPlSXQRAnYv3uvdwQNFOPGAMM6x5/VP0m0jniSW7IK5g28QOUHi4H1i6wuGUsG0tZ58XpA9yLy5/RwDmE+0HDCCfBEVgVah36ByOvzYvKZZ4cjrp4h++MxtsfgtkifBIJy2Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=grimler.se; spf=pass smtp.mailfrom=grimler.se; dkim=pass (1024-bit key) header.d=grimler.se header.i=@grimler.se header.b=pdy7IY3p; arc=none smtp.client-ip=91.218.175.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=grimler.se Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=grimler.se Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=grimler.se header.i=@grimler.se header.b="pdy7IY3p" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=grimler.se; s=key1; t=1753383093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IiDy4Kqhspm647hepX8y1s6z9FB1aeWSmguTuvv/WIY=; b=pdy7IY3pUnKui/Ta8C2Wr1on2JhuiWcv2LIGyHGanxZrRo8OZkhG83VXMGmPjOYr3AHdQt mM4wu0v0g02mryRzQl54NXKXf67brGla0YTkYM3DnEqxY71d4ijEPXqOvhkpHO1ZnfLL/t SQCf4v4q5BSBg6iu5GMEA/ZQyLKw3xg= From: Henrik Grimler Date: Thu, 24 Jul 2025 20:50:53 +0200 Subject: [PATCH v2 3/3] drm/bridge: sii9234: use extcon cable detection logic to detect MHL Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250724-exynos4-sii9234-driver-v2-3-faee244f1d40@grimler.se> References: <20250724-exynos4-sii9234-driver-v2-0-faee244f1d40@grimler.se> In-Reply-To: <20250724-exynos4-sii9234-driver-v2-0-faee244f1d40@grimler.se> To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, replicant@osuosl.org, linux-kernel@vger.kernel.org, Henrik Grimler X-Developer-Signature: v=1; a=openpgp-sha256; l=4838; i=henrik@grimler.se; h=from:subject:message-id; bh=2W4tp0oa2XQwld7BwY7rhkBMwuoZwKS4j+VSjCp8d7Q=; b=owEBbQGS/pANAwAKAbAHbkkLcWFrAcsmYgBogoCphlDJtFUAS+pTsqCgiQ4LJlV+aTwzDIlOg +vU258AoFqJATMEAAEKAB0WIQQsfymul4kfZBmp4s2wB25JC3FhawUCaIKAqQAKCRCwB25JC3Fh a6STB/9C+RD2eaYcEnHCFUmxelDgXrIVwITs1EzwPY/05rgDYSQE2RleM1lhcPukWJJblCUfWse OFRGvZDjBO8+Z+arNoALsd5B/2TXXX7KwZxzZJshRwqU1uw1kZfRu8sd4cLt0E7oMYCzsn3zmnq 217BxK38Td/dsOUw208LpMxtSj73U1FnDKdFD7bfzXINry+bsUWXzrfecDwrJkNja4fJjLRnik9 gTqJR+zn2f447VX3Ohg33awU3X0Hf6Bljo8MpIc4FcAjYAI2pNrM0DbD5FhjNwKCSzXddSQujCH Ou08idSHi0MM7joygqj65s4/ZFloITcMGijNjnedBPwatPxM X-Developer-Key: i=henrik@grimler.se; a=openpgp; fpr=2C7F29AE97891F6419A9E2CDB0076E490B71616B X-Migadu-Flow: FLOW_OUT To use MHL we currently need the MHL chip to be permanently on, which consumes unnecessary power. Let's use extcon attached to MUIC to enable the MHL chip only if it detects an MHL cable. Signed-off-by: Henrik Grimler --- v2: add dependency on extcon. Issue reported by kernel test robot --- drivers/gpu/drm/bridge/Kconfig | 1 + drivers/gpu/drm/bridge/sii9234.c | 89 ++++++++++++++++++++++++++++++++++++= ++-- 2 files changed, 87 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index b9e0ca85226a603a24f90c6879d1499f824060cb..f18a083f6e1c6fe40bde5e65a15= 48acc61a162ae 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -303,6 +303,7 @@ config DRM_SII902X config DRM_SII9234 tristate "Silicon Image SII9234 HDMI/MHL bridge" depends on OF + select EXTCON help Say Y here if you want support for the MHL interface. It is an I2C driver, that detects connection of MHL bridge diff --git a/drivers/gpu/drm/bridge/sii9234.c b/drivers/gpu/drm/bridge/sii9= 234.c index 0e0bb1bf71fdcef788715cfd6fa158a6992def33..4d84ba01ea76816bebdbc29d48a= 041c9c6cd508e 100644 --- a/drivers/gpu/drm/bridge/sii9234.c +++ b/drivers/gpu/drm/bridge/sii9234.c @@ -19,6 +19,7 @@ =20 #include #include +#include #include #include #include @@ -26,6 +27,7 @@ #include #include #include +#include #include #include =20 @@ -170,8 +172,12 @@ struct sii9234 { struct drm_bridge bridge; struct device *dev; struct gpio_desc *gpio_reset; - int i2c_error; struct regulator_bulk_data supplies[4]; + struct extcon_dev *extcon; + struct notifier_block extcon_nb; + struct work_struct extcon_wq; + int cable_state; + int i2c_error; =20 struct mutex lock; /* Protects fields below and device registers */ enum sii9234_state state; @@ -864,6 +870,70 @@ static int sii9234_init_resources(struct sii9234 *ctx, return 0; } =20 +static void sii9234_extcon_work(struct work_struct *work) +{ + struct sii9234 *ctx =3D + container_of(work, struct sii9234, extcon_wq); + int state =3D extcon_get_state(ctx->extcon, EXTCON_DISP_MHL); + + if (state =3D=3D ctx->cable_state) + return; + + ctx->cable_state =3D state; + + if (state > 0) + sii9234_cable_in(ctx); + else + sii9234_cable_out(ctx); +} + +static int sii9234_extcon_notifier(struct notifier_block *self, + unsigned long event, void *ptr) +{ + struct sii9234 *ctx =3D + container_of(self, struct sii9234, extcon_nb); + + schedule_work(&ctx->extcon_wq); + + return NOTIFY_DONE; +} + +static int sii9234_extcon_init(struct sii9234 *ctx) +{ + struct extcon_dev *edev; + struct device_node *musb, *muic; + int ret; + + /* Get micro-USB connector node */ + musb =3D of_graph_get_remote_node(ctx->dev->of_node, 1, -1); + /* Then get micro-USB Interface Controller node */ + muic =3D of_get_next_parent(musb); + + if (!muic) { + dev_info(ctx->dev, + "no extcon found, switching to 'always on' mode\n"); + return 0; + } + + edev =3D extcon_find_edev_by_node(muic); + of_node_put(muic); + if (IS_ERR(edev)) { + dev_err_probe(ctx->dev, PTR_ERR(edev), + "invalid or missing extcon\n"); + } + + ctx->extcon =3D edev; + ctx->extcon_nb.notifier_call =3D sii9234_extcon_notifier; + INIT_WORK(&ctx->extcon_wq, sii9234_extcon_work); + ret =3D extcon_register_notifier(edev, EXTCON_DISP_MHL, &ctx->extcon_nb); + if (ret) { + dev_err(ctx->dev, "failed to register notifier for MHL\n"); + return ret; + } + + return 0; +} + static enum drm_mode_status sii9234_mode_valid(struct drm_bridge *bridge, const struct drm_display_info *info, const struct drm_display_mode *mode) @@ -916,12 +986,17 @@ static int sii9234_probe(struct i2c_client *client) if (ret < 0) return ret; =20 + ret =3D sii9234_extcon_init(ctx); + if (ret < 0) + return ret; + i2c_set_clientdata(client, ctx); =20 ctx->bridge.of_node =3D dev->of_node; drm_bridge_add(&ctx->bridge); =20 - sii9234_cable_in(ctx); + if (!ctx->extcon) + sii9234_cable_in(ctx); =20 return 0; } @@ -930,7 +1005,15 @@ static void sii9234_remove(struct i2c_client *client) { struct sii9234 *ctx =3D i2c_get_clientdata(client); =20 - sii9234_cable_out(ctx); + if (ctx->extcon) { + extcon_unregister_notifier(ctx->extcon, EXTCON_DISP_MHL, + &ctx->extcon_nb); + flush_work(&ctx->extcon_wq); + if (ctx->cable_state > 0) + sii9234_cable_out(ctx); + } else { + sii9234_cable_out(ctx); + } drm_bridge_remove(&ctx->bridge); } =20 --=20 2.50.1