Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3685f00 authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk/2635' of git://git.fluff.org/bjdooks/linux into devel-stable

parents b12f3cbd 63b1f51b

arch/arm/Kconfig

+6 −1
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ config ARCH_SA1100 
	  Support for StrongARM 11x0 based boards.



config ARCH_S3C2410

	bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443"

	bool "Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443, S3C2450"

	select GENERIC_GPIO

	select ARCH_HAS_CPUFREQ

	select HAVE_CLK
@@ -666,6 +666,10 @@ config ARCH_S3C2410 
	  BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or

	  the Samsung SMDK2410 development board (and derivatives).



	  Note, the S3C2416 and the S3C2450 are so close that they even share

	  the same SoC ID code. This means that there is no seperate machine

	  directory (no arch/arm/mach-s3c2450) as the S3C2416 was first.



config ARCH_S3C64XX

	bool "Samsung S3C64XX"

	select PLAT_SAMSUNG
@@ -904,6 +908,7 @@ if ARCH_S3C2410 
source "arch/arm/mach-s3c2400/Kconfig"

source "arch/arm/mach-s3c2410/Kconfig"

source "arch/arm/mach-s3c2412/Kconfig"

source "arch/arm/mach-s3c2416/Kconfig"

source "arch/arm/mach-s3c2440/Kconfig"

source "arch/arm/mach-s3c2443/Kconfig"

endif

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ machine-$(CONFIG_ARCH_PNX4008) := pnx4008 
machine-$(CONFIG_ARCH_PXA)		:= pxa

machine-$(CONFIG_ARCH_REALVIEW)		:= realview

machine-$(CONFIG_ARCH_RPC)		:= rpc

machine-$(CONFIG_ARCH_S3C2410)		:= s3c2410 s3c2400 s3c2412 s3c2440 s3c2443

machine-$(CONFIG_ARCH_S3C2410)		:= s3c2410 s3c2400 s3c2412 s3c2416 s3c2440 s3c2443

machine-$(CONFIG_ARCH_S3C24A0)		:= s3c24a0

machine-$(CONFIG_ARCH_S3C64XX)		:= s3c64xx

machine-$(CONFIG_ARCH_S5P6440)		:= s5p6440

arch/arm/mach-s3c2410/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ config CPU_S3C2410 
	bool

	depends on ARCH_S3C2410

	select CPU_ARM920T

	select S3C_GPIO_PULL_UP

	select S3C2410_CLOCK

	select S3C2410_GPIO

	select CPU_LLSERIAL_S3C2410

arch/arm/mach-s3c2410/h1940-bluetooth.c

+20 −12
Original line number Diff line number Diff line
@@ -33,14 +33,15 @@ static void h1940bt_enable(int on) 
		h1940_latch_control(0, H1940_LATCH_BLUETOOTH_POWER);

		/* Reset the chip */

		mdelay(10);

		s3c2410_gpio_setpin(S3C2410_GPH(1), 1);



		gpio_set_value(S3C2410_GPH(1), 1);

		mdelay(10);

		s3c2410_gpio_setpin(S3C2410_GPH(1), 0);

		gpio_set_value(S3C2410_GPH(1), 0);

	}

	else {

		s3c2410_gpio_setpin(S3C2410_GPH(1), 1);

		gpio_set_value(S3C2410_GPH(1), 1);

		mdelay(10);

		s3c2410_gpio_setpin(S3C2410_GPH(1), 0);

		gpio_set_value(S3C2410_GPH(1), 0);

		mdelay(10);

		h1940_latch_control(H1940_LATCH_BLUETOOTH_POWER, 0);

	}
@@ -61,15 +62,21 @@ static int __devinit h1940bt_probe(struct platform_device *pdev) 
	struct rfkill *rfk;

	int ret = 0;



	ret = gpio_request(S3C2410_GPH(1), dev_name(&pdev->dev));

	if (ret) {

		dev_err(&pdev->dev, "could not get GPH1\n");\

		return ret;

	}



	/* Configures BT serial port GPIOs */

	s3c2410_gpio_cfgpin(S3C2410_GPH(0), S3C2410_GPH0_nCTS0);

	s3c2410_gpio_pullup(S3C2410_GPH(0), 1);

	s3c2410_gpio_cfgpin(S3C2410_GPH(1), S3C2410_GPIO_OUTPUT);

	s3c2410_gpio_pullup(S3C2410_GPH(1), 1);

	s3c2410_gpio_cfgpin(S3C2410_GPH(2), S3C2410_GPH2_TXD0);

	s3c2410_gpio_pullup(S3C2410_GPH(2), 1);

	s3c2410_gpio_cfgpin(S3C2410_GPH(3), S3C2410_GPH3_RXD0);

	s3c2410_gpio_pullup(S3C2410_GPH(3), 1);

	s3c_gpio_cfgpin(S3C2410_GPH(0), S3C2410_GPH0_nCTS0);

	s3c_gpio_cfgpull(S3C2410_GPH(0), S3C_GPIO_PULL_NONE);

	s3c_gpio_cfgpin(S3C2410_GPH(1), S3C2410_GPIO_OUTPUT);

	s3c_gpio_cfgpull(S3C2410_GPH(1), S3C_GPIO_PULL_NONE);

	s3c_gpio_cfgpin(S3C2410_GPH(2), S3C2410_GPH2_TXD0);

	s3c_gpio_cfgpull(S3C2410_GPH(2), S3C_GPIO_PULL_NONE);

	s3c_gpio_cfgpin(S3C2410_GPH(3), S3C2410_GPH3_RXD0);

	s3c_gpio_cfgpull(S3C2410_GPH(3), S3C_GPIO_PULL_NONE);





	rfk = rfkill_alloc(DRV_NAME, &pdev->dev, RFKILL_TYPE_BLUETOOTH,
@@ -100,6 +107,7 @@ static int h1940bt_remove(struct platform_device *pdev) 
	struct rfkill *rfk = platform_get_drvdata(pdev);



	platform_set_drvdata(pdev, NULL);

	gpio_free(S3C2410_GPH(1));



	if (rfk) {

		rfkill_unregister(rfk);

arch/arm/mach-s3c2410/include/mach/dma.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ enum dma_ch { 
#define DMACH_LOW_LEVEL	(1<<28)	/* use this to specifiy hardware ch no */



/* we have 4 dma channels */

#ifndef CONFIG_CPU_S3C2443

#if !defined(CONFIG_CPU_S3C2443) && !defined(CONFIG_CPU_S3C2416)

#define S3C_DMA_CHANNELS		(4)

#else

#define S3C_DMA_CHANNELS		(6)