]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
12 years agoMerge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Tue, 27 Sep 2011 03:05:05 +0000 (13:05 +1000)]
Merge remote-tracking branch 'cpufreq/next'

12 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 03:03:45 +0000 (13:03 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

12 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 03:01:42 +0000 (13:01 +1000)]
Merge remote-tracking branch 'sound/for-next'

Conflicts:
arch/mips/alchemy/devboards/db1x00/platform.c
sound/mips/Kconfig

12 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Tue, 27 Sep 2011 02:56:10 +0000 (12:56 +1000)]
Merge remote-tracking branch 'crypto/master'

12 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Tue, 27 Sep 2011 02:54:51 +0000 (12:54 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
arch/arm/mach-at91/board-afeb-9260v1.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-rm9200dk.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
arch/arm/mach-at91/board-usb-a9260.c

12 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Tue, 27 Sep 2011 02:52:50 +0000 (12:52 +1000)]
Merge remote-tracking branch 'bluetooth/master'

12 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Tue, 27 Sep 2011 02:51:12 +0000 (12:51 +1000)]
Merge remote-tracking branch 'wireless/master'

Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/wl12xx/main.c

12 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Tue, 27 Sep 2011 02:45:16 +0000 (12:45 +1000)]
Merge remote-tracking branch 'net/master'

Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/s390/cio/qdio_main.c

12 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Tue, 27 Sep 2011 02:34:40 +0000 (12:34 +1000)]
Merge remote-tracking branch 'slave-dma/next'

12 years agoMerge remote-tracking branch 'scsi/master'
Stephen Rothwell [Tue, 27 Sep 2011 02:32:33 +0000 (12:32 +1000)]
Merge remote-tracking branch 'scsi/master'

12 years agoMerge remote-tracking branch 'ibft/master'
Stephen Rothwell [Tue, 27 Sep 2011 02:32:29 +0000 (12:32 +1000)]
Merge remote-tracking branch 'ibft/master'

12 years agoMerge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Tue, 27 Sep 2011 02:32:23 +0000 (12:32 +1000)]
Merge remote-tracking branch 'swiotlb/master'

12 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 02:31:06 +0000 (12:31 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'

12 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 02:29:43 +0000 (12:29 +1000)]
Merge remote-tracking branch 'infiniband/for-next'

12 years agoMerge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Tue, 27 Sep 2011 02:28:26 +0000 (12:28 +1000)]
Merge remote-tracking branch 'libata/NEXT'

12 years agoMerge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 02:28:21 +0000 (12:28 +1000)]
Merge remote-tracking branch 'kconfig/for-next'

12 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 02:26:58 +0000 (12:26 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

12 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Tue, 27 Sep 2011 02:25:15 +0000 (12:25 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'

12 years agoMerge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Tue, 27 Sep 2011 02:23:55 +0000 (12:23 +1000)]
Merge remote-tracking branch 'docs/docs-move'

12 years agoMerge branch 'quilt/kernel-doc'
Stephen Rothwell [Tue, 27 Sep 2011 02:22:44 +0000 (12:22 +1000)]
Merge branch 'quilt/kernel-doc'

12 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 27 Sep 2011 02:21:23 +0000 (12:21 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

12 years agoMerge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Tue, 27 Sep 2011 02:20:12 +0000 (12:20 +1000)]
Merge branch 'quilt/jdelvare-hwmon'

12 years agoMerge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Tue, 27 Sep 2011 02:18:54 +0000 (12:18 +1000)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

12 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Tue, 27 Sep 2011 02:17:42 +0000 (12:17 +1000)]
Merge branch 'quilt/i2c'

12 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 02:16:23 +0000 (12:16 +1000)]
Merge remote-tracking branch 'hid/for-next'

12 years agoMerge remote-tracking branch 'xfs/master'
Stephen Rothwell [Tue, 27 Sep 2011 02:14:55 +0000 (12:14 +1000)]
Merge remote-tracking branch 'xfs/master'

Conflicts:
fs/xfs/xfs_aops.c
fs/xfs/xfs_super.c

12 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 02:13:39 +0000 (12:13 +1000)]
Merge remote-tracking branch 'v9fs/for-next'

