On Mon, Nov 25, 2013 at 03:03:47PM -0500, Bruce Ashfield wrote: > On 13-11-19 11:22 PM, Paul Butler wrote: > >This series replaces the previous xx/94 series. > >I've removed the defconfig patches and the > >meta branch cfg/scc patches will be coming soon. > >Some of the patches may still contain some dead code, > >but it is cleaned up in a later patch in the series. > >Commit message improvements and other code touch-ups as suggested. > > It is also useful to do a overall diffstat in the 0/N message, so at > a glance I can see if the series is straying outside of where it > should touch within the kernel source tree. > > This looks better, but there was a comment on patch 19/78, with > no response. Is the entire driver directory something we can > drop in favour of the already in-tree variant ? > > Without the .scc/.cfg files I can't do my own builds, so I'll have > to take your word that it isn't broken :) > > That being said, this looks pretty good for an initial merge, and > then we need to work on updating this to newer kernels, and eventually > a plan to get some parts into mainline. I just need an answer to the > driver question and I'll proceed with some test merges. > > Cheers, > > Bruce >
I have added the 2 new patches and also scrubbed more dead code. The scrubbing of dead code propagated through several patches. Sending a new pull-request. I think I have covered all the issues now. -paul The following changes since commit 9e65874ad3fa6efd7db2e18e91e7246954b60cc5: Merge branch 'standard/base' into standard/axxia/base (2013-08-28 16:49:51 -0400) are available in the git repository at: https://github.com/butlerpaul/lsikernel.git standard/axxia/base for you to fetch changes up to 14d45f528accd9e27be8543e67c544bda4cac56a: drivers/i2c: removes obsolete driver (2013-11-26 08:34:01 -0600) > > > >---------------------------------------------------------------- > > > >The following changes since commit 9e65874ad3fa6efd7db2e18e91e7246954b60cc5: > > > > Merge branch 'standard/base' into standard/axxia/base (2013-08-28 > > 16:49:51 -0400) > > > >are available in the git repository at: > > > > https://github.com/butlerpaul/lsikernel.git standard/axxia/base > >and > > https://github.com/butlerpaul/lsikernel.git standard/preempt-rt/axxia/base > > > >for you to fetch changes up to d139ce041a2470e6c73dbfb48e977a30b28fd5f9: > > > > arm/mach-axxia: The offset was not being passed to __arm_ioremap_pfn! > > (2013-11-19 21:12:24 -0600) > > > >---------------------------------------------------------------- > > > >Anders Berg (9): > > drivers/dma: Corrected IRQ line mixup. > > arm/dts: Added device tree nodes for I2C controllers. > > drivers/i2c: New I2C bus driver > > drivers/i2c: Corrected WAIT_TIMER timeout calculation. > > drivers/i2c: Use 'bus' property from device tree. > > usb: Enable dma transfers in ehci-ci13612 > > usb: Cleanup USB host controller driver ehci-ci13612 > > arm/mach-axxia: Added L3 cache init function > > usb: ehci-ci13612: Halt controller before reset > > > >David Mercado (8): > > LSI axm55xx: Add CPU Hotplug support > > arch/powerpc: Fix PMU interrupts > > arm/mach-axxia: Fix irq_set_type() in arch/arm/mach-axxia/axxia-gic.c > > drivers/net/ethernet: add ACP wrapper support for LSI RTE into kernel > > arm/mach-axxia: fix error with IRQ type setting at startup > > drivers/net/ethernet: combined arm and powerpc FEMAC ethernet driver > > arm/mach-axxia: filled in stub axxia_restart function > > drivers: Fix Device Tree "compatible" fields > > > >Gary McGee (1): > > arm/mach-axxia: support for Axxia DDR retention > > > >Jay Jayatheerthan (1): > > drivers/net/ethernet: Fix clause 45 MDIO access. > > > >John Jacques (40): > > arm/boot/dts: Change the timer interrupt numbers to match the new > > simulator. > > arch/powerpc: Release the lock when ncr_read() completes. > > arch/powerpc: Aded wrappers for platform device > > registration/deregistration. > > powerpc/dts: Device tree files for the LSI boards. > > arm: AXM5516 emulation bringup boot > > arm: AXM5516 emulation bringup mach-axxia > > drivers/tty: AXM5516 emulation bringup - amba-pl011.c > > drivers/net: AXM5516 emulation bringup - lsi_acp_mdio.c > > drivers/net: AXM5516 emulation bringup - lsi_acp_net.c > > drivers/net: AXM5516 emulation bringup - Makefile > > drivers/net/ethernet: Wrapper Cleanup > > drivers/tty: Handle baud rate changes. The initial port only ran at > > 115200. > > arm/boot/dts: The device tree for AXM5516 emulation. > > arm/boot/dts: The device tree for Amarillo. > > drivers/tty: Hard code the baud rate divisors for now. > > arm/mach-axxia: Remove debug printk(). > > drivers/tty: Handle the baud rate correctly, and use the PLLs provided > > by U-Boot to set up the clocks. > > arm/boot/dts: Reserve memory from 0 to 4M (for U-Boot). > > arm/mach-axxia: Wait a bit more gently when in the pen. > > arm/mach-axxia: Clean up the sequence of starting other cores. > > arm/boot/dts: Added phy-link, and changed the default phy address to > > 0x1e. > > drivers/net: Added debug code. > > arm/include: A clean up of the femac code. > > drivers/net: The work around for Amarillo needs to be done the first > > time as well! > > drivers/net/ethernet: Use ntohl() instead of #defines and swab32(). > > drivers/spi: Don't check for the, no longer used, enabled property. > > arch/arm/mach-axxia: add support for SPI flash > > arm-powerpc-drivers: Add the necessary wrappers to all architectures. > > arm/mach-axxia: PCIe support. > > arm-powerpc-drivers: Rearrange the location of the wrapper functions > > drivers/net/ethernet: Remove the Amarillo networking work-around by > > default. > > arch: LSI Axxia systems use a config ring to access parts of the > > hardware. > > drivers/misc: System memory monitoring for AXM55xx. > > drivers/misc: Add a parameter to the smmon module, log. > > drivers/misc: lsi-smmon - Mask unmonitored bits in the interrupt mask > > register > > arm/mach-axxia: L3 Cache is not available in simulation! > > arm/mach-axxia: Add dummy versions of the mdio access functions > > drivers/ethernet: Set the watermark correctly in emulation > > powerpc/dts: adds support for acp35xx emulation > > arm/mach-axxia: The offset was not being passed to __arm_ioremap_pfn! > > > >Michael Bringmann (5): > > drivers/i2c: Collapse AI2C driver implementation - removing ai2c_dev > > drivers/i2c: Collapse AI2C driver implementation - removing ai2c_* > > drivers/i2c: Collapse AI2C driver implementation - removing ai2c/regs > > drivers/i2c: Collapse AI2C driver implementation mods > > drivers/i2c: Collapse AI2C driver implementation - adding i2c_regs > > > >Niraj Desai (1): > > drivers/usb: LSI AXM5500 USB driver support > > > >Paul Butler (5): > > powerpc/configs: remove elpaso defconfig > > Support for the new BCM 5221 phy - acp_mdio > > drivers/misc: adding MTC to dts > > drivers/net: adding ifdef for Amarillo, without the auto-negotiate > > ecn. > > arm/dts: whitespace cleanup axm55xx.dts > > > >SangeethaRao (7): > > arm/mach-axxia: Updated such that GFP_DMA mask is correctly set to 32 > > bits for AXM55xx > > drivers/usb: USB driver changes for AXM55xx > > arm/mach-axxia: Updated PCIe driver since it had incorrect PEI log > > info > > arm/mach-axxia: Fixed type1 PCIe enumeration issue > > drivers/usb: USB driver changes to improve performance on AXM55xx. > > drivers/net: FEMAC hprot register wasn't being set to uncached mode > > usb: Added check to confirm that USB controller is stopped before > > trying to reset it > > > >wwang22 (1): > > drivers/misc: Disabled debug message in MTC driver > > > > arch/arm/Kconfig | 1 + > > arch/arm/Makefile | 4 + > > arch/arm/boot/compressed/head.S | 63 +- > > arch/arm/boot/dts/axm55xx.dts | 391 ++-- > > arch/arm/boot/dts/axm55xxemu.dts | 202 ++ > > arch/arm/boot/dts/axm55xxsim.dts | 6 +- > > arch/arm/boot/emuboot/Makefile | 10 +- > > arch/arm/boot/emuboot/emuboot.S | 27 +- > > arch/arm/boot/emuboot/emuboot.lds | 4 +- > > arch/arm/include/asm/lsi/acp_ncr.h | 3 + > > arch/arm/kernel/head.S | 8 + > > arch/arm/mach-axxia/Kconfig | 3 + > > arch/arm/mach-axxia/Makefile | 4 +- > > arch/arm/mach-axxia/axxia-gic.c | 120 +- > > arch/arm/mach-axxia/axxia.c | 92 +- > > arch/arm/mach-axxia/clock.c | 97 + > > arch/arm/mach-axxia/ddr_retention.c | 282 +++ > > arch/arm/mach-axxia/headsmp.S | 30 +- > > arch/arm/mach-axxia/hotplug.c | 52 +- > > arch/arm/mach-axxia/include/mach/debug-macro.S | 34 +- > > arch/arm/mach-axxia/io.c | 2 +- > > arch/arm/mach-axxia/pci.c | 6 +- > > arch/arm/mach-axxia/platsmp.c | 121 +- > > arch/arm/mach-axxia/wrappers.c | 176 ++ > > arch/powerpc/boot/dts/acp25xx.dts | 309 +++ > > arch/powerpc/boot/dts/acp342x.dts | 309 +++ > > arch/powerpc/boot/dts/acp344x.dts | 309 +++ > > arch/powerpc/boot/dts/acp35xx.dts | 406 ++++ > > arch/powerpc/configs/elpaso_defconfig | 2138 > > ------------------- > > arch/powerpc/include/asm/lsi/acp_ncr.h | 42 - > > arch/powerpc/perf/core-lsi-acp.c | 115 +- > > arch/powerpc/perf/ppc476-pmu.c | 59 - > > arch/powerpc/sysdev/Kconfig | 2 +- > > arch/powerpc/sysdev/Makefile | 4 +- > > arch/powerpc/sysdev/lsi_acp_ncr.c | 375 ---- > > arch/powerpc/sysdev/lsi_acp_wrappers.c | 132 ++ > > arch/powerpc/sysdev/lsi_pci.c | 2 +- > > drivers/dma/lsi-dma32.c | 25 +- > > drivers/dma/lsi-dma32.h | 5 + > > drivers/i2c/busses/Makefile | 2 +- > > drivers/i2c/busses/ai2c/Makefile | 5 +- > > drivers/i2c/busses/ai2c/ai2c_bus.h | 881 +++++++- > > drivers/i2c/busses/ai2c/ai2c_bus_axm5500.c | 5 +- > > drivers/i2c/busses/ai2c/ai2c_dev.h | 228 --- > > drivers/i2c/busses/ai2c/ai2c_dev_clock.c | 493 ----- > > drivers/i2c/busses/ai2c/ai2c_dev_clock_ext.h | 41 - > > drivers/i2c/busses/ai2c/ai2c_i2c_regs.h | 2165 > > ++++++++++++++++++++ > > drivers/i2c/busses/ai2c/ai2c_mod.c | 1267 +++++++++++- > > drivers/i2c/busses/ai2c/ai2c_plat.c | 758 ------- > > drivers/i2c/busses/ai2c/ai2c_plat.h | 336 --- > > drivers/i2c/busses/ai2c/ai2c_sal.c | 109 - > > drivers/i2c/busses/ai2c/ai2c_sal.h | 393 ---- > > drivers/i2c/busses/ai2c/ai2c_types.h | 118 -- > > drivers/i2c/busses/ai2c/regs/ai2c_axi_timer_regs.h | 202 -- > > .../busses/ai2c/regs/ai2c_cfg_node_reg_defines.h | 39 - > > drivers/i2c/busses/ai2c/regs/ai2c_cfg_node_regs.h | 146 -- > > drivers/i2c/busses/ai2c/regs/ai2c_i2c_regs.h | 1797 ---------------- > > drivers/i2c/busses/ai2c/regs/ai2c_regions.h | 81 - > > drivers/i2c/busses/i2c-axxia.c | 589 ++++++ > > drivers/misc/Kconfig | 12 + > > drivers/misc/Makefile | 2 + > > drivers/misc/lsi-mtc.c | 1374 ++++++------- > > drivers/misc/lsi-ncr.c | 423 ++++ > > drivers/misc/lsi-ncr.h | 42 + > > drivers/misc/lsi-smmon.c | 303 +++ > > drivers/net/ethernet/lsi/Makefile | 1 + > > drivers/net/ethernet/lsi/lsi_acp_mdio.c | 326 +++ > > drivers/net/ethernet/lsi/lsi_acp_net.c | 386 ++-- > > drivers/net/ethernet/lsi/lsi_acp_net.h | 72 +- > > drivers/spi/spi-pl022.c | 42 +- > > drivers/tty/serial/amba-pl011.c | 36 +- > > drivers/tty/serial/lsi_acp_serial.c | 2 - > > drivers/usb/host/Kconfig | 8 +- > > drivers/usb/host/ehci-ci13612.c | 151 +- > > drivers/usb/host/ehci-ci13612.h | 2 +- > > 75 files changed, 10167 insertions(+), 8640 deletions(-) > > create mode 100644 arch/arm/boot/dts/axm55xxemu.dts > > create mode 100644 arch/arm/mach-axxia/ddr_retention.c > > create mode 100644 arch/arm/mach-axxia/wrappers.c > > create mode 100644 arch/powerpc/boot/dts/acp25xx.dts > > create mode 100644 arch/powerpc/boot/dts/acp342x.dts > > create mode 100644 arch/powerpc/boot/dts/acp344x.dts > > create mode 100644 arch/powerpc/boot/dts/acp35xx.dts > > delete mode 100755 arch/powerpc/configs/elpaso_defconfig > > delete mode 100644 arch/powerpc/include/asm/lsi/acp_ncr.h > > delete mode 100644 arch/powerpc/sysdev/lsi_acp_ncr.c > > create mode 100644 arch/powerpc/sysdev/lsi_acp_wrappers.c > > delete mode 100644 drivers/i2c/busses/ai2c/ai2c_dev.h > > delete mode 100644 drivers/i2c/busses/ai2c/ai2c_dev_clock.c > > delete mode 100644 drivers/i2c/busses/ai2c/ai2c_dev_clock_ext.h > > create mode 100644 drivers/i2c/busses/ai2c/ai2c_i2c_regs.h > > delete mode 100644 drivers/i2c/busses/ai2c/ai2c_plat.c > > delete mode 100644 drivers/i2c/busses/ai2c/ai2c_plat.h > > delete mode 100644 drivers/i2c/busses/ai2c/ai2c_sal.c > > delete mode 100644 drivers/i2c/busses/ai2c/ai2c_sal.h > > delete mode 100644 drivers/i2c/busses/ai2c/ai2c_types.h > > delete mode 100644 drivers/i2c/busses/ai2c/regs/ai2c_axi_timer_regs.h > > delete mode 100644 drivers/i2c/busses/ai2c/regs/ai2c_cfg_node_reg_defines.h > > delete mode 100644 drivers/i2c/busses/ai2c/regs/ai2c_cfg_node_regs.h > > delete mode 100644 drivers/i2c/busses/ai2c/regs/ai2c_i2c_regs.h > > delete mode 100644 drivers/i2c/busses/ai2c/regs/ai2c_regions.h > > create mode 100644 drivers/i2c/busses/i2c-axxia.c > > create mode 100644 drivers/misc/lsi-ncr.c > > create mode 100644 drivers/misc/lsi-ncr.h > > create mode 100644 drivers/misc/lsi-smmon.c > > create mode 100644 drivers/net/ethernet/lsi/lsi_acp_mdio.c > > > _______________________________________________ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto