| Message ID | CAK8P3a1twq1+RxS9uE7LQWAbg4tf72R2df4Q20fXUR_4+7B26A@mail.gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM SoC updates for v5.4, part 1 | expand |
On Mon, Sep 16, 2019 at 9:32 AM Arnd Bergmann <arnd@arndb.de> wrote: > > ARM: SoC platform updates for v5.4 Hmm. You now build iop-adma.c on other platforms, but that then causes this: drivers/dma/iop-adma.c: In function ‘__iop_adma_slot_cleanup’: drivers/dma/iop-adma.c:118:12: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 6 has type ‘dma_addr_t’ {aka ‘long long unsigned int’} [-Wformat=] 118 | pr_debug("\tcookie: %d slot: %d busy: %d " | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/dma/iop-adma.c:119:18: note: format string is defined here 119 | "this_desc: %#x next_desc: %#llx ack: %d\n", | ~~^ | | | unsigned int | %#llx and the lpc32xx_udc driver has this: drivers/usb/gadget/udc/lpc32xx_udc.c: In function ‘udc_pop_fifo’: drivers/usb/gadget/udc/lpc32xx_udc.c:1156:11: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] 1156 | switch (((u32) data) & 0x3) { | ^ drivers/usb/gadget/udc/lpc32xx_udc.c: In function ‘udc_stuff_fifo’: drivers/usb/gadget/udc/lpc32xx_udc.c:1257:11: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] 1257 | switch (((u32) data) & 0x3) { | ^ so I will be marking them both arm-specific again because I don't want to see the build warnings. Linus
On Tue, Sep 17, 2019 at 12:51 AM Linus Torvalds <torvalds@linux-foundation.org> wrote: > > On Mon, Sep 16, 2019 at 9:32 AM Arnd Bergmann <arnd@arndb.de> wrote: > > > > ARM: SoC platform updates for v5.4 > > Hmm. > > You now build iop-adma.c on other platforms, but that then causes this: > > drivers/dma/iop-adma.c: In function ‘__iop_adma_slot_cleanup’: > drivers/dma/iop-adma.c:118:12: warning: format ‘%x’ expects argument > of type ‘unsigned int’, but argument 6 has type ‘dma_addr_t’ {aka > ‘long long unsigned int’} [-Wformat=] > 118 | pr_debug("\tcookie: %d slot: %d busy: %d " > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/dma/iop-adma.c:119:18: note: format string is defined here > 119 | "this_desc: %#x next_desc: %#llx ack: %d\n", > | ~~^ > | | > | unsigned int > | %#llx There is a fix in the dmaengine tree, commit d17d9ea95727 ("dmaengine: iop-adma.c: fix printk format warning") from Randy Dunlap. I fixed some related issues in the same driver but missed this one because of a clang bug that is now fixed. > and the lpc32xx_udc driver has this: > > drivers/usb/gadget/udc/lpc32xx_udc.c: In function ‘udc_pop_fifo’: > drivers/usb/gadget/udc/lpc32xx_udc.c:1156:11: warning: cast from > pointer to integer of different size [-Wpointer-to-int-cast] > 1156 | switch (((u32) data) & 0x3) { > | ^ > drivers/usb/gadget/udc/lpc32xx_udc.c: In function ‘udc_stuff_fifo’: > drivers/usb/gadget/udc/lpc32xx_udc.c:1257:11: warning: cast from > pointer to integer of different size [-Wpointer-to-int-cast] > 1257 | switch (((u32) data) & 0x3) { > | ^ > > so I will be marking them both arm-specific again because I don't want > to see the build warnings. I guess I may have to test with both clang and gcc in the future. I did lots of build testing of my branches, but only with clang, which apparently never warned about that. I found a bug report from 2010 and commented on that. https://bugs.llvm.org/show_bug.cgi?id=8718 I'll send a fix for the warning after some more build testing. Arnd
On Tue, Sep 17, 2019 at 3:03 AM Arnd Bergmann <arnd@arndb.de> wrote: > > There is a fix in the dmaengine tree, commit d17d9ea95727 ("dmaengine: > iop-adma.c: fix printk format warning") from Randy Dunlap. I fixed > some related issues in the same driver but missed this one because of > a clang bug that is now fixed. Ok, I just pulled the dmaengine tree, and re-enabled the INTEL_IOP_ADMA driver since it now builds cleanly. The lpc32xx_udc driver is still disabled for compile-testing. Linus
The following changes since commit d45331b00ddb179e291766617259261c112db872: Linux 5.3-rc4 (2019-08-11 13:26:41 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/armsoc-soc for you to fetch changes up to 0366977480c43a221e4309f242d1144e85a368c3: ARM: multi_v5_defconfig: make DaVinci part of the ARM v5 multiplatform build (2019-09-09 21:36:56 +0200) ---------------------------------------------------------------- ARM: SoC platform updates for v5.4 The main change this time around is a cleanup of some of the oldest platforms based on the XScale and ARM9 CPU cores, which are between 10 and 20 years old. The Kendin/Micrel/Microchip KS8695, Winbond/Nuvoton W90x900 and Intel IOP33x/IOP13xx platforms are removed after we determined that nobody is using them any more. The TI Davinci and NXP LPC32xx platforms on the other hand are still in active use and are converted to the ARCH_MULTIPLATFORM build, meaning that we can compile a kernel that works on these along with most other ARMv5 platforms. Changes toward that goal are also merged for IOP32x, but additional work is needed to complete this. Patches for the remaining ARMv5 platforms have started but need more work and some testing. Support for the new ASpeed AST2600 gets added, this is based on the Cortex-A7 ARMv7 core, and is a newer version of the existing ARMv5 and ARMv6 chips in the same family. Other changes include a cleanup of the ST-Ericsson ux500 platform and the move of the TI Davinci platform to a new clocksource driver. Signed-off-by: Arnd Bergmann <arnd@arndb.de> ---------------------------------------------------------------- André Draszik (1): ARM: imx: stop adjusting ar8031 phy tx delay Anson Huang (1): arm64: Enable TIMER_IMX_SYS_CTR for ARCH_MXC platforms Arnd Bergmann (34): ARM: remove ks8695 platform ARM: remove w90x900 platform ARM: remove Intel iop33x and iop13xx support dmaengine: iop-adma: include prefetch.h dmaengine: iop-adma: use correct printk format strings dma: iop-adma: allow building without platform headers ARM: xscale: fix multi-cpu compilation ARM: iop32x: make mach/uncompress.h independent of mach/hardware.h ARM: iop32x: merge everything into mach-iop32x/ Merge tag 'ux500-v5.4-1' of git://git.kernel.org/.../linusw/linux-stericsson into arm/soc ARM: dove: clean up mach/*.h headers ARM: orion/mvebu: unify debug-ll virtual addresses usb: ohci-nxp: enable compile-testing usb: udc: lpc32xx: allow compile-testing watchdog: pnx4008_wdt: allow compile-testing serial: lpc32xx_hs: allow compile-testing gpio: lpc32xx: allow building on non-lpc32xx targets net: lpc-enet: factor out iram access net: lpc-enet: move phy setup into platform code net: lpc-enet: fix printk format strings net: lpc-enet: allow compile testing serial: lpc32xx: allow compile testing ARM: lpc32xx: clean up header files ARM: lpc32xx: allow multiplatform build Merge branch 'lpc32xx/multiplatform' into arm/soc Merge tag 'vexpress-update-5.4' of git://git.kernel.org/.../sudeep.holla/linux into arm/soc Merge tag 'aspeed-5.4-arch' of git://git.kernel.org/.../joel/aspeed into arm/soc Merge tag 'imx-soc-5.4' of git://git.kernel.org/.../shawnguo/linux into arm/soc Merge tag 'at91-5.4-soc' of git://git.kernel.org/.../at91/linux into arm/soc Merge tag 'omap-for-v5.4/soc-signed' of git://git.kernel.org/.../tmlind/linux-omap into arm/soc Merge tag 'zynq-soc-for-v5.4' of https://github.com/Xilinx/linux-xlnx into arm/soc Merge tag 'renesas-arm-soc-for-v5.4-tag1' of git://git.kernel.org/.../geert/renesas-devel into arm/soc Merge tag 'davinci-for-v5.4/soc' of git://git.kernel.org/.../nsekhar/linux-davinci into arm/soc Merge tag 'samsung-soc-5.4-2' of git://git.kernel.org/.../krzk/linux into arm/soc Bartosz Golaszewski (10): ARM: davinci: enable the clocksource driver for DT mode ARM: davinci: WARN_ON() if clk_get() fails ARM: davinci: da850: switch to using the clocksource driver ARM: davinci: da830: switch to using the clocksource driver ARM: davinci: move timer definitions to davinci.h ARM: davinci: dm355: switch to using the clocksource driver ARM: davinci: dm644x: switch to using the clocksource driver ARM: davinci: dm646x: switch to using the clocksource driver ARM: davinci: support multiplatform build for ARM v5 ARM: multi_v5_defconfig: make DaVinci part of the ARM v5 multiplatform build Christophe JAILLET (1): ARM: davinci: dm646x: Fix a typo in the comment Geert Uytterhoeven (1): ARM: debug-ll: Add support for r7s9210 Joel Stanley (4): dt-bindings: arm: cpus: Add ASPEED SMP ARM: aspeed: Select timer in each SoC ARM: aspeed: Add ASPEED AST2600 architecture ARM: aspeed: Enable SMP boot Krzysztof Kozlowski (1): MAINTAINERS: Extend patterns for Samsung SoC, Security Subsystem and clock drivers Linus Walleij (4): ARM: ux500: Stop populating the PRCMU devices early ARM: ux500: simplify and move debug UART ARM: mach-nspire: Kill off CLCD auxdata ARM: samsung: Include GPIO driver header Luis Araneda (2): ARM: zynq: Support smp in thumb mode ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up Markus Elfring (1): ARM: OMAP2+: Delete an unnecessary kfree() call in omap_hsmmc_pdata_init() Masahiro Yamada (3): ARM: s3c64xx: squash samsung_usb_phy.h into setup-usb-phy.c ARM: at91: move platform-specific asm-offset.h to arch/arm/mach-at91 ARM: OMAP2+: move platform-specific asm-offset.h to arch/arm/mach-omap2 Nicholas Mc Guire (2): ARM: ux500: add missing of_node_put() MAINTAINERS: add soc/ux500 Nicolas Ferre (3): MAINTAINERS: at91: Collect all pinctrl/gpio drivers in same entry MAINTAINERS: at91: remove the TC entry mailmap: map old company name to new one @microchip.com Pankaj Dubey (2): ARM: exynos: Enable exynos-chipid driver arm64: exynos: Enable exynos-chipid driver Phong Tran (1): ARM: vexpress: Cleanup cppcheck shifting warning kbuild test robot (1): net: lpc-enet: fix badzero.cocci warnings .mailmap | 1 + Documentation/devicetree/bindings/arm/cpus.yaml | 1 + MAINTAINERS | 55 +- arch/arm/Kconfig | 98 +- arch/arm/Kconfig.debug | 41 +- arch/arm/Makefile | 6 +- arch/arm/configs/acs5k_defconfig | 77 -- arch/arm/configs/acs5k_tiny_defconfig | 69 -- arch/arm/configs/davinci_all_defconfig | 5 + arch/arm/configs/iop13xx_defconfig | 118 --- arch/arm/configs/iop33x_defconfig | 85 -- arch/arm/configs/ks8695_defconfig | 67 -- arch/arm/configs/lpc32xx_defconfig | 2 + arch/arm/configs/multi_v5_defconfig | 12 + arch/arm/configs/nuc910_defconfig | 51 - arch/arm/configs/nuc950_defconfig | 67 -- arch/arm/configs/nuc960_defconfig | 57 - arch/arm/include/debug/ks8695.S | 37 - arch/arm/include/debug/renesas-scif.S | 6 +- arch/arm/include/debug/ux500.S | 9 +- arch/arm/mach-aspeed/Kconfig | 17 +- arch/arm/mach-aspeed/Makefile | 5 + arch/arm/mach-aspeed/platsmp.c | 61 ++ arch/arm/mach-at91/.gitignore | 1 + arch/arm/mach-at91/Makefile | 5 +- arch/arm/mach-at91/pm_suspend.S | 2 +- arch/arm/mach-davinci/Kconfig | 17 +- arch/arm/mach-davinci/Makefile | 2 + arch/arm/mach-davinci/da830.c | 45 +- arch/arm/mach-davinci/da850.c | 50 +- arch/arm/mach-davinci/davinci.h | 3 + arch/arm/mach-davinci/dm355.c | 28 +- arch/arm/mach-davinci/dm365.c | 4 + arch/arm/mach-davinci/dm644x.c | 28 +- arch/arm/mach-davinci/dm646x.c | 30 +- arch/arm/mach-davinci/include/mach/time.h | 2 - arch/arm/mach-davinci/time.c | 14 - .../arm/mach-dove/{include/mach => }/bridge-regs.h | 4 +- arch/arm/mach-dove/cm-a510.c | 3 +- arch/arm/mach-dove/common.c | 4 +- arch/arm/mach-dove/dove-db-setup.c | 2 +- arch/arm/mach-dove/{include/mach => }/dove.h | 14 +- arch/arm/mach-dove/include/mach/hardware.h | 19 - arch/arm/mach-dove/include/mach/uncompress.h | 8 +- arch/arm/mach-dove/irq.c | 5 +- arch/arm/mach-dove/{include/mach => }/irqs.h | 2 - arch/arm/mach-dove/mpp.c | 2 +- arch/arm/mach-dove/pcie.c | 4 +- arch/arm/mach-dove/{include/mach => }/pm.h | 4 +- arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-imx/mach-imx7d.c | 6 - arch/arm/mach-iop13xx/Kconfig | 21 - arch/arm/mach-iop13xx/Makefile | 9 - arch/arm/mach-iop13xx/Makefile.boot | 4 - arch/arm/mach-iop13xx/include/mach/adma.h | 608 ----------- arch/arm/mach-iop13xx/include/mach/entry-macro.S | 29 - arch/arm/mach-iop13xx/include/mach/hardware.h | 22 - arch/arm/mach-iop13xx/include/mach/iop13xx.h | 508 --------- arch/arm/mach-iop13xx/include/mach/iq81340.h | 29 - arch/arm/mach-iop13xx/include/mach/irqs.h | 195 ---- arch/arm/mach-iop13xx/include/mach/memory.h | 68 -- arch/arm/mach-iop13xx/include/mach/time.h | 127 --- arch/arm/mach-iop13xx/include/mach/uncompress.h | 23 - arch/arm/mach-iop13xx/io.c | 77 -- arch/arm/mach-iop13xx/iq81340mc.c | 84 -- arch/arm/mach-iop13xx/iq81340sc.c | 86 -- arch/arm/mach-iop13xx/irq.c | 227 ---- arch/arm/mach-iop13xx/msi.c | 152 --- arch/arm/mach-iop13xx/msi.h | 12 - arch/arm/mach-iop13xx/pci.c | 1115 -------------------- arch/arm/mach-iop13xx/pci.h | 66 -- arch/arm/mach-iop13xx/setup.c | 595 ----------- arch/arm/mach-iop13xx/tpmi.c | 244 ----- arch/arm/mach-iop32x/Makefile | 10 +- arch/arm/{plat-iop => mach-iop32x}/adma.c | 39 +- arch/arm/{plat-iop => mach-iop32x}/cp6.c | 0 arch/arm/mach-iop32x/em7210.c | 5 +- arch/arm/mach-iop32x/glantank.c | 5 +- arch/arm/mach-iop32x/{include/mach => }/glantank.h | 2 - arch/arm/mach-iop32x/{include/mach => }/hardware.h | 6 +- arch/arm/{plat-iop => mach-iop32x}/i2c.c | 21 +- arch/arm/mach-iop32x/include/mach/adma.h | 6 - arch/arm/mach-iop32x/include/mach/entry-macro.S | 2 - arch/arm/mach-iop32x/include/mach/iop32x.h | 31 - arch/arm/mach-iop32x/include/mach/irqs.h | 33 - arch/arm/mach-iop32x/include/mach/time.h | 5 - arch/arm/mach-iop32x/include/mach/uncompress.h | 18 +- .../{include/asm/hardware => mach-iop32x}/iop3xx.h | 18 +- arch/arm/mach-iop32x/iq31244.c | 5 +- arch/arm/mach-iop32x/{include/mach => }/iq31244.h | 2 - arch/arm/mach-iop32x/iq80321.c | 5 +- arch/arm/mach-iop32x/{include/mach => }/iq80321.h | 2 - arch/arm/mach-iop32x/irq.c | 3 +- arch/arm/mach-iop32x/irqs.h | 42 + arch/arm/mach-iop32x/n2100.c | 5 +- arch/arm/mach-iop32x/{include/mach => }/n2100.h | 2 - arch/arm/{plat-iop => mach-iop32x}/pci.c | 4 +- arch/arm/{plat-iop => mach-iop32x}/pmu.c | 8 +- arch/arm/{plat-iop => mach-iop32x}/restart.c | 4 +- arch/arm/{plat-iop => mach-iop32x}/setup.c | 2 +- arch/arm/{plat-iop => mach-iop32x}/time.c | 7 +- arch/arm/mach-iop33x/Kconfig | 22 - arch/arm/mach-iop33x/Makefile | 9 - arch/arm/mach-iop33x/Makefile.boot | 4 - arch/arm/mach-iop33x/include/mach/adma.h | 6 - arch/arm/mach-iop33x/include/mach/entry-macro.S | 34 - arch/arm/mach-iop33x/include/mach/hardware.h | 44 - arch/arm/mach-iop33x/include/mach/iop33x.h | 37 - arch/arm/mach-iop33x/include/mach/iq80331.h | 17 - arch/arm/mach-iop33x/include/mach/iq80332.h | 17 - arch/arm/mach-iop33x/include/mach/irqs.h | 57 - arch/arm/mach-iop33x/include/mach/time.h | 5 - arch/arm/mach-iop33x/include/mach/uncompress.h | 37 - arch/arm/mach-iop33x/iq80331.c | 148 --- arch/arm/mach-iop33x/iq80332.c | 148 --- arch/arm/mach-iop33x/irq.c | 115 -- arch/arm/mach-iop33x/uart.c | 100 -- arch/arm/mach-ks8695/Kconfig | 88 -- arch/arm/mach-ks8695/Makefile | 23 - arch/arm/mach-ks8695/Makefile.boot | 9 - arch/arm/mach-ks8695/board-acs5k.c | 238 ----- arch/arm/mach-ks8695/board-dsm320.c | 127 --- arch/arm/mach-ks8695/board-micrel.c | 59 -- arch/arm/mach-ks8695/board-og.c | 197 ---- arch/arm/mach-ks8695/board-sg.c | 118 --- arch/arm/mach-ks8695/cpu.c | 60 -- arch/arm/mach-ks8695/devices.c | 197 ---- arch/arm/mach-ks8695/devices.h | 29 - arch/arm/mach-ks8695/generic.h | 12 - arch/arm/mach-ks8695/include/mach/entry-macro.S | 47 - arch/arm/mach-ks8695/include/mach/gpio-ks8695.h | 36 - arch/arm/mach-ks8695/include/mach/hardware.h | 42 - arch/arm/mach-ks8695/include/mach/irqs.h | 51 - arch/arm/mach-ks8695/include/mach/memory.h | 51 - arch/arm/mach-ks8695/include/mach/regs-gpio.h | 55 - arch/arm/mach-ks8695/include/mach/regs-irq.h | 41 - arch/arm/mach-ks8695/include/mach/regs-misc.h | 97 -- arch/arm/mach-ks8695/include/mach/regs-switch.h | 66 -- arch/arm/mach-ks8695/include/mach/regs-uart.h | 89 -- arch/arm/mach-ks8695/include/mach/uncompress.h | 33 - arch/arm/mach-ks8695/irq.c | 164 --- arch/arm/mach-ks8695/pci.c | 247 ----- arch/arm/mach-ks8695/regs-hpna.h | 25 - arch/arm/mach-ks8695/regs-lan.h | 65 -- arch/arm/mach-ks8695/regs-mem.h | 89 -- arch/arm/mach-ks8695/regs-pci.h | 53 - arch/arm/mach-ks8695/regs-sys.h | 34 - arch/arm/mach-ks8695/regs-wan.h | 65 -- arch/arm/mach-ks8695/time.c | 159 --- arch/arm/mach-lpc32xx/Kconfig | 11 + arch/arm/mach-lpc32xx/common.c | 24 +- arch/arm/mach-lpc32xx/common.h | 1 - arch/arm/mach-lpc32xx/include/mach/board.h | 15 - arch/arm/mach-lpc32xx/include/mach/entry-macro.S | 28 - arch/arm/mach-lpc32xx/include/mach/hardware.h | 25 - arch/arm/mach-lpc32xx/include/mach/uncompress.h | 50 - .../{include/mach/platform.h => lpc32xx.h} | 18 +- arch/arm/mach-lpc32xx/pm.c | 3 +- arch/arm/mach-lpc32xx/serial.c | 33 +- arch/arm/mach-lpc32xx/suspend.S | 3 +- arch/arm/mach-mv78xx0/mv78xx0.h | 4 +- arch/arm/mach-nspire/Makefile | 1 - arch/arm/mach-nspire/clcd.c | 114 -- arch/arm/mach-nspire/clcd.h | 10 - arch/arm/mach-nspire/nspire.c | 25 - arch/arm/mach-omap2/.gitignore | 1 + arch/arm/mach-omap2/Makefile | 5 +- arch/arm/mach-omap2/hsmmc.c | 4 +- arch/arm/mach-omap2/sleep33xx.S | 2 +- arch/arm/mach-omap2/sleep43xx.S | 2 +- arch/arm/mach-orion5x/orion5x.h | 4 +- arch/arm/mach-s3c64xx/setup-usb-phy.c | 5 + arch/arm/mach-ux500/cpu-db8500.c | 1 - arch/arm/mach-vexpress/spc.c | 4 +- arch/arm/mach-w90x900/Kconfig | 50 - arch/arm/mach-w90x900/Makefile | 20 - arch/arm/mach-w90x900/Makefile.boot | 4 - arch/arm/mach-w90x900/clksel.c | 88 -- arch/arm/mach-w90x900/clock.c | 121 --- arch/arm/mach-w90x900/clock.h | 40 - arch/arm/mach-w90x900/cpu.c | 238 ----- arch/arm/mach-w90x900/cpu.h | 56 - arch/arm/mach-w90x900/dev.c | 537 ---------- arch/arm/mach-w90x900/gpio.c | 150 --- arch/arm/mach-w90x900/include/mach/entry-macro.S | 26 - arch/arm/mach-w90x900/include/mach/hardware.h | 19 - arch/arm/mach-w90x900/include/mach/irqs.h | 82 -- arch/arm/mach-w90x900/include/mach/map.h | 153 --- arch/arm/mach-w90x900/include/mach/mfp.h | 21 - arch/arm/mach-w90x900/include/mach/regs-clock.h | 49 - arch/arm/mach-w90x900/include/mach/regs-irq.h | 46 - arch/arm/mach-w90x900/include/mach/regs-ldm.h | 248 ----- arch/arm/mach-w90x900/include/mach/regs-serial.h | 54 - arch/arm/mach-w90x900/include/mach/uncompress.h | 43 - arch/arm/mach-w90x900/irq.c | 212 ---- arch/arm/mach-w90x900/mach-nuc910evb.c | 38 - arch/arm/mach-w90x900/mach-nuc950evb.c | 42 - arch/arm/mach-w90x900/mach-nuc960evb.c | 38 - arch/arm/mach-w90x900/mfp.c | 197 ---- arch/arm/mach-w90x900/nuc910.c | 58 - arch/arm/mach-w90x900/nuc910.h | 17 - arch/arm/mach-w90x900/nuc950.c | 52 - arch/arm/mach-w90x900/nuc950.h | 17 - arch/arm/mach-w90x900/nuc960.c | 50 - arch/arm/mach-w90x900/nuc960.h | 17 - arch/arm/mach-w90x900/nuc9xx.h | 22 - arch/arm/mach-w90x900/regs-ebi.h | 29 - arch/arm/mach-w90x900/regs-gcr.h | 34 - arch/arm/mach-w90x900/regs-timer.h | 37 - arch/arm/mach-w90x900/regs-usb.h | 31 - arch/arm/mach-w90x900/time.c | 168 --- arch/arm/mach-zynq/headsmp.S | 2 + arch/arm/mach-zynq/platsmp.c | 4 +- arch/arm/mm/Kconfig | 2 +- arch/arm/mm/copypage-xscale.c | 6 +- arch/arm/plat-iop/Makefile | 28 - arch/arm/plat-samsung/include/plat/gpio-core.h | 1 + arch/arm/plat-samsung/include/plat/usb-phy.h | 2 - arch/arm64/Kconfig.platforms | 2 + drivers/dma/Kconfig | 4 +- drivers/dma/iop-adma.c | 22 +- .../iop3xx-adma.h => drivers/dma/iop-adma.h | 7 +- drivers/gpio/Kconfig | 9 +- drivers/gpio/Makefile | 2 +- drivers/gpio/gpio-lpc32xx.c | 118 ++- drivers/i2c/busses/Kconfig | 2 +- drivers/net/ethernet/nxp/Kconfig | 2 +- drivers/net/ethernet/nxp/lpc_eth.c | 45 +- drivers/soc/ux500/ux500-soc-id.c | 5 +- drivers/tty/serial/Kconfig | 3 +- drivers/tty/serial/lpc32xx_hs.c | 37 +- drivers/usb/gadget/udc/Kconfig | 3 +- drivers/usb/gadget/udc/lpc32xx_udc.c | 3 +- drivers/usb/host/Kconfig | 3 +- drivers/usb/host/ohci-nxp.c | 25 +- drivers/watchdog/Kconfig | 2 +- drivers/watchdog/pnx4008_wdt.c | 1 - .../linux/platform_data/dma-iop32x.h | 4 + include/linux/soc/nxp/lpc32xx-misc.h | 33 + include/linux/usb/samsung_usb_phy.h | 17 - 240 files changed, 679 insertions(+), 12527 deletions(-) delete mode 100644 arch/arm/configs/acs5k_defconfig delete mode 100644 arch/arm/configs/acs5k_tiny_defconfig delete mode 100644 arch/arm/configs/iop13xx_defconfig delete mode 100644 arch/arm/configs/iop33x_defconfig delete mode 100644 arch/arm/configs/ks8695_defconfig delete mode 100644 arch/arm/configs/nuc910_defconfig delete mode 100644 arch/arm/configs/nuc950_defconfig delete mode 100644 arch/arm/configs/nuc960_defconfig delete mode 100644 arch/arm/include/debug/ks8695.S create mode 100644 arch/arm/mach-aspeed/Makefile create mode 100644 arch/arm/mach-aspeed/platsmp.c create mode 100644 arch/arm/mach-at91/.gitignore rename arch/arm/mach-dove/{include/mach => }/bridge-regs.h (96%) rename arch/arm/mach-dove/{include/mach => }/dove.h (95%) delete mode 100644 arch/arm/mach-dove/include/mach/hardware.h rename arch/arm/mach-dove/{include/mach => }/irqs.h (98%) rename arch/arm/mach-dove/{include/mach => }/pm.h (97%) delete mode 100644 arch/arm/mach-iop13xx/Kconfig delete mode 100644 arch/arm/mach-iop13xx/Makefile delete mode 100644 arch/arm/mach-iop13xx/Makefile.boot delete mode 100644 arch/arm/mach-iop13xx/include/mach/adma.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-iop13xx/include/mach/hardware.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/iop13xx.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/iq81340.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/irqs.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/memory.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/time.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/uncompress.h delete mode 100644 arch/arm/mach-iop13xx/io.c delete mode 100644 arch/arm/mach-iop13xx/iq81340mc.c delete mode 100644 arch/arm/mach-iop13xx/iq81340sc.c delete mode 100644 arch/arm/mach-iop13xx/irq.c delete mode 100644 arch/arm/mach-iop13xx/msi.c delete mode 100644 arch/arm/mach-iop13xx/msi.h delete mode 100644 arch/arm/mach-iop13xx/pci.c delete mode 100644 arch/arm/mach-iop13xx/pci.h delete mode 100644 arch/arm/mach-iop13xx/setup.c delete mode 100644 arch/arm/mach-iop13xx/tpmi.c rename arch/arm/{plat-iop => mach-iop32x}/adma.c (75%) rename arch/arm/{plat-iop => mach-iop32x}/cp6.c (100%) rename arch/arm/mach-iop32x/{include/mach => }/glantank.h (78%) rename arch/arm/mach-iop32x/{include/mach => }/hardware.h (90%) rename arch/arm/{plat-iop => mach-iop32x}/i2c.c (81%) delete mode 100644 arch/arm/mach-iop32x/include/mach/adma.h delete mode 100644 arch/arm/mach-iop32x/include/mach/iop32x.h delete mode 100644 arch/arm/mach-iop32x/include/mach/time.h rename arch/arm/{include/asm/hardware => mach-iop32x}/iop3xx.h (96%) rename arch/arm/mach-iop32x/{include/mach => }/iq31244.h (89%) rename arch/arm/mach-iop32x/{include/mach => }/iq80321.h (89%) create mode 100644 arch/arm/mach-iop32x/irqs.h rename arch/arm/mach-iop32x/{include/mach => }/n2100.h (89%) rename arch/arm/{plat-iop => mach-iop32x}/pci.c (99%) rename arch/arm/{plat-iop => mach-iop32x}/pmu.c (79%) rename arch/arm/{plat-iop => mach-iop32x}/restart.c (82%) rename arch/arm/{plat-iop => mach-iop32x}/setup.c (95%) rename arch/arm/{plat-iop => mach-iop32x}/time.c (97%) delete mode 100644 arch/arm/mach-iop33x/Kconfig delete mode 100644 arch/arm/mach-iop33x/Makefile delete mode 100644 arch/arm/mach-iop33x/Makefile.boot delete mode 100644 arch/arm/mach-iop33x/include/mach/adma.h delete mode 100644 arch/arm/mach-iop33x/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-iop33x/include/mach/hardware.h delete mode 100644 arch/arm/mach-iop33x/include/mach/iop33x.h delete mode 100644 arch/arm/mach-iop33x/include/mach/iq80331.h delete mode 100644 arch/arm/mach-iop33x/include/mach/iq80332.h delete mode 100644 arch/arm/mach-iop33x/include/mach/irqs.h delete mode 100644 arch/arm/mach-iop33x/include/mach/time.h delete mode 100644 arch/arm/mach-iop33x/include/mach/uncompress.h delete mode 100644 arch/arm/mach-iop33x/iq80331.c delete mode 100644 arch/arm/mach-iop33x/iq80332.c delete mode 100644 arch/arm/mach-iop33x/irq.c delete mode 100644 arch/arm/mach-iop33x/uart.c delete mode 100644 arch/arm/mach-ks8695/Kconfig delete mode 100644 arch/arm/mach-ks8695/Makefile delete mode 100644 arch/arm/mach-ks8695/Makefile.boot delete mode 100644 arch/arm/mach-ks8695/board-acs5k.c delete mode 100644 arch/arm/mach-ks8695/board-dsm320.c delete mode 100644 arch/arm/mach-ks8695/board-micrel.c delete mode 100644 arch/arm/mach-ks8695/board-og.c delete mode 100644 arch/arm/mach-ks8695/board-sg.c delete mode 100644 arch/arm/mach-ks8695/cpu.c delete mode 100644 arch/arm/mach-ks8695/devices.c delete mode 100644 arch/arm/mach-ks8695/devices.h delete mode 100644 arch/arm/mach-ks8695/generic.h delete mode 100644 arch/arm/mach-ks8695/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-ks8695/include/mach/gpio-ks8695.h delete mode 100644 arch/arm/mach-ks8695/include/mach/hardware.h delete mode 100644 arch/arm/mach-ks8695/include/mach/irqs.h delete mode 100644 arch/arm/mach-ks8695/include/mach/memory.h delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-gpio.h delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-irq.h delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-misc.h delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-switch.h delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-uart.h delete mode 100644 arch/arm/mach-ks8695/include/mach/uncompress.h delete mode 100644 arch/arm/mach-ks8695/irq.c delete mode 100644 arch/arm/mach-ks8695/pci.c delete mode 100644 arch/arm/mach-ks8695/regs-hpna.h delete mode 100644 arch/arm/mach-ks8695/regs-lan.h delete mode 100644 arch/arm/mach-ks8695/regs-mem.h delete mode 100644 arch/arm/mach-ks8695/regs-pci.h delete mode 100644 arch/arm/mach-ks8695/regs-sys.h delete mode 100644 arch/arm/mach-ks8695/regs-wan.h delete mode 100644 arch/arm/mach-ks8695/time.c create mode 100644 arch/arm/mach-lpc32xx/Kconfig delete mode 100644 arch/arm/mach-lpc32xx/include/mach/board.h delete mode 100644 arch/arm/mach-lpc32xx/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-lpc32xx/include/mach/hardware.h delete mode 100644 arch/arm/mach-lpc32xx/include/mach/uncompress.h rename arch/arm/mach-lpc32xx/{include/mach/platform.h => lpc32xx.h} (98%) delete mode 100644 arch/arm/mach-nspire/clcd.c delete mode 100644 arch/arm/mach-nspire/clcd.h create mode 100644 arch/arm/mach-omap2/.gitignore delete mode 100644 arch/arm/mach-w90x900/Kconfig delete mode 100644 arch/arm/mach-w90x900/Makefile delete mode 100644 arch/arm/mach-w90x900/Makefile.boot delete mode 100644 arch/arm/mach-w90x900/clksel.c delete mode 100644 arch/arm/mach-w90x900/clock.c delete mode 100644 arch/arm/mach-w90x900/clock.h delete mode 100644 arch/arm/mach-w90x900/cpu.c delete mode 100644 arch/arm/mach-w90x900/cpu.h delete mode 100644 arch/arm/mach-w90x900/dev.c delete mode 100644 arch/arm/mach-w90x900/gpio.c delete mode 100644 arch/arm/mach-w90x900/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-w90x900/include/mach/hardware.h delete mode 100644 arch/arm/mach-w90x900/include/mach/irqs.h delete mode 100644 arch/arm/mach-w90x900/include/mach/map.h delete mode 100644 arch/arm/mach-w90x900/include/mach/mfp.h delete mode 100644 arch/arm/mach-w90x900/include/mach/regs-clock.h delete mode 100644 arch/arm/mach-w90x900/include/mach/regs-irq.h delete mode 100644 arch/arm/mach-w90x900/include/mach/regs-ldm.h delete mode 100644 arch/arm/mach-w90x900/include/mach/regs-serial.h delete mode 100644 arch/arm/mach-w90x900/include/mach/uncompress.h delete mode 100644 arch/arm/mach-w90x900/irq.c delete mode 100644 arch/arm/mach-w90x900/mach-nuc910evb.c delete mode 100644 arch/arm/mach-w90x900/mach-nuc950evb.c delete mode 100644 arch/arm/mach-w90x900/mach-nuc960evb.c delete mode 100644 arch/arm/mach-w90x900/mfp.c delete mode 100644 arch/arm/mach-w90x900/nuc910.c delete mode 100644 arch/arm/mach-w90x900/nuc910.h delete mode 100644 arch/arm/mach-w90x900/nuc950.c delete mode 100644 arch/arm/mach-w90x900/nuc950.h delete mode 100644 arch/arm/mach-w90x900/nuc960.c delete mode 100644 arch/arm/mach-w90x900/nuc960.h delete mode 100644 arch/arm/mach-w90x900/nuc9xx.h delete mode 100644 arch/arm/mach-w90x900/regs-ebi.h delete mode 100644 arch/arm/mach-w90x900/regs-gcr.h delete mode 100644 arch/arm/mach-w90x900/regs-timer.h delete mode 100644 arch/arm/mach-w90x900/regs-usb.h delete mode 100644 arch/arm/mach-w90x900/time.c delete mode 100644 arch/arm/plat-iop/Makefile rename arch/arm/include/asm/hardware/iop3xx-adma.h => drivers/dma/iop-adma.h (99%) rename arch/arm/include/asm/hardware/iop_adma.h => include/linux/platform_data/dma-iop32x.h (98%) create mode 100644 include/linux/soc/nxp/lpc32xx-misc.h delete mode 100644 include/linux/usb/samsung_usb_phy.h