July 2011 - U-Boot

[U-Boot] Please pull u-boot-ti/master
by s-paulraj＠ti.com 23 Jul '11

23 Jul '11

Albert, Please pull u-boot-ti/master As mentioned by Anessh on the list, omap4 does not compile and needs the fix http://patchwork.ozlabs.org/patch/105364/ Things should fall in place when this series reaches mainline however I am still working through some other patches for which i will send a pull request later. Regards, Sandeep --- The following changes since commit 09582c20d7564d5240d256c21bd3b6bd7e8afbb4: Laurence Withers (1): DA8xx: fix LPSC constants are available in the git repository at: git://git.denx.de/u-boot-ti.git master Aneesh V (19): arm: adjust PLATFORM_LIBS for SPL scaled down version of generic libraries for SPL replace CONFIG_PRELOADER with CONFIG_SPL_BUILD omap4: utility function to identify the context of hw init omap4: cleanup pin mux data omap4: add OMAP4430 revision check omap4: add clock support omap4: add sdram init support omap4: calculate EMIF register values omap4: automatic sdram detection armv7: start.S: fixes and enhancements for SPL omap: add basic SPL support Correct ih_os for u-boot.img omap: add MMC and FAT support to SPL omap4: add omap4460 revision detection omap4: sdram init changes for omap4460 omap: reuse omap3 gpio support in omap4 omap4: support TPS programming omap4: clock init support for omap4460 Daniel Schwierzeck (6): Use ALL-y style instead of ifeq blocks for better readability spl: add initial support for a generic SPL framework Extend build-system for SPL framework Hook SPL build-system into toplevel Makefile spl: Add support for common libraries and drivers spl: add support for omap-common libraries John Rigby (1): mkimage: Add OMAP boot image support Makefile | 30 +- README | 41 +- arch/arm/config.mk | 11 +- arch/arm/cpu/arm1136/start.S | 20 +- arch/arm/cpu/arm1176/start.S | 4 +- arch/arm/cpu/arm720t/start.S | 4 +- arch/arm/cpu/arm920t/start.S | 4 +- arch/arm/cpu/arm925t/start.S | 4 +- arch/arm/cpu/arm926ejs/start.S | 18 +- arch/arm/cpu/arm946es/start.S | 4 +- arch/arm/cpu/arm_intcm/start.S | 4 +- arch/arm/cpu/armv7/Makefile | 7 +- arch/arm/cpu/armv7/cpu.c | 7 + arch/arm/cpu/armv7/omap-common/Makefile | 6 + arch/arm/cpu/armv7/{omap3 => omap-common}/gpio.c | 41 +- arch/arm/cpu/armv7/omap-common/spl.c | 272 ++++ arch/arm/cpu/armv7/omap-common/u-boot-spl.lds | 62 + arch/arm/cpu/armv7/omap-common/utils.c | 57 + arch/arm/cpu/armv7/omap3/Makefile | 1 - arch/arm/cpu/armv7/omap3/board.c | 12 + arch/arm/cpu/armv7/omap4/Makefile | 6 + arch/arm/cpu/armv7/omap4/board.c | 180 +++- arch/arm/cpu/armv7/omap4/clocks.c | 940 ++++++++++++++ .../sdp4430 => arch/arm/cpu/armv7/omap4}/config.mk | 25 +- arch/arm/cpu/armv7/omap4/emif.c | 1310 ++++++++++++++++++++ arch/arm/cpu/armv7/omap4/lowlevel_init.S | 31 + arch/arm/cpu/armv7/omap4/omap4_mux_data.h | 76 ++ arch/arm/cpu/armv7/omap4/sdram_elpida.c | 282 +++++ arch/arm/cpu/armv7/start.S | 52 +- arch/arm/cpu/armv7/u-boot.lds | 2 + arch/arm/cpu/ixp/start.S | 4 +- arch/arm/cpu/lh7a40x/start.S | 4 +- arch/arm/cpu/pxa/start.S | 30 +- arch/arm/cpu/s3c44b0/start.S | 4 +- arch/arm/cpu/sa1100/start.S | 4 +- arch/arm/include/asm/arch-omap3/cpu.h | 26 + arch/arm/include/asm/arch-omap4/clocks.h | 690 +++++++++++ arch/arm/include/asm/arch-omap4/cpu.h | 26 + arch/arm/include/asm/arch-omap4/emif.h | 1040 ++++++++++++++++ arch/arm/include/asm/arch-omap4/mux_omap4.h | 1 + arch/arm/include/asm/arch-omap4/omap4.h | 61 +- arch/arm/include/asm/arch-omap4/sys_proto.h | 72 ++- arch/arm/include/asm/armv7.h | 6 + arch/arm/include/asm/omap_common.h | 56 + .../include/asm/{arch-omap3/gpio.h => omap_gpio.h} | 27 +- arch/arm/lib/Makefile | 2 + arch/arm/lib/board.c | 2 +- arch/blackfin/config.mk | 2 +- board/pcs440ep/config.mk | 2 +- board/spear/spear300/config.mk | 2 +- board/spear/spear310/config.mk | 2 +- board/spear/spear320/config.mk | 2 +- board/spear/spear600/config.mk | 2 +- board/ti/panda/Makefile | 2 + board/ti/panda/config.mk | 31 - board/ti/panda/panda.c | 25 +- board/ti/{sdp4430/sdp.h => panda/panda_mux_data.h} | 76 +- board/ti/sdp4430/Makefile | 2 + board/ti/sdp4430/sdp.c | 25 +- .../{panda/panda.h => sdp4430/sdp4430_mux_data.h} | 128 +-- common/Makefile | 9 +- common/image.c | 9 +- config.mk | 34 +- doc/README.SPL | 60 + drivers/serial/Makefile | 3 + fs/fat/Makefile | 6 +- include/configs/omap4_panda.h | 37 + include/configs/omap4_sdp4430.h | 37 + include/image.h | 1 + lib/Makefile | 11 +- mmc_spl/board/samsung/smdkv310/Makefile | 2 +- nand_spl/board/davinci/da8xxevm/Makefile | 4 +- nand_spl/board/freescale/mx31pdk/Makefile | 4 +- nand_spl/board/karo/tx25/Makefile | 4 +- onenand_ipl/board/apollon/Makefile | 4 +- onenand_ipl/board/vpac270/Makefile | 4 +- spl/.gitignore | 4 + spl/Makefile | 125 ++ tools/Makefile | 2 + tools/mkimage.c | 2 + tools/mkimage.h | 1 + tools/omap/clocks_get_m_n.c | 197 +++ tools/omapimage.c | 224 ++++ tools/omapimage.h | 50 + 84 files changed, 6290 insertions(+), 413 deletions(-) rename arch/arm/cpu/armv7/{omap3 => omap-common}/gpio.c (76%) create mode 100644 arch/arm/cpu/armv7/omap-common/spl.c create mode 100644 arch/arm/cpu/armv7/omap-common/u-boot-spl.lds create mode 100644 arch/arm/cpu/armv7/omap-common/utils.c create mode 100644 arch/arm/cpu/armv7/omap4/clocks.c rename {board/ti/sdp4430 => arch/arm/cpu/armv7/omap4}/config.mk (64%) create mode 100644 arch/arm/cpu/armv7/omap4/emif.c create mode 100644 arch/arm/cpu/armv7/omap4/omap4_mux_data.h create mode 100644 arch/arm/cpu/armv7/omap4/sdram_elpida.c create mode 100644 arch/arm/include/asm/arch-omap4/clocks.h create mode 100644 arch/arm/include/asm/arch-omap4/emif.h create mode 100644 arch/arm/include/asm/omap_common.h rename arch/arm/include/asm/{arch-omap3/gpio.h => omap_gpio.h} (67%) delete mode 100644 board/ti/panda/config.mk rename board/ti/{sdp4430/sdp.h => panda/panda_mux_data.h} (76%) rename board/ti/{panda/panda.h => sdp4430/sdp4430_mux_data.h} (67%) create mode 100644 doc/README.SPL create mode 100644 spl/.gitignore create mode 100644 spl/Makefile create mode 100644 tools/omap/clocks_get_m_n.c create mode 100644 tools/omapimage.c create mode 100644 tools/omapimage.h

