Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

21604cdc · Linus Torvalds <[email protected]> · 2013-11-11 16:42:43 +09:00

Pull ARM SoC cleanups from Olof Johansson:
 "This branch contains code cleanups, moves and removals for 3.13.

  Qualcomm msm targets had a bunch of code removal for legacy non-DT
  platforms.  Nomadik saw more device tree conversions and cleanup of
  old code.  Tegra has some code refactoring, etc.

  One longish patch series from Sebastian Hasselbarth changes the
  init_time hooks and tries to use a generic implementation for most
  platforms, since they were all doing more or less the same things.

  Finally the "shark" platform is removed in this release.  It's been
  abandoned for a while and nobody seems to care enough to keep it
  around.  If someone comes along and wants to resurrect it, the removal
  can easily be reverted and code brought back.

  Beyond this, mostly a bunch of removals of stale content across the
  board, etc"

* tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (79 commits)
  ARM: gemini: convert to GENERIC_CLOCKEVENTS
  ARM: EXYNOS: remove CONFIG_MACH_EXYNOS[4, 5]_DT config options
  ARM: OMAP3: control: add API for setting IVA bootmode
  ARM: OMAP3: CM/control: move CM scratchpad save to CM driver
  ARM: OMAP3: McBSP: do not access CM register directly
  ARM: OMAP3: clock: add API to enable/disable autoidle for a single clock
  ARM: OMAP2: CM/PM: remove direct register accesses outside CM code
  MAINTAINERS: Add patterns for DTS files for AT91
  ARM: at91: remove init_machine() as default is suitable
  ARM: at91/dt: split sama5d3 peripheral definitions
  ARM: at91/dt: split sam9x5 peripheral definitions
  ARM: Remove temporary sched_clock.h header
  ARM: clps711x: Use linux/sched_clock.h
  MAINTAINERS: Add DTS files to patterns for Samsung platform
  ARM: EXYNOS: remove unnecessary header inclusions from exynos4/5 dt machine file
  ARM: tegra: fix ARCH_TEGRA_114_SOC select sort order
  clk: nomadik: fix missing __init on nomadik_src_init
  ARM: drop explicit selection of HAVE_CLK and CLKDEV_LOOKUP
  ARM: S3C64XX: Kill CONFIG_PLAT_S3C64XX
  ASoC: samsung: Use CONFIG_ARCH_S3C64XX to check for S3C64XX support
  ...

Commit: 21604cdcdcf9ea8c16b1656f78e2eff097244d66
Parents: beb5bfe4 · f3372c01

Merge commit. Changes below are compared with the first parent: beb5bfe4.

Changes

172 files changed · +1317 −3672

