summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c24xx
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2018-05-14 23:52:23 +0300
committerOlof Johansson <olof@lixom.net>2018-05-14 23:52:23 +0300
commit3a19f20c5a279c331e9b613d66c62ef523a36401 (patch)
tree23c6e9ae17ef9fca4c96be66adcb86bdbbfeaa10 /arch/arm/mach-s3c24xx
parent08a5f1ac35b0a42e4edece0cda2a79d2fe92fa03 (diff)
parent9ad9a2183bf51da7f8840f2e7087816c0fc8c91d (diff)
downloadlinux-3a19f20c5a279c331e9b613d66c62ef523a36401.tar.xz
Merge tag 'samsung-soc-4.18' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc
Samsung mach/soc changes for v4.18 1. Remove at24_platform_data in S3C2440. 2. Fix invalid SPDX identifier. 3. Remove Exynos5440 entirely. 4. Cleanups. 5. Remove static mapping of SCU SFR and rely on DTS. * tag 'samsung-soc-4.18' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: exynos: Remove unused soc_is_exynos{4,5} ARM: exynos: Remove static mapping of SCU SFR ARM: exynos: no need to select ARCH_HAS_BANDGAP any longer ARM: exynos: Remove support for Exynos5440 ARM: s3c24xx: Fix invalid SPDX identifier ARM: samsung: simplify getting .drvdata ARM: s3c24xx: mini2440: Use device properties for at24 eeprom Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-s3c24xx')
-rw-r--r--arch/arm/mach-s3c24xx/h1940-bluetooth.c2
-rw-r--r--arch/arm/mach-s3c24xx/mach-mini2440.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-s3c24xx/h1940-bluetooth.c b/arch/arm/mach-s3c24xx/h1940-bluetooth.c
index 46ad20ea87d1..186b5321658e 100644
--- a/arch/arm/mach-s3c24xx/h1940-bluetooth.c
+++ b/arch/arm/mach-s3c24xx/h1940-bluetooth.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-1.0
+// SPDX-License-Identifier: GPL-1.0+
//
// Copyright (c) Arnaud Patard <arnaud.patard@rtp-net.org>
//
diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c
index 95753e0bc073..f9fc1f8d2b28 100644
--- a/arch/arm/mach-s3c24xx/mach-mini2440.c
+++ b/arch/arm/mach-s3c24xx/mach-mini2440.c
@@ -20,7 +20,7 @@
#include <linux/serial_core.h>
#include <linux/serial_s3c.h>
#include <linux/dm9000.h>
-#include <linux/platform_data/at24.h>
+#include <linux/property.h>
#include <linux/platform_device.h>
#include <linux/gpio_keys.h>
#include <linux/i2c.h>
@@ -481,15 +481,15 @@ static struct platform_device mini2440_audio = {
/*
* I2C devices
*/
-static struct at24_platform_data at24c08 = {
- .byte_len = SZ_8K / 8,
- .page_size = 16,
+static const struct property_entry mini2440_at24_properties[] = {
+ PROPERTY_ENTRY_U32("pagesize", 16),
+ { }
};
static struct i2c_board_info mini2440_i2c_devs[] __initdata = {
{
I2C_BOARD_INFO("24c08", 0x50),
- .platform_data = &at24c08,
+ .properties = mini2440_at24_properties,
},
};