]> git.karo-electronics.de Git - mv-sheeva.git/log
mv-sheeva.git
13 years agoARM: SAMSUNG: Add support s3c2443-adc for S3C2443
Heiko Stuebner [Wed, 12 Oct 2011 12:34:12 +0000 (21:34 +0900)]
ARM: SAMSUNG: Add support s3c2443-adc for S3C2443

The S3C2443-adc is 10 bit wide and has its mux-select
in an extra register at base+0x18

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: SAMSUNG: Allow overriding of adc device name for S3C24XX
Heiko Stuebner [Wed, 12 Oct 2011 12:34:12 +0000 (21:34 +0900)]
ARM: SAMSUNG: Allow overriding of adc device name for S3C24XX

The adc blocks of S3C2443 and S3C2416 contain quirks not present
in the stock S3C24xx adc. Therefore allow them to alter the
device name via s3c_adc_setname.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: SAMSUNG: Fix mux bit modification in s3c_adc_select
Heiko Stuebner [Wed, 12 Oct 2011 12:34:11 +0000 (21:34 +0900)]
ARM: SAMSUNG: Fix mux bit modification in s3c_adc_select

The mux bits in the adccon register should be cleared only
if muxing is really done in ADCCON and not another register.

This patch introduces a conditional for this.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: SAMSUNG: Add adc registers for S3C2443/S3C2416
Heiko Stuebner [Wed, 12 Oct 2011 12:34:11 +0000 (21:34 +0900)]
ARM: SAMSUNG: Add adc registers for S3C2443/S3C2416

The adc blocks of the S3C2443 and S3C2416 define some
additional registers and bits.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agogpio/samsung: Move SoC specific codes within macro
Tushar Behera [Tue, 4 Oct 2011 23:55:49 +0000 (08:55 +0900)]
gpio/samsung: Move SoC specific codes within macro

In drivers/gpio/gpio-samsung.c, there are certain structures
and functions which are not getting used if the particular
CPU is not selected. These code segments are moved under CPU
specific macros to remove compilation warnings.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agogpio/samsung: Fix incorrect gpio pull up/down callback for EXYNOS4
Thomas Abraham [Wed, 12 Oct 2011 11:11:17 +0000 (20:11 +0900)]
gpio/samsung: Fix incorrect gpio pull up/down callback for EXYNOS4

Some of the gpio chips of exynos4 are assigned a default gpio config without
the exynos4 specific pull up/down callbacks which resulted in incorrect
setting of pull up/down configuration.

Fix this by adding two new exynos4 specific entries in the array of default
configs with set_pull and get_pull callbacks set to exynos4 specific callbacks
The new default gpio configs can then be used for exynos4 gpio chips.

Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: S3C64XX: Enable TCM support
Mark Brown [Mon, 10 Oct 2011 23:57:11 +0000 (08:57 +0900)]
ARM: S3C64XX: Enable TCM support

The S3C64xx CPUs have TCMs so enable the kernel support for it
on these systems.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agogpio/samsung: only register available gpio banks
Peter Korsgaard [Mon, 10 Oct 2011 10:55:58 +0000 (19:55 +0900)]
gpio/samsung: only register available gpio banks

Only register gpio banks provided by SoC instead of the maximum possible
to lessen confusion, get rid of a warning from gpiolib and stop it from
eating into the extra gpios for configs with S3C24XX_GPIO_EXTRA != 0.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: S3C2410: fix S3C_GPIO_SPACE #error message to match reality
Peter Korsgaard [Mon, 10 Oct 2011 10:55:58 +0000 (19:55 +0900)]
ARM: S3C2410: fix S3C_GPIO_SPACE #error message to match reality

S3C_GPIO_SPACE cannont be NON-zero, not zero.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Remove useless codes on NURI board
Kukjin Kim [Mon, 10 Oct 2011 10:55:30 +0000 (19:55 +0900)]
ARM: EXYNOS4: Remove useless codes on NURI board

The 'nuri_cm_devices' is defined but not used.

Cc: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Register power domains on ORIGEN
Sachin Kamat [Mon, 10 Oct 2011 10:54:59 +0000 (19:54 +0900)]
ARM: EXYNOS4: Register power domains on ORIGEN

This patch registers all the available power domains on ORIGEN board.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Enable regulator support for HDMI on ORIGEN
Sachin Kamat [Mon, 10 Oct 2011 10:54:53 +0000 (19:54 +0900)]
ARM: EXYNOS4: Enable regulator support for HDMI on ORIGEN

