* Re: Domen's MPC5200 FEC cleanup patch.
From: Jon Smirl @ 2007-09-15 15:55 UTC (permalink / raw)
To: Domen Puncer; +Cc: linuxppc-embedded
In-Reply-To: <20070915122218.GB19857@nd47.coderock.org>
On 9/15/07, Domen Puncer <domen.puncer@telargo.com> wrote:
> On 15/09/07 00:28 -0400, Jon Smirl wrote:
> > On 9/14/07, Jon Smirl <jonsmirl@gmail.com> wrote:
> > > This patch doesn't seem to working quite right on my hardware (Phytec
> > > pcm030). At boot I get a long pause.
> >
> > It also doesn't compile if CONFIG_FEC_MPC52xx_MDIO is undefined.
>
> Right, darn.
> Try this one: http://coderock.org/tmp/fec-v3rc1/
0.776407] 0x00f40000-0x00f80000 : "oftree"
[ 0.782101] 0x00f80000-0x01000000 : "space"
[ 0.788100] TCP cubic registered
[ 0.791427] NET: Registered protocol family 1
[ 0.795904] NET: Registered protocol family 17
[ 1.305579] f0003000:00 not found
[ 1.308985] net eth0: phy_connect failed
[ 1.312961] net eth0: fec_init_phy failed
[ 1.317188] IP-Config: Failed to open eth0
[ 1.321362] IP-Config: No network devices available.
[ 1.326973] Looking up port of RPC 100003/3 on 192.168.1.4
>
> Does it work without phy-handle in device tree, but
> with this part being unconditional (fec.c):
> 709 // if (priv->has_phy)
> 710 rcntrl |= FEC_RCNTRL_MII_MODE;
>
> This effectively disables phy part of the driver,
> but still allows hardware to use PHY/MII.
Makes no difference
>
> I am puzzled by the symptoms you see.
>
>
> Domen
>
> >
> > --
> > Jon Smirl
> > jonsmirl@gmail.com
>
--
Jon Smirl
jonsmirl@gmail.com
^ permalink raw reply
* Re: [patch 3/4] 4xx: Convert Walnut flash mappings to new binding
From: Wolfgang Denk @ 2007-09-15 15:09 UTC (permalink / raw)
To: Josh Boyer; +Cc: linuxppc-dev, Stefan Roese, david
In-Reply-To: <1189866379.17593.2.camel@localhost.localdomain>
In message <1189866379.17593.2.camel@localhost.localdomain> Josh Boyer wrote:
> On Sat, 2007-09-15 at 05:23 +0200, Stefan Roese wrote:
...
> > There are not only Bamboo board running PIBS, but running U-Boot too. How
> > should we handle this different FLASH partitioning? Same goes for Ebony too
> > btw.
>
> That's a good question. I'm working on making the NOR flash show up for
> Bamboo right now, and I had intended to just leave the partition
> subnodes missing.
Maybe we can have U-Boot add the partition information if it's
missing in the device tree, and extend the mtdparts command in U-Boot
to add / adjust settings so they match what is defined in U-Boot.
Stefan, what do you think?
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
Without facts, the decision cannot be made logically. You must rely
on your human intuition.
-- Spock, "Assignment: Earth", stardate unknown
^ permalink raw reply
* Re: PPC4xx maintainer?
From: Josh Boyer @ 2007-09-15 14:27 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
In-Reply-To: <18155.24590.33276.113415@cargo.ozlabs.ibm.com>
On Sat, 2007-09-15 at 14:31 +1000, Paul Mackerras wrote:
> Stefan Roese writes:
>
> > I really think that now, as the PPC4xx Linux development is picking up in
> > speed in the ongoing move to arch/powerpc, we need an "active" maintainer for
> > the 4xx Linux kernel platform. Since I haven't heard anything from Matt in a
> > long time, perhaps it would be better if somebody else takes care of this
> > matter. I propose that Josh Boyer takes over this maintainership, and I know
> > that he is competent enough and willing to dedicate the needed time for this
> > task.
>
> Glad you think so. :) I asked Josh to be the 4xx maintainer a couple of
> weeks ago but didn't make an announcement about it, which I should
> have done - sorry about that.
>
> Josh, please send me a patch for MAINTAINERS.
Will do. Thanks everyone :).
josh
^ permalink raw reply
* Re: [patch 1/4] cuimage for Bamboo board
From: Josh Boyer @ 2007-09-15 14:26 UTC (permalink / raw)
To: David Gibson; +Cc: linuxppc-dev
In-Reply-To: <20070915021952.GD25414@localhost.localdomain>
On Sat, 2007-09-15 at 12:19 +1000, David Gibson wrote:
> On Fri, Sep 14, 2007 at 01:54:11PM -0500, Josh Boyer wrote:
> > Add a cuboot wrapper for the Bamboo board. This also removes some obsoleted
> > linker declarations that have been moved into ops.h
> >
> > Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
> > Acked-by: David Gibson <david@gibson.dropbear.id.au>
>
> Heh, well, I know I acked this already, but...
:)
>
> [snip]
> > --- /dev/null
> > +++ linux-2.6/arch/powerpc/boot/cuboot-bamboo.c
> > @@ -0,0 +1,30 @@
> > +/*
> > + * Old U-boot compatibility for Ebony
>
> Error in the comment here.
Fixed.
>
> [snip]
> > --- linux-2.6.orig/arch/powerpc/boot/bamboo.c
> > +++ linux-2.6/arch/powerpc/boot/bamboo.c
> > @@ -24,8 +24,7 @@
> > #include "4xx.h"
> > #include "44x.h"
> >
> > -extern char _dtb_start[];
> > -extern char _dtb_end[];
> > +static u8 *bamboo_mac0, *bamboo_mac1;
>
> This additional handling of the MAC addresses should really also be
> mentioned in the commit comment.
Quite right. I'll revise the commit comment.
josh
^ permalink raw reply
* Re: [patch 3/4] 4xx: Convert Walnut flash mappings to new binding
From: Josh Boyer @ 2007-09-15 14:26 UTC (permalink / raw)
To: Stefan Roese; +Cc: linuxppc-dev, david
In-Reply-To: <200709150523.12817.sr@denx.de>
On Sat, 2007-09-15 at 05:23 +0200, Stefan Roese wrote:
> On Friday 14 September 2007, Josh Boyer wrote:
> > A new binding for flash devices was recently introduced. This updates the
> > Walnut DTS to use the new binding.
> >
> > Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
> > ---
> > arch/powerpc/boot/dts/walnut.dts | 17 ++++++++++++-----
> > 1 file changed, 12 insertions(+), 5 deletions(-)
> >
> > --- linux-2.6.orig/arch/powerpc/boot/dts/walnut.dts
> > +++ linux-2.6/arch/powerpc/boot/dts/walnut.dts
> > @@ -137,6 +137,10 @@
> > dcr-reg = <012 2>;
> > #address-cells = <2>;
> > #size-cells = <1>;
> > + /* The ranges property is supplied by the bootwrapper
> > + * and is based on the firmware's configuration of the
> > + * EBC bridge
> > + */
> > clock-frequency = <0>; /* Filled in by zImage */
> >
> > sram@0,0 {
> > @@ -144,13 +148,16 @@
> > };
> >
> > flash@0,80000 {
> > - device_type = "rom";
> > - compatible = "direct-mapped";
> > - probe-type = "JEDEC";
> > + compatible = "jedec-flash";
> > bank-width = <1>;
> > - partitions = <0 80000>;
> > - partition-names = "OpenBIOS";
> > reg = <0 80000 80000>;
> > + #address-cells = <1>;
> > + #size-cells = <1>;
> > + partition@0 {
> > + label = "OpenBIOS";
> > + reg = <0 80000>;
> > + read-only;
> > + };
>
> There are not only Bamboo board running PIBS, but running U-Boot too. How
> should we handle this different FLASH partitioning? Same goes for Ebony too
> btw.
That's a good question. I'm working on making the NOR flash show up for
Bamboo right now, and I had intended to just leave the partition
subnodes missing.
josh
^ permalink raw reply
* Re: [patch 3/4] 4xx: Convert Walnut flash mappings to new binding
From: Josh Boyer @ 2007-09-15 14:25 UTC (permalink / raw)
To: David Gibson; +Cc: linuxppc-dev
In-Reply-To: <20070915022228.GF25414@localhost.localdomain>
On Sat, 2007-09-15 at 12:22 +1000, David Gibson wrote:
> On Fri, Sep 14, 2007 at 01:54:13PM -0500, Josh Boyer wrote:
> > A new binding for flash devices was recently introduced. This updates the
> > Walnut DTS to use the new binding.
> >
> > Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
> Acked-by: David Gibson <david@gibson.dropbear.id.au>
>
> We should both really figure out the vendor/device ids of the JEDEC
> flash chips in use here and on Ebony, and add the appropriate
> properties as per the binding.
Yeah, I'll do that soon.
josh
^ permalink raw reply
* [PATCH] [PPC] Compile fix for 8xx CPM Ehernet driver
From: Jochen Friedrich @ 2007-09-15 14:05 UTC (permalink / raw)
To: linuxppc-embedded
[-- Attachment #1: Type: text/plain, Size: 492 bytes --]
Add #include <asm/cacheflush.h> for flush_dcache_range
to make the driver compile again.
CC arch/ppc/8xx_io/enet.o
arch/ppc/8xx_io/enet.c: In function 'scc_enet_start_xmit':
arch/ppc/8xx_io/enet.c:240: error: implicit declaration of function
'flush_dcache_range'
make[1]: *** [arch/ppc/8xx_io/enet.o] Error 1
make: *** [arch/ppc/8xx_io] Error 2
Signed-off-by: Jochen Friedrich <jochen@scram.de>
---
arch/ppc/8xx_io/enet.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
[-- Attachment #2: bc5766a0a6e25ccdf6bc1068960cf197ebe5acf5.diff --]
[-- Type: text/x-patch, Size: 308 bytes --]
diff --git a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c
index 703d47e..eace3bc 100644
--- a/arch/ppc/8xx_io/enet.c
+++ b/arch/ppc/8xx_io/enet.c
@@ -44,6 +44,7 @@
#include <asm/mpc8xx.h>
#include <asm/uaccess.h>
#include <asm/commproc.h>
+#include <asm/cacheflush.h>
/*
* Theory of Operation
^ permalink raw reply related
* Re: SPI INT line
From: Clemens Koller @ 2007-09-15 13:42 UTC (permalink / raw)
To: Nicholas Hickman; +Cc: linuxppc-embedded
In-Reply-To: <8140AAF341CC904BA92C3D6A5A1909782F0E9D@ditech-1.ditechllc.com>
Nicholas Hickman schrieb:
> We are developing a system around the mpc8270. On this system we are
> using an ISDN controller connected to the SPI interface of the 8270.
> For the INT line coming from the controller, should this be connected to
> one of the IRQ lines that we typically use for PCI bus, or should we
> connect it to one of the GPIO Group C pins? Currently we have it to
> IRQ4, but I am worried that this is incorrect.
I would use an otherwise unused (even in reference 82xx platforms)
IRQ line and have a look into the kernel and see which
IRQs are free so minimize/eliminate extra patches.
Regards,
--
Clemens Koller
_______________________________
R&D Imaging Devices
Anagramm GmbH
Rupert-Mayer-Str. 45/1
81379 Muenchen
Germany
http://www.anagramm-technology.com
Phone: +49-89-741518-50
Fax: +49-89-741518-19
^ permalink raw reply
* Re: [PATCH] add Kconfig option for optimizing for cell
From: Arnd Bergmann @ 2007-09-15 13:30 UTC (permalink / raw)
To: David Woodhouse; +Cc: linuxppc-dev
In-Reply-To: <1189862035.3742.5.camel@shinybook.infradead.org>
On Saturday 15 September 2007, David Woodhouse wrote:
> On Sat, 2007-09-15 at 02:21 +0200, Arnd Bergmann wrote:
> > Since the PPE on cell is an in-order core, it suffers significantly
> > from wrong instruction scheduling. This adds an Kconfig option that
> > enables passing -mtune=cell to gcc in order to generate object
> > code that runs well on cell.
>
> Do we have an option which is useful for a multiplatform kernel (and for
> userspace) and which lies between the two extremes? Something which will
> improve performance on Cell (and POWER6?) without sucking too hard
> elsewhere?
No, not really. The impact of -mtune=cell should not be too bad on other
out-of-order CPUs, but we don't have any good measurements to back that
up, and it may also be really bad for POWER6 and other in-order cores.
Arnd <><
^ permalink raw reply
* Re: [PATCH] add Kconfig option for optimizing for cell
From: David Woodhouse @ 2007-09-15 13:13 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linuxppc-dev
In-Reply-To: <200709150221.57825.arnd@arndb.de>
On Sat, 2007-09-15 at 02:21 +0200, Arnd Bergmann wrote:
> Since the PPE on cell is an in-order core, it suffers significantly
> from wrong instruction scheduling. This adds an Kconfig option that
> enables passing -mtune=cell to gcc in order to generate object
> code that runs well on cell.
Do we have an option which is useful for a multiplatform kernel (and for
userspace) and which lies between the two extremes? Something which will
improve performance on Cell (and POWER6?) without sucking too hard
elsewhere?
--
dwmw2
^ permalink raw reply
* Re: Domen's MPC5200 FEC cleanup patch.
From: Domen Puncer @ 2007-09-15 12:22 UTC (permalink / raw)
To: Jon Smirl; +Cc: linuxppc-embedded
In-Reply-To: <9e4733910709142128l7a264a05ve68f59aee92b40e3@mail.gmail.com>
On 15/09/07 00:28 -0400, Jon Smirl wrote:
> On 9/14/07, Jon Smirl <jonsmirl@gmail.com> wrote:
> > This patch doesn't seem to working quite right on my hardware (Phytec
> > pcm030). At boot I get a long pause.
>
> It also doesn't compile if CONFIG_FEC_MPC52xx_MDIO is undefined.
Right, darn.
Try this one: http://coderock.org/tmp/fec-v3rc1/
Does it work without phy-handle in device tree, but
with this part being unconditional (fec.c):
709 // if (priv->has_phy)
710 rcntrl |= FEC_RCNTRL_MII_MODE;
This effectively disables phy part of the driver,
but still allows hardware to use PHY/MII.
I am puzzled by the symptoms you see.
Domen
>
> --
> Jon Smirl
> jonsmirl@gmail.com
^ permalink raw reply
* Re: [RFC PATCH v0.2] net driver: mpc52xx fec
From: Domen Puncer @ 2007-09-15 12:14 UTC (permalink / raw)
To: Grant Likely; +Cc: netdev, linuxppc-embedded
In-Reply-To: <fa686aa40709030857j6c36c87ek60215f812864ee0f@mail.gmail.com>
On 03/09/07 09:57 -0600, Grant Likely wrote:
> On 9/2/07, Domen Puncer <domen@coderock.org> wrote:
> > Hi!
> >
> > new in this version:
> > - fixed stuff that was commented on.
> > - added 7-wire support (compile at least, if someone has the hardware,
> > please test!)
> > - ethtool support
>
> Thanks for this work Domen, comments below...
Thanks for reviewing and sorry for not replying sooner, I lost the
mail.
>
> This is a large patch, and it should be broken up into logical
> changes. ie. split into dts changes, bestcomm changes, fec driver and
> mdio driver. Easier to review that way. The bestcomm and dts changes
> don't need to go to the netdev list.
OK.
> > +config FEC_MPC52xx
> > + tristate "FEC Ethernet"
> > + depends on NET_ETHERNET
> > + select PPC_BESTCOMM
> > + select PPC_BESTCOMM_FEC
> > + select CRC32
> > + ---help---
> > + This option enables support for the MPC5200's on-chip
> > + Fast Ethernet Controller
> > +
> > +config FEC_MPC52xx_MDIO
> > + bool "Use external Ethernet MII PHY"
> > + depends on FEC_MPC52xx
> > + select PHYLIB
> > + default y
> > + ---help---
> > + The MPC5200's FEC can connect to the Ethernet either with
> > + an external MII PHY chip or 10 Mbps 7-wire interface
> > + (Motorola? industry standard).
> > + If your board uses an external PHY, say y, else n.
>
> This option should change. Either build the MDIO driver into the FEC
> driver unconditionally and drop this option, or make the MDIO driver
> independent from the FEC driver (it does use the MDIO bus
> infrastructure after all). Either way the FEC driver should detect
> the phy type at runtime (possibly based on the presence/absence of a
> phy-handle property) instead of being hard compiled. 5200 support is
> now multiplatform after all.
>
> If you drop the MDIO config option, then I'd also consider eliminating
> driver/net/fec_mpc52xx/Kconfig entirely and rolling the single
> MPC52xx_FEC option into drivers/net/Kconfig.
Right. I separated it.
> > +static irqreturn_t fec_interrupt(int, void *);
> > +static irqreturn_t fec_rx_interrupt(int, void *);
> > +static irqreturn_t fec_tx_interrupt(int, void *);
> > +static struct net_device_stats *fec_get_stats(struct net_device *);
> > +static void fec_set_multicast_list(struct net_device *dev);
> > +static void fec_hw_init(struct net_device *dev);
> > +static void fec_stop(struct net_device *dev);
> > +static void fec_start(struct net_device *dev);
> > +static void fec_reset(struct net_device *dev);
>
> Nit: Are all these forward decls needed?
Some aren't - cleaned.
>
> > +
> > +static u8 mpc52xx_fec_mac_addr[6];
>
> Why isn't this part of struct fec_priv?
Because at __setup time, there's no fec_priv instance.
OTOH, does anyone even use mpc52xx-mac=?
>
> > +static const u8 null_mac[6];
>
> null_mac?!? Just for comparing a mac addr against 0?
right, is_zero_ether_addr is the right thing.
>
> <snip>
>
> > +#ifdef CONFIG_FEC_MPC52xx_MDIO
>
> Once again; don't make this a conditional compile; detect at runtime.
>
> <snip>
>
> > +static void __init fec_str2mac(char *str, unsigned char *mac)
> > +{
> > + int i;
> > + u64 val64;
> > +
> > + val64 = simple_strtoull(str, NULL, 16);
> > +
> > + for (i = 0; i < 6; i++)
> > + mac[5-i] = val64 >> (i*8);
> > +}
> > +
> > +static int __init mpc52xx_fec_mac_setup(char *mac_address)
> > +{
> > + fec_str2mac(mac_address, mpc52xx_fec_mac_addr);
> > + return 0;
> > +}
>
> fec_str2mac is called in *1* place. I'd roll it into mpc52xx_fec_mac_setup.
>
> > +
> > +__setup("mpc52xx-mac=", mpc52xx_fec_mac_setup);
> > +
>
OK.
Updated and split version at:
http://coderock.org/tmp/fec-v3rc1/
I'll repost to lists once I run-test them.
Domen
>
>
> --
> Grant Likely, B.Sc., P.Eng.
> Secret Lab Technologies Ltd.
> grant.likely@secretlab.ca
> (403) 399-0195
> _______________________________________________
> Linuxppc-embedded mailing list
> Linuxppc-embedded@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-embedded
^ permalink raw reply
* Re: [PATCH] i2c: devtree-aware iic support for PPC4xx
From: Stephen Rothwell @ 2007-09-15 11:36 UTC (permalink / raw)
To: Stefan Roese; +Cc: Jean Delvare, linuxppc-dev, i2c
In-Reply-To: <200709151108.01849.sr@denx.de>
[-- Attachment #1: Type: text/plain, Size: 1821 bytes --]
[Just some trivial things]
On Sat, 15 Sep 2007 11:08:01 +0200 Stefan Roese <sr@denx.de> wrote:
>
> +++ b/drivers/i2c/busses/i2c-ibm_iic.h
> @@ -22,7 +22,8 @@
> #ifndef __I2C_IBM_IIC_H_
> #define __I2C_IBM_IIC_H_
>
> -#include <linux/i2c.h>
> +#include <linux/i2c.h>
> +#include <asm/prom.h>
Please include linux/of.h, of_device.h or of_platform.h (as appropriate)
instead of asm/prom.h. In this case, since you want struct device_node,
include linux/of.h.
> +static irqreturn_t iic_handler(int irq, void *dev_id)
> +{
> + struct ibm_iic_private* dev = (struct ibm_iic_private*)dev_id;
You shouldn't cast from (void *).
> +static int iic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
> +{
> + struct ibm_iic_private* dev = (struct ibm_iic_private*)(i2c_get_adapdata(adap))i
Again the return value of i2c_get_adapdata() is (void *) so shouldn't be
cast.
> + prop = of_get_property(np, "iic-mode", &len);
> + /* use 400kHz only if stated in dts, 100kHz otherwise */
> + if (prop != NULL) {
> + if (*prop == 400)
> + dev->fast_mode = 1;
> + } else
> + dev->fast_mode = 0;
dev->fast_mode = (prop && (*prop == 400));
> +static int __devexit iic_remove(struct of_device *ofdev)
> +{
> + struct ibm_iic_private *dev =
> + (struct ibm_iic_private *)dev_get_drvdata(&ofdev->dev);
dev_get_drvdata() also returns (void *).
> +static struct of_platform_driver ibm_iic_driver = {
> + .name = "ibm-iic",
> + .match_table = ibm_iic_match,
> + .probe = iic_probe,
> + .remove = iic_remove,
> +#if defined(CONFIG_PM)
> + .suspend = NULL,
> + .resume = NULL,
> +#endif
These last two will be NULL anyway, so just leave them out.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: [PATCH] i2c: devtree-aware iic support for PPC4xx
From: Vitaly Bordug @ 2007-09-15 11:29 UTC (permalink / raw)
To: Eugene Surovegin; +Cc: Jean Delvare, linuxppc-dev, Stefan Roese, i2c
In-Reply-To: <20070915100434.GA4978@gate.ebshome.net>
Hello Eugene,
On Sat, 15 Sep 2007 03:04:34 -0700
Eugene Surovegin wrote:
> On Sat, Sep 15, 2007 at 11:08:01AM +0200, Stefan Roese wrote:
> > This patch reworks existing ibm-iic driver to an of_platform_device
> > and enables it to talk to device tree directly. The ocp quirks are
> > completely removed by this patch.
> >
> > This is done to enable I2C support for the PPC4xx platforms now
> > being moved from arch/ppc (ocp) to arch/powerpc (of). The first board
> > using this driver will be the AMCC Sequoia (PPC440EPx).
> >
> > Signed-off-by: Stefan Roese <sr@denx.de>
> >
> > + /* clckdiv is the same for *all* IIC interfaces,
> > + * but I'd rather make a copy than introduce another global. --ebs
> > + */
> > + /* Parent bus should have frequency filled */
> > + prop = of_get_property(of_get_parent(np), "clock-frequency", &len);
> > + if (prop == NULL) {
> > + printk(KERN_ERR
> > + "ibm-iic(%s):no clock-frequency prop on parent bus!\n",
> > + dev->np->full_name);
> > + goto fail;
> > + }
> > +
> > + DBG("%s: clckdiv = %d\n", dev->np->full_name, dev->clckdiv);
> > +
>
> Where is dev->clkdiv initialized?
>
> My original version used iic_clkdiv() to calculate correct devider
> based on OPB frequency. Did you even test this code?
>
heh, just my $0.02: the upper clearly shows one like missing, maybe during cleanup (since there is opb freq pulled in quote):
dev->clckdiv = iic_clckdiv(*prop); or smth like that
--
Sincerely, Vitaly
^ permalink raw reply
* Re: [PATCH] i2c: devtree-aware iic support for PPC4xx
From: Eugene Surovegin @ 2007-09-15 10:04 UTC (permalink / raw)
To: Stefan Roese; +Cc: Jean Delvare, linuxppc-dev, i2c
In-Reply-To: <200709151108.01849.sr@denx.de>
On Sat, Sep 15, 2007 at 11:08:01AM +0200, Stefan Roese wrote:
> This patch reworks existing ibm-iic driver to an of_platform_device
> and enables it to talk to device tree directly. The ocp quirks are
> completely removed by this patch.
>
> This is done to enable I2C support for the PPC4xx platforms now
> being moved from arch/ppc (ocp) to arch/powerpc (of). The first board
> using this driver will be the AMCC Sequoia (PPC440EPx).
>
> Signed-off-by: Stefan Roese <sr@denx.de>
>
> + /* clckdiv is the same for *all* IIC interfaces,
> + * but I'd rather make a copy than introduce another global. --ebs
> + */
> + /* Parent bus should have frequency filled */
> + prop = of_get_property(of_get_parent(np), "clock-frequency", &len);
> + if (prop == NULL) {
> + printk(KERN_ERR
> + "ibm-iic(%s):no clock-frequency prop on parent bus!\n",
> + dev->np->full_name);
> + goto fail;
> + }
> +
> + DBG("%s: clckdiv = %d\n", dev->np->full_name, dev->clckdiv);
> +
Where is dev->clkdiv initialized?
My original version used iic_clkdiv() to calculate correct devider
based on OPB frequency. Did you even test this code?
--
Eugene
^ permalink raw reply
* [PATCH] i2c: devtree-aware iic support for PPC4xx
From: Stefan Roese @ 2007-09-15 9:08 UTC (permalink / raw)
To: i2c, linuxppc-dev; +Cc: Jean Delvare
This patch reworks existing ibm-iic driver to an of_platform_device
and enables it to talk to device tree directly. The ocp quirks are
completely removed by this patch.
This is done to enable I2C support for the PPC4xx platforms now
being moved from arch/ppc (ocp) to arch/powerpc (of). The first board
using this driver will be the AMCC Sequoia (PPC440EPx).
Signed-off-by: Stefan Roese <sr@denx.de>
=2D--
commit c90bbffd8b653b8b7bb5f2152b61f878ad235fd1
tree 4f0d977121ad8efd171dab0dafc827cb8abf62fa
parent 53a3f3087be361dacfc02e7a85b6d6142a41ce8a
author Stefan Roese <sr@denx.de> Sat, 15 Sep 2007 11:02:28 +0200
committer Stefan Roese <sr@denx.de> Sat, 15 Sep 2007 11:02:28 +0200
drivers/i2c/busses/Kconfig | 12 -
drivers/i2c/busses/Makefile | 1=20
drivers/i2c/busses/i2c-ibm_iic.h | 5=20
drivers/i2c/busses/i2c-ibm_of.c | 867 ++++++++++++++++++++++++++++++++++=
++++
4 files changed, 883 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 9f3a4cd..12453e2 100644
=2D-- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -220,7 +220,17 @@ config I2C_PIIX4
=20
config I2C_IBM_IIC
tristate "IBM PPC 4xx on-chip I2C interface"
=2D depends on IBM_OCP
+ depends on !PPC_MERGE
+ help
+ Say Y here if you want to use IIC peripheral found on=20
+ embedded IBM PPC 4xx based systems.=20
+
+ This driver can also be built as a module. If so, the module
+ will be called i2c-ibm_iic.
+
+config I2C_IBM_OF
+ tristate "IBM PPC 4xx on-chip I2C interface"
+ depends on PPC_MERGE
help
Say Y here if you want to use IIC peripheral found on=20
embedded IBM PPC 4xx based systems.=20
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index 5b752e4..0cd0bac 100644
=2D-- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_I2C_HYDRA) +=3D i2c-hydra.o
obj-$(CONFIG_I2C_I801) +=3D i2c-i801.o
obj-$(CONFIG_I2C_I810) +=3D i2c-i810.o
obj-$(CONFIG_I2C_IBM_IIC) +=3D i2c-ibm_iic.o
+obj-$(CONFIG_I2C_IBM_OF) +=3D i2c-ibm_of.o
obj-$(CONFIG_I2C_IOP3XX) +=3D i2c-iop3xx.o
obj-$(CONFIG_I2C_IXP2000) +=3D i2c-ixp2000.o
obj-$(CONFIG_I2C_IXP4XX) +=3D i2c-ixp4xx.o
diff --git a/drivers/i2c/busses/i2c-ibm_iic.h b/drivers/i2c/busses/i2c-ibm_=
iic.h
index 59d7b43..aac2bb7 100644
=2D-- a/drivers/i2c/busses/i2c-ibm_iic.h
+++ b/drivers/i2c/busses/i2c-ibm_iic.h
@@ -22,7 +22,8 @@
#ifndef __I2C_IBM_IIC_H_
#define __I2C_IBM_IIC_H_
=20
=2D#include <linux/i2c.h>=20
+#include <linux/i2c.h>
+#include <asm/prom.h>
=20
struct iic_regs {
u16 mdbuf;
@@ -50,6 +51,8 @@ struct ibm_iic_private {
int irq;
int fast_mode;
u8 clckdiv;
+ struct device_node *np;
+ phys_addr_t paddr;
};
=20
/* IICx_CNTL register */
diff --git a/drivers/i2c/busses/i2c-ibm_of.c b/drivers/i2c/busses/i2c-ibm_o=
f.c
new file mode 100644
index 0000000..0caea80
=2D-- /dev/null
+++ b/drivers/i2c/busses/i2c-ibm_of.c
@@ -0,0 +1,867 @@
+/*
+ * drivers/i2c/busses/i2c-ibm_of.c
+ *
+ * Support for the IIC peripheral on IBM PPC 4xx
+ *
+ * Copyright (c) 2003, 2004 Zultys Technologies.
+ * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
+ *
+ * Based on original work by
+ * Ian DaSilva <idasilva@mvista.com>
+ * Armin Kuster <akuster@mvista.com>
+ * Matt Porter <mporter@mvista.com>
+ *
+ * Copyright 2000-2003 MontaVista Software Inc.
+ *
+ * Original driver version was highly leveraged from i2c-elektor.c
+ *
+ * Copyright 1995-97 Simon G. Vogl
+ * 1998-99 Hans Berglund
+ *
+ * With some changes from Ky=F6sti M=E4lkki <kmalkki@cc.hut.fi>
+ * and even Frodo Looijaard <frodol@dds.nl>
+ *
+ * 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.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/ioport.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <asm/irq.h>
+#include <asm/io.h>
+#include <linux/i2c.h>
+#include <linux/i2c-id.h>
+
+#include <linux/of_platform.h>
+
+#include "i2c-ibm_iic.h"
+
+#define DRIVER_VERSION "2.1"
+
+MODULE_DESCRIPTION("IBM IIC driver v" DRIVER_VERSION);
+MODULE_LICENSE("GPL");
+
+static int device_idx =3D -1;
+
+static int iic_force_poll;
+module_param(iic_force_poll, bool, 0);
+MODULE_PARM_DESC(iic_force_poll, "Force polling mode");
+
+static int iic_force_fast;
+module_param(iic_force_fast, bool, 0);
+MODULE_PARM_DESC(iic_fast_poll, "Force fast mode (400 kHz)");
+
+#define DBG_LEVEL 5
+
+#ifdef DBG
+#undef DBG
+#endif
+
+#ifdef DBG2
+#undef DBG2
+#endif
+
+#if DBG_LEVEL > 0
+# define DBG(f,x...) printk(KERN_DEBUG "ibm-iic" f, ##x)
+#else
+# define DBG(f,x...) ((void)0)
+#endif
+#if DBG_LEVEL > 1
+# define DBG2(f,x...) DBG(f, ##x)
+#else
+# define DBG2(f,x...) ((void)0)
+#endif
+#if DBG_LEVEL > 2
+static void dump_iic_regs(const char* header, struct ibm_iic_private* dev)
+{
+ volatile struct iic_regs __iomem *iic =3D dev->vaddr;
+ printk(KERN_DEBUG "ibm-iic(%s): %s\n", dev->np->full_name, header);
+ printk(KERN_DEBUG " cntl =3D 0x%02x, mdcntl =3D 0x%02x\n"
+ KERN_DEBUG " sts =3D 0x%02x, extsts =3D 0x%02x\n"
+ KERN_DEBUG " clkdiv =3D 0x%02x, xfrcnt =3D 0x%02x\n"
+ KERN_DEBUG " xtcntlss =3D 0x%02x, directcntl =3D 0x%02x\n",
+ in_8(&iic->cntl), in_8(&iic->mdcntl), in_8(&iic->sts),
+ in_8(&iic->extsts), in_8(&iic->clkdiv), in_8(&iic->xfrcnt),
+ in_8(&iic->xtcntlss), in_8(&iic->directcntl));
+}
+# define DUMP_REGS(h,dev) dump_iic_regs((h),(dev))
+#else
+# define DUMP_REGS(h,dev) ((void)0)
+#endif
+
+/* Bus timings (in ns) for bit-banging */
+static struct i2c_timings {
+ unsigned int hd_sta;
+ unsigned int su_sto;
+ unsigned int low;
+ unsigned int high;
+ unsigned int buf;
+} timings [] =3D {
+/* Standard mode (100 KHz) */
+{
+ .hd_sta =3D 4000,
+ .su_sto =3D 4000,
+ .low =3D 4700,
+ .high =3D 4000,
+ .buf =3D 4700,
+},
+/* Fast mode (400 KHz) */
+{
+ .hd_sta =3D 600,
+ .su_sto =3D 600,
+ .low =3D 1300,
+ .high =3D 600,
+ .buf =3D 1300,
+}};
+
+/* Enable/disable interrupt generation */
+static inline void iic_interrupt_mode(struct ibm_iic_private* dev, int ena=
ble)
+{
+ out_8(&dev->vaddr->intmsk, enable ? INTRMSK_EIMTC : 0);
+}
+
+/*
+ * Initialize IIC interface.
+ */
+static void iic_dev_init(struct ibm_iic_private* dev)
+{
+ volatile struct iic_regs __iomem *iic =3D dev->vaddr;
+
+ DBG("%s: init\n", dev->np->full_name);
+
+ /* Clear master address */
+ out_8(&iic->lmadr, 0);
+ out_8(&iic->hmadr, 0);
+
+ /* Clear slave address */
+ out_8(&iic->lsadr, 0);
+ out_8(&iic->hsadr, 0);
+
+ /* Clear status & extended status */
+ out_8(&iic->sts, STS_SCMP | STS_IRQA);
+ out_8(&iic->extsts, EXTSTS_IRQP | EXTSTS_IRQD | EXTSTS_LA
+ | EXTSTS_ICT | EXTSTS_XFRA);
+
+ /* Set clock divider */
+ out_8(&iic->clkdiv, dev->clckdiv);
+
+ /* Clear transfer count */
+ out_8(&iic->xfrcnt, 0);
+
+ /* Clear extended control and status */
+ out_8(&iic->xtcntlss, XTCNTLSS_SRC | XTCNTLSS_SRS | XTCNTLSS_SWC
+ | XTCNTLSS_SWS);
+
+ /* Clear control register */
+ out_8(&iic->cntl, 0);
+
+ /* Enable interrupts if possible */
+ iic_interrupt_mode(dev, dev->irq >=3D 0);
+
+ /* Set mode control */
+ out_8(&iic->mdcntl, MDCNTL_FMDB | MDCNTL_EINT | MDCNTL_EUBS
+ | (dev->fast_mode ? MDCNTL_FSM : 0));
+
+ DUMP_REGS("iic_init", dev);
+}
+
+/*
+ * Reset IIC interface
+ */
+static void iic_dev_reset(struct ibm_iic_private* dev)
+{
+ volatile struct iic_regs __iomem *iic =3D dev->vaddr;
+ int i;
+ u8 dc;
+
+ DBG("%s: soft reset\n", dev->np->full_name);
+ DUMP_REGS("reset", dev);
+
+ /* Place chip in the reset state */
+ out_8(&iic->xtcntlss, XTCNTLSS_SRST);
+
+ /* Check if bus is free */
+ dc =3D in_8(&iic->directcntl);
+ if (!DIRCTNL_FREE(dc)) {
+ DBG("%s: trying to regain bus control\n", dev->np->full_name);
+
+ /* Try to set bus free state */
+ out_8(&iic->directcntl, DIRCNTL_SDAC | DIRCNTL_SCC);
+
+ /* Wait until we regain bus control */
+ for (i =3D 0; i < 100; ++i) {
+ dc =3D in_8(&iic->directcntl);
+ if (DIRCTNL_FREE(dc))
+ break;
+
+ /* Toggle SCL line */
+ dc ^=3D DIRCNTL_SCC;
+ out_8(&iic->directcntl, dc);
+ udelay(10);
+ dc ^=3D DIRCNTL_SCC;
+ out_8(&iic->directcntl, dc);
+
+ /* be nice */
+ cond_resched();
+ }
+ }
+
+ /* Remove reset */
+ out_8(&iic->xtcntlss, 0);
+
+ /* Reinitialize interface */
+ iic_dev_init(dev);
+}
+
+/*
+ * Do 0-length transaction using bit-banging through IIC_DIRECTCNTL regist=
er.
+ */
+
+/* Wait for SCL and/or SDA to be high */
+static int iic_dc_wait(volatile struct iic_regs __iomem *iic, u8 mask)
+{
+ unsigned long x =3D jiffies + HZ / 28 + 2;
+ while ((in_8(&iic->directcntl) & mask) !=3D mask) {
+ if (unlikely(time_after(jiffies, x)))
+ return -1;
+ cond_resched();
+ }
+ return 0;
+}
+
+static int iic_smbus_quick(struct ibm_iic_private* dev, const struct i2c_m=
sg* p)
+{
+ volatile struct iic_regs __iomem *iic =3D dev->vaddr;
+ const struct i2c_timings* t =3D &timings[dev->fast_mode ? 1 : 0];
+ u8 mask, v, sda;
+ int i, res;
+
+ /* Only 7-bit addresses are supported */
+ if (unlikely(p->flags & I2C_M_TEN)) {
+ DBG("%s: smbus_quick - 10 bit addresses are not supported\n",
+ dev->np->full_name);
+ return -EINVAL;
+ }
+
+ DBG("%s: smbus_quick(0x%02x)\n", dev->np->full_name, p->addr);
+
+ /* Reset IIC interface */
+ out_8(&iic->xtcntlss, XTCNTLSS_SRST);
+
+ /* Wait for bus to become free */
+ out_8(&iic->directcntl, DIRCNTL_SDAC | DIRCNTL_SCC);
+ if (unlikely(iic_dc_wait(iic, DIRCNTL_MSDA | DIRCNTL_MSC)))
+ goto err;
+ ndelay(t->buf);
+
+ /* START */
+ out_8(&iic->directcntl, DIRCNTL_SCC);
+ sda =3D 0;
+ ndelay(t->hd_sta);
+
+ /* Send address */
+ v =3D (u8)((p->addr << 1) | ((p->flags & I2C_M_RD) ? 1 : 0));
+ for (i =3D 0, mask =3D 0x80; i < 8; ++i, mask >>=3D 1) {
+ out_8(&iic->directcntl, sda);
+ ndelay(t->low / 2);
+ sda =3D (v & mask) ? DIRCNTL_SDAC : 0;
+ out_8(&iic->directcntl, sda);
+ ndelay(t->low / 2);
+
+ out_8(&iic->directcntl, DIRCNTL_SCC | sda);
+ if (unlikely(iic_dc_wait(iic, DIRCNTL_MSC)))
+ goto err;
+ ndelay(t->high);
+ }
+
+ /* ACK */
+ out_8(&iic->directcntl, sda);
+ ndelay(t->low / 2);
+ out_8(&iic->directcntl, DIRCNTL_SDAC);
+ ndelay(t->low / 2);
+ out_8(&iic->directcntl, DIRCNTL_SDAC | DIRCNTL_SCC);
+ if (unlikely(iic_dc_wait(iic, DIRCNTL_MSC)))
+ goto err;
+ res =3D (in_8(&iic->directcntl) & DIRCNTL_MSDA) ? -EREMOTEIO : 1;
+ ndelay(t->high);
+
+ /* STOP */
+ out_8(&iic->directcntl, 0);
+ ndelay(t->low);
+ out_8(&iic->directcntl, DIRCNTL_SCC);
+ if (unlikely(iic_dc_wait(iic, DIRCNTL_MSC)))
+ goto err;
+ ndelay(t->su_sto);
+ out_8(&iic->directcntl, DIRCNTL_SDAC | DIRCNTL_SCC);
+
+ ndelay(t->buf);
+
+ DBG("%s: smbus_quick -> %s\n",
+ dev->np->full_name, res ? "NACK" : "ACK");
+out:
+ /* Remove reset */
+ out_8(&iic->xtcntlss, 0);
+
+ /* Reinitialize interface */
+ iic_dev_init(dev);
+
+ return res;
+err:
+ DBG("%s: smbus_quick - bus is stuck\n", dev->np->full_name);
+ res =3D -EREMOTEIO;
+ goto out;
+}
+
+/*
+ * IIC interrupt handler
+ */
+static irqreturn_t iic_handler(int irq, void *dev_id)
+{
+ struct ibm_iic_private* dev =3D (struct ibm_iic_private*)dev_id;
+ volatile struct iic_regs __iomem *iic =3D dev->vaddr;
+
+ DBG2("%s: irq handler, STS =3D 0x%02x, EXTSTS =3D 0x%02x\n",
+ dev->np->full_name, in_8(&iic->sts), in_8(&iic->extsts));
+
+ /* Acknowledge IRQ and wakeup iic_wait_for_tc */
+ out_8(&iic->sts, STS_IRQA | STS_SCMP);
+ wake_up_interruptible(&dev->wq);
+
+ return IRQ_HANDLED;
+}
+
+/*
+ * Get master transfer result and clear errors if any.
+ * Returns the number of actually transferred bytes or error (<0)
+ */
+static int iic_xfer_result(struct ibm_iic_private* dev)
+{
+ volatile struct iic_regs __iomem *iic =3D dev->vaddr;
+
+ if (unlikely(in_8(&iic->sts) & STS_ERR)) {
+ DBG("%s: xfer error, EXTSTS =3D 0x%02x\n", dev->np->full_name,
+ in_8(&iic->extsts));
+
+ /* Clear errors and possible pending IRQs */
+ out_8(&iic->extsts, EXTSTS_IRQP | EXTSTS_IRQD |
+ EXTSTS_LA | EXTSTS_ICT | EXTSTS_XFRA);
+
+ /* Flush master data buffer */
+ out_8(&iic->mdcntl, in_8(&iic->mdcntl) | MDCNTL_FMDB);
+
+ /* Is bus free?
+ * If error happened during combined xfer
+ * IIC interface is usually stuck in some strange
+ * state, the only way out - soft reset.
+ */
+ if ((in_8(&iic->extsts) & EXTSTS_BCS_MASK) !=3D EXTSTS_BCS_FREE) {
+ DBG("%s: bus is stuck, resetting\n",
+ dev->np->full_name);
+ iic_dev_reset(dev);
+ }
+ return -EREMOTEIO;
+ } else
+ return in_8(&iic->xfrcnt) & XFRCNT_MTC_MASK;
+}
+
+/*
+ * Try to abort active transfer.
+ */
+static void iic_abort_xfer(struct ibm_iic_private* dev)
+{
+ volatile struct iic_regs __iomem *iic =3D dev->vaddr;
+ unsigned long x;
+
+ DBG("%s: iic_abost_xfer\n", dev->np->full_name);
+
+ out_8(&iic->cntl, CNTL_HMT);
+
+ /*
+ * Wait for the abort command to complete.
+ * It's not worth to be optimized, just poll (timeout >=3D 1 tick)
+ */
+ x =3D jiffies + 2;
+ while ((in_8(&iic->extsts) & EXTSTS_BCS_MASK) !=3D EXTSTS_BCS_FREE) {
+ if (time_after(jiffies, x)) {
+ DBG("%s: abort timeout, resetting...\n",
+ dev->np->full_name);
+ iic_dev_reset(dev);
+ return;
+ }
+ schedule();
+ }
+
+ /* Just to clear errors */
+ iic_xfer_result(dev);
+}
+
+/*
+ * Wait for master transfer to complete.
+ * It puts current process to sleep until we get interrupt or timeout expi=
res.
+ * Returns the number of transferred bytes or error (<0)
+ */
+static int iic_wait_for_tc(struct ibm_iic_private* dev) {
+
+ volatile struct iic_regs __iomem *iic =3D dev->vaddr;
+ int ret =3D 0;
+
+ if (dev->irq >=3D 0) {
+ /* Interrupt mode */
+ ret =3D wait_event_interruptible_timeout(dev->wq,
+ !(in_8(&iic->sts) & STS_PT), dev->adap.timeout * HZ);
+
+ if (unlikely(ret < 0))
+ DBG("%s: wait interrupted\n", dev->np->full_name);
+ else if (unlikely(in_8(&iic->sts) & STS_PT)) {
+ DBG("%s: wait timeout\n", dev->np->full_name);
+ ret =3D -ETIMEDOUT;
+ }
+ } else {
+ /* Polling mode */
+ unsigned long x =3D jiffies + dev->adap.timeout * HZ;
+
+ while (in_8(&iic->sts) & STS_PT) {
+ if (unlikely(time_after(jiffies, x))) {
+ DBG("%s: poll timeout\n", dev->np->full_name);
+ ret =3D -ETIMEDOUT;
+ break;
+ }
+
+ if (unlikely(signal_pending(current))) {
+ DBG("%s: poll interrupted\n",
+ dev->np->full_name);
+ ret =3D -ERESTARTSYS;
+ break;
+ }
+ schedule();
+ }
+ }
+
+ if (unlikely(ret < 0))
+ iic_abort_xfer(dev);
+ else
+ ret =3D iic_xfer_result(dev);
+
+ DBG2("%s: iic_wait_for_tc -> %d\n", dev->np->full_name, ret);
+
+ return ret;
+}
+
+/*
+ * Low level master transfer routine
+ */
+static int iic_xfer_bytes(struct ibm_iic_private* dev, struct i2c_msg* pm,
+ int combined_xfer)
+{
+ volatile struct iic_regs __iomem *iic =3D dev->vaddr;
+ char* buf =3D pm->buf;
+ int i, j, loops, ret =3D 0;
+ int len =3D pm->len;
+
+ u8 cntl =3D (in_8(&iic->cntl) & CNTL_AMD) | CNTL_PT;
+ if (pm->flags & I2C_M_RD)
+ cntl |=3D CNTL_RW;
+
+ loops =3D (len + 3) / 4;
+ for (i =3D 0; i < loops; ++i, len -=3D 4) {
+ int count =3D len > 4 ? 4 : len;
+ u8 cmd =3D cntl | ((count - 1) << CNTL_TCT_SHIFT);
+
+ if (!(cntl & CNTL_RW))
+ for (j =3D 0; j < count; ++j)
+ out_8((void __iomem *)&iic->mdbuf, *buf++);
+
+ if (i < loops - 1)
+ cmd |=3D CNTL_CHT;
+ else if (combined_xfer)
+ cmd |=3D CNTL_RPST;
+
+ DBG2("%s: xfer_bytes, %d, CNTL =3D 0x%02x\n",
+ dev->np->full_name, count, cmd);
+
+ /* Start transfer */
+ out_8(&iic->cntl, cmd);
+
+ /* Wait for completion */
+ ret =3D iic_wait_for_tc(dev);
+
+ if (unlikely(ret < 0))
+ break;
+ else if (unlikely(ret !=3D count)) {
+ DBG("%s: xfer_bytes, requested %d, transfered %d\n",
+ dev->np->full_name, count, ret);
+
+ /* If it's not a last part of xfer, abort it */
+ if (combined_xfer || (i < loops - 1))
+ iic_abort_xfer(dev);
+
+ ret =3D -EREMOTEIO;
+ break;
+ }
+
+ if (cntl & CNTL_RW)
+ for (j =3D 0; j < count; ++j)
+ *buf++ =3D in_8((void __iomem *)&iic->mdbuf);
+ }
+
+ return ret > 0 ? 0 : ret;
+}
+
+/*
+ * Set target slave address for master transfer
+ */
+static inline void iic_address(struct ibm_iic_private* dev, struct i2c_msg=
* msg)
+{
+ volatile struct iic_regs __iomem *iic =3D dev->vaddr;
+ u16 addr =3D msg->addr;
+
+ DBG2("%s: iic_address, 0x%03x (%d-bit)\n", dev->np->full_name,
+ addr, msg->flags & I2C_M_TEN ? 10 : 7);
+
+ if (msg->flags & I2C_M_TEN) {
+ out_8(&iic->cntl, CNTL_AMD);
+ out_8(&iic->lmadr, addr);
+ out_8(&iic->hmadr, 0xf0 | ((addr >> 7) & 0x06));
+ } else {
+ out_8(&iic->cntl, 0);
+ out_8(&iic->lmadr, addr << 1);
+ }
+}
+
+static inline int iic_invalid_address(const struct i2c_msg* p)
+{
+ return (p->addr > 0x3ff) || (!(p->flags & I2C_M_TEN) && (p->addr > 0x7f));
+}
+
+static inline int iic_address_neq(const struct i2c_msg* p1,
+ const struct i2c_msg* p2)
+{
+ return (p1->addr !=3D p2->addr)
+ || ((p1->flags & I2C_M_TEN) !=3D (p2->flags & I2C_M_TEN));
+}
+
+/*
+ * Generic master transfer entrypoint.
+ * Returns the number of processed messages or error (<0)
+ */
+static int iic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int nu=
m)
+{
+ struct ibm_iic_private* dev =3D (struct ibm_iic_private*)(i2c_get_ada=
pdata(adap));
+ volatile struct iic_regs __iomem *iic =3D dev->vaddr;
+ int i, ret =3D 0;
+
+ DBG2("%s: iic_xfer, %d msg(s)\n", dev->np->full_name, num);
+
+ if (!num)
+ return 0;
+
+ /* Check the sanity of the passed messages.
+ * Uhh, generic i2c layer is more suitable place for such code...
+ */
+ if (unlikely(iic_invalid_address(&msgs[0]))) {
+ DBG("%s: invalid address 0x%03x (%d-bit)\n", dev->np->full_name,
+ msgs[0].addr, msgs[0].flags & I2C_M_TEN ? 10 : 7);
+ return -EINVAL;
+ }
+ for (i =3D 0; i < num; ++i) {
+ if (unlikely(msgs[i].len <=3D 0)) {
+ if (num =3D=3D 1 && !msgs[0].len) {
+ /* Special case for I2C_SMBUS_QUICK emulation.
+ * IBM IIC doesn't support 0-length transactions
+ * so we have to emulate them using bit-banging.
+ */
+ return iic_smbus_quick(dev, &msgs[0]);
+ }
+ DBG("%s: invalid len %d in msg[%d]\n",
+ dev->np->full_name,
+ msgs[i].len, i);
+ return -EINVAL;
+ }
+ if (unlikely(iic_address_neq(&msgs[0], &msgs[i]))) {
+ DBG("%s: invalid addr in msg[%d]\n",
+ dev->np->full_name, i);
+ return -EINVAL;
+ }
+ }
+
+ /* Check bus state */
+ if (unlikely((in_8(&iic->extsts) & EXTSTS_BCS_MASK)
+ !=3D EXTSTS_BCS_FREE)) {
+ DBG("%s: iic_xfer, bus is not free\n", dev->np->full_name);
+
+ /* Usually it means something serious has happend.
+ * We *cannot* have unfinished previous transfer
+ * so it doesn't make any sense to try to stop it.
+ * Probably we were not able to recover from the
+ * previous error.
+ * The only *reasonable* thing I can think of here
+ * is soft reset. --ebs
+ */
+ iic_dev_reset(dev);
+
+ if ((in_8(&iic->extsts) & EXTSTS_BCS_MASK) !=3D EXTSTS_BCS_FREE) {
+ DBG("%s: iic_xfer, bus is still not free\n",
+ dev->np->full_name);
+ return -EREMOTEIO;
+ }
+ } else {
+ /* Flush master data buffer (just in case) */
+ out_8(&iic->mdcntl, in_8(&iic->mdcntl) | MDCNTL_FMDB);
+ }
+
+ /* Load slave address */
+ iic_address(dev, &msgs[0]);
+
+ /* Do real transfer */
+ for (i =3D 0; i < num && !ret; ++i)
+ ret =3D iic_xfer_bytes(dev, &msgs[i], i < num - 1);
+
+ return ret < 0 ? ret : num;
+}
+
+static u32 iic_func(struct i2c_adapter *adap)
+{
+ return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR;
+}
+
+static const struct i2c_algorithm iic_algo =3D {
+ .master_xfer =3D iic_xfer,
+ .functionality =3D iic_func
+};
+
+/*
+ * Calculates IICx_CLCKDIV value for a specific OPB clock frequency
+ */
+static inline u8 iic_clckdiv(unsigned int opb)
+{
+ /* Compatibility kludge, should go away after all cards
+ * are fixed to fill correct value for opbfreq.
+ * Previous driver version used hardcoded divider value 4,
+ * it corresponds to OPB frequency from the range (40, 50] MHz
+ */
+ if (!opb) {
+ printk(KERN_WARNING
+ "ibm-iic: using compatibility value for OPB freq,"
+ " fix your board specific setup\n");
+ opb =3D 50000000;
+ }
+
+ /* Convert to MHz */
+ opb /=3D 1000000;
+
+ if (opb < 20 || opb > 150) {
+ printk(KERN_CRIT "ibm-iic: invalid OPB clock frequency %u MHz\n",
+ opb);
+ opb =3D opb < 20 ? 20 : 150;
+ }
+ return (u8)((opb + 9) / 10 - 1);
+}
+
+/*
+ * Register single IIC interface
+ */
+static int __devinit iic_probe (struct of_device *ofdev,
+ const struct of_device_id *match)
+{
+ struct ibm_iic_private* dev;
+ struct i2c_adapter* adap;
+ struct device_node *np;
+ int ret =3D -ENODEV;
+ int irq, len;
+ const u32 *prop;
+ struct resource res;
+
+ np =3D ofdev->node;
+ if (!(dev =3D kzalloc(sizeof(*dev), GFP_KERNEL))) {
+ printk(KERN_CRIT "ibm-iic(%s): failed to allocate device data\n",
+ np->full_name);
+ return -ENOMEM;
+ }
+
+ dev_set_drvdata(&ofdev->dev, dev);
+
+ dev->np =3D np;
+ irq =3D irq_of_parse_and_map(np, 0);
+
+ if (of_address_to_resource(np, 0, &res)) {
+ printk(KERN_ERR "ibd-iic(%s): Can't get registers address\n",
+ np->full_name);
+ goto fail1;
+ }
+ dev->paddr =3D res.start;
+
+ if (!request_mem_region(dev->paddr, sizeof(struct iic_regs),
+ "ibm_iic")) {
+ ret =3D -EBUSY;
+ goto fail1;
+ }
+ dev->vaddr =3D ioremap(dev->paddr, sizeof(struct iic_regs));
+
+ if (dev->vaddr =3D=3D NULL) {
+ printk(KERN_CRIT "ibm-iic(%s): failed to ioremap device regs\n",
+ dev->np->full_name);
+ ret =3D -ENXIO;
+ goto fail2;
+ }
+
+ init_waitqueue_head(&dev->wq);
+
+ dev->irq =3D iic_force_poll ? -1 : (irq =3D=3D NO_IRQ) ? -1 : irq;
+ if (dev->irq >=3D 0) {
+ /* Disable interrupts until we finish initialization,
+ assumes level-sensitive IRQ setup...
+ */
+ iic_interrupt_mode(dev, 0);
+ if (request_irq(dev->irq, iic_handler, 0, "IBM IIC", dev)) {
+ printk(KERN_ERR "ibm-iic(%s): request_irq %d failed\n",
+ dev->np->full_name, dev->irq);
+ /* Fallback to the polling mode */
+ dev->irq =3D -1;
+ }
+ }
+
+ if (dev->irq < 0)
+ printk(KERN_WARNING "ibm-iic(%s): using polling mode\n",
+ dev->np->full_name);
+
+ /* Board specific settings */
+ prop =3D of_get_property(np, "iic-mode", &len);
+ /* use 400kHz only if stated in dts, 100kHz otherwise */
+ if (prop !=3D NULL) {
+ if (*prop =3D=3D 400)
+ dev->fast_mode =3D 1;
+ } else
+ dev->fast_mode =3D 0;
+
+ /* clckdiv is the same for *all* IIC interfaces,
+ * but I'd rather make a copy than introduce another global. --ebs
+ */
+ /* Parent bus should have frequency filled */
+ prop =3D of_get_property(of_get_parent(np), "clock-frequency", &len);
+ if (prop =3D=3D NULL) {
+ printk(KERN_ERR
+ "ibm-iic(%s):no clock-frequency prop on parent bus!\n",
+ dev->np->full_name);
+ goto fail;
+ }
+
+ DBG("%s: clckdiv =3D %d\n", dev->np->full_name, dev->clckdiv);
+
+ /* Initialize IIC interface */
+ iic_dev_init(dev);
+
+ /* Register it with i2c layer */
+ adap =3D &dev->adap;
+ adap->dev.parent =3D &ofdev->dev;
+ strcpy(adap->name, "IBM IIC");
+ i2c_set_adapdata(adap, dev);
+ adap->id =3D I2C_HW_OCP;
+ adap->class =3D I2C_CLASS_HWMON;
+ adap->algo =3D &iic_algo;
+ adap->client_register =3D NULL;
+ adap->client_unregister =3D NULL;
+ adap->timeout =3D 1;
+ adap->retries =3D 1;
+
+ adap->nr =3D ++device_idx;
+ if ((ret =3D i2c_add_numbered_adapter(adap)) < 0) {
+ printk(KERN_CRIT "ibm-iic(%s): failed to register i2c adapter\n",
+ dev->np->full_name);
+ goto fail;
+ }
+
+ printk(KERN_INFO "ibm-iic(%s): using %s mode\n", dev->np->full_name,
+ dev->fast_mode ?
+ "fast (400 kHz)" : "standard (100 kHz)");
+
+ return 0;
+
+fail:
+ if (dev->irq >=3D 0) {
+ iic_interrupt_mode(dev, 0);
+ free_irq(dev->irq, dev);
+ }
+
+ iounmap(dev->vaddr);
+fail2:
+ release_mem_region(dev->paddr, sizeof(struct iic_regs));
+fail1:
+ dev_set_drvdata(&ofdev->dev, NULL);
+ kfree(dev);
+
+ return ret;
+}
+
+/*
+ * Cleanup initialized IIC interface
+ */
+static int __devexit iic_remove(struct of_device *ofdev)
+{
+ struct ibm_iic_private *dev =3D
+ (struct ibm_iic_private *)dev_get_drvdata(&ofdev->dev);
+
+ BUG_ON(dev =3D=3D NULL);
+ if (i2c_del_adapter(&dev->adap)) {
+ printk(KERN_CRIT "ibm-iic(%s): failed to delete i2c adapter\n",
+ dev->np->full_name);
+ /* That's *very* bad, just shutdown IRQ ... */
+ if (dev->irq >=3D 0) {
+ iic_interrupt_mode(dev, 0);
+ free_irq(dev->irq, dev);
+ dev->irq =3D -1;
+ }
+ } else {
+ if (dev->irq >=3D 0) {
+ iic_interrupt_mode(dev, 0);
+ free_irq(dev->irq, dev);
+ }
+ iounmap(dev->vaddr);
+ release_mem_region(dev->paddr, sizeof(struct iic_regs));
+ kfree(dev);
+ }
+
+ return 0;
+}
+
+static struct of_device_id ibm_iic_match[] =3D {
+ {
+ .type =3D "i2c",
+ .compatible =3D "ibm,iic",
+ },
+ {},
+};
+
+MODULE_DEVICE_TABLE(of, ibm_iic_match);
+
+static struct of_platform_driver ibm_iic_driver =3D {
+ .name =3D "ibm-iic",
+ .match_table =3D ibm_iic_match,
+ .probe =3D iic_probe,
+ .remove =3D iic_remove,
+#if defined(CONFIG_PM)
+ .suspend =3D NULL,
+ .resume =3D NULL,
+#endif
+};
+
+static int __init iic_init(void)
+{
+ printk(KERN_INFO "IBM IIC driver v" DRIVER_VERSION "\n");
+ return of_register_platform_driver(&ibm_iic_driver);
+}
+
+static void __exit iic_exit(void)
+{
+ of_unregister_platform_driver(&ibm_iic_driver);
+}
+
+module_init(iic_init);
+module_exit(iic_exit);
^ permalink raw reply
* Re: PPC4xx maintainer?
From: Paul Mackerras @ 2007-09-15 4:31 UTC (permalink / raw)
To: Stefan Roese; +Cc: linuxppc-dev
In-Reply-To: <200709142208.43342.ml@stefan-roese.de>
Stefan Roese writes:
> I really think that now, as the PPC4xx Linux development is picking up in
> speed in the ongoing move to arch/powerpc, we need an "active" maintainer for
> the 4xx Linux kernel platform. Since I haven't heard anything from Matt in a
> long time, perhaps it would be better if somebody else takes care of this
> matter. I propose that Josh Boyer takes over this maintainership, and I know
> that he is competent enough and willing to dedicate the needed time for this
> task.
Glad you think so. :) I asked Josh to be the 4xx maintainer a couple of
weeks ago but didn't make an announcement about it, which I should
have done - sorry about that.
Josh, please send me a patch for MAINTAINERS.
Paul.
^ permalink raw reply
* Re: Domen's MPC5200 FEC cleanup patch.
From: Jon Smirl @ 2007-09-15 4:28 UTC (permalink / raw)
To: Domen Puncer, linuxppc-embedded
In-Reply-To: <9e4733910709142038y1bd88cd5s7c9bb21a668db9f6@mail.gmail.com>
On 9/14/07, Jon Smirl <jonsmirl@gmail.com> wrote:
> This patch doesn't seem to working quite right on my hardware (Phytec
> pcm030). At boot I get a long pause.
It also doesn't compile if CONFIG_FEC_MPC52xx_MDIO is undefined.
--
Jon Smirl
jonsmirl@gmail.com
^ permalink raw reply
* Domen's MPC5200 FEC cleanup patch.
From: Jon Smirl @ 2007-09-15 3:38 UTC (permalink / raw)
To: Domen Puncer, linuxppc-embedded
This patch doesn't seem to working quite right on my hardware (Phytec
pcm030). At boot I get a long pause.
I have a long pause when Ethernet is initializing
[ 0.798529] NET: Registered protocol family 1
[ 0.802988] NET: Registered protocol family 17
[ 1.313708] net eth0: attached phy 0 to driver Generic PHY
[ 2.320013] Sending DHCP requests ...... timed out!
[ 81.968863] IP-Config: Retrying forever (NFS root)...
[ 82.477527] net eth0: attached phy 0 to driver Generic PHY
[ 83.487809] Sending DHCP requests .<6>PHY: f0003000:00 - Link is Up
- 100/Full
[ 86.323795] ., OK
[ 88.579802] IP-Config: Got DHCP answer from 192.168.1.200, my
address is 192.168.1.5
[ 88.587923] IP-Config: Complete:
Reverting back to
0008-drivers-net-Add-support-for-Freescale-MPC5200-SoC-i.patch the
pause goes away.
[ 0.793916] TCP cubic registered
[ 0.797309] NET: Registered protocol family 1
[ 0.801808] NET: Registered protocol family 17
[ 1.309611] eth0: config: auto-negotiation on, 100HDX, 10HDX.
[ 2.316014] Sending DHCP requests .., OK
[ 7.124005] IP-Config: Got DHCP answer from 192.168.1.200, my
address is 192.168.1.5
[ 7.132121] IP-Config: Complete:
[ 7.135212] device=eth0, addr=192.168.1.5,
mask=255.255.255.0, gw=192.168.1.200,
[ 7.143192] host=MPC, domain=home, nis-domain=(none),
[ 7.148778] bootserver=192.168.1.200, rootserver=192.168.1.4, rootpath=
Something not quite right with interrupts maybe? I'm trying to debug it.
--
Jon Smirl
jonsmirl@gmail.com
^ permalink raw reply
* Re: [patch 4/4] 4xx: Convert Seqouia flash mappings to new binding
From: Stefan Roese @ 2007-09-15 3:32 UTC (permalink / raw)
To: linuxppc-dev; +Cc: David Gibson
In-Reply-To: <20070915022318.GG25414@localhost.localdomain>
On Saturday 15 September 2007, David Gibson wrote:
> On Fri, Sep 14, 2007 at 01:54:14PM -0500, Josh Boyer wrote:
> > A new binding for flash devices was recently introduced. This updates
> > the Sequoia DTS to use the new binding and enabled MTD in the defconfig.
> >
> > Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
>
> Acked-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Stefan Roese <sr@denx.de>
Best regards,
Stefan
^ permalink raw reply
* Re: [patch 3/4] 4xx: Convert Walnut flash mappings to new binding
From: Stefan Roese @ 2007-09-15 3:23 UTC (permalink / raw)
To: linuxppc-dev; +Cc: david
In-Reply-To: <20070914185649.272138000@linux.vnet.ibm.com>
On Friday 14 September 2007, Josh Boyer wrote:
> A new binding for flash devices was recently introduced. This updates the
> Walnut DTS to use the new binding.
>
> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
> ---
> arch/powerpc/boot/dts/walnut.dts | 17 ++++++++++++-----
> 1 file changed, 12 insertions(+), 5 deletions(-)
>
> --- linux-2.6.orig/arch/powerpc/boot/dts/walnut.dts
> +++ linux-2.6/arch/powerpc/boot/dts/walnut.dts
> @@ -137,6 +137,10 @@
> dcr-reg = <012 2>;
> #address-cells = <2>;
> #size-cells = <1>;
> + /* The ranges property is supplied by the bootwrapper
> + * and is based on the firmware's configuration of the
> + * EBC bridge
> + */
> clock-frequency = <0>; /* Filled in by zImage */
>
> sram@0,0 {
> @@ -144,13 +148,16 @@
> };
>
> flash@0,80000 {
> - device_type = "rom";
> - compatible = "direct-mapped";
> - probe-type = "JEDEC";
> + compatible = "jedec-flash";
> bank-width = <1>;
> - partitions = <0 80000>;
> - partition-names = "OpenBIOS";
> reg = <0 80000 80000>;
> + #address-cells = <1>;
> + #size-cells = <1>;
> + partition@0 {
> + label = "OpenBIOS";
> + reg = <0 80000>;
> + read-only;
> + };
There are not only Bamboo board running PIBS, but running U-Boot too. How
should we handle this different FLASH partitioning? Same goes for Ebony too
btw.
Best regards,
Stefan
^ permalink raw reply
* Re: PPC4xx maintainer?
From: Stefan Roese @ 2007-09-15 3:04 UTC (permalink / raw)
To: David Gibson; +Cc: linuxppc-dev, Paul Mackerras
In-Reply-To: <20070915014519.GB25414@localhost.localdomain>
On Saturday 15 September 2007, David Gibson wrote:
> > I second that nomination... Go JOSH!
>
> You're behind the times. Paulus has already annointed Josh as 4xx
> maintainer.
Excellent. That's good news.
Good luck Josh. :)
Best regards,
Stefan
^ permalink raw reply
* Re: [patch 2/4] Make partitions optional in physmap_of
From: David Gibson @ 2007-09-15 2:21 UTC (permalink / raw)
To: Josh Boyer; +Cc: linuxppc-dev
In-Reply-To: <20070914185648.970788000@linux.vnet.ibm.com>
On Fri, Sep 14, 2007 at 01:54:12PM -0500, Josh Boyer wrote:
> The latest physmap_of driver has a small error where it will fail the probe
> with:
>
> physmap-flash: probe of fff00000.small-flas failed with error -2
>
> if there are no partition subnodes in the device tree and the old style binding
> is not used. Since partition definitions are optional, the probe should still
> succeed.
>
> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply
* Re: rtc-ds1742.c should use resource_size_t for base address
From: David Gibson @ 2007-09-15 1:30 UTC (permalink / raw)
To: Josh Boyer
Cc: Andrew Morton, linuxppc-dev, Atsushi Nemoto, linux-kernel,
rtc-linux
In-Reply-To: <20070914122037.65a08f48@weaponx.rchland.ibm.com>
On Fri, Sep 14, 2007 at 12:20:37PM -0500, Josh Boyer wrote:
> On Fri, 14 Sep 2007 15:54:27 +1000
> David Gibson <david@gibson.dropbear.id.au> wrote:
>
> > Currently the rtc driver, rtc-ds1742.c uses an unsigned long to store
> > the base mmio address of the NVRAM/RTC. This breaks on systems like
> > PowerPC 440, which is a 32-bit core with 36-bit physical addresses: IO
> > on the system, including the RTC, is typically above the 4GB point,
> > and cannot fit into an unsigned long.
> >
> > This patch fixes the problem by replacing the unsigned long with a
> > resource_size_t. Tested on Ebony (PPC440) (with additional patches to
> > instantiate the ds1742 platform device appropriately).
>
> Where would those additional patches be? :)
Coming, they still need polish...
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply
* Re: [patch 1/4] cuimage for Bamboo board
From: David Gibson @ 2007-09-15 2:19 UTC (permalink / raw)
To: Josh Boyer; +Cc: linuxppc-dev
In-Reply-To: <20070914185648.698807000@linux.vnet.ibm.com>
On Fri, Sep 14, 2007 at 01:54:11PM -0500, Josh Boyer wrote:
> Add a cuboot wrapper for the Bamboo board. This also removes some obsoleted
> linker declarations that have been moved into ops.h
>
> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
> Acked-by: David Gibson <david@gibson.dropbear.id.au>
Heh, well, I know I acked this already, but...
[snip]
> --- /dev/null
> +++ linux-2.6/arch/powerpc/boot/cuboot-bamboo.c
> @@ -0,0 +1,30 @@
> +/*
> + * Old U-boot compatibility for Ebony
Error in the comment here.
[snip]
> --- linux-2.6.orig/arch/powerpc/boot/bamboo.c
> +++ linux-2.6/arch/powerpc/boot/bamboo.c
> @@ -24,8 +24,7 @@
> #include "4xx.h"
> #include "44x.h"
>
> -extern char _dtb_start[];
> -extern char _dtb_end[];
> +static u8 *bamboo_mac0, *bamboo_mac1;
This additional handling of the MAC addresses should really also be
mentioned in the commit comment.
>
> static void bamboo_fixups(void)
> {
> @@ -34,12 +33,15 @@ static void bamboo_fixups(void)
> ibm440ep_fixup_clocks(sysclk, 11059200);
> ibm4xx_fixup_memsize();
> ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00);
> + dt_fixup_mac_addresses(bamboo_mac0, bamboo_mac1);
> }
>
> -void bamboo_init(void)
> +void bamboo_init(void *mac0, void *mac1)
> {
> platform_ops.fixups = bamboo_fixups;
> platform_ops.exit = ibm44x_dbcr_reset;
> + bamboo_mac0 = mac0;
> + bamboo_mac1 = mac1;
> ft_init(_dtb_start, 0, 32);
> serial_console_init();
> }
> --- linux-2.6.orig/arch/powerpc/boot/treeboot-bamboo.c
> +++ linux-2.6/arch/powerpc/boot/treeboot-bamboo.c
> @@ -12,16 +12,32 @@
> #include "ops.h"
> #include "stdio.h"
> #include "44x.h"
> -
> -extern char _end[];
> +#include "stdlib.h"
>
> BSS_STACK(4096);
>
> +#define PIBS_MAC0 0xfffc0400
> +#define PIBS_MAC1 0xfffc0500
> +char pibs_mac0[6];
> +char pibs_mac1[6];
> +
> +static void read_pibs_mac(void)
> +{
> + unsigned long long mac64;
> +
> + mac64 = strtoull((char *)PIBS_MAC0, 0, 16);
> + memcpy(&pibs_mac0, (char *)&mac64+2, 6);
> +
> + mac64 = strtoull((char *)PIBS_MAC1, 0, 16);
> + memcpy(&pibs_mac1, (char *)&mac64+2, 6);
> +}
> +
> void platform_init(void)
> {
> unsigned long end_of_ram = 0x8000000;
> unsigned long avail_ram = end_of_ram - (unsigned long)_end;
>
> simple_alloc_init(_end, avail_ram, 32, 64);
> - bamboo_init();
> + read_pibs_mac();
> + bamboo_init((u8 *)&pibs_mac0, (u8 *)&pibs_mac1);
> }
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox