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

Commit 033c5960 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-soc-4.14' of... 

Merge tag 'samsung-soc-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc

Pull "Samsung mach/soc changes for v4.14" from Krzysztof Kozłowski:

Only for S3C24xx platform:
1. Cleanup from non-existent CONFIG entries.
2. Fix unmet NET dependency when H1940 bluetooth chip is selected..

* tag 'samsung-soc-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: s3c24xx: make H1940BT depend on RFKILL
  ARM: s3c24xx: Do not confuse local define with Kconfig
  ARM: s3c24xx: Remove non-existing SND_SOC_SMDK2443_WM9710
  ARM: s3c24xx: Remove non-existing CONFIG_CPU_S3C2413
parents aae4e7a8 f991ce42

arch/arm/mach-s3c24xx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ config ARCH_H1940 
config H1940BT

	tristate "Control the state of H1940 bluetooth chip"

	depends on ARCH_H1940

	select RFKILL

	depends on RFKILL

	help

	  This is a simple driver that is able to control

	  the state of built in bluetooth chip on h1940.

arch/arm/mach-s3c24xx/common.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static unsigned long s3c24xx_read_idcode_v5(void) 
		return gs;

#endif



#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)

#if defined(CONFIG_CPU_S3C2412)

	return __raw_readl(S3C2412_GSTATUS1);

#else

	return 1UL;	/* don't look like an 2400 */

arch/arm/mach-s3c24xx/include/mach/regs-clock.h

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 


#endif /* CONFIG_CPU_S3C2440 or CONFIG_CPU_S3C2442 */



#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)

#if defined(CONFIG_CPU_S3C2412)



#define S3C2412_OSCSET		S3C2410_CLKREG(0x18)

#define S3C2412_CLKSRC		S3C2410_CLKREG(0x1C)
@@ -141,7 +141,7 @@ 
#define S3C2412_CLKSRC_UREFCLK_EXTCLK	(1<<12)

#define S3C2412_CLKSRC_EREFCLK_EXTCLK	(1<<14)



#endif /* CONFIG_CPU_S3C2412 | CONFIG_CPU_S3C2413 */

#endif /* CONFIG_CPU_S3C2412 */



#define S3C2416_CLKDIV2		S3C2410_CLKREG(0x28)

arch/arm/mach-s3c24xx/mach-smdk2443.c

+0 −8
Original line number Diff line number Diff line
@@ -111,9 +111,6 @@ static struct platform_device *smdk2443_devices[] __initdata = { 
	&s3c_device_wdt,

	&s3c_device_i2c0,

	&s3c_device_hsmmc1,

#ifdef CONFIG_SND_SOC_SMDK2443_WM9710

	&s3c_device_ac97,

#endif

	&s3c2443_device_dma,

};
@@ -133,11 +130,6 @@ static void __init smdk2443_init_time(void) 
static void __init smdk2443_machine_init(void)

{

	s3c_i2c0_set_platdata(NULL);



#ifdef CONFIG_SND_SOC_SMDK2443_WM9710

	s3c24xx_ac97_setup_gpio(S3C24XX_AC97_GPE0);

#endif



	platform_add_devices(smdk2443_devices, ARRAY_SIZE(smdk2443_devices));

	smdk_machine_init();

}

arch/arm/mach-s3c24xx/sleep.S

+6 −5
Original line number Diff line number Diff line
@@ -33,10 +33,11 @@ 
#include <mach/regs-gpio.h>

#include <mach/regs-clock.h>



/* CONFIG_DEBUG_RESUME is dangerous if your bootloader does not

/*

 * S3C24XX_DEBUG_RESUME is dangerous if your bootloader does not

 * reset the UART configuration, only enable if you really need this!

 */

//#define CONFIG_DEBUG_RESUME

//#define S3C24XX_DEBUG_RESUME



	.text
@@ -71,13 +72,13 @@ ENTRY(s3c_cpu_resume) 
	str	r12, [ r14, #0x54 ]

#endif



#ifdef CONFIG_DEBUG_RESUME

#ifdef S3C24XX_DEBUG_RESUME

	mov	r3, #'L'

	strb	r3, [ r2, #S3C2410_UTXH ]

1001:

	ldrb	r14, [ r3, #S3C2410_UTRSTAT ]

	tst	r14, #S3C2410_UTRSTAT_TXE

	beq	1001b

#endif /* CONFIG_DEBUG_RESUME */

#endif /* S3C24XX_DEBUG_RESUME */



	b	cpu_resume