* Re: Xilinx Virtex boot
From: Grant Likely @ 2007-08-30 15:02 UTC (permalink / raw)
To: Robert Woodworth; +Cc: linuxppc-embedded
In-Reply-To: <1188485072.8717.42.camel@PisteOff>
On 8/30/07, Robert Woodworth <rwoodworth@securics.com> wrote:
> On Wed, 2007-08-29 at 18:29 -0600, Grant Likely wrote:
> > On 8/29/07, Robert Woodworth <rwoodworth@securics.com> wrote:
> > > I'm trying to port Linux to a new Virtex Platform. The kernel will not
> > > uncompress, I get the following on the console:
> > >
> > > loaded at: 00400000 004FB19C
> > > board data at: 004F9120 004F919C
> > > relocated to: 00404054 004040D0
> > > zimage at: 00404E50 004F8409
> > > avail ram: 004FC000 04000000
> > >
> > > Linux/PPC load: console=ttyUL root=/dev/xsa2
> > > Uncompressing Linux...
> > > zlib_inflateInit2 returned 00506530
> > > exit
> > >
> > > Any ideas what causes this error??
> > > Is something mis-configured on my EDK project?
> > >
> >
> > Possibly, do you know that EDK has your ram is configured correctly
> > (ie. have you run a memory test application)?
>
> Yes, I ran the sample memory test application that EDK builds
> automatically. It ran fine.
>
> The fact that the above prints on the console, tells me that the
> zImage.elf is getting loaded at the correct start location and that its
> partly executing.
>
> What is the return code that I'm seeing?? I have been unable to figure
> that out from the source yet.
IIRC, the return code is the result of the CRC calculation. If it is
non-zero, then the CRC was incorrect. That says to me that you've got
either memory or download issues.
I have seen corruption in the past when downloading zImages larger
than about 1.2MB over JTAG.
> > > I have 64MB DDR on the OPB *not* the PLB.
> > > Is that a problem??
> >
> > It shouldn't be the problem, but why are you doing that?
>
> We are building an image-processing application inside the FPGA. The
> application is very memory intensive. I have been told that the PPC
> always has priority on the PLB and that if I want to have my FPGA module
> have priority on memory, that I should place the memory and my FPGA
> module on the OPB. Yes, this can significantly slow down the PPC, but
> in my case the PPC is only used for UI and networking.
<offtopic> You might want to take a look at the MPMC ipcore. It
allows multiple PLBs to address a single memory region.</offtopic>
Cheers,
g.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
grant.likely@secretlab.ca
(403) 399-0195
^ permalink raw reply
* Re: [PATCH 8/9] mpc82xx: Update mpc8272ads, and factor out PCI and reset.
From: Scott Wood @ 2007-08-30 15:17 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev
In-Reply-To: <573185B5-2B02-4D97-BAC8-D508C16D6093@kernel.crashing.org>
On Thu, Aug 30, 2007 at 09:56:16AM -0500, Kumar Gala wrote:
> It don't feel its a mishmash of crap its just how things are
> defined. Maybe the SOC node was a mistake, but I think we are past
> the point of return on that.
The node itself wasn't a mistake -- the IMMR is relocatable, so it should
be under a bus node. The mistake was assuming the PCI ranges went
straight to the CPU space, rather than getting translated through the
parent bus's ranges. We got away with that mistake because of a similar
bug in the 32-bit PCI code.
In the past few months, this issue began to be addressed in a handful of
device trees. In the device trees I prepared, I used separate bus and
control nodes. In the 8544, 8548, and 8641 device trees, extra ranges
were hacked into the soc node. All other PCI-bearing Freescale device
tree files are still broken.
I don't think a few months is an unrecoverable legacy.
> Having one platform's device tree be different just creates confusion
> to our customers.
The intent isn't for 82xx to be different from everything else -- it's
simply the first one to get fixed in this way. Incremental changes, and
what not.
Note that it would be quite easy to make the code accept either type of
device tree.
> While there isn't anything technically wrong with what your proposing
> it will cause support issues down the line which I want to avoid.
Such as?
-Scott
^ permalink raw reply
* Re: signals handling in the kernel
From: Mirek23 @ 2007-08-30 15:23 UTC (permalink / raw)
To: linuxppc-embedded
In-Reply-To: <46B9FB23.8040903@ovro.caltech.edu>
Hi David,
I went throught the Rubini book about device drivers and I see that
you are absolutly right about
the way how to handle interrupts in the user space.
When I find a bit of time I will try your first suggestion with read() which
bolckes in the user space and
waits forr ISR to write data to the buffer.
Many thanks for all your suggestions
Best Regards
Mirek
David Hawkins-3 wrote:
>
> Hi Mirek,
>
>> I run embedded Linux on ppc405 (ml403 xilinx evaluation board).
>> I use the GPIO based device build on FPGA part of the xilinx
>> chip. My gpio device generates interrupts whenever it changes
>> its state.
>>
>> I use Montavista gpio driver with some modifications to react
>> on interrupts. Each time when interrupt occurs the interrupt
>> handler routine is called. This routine sends the signal to the
>> application in user space to trigger it. When the application
>> is triggered it reads the data from the GPIO device.
>>
>> I read that in this situation the best is to use signals. In my
>> case the ideal would be to use kill_proc_info which sends to the
>> application the Signal with info data were I intended to put just
>> one integer value. Such a value determines how to react for the
>> signal on the application level.
>
> Signals are not the appropriate solution.
>
> It sounds like your application is read-only, so how about
> the following use-cases for the driver:
>
> 1. In user-space, you only have one GPIO, and the code
> only needs to react in response to this one I/O port.
> The information required by user-space is the 1-byte
> (or 2, or 4) of GPIO
>
> Solution:
> The driver implements a buffer that a user-space read() call
> consumes. A user-space read() call blocks until there is
> data in the buffer.
>
> The driver ISR reads the GPIO port, and writes the
> contents to the buffer.
>
> 2. In user-space, you have multiple GPIO ports, and
> the code needs to respond to any one.
>
> Solution:
> The driver implements the poll() call back so that
> user-space can call select() on the multiple GPIO
> file descriptors.
>
> Again, the driver ISR reads the different GPIO ports,
> and writes the data to the GPIO specific buffer.
>
> I have plenty of driver code lying around, and can point
> you to an example that implements both of these options.
> The driver easily supports both (1) and (2) since
> (1) is just a blocking-read, and (2) is poll().
>
> Is the kernel 2.4 or 2.6? Here's some code I wrote for
> 2.6, and this code was ported from some 2.4 drivers
> (and I still have that code in CVS)
>
> http://www.ovro.caltech.edu/~dwh/correlator/cobra_docs.html
> http://www.ovro.caltech.edu/~dwh/correlator/software/driver_design.tar.gz
> http://www.ovro.caltech.edu/~dwh/correlator/pdf/LNX-762-Hawkins.pdf
>
> I can re-write say the parallel port example to demonstrate
> how the value of the GPIO port (the parallel port) can be
> sent to user space. There's a parallel port interrupt
> example in there somewhere. I know I wrote a GPIO driver
> for my Yosemite board (440EP example), but I don't see it
> in that zip ... it must be lying around here somewhere :)
>
> I wouldn't necessarily copy say a parallel port example
> verbatim, since there is only ever one of those devices
> in a system. There are more likely to be multiple GPIO ports,
> so the driver design would be generalized a little more.
> Look at the COBRA driver code. I have crates of cPCI equipment
> loaded with 10s of boards, with each board having multiple
> device nodes, transferring megabytes per second over
> multiple cPCI crates :)
>
> Anyway, stop thinking about signals, they'll just mess you up.
>
> Oh, the driver will also support sending SIGIO to the process,
> via the fasync() driver call, so you can try signals, and
> convince yourself that select() is much nicer.
>
> A GPIO driver seems like such an obvious thing to write. Are
> you sure the montavista driver doesn't already support these
> features? I have no idea of your experience with coding, so
> it could just be that you are unaware of what the driver
> implements. If you are allowed to post it, go ahead, and
> I'll comment on its features.
>
> Cheers
> Dave
>
>
>
>
>
>
>
>
> _______________________________________________
> Linuxppc-embedded mailing list
> Linuxppc-embedded@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-embedded
>
>
--
View this message in context: http://www.nabble.com/signals-handling-in-the-kernel-tf4229566.html#a12409543
Sent from the linuxppc-embedded mailing list archive at Nabble.com.
^ permalink raw reply
* Re: spin_lock doesn't work?!?
From: Wolfgang Reissnegger @ 2007-08-30 15:36 UTC (permalink / raw)
To: melinda develey; +Cc: linuxppc-embedded
In-Reply-To: <762949.1267.qm@web63906.mail.re1.yahoo.com>
Hi Melinda,
I agree with Josh, you should use spin_lock_irqsave(), especially in
your ioctl() routine. spin_lock_irqsave will not compile into a no-op,
even on a single processor machine and will at least disable interrupts.
On SMP machines they will also spin.
Depending on the type of access of the variables in your ioctl()
routine, you might want to consider using read/write spin-locks.
It is not wrong to use spin_locks the way use want to use them.
spin_locks are the right tool to protect a short section in your code.
Cheers,
Wolfgang
melinda develey wrote:
>
> >You should still put the spin_lock calls into your code because >you
> >never know if someone else will compile it and for another >target. If
> >someone would, for example, compile the same code for a SMP
> >machine then
> >the spin_lock will actually lock.
> I used the spinlock both in an interrupt handler to protect a group
> of variables (because in an interrupt I can't use a semaphore) and
> the same spinlock in a ioctl handler where the same group of
> variables is accessed. Is this wrong? I have a 2.6.19.2 linux kernel.
>
> Thank you,
> Melinda.
>
>
>
>
> ------------------------------------------------------------------------
> Ready for the edge of your seat? Check out tonight's top picks
> <http://us.rd.yahoo.com/evt=48220/*http://tv.yahoo.com/> on Yahoo! TV.
^ permalink raw reply
* Re: signals handling in the kernel
From: David Hawkins @ 2007-08-30 15:57 UTC (permalink / raw)
To: Mirek23; +Cc: linuxppc-embedded
In-Reply-To: <12409543.post@talk.nabble.com>
Hi Mirek,
> I went throught the Rubini book about device drivers
> and I see that you are absolutly right about
> the way how to handle interrupts in the user space.
Great, glad to hear you are convinced :)
> When I find a bit of time I will try your first
> suggestion with read() which blocks in the user space
> and waits for ISR to write data to the buffer.
Look at the example drivers I wrote. Its all in
there, just copy whatever you want.
> Many thanks for all your suggestions
No problem! Its the open-source way ;)
Cheers,
Dave
^ permalink raw reply
* RE: Xilinx Virtex boot (And MPMC)
From: Stephen Neuendorffer @ 2007-08-30 16:07 UTC (permalink / raw)
To: Robert Woodworth, Grant Likely; +Cc: linuxppc-embedded
In-Reply-To: <1188485072.8717.42.camel@PisteOff>
The MPMC would almost certainly be a better option here...
Steve
> -----Original Message-----
> From:=20
> linuxppc-embedded-bounces+stephen=3Dneuendorffer.name@ozlabs.org
> =20
> [mailto:linuxppc-embedded-bounces+stephen=3Dneuendorffer.name@oz
labs.org] On Behalf Of Robert Woodworth
> Sent: Thursday, August 30, 2007 7:45 AM
> To: Grant Likely
> Cc: linuxppc-embedded@ozlabs.org
> Subject: Re: Xilinx Virtex boot
>=20
> On Wed, 2007-08-29 at 18:29 -0600, Grant Likely wrote:
> > On 8/29/07, Robert Woodworth <rwoodworth@securics.com> wrote:
> > > I'm trying to port Linux to a new Virtex Platform. The=20
> kernel will not
> > > uncompress, I get the following on the console:
> > >
> > > loaded at: 00400000 004FB19C
> > > board data at: 004F9120 004F919C
> > > relocated to: 00404054 004040D0
> > > zimage at: 00404E50 004F8409
> > > avail ram: 004FC000 04000000
> > >
> > > Linux/PPC load: console=3DttyUL root=3D/dev/xsa2
> > > Uncompressing Linux...
> > > zlib_inflateInit2 returned 00506530
> > > exit
> > >
> > > Any ideas what causes this error??
> > > Is something mis-configured on my EDK project?
> > >
> >=20
> > Possibly, do you know that EDK has your ram is configured correctly
> > (ie. have you run a memory test application)?
>=20
> Yes, I ran the sample memory test application that EDK builds
> automatically. It ran fine.
>=20
> The fact that the above prints on the console, tells me that the
> zImage.elf is getting loaded at the correct start location=20
> and that its
> partly executing.
>=20
> What is the return code that I'm seeing?? I have been unable=20
> to figure
> that out from the source yet.
>=20
>=20
> > >
> > > I have 64MB DDR on the OPB *not* the PLB.
> > > Is that a problem??
> >=20
> > It shouldn't be the problem, but why are you doing that?
>=20
> We are building an image-processing application inside the FPGA. The
> application is very memory intensive. I have been told that the PPC
> always has priority on the PLB and that if I want to have my=20
> FPGA module
> have priority on memory, that I should place the memory and my FPGA
> module on the OPB. Yes, this can significantly slow down the PPC, but
> in my case the PPC is only used for UI and networking.
>=20
> I will actually build in *two* OPBs one for the memory + my module and
> the second for the other peripherals.=20
>=20
>=20
> Woody.
>=20
> _______________________________________________
> Linuxppc-embedded mailing list
> Linuxppc-embedded@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-embedded
>=20
>=20
^ permalink raw reply
* Re: [PATCH 2/9] bootwrapper: Add strtoull().
From: Scott Wood @ 2007-08-30 16:16 UTC (permalink / raw)
To: Milton Miller; +Cc: ppcdev
In-Reply-To: <ab107db1fd4d7e9bc3b461b7f4157100@bga.com>
On Thu, Aug 30, 2007 at 10:52:22AM -0500, Milton Miller wrote:
> On Thu Aug 30 02:46:38 EST 2007, Scott Wood wrote:
>
> >+ if (*ptr >= '0' && *ptr <= '9' && *ptr < '0' + base)
> >+ digit = *ptr - '0';
> >+ else if (*ptr >= 'A' && *ptr < 'A' + base - 10)
> >+ digit = *ptr - 'A' + 10;
> >+ else if (*ptr >= 'a' && *ptr < 'z' + base - 10)
> >+ digit = *ptr - 'a' + 10;
> >+ else
> >+ break;
>
> 'z' should also be 'a' like the 'A' case.
Oops.
> Should we add <= 'Z' like we do '9', or do we not care about bases >
> 36? (It really breaks above base 42).
I personally don't care about bases > 16; I only supported up to 36
because it was easy to do so.
-Scott
^ permalink raw reply
* Re: [PATCH 2/9] bootwrapper: Add strtoull().
From: Milton Miller @ 2007-08-30 15:52 UTC (permalink / raw)
To: Scott Wood; +Cc: ppcdev
In-Reply-To: <20070829164638.GA31640@ld0162-tx32.am.freescale.net>
On Thu Aug 30 02:46:38 EST 2007, Scott Wood wrote:
> + if (*ptr >= '0' && *ptr <= '9' && *ptr < '0' + base)
> + digit = *ptr - '0';
> + else if (*ptr >= 'A' && *ptr < 'A' + base - 10)
> + digit = *ptr - 'A' + 10;
> + else if (*ptr >= 'a' && *ptr < 'z' + base - 10)
> + digit = *ptr - 'a' + 10;
> + else
> + break;
'z' should also be 'a' like the 'A' case.
Should we add <= 'Z' like we do '9', or do we not care about bases >
36? (It really breaks above base 42).
milton
^ permalink raw reply
* Re: Document and implement an improved flash device binding for powerpc (v4)
From: Scott Wood @ 2007-08-30 17:29 UTC (permalink / raw)
To: linuxppc-dev
In-Reply-To: <20070830012118.GF22844@localhost.localdomain>
On Thu, Aug 30, 2007 at 11:21:18AM +1000, David Gibson wrote:
> + For JEDEC compatible devices, the following additional properties
> + are defined:
> +
> + - vendor-id : Contains the flash chip's vendor id (1 byte).
> + - device-id : Contains the flash chip's device id (1 byte).
Are these required, or recommended?
> + In addition to the information on the flash bank itself, the
> + device tree may optionally contain additional information
> + describing partitions of the flash address space. This can be
> + used on platforms which have strong conventions about which
> + portions of the flash are used for what purposes, but which don't
> + use an on-flash partition table such as RedBoot.
> +
> + Each partition is represented as a sub-node of the flash device.
> + Each node's name represents the name of the corresponding
> + partition of the flash device.
Hmm... I'm not thrilled with using the node name for this. For one, the
node name usually functions more as a node type than a label. It also
means that spaces can't be used in the name, which is fairly common for
existing partition maps.
This might be a good time to introduce a standard "label" property.
-Scott
^ permalink raw reply
* Re: [PATCH 2.6.23] ibmebus: Prevent bus_id collisions
From: Nathan Lynch @ 2007-08-30 17:56 UTC (permalink / raw)
To: Joachim Fenkes
Cc: Thomas Q Klein, Jan-Bernd Themann, Paul Mackerras, LKML,
LinuxPPC-Dev, Christoph Raisch, Paul Mackerras, Stefan Roscher
In-Reply-To: <OF9D1ED44F.896DCCC5-ONC1257347.0044D256-C1257347.004CFB07@de.ibm.com>
Hi Joachim-
Joachim Fenkes wrote:
> Nathan Lynch <ntl@pobox.com> wrote on 29.08.2007 20:12:32:
> > Will anything break?
>
> Nope. Userspace programs should not depend on ibmebus' way of naming the
> devices; especially since some overly long loc_codes tended to be
> truncated and thus rendered useless. I have tested IBM's DLPAR tools
> against the changed kernel, and they didn't break.
Okay.
> > Also, I dislike this approach of duplicating the firmware device tree
> > path in sysfs.
>
> Why? Any specific reasons for your dislike?
struct device's bus_id field is but 20 bytes in size. Too close for
comfort?
> > Are GX/ibmebus devices guaranteed to be children of
> > the same node in the OF device tree? If so, their unit addresses will
> > be unique, and therefore suitable values for bus_id. I believe this
> > is what the powerpc vio bus code does.
>
> While there's no such guarantee (as in "officially signed document"), yes,
> I expect future GX devices to also appear beneath the OFDT root node. For
> the existing devices, the unit addresses are already part of the device
> name, so I save the need to use sprintf() again. Plus, I rather like using
> the full_name since it also contains a descriptive name as opposed to
> being just nondescript numbers, helping the layman (ie user) to make sense
> out of a dev_id.
Okay, but your layman isn't supposed to be relying on any
user-friendly properties of the name :) Hope he doesn't work on a
distro installer.
Anyway, if you're still confident in this approach, I relent. :)
^ permalink raw reply
* Re: Document and implement an improved flash device binding for powerpc (v4)
From: Josh Boyer @ 2007-08-30 17:59 UTC (permalink / raw)
To: Scott Wood; +Cc: linuxppc-dev
In-Reply-To: <20070830172932.GA3317@ld0162-tx32.am.freescale.net>
On Thu, 30 Aug 2007 12:29:33 -0500
Scott Wood <scottwood@freescale.com> wrote:
> On Thu, Aug 30, 2007 at 11:21:18AM +1000, David Gibson wrote:
> > + For JEDEC compatible devices, the following additional properties
> > + are defined:
> > +
> > + - vendor-id : Contains the flash chip's vendor id (1 byte).
> > + - device-id : Contains the flash chip's device id (1 byte).
>
> Are these required, or recommended?
For JEDEC, I believe those are required.
josh
^ permalink raw reply
* Re: Document and implement an improved flash device binding for powerpc (v4)
From: Scott Wood @ 2007-08-30 18:04 UTC (permalink / raw)
To: Josh Boyer; +Cc: linuxppc-dev
In-Reply-To: <20070830125952.14c700ea@zod.rchland.ibm.com>
On Thu, Aug 30, 2007 at 12:59:52PM -0500, Josh Boyer wrote:
> On Thu, 30 Aug 2007 12:29:33 -0500
> Scott Wood <scottwood@freescale.com> wrote:
>
> > On Thu, Aug 30, 2007 at 11:21:18AM +1000, David Gibson wrote:
> > > + For JEDEC compatible devices, the following additional properties
> > > + are defined:
> > > +
> > > + - vendor-id : Contains the flash chip's vendor id (1 byte).
> > > + - device-id : Contains the flash chip's device id (1 byte).
> >
> > Are these required, or recommended?
>
> For JEDEC, I believe those are required.
It can be probed, though...
-Scott
^ permalink raw reply
* Re: [PATCH 2.6.23] ibmebus: Prevent bus_id collisions
From: Arnd Bergmann @ 2007-08-30 18:22 UTC (permalink / raw)
To: linuxppc-dev
Cc: Thomas Klein, Jan-Bernd Themann, Joachim Fenkes, LKML,
Paul Mackerras, Christoph Raisch, Paul Mackerras, Stefan Roscher
In-Reply-To: <200708291815.18197.fenkes@de.ibm.com>
On Wednesday 29 August 2007, Joachim Fenkes wrote:
> Previously, ibmebus derived a device's bus_id from its location code. The
> location code is not guaranteed to be unique, so we might get bus_id
> collisions if two devices share the same location code. The OFDT full_name,
> however, is unique, so we use that instead.
>
> Signed-off-by: Joachim Fenkes <fenkes@de.ibm.com>
Actually, I think it would be much better to convert the code to be more
like of_platform_device, or to even replace all of ibmebus with that.
The whole logic of dynamically adding and removing device is rather bogus,
and it prevents autoloading of device drivers. of_platform_make_bus_id
is the function that is responsible for creating unique names over there.
Arnd <><
^ permalink raw reply
* Re: Document and implement an improved flash device binding for powerpc (v4)
From: Josh Boyer @ 2007-08-30 18:23 UTC (permalink / raw)
To: Scott Wood; +Cc: linuxppc-dev
In-Reply-To: <20070830180450.GA3757@ld0162-tx32.am.freescale.net>
On Thu, 30 Aug 2007 13:04:50 -0500
Scott Wood <scottwood@freescale.com> wrote:
> On Thu, Aug 30, 2007 at 12:59:52PM -0500, Josh Boyer wrote:
> > On Thu, 30 Aug 2007 12:29:33 -0500
> > Scott Wood <scottwood@freescale.com> wrote:
> >
> > > On Thu, Aug 30, 2007 at 11:21:18AM +1000, David Gibson wrote:
> > > > + For JEDEC compatible devices, the following additional properties
> > > > + are defined:
> > > > +
> > > > + - vendor-id : Contains the flash chip's vendor id (1 byte).
> > > > + - device-id : Contains the flash chip's device id (1 byte).
> > >
> > > Are these required, or recommended?
> >
> > For JEDEC, I believe those are required.
>
> It can be probed, though...
Yes, ignore me. And looking at the updated ebony.dts in David's patch,
it would seem they are optional. Apparently I didn't drink enough
coffee this morning.
josh
^ permalink raw reply
* Re: wmb vs mmiowb
From: Brent Casavant @ 2007-08-30 19:42 UTC (permalink / raw)
To: Nick Piggin; +Cc: linuxppc-dev, linux-ia64
In-Reply-To: <20070830033643.GB26257@wotan.suse.de>
On Thu, 30 Aug 2007, Nick Piggin wrote:
> OK, thanks for that. I think I have a rough idea of how they both
> work... I was just thinking (hoping) that, although the writel may
> not reach the device before the store reaches memory, it would
> _appear_ that way from the POV of the device (ie. if the device
> were to DMA from mem). But that's probably wishful thinking because
> the memory might be on some completely different part of the system.
Exactly. Since uncacheable writes cannot by definition take
part in a cache-coherency mechanism, they really become their
own seperate hierarchy of transactions.
> I don't know whether this is exactly a correct implementation of
> Linux's barrier semantics. On one hand, wmb _is_ ordering the stores
> as they come out of the CPU; on the other, it isn't ordering normal
> stores with respect to writel from the POV of the device (which is
> seems to be what is expected by the docs and device driver writers).
Or, as I think of it, it's not ordering cacheable stores with respect
to uncacheable stores from the perspective of other CPUs in the system.
That's what's really at the heart of the concern for SN2.
> And on the other side, it just doesn't seem so useful just to know
> that stores coming out of the CPU are ordered if they can be reordered
> by an intermediate.
Well, it helps when certain classes of stores need to be ordered with
respect to eachother. On SN2, wmb() still ensures that cacheable stores
are issued in a particular order, and thus seen by other CPUs in a
particular order. That is still important, even when IO devices are not
in the mix.
> Why even have wmb() at all, if it doesn't actually
> order stores to IO and RAM?
It orders the class of stores which target RAM. It doesn't order the
two seperate classes of stores (RAM and IO) with respect to eachother.
mmiowb() when used in conjunction with a lock which serializes access
to an IO device ensures that the order of stores to the IO device from
different CPUs is well-defined. That's what we're really after here.
> powerpc's wmb() could just as well be an
> 'eieio' if it were to follow your model; that instruction orders IO,
> but not WRT cacheable stores.
That would seem to follow the intent of mmiowb() on SN2. I know
next to nothing about PowerPC, so I'm not qualified to comment on that.
> So you could argue that the chipset is an extention of the CPU's IO/memory
> subsystem and should follow the ordering specified by the CPU. I like this
> idea because it could make things simpler and more regular for the Linux
> barrier model.
Sorry, I didn't design the hardware. ;)
I believe the problem, for a NUMA system, is that in order to implement
what you describe, you would need the chipset to cause all effectively
dirty cachelines in the CPU (including those that will become dirty
due to previous stores which the CPU hasn't committed from its pipeline
yet) to be written back to RAM before the the uncacheable store was allowed
to issue from the chipset to the IO fabric. This would occur for every
IO store, not just the final store in a related sequence. That would
obviously have a significant negative impact on performance.
> I guess it is too expensive for you to have mmiowb() in every wmb(),
> because _most_ of the time, all that's needed is ordering between IOs.
I think it's the other way around. Most of the time all you need is
ordering between RAM stores, so mmiowb() would kill performance if it
was called every time wmb() was invoked.
> So why not have io_mb(), io_rmb(), io_wmb(), which order IOs but ignore
> system memory. Then the non-prefixed primitives order everything (to the
> point that wmb() is like mmiowb on sn2).
I'm not sure I follow. Here's the bad sequence we're working with:
CPU A CPU B Lock owner IO device sees
----- ----- ---------- --------------
... ... unowned
lock() ... CPU A
writel(val_a) lock() ...
unlock() CPU B
... write(val_b) ...
... unlock() unowned
... ... ... val_b
... ... ... val_a
The cacheable store to RAM from CPU A to perform the unlock was
not ordered with respect to the uncacheable writel() to the IO device.
CPU B, which has a different uncacheable store path to the IO device
in the NUMA system, saw the effect of the RAM store before CPU A's
uncacheable store arrived at the IO device. CPU B then owned the
lock, performed its own uncacheable store to the IO device, and
released the lock. The two uncacheable stores are taking different
routes to the device, and end up arriving in the wrong order.
mmiowb() solves this by causing the following:
CPU A CPU B Lock owner IO device sees
----- ----- ---------- --------------
... ... Unowned
lock() ... CPU A
writel(val_a) lock() ...
mmiowb() ... val_a
unlock() CPU B
... write(val_b) ...
... mmiowb() ... val_b
... unlock() unowned
The mmiowb() caused the IO device to see the uncacheable store from
CPU A before CPU B saw the cacheable store from CPU A. Now all is
well with the world.
I might be exhausting your patience, but this is the key. mmiowb()
causes the IO fabric to see the effects of an uncacheable store
before other CPUs see the effects of a subsequent cacheable store.
That's what's really at the heart of the matter.
> Now I guess it's strictly also needed if you want to ensure cacheable
> stores and IO stores are visible to the device in the correct order
> too. I think we'd normally hope wmb() does that for us too (hence all
> my rambling above).
There's really three perspectives to consider, not just the CPU and IO
device:
1. CPU A performing locking and issuing IO stores.
2. The IO device receiving stores.
3. CPU B performing locking and issuing IO stores.
The lock ensures that the IO device sees stores from a single CPU
at a time. wmb() ensures that CPU A and CPU B see the effect
of cacheable stores in the same order as eachother. mmiowb()
ensures that the IO device has seen all the uncacheable stores from
CPU A before CPU B sees the cacheable stores from CPU A.
Wow. I like that last paragraph. I think I'll send now...
Brent
--
Brent Casavant All music is folk music. I ain't
bcasavan@sgi.com never heard a horse sing a song.
Silicon Graphics, Inc. -- Louis Armstrong
^ permalink raw reply
* Re: [PATCH 2/9] cpm2: Fix off-by-one error in setbrg().
From: Vitaly Bordug @ 2007-08-29 22:09 UTC (permalink / raw)
To: Scott Wood; +Cc: linuxppc-dev
In-Reply-To: <20070828201921.GB24329@ld0162-tx32.am.freescale.net>
On Tue, 28 Aug 2007 15:19:21 -0500
Scott Wood wrote:
> The hardware adds one to the BRG value to get the divider, so it must
> be subtracted by software.
Prolly a note why it used to work, or what exactly this is resulting in the code. IIRC this was
just fw-ported so arch/ppc should have this as well.
>
> Signed-off-by: Scott Wood <scottwood@freescale.com>
> ---
> arch/powerpc/sysdev/cpm2_common.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/powerpc/sysdev/cpm2_common.c
> b/arch/powerpc/sysdev/cpm2_common.c index dbef50c..99ad1ed 100644
> --- a/arch/powerpc/sysdev/cpm2_common.c
> +++ b/arch/powerpc/sysdev/cpm2_common.c
> @@ -102,7 +102,7 @@ cpm_setbrg(uint brg, uint rate)
> brg -= 4;
> }
> bp += brg;
> - out_be32(bp, ((BRG_UART_CLK / rate) << 1) | CPM_BRG_EN);
> + out_be32(bp, (((BRG_UART_CLK / rate) - 1) << 1) |
> CPM_BRG_EN);
> cpm2_unmap(bp);
> }
--
Sincerely, Vitaly
^ permalink raw reply
* Re: [PATCH 3/9] cpm2: Add SCCs to cpm2_clk_setup(), and cpm2_smc_clk_setup().
From: Vitaly Bordug @ 2007-08-29 22:25 UTC (permalink / raw)
To: Scott Wood; +Cc: linuxppc-dev
In-Reply-To: <20070828201922.GC24329@ld0162-tx32.am.freescale.net>
On Tue, 28 Aug 2007 15:19:22 -0500
Scott Wood wrote:
I would have it in the same patch, that adds clocking stuff to 8xx. And
maybe in the same, segregate source rather then having it in the foo_common.c, to ease fix/update/rework.
Just imho, not pressing for that.
> Signed-off-by: Scott Wood <scottwood@freescale.com>
> ---
> arch/powerpc/sysdev/cpm2_common.c | 100
> +++++++++++++++++++++++++++++++++++--
> include/asm-powerpc/cpm2.h | 5 ++- 2 files changed, 99
> insertions(+), 6 deletions(-)
>
> diff --git a/arch/powerpc/sysdev/cpm2_common.c
> b/arch/powerpc/sysdev/cpm2_common.c index 99ad1ed..549da4b 100644
> --- a/arch/powerpc/sysdev/cpm2_common.c
> +++ b/arch/powerpc/sysdev/cpm2_common.c
> @@ -140,7 +140,8 @@ int cpm2_clk_setup(enum cpm_clk_target target,
> int clock, int mode) cpmux_t __iomem *im_cpmux;
> u32 __iomem *reg;
> u32 mask = 7;
> - u8 clk_map [24][3] = {
> +
> + u8 clk_map[][3] = {
> {CPM_CLK_FCC1, CPM_BRG5, 0},
> {CPM_CLK_FCC1, CPM_BRG6, 1},
> {CPM_CLK_FCC1, CPM_BRG7, 2},
> @@ -164,8 +165,40 @@ int cpm2_clk_setup(enum cpm_clk_target target,
> int clock, int mode) {CPM_CLK_FCC3, CPM_CLK13, 4},
> {CPM_CLK_FCC3, CPM_CLK14, 5},
> {CPM_CLK_FCC3, CPM_CLK15, 6},
> - {CPM_CLK_FCC3, CPM_CLK16, 7}
> - };
> + {CPM_CLK_FCC3, CPM_CLK16, 7},
> + {CPM_CLK_SCC1, CPM_BRG1, 0},
> + {CPM_CLK_SCC1, CPM_BRG2, 1},
> + {CPM_CLK_SCC1, CPM_BRG3, 2},
> + {CPM_CLK_SCC1, CPM_BRG4, 3},
> + {CPM_CLK_SCC1, CPM_CLK11, 4},
> + {CPM_CLK_SCC1, CPM_CLK12, 5},
> + {CPM_CLK_SCC1, CPM_CLK3, 6},
> + {CPM_CLK_SCC1, CPM_CLK4, 7},
> + {CPM_CLK_SCC2, CPM_BRG1, 0},
> + {CPM_CLK_SCC2, CPM_BRG2, 1},
> + {CPM_CLK_SCC2, CPM_BRG3, 2},
> + {CPM_CLK_SCC2, CPM_BRG4, 3},
> + {CPM_CLK_SCC2, CPM_CLK11, 4},
> + {CPM_CLK_SCC2, CPM_CLK12, 5},
> + {CPM_CLK_SCC2, CPM_CLK3, 6},
> + {CPM_CLK_SCC2, CPM_CLK4, 7},
> + {CPM_CLK_SCC3, CPM_BRG1, 0},
> + {CPM_CLK_SCC3, CPM_BRG2, 1},
> + {CPM_CLK_SCC3, CPM_BRG3, 2},
> + {CPM_CLK_SCC3, CPM_BRG4, 3},
> + {CPM_CLK_SCC3, CPM_CLK5, 4},
> + {CPM_CLK_SCC3, CPM_CLK6, 5},
> + {CPM_CLK_SCC3, CPM_CLK7, 6},
> + {CPM_CLK_SCC3, CPM_CLK8, 7},
> + {CPM_CLK_SCC4, CPM_BRG1, 0},
> + {CPM_CLK_SCC4, CPM_BRG2, 1},
> + {CPM_CLK_SCC4, CPM_BRG3, 2},
> + {CPM_CLK_SCC4, CPM_BRG4, 3},
> + {CPM_CLK_SCC4, CPM_CLK5, 4},
> + {CPM_CLK_SCC4, CPM_CLK6, 5},
> + {CPM_CLK_SCC4, CPM_CLK7, 6},
> + {CPM_CLK_SCC4, CPM_CLK8, 7},
> + };
>
> im_cpmux = cpm2_map(im_cpmux);
>
> @@ -205,23 +238,80 @@ int cpm2_clk_setup(enum cpm_clk_target target,
> int clock, int mode) if (mode == CPM_CLK_RX)
> shift += 3;
>
> - for (i=0; i<24; i++) {
> + for (i = 0; i < ARRAY_SIZE(clk_map); i++) {
> if (clk_map[i][0] == target && clk_map[i][1] ==
> clock) { bits = clk_map[i][2];
> break;
> }
> }
> - if (i == sizeof(clk_map)/3)
> + if (i == ARRAY_SIZE(clk_map))
> ret = -EINVAL;
>
> bits <<= shift;
> mask <<= shift;
> +
> out_be32(reg, (in_be32(reg) & ~mask) | bits);
>
> cpm2_unmap(im_cpmux);
> return ret;
> }
>
> +int cpm2_smc_clk_setup(enum cpm_clk_target target, int clock)
> +{
> + int ret = 0;
> + int shift;
> + int i, bits = 0;
> + cpmux_t __iomem *im_cpmux;
> + u8 __iomem *reg;
> + u8 mask = 3;
> +
> + u8 clk_map[][3] = {
> + {CPM_CLK_SMC1, CPM_BRG1, 0},
> + {CPM_CLK_SMC1, CPM_BRG7, 1},
> + {CPM_CLK_SMC1, CPM_CLK7, 2},
> + {CPM_CLK_SMC1, CPM_CLK9, 3},
> + {CPM_CLK_SMC2, CPM_BRG2, 0},
> + {CPM_CLK_SMC2, CPM_BRG8, 1},
> + {CPM_CLK_SMC2, CPM_CLK4, 2},
> + {CPM_CLK_SMC2, CPM_CLK15, 3},
> + };
> +
> + im_cpmux = cpm2_map(im_cpmux);
> +
> + switch (target) {
> + case CPM_CLK_SMC1:
> + reg = &im_cpmux->cmx_smr;
> + mask = 3;
> + shift = 4;
> + break;
> + case CPM_CLK_SMC2:
> + reg = &im_cpmux->cmx_smr;
> + mask = 3;
> + shift = 0;
> + break;
> + default:
> + printk(KERN_ERR "cpm2_smc_clock_setup: invalid clock
> target\n");
> + return -EINVAL;
> + }
> +
> + for (i = 0; i < ARRAY_SIZE(clk_map); i++) {
> + if (clk_map[i][0] == target && clk_map[i][1] ==
> clock) {
> + bits = clk_map[i][2];
> + break;
> + }
> + }
> + if (i == ARRAY_SIZE(clk_map))
> + ret = -EINVAL;
> +
> + bits <<= shift;
> + mask <<= shift;
> +
> + out_8(reg, (in_8(reg) & ~mask) | bits);
> +
> + cpm2_unmap(im_cpmux);
> + return ret;
> +}
> +
> /*
> * dpalloc / dpfree bits.
> */
> diff --git a/include/asm-powerpc/cpm2.h b/include/asm-powerpc/cpm2.h
> index c036506..41a45db 100644
> --- a/include/asm-powerpc/cpm2.h
> +++ b/include/asm-powerpc/cpm2.h
> @@ -1206,7 +1206,9 @@ enum cpm_clk_target {
> CPM_CLK_SCC4,
> CPM_CLK_FCC1,
> CPM_CLK_FCC2,
> - CPM_CLK_FCC3
> + CPM_CLK_FCC3,
> + CPM_CLK_SMC1,
> + CPM_CLK_SMC2,
> };
>
> enum cpm_clk {
> @@ -1243,6 +1245,7 @@ enum cpm_clk {
> };
>
> extern int cpm2_clk_setup(enum cpm_clk_target target, int clock, int
> mode); +extern int cpm2_smc_clk_setup(enum cpm_clk_target target, int
> clock);
> #endif /* __CPM2__ */
> #endif /* __KERNEL__ */
--
Sincerely, Vitaly
^ permalink raw reply
* Re: [PATCH 1/9] 8xx: Fix CONFIG_PIN_TLB.
From: Vitaly Bordug @ 2007-08-29 21:09 UTC (permalink / raw)
To: Scott Wood; +Cc: linuxppc-dev
In-Reply-To: <20070828201716.GA24260@ld0162-tx32.am.freescale.net>
On Tue, 28 Aug 2007 15:17:16 -0500
Scott Wood wrote:
> 1. Only map 512K of the IMMR, rather than 8M, to avoid conflicting
> with the default ioremap region.
> 2. The wrong register was being loaded into SPRN_MD_RPN.
>
> Signed-off-by: Scott Wood <scottwood@freescale.com>
Acked-by: Vitaly Bordug <vitb@kernel.crashing.org>
> ---
> arch/powerpc/kernel/head_8xx.S | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/powerpc/kernel/head_8xx.S
> b/arch/powerpc/kernel/head_8xx.S index 901be47..e40e122 100644
> --- a/arch/powerpc/kernel/head_8xx.S
> +++ b/arch/powerpc/kernel/head_8xx.S
> @@ -695,7 +695,7 @@ initial_mmu:
> mtspr SPRN_MI_AP, r8
> mtspr SPRN_MD_AP, r8
>
> - /* Map another 8 MByte at the IMMR to get the processor
> + /* Map another 512 KByte at the IMMR to get the processor
> * internal registers (among other things).
> */
> #ifdef CONFIG_PIN_TLB
> @@ -703,12 +703,12 @@ initial_mmu:
> mtspr SPRN_MD_CTR, r10
> #endif
> mfspr r9, 638 /* Get current
> IMMR */
> - andis. r9, r9, 0xff80 /* Get 8Mbyte
> boundary */
> + andis. r9, r9, 0xfff8 /* Get 512K
> boundary */
> mr r8, r9 /* Create vaddr for
> TLB */ ori r8, r8, MD_EVALID /* Mark it valid */
> mtspr SPRN_MD_EPN, r8
> - li r8, MD_PS8MEG /* Set 8M byte page */
> + li r8, MD_PS512K /* Set 512K byte page
> */ ori r8, r8, MD_SVALID /* Make it valid */
> mtspr SPRN_MD_TWC, r8
> mr r8, r9 /* Create paddr for
> TLB */ @@ -730,13 +730,13 @@ initial_mmu:
> mtspr SPRN_MD_TWC, r9
> li r11, MI_BOOTINIT /* Create RPN for address
> 0 */ addis r11, r11, 0x0080 /* Add 8M */
> - mtspr SPRN_MD_RPN, r8
> + mtspr SPRN_MD_RPN, r11
>
> addis r8, r8, 0x0080 /* Add 8M */
> mtspr SPRN_MD_EPN, r8
> mtspr SPRN_MD_TWC, r9
> addis r11, r11, 0x0080 /* Add 8M */
> - mtspr SPRN_MD_RPN, r8
> + mtspr SPRN_MD_RPN, r11
> #endif
>
> /* Since the cache is enabled according to the information we
--
Sincerely, Vitaly
^ permalink raw reply
* Re: [PATCH 3/9] 8xx: Add pin and clock setting functions.
From: Vitaly Bordug @ 2007-08-29 21:38 UTC (permalink / raw)
To: Scott Wood; +Cc: linuxppc-dev
In-Reply-To: <20070828201719.GC24260@ld0162-tx32.am.freescale.net>
On Tue, 28 Aug 2007 15:17:19 -0500
Scott Wood wrote:
> These let board code set up pins and clocks without having to
> put magic numbers directly into the registers.
>
I personally is not fond of such idea, but it would make this more understandable eases transfer to feature_call
or qe pin setting stuff (though the latter should be reworked at some point too imho).
> Signed-off-by: Scott Wood <scottwood@freescale.com>
> ---
> arch/powerpc/sysdev/commproc.c | 201
> ++++++++++++++++++++++++++++++++++++++++
> include/asm-powerpc/commproc.h | 41 ++++++++ 2 files changed, 242
> insertions(+), 0 deletions(-)
>
> diff --git a/arch/powerpc/sysdev/commproc.c
> b/arch/powerpc/sysdev/commproc.c index af26659..a21a292 100644
> --- a/arch/powerpc/sysdev/commproc.c
> +++ b/arch/powerpc/sysdev/commproc.c
> @@ -405,3 +405,204 @@ uint cpm_dpram_phys(u8 *addr)
> return (dpram_pbase + (uint)(addr - (u8 __force
> *)dpram_vbase)); }
> EXPORT_SYMBOL(cpm_dpram_addr);
> +
> +struct cpm_ioport16 {
> + __be16 dir, par, sor, dat, intr;
> + __be16 res[3];
> +};
> +
Hmm. If we are using such a non-standard types, it worths at least explanation why...
> +struct cpm_ioport32 {
> + __be32 dir, par, sor;
> +};
> +
> +static void cpm1_set_pin32(int port, int pin, int flags)
> +{
> + struct cpm_ioport32 __iomem *iop;
> + pin = 1 << (31 - pin);
> +
> + if (port == 1)
Probably put here define or alike so that we wouldn't have confusion what 1/whatever port number does mean.
Or some comment explaining for PQ newcomer what's going on here. ditto below.
> + iop = (struct cpm_ioport32 __iomem *)
> + &mpc8xx_immr->im_cpm.cp_pbdir;
> + else
> + iop = (struct cpm_ioport32 __iomem *)
> + &mpc8xx_immr->im_cpm.cp_pedir;
> +
> + if (flags & CPM_PIN_OUTPUT)
> + setbits32(&iop->dir, pin);
> + else
> + clrbits32(&iop->dir, pin);
> +
> + if (!(flags & CPM_PIN_GPIO))
> + setbits32(&iop->par, pin);
> + else
> + clrbits32(&iop->par, pin);
> +
> + if (port == 4) {
> + if (flags & CPM_PIN_SECONDARY)
> + setbits32(&iop->sor, pin);
> + else
> + clrbits32(&iop->sor, pin);
> +
> + if (flags & CPM_PIN_OPENDRAIN)
> + setbits32(&mpc8xx_immr->im_cpm.cp_peodr,
> pin);
> + else
> + clrbits32(&mpc8xx_immr->im_cpm.cp_peodr,
> pin);
> + }
> +}
> +
> +static void cpm1_set_pin16(int port, int pin, int flags)
> +{
> + struct cpm_ioport16 __iomem *iop =
> + (struct cpm_ioport16 __iomem
> *)&mpc8xx_immr->im_ioport; +
> + pin = 1 << (15 - pin);
> +
> + if (port != 0)
> + iop += port - 1;
> +
> + if (flags & CPM_PIN_OUTPUT)
> + setbits16(&iop->dir, pin);
> + else
> + clrbits16(&iop->dir, pin);
> +
> + if (!(flags & CPM_PIN_GPIO))
> + setbits16(&iop->par, pin);
> + else
> + clrbits16(&iop->par, pin);
> +
> + if (port == 2) {
> + if (flags & CPM_PIN_SECONDARY)
> + setbits16(&iop->sor, pin);
> + else
> + clrbits16(&iop->sor, pin);
> + }
> +}
> +
> +void cpm1_set_pin(int port, int pin, int flags)
> +{
> + if (port == 1 || port == 4)
> + cpm1_set_pin32(port, pin, flags);
> + else
> + cpm1_set_pin16(port, pin, flags);
> +}
> +
> +int cpm1_clk_setup(enum cpm_clk_target target, int clock, int mode)
> +{
> + int shift;
> + int i, bits = 0;
> + u32 __iomem *reg;
> + u32 mask = 7;
> +
gotta at least briefly explain the clue here, too. We're adding helper functions and should be ready that something somewhere
won't work as expected.
> + u8 clk_map[][3] = {
> + {CPM_CLK_SCC1, CPM_BRG1, 0},
> + {CPM_CLK_SCC1, CPM_BRG2, 1},
> + {CPM_CLK_SCC1, CPM_BRG3, 2},
> + {CPM_CLK_SCC1, CPM_BRG4, 3},
> + {CPM_CLK_SCC1, CPM_CLK1, 4},
> + {CPM_CLK_SCC1, CPM_CLK2, 5},
> + {CPM_CLK_SCC1, CPM_CLK3, 6},
> + {CPM_CLK_SCC1, CPM_CLK4, 7},
> +
> + {CPM_CLK_SCC2, CPM_BRG1, 0},
> + {CPM_CLK_SCC2, CPM_BRG2, 1},
> + {CPM_CLK_SCC2, CPM_BRG3, 2},
> + {CPM_CLK_SCC2, CPM_BRG4, 3},
> + {CPM_CLK_SCC2, CPM_CLK1, 4},
> + {CPM_CLK_SCC2, CPM_CLK2, 5},
> + {CPM_CLK_SCC2, CPM_CLK3, 6},
> + {CPM_CLK_SCC2, CPM_CLK4, 7},
> +
> + {CPM_CLK_SCC3, CPM_BRG1, 0},
> + {CPM_CLK_SCC3, CPM_BRG2, 1},
> + {CPM_CLK_SCC3, CPM_BRG3, 2},
> + {CPM_CLK_SCC3, CPM_BRG4, 3},
> + {CPM_CLK_SCC3, CPM_CLK5, 4},
> + {CPM_CLK_SCC3, CPM_CLK6, 5},
> + {CPM_CLK_SCC3, CPM_CLK7, 6},
> + {CPM_CLK_SCC3, CPM_CLK8, 7},
> +
> + {CPM_CLK_SCC4, CPM_BRG1, 0},
> + {CPM_CLK_SCC4, CPM_BRG2, 1},
> + {CPM_CLK_SCC4, CPM_BRG3, 2},
> + {CPM_CLK_SCC4, CPM_BRG4, 3},
> + {CPM_CLK_SCC4, CPM_CLK5, 4},
> + {CPM_CLK_SCC4, CPM_CLK6, 5},
> + {CPM_CLK_SCC4, CPM_CLK7, 6},
> + {CPM_CLK_SCC4, CPM_CLK8, 7},
> +
> + {CPM_CLK_SMC1, CPM_BRG1, 0},
> + {CPM_CLK_SMC1, CPM_BRG2, 1},
> + {CPM_CLK_SMC1, CPM_BRG3, 2},
> + {CPM_CLK_SMC1, CPM_BRG4, 3},
> + {CPM_CLK_SMC1, CPM_CLK1, 4},
> + {CPM_CLK_SMC1, CPM_CLK2, 5},
> + {CPM_CLK_SMC1, CPM_CLK3, 6},
> + {CPM_CLK_SMC1, CPM_CLK4, 7},
> +
> + {CPM_CLK_SMC2, CPM_BRG1, 0},
> + {CPM_CLK_SMC2, CPM_BRG2, 1},
> + {CPM_CLK_SMC2, CPM_BRG3, 2},
> + {CPM_CLK_SMC2, CPM_BRG4, 3},
> + {CPM_CLK_SMC2, CPM_CLK5, 4},
> + {CPM_CLK_SMC2, CPM_CLK6, 5},
> + {CPM_CLK_SMC2, CPM_CLK7, 6},
> + {CPM_CLK_SMC2, CPM_CLK8, 7},
> + };
> +
> + switch (target) {
> + case CPM_CLK_SCC1:
> + reg = &mpc8xx_immr->im_cpm.cp_sicr;
> + shift = 0;
> + break;
> +
> + case CPM_CLK_SCC2:
> + reg = &mpc8xx_immr->im_cpm.cp_sicr;
> + shift = 8;
> + break;
> +
> + case CPM_CLK_SCC3:
> + reg = &mpc8xx_immr->im_cpm.cp_sicr;
> + shift = 16;
> + break;
> +
> + case CPM_CLK_SCC4:
> + reg = &mpc8xx_immr->im_cpm.cp_sicr;
> + shift = 24;
> + break;
> +
> + case CPM_CLK_SMC1:
> + reg = &mpc8xx_immr->im_cpm.cp_simode;
> + shift = 12;
> + break;
> +
> + case CPM_CLK_SMC2:
> + reg = &mpc8xx_immr->im_cpm.cp_simode;
> + shift = 28;
> + break;
> +
> + default:
> + printk(KERN_ERR "cpm1_clock_setup: invalid clock
> target\n");
> + return -EINVAL;
> + }
> +
> + if (reg == &mpc8xx_immr->im_cpm.cp_sicr && mode ==
> CPM_CLK_RX)
> + shift += 3;
> +
> + for (i = 0; i < ARRAY_SIZE(clk_map); i++) {
> + if (clk_map[i][0] == target && clk_map[i][1] ==
> clock) {
> + bits = clk_map[i][2];
> + break;
> + }
> + }
> +
> + if (i == ARRAY_SIZE(clk_map)) {
> + printk(KERN_ERR "cpm1_clock_setup: invalid clock
> combination\n");
> + return -EINVAL;
> + }
> +
> + bits <<= shift;
> + mask <<= shift;
> + out_be32(reg, (in_be32(reg) & ~mask) | bits);
> +
> + return 0;
> +}
> diff --git a/include/asm-powerpc/commproc.h
> b/include/asm-powerpc/commproc.h index ccb32cd..a95a434 100644
> --- a/include/asm-powerpc/commproc.h
> +++ b/include/asm-powerpc/commproc.h
> @@ -692,4 +692,45 @@ extern void cpm_free_handler(int vec);
> #define IMAP_ADDR (get_immrbase())
> #define IMAP_SIZE ((uint)(64 * 1024))
>
Pull from the dts?
> +#define CPM_PIN_INPUT 0
> +#define CPM_PIN_OUTPUT 1
> +#define CPM_PIN_PRIMARY 0
> +#define CPM_PIN_SECONDARY 2
> +#define CPM_PIN_GPIO 4
> +#define CPM_PIN_OPENDRAIN 8
> +
> +void cpm1_set_pin(int port, int pin, int flags);
> +
> +enum cpm_clk_dir {
> + CPM_CLK_RX,
> + CPM_CLK_TX,
> + CPM_CLK_RTX
> +};
> +
> +enum cpm_clk_target {
> + CPM_CLK_SCC1,
> + CPM_CLK_SCC2,
> + CPM_CLK_SCC3,
> + CPM_CLK_SCC4,
> + CPM_CLK_SMC1,
> + CPM_CLK_SMC2,
> +};
> +
> +enum cpm_clk {
> + CPM_BRG1, /* Baud Rate Generator 1 */
> + CPM_BRG2, /* Baud Rate Generator 2 */
> + CPM_BRG3, /* Baud Rate Generator 3 */
> + CPM_BRG4, /* Baud Rate Generator 4 */
> + CPM_CLK1, /* Clock 1 */
> + CPM_CLK2, /* Clock 2 */
> + CPM_CLK3, /* Clock 3 */
> + CPM_CLK4, /* Clock 4 */
> + CPM_CLK5, /* Clock 5 */
> + CPM_CLK6, /* Clock 6 */
> + CPM_CLK7, /* Clock 7 */
> + CPM_CLK8, /* Clock 8 */
> +};
> +
> +int cpm1_clk_setup(enum cpm_clk_target target, int clock, int mode);
> +
> #endif /* __CPM_8XX__ */
--
Sincerely, Vitaly
^ permalink raw reply
* Re: [PATCH 7/9] 8xx: mpc885ads cleanup
From: Vitaly Bordug @ 2007-08-29 22:03 UTC (permalink / raw)
To: Scott Wood; +Cc: linuxppc-dev
In-Reply-To: <20070828201909.GH24260@ld0162-tx32.am.freescale.net>
On Tue, 28 Aug 2007 15:19:09 -0500
Scott Wood wrote:
> It now uses the new CPM binding and the generic pin/clock functions,
> and has assorted fixes and cleanup.
>
good work, thanks.
> Signed-off-by: Scott Wood <scottwood@freescale.com>
Acked-by: Vitaly Bordug <vitb@kernel.crashing.org>
> ---
> arch/powerpc/boot/dts/mpc885ads.dts | 192 ++++++-----
> arch/powerpc/configs/mpc885_ads_defconfig | 445
> +++++++++++---------------
> arch/powerpc/platforms/8xx/Kconfig | 1 +
> arch/powerpc/platforms/8xx/mpc885ads.h | 38 ---
> arch/powerpc/platforms/8xx/mpc885ads_setup.c | 455
> +++++++++----------------- 5 files changed, 455 insertions(+), 676
> deletions(-)
>
> diff --git a/arch/powerpc/boot/dts/mpc885ads.dts
> b/arch/powerpc/boot/dts/mpc885ads.dts index dc7ab9c..76c0a06 100644
> --- a/arch/powerpc/boot/dts/mpc885ads.dts
> +++ b/arch/powerpc/boot/dts/mpc885ads.dts
> @@ -2,6 +2,7 @@
> * MPC885 ADS Device Tree Source
> *
> * Copyright 2006 MontaVista Software, Inc.
> + * Copyright 2007 Freescale Semiconductor, Inc.
> *
> * 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 @@ -12,7 +13,7 @@
>
> / {
> model = "MPC885ADS";
> - compatible = "mpc8xx";
> + compatible = "fsl,mpc885ads";
> #address-cells = <1>;
> #size-cells = <1>;
>
> @@ -23,161 +24,180 @@
> PowerPC,885@0 {
> device_type = "cpu";
> reg = <0>;
> - d-cache-line-size = <20>; // 32 bytes
> - i-cache-line-size = <20>; // 32 bytes
> - d-cache-size = <2000>; // L1,
> 8K
> - i-cache-size = <2000>; // L1,
> 8K
> + d-cache-line-size = <d#16>;
> + i-cache-line-size = <d#16>;
> + d-cache-size = <d#8192>;
> + i-cache-size = <d#8192>;
> timebase-frequency = <0>;
> bus-frequency = <0>;
> clock-frequency = <0>;
> - 32-bit;
> interrupts = <f 2>; // decrementer
> interrupt
> - interrupt-parent = <&Mpc8xx_pic>;
> + interrupt-parent = <&PIC>;
> };
> };
>
> memory {
> device_type = "memory";
> - reg = <00000000 800000>;
> + reg = <0 0>;
> };
>
> - soc885@ff000000 {
> + chipselect {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + ranges;
> +
> + flash@fe000000 {
> + device_type = "rom";
> + compatible = "direct-mapped";
> + reg = <fe000000 800000>;
> + probe-type = "JEDEC";
> + bank-width = <4>;
> + };
> +
> + board-control@ff080000 {
> + reg = <ff080000 20 ff0a0300 4>;
> + compatible = "fsl,mpc885ads-bcsr";
> + };
> + };
> +
> + soc@ff000000 {
> + compatible = "fsl,mpc885", "fsl,pq1-soc";
> #address-cells = <1>;
> #size-cells = <1>;
> - #interrupt-cells = <2>;
> device_type = "soc";
> - ranges = <0 ff000000 00100000>;
> - reg = <ff000000 00000200>;
> + ranges = <0 ff000000 00004000>;
> bus-frequency = <0>;
> - mdio@e80 {
> - device_type = "mdio";
> - compatible = "fs_enet";
> - reg = <e80 8>;
> +
> + mdio@e00 {
> + compatible = "fsl,mpc885-fec-mdio",
> "fsl,pq1-fec-mdio";
> + reg = <e00 188>;
> #address-cells = <1>;
> #size-cells = <0>;
> - Phy0: ethernet-phy@0 {
> +
> + PHY0: ethernet-phy@0 {
> reg = <0>;
> device_type = "ethernet-phy";
> };
> - Phy1: ethernet-phy@1 {
> +
> + PHY1: ethernet-phy@1 {
> reg = <1>;
> device_type = "ethernet-phy";
> };
> - Phy2: ethernet-phy@2 {
> +
> + PHY2: ethernet-phy@2 {
> reg = <2>;
> device_type = "ethernet-phy";
> };
> };
>
> - fec@e00 {
> + ethernet@e00 {
> device_type = "network";
> - compatible = "fs_enet";
> - model = "FEC";
> - device-id = <1>;
> + compatible = "fsl,mpc885-fec-enet",
> + "fsl,pq1-fec-enet";
> reg = <e00 188>;
> - mac-address = [ 00 00 0C 00 01 FD ];
> + local-mac-address = [ 00 00 00 00 00 00 ];
> interrupts = <3 1>;
> - interrupt-parent = <&Mpc8xx_pic>;
> - phy-handle = <&Phy1>;
> + interrupt-parent = <&PIC>;
> + phy-handle = <&PHY0>;
> + linux,network-index = <0>;
> };
>
> - fec@1e00 {
> + ethernet@1e00 {
> device_type = "network";
> - compatible = "fs_enet";
> - model = "FEC";
> - device-id = <2>;
> + compatible = "fsl,mpc885-fec-enet",
> + "fsl,pq1-fec-enet";
> reg = <1e00 188>;
> - mac-address = [ 00 00 0C 00 02 FD ];
> + local-mac-address = [ 00 00 00 00 00 00 ];
> interrupts = <7 1>;
> - interrupt-parent = <&Mpc8xx_pic>;
> - phy-handle = <&Phy2>;
> + interrupt-parent = <&PIC>;
> + phy-handle = <&PHY1>;
> + linux,network-index = <1>;
> };
>
> - Mpc8xx_pic: pic@ff000000 {
> + PIC: interrupt-controller@0 {
> interrupt-controller;
> - #address-cells = <0>;
> #interrupt-cells = <2>;
> reg = <0 24>;
> - built-in;
> - device_type = "mpc8xx-pic";
> - compatible = "CPM";
> + compatible = "fsl,mpc885-pic", "fsl,pq1-pic";
> };
>
> - pcmcia@0080 {
> + pcmcia@80 {
> #address-cells = <3>;
> #interrupt-cells = <1>;
> #size-cells = <2>;
> compatible = "fsl,pq-pcmcia";
> device_type = "pcmcia";
> reg = <80 80>;
> - interrupt-parent = <&Mpc8xx_pic>;
> + interrupt-parent = <&PIC>;
> interrupts = <d 1>;
> };
>
> - cpm@ff000000 {
> + cpm@9c0 {
> #address-cells = <1>;
> #size-cells = <1>;
> - #interrupt-cells = <2>;
> - device_type = "cpm";
> - model = "CPM";
> - ranges = <0 0 4000>;
> - reg = <860 f0>;
> + compatible = "fsl,mpc885-cpm", "fsl,cpm1";
> command-proc = <9c0>;
> - brg-frequency = <0>;
> - interrupts = <0 2>; // cpm error
> interrupt
> - interrupt-parent = <&Cpm_pic>;
> + fsl,brg-frequency = <0>;
> + interrupts = <0>; // cpm error
> interrupt
> + interrupt-parent = <&CPM_PIC>;
> + reg = <9c0 40 2000 1c00>;
> + ranges;
>
> - Cpm_pic: pic@930 {
> + brg@9f0 {
> + compatible = "fsl,mpc885-brg",
> + "fsl,cpm1-brg",
> + "fsl,cpm-brg";
> + reg = <9f0 10>;
> + };
> +
> + CPM_PIC: interrupt-controller@930 {
> interrupt-controller;
> - #address-cells = <0>;
> - #interrupt-cells = <2>;
> + #interrupt-cells = <1>;
> interrupts = <5 2 0 2>;
> - interrupt-parent = <&Mpc8xx_pic>;
> + interrupt-parent = <&PIC>;
> reg = <930 20>;
> - built-in;
> - device_type = "cpm-pic";
> - compatible = "CPM";
> + compatible = "fsl,mpc885-cpm-pic",
> + "fsl,cpm1-pic";
> };
>
> - smc@a80 {
> + serial@a80 {
> device_type = "serial";
> - compatible = "cpm_uart";
> - model = "SMC";
> - device-id = <1>;
> + compatible = "fsl,mpc885-smc-uart",
> + "fsl,cpm1-smc-uart";
> reg = <a80 10 3e80 40>;
> - clock-setup = <00ffffff 0>;
> - rx-clock = <1>;
> - tx-clock = <1>;
> - current-speed = <0>;
> - interrupts = <4 3>;
> - interrupt-parent = <&Cpm_pic>;
> + interrupts = <4>;
> + interrupt-parent = <&CPM_PIC>;
> + fsl,cpm-brg = <1>;
> + fsl,cpm-command = <0090>;
> };
>
> - smc@a90 {
> + serial@a90 {
> device_type = "serial";
> - compatible = "cpm_uart";
> - model = "SMC";
> - device-id = <2>;
> - reg = <a90 20 3f80 40>;
> - clock-setup = <ff00ffff 90000>;
> - rx-clock = <2>;
> - tx-clock = <2>;
> - current-speed = <0>;
> - interrupts = <3 3>;
> - interrupt-parent = <&Cpm_pic>;
> + compatible = "fsl,mpc885-smc-uart",
> + "fsl,cpm1-smc-uart";
> + reg = <a90 10 3f80 40>;
> + interrupts = <3>;
> + interrupt-parent = <&CPM_PIC>;
> + fsl,cpm-brg = <2>;
> + fsl,cpm-command = <00d0>;
> };
>
> - scc@a40 {
> + ethernet@a40 {
> device_type = "network";
> - compatible = "fs_enet";
> - model = "SCC";
> - device-id = <3>;
> - reg = <a40 18 3e00 80>;
> - mac-address = [ 00 00 0C 00 03 FD ];
> - interrupts = <1c 3>;
> - interrupt-parent = <&Cpm_pic>;
> - phy-handle = <&Phy2>;
> + compatible = "fsl,mpc885-scc-enet",
> + "fsl,cpm1-scc-enet";
> + reg = <a40 18 3e00 100>;
> + local-mac-address = [ 00 00 00 00 00
> 00 ];
> + interrupts = <1c>;
> + interrupt-parent = <&CPM_PIC>;
> + phy-handle = <&PHY2>;
> + fsl,cpm-command = <0080>;
> + linux,network-index = <2>;
> };
> };
> };
> +
> + chosen {
> + linux,stdout-path = "/soc/cpm/serial@a80";
> + };
> };
> diff --git a/arch/powerpc/configs/mpc885_ads_defconfig
> b/arch/powerpc/configs/mpc885_ads_defconfig index fc4f9b7..482d99d
> 100644 --- a/arch/powerpc/configs/mpc885_ads_defconfig
> +++ b/arch/powerpc/configs/mpc885_ads_defconfig
> @@ -1,9 +1,22 @@
> #
> # Automatically generated make config: don't edit
> -# Linux kernel version: 2.6.22-rc7
> -# Sun Jul 1 23:57:01 2007
> +# Linux kernel version: 2.6.23-rc3
> +# Mon Aug 27 15:23:16 2007
> #
> # CONFIG_PPC64 is not set
> +
> +#
> +# Processor support
> +#
> +# CONFIG_6xx is not set
> +# CONFIG_PPC_85xx is not set
> +CONFIG_PPC_8xx=y
> +# CONFIG_40x is not set
> +# CONFIG_44x is not set
> +# CONFIG_E200 is not set
> +CONFIG_8xx=y
> +# CONFIG_PPC_MM_SLICES is not set
> +CONFIG_NOT_COHERENT_CACHE=y
> CONFIG_PPC32=y
> CONFIG_PPC_MERGE=y
> CONFIG_MMU=y
> @@ -14,56 +27,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
> CONFIG_GENERIC_HWEIGHT=y
> CONFIG_GENERIC_CALIBRATE_DELAY=y
> CONFIG_GENERIC_FIND_NEXT_BIT=y
> +# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
> CONFIG_PPC=y
> CONFIG_EARLY_PRINTK=y
> CONFIG_GENERIC_NVRAM=y
> CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
> CONFIG_ARCH_MAY_HAVE_PC_FDC=y
> CONFIG_PPC_OF=y
> +CONFIG_OF=y
> # CONFIG_PPC_UDBG_16550 is not set
> # CONFIG_GENERIC_TBSYNC is not set
> CONFIG_AUDIT_ARCH=y
> +CONFIG_GENERIC_BUG=y
> # CONFIG_DEFAULT_UIMAGE is not set
> -
> -#
> -# Processor support
> -#
> -# CONFIG_CLASSIC32 is not set
> -# CONFIG_PPC_82xx is not set
> -# CONFIG_PPC_83xx is not set
> -# CONFIG_PPC_85xx is not set
> -# CONFIG_PPC_86xx is not set
> -CONFIG_PPC_8xx=y
> -# CONFIG_40x is not set
> -# CONFIG_44x is not set
> -# CONFIG_E200 is not set
> -CONFIG_8xx=y
> # CONFIG_PPC_DCR_NATIVE is not set
> # CONFIG_PPC_DCR_MMIO is not set
> -# CONFIG_PPC_MM_SLICES is not set
> -CONFIG_NOT_COHERENT_CACHE=y
> CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
>
> #
> -# Code maturity level options
> +# General setup
> #
> CONFIG_EXPERIMENTAL=y
> CONFIG_BROKEN_ON_SMP=y
> CONFIG_INIT_ENV_ARG_LIMIT=32
> -
> -#
> -# General setup
> -#
> CONFIG_LOCALVERSION=""
> CONFIG_LOCALVERSION_AUTO=y
> # CONFIG_SWAP is not set
> CONFIG_SYSVIPC=y
> -# CONFIG_IPC_NS is not set
> CONFIG_SYSVIPC_SYSCTL=y
> # CONFIG_POSIX_MQUEUE is not set
> # CONFIG_BSD_PROCESS_ACCT is not set
> # CONFIG_TASKSTATS is not set
> -# CONFIG_UTS_NS is not set
> +# CONFIG_USER_NS is not set
> # CONFIG_AUDIT is not set
> # CONFIG_IKCONFIG is not set
> CONFIG_LOG_BUF_SHIFT=14
> @@ -75,52 +70,46 @@ CONFIG_SYSCTL=y
> CONFIG_EMBEDDED=y
> # CONFIG_SYSCTL_SYSCALL is not set
> CONFIG_KALLSYMS=y
> +# CONFIG_KALLSYMS_ALL is not set
> # CONFIG_KALLSYMS_EXTRA_PASS is not set
> -# CONFIG_HOTPLUG is not set
> +CONFIG_HOTPLUG=y
> CONFIG_PRINTK=y
> -# CONFIG_BUG is not set
> -CONFIG_ELF_CORE=y
> +CONFIG_BUG=y
> +# CONFIG_ELF_CORE is not set
> # CONFIG_BASE_FULL is not set
> -CONFIG_FUTEX=y
> +# CONFIG_FUTEX is not set
> CONFIG_ANON_INODES=y
> -# CONFIG_EPOLL is not set
> +CONFIG_EPOLL=y
> CONFIG_SIGNALFD=y
> CONFIG_TIMERFD=y
> CONFIG_EVENTFD=y
> CONFIG_SHMEM=y
> # CONFIG_VM_EVENT_COUNTERS is not set
> -CONFIG_SLAB=y
> -# CONFIG_SLUB is not set
> +CONFIG_SLUB_DEBUG=y
> +# CONFIG_SLAB is not set
> +CONFIG_SLUB=y
> # CONFIG_SLOB is not set
> -CONFIG_RT_MUTEXES=y
> # CONFIG_TINY_SHMEM is not set
> CONFIG_BASE_SMALL=1
> -
> -#
> -# Loadable module support
> -#
> # CONFIG_MODULES is not set
> -
> -#
> -# Block layer
> -#
> CONFIG_BLOCK=y
> # CONFIG_LBD is not set
> # CONFIG_BLK_DEV_IO_TRACE is not set
> # CONFIG_LSF is not set
> +# CONFIG_BLK_DEV_BSG is not set
>
> #
> # IO Schedulers
> #
> CONFIG_IOSCHED_NOOP=y
> -CONFIG_IOSCHED_AS=y
> +# CONFIG_IOSCHED_AS is not set
> CONFIG_IOSCHED_DEADLINE=y
> -CONFIG_IOSCHED_CFQ=y
> -CONFIG_DEFAULT_AS=y
> -# CONFIG_DEFAULT_DEADLINE is not set
> +# CONFIG_IOSCHED_CFQ is not set
> +# CONFIG_DEFAULT_AS is not set
> +CONFIG_DEFAULT_DEADLINE=y
> # CONFIG_DEFAULT_CFQ is not set
> # CONFIG_DEFAULT_NOOP is not set
> -CONFIG_DEFAULT_IOSCHED="anticipatory"
> +CONFIG_DEFAULT_IOSCHED="deadline"
>
> #
> # Platform support
> @@ -133,6 +122,7 @@ CONFIG_CPM1=y
> # CONFIG_MPC8XXFADS is not set
> # CONFIG_MPC86XADS is not set
> CONFIG_MPC885ADS=y
> +# CONFIG_PPC_EP88XC is not set
>
> #
> # Freescale Ethernet driver platform-specific options
> @@ -150,6 +140,7 @@ CONFIG_MPC8xx_SECOND_ETH_FEC2=y
> #
> CONFIG_8xx_COPYBACK=y
> # CONFIG_8xx_CPU6 is not set
> +CONFIG_8xx_CPU15=y
> CONFIG_NO_UCODE_PATCH=y
> # CONFIG_USB_SOF_UCODE_PATCH is not set
> # CONFIG_I2C_SPI_UCODE_PATCH is not set
> @@ -166,22 +157,23 @@ CONFIG_NO_UCODE_PATCH=y
> # CONFIG_GENERIC_IOMAP is not set
> # CONFIG_CPU_FREQ is not set
> # CONFIG_CPM2 is not set
> +CONFIG_PPC_CPM_NEW_BINDING=y
>
> #
> # Kernel options
> #
> # CONFIG_HIGHMEM is not set
> -# CONFIG_HZ_100 is not set
> +CONFIG_HZ_100=y
> # CONFIG_HZ_250 is not set
> # CONFIG_HZ_300 is not set
> -CONFIG_HZ_1000=y
> -CONFIG_HZ=1000
> +# CONFIG_HZ_1000 is not set
> +CONFIG_HZ=100
> CONFIG_PREEMPT_NONE=y
> # CONFIG_PREEMPT_VOLUNTARY is not set
> # CONFIG_PREEMPT is not set
> CONFIG_BINFMT_ELF=y
> # CONFIG_BINFMT_MISC is not set
> -CONFIG_MATH_EMULATION=y
> +# CONFIG_MATH_EMULATION is not set
> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
> CONFIG_ARCH_FLATMEM_ENABLE=y
> CONFIG_ARCH_POPULATES_NODE_MAP=y
> @@ -195,11 +187,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
> CONFIG_SPLIT_PTLOCK_CPUS=4
> # CONFIG_RESOURCES_64BIT is not set
> CONFIG_ZONE_DMA_FLAG=1
> -# CONFIG_PROC_DEVICETREE is not set
> +CONFIG_BOUNCE=y
> +CONFIG_VIRT_TO_BUS=y
> +CONFIG_PROC_DEVICETREE=y
> # CONFIG_CMDLINE_BOOL is not set
> # CONFIG_PM is not set
> # CONFIG_SECCOMP is not set
> -# CONFIG_WANT_DEVICE_TREE is not set
> +CONFIG_WANT_DEVICE_TREE=y
> +CONFIG_DEVICE_TREE="mpc885ads.dts"
> CONFIG_ISA_DMA_API=y
>
> #
> @@ -209,12 +204,14 @@ CONFIG_ZONE_DMA=y
> CONFIG_FSL_SOC=y
> # CONFIG_PCI is not set
> # CONFIG_PCI_DOMAINS is not set
> +# CONFIG_PCI_SYSCALL is not set
> # CONFIG_PCI_QSPAN is not set
> # CONFIG_ARCH_SUPPORTS_MSI is not set
>
> #
> # PCCARD (PCMCIA/CardBus) support
> #
> +# CONFIG_PCCARD is not set
>
> #
> # Advanced setup
> @@ -243,10 +240,6 @@ CONFIG_NET=y
> CONFIG_PACKET=y
> # CONFIG_PACKET_MMAP is not set
> CONFIG_UNIX=y
> -CONFIG_XFRM=y
> -# CONFIG_XFRM_USER is not set
> -# CONFIG_XFRM_SUB_POLICY is not set
> -# CONFIG_XFRM_MIGRATE is not set
> # CONFIG_NET_KEY is not set
> CONFIG_INET=y
> CONFIG_IP_MULTICAST=y
> @@ -266,9 +259,9 @@ CONFIG_SYN_COOKIES=y
> # CONFIG_INET_IPCOMP is not set
> # CONFIG_INET_XFRM_TUNNEL is not set
> # CONFIG_INET_TUNNEL is not set
> -CONFIG_INET_XFRM_MODE_TRANSPORT=y
> -CONFIG_INET_XFRM_MODE_TUNNEL=y
> -CONFIG_INET_XFRM_MODE_BEET=y
> +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
> +# CONFIG_INET_XFRM_MODE_TUNNEL is not set
> +# CONFIG_INET_XFRM_MODE_BEET is not set
> CONFIG_INET_DIAG=y
> CONFIG_INET_TCP_DIAG=y
> # CONFIG_TCP_CONG_ADVANCED is not set
> @@ -317,6 +310,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
> # CONFIG_MAC80211 is not set
> # CONFIG_IEEE80211 is not set
> # CONFIG_RFKILL is not set
> +# CONFIG_NET_9P is not set
>
> #
> # Device Drivers
> @@ -327,40 +321,91 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
> #
> CONFIG_STANDALONE=y
> CONFIG_PREVENT_FIRMWARE_BUILD=y
> +# CONFIG_FW_LOADER is not set
> +# CONFIG_DEBUG_DRIVER is not set
> +# CONFIG_DEBUG_DEVRES is not set
> # CONFIG_SYS_HYPERVISOR is not set
> -
> -#
> -# Connector - unified userspace <-> kernelspace linker
> -#
> # CONFIG_CONNECTOR is not set
> -# CONFIG_MTD is not set
> -
> -#
> -# Parallel port support
> -#
> +CONFIG_MTD=y
> +# CONFIG_MTD_DEBUG is not set
> +# CONFIG_MTD_CONCAT is not set
> +# CONFIG_MTD_PARTITIONS is not set
> +
> +#
> +# User Modules And Translation Layers
> +#
> +CONFIG_MTD_CHAR=y
> +CONFIG_MTD_BLKDEVS=y
> +CONFIG_MTD_BLOCK=y
> +# CONFIG_FTL is not set
> +# CONFIG_NFTL is not set
> +# CONFIG_INFTL is not set
> +# CONFIG_RFD_FTL is not set
> +# CONFIG_SSFDC is not set
> +
> +#
> +# RAM/ROM/Flash chip drivers
> +#
> +# CONFIG_MTD_CFI is not set
> +CONFIG_MTD_JEDECPROBE=y
> +CONFIG_MTD_GEN_PROBE=y
> +CONFIG_MTD_CFI_ADV_OPTIONS=y
> +CONFIG_MTD_CFI_NOSWAP=y
> +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
> +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
> +CONFIG_MTD_CFI_GEOMETRY=y
> +# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
> +# CONFIG_MTD_MAP_BANK_WIDTH_2 is not set
> +CONFIG_MTD_MAP_BANK_WIDTH_4=y
> +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
> +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
> +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
> +# CONFIG_MTD_CFI_I1 is not set
> +# CONFIG_MTD_CFI_I2 is not set
> +CONFIG_MTD_CFI_I4=y
> +# CONFIG_MTD_CFI_I8 is not set
> +# CONFIG_MTD_OTP is not set
> +# CONFIG_MTD_CFI_INTELEXT is not set
> +CONFIG_MTD_CFI_AMDSTD=y
> +# CONFIG_MTD_CFI_STAA is not set
> +CONFIG_MTD_CFI_UTIL=y
> +# CONFIG_MTD_RAM is not set
> +# CONFIG_MTD_ROM is not set
> +# CONFIG_MTD_ABSENT is not set
> +
> +#
> +# Mapping drivers for chip access
> +#
> +# CONFIG_MTD_COMPLEX_MAPPINGS is not set
> +# CONFIG_MTD_PHYSMAP is not set
> +CONFIG_MTD_PHYSMAP_OF=y
> +# CONFIG_MTD_PLATRAM is not set
> +
> +#
> +# Self-contained MTD device drivers
> +#
> +# CONFIG_MTD_SLRAM is not set
> +# CONFIG_MTD_PHRAM is not set
> +# CONFIG_MTD_MTDRAM is not set
> +# CONFIG_MTD_BLOCK2MTD is not set
> +
> +#
> +# Disk-On-Chip Device Drivers
> +#
> +# CONFIG_MTD_DOC2000 is not set
> +# CONFIG_MTD_DOC2001 is not set
> +# CONFIG_MTD_DOC2001PLUS is not set
> +# CONFIG_MTD_NAND is not set
> +# CONFIG_MTD_ONENAND is not set
> +
> +#
> +# UBI - Unsorted block images
> +#
> +# CONFIG_MTD_UBI is not set
> +CONFIG_OF_DEVICE=y
> # CONFIG_PARPORT is not set
> -
> -#
> -# Plug and Play support
> -#
> -# CONFIG_PNPACPI is not set
> -
> -#
> -# Block devices
> -#
> -# CONFIG_BLK_DEV_FD is not set
> -# CONFIG_BLK_DEV_COW_COMMON is not set
> -CONFIG_BLK_DEV_LOOP=y
> -# CONFIG_BLK_DEV_CRYPTOLOOP is not set
> -# CONFIG_BLK_DEV_NBD is not set
> -# CONFIG_BLK_DEV_RAM is not set
> -# CONFIG_CDROM_PKTCDVD is not set
> -# CONFIG_ATA_OVER_ETH is not set
> -
> -#
> -# Misc devices
> -#
> -# CONFIG_BLINK is not set
> +# CONFIG_BLK_DEV is not set
> +# CONFIG_MISC_DEVICES is not set
> # CONFIG_IDE is not set
>
> #
> @@ -368,21 +413,16 @@ CONFIG_BLK_DEV_LOOP=y
> #
> # CONFIG_RAID_ATTRS is not set
> # CONFIG_SCSI is not set
> +# CONFIG_SCSI_DMA is not set
> # CONFIG_SCSI_NETLINK is not set
> # CONFIG_ATA is not set
> -
> -#
> -# Multi-device support (RAID and LVM)
> -#
> # CONFIG_MD is not set
> # CONFIG_MACINTOSH_DRIVERS is not set
> -
> -#
> -# Network device support
> -#
> CONFIG_NETDEVICES=y
> +# CONFIG_NETDEVICES_MULTIQUEUE is not set
> # CONFIG_DUMMY is not set
> # CONFIG_BONDING is not set
> +# CONFIG_MACVLAN is not set
> # CONFIG_EQUALIZER is not set
> # CONFIG_TUN is not set
> CONFIG_PHYLIB=y
> @@ -398,21 +438,16 @@ CONFIG_DAVICOM_PHY=y
> # CONFIG_VITESSE_PHY is not set
> # CONFIG_SMSC_PHY is not set
> # CONFIG_BROADCOM_PHY is not set
> -CONFIG_FIXED_PHY=y
> -CONFIG_FIXED_MII_10_FDX=y
> -# CONFIG_FIXED_MII_100_FDX is not set
> -
> -#
> -# Ethernet (10 or 100Mbit)
> -#
> +# CONFIG_ICPLUS_PHY is not set
> +# CONFIG_FIXED_PHY is not set
> +# CONFIG_MDIO_BITBANG is not set
> CONFIG_NET_ETHERNET=y
> CONFIG_MII=y
> -# CONFIG_FEC_8XX is not set
> CONFIG_FS_ENET=y
> -CONFIG_FS_ENET_HAS_SCC=y
> +# CONFIG_FS_ENET_HAS_SCC is not set
> CONFIG_FS_ENET_HAS_FEC=y
> -CONFIG_NETDEV_1000=y
> -CONFIG_NETDEV_10000=y
> +# CONFIG_NETDEV_1000 is not set
> +# CONFIG_NETDEV_10000 is not set
>
> #
> # Wireless LAN
> @@ -426,69 +461,18 @@ CONFIG_NETDEV_10000=y
> # CONFIG_NETCONSOLE is not set
> # CONFIG_NETPOLL is not set
> # CONFIG_NET_POLL_CONTROLLER is not set
> -
> -#
> -# ISDN subsystem
> -#
> # CONFIG_ISDN is not set
> -
> -#
> -# Telephony Support
> -#
> # CONFIG_PHONE is not set
>
> #
> # Input device support
> #
> -CONFIG_INPUT=y
> -# CONFIG_INPUT_FF_MEMLESS is not set
> -# CONFIG_INPUT_POLLDEV is not set
> -
> -#
> -# Userland interfaces
> -#
> -CONFIG_INPUT_MOUSEDEV=y
> -CONFIG_INPUT_MOUSEDEV_PSAUX=y
> -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
> -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
> -# CONFIG_INPUT_JOYDEV is not set
> -# CONFIG_INPUT_TSDEV is not set
> -# CONFIG_INPUT_EVDEV is not set
> -# CONFIG_INPUT_EVBUG is not set
> -
> -#
> -# Input Device Drivers
> -#
> -CONFIG_INPUT_KEYBOARD=y
> -CONFIG_KEYBOARD_ATKBD=y
> -# CONFIG_KEYBOARD_SUNKBD is not set
> -# CONFIG_KEYBOARD_LKKBD is not set
> -# CONFIG_KEYBOARD_XTKBD is not set
> -# CONFIG_KEYBOARD_NEWTON is not set
> -# CONFIG_KEYBOARD_STOWAWAY is not set
> -CONFIG_INPUT_MOUSE=y
> -CONFIG_MOUSE_PS2=y
> -CONFIG_MOUSE_PS2_ALPS=y
> -CONFIG_MOUSE_PS2_LOGIPS2PP=y
> -CONFIG_MOUSE_PS2_SYNAPTICS=y
> -CONFIG_MOUSE_PS2_LIFEBOOK=y
> -CONFIG_MOUSE_PS2_TRACKPOINT=y
> -# CONFIG_MOUSE_PS2_TOUCHKIT is not set
> -# CONFIG_MOUSE_SERIAL is not set
> -# CONFIG_MOUSE_VSXXXAA is not set
> -# CONFIG_INPUT_JOYSTICK is not set
> -# CONFIG_INPUT_TABLET is not set
> -# CONFIG_INPUT_TOUCHSCREEN is not set
> -# CONFIG_INPUT_MISC is not set
> +# CONFIG_INPUT is not set
>
> #
> # Hardware I/O ports
> #
> -CONFIG_SERIO=y
> -CONFIG_SERIO_I8042=y
> -CONFIG_SERIO_SERPORT=y
> -CONFIG_SERIO_LIBPS2=y
> -# CONFIG_SERIO_RAW is not set
> +# CONFIG_SERIO is not set
> # CONFIG_GAMEPORT is not set
>
> #
> @@ -518,10 +502,6 @@ CONFIG_SERIAL_CPM_SMC1=y
> CONFIG_SERIAL_CPM_SMC2=y
> CONFIG_UNIX98_PTYS=y
> # CONFIG_LEGACY_PTYS is not set
> -
> -#
> -# IPMI
> -#
> # CONFIG_IPMI_HANDLER is not set
> # CONFIG_WATCHDOG is not set
> CONFIG_HW_RANDOM=y
> @@ -530,10 +510,6 @@ CONFIG_GEN_RTC=y
> # CONFIG_GEN_RTC_X is not set
> # CONFIG_R3964 is not set
> # CONFIG_RAW_DRIVER is not set
> -
> -#
> -# TPM devices
> -#
> # CONFIG_TCG_TPM is not set
> # CONFIG_I2C is not set
>
> @@ -542,21 +518,9 @@ CONFIG_GEN_RTC=y
> #
> # CONFIG_SPI is not set
> # CONFIG_SPI_MASTER is not set
> -
> -#
> -# Dallas's 1-wire bus
> -#
> # CONFIG_W1 is not set
> -CONFIG_HWMON=y
> -# CONFIG_HWMON_VID is not set
> -# CONFIG_SENSORS_ABITUGURU is not set
> -# CONFIG_SENSORS_F71805F is not set
> -# CONFIG_SENSORS_PC87427 is not set
> -# CONFIG_SENSORS_SMSC47M1 is not set
> -# CONFIG_SENSORS_SMSC47B397 is not set
> -# CONFIG_SENSORS_VT1211 is not set
> -# CONFIG_SENSORS_W83627HF is not set
> -# CONFIG_HWMON_DEBUG_CHIP is not set
> +# CONFIG_POWER_SUPPLY is not set
> +# CONFIG_HWMON is not set
>
> #
> # Multifunction device drivers
> @@ -580,6 +544,7 @@ CONFIG_DAB=y
> #
> # CONFIG_DISPLAY_SUPPORT is not set
> # CONFIG_VGASTATE is not set
> +# CONFIG_VIDEO_OUTPUT_CONTROL is not set
> # CONFIG_FB is not set
> # CONFIG_FB_IBM_GXT4500 is not set
>
> @@ -587,54 +552,10 @@ CONFIG_DAB=y
> # Sound
> #
> # CONFIG_SOUND is not set
> -
> -#
> -# HID Devices
> -#
> -CONFIG_HID=y
> -# CONFIG_HID_DEBUG is not set
> -
> -#
> -# USB support
> -#
> -# CONFIG_USB_ARCH_HAS_HCD is not set
> -# CONFIG_USB_ARCH_HAS_OHCI is not set
> -# CONFIG_USB_ARCH_HAS_EHCI is not set
> -
> -#
> -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
> -#
> -
> -#
> -# USB Gadget Support
> -#
> -# CONFIG_USB_GADGET is not set
> +# CONFIG_USB_SUPPORT is not set
> # CONFIG_MMC is not set
> -
> -#
> -# LED devices
> -#
> # CONFIG_NEW_LEDS is not set
> -
> -#
> -# LED drivers
> -#
> -
> -#
> -# LED Triggers
> -#
> -
> -#
> -# InfiniBand support
> -#
> -
> -#
> -# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
> -#
> -
> -#
> -# Real Time Clock
> -#
> +# CONFIG_EDAC is not set
> # CONFIG_RTC_CLASS is not set
>
> #
> @@ -651,21 +572,16 @@ CONFIG_HID=y
> #
>
> #
> +# Userspace I/O
> +#
> +# CONFIG_UIO is not set
> +
> +#
> # File systems
> #
> -CONFIG_EXT2_FS=y
> -CONFIG_EXT2_FS_XATTR=y
> -# CONFIG_EXT2_FS_POSIX_ACL is not set
> -# CONFIG_EXT2_FS_SECURITY is not set
> -# CONFIG_EXT2_FS_XIP is not set
> -CONFIG_EXT3_FS=y
> -CONFIG_EXT3_FS_XATTR=y
> -# CONFIG_EXT3_FS_POSIX_ACL is not set
> -# CONFIG_EXT3_FS_SECURITY is not set
> +# CONFIG_EXT2_FS is not set
> +# CONFIG_EXT3_FS is not set
> # CONFIG_EXT4DEV_FS is not set
> -CONFIG_JBD=y
> -# CONFIG_JBD_DEBUG is not set
> -CONFIG_FS_MBCACHE=y
> # CONFIG_REISERFS_FS is not set
> # CONFIG_JFS_FS is not set
> # CONFIG_FS_POSIX_ACL is not set
> @@ -674,10 +590,9 @@ CONFIG_FS_MBCACHE=y
> # CONFIG_OCFS2_FS is not set
> # CONFIG_MINIX_FS is not set
> # CONFIG_ROMFS_FS is not set
> -CONFIG_INOTIFY=y
> -CONFIG_INOTIFY_USER=y
> +# CONFIG_INOTIFY is not set
> # CONFIG_QUOTA is not set
> -CONFIG_DNOTIFY=y
> +# CONFIG_DNOTIFY is not set
> # CONFIG_AUTOFS_FS is not set
> # CONFIG_AUTOFS4_FS is not set
> # CONFIG_FUSE_FS is not set
> @@ -718,6 +633,7 @@ CONFIG_RAMFS=y
> # CONFIG_BEFS_FS is not set
> # CONFIG_BFS_FS is not set
> # CONFIG_EFS_FS is not set
> +# CONFIG_JFFS2_FS is not set
> CONFIG_CRAMFS=y
> # CONFIG_VXFS_FS is not set
> # CONFIG_HPFS_FS is not set
> @@ -747,7 +663,6 @@ CONFIG_SUNRPC=y
> # CONFIG_NCP_FS is not set
> # CONFIG_CODA_FS is not set
> # CONFIG_AFS_FS is not set
> -# CONFIG_9P_FS is not set
>
> #
> # Partition Types
> @@ -785,14 +700,13 @@ CONFIG_MSDOS_PARTITION=y
> #
> # Library routines
> #
> -CONFIG_BITREVERSE=y
> -CONFIG_CRC_CCITT=y
> +# CONFIG_CRC_CCITT is not set
> # CONFIG_CRC16 is not set
> # CONFIG_CRC_ITU_T is not set
> -CONFIG_CRC32=y
> +# CONFIG_CRC32 is not set
> +# CONFIG_CRC7 is not set
> # CONFIG_LIBCRC32C is not set
> CONFIG_ZLIB_INFLATE=y
> -CONFIG_PLIST=y
> CONFIG_HAS_IOMEM=y
> CONFIG_HAS_IOPORT=y
> CONFIG_HAS_DMA=y
> @@ -807,12 +721,33 @@ CONFIG_HAS_DMA=y
> #
> # CONFIG_PRINTK_TIME is not set
> CONFIG_ENABLE_MUST_CHECK=y
> -# CONFIG_MAGIC_SYSRQ is not set
> +CONFIG_MAGIC_SYSRQ=y
> # CONFIG_UNUSED_SYMBOLS is not set
> # CONFIG_DEBUG_FS is not set
> # CONFIG_HEADERS_CHECK is not set
> -# CONFIG_DEBUG_KERNEL is not set
> -# CONFIG_BOOTX_TEXT is not set
> +CONFIG_DEBUG_KERNEL=y
> +# CONFIG_DEBUG_SHIRQ is not set
> +CONFIG_DETECT_SOFTLOCKUP=y
> +CONFIG_SCHED_DEBUG=y
> +# CONFIG_SCHEDSTATS is not set
> +# CONFIG_TIMER_STATS is not set
> +# CONFIG_SLUB_DEBUG_ON is not set
> +# CONFIG_DEBUG_SPINLOCK is not set
> +# CONFIG_DEBUG_MUTEXES is not set
> +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
> +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
> +# CONFIG_DEBUG_KOBJECT is not set
> +CONFIG_DEBUG_BUGVERBOSE=y
> +CONFIG_DEBUG_INFO=y
> +# CONFIG_DEBUG_VM is not set
> +# CONFIG_DEBUG_LIST is not set
> +CONFIG_FORCED_INLINING=y
> +# CONFIG_FAULT_INJECTION is not set
> +# CONFIG_DEBUG_STACKOVERFLOW is not set
> +# CONFIG_DEBUG_STACK_USAGE is not set
> +# CONFIG_DEBUG_PAGEALLOC is not set
> +# CONFIG_DEBUGGER is not set
> +# CONFIG_BDI_SWITCH is not set
> # CONFIG_PPC_EARLY_DEBUG is not set
>
> #
> @@ -820,8 +755,4 @@ CONFIG_ENABLE_MUST_CHECK=y
> #
> # CONFIG_KEYS is not set
> # CONFIG_SECURITY is not set
> -
> -#
> -# Cryptographic options
> -#
> # CONFIG_CRYPTO is not set
> diff --git a/arch/powerpc/platforms/8xx/Kconfig
> b/arch/powerpc/platforms/8xx/Kconfig index b8dd515..4829378 100644
> --- a/arch/powerpc/platforms/8xx/Kconfig
> +++ b/arch/powerpc/platforms/8xx/Kconfig
> @@ -25,6 +25,7 @@ config MPC86XADS
> config MPC885ADS
> bool "MPC885ADS"
> select CPM1
> + select PPC_CPM_NEW_BINDING
> help
> Freescale Semiconductor MPC885 Application Development
> System (ADS). Also known as DUET.
> diff --git a/arch/powerpc/platforms/8xx/mpc885ads.h
> b/arch/powerpc/platforms/8xx/mpc885ads.h index a21e528..a507666 100644
> --- a/arch/powerpc/platforms/8xx/mpc885ads.h
> +++ b/arch/powerpc/platforms/8xx/mpc885ads.h
> @@ -17,25 +17,10 @@
>
> #include <sysdev/fsl_soc.h>
>
> -/* U-Boot maps BCSR to 0xff080000 */
> -#define BCSR_ADDR ((uint)0xff080000)
> -#define BCSR_SIZE ((uint)32)
> -#define BCSR0 ((uint)(BCSR_ADDR + 0x00))
> -#define BCSR1 ((uint)(BCSR_ADDR + 0x04))
> -#define BCSR2 ((uint)(BCSR_ADDR + 0x08))
> -#define BCSR3 ((uint)(BCSR_ADDR + 0x0c))
> -#define BCSR4 ((uint)(BCSR_ADDR + 0x10))
> -
> -#define CFG_PHYDEV_ADDR ((uint)0xff0a0000)
> -#define BCSR5 ((uint)(CFG_PHYDEV_ADDR +
> 0x300)) -
> #define MPC8xx_CPM_OFFSET (0x9c0)
> #define CPM_MAP_ADDR (get_immrbase() +
> MPC8xx_CPM_OFFSET) #define CPM_IRQ_OFFSET 16 //
> for compability with cpm_uart driver
> -#define PCMCIA_MEM_ADDR ((uint)0xff020000)
> -#define PCMCIA_MEM_SIZE ((uint)(64 * 1024))
> -
> /* Bits of interest in the BCSRs.
> */
> #define BCSR1_ETHEN ((uint)0x20000000)
> @@ -64,28 +49,5 @@
> #define BCSR5_MII1_EN 0x02
> #define BCSR5_MII1_RST 0x01
>
> -/* Interrupt level assignments */
> -#define PHY_INTERRUPT SIU_IRQ7 /* PHY link change
> interrupt */ -#define SIU_INT_FEC1 SIU_LEVEL1 /* FEC1
> interrupt */ -#define SIU_INT_FEC2 SIU_LEVEL3 /* FEC2
> interrupt */ -#define FEC_INTERRUPT SIU_INT_FEC1 /* FEC
> interrupt */ -
> -/* We don't use the 8259 */
> -#define NR_8259_INTS 0
> -
> -/* CPM Ethernet through SCC3 */
> -#define PA_ENET_RXD ((ushort)0x0040)
> -#define PA_ENET_TXD ((ushort)0x0080)
> -#define PE_ENET_TCLK ((uint)0x00004000)
> -#define PE_ENET_RCLK ((uint)0x00008000)
> -#define PE_ENET_TENA ((uint)0x00000010)
> -#define PC_ENET_CLSN ((ushort)0x0400)
> -#define PC_ENET_RENA ((ushort)0x0800)
> -
> -/* Control bits in the SICR to route TCLK (CLK5) and RCLK (CLK6) to
> - * SCC3. Also, make sure GR3 (bit 8) and SC3 (bit 9) are zero */
> -#define SICR_ENET_MASK ((uint)0x00ff0000)
> -#define SICR_ENET_CLKRT ((uint)0x002c0000)
> -
> #endif /* __ASM_MPC885ADS_H__ */
> #endif /* __KERNEL__ */
> diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
> b/arch/powerpc/platforms/8xx/mpc885ads_setup.c index bb54268..f205978
> 100644 --- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
> +++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
> @@ -1,11 +1,13 @@
> -/*arch/powerpc/platforms/8xx/mpc885ads_setup.c
> - *
> +/*
> * Platform setup for the Freescale mpc885ads board
> *
> * Vitaly Bordug <vbordug@ru.mvista.com>
> *
> * Copyright 2005 MontaVista Software Inc.
> *
> + * Heavily modified by Scott Wood <scottwood@freescale.com>
> + * Copyright 2007 Freescale Semiconductor, Inc.
> + *
> * This file is licensed under the terms of the GNU General Public
> License
> * version 2. This program is licensed "as is" without any warranty
> of any
> * kind, whether express or implied.
> @@ -18,7 +20,6 @@
> #include <linux/ioport.h>
> #include <linux/device.h>
> #include <linux/delay.h>
> -#include <linux/root_dev.h>
>
> #include <linux/fs_enet_pd.h>
> #include <linux/fs_uart_pd.h>
> @@ -36,32 +37,26 @@
> #include <asm/8xx_immap.h>
> #include <asm/commproc.h>
> #include <asm/fs_pd.h>
> -#include <asm/prom.h>
> +#include <asm/of_platform.h>
> +#include <asm/udbg.h>
>
> -static void init_smc1_uart_ioports(struct fs_uart_platform_info
> *fpi); -static void init_smc2_uart_ioports(struct
> fs_uart_platform_info *fpi); -static void init_scc3_ioports(struct
> fs_platform_info *ptr); +#include <sysdev/cpm_common.h>
> +#include <sysdev/commproc.h>
> +
> +static u32 __iomem *bcsr, *bcsr5;
>
> #ifdef CONFIG_PCMCIA_M8XX
> static void pcmcia_hw_setup(int slot, int enable)
> {
> - unsigned *bcsr_io;
> -
> - bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
> if (enable)
> - clrbits32(bcsr_io, BCSR1_PCCEN);
> + clrbits32(&bcsr[1], BCSR1_PCCEN);
> else
> - setbits32(bcsr_io, BCSR1_PCCEN);
> -
> - iounmap(bcsr_io);
> + setbits32(&bcsr[1], BCSR1_PCCEN);
> }
>
> static int pcmcia_set_voltage(int slot, int vcc, int vpp)
> {
> u32 reg = 0;
> - unsigned *bcsr_io;
> -
> - bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
>
> switch (vcc) {
> case 0:
> @@ -96,330 +91,200 @@ static int pcmcia_set_voltage(int slot, int
> vcc, int vpp) }
>
> /* first, turn off all power */
> - clrbits32(bcsr_io, 0x00610000);
> + clrbits32(&bcsr[1], 0x00610000);
>
> /* enable new powersettings */
> - setbits32(bcsr_io, reg);
> + setbits32(&bcsr[1], reg);
>
> - iounmap(bcsr_io);
> return 0;
> }
> #endif
>
> -void __init mpc885ads_board_setup(void)
> -{
> - cpm8xx_t *cp;
> - unsigned int *bcsr_io;
> - u8 tmpval8;
> -
> -#ifdef CONFIG_FS_ENET
> - iop8xx_t *io_port;
> -#endif
> +struct cpm_pin {
> + int port, pin, flags;
> +};
>
> - bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
> - cp = (cpm8xx_t *) immr_map(im_cpm);
> +static struct cpm_pin mpc885ads_pins[] = {
> + /* SMC1 */
> + {1, 24, CPM_PIN_INPUT}, /* RX */
> + {1, 25, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* TX */
>
> - if (bcsr_io == NULL) {
> - printk(KERN_CRIT "Could not remap BCSR\n");
> - return;
> - }
> -#ifdef CONFIG_SERIAL_CPM_SMC1
> - clrbits32(bcsr_io, BCSR1_RS232EN_1);
> - clrbits32(&cp->cp_simode, 0xe0000000 >> 17); /* brg1
> */
> - tmpval8 = in_8(&(cp->cp_smc[0].smc_smcm)) | (SMCM_RX |
> SMCM_TX);
> - out_8(&(cp->cp_smc[0].smc_smcm), tmpval8);
> - clrbits16(&cp->cp_smc[0].smc_smcmr, SMCMR_REN |
> SMCMR_TEN); /* brg1 */ -#else
> - setbits32(bcsr_io, BCSR1_RS232EN_1);
> - out_be16(&cp->cp_smc[0].smc_smcmr, 0);
> - out_8(&cp->cp_smc[0].smc_smce, 0);
> + /* SMC2 */
> +#ifndef CONFIG_MPC8xx_SECOND_ETH_FEC2
> + {4, 21, CPM_PIN_INPUT}, /* RX */
> + {4, 20, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* TX */
> #endif
>
> -#ifdef CONFIG_SERIAL_CPM_SMC2
> - clrbits32(bcsr_io, BCSR1_RS232EN_2);
> - clrbits32(&cp->cp_simode, 0xe0000000 >> 1);
> - setbits32(&cp->cp_simode, 0x20000000 >> 1); /* brg2 */
> - tmpval8 = in_8(&(cp->cp_smc[1].smc_smcm)) | (SMCM_RX |
> SMCM_TX);
> - out_8(&(cp->cp_smc[1].smc_smcm), tmpval8);
> - clrbits16(&cp->cp_smc[1].smc_smcmr, SMCMR_REN | SMCMR_TEN);
> -
> - init_smc2_uart_ioports(0);
> -#else
> - setbits32(bcsr_io, BCSR1_RS232EN_2);
> - out_be16(&cp->cp_smc[1].smc_smcmr, 0);
> - out_8(&cp->cp_smc[1].smc_smce, 0);
> -#endif
> - immr_unmap(cp);
> - iounmap(bcsr_io);
> -
> -#ifdef CONFIG_FS_ENET
> - /* use MDC for MII (common) */
> - io_port = (iop8xx_t *) immr_map(im_ioport);
> - setbits16(&io_port->iop_pdpar, 0x0080);
> - clrbits16(&io_port->iop_pddir, 0x0080);
> -
> - bcsr_io = ioremap(BCSR5, sizeof(unsigned long));
> - clrbits32(bcsr_io, BCSR5_MII1_EN);
> - clrbits32(bcsr_io, BCSR5_MII1_RST);
> -#ifndef CONFIG_FC_ENET_HAS_SCC
> - clrbits32(bcsr_io, BCSR5_MII2_EN);
> - clrbits32(bcsr_io, BCSR5_MII2_RST);
> -
> + /* SCC3 */
> + {0, 9, CPM_PIN_INPUT}, /* RX */
> + {0, 8, CPM_PIN_INPUT}, /* TX */
> + {2, 4, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_GPIO}, /*
> RENA */
> + {2, 5, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_GPIO}, /*
> CLSN */
> + {4, 27, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* TENA */
> + {4, 17, CPM_PIN_INPUT}, /* CLK5 */
> + {4, 16, CPM_PIN_INPUT}, /* CLK6 */
> +
> + /* MII1 */
> + {0, 0, CPM_PIN_INPUT},
> + {0, 1, CPM_PIN_INPUT},
> + {0, 2, CPM_PIN_INPUT},
> + {0, 3, CPM_PIN_INPUT},
> + {0, 4, CPM_PIN_OUTPUT},
> + {0, 10, CPM_PIN_OUTPUT},
> + {0, 11, CPM_PIN_OUTPUT},
> + {1, 19, CPM_PIN_INPUT},
> + {1, 31, CPM_PIN_INPUT},
> + {2, 12, CPM_PIN_INPUT},
> + {2, 13, CPM_PIN_INPUT},
> + {4, 30, CPM_PIN_OUTPUT},
> + {4, 31, CPM_PIN_OUTPUT},
> +
> + /* MII2 */
> +#ifdef CONFIG_MPC8xx_SECOND_ETH_FEC2
> + {4, 14, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
> + {4, 15, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
> + {4, 16, CPM_PIN_OUTPUT},
> + {4, 17, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
> + {4, 18, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
> + {4, 19, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
> + {4, 20, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
> + {4, 21, CPM_PIN_OUTPUT},
> + {4, 22, CPM_PIN_OUTPUT},
> + {4, 23, CPM_PIN_OUTPUT},
> + {4, 24, CPM_PIN_OUTPUT},
> + {4, 25, CPM_PIN_OUTPUT},
> + {4, 26, CPM_PIN_OUTPUT},
> + {4, 27, CPM_PIN_OUTPUT},
> + {4, 28, CPM_PIN_OUTPUT},
> + {4, 29, CPM_PIN_OUTPUT},
> #endif
> - iounmap(bcsr_io);
> - immr_unmap(io_port);
> +};
>
> -#endif
> -
> -#ifdef CONFIG_PCMCIA_M8XX
> - /*Set up board specific hook-ups */
> - m8xx_pcmcia_ops.hw_ctrl = pcmcia_hw_setup;
> - m8xx_pcmcia_ops.voltage_set = pcmcia_set_voltage;
> -#endif
> -}
> -
> -static void init_fec1_ioports(struct fs_platform_info *ptr)
> +static void __init init_ioports(void)
> {
> - cpm8xx_t *cp = (cpm8xx_t *) immr_map(im_cpm);
> - iop8xx_t *io_port = (iop8xx_t *) immr_map(im_ioport);
> -
> - /* configure FEC1 pins */
> - setbits16(&io_port->iop_papar, 0xf830);
> - setbits16(&io_port->iop_padir, 0x0830);
> - clrbits16(&io_port->iop_padir, 0xf000);
> -
> - setbits32(&cp->cp_pbpar, 0x00001001);
> - clrbits32(&cp->cp_pbdir, 0x00001001);
> + int i;
>
> - setbits16(&io_port->iop_pcpar, 0x000c);
> - clrbits16(&io_port->iop_pcdir, 0x000c);
> + for (i = 0; i < ARRAY_SIZE(mpc885ads_pins); i++) {
> + struct cpm_pin *pin = &mpc885ads_pins[i];
> + cpm1_set_pin(pin->port, pin->pin, pin->flags);
> + }
>
> - setbits32(&cp->cp_pepar, 0x00000003);
> - setbits32(&cp->cp_pedir, 0x00000003);
> - clrbits32(&cp->cp_peso, 0x00000003);
> - clrbits32(&cp->cp_cptr, 0x00000100);
> + cpm1_clk_setup(CPM_CLK_SMC1, CPM_BRG1, CPM_CLK_RTX);
> + cpm1_clk_setup(CPM_CLK_SMC2, CPM_BRG2, CPM_CLK_RTX);
> + cpm1_clk_setup(CPM_CLK_SCC3, CPM_CLK5, CPM_CLK_TX);
> + cpm1_clk_setup(CPM_CLK_SCC3, CPM_CLK6, CPM_CLK_RX);
>
> - immr_unmap(io_port);
> - immr_unmap(cp);
> + /* Set FEC1 and FEC2 to MII mode */
> + clrbits32(&mpc8xx_immr->im_cpm.cp_cptr, 0x00000180);
> }
>
> -static void init_fec2_ioports(struct fs_platform_info *ptr)
> +static void __init mpc885ads_setup_arch(void)
> {
> - cpm8xx_t *cp = (cpm8xx_t *) immr_map(im_cpm);
> - iop8xx_t *io_port = (iop8xx_t *) immr_map(im_ioport);
> -
> - /* configure FEC2 pins */
> - setbits32(&cp->cp_pepar, 0x0003fffc);
> - setbits32(&cp->cp_pedir, 0x0003fffc);
> - clrbits32(&cp->cp_peso, 0x000087fc);
> - setbits32(&cp->cp_peso, 0x00037800);
> - clrbits32(&cp->cp_cptr, 0x00000080);
> -
> - immr_unmap(io_port);
> - immr_unmap(cp);
> -}
> + struct device_node *np;
>
> -void init_fec_ioports(struct fs_platform_info *fpi)
> -{
> - int fec_no = fs_get_fec_index(fpi->fs_no);
> + cpm_reset();
> + init_ioports();
>
> - switch (fec_no) {
> - case 0:
> - init_fec1_ioports(fpi);
> - break;
> - case 1:
> - init_fec2_ioports(fpi);
> - break;
> - default:
> - printk(KERN_ERR "init_fec_ioports: invalid FEC
> number\n");
> + np = of_find_compatible_node(NULL, NULL,
> "fsl,mpc885ads-bcsr");
> + if (!np) {
> + printk(KERN_CRIT "Could not find fsl,mpc885ads-bcsr
> node\n"); return;
> }
> -}
>
> -static void init_scc3_ioports(struct fs_platform_info *fpi)
> -{
> - unsigned *bcsr_io;
> - iop8xx_t *io_port;
> - cpm8xx_t *cp;
> + bcsr = of_iomap(np, 0);
> + bcsr5 = of_iomap(np, 1);
> + of_node_put(np);
>
> - bcsr_io = ioremap(BCSR_ADDR, BCSR_SIZE);
> - io_port = (iop8xx_t *) immr_map(im_ioport);
> - cp = (cpm8xx_t *) immr_map(im_cpm);
> -
> - if (bcsr_io == NULL) {
> + if (!bcsr || !bcsr5) {
> printk(KERN_CRIT "Could not remap BCSR\n");
> return;
> }
>
> - /* Enable the PHY.
> - */
> - clrbits32(bcsr_io + 4, BCSR4_ETH10_RST);
> - udelay(1000);
> - setbits32(bcsr_io + 4, BCSR4_ETH10_RST);
> - /* Configure port A pins for Txd and Rxd.
> - */
> - setbits16(&io_port->iop_papar, PA_ENET_RXD | PA_ENET_TXD);
> - clrbits16(&io_port->iop_padir, PA_ENET_RXD | PA_ENET_TXD);
> + clrbits32(&bcsr[1], BCSR1_RS232EN_1);
> +#ifdef CONFIG_MPC8xx_SECOND_ETH_FEC2
> + setbits32(&bcsr[1], BCSR1_RS232EN_2);
> +#else
> + clrbits32(&bcsr[1], BCSR1_RS232EN_2);
> +#endif
>
> - /* Configure port C pins to enable CLSN and RENA.
> - */
> - clrbits16(&io_port->iop_pcpar, PC_ENET_CLSN | PC_ENET_RENA);
> - clrbits16(&io_port->iop_pcdir, PC_ENET_CLSN | PC_ENET_RENA);
> - setbits16(&io_port->iop_pcso, PC_ENET_CLSN | PC_ENET_RENA);
> + clrbits32(bcsr5, BCSR5_MII1_EN);
> + setbits32(bcsr5, BCSR5_MII1_RST);
> + udelay(1000);
> + clrbits32(bcsr5, BCSR5_MII1_RST);
>
> - /* Configure port E for TCLK and RCLK.
> - */
> - setbits32(&cp->cp_pepar, PE_ENET_TCLK | PE_ENET_RCLK);
> - clrbits32(&cp->cp_pepar, PE_ENET_TENA);
> - clrbits32(&cp->cp_pedir, PE_ENET_TCLK | PE_ENET_RCLK |
> PE_ENET_TENA);
> - clrbits32(&cp->cp_peso, PE_ENET_TCLK | PE_ENET_RCLK);
> - setbits32(&cp->cp_peso, PE_ENET_TENA);
> -
> - /* Configure Serial Interface clock routing.
> - * First, clear all SCC bits to zero, then set the ones we
> want.
> - */
> - clrbits32(&cp->cp_sicr, SICR_ENET_MASK);
> - setbits32(&cp->cp_sicr, SICR_ENET_CLKRT);
> +#ifdef CONFIG_MPC8xx_SECOND_ETH_FEC2
> + clrbits32(bcsr5, BCSR5_MII2_EN);
> + setbits32(bcsr5, BCSR5_MII2_RST);
> + udelay(1000);
> + clrbits32(bcsr5, BCSR5_MII2_RST);
> +#else
> + setbits32(bcsr5, BCSR5_MII2_EN);
> +#endif
>
> - /* Disable Rx and Tx. SMC1 sshould be stopped if SCC3
> eternet are used.
> - */
> - clrbits16(&cp->cp_smc[0].smc_smcmr, SMCMR_REN | SMCMR_TEN);
> - /* On the MPC885ADS SCC ethernet PHY is initialized in the
> full duplex mode
> - * by H/W setting after reset. SCC ethernet controller
> support only half duplex.
> - * This discrepancy of modes causes a lot of carrier lost
> errors.
> - */
> +#ifdef CONFIG_MPC8xx_SECOND_ETH_SCC3
> + clrbits32(&bcsr[4], BCSR4_ETH10_RST);
> + udelay(1000);
> + setbits32(&bcsr[4], BCSR4_ETH10_RST);
>
> - /* In the original SCC enet driver the following code is
> placed at
> - the end of the initialization */
> - setbits32(&cp->cp_pepar, PE_ENET_TENA);
> - clrbits32(&cp->cp_pedir, PE_ENET_TENA);
> - setbits32(&cp->cp_peso, PE_ENET_TENA);
> + setbits32(&bcsr[1], BCSR1_ETHEN);
>
> - setbits32(bcsr_io + 4, BCSR1_ETHEN);
> - iounmap(bcsr_io);
> - immr_unmap(io_port);
> - immr_unmap(cp);
> -}
> + np =
> of_find_node_by_path("/soc@ff000000/cpm@9c0/serial@a80"); +#else
> + np =
> of_find_node_by_path("/soc@ff000000/cpm@9c0/ethernet@a40"); +#endif
>
> -void init_scc_ioports(struct fs_platform_info *fpi)
> -{
> - int scc_no = fs_get_scc_index(fpi->fs_no);
> + /* The SCC3 enet registers overlap the SMC1 registers, so
> + * one of the two must be removed from the device tree.
> + */
>
> - switch (scc_no) {
> - case 2:
> - init_scc3_ioports(fpi);
> - break;
> - default:
> - printk(KERN_ERR "init_scc_ioports: invalid SCC
> number\n");
> - return;
> + if (np) {
> + of_detach_node(np);
> + of_node_put(np);
> }
> -}
> -
> -static void init_smc1_uart_ioports(struct fs_uart_platform_info *ptr)
> -{
> - unsigned *bcsr_io;
> - cpm8xx_t *cp;
> -
> - cp = (cpm8xx_t *) immr_map(im_cpm);
> - setbits32(&cp->cp_pepar, 0x000000c0);
> - clrbits32(&cp->cp_pedir, 0x000000c0);
> - clrbits32(&cp->cp_peso, 0x00000040);
> - setbits32(&cp->cp_peso, 0x00000080);
> - immr_unmap(cp);
> -
> - bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
>
> - if (bcsr_io == NULL) {
> - printk(KERN_CRIT "Could not remap BCSR1\n");
> - return;
> - }
> - clrbits32(bcsr_io, BCSR1_RS232EN_1);
> - iounmap(bcsr_io);
> +#ifdef CONFIG_PCMCIA_M8XX
> + /* Set up board specific hook-ups.*/
> + m8xx_pcmcia_ops.hw_ctrl = pcmcia_hw_setup;
> + m8xx_pcmcia_ops.voltage_set = pcmcia_set_voltage;
> +#endif
> }
>
> -static void init_smc2_uart_ioports(struct fs_uart_platform_info *fpi)
> +static int __init mpc885ads_probe(void)
> {
> - unsigned *bcsr_io;
> - cpm8xx_t *cp;
> -
> - cp = (cpm8xx_t *) immr_map(im_cpm);
> - setbits32(&cp->cp_pepar, 0x00000c00);
> - clrbits32(&cp->cp_pedir, 0x00000c00);
> - clrbits32(&cp->cp_peso, 0x00000400);
> - setbits32(&cp->cp_peso, 0x00000800);
> - immr_unmap(cp);
> -
> - bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
> -
> - if (bcsr_io == NULL) {
> - printk(KERN_CRIT "Could not remap BCSR1\n");
> - return;
> - }
> - clrbits32(bcsr_io, BCSR1_RS232EN_2);
> - iounmap(bcsr_io);
> + unsigned long root = of_get_flat_dt_root();
> + return of_flat_dt_is_compatible(root, "fsl,mpc885ads");
> }
>
> -void init_smc_ioports(struct fs_uart_platform_info *data)
> -{
> - int smc_no = fs_uart_id_fsid2smc(data->fs_no);
> -
> - switch (smc_no) {
> - case 0:
> - init_smc1_uart_ioports(data);
> - data->brg = data->clk_rx;
> - break;
> - case 1:
> - init_smc2_uart_ioports(data);
> - data->brg = data->clk_rx;
> - break;
> - default:
> - printk(KERN_ERR "init_scc_ioports: invalid SCC
> number\n");
> - return;
> - }
> -}
> +static struct of_device_id __initdata of_bus_ids[] = {
> + { .name = "soc", },
> + { .name = "cpm", },
> + { .name = "chipselect", },
> + {},
> +};
>
> -int platform_device_skip(const char *model, int id)
> +static int __init declare_of_platform_devices(void)
> {
> -#ifdef CONFIG_MPC8xx_SECOND_ETH_SCC3
> - const char *dev = "FEC";
> - int n = 2;
> -#else
> - const char *dev = "SCC";
> - int n = 3;
> -#endif
> -
> - if (!strcmp(model, dev) && n == id)
> - return 1;
> + /* Publish the QE devices */
> + if (machine_is(mpc885_ads))
> + of_platform_bus_probe(NULL, of_bus_ids, NULL);
>
> return 0;
> }
> -
> -static void __init mpc885ads_setup_arch(void)
> -{
> - cpm_reset();
> -
> - mpc885ads_board_setup();
> -
> - ROOT_DEV = Root_NFS;
> -}
> -
> -static int __init mpc885ads_probe(void)
> -{
> - char *model = of_get_flat_dt_prop(of_get_flat_dt_root(),
> - "model", NULL);
> - if (model == NULL)
> - return 0;
> - if (strcmp(model, "MPC885ADS"))
> - return 0;
> -
> - return 1;
> -}
> -
> -define_machine(mpc885_ads)
> -{
> -.name = "MPC885 ADS",.probe = mpc885ads_probe,.setup_arch =
> - mpc885ads_setup_arch,.init_IRQ =
> - m8xx_pic_init,.get_irq =
> - mpc8xx_get_irq,.restart = mpc8xx_restart,.calibrate_decr
> =
> - mpc8xx_calibrate_decr,.set_rtc_time =
> - mpc8xx_set_rtc_time,.get_rtc_time =
> mpc8xx_get_rtc_time,}; +device_initcall(declare_of_platform_devices);
> +
> +define_machine(mpc885_ads) {
> + .name = "Freescale MPC885 ADS",
> + .probe = mpc885ads_probe,
> + .setup_arch = mpc885ads_setup_arch,
> + .init_IRQ = m8xx_pic_init,
> + .get_irq = mpc8xx_get_irq,
> + .restart = mpc8xx_restart,
> + .calibrate_decr = mpc8xx_calibrate_decr,
> + .set_rtc_time = mpc8xx_set_rtc_time,
> + .get_rtc_time = mpc8xx_get_rtc_time,
> + .progress = udbg_progress,
> +};
> +
> +#ifdef CONFIG_PPC_EARLY_DEBUG_CPM
> +u32 __iomem *cpm_udbg_txdesc = (u32 __iomem __force *)0xff002808;
> +#endif
--
Sincerely, Vitaly
^ permalink raw reply
* Re: [PATCH 2/9] cpm2: Fix off-by-one error in setbrg().
From: Scott Wood @ 2007-08-30 20:13 UTC (permalink / raw)
To: Vitaly Bordug; +Cc: linuxppc-dev
In-Reply-To: <20070830020907.59052c67@localhost.localdomain>
On Thu, Aug 30, 2007 at 02:09:07AM +0400, Vitaly Bordug wrote:
> On Tue, 28 Aug 2007 15:19:21 -0500
> Scott Wood wrote:
>
> > The hardware adds one to the BRG value to get the divider, so it must
> > be subtracted by software.
>
> Prolly a note why it used to work, or what exactly this is resulting in
> the code. IIRC this was just fw-ported so arch/ppc should have this as
> well.
It *didn't* work before -- hence the fix.
The failure mode from being off by just one isn't total nonfunctionality,
but rather a corrupted character now and then, which could explain why it
wasn't fixed before.
As for arch/ppc, I'm just trying to not break it more than it already is.
-Scott
^ permalink raw reply
* Re: [PATCH 3/9] cpm2: Add SCCs to cpm2_clk_setup(), and cpm2_smc_clk_setup().
From: Scott Wood @ 2007-08-30 20:15 UTC (permalink / raw)
To: Vitaly Bordug; +Cc: linuxppc-dev
In-Reply-To: <20070830022548.6e0ce296@localhost.localdomain>
On Thu, Aug 30, 2007 at 02:25:48AM +0400, Vitaly Bordug wrote:
> I would have it in the same patch, that adds clocking stuff to 8xx.
I was trying to keep the 8xx and 82xx patchsets reasonably separate.
> And maybe in the same, segregate source rather then having it in the
> foo_common.c, to ease fix/update/rework.
I'm not sure I understand what you mean -- where do you want the code to
go?
-Scott
^ permalink raw reply
* [PATCH 3/3] mpc8349emitx(gp): update defconfigs for 2.6.23
From: Grant Likely @ 2007-08-30 20:26 UTC (permalink / raw)
To: linuxppc-dev
In-Reply-To: <20070830202618.9927.32588.stgit@trillian.cg.shawcable.net>
From: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
CC: Scott Wood <scottwood@freescale.com>
CC: Kumar Gala <galak@kernel.crashing.org>
CC: Timur Tabi <timur@freescale.com>
---
arch/powerpc/configs/mpc834x_itx_defconfig | 292 +++++++++------------
arch/powerpc/configs/mpc834x_itxgp_defconfig | 364 ++++++++++++++++----------
2 files changed, 353 insertions(+), 303 deletions(-)
diff --git a/arch/powerpc/configs/mpc834x_itx_defconfig b/arch/powerpc/configs/mpc834x_itx_defconfig
index 85470b8..20bfc1f 100644
--- a/arch/powerpc/configs/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/mpc834x_itx_defconfig
@@ -1,9 +1,25 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc7
-# Sun Jul 1 23:56:56 2007
+# Linux kernel version: 2.6.23-rc4
+# Thu Aug 30 08:47:23 2007
#
# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_83xx=y
+CONFIG_PPC_FPU=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
CONFIG_PPC32=y
CONFIG_PPC_MERGE=y
CONFIG_MMU=y
@@ -14,61 +30,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
CONFIG_PPC=y
CONFIG_EARLY_PRINTK=y
CONFIG_GENERIC_NVRAM=y
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
CONFIG_PPC_OF=y
+CONFIG_OF=y
CONFIG_PPC_UDBG_16550=y
# CONFIG_GENERIC_TBSYNC is not set
CONFIG_AUDIT_ARCH=y
CONFIG_GENERIC_BUG=y
CONFIG_DEFAULT_UIMAGE=y
-
-#
-# Processor support
-#
-# CONFIG_CLASSIC32 is not set
-# CONFIG_PPC_82xx is not set
-CONFIG_PPC_83xx=y
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_6xx=y
-CONFIG_83xx=y
-CONFIG_PPC_FPU=y
# CONFIG_PPC_DCR_NATIVE is not set
# CONFIG_PPC_DCR_MMIO is not set
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_SMP is not set
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#
-# Code maturity level options
+# General setup
#
CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
CONFIG_LOCALVERSION=""
CONFIG_LOCALVERSION_AUTO=y
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_POSIX_MQUEUE is not set
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
# CONFIG_AUDIT is not set
# CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=14
@@ -94,30 +87,24 @@ CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
CONFIG_SHMEM=y
CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
# CONFIG_SLOB is not set
CONFIG_RT_MUTEXES=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
# CONFIG_KMOD is not set
-
-#
-# Block layer
-#
CONFIG_BLOCK=y
# CONFIG_LBD is not set
# CONFIG_BLK_DEV_IO_TRACE is not set
# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
#
# IO Schedulers
@@ -135,6 +122,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
#
# Platform support
#
+# CONFIG_PPC_MULTIPLATFORM is not set
+# CONFIG_EMBEDDED6xx is not set
+# CONFIG_PPC_82xx is not set
+CONFIG_PPC_83xx=y
+# CONFIG_PPC_86xx is not set
# CONFIG_PPC_MPC52xx is not set
# CONFIG_PPC_MPC5200 is not set
# CONFIG_PPC_CELL is not set
@@ -158,6 +150,7 @@ CONFIG_MPC834x=y
# CONFIG_GENERIC_IOMAP is not set
# CONFIG_CPU_FREQ is not set
# CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
#
# Kernel options
@@ -186,12 +179,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_RESOURCES_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
CONFIG_PROC_DEVICETREE=y
# CONFIG_CMDLINE_BOOL is not set
# CONFIG_PM is not set
CONFIG_SECCOMP=y
CONFIG_WANT_DEVICE_TREE=y
-CONFIG_DEVICE_TREE=""
+CONFIG_DEVICE_TREE="mpc8349emitx.dts"
CONFIG_ISA_DMA_API=y
#
@@ -200,13 +195,14 @@ CONFIG_ISA_DMA_API=y
CONFIG_ZONE_DMA=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_PPC_INDIRECT_PCI=y
-# CONFIG_PPC_INDIRECT_PCI_BE is not set
CONFIG_FSL_SOC=y
CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
# CONFIG_PCIEPORTBUS is not set
CONFIG_ARCH_SUPPORTS_MSI=y
# CONFIG_PCI_MSI is not set
+# CONFIG_PCI_DEBUG is not set
#
# PCCARD (PCMCIA/CardBus) support
@@ -313,6 +309,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_MAC80211 is not set
# CONFIG_IEEE80211 is not set
# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
#
# Device Drivers
@@ -324,11 +321,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
# CONFIG_CONNECTOR is not set
CONFIG_MTD=y
# CONFIG_MTD_DEBUG is not set
@@ -408,20 +403,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
# UBI - Unsorted block images
#
# CONFIG_MTD_UBI is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
# CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_FD is not set
# CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -439,14 +423,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_PHANTOM is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
+# CONFIG_MISC_DEVICES is not set
CONFIG_IDE=y
CONFIG_IDE_MAX_HWIFS=4
# CONFIG_BLK_DEV_IDE is not set
@@ -458,6 +435,7 @@ CONFIG_IDE_MAX_HWIFS=4
#
# CONFIG_RAID_ATTRS is not set
CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
# CONFIG_SCSI_TGT is not set
# CONFIG_SCSI_NETLINK is not set
CONFIG_SCSI_PROC_FS=y
@@ -487,12 +465,8 @@ CONFIG_SCSI_WAIT_SCAN=m
CONFIG_SCSI_SPI_ATTRS=y
# CONFIG_SCSI_FC_ATTRS is not set
# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
# CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
# CONFIG_ISCSI_TCP is not set
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
# CONFIG_SCSI_3W_9XXX is not set
@@ -583,10 +557,6 @@ CONFIG_SATA_SIL=y
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
# CONFIG_PATA_PLATFORM is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
CONFIG_MD=y
CONFIG_BLK_DEV_MD=y
CONFIG_MD_LINEAR=y
@@ -611,19 +581,13 @@ CONFIG_MD_RAID1=y
#
# CONFIG_FIREWIRE is not set
# CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
# CONFIG_I2O is not set
# CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
# CONFIG_ARCNET is not set
@@ -640,11 +604,8 @@ CONFIG_CICADA_PHY=y
# CONFIG_VITESSE_PHY is not set
# CONFIG_SMSC_PHY is not set
# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
# CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
# CONFIG_NET_ETHERNET is not set
CONFIG_NETDEV_1000=y
# CONFIG_ACENIC is not set
@@ -657,7 +618,6 @@ CONFIG_NETDEV_1000=y
# CONFIG_SIS190 is not set
# CONFIG_SKGE is not set
# CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
# CONFIG_VIA_VELOCITY is not set
# CONFIG_TIGON3 is not set
# CONFIG_BNX2 is not set
@@ -665,14 +625,7 @@ CONFIG_GIANFAR=y
CONFIG_GFAR_NAPI=y
# CONFIG_QLA3XXX is not set
# CONFIG_ATL1 is not set
-CONFIG_NETDEV_10000=y
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_CHELSIO_T3 is not set
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_MYRI10GE is not set
-# CONFIG_NETXEN_NIC is not set
-# CONFIG_MLX4_CORE is not set
+# CONFIG_NETDEV_10000 is not set
# CONFIG_TR is not set
#
@@ -700,21 +653,34 @@ CONFIG_NETDEV_10000=y
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
#
-# ISDN subsystem
+# Input device support
#
-# CONFIG_ISDN is not set
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
#
-# Telephony Support
+# Userland interfaces
#
-# CONFIG_PHONE is not set
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
#
-# Input device support
+# Input Device Drivers
#
-# CONFIG_INPUT is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
#
# Hardware I/O ports
@@ -749,10 +715,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
# CONFIG_IPMI_HANDLER is not set
CONFIG_WATCHDOG=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -781,10 +743,6 @@ CONFIG_HW_RANDOM=y
# CONFIG_AGP is not set
# CONFIG_DRM is not set
# CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
# CONFIG_TCG_TPM is not set
CONFIG_DEVPORT=y
CONFIG_I2C=y
@@ -819,6 +777,7 @@ CONFIG_I2C_MPC=y
# CONFIG_I2C_SIS5595 is not set
# CONFIG_I2C_SIS630 is not set
# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
# CONFIG_I2C_STUB is not set
# CONFIG_I2C_TINY_USB is not set
# CONFIG_I2C_VIA is not set
@@ -830,12 +789,14 @@ CONFIG_I2C_MPC=y
#
# CONFIG_SENSORS_DS1337 is not set
# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
# CONFIG_SENSORS_EEPROM is not set
CONFIG_SENSORS_PCF8574=y
# CONFIG_SENSORS_PCA9539 is not set
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_SENSORS_M41T00 is not set
# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
@@ -845,6 +806,7 @@ CONFIG_SENSORS_PCF8574=y
# SPI support
#
CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_MASTER=y
#
@@ -858,11 +820,9 @@ CONFIG_SPI_MPC83xx=y
#
# CONFIG_SPI_AT25 is not set
# CONFIG_SPI_SPIDEV is not set
-
-#
-# Dallas's 1-wire bus
-#
+# CONFIG_SPI_TLE62X0 is not set
# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
# CONFIG_HWMON is not set
#
@@ -888,6 +848,7 @@ CONFIG_DAB=y
#
# CONFIG_DISPLAY_SUPPORT is not set
# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
# CONFIG_FB is not set
# CONFIG_FB_IBM_GXT4500 is not set
@@ -895,15 +856,23 @@ CONFIG_DAB=y
# Sound
#
# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
#
-# USB support
+# USB Input Devices
#
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB=y
-# CONFIG_USB_DEBUG is not set
+CONFIG_USB_DEBUG=y
#
# Miscellaneous USB options
@@ -918,13 +887,14 @@ CONFIG_USB_DEVICE_CLASS=y
#
CONFIG_USB_EHCI_HCD=y
# CONFIG_USB_EHCI_SPLIT_ISO is not set
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_FSL=y
# CONFIG_USB_ISP116X_HCD is not set
# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_UHCI_HCD is not set
+CONFIG_USB_UHCI_HCD=y
# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
#
# USB Device Class drivers
@@ -949,6 +919,7 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_SDDR55 is not set
# CONFIG_USB_STORAGE_JUMPSHOT is not set
# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_LIBUSUAL is not set
@@ -1001,32 +972,9 @@ CONFIG_USB_MON=y
#
# CONFIG_USB_GADGET is not set
# CONFIG_MMC is not set
-
-#
-# LED devices
-#
# CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
# CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
@@ -1053,6 +1001,7 @@ CONFIG_RTC_DRV_DS1307=y
# CONFIG_RTC_DRV_X1205 is not set
# CONFIG_RTC_DRV_PCF8563 is not set
# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
#
# SPI RTC drivers
@@ -1063,9 +1012,12 @@ CONFIG_RTC_DRV_DS1307=y
#
# Platform RTC drivers
#
+# CONFIG_RTC_DRV_CMOS is not set
# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
# CONFIG_RTC_DRV_DS1742 is not set
# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
# CONFIG_RTC_DRV_V3020 is not set
#
@@ -1085,7 +1037,12 @@ CONFIG_NET_DMA=y
#
# DMA Devices
#
-CONFIG_INTEL_IOATDMA=y
+# CONFIG_INTEL_IOATDMA is not set
+
+#
+# Userspace I/O
+#
+# CONFIG_UIO is not set
#
# File systems
@@ -1187,7 +1144,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
# CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
#
# Partition Types
@@ -1240,7 +1196,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
# CONFIG_NLS_CODEPAGE_1250 is not set
# CONFIG_NLS_CODEPAGE_1251 is not set
# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_ISO8859_1 is not set
+CONFIG_NLS_ISO8859_1=y
# CONFIG_NLS_ISO8859_2 is not set
# CONFIG_NLS_ISO8859_3 is not set
# CONFIG_NLS_ISO8859_4 is not set
@@ -1269,6 +1225,7 @@ CONFIG_BITREVERSE=y
# CONFIG_CRC16 is not set
# CONFIG_CRC_ITU_T is not set
CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
# CONFIG_LIBCRC32C is not set
CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
@@ -1283,15 +1240,37 @@ CONFIG_HAS_DMA=y
#
# Kernel hacking
#
-# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINTK_TIME=y
CONFIG_ENABLE_MUST_CHECK=y
# CONFIG_MAGIC_SYSRQ is not set
# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
+CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_BOOTX_TEXT is not set
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_FORCED_INLINING is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUGGER is not set
+# CONFIG_BDI_SWITCH is not set
# CONFIG_PPC_EARLY_DEBUG is not set
#
@@ -1299,10 +1278,6 @@ CONFIG_ENABLE_MUST_CHECK=y
#
# CONFIG_KEYS is not set
# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
CONFIG_CRYPTO=y
CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_BLKCIPHER=y
@@ -1320,7 +1295,7 @@ CONFIG_CRYPTO_MD5=y
# CONFIG_CRYPTO_GF128MUL is not set
# CONFIG_CRYPTO_ECB is not set
CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_PCBC is not set
# CONFIG_CRYPTO_LRW is not set
# CONFIG_CRYPTO_CRYPTD is not set
CONFIG_CRYPTO_DES=y
@@ -1340,7 +1315,4 @@ CONFIG_CRYPTO_DES=y
# CONFIG_CRYPTO_CRC32C is not set
# CONFIG_CRYPTO_CAMELLIA is not set
# CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO_HW is not set
diff --git a/arch/powerpc/configs/mpc834x_itxgp_defconfig b/arch/powerpc/configs/mpc834x_itxgp_defconfig
index 704ee8b..5548ebc 100644
--- a/arch/powerpc/configs/mpc834x_itxgp_defconfig
+++ b/arch/powerpc/configs/mpc834x_itxgp_defconfig
@@ -1,9 +1,25 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc7
-# Sun Jul 1 23:56:56 2007
+# Linux kernel version: 2.6.23-rc4
+# Thu Aug 30 08:47:51 2007
#
# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_83xx=y
+CONFIG_PPC_FPU=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
CONFIG_PPC32=y
CONFIG_PPC_MERGE=y
CONFIG_MMU=y
@@ -14,61 +30,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
CONFIG_PPC=y
CONFIG_EARLY_PRINTK=y
CONFIG_GENERIC_NVRAM=y
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
CONFIG_PPC_OF=y
+CONFIG_OF=y
CONFIG_PPC_UDBG_16550=y
# CONFIG_GENERIC_TBSYNC is not set
CONFIG_AUDIT_ARCH=y
CONFIG_GENERIC_BUG=y
CONFIG_DEFAULT_UIMAGE=y
-
-#
-# Processor support
-#
-# CONFIG_CLASSIC32 is not set
-# CONFIG_PPC_82xx is not set
-CONFIG_PPC_83xx=y
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_6xx=y
-CONFIG_83xx=y
-CONFIG_PPC_FPU=y
# CONFIG_PPC_DCR_NATIVE is not set
# CONFIG_PPC_DCR_MMIO is not set
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_SMP is not set
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#
-# Code maturity level options
+# General setup
#
CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
CONFIG_LOCALVERSION=""
CONFIG_LOCALVERSION_AUTO=y
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_POSIX_MQUEUE is not set
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
# CONFIG_AUDIT is not set
# CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=14
@@ -94,30 +87,24 @@ CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
CONFIG_SHMEM=y
CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
# CONFIG_SLOB is not set
CONFIG_RT_MUTEXES=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
# CONFIG_KMOD is not set
-
-#
-# Block layer
-#
CONFIG_BLOCK=y
# CONFIG_LBD is not set
# CONFIG_BLK_DEV_IO_TRACE is not set
# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
#
# IO Schedulers
@@ -135,6 +122,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
#
# Platform support
#
+# CONFIG_PPC_MULTIPLATFORM is not set
+# CONFIG_EMBEDDED6xx is not set
+# CONFIG_PPC_82xx is not set
+CONFIG_PPC_83xx=y
+# CONFIG_PPC_86xx is not set
# CONFIG_PPC_MPC52xx is not set
# CONFIG_PPC_MPC5200 is not set
# CONFIG_PPC_CELL is not set
@@ -158,6 +150,7 @@ CONFIG_MPC834x=y
# CONFIG_GENERIC_IOMAP is not set
# CONFIG_CPU_FREQ is not set
# CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
#
# Kernel options
@@ -186,12 +179,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_RESOURCES_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
CONFIG_PROC_DEVICETREE=y
# CONFIG_CMDLINE_BOOL is not set
# CONFIG_PM is not set
CONFIG_SECCOMP=y
CONFIG_WANT_DEVICE_TREE=y
-CONFIG_DEVICE_TREE=""
+CONFIG_DEVICE_TREE="mpc8349emitxgp.dts"
CONFIG_ISA_DMA_API=y
#
@@ -200,13 +195,14 @@ CONFIG_ISA_DMA_API=y
CONFIG_ZONE_DMA=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_PPC_INDIRECT_PCI=y
-# CONFIG_PPC_INDIRECT_PCI_BE is not set
CONFIG_FSL_SOC=y
CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
# CONFIG_PCIEPORTBUS is not set
CONFIG_ARCH_SUPPORTS_MSI=y
# CONFIG_PCI_MSI is not set
+# CONFIG_PCI_DEBUG is not set
#
# PCCARD (PCMCIA/CardBus) support
@@ -313,6 +309,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_MAC80211 is not set
# CONFIG_IEEE80211 is not set
# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
#
# Device Drivers
@@ -324,11 +321,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
# CONFIG_CONNECTOR is not set
CONFIG_MTD=y
# CONFIG_MTD_DEBUG is not set
@@ -408,20 +403,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
# UBI - Unsorted block images
#
# CONFIG_MTD_UBI is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
# CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_FD is not set
# CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -432,20 +416,14 @@ CONFIG_BLK_DEV_LOOP=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=32768
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_PHANTOM is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
+# CONFIG_MISC_DEVICES is not set
# CONFIG_IDE is not set
#
@@ -453,6 +431,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
#
# CONFIG_RAID_ATTRS is not set
CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
# CONFIG_SCSI_TGT is not set
# CONFIG_SCSI_NETLINK is not set
CONFIG_SCSI_PROC_FS=y
@@ -482,12 +461,8 @@ CONFIG_SCSI_WAIT_SCAN=m
CONFIG_SCSI_SPI_ATTRS=y
# CONFIG_SCSI_FC_ATTRS is not set
# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
# CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
# CONFIG_ISCSI_TCP is not set
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
# CONFIG_SCSI_3W_9XXX is not set
@@ -523,10 +498,6 @@ CONFIG_SCSI_SPI_ATTRS=y
# CONFIG_SCSI_DEBUG is not set
# CONFIG_SCSI_SRP is not set
# CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
# CONFIG_MD is not set
#
@@ -542,19 +513,13 @@ CONFIG_SCSI_SPI_ATTRS=y
#
# CONFIG_FIREWIRE is not set
# CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
# CONFIG_I2O is not set
# CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
# CONFIG_ARCNET is not set
@@ -571,11 +536,8 @@ CONFIG_CICADA_PHY=y
# CONFIG_VITESSE_PHY is not set
# CONFIG_SMSC_PHY is not set
# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
# CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
# CONFIG_NET_ETHERNET is not set
CONFIG_NETDEV_1000=y
# CONFIG_ACENIC is not set
@@ -588,7 +550,6 @@ CONFIG_NETDEV_1000=y
# CONFIG_SIS190 is not set
# CONFIG_SKGE is not set
# CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
# CONFIG_VIA_VELOCITY is not set
# CONFIG_TIGON3 is not set
# CONFIG_BNX2 is not set
@@ -596,14 +557,7 @@ CONFIG_GIANFAR=y
CONFIG_GFAR_NAPI=y
# CONFIG_QLA3XXX is not set
# CONFIG_ATL1 is not set
-CONFIG_NETDEV_10000=y
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_CHELSIO_T3 is not set
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_MYRI10GE is not set
-# CONFIG_NETXEN_NIC is not set
-# CONFIG_MLX4_CORE is not set
+# CONFIG_NETDEV_10000 is not set
# CONFIG_TR is not set
#
@@ -611,6 +565,16 @@ CONFIG_NETDEV_10000=y
#
# CONFIG_WLAN_PRE80211 is not set
# CONFIG_WLAN_80211 is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
# CONFIG_WAN is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
@@ -621,21 +585,34 @@ CONFIG_NETDEV_10000=y
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
#
-# ISDN subsystem
+# Input device support
#
-# CONFIG_ISDN is not set
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
#
-# Telephony Support
+# Userland interfaces
#
-# CONFIG_PHONE is not set
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
#
-# Input device support
+# Input Device Drivers
#
-# CONFIG_INPUT is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
#
# Hardware I/O ports
@@ -670,10 +647,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
# CONFIG_IPMI_HANDLER is not set
CONFIG_WATCHDOG=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -689,6 +662,11 @@ CONFIG_83xx_WDT=y
#
# CONFIG_PCIPCWATCHDOG is not set
# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
CONFIG_HW_RANDOM=y
# CONFIG_NVRAM is not set
# CONFIG_GEN_RTC is not set
@@ -697,10 +675,6 @@ CONFIG_HW_RANDOM=y
# CONFIG_AGP is not set
# CONFIG_DRM is not set
# CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
# CONFIG_TCG_TPM is not set
CONFIG_DEVPORT=y
CONFIG_I2C=y
@@ -735,7 +709,9 @@ CONFIG_I2C_MPC=y
# CONFIG_I2C_SIS5595 is not set
# CONFIG_I2C_SIS630 is not set
# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
# CONFIG_I2C_VIA is not set
# CONFIG_I2C_VIAPRO is not set
# CONFIG_I2C_VOODOO3 is not set
@@ -745,12 +721,14 @@ CONFIG_I2C_MPC=y
#
# CONFIG_SENSORS_DS1337 is not set
# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
# CONFIG_SENSORS_EEPROM is not set
CONFIG_SENSORS_PCF8574=y
# CONFIG_SENSORS_PCA9539 is not set
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_SENSORS_M41T00 is not set
# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
@@ -760,6 +738,7 @@ CONFIG_SENSORS_PCF8574=y
# SPI support
#
CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_MASTER=y
#
@@ -773,11 +752,9 @@ CONFIG_SPI_MPC83xx=y
#
# CONFIG_SPI_AT25 is not set
# CONFIG_SPI_SPIDEV is not set
-
-#
-# Dallas's 1-wire bus
-#
+# CONFIG_SPI_TLE62X0 is not set
# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
# CONFIG_HWMON is not set
#
@@ -791,6 +768,7 @@ CONFIG_SPI_MPC83xx=y
# CONFIG_VIDEO_DEV is not set
# CONFIG_DVB_CORE is not set
CONFIG_DAB=y
+# CONFIG_USB_DABUSB is not set
#
# Graphics support
@@ -802,6 +780,7 @@ CONFIG_DAB=y
#
# CONFIG_DISPLAY_SUPPORT is not set
# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
# CONFIG_FB is not set
# CONFIG_FB_IBM_GXT4500 is not set
@@ -809,50 +788,125 @@ CONFIG_DAB=y
# Sound
#
# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
#
-# USB support
+# USB Input Devices
#
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB is not set
+CONFIG_USB=y
+CONFIG_USB_DEBUG=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_FSL=y
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_OHCI_HCD is not set
+CONFIG_USB_UHCI_HCD=y
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
#
# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
#
#
-# USB Gadget Support
+# may also be needed; see USB_STORAGE Help for more information
#
-# CONFIG_USB_GADGET is not set
-# CONFIG_MMC is not set
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_LIBUSUAL is not set
#
-# LED devices
+# USB Imaging devices
#
-# CONFIG_NEW_LEDS is not set
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+CONFIG_USB_MON=y
#
-# LED drivers
+# USB port drivers
#
#
-# LED Triggers
+# USB Serial Converter support
#
+# CONFIG_USB_SERIAL is not set
#
-# InfiniBand support
+# USB Miscellaneous drivers
#
-# CONFIG_INFINIBAND is not set
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+# USB DSL modem support
#
#
-# Real Time Clock
+# USB Gadget Support
#
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
@@ -879,6 +933,7 @@ CONFIG_RTC_DRV_DS1307=y
# CONFIG_RTC_DRV_X1205 is not set
# CONFIG_RTC_DRV_PCF8563 is not set
# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
#
# SPI RTC drivers
@@ -889,9 +944,12 @@ CONFIG_RTC_DRV_DS1307=y
#
# Platform RTC drivers
#
+# CONFIG_RTC_DRV_CMOS is not set
# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
# CONFIG_RTC_DRV_DS1742 is not set
# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
# CONFIG_RTC_DRV_V3020 is not set
#
@@ -911,7 +969,12 @@ CONFIG_NET_DMA=y
#
# DMA Devices
#
-CONFIG_INTEL_IOATDMA=y
+# CONFIG_INTEL_IOATDMA is not set
+
+#
+# Userspace I/O
+#
+# CONFIG_UIO is not set
#
# File systems
@@ -1013,7 +1076,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
# CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
#
# Partition Types
@@ -1066,7 +1128,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
# CONFIG_NLS_CODEPAGE_1250 is not set
# CONFIG_NLS_CODEPAGE_1251 is not set
# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_ISO8859_1 is not set
+CONFIG_NLS_ISO8859_1=y
# CONFIG_NLS_ISO8859_2 is not set
# CONFIG_NLS_ISO8859_3 is not set
# CONFIG_NLS_ISO8859_4 is not set
@@ -1095,6 +1157,7 @@ CONFIG_BITREVERSE=y
# CONFIG_CRC16 is not set
# CONFIG_CRC_ITU_T is not set
CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
# CONFIG_LIBCRC32C is not set
CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
@@ -1109,15 +1172,37 @@ CONFIG_HAS_DMA=y
#
# Kernel hacking
#
-# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINTK_TIME=y
CONFIG_ENABLE_MUST_CHECK=y
# CONFIG_MAGIC_SYSRQ is not set
# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
+CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_BOOTX_TEXT is not set
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_FORCED_INLINING is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUGGER is not set
+# CONFIG_BDI_SWITCH is not set
# CONFIG_PPC_EARLY_DEBUG is not set
#
@@ -1125,10 +1210,6 @@ CONFIG_ENABLE_MUST_CHECK=y
#
# CONFIG_KEYS is not set
# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
CONFIG_CRYPTO=y
CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_BLKCIPHER=y
@@ -1146,7 +1227,7 @@ CONFIG_CRYPTO_MD5=y
# CONFIG_CRYPTO_GF128MUL is not set
# CONFIG_CRYPTO_ECB is not set
CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_PCBC is not set
# CONFIG_CRYPTO_LRW is not set
# CONFIG_CRYPTO_CRYPTD is not set
CONFIG_CRYPTO_DES=y
@@ -1166,7 +1247,4 @@ CONFIG_CRYPTO_DES=y
# CONFIG_CRYPTO_CRC32C is not set
# CONFIG_CRYPTO_CAMELLIA is not set
# CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO_HW is not set
^ permalink raw reply related
* [PATCH 1/3] bootwrapper: In cuImage, print message for ENET devices not found in tree
From: Grant Likely @ 2007-08-30 20:26 UTC (permalink / raw)
To: linuxppc-dev
From: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
CC: Scott Wood <scottwood@freescale.com>
CC: Kumar Gala <galak@kernel.crashing.org>
CC: David Gibson <david@gibson.dropbear.id.au>
---
arch/powerpc/boot/devtree.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/boot/devtree.c b/arch/powerpc/boot/devtree.c
index e1b8122..8451a1c 100644
--- a/arch/powerpc/boot/devtree.c
+++ b/arch/powerpc/boot/devtree.c
@@ -99,14 +99,14 @@ void __dt_fixup_mac_addresses(u32 startindex, ...)
while ((addr = va_arg(ap, const u8 *))) {
devp = find_node_by_prop_value(NULL, "linux,network-index",
(void*)&index, sizeof(index));
-
- printf("ENET%d: local-mac-address <-"
- " %02x:%02x:%02x:%02x:%02x:%02x\n\r", index,
- addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
-
- if (devp)
+ if (devp) {
+ printf("ENET%d: local-mac-address <-"
+ " %02x:%02x:%02x:%02x:%02x:%02x\n\r", index,
+ addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
setprop(devp, "local-mac-address", addr, 6);
-
+ } else {
+ printf("ENET%d: no device in tree\n\r", index);
+ }
index++;
}
va_end(ap);
^ permalink raw reply related
* [PATCH 2/3] mpc8349: Add linux, network-index to ethernet nodes in device tree
From: Grant Likely @ 2007-08-30 20:26 UTC (permalink / raw)
To: linuxppc-dev
In-Reply-To: <20070830202618.9927.32588.stgit@trillian.cg.shawcable.net>
From: Grant Likely <grant.likely@secretlab.ca>
cuImage need to know the logical index of the ethernet devices in order
to assign mac addresses. This patch adds the needed properties
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
CC: Scott Wood <scottwood@freescale.com>
CC: Kumar Gala <galak@kernel.crashing.org>
CC: Timur Tabi <timur@freescale.com>
---
arch/powerpc/boot/dts/mpc8349emitx.dts | 2 ++
arch/powerpc/boot/dts/mpc8349emitxgp.dts | 1 +
arch/powerpc/boot/dts/mpc834x_mds.dts | 2 ++
3 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index 502f47c..a4e2284 100644
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -141,6 +141,7 @@
interrupts = <20 8 21 8 22 8>;
interrupt-parent = < &ipic >;
phy-handle = < &phy1c >;
+ linux,network-index = <0>;
};
ethernet@25000 {
@@ -160,6 +161,7 @@
interrupts = <23 8 24 8 25 8>;
interrupt-parent = < &ipic >;
phy-handle = < &phy1f >;
+ linux,network-index = <1>;
};
serial@4500 {
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
index 0b83871..004b737 100644
--- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
@@ -116,6 +116,7 @@
interrupts = <20 8 21 8 22 8>;
interrupt-parent = < &ipic >;
phy-handle = < &phy1c >;
+ linux,network-index = <0>;
};
serial@4500 {
diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts
index 4810997..251c233 100644
--- a/arch/powerpc/boot/dts/mpc834x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc834x_mds.dts
@@ -146,6 +146,7 @@
interrupts = <20 8 21 8 22 8>;
interrupt-parent = < &ipic >;
phy-handle = < &phy0 >;
+ linux,network-index = <0>;
};
ethernet@25000 {
@@ -165,6 +166,7 @@
interrupts = <23 8 24 8 25 8>;
interrupt-parent = < &ipic >;
phy-handle = < &phy1 >;
+ linux,network-index = <1>;
};
serial@4500 {
^ permalink raw reply related
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