Bruce,
I resubmitted this request, I had given you the wrong starting point, this
should fix the merge problem
Charlie
The following changes since commit 55bf6f0b78353c34d4910bca7bfc9eed0aff5de4:
Merge branch 'standard/base' into standard/axxia/base (2014-04-01 21:11:34
-0400)
are available in the git repository at:
g...@github.com:butlerpaul/lsikernel-3.10 sab-next-1
for you to fetch changes up to a72435875d8a4b4e5d61779dd823c59fd4180921:
gpio: repairs merge comflict (2014-04-22 14:44:24 -0700)
----------------------------------------------------------------
Anders Berg (13):
i2c-axxia: Fix broken smbus block read
i2c-axxia: Adjust tLOW,tHIGH to match fast-mode requirements
arm/axxia: Workaround for cross-cluster sev issue
Revert "LSI AXM55XX: Add GENERIC_LOCKBREAK"
Revert "LSI AXM55XX: Disable use of wfe/sev in arch spinlock"
dma: lsi-dma32: DMA driver configuration update
dma: lsi-dma32: Cleanup DMA driver
mach-axxia: Split device tree into SoC/board parts
arm/axxia: Configure changes to 'GPIO driver for SPI chip selects'
arm/axxia: GPIO driver for SPI chip selects
spi: Revert to mainline spi-pl022
hwmon: Support new revision of LTC2974
i2c-axxia: Use managed functions devm_*
Charlie Paul (3):
i2c-axxia: code update kernel.org coding spec
LSI powerpc/boot: added for rapidio
i2c-axxia: Configure changes to 'Use managed functions devm_*'
David Mercado (3):
LSI FEMAC Ethernet Driver
kernel/irq/manage.c: Fix irq_set_affinity to allow use with buslocks
LSI AXM55xx: Axxia GIC driver improvements (3rd gen)
Gary McGee (2):
LSI AXXIA: fixes for VP engine quiesce and DDR shutdown
arm/axxia: improved robustness for DDR retention
John Jacques (10):
arch/arm/mach-axxia: Updated Device Tree for Emulation
arch/arm/mach-axxia: Accept the new lsi,axm5516-emu Machine
arch/arm/mach-axxia: Disable DDR Retention Resets in Sim/Emu
arch/arm/mach-axxia: Updates to the VMFS File System
LSI RapidIO: Updated Device Trees for rapidio
arch/arm/mach-axxia: Name Cleanup
arch/arm/mach-axxia: Work-Around for Event Problems in v1.0 Silicon
arch/powerpc: Update the Axxia Device Tree Files
arch/powerpc: Clean up of Compatible Names in Axxia Device Trees
LSI drivers/tty: Axxia Serial Driver Update
Jonas Svennebring (2):
ARM: 7840/1: LPAE: don't reject mapping /dev/mem above 4GB
LSI AXXIA: Basic perf support for axxia plaform block provided by LSI.
Michael Bringmann (2):
LSI AXM55xx: Configuration updates
LSI AXM55xx: Disable linkdown reset configuration.
Paul Butler (2):
i2c: comforming to changes introduced by move of_i2c to core
gpio: repairs merge comflict
SangeethaRao (2):
arch/powerpc: Checking in correct USB entries to ACP3421 DTS
LSI powerpc/sysdev: Removing the power of 2 size restriction
arch/arm/Kconfig | 7 +-
arch/arm/boot/dts/Makefile | 5 +
arch/arm/boot/dts/axm-sim.dts | 403 ----
arch/arm/boot/dts/axm-ve-tc1.dts | 363 ---
arch/arm/boot/dts/axm-ve-tc2.dts | 174 --
arch/arm/boot/dts/axm5504-cpus.dtsi | 49 +
arch/arm/boot/dts/axm5504-emu.dts | 44 +
arch/arm/boot/dts/axm5504-sim.dts | 127 +
arch/arm/boot/dts/axm5507-cpus.dtsi | 73 +
arch/arm/boot/dts/axm5507-emu.dts | 44 +
arch/arm/boot/dts/axm5508-cpus.dtsi | 81 +
arch/arm/boot/dts/axm5512-cpus.dtsi | 114 +
arch/arm/boot/dts/axm5516-amarillo.dts | 195 ++
arch/arm/boot/dts/axm5516-cpus.dtsi | 145 ++
arch/arm/boot/dts/axm5516-sim.dts | 127 +
arch/arm/boot/dts/axm55xx.dts | 464 ----
arch/arm/boot/dts/axm55xx.dtsi | 390 +++
.../boot/dts/{axm55xxemu.dts => axm55xxemu7.dts} | 17 +-
arch/arm/boot/dts/axm55xxsim.dts | 363 ---
arch/arm/boot/dts/axm55xxsim16.dts | 459 ----
arch/arm/boot/fmboot/Makefile | 12 +-
arch/arm/include/asm/spinlock.h | 9 +-
arch/arm/mach-axxia/Makefile | 6 +-
arch/arm/mach-axxia/axxia-gic.c | 1138 ++++-----
arch/arm/mach-axxia/axxia.c | 66 +-
arch/arm/mach-axxia/clock.c | 2 +-
arch/arm/mach-axxia/ddr_retention.c | 255 +-
arch/arm/mach-axxia/ddr_shutdown.c | 332 +++
arch/arm/mach-axxia/ev.c | 53 +
arch/arm/mach-axxia/ncr.c | 18 +-
arch/arm/mach-axxia/perf_event_memc.c | 130 +
arch/arm/mach-axxia/perf_event_memc.h | 62 +
arch/arm/mach-axxia/perf_event_pcx.c | 46 +
arch/arm/mach-axxia/perf_event_platform.c | 270 +++
arch/arm/mach-axxia/perf_event_platform.h | 10 +
arch/arm/mach-axxia/perf_event_vp.c | 51 +
arch/arm/mach-axxia/platsmp.c | 54 +-
arch/arm/mach-axxia/smon.c | 200 ++
arch/arm/mach-axxia/smon.h | 71 +
arch/arm/mach-axxia/ssp-gpio.c | 132 ++
arch/arm/mm/mmap.c | 10 +-
arch/powerpc/boot/dts/acp25xx.dts | 398 ++--
arch/powerpc/boot/dts/acp342x.dts | 353 +--
arch/powerpc/boot/dts/acp344x.dts | 151 +-
arch/powerpc/boot/dts/acp35xx.dts | 72 +-
arch/powerpc/boot/dts/lsi_acp342x.dts | 317 +++
arch/powerpc/boot/dts/lsi_acp344x.dts | 355 +++
arch/powerpc/platforms/44x/acpx1.c | 2 +-
arch/powerpc/sysdev/lsi_pci.c | 5 +-
drivers/dma/Kconfig | 1 +
drivers/dma/lsi-dma32.c | 527 ++--
drivers/dma/lsi-dma32.h | 41 +-
drivers/gpio/gpio-pl061.c | 2 +-
drivers/hwmon/pmbus/ltc2978.c | 5 +-
drivers/i2c/busses/acp3400-i2c.c | 3 -
drivers/i2c/busses/i2c-axxia.c | 159 +-
drivers/net/ethernet/lsi/Kconfig | 15 -
drivers/net/ethernet/lsi/lsi_acp_mdio.c | 245 +-
drivers/net/ethernet/lsi/lsi_acp_net.c | 877 ++++---
drivers/net/ethernet/lsi/lsi_acp_net.h | 273 ++-
drivers/spi/Kconfig | 7 +
drivers/spi/Makefile | 1 +
drivers/spi/spi-acp.c | 2505 ++++++++++++++++++++
drivers/spi/spi-pl022.c | 810 +++----
drivers/tty/serial/lsi_acp_serial.c | 103 +-
fs/vmfs/inode.c | 18 +-
fs/vmfs/ioctl.c | 8 +
kernel/irq/manage.c | 16 +-
68 files changed, 8721 insertions(+), 5119 deletions(-)
delete mode 100644 arch/arm/boot/dts/axm-sim.dts
delete mode 100644 arch/arm/boot/dts/axm-ve-tc1.dts
delete mode 100644 arch/arm/boot/dts/axm-ve-tc2.dts
create mode 100644 arch/arm/boot/dts/axm5504-cpus.dtsi
create mode 100644 arch/arm/boot/dts/axm5504-emu.dts
create mode 100644 arch/arm/boot/dts/axm5504-sim.dts
create mode 100644 arch/arm/boot/dts/axm5507-cpus.dtsi
create mode 100644 arch/arm/boot/dts/axm5507-emu.dts
create mode 100644 arch/arm/boot/dts/axm5508-cpus.dtsi
create mode 100644 arch/arm/boot/dts/axm5512-cpus.dtsi
create mode 100644 arch/arm/boot/dts/axm5516-amarillo.dts
create mode 100644 arch/arm/boot/dts/axm5516-cpus.dtsi
create mode 100644 arch/arm/boot/dts/axm5516-sim.dts
delete mode 100644 arch/arm/boot/dts/axm55xx.dts
create mode 100644 arch/arm/boot/dts/axm55xx.dtsi
rename arch/arm/boot/dts/{axm55xxemu.dts => axm55xxemu7.dts} (90%)
delete mode 100644 arch/arm/boot/dts/axm55xxsim.dts
delete mode 100644 arch/arm/boot/dts/axm55xxsim16.dts
create mode 100644 arch/arm/mach-axxia/ddr_shutdown.c
create mode 100644 arch/arm/mach-axxia/ev.c
create mode 100644 arch/arm/mach-axxia/perf_event_memc.c
create mode 100644 arch/arm/mach-axxia/perf_event_memc.h
create mode 100644 arch/arm/mach-axxia/perf_event_pcx.c
create mode 100644 arch/arm/mach-axxia/perf_event_platform.c
create mode 100644 arch/arm/mach-axxia/perf_event_platform.h
create mode 100644 arch/arm/mach-axxia/perf_event_vp.c
create mode 100644 arch/arm/mach-axxia/smon.c
create mode 100644 arch/arm/mach-axxia/smon.h
create mode 100644 arch/arm/mach-axxia/ssp-gpio.c
create mode 100644 arch/powerpc/boot/dts/lsi_acp342x.dts
create mode 100644 arch/powerpc/boot/dts/lsi_acp344x.dts
create mode 100644 drivers/spi/spi-acp.c
--
_______________________________________________
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