File	Status	Add	Del	Content
MAINTAINERS	modified	+6	−5	View file
arch/arm/Kconfig	modified	+4	−35	View file
arch/arm/Makefile	modified	+0	−1	View file
arch/arm/boot/compressed/Makefile	modified	+0	−4	View file
arch/arm/boot/compressed/head-shark.S	deleted	+0	−140	View before deletion
arch/arm/boot/compressed/ofw-shark.c	deleted	+0	−260	View before deletion
arch/arm/boot/dts/Makefile	modified	+2	−2	View file
arch/arm/boot/dts/at91sam9g25.dtsi	modified	+2	−0	View file
arch/arm/boot/dts/at91sam9g35.dtsi	modified	+1	−0	View file
arch/arm/boot/dts/at91sam9x25.dtsi	modified	+3	−21	View file
arch/arm/boot/dts/at91sam9x35.dtsi	modified	+1	−0	View file
arch/arm/boot/dts/at91sam9x5.dtsi	modified	+0	−67	View file
arch/arm/boot/dts/at91sam9x5_macb0.dtsi	added	+56	−0	View file
arch/arm/boot/dts/at91sam9x5_macb1.dtsi	added	+44	−0	View file
arch/arm/boot/dts/at91sam9x5_usart3.dtsi	added	+51	−0	View file
arch/arm/boot/dts/msm8660-surf.dts → arch/arm/boot/dts/qcom-msm8660-surf.dts	renamed	+0	−0	View file
arch/arm/boot/dts/msm8960-cdp.dts → arch/arm/boot/dts/qcom-msm8960-cdp.dts	renamed	+0	−0	View file
arch/arm/boot/dts/sama5d3.dtsi	modified	+0	−203	View file
arch/arm/boot/dts/sama5d31.dtsi	added	+16	−0	View file
arch/arm/boot/dts/sama5d31ek.dts	modified	+2	−1	View file
arch/arm/boot/dts/sama5d33.dtsi	added	+14	−0	View file
arch/arm/boot/dts/sama5d33ek.dts	modified	+2	−1	View file
arch/arm/boot/dts/sama5d34.dtsi	added	+16	−0	View file
arch/arm/boot/dts/sama5d34ek.dts	modified	+2	−1	View file
arch/arm/boot/dts/sama5d35.dtsi	added	+18	−0	View file
arch/arm/boot/dts/sama5d35ek.dts	modified	+2	−1	View file
arch/arm/boot/dts/sama5d3_can.dtsi	added	+54	−0	View file
arch/arm/boot/dts/sama5d3_emac.dtsi	added	+44	−0	View file
arch/arm/boot/dts/sama5d3_gmac.dtsi	added	+77	−0	View file
arch/arm/boot/dts/sama5d3_lcd.dtsi	added	+55	−0	View file
arch/arm/boot/dts/sama5d3_mci2.dtsi	added	+47	−0	View file
arch/arm/boot/dts/sama5d3_tcb1.dtsi	added	+27	−0	View file
arch/arm/boot/dts/sama5d3_uart.dtsi	added	+53	−0	View file
arch/arm/boot/dts/sama5d3xcm.dtsi	modified	+0	−1	View file
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi	modified	+10	−2	View file
arch/arm/common/Makefile	modified	+0	−1	View file
arch/arm/common/via82c505.c	deleted	+0	−83	View before deletion
arch/arm/configs/shark_defconfig	deleted	+0	−80	View before deletion
arch/arm/include/asm/mach/pci.h	modified	+0	−4	View file
arch/arm/include/asm/sched_clock.h	deleted	+0	−4	View before deletion
arch/arm/kernel/time.c	modified	+17	−12	View file
arch/arm/lib/Makefile	modified	+0	−1	View file
arch/arm/lib/io-shark.c	deleted	+0	−13	View before deletion
arch/arm/mach-at91/board-cam60.c	modified	+1	−1	View file
arch/arm/mach-at91/board-dt-rm9200.c	modified	+0	−7	View file
arch/arm/mach-at91/board-dt-sam9.c	modified	+0	−7	View file
arch/arm/mach-bcm/board_bcm281xx.c	modified	+0	−1	View file
arch/arm/mach-bcm2835/bcm2835.c	modified	+0	−2	View file
arch/arm/mach-clps711x/common.c	modified	+1	−1	View file
arch/arm/mach-dove/board-dt.c	modified	+0	−11	View file
arch/arm/mach-exynos/Kconfig	modified	+9	−29	View file
arch/arm/mach-exynos/Makefile	modified	+2	−2	View file
arch/arm/mach-exynos/common.c	modified	+0	−8	View file
arch/arm/mach-exynos/common.h	modified	+0	−1	View file
arch/arm/mach-exynos/mach-exynos4-dt.c	modified	+0	−5	View file
arch/arm/mach-exynos/mach-exynos5-dt.c	modified	+0	−5	View file
arch/arm/mach-gemini/time.c	modified	+89	−8	View file
arch/arm/mach-highbank/Kconfig	modified	+0	−1	View file
arch/arm/mach-highbank/highbank.c	modified	+7	−16	View file
arch/arm/mach-imx/Kconfig	modified	+1	−9	View file
arch/arm/mach-imx/clk-imx51-imx53.c	modified	+10	−19	View file
arch/arm/mach-imx/common.h	modified	+0	−4	View file
arch/arm/mach-imx/imx51-dt.c	modified	+0	−6	View file
arch/arm/mach-imx/mach-imx53.c	modified	+0	−6	View file
arch/arm/mach-imx/mach-imx6q.c	modified	+3	−11	View file
arch/arm/mach-imx/mach-imx6sl.c	modified	+0	−7	View file
arch/arm/mach-imx/mach-vf610.c	modified	+0	−9	View file
arch/arm/mach-kirkwood/board-dt.c	modified	+0	−8	View file
arch/arm/mach-msm/Kconfig	modified	+10	−3	View file
arch/arm/mach-msm/Makefile	modified	+1	−2	View file
arch/arm/mach-msm/board-dt-8660.c	deleted	+0	−48	View before deletion
arch/arm/mach-msm/board-dt-8960.c → arch/arm/mach-msm/board-dt.c	renamed	+7	−10	View file
arch/arm/mach-msm/include/mach/irqs-8960.h	deleted	+0	−277	View before deletion
arch/arm/mach-msm/include/mach/irqs-8x60.h	deleted	+0	−258	View before deletion
arch/arm/mach-msm/include/mach/irqs.h	modified	+0	−5	View file
arch/arm/mach-mxs/mach-mxs.c	modified	+0	−13	View file
arch/arm/mach-nomadik/cpu-8815.c	modified	+1	−70	View file
arch/arm/mach-nspire/nspire.c	modified	+0	−9	View file
arch/arm/mach-omap2/Kconfig	modified	+1	−8	View file
arch/arm/mach-omap2/clkt2xxx_apll.c	modified	+2	−2	View file
arch/arm/mach-omap2/clkt2xxx_dpllcore.c	modified	+4	−7	View file
arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c	modified	+6	−18	View file
arch/arm/mach-omap2/clock.c	modified	+38	−0	View file
arch/arm/mach-omap2/clock.h	modified	+2	−0	View file
arch/arm/mach-omap2/cm2xxx.c	modified	+67	−0	View file
arch/arm/mach-omap2/cm2xxx.h	modified	+8	−0	View file
arch/arm/mach-omap2/cm3xxx.c	modified	+22	−0	View file
arch/arm/mach-omap2/cm3xxx.h	modified	+1	−0	View file
arch/arm/mach-omap2/control.c	modified	+15	−39	View file
arch/arm/mach-omap2/control.h	modified	+1	−0	View file
arch/arm/mach-omap2/mcbsp.c	modified	+8	−8	View file
arch/arm/mach-omap2/pm24xx.c	modified	+2	−22	View file
arch/arm/mach-omap2/pm34xx.c	modified	+1	−2	View file
arch/arm/mach-prima2/common.c	modified	+0	−11	View file
arch/arm/mach-prima2/common.h	modified	+0	−1	View file
arch/arm/mach-rockchip/rockchip.c	modified	+0	−9	View file
arch/arm/mach-s3c64xx/Kconfig	modified	+3	−10	View file
arch/arm/mach-shark/Makefile	deleted	+0	−10	View before deletion
arch/arm/mach-shark/Makefile.boot	deleted	+0	−2	View before deletion
arch/arm/mach-shark/core.c	deleted	+0	−146	View before deletion
arch/arm/mach-shark/dma.c	deleted	+0	−23	View before deletion
arch/arm/mach-shark/include/mach/debug-macro.S	deleted	+0	−34	View before deletion
arch/arm/mach-shark/include/mach/entry-macro.S	deleted	+0	−36	View before deletion
arch/arm/mach-shark/include/mach/framebuffer.h	deleted	+0	−16	View before deletion
arch/arm/mach-shark/include/mach/hardware.h	deleted	+0	−16	View before deletion
arch/arm/mach-shark/include/mach/irqs.h	deleted	+0	−13	View before deletion
arch/arm/mach-shark/include/mach/isa-dma.h	deleted	+0	−13	View before deletion
arch/arm/mach-shark/include/mach/memory.h	deleted	+0	−26	View before deletion
arch/arm/mach-shark/include/mach/timex.h	deleted	+0	−7	View before deletion
arch/arm/mach-shark/include/mach/uncompress.h	deleted	+0	−50	View before deletion
arch/arm/mach-shark/irq.c	deleted	+0	−108	View before deletion
arch/arm/mach-shark/leds.c	deleted	+0	−117	View before deletion
arch/arm/mach-shark/pci.c	deleted	+0	−57	View before deletion
arch/arm/mach-shmobile/board-ape6evm-reference.c	modified	+1	−1	View file
arch/arm/mach-shmobile/board-ape6evm.c	modified	+2	−2	View file
arch/arm/mach-shmobile/board-bockw.c	modified	+39	−7	View file
arch/arm/mach-shmobile/board-lager-reference.c	modified	+1	−1	View file
arch/arm/mach-shmobile/board-lager.c	modified	+8	−8	View file
arch/arm/mach-shmobile/include/mach/r8a73a4.h	modified	+1	−1	View file
arch/arm/mach-shmobile/include/mach/r8a7778.h	modified	+0	−3	View file
arch/arm/mach-shmobile/include/mach/r8a7790.h	modified	+1	−1	View file
arch/arm/mach-shmobile/setup-r8a73a4.c	modified	+2	−2	View file
arch/arm/mach-shmobile/setup-r8a7778.c	modified	+1	−49	View file
arch/arm/mach-shmobile/setup-r8a7790.c	modified	+13	−12	View file
arch/arm/mach-socfpga/Kconfig	modified	+0	−1	View file
arch/arm/mach-socfpga/socfpga.c	modified	+0	−2	View file
arch/arm/mach-spear/Kconfig	modified	+0	−2	View file
arch/arm/mach-sti/board-dt.c	modified	+4	−6	View file
arch/arm/mach-sunxi/sunxi.c	modified	+0	−10	View file
arch/arm/mach-tegra/Kconfig	modified	+1	−3	View file
arch/arm/mach-tegra/Makefile	modified	+0	−1	View file
arch/arm/mach-tegra/board-paz00.c	modified	+2	−3	View file
arch/arm/mach-tegra/board-paz00.h	deleted	+0	−25	View before deletion
arch/arm/mach-tegra/board.h	modified	+0	−12	View file
arch/arm/mach-tegra/common.c	deleted	+0	−115	View before deletion
arch/arm/mach-tegra/fuse.c	modified	+1	−1	View file
arch/arm/mach-tegra/gpio-names.h	deleted	+0	−247	View before deletion
arch/arm/mach-tegra/iomap.h	modified	+0	−152	View file
arch/arm/mach-tegra/irammap.h	modified	+6	−0	View file
arch/arm/mach-tegra/pm.c	modified	+4	−4	View file
arch/arm/mach-tegra/pm.h	modified	+0	−3	View file
arch/arm/mach-tegra/pmc.c	modified	+31	−19	View file
arch/arm/mach-tegra/pmc.h	modified	+5	−0	View file
arch/arm/mach-tegra/reset.c	modified	+1	−1	View file
arch/arm/mach-tegra/sleep-tegra20.S	modified	+3	−2	View file
arch/arm/mach-tegra/sleep-tegra30.S	modified	+3	−2	View file
arch/arm/mach-tegra/tegra.c	modified	+68	−4	View file
arch/arm/mach-u300/Kconfig	modified	+0	−1	View file
arch/arm/mach-ux500/Kconfig	modified	+12	−17	View file
arch/arm/mach-vexpress/Kconfig	modified	+0	−2	View file
arch/arm/mach-vexpress/v2m.c	modified	+1	−13	View file
arch/arm/mach-vt8500/Kconfig	modified	+0	−1	View file
arch/arm/mach-vt8500/common.h	deleted	+0	−24	View before deletion
arch/arm/mach-vt8500/vt8500.c	modified	+0	−6	View file
drivers/block/Kconfig	modified	+1	−1	View file
drivers/clk/clk-bcm2835.c	modified	+0	−8	View file
drivers/clk/clk-highbank.c	modified	+7	−3	View file
drivers/clk/clk-nomadik.c	modified	+88	−99	View file
drivers/clk/clk-prima2.c	modified	+6	−23	View file
drivers/clk/clk-vt8500.c	modified	+24	−10	View file
drivers/clk/mxs/clk-imx23.c	modified	+8	−7	View file
drivers/clk/mxs/clk-imx28.c	modified	+8	−8	View file
drivers/clk/sunxi/clk-sunxi.c	modified	+6	−5	View file
drivers/gpio/gpio-samsung.c	modified	+4	−4	View file
drivers/ide/Kconfig	modified	+2	−2	View file
drivers/input/serio/Kconfig	modified	+1	−1	View file
drivers/media/platform/Kconfig	modified	+1	−1	View file
drivers/video/cyber2000fb.c	modified	+0	−70	View file
include/linux/clk/mxs.h	modified	+0	−2	View file
include/linux/clk/sunxi.h	deleted	+0	−22	View before deletion
include/linux/platform_data/clk-nomadik.h	deleted	+0	−2	View before deletion
sound/soc/samsung/s3c-i2s-v2.c	modified	+1	−5	View file