2 1

[U-Boot] [PATCH] command "sspi": add write-only flag '.w' (discard read data)
by Andreas Pretzsch 22 Jul '11

22 Jul '11

The sspi command writes the given data out on SPI and prints the data it reads to the console. For write-only slaves (i.e. a SPI-connected latch used as output expander), this is pointless and clutters the console. When called as "sspi.w", this output is omitted. The flag is optional and backwards compatible, previous sspi revisions would simply ignore the flag (checked back to 2011.03). Signed-off-by: Andreas Pretzsch <apr(a)cn-eng.de> --- Data size (number of bits) are passed as separate parameter to sspi, hence .w is "free" and not used as data size anyway. --- common/cmd_spi.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/common/cmd_spi.c b/common/cmd_spi.c index 8c623c9..c56c191 100644 --- a/common/cmd_spi.c +++ b/common/cmd_spi.c @@ -72,12 +72,17 @@ int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) uchar tmp; int j; int rcode = 0; + int write_only = 0; /* * We use the last specified parameters, unless new ones are * entered. */ + j = strlen(argv[0]); + if (j > 2 && argv[0][j-2] == '.' && argv[0][j-1] == 'w') + write_only = 1; + if ((flag & CMD_FLAG_REPEAT) == 0) { if (argc >= 2) { @@ -131,10 +136,12 @@ int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) printf("Error during SPI transaction\n"); rcode = 1; } else { - for(j = 0; j < ((bitlen + 7) / 8); j++) { - printf("%02X", din[j]); + if (!write_only) { + /* dump read values to console */ + for (j = 0; j < ((bitlen + 7) / 8); j++) + printf("%02X", din[j]); + printf("\n"); } - printf("\n"); } spi_release_bus(slave); spi_free_slave(slave); @@ -147,7 +154,8 @@ int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) U_BOOT_CMD( sspi, 5, 1, do_spi, "SPI utility command", - "[<bus>:]<cs>[.<mode>] <bit_len> <dout> - Send and receive bits\n" + "[.w] [<bus>:]<cs>[.<mode>] <bit_len> <dout> - Send and receive bits\n" + ".w - write only => don't print read result\n" "<bus> - Identifies the SPI bus\n" "<cs> - Identifies the chip select\n" "<mode> - Identifies the SPI mode to use\n" -- 1.7.5.4

3 6

[U-Boot] From Miss Alile Justin Yak
by miss aida justin 22 Jul '11

22 Jul '11

My Dearest one, Hi, my name is Miss Aida Justin Yak, 23years old originated from Sudan. I decide to contact you after my prayers; I really want to have a good relationship with you. My father Dr. Justin Yak was the former Minister for SPLA Affairs and Special Adviser to President Salva Kiir of South Sudan for Decentralization. My father Dr.Justin Yak and my mother including other top Military officers and top government officials had been on board when the plane crashed on Friday May 02, 2008. You can read more about the crash through the below site: http://news.bbc.co.uk/2/hi/africa/7380412.stm After the burial of my father, my uncles conspired and sold my father’s properties to a Chinese Expatriate and left nothing for me. On a faithful morning, I opened my father's briefcase and found out the documents which he have deposited huge amount of money in one bank in Burkina Faso with my name as the next of kin. I travelled to Burkina Faso to withdraw the money so that I can start a better life and take care of myself. On my arrival, the Branch manager of the Bank whom I met in person told me that my father's instruction to the bank was that the money be release to me only when I am married or present a trustee who will help me and invest the money overseas. I have chosen to contact you after my prayers and I believe that you will not betray my trust. But rather take me as your own sister. Though you may wonder why I am so soon revealing myself to you without knowing you, well, I will say that my mind convinced me that you are the true person to help me. More so, I will like to disclose much to you if you can help me to relocate to your country because my uncle has threatened to assassinate me. The amount is $5.6 Million and I have confirmed from the bank in Burkina Faso. You will also help me to place the money in a more profitable business venture in your Country. However, you will help by recommending a nice University in your country so that I can complete my studies. It is my intention to compensate you with 30% of the total money for your services and the balance shall be my capital in your establishment. As soon as I receive your interest in helping me, I will put things into action immediately. In the light of the above, I shall appreciate an urgent message indicating your ability and willingness to handle this transaction sincerely. Please do keep this only to your self. I beg you not to disclose it till I come over because I am afraid of my wicked uncle who has threatened to kill me. Sincerely yours, Miss Aida Justin Yak

1 0

[U-Boot] [PATCH 0/1] Removed obsolete Netstal boards
by Niklaus Giger 22 Jul '11

22 Jul '11

Hi I left Netstal Maschinen a couple of months ago and found a part time job at another company (www.solcept.ch) where some of its customers use U-Boot and linux for their products. Beside that I am working free-lance on a free software project (www.elexis.ch, An Eclipse RCP program for all aspects of a medical practice) Netstal Maschinen is not interested anymore in maintaining these powerpc boards. The HCU5 board is part of a current production model. It uses the U- boot. Source code is included with all software releases. Many thanks for the friendly help I received on this list when I submitted patches for these boards! Patch is based on git://git.denx.de/u-boot.git Compiling was tested using ELDK 4.2 using the following command line: CROSS_COMPILE=ppc_4xx- ./MAKEALL 4xx Niklaus Giger (1): Removed obsolete Netstal boards CREDITS | 5 - MAINTAINERS | 6 - board/netstal/common/fixed_sdram.c | 105 --------- board/netstal/common/nm.h | 44 ---- board/netstal/common/nm_bsp.c | 117 ---------- board/netstal/hcu4/Makefile | 51 ----- board/netstal/hcu4/README.txt | 59 ----- board/netstal/hcu4/config.mk | 25 --- board/netstal/hcu4/hcu4.c | 198 ----------------- board/netstal/hcu5/Makefile | 55 ----- board/netstal/hcu5/README.txt | 171 --------------- board/netstal/hcu5/config.mk | 27 --- board/netstal/hcu5/hcu5.c | 414 ------------------------------------ board/netstal/hcu5/init.S | 106 --------- board/netstal/hcu5/sdram.c | 283 ------------------------ board/netstal/mcu25/Makefile | 51 ----- board/netstal/mcu25/README.txt | 59 ----- board/netstal/mcu25/config.mk | 25 --- board/netstal/mcu25/mcu25.c | 197 ----------------- boards.cfg | 3 - include/configs/hcu4.h | 275 ------------------------ include/configs/hcu5.h | 325 ---------------------------- include/configs/mcu25.h | 281 ------------------------ include/configs/netstal-common.h | 261 ----------------------- 24 files changed, 0 insertions(+), 3143 deletions(-) delete mode 100644 board/netstal/common/fixed_sdram.c delete mode 100644 board/netstal/common/nm.h delete mode 100644 board/netstal/common/nm_bsp.c delete mode 100644 board/netstal/hcu4/Makefile delete mode 100644 board/netstal/hcu4/README.txt delete mode 100644 board/netstal/hcu4/config.mk delete mode 100644 board/netstal/hcu4/hcu4.c delete mode 100644 board/netstal/hcu5/Makefile delete mode 100644 board/netstal/hcu5/README.txt delete mode 100644 board/netstal/hcu5/config.mk delete mode 100644 board/netstal/hcu5/hcu5.c delete mode 100644 board/netstal/hcu5/init.S delete mode 100644 board/netstal/hcu5/sdram.c delete mode 100644 board/netstal/mcu25/Makefile delete mode 100644 board/netstal/mcu25/README.txt delete mode 100644 board/netstal/mcu25/config.mk delete mode 100644 board/netstal/mcu25/mcu25.c delete mode 100644 include/configs/hcu4.h delete mode 100644 include/configs/hcu5.h delete mode 100644 include/configs/mcu25.h delete mode 100644 include/configs/netstal-common.h -- 1.7.5.4

1 0

[U-Boot] u-boot environment variable parsing
by Hebbar, Gururaja 22 Jul '11

22 Jul '11

Hi, I need one clarification regarding Environment variable declaration & its usage. #define CONFIG_EXTRA_ENV_SETTINGS \ "brd_mem=62M\0" \ "bootargs_defaults=setenv bootargs " \ "console=${console} " \ "mem=${brd_mem}\0" \ "mmc_args=run bootargs_defaults;" \ "setenv bootargs $(bootargs) " \ "root=${mmc_root} " \ "rootfstype=${mmc_root_fs_type} ip=${ip_method}\0" \ "nand_args=run bootargs_defaults;" \ "setenv bootargs ${bootargs} " \ "root=${nand_root} noinitrd " \ "rootfstype=${nand_root_fs_type} ip=${ip_method}\0" \ The question here is mmc_args re-uses variable bootargs as $(bootargs) & nand_args re-uses it as ${bootargs}. Note the difference in curly & flower brackets. "run mmc_args" fails for me however nand_args runs properly. My question is 1. Which is correct? 2. What is the difference between the two? I have seen few boards using both methods. Thanks in advance Regards Gururaja

2 2

Re: [U-Boot] [PATCH v2 2/2] gpio: Add GPIO driver for Marvell SoC Armada100
by Ajay Bhargav 22 Jul '11

22 Jul '11

Hi Lei, > I think if have no such same structure, the gpio driver may need to be > rewrite, > since the meaning of the register may also change. > so should this be changed back to Armada100 gpio? How bout mmp3, is it having same register set? Regards, Ajay Bhargav

2 1

[U-Boot] 报关--单证
by 张生 22 Jul '11

22 Jul '11

您好! 本公司是一家拥有进出口报关等一切出口单证代理公司，有着丰富的出口经验和优势的价格，可以为贵公司代理以下出口业务 1.提供核销单（报关单） 2.CO产地证. 普惠证(FA,FE,FF,亚太,中巴，大使馆签等) 3.买单报关，商检，拖车 4.实力报关, 请存留备用，欢迎你的来电咨询：联系人：张先生联系电话：0755-25420177 手机：13686868548 QQ：122062143 邮箱：szyongdongjiangs(a)163.com 122062143(a)qq.com 本广告长期有效

1 0

Re: [U-Boot] u-boot using UART1
by Nick Thompson 22 Jul '11

22 Jul '11

Don, Please ask u-boot questions on the u-boot mailing list. On 22/07/11 01:03, Don McCune wrote: > > We are bringing up a board based on the OMAPL137 processor. The board is similar to the Spectrum Digital Evm board; however it has used UART2 for something else, so we need to make UAR1 the console line for u-boot. Could you tell us how to modify u-boot to use UART1 for its console? > $ grep UART include/configs/da830evm.h #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART2_BASE /* Base address of UART2 */ #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) #define CONFIG_CONS_INDEX 1 /* use UART0 for console */ Just change DAVINCI_UART2_BASE to DAVINCI_UART1_BASE. (and make sure your boot loader enables the pinmux for UART1) > > > Please reply-to-all with any questions or answers. If you wish to contact us directly, please call Tim Orling at 805 269 0767. > > > > Thank you. > > > > Regards, > > Don McCune > > Nick.

2 1

[U-Boot] [PATCH v2 2/2] gpio: Add GPIO driver for Marvell SoC Armada100
by Ajay Bhargav 22 Jul '11

22 Jul '11

This patch adds support for generic GPIO driver framework for Marvell SoC Armada100. Signed-off-by: Ajay Bhargav <ajay.bhargav(a)einfochips.com> --- arch/arm/include/asm/arch-armada100/armada100.h | 4 + arch/arm/include/asm/arch-armada100/gpio.h | 95 +++++++++++++++++++++++ 2 files changed, 99 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/arch-armada100/gpio.h diff --git a/arch/arm/include/asm/arch-armada100/armada100.h b/arch/arm/include/asm/arch-armada100/armada100.h index d5d125a..aad3ed1 100644 --- a/arch/arm/include/asm/arch-armada100/armada100.h +++ b/arch/arm/include/asm/arch-armada100/armada100.h @@ -59,6 +59,10 @@ #define ARMD1_MPMU_BASE 0xD4050000 #define ARMD1_APMU_BASE 0xD4282800 #define ARMD1_CPU_BASE 0xD4282C00 +#define ARMD1_GPIO0_BASE 0xD4019000 +#define ARMD1_GPIO1_BASE 0xD4019004 +#define ARMD1_GPIO2_BASE 0xD4019008 +#define ARMD1_GPIO3_BASE 0xD4019100 /* * Main Power Management (MPMU) Registers diff --git a/arch/arm/include/asm/arch-armada100/gpio.h b/arch/arm/include/asm/arch-armada100/gpio.h new file mode 100644 index 0000000..0593b13 --- /dev/null +++ b/arch/arm/include/asm/arch-armada100/gpio.h @@ -0,0 +1,95 @@ +/* + * (C) Copyright 2011 + * eInfochips Ltd. <www.einfochips.com> + * Written-by: Ajay Bhargav <ajay.bhargav(a)einfochips.com> + * + * (C) Copyright 2010 + * Marvell Semiconductor <www.marvell.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#ifndef _ASM_ARCH_GPIO_H +#define _ASM_ARCH_GPIO_H + +#include <asm/types.h> +#include <asm/arch/armada100.h> + +#define GPIO_TO_REG(gp) (gp >> 5) +#define GPIO_TO_BIT(gp) (1 << (gp & 0x1F)) +#define GPIO_VAL(gp, val) ((val >> (gp & 0x1F)) & 0x01) + +#define GPIO_SET 1 +#define GPIO_CLR 0 + +/* + * GPIO register map + * Refer Datasheet Appendix A.36 + */ +struct gpio_reg { + u32 gplr; /* Pin Level Register - 0x0000 */ + u32 pad0[2]; + u32 gpdr; /* Pin Direction Register - 0x000C */ + u32 pad1[2]; + u32 gpsr; /* Pin Output Set Register - 0x0018 */ + u32 pad2[2]; + u32 gpcr; /* Pin Output Clear Register - 0x0024 */ + u32 pad3[2]; + u32 grer; /* Rising-Edge Detect Enable Register - 0x0030 */ + u32 pad4[2]; + u32 gfer; /* Falling-Edge Detect Enable Register - 0x003C */ + u32 pad5[2]; + u32 gedr; /* Edge Detect Status Register - 0x0048 */ + u32 pad6[2]; + u32 gsdr; /* Bitwise Set of GPIO Direction Register - 0x0054 */ + u32 pad7[2]; + u32 gcdr; /* Bitwise Clear of GPIO Direction Register - 0x0060 */ + u32 pad8[2]; + u32 gsrer; /* Bitwise Set of Rising-Edge Detect Enable + Register - 0x006C */ + u32 pad9[2]; + u32 gcrer; /* Bitwise Clear of Rising-Edge Detect Enable + Register - 0x0078 */ + u32 pad10[2]; + u32 gsfer; /* Bitwise Set of Falling-Edge Detect Enable + Register - 0x0084 */ + u32 pad11[2]; + u32 gcfer; /* Bitwise Clear of Falling-Edge Detect Enable + Register - 0x0090 */ + u32 pad12[2]; + u32 apmask; /* Bitwise Mask of Edge Detect Register - 0x009C */ +}; + + +static inline struct gpio_reg *get_gpio_base(int bank) +{ + switch (bank) { + case 0: + return (struct gpio_reg *)ARMD1_GPIO0_BASE; + case 1: + return (struct gpio_reg *)ARMD1_GPIO1_BASE; + case 2: + return (struct gpio_reg *)ARMD1_GPIO2_BASE; + case 3: + return (struct gpio_reg *)ARMD1_GPIO3_BASE; + } + return 0; +} + +#endif /* _ASM_ARCH_GPIO_H */ -- 1.7.0.4

2 3

[U-Boot] [PATCH 1/2] gpio: Add GPIO driver framework for Marvell SoCs
by Ajay Bhargav 22 Jul '11

22 Jul '11

This patch adds generic GPIO driver framework support for Marvell SoCs. To enable GPIO driver define CONFIG_MV_GPIO and for GPIO commands define CONFIG_CMD_GPIO in your board configuration file. Signed-off-by: Ajay Bhargav <ajay.bhargav(a)einfochips.com> --- drivers/gpio/Makefile | 1 + drivers/gpio/mvgpio.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++ include/mvgpio.h | 52 ++++++++++++++++++++ 3 files changed, 178 insertions(+), 0 deletions(-) create mode 100644 drivers/gpio/mvgpio.c create mode 100644 include/mvgpio.h diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 62ec97d..c6f652f 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -28,6 +28,7 @@ LIB := $(obj)libgpio.o COBJS-$(CONFIG_AT91_GPIO) += at91_gpio.o COBJS-$(CONFIG_KIRKWOOD_GPIO) += kw_gpio.o COBJS-$(CONFIG_MARVELL_MFP) += mvmfp.o +COBJS-$(CONFIG_MV_GPIO) += mvgpio.o COBJS-$(CONFIG_MXC_GPIO) += mxc_gpio.o COBJS-$(CONFIG_PCA953X) += pca953x.o COBJS-$(CONFIG_S5P) += s5p_gpio.o diff --git a/drivers/gpio/mvgpio.c b/drivers/gpio/mvgpio.c new file mode 100644 index 0000000..d64f0db --- /dev/null +++ b/drivers/gpio/mvgpio.c @@ -0,0 +1,125 @@ +/* + * (C) Copyright 2011 + * eInfochips Ltd. <www.einfochips.com> + * Written-by: Ajay Bhargav <ajay.bhargav(a)einfochips.com> + * + * (C) Copyright 2010 + * Marvell Semiconductor <www.marvell.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#include <common.h> +#include <asm/io.h> +#include <asm/errno.h> +#include <asm/gpio.h> + +char gpio_names[MV_MAX_GPIO][GPIO_LABEL_MAX]; + +static int get_gpio_base(int bank) +{ + switch (bank) { + case 0: + return GPIO_BANK0_BASE; + case 1: + return GPIO_BANK1_BASE; + case 2: + return GPIO_BANK2_BASE; + case 3: + return GPIO_BANK3_BASE; + } + return 0; +} + +int gpio_request(int gp, const char *label) +{ + if (gp >= MV_MAX_GPIO) + return -EINVAL; + + if (strlen(gpio_names[gp]) == 0) { + strncpy(gpio_names[gp], label, GPIO_LABEL_MAX); + gpio_names[gp][GPIO_LABEL_MAX - 1] = '\0'; + } else { + return -EBUSY; + } + return 0; +} + +void gpio_free(int gp) +{ + gpio_names[gp][0] = '\0'; +} + +void gpio_toggle_value(int gp) +{ + gpio_set_value(gp, !gpio_get_value(gp)); +} + +int gpio_direction_input(int gp) +{ + struct gpio_reg *gpio_reg_bank; + + if (gp >= MV_MAX_GPIO) + return -EINVAL; + + gpio_reg_bank = (struct gpio_reg *) get_gpio_base(GPIO_TO_REG(gp)); + writel(GPIO_TO_BIT(gp), &gpio_reg_bank->gcdr); + return 0; +} + +int gpio_direction_output(int gp, int value) +{ + struct gpio_reg *gpio_reg_bank; + + if (gp >= MV_MAX_GPIO) + return -EINVAL; + + gpio_reg_bank = (struct gpio_reg *) get_gpio_base(GPIO_TO_REG(gp)); + writel(GPIO_TO_BIT(gp), &gpio_reg_bank->gsdr); + gpio_set_value(gp, value); + return 0; +} + +int gpio_get_value(int gp) +{ + struct gpio_reg *gpio_reg_bank; + u32 gp_val; + + if (gp >= MV_MAX_GPIO) + return -EINVAL; + + gpio_reg_bank = (struct gpio_reg *) get_gpio_base(GPIO_TO_REG(gp)); + gp_val = readl(&gpio_reg_bank->gplr); + + return GPIO_VAL(gp, gp_val); +} + +void gpio_set_value(int gp, int value) +{ + struct gpio_reg *gpio_reg_bank; + + if (gp >= MV_MAX_GPIO) + return; + + gpio_reg_bank = (struct gpio_reg *) get_gpio_base(GPIO_TO_REG(gp)); + if (value) + writel(GPIO_TO_BIT(gp), &gpio_reg_bank->gpsr); + else + writel(GPIO_TO_BIT(gp), &gpio_reg_bank->gpcr); +} diff --git a/include/mvgpio.h b/include/mvgpio.h new file mode 100644 index 0000000..7d0258f --- /dev/null +++ b/include/mvgpio.h @@ -0,0 +1,52 @@ +/* + * (C) Copyright 2011 + * eInfochips Ltd. <www.einfochips.com> + * Written-by: Ajay Bhargav <ajay.bhargav(a)einfochips.com> + * + * (C) Copyright 2010 + * Marvell Semiconductor <www.marvell.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#ifndef _MV_GPIO_H +#define _MV_GPIO_H + +#include <asm/types.h> + +#if defined(CONFIG_MV_GPIO) + +#define MV_GPIO_BASE 0xD4019000 +#define GPIO_BANK0_BASE (MV_GPIO_BASE + 0x0000) +#define GPIO_BANK1_BASE (MV_GPIO_BASE + 0x0004) +#define GPIO_BANK2_BASE (MV_GPIO_BASE + 0x0008) +#define GPIO_BANK3_BASE (MV_GPIO_BASE + 0x0100) + +#define GPIO_LABEL_MAX 20 +#define MV_MAX_GPIO 128 + +#define GPIO_TO_REG(gp) (gp >> 5) +#define GPIO_TO_BIT(gp) (1 << (gp & 0x1F)) +#define GPIO_VAL(gp, val) ((val >> (gp & 0x1F)) & 0x01) + +#define GPIO_SET 1 +#define GPIO_CLR 0 + +#endif /* CONFIG_MV_GPIO */ +#endif /* _MV_GPIO_H */ -- 1.7.0.4

4 7