diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2015-03-29 16:09:02 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2015-04-01 11:22:08 -0400 |
commit | 4c9164b9f77cebe715db18f179329c48b95243bb (patch) | |
tree | 70dd048e7ca7627bdd83725b3fed299c0a230ba2 /arch | |
parent | 968c94bcd891075ac06dd2f669c557f58a6523fc (diff) |
MIPS: SEAD3: Nuke remaining I2C bits.
With no I2C driver available, keeping the platform device registration
makes no sense just as keeping the code to instantiage the I2C devices.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/mti-sead3/Makefile | 3 | ||||
-rw-r--r-- | arch/mips/mti-sead3/sead3-i2c-dev.c | 33 | ||||
-rw-r--r-- | arch/mips/mti-sead3/sead3-i2c.c | 31 |
3 files changed, 1 insertions, 66 deletions
diff --git a/arch/mips/mti-sead3/Makefile b/arch/mips/mti-sead3/Makefile index 2ae49e99eb67..46d83b362635 100644 --- a/arch/mips/mti-sead3/Makefile +++ b/arch/mips/mti-sead3/Makefile | |||
@@ -13,8 +13,7 @@ obj-y := sead3-lcd.o sead3-display.o sead3-init.o \ | |||
13 | sead3-platform.o sead3-reset.o \ | 13 | sead3-platform.o sead3-reset.o \ |
14 | sead3-setup.o sead3-time.o | 14 | sead3-setup.o sead3-time.o |
15 | 15 | ||
16 | obj-y += sead3-i2c-dev.o sead3-i2c.o \ | 16 | obj-y += leds-sead3.o sead3-leds.o |
17 | leds-sead3.o sead3-leds.o | ||
18 | 17 | ||
19 | obj-$(CONFIG_EARLY_PRINTK) += sead3-console.o | 18 | obj-$(CONFIG_EARLY_PRINTK) += sead3-console.o |
20 | obj-$(CONFIG_USB_EHCI_HCD) += sead3-ehci.o | 19 | obj-$(CONFIG_USB_EHCI_HCD) += sead3-ehci.o |
diff --git a/arch/mips/mti-sead3/sead3-i2c-dev.c b/arch/mips/mti-sead3/sead3-i2c-dev.c deleted file mode 100644 index eca0b53a71dd..000000000000 --- a/arch/mips/mti-sead3/sead3-i2c-dev.c +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | /* | ||
2 | * This file is subject to the terms and conditions of the GNU General Public | ||
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved. | ||
7 | */ | ||
8 | #include <linux/init.h> | ||
9 | #include <linux/i2c.h> | ||
10 | |||
11 | static struct i2c_board_info __initdata sead3_i2c_devices[] = { | ||
12 | { | ||
13 | I2C_BOARD_INFO("adt7476", 0x2c), | ||
14 | .irq = 0, | ||
15 | }, | ||
16 | { | ||
17 | I2C_BOARD_INFO("m41t80", 0x68), | ||
18 | .irq = 0, | ||
19 | }, | ||
20 | }; | ||
21 | |||
22 | static int __init sead3_i2c_init(void) | ||
23 | { | ||
24 | int err; | ||
25 | |||
26 | err = i2c_register_board_info(0, sead3_i2c_devices, | ||
27 | ARRAY_SIZE(sead3_i2c_devices)); | ||
28 | if (err < 0) | ||
29 | pr_err("sead3-i2c-dev: cannot register board I2C devices\n"); | ||
30 | return err; | ||
31 | } | ||
32 | |||
33 | arch_initcall(sead3_i2c_init); | ||
diff --git a/arch/mips/mti-sead3/sead3-i2c.c b/arch/mips/mti-sead3/sead3-i2c.c deleted file mode 100644 index 795ae83894e0..000000000000 --- a/arch/mips/mti-sead3/sead3-i2c.c +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | /* | ||
2 | * This file is subject to the terms and conditions of the GNU General Public | ||
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved. | ||
7 | */ | ||
8 | #include <linux/init.h> | ||
9 | #include <linux/platform_device.h> | ||
10 | |||
11 | struct resource sead3_i2c_resources[] = { | ||
12 | { | ||
13 | .start = 0x805200, | ||
14 | .end = 0x8053ff, | ||
15 | .flags = IORESOURCE_MEM, | ||
16 | }, | ||
17 | }; | ||
18 | |||
19 | static struct platform_device sead3_i2c_device = { | ||
20 | .name = "sead3-i2c", | ||
21 | .id = 0, | ||
22 | .num_resources = ARRAY_SIZE(sead3_i2c_resources), | ||
23 | .resource = sead3_i2c_resources, | ||
24 | }; | ||
25 | |||
26 | static int __init sead3_i2c_init(void) | ||
27 | { | ||
28 | return platform_device_register(&sead3_i2c_device); | ||
29 | } | ||
30 | |||
31 | device_initcall(sead3_i2c_init); | ||