Only the first 600 diff lines are shown. Download the complete patch.

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 831b869..7a00136 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -763,6 +763,10 @@ W:	http://maxim.org.za/at91_26.html
 W:	http://www.linux4sam.org
 S:	Supported
 F:	arch/arm/mach-at91/
+F:	arch/arm/boot/dts/at91*.dts
+F:	arch/arm/boot/dts/at91*.dtsi
+F:	arch/arm/boot/dts/sama*.dts
+F:	arch/arm/boot/dts/sama*.dtsi
 
 ARM/CALXEDA HIGHBANK ARCHITECTURE
 M:	Rob Herring <[email protected]>
@@ -1157,11 +1161,6 @@ S:	Maintained
 F:	arch/arm/mach-rockchip/
 F:	drivers/*/*rockchip*
 
-ARM/SHARK MACHINE SUPPORT
-M:	Alexander Schulz <[email protected]>
-W:	http://www.shark-linux.de/shark.html
-S:	Maintained
-
 ARM/SAMSUNG ARM ARCHITECTURES
 M:	Ben Dooks <[email protected]>
 M:	Kukjin Kim <[email protected]>
@@ -1169,6 +1168,8 @@ L:	[email protected] (moderated for non-subscribers)
 L:	[email protected] (moderated for non-subscribers)
 W:	http://www.fluff.org/ben/linux/
 S:	Maintained
+F:	arch/arm/boot/dts/s3c*
+F:	arch/arm/boot/dts/exynos*
 F:	arch/arm/plat-samsung/
 F:	arch/arm/mach-s3c24*/
 F:	arch/arm/mach-s3c64xx/