Since the DC5V line is connected directly to the HDMI connector,
"hdmi-en" regulator would become a dummy regulator on origen board
(by defining REGULATOR_DUMMY in the kernel config file).

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: S5P64X0: Add Power Management support
Abhilash Kesavan [Tue, 4 Oct 2011 11:30:22 +0000 (20:30 +0900)]
ARM: S5P64X0: Add Power Management support

Add suspend-to-ram support for SMDK6440/50

Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: S5P: Make the sleep code common for S5P series SoCs
Abhilash Kesavan [Tue, 4 Oct 2011 11:25:51 +0000 (20:25 +0900)]
ARM: S5P: Make the sleep code common for S5P series SoCs

The sleep code for S5PV210 and EXYNOS4 are identical; moreover
S5p64X0 and S5PC100 for which support will be added soon can
use the same procedure. Create a common sleep code in the plat-s5p
directory so that it can be re-used.

Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: S5P: Make the common S5P PM code conditionally compile
Abhilash Kesavan [Tue, 4 Oct 2011 11:25:51 +0000 (20:25 +0900)]
ARM: S5P: Make the common S5P PM code conditionally compile

Pave the way for adding PM support on S5P64X0, which is more similar
to the S3C64XX series than the S5P series. Hence, the common pm code
(containing dummy functions) should not be used for S5P64X0.

Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoMerge branch 'next-samsung-board-2' into next-samsung-devel-2
Kukjin Kim [Tue, 4 Oct 2011 11:20:21 +0000 (20:20 +0900)]
Merge branch 'next-samsung-board-2' into next-samsung-devel-2

13 years agoMerge branch 'next-samsung-cleanup-2' into next-samsung-devel-2
Kukjin Kim [Tue, 4 Oct 2011 11:20:08 +0000 (20:20 +0900)]
Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2

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

13 years agoMerge branch 'next-samsung-devel' into next-samsung-devel-2
Kukjin Kim [Tue, 4 Oct 2011 11:18:36 +0000 (20:18 +0900)]
Merge branch 'next-samsung-devel' into next-samsung-devel-2

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

13 years agoMerge branch 'next-samsung-board' into next-samsung-devel-2
Kukjin Kim [Tue, 4 Oct 2011 11:14:11 +0000 (20:14 +0900)]
Merge branch 'next-samsung-board' into next-samsung-devel-2

13 years agoMerge branch 'next-samsung-cleanup' into next-samsung-devel-2
Kukjin Kim [Tue, 4 Oct 2011 11:14:06 +0000 (20:14 +0900)]
Merge branch 'next-samsung-cleanup' into next-samsung-devel-2

13 years agoARM: SAMSUNG: Move S5P header files to plat-samsung
Kukjin Kim [Wed, 28 Sep 2011 12:06:52 +0000 (21:06 +0900)]
ARM: SAMSUNG: Move S5P header files to plat-samsung

This patch moves header files from plat-s5p to plat-samsung to
remove plat-s5p directory to make one plat-samsung directory
for Samsung SoCs.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: SAMSUNG: Move S3C24XX header files to plat-samsung
Kukjin Kim [Wed, 28 Sep 2011 11:48:52 +0000 (20:48 +0900)]
ARM: SAMSUNG: Move S3C24XX header files to plat-samsung

This patch moves header files from plat-s3c24xx to plat-samsung to
remove plat-s3c24xx directory to make one plat-samsung directory for
Samsung SoCs. And this patch includes fixing coding style, too.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: SAMSUNG: Moving each SoC support header files
Kukjin Kim [Sat, 10 Sep 2011 01:09:21 +0000 (10:09 +0900)]
ARM: SAMSUNG: Moving each SoC support header files

This patch moves SoC header files for supporting each SoCs to
plat-samsung directory. This is required to make one plat-
directory for Samsung SoCs.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: SAMSUNG: Consolidate plat/pll.h
Kukjin Kim [Tue, 4 Oct 2011 10:41:43 +0000 (19:41 +0900)]
ARM: SAMSUNG: Consolidate plat/pll.h

Removed
- arch/arm/plat-s3c24xx/include/plat/pll.h
- arch/arm/mach-s3c64xx/include/mach/pll.h
- arch/arm/plat-s5p/include/plat/pll.h
- arch/arm/plat-samsung/include/plat/pll6553x.h

