From: Ondrej Zary <linux@rainbow-software.org>
To: Krzysztof Helt <krzysztof.h1@wp.pl>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>,
linux-fbdev@vger.kernel.org,
Kernel development list <linux-kernel@vger.kernel.org>
Subject: [PATCH 3/4] [resend #2] fb_ddc: Allow I2C adapters without SCL read capability
Date: Mon, 24 Aug 2015 19:37:27 +0000 [thread overview]
Message-ID: <1440445048-24694-3-git-send-email-linux@rainbow-software.org> (raw)
In-Reply-To: <1440445048-24694-1-git-send-email-linux@rainbow-software.org>
i2c-algo-bit allows I2C adapters without SCL read capability to work but
fb_ddc_read fails to work on them.
Fix fb_ddc_read to work with I2C adapters not capable of reading SCL.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>
---
drivers/video/fbdev/core/fb_ddc.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/video/fbdev/core/fb_ddc.c b/drivers/video/fbdev/core/fb_ddc.c
index 94322cc..22c694a 100644
--- a/drivers/video/fbdev/core/fb_ddc.c
+++ b/drivers/video/fbdev/core/fb_ddc.c
@@ -69,10 +69,11 @@ unsigned char *fb_ddc_read(struct i2c_adapter *adapter)
algo_data->setscl(algo_data->data, 1);
for (j = 0; j < 5; j++) {
msleep(10);
- if (algo_data->getscl(algo_data->data))
+ if (algo_data->getscl &&
+ algo_data->getscl(algo_data->data))
break;
}
- if (j = 5)
+ if (algo_data->getscl && j = 5)
continue;
algo_data->setsda(algo_data->data, 0);
@@ -91,7 +92,8 @@ unsigned char *fb_ddc_read(struct i2c_adapter *adapter)
algo_data->setscl(algo_data->data, 1);
for (j = 0; j < 10; j++) {
msleep(10);
- if (algo_data->getscl(algo_data->data))
+ if (algo_data->getscl &&
+ algo_data->getscl(algo_data->data))
break;
}
--
Ondrej Zary
WARNING: multiple messages have this Message-ID (diff)
From: Ondrej Zary <linux@rainbow-software.org>
To: Krzysztof Helt <krzysztof.h1@wp.pl>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>,
linux-fbdev@vger.kernel.org,
Kernel development list <linux-kernel@vger.kernel.org>
Subject: [PATCH 3/4] [resend #2] fb_ddc: Allow I2C adapters without SCL read capability
Date: Mon, 24 Aug 2015 21:37:27 +0200 [thread overview]
Message-ID: <1440445048-24694-3-git-send-email-linux@rainbow-software.org> (raw)
In-Reply-To: <1440445048-24694-1-git-send-email-linux@rainbow-software.org>
i2c-algo-bit allows I2C adapters without SCL read capability to work but
fb_ddc_read fails to work on them.
Fix fb_ddc_read to work with I2C adapters not capable of reading SCL.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>
---
drivers/video/fbdev/core/fb_ddc.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/video/fbdev/core/fb_ddc.c b/drivers/video/fbdev/core/fb_ddc.c
index 94322cc..22c694a 100644
--- a/drivers/video/fbdev/core/fb_ddc.c
+++ b/drivers/video/fbdev/core/fb_ddc.c
@@ -69,10 +69,11 @@ unsigned char *fb_ddc_read(struct i2c_adapter *adapter)
algo_data->setscl(algo_data->data, 1);
for (j = 0; j < 5; j++) {
msleep(10);
- if (algo_data->getscl(algo_data->data))
+ if (algo_data->getscl &&
+ algo_data->getscl(algo_data->data))
break;
}
- if (j == 5)
+ if (algo_data->getscl && j == 5)
continue;
algo_data->setsda(algo_data->data, 0);
@@ -91,7 +92,8 @@ unsigned char *fb_ddc_read(struct i2c_adapter *adapter)
algo_data->setscl(algo_data->data, 1);
for (j = 0; j < 10; j++) {
msleep(10);
- if (algo_data->getscl(algo_data->data))
+ if (algo_data->getscl &&
+ algo_data->getscl(algo_data->data))
break;
}
--
Ondrej Zary
next prev parent reply other threads:[~2015-08-24 19:37 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-24 19:37 [PATCH 1/4] [resend #2] tridentfb: fix hang on Blade3D with CONFIG_CC_OPTIMIZE_FOR_SIZE Ondrej Zary
2015-08-24 19:37 ` Ondrej Zary
2015-08-24 19:37 ` [PATCH 2/4] [resend #2] tridentfb: Fix set_lwidth on TGUI9440 and CYBER9320 Ondrej Zary
2015-08-24 19:37 ` Ondrej Zary
2015-09-24 11:07 ` Tomi Valkeinen
2015-09-24 11:07 ` Tomi Valkeinen
2015-08-24 19:37 ` Ondrej Zary [this message]
2015-08-24 19:37 ` [PATCH 3/4] [resend #2] fb_ddc: Allow I2C adapters without SCL read capability Ondrej Zary
2015-09-02 11:33 ` Tomi Valkeinen
2015-09-02 11:33 ` Tomi Valkeinen
2015-09-02 12:04 ` Ondrej Zary
2015-09-02 12:04 ` Ondrej Zary
2015-09-24 11:04 ` Tomi Valkeinen
2015-09-24 11:04 ` Tomi Valkeinen
2015-08-24 19:37 ` [PATCH 4/4] [resend #2] tridentfb: Add DDC support Ondrej Zary
2015-08-24 19:37 ` Ondrej Zary
2015-09-02 11:30 ` Tomi Valkeinen
2015-09-02 11:30 ` Tomi Valkeinen
2015-09-02 12:04 ` Ondrej Zary
2015-09-02 12:04 ` Ondrej Zary
2015-09-24 11:00 ` Tomi Valkeinen
2015-09-24 11:00 ` Tomi Valkeinen
2015-09-24 11:06 ` [PATCH 1/4] [resend #2] tridentfb: fix hang on Blade3D with CONFIG_CC_OPTIMIZE_FOR_SIZE Tomi Valkeinen
2015-09-24 11:06 ` Tomi Valkeinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1440445048-24694-3-git-send-email-linux@rainbow-software.org \
--to=linux@rainbow-software.org \
--cc=krzysztof.h1@wp.pl \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tomi.valkeinen@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.