-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/…
…benh/powerpc
Pull powerpc updates from Benjamin Herrenschmidt:
"Notable highlights:
- iommu improvements from Anton removing the per-iommu global lock in
favor of dividing the DMA space into pools, each with its own lock,
and hashed on the CPU number. Along with making the locking more
fine grained, this gives significant improvements in multiqueue
networking scalability.
- Still from Anton, we know provide a vdso based variant of getcpu
which makes sched_getcpu with the appropriate glibc patch something
like 18 times faster.
- More anton goodness (he's been busy !) in other areas such as a
faster __clear_user and copy_page on P7, various perf fixes to
improve sampling quality, etc...
- One more step toward removing legacy i2c interfaces by using new
device-tree based probing of platform devices for the AOA audio
drivers
- A nice series of patches from Michael Neuling that helps avoiding
confusion between register numbers and litterals in assembly code,
trying to enforce the use of "%rN" register names in gas rather
than plain numbers.
- A pile of FSL updates
- The usual bunch of small fixes, cleanups etc...
You may spot a change to drivers/char/mem. The patch got no comment
or ack from outside, it's a trivial patch to allow the architecture to
skip creating /dev/port, which we use to disable it on ppc64 that
don't have a legacy brige. On those, IO ports 0...64K are not mapped
in kernel space at all, so accesses to /dev/port cause oopses (and
yes, distros -still- ship userspace that bangs hard coded ports such
as kbdrate)."
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (106 commits)
powerpc/mpic: Create a revmap with enough entries for IPIs and timers
Remove stale .rej file
powerpc/iommu: Fix iommu pool initialization
powerpc/eeh: Check handle_eeh_events() return value
powerpc/85xx: Add phy nodes in SGMII mode for MPC8536/44/72DS & P2020DS
powerpc/e500: add paravirt QEMU platform
powerpc/mpc85xx_ds: convert to unified PCI init
powerpc/fsl-pci: get PCI init out of board files
powerpc/85xx: Update corenet64_smp_defconfig
powerpc/85xx: Update corenet32_smp_defconfig
powerpc/85xx: Rename P1021RDB-PC device trees to be consistent
powerpc/watchdog: move booke watchdog param related code to setup-common.c
sound/aoa: Adapt to new i2c probing scheme
i2c/powermac: Improve detection of devices from device-tree
powerpc: Disable /dev/port interface on systems without an ISA bridge
of: Improve prom_update_property() function
powerpc: Add "memory" attribute for mfmsr()
powerpc/ftrace: Fix assembly trampoline register usage
powerpc/hw_breakpoints: Fix incorrect pointer access
powerpc: Put the gpr save/restore functions in their own section
...- Loading branch information
Showing
163 changed files
with
4,611 additions
and
3,008 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * BSC9131 RDB Device Tree Source | ||
| * | ||
| * Copyright 2011-2012 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 | ||
| * Free Software Foundation; either version 2 of the License, or (at your | ||
| * option) any later version. | ||
| */ | ||
|
|
||
| /include/ "fsl/bsc9131si-pre.dtsi" | ||
|
|
||
| / { | ||
| model = "fsl,bsc9131rdb"; | ||
| compatible = "fsl,bsc9131rdb"; | ||
|
|
||
| memory { | ||
| device_type = "memory"; | ||
| }; | ||
|
|
||
| board_ifc: ifc: ifc@ff71e000 { | ||
| /* NAND Flash on board */ | ||
| ranges = <0x0 0x0 0x0 0xff800000 0x00004000>; | ||
| reg = <0x0 0xff71e000 0x0 0x2000>; | ||
| }; | ||
|
|
||
| board_soc: soc: soc@ff700000 { | ||
| ranges = <0x0 0x0 0xff700000 0x100000>; | ||
| }; | ||
| }; | ||
|
|
||
| /include/ "bsc9131rdb.dtsi" | ||
| /include/ "fsl/bsc9131si-post.dtsi" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| /* | ||
| * BSC9131 RDB Device Tree Source stub (no addresses or top-level ranges) | ||
| * | ||
| * Copyright 2011-2012 Freescale Semiconductor Inc. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are met: | ||
| * * Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * * Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * * Neither the name of Freescale Semiconductor nor the | ||
| * names of its contributors may be used to endorse or promote products | ||
| * derived from this software without specific prior written permission. | ||
| * | ||
| * | ||
| * ALTERNATIVELY, this software may be distributed under the terms of the | ||
| * GNU General Public License ("GPL") as published by the Free Software | ||
| * Foundation, either version 2 of that License or (at your option) any | ||
| * later version. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY | ||
| * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
| * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY | ||
| * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
| * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
| * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| &board_ifc { | ||
|
|
||
| nand@0,0 { | ||
| #address-cells = <1>; | ||
| #size-cells = <1>; | ||
| compatible = "fsl,ifc-nand"; | ||
| reg = <0x0 0x0 0x4000>; | ||
|
|
||
| partition@0 { | ||
| /* This location must not be altered */ | ||
| /* 3MB for u-boot Bootloader Image */ | ||
| reg = <0x0 0x00300000>; | ||
| label = "NAND U-Boot Image"; | ||
| read-only; | ||
| }; | ||
|
|
||
| partition@300000 { | ||
| /* 1MB for DTB Image */ | ||
| reg = <0x00300000 0x00100000>; | ||
| label = "NAND DTB Image"; | ||
| }; | ||
|
|
||
| partition@400000 { | ||
| /* 8MB for Linux Kernel Image */ | ||
| reg = <0x00400000 0x00800000>; | ||
| label = "NAND Linux Kernel Image"; | ||
| }; | ||
|
|
||
| partition@c00000 { | ||
| /* Rest space for Root file System Image */ | ||
| reg = <0x00c00000 0x07400000>; | ||
| label = "NAND RFS Image"; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &board_soc { | ||
| /* BSC9131RDB does not have any device on i2c@3100 */ | ||
| i2c@3100 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| spi@7000 { | ||
| flash@0 { | ||
| #address-cells = <1>; | ||
| #size-cells = <1>; | ||
| compatible = "spansion,s25sl12801"; | ||
| reg = <0>; | ||
| spi-max-frequency = <50000000>; | ||
|
|
||
| /* 512KB for u-boot Bootloader Image */ | ||
| partition@0 { | ||
| reg = <0x0 0x00080000>; | ||
| label = "SPI Flash U-Boot Image"; | ||
| read-only; | ||
| }; | ||
|
|
||
| /* 512KB for DTB Image */ | ||
| partition@80000 { | ||
| reg = <0x00080000 0x00080000>; | ||
| label = "SPI Flash DTB Image"; | ||
| }; | ||
|
|
||
| /* 4MB for Linux Kernel Image */ | ||
| partition@100000 { | ||
| reg = <0x00100000 0x00400000>; | ||
| label = "SPI Flash Kernel Image"; | ||
| }; | ||
|
|
||
| /*11MB for RFS Image */ | ||
| partition@500000 { | ||
| reg = <0x00500000 0x00B00000>; | ||
| label = "SPI Flash RFS Image"; | ||
| }; | ||
|
|
||
| }; | ||
| }; | ||
|
|
||
| usb@22000 { | ||
| phy_type = "ulpi"; | ||
| }; | ||
|
|
||
| mdio@24000 { | ||
| phy0: ethernet-phy@0 { | ||
| interrupts = <3 1 0 0>; | ||
| reg = <0x0>; | ||
| }; | ||
|
|
||
| phy1: ethernet-phy@1 { | ||
| interrupts = <2 1 0 0>; | ||
| reg = <0x3>; | ||
| }; | ||
| }; | ||
|
|
||
| sdhci@2e000 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| enet0: ethernet@b0000 { | ||
| phy-handle = <&phy0>; | ||
| phy-connection-type = "rgmii-id"; | ||
| }; | ||
|
|
||
| enet1: ethernet@b1000 { | ||
| phy-handle = <&phy1>; | ||
| phy-connection-type = "rgmii-id"; | ||
| }; | ||
| }; |
Oops, something went wrong.