* [U-Boot] [PATCH v1 1/2] i2c: zynq: Support for 0-length register address
@ 2014-01-03 9:45 Michal Simek
2014-01-03 9:45 ` [U-Boot] [PATCH v1 2/2] i2c: zynq: Add support for the second i2c controller Michal Simek
0 siblings, 1 reply; 9+ messages in thread
From: Michal Simek @ 2014-01-03 9:45 UTC (permalink / raw)
To: u-boot
From: Michael Burr <michael.burr@logicpd.com>
Fixed bug with alen == 0 in 'i2c_write', 'i2c_read'
Further minor corrections:
- Write 'address' register before 'data' register.
- Write 'transfer_size' register before 'address' register.
Signed-off-by: Michael Burr <michael.burr@logicpd.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
Changes in v1:
- Based on original thread from Michael Burr
http://lists.denx.de/pipermail/u-boot/2013-October/165060.html
- MS rebase on latest&greatest
drivers/i2c/zynq_i2c.c | 37 +++++++++++++++++++++++++++----------
1 file changed, 27 insertions(+), 10 deletions(-)
diff --git a/drivers/i2c/zynq_i2c.c b/drivers/i2c/zynq_i2c.c
index 70a9aea..a9df838 100644
--- a/drivers/i2c/zynq_i2c.c
+++ b/drivers/i2c/zynq_i2c.c
@@ -189,20 +189,37 @@ static int zynq_i2c_read(struct i2c_adapter *adap, u8 dev, uint addr,
* Temporarily disable restart (by clearing hold)
* It doesn't seem to work.
*/
+ clrbits_le32(&zynq_i2c->control, ZYNQ_I2C_CONTROL_HOLD);
+ writel(0xFF, &zynq_i2c->interrupt_status);
+ if (alen) {
+ clrbits_le32(&zynq_i2c->control, ZYNQ_I2C_CONTROL_RW);
+ writel(dev, &zynq_i2c->address);
+ while (alen--)
+ writel(addr >> (8*alen), &zynq_i2c->data);
+
+ /* Wait for the address to be sent */
+ if (!zynq_i2c_wait(ZYNQ_I2C_INTERRUPT_COMP)) {
+ /* Release the bus */
+ clrbits_le32(&zynq_i2c->control, ZYNQ_I2C_CONTROL_HOLD);
+ return -ETIMEDOUT;
+ }
+ debug("Device acked address\n");
+ }
+
clrbits_le32(&zynq_i2c->control, ZYNQ_I2C_CONTROL_RW |
ZYNQ_I2C_CONTROL_HOLD);
writel(0xFF, &zynq_i2c->interrupt_status);
- while (alen--)
- writel(addr >> (8*alen), &zynq_i2c->data);
- writel(dev, &zynq_i2c->address);
-
- /* Wait for the address to be sent */
- if (!zynq_i2c_wait(ZYNQ_I2C_INTERRUPT_COMP)) {
- /* Release the bus */
- clrbits_le32(&zynq_i2c->control, ZYNQ_I2C_CONTROL_HOLD);
- return -ETIMEDOUT;
+ if (alen) {
+ while (alen--)
+ writel(addr >> (8*alen), &zynq_i2c->data);
+ /* Start the tranfer */
+ if (!zynq_i2c_wait(ZYNQ_I2C_INTERRUPT_COMP)) {
+ /* Release the bus */
+ clrbits_le32(&zynq_i2c->control, ZYNQ_I2C_CONTROL_HOLD);
+ return -ETIMEDOUT;
+ }
+ debug("Device acked address\n");
}
- debug("Device acked address\n");
setbits_le32(&zynq_i2c->control, ZYNQ_I2C_CONTROL_CLR_FIFO |
ZYNQ_I2C_CONTROL_RW);
--
1.8.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140103/47ca9512/attachment.pgp>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH v1 2/2] i2c: zynq: Add support for the second i2c controller
2014-01-03 9:45 [U-Boot] [PATCH v1 1/2] i2c: zynq: Support for 0-length register address Michal Simek
@ 2014-01-03 9:45 ` Michal Simek
2014-01-13 7:32 ` [U-Boot] [U-Boot, v1, " Heiko Schocher
0 siblings, 1 reply; 9+ messages in thread
From: Michal Simek @ 2014-01-03 9:45 UTC (permalink / raw)
To: u-boot
From: Michael Burr <michael.burr@logicpd.com>
Initialize the second i2c controller.
Signed-off-by: Michael Burr <michael.burr@logicpd.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
Changes in v1:
- Based on original thread from Michael Burr
http://lists.denx.de/pipermail/u-boot/2013-October/165017.html
Heiko did some changes in this mainline patch
"i2c, zynq: convert zynq i2c driver to new multibus/multiadapter framework"
(sha1: 0bdffe71fddeaa46768a39305797e4512dee0f15)
- MS rebase on latest&greatest
drivers/i2c/zynq_i2c.c | 46 ++++++++++++++++++++++++++++------------------
include/configs/zynq.h | 7 +++----
2 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/drivers/i2c/zynq_i2c.c b/drivers/i2c/zynq_i2c.c
index a9df838..7326349 100644
--- a/drivers/i2c/zynq_i2c.c
+++ b/drivers/i2c/zynq_i2c.c
@@ -64,19 +64,21 @@ struct zynq_i2c_registers {
#define ZYNQ_I2C_FIFO_DEPTH 16
#define ZYNQ_I2C_TRANSFERT_SIZE_MAX 255 /* Controller transfer limit */
-#if defined(CONFIG_ZYNQ_I2C0)
-# define ZYNQ_I2C_BASE ZYNQ_I2C_BASEADDR0
-#else
-# define ZYNQ_I2C_BASE ZYNQ_I2C_BASEADDR1
-#endif
-
-static struct zynq_i2c_registers *zynq_i2c =
- (struct zynq_i2c_registers *)ZYNQ_I2C_BASE;
+static struct zynq_i2c_registers *i2c_select(struct i2c_adapter *adap)
+{
+ return adap->hwadapnr ?
+ /* Zynq PS I2C1 */
+ (struct zynq_i2c_registers *)ZYNQ_I2C_BASEADDR1 :
+ /* Zynq PS I2C0 */
+ (struct zynq_i2c_registers *)ZYNQ_I2C_BASEADDR0;
+}
/* I2C init called by cmd_i2c when doing 'i2c reset'. */
static void zynq_i2c_init(struct i2c_adapter *adap, int requested_speed,
int slaveadd)
{
+ struct zynq_i2c_registers *zynq_i2c = i2c_select(adap);
+
/* 111MHz / ( (3 * 17) * 22 ) = ~100KHz */
writel((16 << ZYNQ_I2C_CONTROL_DIV_B_SHIFT) |
(2 << ZYNQ_I2C_CONTROL_DIV_A_SHIFT), &zynq_i2c->control);
@@ -87,7 +89,7 @@ static void zynq_i2c_init(struct i2c_adapter *adap, int requested_speed,
}
#ifdef DEBUG
-static void zynq_i2c_debug_status(void)
+static void zynq_i2c_debug_status(struct zynq_i2c_registers *zynq_i2c)
{
int int_status;
int status;
@@ -129,7 +131,7 @@ static void zynq_i2c_debug_status(void)
#endif
/* Wait for an interrupt */
-static u32 zynq_i2c_wait(u32 mask)
+static u32 zynq_i2c_wait(struct zynq_i2c_registers *zynq_i2c, u32 mask)
{
int timeout, int_status;
@@ -140,7 +142,7 @@ static u32 zynq_i2c_wait(u32 mask)
break;
}
#ifdef DEBUG
- zynq_i2c_debug_status();
+ zynq_i2c_debug_status(zynq_i2c));
#endif
/* Clear interrupt status flags */
writel(int_status & mask, &zynq_i2c->interrupt_status);
@@ -154,6 +156,8 @@ static u32 zynq_i2c_wait(u32 mask)
*/
static int zynq_i2c_probe(struct i2c_adapter *adap, u8 dev)
{
+ struct zynq_i2c_registers *zynq_i2c = i2c_select(adap);
+
/* Attempt to read a byte */
setbits_le32(&zynq_i2c->control, ZYNQ_I2C_CONTROL_CLR_FIFO |
ZYNQ_I2C_CONTROL_RW);
@@ -162,7 +166,7 @@ static int zynq_i2c_probe(struct i2c_adapter *adap, u8 dev)
writel(dev, &zynq_i2c->address);
writel(1, &zynq_i2c->transfer_size);
- return (zynq_i2c_wait(ZYNQ_I2C_INTERRUPT_COMP |
+ return (zynq_i2c_wait(zynq_i2c, ZYNQ_I2C_INTERRUPT_COMP |
ZYNQ_I2C_INTERRUPT_NACK) &
ZYNQ_I2C_INTERRUPT_COMP) ? 0 : -ETIMEDOUT;
}
@@ -177,6 +181,7 @@ static int zynq_i2c_read(struct i2c_adapter *adap, u8 dev, uint addr,
u32 status;
u32 i = 0;
u8 *cur_data = data;
+ struct zynq_i2c_registers *zynq_i2c = i2c_select(adap);
/* Check the hardware can handle the requested bytes */
if ((length < 0) || (length > ZYNQ_I2C_TRANSFERT_SIZE_MAX))
@@ -198,7 +203,7 @@ static int zynq_i2c_read(struct i2c_adapter *adap, u8 dev, uint addr,
writel(addr >> (8*alen), &zynq_i2c->data);
/* Wait for the address to be sent */
- if (!zynq_i2c_wait(ZYNQ_I2C_INTERRUPT_COMP)) {
+ if (!zynq_i2c_wait(zynq_i2c, ZYNQ_I2C_INTERRUPT_COMP)) {
/* Release the bus */
clrbits_le32(&zynq_i2c->control, ZYNQ_I2C_CONTROL_HOLD);
return -ETIMEDOUT;
@@ -213,7 +218,7 @@ static int zynq_i2c_read(struct i2c_adapter *adap, u8 dev, uint addr,
while (alen--)
writel(addr >> (8*alen), &zynq_i2c->data);
/* Start the tranfer */
- if (!zynq_i2c_wait(ZYNQ_I2C_INTERRUPT_COMP)) {
+ if (!zynq_i2c_wait(zynq_i2c, ZYNQ_I2C_INTERRUPT_COMP)) {
/* Release the bus */
clrbits_le32(&zynq_i2c->control, ZYNQ_I2C_CONTROL_HOLD);
return -ETIMEDOUT;
@@ -229,7 +234,7 @@ static int zynq_i2c_read(struct i2c_adapter *adap, u8 dev, uint addr,
/* Wait for data */
do {
- status = zynq_i2c_wait(ZYNQ_I2C_INTERRUPT_COMP |
+ status = zynq_i2c_wait(zynq_i2c, ZYNQ_I2C_INTERRUPT_COMP |
ZYNQ_I2C_INTERRUPT_DATA);
if (!status) {
/* Release the bus */
@@ -258,6 +263,7 @@ static int zynq_i2c_write(struct i2c_adapter *adap, u8 dev, uint addr,
int alen, u8 *data, int length)
{
u8 *cur_data = data;
+ struct zynq_i2c_registers *zynq_i2c = i2c_select(adap);
/* Write the register address */
setbits_le32(&zynq_i2c->control, ZYNQ_I2C_CONTROL_CLR_FIFO |
@@ -268,7 +274,7 @@ static int zynq_i2c_write(struct i2c_adapter *adap, u8 dev, uint addr,
writel(addr >> (8*alen), &zynq_i2c->data);
/* Start the tranfer */
writel(dev, &zynq_i2c->address);
- if (!zynq_i2c_wait(ZYNQ_I2C_INTERRUPT_COMP)) {
+ if (!zynq_i2c_wait(zynq_i2c, ZYNQ_I2C_INTERRUPT_COMP)) {
/* Release the bus */
clrbits_le32(&zynq_i2c->control, ZYNQ_I2C_CONTROL_HOLD);
return -ETIMEDOUT;
@@ -278,7 +284,7 @@ static int zynq_i2c_write(struct i2c_adapter *adap, u8 dev, uint addr,
while (length--) {
writel(*(cur_data++), &zynq_i2c->data);
if (readl(&zynq_i2c->transfer_size) == ZYNQ_I2C_FIFO_DEPTH) {
- if (!zynq_i2c_wait(ZYNQ_I2C_INTERRUPT_COMP)) {
+ if (!zynq_i2c_wait(zynq_i2c, ZYNQ_I2C_INTERRUPT_COMP)) {
/* Release the bus */
clrbits_le32(&zynq_i2c->control,
ZYNQ_I2C_CONTROL_HOLD);
@@ -290,7 +296,7 @@ static int zynq_i2c_write(struct i2c_adapter *adap, u8 dev, uint addr,
/* All done... release the bus */
clrbits_le32(&zynq_i2c->control, ZYNQ_I2C_CONTROL_HOLD);
/* Wait for the address and data to be sent */
- if (!zynq_i2c_wait(ZYNQ_I2C_INTERRUPT_COMP))
+ if (!zynq_i2c_wait(zynq_i2c, ZYNQ_I2C_INTERRUPT_COMP))
return -ETIMEDOUT;
return 0;
}
@@ -308,3 +314,7 @@ U_BOOT_I2C_ADAP_COMPLETE(zynq_0, zynq_i2c_init, zynq_i2c_probe, zynq_i2c_read,
zynq_i2c_write, zynq_i2c_set_bus_speed,
CONFIG_SYS_I2C_ZYNQ_SPEED, CONFIG_SYS_I2C_ZYNQ_SLAVE,
0)
+U_BOOT_I2C_ADAP_COMPLETE(zynq_1, zynq_i2c_init, zynq_i2c_probe, zynq_i2c_read,
+ zynq_i2c_write, zynq_i2c_set_bus_speed,
+ CONFIG_SYS_I2C_ZYNQ_SPEED, CONFIG_SYS_I2C_ZYNQ_SLAVE,
+ 1)
diff --git a/include/configs/zynq.h b/include/configs/zynq.h
index 82ec826..a9a6fac 100644
--- a/include/configs/zynq.h
+++ b/include/configs/zynq.h
@@ -55,15 +55,14 @@
# define CONFIG_DOS_PARTITION
#endif
-#define CONFIG_ZYNQ_I2C0
+#define CONFIG_SYS_I2C_ZYNQ
/* I2C */
-#if defined(CONFIG_ZYNQ_I2C0) || defined(CONFIG_ZYNQ_I2C1)
+#if defined(CONFIG_SYS_I2C_ZYNQ)
# define CONFIG_CMD_I2C
# define CONFIG_SYS_I2C
-# define CONFIG_SYS_I2C_ZYNQ
# define CONFIG_SYS_I2C_ZYNQ_SPEED 100000
-# define CONFIG_SYS_I2C_ZYNQ_SLAVE 1
+# define CONFIG_SYS_I2C_ZYNQ_SLAVE 0
#endif
#if defined(CONFIG_ZYNQ_DCC)
--
1.8.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140103/799cdf85/attachment.pgp>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [U-Boot, v1, 2/2] i2c: zynq: Add support for the second i2c controller
2014-01-03 9:45 ` [U-Boot] [PATCH v1 2/2] i2c: zynq: Add support for the second i2c controller Michal Simek
@ 2014-01-13 7:32 ` Heiko Schocher
2014-01-13 7:53 ` Michal Simek
0 siblings, 1 reply; 9+ messages in thread
From: Heiko Schocher @ 2014-01-13 7:32 UTC (permalink / raw)
To: u-boot
Hello Michel,
Am 03.01.2014 10:45, schrieb Michal Simek:
> From: Michael Burr<michael.burr@logicpd.com>
>
> Initialize the second i2c controller.
>
> Signed-off-by: Michael Burr<michael.burr@logicpd.com>
> Signed-off-by: Michal Simek<michal.simek@xilinx.com>
>
> ---
> Changes in v1:
> - Based on original thread from Michael Burr
> http://lists.denx.de/pipermail/u-boot/2013-October/165017.html
> Heiko did some changes in this mainline patch
> "i2c, zynq: convert zynq i2c driver to new multibus/multiadapter framework"
> (sha1: 0bdffe71fddeaa46768a39305797e4512dee0f15)
> - MS rebase on latest&greatest
>
> drivers/i2c/zynq_i2c.c | 46 ++++++++++++++++++++++++++++------------------
> include/configs/zynq.h | 7 +++----
> 2 files changed, 31 insertions(+), 22 deletions(-)
I could not apply your patch on top of current tree
commit 7f673c99c2d8d1aa21996c5b914f06d784b080ca
Merge: 8401bfa 10a147b
Author: Tom Rini <trini@ti.com>
Date: Fri Jan 10 10:56:00 2014 -0500
Merge branch 'master' of git://git.denx.de/u-boot-arm
Problem is the change in "include/configs/zynq.h", as this file does
not longer exist in mainline ... I think, your change should be done
in "include/configs/zynq-common.h", right?
Is it OK, if I fix this, or would you send a v2 (prefered, as I could
not test this)?
bye,
Heiko
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [U-Boot, v1, 2/2] i2c: zynq: Add support for the second i2c controller
2014-01-13 7:32 ` [U-Boot] [U-Boot, v1, " Heiko Schocher
@ 2014-01-13 7:53 ` Michal Simek
2014-01-13 8:10 ` Heiko Schocher
0 siblings, 1 reply; 9+ messages in thread
From: Michal Simek @ 2014-01-13 7:53 UTC (permalink / raw)
To: u-boot
On 01/13/2014 08:32 AM, Heiko Schocher wrote:
> Hello Michel,
>
> Am 03.01.2014 10:45, schrieb Michal Simek:
>> From: Michael Burr<michael.burr@logicpd.com>
>>
>> Initialize the second i2c controller.
>>
>> Signed-off-by: Michael Burr<michael.burr@logicpd.com>
>> Signed-off-by: Michal Simek<michal.simek@xilinx.com>
>>
>> ---
>> Changes in v1:
>> - Based on original thread from Michael Burr
>> http://lists.denx.de/pipermail/u-boot/2013-October/165017.html
>> Heiko did some changes in this mainline patch
>> "i2c, zynq: convert zynq i2c driver to new multibus/multiadapter framework"
>> (sha1: 0bdffe71fddeaa46768a39305797e4512dee0f15)
>> - MS rebase on latest&greatest
>>
>> drivers/i2c/zynq_i2c.c | 46 ++++++++++++++++++++++++++++------------------
>> include/configs/zynq.h | 7 +++----
>> 2 files changed, 31 insertions(+), 22 deletions(-)
>
> I could not apply your patch on top of current tree
>
> commit 7f673c99c2d8d1aa21996c5b914f06d784b080ca
> Merge: 8401bfa 10a147b
> Author: Tom Rini <trini@ti.com>
> Date: Fri Jan 10 10:56:00 2014 -0500
>
> Merge branch 'master' of git://git.denx.de/u-boot-arm
>
> Problem is the change in "include/configs/zynq.h", as this file does
> not longer exist in mainline ... I think, your change should be done
> in "include/configs/zynq-common.h", right?
>
> Is it OK, if I fix this, or would you send a v2 (prefered, as I could
> not test this)?
yes, zynq.h was renamed to zynq-common.h.
That will be great if you can fix it yourself.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140113/acb94896/attachment.pgp>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [U-Boot, v1, 2/2] i2c: zynq: Add support for the second i2c controller
2014-01-13 7:53 ` Michal Simek
@ 2014-01-13 8:10 ` Heiko Schocher
2014-01-13 8:23 ` Michal Simek
0 siblings, 1 reply; 9+ messages in thread
From: Heiko Schocher @ 2014-01-13 8:10 UTC (permalink / raw)
To: u-boot
Hello Michael,
Am 13.01.2014 08:53, schrieb Michal Simek:
> On 01/13/2014 08:32 AM, Heiko Schocher wrote:
>> Hello Michel,
>>
>> Am 03.01.2014 10:45, schrieb Michal Simek:
>>> From: Michael Burr<michael.burr@logicpd.com>
>>>
>>> Initialize the second i2c controller.
>>>
>>> Signed-off-by: Michael Burr<michael.burr@logicpd.com>
>>> Signed-off-by: Michal Simek<michal.simek@xilinx.com>
>>>
>>> ---
>>> Changes in v1:
>>> - Based on original thread from Michael Burr
>>> http://lists.denx.de/pipermail/u-boot/2013-October/165017.html
>>> Heiko did some changes in this mainline patch
>>> "i2c, zynq: convert zynq i2c driver to new multibus/multiadapter framework"
>>> (sha1: 0bdffe71fddeaa46768a39305797e4512dee0f15)
>>> - MS rebase on latest&greatest
>>>
>>> drivers/i2c/zynq_i2c.c | 46 ++++++++++++++++++++++++++++------------------
>>> include/configs/zynq.h | 7 +++----
>>> 2 files changed, 31 insertions(+), 22 deletions(-)
>>
>> I could not apply your patch on top of current tree
>>
>> commit 7f673c99c2d8d1aa21996c5b914f06d784b080ca
>> Merge: 8401bfa 10a147b
>> Author: Tom Rini<trini@ti.com>
>> Date: Fri Jan 10 10:56:00 2014 -0500
>>
>> Merge branch 'master' of git://git.denx.de/u-boot-arm
>>
>> Problem is the change in "include/configs/zynq.h", as this file does
>> not longer exist in mainline ... I think, your change should be done
>> in "include/configs/zynq-common.h", right?
>>
>> Is it OK, if I fix this, or would you send a v2 (prefered, as I could
>> not test this)?
>
> yes, zynq.h was renamed to zynq-common.h.
> That will be great if you can fix it yourself.
Done, see:
http://git.denx.de/?p=u-boot/u-boot-i2c.git;a=commit;h=8e0b3c020057b3f7345b6696029a80eaf162e7f3
Please test and give me feedback. If my fix is not perfect, please
post a v2, thanks!
bye,
Heiko
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [U-Boot, v1, 2/2] i2c: zynq: Add support for the second i2c controller
2014-01-13 8:10 ` Heiko Schocher
@ 2014-01-13 8:23 ` Michal Simek
2014-01-17 6:43 ` Heiko Schocher
0 siblings, 1 reply; 9+ messages in thread
From: Michal Simek @ 2014-01-13 8:23 UTC (permalink / raw)
To: u-boot
On 01/13/2014 09:10 AM, Heiko Schocher wrote:
> Hello Michael,
>
> Am 13.01.2014 08:53, schrieb Michal Simek:
>> On 01/13/2014 08:32 AM, Heiko Schocher wrote:
>>> Hello Michel,
>>>
>>> Am 03.01.2014 10:45, schrieb Michal Simek:
>>>> From: Michael Burr<michael.burr@logicpd.com>
>>>>
>>>> Initialize the second i2c controller.
>>>>
>>>> Signed-off-by: Michael Burr<michael.burr@logicpd.com>
>>>> Signed-off-by: Michal Simek<michal.simek@xilinx.com>
>>>>
>>>> ---
>>>> Changes in v1:
>>>> - Based on original thread from Michael Burr
>>>> http://lists.denx.de/pipermail/u-boot/2013-October/165017.html
>>>> Heiko did some changes in this mainline patch
>>>> "i2c, zynq: convert zynq i2c driver to new multibus/multiadapter framework"
>>>> (sha1: 0bdffe71fddeaa46768a39305797e4512dee0f15)
>>>> - MS rebase on latest&greatest
>>>>
>>>> drivers/i2c/zynq_i2c.c | 46 ++++++++++++++++++++++++++++------------------
>>>> include/configs/zynq.h | 7 +++----
>>>> 2 files changed, 31 insertions(+), 22 deletions(-)
>>>
>>> I could not apply your patch on top of current tree
>>>
>>> commit 7f673c99c2d8d1aa21996c5b914f06d784b080ca
>>> Merge: 8401bfa 10a147b
>>> Author: Tom Rini<trini@ti.com>
>>> Date: Fri Jan 10 10:56:00 2014 -0500
>>>
>>> Merge branch 'master' of git://git.denx.de/u-boot-arm
>>>
>>> Problem is the change in "include/configs/zynq.h", as this file does
>>> not longer exist in mainline ... I think, your change should be done
>>> in "include/configs/zynq-common.h", right?
>>>
>>> Is it OK, if I fix this, or would you send a v2 (prefered, as I could
>>> not test this)?
>>
>> yes, zynq.h was renamed to zynq-common.h.
>> That will be great if you can fix it yourself.
>
> Done, see:
> http://git.denx.de/?p=u-boot/u-boot-i2c.git;a=commit;h=8e0b3c020057b3f7345b6696029a80eaf162e7f3
>
> Please test and give me feedback. If my fix is not perfect, please
> post a v2, thanks!
Looks good to me. We will test it and I will let you know if we see any problem.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140113/cfdf044b/attachment.pgp>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [U-Boot, v1, 2/2] i2c: zynq: Add support for the second i2c controller
2014-01-13 8:23 ` Michal Simek
@ 2014-01-17 6:43 ` Heiko Schocher
2014-01-20 9:22 ` Michal Simek
0 siblings, 1 reply; 9+ messages in thread
From: Heiko Schocher @ 2014-01-17 6:43 UTC (permalink / raw)
To: u-boot
Hello Michal,
Am 13.01.2014 09:23, schrieb Michal Simek:
> On 01/13/2014 09:10 AM, Heiko Schocher wrote:
>> Hello Michael,
>>
>> Am 13.01.2014 08:53, schrieb Michal Simek:
>>> On 01/13/2014 08:32 AM, Heiko Schocher wrote:
>>>> Hello Michel,
>>>>
>>>> Am 03.01.2014 10:45, schrieb Michal Simek:
>>>>> From: Michael Burr<michael.burr@logicpd.com>
>>>>>
>>>>> Initialize the second i2c controller.
>>>>>
>>>>> Signed-off-by: Michael Burr<michael.burr@logicpd.com>
>>>>> Signed-off-by: Michal Simek<michal.simek@xilinx.com>
>>>>>
>>>>> ---
>>>>> Changes in v1:
>>>>> - Based on original thread from Michael Burr
>>>>> http://lists.denx.de/pipermail/u-boot/2013-October/165017.html
>>>>> Heiko did some changes in this mainline patch
>>>>> "i2c, zynq: convert zynq i2c driver to new multibus/multiadapter framework"
>>>>> (sha1: 0bdffe71fddeaa46768a39305797e4512dee0f15)
>>>>> - MS rebase on latest&greatest
>>>>>
>>>>> drivers/i2c/zynq_i2c.c | 46 ++++++++++++++++++++++++++++------------------
>>>>> include/configs/zynq.h | 7 +++----
>>>>> 2 files changed, 31 insertions(+), 22 deletions(-)
>>>>
>>>> I could not apply your patch on top of current tree
>>>>
>>>> commit 7f673c99c2d8d1aa21996c5b914f06d784b080ca
>>>> Merge: 8401bfa 10a147b
>>>> Author: Tom Rini<trini@ti.com>
>>>> Date: Fri Jan 10 10:56:00 2014 -0500
>>>>
>>>> Merge branch 'master' of git://git.denx.de/u-boot-arm
>>>>
>>>> Problem is the change in "include/configs/zynq.h", as this file does
>>>> not longer exist in mainline ... I think, your change should be done
>>>> in "include/configs/zynq-common.h", right?
>>>>
>>>> Is it OK, if I fix this, or would you send a v2 (prefered, as I could
>>>> not test this)?
>>>
>>> yes, zynq.h was renamed to zynq-common.h.
>>> That will be great if you can fix it yourself.
>>
>> Done, see:
>> http://git.denx.de/?p=u-boot/u-boot-i2c.git;a=commit;h=8e0b3c020057b3f7345b6696029a80eaf162e7f3
>>
>> Please test and give me feedback. If my fix is not perfect, please
>> post a v2, thanks!
>
>
> Looks good to me. We will test it and I will let you know if we see any problem.
Do you find some time for tests? I want to send a pull request for
pending i2c patches (inclusive this patch).
bye,
Heiko
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [U-Boot, v1, 2/2] i2c: zynq: Add support for the second i2c controller
2014-01-17 6:43 ` Heiko Schocher
@ 2014-01-20 9:22 ` Michal Simek
2014-01-20 9:41 ` Heiko Schocher
0 siblings, 1 reply; 9+ messages in thread
From: Michal Simek @ 2014-01-20 9:22 UTC (permalink / raw)
To: u-boot
On 01/17/2014 07:43 AM, Heiko Schocher wrote:
> Hello Michal,
>
> Am 13.01.2014 09:23, schrieb Michal Simek:
>> On 01/13/2014 09:10 AM, Heiko Schocher wrote:
>>> Hello Michael,
>>>
>>> Am 13.01.2014 08:53, schrieb Michal Simek:
>>>> On 01/13/2014 08:32 AM, Heiko Schocher wrote:
>>>>> Hello Michel,
>>>>>
>>>>> Am 03.01.2014 10:45, schrieb Michal Simek:
>>>>>> From: Michael Burr<michael.burr@logicpd.com>
>>>>>>
>>>>>> Initialize the second i2c controller.
>>>>>>
>>>>>> Signed-off-by: Michael Burr<michael.burr@logicpd.com>
>>>>>> Signed-off-by: Michal Simek<michal.simek@xilinx.com>
>>>>>>
>>>>>> ---
>>>>>> Changes in v1:
>>>>>> - Based on original thread from Michael Burr
>>>>>> http://lists.denx.de/pipermail/u-boot/2013-October/165017.html
>>>>>> Heiko did some changes in this mainline patch
>>>>>> "i2c, zynq: convert zynq i2c driver to new multibus/multiadapter framework"
>>>>>> (sha1: 0bdffe71fddeaa46768a39305797e4512dee0f15)
>>>>>> - MS rebase on latest&greatest
>>>>>>
>>>>>> drivers/i2c/zynq_i2c.c | 46 ++++++++++++++++++++++++++++------------------
>>>>>> include/configs/zynq.h | 7 +++----
>>>>>> 2 files changed, 31 insertions(+), 22 deletions(-)
>>>>>
>>>>> I could not apply your patch on top of current tree
>>>>>
>>>>> commit 7f673c99c2d8d1aa21996c5b914f06d784b080ca
>>>>> Merge: 8401bfa 10a147b
>>>>> Author: Tom Rini<trini@ti.com>
>>>>> Date: Fri Jan 10 10:56:00 2014 -0500
>>>>>
>>>>> Merge branch 'master' of git://git.denx.de/u-boot-arm
>>>>>
>>>>> Problem is the change in "include/configs/zynq.h", as this file does
>>>>> not longer exist in mainline ... I think, your change should be done
>>>>> in "include/configs/zynq-common.h", right?
>>>>>
>>>>> Is it OK, if I fix this, or would you send a v2 (prefered, as I could
>>>>> not test this)?
>>>>
>>>> yes, zynq.h was renamed to zynq-common.h.
>>>> That will be great if you can fix it yourself.
>>>
>>> Done, see:
>>> http://git.denx.de/?p=u-boot/u-boot-i2c.git;a=commit;h=8e0b3c020057b3f7345b6696029a80eaf162e7f3
>>>
>>> Please test and give me feedback. If my fix is not perfect, please
>>> post a v2, thanks!
>>
>>
>> Looks good to me. We will test it and I will let you know if we see any problem.
>
> Do you find some time for tests? I want to send a pull request for
> pending i2c patches (inclusive this patch).
Sorry for delay. I have retest it and I see that I have totally messed up
the first patch.
"i2c: zynq: Support for 0-length register address"
This is the origin patch.
http://lists.denx.de/pipermail/u-boot/2013-October/165019.html
Interesting is that I really don't know what I have tested before. :-(
Would it be possible to remove this patch. Feel free to remove both
I will resend them.
Sorry for troubles.
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140120/d23a40e7/attachment.pgp>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [U-Boot, v1, 2/2] i2c: zynq: Add support for the second i2c controller
2014-01-20 9:22 ` Michal Simek
@ 2014-01-20 9:41 ` Heiko Schocher
0 siblings, 0 replies; 9+ messages in thread
From: Heiko Schocher @ 2014-01-20 9:41 UTC (permalink / raw)
To: u-boot
Hello Michal,
Am 20.01.2014 10:22, schrieb Michal Simek:
> On 01/17/2014 07:43 AM, Heiko Schocher wrote:
>> Hello Michal,
>>
>> Am 13.01.2014 09:23, schrieb Michal Simek:
>>> On 01/13/2014 09:10 AM, Heiko Schocher wrote:
>>>> Hello Michael,
>>>>
>>>> Am 13.01.2014 08:53, schrieb Michal Simek:
>>>>> On 01/13/2014 08:32 AM, Heiko Schocher wrote:
>>>>>> Hello Michel,
>>>>>>
>>>>>> Am 03.01.2014 10:45, schrieb Michal Simek:
>>>>>>> From: Michael Burr<michael.burr@logicpd.com>
>>>>>>>
>>>>>>> Initialize the second i2c controller.
>>>>>>>
>>>>>>> Signed-off-by: Michael Burr<michael.burr@logicpd.com>
>>>>>>> Signed-off-by: Michal Simek<michal.simek@xilinx.com>
>>>>>>>
>>>>>>> ---
>>>>>>> Changes in v1:
>>>>>>> - Based on original thread from Michael Burr
>>>>>>> http://lists.denx.de/pipermail/u-boot/2013-October/165017.html
>>>>>>> Heiko did some changes in this mainline patch
>>>>>>> "i2c, zynq: convert zynq i2c driver to new multibus/multiadapter framework"
>>>>>>> (sha1: 0bdffe71fddeaa46768a39305797e4512dee0f15)
>>>>>>> - MS rebase on latest&greatest
>>>>>>>
>>>>>>> drivers/i2c/zynq_i2c.c | 46 ++++++++++++++++++++++++++++------------------
>>>>>>> include/configs/zynq.h | 7 +++----
>>>>>>> 2 files changed, 31 insertions(+), 22 deletions(-)
>>>>>>
>>>>>> I could not apply your patch on top of current tree
>>>>>>
>>>>>> commit 7f673c99c2d8d1aa21996c5b914f06d784b080ca
>>>>>> Merge: 8401bfa 10a147b
>>>>>> Author: Tom Rini<trini@ti.com>
>>>>>> Date: Fri Jan 10 10:56:00 2014 -0500
>>>>>>
>>>>>> Merge branch 'master' of git://git.denx.de/u-boot-arm
>>>>>>
>>>>>> Problem is the change in "include/configs/zynq.h", as this file does
>>>>>> not longer exist in mainline ... I think, your change should be done
>>>>>> in "include/configs/zynq-common.h", right?
>>>>>>
>>>>>> Is it OK, if I fix this, or would you send a v2 (prefered, as I could
>>>>>> not test this)?
>>>>>
>>>>> yes, zynq.h was renamed to zynq-common.h.
>>>>> That will be great if you can fix it yourself.
>>>>
>>>> Done, see:
>>>> http://git.denx.de/?p=u-boot/u-boot-i2c.git;a=commit;h=8e0b3c020057b3f7345b6696029a80eaf162e7f3
>>>>
>>>> Please test and give me feedback. If my fix is not perfect, please
>>>> post a v2, thanks!
>>>
>>>
>>> Looks good to me. We will test it and I will let you know if we see any problem.
>>
>> Do you find some time for tests? I want to send a pull request for
>> pending i2c patches (inclusive this patch).
>
> Sorry for delay. I have retest it and I see that I have totally messed up
> the first patch.
> "i2c: zynq: Support for 0-length register address"
>
> This is the origin patch.
> http://lists.denx.de/pipermail/u-boot/2013-October/165019.html
>
> Interesting is that I really don't know what I have tested before. :-(
>
> Would it be possible to remove this patch. Feel free to remove both
> I will resend them.
I havd removed both patches from u-boot-i2c.git. Please repost them,
thanks!
bye,
Heiko
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-01-20 9:41 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-03 9:45 [U-Boot] [PATCH v1 1/2] i2c: zynq: Support for 0-length register address Michal Simek
2014-01-03 9:45 ` [U-Boot] [PATCH v1 2/2] i2c: zynq: Add support for the second i2c controller Michal Simek
2014-01-13 7:32 ` [U-Boot] [U-Boot, v1, " Heiko Schocher
2014-01-13 7:53 ` Michal Simek
2014-01-13 8:10 ` Heiko Schocher
2014-01-13 8:23 ` Michal Simek
2014-01-17 6:43 ` Heiko Schocher
2014-01-20 9:22 ` Michal Simek
2014-01-20 9:41 ` Heiko Schocher
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.