| Message ID | 1289988545-13624-2-git-send-email-sbabic@denx.de |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Sandeep Paulraj |
| Headers | show |
Hi Stefano, On Wed, Nov 17, 2010 at 5:09 AM, Stefano Babic <sbabic@denx.de> wrote: > [...] > diff --git a/arch/arm/include/asm/arch-davinci/da8xx_common.h b/arch/arm/include/asm/arch-davinci/da8xx_common.h > deleted file mode 100644 > index 8b564f7..0000000 > --- a/arch/arm/include/asm/arch-davinci/da8xx_common.h > +++ /dev/null > @@ -1,33 +0,0 @@ > -/* > - * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/ > - * > - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. > - */ > - > -#ifndef __COMMON_H > -#define __COMMON_H > - > -struct lpsc_resource { > - const int lpsc_no; > -}; > - > -void irq_init(void); > -int da8xx_configure_lpsc_items(const struct lpsc_resource *item, > - int n_items); > -#if defined(CONFIG_DRIVER_TI_EMAC) && defined(CONFIG_MACH_DAVINCI_DA850_EVM) > -void da850_emac_mii_mode_sel(int mode_sel); > -#endif I was unable to test this series on top of Sugosh's and my patches even after re-basing my patch on top of his by moving the da850_emac_mii_mode_sel declaration from board/davinci/da8xxevm/common.h to the location from which you have removed it above. It looked like the removal of this file also needs to move the kick register declarations that Sugosh added here. I'm guessing you are working from a tree that is very close but not quite equal to mainline plus the patches you referenced in the cover letter. I don't know what is the best way to proceed... I like the current state of this patch series. I was unable to apply the three patch series (Sugosh's, Yours and mine) in any order without conflicts. Best Regards, Ben Gardiner --- Nanometrics Inc. http://www.nanometrics.ca
On 11/17/2010 05:26 PM, Ben Gardiner wrote: > Hi Stefano, > Hi Ben, > I was unable to test this series on top of Sugosh's and my patches > even after re-basing my patch on top of his by moving the > da850_emac_mii_mode_sel declaration from > board/davinci/da8xxevm/common.h to the location from which you have > removed it above. > > It looked like the removal of this file also needs to move the kick > register declarations that Sugosh added here. > > I'm guessing you are working from a tree that is very close but not > quite equal to mainline plus the patches you referenced in the cover > letter. Let's see. I am working on TOT of u-boot mainline, and I have applied Sugosh's and your patch. Last u-boot commit in mainline is: commit 8ad25bf8d9233eb7d0b614612108622a59069354 Author: Ben Warren <biggerbadderben@gmail.com> Date: Tue Aug 31 23:05:04 2010 -0700 Net: clarify board/cpu_eth_init calls I have then applied in the order the two SPI flash I have already sent and you tested, Sugosh's patch and your patch. At the very top there is my patchset. This is my git log, I drop some part of the commit id to avoid wrapping: 6a1b17dd5cdaeb4c Davinci: add support for the ea20 board 5195253f20d5bedb Davinci 8xx: Move common functions to share code 8e6ed317d74b3b4d da850: Add RMII support for EMAC 9c1455c63dafc292 Move and rename common headers from under board/davinci. 4ccdfedb55b65f30 da850: Enable SPI Flash 0aacad5f81caac89 da8xx: Add cpu_is_da8xx macros 8ad25bf8d9233eb7 Net: clarify board/cpu_eth_init calls ^ |------- this is actual u-boot TOT I think it is correct - patches are always sent on the actual u-boot TOT. However, in this case my patches need that other patches (yours and Sugosh's) are applied. I have tried to apply patches in the same order I have seen, but we can have a different order. > I don't know what is the best way to proceed... I like the current > state of this patch series. I was unable to apply the three patch > series (Sugosh's, Yours and mine) in any order without conflicts. Let's see if something is missing ;-) Best regards, Stefano Babic
hi Ben, On Wed Nov 17, 2010 at 11:26:47AM -0500, Ben Gardiner wrote: > Hi Stefano, > > On Wed, Nov 17, 2010 at 5:09 AM, Stefano Babic <sbabic@denx.de> wrote: > > [...] > > diff --git a/arch/arm/include/asm/arch-davinci/da8xx_common.h b/arch/arm/include/asm/arch-davinci/da8xx_common.h > > deleted file mode 100644 > > index 8b564f7..0000000 > > --- a/arch/arm/include/asm/arch-davinci/da8xx_common.h > > +++ /dev/null > > @@ -1,33 +0,0 @@ > > -void irq_init(void); > > -int da8xx_configure_lpsc_items(const struct lpsc_resource *item, > > - int n_items); > > -#if defined(CONFIG_DRIVER_TI_EMAC) && defined(CONFIG_MACH_DAVINCI_DA850_EVM) > > -void da850_emac_mii_mode_sel(int mode_sel); > > -#endif > > I don't know what is the best way to proceed... I like the current > state of this patch series. I was unable to apply the three patch > series (Sugosh's, Yours and mine) in any order without conflicts. I think you would need to rebase your patch 'da850: Add RMII support for EMAC', on top of my patches. I had made changes in the include/asm/arch-davinci/hardware.h and moved the board/davinci/da8xxevm/common.h, both of which you are making changes to. Stefano's patch series should then apply on top of your rebased patch. Missed out your patch, else would have flagged you in advance. Sorry about that. -sughosh
Hi Sugosh, On Thu, Nov 18, 2010 at 12:26 AM, Sughosh Ganu <urwithsughosh@gmail.com> wrote: > > hi Ben, > > On Wed Nov 17, 2010 at 11:26:47AM -0500, Ben Gardiner wrote: > > Hi Stefano, > > > > On Wed, Nov 17, 2010 at 5:09 AM, Stefano Babic <sbabic@denx.de> wrote: > > > [...] > > > diff --git a/arch/arm/include/asm/arch-davinci/da8xx_common.h b/arch/arm/include/asm/arch-davinci/da8xx_common.h > > > deleted file mode 100644 > > > index 8b564f7..0000000 > > > --- a/arch/arm/include/asm/arch-davinci/da8xx_common.h > > > +++ /dev/null > > > @@ -1,33 +0,0 @@ > > > -void irq_init(void); > > > -int da8xx_configure_lpsc_items(const struct lpsc_resource *item, > > > - int n_items); > > > -#if defined(CONFIG_DRIVER_TI_EMAC) && defined(CONFIG_MACH_DAVINCI_DA850_EVM) > > > -void da850_emac_mii_mode_sel(int mode_sel); > > > -#endif > > > > I don't know what is the best way to proceed... I like the current > > state of this patch series. I was unable to apply the three patch > > series (Sugosh's, Yours and mine) in any order without conflicts. > > I think you would need to rebase your patch 'da850: Add RMII > support for EMAC', on top of my patches. I had made changes in the I agree. A respin is on the way > include/asm/arch-davinci/hardware.h and moved the > board/davinci/da8xxevm/common.h, both of which you are making > changes to. Stefano's patch series should then apply on top of your > rebased patch. Missed out your patch, else would have flagged you in > advance. Sorry about that. No worries. -- Best Regards, Ben Gardiner --- Nanometrics Inc. http://www.nanometrics.ca
Hi Stefano, Sorry for the long delay. I thought rebasing my patch onto Sugosh's series would be a good start to getting all of our patches applied together. What I didn't realize was I that I still did not have the order of patches you listed below. On Wed, Nov 17, 2010 at 11:47 AM, Stefano Babic <sbabic@denx.de> wrote: > [...] > 6a1b17dd5cdaeb4c Davinci: add support for the ea20 board > 5195253f20d5bedb Davinci 8xx: Move common functions to share code > 8e6ed317d74b3b4d da850: Add RMII support for EMAC > 9c1455c63dafc292 Move and rename common headers from under board/davinci. > 4ccdfedb55b65f30 da850: Enable SPI Flash > 0aacad5f81caac89 da8xx: Add cpu_is_da8xx macros > 8ad25bf8d9233eb7 Net: clarify board/cpu_eth_init calls > ^ > |------- this is actual u-boot TOT The problem was that I was applying my RMII patch on top of Sugosh's patches without your SPI flash patches underneath. Another RMII version patch is coming. Still, there were some merge conflicts due to the fact that you were basing your ea20 patches off of only 1 of Sugosh's patches. here is the 'git log --format="%s -- %Cgreen%an <%aE> %Cred%ai" u-boot/master^..HEAD' output after all the merging. Davinci: add support for the ea20 board -- Stefano Babic <sbabic@denx.de> 2010-11-17 11:09:05 +0100 Davinci 8xx: Move common functions to share code -- Stefano Babic <sbabic@denx.de> 2010-11-17 11:09:04 +0100 [PATCH V4][NEXT] da850: Add RMII support for EMAC -- Sudhakar Rajashekhara <sudhakar.raj@ti.com> 2010-11-18 09:59:37 -0500 Add board support for hawkboard -- Sughosh Ganu <urwithsughosh@gmail.com> 2010-11-01 23:30:34 +0530 Remove board_init_f function from nand_boot.c -- Sughosh Ganu <urwithsughosh@gmail.com> 2010-11-01 23:29:27 +0530 Move and rename common headers from under board/davinci. -- Sughosh Ganu <urwithsughosh@gmail.com> 2010-11-01 23:28:38 +0530 da850: Enable SPI Flash -- Stefano Babic <sbabic@denx.de> 2010-11-11 15:38:02 +0100 da8xx: Add cpu_is_da8xx macros -- Sudhakar Rajashekhara <sudhakar.raj@ti.com> 2010-11-11 15:38:01 +0100 Net: clarify board/cpu_eth_init calls -- Ben Warren <biggerbadderben@gmail.com> 2010-08-31 23:05:04 -0700 You didn't have "Add board support for hawkboard" and "Remove board_init_f function from nand_boot.c" applied. I hope you don't mind that I merged them and pushed the result to branch "testing-ea20-plus" of git://github.com/BenGardiner/u-boot-bg.git . I hope that saves us some time. I will be sending a V4 of the RMII patch -- as can be seen from that series -- to the list. I hope you can use the merged patches in the branch I pushed to send your updated patches. Best Regards, Ben Gardiner --- Nanometrics Inc. http://www.nanometrics.ca
On 11/18/2010 10:50 PM, Ben Gardiner wrote: > Hi Stefano, > Hi Ben, > Sorry for the long delay. No problem at all ! > The problem was that I was applying my RMII patch on top of Sugosh's > patches without your SPI flash patches underneath. Another RMII > version patch is coming. > > Still, there were some merge conflicts due to the fact that you were > basing your ea20 patches off of only 1 of Sugosh's patches. Right. Sugosh pointed me out to this patch and I have not seen that the patches for the hawkboard change something in common code, too. > > You didn't have "Add board support for hawkboard" and "Remove > board_init_f function from nand_boot.c" applied. > > I hope you don't mind that I merged them and pushed the result to > branch "testing-ea20-plus" of > git://github.com/BenGardiner/u-boot-bg.git . I hope that saves us some > time. Thank you for doing that - we have already a working tree ! > > I will be sending a V4 of the RMII patch -- as can be seen from that > series -- to the list. I hope you can use the merged patches in the > branch I pushed to send your updated patches. I will test today on ea20, but it seems all what I have to do is only to send them to the ML - thank you again for your work ! Best regards, Stefano Babic
hi Ben, On Thu Nov 18, 2010 at 04:50:30PM -0500, Ben Gardiner wrote: > Davinci: add support for the ea20 board -- Stefano Babic > <sbabic@denx.de> 2010-11-17 11:09:05 +0100 > Davinci 8xx: Move common functions to share code -- Stefano Babic > <sbabic@denx.de> 2010-11-17 11:09:04 +0100 > [PATCH V4][NEXT] da850: Add RMII support for EMAC -- Sudhakar > Rajashekhara <sudhakar.raj@ti.com> 2010-11-18 09:59:37 -0500 > Add board support for hawkboard -- Sughosh Ganu > <urwithsughosh@gmail.com> 2010-11-01 23:30:34 +0530 > Remove board_init_f function from nand_boot.c -- Sughosh Ganu > <urwithsughosh@gmail.com> 2010-11-01 23:29:27 +0530 > Move and rename common headers from under board/davinci. -- Sughosh > Ganu <urwithsughosh@gmail.com> 2010-11-01 23:28:38 +0530 > da850: Enable SPI Flash -- Stefano Babic <sbabic@denx.de> 2010-11-11 > 15:38:02 +0100 > da8xx: Add cpu_is_da8xx macros -- Sudhakar Rajashekhara > <sudhakar.raj@ti.com> 2010-11-11 15:38:01 +0100 > Net: clarify board/cpu_eth_init calls -- Ben Warren > <biggerbadderben@gmail.com> 2010-08-31 23:05:04 -0700 > > You didn't have "Add board support for hawkboard" and "Remove > board_init_f function from nand_boot.c" applied. > > I hope you don't mind that I merged them and pushed the result to > branch "testing-ea20-plus" of > git://github.com/BenGardiner/u-boot-bg.git . I hope that saves us some > time. Thanks for all the work. I will be able to test these changes only next week. I will test them on hawkboard and update you. Thanks. -sughosh
hi Ben, On Fri, Nov 19, 2010 at 3:20 AM, Ben Gardiner <bengardiner@nanometrics.ca>wrote: > > Still, there were some merge conflicts due to the fact that you were > basing your ea20 patches off of only 1 of Sugosh's patches. here is > the 'git log --format="%s -- %Cgreen%an <%aE> %Cred%ai" > u-boot/master^..HEAD' output after all the merging. > > Davinci: add support for the ea20 board -- Stefano Babic > <sbabic@denx.de> 2010-11-17 11:09:05 +0100 > Davinci 8xx: Move common functions to share code -- Stefano Babic > <sbabic@denx.de> 2010-11-17 11:09:04 +0100 > [PATCH V4][NEXT] da850: Add RMII support for EMAC -- Sudhakar > Rajashekhara <sudhakar.raj@ti.com> 2010-11-18 09:59:37 -0500 > Add board support for hawkboard -- Sughosh Ganu > <urwithsughosh@gmail.com> 2010-11-01 23:30:34 +0530 > Remove board_init_f function from nand_boot.c -- Sughosh Ganu > <urwithsughosh@gmail.com> 2010-11-01 23:29:27 +0530 > Move and rename common headers from under board/davinci. -- Sughosh > Ganu <urwithsughosh@gmail.com> 2010-11-01 23:28:38 +0530 > da850: Enable SPI Flash -- Stefano Babic <sbabic@denx.de> 2010-11-11 > 15:38:02 +0100 > da8xx: Add cpu_is_da8xx macros -- Sudhakar Rajashekhara > <sudhakar.raj@ti.com> 2010-11-11 15:38:01 +0100 > Net: clarify board/cpu_eth_init calls -- Ben Warren > <biggerbadderben@gmail.com> 2010-08-31 23:05:04 -0700 > > You didn't have "Add board support for hawkboard" and "Remove > board_init_f function from nand_boot.c" applied. > > I hope you don't mind that I merged them and pushed the result to > branch "testing-ea20-plus" of > git://github.com/BenGardiner/u-boot-bg.git . I hope that saves us some > time. > > I will be sending a V4 of the RMII patch -- as can be seen from that > series -- to the list. I hope you can use the merged patches in the > branch I pushed to send your updated patches. > > Tested on hawkboard with u-boot and nand_spl images built from Ben's tree. Tested-by: Sughosh Ganu <urwithsughosh@gmail.com> I guess i will have to send an updated version from Ben's tree, as he has fixed some merge issues in "Add board support for hawkboard" patch. The patches would have to be committed in the same order as mentioned above. -sughosh
On 11/23/2010 05:55 PM, sughosh ganu wrote: Hi, > Tested on hawkboard with u-boot and nand_spl images built from Ben's tree. > > Tested-by: Sughosh Ganu <urwithsughosh@gmail.com > <mailto:urwithsughosh@gmail.com>> > > I guess i will have to send an updated version from Ben's tree, as he > has fixed some merge issues in "Add board support for hawkboard" patch. Yes, I did the same for mine as Ben has rebased my patches and they are different as the ones I send to ML. Stefano
> > On 11/23/2010 05:55 PM, sughosh ganu wrote: > > Hi, > > > Tested on hawkboard with u-boot and nand_spl images built from Ben's > tree. > > > > Tested-by: Sughosh Ganu <urwithsughosh@gmail.com > > <mailto:urwithsughosh@gmail.com>> > > > > I guess i will have to send an updated version from Ben's tree, as he > > has fixed some merge issues in "Add board support for hawkboard" patch. > > Yes, I did the same for mine as Ben has rebased my patches and they are > different as the ones I send to ML. > > Stefano > Hello All, I have been tracking this e-mail chain for some time now and I have lost track of which patches to apply in which order. Can someone please give me the correct order and the correct version of the patches? Regards, Sandeep
Hi Sandeep, On Tue, Nov 23, 2010 at 1:25 PM, Paulraj, Sandeep <s-paulraj@ti.com> wrote: > I have been tracking this e-mail chain for some time now and I have lost track of which patches to apply in which order. > > Can someone please give me the correct order and the correct version of the patches? The correct order and correct versions of the patches can be found in branch "testing-ea20-plus" of git://github.com/BenGardiner/u-boot-bg.git. The commit messages there do not include Sugosh's Tested-by: tag on the hawkboard patches, nor has he re-sent them to the ML yet. Best Regards, Ben Gardiner --- Nanometrics Inc. http://www.nanometrics.ca
> > Hi Sandeep, > > On Tue, Nov 23, 2010 at 1:25 PM, Paulraj, Sandeep <s-paulraj@ti.com> > wrote: > > I have been tracking this e-mail chain for some time now and I have lost > track of which patches to apply in which order. > > > > Can someone please give me the correct order and the correct version of > the patches? > > The correct order and correct versions of the patches can be found in > branch "testing-ea20-plus" of > git://github.com/BenGardiner/u-boot-bg.git. The commit messages there > do not include Sugosh's Tested-by: tag on the hawkboard patches, nor > has he re-sent them to the ML yet. I tried to access that page but failed. --Sandeep
On Tue, Nov 23, 2010 at 1:38 PM, Paulraj, Sandeep <s-paulraj@ti.com> wrote:
> I tried to access that page but failed.
Oh. Sorry, Sandeep. The webpage for the repo can be found at
http://github.com/BenGardiner/u-boot-bg -- that page contains three
URL variants for access to the repo.
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
> > > > > > > Hi Sandeep, > > > > On Tue, Nov 23, 2010 at 1:25 PM, Paulraj, Sandeep <s-paulraj@ti.com> > > wrote: > > > I have been tracking this e-mail chain for some time now and I have > lost > > track of which patches to apply in which order. > > > > > > Can someone please give me the correct order and the correct version > of > > the patches? > > > > The correct order and correct versions of the patches can be found in > > branch "testing-ea20-plus" of > > git://github.com/BenGardiner/u-boot-bg.git. The commit messages there > > do not include Sugosh's Tested-by: tag on the hawkboard patches, nor > > has he re-sent them to the ML yet. > > I tried to access that page but failed. I am able to clone the tree but I am unable to access it on the web
On Tue, Nov 23, 2010 at 1:44 PM, Paulraj, Sandeep <s-paulraj@ti.com> wrote:
> I am able to clone the tree but I am unable to access it on the web
I'm very sorry for the trouble you've had accessing that repo -- I
will happily switch to any other public git hosting service of your
choosing for future merged series.
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
> > On Tue, Nov 23, 2010 at 1:44 PM, Paulraj, Sandeep <s-paulraj@ti.com> > wrote: > > I am able to clone the tree but I am unable to access it on the web > > I'm very sorry for the trouble you've had accessing that repo -- I > will happily switch to any other public git hosting service of your > choosing for future merged series. Not an issue at all. In this case because of some major changes and multiple patch versions I lost track. Usually I pick it from the mailing list. After Wolfgang accept my previous pull request, I'll get on with the program of merging these patches. Thanks, Sandeep
On Tue, Nov 23, 2010 at 1:57 PM, Paulraj, Sandeep <s-paulraj@ti.com> wrote: > Not an issue at all. > > In this case because of some major changes and multiple patch versions I lost track. Usually I pick it from the mailing list. > > After Wolfgang accept my previous pull request, I'll get on with the program of merging these patches. That is very exciting news! Thank you, Sandeep. Best Regards, Ben Gardiner --- Nanometrics Inc. http://www.nanometrics.ca
hi, On Tue Nov 23, 2010 at 01:31:46PM -0500, Ben Gardiner wrote: > On Tue, Nov 23, 2010 at 1:25 PM, Paulraj, Sandeep <s-paulraj@ti.com> wrote: > > I have been tracking this e-mail chain for some time now and I have lost track of which patches to apply in which order. > > > > Can someone please give me the correct order and the correct version of the patches? > > The correct order and correct versions of the patches can be found in > branch "testing-ea20-plus" of > git://github.com/BenGardiner/u-boot-bg.git. The commit messages there > do not include Sugosh's Tested-by: tag on the hawkboard patches, nor > has he re-sent them to the ML yet. I will be sending the updated version based off Ben's tree tonight. Thanks. -sughosh
diff --git a/arch/arm/include/asm/arch-davinci/da8xx_common.h b/arch/arm/include/asm/arch-davinci/da8xx_common.h deleted file mode 100644 index 8b564f7..0000000 --- a/arch/arm/include/asm/arch-davinci/da8xx_common.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/ - * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef __COMMON_H -#define __COMMON_H - -struct lpsc_resource { - const int lpsc_no; -}; - -void irq_init(void); -int da8xx_configure_lpsc_items(const struct lpsc_resource *item, - int n_items); -#if defined(CONFIG_DRIVER_TI_EMAC) && defined(CONFIG_MACH_DAVINCI_DA850_EVM) -void da850_emac_mii_mode_sel(int mode_sel); -#endif - -#endif /* __COMMON_H */ diff --git a/arch/arm/include/asm/arch-davinci/davinci_misc.h b/arch/arm/include/asm/arch-davinci/davinci_misc.h index a6ac3b9..12cafac 100644 --- a/arch/arm/include/asm/arch-davinci/davinci_misc.h +++ b/arch/arm/include/asm/arch-davinci/davinci_misc.h @@ -45,10 +45,22 @@ struct pinmux_resource { .n_pins = ARRAY_SIZE(item) \ } +struct lpsc_resource { + const int lpsc_no; +}; + int dvevm_read_mac_address(uint8_t *buf); void davinci_sync_env_enetaddr(uint8_t *rom_enetaddr); int davinci_configure_pin_mux(const struct pinmux_config *pins, int n_pins); int davinci_configure_pin_mux_items(const struct pinmux_resource *item, int n_items); +#if defined(CONFIG_DRIVER_TI_EMAC) && defined(CONFIG_MACH_DAVINCI_DA850_EVM) +void davinci_emac_mii_mode_sel(int mode_sel); +#endif +#if defined(CONFIG_SOC_DA8XX) +void irq_init(void); +int da8xx_configure_lpsc_items(const struct lpsc_resource *item, + const int n_items); +#endif #endif /* __MISC_H */ diff --git a/board/davinci/common/misc.c b/board/davinci/common/misc.c index a30047b..f7b2fac 100644 --- a/board/davinci/common/misc.c +++ b/board/davinci/common/misc.c @@ -170,3 +170,54 @@ int davinci_configure_pin_mux_items(const struct pinmux_resource *item, return 0; } + +/* + * Set the mii mode as MII or RMII + */ +#if defined(CONFIG_DRIVER_TI_EMAC) +void davinci_emac_mii_mode_sel(int mode_sel) +{ + int val; + + val = readl(&davinci_syscfg_regs->cfgchip3); + if (mode_sel == 0) + val &= ~(1 << 8); + else + val |= (1 << 8); + writel(val, &davinci_syscfg_regs->cfgchip3); +} +#endif + +#if defined(CONFIG_SOC_DA8XX) +#ifndef CONFIG_USE_IRQ +void irq_init(void) +{ + /* + * Mask all IRQs by clearing the global enable and setting + * the enable clear for all the 90 interrupts. + */ + + writel(0, &davinci_aintc_regs->ger); + + writel(0, &davinci_aintc_regs->hier); + + writel(0xffffffff, &davinci_aintc_regs->ecr1); + writel(0xffffffff, &davinci_aintc_regs->ecr2); + writel(0xffffffff, &davinci_aintc_regs->ecr3); +} +#endif + +/* + * Enable PSC for various peripherals. + */ +int da8xx_configure_lpsc_items(const struct lpsc_resource *item, + const int n_items) +{ + int i; + + for (i = 0; i < n_items; i++) + lpsc_on(item[i].lpsc_no); + + return 0; +} +#endif diff --git a/board/davinci/da8xxevm/Makefile b/board/davinci/da8xxevm/Makefile index 17cbe86..0d42672 100644 --- a/board/davinci/da8xxevm/Makefile +++ b/board/davinci/da8xxevm/Makefile @@ -27,7 +27,6 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS-y += common.o COBJS-$(CONFIG_MACH_DAVINCI_DA830_EVM) += da830evm.o COBJS-$(CONFIG_MACH_DAVINCI_DA850_EVM) += da850evm.o diff --git a/board/davinci/da8xxevm/common.c b/board/davinci/da8xxevm/common.c deleted file mode 100644 index 2d9a64b..0000000 --- a/board/davinci/da8xxevm/common.c +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Miscellaneous DA8XX functions. - * - * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/ - * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#include <asm/io.h> -#include <asm/arch/hardware.h> -#include <asm/arch/da8xx_common.h> - -#ifndef CONFIG_USE_IRQ -void irq_init(void) -{ - /* - * Mask all IRQs by clearing the global enable and setting - * the enable clear for all the 90 interrupts. - */ - - writel(0, &davinci_aintc_regs->ger); - - writel(0, &davinci_aintc_regs->hier); - - writel(0xffffffff, &davinci_aintc_regs->ecr1); - writel(0xffffffff, &davinci_aintc_regs->ecr2); - writel(0xffffffff, &davinci_aintc_regs->ecr3); -} -#endif - -/* - * Enable PSC for various peripherals. - */ -int da8xx_configure_lpsc_items(const struct lpsc_resource *item, - const int n_items) -{ - int i; - - for (i = 0; i < n_items; i++) - lpsc_on(item[i].lpsc_no); - - return 0; -} - -#if defined(CONFIG_DRIVER_TI_EMAC) && defined(CONFIG_MACH_DAVINCI_DA850_EVM) -void da850_emac_mii_mode_sel(int mode_sel) -{ - int val; - - val = readl(&davinci_syscfg_regs->cfgchip3); - if (mode_sel == 0) - val &= ~(1 << 8); - else - val |= (1 << 8); - writel(val, &davinci_syscfg_regs->cfgchip3); -} -#endif diff --git a/board/davinci/da8xxevm/da830evm.c b/board/davinci/da8xxevm/da830evm.c index b6b7e37..0650653 100644 --- a/board/davinci/da8xxevm/da830evm.c +++ b/board/davinci/da8xxevm/da830evm.c @@ -41,7 +41,6 @@ #include <asm/arch/emac_defs.h> #include <asm/io.h> #include <asm/arch/davinci_misc.h> -#include <asm/arch/da8xx_common.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c index 4793005..f6d6427 100644 --- a/board/davinci/da8xxevm/da850evm.c +++ b/board/davinci/da8xxevm/da850evm.c @@ -30,7 +30,6 @@ #include <asm/arch/emac_defs.h> #include <asm/io.h> #include <asm/arch/davinci_misc.h> -#include <asm/arch/da8xx_common.h> DECLARE_GLOBAL_DATA_PTR; @@ -187,7 +186,7 @@ int board_init(void) if (davinci_configure_pin_mux(emac_pins, ARRAY_SIZE(emac_pins)) != 0) return 1; - da850_emac_mii_mode_sel(HAS_RMII); + davinci_emac_mii_mode_sel(HAS_RMII); #endif /* CONFIG_DRIVER_TI_EMAC */ /* enable the console UART */
As more Davinci 8xx board can be added, move common code to be shared between boards. Signed-off-by: Stefano Babic <sbabic@denx.de> --- arch/arm/include/asm/arch-davinci/da8xx_common.h | 33 ---------- arch/arm/include/asm/arch-davinci/davinci_misc.h | 12 ++++ board/davinci/common/misc.c | 51 ++++++++++++++++ board/davinci/da8xxevm/Makefile | 1 - board/davinci/da8xxevm/common.c | 69 ---------------------- board/davinci/da8xxevm/da830evm.c | 1 - board/davinci/da8xxevm/da850evm.c | 3 +- 7 files changed, 64 insertions(+), 106 deletions(-) delete mode 100644 arch/arm/include/asm/arch-davinci/da8xx_common.h delete mode 100644 board/davinci/da8xxevm/common.c