[U-Boot] [PATCH 1/4 v2] blackfin: Use ADI_GPIO2 driver other than the default ADI_GPIO1
From: Sonic Zhang sonic.zhang@analog.com
Signed-off-by: Sonic Zhang sonic.zhang@analog.com --- include/configs/cm-bf548.h | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/include/configs/cm-bf548.h b/include/configs/cm-bf548.h index 3c9eeb5..7f27eda 100644 --- a/include/configs/cm-bf548.h +++ b/include/configs/cm-bf548.h @@ -118,6 +118,8 @@ #define CONFIG_BOOTCOMMAND "run flashboot" #define FLASHBOOT_ENV_SETTINGS "flashboot=bootm 0x20040000\0"
+#define CONFIG_ADI_GPIO2 + #ifndef __ADSPBF542__ /* Don't waste time transferring a logo over the UART */ # if (CONFIG_BFIN_BOOT_MODE != BFIN_BOOT_UART)
From: Sonic Zhang sonic.zhang@analog.com
Signed-off-by: Sonic Zhang sonic.zhang@analog.com --- arch/blackfin/cpu/gpio.c | 2 +- arch/blackfin/include/asm/gpio.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/blackfin/cpu/gpio.c b/arch/blackfin/cpu/gpio.c index 5e9c68a..86da706 100644 --- a/arch/blackfin/cpu/gpio.c +++ b/arch/blackfin/cpu/gpio.c @@ -12,7 +12,7 @@ #include <asm/gpio.h> #include <asm/portmux.h>
-#ifdef CONFIG_ADI_GPIO1 +#ifndef CONFIG_ADI_GPIO2 #if ANOMALY_05000311 || ANOMALY_05000323 enum { AWA_data = SYSCR, diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h index 376ec02..6ebcf01 100644 --- a/arch/blackfin/include/asm/gpio.h +++ b/arch/blackfin/include/asm/gpio.h @@ -72,7 +72,7 @@
#ifndef __ASSEMBLY__
-#ifdef CONFIG_ADI_GPIO1 +#ifndef CONFIG_ADI_GPIO2 void set_gpio_dir(unsigned, unsigned short); void set_gpio_inen(unsigned, unsigned short); void set_gpio_polar(unsigned, unsigned short);
From: Sonic Zhang sonic.zhang@analog.com
Signed-off-by: Sonic Zhang sonic.zhang@analog.com --- include/configs/bf506f-ezkit.h | 1 + include/configs/bf525-ucr2.h | 1 + include/configs/bf537-minotaur.h | 1 + include/configs/bf537-srv1.h | 1 + include/configs/blackstamp.h | 1 + include/configs/dnp5370.h | 1 + 6 files changed, 6 insertions(+)
diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h index 77b6735..5ad3ee7 100644 --- a/include/configs/bf506f-ezkit.h +++ b/include/configs/bf506f-ezkit.h @@ -94,6 +94,7 @@ #define CONFIG_DCACHE_OFF #define CONFIG_UART_CONSOLE 0 #define CONFIG_BAUDRATE 115200 +#define CONFIG_BFIN_SERIAL
#define CONFIG_CMD_MEMORY #undef CONFIG_GZIP diff --git a/include/configs/bf525-ucr2.h b/include/configs/bf525-ucr2.h index 1f65130..008f4b5 100644 --- a/include/configs/bf525-ucr2.h +++ b/include/configs/bf525-ucr2.h @@ -85,6 +85,7 @@ #define CONFIG_UART_CONSOLE 0
#define CONFIG_BAUDRATE 115200 +#define CONFIG_BFIN_SERIAL #define CONFIG_BOOTARGS "root=/dev/mtdblock0 rw" #define CONFIG_BOOTCOMMAND "run sfboot" #define CONFIG_BOOTDELAY 5 diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h index feb9d73..156eeab 100644 --- a/include/configs/bf537-minotaur.h +++ b/include/configs/bf537-minotaur.h @@ -136,6 +136,7 @@
#define CONFIG_BAUDRATE 57600 #define CONFIG_UART_CONSOLE 0 +#define CONFIG_BFIN_SERIAL
#define CONFIG_PANIC_HANG 1 #define CONFIG_RTC_BFIN 1 diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h index 1de8ffe..e12d761 100644 --- a/include/configs/bf537-srv1.h +++ b/include/configs/bf537-srv1.h @@ -136,6 +136,7 @@
#define CONFIG_BAUDRATE 115200 #define CONFIG_UART_CONSOLE 0 +#define CONFIG_BFIN_SERIAL
#define CONFIG_PANIC_HANG 1 #define CONFIG_RTC_BFIN 1 diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h index 5b3aac7..7de4253 100644 --- a/include/configs/blackstamp.h +++ b/include/configs/blackstamp.h @@ -195,6 +195,7 @@ #define CONFIG_BAUDRATE 57600 #define CONFIG_LOADS_ECHO 1 #define CONFIG_UART_CONSOLE 0 +#define CONFIG_BFIN_SERIAL
/* * I2C settings diff --git a/include/configs/dnp5370.h b/include/configs/dnp5370.h index d0e72e3..4f2c742 100644 --- a/include/configs/dnp5370.h +++ b/include/configs/dnp5370.h @@ -103,6 +103,7 @@ #define CONFIG_DNP5370_EXT_WD_DISABLE 1
#define CONFIG_UART_CONSOLE 0 +#define CONFIG_BFIN_SERIAL #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTCOMMAND "bootm 0x20030000" #define CONFIG_BOOTARGS "console=ttyBF0,115200 root=/dev/mtdblock3 rootfstype=ext2"
From: Sonic Zhang sonic.zhang@analog.com
Use default GPIO operations.
Signed-off-by: Sonic Zhang sonic.zhang@analog.com --- include/configs/bf533-stamp.h | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-)
diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h index a22c868..f5b9658 100644 --- a/include/configs/bf533-stamp.h +++ b/include/configs/bf533-stamp.h @@ -80,33 +80,8 @@ /* * Software (bit-bang) I2C driver configuration */ -#define PF_SCL PF3 -#define PF_SDA PF2 -#define I2C_INIT (*pFIO_DIR |= PF_SCL); asm("ssync;") -#define I2C_ACTIVE (*pFIO_DIR |= PF_SDA); \ - *pFIO_INEN &= ~PF_SDA; asm("ssync;") -#define I2C_TRISTATE (*pFIO_DIR &= ~PF_SDA); \ - *pFIO_INEN |= PF_SDA; asm("ssync;") -#define I2C_READ ((volatile)(*pFIO_FLAG_D & PF_SDA) != 0); \ - asm("ssync;") -#define I2C_SDA(bit) if (bit) { \ - *pFIO_FLAG_S = PF_SDA; \ - asm("ssync;"); \ - } \ - else { \ - *pFIO_FLAG_C = PF_SDA; \ - asm("ssync;"); \ - } -#define I2C_SCL(bit) if (bit) { \ - *pFIO_FLAG_S = PF_SCL; \ - asm("ssync;"); \ - } \ - else { \ - *pFIO_FLAG_C = PF_SCL; \ - asm("ssync;"); \ - } -#define I2C_DELAY udelay(5) /* 1/4 I2C clock duration */ - +#define CONFIG_SOFT_I2C_GPIO_SCL GPIO_PF3 +#define CONFIG_SOFT_I2C_GPIO_SDA GPIO_PF2
/* * Flash Settings
Hello Sonic,
Am 25.11.2013 07:27, schrieb Sonic Zhang:
From: Sonic Zhangsonic.zhang@analog.com
Use default GPIO operations.
Signed-off-by: Sonic Zhangsonic.zhang@analog.com
include/configs/bf533-stamp.h | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-)
Is this the same patch you posted here:
http://patchwork.ozlabs.org/patch/292026/
?
I have the "old" patch on my ToDo list, but I can Ack the new patch, if it should go through the blackfin repo ... added Mike Frysinger to cc ...
bye, Heiko
Hi Heiko,
The second patch is to address Masahiro Yamada's concern on the title format. No change to the content.
Mike is no longer with ADI and Blackfin. If you prefer to go through the Blackfin repo, I can handle it.
Regards,
Sonic
-----Original Message----- From: Heiko Schocher [mailto:hs@denx.de] Sent: Monday, November 25, 2013 2:51 PM To: Sonic Zhang Cc: Masahiro Yamada; u-boot@lists.denx.de; adi-u-boot-devel@lists.sourceforge.net; Zhang, Sonic; Mike Frysinger Subject: Re: [PATCH 4/4 v2] blackfin: soft-i2c: No need to define blackfin specific soft i2c operations
Hello Sonic,
Am 25.11.2013 07:27, schrieb Sonic Zhang:
From: Sonic Zhangsonic.zhang@analog.com
Use default GPIO operations.
Signed-off-by: Sonic Zhangsonic.zhang@analog.com
include/configs/bf533-stamp.h | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-)
Is this the same patch you posted here:
http://patchwork.ozlabs.org/patch/292026/
?
I have the "old" patch on my ToDo list, but I can Ack the new patch, if it should go through the blackfin repo ... added Mike Frysinger to cc ...
bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Hello Sonic,
Am 25.11.2013 08:07, schrieb Zhang, Sonic:
Hi Heiko,
The second patch is to address Masahiro Yamada's concern on the title format. No change to the content.
Oh... you should note this after the "---" in your patch.
Mike is no longer with ADI and Blackfin. If you prefer to go through the Blackfin repo, I can handle it.
Hmm... as you posted it in a patchserie now, I just Acked it ;-)
Oh, maybe you can update "doc/git-mailrc" ?
bye, Heiko
Hello Sonic,
Am 25.11.2013 07:27, schrieb Sonic Zhang:
From: Sonic Zhangsonic.zhang@analog.com
Use default GPIO operations.
Signed-off-by: Sonic Zhangsonic.zhang@analog.com
include/configs/bf533-stamp.h | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-)
Acked-by: Heiko Schocher hs@denx.de
bye, Heiko
participants (3)
-
Heiko Schocher -
Sonic Zhang -
Zhang, Sonic