arch/arm/Kconfig

View file

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1ad6fb6..e98261c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -358,7 +358,6 @@ config ARCH_AT91
 	bool "Atmel AT91"
 	select ARCH_REQUIRE_GPIOLIB
 	select CLKDEV_LOOKUP
-	select HAVE_CLK
 	select IRQ_DOMAIN
 	select NEED_MACH_GPIO_H
 	select NEED_MACH_IO_H if PCCARD
@@ -372,7 +371,6 @@ config ARCH_CLPS711X
 	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
 	select ARCH_REQUIRE_GPIOLIB
 	select AUTO_ZRELADDR
-	select CLKDEV_LOOKUP
 	select CLKSRC_MMIO
 	select COMMON_CLK
 	select CPU_ARM720T
@@ -386,8 +384,9 @@ config ARCH_CLPS711X
 config ARCH_GEMINI
 	bool "Cortina Systems Gemini"
 	select ARCH_REQUIRE_GPIOLIB
-	select ARCH_USES_GETTIMEOFFSET
+	select CLKSRC_MMIO
 	select CPU_FA526
+	select GENERIC_CLOCKEVENTS
 	select NEED_MACH_GPIO_H
 	help
 	  Support for the Cortina Systems Gemini family SoCs
@@ -631,7 +630,6 @@ config ARCH_PXA
 config ARCH_MSM
 	bool "Qualcomm MSM"
 	select ARCH_REQUIRE_GPIOLIB
