10 Jan, 2012

1 commit

• dfc1ebe76   Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

  Device tree conversions for samsung and tegra

  Both platforms had some initial device tree support, but this adds
  much more to actually make it usable.

  * tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits)
  ARM: dts: Add intial dts file for EXYNOS4210 SoC, SMDKV310 and ORIGEN
  ARM: EXYNOS: Add Exynos4 device tree enabled board file
  rtc: rtc-s3c: Add device tree support
  input: samsung-keypad: Add device tree support
  ARM: S5PV210: Modify platform data for pl330 driver
  ARM: S5PC100: Modify platform data for pl330 driver
  ARM: S5P64x0: Modify platform data for pl330 driver
  ARM: EXYNOS: Add a alias for pdma clocks
  ARM: EXYNOS: Limit usage of pl330 device instance to non-dt build
  ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers
  DMA: PL330: Add device tree support
  ARM: EXYNOS: Modify platform data for pl330 driver
  DMA: PL330: Infer transfer direction from transfer request instead of platform data
  DMA: PL330: move filter function into driver
  serial: samsung: Fix build for non-Exynos4210 devices
  serial: samsung: add device tree support
  serial: samsung: merge probe() function from all SoC specific extensions
  serial: samsung: merge all SoC specific port reset functions
  ARM: SAMSUNG: register uart clocks to clock lookup list
  serial: samsung: remove all uses of get_clksrc and set_clksrc
  ...

  Fix up fairly trivial conflicts in arch/arm/mach-s3c2440/clock.c and
  drivers/tty/serial/Kconfig both due to just adding code close to
  changes.

  Linus Torvalds

  2012-01-10 06:28:38 +0800  

08 Jan, 2012

1 commit

• 7affca353   Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core ... Browse Code »

  * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits)
  arm: fix up some samsung merge sysdev conversion problems
  firmware: Fix an oops on reading fw_priv->fw in sysfs loading file
  Drivers:hv: Fix a bug in vmbus_driver_unregister()
  driver core: remove __must_check from device_create_file
  debugfs: add missing #ifdef HAS_IOMEM
  arm: time.h: remove device.h #include
  driver-core: remove sysdev.h usage.
  clockevents: remove sysdev.h
  arm: convert sysdev_class to a regular subsystem
  arm: leds: convert sysdev_class to a regular subsystem
  kobject: remove kset_find_obj_hinted()
  m86k: gpio - convert sysdev_class to a regular subsystem
  mips: txx9_sram - convert sysdev_class to a regular subsystem
  mips: 7segled - convert sysdev_class to a regular subsystem
  sh: dma - convert sysdev_class to a regular subsystem
  sh: intc - convert sysdev_class to a regular subsystem
  power: suspend - convert sysdev_class to a regular subsystem
  power: qe_ic - convert sysdev_class to a regular subsystem
  power: cmm - convert sysdev_class to a regular subsystem
  s390: time - convert sysdev_class to a regular subsystem
  ...

  Fix up conflicts with 'struct sysdev' removal from various platform
  drivers that got changed:
  - arch/arm/mach-exynos/cpu.c
  - arch/arm/mach-exynos/irq-eint.c
  - arch/arm/mach-s3c64xx/common.c
  - arch/arm/mach-s3c64xx/cpu.c
  - arch/arm/mach-s5p64x0/cpu.c
  - arch/arm/mach-s5pv210/common.c
  - arch/arm/plat-samsung/include/plat/cpu.h
  - arch/powerpc/kernel/sysfs.c
  and fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h

  Linus Torvalds

  2012-01-08 04:03:30 +0800  

07 Jan, 2012

1 commit

• 237c78beb   Merge branch 'depends/rmk/for-linus' into samsung/dt ... Browse Code »

  Conflicts:
  arch/arm/mach-exynos/Makefile
  arch/arm/mach-exynos/cpu.c -> common.c
  arch/arm/mach-exynos/include/mach/entry-macro.S
  arch/arm/mach-exynos/init.c -> common.c
  arch/arm/mach-s5p64x0/init.c -> common.c
  arch/arm/mach-s5pv210/init.c -> common.c

  Multiple files were moved into common.c files in the rmk/for-linus
  branch, so this moves over the samsung/dt changes to the new
  files.

  Signed-off-by: Arnd Bergmann

  Arnd Bergmann

  2012-01-07 20:42:17 +0800  

05 Jan, 2012

1 commit

• 1f34f0e2f   ARM: 7252/1: restart: S5PV210: use new restart hook ... Browse Code »

  Hook these platforms restart code into the new restart hook rather
  than using arch_reset().

  [kgene.kim@samsung.com: according to local header, updated]

  Signed-off-by: Kukjin Kim
  Signed-off-by: Russell King

  Russell King

  2012-01-05 20:57:19 +0800  

24 Dec, 2011

1 commit

• 3fa754c29   ARM: 7248/1: S5PV210: introduce arch/arm/mach-s5pv210/common.[ch] ... Browse Code »

  This patch introduces common.[ch] which are used only in the
  arch/arm/mach-s5pv210/ directory. The common.c file merges
  the cpu.c and init.c which are used commonly on S5PCV210/S5PC100
  SoC and the common.h local header file replaces with plat/s5pv210.h
  file.

  Cc: Ben Dooks
  Signed-off-by: Kukjin Kim
  Signed-off-by: Russell King

  Kukjin Kim

  2011-12-24 03:11:28 +0800