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>
This commit is contained in:
@@ -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>
|
||||
//
|
||||
|
@@ -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,
|
||||
},
|
||||
};
|
||||
|
||||
|
Verwijs in nieuw issue
Block a user