-	select CLKDEV_LOOKUP
 	select CLKSRC_OF if OF
 	select COMMON_CLK
 	select GENERIC_CLOCKEVENTS
@@ -649,7 +647,6 @@ config ARCH_SHMOBILE
 	select GENERIC_CLOCKEVENTS
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
-	select HAVE_CLK
 	select HAVE_MACH_CLKDEV
 	select HAVE_SMP
 	select MIGHT_HAVE_CACHE_L2X0
@@ -706,7 +703,6 @@ config ARCH_S3C24XX
 	select CLKSRC_SAMSUNG_PWM
 	select GENERIC_CLOCKEVENTS
 	select GPIO_SAMSUNG
-	select HAVE_CLK
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
@@ -730,18 +726,19 @@ config ARCH_S3C64XX
 	select CPU_V6
 	select GENERIC_CLOCKEVENTS
 	select GPIO_SAMSUNG
-	select HAVE_CLK
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_TCM
 	select NEED_MACH_GPIO_H
 	select NO_IOPORT
 	select PLAT_SAMSUNG
+	select PM_GENERIC_DOMAINS
 	select S3C_DEV_NAND
 	select S3C_GPIO_TRACK
 	select SAMSUNG_ATAGS
 	select SAMSUNG_CLKSRC
 	select SAMSUNG_GPIOLIB_4BIT
+	select SAMSUNG_WAKEMASK
 	select SAMSUNG_WDT_RESET
 	select USB_ARCH_HAS_OHCI
 	help
@@ -754,7 +751,6 @@ config ARCH_S5P64X0
 	select CPU_V6
 	select GENERIC_CLOCKEVENTS
 	select GPIO_SAMSUNG
-	select HAVE_CLK
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
@@ -773,7 +769,6 @@ config ARCH_S5PC100
 	select CPU_V7
 	select GENERIC_CLOCKEVENTS
 	select GPIO_SAMSUNG
-	select HAVE_CLK
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
@@ -793,7 +788,6 @@ config ARCH_S5PV210
 	select CPU_V7
 	select GENERIC_CLOCKEVENTS
 	select GPIO_SAMSUNG
-	select HAVE_CLK
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
@@ -810,11 +804,9 @@ config ARCH_EXYNOS
 	select ARCH_REQUIRE_GPIOLIB
 	select ARCH_SPARSEMEM_ENABLE
 	select ARM_GIC
-	select CLKDEV_LOOKUP
 	select COMMON_CLK
 	select CPU_V7
 	select GENERIC_CLOCKEVENTS
-	select HAVE_CLK
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
@@ -824,20 +816,6 @@ config ARCH_EXYNOS
 	help
 	  Support for SAMSUNG's EXYNOS SoCs (EXYNOS4/5)
 