And created
- arch/arm/plat-samsung/include/plat/pll.h

Cc: Ben Dooks <ben-linux@fluff.org>
[kgene.kim@samsung.com: changed title]
[kgene.kim@samsung.com: fixed conflicts in plat-s5p/include/pll.h]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: SAMSUNG: Consolidate plat/pwm-clock.h
Kukjin Kim [Mon, 19 Sep 2011 23:44:38 +0000 (08:44 +0900)]
ARM: SAMSUNG: Consolidate plat/pwm-clock.h

Removed
 - arch/arm/plat-s3c24xx/include/mach/pwm-clock.h
 - arch/arm/mach-s3c64xx/include/mach/pwm-clock.h
 - arch/arm/mach-s5p64x0/include/mach/pwm-clock.h
 - arch/arm/mach-s5pc100/include/mach/pwm-clock.h
 - arch/arm/mach-s5pv210/include/mach/pwm-clock.h
 - arch/arm/mach-exynos4/include/mach/pwm-clock.h

And created
 - arch/arm/plat-samsung/include/plat/pwm-clock.h

Cc: Ben Dooks <ben-linux@fluff.org>
[kgene.kim@samsung.com: changed title]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: SAMSUNG: Cleanup mach/clkdev.h
Kukjin Kim [Mon, 19 Sep 2011 23:39:09 +0000 (08:39 +0900)]
ARM: SAMSUNG: Cleanup mach/clkdev.h

