From f6d1b15c154d07c88829426d2c83c6321fe31cf3 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 25 Jun 2012 11:06:59 -0300 Subject: [PATCH] Revert "[media] radio: Add Sanyo LM7000 tuner driver" This reverts commit 4ecbb69414c61af3594209e081d6e834ea68a16d. As requested by Hans Verkuil: > You accidentally merged the wrong first version of the lm7000 patch series. > > These are the correct second version patches: > > http://patchwork.linuxtv.org/patch/11689/ > http://patchwork.linuxtv.org/patch/11690/ > http://patchwork.linuxtv.org/patch/11691/ > > The second version is much simpler and doesn't require the creation of a whole > new driver. Requested-by: Hans Verkuil Cc: Ondrej Zary Signed-off-by: Mauro Carvalho Chehab --- drivers/media/radio/Kconfig | 3 --- drivers/media/radio/Makefile | 1 - drivers/media/radio/lm7000.c | 52 ------------------------------------ drivers/media/radio/lm7000.h | 32 ---------------------- 4 files changed, 88 deletions(-) delete mode 100644 drivers/media/radio/lm7000.c delete mode 100644 drivers/media/radio/lm7000.h diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig index 5bcce129d718..c257da13d766 100644 --- a/drivers/media/radio/Kconfig +++ b/drivers/media/radio/Kconfig @@ -191,9 +191,6 @@ config RADIO_CADET To compile this driver as a module, choose M here: the module will be called radio-cadet. -config RADIO_LM7000 - tristate - config RADIO_RTRACK tristate "AIMSlab RadioTrack (aka RadioReveal) support" depends on ISA && VIDEO_V4L2 diff --git a/drivers/media/radio/Makefile b/drivers/media/radio/Makefile index 7f6aa63117c0..ca8c7d134b95 100644 --- a/drivers/media/radio/Makefile +++ b/drivers/media/radio/Makefile @@ -28,6 +28,5 @@ obj-$(CONFIG_RADIO_TEF6862) += tef6862.o obj-$(CONFIG_RADIO_TIMBERDALE) += radio-timb.o obj-$(CONFIG_RADIO_WL1273) += radio-wl1273.o obj-$(CONFIG_RADIO_WL128X) += wl128x/ -obj-$(CONFIG_RADIO_LM7000) += lm7000.o ccflags-y += -Isound diff --git a/drivers/media/radio/lm7000.c b/drivers/media/radio/lm7000.c deleted file mode 100644 index 681f3af89260..000000000000 --- a/drivers/media/radio/lm7000.c +++ /dev/null @@ -1,52 +0,0 @@ -/* Sanyo LM7000 tuner chip driver - * - * Copyright 2012 Ondrej Zary - * based on radio-aimslab.c by M. Kirkwood - * and radio-sf16fmi.c by M. Kirkwood and Petr Vandrovec - */ - -#include -#include -#include "lm7000.h" - -MODULE_AUTHOR("Ondrej Zary "); -MODULE_DESCRIPTION("Routines for Sanyo LM7000 AM/FM radio tuner chip"); -MODULE_LICENSE("GPL"); - -/* write the 24-bit register, starting with LSB */ -static void lm7000_write(struct lm7000 *lm, u32 val) -{ - int i; - u8 data; - - for (i = 0; i < 24; i++) { - data = val & (1 << i) ? LM7000_DATA : 0; - lm->set_pins(lm, data | LM7000_CE); - udelay(2); - lm->set_pins(lm, data | LM7000_CE | LM7000_CLK); - udelay(2); - lm->set_pins(lm, data | LM7000_CE); - udelay(2); - } - lm->set_pins(lm, 0); -} - -void lm7000_set_freq(struct lm7000 *lm, u32 freq) -{ - freq += 171200; /* Add 10.7 MHz IF */ - freq /= 400; /* Convert to 25 kHz units */ - lm7000_write(lm, freq | LM7000_FM_25 | LM7000_BIT_FM); -} -EXPORT_SYMBOL(lm7000_set_freq); - -static int __init lm7000_module_init(void) -{ - return 0; -} - -static void __exit lm7000_module_exit(void) -{ -} - -module_init(lm7000_module_init) -module_exit(lm7000_module_exit) diff --git a/drivers/media/radio/lm7000.h b/drivers/media/radio/lm7000.h deleted file mode 100644 index a5bc7d632f1d..000000000000 --- a/drivers/media/radio/lm7000.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef __LM7000_H -#define __LM7000_H - -#define LM7000_DATA (1 << 0) -#define LM7000_CLK (1 << 1) -#define LM7000_CE (1 << 2) - -#define LM7000_FREQ_MASK 0x3fff -#define LM7000_BIT_T0 (1 << 14) -#define LM7000_BIT_T1 (1 << 15) -#define LM7000_BIT_B0 (1 << 16) -#define LM7000_BIT_B1 (1 << 17) -#define LM7000_BIT_B2 (1 << 18) -#define LM7000_BIT_TB (1 << 19) -#define LM7000_FM_100 (0 << 20) -#define LM7000_FM_50 (1 << 20) -#define LM7000_FM_25 (2 << 20) -#define LM7000_AM_5 (3 << 20) -#define LM7000_AM_10 (4 << 20) -#define LM7000_AM_9 (5 << 20) -#define LM7000_AM_1 (6 << 20) -#define LM7000_AM_5_ (7 << 20) -#define LM7000_BIT_FM (1 << 23) - - -struct lm7000 { - void (*set_pins)(struct lm7000 *lm, u8 pins); -}; - -void lm7000_set_freq(struct lm7000 *lm, u32 freq); - -#endif /* __LM7000_H */ -- 2.30.2