-config ARCH_SHARK
-	bool "Shark"
-	select ARCH_USES_GETTIMEOFFSET
-	select CPU_SA110
-	select ISA
-	select ISA_DMA
-	select NEED_MACH_MEMORY_H
-	select PCI
-	select VIRT_TO_BUS
-	select ZONE_DMA
-	help
-	  Support for the StrongARM based Digital DNARD machine, also known
-	  as "Shark" (<http://www.shark-linux.de/shark.html>).
-
 config ARCH_DAVINCI
 	bool "TI DaVinci"
 	select ARCH_HAS_HOLES_MEMORYMODEL
@@ -865,7 +843,6 @@ config ARCH_OMAP1
 	select CLKSRC_MMIO
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_IRQ_CHIP
-	select HAVE_CLK
 	select HAVE_IDE
 	select IRQ_DOMAIN
 	select NEED_MACH_IO_H if PCCARD
@@ -1009,9 +986,7 @@ source "arch/arm/mach-sti/Kconfig"
 
 source "arch/arm/mach-s3c24xx/Kconfig"
 
-if ARCH_S3C64XX
 source "arch/arm/mach-s3c64xx/Kconfig"
-endif
 
 source "arch/arm/mach-s5p64x0/Kconfig"
 
@@ -1431,12 +1406,6 @@ config PCI_NANOENGINE
 config PCI_SYSCALL
 	def_bool PCI
 
-# Select the host bridge type
-config PCI_HOST_VIA82C505
-	bool
-	depends on PCI && ARCH_SHARK
-	default y
-
 config PCI_HOST_ITE8152
 	bool
 	depends on PCI && MACH_ARMCORE

arch/arm/Makefile

View file

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index db50b62..8b66713 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -188,7 +188,6 @@ machine-$(CONFIG_ARCH_S5P64X0)		+= s5p64x0
 machine-$(CONFIG_ARCH_S5PC100)		+= s5pc100
 machine-$(CONFIG_ARCH_S5PV210)		+= s5pv210
 machine-$(CONFIG_ARCH_SA1100)		+= sa1100
-machine-$(CONFIG_ARCH_SHARK)		+= shark
 machine-$(CONFIG_ARCH_SHMOBILE) 	+= shmobile
 machine-$(CONFIG_ARCH_SHMOBILE_MULTI) 	+= shmobile
 machine-$(CONFIG_ARCH_SIRF)		+= prima2

arch/arm/boot/compressed/Makefile

View file

diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 7ac1610..e7190bb 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -44,10 +44,6 @@ ifeq ($(CONFIG_ARCH_ACORN),y)
 OBJS		+= ll_char_wr.o font.o
 endif
 
-ifeq ($(CONFIG_ARCH_SHARK),y)
-OBJS		+= head-shark.o ofw-shark.o
-endif
-
 ifeq ($(CONFIG_ARCH_SA1100),y)
 OBJS		+= head-sa1100.o
 endif

arch/arm/boot/compressed/head-shark.S

View before deletion

diff --git a/arch/arm/boot/compressed/head-shark.S b/arch/arm/boot/compressed/head-shark.S
deleted file mode 100644
index 92b5689..0000000
--- a/arch/arm/boot/compressed/head-shark.S
+++ /dev/null
@@ -1,140 +0,0 @@
-/* The head-file for the Shark
- * by Alexander Schulz
- *
- * Does the following:
- * - get the memory layout from firmware. This can only be done as long as the mmu
- *   is still on.
- * - switch the mmu off, so we have physical addresses
- * - copy the kernel to 0x08508000. This is done to have a fixed address where the
- *   C-parts (misc.c) are executed. This address must be known at compile-time,
- *   but the load-address of the kernel depends on how much memory is installed.
- * - Jump to this location.
- * - Set r8 with 0, r7 with the architecture ID for head.S
- */
-
-#include <linux/linkage.h>
-
-#include <asm/assembler.h>
-	
-		.section	".start", "ax"
-
-		.arch armv4
-		b	__beginning
-	
-__ofw_data:	.long	0				@ the number of memory blocks
-		.space  128				@ (startaddr,size) ...
-		.space  128				@ bootargs
-		.align
-
-__beginning:	mov	r4, r0				@ save the entry to the firmware
-
-		mov	r0, #0xC0			@ disable irq and fiq
-		mov	r1, r0
-		mrs	r3, cpsr
-		bic	r2, r3, r0
-		eor	r2, r2, r1
-		msr	cpsr_c, r2
-
-		mov	r0, r4				@ get the Memory layout from firmware
-		adr	r1, __ofw_data
-		add	r2, r1, #4
-		mov	lr, pc
-		b	ofw_init
-		mov	r1, #0
-
-		adr	r2, __mmu_off			@ calculate physical address
-		sub	r2, r2, #0xf0000000		@ openprom maps us at f000 virt, 0e50 phys
-		adr	r0, __ofw_data
-		ldr	r0, [r0, #4]
-		add	r2, r2, r0
-		add	r2, r2, #0x00500000
-
-		mrc	p15, 0, r3, c1, c0
-		bic	r3, r3, #0xC			@ Write Buffer and DCache
-		bic	r3, r3, #0x1000			@ ICache
-		mcr	p15, 0, r3, c1, c0		@ disabled
-
-		mov	r0, #0
-		mcr	p15, 0, r0, c7, c7		@ flush I,D caches on v4
-		mcr	p15, 0, r0, c7, c10, 4		@ drain write buffer on v4
-		mcr	p15, 0, r0, c8, c7		@ flush I,D TLBs on v4
-
-		bic	r3, r3, #0x1			@ MMU
-		mcr	p15, 0, r3, c1, c0		@ disabled
-
-		mov	pc, r2
-
-__copy_target:	.long	0x08507FFC
-__copy_end:	.long	0x08607FFC
-		
-		.word	_start
-		.word	__bss_start
-
-		.align
-__temp_stack:	.space 128
-
-__mmu_off:
-		adr	r0, __ofw_data			@ read the 1. entry of the memory map
-		ldr	r0, [r0, #4]
-		orr	r0, r0, #0x00600000
-		sub	r0, r0, #4
-	
-		ldr	r1, __copy_end
-		ldr	r3, __copy_target
-
-/* r0 = 0x0e600000 (current end of kernelcode)
- * r3 = 0x08508000 (where it should begin)
- * r1 = 0x08608000 (end of copying area, 1MB)
- * The kernel is compressed, so 1 MB should be enough.
- * copy the kernel to the beginning of physical memory
- * We start from the highest address, so we can copy
- * from 0x08500000 to 0x08508000 if we have only 8MB
- */
-
-/* As we get more 2.6-kernels it gets more and more
- * uncomfortable to be bound to kernel images of 1MB only.
- * So we add a loop here, to be able to copy some more.
- * Alexander Schulz 2005-07-17
- */
-
-		mov	r4, #3				@ How many megabytes to copy
-
-
-__MoveCode:	sub	r4, r4, #1
-	
-__Copy:		ldr	r2, [r0], #-4
-		str	r2, [r1], #-4
-		teq	r1, r3
-		bne	__Copy
-
-		/* The firmware maps us in blocks of 1 MB, the next block is
-		   _below_ the last one. So our decrementing source pointer
-		   ist right here, but the destination pointer must be increased
-		   by 2 MB */
-		add	r1, r1, #0x00200000
-		add	r3, r3, #0x00100000
-
-		teq	r4, #0
-		bne	__MoveCode
-
-
-		/* and jump to it */
-		adr	r2, __go_on			@ where we want to jump
-		adr	r0, __ofw_data			@ read the 1. entry of the memory map
-		ldr	r0, [r0, #4]
-		sub	r2, r2, r0			@ we are mapped add 0e50 now, sub that (-0e00)
-		sub	r2, r2, #0x00500000		@ -0050
-		ldr	r0, __copy_target		@ and add 0850 8000 instead
-		add	r0, r0, #4
-		add	r2, r2, r0
-		mov	pc, r2				@ and jump there
-
-__go_on:
-		adr	sp, __temp_stack
-		add	sp, sp, #128
-		adr	r0, __ofw_data
-		mov	lr, pc
-		b	create_params
-	
-		mov	r8, #0
-		mov	r7, #15

arch/arm/boot/compressed/ofw-shark.c

View before deletion

diff --git a/arch/arm/boot/compressed/ofw-shark.c b/arch/arm/boot/compressed/ofw-shark.c
deleted file mode 100644
index 465c54b..0000000
--- a/arch/arm/boot/compressed/ofw-shark.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * linux/arch/arm/boot/compressed/ofw-shark.c
- *
- * by Alexander Schulz
- *
- * This file is used to get some basic information
- * about the memory layout of the shark we are running
- * on. Memory is usually divided in blocks a 8 MB.
- * And bootargs are copied from OpenFirmware.
- */
-
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <asm/setup.h>
-#include <asm/page.h>
-
-
-asmlinkage void
-create_params (unsigned long *buffer)
-{
-	/* Is there a better address? Also change in mach-shark/core.c */
-	struct tag *tag = (struct tag *) 0x08003000;
-	int j,i,m,k,nr_banks,size;
-	unsigned char *c;
-
-	k = 0;
-
-	/* Head of the taglist */
-	tag->hdr.tag  = ATAG_CORE;
-	tag->hdr.size = tag_size(tag_core);
-	tag->u.core.flags = 1;
-	tag->u.core.pagesize = PAGE_SIZE;
-	tag->u.core.rootdev = 0;
-
-	/* Build up one tagged block for each memory region */
-	size=0;
-	nr_banks=(unsigned int) buffer[0];
-	for (j=0;j<nr_banks;j++){
-		/* search the lowest address and put it into the next entry   */
-		/* not a fast sort algorithm, but there are at most 8 entries */
-		/* and this is used only once anyway                          */
-		m=0xffffffff;
-		for (i=0;i<(unsigned int) buffer[0];i++){
-			if (buffer[2*i+1]<m) {
-				m=buffer[2*i+1];
-				k=i;
-			}
-		}
-	  
-		tag = tag_next(tag);
-		tag->hdr.tag = ATAG_MEM;
-		tag->hdr.size = tag_size(tag_mem32);
-		tag->u.mem.size = buffer[2*k+2];
-		tag->u.mem.start = buffer[2*k+1];
-
-		size += buffer[2*k+2];
-
-		buffer[2*k+1]=0xffffffff;                    /* mark as copied */
-	}
-	
-	/* The command line */
-	tag = tag_next(tag);
-	tag->hdr.tag = ATAG_CMDLINE;
-	
-	c=(unsigned char *)(&buffer[34]);
-	j=0;
-	while (*c) tag->u.cmdline.cmdline[j++]=*c++;
-
-	tag->u.cmdline.cmdline[j]=0;
-	tag->hdr.size = (j + 7 + sizeof(struct tag_header)) >> 2;
-
-	/* Hardware revision */
-	tag = tag_next(tag);
-	tag->hdr.tag = ATAG_REVISION;
-	tag->hdr.size = tag_size(tag_revision);
-	tag->u.revision.rev = ((unsigned char) buffer[33])-'0';
-
-	/* End of the taglist */
-	tag = tag_next(tag);
-	tag->hdr.tag = 0;
-	tag->hdr.size = 0;
-}
-
-
-typedef int (*ofw_handle_t)(void *);
-
-/* Everything below is called with a wrong MMU setting.
- * This means: no string constants, no initialization of
- * arrays, no global variables! This is ugly but I didn't
- * want to write this in assembler :-)
- */
-
-int
-of_decode_int(const unsigned char *p)
-{
-	unsigned int i = *p++ << 8;
-	i = (i + *p++) << 8;
-	i = (i + *p++) << 8;
-	return (i + *p);
-}
-  
-int
-OF_finddevice(ofw_handle_t openfirmware, char *name)
-{
-	unsigned int args[8];
-	char service[12];
-
-	service[0]='f';
-	service[1]='i';
-	service[2]='n';
-	service[3]='d';
-	service[4]='d';
-	service[5]='e';
-	service[6]='v';
-	service[7]='i';
-	service[8]='c';
-	service[9]='e';
-	service[10]='\0';
-
-	args[0]=(unsigned int)service;
-	args[1]=1;
-	args[2]=1;
-	args[3]=(unsigned int)name;
-
-	if (openfirmware(args) == -1)
-		return -1;
-	return args[4];
-}
-
-int
-OF_getproplen(ofw_handle_t openfirmware, int handle, char *prop)
-{
-	unsigned int args[8];
-	char service[12];
-
-	service[0]='g';
-	service[1]='e';
-	service[2]='t';
-	service[3]='p';
-	service[4]='r';
-	service[5]='o';
-	service[6]='p';
-	service[7]='l';
-	service[8]='e';
-	service[9]='n';
-	service[10]='\0';
-
-	args[0] = (unsigned int)service;
-	args[1] = 2;
-	args[2] = 1;
-	args[3] = (unsigned int)handle;
-	args[4] = (unsigned int)prop;
-
-	if (openfirmware(args) == -1)
-		return -1;
-	return args[5];
-}
-  
-int
-OF_getprop(ofw_handle_t openfirmware, int handle, char *prop, void *buf, unsigned int buflen)
-{
-	unsigned int args[8];
-	char service[8];
-
-	service[0]='g';
-	service[1]='e';
-	service[2]='t';
-	service[3]='p';
-	service[4]='r';
-	service[5]='o';
-	service[6]='p';
-	service[7]='\0';
-
-	args[0] = (unsigned int)service;
-	args[1] = 4;
-	args[2] = 1;
-	args[3] = (unsigned int)handle;
-	args[4] = (unsigned int)prop;
-	args[5] = (unsigned int)buf;
-	args[6] = buflen;
-
-	if (openfirmware(args) == -1)
-		return -1;
-	return args[7];
-}
-  
-asmlinkage void ofw_init(ofw_handle_t o, int *nomr, int *pointer)
-{
-	int phandle,i,mem_len,buffer[32];
-	char temp[15];
-  
-	temp[0]='/';
-	temp[1]='m';
-	temp[2]='e';
-	temp[3]='m';
-	temp[4]='o';
-	temp[5]='r';
-	temp[6]='y';
-	temp[7]='\0';
-
-	phandle=OF_finddevice(o,temp);
-
-	temp[0]='r';
-	temp[1]='e';
-	temp[2]='g';
-	temp[3]='\0';
-
-	mem_len = OF_getproplen(o,phandle, temp);
-	OF_getprop(o,phandle, temp, buffer, mem_len);
-	*nomr=mem_len >> 3;
-
-	for (i=0; i<=mem_len/4; i++) pointer[i]=of_decode_int((const unsigned char *)&buffer[i]);
-
-	temp[0]='/';
-	temp[1]='c';
-	temp[2]='h';
-	temp[3]='o';
-	temp[4]='s';
-	temp[5]='e';
-	temp[6]='n';