According to commit a3831cf ("ARM: Consolidate the
clkdev header files"), current mach/clkdev.h is no
needed in Samsung stuff.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: SAMSUNG: remove sdhci default configuration setup platform helper
Thomas Abraham [Wed, 28 Sep 2011 01:59:34 +0000 (10:59 +0900)]
ARM: SAMSUNG: remove sdhci default configuration setup platform helper

The sdhci platform helper function that sets up the default controller
configuration is removed for all Samsung platforms since such default
controller configuration can be handled by the driver.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Add FIMC device on SMDKV310 board
Sachin Kamat [Wed, 28 Sep 2011 02:13:30 +0000 (11:13 +0900)]
ARM: EXYNOS4: Add FIMC device on SMDKV310 board

This patch adds definitions to enable support for s5p-fimc driver on
SMDKV310 board.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Add header file protection macros
Sachin Kamat [Wed, 28 Sep 2011 01:38:12 +0000 (10:38 +0900)]
ARM: EXYNOS4: Add header file protection macros

This patch adds header file protection macros to prevent duplication.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Add usb ehci device to the SMDKV310
Jingoo Han [Wed, 28 Sep 2011 01:33:25 +0000 (10:33 +0900)]
ARM: EXYNOS4: Add usb ehci device to the SMDKV310

This patch is to support usb ehci device to the SMDKV310 board.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
Acked-by: Boojin Kim <boojin.kim@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 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>
13 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>
13 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>
13 years agoARM: S5PV210: Add support for M-5MOLS image sensor on UNIVERSAL_C210
Sylwester Nawrocki [Mon, 26 Sep 2011 22:18:55 +0000 (07:18 +0900)]
ARM: S5PV210: Add support for M-5MOLS image sensor on UNIVERSAL_C210

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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 years agoMerge branch 'next/topic-gpio-samsung' into next-samsung-devel
Kukjin Kim [Tue, 4 Oct 2011 09:57:43 +0000 (18:57 +0900)]
Merge branch 'next/topic-gpio-samsung' into next-samsung-devel

13 years agoMerge branch 'next/topic-dma-samsung' into next-samsung-devel
Kukjin Kim [Tue, 4 Oct 2011 09:57:38 +0000 (18:57 +0900)]
Merge branch 'next/topic-dma-samsung' into next-samsung-devel

13 years agoMerge branch 'next/topic-exynos4-devel' into next-samsung-devel
Kukjin Kim [Tue, 4 Oct 2011 09:57:34 +0000 (18:57 +0900)]
Merge branch 'next/topic-exynos4-devel' into next-samsung-devel

13 years agoMerge branch 'next/topic-s3c64xx-devel' into next-samsung-devel
Kukjin Kim [Tue, 4 Oct 2011 09:57:29 +0000 (18:57 +0900)]
Merge branch 'next/topic-s3c64xx-devel' into next-samsung-devel

13 years agoARM: EXYNOS4: Add support SMDK4412 Board
Changhwan Youn [Tue, 4 Oct 2011 08:09:26 +0000 (17:09 +0900)]
ARM: EXYNOS4: Add support SMDK4412 Board

SMDK4412 board is same as a SMDK4212 board except that
it has EXYNOS4412 SoC, thus it can share machine code
with SMDK4212.

This patch renames mach-smdk4212.c to mach-smdk4x12.c
to support both SMDK4212 and SMDK4412 board with one
machine file.

Signed-off-by: Changhwan Youn <chaos.youn@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Add MCT support for EXYNOS4412
Changhwan Youn [Tue, 4 Oct 2011 08:09:26 +0000 (17:09 +0900)]
ARM: EXYNOS4: Add MCT support for EXYNOS4412

Current MCT implementation only provide 2 event timers,
thus cannot support EXYNOS4412 which has 4 CPU cores.
This patch fixes MCT implementation to support SoCs
with 4 cores.

Signed-off-by: Changhwan Youn <chaos.youn@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Add functions for gic interrupt handling
Changhwan Youn [Tue, 4 Oct 2011 08:08:57 +0000 (17:08 +0900)]
ARM: EXYNOS4: Add functions for gic interrupt handling

This patch adds two functions for gic interrupt handling.
1. Add interrupt handling of 4 cores.
2. Dynamically set gic bank offset according to the type of soc.
   Gic bank offset of EXYNOS4412 is 0x4000 while the offset of
   EXYNOS4210 and EXYNOS4212 is 0x8000.

This patch is necessary because EXYNOS4 socs cannot support
GIC register banking as described in commit aab74d3e75364.

Signed-off-by: Changhwan Youn <chaos.youn@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Add support clock for EXYNOS4412
Changhwan Youn [Tue, 4 Oct 2011 08:08:56 +0000 (17:08 +0900)]
ARM: EXYNOS4: Add support clock for EXYNOS4412

This patch makes EXYNOS4412 use same clock code for
EXYNOS4212 because the clock hierarchy of both SoCs
are same.

Signed-off-by: Changhwan Youn <chaos.youn@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Add support new EXYNOS4412 SoC
Changhwan Youn [Tue, 4 Oct 2011 08:08:56 +0000 (17:08 +0900)]
ARM: EXYNOS4: Add support new EXYNOS4412 SoC

This patch adds Samsung EXYNOS4412 SoC support.
The EXYNOS4412 integrates a ARM Cortex A9 quad-core.

Signed-off-by: Changhwan Youn <chaos.youn@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Add support MCT PPI for EXYNOS4212
Changhwan Youn [Tue, 4 Oct 2011 08:02:58 +0000 (17:02 +0900)]
ARM: EXYNOS4: Add support MCT PPI for EXYNOS4212

This patch implements clock event timer using MCT PPI
and make EXYNOS4212 use MCT PPI instead of MCT SPI.

Signed-off-by: Changhwan Youn <chaos.youn@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Add support PPI in external GIC
Changhwan Youn [Tue, 4 Oct 2011 08:02:58 +0000 (17:02 +0900)]
ARM: EXYNOS4: Add support PPI in external GIC

To support PPI in external GIC of EXYNOS4 SoCs,
gic_arch_extn.irq_eoi, irq_unmask and irq_mask are
fixed. This patch is necessary because external GIC of EXYNOS4
cannot support register banking.

Signed-off-by: Changhwan Youn <chaos.youn@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 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>
[kgene.kim@samsung.com: added fixing for smdkv310]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agogpio/samsung: correct pin configuration for S5PC100/S5PC110/EXYNOS4
Marek Szyprowski [Mon, 26 Sep 2011 04:10:32 +0000 (13:10 +0900)]
gpio/samsung: correct pin configuration for S5PC100/S5PC110/EXYNOS4

Commit 1b39d5f2cc introduced new common gpio driver for all Samsung GPIO
SoCs. The new driver use wrong configuration setup for all gpio pins on
S5PC100 and S5PV210 SoCs and external interrupt lines on Exynos4 SoCs.
This patch fixes this issue.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agogpio/samsung: fix GPIO interrupt registration for EXYNOS4 SoCs
Marek Szyprowski [Mon, 26 Sep 2011 04:09:08 +0000 (13:09 +0900)]
gpio/samsung: fix GPIO interrupt registration for EXYNOS4 SoCs

Commit 1b39d5f2cc introduced new common gpio driver for all Samsung GPIO
SoCs. The new driver doesn't correctly register GPIO interrupts on
Samsung Exynos4 SoCs. This is caused by a typo in define name. This
patch fixes this issue.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agogpio/samsung: fix broken configuration for EXYNOS4 GPIO banks
Marek Szyprowski [Mon, 26 Sep 2011 04:06:57 +0000 (13:06 +0900)]
gpio/samsung: fix broken configuration for EXYNOS4 GPIO banks

Commit 1b39d5f2cc introduced new common gpio driver for all Samsung GPIO
SoCs. The new driver doesn't work correctly on Samsung Exynos4 SoC. It
fails to set configuration for all but external interrupt pins. This
patch fixes this issue.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Enable MFC on Samsung SMDKV310
Sachin Kamat [Fri, 12 Aug 2011 09:21:27 +0000 (18:21 +0900)]
ARM: EXYNOS4: Enable MFC on Samsung SMDKV310

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Update config file of NURI to enable RTC
Chanwoo Choi [Fri, 12 Aug 2011 08:14:56 +0000 (17:14 +0900)]
ARM: EXYNOS4: Update config file of NURI to enable RTC

This patch update config file of NURI board to enable RTC

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: enable frame buffer on Nuri board
Marek Szyprowski [Thu, 11 Aug 2011 10:57:28 +0000 (19:57 +0900)]
ARM: EXYNOS4: enable frame buffer on Nuri board

This patch adds platform definitions to enable s3c-fb driver.
Framebuffer window with 1280x800x16bpp mode has been defined.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: enable frame buffer on Universal C210 board
Marek Szyprowski [Thu, 11 Aug 2011 10:55:40 +0000 (19:55 +0900)]
ARM: EXYNOS4: enable frame buffer on Universal C210 board

This patch adds platform definitions to enable s3c-fb driver.
Framebuffer window with 480x800x16bpp mode has been defined.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Add HPD and PD support for HDMI on ORIGEN
Sachin Kamat [Mon, 3 Oct 2011 00:16:53 +0000 (09:16 +0900)]
ARM: EXYNOS4: Add HPD and PD support for HDMI on ORIGEN

This patch adds hot plug detection(HPD) and power domain(PD)
support for HDMI on ORIGEN board.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Add machine support for 7" LCD on ORIGEN
Tushar Behera [Mon, 3 Oct 2011 00:12:56 +0000 (09:12 +0900)]
ARM: EXYNOS4: Add machine support for 7" LCD on ORIGEN

ORIGEN board is fitted with 7" LCD panel HV070WSA. The pixel
resolution of the LCD panel is 1024x600.

Also power domain device for LCD0 is registered.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Configure MAX8997 PMIC for ORIGEN
Inderpal Singh [Sun, 2 Oct 2011 23:51:20 +0000 (08:51 +0900)]
ARM: EXYNOS4: Configure MAX8997 PMIC for ORIGEN

Configure MAX8997 PMIC and provide platform specific
data for ORIGEN board.

Signed-off-by: Inderpal Singh <inderpal.singh@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Add HDMI support for ORIGEN
Sachin Kamat [Sat, 17 Sep 2011 02:42:43 +0000 (11:42 +0900)]
ARM: EXYNOS4: Add HDMI support for ORIGEN

This patch adds HDMI (TVout) support for ORIGEN board.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Add keypad support for ORIGEN
Sachin Kamat [Fri, 16 Sep 2011 12:41:25 +0000 (21:41 +0900)]
ARM: EXYNOS4: Add keypad support for ORIGEN

This patch adds keypad support for ORIGEN board as GPIO keys.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Add support for secondary MMC port on ORIGEN
Tushar Behera [Wed, 31 Aug 2011 07:57:37 +0000 (16:57 +0900)]
ARM: EXYNOS4: Add support for secondary MMC port on ORIGEN

Secondary MMC port on ORIGEN is connected to sdhci instance 0.
Support for secondary MMC port is extended by registering
sdhci instance 0.

Since sdhci instance 2 can contain a bootable media, sdhci
instance 0 is registered after instance 2.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
[kgene.kim@samsung.com: Added comments in registering sdhci]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Fix sdhci card detection for ORIGEN
Tushar Behera [Wed, 31 Aug 2011 07:01:15 +0000 (16:01 +0900)]
ARM: EXYNOS4: Fix sdhci card detection for ORIGEN

Fix incorrect value of cd_type field in platform data
for sdhci device.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Add PWM backlight support on ORIGEN
Giridhar Maruthy [Wed, 31 Aug 2011 06:58:52 +0000 (15:58 +0900)]
ARM: EXYNOS4: Add PWM backlight support on ORIGEN

This patch adds support for LCD backlight using PWM timer
on ORIGEN board.

Signed-off-by: Giridhar Maruthy <giridhar.maruthy@linaro.org>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Add FIMC device on ORIGEN board
Sachin Kamat [Wed, 31 Aug 2011 06:52:27 +0000 (15:52 +0900)]
ARM: EXYNOS4: Add FIMC device on ORIGEN board

This patch adds definitions to enable support for s5p-fimc
driver on ORIGEN board.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
[kgene.kim@samsung.com: re-ordering changes]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoARM: EXYNOS4: Add USB EHCI device to ORIGEN board
Sachin Kamat [Wed, 31 Aug 2011 06:47:16 +0000 (15:47 +0900)]
ARM: EXYNOS4: Add USB EHCI device to ORIGEN board

Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
[kgene.kim@samsung.com: re-ordering changes in Kconfig]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
13 years agoMerge branch 'next-samsung-board-v3.1' into next/topic-exynos4-devel-origen
Kukjin Kim [Sun, 2 Oct 2011 23:42:01 +0000 (08:42 +0900)]
Merge branch 'next-samsung-board-v3.1' into next/topic-exynos4-devel-origen

13 years agoLinux 3.1-rc8
Linus Torvalds [Tue, 27 Sep 2011 22:48:34 +0000 (15:48 -0700)]
Linux 3.1-rc8

13 years agoMerge branch 'for-linus' of git://github.com/tiwai/sound
Linus Torvalds [Tue, 27 Sep 2011 22:46:21 +0000 (15:46 -0700)]
Merge branch 'for-linus' of git://github.com/tiwai/sound

* 'for-linus' of git://github.com/tiwai/sound:
  ASoC: ssm2602: Re-enable oscillator after suspend
  ALSA: usb-audio: Check for possible chip NULL pointer before clearing probing flag
  ALSA: hda/realtek - Don't detect LO jack when identical with HP
  ALSA: hda/realtek - Avoid bogus HP-pin assignment
  ALSA: HDA: No power nids on 92HD93
  ASoC: omap-mcbsp: Do not attempt to change DAI sysclk if stream is active

13 years agoMerge branch 'pm-fixes' of git://github.com/rjwysocki/linux-pm
Linus Torvalds [Tue, 27 Sep 2011 22:41:32 +0000 (15:41 -0700)]
Merge branch 'pm-fixes' of git://github.com/rjwysocki/linux-pm

* 'pm-fixes' of git://github.com/rjwysocki/linux-pm:
  PM / Clocks: Do not acquire a mutex under a spinlock

13 years agoMerge branch 'fix/asoc' into for-linus
Takashi Iwai [Tue, 27 Sep 2011 16:21:41 +0000 (18:21 +0200)]
Merge branch 'fix/asoc' into for-linus

13 years agovfs: remove LOOKUP_NO_AUTOMOUNT flag
Linus Torvalds [Tue, 27 Sep 2011 15:12:33 +0000 (08:12 -0700)]
vfs: remove LOOKUP_NO_AUTOMOUNT flag

That flag no longer makes sense, since we don't look up automount points
as eagerly any more.  Additionally, it turns out that the NO_AUTOMOUNT
handling was buggy to begin with: it would avoid automounting even for
cases where we really *needed* to do the automount handling, and could
return ENOENT for autofs entries that hadn't been instantiated yet.

With our new non-eager automount semantics, one discussion has been
about adding a AT_AUTOMOUNT flag to vfs_fstatat (and thus the
newfstatat() and fstatat64() system calls), but it's probably not worth
it: you can always force at least directory automounting by simply
adding the final '/' to the filename, which works for *all* of the stat
family system calls, old and new.

So AT_NO_AUTOMOUNT (and thus LOOKUP_NO_AUTOMOUNT) really were just a
result of our bad default behavior.

Acked-by: Ian Kent <raven@themaw.net>
Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 years agoASoC: ssm2602: Re-enable oscillator after suspend
Lars-Peter Clausen [Tue, 27 Sep 2011 09:08:46 +0000 (11:08 +0200)]
ASoC: ssm2602: Re-enable oscillator after suspend

Currently the the internal oscillator is powered down when entering BIAS_OFF
state, but not re-enabled when going back to BIAS_STANDBY. As a result the
CODEC will stop working after suspend if the internal oscillator is used to
generate the sysclock signal. This patch fixes it by clearing the appropriate
bit in the power down register when the CODEC is re-enabled.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
13 years agoVFS: Fix the remaining automounter semantics regressions
Trond Myklebust [Tue, 27 Sep 2011 00:36:09 +0000 (20:36 -0400)]
VFS: Fix the remaining automounter semantics regressions

The concensus seems to be that system calls such as stat() etc should
not trigger an automount.  Neither should the l* versions.

This patch therefore adds a LOOKUP_AUTOMOUNT flag to tag those lookups
that _should_ trigger an automount on the last path element.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
[ Edited to leave out the cases that are already covered by LOOKUP_OPEN,
  LOOKUP_DIRECTORY and LOOKUP_CREATE - all of which also fundamentally
  force automounting for their own reasons   - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 years agovfs pathname lookup: Add LOOKUP_AUTOMOUNT flag
Linus Torvalds [Tue, 27 Sep 2011 00:44:55 +0000 (17:44 -0700)]
vfs pathname lookup: Add LOOKUP_AUTOMOUNT flag

Since we've now turned around and made LOOKUP_FOLLOW *not* force an
automount, we want to add the ability to force an automount event on
lookup even if we don't happen to have one of the other flags that force
it implicitly (LOOKUP_OPEN, LOOKUP_DIRECTORY, LOOKUP_PARENT..)

Most cases will never want to use this, since you'd normally want to
delay automounting as long as possible, which usually implies
LOOKUP_OPEN (when we open a file or directory, we really cannot avoid
the automount any more).

But Trond argued sufficiently forcefully that at a minimum bind mounting
a file and quotactl will want to force the automount lookup.  Some other
cases (like nfs_follow_remote_path()) could use it too, although
LOOKUP_DIRECTORY would work there as well.

This commit just adds the flag and logic, no users yet, though.  It also
doesn't actually touch the LOOKUP_NO_AUTOMOUNT flag that is related, and
was made irrelevant by the same change that made us not follow on
LOOKUP_FOLLOW.

Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Ian Kent <raven@themaw.net>
Cc: Jeff Layton <jlayton@redhat.com>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Cc: David Howells <dhowells@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Greg KH <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 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

13 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>
13 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>
13 years agoMerge branch 'hwmon-for-linus' of git://github.com/groeck/linux
Linus Torvalds [Mon, 26 Sep 2011 20:35:43 +0000 (13:35 -0700)]
Merge branch 'hwmon-for-linus' of git://github.com/groeck/linux

* 'hwmon-for-linus' of git://github.com/groeck/linux:
  hwmon: (coretemp) remove struct platform_data * parameter from create_core_data()
  hwmon: (coretemp) constify static data
  hwmon: (coretemp) don't use kernel assigned CPU number as platform device ID
  hwmon: (ds620) Fix handling of negative temperatures
  hwmon: (w83791d) rename prototype parameter from 'register' to 'reg'
  hwmon: (coretemp) Don't use threshold registers for tempX_max
  hwmon: (coretemp) Let the user force TjMax
  hwmon: (coretemp) Drop duplicate function get_pkg_tjmax

13 years agoMerge branch 'kvm-updates/3.1' of git://github.com/avikivity/kvm
Linus Torvalds [Mon, 26 Sep 2011 20:33:44 +0000 (13:33 -0700)]
Merge branch 'kvm-updates/3.1' of git://github.com/avikivity/kvm

* 'kvm-updates/3.1' of git://github.com/avikivity/kvm:
  KVM: x86 emulator: fix Src2CL decode
  KVM: MMU: fix incorrect return of spte

13 years agoMerge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur...
Linus Torvalds [Mon, 26 Sep 2011 20:26:30 +0000 (13:26 -0700)]
Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
  ARM: 7099/1: futex: preserve oldval in SMP __futex_atomic_op
  ARM: dma-mapping: free allocated page if unable to map
  ARM: fix vmlinux.lds.S discarding sections
  ARM: nommu: fix warning with checksyscalls.sh
  ARM: 7091/1: errata: D-cache line maintenance operation by MVA may not succeed

13 years agoPM / Clocks: Do not acquire a mutex under a spinlock
Rafael J. Wysocki [Mon, 26 Sep 2011 17:40:23 +0000 (19:40 +0200)]
PM / Clocks: Do not acquire a mutex under a spinlock

Commit b7ab83e (PM: Use spinlock instead of mutex in clock
management functions) introduced a regression causing clocks_mutex
to be acquired under a spinlock.  This happens because
pm_clk_suspend() and pm_clk_resume() call pm_clk_acquire() under
pcd->lock, but pm_clk_acquire() executes clk_get() which causes
clocks_mutex to be acquired.  Similarly, __pm_clk_remove(),
executed under pcd->lock, calls clk_put(), which also causes
clocks_mutex to be acquired.

To fix those problems make pm_clk_add() call pm_clk_acquire(), so
that pm_clk_suspend() and pm_clk_resume() don't have to do that.
Change pm_clk_remove() and pm_clk_destroy() to separate
modifications of the pcd->clock_list list from the actual removal of
PM clock entry objects done by __pm_clk_remove().

Reported-and-tested-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
13 years agoALSA: usb-audio: Check for possible chip NULL pointer before clearing probing flag
Thomas Pfaff [Mon, 26 Sep 2011 13:43:59 +0000 (15:43 +0200)]
ALSA: usb-audio: Check for possible chip NULL pointer before clearing probing flag

Before clearing the probing flag in the error exit path, check that the
chip pointer is not NULL.

Signed-off-by: Thomas Pfaff <tpfaff@gmx.net>
Cc: <stable@kernel.org> [2.6.39+]
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda/realtek - Don't detect LO jack when identical with HP
Takashi Iwai [Mon, 26 Sep 2011 13:19:55 +0000 (15:19 +0200)]
ALSA: hda/realtek - Don't detect LO jack when identical with HP

The spec->autocfg.line_out_pins[] may contain the same pins as hp_pins[]
depending on the configuration.  When they are identical, detecting the
line_jack_present flag screws up the auto-mute because alc_line_automute()
is called unconditionally at initialization while it won't be triggered
by unsol events, thus the old line_jack_present flag is kept for the
whole run.

For fixing this buggy behavior, the driver needs to check whether the
line-outs are really individual, and skip if same as headphone jacks.

Reference: https://bugzilla.novell.com/show_bug.cgi?id=716104

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoARM: 7099/1: futex: preserve oldval in SMP __futex_atomic_op
Will Deacon [Fri, 23 Sep 2011 13:34:12 +0000 (14:34 +0100)]
ARM: 7099/1: futex: preserve oldval in SMP __futex_atomic_op

The SMP implementation of __futex_atomic_op clobbers oldval with the
status flag from the exclusive store. This causes it to always read as
zero when performing the FUTEX_OP_CMP_* operation.

This patch updates the ARM __futex_atomic_op implementations to take a
tmp argument, allowing us to store the strex status flag without
overwriting the register containing oldval.

Cc: stable@kernel.org
Reported-by: Minho Ban <mhban@samsung.com>
Reviewed-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
13 years agoALSA: hda/realtek - Avoid bogus HP-pin assignment
Takashi Iwai [Mon, 26 Sep 2011 08:41:21 +0000 (10:41 +0200)]
ALSA: hda/realtek - Avoid bogus HP-pin assignment

When the headphone pin is assigned as primary output to line_out_pins[],
the automatic HP-pin assignment by ASSID must be suppressed.  Otherwise
a wrong pin might be assigned to the headphone and breaks the auto-mute.

Reference: https://bugzilla.novell.com/show_bug.cgi?id=716104

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Cc: <stable@kernel.org>
13 years agoARM: dma-mapping: free allocated page if unable to map
Russell King [Thu, 22 Sep 2011 09:32:25 +0000 (10:32 +0100)]
ARM: dma-mapping: free allocated page if unable to map

If the attempt to map a page for DMA fails (eg, because we're out of
mapping space) then we must not hold on to the page we allocated for
DMA - doing so will result in a memory leak.

Cc: <stable@kernel.org>
Reported-by: Bryan Phillippe <bp@darkforest.org>
Tested-by: Bryan Phillippe <bp@darkforest.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>