12 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Tue, 27 Sep 2011 02:12:10 +0000 (12:12 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'

12 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Tue, 27 Sep 2011 02:06:11 +0000 (12:06 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'

12 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 27 Sep 2011 02:04:58 +0000 (12:04 +1000)]
Merge remote-tracking branch 'logfs/master'

12 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 27 Sep 2011 02:03:45 +0000 (12:03 +1000)]
Merge remote-tracking branch 'gfs2/master'

12 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Tue, 27 Sep 2011 02:02:26 +0000 (12:02 +1000)]
Merge remote-tracking branch 'ext4/dev'

12 years agoMerge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 02:01:07 +0000 (12:01 +1000)]
Merge remote-tracking branch 'ceph/for-next'

12 years agoMerge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Tue, 27 Sep 2011 01:59:56 +0000 (11:59 +1000)]
Merge remote-tracking branch 'xtensa/master'

12 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Tue, 27 Sep 2011 01:58:45 +0000 (11:58 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'

12 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Tue, 27 Sep 2011 01:57:32 +0000 (11:57 +1000)]
Merge remote-tracking branch 'tile/master'

12 years agoMerge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Tue, 27 Sep 2011 01:56:21 +0000 (11:56 +1000)]
Merge remote-tracking branch 'rmobile/rmobile-latest'

12 years agoMerge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Tue, 27 Sep 2011 01:55:10 +0000 (11:55 +1000)]
Merge remote-tracking branch 'sh/sh-latest'

12 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 27 Sep 2011 01:48:51 +0000 (11:48 +1000)]
Merge remote-tracking branch 's390/features'

12 years agoMerge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Tue, 27 Sep 2011 01:47:34 +0000 (11:47 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

12 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Tue, 27 Sep 2011 01:41:16 +0000 (11:41 +1000)]
Merge remote-tracking branch 'powerpc/next'

12 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 27 Sep 2011 01:39:57 +0000 (11:39 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

12 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 01:38:38 +0000 (11:38 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'

12 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 01:37:25 +0000 (11:37 +1000)]
Merge remote-tracking branch 'm68k/for-next'

12 years agoMerge remote-tracking branch 'ia64/test'
Stephen Rothwell [Tue, 27 Sep 2011 01:36:13 +0000 (11:36 +1000)]
Merge remote-tracking branch 'ia64/test'

12 years agoMerge branch 'quilt/hexagon'
Stephen Rothwell [Tue, 27 Sep 2011 01:34:58 +0000 (11:34 +1000)]
Merge branch 'quilt/hexagon'

12 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 01:33:39 +0000 (11:33 +1000)]
Merge remote-tracking branch 'cris/for-next'

12 years agoMerge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Tue, 27 Sep 2011 01:32:28 +0000 (11:32 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'

12 years agoMerge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 01:29:12 +0000 (11:29 +1000)]
Merge remote-tracking branch 's5p/for-next'

Conflicts:
drivers/gpio/Makefile

12 years agoMerge remote-tracking branch 'i.MX/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 01:27:50 +0000 (11:27 +1000)]
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/Makefile

12 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Tue, 27 Sep 2011 01:26:28 +0000 (11:26 +1000)]
Merge remote-tracking branch 'at91/at91-next'

12 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 01:25:15 +0000 (11:25 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
Documentation/devicetree/bindings/arm/l2cc.txt
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-msm/board-msm7x30.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-nuc93x/Makefile.boot
arch/arm/mach-u300/Makefile.boot
arch/arm/mm/cache-l2x0.c
arch/arm/mm/dma-mapping.c
arch/arm/plat-mxc/include/mach/gpio.h

12 years agoMerge remote-tracking branch 'arm-lpae/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 01:05:28 +0000 (11:05 +1000)]
Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/page.h
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable-hwdef.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/kernel/head.S
arch/arm/mm/mmu.c

12 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 01:04:10 +0000 (11:04 +1000)]
Merge remote-tracking branch 'arm/for-next'

12 years agoMerge remote-tracking branch 'wireless-current/master'
Stephen Rothwell [Tue, 27 Sep 2011 01:02:34 +0000 (11:02 +1000)]
Merge remote-tracking branch 'wireless-current/master'

