renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-25 15:15:33 +08:00
Code

Samsung mach/soc changes for v4.14

Browse Source 
Only for S3C24xx platform:
 1. Cleanup from non-existent CONFIG entries.
 2. Fix unmet NET dependency when H1940 bluetooth chip is selected..
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJZdjyWAAoJEME3ZuaGi4PXQM8P/REbB+QZFdAhb7Vn/cnF6KeU
 RbZTa+mKDQZ+07BeENUA7qrwMr0bnOfwvnF/yXNppBRkEKEzKLL4XFi8LW01W42q
 Q/jBpRA6xF48ohkKIQPv+dYR10H4FhN5FAOaQngGKHiu8t8CN3YgpmbqTQSw/5Te
 4XuUnfMuLMjqTMmY9fMKtgRoPLDG/j39h9zcc1ROk1CZJEqYfiSzRExMrh4rpRgR
 EVl3Yejk2/HEZsyRCpIywiKrzeQtuLYUtet4oVPFwUaT2EWtHLPv/NpcBp46DQI1
 2a2pf6X6j8vmfYUunJCT1/VrTzPIKhEKOX6Jyz8O4CAROcvBgikvlY7ciwFyoaRj
 G12sg8OmXvpuLpELnSQFHXNdWmUBNiij15EMgWrHJKnC1rLR/caSlqDWzQFsPYlP
 ueRkwaFpDvCQqehe6HE7ZEmidXgWoim6N4hNnO4p26cuuc4GQNZmhRs7yyNN5x7t
 cLZ8D93X1gfpPqeGvn7IUvgpebug19Xap25JhzKU1wtrGw8pIR+2uSpce8qVbfng
 AS/LOs6mGNKTm5ZD3XFM058G9G8Byjw/zY/p6gu1Xkz9imao8pA3+Um7ve/9onFo
 dUrYn2AT0BS2Oh3QkavX/SGCqSg6lBfVlcplnRGRQ07omxQZ+jQ4Lpj75K4rHMeg
 8p9AaHb9RrQoGfY7OZvS
 =pGQ/
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2017-08-16 21:50:53 +02:00
commit 033c596022
6 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-s3c24xx/Kconfig
View File

@ -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.

2
arch/arm/mach-s3c24xx/common.c
View File

@ -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 */

4
arch/arm/mach-s3c24xx/include/mach/regs-clock.h
View File

@ -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)

8
arch/arm/mach-s3c24xx/mach-smdk2443.c
View File

@ -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();
}

11
arch/arm/mach-s3c24xx/sleep.S
View File

@ -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

2
arch/arm/plat-samsung/include/plat/map-s3c.h
View File

@ -61,7 +61,7 @@
/* deal with the registers that move under the 2412/2413 */
#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
#if defined(CONFIG_CPU_S3C2412)
#ifndef __ASSEMBLY__
extern void __iomem *s3c24xx_va_gpio2;
#endif