12 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Tue, 27 Sep 2011 01:02:32 +0000 (11:02 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'

12 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Tue, 27 Sep 2011 01:02:31 +0000 (11:02 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'

12 years agoMerge remote-tracking branch 'scsi-rc-fixes/master'
Stephen Rothwell [Tue, 27 Sep 2011 01:02:29 +0000 (11:02 +1000)]
Merge remote-tracking branch 'scsi-rc-fixes/master'

12 years agoARM: EXYNOS4: convert boot_params to atag_offset
Tushar Behera [Mon, 19 Sep 2011 11:09:01 +0000 (20:09 +0900)]
ARM: EXYNOS4: convert boot_params to atag_offset

Based on "ARM: introduce atag_offset to replace boot_params"
by Nicolas Pitre (2bb9839e312ed55a6d5824ffa6077ce3d7d63b1e).

Since boot_params variable is deleted from machine_desc, the variable
is modified in the newer board files.

CC: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoARM: S3C2443: Add hsspi-clock from pclk and rename S3C2443 hsspi sclk
Heiko Stuebner [Mon, 26 Sep 2011 23:45:23 +0000 (08:45 +0900)]
ARM: S3C2443: Add hsspi-clock from pclk and rename S3C2443 hsspi sclk

This clock is common to S3C2443/2416/2450.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoARM: S3C2416: Add HSSPI clock sourced from EPLL
Heiko Stuebner [Mon, 26 Sep 2011 23:45:09 +0000 (08:45 +0900)]
ARM: S3C2416: Add HSSPI clock sourced from EPLL

This clock is special to the S3C2416/2450 SoCs.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoARM: S3C2443: Define constant for HSSPI pclk
Heiko Stuebner [Mon, 26 Sep 2011 23:44:57 +0000 (08:44 +0900)]
ARM: S3C2443: Define constant for HSSPI pclk

It's the same clock for 2443/2416/2450.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoARM: S3C2443: Move i2s clock definitions to common code
Heiko Stuebner [Mon, 26 Sep 2011 23:44:37 +0000 (08:44 +0900)]
ARM: S3C2443: Move i2s clock definitions to common code

S3C2416/S3C2450 use the same clocks for their i2s blocks
and can therefore reuse the existing ones.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoMerge branch 'upstream-fixes' into for-next
Jiri Kosina [Mon, 26 Sep 2011 23:33:45 +0000 (01:33 +0200)]
Merge branch 'upstream-fixes' into for-next

12 years agoHID: hiddev: potential info leak in hiddev_ioctl()
Dan Carpenter [Fri, 23 Sep 2011 06:21:13 +0000 (09:21 +0300)]
HID: hiddev: potential info leak in hiddev_ioctl()

Smatch has a new check for Rosenberg type information leaks where
structs are copied to the user with uninitialized stack data in them.

In this case, the hiddev_devinfo struct has a two byte hole.

struct hiddev_devinfo {
        __u32                      bustype;              /*     0     4 */
        __u32                      busnum;               /*     4     4 */
        __u32                      devnum;               /*     8     4 */
        __u32                      ifnum;                /*    12     4 */
        __s16                      vendor;               /*    16     2 */
        __s16                      product;              /*    18     2 */
        __s16                      version;              /*    20     2 */

        /* XXX 2 bytes hole, try to pack */

        __u32                      num_applications;     /*    24     4 */

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoMerge branch 'samsung-fixes-3' of git://github.com/kgene/linux-samsung
Linus Torvalds [Mon, 26 Sep 2011 23:29:26 +0000 (16:29 -0700)]
Merge branch 'samsung-fixes-3' of git://github.com/kgene/linux-samsung

* 'samsung-fixes-3' of git://github.com/kgene/linux-samsung:
  ARM: EXYNOS4: Rename sclk_cam clocks for FIMC driver
  ARM: S5PV210: Rename sclk_cam clocks for FIMC media driver
  ARM: S5P: fix incorrect loop iterator usage on gpio-interrupt
  ARM: S3C2443: Fix bit-reset in setrate of clk_armdiv

12 years agoMerge branch 'next-samsung-cleanup-2' into for-next
Kukjin Kim [Mon, 26 Sep 2011 23:24:48 +0000 (08:24 +0900)]
Merge branch 'next-samsung-cleanup-2' into for-next

Conflicts:
arch/arm/plat-s5p/include/plat/pll.h

12 years agoMerge branch 'next-samsung-devel' into for-next
Kukjin Kim [Mon, 26 Sep 2011 23:23:02 +0000 (08:23 +0900)]
Merge branch 'next-samsung-devel' into for-next

Conflicts:
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-exynos4/Makefile
arch/arm/mach-exynos4/clock.c
arch/arm/mach-exynos4/mach-origen.c
arch/arm/mach-s3c2412/gpio.c
arch/arm/mach-s5p64x0/dma.c
arch/arm/mach-s5p64x0/gpiolib.c

12 years agoMerge branch 'next-samsung-board' into for-next
Kukjin Kim [Mon, 26 Sep 2011 23:16:35 +0000 (08:16 +0900)]
Merge branch 'next-samsung-board' into for-next

12 years agoMerge branch 'next-samsung-cleanup' into for-next
Kukjin Kim [Mon, 26 Sep 2011 23:16:30 +0000 (08:16 +0900)]
Merge branch 'next-samsung-cleanup' into for-next

12 years agoMerge branch 'next/topic-plat-samsung-2' into next-samsung-cleanup-2
Kukjin Kim [Mon, 26 Sep 2011 23:12:05 +0000 (08:12 +0900)]
Merge branch 'next/topic-plat-samsung-2' into next-samsung-cleanup-2

12 years agoARM: S5P6450: Add LCD-LTE480 and enable Framebuffer support
Ajay Kumar [Mon, 26 Sep 2011 22:53:20 +0000 (07:53 +0900)]
ARM: S5P6450: Add LCD-LTE480 and enable Framebuffer support

This patch:
-- Adds platform device support for LCD-LTE480.
-- Adds platform data for FB with win_mode and default_bpp.
-- Enables FB device support and platform-lcd support.
-- Adds SPCON settings for LCD.

Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoARM: S5P6440: Add LCD-LTE480 and enable Framebuffer support
Ajay Kumar [Mon, 26 Sep 2011 22:51:22 +0000 (07:51 +0900)]
ARM: S5P6440: Add LCD-LTE480 and enable Framebuffer support

This patch:
-- Adds platform device support for LCD-LTE480.
-- Adds platform data for FB with win_mode and default_bpp.
-- Enables FB device support and platform-lcd support.
-- Adds SPCON settings for LCD.

Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoARM: S5P64X0: Add GPIO setup for LCD
Ajay Kumar [Mon, 26 Sep 2011 22:46:57 +0000 (07:46 +0900)]
ARM: S5P64X0: Add GPIO setup for LCD

This patch adds GPIO lines settings(HSYNC, VSYNC, VCLK and VD) for LCD.

Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoARM: S5P64X0: Set s3c_device_fb name
Ajay Kumar [Mon, 26 Sep 2011 22:46:50 +0000 (07:46 +0900)]
ARM: S5P64X0: Set s3c_device_fb name

Set s3c_device_fb name as "s5p64x0-fb" for S5P6440 and S5P6450.

Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoARM: S5P64X0: Add register base and IRQ for Framebuffer
Ajay Kumar [Mon, 26 Sep 2011 22:46:45 +0000 (07:46 +0900)]
ARM: S5P64X0: Add register base and IRQ for Framebuffer

This patch adds:
-- Framebuffer related register mappings and bit fields.
-- IRQ number being used.

Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoARM: EXYNOS4: Add TVOUT support for SMDKV310
Hatim Ali [Mon, 26 Sep 2011 22:37:18 +0000 (07:37 +0900)]
ARM: EXYNOS4: Add TVOUT support for SMDKV310

Add support for TVOUT on SMDKV310 board.

Signed-off-by: Hatim Ali <hatim.rv@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoASoC: Flush Samsung DMA on free
Mark Brown [Mon, 26 Sep 2011 22:29:11 +0000 (07:29 +0900)]
ASoC: Flush Samsung DMA on free

Ever since it was written the Samsung DMA driver has had a TODO in the
hw_free() function wondering if we need to flush the DMA buffers. Up until
now the answer has been no but with the recent improvements Boojin has
done to the DMA infrastructure for the Samsung port the answer has changed
to yes for at least S3C6410 systems.

If we don't then when we next prepare() the channel the API will get
confused trying to run callbacks on the transfers hanging around from the
previous time the stream was open and oops.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoARM: EXYNOS4: Support suspend/resume for EXYNOS4212
Jongpill Lee [Mon, 26 Sep 2011 22:26:04 +0000 (07:26 +0900)]
ARM: EXYNOS4: Support suspend/resume for EXYNOS4212

Signed-off-by: Jongpill Lee <boyko.lee@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoARM: EXYNOS4: Add PMU register definition for EXYNOS4212
Jongpill Lee [Mon, 26 Sep 2011 22:24:58 +0000 (07:24 +0900)]
ARM: EXYNOS4: Add PMU register definition for EXYNOS4212

Signed-off-by: Jongpill Lee <boyko.lee@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoARM: EXYNOS4: Modify PMU register setting function
Jongpill Lee [Mon, 26 Sep 2011 22:22:11 +0000 (07:22 +0900)]
ARM: EXYNOS4: Modify PMU register setting function

This patch modifies PMU register setting function
to support the other EXYNOS4 SoCs.

Signed-off-by: Jongpill Lee <boyko.lee@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoARM: S5PV210: UNIVERSAL_C210: Add support for M-5MOLS image sensor
Sylwester Nawrocki [Mon, 26 Sep 2011 22:18:55 +0000 (07:18 +0900)]
ARM: S5PV210: UNIVERSAL_C210: Add support for M-5MOLS image sensor

Add voltage regulator definitions for M-5MOLS camera, platform data
definition for the sensor and MIPI-CSI receiver drivers.
Add CAM power domain dependencies for FIMC and CSIS devices.
Define required I2C0 bus timings. Setup camera port A GPIO.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoARM: S5PV210: Add support for NOON010PC30 sensor on GONI board
Sylwester Nawrocki [Mon, 26 Sep 2011 22:18:55 +0000 (07:18 +0900)]
ARM: S5PV210: Add support for NOON010PC30 sensor on GONI board

Add platform data for CIF camera sensor and FIMC platform data
entries for it. Add platform device for s5p-fimc media device
driver and the camera port A I/O pins initialization.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoARM: S5PV210: enable TV support on GONI board
Tomasz Stanislawski [Fri, 16 Sep 2011 09:48:52 +0000 (18:48 +0900)]
ARM: S5PV210: enable TV support on GONI board

This patch adds platform devices and regulators for TV devices on
Samsung Goni board.

Signed-off-by: Tomasz Stanislawski <t.stanislaws@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoARM: EXYNOS4: enable TV support on Universal_C210 board
Tomasz Stanislawski [Fri, 16 Sep 2011 09:48:32 +0000 (18:48 +0900)]
ARM: EXYNOS4: enable TV support on Universal_C210 board

This patch adds platform devices and regulators for TV devices on
Samsung Universal C210 board.

Signed-off-by: Tomasz Stanislawski <t.stanislaws@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoARM: S5P: add support for tv device
Tomasz Stanislawski [Mon, 19 Sep 2011 07:44:42 +0000 (16:44 +0900)]
ARM: S5P: add support for tv device

This patch adds all the resources for TV drivers and devices for Samsung
Exynos4 and S5PV210 platforms.

Signed-off-by: Tomasz Stanislawski <t.stanislaws@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
[m.szyprowski: squashed Exynos4 and S5PV210 patches and rewrote commit message]
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoARM: SAMSUNG: add i2c hdmiphy controller definitions
Tomasz Stanislawski [Fri, 16 Sep 2011 09:44:36 +0000 (18:44 +0900)]
ARM: SAMSUNG: add i2c hdmiphy controller definitions

This patch adds hdmiphy dedicated i2c controller definitions.

Signed-off-by: Tomasz Stanislawski <t.stanislaws@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
[m.szyprowski: renamed to i2c-hdmiphy and squashed Exynos4 and S5PV210 patches]
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoMerge branch 'next/topic-gpio-samsung' into next-samsung-devel
Kukjin Kim [Mon, 26 Sep 2011 22:13:56 +0000 (07:13 +0900)]
Merge branch 'next/topic-gpio-samsung' into next-samsung-devel

12 years agoMerge branch 'next/topic-dma-samsung' into next-samsung-devel
Kukjin Kim [Mon, 26 Sep 2011 22:13:50 +0000 (07:13 +0900)]
Merge branch 'next/topic-dma-samsung' into next-samsung-devel

12 years agoMerge branch 'next/topic-exynos4-devel' into next-samsung-devel
Kukjin Kim [Mon, 26 Sep 2011 22:13:44 +0000 (07:13 +0900)]
Merge branch 'next/topic-exynos4-devel' into next-samsung-devel

12 years agoMerge branch 'next/topic-s3c64xx-devel' into next-samsung-devel
Kukjin Kim [Mon, 26 Sep 2011 22:13:39 +0000 (07:13 +0900)]
Merge branch 'next/topic-s3c64xx-devel' into next-samsung-devel

12 years agoARM: EXYNOS4: Rename sclk_cam clocks for FIMC driver
Sylwester Nawrocki [Mon, 26 Sep 2011 22:00:59 +0000 (07:00 +0900)]
ARM: EXYNOS4: Rename sclk_cam clocks for FIMC driver

The sclk_cam clocks are now controlled by the top level FIMC media
device driver bound to "s5p-fimc-md" platform device.
Rename sclk_cam clocks so they accessible by the corresponding
driver.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoARM: S5PV210: Rename sclk_cam clocks for FIMC media driver
Sylwester Nawrocki [Mon, 26 Sep 2011 22:00:53 +0000 (07:00 +0900)]
ARM: S5PV210: Rename sclk_cam clocks for FIMC media driver

The sclk_cam clocks are now controlled by the top level FIMC media
device driver bound to "s5p-fimc-md" platform device.
Rename sclk_cam clocks so they accessible by the corresponding
driver.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
12 years agoASoC: twl6040: Move the delayed_work for HS detection under twl6040_jack_data
Peter Ujfalusi [Mon, 26 Sep 2011 13:26:27 +0000 (16:26 +0300)]
ASoC: twl6040: Move the delayed_work for HS detection under twl6040_jack_data

The delayed_work named 'delayed_work' is for the headset detection,
so move it to the twl6040_jack_data struct.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: twl6040: Move delayed_work struct inside twl6040_output for HS/HF
Peter Ujfalusi [Mon, 26 Sep 2011 13:26:26 +0000 (16:26 +0300)]
ASoC: twl6040: Move delayed_work struct inside twl6040_output for HS/HF

The delayed works for the output can be moved within the
twl6040_output struct (from the twl6040_data) to be better
organized.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: twl6040: Combine the custom volsw get, and put functions
Peter Ujfalusi [Mon, 26 Sep 2011 13:26:25 +0000 (16:26 +0300)]
ASoC: twl6040: Combine the custom volsw get, and put functions

We can manage with one set of get, and put function for the gain
controls we need to handle with custom code due to the shadowing
of the register.
For both get, and put function we can call decide based on the
mc->rreg value, if we need to call the volsw, or the vlosw_2r
variant (in 2r case rreg is not 0).
Handling of the shadow values are the same for both type of
controls.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: twl6040: Rename pga_event to out_drv_event
Peter Ujfalusi [Mon, 26 Sep 2011 13:26:24 +0000 (16:26 +0300)]
ASoC: twl6040: Rename pga_event to out_drv_event

This event handler is used with the OUT_DRV widgets.
The name pga_event was misleading.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: sdp4430: Configure McPDM offset cancellation
Peter Ujfalusi [Mon, 26 Sep 2011 13:05:59 +0000 (16:05 +0300)]
ASoC: sdp4430: Configure McPDM offset cancellation

Based on the values from twl6040 codec (HSOTRIM L/R) we can configure
the McPDM offset cancellation.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: omap-mcpdm: API to configure offset cancellation
Peter Ujfalusi [Mon, 26 Sep 2011 13:05:58 +0000 (16:05 +0300)]
ASoC: omap-mcpdm: API to configure offset cancellation

The offset cancellation values can be different from board to board, even
on the same HW platform.
Provide a way for the machine drivers to configure the McPDM offset
cancellation.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: twl6040: Function to fetch the TRIM values
Peter Ujfalusi [Mon, 26 Sep 2011 13:05:57 +0000 (16:05 +0300)]
ASoC: twl6040: Function to fetch the TRIM values

Provide API to fetch the TRIM values (for machine drivers)

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>