From 470ec9879637fbb6b98ab8c28cd0750e19eacd08 Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 16 Sep 2012 22:33:21 +1200 Subject: [PATCH 01/52] slightly lowercpu freq for some battery savings PaulM 12/09/2012 --- arch/arm/mach-msm/acpuclock-7x30.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-msm/acpuclock-7x30.c b/arch/arm/mach-msm/acpuclock-7x30.c index 8ffe61a4d..b6d88e0da 100755 --- a/arch/arm/mach-msm/acpuclock-7x30.c +++ b/arch/arm/mach-msm/acpuclock-7x30.c @@ -119,28 +119,28 @@ static struct clk *acpuclk_sources[MAX_SOURCE]; * know all the h/w requirements. */ static struct clkctl_acpu_speed acpu_freq_tbl[] = { - { 0, 24576, LPXO, 0, 0, 30720000, 900, VDD_RAW(900) }, - { 0, 61440, PLL_3, 5, 11, 61440000, 900, VDD_RAW(900) }, - { 1, 122880, PLL_3, 5, 5, 61440000, 900, VDD_RAW(900) }, - { 0, 184320, PLL_3, 5, 4, 61440000, 900, VDD_RAW(900) }, - { 0, MAX_AXI_KHZ, AXI, 1, 0, 61440000, 900, VDD_RAW(900) }, + { 0, 24576, LPXO, 0, 0, 30720000, 850, VDD_RAW(850) }, + { 0, 61440, PLL_3, 5, 11, 61440000, 850, VDD_RAW(850) }, + { 1, 122880, PLL_3, 5, 5, 61440000, 850, VDD_RAW(850) }, + { 0, 184320, PLL_3, 5, 4, 61440000, 850, VDD_RAW(850) }, + { 0, MAX_AXI_KHZ, AXI, 1, 0, 61440000, 850, VDD_RAW(850) }, { 1, 245760, PLL_3, 5, 2, 61440000, 900, VDD_RAW(900) }, { 1, 368640, PLL_3, 5, 1, 122800000, 900, VDD_RAW(900) }, { 0, 480000, PLL_2, 3, 0, 122800000, 900, VDD_RAW(900), &pll2_tbl[0]}, { 0, 600000, PLL_2, 3, 0, 122800000, 925, VDD_RAW(925), &pll2_tbl[1]}, /* AXI has MSMC1 implications. See above. */ - { 1, 768000, PLL_1, 2, 0, 153600000, 1050, VDD_RAW(1050) }, + { 1, 768000, PLL_1, 2, 0, 153600000, 1000, VDD_RAW(1000) }, /* * AXI has MSMC1 implications. See above. */ - { 1, 806400, PLL_2, 3, 0, UINT_MAX, 1100, VDD_RAW(1100), &pll2_tbl[2]}, - { 1, 1024000, PLL_2, 3, 0, UINT_MAX, 1200, VDD_RAW(1200), &pll2_tbl[3]}, + { 1, 806400, PLL_2, 3, 0, UINT_MAX, 1000, VDD_RAW(1000), &pll2_tbl[2]}, + { 1, 1024000, PLL_2, 3, 0, UINT_MAX, 1100, VDD_RAW(1100), &pll2_tbl[3]}, { 1, 1200000, PLL_2, 3, 0, UINT_MAX, 1200, VDD_RAW(1200), &pll2_tbl[4]}, { 1, 1401600, PLL_2, 3, 0, UINT_MAX, 1250, VDD_RAW(1250), &pll2_tbl[5]}, { 1, 1516800, PLL_2, 3, 0, UINT_MAX, 1300, VDD_RAW(1300), &pll2_tbl[6]}, { 1, 1612800, PLL_2, 3, 0, UINT_MAX, 1350, VDD_RAW(1350), &pll2_tbl[7]}, { 1, 1708800, PLL_2, 3, 0, UINT_MAX, 1400, VDD_RAW(1400), &pll2_tbl[8]}, - { 1, 1804800, PLL_2, 3, 0, UINT_MAX, 1425, VDD_RAW(1425), &pll2_tbl[9]}, + { 0, 1804800, PLL_2, 3, 0, UINT_MAX, 1425, VDD_RAW(1425), &pll2_tbl[9]}, { 0 } }; From f247d01b36ff671c8bfddf6389052b6aadfb179e Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 17 Sep 2012 23:40:12 +1200 Subject: [PATCH 02/52] Change Governer Frequencies for battery/speed balance. --- drivers/cpufreq/cpufreq_conservative.c | 2 +- drivers/cpufreq/cpufreq_ondemand.c | 2 +- drivers/cpufreq/cpufreq_smartass2.c | 8 ++++---- drivers/leds/leds-msm-pmic.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c index 33b56e5c5..19a208b2f 100755 --- a/drivers/cpufreq/cpufreq_conservative.c +++ b/drivers/cpufreq/cpufreq_conservative.c @@ -29,7 +29,7 @@ * It helps to keep variable names smaller, simpler */ -#define DEF_FREQUENCY_UP_THRESHOLD (80) +#define DEF_FREQUENCY_UP_THRESHOLD (75) #define DEF_FREQUENCY_DOWN_THRESHOLD (20) /* diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c index ed4520539..5c9190d47 100755 --- a/drivers/cpufreq/cpufreq_ondemand.c +++ b/drivers/cpufreq/cpufreq_ondemand.c @@ -32,7 +32,7 @@ */ #define DEF_FREQUENCY_DOWN_DIFFERENTIAL (10) -#define DEF_FREQUENCY_UP_THRESHOLD (80) +#define DEF_FREQUENCY_UP_THRESHOLD (85) #define DEF_SAMPLING_DOWN_FACTOR (1) #define MAX_SAMPLING_DOWN_FACTOR (100000) #define MICRO_FREQUENCY_DOWN_DIFFERENTIAL (3) diff --git a/drivers/cpufreq/cpufreq_smartass2.c b/drivers/cpufreq/cpufreq_smartass2.c index e00524992..6d54d8f74 100644 --- a/drivers/cpufreq/cpufreq_smartass2.c +++ b/drivers/cpufreq/cpufreq_smartass2.c @@ -74,13 +74,13 @@ static unsigned int ramp_down_step; /* * CPU freq will be increased if measured load > max_cpu_load; */ -#define DEFAULT_MAX_CPU_LOAD 50 +#define DEFAULT_MAX_CPU_LOAD 75 static unsigned long max_cpu_load; /* * CPU freq will be decreased if measured load < min_cpu_load; */ -#define DEFAULT_MIN_CPU_LOAD 25 +#define DEFAULT_MIN_CPU_LOAD 30 static unsigned long min_cpu_load; /* @@ -94,14 +94,14 @@ static unsigned long up_rate_us; * The minimum amount of time to spend at a frequency before we can ramp down. * Notice we ignore this when we are above the ideal frequency. */ -#define DEFAULT_DOWN_RATE_US 99000; +#define DEFAULT_DOWN_RATE_US 60000; static unsigned long down_rate_us; /* * The frequency to set when waking up from sleep. * When sleep_ideal_freq=0 this will have no effect. */ -#define DEFAULT_SLEEP_WAKEUP_FREQ 1024000 +#define DEFAULT_SLEEP_WAKEUP_FREQ 386640 static unsigned int sleep_wakeup_freq; /* diff --git a/drivers/leds/leds-msm-pmic.c b/drivers/leds/leds-msm-pmic.c index 4ccc2c28d..61ad0a827 100755 --- a/drivers/leds/leds-msm-pmic.c +++ b/drivers/leds/leds-msm-pmic.c @@ -137,7 +137,7 @@ static void msm_keypad_bl_led_set(struct led_classdev *led_cdev, int ret = 0; if(machine_is_msm7x30_u8800() || machine_is_msm7x30_u8800_51() || machine_is_msm8255_u8800_pro() ) { - ret = pmic_set_keyled_intensity(LED_KEYPAD, value/32); + ret = pmic_set_keyled_intensity(LED_KEYPAD, value/24); } else if( machine_is_msm8255_u8860lp() ||machine_is_msm8255_u8860_51()) From 93ed51dce091a2fe060a9ef48323ffa17b31e609 Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 17 Sep 2012 23:43:12 +1200 Subject: [PATCH 03/52] Use lower voltages on cpu to save some power. --- arch/arm/mach-msm/acpuclock-7x30.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-msm/acpuclock-7x30.c b/arch/arm/mach-msm/acpuclock-7x30.c index b6d88e0da..becc1f5d2 100755 --- a/arch/arm/mach-msm/acpuclock-7x30.c +++ b/arch/arm/mach-msm/acpuclock-7x30.c @@ -121,10 +121,10 @@ static struct clk *acpuclk_sources[MAX_SOURCE]; static struct clkctl_acpu_speed acpu_freq_tbl[] = { { 0, 24576, LPXO, 0, 0, 30720000, 850, VDD_RAW(850) }, { 0, 61440, PLL_3, 5, 11, 61440000, 850, VDD_RAW(850) }, - { 1, 122880, PLL_3, 5, 5, 61440000, 850, VDD_RAW(850) }, + { 0, 122880, PLL_3, 5, 5, 61440000, 850, VDD_RAW(850) }, { 0, 184320, PLL_3, 5, 4, 61440000, 850, VDD_RAW(850) }, { 0, MAX_AXI_KHZ, AXI, 1, 0, 61440000, 850, VDD_RAW(850) }, - { 1, 245760, PLL_3, 5, 2, 61440000, 900, VDD_RAW(900) }, + { 1, 245760, PLL_3, 5, 2, 61440000, 875, VDD_RAW(900) }, { 1, 368640, PLL_3, 5, 1, 122800000, 900, VDD_RAW(900) }, { 0, 480000, PLL_2, 3, 0, 122800000, 900, VDD_RAW(900), &pll2_tbl[0]}, { 0, 600000, PLL_2, 3, 0, 122800000, 925, VDD_RAW(925), &pll2_tbl[1]}, From 30d803d73c1868822eeba2457cd65f37c86cd5ab Mon Sep 17 00:00:00 2001 From: Paul Date: Tue, 18 Sep 2012 22:22:29 +1200 Subject: [PATCH 04/52] Update governers a little --- drivers/cpufreq/cpufreq_conservative.c | 2 +- drivers/cpufreq/cpufreq_ondemand.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c index 19a208b2f..60a62613e 100755 --- a/drivers/cpufreq/cpufreq_conservative.c +++ b/drivers/cpufreq/cpufreq_conservative.c @@ -29,7 +29,7 @@ * It helps to keep variable names smaller, simpler */ -#define DEF_FREQUENCY_UP_THRESHOLD (75) +#define DEF_FREQUENCY_UP_THRESHOLD (60) #define DEF_FREQUENCY_DOWN_THRESHOLD (20) /* diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c index 5c9190d47..46295260a 100755 --- a/drivers/cpufreq/cpufreq_ondemand.c +++ b/drivers/cpufreq/cpufreq_ondemand.c @@ -32,7 +32,7 @@ */ #define DEF_FREQUENCY_DOWN_DIFFERENTIAL (10) -#define DEF_FREQUENCY_UP_THRESHOLD (85) +#define DEF_FREQUENCY_UP_THRESHOLD (90) #define DEF_SAMPLING_DOWN_FACTOR (1) #define MAX_SAMPLING_DOWN_FACTOR (100000) #define MICRO_FREQUENCY_DOWN_DIFFERENTIAL (3) From b1b4fb75add68343c2370d9bde5b130cdd34e5af Mon Sep 17 00:00:00 2001 From: Paul Date: Sat, 22 Sep 2012 08:13:45 +1200 Subject: [PATCH 05/52] Default gov to smartass --- arch/arm/configs/u8800_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/configs/u8800_defconfig b/arch/arm/configs/u8800_defconfig index 966a1c371..5e99795e2 100644 --- a/arch/arm/configs/u8800_defconfig +++ b/arch/arm/configs/u8800_defconfig @@ -579,13 +579,13 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=y CONFIG_CPU_FREQ_STAT=y # CONFIG_CPU_FREQ_STAT_DETAILS is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +#CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SMARTASS2 is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_SMARTASS2=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y From 07788081ff411e428347f8b6ebdfcab629fbe850 Mon Sep 17 00:00:00 2001 From: Paul Date: Sat, 22 Sep 2012 22:08:58 +1200 Subject: [PATCH 06/52] Test to increase brightness further --- drivers/leds/leds-msm-pmic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/leds/leds-msm-pmic.c b/drivers/leds/leds-msm-pmic.c index 61ad0a827..4abd30daa 100755 --- a/drivers/leds/leds-msm-pmic.c +++ b/drivers/leds/leds-msm-pmic.c @@ -137,7 +137,7 @@ static void msm_keypad_bl_led_set(struct led_classdev *led_cdev, int ret = 0; if(machine_is_msm7x30_u8800() || machine_is_msm7x30_u8800_51() || machine_is_msm8255_u8800_pro() ) { - ret = pmic_set_keyled_intensity(LED_KEYPAD, value/24); + ret = pmic_set_keyled_intensity(LED_KEYPAD, value/20); } else if( machine_is_msm8255_u8860lp() ||machine_is_msm8255_u8860_51()) From 365277938ade08a439decc817e869751e519fa2d Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 24 Sep 2012 21:56:36 +1200 Subject: [PATCH 07/52] Kgsl and board memory tweaks --- arch/arm/mach-msm/board-hw7x30.c | 20 ++++++++++---------- drivers/gpu/msm/kgsl.c | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-msm/board-hw7x30.c b/arch/arm/mach-msm/board-hw7x30.c index 92be3633a..de43f9b29 100755 --- a/arch/arm/mach-msm/board-hw7x30.c +++ b/arch/arm/mach-msm/board-hw7x30.c @@ -135,7 +135,7 @@ struct regulator *vreg_gp4 = NULL; #include #include "board-msm7x30-regulator.h" -#define MSM_PMEM_SF_SIZE 0x1800000 // 24M +#define MSM_PMEM_SF_SIZE 0x01800000 // 24M #ifdef CONFIG_HUAWEI_KERNEL #include @@ -147,23 +147,23 @@ smem_huawei_vender usb_para_data; /*set fb size to 5M to save memory 2.8M */ #ifdef CONFIG_HUAWEI_KERNEL -#define MSM_FB_SIZE 0x465000 -#define MSM_PMEM_ADSP_SIZE 0x2000000 +#define MSM_FB_SIZE 0x00480000 +#define MSM_PMEM_ADSP_SIZE 0x02200000 #else #ifdef CONFIG_FB_MSM_TRIPLE_BUFFER -#define MSM_FB_SIZE 0x780000 +#define MSM_FB_SIZE 0x00800000 #else -#define MSM_FB_SIZE 0x500000 +#define MSM_FB_SIZE 0x00500000 #endif -#define MSM_PMEM_ADSP_SIZE 0x3000000 +#define MSM_PMEM_ADSP_SIZE 0x03000000 #endif -#define MSM_FLUID_PMEM_ADSP_SIZE 0x2800000 -#define PMEM_KERNEL_EBI0_SIZE 0x600000 -#define MSM_PMEM_AUDIO_SIZE 0x200000 +#define MSM_FLUID_PMEM_ADSP_SIZE 0x02800000 +#define PMEM_KERNEL_EBI0_SIZE 0x00600000 +#define MSM_PMEM_AUDIO_SIZE 0x00200000 #ifdef CONFIG_FB_MSM_DEFAULT_DEPTH_RGB565 #undef MSM_PMEM_SF_SIZE -#define MSM_PMEM_SF_SIZE 0x0c00000 +#define MSM_PMEM_SF_SIZE 0x01800000 #endif #define PMIC_GPIO_INT 27 diff --git a/drivers/gpu/msm/kgsl.c b/drivers/gpu/msm/kgsl.c index b10b9b203..8b1d464cc 100755 --- a/drivers/gpu/msm/kgsl.c +++ b/drivers/gpu/msm/kgsl.c @@ -2375,7 +2375,7 @@ static void kgsl_core_exit(void) { unregister_chrdev_region(kgsl_driver.major, KGSL_DEVICE_MAX); - kgsl_mmu_ptpool_destroy(&kgsl_driver.ptpool); + kgsl_mmu_ptpool_destroy(kgsl_driver.ptpool); kgsl_driver.ptpool = NULL; device_unregister(&kgsl_driver.virtdev); From 0f991d5306c612bce33c7dd30ccb9ec3bc8a1876 Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 24 Sep 2012 22:48:16 +1200 Subject: [PATCH 08/52] enable deadline and sio --- arch/arm/configs/u8800_defconfig | 5 +- block/Kconfig.iosched | 14 ++ block/Makefile | 1 + block/sio-iosched.c | 399 +++++++++++++++++++++++++++++++ 4 files changed, 418 insertions(+), 1 deletion(-) create mode 100644 block/sio-iosched.c diff --git a/arch/arm/configs/u8800_defconfig b/arch/arm/configs/u8800_defconfig index 5e99795e2..cf6c7625a 100644 --- a/arch/arm/configs/u8800_defconfig +++ b/arch/arm/configs/u8800_defconfig @@ -172,9 +172,12 @@ CONFIG_LBDAF=y # IO Schedulers # CONFIG_IOSCHED_NOOP=y -# CONFIG_IOSCHED_DEADLINE is not set +CONFIG_IOSCHED_DEADLINE=y +# CONFIG_DEFAULT_DEADLINE is not set CONFIG_IOSCHED_CFQ=y # CONFIG_DEFAULT_CFQ is not set +CONFIG_IOSCHED_SIO=y +# CONFIG_DEFAULT_SIO is not set CONFIG_DEFAULT_NOOP=y CONFIG_DEFAULT_IOSCHED="noop" # CONFIG_INLINE_SPIN_TRYLOCK is not set diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched index 3199b76f7..ee5d210c7 100755 --- a/block/Kconfig.iosched +++ b/block/Kconfig.iosched @@ -43,6 +43,16 @@ config CFQ_GROUP_IOSCHED ---help--- Enable group IO scheduling in CFQ. +config IOSCHED_SIO + tristate "Simple I/O scheduler" + default y + ---help--- + The Simple I/O scheduler is an extremely simple scheduler, + based on noop and deadline, that relies on deadlines to + ensure fairness. The algorithm does not do any sorting but + basic merging, trying to keep a minimum overhead. It is aimed + mainly for aleatory access devices (eg: flash devices). + choice prompt "Default I/O scheduler" default DEFAULT_CFQ @@ -56,6 +66,9 @@ choice config DEFAULT_CFQ bool "CFQ" if IOSCHED_CFQ=y + config DEFAULT_SIO + bool "SIO" if IOSCHED_SIO=y + config DEFAULT_NOOP bool "No-op" @@ -65,6 +78,7 @@ config DEFAULT_IOSCHED string default "deadline" if DEFAULT_DEADLINE default "cfq" if DEFAULT_CFQ + default "sio" if DEFAULT_SIO default "noop" if DEFAULT_NOOP endmenu diff --git a/block/Makefile b/block/Makefile index 0fec4b3fa..deb9da17e 100755 --- a/block/Makefile +++ b/block/Makefile @@ -13,6 +13,7 @@ obj-$(CONFIG_BLK_DEV_THROTTLING) += blk-throttle.o obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o +obj-$(CONFIG_IOSCHED_SIO) += sio-iosched.o obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o diff --git a/block/sio-iosched.c b/block/sio-iosched.c new file mode 100644 index 000000000..c52a67c55 --- /dev/null +++ b/block/sio-iosched.c @@ -0,0 +1,399 @@ +/* + * Simple IO scheduler + * Based on Noop, Deadline and V(R) IO schedulers. + * + * Copyright (C) 2012 Miguel Boton + * + * + * This algorithm does not do any kind of sorting, as it is aimed for + * aleatory access devices, but it does some basic merging. We try to + * keep minimum overhead to achieve low latency. + * + * Asynchronous and synchronous requests are not treated separately, but + * we relay on deadlines to ensure fairness. + * + */ +#include +#include +#include +#include +#include +#include + +enum { ASYNC, SYNC }; + +/* Tunables */ +static const int sync_read_expire = HZ / 2; /* max time before a sync read is submitted. */ +static const int sync_write_expire = 2 * HZ; /* max time before a sync write is submitted. */ + +static const int async_read_expire = 4 * HZ; /* ditto for async, these limits are SOFT! */ +static const int async_write_expire = 16 * HZ; /* ditto for async, these limits are SOFT! */ + +static const int writes_starved = 2; /* max times reads can starve a write */ +static const int fifo_batch = 8; /* # of sequential requests treated as one + by the above parameters. For throughput. */ + +/* Elevator data */ +struct sio_data { + /* Request queues */ + struct list_head fifo_list[2][2]; + + /* Attributes */ + unsigned int batched; + unsigned int starved; + + /* Settings */ + int fifo_expire[2][2]; + int fifo_batch; + int writes_starved; +}; + +static void +sio_merged_requests(struct request_queue *q, struct request *rq, + struct request *next) +{ + /* + * If next expires before rq, assign its expire time to rq + * and move into next position (next will be deleted) in fifo. + */ + if (!list_empty(&rq->queuelist) && !list_empty(&next->queuelist)) { + if (time_before(rq_fifo_time(next), rq_fifo_time(rq))) { + list_move(&rq->queuelist, &next->queuelist); + rq_set_fifo_time(rq, rq_fifo_time(next)); + } + } + + /* Delete next request */ + rq_fifo_clear(next); +} + +static void +sio_add_request(struct request_queue *q, struct request *rq) +{ + struct sio_data *sd = q->elevator->elevator_data; + const int sync = rq_is_sync(rq); + const int data_dir = rq_data_dir(rq); + + /* + * Add request to the proper fifo list and set its + * expire time. + */ + rq_set_fifo_time(rq, jiffies + sd->fifo_expire[sync][data_dir]); + list_add_tail(&rq->queuelist, &sd->fifo_list[sync][data_dir]); +} + +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,38) +static int +sio_queue_empty(struct request_queue *q) +{ + struct sio_data *sd = q->elevator->elevator_data; + + /* Check if fifo lists are empty */ + return list_empty(&sd->fifo_list[SYNC][READ]) && list_empty(&sd->fifo_list[SYNC][WRITE]) && + list_empty(&sd->fifo_list[ASYNC][READ]) && list_empty(&sd->fifo_list[ASYNC][WRITE]); +} +#endif + +static struct request * +sio_expired_request(struct sio_data *sd, int sync, int data_dir) +{ + struct list_head *list = &sd->fifo_list[sync][data_dir]; + struct request *rq; + + if (list_empty(list)) + return NULL; + + /* Retrieve request */ + rq = rq_entry_fifo(list->next); + + /* Request has expired */ + if (time_after(jiffies, rq_fifo_time(rq))) + return rq; + + return NULL; +} + +static struct request * +sio_choose_expired_request(struct sio_data *sd) +{ + struct request *rq; + + /* + * Check expired requests. + * Asynchronous requests have priority over synchronous. + * Write requests have priority over read. + */ + rq = sio_expired_request(sd, ASYNC, WRITE); + if (rq) + return rq; + rq = sio_expired_request(sd, ASYNC, READ); + if (rq) + return rq; + + rq = sio_expired_request(sd, SYNC, WRITE); + if (rq) + return rq; + rq = sio_expired_request(sd, SYNC, READ); + if (rq) + return rq; + + return NULL; +} + +static struct request * +sio_choose_request(struct sio_data *sd, int data_dir) +{ + struct list_head *sync = sd->fifo_list[SYNC]; + struct list_head *async = sd->fifo_list[ASYNC]; + + /* + * Retrieve request from available fifo list. + * Synchronous requests have priority over asynchronous. + * Read requests have priority over write. + */ + if (!list_empty(&sync[data_dir])) + return rq_entry_fifo(sync[data_dir].next); + if (!list_empty(&async[data_dir])) + return rq_entry_fifo(async[data_dir].next); + + if (!list_empty(&sync[!data_dir])) + return rq_entry_fifo(sync[!data_dir].next); + if (!list_empty(&async[!data_dir])) + return rq_entry_fifo(async[!data_dir].next); + + return NULL; +} + +static inline void +sio_dispatch_request(struct sio_data *sd, struct request *rq) +{ + /* + * Remove the request from the fifo list + * and dispatch it. + */ + rq_fifo_clear(rq); + elv_dispatch_add_tail(rq->q, rq); + + sd->batched++; + + if (rq_data_dir(rq)) + sd->starved = 0; + else + sd->starved++; +} + +static int +sio_dispatch_requests(struct request_queue *q, int force) +{ + struct sio_data *sd = q->elevator->elevator_data; + struct request *rq = NULL; + int data_dir = READ; + + /* + * Retrieve any expired request after a batch of + * sequential requests. + */ + if (sd->batched > sd->fifo_batch) { + sd->batched = 0; + rq = sio_choose_expired_request(sd); + } + + /* Retrieve request */ + if (!rq) { + if (sd->starved > sd->writes_starved) + data_dir = WRITE; + + rq = sio_choose_request(sd, data_dir); + if (!rq) + return 0; + } + + /* Dispatch request */ + sio_dispatch_request(sd, rq); + + return 1; +} + +static struct request * +sio_former_request(struct request_queue *q, struct request *rq) +{ + struct sio_data *sd = q->elevator->elevator_data; + const int sync = rq_is_sync(rq); + const int data_dir = rq_data_dir(rq); + + if (rq->queuelist.prev == &sd->fifo_list[sync][data_dir]) + return NULL; + + /* Return former request */ + return list_entry(rq->queuelist.prev, struct request, queuelist); +} + +static struct request * +sio_latter_request(struct request_queue *q, struct request *rq) +{ + struct sio_data *sd = q->elevator->elevator_data; + const int sync = rq_is_sync(rq); + const int data_dir = rq_data_dir(rq); + + if (rq->queuelist.next == &sd->fifo_list[sync][data_dir]) + return NULL; + + /* Return latter request */ + return list_entry(rq->queuelist.next, struct request, queuelist); +} + +static void * +sio_init_queue(struct request_queue *q) +{ + struct sio_data *sd; + + /* Allocate structure */ + sd = kmalloc_node(sizeof(*sd), GFP_KERNEL, q->node); + if (!sd) + return NULL; + + /* Initialize fifo lists */ + INIT_LIST_HEAD(&sd->fifo_list[SYNC][READ]); + INIT_LIST_HEAD(&sd->fifo_list[SYNC][WRITE]); + INIT_LIST_HEAD(&sd->fifo_list[ASYNC][READ]); + INIT_LIST_HEAD(&sd->fifo_list[ASYNC][WRITE]); + + /* Initialize data */ + sd->batched = 0; + sd->fifo_expire[SYNC][READ] = sync_read_expire; + sd->fifo_expire[SYNC][WRITE] = sync_write_expire; + sd->fifo_expire[ASYNC][READ] = async_read_expire; + sd->fifo_expire[ASYNC][WRITE] = async_write_expire; + sd->fifo_batch = fifo_batch; + + return sd; +} + +static void +sio_exit_queue(struct elevator_queue *e) +{ + struct sio_data *sd = e->elevator_data; + + BUG_ON(!list_empty(&sd->fifo_list[SYNC][READ])); + BUG_ON(!list_empty(&sd->fifo_list[SYNC][WRITE])); + BUG_ON(!list_empty(&sd->fifo_list[ASYNC][READ])); + BUG_ON(!list_empty(&sd->fifo_list[ASYNC][WRITE])); + + /* Free structure */ + kfree(sd); +} + +/* + * sysfs code + */ + +static ssize_t +sio_var_show(int var, char *page) +{ + return sprintf(page, "%d\n", var); +} + +static ssize_t +sio_var_store(int *var, const char *page, size_t count) +{ + char *p = (char *) page; + + *var = simple_strtol(p, &p, 10); + return count; +} + +#define SHOW_FUNCTION(__FUNC, __VAR, __CONV) \ +static ssize_t __FUNC(struct elevator_queue *e, char *page) \ +{ \ + struct sio_data *sd = e->elevator_data; \ + int __data = __VAR; \ + if (__CONV) \ + __data = jiffies_to_msecs(__data); \ + return sio_var_show(__data, (page)); \ +} +SHOW_FUNCTION(sio_sync_read_expire_show, sd->fifo_expire[SYNC][READ], 1); +SHOW_FUNCTION(sio_sync_write_expire_show, sd->fifo_expire[SYNC][WRITE], 1); +SHOW_FUNCTION(sio_async_read_expire_show, sd->fifo_expire[ASYNC][READ], 1); +SHOW_FUNCTION(sio_async_write_expire_show, sd->fifo_expire[ASYNC][WRITE], 1); +SHOW_FUNCTION(sio_fifo_batch_show, sd->fifo_batch, 0); +SHOW_FUNCTION(sio_writes_starved_show, sd->writes_starved, 0); +#undef SHOW_FUNCTION + +#define STORE_FUNCTION(__FUNC, __PTR, MIN, MAX, __CONV) \ +static ssize_t __FUNC(struct elevator_queue *e, const char *page, size_t count) \ +{ \ + struct sio_data *sd = e->elevator_data; \ + int __data; \ + int ret = sio_var_store(&__data, (page), count); \ + if (__data < (MIN)) \ + __data = (MIN); \ + else if (__data > (MAX)) \ + __data = (MAX); \ + if (__CONV) \ + *(__PTR) = msecs_to_jiffies(__data); \ + else \ + *(__PTR) = __data; \ + return ret; \ +} +STORE_FUNCTION(sio_sync_read_expire_store, &sd->fifo_expire[SYNC][READ], 0, INT_MAX, 1); +STORE_FUNCTION(sio_sync_write_expire_store, &sd->fifo_expire[SYNC][WRITE], 0, INT_MAX, 1); +STORE_FUNCTION(sio_async_read_expire_store, &sd->fifo_expire[ASYNC][READ], 0, INT_MAX, 1); +STORE_FUNCTION(sio_async_write_expire_store, &sd->fifo_expire[ASYNC][WRITE], 0, INT_MAX, 1); +STORE_FUNCTION(sio_fifo_batch_store, &sd->fifo_batch, 0, INT_MAX, 0); +STORE_FUNCTION(sio_writes_starved_store, &sd->writes_starved, 0, INT_MAX, 0); +#undef STORE_FUNCTION + +#define DD_ATTR(name) \ + __ATTR(name, S_IRUGO|S_IWUSR, sio_##name##_show, \ + sio_##name##_store) + +static struct elv_fs_entry sio_attrs[] = { + DD_ATTR(sync_read_expire), + DD_ATTR(sync_write_expire), + DD_ATTR(async_read_expire), + DD_ATTR(async_write_expire), + DD_ATTR(fifo_batch), + DD_ATTR(writes_starved), + __ATTR_NULL +}; + +static struct elevator_type iosched_sio = { + .ops = { + .elevator_merge_req_fn = sio_merged_requests, + .elevator_dispatch_fn = sio_dispatch_requests, + .elevator_add_req_fn = sio_add_request, +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,38) + .elevator_queue_empty_fn = sio_queue_empty, +#endif + .elevator_former_req_fn = sio_former_request, + .elevator_latter_req_fn = sio_latter_request, + .elevator_init_fn = sio_init_queue, + .elevator_exit_fn = sio_exit_queue, + }, + + .elevator_attrs = sio_attrs, + .elevator_name = "sio", + .elevator_owner = THIS_MODULE, +}; + +static int __init sio_init(void) +{ + /* Register elevator */ + elv_register(&iosched_sio); + + return 0; +} + +static void __exit sio_exit(void) +{ + /* Unregister elevator */ + elv_unregister(&iosched_sio); +} + +module_init(sio_init); +module_exit(sio_exit); + +MODULE_AUTHOR("Miguel Boton"); +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Simple IO scheduler"); +MODULE_VERSION("0.2"); From 83ac7ea62574b58d34c9445d4a0a6c918820720a Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 26 Sep 2012 22:23:38 +1200 Subject: [PATCH 09/52] Experiment, enable polling to try fix wifi staying on with no signal --- drivers/mmc/host/msm_sdcc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c index 670653fb1..fe2d32c16 100755 --- a/drivers/mmc/host/msm_sdcc.c +++ b/drivers/mmc/host/msm_sdcc.c @@ -3482,9 +3482,10 @@ set_polling(struct device *dev, struct device_attribute *attr, mmc->caps |= MMC_CAP_NEEDS_POLL; #ifdef CONFIG_HUAWEI_WIFI_SDCC if (host->pdev_id == SDCC_WIFI_SLOT) { - printk("%s : no need to enable polling for slot %d (as host->pdev_id) \n", __FUNCTION__ , \ +/* printk("%s : no need to enable polling for slot %d (as host->pdev_id) \n", __FUNCTION__ , \ host->pdev_id ); - mmc->caps &= ~MMC_CAP_NEEDS_POLL; +*/ +// mmc->caps &= ~MMC_CAP_NEEDS_POLL; } #endif mmc_detect_change(host->mmc, 0); From a46bf9511f70ec810b355118eb27644492c19ced Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 26 Sep 2012 23:00:24 +1200 Subject: [PATCH 10/52] Revert that one quick, kills the baseband. --- drivers/mmc/host/msm_sdcc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c index fe2d32c16..119be6eaf 100755 --- a/drivers/mmc/host/msm_sdcc.c +++ b/drivers/mmc/host/msm_sdcc.c @@ -3482,10 +3482,10 @@ set_polling(struct device *dev, struct device_attribute *attr, mmc->caps |= MMC_CAP_NEEDS_POLL; #ifdef CONFIG_HUAWEI_WIFI_SDCC if (host->pdev_id == SDCC_WIFI_SLOT) { -/* printk("%s : no need to enable polling for slot %d (as host->pdev_id) \n", __FUNCTION__ , \ + printk("%s : no need to enable polling for slot %d (as host->pdev_id) \n", __FUNCTION__ , \ host->pdev_id ); -*/ -// mmc->caps &= ~MMC_CAP_NEEDS_POLL; + + mmc->caps &= ~MMC_CAP_NEEDS_POLL; } #endif mmc_detect_change(host->mmc, 0); From de49a974c59e6a397e240990036c1d47d0df84ef Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 27 Sep 2012 19:24:27 +1200 Subject: [PATCH 11/52] Readd polling to kernel. seems to help with sticking wifi. --- drivers/mmc/host/msm_sdcc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c index 119be6eaf..fe2d32c16 100755 --- a/drivers/mmc/host/msm_sdcc.c +++ b/drivers/mmc/host/msm_sdcc.c @@ -3482,10 +3482,10 @@ set_polling(struct device *dev, struct device_attribute *attr, mmc->caps |= MMC_CAP_NEEDS_POLL; #ifdef CONFIG_HUAWEI_WIFI_SDCC if (host->pdev_id == SDCC_WIFI_SLOT) { - printk("%s : no need to enable polling for slot %d (as host->pdev_id) \n", __FUNCTION__ , \ +/* printk("%s : no need to enable polling for slot %d (as host->pdev_id) \n", __FUNCTION__ , \ host->pdev_id ); - - mmc->caps &= ~MMC_CAP_NEEDS_POLL; +*/ +// mmc->caps &= ~MMC_CAP_NEEDS_POLL; } #endif mmc_detect_change(host->mmc, 0); From 3d92392822c9c832c59d913a3e8659f62d42e900 Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 28 Sep 2012 17:39:58 +1200 Subject: [PATCH 12/52] Reverty it again, may help with wifi sticking, but kills bluetooth. --- drivers/mmc/host/msm_sdcc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c index fe2d32c16..119be6eaf 100755 --- a/drivers/mmc/host/msm_sdcc.c +++ b/drivers/mmc/host/msm_sdcc.c @@ -3482,10 +3482,10 @@ set_polling(struct device *dev, struct device_attribute *attr, mmc->caps |= MMC_CAP_NEEDS_POLL; #ifdef CONFIG_HUAWEI_WIFI_SDCC if (host->pdev_id == SDCC_WIFI_SLOT) { -/* printk("%s : no need to enable polling for slot %d (as host->pdev_id) \n", __FUNCTION__ , \ + printk("%s : no need to enable polling for slot %d (as host->pdev_id) \n", __FUNCTION__ , \ host->pdev_id ); -*/ -// mmc->caps &= ~MMC_CAP_NEEDS_POLL; + + mmc->caps &= ~MMC_CAP_NEEDS_POLL; } #endif mmc_detect_change(host->mmc, 0); From 999b6ff8c88e7e426021087a4b572e767a781ec1 Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 28 Sep 2012 20:42:24 +1200 Subject: [PATCH 13/52] Setting som environment variables --- Makefile | 4 ++-- arch/arm/configs/u8800_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 93ec28526..357d86803 100755 --- a/Makefile +++ b/Makefile @@ -192,8 +192,8 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ # Default value for CROSS_COMPILE is not to prefix executables # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile export KBUILD_BUILDHOST := $(SUBARCH) -ARCH ?= $(SUBARCH) -CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%) +MARCH ?= armv7 +CROSS_COMPILE ?= /home/milbank/Build/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi- # Architecture as present in compile.h UTS_MACHINE := $(ARCH) diff --git a/arch/arm/configs/u8800_defconfig b/arch/arm/configs/u8800_defconfig index cf6c7625a..b31dd37f9 100644 --- a/arch/arm/configs/u8800_defconfig +++ b/arch/arm/configs/u8800_defconfig @@ -35,7 +35,7 @@ CONFIG_IRQ_WORK=y CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_CROSS_COMPILE="" +CONFIG_CROSS_COMPILE="/home/milbank/Build/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi-" CONFIG_LOCALVERSION="-perf" CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y @@ -44,7 +44,7 @@ CONFIG_HAVE_KERNEL_LZO=y CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_LZO is not set -CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_DEFAULT_HOSTNAME="Paul Ubuntu" # CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y From 10da95c732481290169c9248cbea77996bab3cc2 Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 28 Sep 2012 21:18:01 +1200 Subject: [PATCH 14/52] probably changes nothing looking at the way kernel rebuilt with this added --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 357d86803..38621001a 100755 --- a/Makefile +++ b/Makefile @@ -192,7 +192,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ # Default value for CROSS_COMPILE is not to prefix executables # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile export KBUILD_BUILDHOST := $(SUBARCH) -MARCH ?= armv7 +MARCH ?= armv7-a CROSS_COMPILE ?= /home/milbank/Build/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi- # Architecture as present in compile.h From 131ee18a900b753dac4be121cc234bf934df4d3b Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 1 Oct 2012 23:26:25 +1300 Subject: [PATCH 15/52] Try new brigntness value for keypad --- drivers/leds/leds-msm-pmic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/leds/leds-msm-pmic.c b/drivers/leds/leds-msm-pmic.c index 4abd30daa..f52142edd 100755 --- a/drivers/leds/leds-msm-pmic.c +++ b/drivers/leds/leds-msm-pmic.c @@ -137,7 +137,7 @@ static void msm_keypad_bl_led_set(struct led_classdev *led_cdev, int ret = 0; if(machine_is_msm7x30_u8800() || machine_is_msm7x30_u8800_51() || machine_is_msm8255_u8800_pro() ) { - ret = pmic_set_keyled_intensity(LED_KEYPAD, value/20); + ret = pmic_set_keyled_intensity(LED_KEYPAD, value/16); } else if( machine_is_msm8255_u8860lp() ||machine_is_msm8255_u8860_51()) From c2b68b5285201d4a26359c59e3d5852801f4f3e4 Mon Sep 17 00:00:00 2001 From: Paul Date: Tue, 2 Oct 2012 20:53:08 +1300 Subject: [PATCH 16/52] Change rear speaker to music as per .35 dzo --- arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c b/arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c index 999466aad..364931375 100755 --- a/arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c +++ b/arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c @@ -62,7 +62,7 @@ static struct snddev_icodec_data snddev_iearpiece_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), .name = "handset_rx", .copp_id = 0, - .acdb_id = ACDB_ID_HANDSET_SPKR, + .acdb_id = ACDB_ID_SPKR_PHONE_MUSIC_MONO, //7, //ACDB_ID_SPKR_PHONE_MONO, //7, .profile = &iearpiece_profile, .channel_mode = 1, .pmctl_id = NULL, From 2fbc67413bce5c30162bced8fe33ca1654e98e89 Mon Sep 17 00:00:00 2001 From: Paul Date: Tue, 2 Oct 2012 20:54:28 +1300 Subject: [PATCH 17/52] Delete unused defconfigs --- arch/arm/configs/acs5k_defconfig | 86 ---- arch/arm/configs/acs5k_tiny_defconfig | 80 ---- arch/arm/configs/afeb9260_defconfig | 107 ----- arch/arm/configs/ag5evm_defconfig | 83 ---- arch/arm/configs/am200epdkit_defconfig | 108 ----- arch/arm/configs/ap4evb_defconfig | 57 --- arch/arm/configs/assabet_defconfig | 60 --- arch/arm/configs/at91cap9adk_defconfig | 115 ----- arch/arm/configs/at91rm9200_defconfig | 341 --------------- arch/arm/configs/at91sam9260ek_defconfig | 83 ---- arch/arm/configs/at91sam9261_defconfig | 158 ------- arch/arm/configs/at91sam9263_defconfig | 168 -------- arch/arm/configs/at91sam9g20ek_defconfig | 123 ------ arch/arm/configs/at91sam9rlek_defconfig | 84 ---- arch/arm/configs/at91x40_defconfig | 48 --- arch/arm/configs/badge4_defconfig | 122 ------ arch/arm/configs/bcmring_defconfig | 79 ---- arch/arm/configs/cam60_defconfig | 174 -------- arch/arm/configs/cerfcube_defconfig | 75 ---- arch/arm/configs/cm_x2xx_defconfig | 189 --------- arch/arm/configs/cm_x300_defconfig | 188 --------- arch/arm/configs/cns3420vb_defconfig | 72 ---- arch/arm/configs/colibri_pxa270_defconfig | 180 -------- arch/arm/configs/colibri_pxa300_defconfig | 73 ---- arch/arm/configs/collie_defconfig | 94 ----- arch/arm/configs/corgi_defconfig | 274 ------------ arch/arm/configs/cpu9260_defconfig | 116 ----- arch/arm/configs/cpu9g20_defconfig | 116 ----- arch/arm/configs/da8xx_omapl_defconfig | 129 ------ arch/arm/configs/davinci_all_defconfig | 194 --------- arch/arm/configs/dove_defconfig | 127 ------ arch/arm/configs/ebsa110_defconfig | 75 ---- arch/arm/configs/edb7211_defconfig | 27 -- arch/arm/configs/em_x270_defconfig | 194 --------- arch/arm/configs/ep93xx_defconfig | 124 ------ arch/arm/configs/eseries_pxa_defconfig | 118 ------ arch/arm/configs/exynos4_defconfig | 72 ---- arch/arm/configs/ezx_defconfig | 420 ------------------- arch/arm/configs/footbridge_defconfig | 127 ------ arch/arm/configs/fortunet_defconfig | 28 -- arch/arm/configs/fsm9xxx-perf_defconfig | 187 --------- arch/arm/configs/fsm9xxx_defconfig | 189 --------- arch/arm/configs/g3evm_defconfig | 57 --- arch/arm/configs/g4evm_defconfig | 57 --- arch/arm/configs/h3600_defconfig | 79 ---- arch/arm/configs/h5000_defconfig | 82 ---- arch/arm/configs/h7201_defconfig | 27 -- arch/arm/configs/h7202_defconfig | 48 --- arch/arm/configs/hackkit_defconfig | 49 --- arch/arm/configs/imote2_defconfig | 392 ----------------- arch/arm/configs/integrator_defconfig | 71 ---- arch/arm/configs/iop13xx_defconfig | 124 ------ arch/arm/configs/iop32x_defconfig | 135 ------ arch/arm/configs/iop33x_defconfig | 91 ---- arch/arm/configs/ixp2000_defconfig | 99 ----- arch/arm/configs/ixp23xx_defconfig | 105 ----- arch/arm/configs/ixp4xx_defconfig | 205 --------- arch/arm/configs/jornada720_defconfig | 112 ----- arch/arm/configs/kirkwood_defconfig | 186 -------- arch/arm/configs/ks8695_defconfig | 75 ---- arch/arm/configs/lart_defconfig | 75 ---- arch/arm/configs/loki_defconfig | 120 ------ arch/arm/configs/lpd270_defconfig | 65 --- arch/arm/configs/lubbock_defconfig | 56 --- arch/arm/configs/mackerel_defconfig | 138 ------ arch/arm/configs/magician_defconfig | 182 -------- arch/arm/configs/mainstone_defconfig | 55 --- arch/arm/configs/mini2440_defconfig | 384 ----------------- arch/arm/configs/mmp2_defconfig | 88 ---- arch/arm/configs/msm-copper_defconfig | 165 -------- arch/arm/configs/msm7627-perf_defconfig | 302 ------------- arch/arm/configs/msm7627_defconfig | 307 -------------- arch/arm/configs/msm7627a-perf_defconfig | 330 --------------- arch/arm/configs/msm7627a_defconfig | 332 --------------- arch/arm/configs/msm7630-perf_defconfig | 380 ----------------- arch/arm/configs/msm7630_defconfig | 372 ---------------- arch/arm/configs/msm8660-perf_defconfig | 441 ------------------- arch/arm/configs/msm8660_defconfig | 440 ------------------- arch/arm/configs/msm8960_defconfig | 429 ------------------- arch/arm/configs/msm9615_defconfig | 228 ---------- arch/arm/configs/msm_defconfig | 72 ---- arch/arm/configs/mv78xx0_defconfig | 140 ------- arch/arm/configs/mx1_defconfig | 91 ---- arch/arm/configs/mx21_defconfig | 97 ----- arch/arm/configs/mx27_defconfig | 130 ------ arch/arm/configs/mx3_defconfig | 124 ------ arch/arm/configs/mx51_defconfig | 169 -------- arch/arm/configs/mxs_defconfig | 129 ------ arch/arm/configs/neponset_defconfig | 90 ---- arch/arm/configs/netwinder_defconfig | 87 ---- arch/arm/configs/netx_defconfig | 86 ---- arch/arm/configs/nhk8815_defconfig | 132 ------ arch/arm/configs/nuc910_defconfig | 60 --- arch/arm/configs/nuc950_defconfig | 76 ---- arch/arm/configs/nuc960_defconfig | 66 --- arch/arm/configs/omap1_defconfig | 286 ------------- arch/arm/configs/omap2plus_defconfig | 236 ----------- arch/arm/configs/orion5x_defconfig | 179 -------- arch/arm/configs/palmz72_defconfig | 85 ---- arch/arm/configs/pcm027_defconfig | 102 ----- arch/arm/configs/pcontrol_g20_defconfig | 175 -------- arch/arm/configs/pleb_defconfig | 57 --- arch/arm/configs/pnx4008_defconfig | 472 --------------------- arch/arm/configs/pxa168_defconfig | 70 ---- arch/arm/configs/pxa255-idp_defconfig | 59 --- arch/arm/configs/pxa3xx_defconfig | 134 ------ arch/arm/configs/pxa910_defconfig | 70 ---- arch/arm/configs/qil-a9260_defconfig | 115 ----- arch/arm/configs/raumfeld_defconfig | 208 --------- arch/arm/configs/realview-smp_defconfig | 101 ----- arch/arm/configs/realview_defconfig | 100 ----- arch/arm/configs/rpc_defconfig | 135 ------ arch/arm/configs/s3c2410_defconfig | 489 ---------------------- arch/arm/configs/s3c6400_defconfig | 93 ---- arch/arm/configs/s5p64x0_defconfig | 68 --- arch/arm/configs/s5pc100_defconfig | 49 --- arch/arm/configs/s5pv210_defconfig | 73 ---- arch/arm/configs/sam9_l9260_defconfig | 148 ------- arch/arm/configs/shannon_defconfig | 48 --- arch/arm/configs/shark_defconfig | 81 ---- arch/arm/configs/simpad_defconfig | 111 ----- arch/arm/configs/spear3xx_defconfig | 53 --- arch/arm/configs/spear6xx_defconfig | 49 --- arch/arm/configs/spitz_defconfig | 275 ------------ arch/arm/configs/stamp9g20_defconfig | 129 ------ arch/arm/configs/tct_hammer_defconfig | 70 ---- arch/arm/configs/tegra_defconfig | 146 ------- arch/arm/configs/trizeps4_defconfig | 226 ---------- arch/arm/configs/u300_defconfig | 74 ---- arch/arm/configs/u8500_defconfig | 105 ----- arch/arm/configs/usb-a9260_defconfig | 106 ----- arch/arm/configs/versatile_defconfig | 84 ---- arch/arm/configs/vexpress_defconfig | 140 ------- arch/arm/configs/viper_defconfig | 174 -------- arch/arm/configs/xcep_defconfig | 99 ----- arch/arm/configs/zeus_defconfig | 189 --------- 136 files changed, 19559 deletions(-) delete mode 100755 arch/arm/configs/acs5k_defconfig delete mode 100755 arch/arm/configs/acs5k_tiny_defconfig delete mode 100755 arch/arm/configs/afeb9260_defconfig delete mode 100755 arch/arm/configs/ag5evm_defconfig delete mode 100755 arch/arm/configs/am200epdkit_defconfig delete mode 100755 arch/arm/configs/ap4evb_defconfig delete mode 100755 arch/arm/configs/assabet_defconfig delete mode 100755 arch/arm/configs/at91cap9adk_defconfig delete mode 100755 arch/arm/configs/at91rm9200_defconfig delete mode 100755 arch/arm/configs/at91sam9260ek_defconfig delete mode 100755 arch/arm/configs/at91sam9261_defconfig delete mode 100755 arch/arm/configs/at91sam9263_defconfig delete mode 100755 arch/arm/configs/at91sam9g20ek_defconfig delete mode 100755 arch/arm/configs/at91sam9rlek_defconfig delete mode 100755 arch/arm/configs/at91x40_defconfig delete mode 100755 arch/arm/configs/badge4_defconfig delete mode 100755 arch/arm/configs/bcmring_defconfig delete mode 100755 arch/arm/configs/cam60_defconfig delete mode 100755 arch/arm/configs/cerfcube_defconfig delete mode 100755 arch/arm/configs/cm_x2xx_defconfig delete mode 100755 arch/arm/configs/cm_x300_defconfig delete mode 100755 arch/arm/configs/cns3420vb_defconfig delete mode 100755 arch/arm/configs/colibri_pxa270_defconfig delete mode 100755 arch/arm/configs/colibri_pxa300_defconfig delete mode 100755 arch/arm/configs/collie_defconfig delete mode 100755 arch/arm/configs/corgi_defconfig delete mode 100755 arch/arm/configs/cpu9260_defconfig delete mode 100755 arch/arm/configs/cpu9g20_defconfig delete mode 100755 arch/arm/configs/da8xx_omapl_defconfig delete mode 100755 arch/arm/configs/davinci_all_defconfig delete mode 100755 arch/arm/configs/dove_defconfig delete mode 100755 arch/arm/configs/ebsa110_defconfig delete mode 100755 arch/arm/configs/edb7211_defconfig delete mode 100755 arch/arm/configs/em_x270_defconfig delete mode 100755 arch/arm/configs/ep93xx_defconfig delete mode 100755 arch/arm/configs/eseries_pxa_defconfig delete mode 100755 arch/arm/configs/exynos4_defconfig delete mode 100755 arch/arm/configs/ezx_defconfig delete mode 100755 arch/arm/configs/footbridge_defconfig delete mode 100755 arch/arm/configs/fortunet_defconfig delete mode 100755 arch/arm/configs/fsm9xxx-perf_defconfig delete mode 100755 arch/arm/configs/fsm9xxx_defconfig delete mode 100755 arch/arm/configs/g3evm_defconfig delete mode 100755 arch/arm/configs/g4evm_defconfig delete mode 100755 arch/arm/configs/h3600_defconfig delete mode 100755 arch/arm/configs/h5000_defconfig delete mode 100755 arch/arm/configs/h7201_defconfig delete mode 100755 arch/arm/configs/h7202_defconfig delete mode 100755 arch/arm/configs/hackkit_defconfig delete mode 100755 arch/arm/configs/imote2_defconfig delete mode 100755 arch/arm/configs/integrator_defconfig delete mode 100755 arch/arm/configs/iop13xx_defconfig delete mode 100755 arch/arm/configs/iop32x_defconfig delete mode 100755 arch/arm/configs/iop33x_defconfig delete mode 100755 arch/arm/configs/ixp2000_defconfig delete mode 100755 arch/arm/configs/ixp23xx_defconfig delete mode 100755 arch/arm/configs/ixp4xx_defconfig delete mode 100755 arch/arm/configs/jornada720_defconfig delete mode 100755 arch/arm/configs/kirkwood_defconfig delete mode 100755 arch/arm/configs/ks8695_defconfig delete mode 100755 arch/arm/configs/lart_defconfig delete mode 100755 arch/arm/configs/loki_defconfig delete mode 100755 arch/arm/configs/lpd270_defconfig delete mode 100755 arch/arm/configs/lubbock_defconfig delete mode 100755 arch/arm/configs/mackerel_defconfig delete mode 100755 arch/arm/configs/magician_defconfig delete mode 100755 arch/arm/configs/mainstone_defconfig delete mode 100755 arch/arm/configs/mini2440_defconfig delete mode 100755 arch/arm/configs/mmp2_defconfig delete mode 100755 arch/arm/configs/msm-copper_defconfig delete mode 100755 arch/arm/configs/msm7627-perf_defconfig delete mode 100755 arch/arm/configs/msm7627_defconfig delete mode 100755 arch/arm/configs/msm7627a-perf_defconfig delete mode 100755 arch/arm/configs/msm7627a_defconfig delete mode 100755 arch/arm/configs/msm7630-perf_defconfig delete mode 100755 arch/arm/configs/msm7630_defconfig delete mode 100755 arch/arm/configs/msm8660-perf_defconfig delete mode 100755 arch/arm/configs/msm8660_defconfig delete mode 100755 arch/arm/configs/msm8960_defconfig delete mode 100755 arch/arm/configs/msm9615_defconfig delete mode 100755 arch/arm/configs/msm_defconfig delete mode 100755 arch/arm/configs/mv78xx0_defconfig delete mode 100755 arch/arm/configs/mx1_defconfig delete mode 100755 arch/arm/configs/mx21_defconfig delete mode 100755 arch/arm/configs/mx27_defconfig delete mode 100755 arch/arm/configs/mx3_defconfig delete mode 100755 arch/arm/configs/mx51_defconfig delete mode 100755 arch/arm/configs/mxs_defconfig delete mode 100755 arch/arm/configs/neponset_defconfig delete mode 100755 arch/arm/configs/netwinder_defconfig delete mode 100755 arch/arm/configs/netx_defconfig delete mode 100755 arch/arm/configs/nhk8815_defconfig delete mode 100755 arch/arm/configs/nuc910_defconfig delete mode 100755 arch/arm/configs/nuc950_defconfig delete mode 100755 arch/arm/configs/nuc960_defconfig delete mode 100755 arch/arm/configs/omap1_defconfig delete mode 100755 arch/arm/configs/omap2plus_defconfig delete mode 100755 arch/arm/configs/orion5x_defconfig delete mode 100755 arch/arm/configs/palmz72_defconfig delete mode 100755 arch/arm/configs/pcm027_defconfig delete mode 100755 arch/arm/configs/pcontrol_g20_defconfig delete mode 100755 arch/arm/configs/pleb_defconfig delete mode 100755 arch/arm/configs/pnx4008_defconfig delete mode 100755 arch/arm/configs/pxa168_defconfig delete mode 100755 arch/arm/configs/pxa255-idp_defconfig delete mode 100755 arch/arm/configs/pxa3xx_defconfig delete mode 100755 arch/arm/configs/pxa910_defconfig delete mode 100755 arch/arm/configs/qil-a9260_defconfig delete mode 100755 arch/arm/configs/raumfeld_defconfig delete mode 100755 arch/arm/configs/realview-smp_defconfig delete mode 100755 arch/arm/configs/realview_defconfig delete mode 100755 arch/arm/configs/rpc_defconfig delete mode 100755 arch/arm/configs/s3c2410_defconfig delete mode 100755 arch/arm/configs/s3c6400_defconfig delete mode 100755 arch/arm/configs/s5p64x0_defconfig delete mode 100755 arch/arm/configs/s5pc100_defconfig delete mode 100755 arch/arm/configs/s5pv210_defconfig delete mode 100755 arch/arm/configs/sam9_l9260_defconfig delete mode 100755 arch/arm/configs/shannon_defconfig delete mode 100755 arch/arm/configs/shark_defconfig delete mode 100755 arch/arm/configs/simpad_defconfig delete mode 100755 arch/arm/configs/spear3xx_defconfig delete mode 100755 arch/arm/configs/spear6xx_defconfig delete mode 100755 arch/arm/configs/spitz_defconfig delete mode 100755 arch/arm/configs/stamp9g20_defconfig delete mode 100755 arch/arm/configs/tct_hammer_defconfig delete mode 100755 arch/arm/configs/tegra_defconfig delete mode 100755 arch/arm/configs/trizeps4_defconfig delete mode 100755 arch/arm/configs/u300_defconfig delete mode 100755 arch/arm/configs/u8500_defconfig delete mode 100755 arch/arm/configs/usb-a9260_defconfig delete mode 100755 arch/arm/configs/versatile_defconfig delete mode 100755 arch/arm/configs/vexpress_defconfig delete mode 100755 arch/arm/configs/viper_defconfig delete mode 100755 arch/arm/configs/xcep_defconfig delete mode 100755 arch/arm/configs/zeus_defconfig diff --git a/arch/arm/configs/acs5k_defconfig b/arch/arm/configs/acs5k_defconfig deleted file mode 100755 index 92b0f90d1..000000000 --- a/arch/arm/configs/acs5k_defconfig +++ /dev/null @@ -1,86 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_KS8695=y -CONFIG_MACH_KS8695=y -CONFIG_MACH_DSM320=y -CONFIG_MACH_ACS5K=y -# CONFIG_ARM_THUMB is not set -CONFIG_PCI=y -CONFIG_PCI_DEBUG=y -CONFIG_PCCARD=y -CONFIG_YENTA=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x20410000,3145728 root=/dev/ram0 rw" -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_ARM_KS8695_ETHER=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_PRISM54=m -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_KS8695=y -CONFIG_SERIAL_KS8695_CONSOLE=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_PCA953X=y -CONFIG_WATCHDOG=y -CONFIG_KS8695_WATCHDOG=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_PCF8563=y -CONFIG_EXT2_FS=y -CONFIG_INOTIFY=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_RUBIN=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_MUTEXES=y -# CONFIG_FTRACE is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/acs5k_tiny_defconfig b/arch/arm/configs/acs5k_tiny_defconfig deleted file mode 100755 index 2a27a1474..000000000 --- a/arch/arm/configs/acs5k_tiny_defconfig +++ /dev/null @@ -1,80 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_KS8695=y -CONFIG_MACH_ACS5K=y -# CONFIG_ARM_THUMB is not set -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyAM0,115200 init=/bin/sh" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP=y -# CONFIG_BLK_DEV is not set -# CONFIG_MISC_DEVICES is not set -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_ARM_KS8695_ETHER=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_KS8695=y -CONFIG_SERIAL_KS8695_CONSOLE=y -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_PCA953X=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_KS8695_WATCHDOG=y -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_PCF8563=y -CONFIG_INOTIFY=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_RUBIN=y -CONFIG_SQUASHFS=y -# CONFIG_NETWORK_FILESYSTEMS is not set -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_MUTEXES=y -# CONFIG_FTRACE is not set -CONFIG_DEBUG_USER=y diff --git a/arch/arm/configs/afeb9260_defconfig b/arch/arm/configs/afeb9260_defconfig deleted file mode 100755 index 2afdf67c2..000000000 --- a/arch/arm/configs/afeb9260_defconfig +++ /dev/null @@ -1,107 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91SAM9260=y -CONFIG_MACH_AFEB9260=y -CONFIG_AT91_PROGRAMMABLE_CLOCKS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_ATMEL_SSC=y -CONFIG_EEPROM_AT24=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -CONFIG_MACB=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_GPIO=y -CONFIG_SPI=y -CONFIG_SPI_DEBUG=y -CONFIG_SPI_ATMEL=y -CONFIG_SPI_SPIDEV=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_NOWAYOUT=y -# CONFIG_VGA_CONSOLE is not set -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_ZERO=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_RTC_CLASS=y -CONFIG_RTC_DEBUG=y -CONFIG_RTC_DRV_FM3130=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_INOTIFY=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_INFO=y -CONFIG_SYSCTL_SYSCALL_CHECK=y -# CONFIG_FTRACE is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y -CONFIG_CRC_T10DIF=y diff --git a/arch/arm/configs/ag5evm_defconfig b/arch/arm/configs/ag5evm_defconfig deleted file mode 100755 index 212ead354..000000000 --- a/arch/arm/configs/ag5evm_defconfig +++ /dev/null @@ -1,83 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_NAMESPACES=y -# CONFIG_UTS_NS is not set -# CONFIG_IPC_NS is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_EXPERT=y -CONFIG_SLAB=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_SHMOBILE=y -CONFIG_ARCH_SH73A0=y -CONFIG_MACH_AG5EVM=y -CONFIG_MEMORY_SIZE=0x10000000 -CONFIG_CPU_BPREDICT_DISABLE=y -CONFIG_ARM_ERRATA_430973=y -CONFIG_ARM_ERRATA_458693=y -CONFIG_NO_HZ=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_HIGHMEM=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=tty0 console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel" -CONFIG_CMDLINE_FORCE=y -CONFIG_KEXEC=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_PM=y -# CONFIG_SUSPEND is not set -CONFIG_PM_RUNTIME=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -# CONFIG_WIRELESS is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_BLK_DEV is not set -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SMSC911X=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_WLAN is not set -CONFIG_INPUT_SPARSEKMAP=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_SERIAL_SH_SCI=y -CONFIG_SERIAL_SH_SCI_NR_UARTS=9 -CONFIG_SERIAL_SH_SCI_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_SH_MOBILE=y -# CONFIG_HWMON is not set -# CONFIG_MFD_SUPPORT is not set -CONFIG_FB=y -CONFIG_FB_SH_MOBILE_LCDC=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -# CONFIG_DNOTIFY is not set -# CONFIG_INOTIFY_USER is not set -CONFIG_TMPFS=y -# CONFIG_MISC_FILESYSTEMS is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_FTRACE is not set diff --git a/arch/arm/configs/am200epdkit_defconfig b/arch/arm/configs/am200epdkit_defconfig deleted file mode 100755 index f0dea52e4..000000000 --- a/arch/arm/configs/am200epdkit_defconfig +++ /dev/null @@ -1,108 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_LOCALVERSION="gum" -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_EXPERT=y -# CONFIG_SYSCTL_SYSCALL is not set -# CONFIG_EPOLL is not set -# CONFIG_SHMEM is not set -# CONFIG_VM_EVENT_COUNTERS is not set -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_PXA=y -CONFIG_ARCH_GUMSTIX=y -CONFIG_PCCARD=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200n8 root=1f01 rootfstype=jffs2" -CONFIG_NET=y -CONFIG_PACKET=m -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set -# CONFIG_MTD_CFI_I2 is not set -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_PXA2XX=y -CONFIG_BLK_DEV_LOOP=m -CONFIG_IDE=m -CONFIG_BLK_DEV_IDECS=m -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=m -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_SA1100_WATCHDOG=m -CONFIG_FB=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y -CONFIG_FB_PXA=y -CONFIG_FB_PXA_PARAMETERS=y -CONFIG_FB_MBX=m -CONFIG_FB_VIRTUAL=m -# CONFIG_VGA_CONSOLE is not set -CONFIG_SOUND=m -CONFIG_SND=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -# CONFIG_SND_SUPPORT_OLD_API is not set -# CONFIG_SND_VERBOSE_PROCFS is not set -CONFIG_SND_PXA2XX_AC97=m -CONFIG_USB_GADGET=y -CONFIG_USB_ETH=m -CONFIG_MMC=y -CONFIG_MMC_PXA=y -# CONFIG_DNOTIFY is not set -CONFIG_INOTIFY=y -CONFIG_VFAT_FS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_RUBIN=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DETECT_SOFTLOCKUP is not set -# CONFIG_DEBUG_PREEMPT is not set -# CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_CRYPTO=y -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_ARC4=m diff --git a/arch/arm/configs/ap4evb_defconfig b/arch/arm/configs/ap4evb_defconfig deleted file mode 100755 index 2eef85e3c..000000000 --- a/arch/arm/configs/ap4evb_defconfig +++ /dev/null @@ -1,57 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_SHMOBILE=y -CONFIG_ARCH_SH7372=y -CONFIG_MACH_AP4EVB=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=sh-sci.0,115200" -CONFIG_KEXEC=y -CONFIG_PM=y -# CONFIG_SUSPEND is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_NAND=y -# CONFIG_BLK_DEV is not set -# CONFIG_MISC_DEVICES is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_SH_SCI=y -CONFIG_SERIAL_SH_SCI_NR_UARTS=8 -CONFIG_SERIAL_SH_SCI_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -# CONFIG_DNOTIFY is not set -# CONFIG_INOTIFY_USER is not set -CONFIG_TMPFS=y -# CONFIG_MISC_FILESYSTEMS is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DETECT_SOFTLOCKUP is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_FTRACE is not set -# CONFIG_CRC32 is not set diff --git a/arch/arm/configs/assabet_defconfig b/arch/arm/configs/assabet_defconfig deleted file mode 100755 index 558ecd8f6..000000000 --- a/arch/arm/configs/assabet_defconfig +++ /dev/null @@ -1,60 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_MODULES=y -CONFIG_ARCH_SA1100=y -CONFIG_SA1100_ASSABET=y -CONFIG_PCCARD=y -CONFIG_PCMCIA_SA1100=y -CONFIG_LEDS=y -CONFIG_LEDS_CPU=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=32M console=ttySA0,38400n8 initrd=0xc0800000,3M root=/dev/ram" -CONFIG_FPE_NWFPE=y -CONFIG_PM=y -CONFIG_NET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_IPV6 is not set -CONFIG_IRDA=m -CONFIG_IRLAN=m -CONFIG_SA1100_FIR=m -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_CFI_I1 is not set -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_SA1100=y -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_RAM=y -CONFIG_IDE=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_NET_PCMCIA=y -CONFIG_PCMCIA_PCNET=y -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_8250=m -CONFIG_SERIAL_SA1100=y -CONFIG_SERIAL_SA1100_CONSOLE=y -CONFIG_FB=y -CONFIG_FB_SA1100=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_SOUND=y -CONFIG_EXT2_FS=y -CONFIG_MSDOS_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_DEBUG_USER=y diff --git a/arch/arm/configs/at91cap9adk_defconfig b/arch/arm/configs/at91cap9adk_defconfig deleted file mode 100755 index ffb1edd93..000000000 --- a/arch/arm/configs/at91cap9adk_defconfig +++ /dev/null @@ -1,115 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91CAP9=y -CONFIG_MACH_AT91CAP9ADK=y -CONFIG_MTD_AT91_DATAFLASH_CARD=y -CONFIG_AT91_PROGRAMMABLE_CLOCKS=y -# CONFIG_ARM_THUMB is not set -CONFIG_AEABI=y -CONFIG_LEDS=y -CONFIG_LEDS_CPU=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/ram0 rw" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_ATMEL_SSC=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -CONFIG_MACB=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=y -# CONFIG_SERIO is not set -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_SPI=y -CONFIG_SPI_ATMEL=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_NOWAYOUT=y -CONFIG_FB=y -CONFIG_FB_ATMEL=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_CLUT224 is not set -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_ETH=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_MMC=y -CONFIG_MMC_AT91=m -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_AT91SAM9=y -CONFIG_EXT2_FS=y -CONFIG_INOTIFY=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_USER=y diff --git a/arch/arm/configs/at91rm9200_defconfig b/arch/arm/configs/at91rm9200_defconfig deleted file mode 100755 index 38cb7c985..000000000 --- a/arch/arm/configs/at91rm9200_defconfig +++ /dev/null @@ -1,341 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_MODULES=y -CONFIG_MODULE_FORCE_LOAD=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_MODULE_SRCVERSION_ALL=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_AT91=y -CONFIG_MACH_ONEARM=y -CONFIG_ARCH_AT91RM9200DK=y -CONFIG_MACH_AT91RM9200EK=y -CONFIG_MACH_CSB337=y -CONFIG_MACH_CSB637=y -CONFIG_MACH_CARMEVA=y -CONFIG_MACH_ATEB9200=y -CONFIG_MACH_KB9200=y -CONFIG_MACH_PICOTUX2XX=y -CONFIG_MACH_KAFA=y -CONFIG_MACH_ECBAT91=y -CONFIG_MACH_YL9200=y -CONFIG_MACH_CPUAT91=y -CONFIG_MACH_ECO920=y -CONFIG_MTD_AT91_DATAFLASH_CARD=y -CONFIG_AT91_PROGRAMMABLE_CLOCKS=y -CONFIG_AT91_TIMER_HZ=100 -# CONFIG_ARM_THUMB is not set -CONFIG_PCCARD=y -CONFIG_AT91_CF=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_LEDS=y -CONFIG_LEDS_CPU=y -CONFIG_ZBOOT_ROM_TEXT=0x10000000 -CONFIG_ZBOOT_ROM_BSS=0x20040000 -CONFIG_KEXEC=y -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_MISC=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=m -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE=m -CONFIG_INET_AH=m -CONFIG_INET_ESP=m -CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m -CONFIG_IPV6_TUNNEL=m -CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_AFS_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_PLATRAM=y -CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_MTD_NAND_PLATFORM=y -CONFIG_MTD_UBI=y -CONFIG_MTD_UBI_GLUEBI=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_NBD=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_ATMEL_TCLIB=y -CONFIG_EEPROM_LEGACY=m -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_BLK_DEV_SR=m -CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SG=m -CONFIG_SCSI_MULTI_LUN=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_NETDEVICES=y -CONFIG_TUN=m -CONFIG_PHYLIB=y -CONFIG_DAVICOM_PHY=y -CONFIG_SMSC_PHY=y -CONFIG_MICREL_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_ARM_AT91_ETHER=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_PLUSB=m -CONFIG_USB_NET_RNDIS_HOST=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_EPSON2888=y -CONFIG_PPP=y -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=y -CONFIG_PPP_DEFLATE=y -CONFIG_PPP_BSDCOMP=y -CONFIG_PPP_MPPE=m -CONFIG_PPPOE=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -CONFIG_SLIP_MODE_SLIP6=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_MOUSEDEV_SCREEN_X=640 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480 -CONFIG_INPUT_EVDEV=y -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=32 -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_GPIO=y -CONFIG_SPI=y -CONFIG_SPI_ATMEL=y -CONFIG_SPI_BITBANG=y -CONFIG_GPIO_SYSFS=y -CONFIG_HWMON=m -CONFIG_SENSORS_ADM1021=m -CONFIG_SENSORS_ADM1025=m -CONFIG_SENSORS_ADM1026=m -CONFIG_SENSORS_ADM1029=m -CONFIG_SENSORS_ADM1031=m -CONFIG_SENSORS_ADM9240=m -CONFIG_SENSORS_DS1621=m -CONFIG_SENSORS_GL518SM=m -CONFIG_SENSORS_GL520SM=m -CONFIG_SENSORS_IT87=m -CONFIG_SENSORS_LM63=m -CONFIG_SENSORS_LM73=m -CONFIG_SENSORS_LM75=m -CONFIG_SENSORS_LM77=m -CONFIG_SENSORS_LM78=m -CONFIG_SENSORS_LM80=m -CONFIG_SENSORS_LM83=m -CONFIG_SENSORS_LM85=m -CONFIG_SENSORS_LM87=m -CONFIG_SENSORS_LM90=m -CONFIG_SENSORS_LM92=m -CONFIG_SENSORS_MAX1619=m -CONFIG_SENSORS_PCF8591=m -CONFIG_SENSORS_SMSC47B397=m -CONFIG_SENSORS_W83781D=m -CONFIG_SENSORS_W83791D=m -CONFIG_SENSORS_W83792D=m -CONFIG_SENSORS_W83793=m -CONFIG_SENSORS_W83L785TS=m -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_NOWAYOUT=y -CONFIG_AT91RM9200_WATCHDOG=y -CONFIG_FB=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y -CONFIG_FB_S1D13XXX=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_BACKLIGHT_GENERIC is not set -CONFIG_DISPLAY_SUPPORT=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FONTS=y -CONFIG_FONT_MINI_4x6=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m -CONFIG_USB_STORAGE=y -CONFIG_USB_SERIAL=y -CONFIG_USB_SERIAL_CONSOLE=y -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_FTDI_SIO=y -CONFIG_USB_SERIAL_KEYSPAN=y -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y -CONFIG_USB_SERIAL_MCT_U232=y -CONFIG_USB_SERIAL_PL2303=y -CONFIG_USB_GADGET=y -CONFIG_USB_ETH=m -CONFIG_USB_MASS_STORAGE=m -CONFIG_MMC=y -CONFIG_MMC_AT91=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_GPIO=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_RTC_CLASS=y -# CONFIG_RTC_HCTOSYS is not set -CONFIG_RTC_DRV_DS1307=y -CONFIG_RTC_DRV_PCF8563=y -CONFIG_RTC_DRV_AT91RM9200=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_XATTR is not set -CONFIG_REISERFS_FS=y -CONFIG_AUTOFS4_FS=y -CONFIG_ISO9660_FS=y -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_NTFS_FS=m -CONFIG_TMPFS=y -CONFIG_CONFIGFS_FS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_LZO=y -CONFIG_JFFS2_RUBIN=y -CONFIG_CRAMFS=y -CONFIG_MINIX_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=y -CONFIG_SMB_FS=m -CONFIG_CIFS=m -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAC_PARTITION=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_FTRACE is not set -CONFIG_CRYPTO_PCBC=y -CONFIG_CRYPTO_SHA1=y diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig deleted file mode 100755 index f8a922641..000000000 --- a/arch/arm/configs/at91sam9260ek_defconfig +++ /dev/null @@ -1,83 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91SAM9260=y -CONFIG_MACH_AT91SAM9260EK=y -CONFIG_AT91_PROGRAMMABLE_CLOCKS=y -# CONFIG_ARM_THUMB is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_ATMEL_SSC=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -CONFIG_MACB=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_GPIO=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_NOWAYOUT=y -CONFIG_AT91SAM9X_WATCHDOG=y -# CONFIG_VGA_CONSOLE is not set -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DEBUG=y -CONFIG_USB_GADGET=y -CONFIG_USB_ZERO=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_AT91SAM9=y -CONFIG_EXT2_FS=y -CONFIG_INOTIFY=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_CRAMFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/at91sam9261_defconfig b/arch/arm/configs/at91sam9261_defconfig deleted file mode 100755 index ade6b2f23..000000000 --- a/arch/arm/configs/at91sam9261_defconfig +++ /dev/null @@ -1,158 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_KERNEL_LZMA=y -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_NAMESPACES=y -CONFIG_EMBEDDED=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91SAM9261=y -CONFIG_MACH_AT91SAM9261EK=y -CONFIG_AT91_PROGRAMMABLE_CLOCKS=y -# CONFIG_ARM_THUMB is not set -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw" -CONFIG_AUTO_ZRELADDR=y -CONFIG_VFP=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_CFG80211=y -CONFIG_LIB80211=y -CONFIG_MAC80211=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_MTD_UBI=y -CONFIG_MTD_UBI_GLUEBI=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_MISC_DEVICES=y -CONFIG_ATMEL_TCLIB=y -CONFIG_ATMEL_SSC=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_DM9000=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_USB_ZD1201=m -CONFIG_RTL8187=m -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_SDIO=m -CONFIG_LIBERTAS_SPI=m -CONFIG_RT2X00=m -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_ZD1211RW=m -CONFIG_INPUT_POLLDEV=m -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_MOUSEDEV_SCREEN_X=240 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=y -CONFIG_DEVPTS_MULTIPLE_INSTANCES=y -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_GPIO=y -CONFIG_SPI=y -CONFIG_SPI_ATMEL=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_NOWAYOUT=y -CONFIG_AT91SAM9X_WATCHDOG=y -CONFIG_FB=y -CONFIG_FB_ATMEL=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_ATMEL_LCDC=y -# CONFIG_BACKLIGHT_GENERIC is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -CONFIG_LOGO=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_SEQUENCER=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y -# CONFIG_SND_SUPPORT_OLD_API is not set -# CONFIG_SND_VERBOSE_PROCFS is not set -# CONFIG_SND_DRIVERS is not set -# CONFIG_SND_ARM is not set -CONFIG_SND_AT73C213=y -CONFIG_SND_USB_AUDIO=m -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_MMC=y -CONFIG_MMC_AT91=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_GPIO=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_AT91SAM9=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_UBIFS_FS=y -CONFIG_UBIFS_FS_ADVANCED_COMPR=y -CONFIG_SQUASHFS=y -CONFIG_SQUASHFS_LZO=y -CONFIG_SQUASHFS_XZ=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_15=y -CONFIG_NLS_UTF8=y -CONFIG_FTRACE=y -CONFIG_CRC_CCITT=m diff --git a/arch/arm/configs/at91sam9263_defconfig b/arch/arm/configs/at91sam9263_defconfig deleted file mode 100755 index 1cf96264c..000000000 --- a/arch/arm/configs/at91sam9263_defconfig +++ /dev/null @@ -1,168 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_KERNEL_LZMA=y -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_NAMESPACES=y -CONFIG_EMBEDDED=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91SAM9263=y -CONFIG_MACH_AT91SAM9263EK=y -CONFIG_MACH_USB_A9263=y -CONFIG_MACH_NEOCORE926=y -CONFIG_MTD_AT91_DATAFLASH_CARD=y -# CONFIG_ARM_THUMB is not set -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw" -CONFIG_AUTO_ZRELADDR=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_NET_IPIP=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -CONFIG_IPV6=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_NFTL=y -CONFIG_NFTL_RW=y -CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_BLOCK2MTD=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y -CONFIG_MTD_UBI=y -CONFIG_MTD_UBI_GLUEBI=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_MISC_DEVICES=y -CONFIG_ATMEL_PWM=y -CONFIG_ATMEL_TCLIB=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_NETDEVICES=y -CONFIG_MII=y -CONFIG_SMSC_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_MACB=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_USB_ZD1201=m -CONFIG_INPUT_POLLDEV=m -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_MOUSEDEV_SCREEN_X=240 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=y -CONFIG_LEGACY_PTY_COUNT=4 -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_GPIO=y -CONFIG_SPI=y -CONFIG_SPI_ATMEL=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_NOWAYOUT=y -CONFIG_AT91SAM9X_WATCHDOG=y -CONFIG_FB=y -CONFIG_FB_ATMEL=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_ATMEL_LCDC=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -CONFIG_LOGO=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_SEQUENCER=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y -# CONFIG_SND_SUPPORT_OLD_API is not set -# CONFIG_SND_VERBOSE_PROCFS is not set -# CONFIG_SND_DRIVERS is not set -# CONFIG_SND_ARM is not set -CONFIG_SND_ATMEL_AC97C=y -# CONFIG_SND_SPI is not set -CONFIG_SND_USB_AUDIO=m -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_MMC=y -CONFIG_SDIO_UART=m -CONFIG_MMC_AT91=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_ATMEL_PWM=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_AT91SAM9=y -CONFIG_EXT2_FS=y -CONFIG_FUSE_FS=m -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_UBIFS_FS=y -CONFIG_UBIFS_FS_ADVANCED_COMPR=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_FTRACE=y -CONFIG_DEBUG_USER=y -CONFIG_XZ_DEC=y diff --git a/arch/arm/configs/at91sam9g20ek_defconfig b/arch/arm/configs/at91sam9g20ek_defconfig deleted file mode 100755 index 9e90e6d79..000000000 --- a/arch/arm/configs/at91sam9g20ek_defconfig +++ /dev/null @@ -1,123 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91SAM9G20=y -CONFIG_MACH_AT91SAM9G20EK=y -CONFIG_MACH_AT91SAM9G20EK_2MMC=y -CONFIG_AT91_PROGRAMMABLE_CLOCKS=y -# CONFIG_ARM_THUMB is not set -CONFIG_AEABI=y -CONFIG_LEDS=y -CONFIG_LEDS_CPU=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw" -CONFIG_FPE_NWFPE=y -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_ATMEL_SSC=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -CONFIG_MACB=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=16 -CONFIG_HW_RANDOM=y -CONFIG_SPI=y -CONFIG_SPI_ATMEL=y -CONFIG_SPI_SPIDEV=y -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_SEQUENCER=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y -CONFIG_SND_SEQUENCER_OSS=y -# CONFIG_SND_VERBOSE_PROCFS is not set -CONFIG_SND_AT73C213=y -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_ZERO=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_MMC=y -CONFIG_MMC_AT91=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_AT91SAM9=y -CONFIG_EXT2_FS=y -CONFIG_INOTIFY=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_15=y -CONFIG_NLS_UTF8=y -# CONFIG_ENABLE_WARN_DEPRECATED is not set diff --git a/arch/arm/configs/at91sam9rlek_defconfig b/arch/arm/configs/at91sam9rlek_defconfig deleted file mode 100755 index 75621e4d0..000000000 --- a/arch/arm/configs/at91sam9rlek_defconfig +++ /dev/null @@ -1,84 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91SAM9RL=y -CONFIG_MACH_AT91SAM9RLEK=y -CONFIG_AT91_PROGRAMMABLE_CLOCKS=y -# CONFIG_ARM_THUMB is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,17105363 root=/dev/ram0 rw" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_UNIX=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=4 -CONFIG_BLK_DEV_RAM_SIZE=24576 -CONFIG_ATMEL_SSC=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ATMEL_TSADCC=y -# CONFIG_SERIO is not set -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_GPIO=y -CONFIG_SPI=y -CONFIG_SPI_ATMEL=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_NOWAYOUT=y -CONFIG_AT91SAM9X_WATCHDOG=y -CONFIG_FB=y -CONFIG_FB_ATMEL=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_MMC=y -CONFIG_MMC_AT91=m -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_AT91SAM9=y -CONFIG_EXT2_FS=y -CONFIG_INOTIFY=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_CRAMFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_15=y -CONFIG_NLS_UTF8=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/at91x40_defconfig b/arch/arm/configs/at91x40_defconfig deleted file mode 100755 index c55e9212f..000000000 --- a/arch/arm/configs/at91x40_defconfig +++ /dev/null @@ -1,48 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_EMBEDDED=y -# CONFIG_HOTPLUG is not set -# CONFIG_ELF_CORE is not set -# CONFIG_FUTEX is not set -# CONFIG_TIMERFD is not set -# CONFIG_VM_EVENT_COUNTERS is not set -# CONFIG_COMPAT_BRK is not set -CONFIG_SLAB=y -# CONFIG_LBDAF is not set -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -# CONFIG_MMU is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91X40=y -CONFIG_MACH_AT91EB01=y -CONFIG_AT91_EARLY_USART0=y -CONFIG_CPU_ARM7TDMI=y -CONFIG_SET_MEM_PARAM=y -CONFIG_DRAM_BASE=0x01000000 -CONFIG_DRAM_SIZE=0x00400000 -CONFIG_FLASH_MEM_BASE=0x01400000 -CONFIG_PROCESSOR_ID=0x14000040 -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_BINFMT_FLAT=y -# CONFIG_SUSPEND is not set -# CONFIG_FW_LOADER is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_RAM=y -CONFIG_MTD_ROM=y -CONFIG_BLK_DEV_RAM=y -# CONFIG_INPUT is not set -# CONFIG_SERIO is not set -# CONFIG_VT is not set -# CONFIG_DEVKMEM is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_EXT2_FS=y -# CONFIG_DNOTIFY is not set -CONFIG_ROMFS_FS=y -# CONFIG_ENABLE_MUST_CHECK is not set diff --git a/arch/arm/configs/badge4_defconfig b/arch/arm/configs/badge4_defconfig deleted file mode 100755 index 5b54abbeb..000000000 --- a/arch/arm/configs/badge4_defconfig +++ /dev/null @@ -1,122 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_EXPERT=y -CONFIG_MODULES=y -CONFIG_MODVERSIONS=y -CONFIG_ARCH_SA1100=y -CONFIG_SA1100_BADGE4=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="init=/linuxrc root=/dev/mtdblock3" -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_AOUT=m -CONFIG_BINFMT_MISC=m -CONFIG_ARTHUR=m -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_IPV6 is not set -CONFIG_IRDA=y -CONFIG_IRLAN=y -CONFIG_IRCOMM=y -CONFIG_IRDA_ULTRA=y -CONFIG_SA1100_FIR=y -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIVHCI=m -# CONFIG_FW_LOADER is not set -CONFIG_MTD=y -CONFIG_MTD_DEBUG=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_CFI_I2 is not set -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_RAM=y -CONFIG_MTD_SA1100=y -CONFIG_PARPORT=m -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_NBD=m -CONFIG_IDE=m -CONFIG_BLK_DEV_IDECD=m -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=m -CONFIG_BLK_DEV_SR=m -CONFIG_CHR_DEV_SG=y -CONFIG_NETDEVICES=y -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_USBNET=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_EPSON2888=y -CONFIG_USB_KC2190=y -# CONFIG_INPUT is not set -# CONFIG_SERIO is not set -# CONFIG_VT is not set -CONFIG_SERIAL_SA1100=y -CONFIG_SERIAL_SA1100_CONSOLE=y -CONFIG_I2C=m -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_ELEKTOR=m -CONFIG_WATCHDOG=y -CONFIG_SOFT_WATCHDOG=m -CONFIG_SA1100_WATCHDOG=m -CONFIG_SOUND=y -CONFIG_SOUND_PRIME=y -CONFIG_USB=y -CONFIG_USB_DEBUG=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=y -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DEBUG=y -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m -CONFIG_USB_USS720=m -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_BELKIN=m -CONFIG_USB_SERIAL_WHITEHEAT=m -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_IR=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_MCT_U232=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m -CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_RIO500=m -CONFIG_EXT2_FS=m -CONFIG_EXT3_FS=m -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=m -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=m -CONFIG_MINIX_FS=m -CONFIG_NFS_FS=m -CONFIG_NFS_V3=y -CONFIG_SMB_FS=m -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/bcmring_defconfig b/arch/arm/configs/bcmring_defconfig deleted file mode 100755 index 795374d48..000000000 --- a/arch/arm/configs/bcmring_defconfig +++ /dev/null @@ -1,79 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_EXPERT=y -CONFIG_KALLSYMS_EXTRA_PASS=y -# CONFIG_HOTPLUG is not set -# CONFIG_ELF_CORE is not set -# CONFIG_EPOLL is not set -# CONFIG_SIGNALFD is not set -# CONFIG_TIMERFD is not set -# CONFIG_EVENTFD is not set -# CONFIG_AIO is not set -CONFIG_PERF_COUNTERS=y -# CONFIG_VM_EVENT_COUNTERS is not set -# CONFIG_SLUB_DEBUG is not set -# CONFIG_COMPAT_BRK is not set -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_BCMRING=y -CONFIG_BCM_ZRELADDR=0x8000 -CONFIG_CPU_32v6K=y -CONFIG_NO_HZ=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_UACCESS_WITH_MEMCPY=y -CONFIG_ZBOOT_ROM_TEXT=0x0e000000 -CONFIG_ZBOOT_ROM_BSS=0x0ea00000 -CONFIG_ZBOOT_ROM=y -CONFIG_NET=y -# CONFIG_WIRELESS is not set -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_CFI_I2 is not set -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y -CONFIG_MTD_NAND_BCM_UMI=y -CONFIG_MTD_NAND_BCM_UMI_HWCS=y -# CONFIG_MISC_DEVICES is not set -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -# CONFIG_CONSOLE_TRANSLATIONS is not set -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=64 -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -# CONFIG_FILE_LOCKING is not set -# CONFIG_DNOTIFY is not set -# CONFIG_INOTIFY_USER is not set -# CONFIG_PROC_PAGE_MONITOR is not set -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_JFFS2_FS_XATTR=y -# CONFIG_JFFS2_FS_SECURITY is not set -# CONFIG_NETWORK_FILESYSTEMS is not set -# CONFIG_ENABLE_WARN_DEPRECATED is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_HEADERS_CHECK=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_ARM_UNWIND is not set diff --git a/arch/arm/configs/cam60_defconfig b/arch/arm/configs/cam60_defconfig deleted file mode 100755 index cedc92ef8..000000000 --- a/arch/arm/configs/cam60_defconfig +++ /dev/null @@ -1,174 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_AUDIT=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_BLK_DEV_INITRD=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_KALLSYMS_ALL=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91SAM9260=y -CONFIG_MACH_CAM60=y -CONFIG_ZBOOT_ROM_BSS=0x20004000 -CONFIG_CMDLINE="console=ttyS0,115200 noinitrd root=/dev/mtdblock0 rootfstype=jffs2 mem=64M" -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_AOUT=y -CONFIG_BINFMT_MISC=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_NETWORK_SECMARK=y -CONFIG_CFG80211=m -CONFIG_MAC80211=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_PLATRAM=m -CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -# CONFIG_MISC_DEVICES is not set -CONFIG_SCSI=y -CONFIG_SCSI_TGT=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_SCH=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_SCSI_SPI_ATTRS=m -CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_SAS_LIBSAS=m -# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_NETDEVICES=y -CONFIG_MARVELL_PHY=m -CONFIG_DAVICOM_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_LXT_PHY=m -CONFIG_CICADA_PHY=m -CONFIG_VITESSE_PHY=m -CONFIG_SMSC_PHY=m -CONFIG_BROADCOM_PHY=m -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -CONFIG_MACB=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_INPUT_EVDEV=y -CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_NEWTON=m -CONFIG_KEYBOARD_STOWAWAY=m -CONFIG_KEYBOARD_SUNKBD=m -CONFIG_KEYBOARD_XTKBD=m -CONFIG_MOUSE_SERIAL=m -CONFIG_MOUSE_APPLETOUCH=m -CONFIG_MOUSE_VSXXXAA=m -# CONFIG_SERIO_SERPORT is not set -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_SERIAL_NONSTANDARD=y -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_SPI=y -CONFIG_SPI_ATMEL=y -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_LIBUSUAL=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_INTF_DEV_UIE_EMUL=y -CONFIG_RTC_DRV_TEST=m -CONFIG_RTC_DRV_AT91SAM9=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT3_FS=y -CONFIG_INOTIFY=y -CONFIG_QUOTA=y -CONFIG_AUTOFS_FS=y -CONFIG_AUTOFS4_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_CONFIGFS_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_DEFAULT="cp437" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_UTF8=y -CONFIG_PRINTK_TIME=y -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_UNUSED_SYMBOLS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_BLK_DEV_IO_TRACE=y -CONFIG_DEBUG_LL=y -CONFIG_CRYPTO=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_CRYPTD=m -CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_LRW=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_CAMELLIA=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_DES=y -CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_DEFLATE=m -# CONFIG_CRYPTO_HW is not set -CONFIG_CRC32=m -CONFIG_LIBCRC32C=m diff --git a/arch/arm/configs/cerfcube_defconfig b/arch/arm/configs/cerfcube_defconfig deleted file mode 100755 index dce912d14..000000000 --- a/arch/arm/configs/cerfcube_defconfig +++ /dev/null @@ -1,75 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_ARCH_SA1100=y -CONFIG_SA1100_CERF=y -CONFIG_SA1100_CERF_FLASH_16MB=y -CONFIG_PCCARD=m -CONFIG_PCMCIA_SA1100=m -CONFIG_LEDS=y -CONFIG_LEDS_CPU=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttySA0,38400 root=/dev/mtdblock3 rootfstype=jffs2 rw mem=32M init=/linuxrc" -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_FPE_FASTFPE=y -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -# CONFIG_IPV6 is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=m -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_SA1100=y -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_RAM=m -CONFIG_IDE=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_NET_PCI=y -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_SA1100=y -CONFIG_SERIAL_SA1100_CONSOLE=y -CONFIG_WATCHDOG=y -CONFIG_SA1100_WATCHDOG=m -# CONFIG_VGA_CONSOLE is not set -CONFIG_EXT2_FS=m -CONFIG_EXT3_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_ROMFS_FS=y -CONFIG_NFS_FS=m -CONFIG_NFS_V3=y -CONFIG_NFS_V4=y -CONFIG_NFSD=m -CONFIG_NFSD_V4=y -CONFIG_SMB_FS=m -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS=y -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_ISO8859_1=m -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/cm_x2xx_defconfig b/arch/arm/configs/cm_x2xx_defconfig deleted file mode 100755 index a93ff8da5..000000000 --- a/arch/arm/configs/cm_x2xx_defconfig +++ /dev/null @@ -1,189 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -# CONFIG_VM_EVENT_COUNTERS is not set -# CONFIG_SLUB_DEBUG is not set -# CONFIG_COMPAT_BRK is not set -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_PXA=y -CONFIG_MACH_ARMCORE=y -CONFIG_PCI=y -CONFIG_PCCARD=m -CONFIG_YENTA=m -# CONFIG_YENTA_O2 is not set -# CONFIG_YENTA_RICOH is not set -# CONFIG_YENTA_ENE_TUNE is not set -# CONFIG_YENTA_TOSHIBA is not set -CONFIG_PCMCIA_PXA2XX=m -CONFIG_NO_HZ=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=1f03 mem=32M" -CONFIG_FPE_NWFPE=y -CONFIG_PM=y -CONFIG_APM_EMULATION=m -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_BNEP=m -CONFIG_BT_HIDP=m -CONFIG_LIB80211=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_FW_LOADER=m -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_CFI_STAA=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_PXA2XX=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_GPIO=m -CONFIG_MTD_NAND_CM_X270=y -CONFIG_MTD_NAND_PLATFORM=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -# CONFIG_MISC_DEVICES is not set -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_ATA=m -# CONFIG_SATA_PMP is not set -CONFIG_PATA_PCMCIA=m -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_DM9000=y -CONFIG_DM9000_DEBUGLEVEL=1 -CONFIG_NET_PCI=y -CONFIG_8139TOO=m -# CONFIG_8139TOO_PIO is not set -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_INPUT_EVDEV=y -CONFIG_KEYBOARD_PXA27x=m -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_UCB1400=m -# CONFIG_SERIO_SERPORT is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=16 -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_PXA=y -CONFIG_SPI=y -CONFIG_SPI_PXA2XX=m -# CONFIG_HWMON is not set -CONFIG_UCB1400_CORE=m -CONFIG_FB=y -CONFIG_FB_PXA=y -CONFIG_FB_PXA_PARAMETERS=y -CONFIG_FB_MBX=m -CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_LCD_CLASS_DEVICE is not set -# CONFIG_BACKLIGHT_CLASS_DEVICE is not set -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -CONFIG_SOUND=m -CONFIG_SND=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -# CONFIG_SND_DRIVERS is not set -# CONFIG_SND_PCI is not set -CONFIG_SND_PXA2XX_AC97=m -# CONFIG_SND_SPI is not set -# CONFIG_SND_USB is not set -# CONFIG_SND_PCMCIA is not set -CONFIG_HID_A4TECH=y -CONFIG_HID_APPLE=y -CONFIG_HID_BELKIN=y -CONFIG_HID_CHERRY=y -CONFIG_HID_CHICONY=y -CONFIG_HID_CYPRESS=y -CONFIG_HID_EZKEY=y -CONFIG_HID_GYRATION=y -CONFIG_HID_LOGITECH=y -CONFIG_HID_MICROSOFT=y -CONFIG_HID_MONTEREY=y -CONFIG_HID_PANTHERLORD=y -CONFIG_HID_PETALYNX=y -CONFIG_HID_SAMSUNG=y -CONFIG_HID_SONY=y -CONFIG_HID_SUNPLUS=y -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_MMC=m -CONFIG_MMC_PXA=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=m -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_V3020=y -CONFIG_RTC_DRV_SA1100=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_INOTIFY=y -CONFIG_VFAT_FS=m -# CONFIG_PROC_PAGE_MONITOR is not set -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_CIFS=m -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_UTF8=m -CONFIG_FRAME_WARN=0 -CONFIG_DEBUG_KERNEL=y -# CONFIG_DETECT_SOFTLOCKUP is not set -# CONFIG_SCHED_DEBUG is not set -# CONFIG_DEBUG_BUGVERBOSE is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set diff --git a/arch/arm/configs/cm_x300_defconfig b/arch/arm/configs/cm_x300_defconfig deleted file mode 100755 index 921e56a75..000000000 --- a/arch/arm/configs/cm_x300_defconfig +++ /dev/null @@ -1,188 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_LOCALVERSION="-cm-x300" -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=18 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_PXA=y -CONFIG_MACH_CM_X300=y -CONFIG_NO_HZ=y -CONFIG_AEABI=y -CONFIG_HIGHMEM=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/mtdblock5 rootfstype=ubifs console=ttyS2,38400" -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_FPE_NWFPE=y -CONFIG_PM=y -CONFIG_APM_EMULATION=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m -CONFIG_BT_HCIBTUSB=m -CONFIG_LIB80211=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_PXA3xx=y -CONFIG_MTD_UBI=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -# CONFIG_MISC_DEVICES is not set -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_DM9000=y -CONFIG_DM9000_DEBUGLEVEL=0 -CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_PXA27x=m -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -# CONFIG_TOUCHSCREEN_DA9034 is not set -CONFIG_TOUCHSCREEN_WM97XX=m -# CONFIG_TOUCHSCREEN_WM9705 is not set -# CONFIG_TOUCHSCREEN_WM9713 is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_PXA=y -CONFIG_SPI=y -CONFIG_SPI_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_PCA953X=y -# CONFIG_HWMON is not set -CONFIG_PMIC_DA903X=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_DA903X=y -CONFIG_FB=y -CONFIG_FB_PXA=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_LCD_TDO24M=y -# CONFIG_BACKLIGHT_GENERIC is not set -CONFIG_BACKLIGHT_DA903X=m -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -CONFIG_FONTS=y -CONFIG_FONT_6x11=y -CONFIG_LOGO=y -CONFIG_SOUND=m -CONFIG_SND=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -# CONFIG_SND_DRIVERS is not set -# CONFIG_SND_SPI is not set -# CONFIG_SND_USB is not set -CONFIG_SND_SOC=m -CONFIG_SND_PXA2XX_SOC=m -CONFIG_SND_PXA2XX_SOC_EM_X270=m -CONFIG_HID_DRAGONRISE=y -CONFIG_HID_GYRATION=y -CONFIG_HID_TWINHAN=y -CONFIG_HID_NTRIG=y -CONFIG_HID_PANTHERLORD=y -CONFIG_HID_PETALYNX=y -CONFIG_HID_SAMSUNG=y -CONFIG_HID_SONY=y -CONFIG_HID_SUNPLUS=y -CONFIG_HID_GREENASIA=y -CONFIG_HID_SMARTJOYPLUS=y -CONFIG_HID_TOPSEED=y -CONFIG_HID_THRUSTMASTER=y -CONFIG_HID_WACOM=m -CONFIG_HID_ZEROPLUS=y -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_MMC=m -CONFIG_MMC_PXA=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_V3020=y -CONFIG_RTC_DRV_PXA=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_XATTR is not set -CONFIG_INOTIFY=y -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_UBIFS_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_SMB_FS=m -CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_ISO8859_1=m -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DETECT_SOFTLOCKUP is not set -# CONFIG_SCHED_DEBUG is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -# CONFIG_FTRACE is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_ARC4=m -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set -CONFIG_CRC_T10DIF=y diff --git a/arch/arm/configs/cns3420vb_defconfig b/arch/arm/configs/cns3420vb_defconfig deleted file mode 100755 index 313627adf..000000000 --- a/arch/arm/configs/cns3420vb_defconfig +++ /dev/null @@ -1,72 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_CGROUPS=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_RELAY=y -CONFIG_BLK_DEV_INITRD=y -# CONFIG_PERF_EVENTS is not set -CONFIG_SLAB=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=m -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_IOSCHED_CFQ=m -CONFIG_ARCH_CNS3XXX=y -CONFIG_MACH_CNS3420VB=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,38400 mem=128M root=/dev/mmcblk0p1 ro rootwait" -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=20000 -# CONFIG_MISC_DEVICES is not set -CONFIG_BLK_DEV_SD=y -CONFIG_ATA=y -# CONFIG_SATA_PMP is not set -# CONFIG_ATA_SFF is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=16 -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_MMC=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_INOTIFY=y -CONFIG_AUTOFS4_FS=y -CONFIG_FSCACHE=y -CONFIG_TMPFS=y -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_DEBUG_FS=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_ARM_UNWIND is not set -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/colibri_pxa270_defconfig b/arch/arm/configs/colibri_pxa270_defconfig deleted file mode 100755 index 2ef2c5e8a..000000000 --- a/arch/arm/configs/colibri_pxa270_defconfig +++ /dev/null @@ -1,180 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -CONFIG_KALLSYMS_EXTRA_PASS=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_MODULE_SRCVERSION_ALL=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_PXA=y -CONFIG_MACH_COLIBRI=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_FPE_NWFPE=y -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=m -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_NETFILTER=y -CONFIG_IP_NF_QUEUE=m -CONFIG_VLAN_8021Q=m -CONFIG_IRDA=m -CONFIG_IRLAN=m -CONFIG_IRCOMM=m -CONFIG_IRDA_ULTRA=y -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -CONFIG_IRTTY_SIR=m -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m -CONFIG_CFG80211=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_CONNECTOR=y -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_LE_BYTE_SWAP=y -CONFIG_MTD_CFI_GEOMETRY=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_PXA2XX=y -CONFIG_MTD_BLOCK2MTD=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_DISKONCHIP=y -CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y -CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x4000000 -CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y -CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y -CONFIG_MTD_ONENAND=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_NBD=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=8 -CONFIG_IDE=y -CONFIG_NETDEVICES=y -CONFIG_PHYLIB=y -CONFIG_NET_ETHERNET=y -CONFIG_DM9000=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_HOSTAP=y -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=640 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480 -CONFIG_INPUT_EVDEV=y -CONFIG_KEYBOARD_ATKBD=m -# CONFIG_MOUSE_PS2 is not set -CONFIG_MOUSE_SERIAL=m -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=m -CONFIG_SERIO_LIBPS2=y -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_WATCHDOG=y -CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FB_PXA=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -CONFIG_LOGO=y -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_SERIAL=m -CONFIG_USB_GADGET=m -CONFIG_USB_GADGET_DUMMY_HCD=y -CONFIG_MMC=y -CONFIG_NEW_LEDS=y -CONFIG_RTC_CLASS=y -# CONFIG_RTC_HCTOSYS is not set -CONFIG_RTC_DRV_PCF8583=m -CONFIG_INOTIFY=y -CONFIG_AUTOFS4_FS=y -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-15" -CONFIG_TMPFS=y -CONFIG_CONFIGFS_FS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_FS_DEBUG=1 -CONFIG_JFFS2_FS_WBUF_VERIFY=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=y -CONFIG_NFSD_V4=y -CONFIG_NLS_DEFAULT="iso8859-15" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_UTF8=m -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -CONFIG_KEYS=y -CONFIG_KEYS_DEBUG_PROC_KEYS=y -CONFIG_SECURITY=y -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_DEFLATE=m -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRC_CCITT=y -CONFIG_CRC16=y -CONFIG_LIBCRC32C=y diff --git a/arch/arm/configs/colibri_pxa300_defconfig b/arch/arm/configs/colibri_pxa300_defconfig deleted file mode 100755 index b985334e4..000000000 --- a/arch/arm/configs/colibri_pxa300_defconfig +++ /dev/null @@ -1,73 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_PXA=y -CONFIG_MACH_COLIBRI300=y -CONFIG_AEABI=y -CONFIG_CMDLINE="console=ttyS0,115200 rw" -CONFIG_CPU_IDLE=y -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_SYN_COOKIES=y -# CONFIG_INET_LRO is not set -CONFIG_IPV6=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_MISC_DEVICES is not set -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_AX88796=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_MISC=y -CONFIG_INPUT_GPIO_ROTARY_ENCODER=y -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_DEBUG_GPIO=y -# CONFIG_HWMON is not set -CONFIG_FB=y -CONFIG_FB_PXA=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_BACKLIGHT_GENERIC is not set -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -# CONFIG_HID_SUPPORT is not set -CONFIG_USB=y -CONFIG_USB_DEBUG=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=y -CONFIG_USB_STORAGE=y -CONFIG_MMC=y -# CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_PXA=y -CONFIG_EXT3_FS=y -CONFIG_INOTIFY=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_PRINTK_TIME=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_AES=y -CONFIG_CRYPTO_ARC4=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set diff --git a/arch/arm/configs/collie_defconfig b/arch/arm/configs/collie_defconfig deleted file mode 100755 index 6c56ad086..000000000 --- a/arch/arm/configs/collie_defconfig +++ /dev/null @@ -1,94 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_EXPERT=y -# CONFIG_BASE_FULL is not set -# CONFIG_EPOLL is not set -CONFIG_SLOB=y -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_SA1100=y -CONFIG_SA1100_COLLIE=y -CONFIG_PCCARD=y -CONFIG_PCMCIA_SA1100=y -CONFIG_PCMCIA_DEBUG=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1" -CONFIG_FPE_NWFPE=y -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_IPV6 is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_2 is not set -# CONFIG_MTD_CFI_I1 is not set -# CONFIG_MTD_CFI_I2 is not set -CONFIG_MTD_CFI_I4=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_SA1100=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=1024 -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECS=y -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_LOCOMO=y -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -# CONFIG_SERIO_SERPORT is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CS=y -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_SA1100=y -CONFIG_SERIAL_SA1100_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HWMON is not set -CONFIG_MCP_SA11X0=y -CONFIG_MCP_UCB1200=y -CONFIG_MCP_UCB1200_TS=y -CONFIG_FB=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_SA1100=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -CONFIG_FONTS=y -CONFIG_FONT_MINI_4x6=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_LOCOMO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_IDE_DISK=y -# CONFIG_DNOTIFY is not set -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_ROMFS_FS=y -CONFIG_NLS_DEFAULT="cp437" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DETECT_SOFTLOCKUP is not set -CONFIG_DEBUG_MUTEXES=y -# CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_DEBUG_ERRORS=y -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig deleted file mode 100755 index e53c47563..000000000 --- a/arch/arm/configs/corgi_defconfig +++ /dev/null @@ -1,274 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_EXPERT=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=m -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_PXA=y -CONFIG_PXA_SHARPSL=y -CONFIG_MACH_POODLE=y -CONFIG_MACH_CORGI=y -CONFIG_MACH_SHEPHERD=y -CONFIG_MACH_HUSKY=y -CONFIG_PCCARD=y -CONFIG_PCMCIA_PXA2XX=y -CONFIG_PREEMPT=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 debug" -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_AOUT=m -CONFIG_BINFMT_MISC=m -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=m -CONFIG_INET=y -CONFIG_SYN_COOKIES=y -# CONFIG_INET_LRO is not set -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_TUNNEL=m -CONFIG_NETFILTER=y -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_ADDRTYPE=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m -CONFIG_IP6_NF_QUEUE=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -CONFIG_IRDA=m -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -CONFIG_PXA_FICP=m -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIDTL1=m -CONFIG_BT_HCIBT3C=m -CONFIG_BT_HCIBLUECARD=m -CONFIG_BT_HCIBTUART=m -CONFIG_BT_HCIVHCI=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_ROM=y -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y -CONFIG_MTD_NAND_SHARPSL=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECS=y -CONFIG_SCSI=m -CONFIG_BLK_DEV_SD=m -CONFIG_CHR_DEV_ST=m -CONFIG_CHR_DEV_OSST=m -CONFIG_BLK_DEV_SR=m -CONFIG_CHR_DEV_SG=m -CONFIG_SCSI_MULTI_LUN=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET=m -# CONFIG_USB_NET_CDC_SUBSET is not set -CONFIG_NET_PCMCIA=y -CONFIG_PCMCIA_PCNET=m -CONFIG_PPP=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_BSDCOMP=m -CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=m -# CONFIG_SERIO is not set -CONFIG_SERIAL_8250=m -CONFIG_SERIAL_8250_CS=m -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_I2C=y -CONFIG_I2C_PXA=y -CONFIG_SPI=y -CONFIG_SPI_PXA2XX=y -CONFIG_FB=y -CONFIG_FB_W100=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_LCD_CORGI=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -CONFIG_SOUND=y -CONFIG_SOUND_PRIME=y -CONFIG_USB_KBD=m -CONFIG_USB_MOUSE=m -CONFIG_HID_A4TECH=m -CONFIG_HID_APPLE=m -CONFIG_HID_BELKIN=m -CONFIG_HID_CHERRY=m -CONFIG_HID_CHICONY=m -CONFIG_HID_CYPRESS=m -CONFIG_HID_EZKEY=m -CONFIG_HID_GYRATION=m -CONFIG_HID_LOGITECH=m -CONFIG_HID_MICROSOFT=m -CONFIG_HID_MONTEREY=m -CONFIG_HID_PANTHERLORD=m -CONFIG_HID_PETALYNX=m -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_HID_SUNPLUS=m -CONFIG_USB=m -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=m -CONFIG_USB_SL811_HCD=m -CONFIG_USB_SL811_CS=m -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m -CONFIG_USB_STORAGE=m -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_BELKIN=m -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -CONFIG_USB_SERIAL_CYPRESS_M8=m -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_IPAQ=m -CONFIG_USB_SERIAL_IR=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_EDGEPORT_TI=m -CONFIG_USB_SERIAL_GARMIN=m -CONFIG_USB_SERIAL_IPW=m -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KLSI=m -CONFIG_USB_SERIAL_KOBIL_SCT=m -CONFIG_USB_SERIAL_MCT_U232=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_USB_SERIAL_SAFE=m -CONFIG_USB_SERIAL_TI=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m -CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_EMI62=m -CONFIG_USB_EMI26=m -CONFIG_USB_RIO500=m -CONFIG_USB_LEGOTOWER=m -CONFIG_USB_LCD=m -CONFIG_USB_LED=m -CONFIG_USB_CYTHERM=m -CONFIG_USB_IDMOUSE=m -CONFIG_USB_GADGET=y -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_MMC=y -CONFIG_MMC_PXA=y -CONFIG_EXT2_FS=y -CONFIG_INOTIFY=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_RUBIN=y -CONFIG_CRAMFS=m -CONFIG_NFS_FS=m -CONFIG_NFS_V3=y -CONFIG_NFS_V4=y -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_DEFAULT="cp437" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_UTF8=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_PREEMPT is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_FTRACE is not set -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_TWOFISH=m -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRC_CCITT=y -CONFIG_LIBCRC32C=m diff --git a/arch/arm/configs/cpu9260_defconfig b/arch/arm/configs/cpu9260_defconfig deleted file mode 100755 index bbf729e2f..000000000 --- a/arch/arm/configs/cpu9260_defconfig +++ /dev/null @@ -1,116 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91SAM9260=y -CONFIG_MACH_CPU9260=y -# CONFIG_ARM_THUMB is not set -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_PLATRAM=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_NBD=y -CONFIG_BLK_DEV_RAM=y -# CONFIG_MISC_DEVICES is not set -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_NETDEVICES=y -CONFIG_SMSC_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -CONFIG_MACB=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_PPP=y -CONFIG_PPP_ASYNC=y -CONFIG_PPP_DEFLATE=y -CONFIG_PPP_BSDCOMP=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=32 -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_GPIO=y -CONFIG_GPIO_SYSFS=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_NOWAYOUT=y -CONFIG_AT91SAM9X_WATCHDOG=y -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -CONFIG_USB=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_ETH=m -CONFIG_MMC=y -CONFIG_MMC_AT91=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_GPIO=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_RTC_CLASS=y -# CONFIG_RTC_HCTOSYS is not set -CONFIG_RTC_DRV_DS1307=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_XATTR is not set -CONFIG_INOTIFY=y -CONFIG_AUTOFS4_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_CRAMFS=y -CONFIG_MINIX_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_UTF8=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set diff --git a/arch/arm/configs/cpu9g20_defconfig b/arch/arm/configs/cpu9g20_defconfig deleted file mode 100755 index e7d794292..000000000 --- a/arch/arm/configs/cpu9g20_defconfig +++ /dev/null @@ -1,116 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91SAM9G20=y -CONFIG_MACH_CPU9G20=y -# CONFIG_ARM_THUMB is not set -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_PLATRAM=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_NBD=y -CONFIG_BLK_DEV_RAM=y -# CONFIG_MISC_DEVICES is not set -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_NETDEVICES=y -CONFIG_SMSC_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -CONFIG_MACB=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_PPP=y -CONFIG_PPP_ASYNC=y -CONFIG_PPP_DEFLATE=y -CONFIG_PPP_BSDCOMP=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=32 -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_GPIO=y -CONFIG_GPIO_SYSFS=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_NOWAYOUT=y -CONFIG_AT91SAM9X_WATCHDOG=y -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -CONFIG_USB=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_ETH=m -CONFIG_MMC=y -CONFIG_MMC_AT91=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_GPIO=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_RTC_CLASS=y -# CONFIG_RTC_HCTOSYS is not set -CONFIG_RTC_DRV_DS1307=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_XATTR is not set -CONFIG_INOTIFY=y -CONFIG_AUTOFS4_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_CRAMFS=y -CONFIG_MINIX_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_UTF8=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set diff --git a/arch/arm/configs/da8xx_omapl_defconfig b/arch/arm/configs/da8xx_omapl_defconfig deleted file mode 100755 index 88ccde058..000000000 --- a/arch/arm/configs/da8xx_omapl_defconfig +++ /dev/null @@ -1,129 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_DAVINCI=y -CONFIG_ARCH_DAVINCI_DA830=y -CONFIG_ARCH_DAVINCI_DA850=y -CONFIG_MACH_MITYOMAPL138=y -CONFIG_MACH_OMAPL138_HAWKBOARD=y -CONFIG_DAVINCI_RESET_CLOCKS=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_LEDS=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_PERFORMANCE=m -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m -CONFIG_CPU_IDLE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_LRO is not set -CONFIG_NETFILTER=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FW_LOADER is not set -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=1 -CONFIG_BLK_DEV_RAM_SIZE=32768 -CONFIG_EEPROM_AT24=y -CONFIG_SCSI=m -CONFIG_BLK_DEV_SD=m -CONFIG_NETDEVICES=y -CONFIG_TUN=m -CONFIG_LXT_PHY=y -CONFIG_LSI_ET1011C_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -CONFIG_TI_DAVINCI_EMAC=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_NETCONSOLE=y -CONFIG_NETPOLL_TRAP=y -CONFIG_INPUT_MOUSEDEV=m -CONFIG_INPUT_EVDEV=m -CONFIG_INPUT_EVBUG=m -CONFIG_KEYBOARD_ATKBD=m -CONFIG_KEYBOARD_GPIO=y -CONFIG_KEYBOARD_XTKBD=m -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_SERIO_LIBPS2=y -# CONFIG_VT_CONSOLE is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=3 -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_DAVINCI=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_DUMMY=y -CONFIG_REGULATOR_TPS6507X=y -CONFIG_FB=y -CONFIG_FB_DA8XX=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -CONFIG_SOUND=m -CONFIG_SND=m -CONFIG_SND_SOC=m -CONFIG_SND_DAVINCI_SOC=m -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_XFS_FS=m -CONFIG_INOTIFY=y -CONFIG_AUTOFS4_FS=m -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_CRAMFS=y -CONFIG_MINIX_FS=m -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=m -CONFIG_NFSD_V3=y -CONFIG_SMB_FS=m -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_UTF8=m -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_TIMER_STATS=y -CONFIG_DEBUG_RT_MUTEXES=y -CONFIG_DEBUG_MUTEXES=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set -CONFIG_CRC_CCITT=m -CONFIG_CRC_T10DIF=m diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig deleted file mode 100755 index 67b5abb6f..000000000 --- a/arch/arm/configs/davinci_all_defconfig +++ /dev/null @@ -1,194 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_DAVINCI=y -CONFIG_ARCH_DAVINCI_DM644x=y -CONFIG_ARCH_DAVINCI_DM355=y -CONFIG_ARCH_DAVINCI_DM646x=y -CONFIG_ARCH_DAVINCI_DM365=y -CONFIG_MACH_SFFSDR=y -CONFIG_MACH_NEUROS_OSD2=y -CONFIG_MACH_DM355_LEOPARD=y -CONFIG_DAVINCI_MUX_DEBUG=y -CONFIG_DAVINCI_MUX_WARNINGS=y -CONFIG_DAVINCI_RESET_CLOCKS=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_LEDS=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_LRO is not set -CONFIG_NETFILTER=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FW_LOADER is not set -CONFIG_MTD=m -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=m -CONFIG_MTD_BLOCK=m -CONFIG_MTD_CFI=m -CONFIG_MTD_CFI_INTELEXT=m -CONFIG_MTD_CFI_AMDSTD=m -CONFIG_MTD_PHYSMAP=m -CONFIG_MTD_NAND=m -CONFIG_MTD_NAND_DAVINCI=m -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=1 -CONFIG_BLK_DEV_RAM_SIZE=32768 -CONFIG_EEPROM_AT24=y -CONFIG_IDE=m -CONFIG_BLK_DEV_PALMCHIP_BK3710=m -CONFIG_SCSI=m -CONFIG_BLK_DEV_SD=m -CONFIG_NETDEVICES=y -CONFIG_TUN=m -CONFIG_LXT_PHY=y -CONFIG_LSI_ET1011C_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_TI_DAVINCI_EMAC=y -CONFIG_DM9000=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_PPP=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_NETCONSOLE=y -CONFIG_NETPOLL_TRAP=y -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=m -CONFIG_INPUT_EVBUG=m -CONFIG_KEYBOARD_ATKBD=m -CONFIG_KEYBOARD_GPIO=y -CONFIG_KEYBOARD_XTKBD=m -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_DM355EVM=m -CONFIG_SERIO_LIBPS2=y -# CONFIG_VT_CONSOLE is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=3 -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_DAVINCI=y -CONFIG_GPIO_PCF857X=y -CONFIG_WATCHDOG=y -CONFIG_DAVINCI_WATCHDOG=m -CONFIG_MFD_DM355EVM_MSP=y -CONFIG_VIDEO_OUTPUT_CONTROL=m -CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -CONFIG_SOUND=m -CONFIG_SND=m -CONFIG_SND_SOC=m -CONFIG_SND_DAVINCI_SOC=m -CONFIG_SND_DAVINCI_SOC_EVM=m -CONFIG_SND_DM6467_SOC_EVM=m -CONFIG_HID=m -CONFIG_HID_A4TECH=m -CONFIG_HID_APPLE=m -CONFIG_HID_BELKIN=m -CONFIG_HID_CHERRY=m -CONFIG_HID_CHICONY=m -CONFIG_HID_CYPRESS=m -CONFIG_HID_EZKEY=m -CONFIG_HID_GYRATION=m -CONFIG_HID_LOGITECH=m -CONFIG_HID_MICROSOFT=m -CONFIG_HID_MONTEREY=m -CONFIG_HID_PANTHERLORD=m -CONFIG_HID_PETALYNX=m -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_HID_SUNPLUS=m -CONFIG_USB=m -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=m -CONFIG_USB_MUSB_HDRC=m -CONFIG_USB_MUSB_PERIPHERAL=y -CONFIG_USB_GADGET_MUSB_HDRC=y -CONFIG_MUSB_PIO_ONLY=y -CONFIG_USB_STORAGE=m -CONFIG_USB_TEST=m -CONFIG_USB_GADGET=m -CONFIG_USB_GADGET_DEBUG_FILES=y -CONFIG_USB_GADGET_DEBUG_FS=y -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_USB_G_PRINTER=m -CONFIG_USB_CDC_COMPOSITE=m -CONFIG_MMC=m -# CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_DAVINCI=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m -CONFIG_LEDS_GPIO=m -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_RTC_CLASS=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_XFS_FS=m -CONFIG_INOTIFY=y -CONFIG_AUTOFS4_FS=m -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=m -CONFIG_CRAMFS=y -CONFIG_MINIX_FS=m -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=m -CONFIG_NFSD_V3=y -CONFIG_SMB_FS=m -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_UTF8=m -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_TIMER_STATS=y -CONFIG_DEBUG_RT_MUTEXES=y -CONFIG_DEBUG_MUTEXES=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_ARM_UNWIND is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set -CONFIG_CRC_T10DIF=m diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig deleted file mode 100755 index 40db34cf2..000000000 --- a/arch/arm/configs/dove_defconfig +++ /dev/null @@ -1,127 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_EXPERT=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_DOVE=y -CONFIG_MACH_DOVE_DB=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_VFP=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_STAA=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_M25P80=y -CONFIG_MTD_UBI=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=1 -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_ATA=y -CONFIG_SATA_MV=y -CONFIG_NETDEVICES=y -CONFIG_MV643XX_ETH=y -# CONFIG_NETDEV_10000 is not set -CONFIG_INPUT_POLLDEV=y -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_MOUSE_PS2 is not set -# CONFIG_SERIO is not set -CONFIG_LEGACY_PTY_COUNT=16 -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -# CONFIG_SERIAL_8250_PCI is not set -CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MV64XXX=y -CONFIG_SPI=y -CONFIG_SPI_ORION=y -# CONFIG_HWMON is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_STORAGE=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_MV=y -CONFIG_DMADEVICES=y -CONFIG_MV_XOR=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_XATTR is not set -CONFIG_ISO9660_FS=y -CONFIG_JOLIET=y -CONFIG_UDF_FS=m -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=y -CONFIG_NLS_UTF8=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -CONFIG_TIMER_STATS=y -# CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_DEBUG_INFO=y -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_CRYPTO_NULL=y -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_MD4=y -CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_AES=y -CONFIG_CRYPTO_BLOWFISH=y -CONFIG_CRYPTO_TEA=y -CONFIG_CRYPTO_TWOFISH=y -CONFIG_CRYPTO_DEFLATE=y -CONFIG_CRYPTO_LZO=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRC_CCITT=y -CONFIG_CRC16=y -CONFIG_LIBCRC32C=y diff --git a/arch/arm/configs/ebsa110_defconfig b/arch/arm/configs/ebsa110_defconfig deleted file mode 100755 index 14559dbb4..000000000 --- a/arch/arm/configs/ebsa110_defconfig +++ /dev/null @@ -1,75 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_EXPERT=y -CONFIG_MODULES=y -CONFIG_ARCH_EBSA110=y -CONFIG_PCCARD=m -CONFIG_I82365=m -CONFIG_LEDS=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/nfs rw mem=16M console=ttyS1,38400n8" -CONFIG_FPE_NWFPE=y -CONFIG_FPE_FASTFPE=y -CONFIG_BINFMT_AOUT=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_SYN_COOKIES=y -CONFIG_IPV6=y -CONFIG_NETFILTER=y -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_MATCH_ECN=y -CONFIG_IP_NF_MATCH_TTL=y -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_TARGET_REJECT=y -CONFIG_IP_NF_TARGET_LOG=y -CONFIG_IP_NF_MANGLE=y -CONFIG_IP_NF_TARGET_ECN=y -CONFIG_IP6_NF_IPTABLES=y -CONFIG_IP6_NF_MATCH_FRAG=y -CONFIG_IP6_NF_MATCH_OPTS=y -CONFIG_IP6_NF_MATCH_HL=y -CONFIG_IP6_NF_MATCH_RT=y -CONFIG_IP6_NF_FILTER=y -CONFIG_IP6_NF_MANGLE=y -CONFIG_FW_LOADER=m -CONFIG_PARPORT=y -CONFIG_PARPORT_PC=y -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_1284=y -CONFIG_BLK_DEV_RAM=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_ARM_AM79C961A=y -CONFIG_NET_PCMCIA=y -CONFIG_PCMCIA_PCNET=m -CONFIG_PPP=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -# CONFIG_INPUT is not set -# CONFIG_SERIO is not set -# CONFIG_VT is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_CS=m -CONFIG_PRINTER=m -CONFIG_WATCHDOG=y -CONFIG_SOFT_WATCHDOG=y -CONFIG_AUTOFS4_FS=y -CONFIG_MINIX_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_PARTITION_ADVANCED=y -# CONFIG_MSDOS_PARTITION is not set diff --git a/arch/arm/configs/edb7211_defconfig b/arch/arm/configs/edb7211_defconfig deleted file mode 100755 index d52ded350..000000000 --- a/arch/arm/configs/edb7211_defconfig +++ /dev/null @@ -1,27 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -# CONFIG_HOTPLUG is not set -CONFIG_ARCH_CLPS711X=y -CONFIG_ARCH_EDB7211=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_IPV6 is not set -CONFIG_BLK_DEV_RAM=y -CONFIG_NETDEVICES=y -# CONFIG_INPUT is not set -CONFIG_SERIO_LIBPS2=y -# CONFIG_VT is not set -CONFIG_SERIAL_CLPS711X=y -CONFIG_SERIAL_CLPS711X_CONSOLE=y -CONFIG_EXT2_FS=y -CONFIG_MINIX_FS=y -CONFIG_PARTITION_ADVANCED=y -# CONFIG_MSDOS_PARTITION is not set -CONFIG_DEBUG_USER=y diff --git a/arch/arm/configs/em_x270_defconfig b/arch/arm/configs/em_x270_defconfig deleted file mode 100755 index 60a21e01e..000000000 --- a/arch/arm/configs/em_x270_defconfig +++ /dev/null @@ -1,194 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -# CONFIG_VM_EVENT_COUNTERS is not set -# CONFIG_SLUB_DEBUG is not set -# CONFIG_COMPAT_BRK is not set -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_PXA=y -CONFIG_MACH_EM_X270=y -CONFIG_MACH_EXEDA=y -CONFIG_NO_HZ=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=1f03 mem=32M" -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_FPE_NWFPE=y -CONFIG_PM=y -CONFIG_APM_EMULATION=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_BNEP=m -CONFIG_BT_HIDP=m -CONFIG_BT_HCIBTUSB=m -CONFIG_LIB80211=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_FW_LOADER=m -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_CFI_STAA=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_PXA2XX=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_PLATFORM=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -# CONFIG_MISC_DEVICES is not set -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_DM9000=y -CONFIG_DM9000_DEBUGLEVEL=1 -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_APMPOWER=y -CONFIG_KEYBOARD_GPIO=y -CONFIG_KEYBOARD_PXA27x=y -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -# CONFIG_TOUCHSCREEN_DA9034 is not set -CONFIG_TOUCHSCREEN_WM97XX=m -# CONFIG_TOUCHSCREEN_WM9705 is not set -# CONFIG_TOUCHSCREEN_WM9713 is not set -# CONFIG_SERIO_SERPORT is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=16 -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_PXA=y -CONFIG_SPI=y -CONFIG_SPI_PXA2XX=y -CONFIG_POWER_SUPPLY=y -CONFIG_BATTERY_DA9030=y -# CONFIG_HWMON is not set -CONFIG_PMIC_DA903X=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_DA903X=y -CONFIG_FB=y -CONFIG_FB_PXA=y -CONFIG_FB_PXA_PARAMETERS=y -CONFIG_FB_MBX=m -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_LCD_TDO24M=y -# CONFIG_BACKLIGHT_GENERIC is not set -CONFIG_BACKLIGHT_DA903X=m -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -CONFIG_SOUND=m -CONFIG_SND=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -# CONFIG_SND_DRIVERS is not set -# CONFIG_SND_SPI is not set -# CONFIG_SND_USB is not set -CONFIG_SND_SOC=m -CONFIG_SND_PXA2XX_SOC=m -CONFIG_SND_PXA2XX_SOC_EM_X270=m -CONFIG_HID_A4TECH=y -CONFIG_HID_APPLE=y -CONFIG_HID_BELKIN=y -CONFIG_HID_CHERRY=y -CONFIG_HID_CHICONY=y -CONFIG_HID_CYPRESS=y -CONFIG_HID_EZKEY=y -CONFIG_HID_GYRATION=y -CONFIG_HID_LOGITECH=y -CONFIG_HID_MICROSOFT=y -CONFIG_HID_MONTEREY=y -CONFIG_HID_PANTHERLORD=y -CONFIG_HID_PETALYNX=y -CONFIG_HID_SAMSUNG=y -CONFIG_HID_SONY=y -CONFIG_HID_SUNPLUS=y -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_MMC=m -CONFIG_MMC_PXA=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_DA903X=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_V3020=y -CONFIG_RTC_DRV_SA1100=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_INOTIFY=y -CONFIG_VFAT_FS=m -# CONFIG_PROC_PAGE_MONITOR is not set -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_CIFS=m -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_UTF8=m -CONFIG_FRAME_WARN=0 -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DETECT_SOFTLOCKUP is not set -# CONFIG_SCHED_DEBUG is not set -# CONFIG_DEBUG_BUGVERBOSE is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_ARC4=m -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set diff --git a/arch/arm/configs/ep93xx_defconfig b/arch/arm/configs/ep93xx_defconfig deleted file mode 100755 index 8e97b2f7c..000000000 --- a/arch/arm/configs/ep93xx_defconfig +++ /dev/null @@ -1,124 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_EXPERT=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_EP93XX=y -CONFIG_CRUNCH=y -CONFIG_MACH_ADSSPHERE=y -CONFIG_MACH_EDB9301=y -CONFIG_MACH_EDB9302=y -CONFIG_MACH_EDB9307=y -CONFIG_MACH_EDB9312=y -CONFIG_MACH_EDB9315=y -CONFIG_MACH_GESBC9312=y -CONFIG_MACH_MICRO9H=y -CONFIG_MACH_MICRO9L=y -CONFIG_MACH_TS72XX=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/nfs ip=bootp" -CONFIG_FPE_NWFPE=y -CONFIG_FPE_NWFPE_XP=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_SYN_COOKIES=y -# CONFIG_INET_LRO is not set -CONFIG_IPV6=y -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_IPV6_SIT is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FW_LOADER is not set -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_CFI_STAA=y -CONFIG_MTD_ROM=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y -CONFIG_BLK_DEV_NBD=y -CONFIG_EEPROM_LEGACY=y -CONFIG_SCSI=y -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_EP93XX_ETH=y -CONFIG_USB_RTL8150=y -# CONFIG_INPUT is not set -# CONFIG_SERIO is not set -# CONFIG_VT is not set -CONFIG_SERIAL_AMBA_PL010=y -CONFIG_SERIAL_AMBA_PL010_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_DEBUG_CORE=y -CONFIG_I2C_DEBUG_ALGO=y -CONFIG_I2C_DEBUG_BUS=y -CONFIG_WATCHDOG=y -CONFIG_EP93XX_WATCHDOG=y -CONFIG_USB=y -CONFIG_USB_DEBUG=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_DYNAMIC_MINORS=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_SERIAL=y -CONFIG_USB_SERIAL_CONSOLE=y -CONFIG_USB_SERIAL_PL2303=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_DS1307=y -CONFIG_RTC_DRV_M48T86=y -CONFIG_RTC_DRV_EP93XX=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_XATTR is not set -CONFIG_INOTIFY=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_SLAB=y -CONFIG_DEBUG_SPINLOCK=y -CONFIG_DEBUG_MUTEXES=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_LIBCRC32C=y diff --git a/arch/arm/configs/eseries_pxa_defconfig b/arch/arm/configs/eseries_pxa_defconfig deleted file mode 100755 index d68ac67c2..000000000 --- a/arch/arm/configs/eseries_pxa_defconfig +++ /dev/null @@ -1,118 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_EXPERT=y -# CONFIG_KALLSYMS is not set -# CONFIG_COMPAT_BRK is not set -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_PXA=y -CONFIG_ARCH_PXA_ESERIES=y -# CONFIG_ARM_THUMB is not set -CONFIG_IWMMXT=y -CONFIG_PCCARD=y -CONFIG_PCMCIA=m -CONFIG_PCMCIA_PXA2XX=m -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_KEXEC=y -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_MISC=y -CONFIG_PM=y -CONFIG_NET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_IRDA=y -CONFIG_IRLAN=m -CONFIG_IRCOMM=m -CONFIG_IRDA_ULTRA=y -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -CONFIG_PXA_FICP=y -CONFIG_CFG80211=m -CONFIG_MAC80211=m -CONFIG_MAC80211_RC_PID=y -# CONFIG_MAC80211_RC_MINSTREL is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_STANDALONE is not set -CONFIG_MTD=m -CONFIG_MTD_NAND=m -CONFIG_MTD_NAND_TMIO=m -CONFIG_BLK_DEV_LOOP=m -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=m -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_ATA=m -# CONFIG_SATA_PMP is not set -CONFIG_PATA_PCMCIA=m -CONFIG_NETDEVICES=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_NET_PCMCIA=y -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=m -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=m -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_WM97XX=m -# CONFIG_SERIO is not set -CONFIG_SERIAL_PXA=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -CONFIG_MFD_T7L66XB=y -CONFIG_MFD_TC6387XB=y -CONFIG_MFD_TC6393XB=y -CONFIG_FB=y -CONFIG_FB_PXA=y -CONFIG_FB_W100=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FONTS=y -CONFIG_FONT_MINI_4x6=y -CONFIG_SOUND=y -CONFIG_SND=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_DYNAMIC_MINORS=y -CONFIG_SND_VERBOSE_PRINTK=y -# CONFIG_SND_PCMCIA is not set -CONFIG_SND_SOC=m -CONFIG_SND_PXA2XX_SOC=m -CONFIG_SND_PXA2XX_SOC_E800=m -# CONFIG_USB_SUPPORT is not set -CONFIG_MMC=y -CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_MMC_TMIO=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=m -CONFIG_INOTIFY=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_PCBC=m -# CONFIG_CRYPTO_ANSI_CPRNG is not set diff --git a/arch/arm/configs/exynos4_defconfig b/arch/arm/configs/exynos4_defconfig deleted file mode 100755 index da53ff3b4..000000000 --- a/arch/arm/configs/exynos4_defconfig +++ /dev/null @@ -1,72 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_ALL=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_EXYNOS4=y -CONFIG_S3C_LOWLEVEL_UART_PORT=1 -CONFIG_MACH_SMDKC210=y -CONFIG_MACH_SMDKV310=y -CONFIG_MACH_ARMLEX4210=y -CONFIG_MACH_UNIVERSAL_C210=y -CONFIG_MACH_NURI=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_SMP=y -CONFIG_NR_CPUS=2 -CONFIG_HOTPLUG_CPU=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M" -CONFIG_VFP=y -CONFIG_NEON=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_SAMSUNG=y -CONFIG_SERIAL_SAMSUNG_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -# CONFIG_HWMON is not set -# CONFIG_MFD_SUPPORT is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_EXT2_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_CRAMFS=y -CONFIG_ROMFS_FS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_BSD_DISKLABEL=y -CONFIG_SOLARIS_X86_PARTITION=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DETECT_HUNG_TASK=y -CONFIG_DEBUG_RT_MUTEXES=y -CONFIG_DEBUG_SPINLOCK=y -CONFIG_DEBUG_MUTEXES=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -CONFIG_EARLY_PRINTK=y -CONFIG_DEBUG_S3C_UART=1 -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/ezx_defconfig b/arch/arm/configs/ezx_defconfig deleted file mode 100755 index 227a47734..000000000 --- a/arch/arm/configs/ezx_defconfig +++ /dev/null @@ -1,420 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_LOCALVERSION="-ezx200910312315" -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_EXPERT=y -# CONFIG_COMPAT_BRK is not set -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_LBDAF is not set -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_PXA=y -CONFIG_PXA_EZX=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=tty1 root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=3 ip=192.168.0.202:192.168.0.200:192.168.0.200:255.255.255.0 debug" -CONFIG_KEXEC=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_DEBUG=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m -CONFIG_CPU_IDLE=y -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_AOUT=m -CONFIG_BINFMT_MISC=m -CONFIG_PM=y -CONFIG_APM_EMULATION=y -CONFIG_PM_RUNTIME=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_MIP6=m -CONFIG_IPV6_TUNNEL=m -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_NETFILTER=y -CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NF_CONNTRACK=m -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CT_PROTO_SCTP=m -CONFIG_NF_CT_PROTO_UDPLITE=m -CONFIG_NF_CONNTRACK_AMANDA=m -CONFIG_NF_CONNTRACK_FTP=m -CONFIG_NF_CONNTRACK_H323=m -CONFIG_NF_CONNTRACK_IRC=m -CONFIG_NF_CONNTRACK_NETBIOS_NS=m -CONFIG_NF_CONNTRACK_PPTP=m -CONFIG_NF_CONNTRACK_SANE=m -CONFIG_NF_CONNTRACK_SIP=m -CONFIG_NF_CONNTRACK_TFTP=m -CONFIG_NF_CT_NETLINK=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_LED=m -CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_TARGET_NFLOG=m -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -CONFIG_NETFILTER_XT_MATCH_DSCP=m -CONFIG_NETFILTER_XT_MATCH_ESP=m -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -CONFIG_NETFILTER_XT_MATCH_HELPER=m -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -CONFIG_NETFILTER_XT_MATCH_POLICY=m -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -CONFIG_NETFILTER_XT_MATCH_REALM=m -CONFIG_NETFILTER_XT_MATCH_SCTP=m -CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_TIME=m -CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_ADDRTYPE=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT=m -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m -CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_IP6_NF_QUEUE=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_TARGET_LOG=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -CONFIG_BRIDGE=m -CONFIG_BT=y -CONFIG_BT_L2CAP=y -CONFIG_BT_SCO=y -CONFIG_BT_RFCOMM=y -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=y -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=y -CONFIG_BT_HCIBTUSB=m -CONFIG_BT_HCIBTSDIO=m -CONFIG_BT_HCIUART=y -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIVHCI=m -CONFIG_BT_MRVL=m -CONFIG_BT_MRVL_SDIO=m -# CONFIG_WIRELESS is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_FW_LOADER=m -CONFIG_CONNECTOR=m -CONFIG_MTD=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set -# CONFIG_MTD_CFI_I2 is not set -CONFIG_MTD_OTP=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PXA2XX=y -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_RAM=y -# CONFIG_MISC_DEVICES is not set -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_WLAN is not set -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -CONFIG_KEYBOARD_PXA27x=y -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_PCAP=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y -CONFIG_INPUT_PCAP=y -# CONFIG_SERIO is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=8 -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_PXA=y -CONFIG_SPI=y -CONFIG_SPI_PXA2XX=y -CONFIG_GPIO_SYSFS=y -CONFIG_POWER_SUPPLY=y -# CONFIG_HWMON is not set -CONFIG_EZX_PCAP=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_DEBUG=y -CONFIG_REGULATOR_VIRTUAL_CONSUMER=y -CONFIG_REGULATOR_USERSPACE_CONSUMER=y -CONFIG_REGULATOR_PCAP=y -CONFIG_MEDIA_SUPPORT=y -CONFIG_VIDEO_DEV=y -CONFIG_MEDIA_TUNER_CUSTOMISE=y -# CONFIG_MEDIA_TUNER_SIMPLE is not set -# CONFIG_MEDIA_TUNER_TDA8290 is not set -# CONFIG_MEDIA_TUNER_TDA827X is not set -# CONFIG_MEDIA_TUNER_TDA18271 is not set -# CONFIG_MEDIA_TUNER_TDA9887 is not set -# CONFIG_MEDIA_TUNER_TEA5761 is not set -# CONFIG_MEDIA_TUNER_TEA5767 is not set -# CONFIG_MEDIA_TUNER_MT20XX is not set -# CONFIG_MEDIA_TUNER_MT2060 is not set -# CONFIG_MEDIA_TUNER_MT2266 is not set -# CONFIG_MEDIA_TUNER_MT2131 is not set -# CONFIG_MEDIA_TUNER_QT1010 is not set -# CONFIG_MEDIA_TUNER_XC2028 is not set -# CONFIG_MEDIA_TUNER_XC5000 is not set -# CONFIG_MEDIA_TUNER_MXL5005S is not set -# CONFIG_MEDIA_TUNER_MXL5007T is not set -# CONFIG_MEDIA_TUNER_MC44S803 is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -CONFIG_SOC_CAMERA=y -CONFIG_SOC_CAMERA_MT9M111=y -CONFIG_VIDEO_PXA27x=y -# CONFIG_V4L_USB_DRIVERS is not set -CONFIG_RADIO_TEA5764=y -CONFIG_FB=y -CONFIG_FB_PXA=y -CONFIG_FB_PXA_OVERLAY=y -CONFIG_FB_PXA_PARAMETERS=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_PWM=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FONTS=y -CONFIG_FONT_MINI_4x6=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y -# CONFIG_SND_DRIVERS is not set -# CONFIG_SND_ARM is not set -# CONFIG_SND_SPI is not set -# CONFIG_SND_USB is not set -CONFIG_SND_SOC=y -CONFIG_SND_PXA2XX_SOC=y -# CONFIG_USB_HID is not set -CONFIG_HID_APPLE=m -CONFIG_USB=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_PXA27X=y -CONFIG_USB_ETH=m -# CONFIG_USB_ETH_RNDIS is not set -CONFIG_MMC=y -CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_SDIO_UART=m -CONFIG_MMC_PXA=y -CONFIG_MMC_SPI=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_LP3944=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_BACKLIGHT=y -CONFIG_LEDS_TRIGGER_GPIO=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_PCAP=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=m -CONFIG_REISERFS_FS=m -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -CONFIG_REISERFS_FS_SECURITY=y -CONFIG_XFS_FS=m -CONFIG_INOTIFY=y -CONFIG_AUTOFS_FS=y -CONFIG_AUTOFS4_FS=y -CONFIG_FUSE_FS=m -CONFIG_CUSE=m -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=m -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_LZO=y -CONFIG_JFFS2_RUBIN=y -CONFIG_CRAMFS=m -CONFIG_SQUASHFS=m -CONFIG_ROMFS_FS=m -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFSD=m -CONFIG_NFSD_V3=y -CONFIG_NFSD_V3_ACL=y -CONFIG_SMB_FS=m -CONFIG_CIFS=m -CONFIG_CIFS_STATS=y -CONFIG_CIFS_WEAK_PW_HASH=y -CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=m -CONFIG_PRINTK_TIME=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -CONFIG_DEBUG_RT_MUTEXES=y -CONFIG_PROVE_LOCKING=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_FTRACE is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_CRYPTD=m -CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_LRW=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_XTS=m -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_VMAC=m -CONFIG_CRYPTO_GHASH=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SEED=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_TWOFISH=m -# CONFIG_CRYPTO_ANSI_CPRNG is not set diff --git a/arch/arm/configs/footbridge_defconfig b/arch/arm/configs/footbridge_defconfig deleted file mode 100755 index 038518ab3..000000000 --- a/arch/arm/configs/footbridge_defconfig +++ /dev/null @@ -1,127 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -# CONFIG_HOTPLUG is not set -CONFIG_MODULES=y -CONFIG_ARCH_FOOTBRIDGE=y -CONFIG_ARCH_CATS=y -CONFIG_ARCH_PERSONAL_SERVER=y -CONFIG_ARCH_EBSA285_HOST=y -CONFIG_ARCH_NETWINDER=y -CONFIG_LEDS=y -CONFIG_LEDS_TIMER=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_FPE_NWFPE=y -CONFIG_FPE_NWFPE_XP=y -CONFIG_BINFMT_AOUT=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_SYN_COOKIES=y -# CONFIG_IPV6 is not set -CONFIG_ATM=y -CONFIG_IRDA=m -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -CONFIG_IRDA_ULTRA=y -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -CONFIG_IRDA_DEBUG=y -CONFIG_WINBOND_FIR=m -CONFIG_PARPORT=y -CONFIG_PARPORT_PC=y -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_1284=y -CONFIG_PNP=y -CONFIG_ISAPNP=y -CONFIG_PARIDE=m -CONFIG_PARIDE_PD=m -CONFIG_PARIDE_PCD=m -CONFIG_PARIDE_PF=m -CONFIG_PARIDE_PT=m -CONFIG_PARIDE_PG=m -CONFIG_PARIDE_ATEN=m -CONFIG_PARIDE_BPCK=m -CONFIG_PARIDE_COMM=m -CONFIG_PARIDE_DSTR=m -CONFIG_PARIDE_FIT2=m -CONFIG_PARIDE_FIT3=m -CONFIG_PARIDE_EPAT=m -CONFIG_PARIDE_EPIA=m -CONFIG_PARIDE_FRIQ=m -CONFIG_PARIDE_FRPW=m -CONFIG_PARIDE_KBIC=m -CONFIG_PARIDE_KTTI=m -CONFIG_PARIDE_ON20=m -CONFIG_PARIDE_ON26=m -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_RAM=y -CONFIG_IDE=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_NET_VENDOR_3COM=y -CONFIG_VORTEX=y -CONFIG_NET_PCI=y -CONFIG_NE2K_PCI=y -CONFIG_PPP=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPPOE=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -CONFIG_SLIP_MODE_SLIP6=y -CONFIG_SERIAL_NONSTANDARD=y -CONFIG_SERIAL_21285=y -CONFIG_SERIAL_21285_CONSOLE=y -CONFIG_PRINTER=m -CONFIG_DS1620=y -CONFIG_NWBUTTON=y -CONFIG_NWBUTTON_REBOOT=y -CONFIG_NWFLASH=m -CONFIG_I2C=m -CONFIG_WATCHDOG=y -CONFIG_SOFT_WATCHDOG=y -CONFIG_21285_WATCHDOG=m -CONFIG_977_WATCHDOG=m -CONFIG_FB=y -CONFIG_FB_CYBER2000=y -CONFIG_SOUND=m -# CONFIG_USB_HID is not set -CONFIG_USB=m -CONFIG_USB_DEBUG=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=m -CONFIG_USB_PRINTER=m -CONFIG_EXT2_FS=y -CONFIG_AUTOFS4_FS=y -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_ADFS_FS=m -CONFIG_NFS_FS=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=m -CONFIG_PARTITION_ADVANCED=y -CONFIG_ACORN_PARTITION=y -CONFIG_ACORN_PARTITION_ADFS=y -CONFIG_NLS=y -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_15=m -CONFIG_DEBUG_USER=y diff --git a/arch/arm/configs/fortunet_defconfig b/arch/arm/configs/fortunet_defconfig deleted file mode 100755 index 840fced75..000000000 --- a/arch/arm/configs/fortunet_defconfig +++ /dev/null @@ -1,28 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -# CONFIG_HOTPLUG is not set -CONFIG_ARCH_CLPS711X=y -CONFIG_ARCH_FORTUNET=y -# CONFIG_ARM_THUMB is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_FPE_FASTFPE=y -CONFIG_BINFMT_AOUT=y -CONFIG_NET=y -CONFIG_UNIX=y -CONFIG_MTD=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_BLK_DEV_RAM=y -# CONFIG_INPUT is not set -# CONFIG_SERIO is not set -# CONFIG_VT is not set -CONFIG_SERIAL_CLPS711X=y -CONFIG_SERIAL_CLPS711X_CONSOLE=y -CONFIG_EXT2_FS=y -CONFIG_DEBUG_USER=y diff --git a/arch/arm/configs/fsm9xxx-perf_defconfig b/arch/arm/configs/fsm9xxx-perf_defconfig deleted file mode 100755 index 92d401c1e..000000000 --- a/arch/arm/configs/fsm9xxx-perf_defconfig +++ /dev/null @@ -1,187 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_LOCALVERSION="$(KERNEL_LOCAL_VERSION)" -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_ASHMEM=y -CONFIG_EMBEDDED=y -# CONFIG_PERF_EVENTS is not set -CONFIG_SLAB=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=m -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_MSM=y -CONFIG_ARCH_FSM9XXX=y -# CONFIG_MSM_STACKED_MEMORY is not set -CONFIG_MSM7X00A_USE_DG_TIMER=y -CONFIG_MSM7X00A_SLEEP_WAIT_FOR_INTERRUPT=y -CONFIG_MSM7X00A_IDLE_SLEEP_WAIT_FOR_INTERRUPT=y -CONFIG_MSM_SMD=y -CONFIG_MSM_SMD_PKG3=y -# CONFIG_MSM_SMD_DEBUG is not set -CONFIG_MSM_ONCRPCROUTER=y -# CONFIG_MSM_ONCRPCROUTER_DEBUG is not set -# CONFIG_MSM_HW3D is not set -# CONFIG_QSD_AUDIO is not set -# CONFIG_SURF_FFA_GPIO_KEYPAD is not set -CONFIG_MSM_JTAG_V7=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_VMSPLIT_2G=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="init=/sbin/init root=/dev/ram rw initrd=0x11000000,16M console=ttyDCC0 mem=88M ip=dhcp" -CONFIG_CPU_IDLE=y -CONFIG_VFP=y -CONFIG_NEON=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=y -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_INET_AH=y -CONFIG_INET_ESP=y -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -CONFIG_IPV6=y -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=y -CONFIG_INET6_ESP=y -CONFIG_INET6_IPCOMP=y -CONFIG_IPV6_MIP6=y -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=y -CONFIG_IPV6_TUNNEL=y -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_IPV6_MROUTE=y -CONFIG_IPV6_PIMSM_V2=y -# CONFIG_NET_ACTIVITY_STATS is not set -CONFIG_RFKILL=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_TESTS=m -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=8 -CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_MISC_DEVICES=y -CONFIG_PMIC8058_XOADC=y -CONFIG_QFP_FUSE=y -CONFIG_SCSI=y -CONFIG_SCSI_TGT=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_SCH=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -CONFIG_SMSC911X=y -CONFIG_QFEC=y -# CONFIG_NETDEV_10000 is not set -CONFIG_SLIP=y -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_MODE_SLIP6=y -# CONFIG_MSM_RMNET is not set -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=m -# CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_KEYBOARD_PMIC8058 is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y -CONFIG_INPUT_GPIO=y -# CONFIG_SERIO is not set -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_MSM=y -CONFIG_SERIAL_MSM_CONSOLE=y -# CONFIG_DIAG_OVER_USB is not set -# CONFIG_HW_RANDOM is not set -CONFIG_DCC_TTY=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_SSBI=y -CONFIG_SPI=y -CONFIG_GPIO_SYSFS=y -CONFIG_POWER_SUPPLY=y -CONFIG_SENSORS_MSM_ADC=y -CONFIG_PMIC8058=y -# CONFIG_MFD_PM8XXX_PWM is not set -# CONFIG_MFD_PM8XXX_MISC is not set -CONFIG_REGULATOR=y -CONFIG_REGULATOR_PM8058_XO=y -# CONFIG_USB_SUPPORT is not set -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_SWITCH=y -CONFIG_SWITCH_GPIO=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DEBUG=y -CONFIG_STAGING=y -CONFIG_ANDROID=y -CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_LOGGER=y -CONFIG_ANDROID_RAM_CONSOLE=y -CONFIG_ANDROID_TIMED_GPIO=y -CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_MSM_SSBI=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_YAFFS_FS=y -CONFIG_YAFFS_DISABLE_TAGS_ECC=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -# CONFIG_STACKTRACE is not set -CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_USER=y -# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set -CONFIG_CRYPTO_NULL=y -CONFIG_CRYPTO_CRYPTD=y -CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_CTR=y -CONFIG_CRYPTO_CTS=y -CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_AES=y -CONFIG_CRYPTO_DEV_QCRYPTO=y -CONFIG_CRYPTO_DEV_QCE=y -CONFIG_CRYPTO_DEV_OTA_CRYPTO=y -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/fsm9xxx_defconfig b/arch/arm/configs/fsm9xxx_defconfig deleted file mode 100755 index ebff2d2bc..000000000 --- a/arch/arm/configs/fsm9xxx_defconfig +++ /dev/null @@ -1,189 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_LOCALVERSION="$(KERNEL_LOCAL_VERSION)" -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_KALLSYMS_ALL=y -CONFIG_ASHMEM=y -CONFIG_EMBEDDED=y -# CONFIG_PERF_EVENTS is not set -CONFIG_SLAB=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=m -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_MSM=y -CONFIG_ARCH_FSM9XXX=y -# CONFIG_MSM_STACKED_MEMORY is not set -CONFIG_MSM7X00A_USE_DG_TIMER=y -CONFIG_MSM7X00A_SLEEP_WAIT_FOR_INTERRUPT=y -CONFIG_MSM7X00A_IDLE_SLEEP_WAIT_FOR_INTERRUPT=y -CONFIG_MSM_SMD=y -CONFIG_MSM_SMD_PKG3=y -CONFIG_MSM_ONCRPCROUTER=y -# CONFIG_MSM_HW3D is not set -# CONFIG_QSD_AUDIO is not set -# CONFIG_SURF_FFA_GPIO_KEYPAD is not set -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_VMSPLIT_2G=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="init=/sbin/init root=/dev/ram rw initrd=0x11000000,16M console=ttyDCC0 mem=88M ip=dhcp" -CONFIG_CPU_IDLE=y -CONFIG_VFP=y -CONFIG_NEON=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=y -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_INET_AH=y -CONFIG_INET_ESP=y -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -CONFIG_IPV6=y -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=y -CONFIG_INET6_ESP=y -CONFIG_INET6_IPCOMP=y -CONFIG_IPV6_MIP6=y -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=y -CONFIG_IPV6_TUNNEL=y -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_IPV6_MROUTE=y -CONFIG_IPV6_PIMSM_V2=y -# CONFIG_NET_ACTIVITY_STATS is not set -CONFIG_RFKILL=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_TESTS=m -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=8 -CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_MISC_DEVICES=y -CONFIG_PMIC8058_XOADC=y -CONFIG_QFP_FUSE=y -CONFIG_SCSI=y -CONFIG_SCSI_TGT=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_SCH=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -CONFIG_SMSC911X=y -CONFIG_QFEC=y -# CONFIG_NETDEV_10000 is not set -CONFIG_SLIP=y -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_MODE_SLIP6=y -# CONFIG_MSM_RMNET is not set -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=m -# CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_KEYBOARD_PMIC8058 is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y -CONFIG_INPUT_GPIO=y -# CONFIG_SERIO is not set -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_MSM=y -CONFIG_SERIAL_MSM_CONSOLE=y -# CONFIG_DIAG_OVER_USB is not set -# CONFIG_HW_RANDOM is not set -CONFIG_DCC_TTY=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_SSBI=y -CONFIG_SPI=y -CONFIG_GPIO_SYSFS=y -CONFIG_POWER_SUPPLY=y -CONFIG_SENSORS_MSM_ADC=y -CONFIG_PMIC8058=y -# CONFIG_MFD_PM8XXX_PWM is not set -# CONFIG_MFD_PM8XXX_MISC is not set -CONFIG_REGULATOR=y -CONFIG_REGULATOR_PM8058_XO=y -# CONFIG_USB_SUPPORT is not set -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_SWITCH=y -CONFIG_SWITCH_GPIO=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DEBUG=y -CONFIG_STAGING=y -CONFIG_ANDROID=y -CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_LOGGER=y -CONFIG_ANDROID_RAM_CONSOLE=y -CONFIG_ANDROID_TIMED_GPIO=y -CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_MSM_SSBI=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_YAFFS_FS=y -CONFIG_YAFFS_DISABLE_TAGS_ECC=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_SCHEDSTATS=y -# CONFIG_STACKTRACE is not set -CONFIG_DEBUG_STACK_USAGE=y -CONFIG_DEBUG_INFO=y -CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_USER=y -# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set -CONFIG_CRYPTO_NULL=y -CONFIG_CRYPTO_CRYPTD=y -CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_CTR=y -CONFIG_CRYPTO_CTS=y -CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_AES=y -CONFIG_CRYPTO_DEV_QCRYPTO=y -CONFIG_CRYPTO_DEV_QCE=y -CONFIG_CRYPTO_DEV_OTA_CRYPTO=y -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/g3evm_defconfig b/arch/arm/configs/g3evm_defconfig deleted file mode 100755 index 4a336ab5a..000000000 --- a/arch/arm/configs/g3evm_defconfig +++ /dev/null @@ -1,57 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_SHMOBILE=y -CONFIG_ARCH_SH7367=y -CONFIG_MACH_G3EVM=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttySC1,115200 earlyprintk=sh-sci.1,115200" -CONFIG_KEXEC=y -CONFIG_PM=y -# CONFIG_SUSPEND is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_NAND=y -# CONFIG_BLK_DEV is not set -# CONFIG_MISC_DEVICES is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_SH_SCI=y -CONFIG_SERIAL_SH_SCI_NR_UARTS=8 -CONFIG_SERIAL_SH_SCI_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -# CONFIG_DNOTIFY is not set -# CONFIG_INOTIFY_USER is not set -CONFIG_TMPFS=y -# CONFIG_MISC_FILESYSTEMS is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DETECT_SOFTLOCKUP is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_FTRACE is not set -# CONFIG_CRC32 is not set diff --git a/arch/arm/configs/g4evm_defconfig b/arch/arm/configs/g4evm_defconfig deleted file mode 100755 index 21c6d0307..000000000 --- a/arch/arm/configs/g4evm_defconfig +++ /dev/null @@ -1,57 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_SHMOBILE=y -CONFIG_ARCH_SH7377=y -CONFIG_MACH_G4EVM=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttySC4,115200 earlyprintk=sh-sci.4,115200" -CONFIG_KEXEC=y -CONFIG_PM=y -# CONFIG_SUSPEND is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_NAND=y -# CONFIG_BLK_DEV is not set -# CONFIG_MISC_DEVICES is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_SH_SCI=y -CONFIG_SERIAL_SH_SCI_NR_UARTS=8 -CONFIG_SERIAL_SH_SCI_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -# CONFIG_DNOTIFY is not set -# CONFIG_INOTIFY_USER is not set -CONFIG_TMPFS=y -# CONFIG_MISC_FILESYSTEMS is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DETECT_SOFTLOCKUP is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_FTRACE is not set -# CONFIG_CRC32 is not set diff --git a/arch/arm/configs/h3600_defconfig b/arch/arm/configs/h3600_defconfig deleted file mode 100755 index 317960f12..000000000 --- a/arch/arm/configs/h3600_defconfig +++ /dev/null @@ -1,79 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_MODULES=y -# CONFIG_LBDAF is not set -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_SA1100=y -CONFIG_SA1100_H3600=y -CONFIG_PCCARD=y -CONFIG_PCMCIA_SA1100=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -# CONFIG_CPU_FREQ_STAT is not set -CONFIG_FPE_NWFPE=y -CONFIG_PM=y -CONFIG_NET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_IPV6 is not set -CONFIG_IRDA=m -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -CONFIG_SA1100_FIR=m -# CONFIG_WIRELESS is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_CFI_I1 is not set -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_SA1100=y -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -# CONFIG_MISC_DEVICES is not set -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECS=y -CONFIG_NETDEVICES=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_WLAN is not set -CONFIG_NET_PCMCIA=y -CONFIG_PCMCIA_PCNET=y -CONFIG_PPP=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_SA1100=y -CONFIG_SERIAL_SA1100_CONSOLE=y -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -CONFIG_FB=y -CONFIG_FB_SA1100=y -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_EXT2_FS=y -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=m -CONFIG_NFS_FS=y -CONFIG_NFSD=m -CONFIG_SMB_FS=m -CONFIG_NLS=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set diff --git a/arch/arm/configs/h5000_defconfig b/arch/arm/configs/h5000_defconfig deleted file mode 100755 index 37903e3f0..000000000 --- a/arch/arm/configs/h5000_defconfig +++ /dev/null @@ -1,82 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_EXPERT=y -# CONFIG_UID16 is not set -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_PXA=y -CONFIG_MACH_H5000=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="keepinitrd" -CONFIG_KEXEC=y -CONFIG_FPE_NWFPE=y -CONFIG_PM=y -CONFIG_APM_EMULATION=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=32 -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -CONFIG_USB_GADGET=y -CONFIG_USB_ETH=m -# CONFIG_USB_ETH_RNDIS is not set -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_SA1100=y -CONFIG_EXT2_FS=y -CONFIG_INOTIFY=y -# CONFIG_PROC_PAGE_MONITOR is not set -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -# CONFIG_NETWORK_FILESYSTEMS is not set -CONFIG_PRINTK_TIME=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -# CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -# CONFIG_FTRACE is not set -CONFIG_CRYPTO=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_DES=y -CONFIG_CRYPTO_DEFLATE=y -# CONFIG_CRYPTO_HW is not set -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/h7201_defconfig b/arch/arm/configs/h7201_defconfig deleted file mode 100755 index bee94d296..000000000 --- a/arch/arm/configs/h7201_defconfig +++ /dev/null @@ -1,27 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_MODULES=y -CONFIG_ARCH_H720X=y -CONFIG_ARCH_H7201=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_FPE_NWFPE=y -CONFIG_MTD=y -CONFIG_MTD_DEBUG=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_VGA_CONSOLE is not set -CONFIG_SOUND=m -CONFIG_EXT2_FS=y -CONFIG_JFFS2_FS=y -CONFIG_DEBUG_USER=y diff --git a/arch/arm/configs/h7202_defconfig b/arch/arm/configs/h7202_defconfig deleted file mode 100755 index 69405a762..000000000 --- a/arch/arm/configs/h7202_defconfig +++ /dev/null @@ -1,48 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_MODULES=y -CONFIG_ARCH_H720X=y -CONFIG_ARCH_H7202=y -# CONFIG_ARM_THUMB is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,19200" -CONFIG_FPE_NWFPE=y -CONFIG_FPE_NWFPE_XP=y -CONFIG_NET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_IPV6 is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_H720X=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FB=y -CONFIG_FB_MODE_HELPERS=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_USB_GADGET=m -CONFIG_USB_ZERO=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_FILE_STORAGE_TEST=y -CONFIG_USB_G_SERIAL=m -CONFIG_EXT2_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_USER=y diff --git a/arch/arm/configs/hackkit_defconfig b/arch/arm/configs/hackkit_defconfig deleted file mode 100755 index bed804729..000000000 --- a/arch/arm/configs/hackkit_defconfig +++ /dev/null @@ -1,49 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_MODULES=y -CONFIG_ARCH_SA1100=y -CONFIG_SA1100_HACKKIT=y -CONFIG_LEDS=y -CONFIG_LEDS_CPU=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttySA0,115200 root=/dev/ram0 initrd=0xc0400000,8M init=/rootshell" -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_AOUT=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_SYN_COOKIES=y -# CONFIG_IPV6 is not set -CONFIG_MTD=y -CONFIG_MTD_DEBUG=y -CONFIG_MTD_DEBUG_VERBOSE=3 -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_SERIAL_SA1100=y -CONFIG_SERIAL_SA1100_CONSOLE=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_EXT2_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_CRAMFS=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_SPINLOCK=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -# CONFIG_CRC32 is not set diff --git a/arch/arm/configs/imote2_defconfig b/arch/arm/configs/imote2_defconfig deleted file mode 100755 index 176ec22af..000000000 --- a/arch/arm/configs/imote2_defconfig +++ /dev/null @@ -1,392 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_EXPERT=y -# CONFIG_COMPAT_BRK is not set -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_LBDAF is not set -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_PXA=y -CONFIG_MACH_INTELMOTE2=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS2,115200 mem=32M" -CONFIG_KEXEC=y -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_AOUT=m -CONFIG_BINFMT_MISC=m -CONFIG_PM=y -CONFIG_APM_EMULATION=y -CONFIG_PM_RUNTIME=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_MIP6=m -CONFIG_IPV6_TUNNEL=m -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_NETFILTER=y -CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NF_CONNTRACK=m -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CT_PROTO_SCTP=m -CONFIG_NF_CT_PROTO_UDPLITE=m -CONFIG_NF_CONNTRACK_AMANDA=m -CONFIG_NF_CONNTRACK_FTP=m -CONFIG_NF_CONNTRACK_H323=m -CONFIG_NF_CONNTRACK_IRC=m -CONFIG_NF_CONNTRACK_NETBIOS_NS=m -CONFIG_NF_CONNTRACK_PPTP=m -CONFIG_NF_CONNTRACK_SANE=m -CONFIG_NF_CONNTRACK_SIP=m -CONFIG_NF_CONNTRACK_TFTP=m -CONFIG_NF_CT_NETLINK=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_LED=m -CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_TARGET_NFLOG=m -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -CONFIG_NETFILTER_XT_MATCH_DSCP=m -CONFIG_NETFILTER_XT_MATCH_ESP=m -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -CONFIG_NETFILTER_XT_MATCH_HELPER=m -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -CONFIG_NETFILTER_XT_MATCH_POLICY=m -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -CONFIG_NETFILTER_XT_MATCH_REALM=m -CONFIG_NETFILTER_XT_MATCH_SCTP=m -CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_TIME=m -CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_ADDRTYPE=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT=m -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m -CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_IP6_NF_QUEUE=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_TARGET_LOG=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -CONFIG_BRIDGE=m -# CONFIG_BRIDGE_IGMP_SNOOPING is not set -CONFIG_IEEE802154=y -# CONFIG_WIRELESS is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_FW_LOADER=m -CONFIG_CONNECTOR=m -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_AFS_PARTS=y -CONFIG_MTD_AR7_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set -# CONFIG_MTD_CFI_I2 is not set -CONFIG_MTD_OTP=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PXA2XX=y -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_RAM=y -# CONFIG_MISC_DEVICES is not set -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_WLAN is not set -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -CONFIG_KEYBOARD_PXA27x=y -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y -# CONFIG_SERIO is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=8 -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_PXA=y -CONFIG_SPI=y -CONFIG_SPI_PXA2XX=y -CONFIG_GPIO_SYSFS=y -CONFIG_POWER_SUPPLY=y -# CONFIG_HWMON is not set -CONFIG_PMIC_DA903X=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_DEBUG=y -CONFIG_REGULATOR_VIRTUAL_CONSUMER=y -CONFIG_REGULATOR_USERSPACE_CONSUMER=y -CONFIG_REGULATOR_DA903X=y -CONFIG_MEDIA_SUPPORT=y -CONFIG_VIDEO_DEV=y -CONFIG_MEDIA_TUNER_CUSTOMISE=y -# CONFIG_MEDIA_TUNER_SIMPLE is not set -# CONFIG_MEDIA_TUNER_TDA8290 is not set -# CONFIG_MEDIA_TUNER_TDA827X is not set -# CONFIG_MEDIA_TUNER_TDA18271 is not set -# CONFIG_MEDIA_TUNER_TDA9887 is not set -# CONFIG_MEDIA_TUNER_TEA5761 is not set -# CONFIG_MEDIA_TUNER_TEA5767 is not set -# CONFIG_MEDIA_TUNER_MT20XX is not set -# CONFIG_MEDIA_TUNER_MT2060 is not set -# CONFIG_MEDIA_TUNER_MT2266 is not set -# CONFIG_MEDIA_TUNER_MT2131 is not set -# CONFIG_MEDIA_TUNER_QT1010 is not set -# CONFIG_MEDIA_TUNER_XC2028 is not set -# CONFIG_MEDIA_TUNER_XC5000 is not set -# CONFIG_MEDIA_TUNER_MXL5005S is not set -# CONFIG_MEDIA_TUNER_MXL5007T is not set -# CONFIG_MEDIA_TUNER_MC44S803 is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -CONFIG_SOC_CAMERA=y -CONFIG_SOC_CAMERA_MT9M111=y -CONFIG_VIDEO_PXA27x=y -# CONFIG_V4L_USB_DRIVERS is not set -# CONFIG_RADIO_ADAPTERS is not set -CONFIG_FB=y -CONFIG_FB_PXA=y -CONFIG_FB_PXA_OVERLAY=y -CONFIG_FB_PXA_PARAMETERS=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FONTS=y -CONFIG_FONT_MINI_4x6=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y -# CONFIG_SND_DRIVERS is not set -# CONFIG_SND_ARM is not set -# CONFIG_SND_SPI is not set -# CONFIG_SND_USB is not set -CONFIG_SND_SOC=y -CONFIG_SND_PXA2XX_SOC=y -# CONFIG_USB_HID is not set -CONFIG_USB=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_PXA27X=y -CONFIG_USB_ETH=m -# CONFIG_USB_ETH_RNDIS is not set -CONFIG_MMC=y -CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_SDIO_UART=m -CONFIG_MMC_PXA=y -CONFIG_MMC_SPI=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_LP3944=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_BACKLIGHT=y -CONFIG_LEDS_TRIGGER_GPIO=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_PXA=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=m -CONFIG_INOTIFY=y -CONFIG_AUTOFS_FS=y -CONFIG_AUTOFS4_FS=y -CONFIG_FUSE_FS=m -CONFIG_CUSE=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_FS_WBUF_VERIFY=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_JFFS2_FS_XATTR=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_LZO=y -CONFIG_JFFS2_RUBIN=y -CONFIG_CRAMFS=m -CONFIG_SQUASHFS=m -CONFIG_ROMFS_FS=m -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFSD=m -CONFIG_NFSD_V3=y -CONFIG_NFSD_V3_ACL=y -CONFIG_SMB_FS=m -CONFIG_CIFS=m -CONFIG_CIFS_STATS=y -CONFIG_CIFS_WEAK_PW_HASH=y -CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=m -CONFIG_PRINTK_TIME=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -CONFIG_DEBUG_RT_MUTEXES=y -CONFIG_PROVE_LOCKING=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_FTRACE is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_CRYPTD=m -CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_LRW=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_XTS=m -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_VMAC=m -CONFIG_CRYPTO_GHASH=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SEED=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_TWOFISH=m -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRC16=y diff --git a/arch/arm/configs/integrator_defconfig b/arch/arm/configs/integrator_defconfig deleted file mode 100755 index 7196ade07..000000000 --- a/arch/arm/configs/integrator_defconfig +++ /dev/null @@ -1,71 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_ARCH_INTEGRATOR=y -CONFIG_ARCH_INTEGRATOR_AP=y -CONFIG_CPU_ARM720T=y -CONFIG_CPU_ARM920T=y -CONFIG_PCI=y -CONFIG_LEDS=y -CONFIG_LEDS_CPU=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyAM0,38400n8 root=/dev/nfs ip=bootp mem=32M" -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_FPE_NWFPE=y -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_IPV6 is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_AFS_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_NET_PCI=y -CONFIG_E100=y -# CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_SERIO_SERPORT is not set -CONFIG_SERIAL_AMBA_PL010=y -CONFIG_SERIAL_AMBA_PL010_CONSOLE=y -CONFIG_FB=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_MATROX=y -CONFIG_FB_MATROX_MILLENIUM=y -CONFIG_FB_MATROX_MYSTIQUE=y -CONFIG_EXT2_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=y -CONFIG_NFSD_V3=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_ERRORS=y diff --git a/arch/arm/configs/iop13xx_defconfig b/arch/arm/configs/iop13xx_defconfig deleted file mode 100755 index 4fa94a1f1..000000000 --- a/arch/arm/configs/iop13xx_defconfig +++ /dev/null @@ -1,124 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_IOP13XX=y -CONFIG_MACH_IQ81340SC=y -CONFIG_MACH_IQ81340MC=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="ip=bootp root=nfs console=ttyS0,115200 nfsroot=,tcp,v3,wsize=8192,rsize=8192" -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_AOUT=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_LRO is not set -CONFIG_IPV6=y -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_IPV6_SIT is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y -CONFIG_MTD_REDBOOT_PARTS_READONLY=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=2 -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_ISCSI_ATTRS=y -CONFIG_MD=y -CONFIG_BLK_DEV_MD=y -CONFIG_MD_RAID0=y -CONFIG_MD_RAID1=y -CONFIG_MD_RAID10=y -CONFIG_MD_RAID456=y -CONFIG_BLK_DEV_DM=y -CONFIG_NETDEVICES=y -CONFIG_E1000=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=2 -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_IOP3XX=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_DMADEVICES=y -CONFIG_INTEL_IOP_ADMA=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_INOTIFY=y -CONFIG_TMPFS=y -CONFIG_ECRYPT_FS=y -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=y -CONFIG_NFSD_V3=y -CONFIG_SMB_FS=m -CONFIG_CIFS=m -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS=y -CONFIG_DEBUG_USER=y -CONFIG_KEYS=y -CONFIG_KEYS_DEBUG_PROC_KEYS=y -CONFIG_CRYPTO_NULL=y -CONFIG_CRYPTO_LRW=y -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_XCBC=y -CONFIG_CRYPTO_MD4=y -CONFIG_CRYPTO_MICHAEL_MIC=y -CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_TGR192=y -CONFIG_CRYPTO_WP512=y -CONFIG_CRYPTO_AES=y -CONFIG_CRYPTO_ANUBIS=y -CONFIG_CRYPTO_ARC4=y -CONFIG_CRYPTO_BLOWFISH=y -CONFIG_CRYPTO_CAST5=y -CONFIG_CRYPTO_CAST6=y -CONFIG_CRYPTO_DES=y -CONFIG_CRYPTO_KHAZAD=y -CONFIG_CRYPTO_SERPENT=y -CONFIG_CRYPTO_TEA=y -CONFIG_CRYPTO_TWOFISH=y -CONFIG_CRYPTO_DEFLATE=y -CONFIG_CRC_CCITT=y -CONFIG_LIBCRC32C=y diff --git a/arch/arm/configs/iop32x_defconfig b/arch/arm/configs/iop32x_defconfig deleted file mode 100755 index 4f2ec3ac1..000000000 --- a/arch/arm/configs/iop32x_defconfig +++ /dev/null @@ -1,135 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_ALL=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_IOP32X=y -CONFIG_MACH_GLANTANK=y -CONFIG_ARCH_IQ80321=y -CONFIG_ARCH_IQ31244=y -CONFIG_MACH_N2100=y -# CONFIG_ARM_THUMB is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp cachepolicy=writealloc" -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_AOUT=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_LRO is not set -CONFIG_IPV6=y -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_IPV6_SIT is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y -CONFIG_MTD_REDBOOT_PARTS_READONLY=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_NBD=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_ATA=y -CONFIG_SATA_SIL=y -CONFIG_SATA_VITESSE=y -CONFIG_MD=y -CONFIG_BLK_DEV_MD=y -CONFIG_MD_RAID0=y -CONFIG_MD_RAID1=y -CONFIG_MD_RAID10=y -CONFIG_MD_RAID456=y -CONFIG_BLK_DEV_DM=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_NET_PCI=y -CONFIG_E100=y -CONFIG_E1000=y -CONFIG_R8169=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_IOP3XX=y -# CONFIG_VGA_CONSOLE is not set -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_MON=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -CONFIG_USB_UHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_RS5C372=y -CONFIG_DMADEVICES=y -CONFIG_INTEL_IOP_ADMA=y -CONFIG_NET_DMA=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_INOTIFY=y -CONFIG_TMPFS=y -CONFIG_ECRYPT_FS=y -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=y -CONFIG_NFSD_V3=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y -CONFIG_KEYS=y -CONFIG_KEYS_DEBUG_PROC_KEYS=y -CONFIG_CRYPTO_NULL=y -CONFIG_CRYPTO_LRW=y -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_XCBC=y -CONFIG_CRYPTO_MD4=y -CONFIG_CRYPTO_MICHAEL_MIC=y -CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_TGR192=y -CONFIG_CRYPTO_WP512=y -CONFIG_CRYPTO_AES=y -CONFIG_CRYPTO_ANUBIS=y -CONFIG_CRYPTO_ARC4=y -CONFIG_CRYPTO_BLOWFISH=y -CONFIG_CRYPTO_CAST5=y -CONFIG_CRYPTO_CAST6=y -CONFIG_CRYPTO_DES=y -CONFIG_CRYPTO_KHAZAD=y -CONFIG_CRYPTO_SERPENT=y -CONFIG_CRYPTO_TEA=y -CONFIG_CRYPTO_TWOFISH=y -CONFIG_CRYPTO_DEFLATE=y -CONFIG_LIBCRC32C=y diff --git a/arch/arm/configs/iop33x_defconfig b/arch/arm/configs/iop33x_defconfig deleted file mode 100755 index aa36128ab..000000000 --- a/arch/arm/configs/iop33x_defconfig +++ /dev/null @@ -1,91 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_ALL=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_IOP33X=y -CONFIG_ARCH_IQ80331=y -CONFIG_MACH_IQ80332=y -# CONFIG_ARM_THUMB is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp cachepolicy=writealloc iop3xx_init_atu=y" -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_AOUT=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_LRO is not set -CONFIG_IPV6=y -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_IPV6_SIT is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y -CONFIG_MTD_REDBOOT_PARTS_READONLY=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_BLK_DEV_NBD=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_MD=y -CONFIG_BLK_DEV_MD=y -CONFIG_MD_LINEAR=y -CONFIG_MD_RAID0=y -CONFIG_MD_RAID1=y -CONFIG_MD_RAID456=y -CONFIG_BLK_DEV_DM=y -CONFIG_NETDEVICES=y -CONFIG_E1000=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_IOP3XX=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_DMADEVICES=y -CONFIG_INTEL_IOP_ADMA=y -CONFIG_NET_DMA=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_INOTIFY=y -CONFIG_TMPFS=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=y -CONFIG_NFSD_V3=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRC32 is not set diff --git a/arch/arm/configs/ixp2000_defconfig b/arch/arm/configs/ixp2000_defconfig deleted file mode 100755 index 8405aded9..000000000 --- a/arch/arm/configs/ixp2000_defconfig +++ /dev/null @@ -1,99 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -# CONFIG_HOTPLUG is not set -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_ARCH_IXP2000=y -CONFIG_ARCH_ENP2611=y -CONFIG_ARCH_IXDP2400=y -CONFIG_ARCH_IXDP2800=y -CONFIG_ARCH_IXDP2401=y -CONFIG_ARCH_IXDP2801=y -# CONFIG_IXP2000_SUPPORT_BROKEN_PCI_IO is not set -# CONFIG_ARM_THUMB is not set -CONFIG_CPU_BIG_ENDIAN=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,57600 root=/dev/nfs ip=bootp mem=64M@0x0" -CONFIG_FPE_NWFPE=y -CONFIG_FPE_NWFPE_XP=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_SYN_COOKIES=y -CONFIG_IPV6=y -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_IPV6_SIT is not set -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y -CONFIG_MTD_REDBOOT_PARTS_READONLY=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_IXP2000=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_NBD=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_EEPROM_LEGACY=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_NET_ETHERNET=y -CONFIG_NET_PCI=y -CONFIG_CS89x0=y -CONFIG_E100=y -CONFIG_ENP2611_MSF_NET=y -CONFIG_WAN=y -CONFIG_HDLC=y -CONFIG_HDLC_RAW=y -CONFIG_HDLC_CISCO=y -CONFIG_HDLC_FR=y -CONFIG_HDLC_PPP=y -CONFIG_DLCI=y -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -# CONFIG_VT is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=3 -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_IXP2000=y -CONFIG_WATCHDOG=y -CONFIG_IXP2000_WATCHDOG=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_INOTIFY=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_MUTEXES=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/ixp23xx_defconfig b/arch/arm/configs/ixp23xx_defconfig deleted file mode 100755 index 688717612..000000000 --- a/arch/arm/configs/ixp23xx_defconfig +++ /dev/null @@ -1,105 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_ARCH_IXP23XX=y -CONFIG_MACH_ESPRESSO=y -CONFIG_MACH_IXDP2351=y -CONFIG_MACH_ROADRUNNER=y -# CONFIG_ARM_THUMB is not set -CONFIG_CPU_BIG_ENDIAN=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp" -CONFIG_FPE_NWFPE=y -CONFIG_FPE_NWFPE_XP=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_SYN_COOKIES=y -CONFIG_IPV6=y -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_IPV6_SIT is not set -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -# CONFIG_FW_LOADER is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y -CONFIG_MTD_REDBOOT_PARTS_READONLY=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_PHYSMAP=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_NBD=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_EEPROM_LEGACY=y -CONFIG_IDE=y -CONFIG_BLK_DEV_SIIMAGE=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_NET_ETHERNET=y -CONFIG_NET_PCI=y -CONFIG_E100=y -CONFIG_E1000=y -CONFIG_WAN=y -CONFIG_HDLC=y -CONFIG_HDLC_RAW=y -CONFIG_HDLC_CISCO=y -CONFIG_HDLC_FR=y -CONFIG_HDLC_PPP=y -CONFIG_DLCI=y -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -# CONFIG_VT is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_WATCHDOG=y -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_MON=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_UHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_INOTIFY=y -CONFIG_MSDOS_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_MUTEXES=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig deleted file mode 100755 index 063e2ab2c..000000000 --- a/arch/arm/configs/ixp4xx_defconfig +++ /dev/null @@ -1,205 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -CONFIG_MODULES=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_IXP4XX=y -CONFIG_MACH_NSLU2=y -CONFIG_MACH_AVILA=y -CONFIG_MACH_LOFT=y -CONFIG_ARCH_ADI_COYOTE=y -CONFIG_MACH_GATEWAY7001=y -CONFIG_MACH_WG302V2=y -CONFIG_ARCH_IXDP425=y -CONFIG_MACH_IXDPG425=y -CONFIG_MACH_IXDP465=y -CONFIG_MACH_KIXRP435=y -CONFIG_ARCH_PRPMC1100=y -CONFIG_MACH_NAS100D=y -CONFIG_MACH_DSMG600=y -CONFIG_MACH_FSG=y -CONFIG_MACH_GTWX5715=y -CONFIG_IXP4XX_QMGR=y -CONFIG_IXP4XX_NPE=y -# CONFIG_ARM_THUMB is not set -CONFIG_CPU_BIG_ENDIAN=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200 ip=bootp root=/dev/nfs" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_NET_IPGRE=m -CONFIG_NET_IPGRE_BROADCAST=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_SYN_COOKIES=y -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_NETFILTER=y -CONFIG_IP_VS=m -CONFIG_IP_VS_DEBUG=y -CONFIG_IP_VS_RR=m -CONFIG_IP_VS_WRR=m -CONFIG_IP_VS_LC=m -CONFIG_IP_VS_WLC=m -CONFIG_IP_VS_LBLC=m -CONFIG_IP_VS_LBLCR=m -CONFIG_IP_VS_DH=m -CONFIG_IP_VS_SH=m -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_ATM=y -CONFIG_ATM_CLIP=y -CONFIG_ATM_LANE=m -CONFIG_ATM_MPOA=m -CONFIG_ATM_BR2684=m -CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m -CONFIG_IPX=m -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -CONFIG_IPDDP_DECAP=y -CONFIG_X25=m -CONFIG_LAPB=m -CONFIG_ECONET=m -CONFIG_ECONET_AUNUDP=y -CONFIG_ECONET_NATIVE=y -CONFIG_WAN_ROUTER=m -CONFIG_NET_SCHED=y -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m -CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_INGRESS=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_POLICE=y -CONFIG_NET_PKTGEN=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_IXP4XX=y -CONFIG_MTD_NAND=m -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_EEPROM_LEGACY=y -CONFIG_IDE=y -CONFIG_BLK_DEV_CMD64X=y -CONFIG_BLK_DEV_HPT366=y -CONFIG_BLK_DEV_PDC202XX_NEW=y -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_ATA=y -CONFIG_SATA_VIA=y -CONFIG_PATA_ARTOP=y -CONFIG_PATA_IXP4XX_CF=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -CONFIG_IXP4XX_ETH=y -CONFIG_NET_PCI=y -CONFIG_WAN=y -CONFIG_HDLC=m -CONFIG_HDLC_RAW=m -CONFIG_HDLC_CISCO=m -CONFIG_HDLC_FR=m -CONFIG_HDLC_PPP=m -CONFIG_HDLC_X25=m -CONFIG_DLCI=m -CONFIG_WAN_ROUTER_DRIVERS=m -CONFIG_ATM_TCP=m -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_MISC=y -CONFIG_INPUT_IXP4XX_BEEPER=y -# CONFIG_SERIO is not set -# CONFIG_VT is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=2 -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_SENSORS_W83781D=y -CONFIG_WATCHDOG=y -CONFIG_IXP4XX_WATCHDOG=y -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_UHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_FSG=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_IDE_DISK=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_ISL1208=y -CONFIG_RTC_DRV_X1205=y -CONFIG_RTC_DRV_PCF8563=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_INOTIFY=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/jornada720_defconfig b/arch/arm/configs/jornada720_defconfig deleted file mode 100755 index ea80e7e86..000000000 --- a/arch/arm/configs/jornada720_defconfig +++ /dev/null @@ -1,112 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_MODULES=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_SA1100=y -CONFIG_SA1100_JORNADA720=y -CONFIG_SA1100_JORNADA720_SSP=y -CONFIG_PCCARD=y -CONFIG_PCMCIA_SA1100=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_AOUT=y -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_NETFILTER=y -CONFIG_IRDA=m -CONFIG_IRLAN=m -CONFIG_IRCOMM=m -CONFIG_SA1100_FIR=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_NBD=y -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECS=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_NET_ETHERNET=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_NET_PCMCIA=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=640 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_HP7XX=y -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_HP7XX=y -CONFIG_SERIAL_SA1100=y -CONFIG_SERIAL_SA1100_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=32 -# CONFIG_HWMON is not set -CONFIG_FB=y -CONFIG_FB_S1D13XXX=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_BACKLIGHT_GENERIC is not set -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_SA1100=y -CONFIG_EXT2_FS=y -CONFIG_INOTIFY=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -# CONFIG_NETWORK_FILESYSTEMS is not set -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=m -CONFIG_DEBUG_KERNEL=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_FTRACE is not set -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig deleted file mode 100755 index aeb3af541..000000000 --- a/arch/arm/configs/kirkwood_defconfig +++ /dev/null @@ -1,186 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=19 -CONFIG_PROFILING=y -CONFIG_OPROFILE=y -CONFIG_KPROBES=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_KIRKWOOD=y -CONFIG_MACH_DB88F6281_BP=y -CONFIG_MACH_RD88F6192_NAS=y -CONFIG_MACH_RD88F6281=y -CONFIG_MACH_MV88F6281GTW_GE=y -CONFIG_MACH_SHEEVAPLUG=y -CONFIG_MACH_ESATA_SHEEVAPLUG=y -CONFIG_MACH_GURUPLUG=y -CONFIG_MACH_DOCKSTAR=y -CONFIG_MACH_TS219=y -CONFIG_MACH_TS41X=y -CONFIG_MACH_OPENRD_BASE=y -CONFIG_MACH_OPENRD_CLIENT=y -CONFIG_MACH_OPENRD_ULTIMATE=y -CONFIG_MACH_NETSPACE_V2=y -CONFIG_MACH_INETSPACE_V2=y -CONFIG_MACH_NETSPACE_MAX_V2=y -CONFIG_MACH_D2NET_V2=y -CONFIG_MACH_NET2BIG_V2=y -CONFIG_MACH_NET5BIG_V2=y -CONFIG_MACH_T5325=y -# CONFIG_CPU_FEROCEON_OLD_ID is not set -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CPU_IDLE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_IPV6 is not set -CONFIG_NET_DSA=y -CONFIG_NET_DSA_MV88E6123_61_65=y -CONFIG_NET_PKTGEN=m -CONFIG_CFG80211=y -CONFIG_MAC80211=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_STAA=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_M25P80=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ORION=y -CONFIG_BLK_DEV_LOOP=y -# CONFIG_MISC_DEVICES is not set -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=y -CONFIG_BLK_DEV_SR=m -CONFIG_CHR_DEV_SG=m -CONFIG_ATA=y -CONFIG_SATA_AHCI=y -CONFIG_SATA_MV=y -CONFIG_NETDEVICES=y -CONFIG_MARVELL_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -CONFIG_NET_PCI=y -CONFIG_MV643XX_ETH=y -# CONFIG_NETDEV_10000 is not set -CONFIG_LIBERTAS=y -CONFIG_LIBERTAS_SDIO=y -CONFIG_INPUT_EVDEV=y -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -CONFIG_LEGACY_PTY_COUNT=16 -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -# CONFIG_I2C_COMPAT is not set -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MV64XXX=y -CONFIG_SPI=y -CONFIG_SPI_ORION=y -CONFIG_GPIO_SYSFS=y -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -CONFIG_HID_DRAGONRISE=y -CONFIG_HID_GYRATION=y -CONFIG_HID_TWINHAN=y -CONFIG_HID_NTRIG=y -CONFIG_HID_PANTHERLORD=y -CONFIG_HID_PETALYNX=y -CONFIG_HID_SAMSUNG=y -CONFIG_HID_SONY=y -CONFIG_HID_SUNPLUS=y -CONFIG_HID_GREENASIA=y -CONFIG_HID_SMARTJOYPLUS=y -CONFIG_HID_TOPSEED=y -CONFIG_HID_THRUSTMASTER=y -CONFIG_HID_ZEROPLUS=y -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -CONFIG_USB_PRINTER=m -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_MMC=y -CONFIG_SDIO_UART=y -CONFIG_MMC_MVSDIO=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_S35390A=y -CONFIG_RTC_DRV_MV=y -CONFIG_DMADEVICES=y -CONFIG_MV_XOR=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_XATTR is not set -CONFIG_INOTIFY=y -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_UDF_FS=m -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=y -CONFIG_NLS_UTF8=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -# CONFIG_DEBUG_PREEMPT is not set -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -# CONFIG_FTRACE is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_PCBC=m -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_DEV_MV_CESA=y -CONFIG_CRC_CCITT=y -CONFIG_CRC16=y -CONFIG_LIBCRC32C=y diff --git a/arch/arm/configs/ks8695_defconfig b/arch/arm/configs/ks8695_defconfig deleted file mode 100755 index 47c488379..000000000 --- a/arch/arm/configs/ks8695_defconfig +++ /dev/null @@ -1,75 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_KS8695=y -CONFIG_MACH_KS8695=y -CONFIG_MACH_DSM320=y -# CONFIG_ARM_THUMB is not set -CONFIG_PCI=y -CONFIG_PCI_DEBUG=y -CONFIG_PCCARD=y -CONFIG_YENTA=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x20410000,3145728 root=/dev/ram0 rw" -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_PRISM54=m -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_KS8695=y -CONFIG_SERIAL_KS8695_CONSOLE=y -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -CONFIG_EXT2_FS=y -CONFIG_INOTIFY=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_RUBIN=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_MUTEXES=y -# CONFIG_FTRACE is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/lart_defconfig b/arch/arm/configs/lart_defconfig deleted file mode 100755 index faa286565..000000000 --- a/arch/arm/configs/lart_defconfig +++ /dev/null @@ -1,75 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_MODULES=y -CONFIG_ARCH_SA1100=y -CONFIG_SA1100_LART=y -CONFIG_LEDS=y -CONFIG_LEDS_CPU=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttySA0,9600 root=/dev/ram" -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_AOUT=y -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=m -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_SYN_COOKIES=y -# CONFIG_IPV6 is not set -CONFIG_IRDA=m -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_DEBUG=y -CONFIG_SA1100_FIR=m -CONFIG_MTD=y -CONFIG_MTD_DEBUG=y -CONFIG_MTD_DEBUG_VERBOSE=1 -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_LART=y -CONFIG_BLK_DEV_RAM=y -CONFIG_IDE=m -CONFIG_BLK_DEV_IDECD=m -CONFIG_NETDEVICES=y -CONFIG_DUMMY=m -CONFIG_NET_ETHERNET=y -CONFIG_PPP=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SERIAL_SA1100=y -CONFIG_SERIAL_SA1100_CONSOLE=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_SOUND=m -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=m -CONFIG_REISERFS_FS=m -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_UDF_FS=m -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=m -CONFIG_JFFS2_FS_DEBUG=1 -CONFIG_CRAMFS=m -CONFIG_NFS_FS=m -CONFIG_NFS_V3=y -CONFIG_NFSD=m -CONFIG_NFSD_V3=y -CONFIG_NLS=y -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_UTF8=m -CONFIG_DEBUG_USER=y -CONFIG_CRC32=m diff --git a/arch/arm/configs/loki_defconfig b/arch/arm/configs/loki_defconfig deleted file mode 100755 index 1ba752b2d..000000000 --- a/arch/arm/configs/loki_defconfig +++ /dev/null @@ -1,120 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_EXPERT=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_LOKI=y -CONFIG_MACH_LB88RC8480=y -# CONFIG_CPU_FEROCEON_OLD_ID is not set -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_IPV6 is not set -CONFIG_NET_PKTGEN=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_FTL=y -CONFIG_NFTL=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -CONFIG_MTD_CFI_I4=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_CFI_STAA=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_M25P80=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y -CONFIG_MTD_NAND_ORION=y -CONFIG_BLK_DEV_LOOP=y -# CONFIG_MISC_DEVICES is not set -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=y -CONFIG_BLK_DEV_SR=m -CONFIG_CHR_DEV_SG=m -CONFIG_ATA=y -CONFIG_SATA_MV=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -CONFIG_MV643XX_ETH=y -# CONFIG_NETDEV_10000 is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -CONFIG_LEGACY_PTY_COUNT=16 -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MV64XXX=y -CONFIG_SPI=y -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_PRINTER=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_NEW_LEDS=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_XATTR is not set -CONFIG_XFS_FS=y -CONFIG_INOTIFY=y -CONFIG_ISO9660_FS=y -CONFIG_UDF_FS=m -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_BSD_DISKLABEL=y -CONFIG_MINIX_SUBPARTITION=y -CONFIG_SOLARIS_X86_PARTITION=y -CONFIG_UNIXWARE_DISKLABEL=y -CONFIG_LDM_PARTITION=y -CONFIG_LDM_DEBUG=y -CONFIG_SUN_PARTITION=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_DEBUG_USER=y -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRC_CCITT=y -CONFIG_CRC16=y -CONFIG_LIBCRC32C=y diff --git a/arch/arm/configs/lpd270_defconfig b/arch/arm/configs/lpd270_defconfig deleted file mode 100755 index 1c8c9ee71..000000000 --- a/arch/arm/configs/lpd270_defconfig +++ /dev/null @@ -1,65 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_ARCH_PXA=y -CONFIG_MACH_LOGICPD_PXA270=y -# CONFIG_ARM_THUMB is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/nfs ip=bootp console=ttyS0,115200 mem=64M" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IPV6=y -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_IPV6_SIT is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_CFI_I1 is not set -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_BLK_DEV_NBD=y -CONFIG_IDE=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO_SERPORT is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -# CONFIG_HW_RANDOM is not set -CONFIG_FB=y -CONFIG_FB_PXA=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -CONFIG_SOUND=y -CONFIG_SND=y -# CONFIG_SND_SUPPORT_OLD_API is not set -CONFIG_SND_PXA2XX_AC97=y -CONFIG_EXT2_FS=y -CONFIG_INOTIFY=y -CONFIG_MSDOS_FS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_ISO8859_1=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/lubbock_defconfig b/arch/arm/configs/lubbock_defconfig deleted file mode 100755 index c4ba27458..000000000 --- a/arch/arm/configs/lubbock_defconfig +++ /dev/null @@ -1,56 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_MODULES=y -CONFIG_ARCH_PXA=y -CONFIG_ARCH_LUBBOCK=y -# CONFIG_ARM_THUMB is not set -CONFIG_PCCARD=y -CONFIG_PCMCIA_PXA2XX=y -CONFIG_LEDS=y -CONFIG_LEDS_CPU=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/nfs ip=bootp console=ttyS0,115200 mem=64M" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_IPV6 is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_CFI_I1 is not set -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -CONFIG_NET_PCMCIA=y -CONFIG_PCMCIA_PCNET=y -CONFIG_INPUT_EVDEV=y -# CONFIG_SERIO_SERPORT is not set -CONFIG_SERIO_SA1111=y -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_USB_GADGET=y -CONFIG_USB_G_SERIAL=m -CONFIG_EXT2_FS=y -CONFIG_MSDOS_FS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_ISO8859_1=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig deleted file mode 100755 index 306a2e2d3..000000000 --- a/arch/arm/configs/mackerel_defconfig +++ /dev/null @@ -1,138 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -# CONFIG_UTS_NS is not set -# CONFIG_IPC_NS is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set -# CONFIG_NET_NS is not set -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_SHMOBILE=y -CONFIG_ARCH_SH7372=y -CONFIG_MACH_MACKEREL=y -CONFIG_MEMORY_SIZE=0x10000000 -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_FORCE_MAX_ZONEORDER=15 -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=tty0, console=ttySC0,115200 earlyprintk=sh-sci.0,115200 root=/dev/nfs nfsroot=,tcp,v3 ip=dhcp memchunk.vpu=64m memchunk.veu0=8m memchunk.spu0=2m mem=240m" -CONFIG_KEXEC=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_PM=y -CONFIG_PM_RUNTIME=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_IPV6 is not set -# CONFIG_WIRELESS is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_ARM_INTEGRATOR=y -CONFIG_MTD_BLOCK2MTD=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SMSC911X=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_WLAN is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_SERIAL_SH_SCI=y -CONFIG_SERIAL_SH_SCI_NR_UARTS=8 -CONFIG_SERIAL_SH_SCI_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -# CONFIG_MFD_SUPPORT is not set -CONFIG_FB=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_SH_MOBILE_LCDC=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_CLUT224 is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT2_FS_XIP=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -# CONFIG_DNOTIFY is not set -# CONFIG_INOTIFY_USER is not set -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -# CONFIG_MISC_FILESYSTEMS is not set -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_NFS_V4_1=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_737=y -CONFIG_NLS_CODEPAGE_775=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_CODEPAGE_852=y -CONFIG_NLS_CODEPAGE_855=y -CONFIG_NLS_CODEPAGE_857=y -CONFIG_NLS_CODEPAGE_860=y -CONFIG_NLS_CODEPAGE_861=y -CONFIG_NLS_CODEPAGE_862=y -CONFIG_NLS_CODEPAGE_863=y -CONFIG_NLS_CODEPAGE_864=y -CONFIG_NLS_CODEPAGE_865=y -CONFIG_NLS_CODEPAGE_866=y -CONFIG_NLS_CODEPAGE_869=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=y -CONFIG_NLS_ISO8859_3=y -CONFIG_NLS_ISO8859_4=y -CONFIG_NLS_ISO8859_5=y -CONFIG_NLS_ISO8859_6=y -CONFIG_NLS_ISO8859_7=y -CONFIG_NLS_ISO8859_9=y -CONFIG_NLS_ISO8859_13=y -CONFIG_NLS_ISO8859_14=y -CONFIG_NLS_ISO8859_15=y -CONFIG_NLS_KOI8_R=y -CONFIG_NLS_KOI8_U=y -CONFIG_NLS_UTF8=y -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -# CONFIG_ARM_UNWIND is not set -CONFIG_CRYPTO=y -CONFIG_CRYPTO_ANSI_CPRNG=y diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig deleted file mode 100755 index a88e64d4e..000000000 --- a/arch/arm/configs/magician_defconfig +++ /dev/null @@ -1,182 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -# CONFIG_UID16 is not set -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_PXA=y -CONFIG_MACH_H4700=y -CONFIG_MACH_MAGICIAN=y -CONFIG_NO_HZ=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="keepinitrd" -CONFIG_KEXEC=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_FPE_NWFPE=y -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_IRDA=m -CONFIG_IRLAN=m -CONFIG_IRCOMM=m -CONFIG_IRDA_ULTRA=y -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -CONFIG_IRDA_DEBUG=y -CONFIG_IRTTY_SIR=m -CONFIG_PXA_FICP=m -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m -CONFIG_BT_HCIBTUSB=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -# CONFIG_MISC_DEVICES is not set -CONFIG_NETDEVICES=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_PPP=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=m -# CONFIG_SERIO is not set -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_PXA=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_PXA=y -CONFIG_W1_MASTER_DS1WM=y -CONFIG_POWER_SUPPLY=y -CONFIG_PDA_POWER=y -CONFIG_BATTERY_DS2760=y -# CONFIG_HWMON is not set -CONFIG_MFD_ASIC3=y -CONFIG_HTC_EGPIO=y -CONFIG_HTC_PASIC3=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_BQ24022=y -CONFIG_FB=y -CONFIG_FB_PXA=y -CONFIG_FB_PXA_OVERLAY=y -CONFIG_FB_W100=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_BACKLIGHT_GENERIC is not set -CONFIG_BACKLIGHT_PWM=y -CONFIG_DISPLAY_SUPPORT=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -CONFIG_FONTS=y -CONFIG_FONT_MINI_4x6=y -CONFIG_SOUND=y -CONFIG_SND=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -# CONFIG_SND_ARM is not set -# CONFIG_SND_USB is not set -CONFIG_SND_SOC=m -CONFIG_SND_PXA2XX_SOC=m -# CONFIG_HID_SUPPORT is not set -CONFIG_USB=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_MON=m -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VBUS_DRAW=500 -CONFIG_USB_GADGET_PXA27X=y -CONFIG_USB_ETH=m -# CONFIG_USB_ETH_RNDIS is not set -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_USB_CDC_COMPOSITE=m -CONFIG_USB_GPIO_VBUS=y -CONFIG_MMC=y -CONFIG_SDIO_UART=m -CONFIG_MMC_PXA=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_BACKLIGHT=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DEBUG=y -CONFIG_RTC_DRV_SA1100=y -CONFIG_EXT2_FS=y -CONFIG_INOTIFY=y -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_LZO=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_UTF8=y -CONFIG_PRINTK_TIME=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -CONFIG_TIMER_STATS=y -# CONFIG_DEBUG_PREEMPT is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -CONFIG_CRYPTO=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/mainstone_defconfig b/arch/arm/configs/mainstone_defconfig deleted file mode 100755 index 04efa1b3e..000000000 --- a/arch/arm/configs/mainstone_defconfig +++ /dev/null @@ -1,55 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_MODULES=y -CONFIG_ARCH_PXA=y -CONFIG_MACH_MAINSTONE=y -# CONFIG_ARM_THUMB is not set -CONFIG_LEDS=y -CONFIG_LEDS_CPU=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/nfs ip=bootp console=ttyS0,115200 mem=64M" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_IPV6 is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_CFI_I1 is not set -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_IDE=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO_SERPORT is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_FB=y -CONFIG_FB_PXA=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -CONFIG_EXT2_FS=y -CONFIG_MSDOS_FS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_ISO8859_1=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/mini2440_defconfig b/arch/arm/configs/mini2440_defconfig deleted file mode 100755 index 2472a9585..000000000 --- a/arch/arm/configs/mini2440_defconfig +++ /dev/null @@ -1,384 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_RELAY=y -CONFIG_UTS_NS=y -CONFIG_IPC_NS=y -CONFIG_BLK_DEV_INITRD=y -# CONFIG_COMPAT_BRK is not set -CONFIG_MODULES=y -CONFIG_MODULE_FORCE_LOAD=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_BLK_DEV_INTEGRITY=y -CONFIG_ARCH_S3C2410=y -CONFIG_S3C_ADC=y -CONFIG_S3C24XX_PWM=y -CONFIG_MACH_MINI2440=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_KEXEC=y -CONFIG_CPU_IDLE=y -CONFIG_BINFMT_AOUT=m -CONFIG_BINFMT_MISC=m -CONFIG_PM=y -CONFIG_APM_EMULATION=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=m -CONFIG_NET_KEY=m -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=m -# CONFIG_IPV6 is not set -CONFIG_NETFILTER=y -CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m -CONFIG_VLAN_8021Q_GVRP=y -CONFIG_NET_PKTGEN=m -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m -CONFIG_BT_HCIBTUSB=m -CONFIG_BT_HCIBTSDIO=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIUART_LL=y -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIVHCI=m -CONFIG_CFG80211=m -CONFIG_CFG80211_REG_DEBUG=y -CONFIG_MAC80211=m -CONFIG_MAC80211_MESH=y -CONFIG_MAC80211_LEDS=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_CONNECTOR=m -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_FTL=y -CONFIG_NFTL=y -CONFIG_NFTL_RW=y -CONFIG_INFTL=y -CONFIG_RFD_FTL=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_CFI_STAA=y -CONFIG_MTD_RAM=y -CONFIG_MTD_ROM=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y -CONFIG_MTD_NAND_S3C2410=y -CONFIG_MTD_NAND_PLATFORM=y -CONFIG_MTD_LPDDR=y -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=65536 -CONFIG_CDROM_PKTCDVD=m -CONFIG_SENSORS_TSL2550=m -CONFIG_SCSI=m -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=m -CONFIG_CHR_DEV_SG=m -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_NETDEVICES=y -CONFIG_TUN=m -CONFIG_NET_ETHERNET=y -CONFIG_DM9000=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_SDIO=m -CONFIG_ZD1211RW=m -CONFIG_ZD1211RW_DEBUG=y -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_INPUT_FF_MEMLESS=y -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=m -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_SERIO_RAW=y -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_SERIAL_SAMSUNG=y -CONFIG_SERIAL_SAMSUNG_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=128 -CONFIG_IPMI_HANDLER=m -CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_SI=m -CONFIG_IPMI_WATCHDOG=m -CONFIG_IPMI_POWEROFF=m -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_S3C2410=y -CONFIG_I2C_SIMTEC=y -CONFIG_SPI=y -CONFIG_SPI_S3C24XX=y -CONFIG_SPI_SPIDEV=y -CONFIG_GPIO_SYSFS=y -CONFIG_SENSORS_LM75=y -CONFIG_THERMAL=m -CONFIG_WATCHDOG=y -CONFIG_S3C2410_WATCHDOG=y -CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y -CONFIG_FB_S3C2410=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_LCD_PLATFORM=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_BACKLIGHT_GENERIC is not set -CONFIG_BACKLIGHT_PWM=y -CONFIG_DISPLAY_SUPPORT=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_MINI_4x6=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_SEQUENCER=m -CONFIG_SND_SEQ_DUMMY=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_SEQUENCER_OSS=y -CONFIG_SND_DYNAMIC_MINORS=y -# CONFIG_SND_DRIVERS is not set -# CONFIG_SND_ARM is not set -# CONFIG_SND_SPI is not set -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_USB_CAIAQ=m -CONFIG_SND_USB_CAIAQ_INPUT=y -CONFIG_SND_SOC=y -CONFIG_SND_S3C24XX_SOC=y -CONFIG_HIDRAW=y -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y -CONFIG_HID_GYRATION=y -CONFIG_HID_NTRIG=y -CONFIG_HID_PANTHERLORD=y -CONFIG_HID_PETALYNX=y -CONFIG_HID_SAMSUNG=y -CONFIG_HID_SONY=y -CONFIG_HID_SUNPLUS=y -CONFIG_HID_TOPSEED=y -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_ACM=m -CONFIG_USB_WDM=m -CONFIG_USB_STORAGE=m -CONFIG_USB_STORAGE_DATAFAB=m -CONFIG_USB_STORAGE_ISD200=m -CONFIG_USB_STORAGE_USBAT=m -CONFIG_USB_STORAGE_SDDR09=m -CONFIG_USB_STORAGE_SDDR55=m -CONFIG_USB_STORAGE_JUMPSHOT=m -CONFIG_USB_STORAGE_ALAUDA=m -CONFIG_USB_LIBUSUAL=y -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_CP210X=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_SPCP8X5=m -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_S3C2410=y -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_USB_CDC_COMPOSITE=m -CONFIG_MMC=y -CONFIG_SDIO_UART=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SPI=y -CONFIG_MMC_S3C=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_S3C24XX=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_GPIO=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_INTF_DEV_UIE_EMUL=y -CONFIG_RTC_DRV_S3C=y -CONFIG_DMADEVICES=y -CONFIG_EXT2_FS=m -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_INOTIFY=y -CONFIG_AUTOFS_FS=y -CONFIG_AUTOFS4_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_CONFIGFS_FS=m -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=y -CONFIG_ROMFS_FS=y -CONFIG_ROMFS_BACKED_BY_BOTH=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_BSD_DISKLABEL=y -CONFIG_MINIX_SUBPARTITION=y -CONFIG_SOLARIS_X86_PARTITION=y -CONFIG_UNIXWARE_DISKLABEL=y -CONFIG_LDM_PARTITION=y -CONFIG_EFI_PARTITION=y -CONFIG_NLS_DEFAULT="cp437" -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=m -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_STRIP_ASM_SYMS=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_DEBUG_USER=y -CONFIG_KEYS=y -CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_CRYPTD=m -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_CCM=m -CONFIG_CRYPTO_GCM=m -CONFIG_CRYPTO_CTS=m -CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_LRW=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_XTS=m -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MICHAEL_MIC=y -CONFIG_CRYPTO_RMD128=m -CONFIG_CRYPTO_RMD160=m -CONFIG_CRYPTO_RMD256=m -CONFIG_CRYPTO_RMD320=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_AES=y -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_ARC4=y -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_CAMELLIA=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SEED=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_ZLIB=m -CONFIG_CRYPTO_LZO=m -CONFIG_CRC_T10DIF=y -CONFIG_LIBCRC32C=m diff --git a/arch/arm/configs/mmp2_defconfig b/arch/arm/configs/mmp2_defconfig deleted file mode 100755 index 47ad3b1a4..000000000 --- a/arch/arm/configs/mmp2_defconfig +++ /dev/null @@ -1,88 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_MMP=y -CONFIG_MACH_FLINT=y -CONFIG_MACH_MARVELL_JASPER=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/nfs rootfstype=nfs nfsroot=192.168.1.100:/nfsroot/ ip=192.168.1.101:192.168.1.100::255.255.255.0::eth0:on console=ttyS2,38400 mem=128M user_debug=255" -CONFIG_VFP=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -# CONFIG_STANDALONE is not set -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_NAND=y -CONFIG_MTD_ONENAND=y -CONFIG_MTD_ONENAND_GENERIC=y -# CONFIG_BLK_DEV is not set -# CONFIG_MISC_DEVICES is not set -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_PXA=y -# CONFIG_HWMON is not set -CONFIG_MFD_MAX8925=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_MAX8649=y -CONFIG_REGULATOR_MAX8925=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_MAX8925=y -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_MAX8925=y -# CONFIG_DNOTIFY is not set -CONFIG_INOTIFY=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_PREEMPT is not set -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/msm-copper_defconfig b/arch/arm/configs/msm-copper_defconfig deleted file mode 100755 index 4d4c27f7f..000000000 --- a/arch/arm/configs/msm-copper_defconfig +++ /dev/null @@ -1,165 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_CGROUPS=y -CONFIG_CGROUP_DEBUG=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_SCHED=y -# CONFIG_FAIR_GROUP_SCHED is not set -CONFIG_RT_GROUP_SCHED=y -CONFIG_NAMESPACES=y -# CONFIG_UTS_NS is not set -# CONFIG_IPC_NS is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set -CONFIG_RELAY=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_KALLSYMS_ALL=y -CONFIG_ASHMEM=y -CONFIG_EMBEDDED=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=m -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_ARCH_MSM=y -CONFIG_ARCH_MSMCOPPER=y -CONFIG_MSM_KRAIT_TBB_ABORT_HANDLER=y -# CONFIG_MSM_STACKED_MEMORY is not set -CONFIG_DEBUG_MSMCOPPER_UART=y -CONFIG_CPU_HAS_L2_PMU=y -# CONFIG_MSM_JTAG_V7 is not set -# CONFIG_MSM_FIQ_SUPPORT is not set -# CONFIG_MSM_PROC_COMM is not set -# CONFIG_MSM_DALRPC is not set -# CONFIG_MSM_HW3D is not set -CONFIG_MSM_DIRECT_SCLK_ACCESS=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_SMP=y -# CONFIG_SMP_ON_UP is not set -CONFIG_ARM_ARCH_TIMER=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_HIGHMEM=y -CONFIG_VMALLOC_RESERVE=0x19000000 -CONFIG_USE_OF=y -CONFIG_ARM_APPENDED_DTB=y -CONFIG_ARM_ATAG_DTB_COMPAT=y -CONFIG_VFP=y -CONFIG_NEON=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -# CONFIG_SUSPEND is not set -CONFIG_HOTPLUG_CPU=y -CONFIG_NET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IPV6=y -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_IPV6_MIP6=y -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_MISC_DEVICES=y -CONFIG_SCSI=y -CONFIG_SCSI_TGT=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_SCH=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_NETDEVICES=y -# CONFIG_MSM_RMNET is not set -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=m -CONFIG_INPUT_JOYSTICK=y -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y -CONFIG_SERIAL_MSM_HSL=y -CONFIG_SERIAL_MSM_HSL_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_DCC_TTY=y -CONFIG_DEBUG_GPIO=y -CONFIG_GPIO_SYSFS=y -# CONFIG_HWMON is not set -# CONFIG_MFD_SUPPORT is not set -# CONFIG_HID_SUPPORT is not set -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_CI13XXX_MSM=y -CONFIG_USB_G_ANDROID=y -CONFIG_MMC=y -CONFIG_MMC_PERF_PROFILING=y -CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_MMC_PARANOID_SD_INIT=y -CONFIG_MMC_BLOCK_MINORS=32 -# CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_TEST=m -CONFIG_MMC_MSM=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -# CONFIG_LEDS_MSM_PMIC is not set -CONFIG_SWITCH=y -CONFIG_STAGING=y -CONFIG_ANDROID=y -CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_LOGGER=y -CONFIG_ANDROID_RAM_CONSOLE=y -CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION=y -CONFIG_ANDROID_TIMED_GPIO=y -CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_MSM_SSBI=y -CONFIG_SPS=y -CONFIG_SPS_SUPPORT_BAMDMA=y -CONFIG_SPS_SUPPORT_NDP_BAM=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_EXT4_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -CONFIG_TIMER_STATS=y -# CONFIG_DEBUG_PREEMPT is not set -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_MEMORY_INIT=y -CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y -CONFIG_EARLY_PRINTK=y -CONFIG_KEYS=y -CONFIG_CRYPTO_AUTHENC=y -CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_MD4=y -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_AES=y -CONFIG_CRYPTO_ARC4=y -CONFIG_CRYPTO_DES=y -CONFIG_CRYPTO_TWOFISH=y -CONFIG_CRYPTO_DEFLATE=y -CONFIG_CRC_CCITT=y -CONFIG_LIBCRC32C=y diff --git a/arch/arm/configs/msm7627-perf_defconfig b/arch/arm/configs/msm7627-perf_defconfig deleted file mode 100755 index 0f2ffc1bf..000000000 --- a/arch/arm/configs/msm7627-perf_defconfig +++ /dev/null @@ -1,302 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_LOCALVERSION="-perf" -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_CGROUPS=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_SCHED=y -CONFIG_RT_GROUP_SCHED=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_KALLSYMS_ALL=y -CONFIG_ASHMEM=y -CONFIG_EMBEDDED=y -CONFIG_SLAB=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=m -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -CONFIG_ARCH_MSM=y -CONFIG_ARCH_MSM7X27=y -# CONFIG_MSM_STACKED_MEMORY is not set -CONFIG_MSM7X00A_USE_DG_TIMER=y -# CONFIG_MSM_FIQ_SUPPORT is not set -CONFIG_MSM_SMD=y -CONFIG_MSM_SMD_PKG4=y -CONFIG_MSM_ONCRPCROUTER=y -CONFIG_MSM_RMT_STORAGE_CLIENT=y -# CONFIG_MSM_HW3D is not set -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="init=/sbin/init root=/dev/ram rw initrd=0x11000000,16M console=ttyDCC0 mem=88M" -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_STAT_DETAILS=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_VFP=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_WAKELOCK=y -CONFIG_PM_RUNTIME=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -CONFIG_IPV6=y -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=y -CONFIG_INET6_ESP=y -CONFIG_INET6_IPCOMP=y -CONFIG_IPV6_MIP6=y -CONFIG_IPV6_TUNNEL=y -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_NETFILTER=y -CONFIG_NETFILTER_NETLINK_LOG=y -CONFIG_NF_CONNTRACK=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CT_PROTO_DCCP=y -CONFIG_NF_CT_PROTO_SCTP=y -CONFIG_NF_CT_PROTO_UDPLITE=y -CONFIG_NF_CONNTRACK_AMANDA=y -CONFIG_NF_CONNTRACK_FTP=y -CONFIG_NF_CONNTRACK_H323=y -CONFIG_NF_CONNTRACK_IRC=y -CONFIG_NF_CONNTRACK_NETBIOS_NS=y -CONFIG_NF_CONNTRACK_PPTP=y -CONFIG_NF_CONNTRACK_SANE=y -CONFIG_NF_CONNTRACK_SIP=y -CONFIG_NF_CONNTRACK_TFTP=y -CONFIG_NF_CT_NETLINK=y -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y -CONFIG_NETFILTER_XT_TARGET_CONNMARK=y -CONFIG_NETFILTER_XT_TARGET_MARK=y -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y -CONFIG_NETFILTER_XT_MATCH_COMMENT=y -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y -CONFIG_NETFILTER_XT_MATCH_CONNMARK=y -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y -CONFIG_NETFILTER_XT_MATCH_HELPER=y -CONFIG_NETFILTER_XT_MATCH_IPRANGE=y -CONFIG_NETFILTER_XT_MATCH_LENGTH=y -CONFIG_NETFILTER_XT_MATCH_LIMIT=y -CONFIG_NETFILTER_XT_MATCH_MAC=y -CONFIG_NETFILTER_XT_MATCH_MARK=y -CONFIG_NETFILTER_XT_MATCH_OWNER=y -CONFIG_NETFILTER_XT_MATCH_POLICY=y -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y -CONFIG_NETFILTER_XT_MATCH_QUOTA=y -CONFIG_NETFILTER_XT_MATCH_STATE=y -CONFIG_NETFILTER_XT_MATCH_STATISTIC=y -CONFIG_NETFILTER_XT_MATCH_STRING=y -CONFIG_NETFILTER_XT_MATCH_TIME=y -CONFIG_NETFILTER_XT_MATCH_U32=y -CONFIG_NF_CONNTRACK_IPV4=y -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_MATCH_AH=y -CONFIG_IP_NF_MATCH_ECN=y -CONFIG_IP_NF_MATCH_TTL=y -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_TARGET_REJECT=y -CONFIG_IP_NF_TARGET_LOG=y -CONFIG_NF_NAT=y -CONFIG_IP_NF_TARGET_MASQUERADE=y -CONFIG_IP_NF_TARGET_NETMAP=y -CONFIG_IP_NF_TARGET_REDIRECT=y -CONFIG_IP_NF_ARPTABLES=y -CONFIG_IP_NF_ARPFILTER=y -CONFIG_IP_NF_ARP_MANGLE=y -CONFIG_NET_SCHED=y -CONFIG_NET_SCH_HTB=y -CONFIG_NET_CLS_U32=y -CONFIG_BT=y -CONFIG_BT_L2CAP=y -CONFIG_BT_SCO=y -CONFIG_BT_RFCOMM=y -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=y -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=y -CONFIG_BT_HCIUART=y -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIUART_IBS=y -CONFIG_BT_MSM_SLEEP=y -CONFIG_MSM_BT_POWER=y -# CONFIG_WIRELESS_EXT_SYSFS is not set -CONFIG_RFKILL=y -# CONFIG_RFKILL_PM is not set -CONFIG_MTD=y -CONFIG_MTD_TESTS=m -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=8 -CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_MISC_DEVICES=y -CONFIG_SCSI=y -CONFIG_SCSI_TGT=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_SCH=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_MD=y -CONFIG_BLK_DEV_DM=y -CONFIG_DM_CRYPT=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_LIBRA_SDIOIF=m -CONFIG_SLIP=y -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_MODE_SLIP6=y -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=m -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_MSM_LEGACY=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_KEYCHORD=y -CONFIG_INPUT_UINPUT=y -CONFIG_INPUT_GPIO=y -# CONFIG_SERIO is not set -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_MSM_HS=y -CONFIG_DIAG_CHAR=y -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_DEBUG_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_POWER_SUPPLY=y -CONFIG_BATTERY_MSM=y -# CONFIG_HWMON is not set -CONFIG_MEDIA_SUPPORT=y -CONFIG_VIDEO_DEV=y -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_VIDEO_HELPER_CHIPS_AUTO=y -CONFIG_MSM_KGSL=y -CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_FB=y -CONFIG_FB_MSM=y -# CONFIG_FB_MSM_BACKLIGHT is not set -CONFIG_FB_MSM_TRIPLE_BUFFER=y -CONFIG_FB_MSM_MDP30=y -CONFIG_FB_MSM_TRY_MDDI_CATCH_LCDC_PRISM=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_SOUND=y -CONFIG_SND=y -# CONFIG_SND_DRIVERS is not set -# CONFIG_SND_ARM is not set -CONFIG_SND_SOC=y -CONFIG_SND_MSM_SOC=y -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_SUSPEND=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_EHSET=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y -# CONFIG_USB_EHCI_TT_NEWSCHED is not set -CONFIG_USB_EHCI_MSM_72K=y -CONFIG_USB_ACM=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y -CONFIG_USB_STORAGE_ONETOUCH=y -CONFIG_USB_STORAGE_KARMA=y -CONFIG_USB_STORAGE_CYPRESS_ATACB=y -CONFIG_USB_EHSET_TEST_FIXTURE=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MSM_72K=y -CONFIG_USB_G_ANDROID=y -CONFIG_RMNET_SMD_CTL_CHANNEL="DATA12_CNTL" -CONFIG_RMNET_SMD_DATA_CHANNEL="DATA12" -CONFIG_MMC=y -CONFIG_MMC_PERF_PROFILING=y -CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_MMC_CLKGATE=y -CONFIG_MMC_PARANOID_SD_INIT=y -CONFIG_MMC_BLOCK_MINORS=32 -# CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_MSM=y -CONFIG_MMC_MSM_SDIO_SUPPORT=y -CONFIG_SWITCH=y -CONFIG_SWITCH_GPIO=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DEBUG=y -CONFIG_STAGING=y -CONFIG_ANDROID=y -CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_LOGGER=y -CONFIG_ANDROID_RAM_CONSOLE=y -CONFIG_ANDROID_TIMED_GPIO=y -CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_EXT4_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_YAFFS_FS=y -CONFIG_YAFFS_DISABLE_TAGS_ECC=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -CONFIG_TIMER_STATS=y -# CONFIG_DEBUG_PREEMPT is not set -CONFIG_DEBUG_INFO=y -CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_USER=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_TWOFISH=y -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/msm7627_defconfig b/arch/arm/configs/msm7627_defconfig deleted file mode 100755 index d1d0e6641..000000000 --- a/arch/arm/configs/msm7627_defconfig +++ /dev/null @@ -1,307 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_CGROUPS=y -CONFIG_CGROUP_DEBUG=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_SCHED=y -CONFIG_RT_GROUP_SCHED=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_ASHMEM=y -CONFIG_EMBEDDED=y -CONFIG_SLAB=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=m -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -CONFIG_ARCH_MSM=y -CONFIG_ARCH_MSM7X27=y -# CONFIG_MSM_STACKED_MEMORY is not set -CONFIG_MSM7X00A_USE_DG_TIMER=y -# CONFIG_MSM_FIQ_SUPPORT is not set -CONFIG_MSM_SMD=y -CONFIG_MSM_SMD_PKG4=y -CONFIG_MSM_ONCRPCROUTER=y -CONFIG_MSM_RMT_STORAGE_CLIENT=y -# CONFIG_MSM_HW3D is not set -CONFIG_STRICT_MEMORY_RWX=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="init=/sbin/init root=/dev/ram rw initrd=0x11000000,16M console=ttyDCC0 mem=88M" -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_STAT_DETAILS=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_VFP=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_WAKELOCK=y -CONFIG_PM_RUNTIME=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -CONFIG_IPV6=y -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=y -CONFIG_INET6_ESP=y -CONFIG_INET6_IPCOMP=y -CONFIG_IPV6_MIP6=y -CONFIG_IPV6_TUNNEL=y -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_NETFILTER=y -CONFIG_NETFILTER_NETLINK_LOG=y -CONFIG_NF_CONNTRACK=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CT_PROTO_DCCP=y -CONFIG_NF_CT_PROTO_SCTP=y -CONFIG_NF_CT_PROTO_UDPLITE=y -CONFIG_NF_CONNTRACK_AMANDA=y -CONFIG_NF_CONNTRACK_FTP=y -CONFIG_NF_CONNTRACK_H323=y -CONFIG_NF_CONNTRACK_IRC=y -CONFIG_NF_CONNTRACK_NETBIOS_NS=y -CONFIG_NF_CONNTRACK_PPTP=y -CONFIG_NF_CONNTRACK_SANE=y -CONFIG_NF_CONNTRACK_SIP=y -CONFIG_NF_CONNTRACK_TFTP=y -CONFIG_NF_CT_NETLINK=y -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y -CONFIG_NETFILTER_XT_TARGET_CONNMARK=y -CONFIG_NETFILTER_XT_TARGET_MARK=y -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y -CONFIG_NETFILTER_XT_MATCH_COMMENT=y -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y -CONFIG_NETFILTER_XT_MATCH_CONNMARK=y -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y -CONFIG_NETFILTER_XT_MATCH_HELPER=y -CONFIG_NETFILTER_XT_MATCH_IPRANGE=y -CONFIG_NETFILTER_XT_MATCH_LENGTH=y -CONFIG_NETFILTER_XT_MATCH_LIMIT=y -CONFIG_NETFILTER_XT_MATCH_MAC=y -CONFIG_NETFILTER_XT_MATCH_MARK=y -CONFIG_NETFILTER_XT_MATCH_OWNER=y -CONFIG_NETFILTER_XT_MATCH_POLICY=y -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y -CONFIG_NETFILTER_XT_MATCH_QUOTA=y -CONFIG_NETFILTER_XT_MATCH_STATE=y -CONFIG_NETFILTER_XT_MATCH_STATISTIC=y -CONFIG_NETFILTER_XT_MATCH_STRING=y -CONFIG_NETFILTER_XT_MATCH_TIME=y -CONFIG_NETFILTER_XT_MATCH_U32=y -CONFIG_NF_CONNTRACK_IPV4=y -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_MATCH_AH=y -CONFIG_IP_NF_MATCH_ECN=y -CONFIG_IP_NF_MATCH_TTL=y -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_TARGET_REJECT=y -CONFIG_IP_NF_TARGET_LOG=y -CONFIG_NF_NAT=y -CONFIG_IP_NF_TARGET_MASQUERADE=y -CONFIG_IP_NF_TARGET_NETMAP=y -CONFIG_IP_NF_TARGET_REDIRECT=y -CONFIG_IP_NF_ARPTABLES=y -CONFIG_IP_NF_ARPFILTER=y -CONFIG_IP_NF_ARP_MANGLE=y -CONFIG_NET_SCHED=y -CONFIG_NET_SCH_HTB=y -CONFIG_NET_CLS_U32=y -CONFIG_BT=y -CONFIG_BT_L2CAP=y -CONFIG_BT_SCO=y -CONFIG_BT_RFCOMM=y -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=y -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=y -CONFIG_BT_HCIUART=y -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIUART_IBS=y -CONFIG_BT_MSM_SLEEP=y -CONFIG_MSM_BT_POWER=y -# CONFIG_WIRELESS_EXT_SYSFS is not set -CONFIG_RFKILL=y -# CONFIG_RFKILL_PM is not set -CONFIG_MTD=y -CONFIG_MTD_TESTS=m -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=8 -CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_MISC_DEVICES=y -CONFIG_SCSI=y -CONFIG_SCSI_TGT=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_SCH=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_MD=y -CONFIG_BLK_DEV_DM=y -CONFIG_DM_CRYPT=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_LIBRA_SDIOIF=m -CONFIG_SLIP=y -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_MODE_SLIP6=y -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=m -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_MSM_LEGACY=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_KEYCHORD=y -CONFIG_INPUT_UINPUT=y -CONFIG_INPUT_GPIO=y -# CONFIG_SERIO is not set -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_MSM_HS=y -CONFIG_DIAG_CHAR=y -# CONFIG_HW_RANDOM is not set -CONFIG_DCC_TTY=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_DEBUG_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_POWER_SUPPLY=y -CONFIG_BATTERY_MSM=y -# CONFIG_HWMON is not set -CONFIG_MSM_KGSL=y -CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_FB=y -CONFIG_FB_MSM=y -# CONFIG_FB_MSM_BACKLIGHT is not set -CONFIG_FB_MSM_TRIPLE_BUFFER=y -CONFIG_FB_MSM_MDP30=y -CONFIG_FB_MSM_TRY_MDDI_CATCH_LCDC_PRISM=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_SOUND=y -CONFIG_SND=y -# CONFIG_SND_DRIVERS is not set -# CONFIG_SND_ARM is not set -CONFIG_SND_SOC=y -CONFIG_SND_MSM_SOC=y -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_SUSPEND=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_EHSET=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y -# CONFIG_USB_EHCI_TT_NEWSCHED is not set -CONFIG_USB_EHCI_MSM_72K=y -CONFIG_USB_ACM=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y -CONFIG_USB_STORAGE_ONETOUCH=y -CONFIG_USB_STORAGE_KARMA=y -CONFIG_USB_STORAGE_CYPRESS_ATACB=y -CONFIG_USB_EHSET_TEST_FIXTURE=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MSM_72K=y -CONFIG_USB_G_ANDROID=y -CONFIG_RMNET_SMD_CTL_CHANNEL="DATA12_CNTL" -CONFIG_RMNET_SMD_DATA_CHANNEL="DATA12" -CONFIG_MMC=y -CONFIG_MMC_PERF_PROFILING=y -CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_MMC_CLKGATE=y -CONFIG_MMC_PARANOID_SD_INIT=y -CONFIG_MMC_BLOCK_MINORS=32 -# CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_MSM=y -CONFIG_MMC_MSM_SDIO_SUPPORT=y -CONFIG_SWITCH=y -CONFIG_SWITCH_GPIO=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DEBUG=y -CONFIG_STAGING=y -CONFIG_ANDROID=y -CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_LOGGER=y -CONFIG_ANDROID_RAM_CONSOLE=y -CONFIG_ANDROID_TIMED_GPIO=y -CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_EXT4_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_YAFFS_FS=y -CONFIG_YAFFS_DISABLE_TAGS_ECC=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_LOCKUP_DETECTOR=y -CONFIG_DETECT_HUNG_TASK=y -CONFIG_TIMER_STATS=y -CONFIG_DEBUG_SPINLOCK=y -CONFIG_DEBUG_MUTEXES=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -CONFIG_DEBUG_STACK_USAGE=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_LIST=y -CONFIG_LATENCYTOP=y -CONFIG_DEBUG_PAGEALLOC=y -CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_USER=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_TWOFISH=y -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/msm7627a-perf_defconfig b/arch/arm/configs/msm7627a-perf_defconfig deleted file mode 100755 index 342aad647..000000000 --- a/arch/arm/configs/msm7627a-perf_defconfig +++ /dev/null @@ -1,330 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_LOCALVERSION="$(KERNEL_LOCAL_VERSION)-perf" -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_CGROUPS=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_SCHED=y -CONFIG_RT_GROUP_SCHED=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_KALLSYMS_ALL=y -CONFIG_ASHMEM=y -CONFIG_EMBEDDED=y -CONFIG_SLAB=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -CONFIG_ARCH_MSM=y -CONFIG_ARCH_MSM7X27=y -CONFIG_MSM_SOC_REV_A=y -# CONFIG_MACH_MSM7X27_SURF is not set -# CONFIG_MACH_MSM7X27_FFA is not set -# CONFIG_MSM_STACKED_MEMORY is not set -CONFIG_MSM7X00A_USE_DG_TIMER=y -# CONFIG_MSM_FIQ_SUPPORT is not set -CONFIG_MSM_SMD=y -CONFIG_MSM_SMD_PKG4=y -# CONFIG_MSM_SMD_DEBUG is not set -# CONFIG_MSM_RESET_MODEM is not set -# CONFIG_MSM_SMD_NMEA is not set -# CONFIG_MSM_SMD_QMI is not set -CONFIG_MSM_ONCRPCROUTER=y -# CONFIG_MSM_RPCSERVER_TIME_REMOTE is not set -CONFIG_MSM_RMT_STORAGE_CLIENT=y -# CONFIG_MSM_HW3D is not set -CONFIG_MSM7X27A_AUDIO=y -CONFIG_MSM_DMA_TEST=y -# CONFIG_MSM_JTAG_V7 is not set -CONFIG_BT_MSM_PINTEST=y -CONFIG_MSM_RPC_VIBRATOR=y -CONFIG_PM8XXX_RPC_VIBRATOR=y -CONFIG_ARM_THUMBEE=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_CP_ACCESS=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="init=/sbin/init root=/dev/ram rw initrd=0x11000000,16M console=ttyDCC0 mem=88M" -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_STAT_DETAILS=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_INTERACTIVE=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_VFP=y -CONFIG_NEON=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_WAKELOCK=y -CONFIG_PM_RUNTIME=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IPV6=y -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=y -CONFIG_INET6_ESP=y -CONFIG_INET6_IPCOMP=y -CONFIG_IPV6_MIP6=y -CONFIG_IPV6_TUNNEL=y -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_NETFILTER=y -CONFIG_NETFILTER_NETLINK_LOG=y -CONFIG_NF_CONNTRACK=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CT_PROTO_DCCP=y -CONFIG_NF_CT_PROTO_SCTP=y -CONFIG_NF_CT_PROTO_UDPLITE=y -CONFIG_NF_CONNTRACK_AMANDA=y -CONFIG_NF_CONNTRACK_FTP=y -CONFIG_NF_CONNTRACK_H323=y -CONFIG_NF_CONNTRACK_IRC=y -CONFIG_NF_CONNTRACK_NETBIOS_NS=y -CONFIG_NF_CONNTRACK_PPTP=y -CONFIG_NF_CONNTRACK_SANE=y -CONFIG_NF_CONNTRACK_SIP=y -CONFIG_NF_CONNTRACK_TFTP=y -CONFIG_NF_CT_NETLINK=y -CONFIG_NETFILTER_TPROXY=y -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y -CONFIG_NETFILTER_XT_TARGET_CONNMARK=y -CONFIG_NETFILTER_XT_TARGET_MARK=y -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y -CONFIG_NETFILTER_XT_MATCH_COMMENT=y -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y -CONFIG_NETFILTER_XT_MATCH_CONNMARK=y -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y -CONFIG_NETFILTER_XT_MATCH_HELPER=y -CONFIG_NETFILTER_XT_MATCH_IPRANGE=y -CONFIG_NETFILTER_XT_MATCH_LENGTH=y -CONFIG_NETFILTER_XT_MATCH_LIMIT=y -CONFIG_NETFILTER_XT_MATCH_MAC=y -CONFIG_NETFILTER_XT_MATCH_MARK=y -CONFIG_NETFILTER_XT_MATCH_POLICY=y -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y -CONFIG_NETFILTER_XT_MATCH_QTAGUID=y -CONFIG_NETFILTER_XT_MATCH_QUOTA=y -CONFIG_NETFILTER_XT_MATCH_SOCKET=y -CONFIG_NETFILTER_XT_MATCH_STATE=y -CONFIG_NETFILTER_XT_MATCH_STATISTIC=y -CONFIG_NETFILTER_XT_MATCH_STRING=y -CONFIG_NETFILTER_XT_MATCH_TIME=y -CONFIG_NETFILTER_XT_MATCH_U32=y -CONFIG_NF_CONNTRACK_IPV4=y -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_MATCH_AH=y -CONFIG_IP_NF_MATCH_ECN=y -CONFIG_IP_NF_MATCH_TTL=y -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_TARGET_REJECT=y -CONFIG_IP_NF_TARGET_LOG=y -CONFIG_NF_NAT=y -CONFIG_IP_NF_TARGET_MASQUERADE=y -CONFIG_IP_NF_TARGET_NETMAP=y -CONFIG_IP_NF_TARGET_REDIRECT=y -CONFIG_IP_NF_MANGLE=y -CONFIG_IP_NF_ARPTABLES=y -CONFIG_IP_NF_ARPFILTER=y -CONFIG_IP_NF_ARP_MANGLE=y -CONFIG_IP6_NF_IPTABLES=y -CONFIG_BT=y -CONFIG_BT_L2CAP=y -CONFIG_BT_SCO=y -CONFIG_BT_RFCOMM=y -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=y -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=y -CONFIG_BT_HCIUART=y -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_IBS=y -CONFIG_BT_MSM_SLEEP=y -CONFIG_MSM_BT_POWER=y -CONFIG_CFG80211=y -# CONFIG_CFG80211_WEXT is not set -CONFIG_RFKILL=y -CONFIG_GENLOCK=y -CONFIG_GENLOCK_MISCDEVICE=y -CONFIG_MTD=y -CONFIG_MTD_TESTS=m -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_MISC_DEVICES=y -CONFIG_SCSI=y -CONFIG_SCSI_TGT=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_SCH=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_MD=y -CONFIG_BLK_DEV_DM=y -CONFIG_DM_CRYPT=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -CONFIG_SMSC911X=y -# CONFIG_NETDEV_10000 is not set -CONFIG_LIBRA_SDIOIF=m -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=m -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ATMEL_MAXTOUCH=y -CONFIG_TOUCHSCREEN_SYNAPTICS_RMI4_I2C=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y -CONFIG_INPUT_GPIO=y -# CONFIG_SERIO is not set -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_MSM=y -CONFIG_SERIAL_MSM_CONSOLE=y -CONFIG_SERIAL_MSM_HS=y -# CONFIG_SERIAL_MSM_CLOCK_CONTROL is not set -CONFIG_DIAG_CHAR=y -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -# CONFIG_I2C_MSM is not set -CONFIG_I2C_QUP=y -CONFIG_DEBUG_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_SX150X=y -CONFIG_POWER_SUPPLY=y -CONFIG_BATTERY_MSM=y -# CONFIG_HWMON is not set -CONFIG_MARIMBA_CORE=y -CONFIG_MEDIA_SUPPORT=y -CONFIG_VIDEO_DEV=y -# CONFIG_MT9T013 is not set -# CONFIG_MT9D112 is not set -CONFIG_OV5640=y -CONFIG_WEBCAM_OV7692_QRD=y -CONFIG_WEBCAM_OV9726=y -# CONFIG_MT9P012 is not set -# CONFIG_MT9P012_KM is not set -CONFIG_MT9E013=y -# CONFIG_S5K3E2FX is not set -CONFIG_S5K4E1=y -CONFIG_MSM_CAMERA_FLASH_SC628A=y -CONFIG_IMX072=y -CONFIG_RADIO_TAVARUA=y -CONFIG_MSM_KGSL=y -CONFIG_FB=y -CONFIG_FB_MSM=y -# CONFIG_FB_MSM_BACKLIGHT is not set -CONFIG_FB_MSM_TRIPLE_BUFFER=y -CONFIG_FB_MSM_MDP30=y -CONFIG_FB_MSM_MDP303=y -CONFIG_FB_MSM_MIPI_PANEL_DETECT=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_SOC=y -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_SUSPEND=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_EHSET=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y -# CONFIG_USB_EHCI_TT_NEWSCHED is not set -CONFIG_USB_EHCI_MSM_72K=y -CONFIG_USB_ACM=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y -CONFIG_USB_STORAGE_ONETOUCH=y -CONFIG_USB_STORAGE_KARMA=y -CONFIG_USB_STORAGE_CYPRESS_ATACB=y -CONFIG_USB_EHSET_TEST_FIXTURE=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MSM_72K=y -CONFIG_USB_G_ANDROID=y -CONFIG_RMNET_SMD_CTL_CHANNEL="DATA40_CNTL" -CONFIG_RMNET_SMD_DATA_CHANNEL="DATA40" -CONFIG_MMC=y -CONFIG_MMC_PERF_PROFILING=y -CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_MMC_CLKGATE=y -CONFIG_MMC_PARANOID_SD_INIT=y -CONFIG_MMC_BLOCK_MINORS=32 -# CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_TEST=m -CONFIG_MMC_MSM=y -CONFIG_MMC_MSM_SDIO_SUPPORT=y -CONFIG_MMC_MSM_CARD_HW_DETECTION=y -CONFIG_MMC_MSM_SDC3_SUPPORT=y -CONFIG_MMC_MSM_SDC3_8_BIT_SUPPORT=y -CONFIG_LEDS_MSM_PDM=y -CONFIG_SWITCH=y -CONFIG_SWITCH_GPIO=y -CONFIG_RTC_CLASS=y -CONFIG_STAGING=y -CONFIG_ANDROID=y -CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_LOGGER=y -CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_EXT4_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_YAFFS_FS=y -CONFIG_YAFFS_DISABLE_TAGS_ECC=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_SHIRQ=y -# CONFIG_SCHED_DEBUG is not set -CONFIG_TIMER_STATS=y -CONFIG_DEBUG_STACK_USAGE=y -CONFIG_DEBUG_INFO=y -# CONFIG_FTRACE is not set -CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y -CONFIG_EARLY_PRINTK=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_TWOFISH=y -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/msm7627a_defconfig b/arch/arm/configs/msm7627a_defconfig deleted file mode 100755 index c52475997..000000000 --- a/arch/arm/configs/msm7627a_defconfig +++ /dev/null @@ -1,332 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_LOCALVERSION="$(KERNEL_LOCAL_VERSION)" -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_CGROUPS=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_SCHED=y -CONFIG_RT_GROUP_SCHED=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_ASHMEM=y -CONFIG_EMBEDDED=y -CONFIG_SLAB=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -CONFIG_ARCH_MSM=y -CONFIG_ARCH_MSM7X27=y -CONFIG_MSM_SOC_REV_A=y -# CONFIG_MACH_MSM7X27_SURF is not set -# CONFIG_MACH_MSM7X27_FFA is not set -# CONFIG_MSM_STACKED_MEMORY is not set -CONFIG_MSM7X00A_USE_DG_TIMER=y -# CONFIG_MSM_FIQ_SUPPORT is not set -CONFIG_MSM_SMD=y -CONFIG_MSM_SMD_PKG4=y -# CONFIG_MSM_SMD_DEBUG is not set -# CONFIG_MSM_RESET_MODEM is not set -# CONFIG_MSM_SMD_NMEA is not set -# CONFIG_MSM_SMD_QMI is not set -CONFIG_MSM_ONCRPCROUTER=y -# CONFIG_MSM_RPCSERVER_TIME_REMOTE is not set -CONFIG_MSM_RMT_STORAGE_CLIENT=y -# CONFIG_MSM_HW3D is not set -CONFIG_MSM7X27A_AUDIO=y -CONFIG_MSM_DMA_TEST=y -# CONFIG_MSM_JTAG_V7 is not set -CONFIG_BT_MSM_PINTEST=y -CONFIG_MSM_RPC_VIBRATOR=y -CONFIG_PM8XXX_RPC_VIBRATOR=y -CONFIG_ARM_THUMBEE=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_CP_ACCESS=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="init=/sbin/init root=/dev/ram rw initrd=0x11000000,16M console=ttyDCC0 mem=88M" -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_INTERACTIVE=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_VFP=y -CONFIG_NEON=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_WAKELOCK=y -CONFIG_PM_RUNTIME=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IPV6=y -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=y -CONFIG_INET6_ESP=y -CONFIG_INET6_IPCOMP=y -CONFIG_IPV6_MIP6=y -CONFIG_IPV6_TUNNEL=y -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_NETFILTER=y -CONFIG_NETFILTER_NETLINK_LOG=y -CONFIG_NF_CONNTRACK=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CT_PROTO_DCCP=y -CONFIG_NF_CT_PROTO_SCTP=y -CONFIG_NF_CT_PROTO_UDPLITE=y -CONFIG_NF_CONNTRACK_AMANDA=y -CONFIG_NF_CONNTRACK_FTP=y -CONFIG_NF_CONNTRACK_H323=y -CONFIG_NF_CONNTRACK_IRC=y -CONFIG_NF_CONNTRACK_NETBIOS_NS=y -CONFIG_NF_CONNTRACK_PPTP=y -CONFIG_NF_CONNTRACK_SANE=y -CONFIG_NF_CONNTRACK_SIP=y -CONFIG_NF_CONNTRACK_TFTP=y -CONFIG_NF_CT_NETLINK=y -CONFIG_NETFILTER_TPROXY=y -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y -CONFIG_NETFILTER_XT_TARGET_CONNMARK=y -CONFIG_NETFILTER_XT_TARGET_MARK=y -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y -CONFIG_NETFILTER_XT_MATCH_COMMENT=y -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y -CONFIG_NETFILTER_XT_MATCH_CONNMARK=y -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y -CONFIG_NETFILTER_XT_MATCH_HELPER=y -CONFIG_NETFILTER_XT_MATCH_IPRANGE=y -CONFIG_NETFILTER_XT_MATCH_LENGTH=y -CONFIG_NETFILTER_XT_MATCH_LIMIT=y -CONFIG_NETFILTER_XT_MATCH_MAC=y -CONFIG_NETFILTER_XT_MATCH_MARK=y -CONFIG_NETFILTER_XT_MATCH_POLICY=y -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y -CONFIG_NETFILTER_XT_MATCH_QTAGUID=y -CONFIG_NETFILTER_XT_MATCH_QUOTA=y -CONFIG_NETFILTER_XT_MATCH_SOCKET=y -CONFIG_NETFILTER_XT_MATCH_STATE=y -CONFIG_NETFILTER_XT_MATCH_STATISTIC=y -CONFIG_NETFILTER_XT_MATCH_STRING=y -CONFIG_NETFILTER_XT_MATCH_TIME=y -CONFIG_NETFILTER_XT_MATCH_U32=y -CONFIG_NF_CONNTRACK_IPV4=y -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_MATCH_AH=y -CONFIG_IP_NF_MATCH_ECN=y -CONFIG_IP_NF_MATCH_TTL=y -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_TARGET_REJECT=y -CONFIG_IP_NF_TARGET_LOG=y -CONFIG_NF_NAT=y -CONFIG_IP_NF_TARGET_MASQUERADE=y -CONFIG_IP_NF_TARGET_NETMAP=y -CONFIG_IP_NF_TARGET_REDIRECT=y -CONFIG_IP_NF_MANGLE=y -CONFIG_IP_NF_ARPTABLES=y -CONFIG_IP_NF_ARPFILTER=y -CONFIG_IP_NF_ARP_MANGLE=y -CONFIG_IP6_NF_IPTABLES=y -CONFIG_BT=y -CONFIG_BT_L2CAP=y -CONFIG_BT_SCO=y -CONFIG_BT_RFCOMM=y -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=y -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=y -CONFIG_BT_HCIUART=y -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_IBS=y -CONFIG_BT_MSM_SLEEP=y -CONFIG_MSM_BT_POWER=y -CONFIG_CFG80211=y -# CONFIG_CFG80211_WEXT is not set -CONFIG_RFKILL=y -CONFIG_GENLOCK=y -CONFIG_GENLOCK_MISCDEVICE=y -CONFIG_MTD=y -CONFIG_MTD_TESTS=m -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_MISC_DEVICES=y -CONFIG_SCSI=y -CONFIG_SCSI_TGT=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_SCH=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_MD=y -CONFIG_BLK_DEV_DM=y -CONFIG_DM_CRYPT=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -CONFIG_SMSC911X=y -# CONFIG_NETDEV_10000 is not set -CONFIG_LIBRA_SDIOIF=m -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=m -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ATMEL_MAXTOUCH=y -CONFIG_TOUCHSCREEN_SYNAPTICS_RMI4_I2C=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y -CONFIG_INPUT_GPIO=y -# CONFIG_SERIO is not set -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_MSM=y -CONFIG_SERIAL_MSM_CONSOLE=y -CONFIG_SERIAL_MSM_HS=y -# CONFIG_SERIAL_MSM_CLOCK_CONTROL is not set -# CONFIG_HW_RANDOM is not set -CONFIG_DCC_TTY=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -# CONFIG_I2C_MSM is not set -CONFIG_I2C_QUP=y -CONFIG_DEBUG_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_SX150X=y -CONFIG_POWER_SUPPLY=y -CONFIG_BATTERY_MSM=y -# CONFIG_HWMON is not set -CONFIG_MARIMBA_CORE=y -CONFIG_MEDIA_SUPPORT=y -CONFIG_VIDEO_DEV=y -# CONFIG_MT9T013 is not set -# CONFIG_MT9D112 is not set -CONFIG_OV5640=y -CONFIG_WEBCAM_OV7692_QRD=y -CONFIG_WEBCAM_OV9726=y -# CONFIG_MT9P012 is not set -# CONFIG_MT9P012_KM is not set -CONFIG_MT9E013=y -# CONFIG_S5K3E2FX is not set -CONFIG_S5K4E1=y -CONFIG_MSM_CAMERA_FLASH_SC628A=y -CONFIG_IMX072=y -CONFIG_RADIO_TAVARUA=y -CONFIG_MSM_KGSL=y -CONFIG_FB=y -CONFIG_FB_MSM=y -# CONFIG_FB_MSM_BACKLIGHT is not set -CONFIG_FB_MSM_TRIPLE_BUFFER=y -CONFIG_FB_MSM_MDP30=y -CONFIG_FB_MSM_MDP303=y -CONFIG_FB_MSM_MIPI_PANEL_DETECT=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_SOC=y -CONFIG_SND_MSM_SOC=y -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_SUSPEND=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_EHSET=y -# CONFIG_USB_EHCI_TT_NEWSCHED is not set -CONFIG_USB_EHCI_MSM=y -CONFIG_USB_ACM=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y -CONFIG_USB_STORAGE_ONETOUCH=y -CONFIG_USB_STORAGE_KARMA=y -CONFIG_USB_STORAGE_CYPRESS_ATACB=y -CONFIG_USB_EHSET_TEST_FIXTURE=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MSM_72K=y -CONFIG_MMC=y -CONFIG_MMC_PERF_PROFILING=y -CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_MMC_CLKGATE=y -CONFIG_MMC_PARANOID_SD_INIT=y -CONFIG_MMC_BLOCK_MINORS=32 -# CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_TEST=m -CONFIG_MMC_MSM=y -CONFIG_MMC_MSM_SDIO_SUPPORT=y -CONFIG_MMC_MSM_CARD_HW_DETECTION=y -CONFIG_MMC_MSM_SDC3_SUPPORT=y -CONFIG_MMC_MSM_SDC3_8_BIT_SUPPORT=y -CONFIG_LEDS_MSM_PDM=y -CONFIG_SWITCH=y -CONFIG_SWITCH_GPIO=y -CONFIG_RTC_CLASS=y -CONFIG_STAGING=y -CONFIG_ANDROID=y -CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_LOGGER=y -CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_EXT4_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_YAFFS_FS=y -CONFIG_YAFFS_DISABLE_TAGS_ECC=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_SHIRQ=y -CONFIG_LOCKUP_DETECTOR=y -CONFIG_DETECT_HUNG_TASK=y -CONFIG_TIMER_STATS=y -CONFIG_DEBUG_SPINLOCK=y -CONFIG_DEBUG_MUTEXES=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -CONFIG_DEBUG_STACK_USAGE=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_LIST=y -CONFIG_LATENCYTOP=y -CONFIG_DEBUG_PAGEALLOC=y -# CONFIG_FTRACE is not set -CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y -CONFIG_EARLY_PRINTK=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_TWOFISH=y -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/msm7630-perf_defconfig b/arch/arm/configs/msm7630-perf_defconfig deleted file mode 100755 index e5fec3559..000000000 --- a/arch/arm/configs/msm7630-perf_defconfig +++ /dev/null @@ -1,380 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_LOCALVERSION="-perf" -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_CGROUPS=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_SCHED=y -CONFIG_RT_GROUP_SCHED=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_ASHMEM=y -CONFIG_EMBEDDED=y -CONFIG_SLAB=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=m -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -CONFIG_ARCH_MSM=y -CONFIG_ARCH_MSM7X30=y -# CONFIG_MSM_STACKED_MEMORY is not set -CONFIG_MSM_SMD=y -CONFIG_MSM_SMD_PKG3=y -CONFIG_MSM_SDIO_DMUX=y -CONFIG_MSM_SDIO_CMUX=y -CONFIG_MSM_SDIO_CTL=y -CONFIG_MSM_ONCRPCROUTER=y -CONFIG_MSM_RPC_WATCHDOG=y -CONFIG_MSM_RMT_STORAGE_CLIENT=y -# CONFIG_MSM_HW3D is not set -# CONFIG_QSD_AUDIO is not set -CONFIG_MSM_MEMORY_LOW_POWER_MODE=y -CONFIG_MSM_MEMORY_LOW_POWER_MODE_IDLE_RETENTION=y -CONFIG_MSM_MEMORY_LOW_POWER_MODE_SUSPEND_DEEP_POWER_DOWN=y -CONFIG_MSM_IDLE_WAIT_ON_MODEM=2000 -# CONFIG_MSM_JTAG_V7 is not set -CONFIG_MSM_STANDALONE_POWER_COLLAPSE=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="init=/sbin/init root=/dev/ram rw initrd=0x11000000,16M console=ttyDCC0 mem=88M ip=dhcp" -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_VFP=y -CONFIG_NEON=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_WAKELOCK=y -CONFIG_PM_RUNTIME=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -CONFIG_IPV6=y -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=y -CONFIG_INET6_ESP=y -CONFIG_INET6_IPCOMP=y -CONFIG_IPV6_MIP6=y -CONFIG_IPV6_TUNNEL=y -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_NETFILTER=y -CONFIG_NF_CONNTRACK=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CT_PROTO_DCCP=y -CONFIG_NF_CT_PROTO_SCTP=y -CONFIG_NF_CT_PROTO_UDPLITE=y -CONFIG_NF_CONNTRACK_AMANDA=y -CONFIG_NF_CONNTRACK_FTP=y -CONFIG_NF_CONNTRACK_H323=y -CONFIG_NF_CONNTRACK_IRC=y -CONFIG_NF_CONNTRACK_NETBIOS_NS=y -CONFIG_NF_CONNTRACK_PPTP=y -CONFIG_NF_CONNTRACK_SANE=y -CONFIG_NF_CONNTRACK_SIP=y -CONFIG_NF_CONNTRACK_TFTP=y -CONFIG_NF_CT_NETLINK=y -CONFIG_NETFILTER_TPROXY=y -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y -CONFIG_NETFILTER_XT_TARGET_CONNMARK=y -CONFIG_NETFILTER_XT_TARGET_MARK=y -CONFIG_NETFILTER_XT_TARGET_NFLOG=y -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y -CONFIG_NETFILTER_XT_MATCH_COMMENT=y -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y -CONFIG_NETFILTER_XT_MATCH_CONNMARK=y -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y -CONFIG_NETFILTER_XT_MATCH_HELPER=y -CONFIG_NETFILTER_XT_MATCH_IPRANGE=y -CONFIG_NETFILTER_XT_MATCH_LENGTH=y -CONFIG_NETFILTER_XT_MATCH_LIMIT=y -CONFIG_NETFILTER_XT_MATCH_MAC=y -CONFIG_NETFILTER_XT_MATCH_MARK=y -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y -CONFIG_NETFILTER_XT_MATCH_POLICY=y -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y -CONFIG_NETFILTER_XT_MATCH_QTAGUID=y -CONFIG_NETFILTER_XT_MATCH_QUOTA=y -CONFIG_NETFILTER_XT_MATCH_SOCKET=y -CONFIG_NETFILTER_XT_MATCH_STATE=y -CONFIG_NETFILTER_XT_MATCH_STATISTIC=y -CONFIG_NETFILTER_XT_MATCH_STRING=y -CONFIG_NETFILTER_XT_MATCH_TIME=y -CONFIG_NETFILTER_XT_MATCH_U32=y -CONFIG_NF_CONNTRACK_IPV4=y -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_MATCH_AH=y -CONFIG_IP_NF_MATCH_ECN=y -CONFIG_IP_NF_MATCH_TTL=y -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_TARGET_REJECT=y -CONFIG_IP_NF_TARGET_LOG=y -CONFIG_NF_NAT=y -CONFIG_IP_NF_TARGET_MASQUERADE=y -CONFIG_IP_NF_TARGET_NETMAP=y -CONFIG_IP_NF_TARGET_REDIRECT=y -CONFIG_IP_NF_MANGLE=y -CONFIG_IP_NF_ARPTABLES=y -CONFIG_IP_NF_ARPFILTER=y -CONFIG_IP_NF_ARP_MANGLE=y -CONFIG_IP6_NF_IPTABLES=y -CONFIG_IP6_NF_FILTER=y -CONFIG_IP6_NF_MANGLE=y -CONFIG_NET_SCHED=y -CONFIG_NET_SCH_HTB=y -CONFIG_NET_SCH_PRIO=y -CONFIG_NET_SCH_SFQ=y -CONFIG_NET_SCH_TBF=y -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_INGRESS=y -CONFIG_NET_CLS_BASIC=y -CONFIG_NET_CLS_TCINDEX=y -CONFIG_NET_CLS_FW=y -CONFIG_NET_CLS_U32=y -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_FLOW=m -CONFIG_NET_EMATCH=y -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_MIRRED=y -CONFIG_BT=y -CONFIG_BT_L2CAP=y -CONFIG_BT_SCO=y -CONFIG_BT_RFCOMM=y -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=y -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=y -CONFIG_BT_HCIUART=y -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_IBS=y -CONFIG_MSM_BT_POWER=y -CONFIG_CFG80211=y -# CONFIG_CFG80211_WEXT is not set -# CONFIG_WIRELESS_EXT_SYSFS is not set -CONFIG_RFKILL=y -CONFIG_GENLOCK=y -CONFIG_GENLOCK_MISCDEVICE=y -CONFIG_MTD=y -CONFIG_MTD_TESTS=m -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=8 -CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_MISC_DEVICES=y -CONFIG_HAPTIC_ISA1200=y -CONFIG_PMIC8XXX_UPL=y -CONFIG_SCSI=y -CONFIG_SCSI_TGT=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_SCH=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_MD=y -CONFIG_BLK_DEV_DM=y -CONFIG_DM_CRYPT=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -CONFIG_SMSC911X=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_LIBRA_SDIOIF=m -CONFIG_SLIP=y -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_MODE_SLIP6=y -CONFIG_MSM_RMNET_SDIO=y -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=m -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_PMIC8XXX=y -# CONFIG_KEYBOARD_PMIC8058 is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_MSM=y -CONFIG_TOUCHSCREEN_TSC2007=y -CONFIG_TOUCHSCREEN_CY8C_TS=y -CONFIG_TOUCHSCREEN_CYTTSP_I2C=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y -CONFIG_INPUT_GPIO=y -CONFIG_BOSCH_BMA150=y -# CONFIG_SERIO is not set -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_MSM=y -CONFIG_SERIAL_MSM_HS=y -CONFIG_DIAG_CHAR=y -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_QUP=y -CONFIG_I2C_SSBI=y -CONFIG_SPI=y -CONFIG_SPI_QSD=y -CONFIG_DEBUG_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_POWER_SUPPLY=y -CONFIG_BATTERY_MSM=y -CONFIG_SENSORS_MSM_ADC=y -CONFIG_THERMAL=y -CONFIG_THERMAL_MSM_POPMEM=y -CONFIG_PMIC8058=y -CONFIG_MARIMBA_CORE=y -CONFIG_MARIMBA_CODEC=y -CONFIG_TIMPANI_CODEC=y -# CONFIG_MFD_PM8XXX_DEBUG is not set -# CONFIG_MFD_PM8XXX_PWM is not set -# CONFIG_MFD_PM8XXX_MISC is not set -CONFIG_MEDIA_SUPPORT=y -CONFIG_VIDEO_DEV=y -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_VIDEO_HELPER_CHIPS_AUTO=y -CONFIG_WEBCAM_OV9726=y -CONFIG_MT9E013=y -CONFIG_MSM_GEMINI=y -CONFIG_RADIO_TAVARUA=y -CONFIG_MSM_KGSL=y -CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_FB=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y -CONFIG_FB_MSM=y -# CONFIG_FB_MSM_BACKLIGHT is not set -CONFIG_FB_MSM_LOGO=y -CONFIG_FB_MSM_TRIPLE_BUFFER=y -CONFIG_FB_MSM_MDP40=y -CONFIG_FB_MSM_OVERLAY=y -CONFIG_FB_MSM_TRY_MDDI_CATCH_LCDC_PRISM=y -CONFIG_FB_MSM_HDMI_ADV7520_PANEL=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_BACKLIGHT_GENERIC is not set -CONFIG_SOUND=y -CONFIG_SND=y -# CONFIG_SND_DRIVERS is not set -# CONFIG_SND_ARM is not set -# CONFIG_SND_SPI is not set -CONFIG_SND_SOC=y -CONFIG_SND_MSM7KV2_SOC=y -CONFIG_SND_MVS_SOC=y -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_SUSPEND=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_EHSET=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y -# CONFIG_USB_EHCI_TT_NEWSCHED is not set -CONFIG_USB_EHCI_MSM_72K=y -CONFIG_USB_ACM=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y -CONFIG_USB_STORAGE_ONETOUCH=y -CONFIG_USB_STORAGE_KARMA=y -CONFIG_USB_STORAGE_CYPRESS_ATACB=y -CONFIG_USB_EHSET_TEST_FIXTURE=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MSM_72K=y -CONFIG_USB_G_ANDROID=y -CONFIG_RMNET_SMD_CTL_CHANNEL="DATA40_CNTL" -CONFIG_RMNET_SMD_DATA_CHANNEL="DATA40" -CONFIG_RMNET_SDIO_SMD_DATA_CHANNEL="" -CONFIG_USB_MSM_ACA=y -CONFIG_MMC=y -CONFIG_MMC_PERF_PROFILING=y -CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_MMC_CLKGATE=y -CONFIG_MMC_PARANOID_SD_INIT=y -CONFIG_MMC_BLOCK_MINORS=32 -# CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_MSM=y -CONFIG_MMC_MSM_SDIO_SUPPORT=y -CONFIG_MMC_MSM_CARD_HW_DETECTION=y -# CONFIG_MMC_MSM_SDC1_SUPPORT is not set -CONFIG_MMC_MSM_SDC2_8_BIT_SUPPORT=y -CONFIG_MMC_MSM_SDC3_SUPPORT=y -CONFIG_MMC_MSM_SDC4_SUPPORT=y -CONFIG_LEDS_PMIC8058=y -CONFIG_SWITCH=y -CONFIG_SWITCH_GPIO=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DEBUG=y -CONFIG_STAGING=y -CONFIG_ANDROID=y -CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_LOGGER=y -CONFIG_ANDROID_RAM_CONSOLE=y -CONFIG_ANDROID_TIMED_GPIO=y -CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_MSM_SSBI=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_EXT4_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_YAFFS_FS=y -CONFIG_YAFFS_DISABLE_TAGS_ECC=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -CONFIG_TIMER_STATS=y -# CONFIG_DEBUG_PREEMPT is not set -CONFIG_DEBUG_INFO=y -CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_USER=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_TWOFISH=y -CONFIG_CRYPTO_DEV_QCRYPTO=m -CONFIG_CRYPTO_DEV_QCE=m -CONFIG_CRYPTO_DEV_QCEDEV=m -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/msm7630_defconfig b/arch/arm/configs/msm7630_defconfig deleted file mode 100755 index 6e3290b95..000000000 --- a/arch/arm/configs/msm7630_defconfig +++ /dev/null @@ -1,372 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_CGROUPS=y -CONFIG_CGROUP_DEBUG=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_SCHED=y -CONFIG_RT_GROUP_SCHED=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_ASHMEM=y -CONFIG_EMBEDDED=y -CONFIG_SLAB=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=m -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -CONFIG_ARCH_MSM=y -CONFIG_ARCH_MSM7X30=y -# CONFIG_MSM_STACKED_MEMORY is not set -CONFIG_MSM_SMD=y -CONFIG_MSM_SMD_PKG3=y -CONFIG_MSM_SDIO_DMUX=y -CONFIG_MSM_SDIO_CMUX=y -CONFIG_MSM_SDIO_CTL=y -CONFIG_MSM_ONCRPCROUTER=y -CONFIG_MSM_RPC_WATCHDOG=y -CONFIG_MSM_RMT_STORAGE_CLIENT=y -# CONFIG_MSM_HW3D is not set -# CONFIG_QSD_AUDIO is not set -CONFIG_MSM_MEMORY_LOW_POWER_MODE=y -CONFIG_MSM_MEMORY_LOW_POWER_MODE_IDLE_RETENTION=y -CONFIG_MSM_MEMORY_LOW_POWER_MODE_SUSPEND_DEEP_POWER_DOWN=y -CONFIG_MSM_IDLE_WAIT_ON_MODEM=2000 -CONFIG_STRICT_MEMORY_RWX=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="init=/sbin/init root=/dev/ram rw initrd=0x11000000,16M console=ttyDCC0 mem=88M ip=dhcp" -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_VFP=y -CONFIG_NEON=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_WAKELOCK=y -CONFIG_PM_RUNTIME=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -CONFIG_IPV6=y -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=y -CONFIG_INET6_ESP=y -CONFIG_INET6_IPCOMP=y -CONFIG_IPV6_MIP6=y -CONFIG_IPV6_TUNNEL=y -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_NETFILTER=y -CONFIG_NF_CONNTRACK=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CT_PROTO_DCCP=y -CONFIG_NF_CT_PROTO_SCTP=y -CONFIG_NF_CT_PROTO_UDPLITE=y -CONFIG_NF_CONNTRACK_AMANDA=y -CONFIG_NF_CONNTRACK_FTP=y -CONFIG_NF_CONNTRACK_H323=y -CONFIG_NF_CONNTRACK_IRC=y -CONFIG_NF_CONNTRACK_NETBIOS_NS=y -CONFIG_NF_CONNTRACK_PPTP=y -CONFIG_NF_CONNTRACK_SANE=y -CONFIG_NF_CONNTRACK_SIP=y -CONFIG_NF_CONNTRACK_TFTP=y -CONFIG_NF_CT_NETLINK=y -CONFIG_NETFILTER_TPROXY=y -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y -CONFIG_NETFILTER_XT_TARGET_CONNMARK=y -CONFIG_NETFILTER_XT_TARGET_MARK=y -CONFIG_NETFILTER_XT_TARGET_NFLOG=y -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y -CONFIG_NETFILTER_XT_MATCH_COMMENT=y -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y -CONFIG_NETFILTER_XT_MATCH_CONNMARK=y -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y -CONFIG_NETFILTER_XT_MATCH_HELPER=y -CONFIG_NETFILTER_XT_MATCH_IPRANGE=y -CONFIG_NETFILTER_XT_MATCH_LENGTH=y -CONFIG_NETFILTER_XT_MATCH_LIMIT=y -CONFIG_NETFILTER_XT_MATCH_MAC=y -CONFIG_NETFILTER_XT_MATCH_MARK=y -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y -CONFIG_NETFILTER_XT_MATCH_POLICY=y -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y -CONFIG_NETFILTER_XT_MATCH_QTAGUID=y -CONFIG_NETFILTER_XT_MATCH_QUOTA=y -CONFIG_NETFILTER_XT_MATCH_SOCKET=y -CONFIG_NETFILTER_XT_MATCH_STATE=y -CONFIG_NETFILTER_XT_MATCH_STATISTIC=y -CONFIG_NETFILTER_XT_MATCH_STRING=y -CONFIG_NETFILTER_XT_MATCH_TIME=y -CONFIG_NETFILTER_XT_MATCH_U32=y -CONFIG_NF_CONNTRACK_IPV4=y -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_MATCH_AH=y -CONFIG_IP_NF_MATCH_ECN=y -CONFIG_IP_NF_MATCH_TTL=y -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_TARGET_REJECT=y -CONFIG_IP_NF_TARGET_LOG=y -CONFIG_NF_NAT=y -CONFIG_IP_NF_TARGET_MASQUERADE=y -CONFIG_IP_NF_TARGET_NETMAP=y -CONFIG_IP_NF_TARGET_REDIRECT=y -CONFIG_IP_NF_MANGLE=y -CONFIG_IP_NF_ARPTABLES=y -CONFIG_IP_NF_ARPFILTER=y -CONFIG_IP_NF_ARP_MANGLE=y -CONFIG_IP6_NF_IPTABLES=y -CONFIG_IP6_NF_FILTER=y -CONFIG_IP6_NF_MANGLE=y -CONFIG_NET_SCHED=y -CONFIG_NET_SCH_HTB=y -CONFIG_NET_SCH_PRIO=y -CONFIG_NET_SCH_SFQ=y -CONFIG_NET_SCH_TBF=y -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_INGRESS=y -CONFIG_NET_CLS_BASIC=y -CONFIG_NET_CLS_TCINDEX=y -CONFIG_NET_CLS_FW=y -CONFIG_NET_CLS_U32=y -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_FLOW=m -CONFIG_NET_EMATCH=y -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_MIRRED=y -CONFIG_BT=y -CONFIG_BT_L2CAP=y -CONFIG_BT_SCO=y -CONFIG_BT_RFCOMM=y -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=y -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=y -CONFIG_BT_HCIUART=y -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_IBS=y -CONFIG_MSM_BT_POWER=y -CONFIG_CFG80211=y -# CONFIG_CFG80211_WEXT is not set -# CONFIG_WIRELESS_EXT_SYSFS is not set -CONFIG_RFKILL=y -CONFIG_GENLOCK=y -CONFIG_GENLOCK_MISCDEVICE=y -CONFIG_MTD=y -CONFIG_MTD_TESTS=m -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=8 -CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_MISC_DEVICES=y -CONFIG_HAPTIC_ISA1200=y -CONFIG_PMIC8XXX_UPL=y -CONFIG_SCSI=y -CONFIG_SCSI_TGT=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_SCH=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_MD=y -CONFIG_BLK_DEV_DM=y -CONFIG_DM_CRYPT=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -CONFIG_SMSC911X=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_LIBRA_SDIOIF=m -CONFIG_SLIP=y -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_MODE_SLIP6=y -CONFIG_MSM_RMNET_SDIO=y -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=m -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_PMIC8XXX=y -# CONFIG_KEYBOARD_PMIC8058 is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_MSM=y -CONFIG_TOUCHSCREEN_TSC2007=y -CONFIG_TOUCHSCREEN_CY8C_TS=y -CONFIG_TOUCHSCREEN_CYTTSP_I2C=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y -CONFIG_INPUT_GPIO=y -CONFIG_BOSCH_BMA150=y -# CONFIG_SERIO is not set -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_MSM=y -CONFIG_SERIAL_MSM_HS=y -# CONFIG_HW_RANDOM is not set -CONFIG_DCC_TTY=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_QUP=y -CONFIG_I2C_SSBI=y -CONFIG_SPI=y -CONFIG_SPI_QSD=y -CONFIG_DEBUG_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_POWER_SUPPLY=y -CONFIG_BATTERY_MSM=y -CONFIG_SENSORS_MSM_ADC=y -CONFIG_THERMAL=y -CONFIG_THERMAL_MSM_POPMEM=y -CONFIG_PMIC8058=y -CONFIG_MARIMBA_CORE=y -CONFIG_MARIMBA_CODEC=y -CONFIG_TIMPANI_CODEC=y -# CONFIG_MFD_PM8XXX_DEBUG is not set -# CONFIG_MFD_PM8XXX_PWM is not set -# CONFIG_MFD_PM8XXX_MISC is not set -CONFIG_MSM_KGSL=y -CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_FB=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y -CONFIG_FB_MSM=y -# CONFIG_FB_MSM_BACKLIGHT is not set -CONFIG_FB_MSM_LOGO=y -CONFIG_FB_MSM_TRIPLE_BUFFER=y -CONFIG_FB_MSM_MDP40=y -CONFIG_FB_MSM_OVERLAY=y -CONFIG_FB_MSM_TRY_MDDI_CATCH_LCDC_PRISM=y -CONFIG_FB_MSM_HDMI_ADV7520_PANEL=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_BACKLIGHT_GENERIC is not set -CONFIG_SOUND=y -CONFIG_SND=y -# CONFIG_SND_DRIVERS is not set -# CONFIG_SND_ARM is not set -# CONFIG_SND_SPI is not set -CONFIG_SND_SOC=y -CONFIG_SND_MSM7KV2_SOC=y -CONFIG_SND_MVS_SOC=y -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_SUSPEND=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_EHSET=y -# CONFIG_USB_EHCI_TT_NEWSCHED is not set -CONFIG_USB_EHCI_MSM=y -CONFIG_USB_ACM=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y -CONFIG_USB_STORAGE_ONETOUCH=y -CONFIG_USB_STORAGE_KARMA=y -CONFIG_USB_STORAGE_CYPRESS_ATACB=y -CONFIG_USB_EHSET_TEST_FIXTURE=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MSM_72K=y -CONFIG_USB_MSM_ACA=y -CONFIG_MMC=y -CONFIG_MMC_PERF_PROFILING=y -CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_MMC_CLKGATE=y -CONFIG_MMC_PARANOID_SD_INIT=y -CONFIG_MMC_BLOCK_MINORS=32 -# CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_MSM=y -CONFIG_MMC_MSM_SDIO_SUPPORT=y -CONFIG_MMC_MSM_CARD_HW_DETECTION=y -# CONFIG_MMC_MSM_SDC1_SUPPORT is not set -CONFIG_MMC_MSM_SDC2_8_BIT_SUPPORT=y -CONFIG_MMC_MSM_SDC3_SUPPORT=y -CONFIG_MMC_MSM_SDC4_SUPPORT=y -CONFIG_SWITCH=y -CONFIG_SWITCH_GPIO=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DEBUG=y -CONFIG_STAGING=y -CONFIG_ANDROID=y -CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_LOGGER=y -CONFIG_ANDROID_RAM_CONSOLE=y -CONFIG_ANDROID_TIMED_GPIO=y -CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_MSM_SSBI=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_EXT4_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_YAFFS_FS=y -CONFIG_YAFFS_DISABLE_TAGS_ECC=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_LOCKUP_DETECTOR=y -CONFIG_DETECT_HUNG_TASK=y -CONFIG_SCHEDSTATS=y -CONFIG_TIMER_STATS=y -# CONFIG_DEBUG_PREEMPT is not set -CONFIG_PROVE_LOCKING=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -CONFIG_DEBUG_STACK_USAGE=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_LIST=y -CONFIG_DEBUG_PAGEALLOC=y -CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_USER=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_TWOFISH=y -CONFIG_CRYPTO_DEV_QCRYPTO=m -CONFIG_CRYPTO_DEV_QCE=m -CONFIG_CRYPTO_DEV_QCEDEV=m -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/msm8660-perf_defconfig b/arch/arm/configs/msm8660-perf_defconfig deleted file mode 100755 index bf01b409d..000000000 --- a/arch/arm/configs/msm8660-perf_defconfig +++ /dev/null @@ -1,441 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_LOCALVERSION="-perf" -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_CGROUPS=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_SCHED=y -CONFIG_RT_GROUP_SCHED=y -CONFIG_NAMESPACES=y -# CONFIG_UTS_NS is not set -# CONFIG_IPC_NS is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set -# CONFIG_NET_NS is not set -CONFIG_BLK_DEV_INITRD=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_PANIC_TIMEOUT=5 -CONFIG_ASHMEM=y -CONFIG_EMBEDDED=y -# CONFIG_SLUB_DEBUG is not set -CONFIG_PROFILING=y -CONFIG_OPROFILE=y -CONFIG_KPROBES=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_DEFAULT_DEADLINE=y -CONFIG_ARCH_MSM=y -CONFIG_ARCH_MSM8X60=y -CONFIG_MACH_MSM8X60_RUMI3=y -CONFIG_MACH_MSM8X60_SIM=y -CONFIG_MACH_MSM8X60_SURF=y -CONFIG_MACH_MSM8X60_FFA=y -CONFIG_MACH_MSM8X60_FLUID=y -CONFIG_MACH_MSM8X60_FUSION=y -CONFIG_MACH_MSM8X60_FUSN_FFA=y -CONFIG_MACH_MSM8X60_DRAGON=y -CONFIG_MSM7X00A_USE_DG_TIMER=y -CONFIG_MSM7X00A_SLEEP_MODE_POWER_COLLAPSE=y -CONFIG_MSM7X00A_IDLE_SLEEP_WAIT_FOR_INTERRUPT=y -# CONFIG_MSM_FIQ_SUPPORT is not set -# CONFIG_MSM_PROC_COMM is not set -CONFIG_MSM_SMD=y -CONFIG_MSM_SDIO_DMUX=y -# CONFIG_MSM_RESET_MODEM is not set -# CONFIG_MSM_SMD_NMEA is not set -CONFIG_MSM_SDIO_TTY=y -# CONFIG_MSM_SMD_QMI is not set -CONFIG_MSM_SDIO_CMUX=y -CONFIG_MSM_DSPS=y -CONFIG_MSM_SDIO_CTL=y -CONFIG_MSM_ONCRPCROUTER=y -# CONFIG_MSM_RPCSERVER_TIME_REMOTE is not set -# CONFIG_MSM_RPCSERVER_WATCHDOG is not set -# CONFIG_MSM_RPCSERVER_HANDSET is not set -CONFIG_MSM_RMT_STORAGE_CLIENT=y -CONFIG_MSM_SDIO_SMEM=y -# CONFIG_MSM_HW3D is not set -CONFIG_MSM_PIL_QDSP6V3=y -CONFIG_MSM_SUBSYSTEM_RESTART=y -CONFIG_MSM_RPM_LOG=y -CONFIG_MSM_RPM_STATS_LOG=y -CONFIG_MSM_WATCHDOG=y -CONFIG_MSM_DLOAD_MODE=y -# CONFIG_MSM_JTAG_V7 is not set -CONFIG_MSM_ETM=y -CONFIG_MSM_SLEEP_STATS=y -CONFIG_MSM_GSBI9_UART=y -CONFIG_STRICT_MEMORY_RWX=y -CONFIG_KSAPI=m -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_SMP=y -CONFIG_NR_CPUS=2 -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_HIGHMEM=y -CONFIG_VMALLOC_RESERVE=0x19000000 -CONFIG_CP_ACCESS=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_CPU_IDLE=y -CONFIG_VFP=y -CONFIG_NEON=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_WAKELOCK=y -CONFIG_PM_RUNTIME=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -CONFIG_IPV6=y -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=y -CONFIG_INET6_ESP=y -CONFIG_INET6_IPCOMP=y -CONFIG_IPV6_MIP6=y -CONFIG_IPV6_TUNNEL=y -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_NETFILTER=y -CONFIG_NF_CONNTRACK=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CT_PROTO_DCCP=y -CONFIG_NF_CT_PROTO_SCTP=y -CONFIG_NF_CT_PROTO_UDPLITE=y -CONFIG_NF_CONNTRACK_AMANDA=y -CONFIG_NF_CONNTRACK_FTP=y -CONFIG_NF_CONNTRACK_H323=y -CONFIG_NF_CONNTRACK_IRC=y -CONFIG_NF_CONNTRACK_NETBIOS_NS=y -CONFIG_NF_CONNTRACK_PPTP=y -CONFIG_NF_CONNTRACK_SANE=y -CONFIG_NF_CONNTRACK_SIP=y -CONFIG_NF_CONNTRACK_TFTP=y -CONFIG_NF_CT_NETLINK=y -CONFIG_NETFILTER_TPROXY=y -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y -CONFIG_NETFILTER_XT_TARGET_CONNMARK=y -CONFIG_NETFILTER_XT_TARGET_MARK=y -CONFIG_NETFILTER_XT_TARGET_NFLOG=y -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y -CONFIG_NETFILTER_XT_MATCH_COMMENT=y -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y -CONFIG_NETFILTER_XT_MATCH_CONNMARK=y -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y -CONFIG_NETFILTER_XT_MATCH_HELPER=y -CONFIG_NETFILTER_XT_MATCH_IPRANGE=y -CONFIG_NETFILTER_XT_MATCH_LENGTH=y -CONFIG_NETFILTER_XT_MATCH_LIMIT=y -CONFIG_NETFILTER_XT_MATCH_MAC=y -CONFIG_NETFILTER_XT_MATCH_MARK=y -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y -CONFIG_NETFILTER_XT_MATCH_POLICY=y -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y -CONFIG_NETFILTER_XT_MATCH_QTAGUID=y -CONFIG_NETFILTER_XT_MATCH_QUOTA=y -CONFIG_NETFILTER_XT_MATCH_SOCKET=y -CONFIG_NETFILTER_XT_MATCH_STATE=y -CONFIG_NETFILTER_XT_MATCH_STATISTIC=y -CONFIG_NETFILTER_XT_MATCH_STRING=y -CONFIG_NETFILTER_XT_MATCH_TIME=y -CONFIG_NETFILTER_XT_MATCH_U32=y -CONFIG_NF_CONNTRACK_IPV4=y -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_MATCH_AH=y -CONFIG_IP_NF_MATCH_ECN=y -CONFIG_IP_NF_MATCH_TTL=y -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_TARGET_REJECT=y -CONFIG_IP_NF_TARGET_LOG=y -CONFIG_NF_NAT=y -CONFIG_IP_NF_TARGET_MASQUERADE=y -CONFIG_IP_NF_TARGET_NETMAP=y -CONFIG_IP_NF_TARGET_REDIRECT=y -CONFIG_IP_NF_MANGLE=y -CONFIG_IP_NF_ARPTABLES=y -CONFIG_IP_NF_ARPFILTER=y -CONFIG_IP_NF_ARP_MANGLE=y -CONFIG_IP6_NF_IPTABLES=y -CONFIG_IP6_NF_FILTER=y -CONFIG_IP6_NF_MANGLE=y -CONFIG_NET_SCHED=y -CONFIG_NET_SCH_HTB=y -CONFIG_NET_SCH_PRIO=y -CONFIG_NET_SCH_SFQ=y -CONFIG_NET_SCH_TBF=y -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_INGRESS=y -CONFIG_NET_CLS_BASIC=y -CONFIG_NET_CLS_TCINDEX=y -CONFIG_NET_CLS_FW=y -CONFIG_NET_CLS_U32=y -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_FLOW=m -CONFIG_NET_EMATCH=y -CONFIG_NET_EMATCH_CMP=y -CONFIG_NET_EMATCH_NBYTE=y -CONFIG_NET_EMATCH_U32=y -CONFIG_NET_EMATCH_META=y -CONFIG_NET_EMATCH_TEXT=y -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_MIRRED=y -CONFIG_BT=y -CONFIG_BT_L2CAP=y -CONFIG_BT_SCO=y -CONFIG_BT_RFCOMM=y -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=y -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=y -CONFIG_BT_HCIUART=y -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_IBS=y -CONFIG_MSM_BT_POWER=y -CONFIG_CFG80211=y -# CONFIG_CFG80211_WEXT is not set -# CONFIG_WIRELESS_EXT_SYSFS is not set -CONFIG_RFKILL=y -CONFIG_GENLOCK=y -CONFIG_GENLOCK_MISCDEVICE=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_MISC_DEVICES=y -CONFIG_UID_STAT=y -CONFIG_TSIF=m -CONFIG_TSIF_CHRDEV=m -CONFIG_HAPTIC_ISA1200=y -CONFIG_PMIC8XXX_VIBRATOR=y -CONFIG_PMIC8XXX_UPL=y -CONFIG_PMIC8058_XOADC=y -CONFIG_TZCOM=y -CONFIG_SCSI=y -CONFIG_SCSI_TGT=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_SCH=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_MD=y -CONFIG_BLK_DEV_DM=y -CONFIG_DM_CRYPT=y -CONFIG_DM_UEVENT=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -CONFIG_SMC911X=y -CONFIG_SMSC911X=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_LIBRA_SDIOIF=m -CONFIG_PPP=y -CONFIG_PPP_ASYNC=y -CONFIG_PPP_DEFLATE=y -CONFIG_PPP_BSDCOMP=y -CONFIG_SLIP=y -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_MODE_SLIP6=y -CONFIG_MSM_RMNET_SDIO=y -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=m -CONFIG_INPUT_KEYRESET=y -CONFIG_KEYBOARD_GPIO=y -CONFIG_KEYBOARD_MATRIX=y -CONFIG_KEYBOARD_PMIC8XXX=y -# CONFIG_KEYBOARD_PMIC8058 is not set -CONFIG_INPUT_JOYSTICK=y -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ATMEL_MAXTOUCH=y -CONFIG_TOUCHSCREEN_CY8C_TS=y -CONFIG_TOUCHSCREEN_CYTTSP_I2C=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y -CONFIG_INPUT_PMIC8XXX_PWRKEY=y -CONFIG_PMIC8058_OTHC=y -CONFIG_SERIAL_MSM_HS=y -CONFIG_SERIAL_MSM_HSL=y -CONFIG_SERIAL_MSM_HSL_CONSOLE=y -CONFIG_DIAG_CHAR=y -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_MSM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -# CONFIG_I2C_MSM is not set -CONFIG_I2C_QUP=y -CONFIG_I2C_SSBI=y -CONFIG_SPI=y -CONFIG_SPI_QUP=y -CONFIG_SPI_SPIDEV=m -CONFIG_DEBUG_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_SX150X=y -# CONFIG_MPP_PMIC8901 is not set -CONFIG_POWER_SUPPLY=y -# CONFIG_BATTERY_MSM is not set -CONFIG_BATTERY_MSM8X60=y -CONFIG_PM8058_CHARGER=y -CONFIG_ISL9519_CHARGER=y -CONFIG_SMB137B_CHARGER=y -CONFIG_BATTERY_BQ27520=y -CONFIG_BATTERY_BQ27541=y -CONFIG_SENSORS_MSM_ADC=y -CONFIG_THERMAL=y -CONFIG_THERMAL_HWMON=y -CONFIG_THERMAL_TSENS=y -CONFIG_THERMAL_PM8XXX=y -CONFIG_PMIC8058=y -CONFIG_PMIC8901=y -CONFIG_MARIMBA_CORE=y -CONFIG_TIMPANI_CODEC=y -# CONFIG_MFD_PM8XXX_PWM is not set -CONFIG_MFD_PM8XXX_BATT_ALARM=y -CONFIG_REGULATOR_GPIO=y -CONFIG_MEDIA_SUPPORT=y -CONFIG_VIDEO_DEV=y -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_USB_VIDEO_CLASS=y -CONFIG_WEBCAM_OV9726=y -CONFIG_MT9E013=y -CONFIG_MSM_GEMINI=y -CONFIG_RADIO_TAVARUA=y -CONFIG_ION=y -CONFIG_ION_MSM=y -CONFIG_MSM_KGSL=y -CONFIG_KGSL_PER_PROCESS_PAGE_TABLE=y -CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_FB=y -CONFIG_FB_MSM=y -# CONFIG_FB_MSM_BACKLIGHT is not set -CONFIG_FB_MSM_TRIPLE_BUFFER=y -CONFIG_FB_MSM_MDP40=y -CONFIG_FB_MSM_OVERLAY=y -CONFIG_FB_MSM_OVERLAY0_WRITEBACK=y -CONFIG_FB_MSM_LCDC_MIPI_PANEL_AUTO_DETECT=y -CONFIG_FB_MSM_HDMI_MSM_PANEL=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_USB_AUDIO=y -CONFIG_SND_SOC=y -CONFIG_HID_APPLE=y -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_SUSPEND=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_EHSET=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y -# CONFIG_USB_EHCI_TT_NEWSCHED is not set -CONFIG_USB_EHCI_MSM_72K=y -CONFIG_USB_ACM=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y -CONFIG_USB_STORAGE_ONETOUCH=y -CONFIG_USB_STORAGE_KARMA=y -CONFIG_USB_STORAGE_CYPRESS_ATACB=y -CONFIG_USB_EHSET_TEST_FIXTURE=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MSM_72K=y -CONFIG_USB_G_ANDROID=y -CONFIG_RMNET_SMD_CTL_CHANNEL="DATA40_CNTL" -CONFIG_RMNET_SMD_DATA_CHANNEL="DATA40" -CONFIG_MMC=y -CONFIG_MMC_PERF_PROFILING=y -CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_MMC_CLKGATE=y -CONFIG_MMC_EMBEDDED_SDIO=y -CONFIG_MMC_PARANOID_SD_INIT=y -CONFIG_MMC_BLOCK_MINORS=32 -# CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_MSM=y -CONFIG_MMC_MSM_SDIO_SUPPORT=y -CONFIG_MMC_MSM_CARD_HW_DETECTION=y -CONFIG_MMC_MSM_SDC1_8_BIT_SUPPORT=y -CONFIG_MMC_MSM_SDC2_8_BIT_SUPPORT=y -CONFIG_MMC_MSM_SDC3_SUPPORT=y -CONFIG_MMC_MSM_SDC3_8_BIT_SUPPORT=y -CONFIG_MMC_MSM_SDC4_SUPPORT=y -CONFIG_MMC_MSM_SDC5_SUPPORT=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_PMIC8058=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_SLEEP=y -CONFIG_SWITCH=y -CONFIG_SWITCH_GPIO=y -CONFIG_RTC_CLASS=y -# CONFIG_RTC_DRV_MSM is not set -CONFIG_RTC_DRV_PM8XXX=y -CONFIG_STAGING=y -CONFIG_ANDROID=y -CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_LOGGER=y -CONFIG_ANDROID_RAM_CONSOLE=y -CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION=y -CONFIG_ANDROID_TIMED_GPIO=y -CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_MSM_SSBI=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_CIFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -CONFIG_TIMER_STATS=y -# CONFIG_DEBUG_PREEMPT is not set -CONFIG_DEBUG_INFO=y -CONFIG_ENABLE_DEFAULT_TRACERS=y -CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_USER=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_TWOFISH=y diff --git a/arch/arm/configs/msm8660_defconfig b/arch/arm/configs/msm8660_defconfig deleted file mode 100755 index 0472ad794..000000000 --- a/arch/arm/configs/msm8660_defconfig +++ /dev/null @@ -1,440 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_CGROUPS=y -CONFIG_CGROUP_DEBUG=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_SCHED=y -CONFIG_RT_GROUP_SCHED=y -CONFIG_NAMESPACES=y -# CONFIG_UTS_NS is not set -# CONFIG_IPC_NS is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set -# CONFIG_NET_NS is not set -CONFIG_BLK_DEV_INITRD=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_PANIC_TIMEOUT=5 -CONFIG_ASHMEM=y -CONFIG_EMBEDDED=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=m -CONFIG_KPROBES=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_DEFAULT_DEADLINE=y -CONFIG_ARCH_MSM=y -CONFIG_ARCH_MSM8X60=y -CONFIG_MACH_MSM8X60_RUMI3=y -CONFIG_MACH_MSM8X60_SIM=y -CONFIG_MACH_MSM8X60_SURF=y -CONFIG_MACH_MSM8X60_FFA=y -CONFIG_MACH_MSM8X60_FLUID=y -CONFIG_MACH_MSM8X60_DRAGON=y -CONFIG_MSM7X00A_USE_DG_TIMER=y -CONFIG_MSM7X00A_SLEEP_MODE_POWER_COLLAPSE=y -CONFIG_MSM7X00A_IDLE_SLEEP_WAIT_FOR_INTERRUPT=y -# CONFIG_MSM_FIQ_SUPPORT is not set -# CONFIG_MSM_PROC_COMM is not set -CONFIG_MSM_SMD=y -# CONFIG_MSM_RESET_MODEM is not set -# CONFIG_MSM_SMD_NMEA is not set -# CONFIG_MSM_SMD_QMI is not set -CONFIG_MSM_DSPS=y -CONFIG_MSM_ONCRPCROUTER=y -# CONFIG_MSM_RPCSERVER_TIME_REMOTE is not set -# CONFIG_MSM_RPCSERVER_WATCHDOG is not set -# CONFIG_MSM_RPCSERVER_HANDSET is not set -CONFIG_MSM_RMT_STORAGE_CLIENT=y -# CONFIG_MSM_HW3D is not set -CONFIG_MSM_PIL_QDSP6V3=y -CONFIG_MSM_SUBSYSTEM_RESTART=y -CONFIG_MSM_RPM_LOG=y -CONFIG_MSM_RPM_STATS_LOG=y -CONFIG_MSM_WATCHDOG=y -CONFIG_MSM_DLOAD_MODE=y -CONFIG_MSM_ETM=y -CONFIG_MSM_SLEEP_STATS=y -CONFIG_MSM_GSBI9_UART=y -CONFIG_STRICT_MEMORY_RWX=y -CONFIG_KSAPI=m -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_SMP=y -CONFIG_NR_CPUS=2 -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_HIGHMEM=y -CONFIG_VMALLOC_RESERVE=0x10000000 -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_CPU_IDLE=y -CONFIG_VFP=y -CONFIG_NEON=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_WAKELOCK=y -CONFIG_PM_RUNTIME=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -CONFIG_IPV6=y -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=y -CONFIG_INET6_ESP=y -CONFIG_INET6_IPCOMP=y -CONFIG_IPV6_MIP6=y -CONFIG_IPV6_TUNNEL=y -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_NETFILTER=y -CONFIG_NF_CONNTRACK=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CT_PROTO_DCCP=y -CONFIG_NF_CT_PROTO_SCTP=y -CONFIG_NF_CT_PROTO_UDPLITE=y -CONFIG_NF_CONNTRACK_AMANDA=y -CONFIG_NF_CONNTRACK_FTP=y -CONFIG_NF_CONNTRACK_H323=y -CONFIG_NF_CONNTRACK_IRC=y -CONFIG_NF_CONNTRACK_NETBIOS_NS=y -CONFIG_NF_CONNTRACK_PPTP=y -CONFIG_NF_CONNTRACK_SANE=y -CONFIG_NF_CONNTRACK_SIP=y -CONFIG_NF_CONNTRACK_TFTP=y -CONFIG_NF_CT_NETLINK=y -CONFIG_NETFILTER_TPROXY=y -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y -CONFIG_NETFILTER_XT_TARGET_CONNMARK=y -CONFIG_NETFILTER_XT_TARGET_MARK=y -CONFIG_NETFILTER_XT_TARGET_NFLOG=y -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y -CONFIG_NETFILTER_XT_MATCH_COMMENT=y -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y -CONFIG_NETFILTER_XT_MATCH_CONNMARK=y -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y -CONFIG_NETFILTER_XT_MATCH_HELPER=y -CONFIG_NETFILTER_XT_MATCH_IPRANGE=y -CONFIG_NETFILTER_XT_MATCH_LENGTH=y -CONFIG_NETFILTER_XT_MATCH_LIMIT=y -CONFIG_NETFILTER_XT_MATCH_MAC=y -CONFIG_NETFILTER_XT_MATCH_MARK=y -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y -CONFIG_NETFILTER_XT_MATCH_POLICY=y -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y -CONFIG_NETFILTER_XT_MATCH_QTAGUID=y -CONFIG_NETFILTER_XT_MATCH_QUOTA=y -CONFIG_NETFILTER_XT_MATCH_SOCKET=y -CONFIG_NETFILTER_XT_MATCH_STATE=y -CONFIG_NETFILTER_XT_MATCH_STATISTIC=y -CONFIG_NETFILTER_XT_MATCH_STRING=y -CONFIG_NETFILTER_XT_MATCH_TIME=y -CONFIG_NETFILTER_XT_MATCH_U32=y -CONFIG_NF_CONNTRACK_IPV4=y -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_MATCH_AH=y -CONFIG_IP_NF_MATCH_ECN=y -CONFIG_IP_NF_MATCH_TTL=y -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_TARGET_REJECT=y -CONFIG_IP_NF_TARGET_LOG=y -CONFIG_NF_NAT=y -CONFIG_IP_NF_TARGET_MASQUERADE=y -CONFIG_IP_NF_TARGET_NETMAP=y -CONFIG_IP_NF_TARGET_REDIRECT=y -CONFIG_IP_NF_MANGLE=y -CONFIG_IP_NF_ARPTABLES=y -CONFIG_IP_NF_ARPFILTER=y -CONFIG_IP_NF_ARP_MANGLE=y -CONFIG_IP6_NF_IPTABLES=y -CONFIG_IP6_NF_FILTER=y -CONFIG_IP6_NF_MANGLE=y -CONFIG_NET_SCHED=y -CONFIG_NET_SCH_HTB=y -CONFIG_NET_SCH_PRIO=y -CONFIG_NET_SCH_SFQ=y -CONFIG_NET_SCH_TBF=y -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_INGRESS=y -CONFIG_NET_CLS_BASIC=y -CONFIG_NET_CLS_TCINDEX=y -CONFIG_NET_CLS_FW=y -CONFIG_NET_CLS_U32=y -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_FLOW=m -CONFIG_NET_EMATCH=y -CONFIG_NET_EMATCH_CMP=y -CONFIG_NET_EMATCH_NBYTE=y -CONFIG_NET_EMATCH_U32=y -CONFIG_NET_EMATCH_META=y -CONFIG_NET_EMATCH_TEXT=y -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_MIRRED=y -CONFIG_BT=y -CONFIG_BT_L2CAP=y -CONFIG_BT_SCO=y -CONFIG_BT_RFCOMM=y -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=y -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=y -CONFIG_BT_HCIUART=y -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_IBS=y -CONFIG_MSM_BT_POWER=y -CONFIG_CFG80211=y -# CONFIG_CFG80211_WEXT is not set -# CONFIG_WIRELESS_EXT_SYSFS is not set -CONFIG_RFKILL=y -CONFIG_GENLOCK=y -CONFIG_GENLOCK_MISCDEVICE=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_MISC_DEVICES=y -CONFIG_UID_STAT=y -CONFIG_TSIF=m -CONFIG_TSIF_CHRDEV=m -CONFIG_HAPTIC_ISA1200=y -CONFIG_PMIC8XXX_VIBRATOR=y -CONFIG_PMIC8XXX_UPL=y -CONFIG_PMIC8058_XOADC=y -CONFIG_TZCOM=y -CONFIG_SCSI=y -CONFIG_SCSI_TGT=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_SCH=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_MD=y -CONFIG_BLK_DEV_DM=y -CONFIG_DM_DEBUG=y -CONFIG_DM_CRYPT=y -CONFIG_DM_UEVENT=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -CONFIG_SMC911X=y -CONFIG_SMSC911X=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_LIBRA_SDIOIF=m -CONFIG_PPP=y -CONFIG_PPP_ASYNC=y -CONFIG_PPP_DEFLATE=y -CONFIG_PPP_BSDCOMP=y -CONFIG_SLIP=y -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_MODE_SLIP6=y -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=m -CONFIG_INPUT_KEYRESET=y -CONFIG_KEYBOARD_GPIO=y -CONFIG_KEYBOARD_MATRIX=y -CONFIG_KEYBOARD_PMIC8XXX=y -# CONFIG_KEYBOARD_PMIC8058 is not set -CONFIG_INPUT_JOYSTICK=y -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ATMEL_MAXTOUCH=y -CONFIG_TOUCHSCREEN_CY8C_TS=y -CONFIG_TOUCHSCREEN_CYTTSP_I2C=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y -CONFIG_INPUT_PMIC8XXX_PWRKEY=y -CONFIG_PMIC8058_OTHC=y -CONFIG_SERIAL_MSM_HS=y -CONFIG_SERIAL_MSM_HSL=y -CONFIG_SERIAL_MSM_HSL_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_MSM=y -CONFIG_DCC_TTY=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -# CONFIG_I2C_MSM is not set -CONFIG_I2C_QUP=y -CONFIG_I2C_SSBI=y -CONFIG_SPI=y -CONFIG_SPI_QUP=y -CONFIG_SPI_SPIDEV=m -CONFIG_DEBUG_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_SX150X=y -# CONFIG_MPP_PMIC8901 is not set -CONFIG_POWER_SUPPLY=y -# CONFIG_BATTERY_MSM is not set -CONFIG_BATTERY_MSM8X60=y -CONFIG_PM8058_CHARGER=y -CONFIG_ISL9519_CHARGER=y -CONFIG_SMB137B_CHARGER=y -CONFIG_BATTERY_BQ27520=y -CONFIG_BATTERY_BQ27541=y -CONFIG_SENSORS_MSM_ADC=y -CONFIG_THERMAL=y -CONFIG_THERMAL_TSENS=y -CONFIG_THERMAL_PM8XXX=y -CONFIG_PMIC8058=y -CONFIG_PMIC8901=y -CONFIG_MARIMBA_CORE=y -CONFIG_TIMPANI_CODEC=y -# CONFIG_MFD_PM8XXX_PWM is not set -CONFIG_MFD_PM8XXX_BATT_ALARM=y -CONFIG_REGULATOR_GPIO=y -CONFIG_MEDIA_SUPPORT=y -CONFIG_VIDEO_DEV=y -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_USB_VIDEO_CLASS=y -CONFIG_WEBCAM_OV9726=y -CONFIG_MT9E013=y -CONFIG_MSM_GEMINI=y -CONFIG_RADIO_TAVARUA=y -CONFIG_MSM_KGSL=y -CONFIG_KGSL_PER_PROCESS_PAGE_TABLE=y -CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_FB=y -CONFIG_FB_MSM=y -# CONFIG_FB_MSM_BACKLIGHT is not set -CONFIG_FB_MSM_TRIPLE_BUFFER=y -CONFIG_FB_MSM_MDP40=y -CONFIG_FB_MSM_OVERLAY=y -CONFIG_FB_MSM_OVERLAY0_WRITEBACK=y -CONFIG_FB_MSM_LCDC_MIPI_PANEL_AUTO_DETECT=y -CONFIG_FB_MSM_HDMI_MSM_PANEL=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_USB_AUDIO=y -CONFIG_SND_SOC=y -CONFIG_MSM_8x60_VOIP=y -CONFIG_HID_APPLE=y -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_SUSPEND=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_EHSET=y -# CONFIG_USB_EHCI_TT_NEWSCHED is not set -CONFIG_USB_EHCI_MSM=y -CONFIG_USB_ACM=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y -CONFIG_USB_STORAGE_ONETOUCH=y -CONFIG_USB_STORAGE_KARMA=y -CONFIG_USB_STORAGE_CYPRESS_ATACB=y -CONFIG_USB_EHSET_TEST_FIXTURE=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MSM_72K=y -CONFIG_USB_MSM_ACA=y -CONFIG_MMC=y -CONFIG_MMC_PERF_PROFILING=y -CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_MMC_CLKGATE=y -CONFIG_MMC_EMBEDDED_SDIO=y -CONFIG_MMC_PARANOID_SD_INIT=y -CONFIG_MMC_BLOCK_MINORS=32 -# CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_MSM=y -CONFIG_MMC_MSM_SDIO_SUPPORT=y -CONFIG_MMC_MSM_CARD_HW_DETECTION=y -CONFIG_MMC_MSM_SDC1_8_BIT_SUPPORT=y -CONFIG_MMC_MSM_SDC2_8_BIT_SUPPORT=y -CONFIG_MMC_MSM_SDC3_SUPPORT=y -CONFIG_MMC_MSM_SDC3_8_BIT_SUPPORT=y -CONFIG_MMC_MSM_SDC4_SUPPORT=y -CONFIG_MMC_MSM_SDC5_SUPPORT=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_PMIC8058=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_SLEEP=y -CONFIG_SWITCH=y -CONFIG_SWITCH_GPIO=y -CONFIG_RTC_CLASS=y -# CONFIG_RTC_DRV_MSM is not set -CONFIG_RTC_DRV_PM8XXX=y -CONFIG_STAGING=y -CONFIG_ANDROID=y -CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_LOGGER=y -CONFIG_ANDROID_RAM_CONSOLE=y -CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION=y -CONFIG_ANDROID_TIMED_GPIO=y -CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_MSM_SSBI=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_CIFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_LOCKUP_DETECTOR=y -CONFIG_SCHEDSTATS=y -CONFIG_TIMER_STATS=y -CONFIG_SLUB_DEBUG_ON=y -# CONFIG_DEBUG_PREEMPT is not set -CONFIG_PROVE_LOCKING=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -CONFIG_DEBUG_STACK_USAGE=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_VM=y -CONFIG_DEBUG_MEMORY_INIT=y -CONFIG_DEBUG_LIST=y -CONFIG_DEBUG_SG=y -CONFIG_DEBUG_PAGEALLOC=y -CONFIG_ENABLE_DEFAULT_TRACERS=y -CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_TWOFISH=y -CONFIG_CRYPTO_DEV_QCRYPTO=m -CONFIG_CRYPTO_DEV_QCE=m -CONFIG_CRYPTO_DEV_QCEDEV=m diff --git a/arch/arm/configs/msm8960_defconfig b/arch/arm/configs/msm8960_defconfig deleted file mode 100755 index 748b8ca7d..000000000 --- a/arch/arm/configs/msm8960_defconfig +++ /dev/null @@ -1,429 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_CGROUPS=y -CONFIG_CGROUP_DEBUG=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_SCHED=y -# CONFIG_FAIR_GROUP_SCHED is not set -CONFIG_RT_GROUP_SCHED=y -CONFIG_NAMESPACES=y -# CONFIG_UTS_NS is not set -# CONFIG_IPC_NS is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set -# CONFIG_NET_NS is not set -CONFIG_BLK_DEV_INITRD=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_PANIC_TIMEOUT=5 -CONFIG_KALLSYMS_ALL=y -CONFIG_ASHMEM=y -CONFIG_EMBEDDED=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=y -CONFIG_KPROBES=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_ARCH_MSM=y -CONFIG_ARCH_MSM8960=y -CONFIG_ARCH_MSM8930=y -CONFIG_ARCH_APQ8064=y -CONFIG_MSM_KRAIT_TBB_ABORT_HANDLER=y -CONFIG_MACH_MSM8960_SIM=y -CONFIG_MACH_MSM8960_RUMI3=y -CONFIG_MACH_MSM8960_CDP=y -CONFIG_MACH_MSM8960_MTP=y -CONFIG_MACH_MSM8960_FLUID=y -CONFIG_MACH_MSM8960_LIQUID=y -CONFIG_MACH_MSM8930_CDP=y -CONFIG_MACH_MSM8930_MTP=y -CONFIG_MACH_MSM8930_FLUID=y -CONFIG_MACH_MSM8627_CDP=y -CONFIG_MACH_MSM8627_MTP=y -CONFIG_MACH_APQ8064_SIM=y -CONFIG_MACH_APQ8064_RUMI3=y -# CONFIG_MSM_STACKED_MEMORY is not set -CONFIG_KERNEL_PMEM_EBI_REGION=y -# CONFIG_MSM_FIQ_SUPPORT is not set -# CONFIG_MSM_PROC_COMM is not set -CONFIG_MSM_SMD=y -CONFIG_MSM_SMD_PKG4=y -CONFIG_MSM_BAM_DMUX=y -CONFIG_MSM_DSPS=y -CONFIG_MSM_IPC_ROUTER=y -CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y -# CONFIG_MSM_HW3D is not set -CONFIG_MSM_PIL_QDSP6V4=y -CONFIG_MSM_SUBSYSTEM_RESTART=y -CONFIG_MSM_MODEM_8960=y -CONFIG_MSM_LPASS_8960=y -CONFIG_MSM_WCNSS_SSR_8960=y -CONFIG_MSM_TZ_LOG=y -CONFIG_MSM_RPM_LOG=y -CONFIG_MSM_RPM_STATS_LOG=y -CONFIG_MSM_BUS_SCALING=y -CONFIG_MSM_BUS_RPM_MULTI_TIER_ENABLED=y -CONFIG_MSM_WATCHDOG=y -CONFIG_MSM_DLOAD_MODE=y -CONFIG_MSM_QDSS=y -CONFIG_MSM_SLEEP_STATS=y -CONFIG_STRICT_MEMORY_RWX=y -CONFIG_MSM_SHOW_RESUME_IRQ=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_SMP=y -# CONFIG_SMP_ON_UP is not set -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_HIGHMEM=y -CONFIG_VMALLOC_RESERVE=0x19000000 -CONFIG_CP_ACCESS=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_IDLE=y -CONFIG_VFP=y -CONFIG_NEON=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_WAKELOCK=y -CONFIG_PM_RUNTIME=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -CONFIG_IPV6=y -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=y -CONFIG_INET6_ESP=y -CONFIG_INET6_IPCOMP=y -CONFIG_IPV6_MIP6=y -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_NETFILTER=y -CONFIG_NETFILTER_NETLINK_LOG=y -CONFIG_NF_CONNTRACK=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CT_PROTO_DCCP=y -CONFIG_NF_CT_PROTO_SCTP=y -CONFIG_NF_CT_PROTO_UDPLITE=y -CONFIG_NF_CONNTRACK_AMANDA=y -CONFIG_NF_CONNTRACK_FTP=y -CONFIG_NF_CONNTRACK_H323=y -CONFIG_NF_CONNTRACK_IRC=y -CONFIG_NF_CONNTRACK_NETBIOS_NS=y -CONFIG_NF_CONNTRACK_PPTP=y -CONFIG_NF_CONNTRACK_SANE=y -CONFIG_NF_CONNTRACK_SIP=y -CONFIG_NF_CONNTRACK_TFTP=y -CONFIG_NF_CT_NETLINK=y -CONFIG_NETFILTER_TPROXY=y -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y -CONFIG_NETFILTER_XT_TARGET_CONNMARK=y -CONFIG_NETFILTER_XT_TARGET_MARK=y -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y -CONFIG_NETFILTER_XT_MATCH_COMMENT=y -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y -CONFIG_NETFILTER_XT_MATCH_CONNMARK=y -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y -CONFIG_NETFILTER_XT_MATCH_HELPER=y -CONFIG_NETFILTER_XT_MATCH_IPRANGE=y -CONFIG_NETFILTER_XT_MATCH_LENGTH=y -CONFIG_NETFILTER_XT_MATCH_LIMIT=y -CONFIG_NETFILTER_XT_MATCH_MAC=y -CONFIG_NETFILTER_XT_MATCH_MARK=y -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y -CONFIG_NETFILTER_XT_MATCH_POLICY=y -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y -CONFIG_NETFILTER_XT_MATCH_QTAGUID=y -CONFIG_NETFILTER_XT_MATCH_QUOTA=y -CONFIG_NETFILTER_XT_MATCH_SOCKET=y -CONFIG_NETFILTER_XT_MATCH_STATE=y -CONFIG_NETFILTER_XT_MATCH_STATISTIC=y -CONFIG_NETFILTER_XT_MATCH_STRING=y -CONFIG_NETFILTER_XT_MATCH_TIME=y -CONFIG_NETFILTER_XT_MATCH_U32=y -CONFIG_NF_CONNTRACK_IPV4=y -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_MATCH_AH=y -CONFIG_IP_NF_MATCH_ECN=y -CONFIG_IP_NF_MATCH_TTL=y -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_TARGET_REJECT=y -CONFIG_IP_NF_TARGET_LOG=y -CONFIG_NF_NAT=y -CONFIG_IP_NF_TARGET_MASQUERADE=y -CONFIG_IP_NF_TARGET_NETMAP=y -CONFIG_IP_NF_TARGET_REDIRECT=y -CONFIG_IP_NF_MANGLE=y -CONFIG_IP_NF_ARPTABLES=y -CONFIG_IP_NF_ARPFILTER=y -CONFIG_IP_NF_ARP_MANGLE=y -CONFIG_IP6_NF_IPTABLES=y -CONFIG_IP6_NF_FILTER=y -CONFIG_IP6_NF_MANGLE=y -CONFIG_NET_SCHED=y -CONFIG_NET_SCH_HTB=y -CONFIG_NET_CLS_U32=y -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_FLOW=y -CONFIG_NET_EMATCH=y -CONFIG_NET_EMATCH_CMP=y -CONFIG_NET_EMATCH_NBYTE=y -CONFIG_NET_EMATCH_U32=y -CONFIG_NET_EMATCH_META=y -CONFIG_NET_EMATCH_TEXT=y -CONFIG_NET_CLS_ACT=y -CONFIG_BT=y -CONFIG_BT_L2CAP=y -CONFIG_BT_SCO=y -CONFIG_BT_RFCOMM=y -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=y -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=y -CONFIG_BT_HCISMD=y -CONFIG_CFG80211=y -# CONFIG_CFG80211_WEXT is not set -CONFIG_RFKILL=y -CONFIG_GENLOCK=y -CONFIG_GENLOCK_MISCDEVICE=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_HAPTIC_ISA1200=y -CONFIG_PMIC8XXX_VIBRATOR=y -CONFIG_TZCOM=y -CONFIG_SCSI=y -CONFIG_SCSI_TGT=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_SCH=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_MD=y -CONFIG_BLK_DEV_DM=y -CONFIG_DM_CRYPT=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -CONFIG_SMC911X=y -CONFIG_SMSC911X=y -CONFIG_KS8851=m -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_WCNSS_CORE=y -CONFIG_USB_USBNET=y -CONFIG_SLIP=y -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_MODE_SLIP6=y -# CONFIG_MSM_RMNET is not set -CONFIG_MSM_RMNET_BAM=y -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=m -CONFIG_KEYBOARD_PMIC8XXX=y -CONFIG_INPUT_JOYSTICK=y -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ATMEL_MXT=y -CONFIG_TOUCHSCREEN_CYTTSP_I2C=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y -CONFIG_INPUT_PMIC8XXX_PWRKEY=y -CONFIG_SERIAL_MSM=y -CONFIG_SERIAL_MSM_HS=y -# CONFIG_SERIAL_MSM_CLOCK_CONTROL is not set -CONFIG_SERIAL_MSM_HSL=y -CONFIG_SERIAL_MSM_HSL_CONSOLE=y -CONFIG_DIAG_CHAR=y -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_MSM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -# CONFIG_I2C_MSM is not set -CONFIG_I2C_QUP=y -CONFIG_SPI=y -CONFIG_SPI_QUP=y -CONFIG_SPI_SPIDEV=m -CONFIG_SLIMBUS_MSM_CTRL=y -CONFIG_DEBUG_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_SX150X=y -CONFIG_POWER_SUPPLY=y -# CONFIG_BATTERY_MSM is not set -CONFIG_ISL9519_CHARGER=y -CONFIG_PM8921_CHARGER=y -CONFIG_PM8921_BMS=y -CONFIG_SENSORS_PM8XXX_ADC=y -CONFIG_THERMAL=y -CONFIG_THERMAL_TSENS8960=y -CONFIG_THERMAL_PM8XXX=y -CONFIG_MFD_PM8921_CORE=y -CONFIG_MFD_PM8821_CORE=y -CONFIG_MFD_PM8038_CORE=y -CONFIG_MFD_PM8XXX_BATT_ALARM=y -CONFIG_WCD9310_CODEC=y -CONFIG_REGULATOR_GPIO=y -CONFIG_MEDIA_SUPPORT=y -CONFIG_VIDEO_DEV=y -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_VIDEO_HELPER_CHIPS_AUTO=y -CONFIG_USB_VIDEO_CLASS=y -CONFIG_MSM_CAMERA_V4L2=y -CONFIG_MSM_CAMERA_FLASH_SC628A=y -CONFIG_MSM_CAMERA_SENSOR=y -CONFIG_MSM_ACTUATOR=y -CONFIG_MSM_GEMINI=y -CONFIG_MT9M114=y -CONFIG_RADIO_IRIS=y -CONFIG_RADIO_IRIS_TRANSPORT=m -CONFIG_ION=y -CONFIG_ION_MSM=y -CONFIG_MSM_KGSL=y -CONFIG_KGSL_PER_PROCESS_PAGE_TABLE=y -CONFIG_FB=y -CONFIG_FB_VIRTUAL=y -CONFIG_FB_MSM=y -# CONFIG_FB_MSM_BACKLIGHT is not set -CONFIG_FB_MSM_TRIPLE_BUFFER=y -CONFIG_FB_MSM_MDP40=y -CONFIG_FB_MSM_OVERLAY=y -CONFIG_FB_MSM_OVERLAY0_WRITEBACK=y -CONFIG_FB_MSM_MIPI_PANEL_DETECT=y -CONFIG_FB_MSM_HDMI_MSM_PANEL=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_DYNAMIC_MINORS=y -# CONFIG_SND_ARM is not set -# CONFIG_SND_SPI is not set -CONFIG_SND_USB_AUDIO=y -CONFIG_SND_SOC=y -CONFIG_SND_SOC_MSM8960=y -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_SUSPEND=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_EHSET=y -CONFIG_USB_EHCI_MSM=y -CONFIG_USB_EHCI_MSM_HSIC=y -CONFIG_USB_ACM=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DEBUG=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y -CONFIG_USB_STORAGE_ONETOUCH=y -CONFIG_USB_STORAGE_KARMA=y -CONFIG_USB_STORAGE_CYPRESS_ATACB=y -CONFIG_USB_SERIAL=y -CONFIG_USB_SERIAL_QUALCOMM=y -CONFIG_USB_EHSET_TEST_FIXTURE=y -CONFIG_USB_QCOM_DIAG_BRIDGE=y -CONFIG_USB_QCOM_MDM_BRIDGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_DEBUG_FILES=y -CONFIG_USB_GADGET_CI13XXX_MSM=y -CONFIG_USB_G_ANDROID=y -CONFIG_USB_ANDROID_RMNET_CTRL_SMD=y -CONFIG_MMC=y -CONFIG_MMC_PERF_PROFILING=y -CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_MMC_CLKGATE=y -CONFIG_MMC_PARANOID_SD_INIT=y -CONFIG_MMC_BLOCK_MINORS=32 -# CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_MSM=y -CONFIG_MMC_MSM_CARD_HW_DETECTION=y -CONFIG_MMC_MSM_SDC1_8_BIT_SUPPORT=y -# CONFIG_MMC_MSM_SDC2_SUPPORT is not set -CONFIG_MMC_MSM_SDC3_SUPPORT=y -CONFIG_MMC_MSM_SDC3_WP_SUPPORT=y -CONFIG_MMC_MSM_SPS_SUPPORT=y -CONFIG_LEDS_PM8XXX=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_SWITCH=y -CONFIG_RTC_CLASS=y -# CONFIG_RTC_DRV_MSM is not set -CONFIG_RTC_DRV_PM8XXX=y -CONFIG_STAGING=y -CONFIG_ANDROID=y -CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_LOGGER=y -CONFIG_ANDROID_RAM_CONSOLE=y -CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION=y -CONFIG_ANDROID_TIMED_GPIO=y -CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_MSM_SSBI=y -CONFIG_SPS=y -CONFIG_SPS_SUPPORT_BAMDMA=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_EXT4_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_CIFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_EFI_PARTITION=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_LOCKUP_DETECTOR=y -# CONFIG_SCHED_DEBUG is not set -CONFIG_TIMER_STATS=y -CONFIG_SLUB_DEBUG_ON=y -# CONFIG_DEBUG_PREEMPT is not set -CONFIG_DEBUG_SPINLOCK=y -CONFIG_DEBUG_MUTEXES=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_MEMORY_INIT=y -CONFIG_DEBUG_LIST=y -CONFIG_DEBUG_PAGEALLOC=y -CONFIG_ENABLE_DEFAULT_TRACERS=y -CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_USER=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_TWOFISH=y -CONFIG_CRYPTO_DEV_QCRYPTO=m -CONFIG_CRYPTO_DEV_QCE=m -CONFIG_CRYPTO_DEV_QCEDEV=m -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/msm9615_defconfig b/arch/arm/configs/msm9615_defconfig deleted file mode 100755 index b5aa1b455..000000000 --- a/arch/arm/configs/msm9615_defconfig +++ /dev/null @@ -1,228 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_CGROUPS=y -CONFIG_CGROUP_DEBUG=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_SCHED=y -# CONFIG_FAIR_GROUP_SCHED is not set -CONFIG_RT_GROUP_SCHED=y -CONFIG_NAMESPACES=y -# CONFIG_UTS_NS is not set -# CONFIG_IPC_NS is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set -CONFIG_RELAY=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_PANIC_TIMEOUT=5 -CONFIG_KALLSYMS_ALL=y -CONFIG_EMBEDDED=y -# CONFIG_PERF_EVENTS is not set -CONFIG_PROFILING=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_ARCH_MSM=y -CONFIG_ARCH_MSM9615=y -CONFIG_MACH_MSM9615_CDP=y -CONFIG_MACH_MSM9615_MTP=y -# CONFIG_MSM_STACKED_MEMORY is not set -CONFIG_CPU_HAS_L2_PMU=y -# CONFIG_MSM_FIQ_SUPPORT is not set -# CONFIG_MSM_PROC_COMM is not set -CONFIG_MSM_SMD=y -CONFIG_MSM_SMD_PKG4=y -CONFIG_MSM_BAM_DMUX=y -# CONFIG_MSM_RESET_MODEM is not set -CONFIG_MSM_IPC_ROUTER=y -CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y -CONFIG_MSM_SUBSYSTEM_RESTART=y -# CONFIG_MSM_SYSMON_COMM is not set -CONFIG_MSM_MODEM_8960=y -CONFIG_MSM_LPASS_8960=y -CONFIG_MSM_DIRECT_SCLK_ACCESS=y -CONFIG_MSM_BUS_SCALING=y -CONFIG_MSM_BUS_RPM_MULTI_TIER_ENABLED=y -CONFIG_MSM_WATCHDOG=y -CONFIG_MSM_DLOAD_MODE=y -# CONFIG_MSM_JTAG_V7 is not set -CONFIG_SWP_EMULATE=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_HIGHMEM=y -CONFIG_VMALLOC_RESERVE=0x19000000 -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_CPU_IDLE=y -CONFIG_VFP=y -CONFIG_NEON=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -CONFIG_IPV6=y -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_IPV6_SIT is not set -# CONFIG_ANDROID_PARANOID_NETWORK is not set -CONFIG_CFG80211=y -CONFIG_MTD=y -CONFIG_MTD_TESTS=m -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_MISC_DEVICES=y -# CONFIG_ANDROID_PMEM is not set -CONFIG_SCSI=y -CONFIG_SCSI_TGT=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_SCH=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_NETDEVICES=y -CONFIG_HOSTAP=y -# CONFIG_MSM_RMNET is not set -CONFIG_MSM_RMNET_BAM=y -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=m -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y -CONFIG_INPUT_PMIC8XXX_PWRKEY=y -CONFIG_SERIO_LIBPS2=y -CONFIG_SERIAL_MSM=y -CONFIG_SERIAL_MSM_CONSOLE=y -# CONFIG_SERIAL_MSM_CLOCK_CONTROL is not set -CONFIG_SERIAL_MSM_HSL=y -CONFIG_SERIAL_MSM_HSL_CONSOLE=y -CONFIG_DIAG_CHAR=y -CONFIG_HVC_DCC=y -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_MSM=y -CONFIG_DCC_TTY=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -# CONFIG_I2C_MSM is not set -CONFIG_I2C_QUP=y -CONFIG_SPI=y -CONFIG_SPI_QUP=y -CONFIG_SPI_SPIDEV=m -CONFIG_DEBUG_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_SENSORS_PM8XXX_ADC=y -CONFIG_THERMAL=y -CONFIG_THERMAL_TSENS8960=y -CONFIG_MFD_PM8018_CORE=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_GPIO=y -# CONFIG_HID_SUPPORT is not set -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_EHSET=y -CONFIG_USB_EHCI_MSM=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DEBUG=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y -CONFIG_USB_STORAGE_ONETOUCH=y -CONFIG_USB_STORAGE_KARMA=y -CONFIG_USB_STORAGE_CYPRESS_ATACB=y -CONFIG_USB_EHSET_TEST_FIXTURE=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_CI13XXX_MSM=y -CONFIG_USB_G_ANDROID=y -CONFIG_RMNET_SMD_CTL_CHANNEL="DATA36_CNTL" -CONFIG_RMNET_SMD_DATA_CHANNEL="DATA36" -CONFIG_MMC=y -CONFIG_MMC_PERF_PROFILING=y -CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_MMC_EMBEDDED_SDIO=y -CONFIG_MMC_PARANOID_SD_INIT=y -CONFIG_MMC_BLOCK_MINORS=32 -# CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_MSM=y -CONFIG_MMC_MSM_SDIO_SUPPORT=y -CONFIG_MMC_MSM_CARD_HW_DETECTION=y -CONFIG_MMC_MSM_SPS_SUPPORT=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_PM8XXX=y -CONFIG_SWITCH=y -CONFIG_RTC_CLASS=y -# CONFIG_RTC_INTF_ALARM is not set -# CONFIG_RTC_DRV_MSM is not set -CONFIG_RTC_DRV_PM8XXX=y -CONFIG_MSM_SSBI=y -CONFIG_SPS=y -CONFIG_SPS_SUPPORT_BAMDMA=y -CONFIG_USB_BAM=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_YAFFS_FS=y -CONFIG_YAFFS_DISABLE_TAGS_ECC=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_EFI_PARTITION=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -CONFIG_TIMER_STATS=y -# CONFIG_DEBUG_PREEMPT is not set -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_MEMORY_INIT=y -CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_USER=y -CONFIG_KEYS=y -CONFIG_CRYPTO_AUTHENC=y -CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_MD4=y -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_DES=y -CONFIG_CRYPTO_TWOFISH=y -CONFIG_CRYPTO_DEFLATE=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_DEV_QCRYPTO=m -CONFIG_CRYPTO_DEV_QCE=m -CONFIG_CRYPTO_DEV_QCEDEV=m -CONFIG_CRC_CCITT=y -CONFIG_LIBCRC32C=y diff --git a/arch/arm/configs/msm_defconfig b/arch/arm/configs/msm_defconfig deleted file mode 100755 index 2b8f7affc..000000000 --- a/arch/arm/configs/msm_defconfig +++ /dev/null @@ -1,72 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_MSM=y -CONFIG_MACH_HALIBUT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=64M console=ttyMSM,115200n8" -CONFIG_PM=y -CONFIG_NET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -CONFIG_PPP=y -CONFIG_PPP_ASYNC=y -CONFIG_PPP_DEFLATE=y -CONFIG_PPP_BSDCOMP=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_INPUT_MISC=y -# CONFIG_SERIO is not set -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_SERIAL_MSM=y -CONFIG_SERIAL_MSM_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -# CONFIG_HWMON is not set -CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_FB=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y -CONFIG_FB_MSM=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_INOTIFY=y -CONFIG_TMPFS=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_SCHEDSTATS=y -CONFIG_DEBUG_MUTEXES=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/mv78xx0_defconfig b/arch/arm/configs/mv78xx0_defconfig deleted file mode 100755 index 7305ebddb..000000000 --- a/arch/arm/configs/mv78xx0_defconfig +++ /dev/null @@ -1,140 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_EXPERT=y -CONFIG_KALLSYMS_ALL=y -# CONFIG_SLUB_DEBUG is not set -CONFIG_PROFILING=y -CONFIG_OPROFILE=y -CONFIG_KPROBES=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_MV78XX0=y -CONFIG_MACH_DB78X00_BP=y -CONFIG_MACH_RD78X00_MASA=y -CONFIG_MACH_TERASTATION_WXL=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_HIGHMEM=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_FPE_NWFPE=y -CONFIG_VFP=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_IPV6 is not set -CONFIG_NET_PKTGEN=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y -CONFIG_MTD_NAND_ORION=y -CONFIG_BLK_DEV_LOOP=y -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=y -CONFIG_BLK_DEV_SR=m -CONFIG_CHR_DEV_SG=m -CONFIG_ATA=y -CONFIG_SATA_MV=y -CONFIG_NETDEVICES=y -CONFIG_MARVELL_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -CONFIG_NET_PCI=y -CONFIG_MV643XX_ETH=y -# CONFIG_NETDEV_10000 is not set -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -# CONFIG_VT is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -# CONFIG_SERIAL_8250_PCI is not set -CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -CONFIG_LEGACY_PTY_COUNT=16 -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MV64XXX=y -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -CONFIG_USB_PRINTER=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_DS1307=y -CONFIG_RTC_DRV_RS5C372=y -CONFIG_RTC_DRV_M41T80=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_XATTR is not set -CONFIG_EXT4_FS=m -CONFIG_INOTIFY=y -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_UDF_FS=m -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_BSD_DISKLABEL=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_SCHEDSTATS=y -# CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_PCBC=m -# CONFIG_CRYPTO_ANSI_CPRNG is not set diff --git a/arch/arm/configs/mx1_defconfig b/arch/arm/configs/mx1_defconfig deleted file mode 100755 index c9436d0bf..000000000 --- a/arch/arm/configs/mx1_defconfig +++ /dev/null @@ -1,91 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_EXPERT=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_MXC=y -CONFIG_ARCH_MX1=y -CONFIG_ARCH_MX1ADS=y -CONFIG_MACH_SCB9328=y -CONFIG_MACH_APF9328=y -CONFIG_MXC_IRQ_PRIOR=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/mtdblock2 rw ip=off" -CONFIG_PM=y -CONFIG_PM_DEBUG=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_FW_LOADER=m -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_PHYSMAP=y -# CONFIG_BLK_DEV is not set -# CONFIG_MISC_DEVICES is not set -CONFIG_NETDEVICES=y -CONFIG_PHYLIB=y -CONFIG_SMSC_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_DM9000=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_INPUT is not set -# CONFIG_SERIO is not set -# CONFIG_VT is not set -CONFIG_SERIAL_IMX=y -CONFIG_SERIAL_IMX_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_IMX=y -CONFIG_W1=y -CONFIG_W1_MASTER_MXC=y -CONFIG_W1_SLAVE_THERM=y -# CONFIG_HWMON is not set -CONFIG_FB=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_IMX=y -CONFIG_USB_ETH=m -CONFIG_MMC=y -CONFIG_MMC_MXC=y -# CONFIG_DNOTIFY is not set -CONFIG_INOTIFY=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set diff --git a/arch/arm/configs/mx21_defconfig b/arch/arm/configs/mx21_defconfig deleted file mode 100755 index 411f88dd4..000000000 --- a/arch/arm/configs/mx21_defconfig +++ /dev/null @@ -1,97 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_EXPERT=y -CONFIG_KALLSYMS_EXTRA_PASS=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_MXC=y -CONFIG_ARCH_MX2=y -CONFIG_MACH_MX21ADS=y -CONFIG_MXC_PWM=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_NET=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FW_LOADER is not set -CONFIG_MTD=y -CONFIG_MTD_DEBUG=y -CONFIG_MTD_DEBUG_VERBOSE=3 -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_MXC=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -# CONFIG_SERIO is not set -# CONFIG_CONSOLE_TRANSLATIONS is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=1 -CONFIG_SERIAL_IMX=y -CONFIG_SERIAL_IMX_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_IMX=y -CONFIG_SPI=y -# CONFIG_HWMON is not set -CONFIG_FB=y -CONFIG_FB_IMX=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_LOGO=y -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_MMC=y -CONFIG_MMC_MXC=y -# CONFIG_DNOTIFY is not set -CONFIG_MSDOS_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set diff --git a/arch/arm/configs/mx27_defconfig b/arch/arm/configs/mx27_defconfig deleted file mode 100755 index 9ad4c656c..000000000 --- a/arch/arm/configs/mx27_defconfig +++ /dev/null @@ -1,130 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_EXPERT=y -CONFIG_KALLSYMS_EXTRA_PASS=y -# CONFIG_COMPAT_BRK is not set -CONFIG_SLAB=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=y -CONFIG_KPROBES=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_MXC=y -CONFIG_ARCH_MX2=y -CONFIG_MACH_MX27=y -CONFIG_MACH_MX27ADS=y -CONFIG_MACH_PCM038=y -CONFIG_MACH_CPUIMX27=y -CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2=y -CONFIG_MACH_EUKREA_CPUIMX27_USEUART4=y -CONFIG_MACH_MX27_3DS=y -CONFIG_MACH_IMX27_VISSTRIM_M10=y -CONFIG_MACH_IMX27LITE=y -CONFIG_MACH_PCA100=y -CONFIG_MACH_MXT_TD60=y -CONFIG_MXC_IRQ_PRIOR=y -CONFIG_MXC_PWM=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_FPE_NWFPE=y -CONFIG_FPE_NWFPE_XP=y -CONFIG_PM=y -CONFIG_PM_DEBUG=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set -# CONFIG_MTD_CFI_I2 is not set -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_MXC=y -CONFIG_MTD_UBI=y -CONFIG_EEPROM_AT24=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_FEC=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=m -# CONFIG_SERIO is not set -CONFIG_SERIAL_8250=m -CONFIG_SERIAL_IMX=y -CONFIG_SERIAL_IMX_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_IMX=y -CONFIG_SPI=y -CONFIG_SPI_IMX=y -CONFIG_W1=y -CONFIG_W1_MASTER_MXC=y -CONFIG_W1_SLAVE_THERM=y -# CONFIG_HWMON is not set -CONFIG_FB=y -CONFIG_FB_IMX=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -# CONFIG_HID_SUPPORT is not set -CONFIG_USB=m -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_ULPI=y -CONFIG_MMC=y -CONFIG_MMC_MXC=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_PCF8563=y -# CONFIG_DNOTIFY is not set -# CONFIG_PROC_PAGE_MONITOR is not set -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_UBIFS_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_NLS=y -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_15=m -CONFIG_DEBUG_FS=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set diff --git a/arch/arm/configs/mx3_defconfig b/arch/arm/configs/mx3_defconfig deleted file mode 100755 index 7c4b30b34..000000000 --- a/arch/arm/configs/mx3_defconfig +++ /dev/null @@ -1,124 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_EXPERT=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_MXC=y -CONFIG_MACH_MX31ADS_WM1133_EV1=y -CONFIG_MACH_PCM037=y -CONFIG_MACH_PCM037_EET=y -CONFIG_MACH_MX31LITE=y -CONFIG_MACH_MX31_3DS=y -CONFIG_MACH_MX31MOBOARD=y -CONFIG_MACH_MX31LILLY=y -CONFIG_MACH_QONG=y -CONFIG_MACH_PCM043=y -CONFIG_MACH_ARMADILLO5X0=y -CONFIG_MACH_MX35_3DS=y -CONFIG_MACH_KZM_ARM11_01=y -CONFIG_MACH_EUKREA_CPUIMX35=y -CONFIG_MXC_IRQ_PRIOR=y -CONFIG_MXC_PWM=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/mtdblock2 rw ip=off" -CONFIG_VFP=y -CONFIG_PM=y -CONFIG_PM_DEBUG=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_FW_LOADER=m -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_MXC=y -CONFIG_MTD_UBI=y -# CONFIG_BLK_DEV is not set -CONFIG_EEPROM_AT24=y -CONFIG_NETDEVICES=y -CONFIG_SMSC_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_SMSC911X=y -CONFIG_DNET=y -CONFIG_FEC=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_INPUT is not set -# CONFIG_SERIO is not set -# CONFIG_VT is not set -CONFIG_SERIAL_8250=m -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_IMX=y -CONFIG_SERIAL_IMX_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_IMX=y -CONFIG_SPI=y -CONFIG_W1=y -CONFIG_W1_MASTER_MXC=y -CONFIG_W1_SLAVE_THERM=y -# CONFIG_HWMON is not set -CONFIG_MFD_WM8350_I2C=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_WM8350=y -CONFIG_MEDIA_SUPPORT=y -CONFIG_VIDEO_DEV=y -# CONFIG_VIDEO_ALLOW_V4L1 is not set -CONFIG_SOC_CAMERA=y -CONFIG_SOC_CAMERA_MT9M001=y -CONFIG_SOC_CAMERA_MT9M111=y -CONFIG_SOC_CAMERA_MT9T031=y -CONFIG_SOC_CAMERA_MT9V022=y -CONFIG_SOC_CAMERA_TW9910=y -CONFIG_SOC_CAMERA_OV772X=y -CONFIG_VIDEO_MX3=y -# CONFIG_RADIO_ADAPTERS is not set -CONFIG_FB=y -# CONFIG_USB_SUPPORT is not set -CONFIG_MMC=y -CONFIG_MMC_MXC=y -CONFIG_DMADEVICES=y -# CONFIG_DNOTIFY is not set -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_UBIFS_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set diff --git a/arch/arm/configs/mx51_defconfig b/arch/arm/configs/mx51_defconfig deleted file mode 100755 index 0ace16cba..000000000 --- a/arch/arm/configs/mx51_defconfig +++ /dev/null @@ -1,169 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=18 -CONFIG_RELAY=y -CONFIG_EXPERT=y -# CONFIG_SLUB_DEBUG is not set -# CONFIG_COMPAT_BRK is not set -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_MODULE_SRCVERSION_ALL=y -# CONFIG_LBDAF is not set -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_MXC=y -CONFIG_ARCH_MX51=y -CONFIG_MACH_MX51_BABBAGE=y -CONFIG_MACH_MX51_3DS=y -CONFIG_MACH_EUKREA_CPUIMX51=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT_VOLUNTARY=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 -CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/nfs nfsroot=192.168.0.101:/shared/nfs ip=dhcp" -CONFIG_VFP=y -CONFIG_NEON=y -CONFIG_BINFMT_MISC=m -CONFIG_PM=y -CONFIG_PM_DEBUG=y -CONFIG_PM_TEST_SUSPEND=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -# CONFIG_WIRELESS is not set -# CONFIG_STANDALONE is not set -CONFIG_CONNECTOR=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=65536 -# CONFIG_MISC_DEVICES is not set -CONFIG_SCSI=y -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_ATA=m -CONFIG_NETDEVICES=y -CONFIG_MARVELL_PHY=y -CONFIG_DAVICOM_PHY=y -CONFIG_QSEMI_PHY=y -CONFIG_LXT_PHY=y -CONFIG_CICADA_PHY=y -CONFIG_VITESSE_PHY=y -CONFIG_SMSC_PHY=y -CONFIG_BROADCOM_PHY=y -CONFIG_ICPLUS_PHY=y -CONFIG_REALTEK_PHY=y -CONFIG_NATIONAL_PHY=y -CONFIG_STE10XP=y -CONFIG_LSI_ET1011C_PHY=y -CONFIG_MDIO_BITBANG=y -CONFIG_MDIO_GPIO=y -CONFIG_NET_ETHERNET=y -CONFIG_MII=m -CONFIG_FEC=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_WLAN is not set -CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=y -CONFIG_KEYBOARD_GPIO=y -CONFIG_INPUT_EVBUG=m -CONFIG_MOUSE_PS2=m -CONFIG_MOUSE_PS2_ELANTECH=y -CONFIG_SERIO_SERPORT=m -CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_IMX=y -CONFIG_SERIAL_IMX_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -# CONFIG_I2C_COMPAT is not set -CONFIG_I2C_CHARDEV=m -# CONFIG_I2C_HELPER_AUTO is not set -CONFIG_I2C_ALGOBIT=m -CONFIG_I2C_ALGOPCF=m -CONFIG_I2C_ALGOPCA=m -CONFIG_GPIO_SYSFS=y -# CONFIG_HWMON is not set -# CONFIG_HID_SUPPORT is not set -CONFIG_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_MXC=y -CONFIG_MMC=y -CONFIG_MMC_BLOCK=m -CONFIG_MMC_SDHCI=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_INTF_DEV_UIE_EMUL=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y -CONFIG_QUOTA=y -CONFIG_QUOTA_NETLINK_INTERFACE=y -# CONFIG_PRINT_QUOTA_WARNING is not set -CONFIG_AUTOFS_FS=y -CONFIG_AUTOFS4_FS=y -CONFIG_FUSE_FS=y -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_CONFIGFS_FS=m -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_DEFAULT="cp437" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_UTF8=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -# CONFIG_DEBUG_BUGVERBOSE is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_FTRACE is not set -# CONFIG_ARM_UNWIND is not set -CONFIG_DEBUG_LL=y -CONFIG_EARLY_PRINTK=y -CONFIG_SECURITYFS=y -CONFIG_CRYPTO_DEFLATE=y -CONFIG_CRYPTO_LZO=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set -CONFIG_CRC_CCITT=m -CONFIG_CRC_T10DIF=y -CONFIG_CRC7=m -CONFIG_LIBCRC32C=m diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig deleted file mode 100755 index 2bf224310..000000000 --- a/arch/arm/configs/mxs_defconfig +++ /dev/null @@ -1,129 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -# CONFIG_UTS_NS is not set -# CONFIG_IPC_NS is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set -# CONFIG_NET_NS is not set -CONFIG_PERF_EVENTS=y -# CONFIG_COMPAT_BRK is not set -CONFIG_MODULES=y -CONFIG_MODULE_FORCE_LOAD=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_BLK_DEV_INTEGRITY=y -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_MXS=y -CONFIG_MACH_STMP378X_DEVB=y -CONFIG_MACH_TX28=y -# CONFIG_ARM_THUMB is not set -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT_VOLUNTARY=y -CONFIG_AEABI=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 -CONFIG_AUTO_ZRELADDR=y -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_CAN=m -CONFIG_CAN_RAW=m -CONFIG_CAN_BCM=m -CONFIG_CAN_DEV=m -CONFIG_CAN_FLEXCAN=m -# CONFIG_WIRELESS is not set -CONFIG_DEVTMPFS=y -# CONFIG_FIRMWARE_IN_KERNEL is not set -# CONFIG_BLK_DEV is not set -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_ENC28J60=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_WLAN is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=m -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_TSC2007=m -# CONFIG_SERIO is not set -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_DEVPTS_MULTIPLE_INSTANCES=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=m -# CONFIG_I2C_COMPAT is not set -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_MXS=m -CONFIG_SPI=y -CONFIG_SPI_GPIO=m -CONFIG_DEBUG_GPIO=y -CONFIG_GPIO_SYSFS=y -# CONFIG_HWMON is not set -# CONFIG_MFD_SUPPORT is not set -CONFIG_DISPLAY_SUPPORT=m -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_MMC=y -CONFIG_MMC_MXS=y -CONFIG_RTC_CLASS=m -CONFIG_RTC_DRV_DS1307=m -CONFIG_DMADEVICES=y -CONFIG_MXS_DMA=y -CONFIG_EXT3_FS=y -# CONFIG_DNOTIFY is not set -CONFIG_FSCACHE=m -CONFIG_FSCACHE_STATS=y -CONFIG_CACHEFILES=m -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -# CONFIG_MISC_FILESYSTEMS is not set -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_PRINTK_TIME=y -CONFIG_FRAME_WARN=2048 -CONFIG_MAGIC_SYSRQ=y -CONFIG_UNUSED_SYMBOLS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_LOCKUP_DETECTOR=y -CONFIG_DETECT_HUNG_TASK=y -CONFIG_TIMER_STATS=y -CONFIG_PROVE_LOCKING=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -CONFIG_DEBUG_INFO=y -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_BLK_DEV_IO_TRACE=y -CONFIG_STRICT_DEVMEM=y -CONFIG_DEBUG_USER=y -CONFIG_CRYPTO=y -CONFIG_CRYPTO_CRC32C=m -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set -CONFIG_CRC_ITU_T=m -CONFIG_CRC7=m diff --git a/arch/arm/configs/neponset_defconfig b/arch/arm/configs/neponset_defconfig deleted file mode 100755 index d7dc9922c..000000000 --- a/arch/arm/configs/neponset_defconfig +++ /dev/null @@ -1,90 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_ARCH_SA1100=y -CONFIG_SA1100_ASSABET=y -CONFIG_ASSABET_NEPONSET=y -CONFIG_PCCARD=y -CONFIG_PCMCIA_SA1100=y -CONFIG_PCMCIA_SA1111=y -CONFIG_LEDS=y -CONFIG_LEDS_CPU=y -CONFIG_ZBOOT_ROM_TEXT=0x80000 -CONFIG_ZBOOT_ROM_BSS=0xc1000000 -CONFIG_ZBOOT_ROM=y -CONFIG_CMDLINE="console=ttySA0,38400n8 cpufreq=221200 rw root=/dev/mtdblock2 mtdparts=sa1100:512K(boot),1M(kernel),2560K(initrd),4M(root) load_ramdisk=1 prompt_ramdisk=0 mem=32M noinitrd initrd=0xc0800000,3M" -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_AOUT=y -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_IPV6 is not set -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_RAM=y -CONFIG_MTD_SA1100=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_SCSI=m -CONFIG_BLK_DEV_SD=m -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_NET_VENDOR_SMC=y -CONFIG_SMC9194=y -CONFIG_SMC91X=y -CONFIG_NET_PCMCIA=y -CONFIG_PCMCIA_PCNET=y -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_SERIO_SERPORT=m -CONFIG_SERIO_SA1111=y -CONFIG_SERIAL_NONSTANDARD=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CS=y -CONFIG_SERIAL_SA1100=y -CONFIG_SERIAL_SA1100_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=64 -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_WATCHDOG=y -CONFIG_SA1100_WATCHDOG=m -CONFIG_FB=y -CONFIG_FB_SA1100=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_SOUND=y -CONFIG_SOUND_PRIME=y -# CONFIG_USB_HID is not set -CONFIG_USB=m -CONFIG_USB_DEBUG=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=m -CONFIG_USB_OHCI_HCD=m -CONFIG_USB_STORAGE=m -CONFIG_EXT2_FS=y -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_PARTITION_ADVANCED=y -# CONFIG_MSDOS_PARTITION is not set -CONFIG_NLS=y -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_ISO8859_1=m -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/netwinder_defconfig b/arch/arm/configs/netwinder_defconfig deleted file mode 100755 index 25ed772df..000000000 --- a/arch/arm/configs/netwinder_defconfig +++ /dev/null @@ -1,87 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_ARCH_FOOTBRIDGE=y -CONFIG_ARCH_NETWINDER=y -CONFIG_LEDS=y -CONFIG_LEDS_CPU=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=0x301" -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_AOUT=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -# CONFIG_IPV6 is not set -CONFIG_NETFILTER=y -CONFIG_IP_NF_QUEUE=y -CONFIG_IP_NF_IPTABLES=y -CONFIG_PARPORT=y -CONFIG_PARPORT_PC=y -CONFIG_PARPORT_PC_SUPERIO=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_IDE=y -CONFIG_BLK_DEV_SL82C105=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -CONFIG_NET_TULIP=y -CONFIG_TULIP=y -CONFIG_TULIP_MMIO=y -CONFIG_NET_PCI=y -CONFIG_NE2K_PCI=y -CONFIG_MOUSE_SERIAL=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_PRINTER=y -CONFIG_DS1620=y -CONFIG_NWBUTTON=y -CONFIG_NWBUTTON_REBOOT=y -CONFIG_NWFLASH=y -CONFIG_WATCHDOG=y -CONFIG_977_WATCHDOG=y -CONFIG_FB=y -CONFIG_FB_CYBER2000=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -CONFIG_LOGO=y -CONFIG_SOUND=y -CONFIG_SOUND_PRIME=y -CONFIG_SOUND_OSS=y -CONFIG_SOUND_TRACEINIT=y -CONFIG_SOUND_DMAP=y -CONFIG_SOUND_YM3812=y -CONFIG_SOUND_WAVEARTIST=y -CONFIG_EXT2_FS=y -CONFIG_AUTOFS_FS=y -CONFIG_ISO9660_FS=y -CONFIG_JOLIET=y -CONFIG_TMPFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=y -CONFIG_NFSD_V3=y -CONFIG_SMB_FS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_CODEPAGE_852=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=y -CONFIG_NLS_ISO8859_15=y -CONFIG_NLS_UTF8=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_USER=y diff --git a/arch/arm/configs/netx_defconfig b/arch/arm/configs/netx_defconfig deleted file mode 100755 index 9c0ad7993..000000000 --- a/arch/arm/configs/netx_defconfig +++ /dev/null @@ -1,86 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_ARCH_NETX=y -CONFIG_MACH_NXDKN=y -CONFIG_MACH_NXDB500=y -CONFIG_MACH_NXEB500HMI=y -CONFIG_PREEMPT=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttySMX0,115200" -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=m -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_NET_IPGRE=m -CONFIG_SYN_COOKIES=y -CONFIG_INET_AH=y -CONFIG_INET_ESP=y -CONFIG_INET_IPCOMP=y -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -CONFIG_NETFILTER=y -CONFIG_IP_NF_QUEUE=m -CONFIG_NET_PKTGEN=m -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PLATRAM=y -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_NET_NETX=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_SERIAL_NETX=y -CONFIG_SERIAL_NETX_CONSOLE=y -# CONFIG_HWMON is not set -CONFIG_FB=y -CONFIG_FB_ARMCLCD=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -CONFIG_RTC_CLASS=y -CONFIG_INOTIFY=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_ERRORS=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRC_CCITT=m -CONFIG_LIBCRC32C=m diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig deleted file mode 100755 index 37207d1bf..000000000 --- a/arch/arm/configs/nhk8815_defconfig +++ /dev/null @@ -1,132 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -CONFIG_KALLSYMS_ALL=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_NOMADIK=y -CONFIG_MACH_NOMADIK_8815NHK=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_FPE_NWFPE=y -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_NET_IPIP=y -CONFIG_NET_IPGRE=y -CONFIG_NET_IPGRE_BROADCAST=y -CONFIG_IP_MROUTE=y -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIVHCI=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_TESTS=m -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ECC_SMC=y -CONFIG_MTD_NAND_VERIFY_WRITE=y -CONFIG_MTD_NAND_NOMADIK=y -CONFIG_MTD_ONENAND=y -CONFIG_MTD_ONENAND_VERIFY_WRITE=y -CONFIG_MTD_ONENAND_GENERIC=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_CRYPTOLOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_NETDEVICES=y -CONFIG_TUN=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -CONFIG_PPP=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_PPPOE=m -CONFIG_NETCONSOLE=m -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_MOUSE_PS2 is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_GPIO=y -CONFIG_DEBUG_GPIO=y -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -CONFIG_RTC_CLASS=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_INOTIFY=y -CONFIG_FUSE_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_ROOT_NFS=y -CONFIG_SMB_FS=m -CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_15=y -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -# CONFIG_DEBUG_PREEMPT is not set -# CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_DES=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set diff --git a/arch/arm/configs/nuc910_defconfig b/arch/arm/configs/nuc910_defconfig deleted file mode 100755 index 10180cfde..000000000 --- a/arch/arm/configs/nuc910_defconfig +++ /dev/null @@ -1,60 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_RELAY=y -CONFIG_USER_NS=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_EXTRA_PASS=y -CONFIG_SLAB=y -CONFIG_ARCH_W90X900=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_CMDLINE="root=/dev/ram0 console=ttyS0,115200n8 rdinit=/sbin/init mem=64M" -CONFIG_KEXEC=y -CONFIG_FPE_NWFPE=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=16384 -# CONFIG_MISC_DEVICES is not set -CONFIG_SCSI=y -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=y -# CONFIG_SCSI_LOWLEVEL is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=1 -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -CONFIG_USB=y -CONFIG_USB_MON=y -CONFIG_USB_STORAGE=y -# CONFIG_DNOTIFY is not set -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_ROMFS_FS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_DEBUG_FS=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_CRC32 is not set diff --git a/arch/arm/configs/nuc950_defconfig b/arch/arm/configs/nuc950_defconfig deleted file mode 100755 index 27aa87313..000000000 --- a/arch/arm/configs/nuc950_defconfig +++ /dev/null @@ -1,76 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_RELAY=y -CONFIG_USER_NS=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_EXTRA_PASS=y -CONFIG_SLAB=y -CONFIG_ARCH_W90X900=y -# CONFIG_MACH_W90P910EVB is not set -CONFIG_MACH_W90P950EVB=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_CMDLINE="root=/dev/ram0 console=ttyS0,115200n8 rdinit=/sbin/init mem=64M" -CONFIG_KEXEC=y -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_AOUT=y -CONFIG_BINFMT_MISC=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=16384 -# CONFIG_MISC_DEVICES is not set -CONFIG_SCSI=y -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=y -# CONFIG_SCSI_LOWLEVEL is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=1 -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -CONFIG_FB=y -CONFIG_FB_NUC900=y -CONFIG_GPM1040A0_320X240=y -CONFIG_FB_NUC900_DEBUG=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -CONFIG_FONTS=y -CONFIG_FONT_8x16=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -# CONFIG_HID_SUPPORT is not set -CONFIG_USB=y -CONFIG_USB_MON=y -CONFIG_USB_STORAGE=y -# CONFIG_DNOTIFY is not set -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_ROMFS_FS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_DEBUG_FS=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set diff --git a/arch/arm/configs/nuc960_defconfig b/arch/arm/configs/nuc960_defconfig deleted file mode 100755 index 56fd7ad0f..000000000 --- a/arch/arm/configs/nuc960_defconfig +++ /dev/null @@ -1,66 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_RELAY=y -CONFIG_USER_NS=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_EXTRA_PASS=y -CONFIG_SLAB=y -CONFIG_ARCH_W90X900=y -# CONFIG_MACH_W90P910EVB is not set -CONFIG_MACH_W90N960EVB=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_CMDLINE="root=/dev/ram0 console=ttyS0,115200n8 rdinit=/sbin/init mem=64M" -CONFIG_KEXEC=y -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_AOUT=y -CONFIG_BINFMT_MISC=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=16384 -# CONFIG_MISC_DEVICES is not set -CONFIG_SCSI=y -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=y -# CONFIG_SCSI_LOWLEVEL is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=1 -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -CONFIG_USB=y -CONFIG_USB_MON=y -CONFIG_USB_STORAGE=y -# CONFIG_DNOTIFY is not set -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_ROMFS_FS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_DEBUG_FS=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_CRC32 is not set diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig deleted file mode 100755 index 7b63462b3..000000000 --- a/arch/arm/configs/omap1_defconfig +++ /dev/null @@ -1,286 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_IKCONFIG=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -# CONFIG_KALLSYMS is not set -# CONFIG_ELF_CORE is not set -# CONFIG_BASE_FULL is not set -# CONFIG_SHMEM is not set -# CONFIG_VM_EVENT_COUNTERS is not set -CONFIG_SLOB=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_LBDAF is not set -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_OMAP=y -CONFIG_ARCH_OMAP1=y -CONFIG_OMAP_RESET_CLOCKS=y -# CONFIG_OMAP_MUX is not set -CONFIG_OMAP_MBOX_FWK=y -CONFIG_OMAP_32K_TIMER=y -CONFIG_OMAP_DM_TIMER=y -CONFIG_ARCH_OMAP730=y -CONFIG_ARCH_OMAP850=y -CONFIG_ARCH_OMAP16XX=y -CONFIG_MACH_OMAP_INNOVATOR=y -CONFIG_MACH_OMAP_H2=y -CONFIG_MACH_OMAP_H3=y -CONFIG_MACH_OMAP_HTCWIZARD=y -CONFIG_MACH_HERALD=y -CONFIG_MACH_OMAP_OSK=y -CONFIG_MACH_OMAP_PERSEUS2=y -CONFIG_MACH_OMAP_FSAMPLE=y -CONFIG_MACH_VOICEBLUE=y -CONFIG_MACH_OMAP_PALMTE=y -CONFIG_MACH_OMAP_PALMZ71=y -CONFIG_MACH_OMAP_PALMTT=y -CONFIG_MACH_SX1=y -CONFIG_MACH_NOKIA770=y -CONFIG_MACH_AMS_DELTA=y -CONFIG_MACH_OMAP_GENERIC=y -CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y -CONFIG_OMAP_ARM_216MHZ=y -CONFIG_OMAP_ARM_195MHZ=y -CONFIG_OMAP_ARM_192MHZ=y -CONFIG_OMAP_ARM_182MHZ=y -CONFIG_OMAP_ARM_168MHZ=y -# CONFIG_OMAP_ARM_60MHZ is not set -# CONFIG_ARM_THUMB is not set -CONFIG_PCCARD=y -CONFIG_OMAP_CF=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_LEDS=y -CONFIG_LEDS_CPU=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=1f03 rootfstype=jffs2" -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_MISC=y -CONFIG_PM=y -# CONFIG_SUSPEND is not set -CONFIG_PM_RUNTIME=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -CONFIG_IPV6=y -CONFIG_NETFILTER=y -CONFIG_BT=y -CONFIG_BT_L2CAP=y -CONFIG_BT_SCO=y -CONFIG_BT_RFCOMM=y -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=y -CONFIG_BT_HIDP=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_STANDALONE is not set -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -CONFIG_CONNECTOR=y -# CONFIG_PROC_EVENTS is not set -CONFIG_MTD=y -CONFIG_MTD_DEBUG=y -CONFIG_MTD_DEBUG_VERBOSE=3 -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_NAND=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=2 -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_IDE=m -CONFIG_BLK_DEV_IDECS=m -CONFIG_SCSI=y -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=y -CONFIG_BLK_DEV_SR=y -CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_NETDEVICES=y -CONFIG_TUN=y -CONFIG_PHYLIB=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -CONFIG_USB_CATC=y -CONFIG_USB_KAWETH=y -CONFIG_USB_PEGASUS=y -CONFIG_USB_RTL8150=y -CONFIG_USB_USBNET=y -# CONFIG_USB_NET_AX8817X is not set -# CONFIG_USB_NET_CDC_SUBSET is not set -CONFIG_PPP=y -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=y -CONFIG_PPP_DEFLATE=y -CONFIG_PPP_BSDCOMP=y -CONFIG_SLIP=y -CONFIG_SLIP_COMPRESSED=y -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=y -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y -# CONFIG_SERIO is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=3 -CONFIG_SERIAL_8250_RUNTIME_UARTS=3 -# CONFIG_LEGACY_PTYS is not set -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_SPI=y -CONFIG_SPI_OMAP_UWIRE=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_NOWAYOUT=y -CONFIG_OMAP_WATCHDOG=y -CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_VIRTUAL=y -CONFIG_FB_OMAP=y -CONFIG_FB_OMAP_LCDC_EXTERNAL=y -CONFIG_FB_OMAP_LCDC_HWA742=y -CONFIG_FB_OMAP_MANUAL_UPDATE=y -CONFIG_FB_OMAP_LCD_MIPID=y -CONFIG_FB_OMAP_BOOTLOADER_INIT=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -CONFIG_FONT_6x11=y -CONFIG_FONT_MINI_4x6=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y -# CONFIG_SND_SUPPORT_OLD_API is not set -# CONFIG_SND_VERBOSE_PROCFS is not set -CONFIG_SND_DUMMY=y -CONFIG_SND_USB_AUDIO=y -CONFIG_SND_SOC=y -CONFIG_SND_OMAP_SOC=y -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_DEBUG=y -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_SUSPEND=y -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_SERIAL=y -CONFIG_USB_SERIAL_CONSOLE=y -CONFIG_USB_SERIAL_PL2303=y -CONFIG_USB_TEST=y -CONFIG_USB_GADGET=y -CONFIG_USB_ETH=m -# CONFIG_USB_ETH_RNDIS is not set -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_FILE_STORAGE_TEST=y -CONFIG_MMC=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_OMAP=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_OMAP=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_DNOTIFY is not set -CONFIG_AUTOFS4_FS=y -CONFIG_ISO9660_FS=y -CONFIG_JOLIET=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_FAT_DEFAULT_CODEPAGE=866 -CONFIG_FAT_DEFAULT_IOCHARSET="koi8-r" -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_CRAMFS=y -CONFIG_ROMFS_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_CODEPAGE_852=y -CONFIG_NLS_CODEPAGE_866=y -CONFIG_NLS_CODEPAGE_1251=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=y -CONFIG_NLS_ISO8859_5=y -CONFIG_NLS_ISO8859_15=y -CONFIG_NLS_KOI8_R=y -CONFIG_NLS_UTF8=y -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_SPINLOCK=y -CONFIG_DEBUG_MUTEXES=y -# CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_SECURITY=y -CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_PCBC=y -CONFIG_CRYPTO_DEFLATE=y -CONFIG_CRYPTO_ZLIB=y -CONFIG_CRYPTO_LZO=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_LIBCRC32C=y diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig deleted file mode 100755 index d5f00d7eb..000000000 --- a/arch/arm/configs/omap2plus_defconfig +++ /dev/null @@ -1,236 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -# CONFIG_SYSCTL_SYSCALL is not set -CONFIG_KALLSYMS_EXTRA_PASS=y -CONFIG_SLAB=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=y -CONFIG_KPROBES=y -CONFIG_MODULES=y -CONFIG_MODULE_FORCE_LOAD=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_MODULE_SRCVERSION_ALL=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_OMAP=y -CONFIG_OMAP_RESET_CLOCKS=y -CONFIG_OMAP_MUX_DEBUG=y -CONFIG_ARM_THUMBEE=y -CONFIG_ARM_ERRATA_411920=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_SMP=y -CONFIG_NR_CPUS=2 -CONFIG_LEDS=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200" -CONFIG_KEXEC=y -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_MISC=y -CONFIG_PM_DEBUG=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=y -CONFIG_NET_KEY=y -CONFIG_NET_KEY_MIGRATE=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_NETFILTER=y -CONFIG_BT=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIUART_LL=y -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_CFG80211=m -CONFIG_MAC80211=m -CONFIG_MAC80211_RC_PID=y -CONFIG_MAC80211_RC_DEFAULT_PID=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_CONNECTOR=y -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_OOPS=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_OMAP2=y -CONFIG_MTD_ONENAND=y -CONFIG_MTD_ONENAND_VERIFY_WRITE=y -CONFIG_MTD_ONENAND_OMAP2=y -CONFIG_MTD_UBI=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_MD=y -CONFIG_NETDEVICES=y -CONFIG_SMSC_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -CONFIG_SMSC911X=y -CONFIG_KS8851=y -CONFIG_KS8851_MLL=y -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_SDIO=m -CONFIG_LIBERTAS_DEBUG=y -CONFIG_USB_USBNET=y -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_EPSON2888=y -CONFIG_USB_KC2190=y -CONFIG_INPUT_JOYDEV=y -CONFIG_INPUT_EVDEV=y -CONFIG_KEYBOARD_GPIO=y -CONFIG_KEYBOARD_TWL4030=y -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_TWL4030_PWRBUTTON=y -CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_8250_DETECT_IRQ=y -CONFIG_SERIAL_8250_RSA=y -CONFIG_HW_RANDOM=y -CONFIG_I2C_CHARDEV=y -CONFIG_SPI=y -CONFIG_SPI_OMAP24XX=y -CONFIG_DEBUG_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_TWL4030=y -CONFIG_W1=y -CONFIG_POWER_SUPPLY=y -CONFIG_WATCHDOG=y -CONFIG_OMAP_WATCHDOG=y -CONFIG_TWL4030_WATCHDOG=y -CONFIG_REGULATOR_TWL4030=y -CONFIG_REGULATOR_TPS65023=y -CONFIG_REGULATOR_TPS6507X=y -CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y -CONFIG_FB_OMAP_LCD_VGA=y -CONFIG_OMAP2_DSS=m -CONFIG_OMAP2_DSS_RFBI=y -CONFIG_OMAP2_DSS_SDI=y -CONFIG_OMAP2_DSS_DSI=y -CONFIG_FB_OMAP2=m -CONFIG_PANEL_GENERIC_DPI=m -CONFIG_PANEL_SHARP_LS037V7DW01=m -CONFIG_PANEL_NEC_NL8048HL11_01B=m -CONFIG_PANEL_TAAL=m -CONFIG_PANEL_TPO_TD043MTEA1=m -CONFIG_PANEL_ACX565AKM=m -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_LCD_PLATFORM=y -CONFIG_DISPLAY_SUPPORT=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -CONFIG_LOGO=y -CONFIG_SOUND=m -CONFIG_SND=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_VERBOSE_PRINTK=y -CONFIG_SND_DEBUG=y -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_SOC=m -CONFIG_SND_OMAP_SOC=m -CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m -CONFIG_USB=y -CONFIG_USB_DEBUG=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_SUSPEND=y -CONFIG_USB_MON=y -CONFIG_USB_WDM=y -CONFIG_USB_STORAGE=y -CONFIG_USB_LIBUSUAL=y -CONFIG_USB_TEST=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_DEBUG=y -CONFIG_USB_GADGET_DEBUG_FILES=y -CONFIG_USB_GADGET_DEBUG_FS=y -CONFIG_USB_ZERO=m -CONFIG_MMC=y -CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_SDIO_UART=y -CONFIG_MMC_OMAP=y -CONFIG_MMC_OMAP_HS=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_TWL92330=y -CONFIG_RTC_DRV_TWL4030=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_XATTR is not set -CONFIG_QUOTA=y -CONFIG_QFMT_V2=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_JFFS2_FS_XATTR=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_LZO=y -CONFIG_JFFS2_RUBIN=y -CONFIG_UBIFS_FS=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_SCHEDSTATS=y -CONFIG_TIMER_STATS=y -CONFIG_PROVE_LOCKING=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -# CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SECURITY=y -CONFIG_CRYPTO_MICHAEL_MIC=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRC_CCITT=y -CONFIG_CRC_T10DIF=y -CONFIG_CRC_ITU_T=y -CONFIG_CRC7=y -CONFIG_LIBCRC32C=y diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig deleted file mode 100755 index a288d7033..000000000 --- a/arch/arm/configs/orion5x_defconfig +++ /dev/null @@ -1,179 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_EXPERT=y -# CONFIG_SLUB_DEBUG is not set -CONFIG_PROFILING=y -CONFIG_OPROFILE=y -CONFIG_KPROBES=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_ORION5X=y -CONFIG_MACH_DB88F5281=y -CONFIG_MACH_RD88F5182=y -CONFIG_MACH_KUROBOX_PRO=y -CONFIG_MACH_DNS323=y -CONFIG_MACH_TS209=y -CONFIG_MACH_TERASTATION_PRO2=y -CONFIG_MACH_LINKSTATION_PRO=y -CONFIG_MACH_LINKSTATION_MINI=y -CONFIG_MACH_LINKSTATION_LS_HGL=y -CONFIG_MACH_TS409=y -CONFIG_MACH_WRT350N_V2=y -CONFIG_MACH_TS78XX=y -CONFIG_MACH_MV2120=y -CONFIG_MACH_EDMINI_V2=y -CONFIG_MACH_D2NET=y -CONFIG_MACH_BIGDISK=y -CONFIG_MACH_NET2BIG=y -CONFIG_MACH_MSS2=y -CONFIG_MACH_WNR854T=y -CONFIG_MACH_RD88F5181L_GE=y -CONFIG_MACH_RD88F5181L_FXO=y -CONFIG_MACH_RD88F6183AP_GE=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_LEDS=y -CONFIG_LEDS_CPU=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_FPE_NWFPE=y -CONFIG_VFP=y -# CONFIG_SUSPEND is not set -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_IPV6 is not set -CONFIG_NET_DSA=y -CONFIG_NET_DSA_MV88E6131=y -CONFIG_NET_DSA_MV88E6123_61_65=y -CONFIG_NET_PKTGEN=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y -CONFIG_MTD_NAND_PLATFORM=y -CONFIG_MTD_NAND_ORION=y -CONFIG_BLK_DEV_LOOP=y -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=y -CONFIG_BLK_DEV_SR=m -CONFIG_CHR_DEV_SG=m -CONFIG_ATA=y -CONFIG_SATA_MV=y -CONFIG_NETDEVICES=y -CONFIG_MARVELL_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -CONFIG_NET_PCI=y -CONFIG_MV643XX_ETH=y -# CONFIG_NETDEV_10000 is not set -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -# CONFIG_VT is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -# CONFIG_SERIAL_8250_PCI is not set -CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -CONFIG_LEGACY_PTY_COUNT=16 -CONFIG_HW_RANDOM_TIMERIOMEM=m -CONFIG_I2C=y -# CONFIG_I2C_COMPAT is not set -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MV64XXX=y -CONFIG_GPIO_SYSFS=y -CONFIG_SENSORS_LM75=y -# CONFIG_VGA_ARB is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -CONFIG_USB_PRINTER=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_DS1307=y -CONFIG_RTC_DRV_RS5C372=y -CONFIG_RTC_DRV_PCF8563=y -CONFIG_RTC_DRV_M41T80=y -CONFIG_RTC_DRV_S35390A=y -CONFIG_RTC_DRV_M48T86=y -CONFIG_DMADEVICES=y -CONFIG_MV_XOR=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_XATTR is not set -CONFIG_EXT4_FS=m -CONFIG_INOTIFY=y -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_UDF_FS=m -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_BSD_DISKLABEL=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_LATENCYTOP=y -CONFIG_SYSCTL_SYSCALL_CHECK=y -# CONFIG_FTRACE is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_PCBC=m -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_DEV_MV_CESA=y -CONFIG_CRC_T10DIF=y diff --git a/arch/arm/configs/palmz72_defconfig b/arch/arm/configs/palmz72_defconfig deleted file mode 100755 index 4baa83c1c..000000000 --- a/arch/arm/configs/palmz72_defconfig +++ /dev/null @@ -1,85 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_PXA=y -CONFIG_ARCH_PXA_PALM=y -# CONFIG_MACH_PALMTX is not set -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=32M console=tty root=/dev/mmcblk0" -CONFIG_FPE_NWFPE=y -CONFIG_PM=y -CONFIG_APM_EMULATION=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_BLK_DEV_LOOP=y -# CONFIG_MISC_DEVICES is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_PXA27x=y -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_PXA=y -CONFIG_SPI=y -CONFIG_SPI_SPIDEV=y -CONFIG_GPIO_SYSFS=y -CONFIG_POWER_SUPPLY=y -CONFIG_PDA_POWER=y -# CONFIG_HWMON is not set -CONFIG_FB=y -CONFIG_FB_PXA=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_PWM=y -CONFIG_DISPLAY_SUPPORT=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_MMC=y -CONFIG_MMC_DEBUG=y -CONFIG_MMC_PXA=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_SA1100=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_DNOTIFY is not set -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_FAT_DEFAULT_CODEPAGE=866 -CONFIG_FAT_DEFAULT_IOCHARSET="utf8" -CONFIG_TMPFS=y -# CONFIG_NETWORK_FILESYSTEMS is not set -CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_866=y -CONFIG_NLS_UTF8=y -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_DEBUG_USER=y -CONFIG_CRC_T10DIF=y diff --git a/arch/arm/configs/pcm027_defconfig b/arch/arm/configs/pcm027_defconfig deleted file mode 100755 index 2f136c30a..000000000 --- a/arch/arm/configs/pcm027_defconfig +++ /dev/null @@ -1,102 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_EXPERT=y -# CONFIG_KALLSYMS is not set -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_PXA=y -CONFIG_MACH_PCM027=y -CONFIG_MACH_PCM990_BASEBOARD=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -# CONFIG_BLK_DEV is not set -# CONFIG_MISC_DEVICES is not set -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_PXA=y -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y -CONFIG_SND_PXA2XX_AC97=y -# CONFIG_HID_SUPPORT is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_MMC=y -CONFIG_MMC_PXA=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_PCF8563=m -CONFIG_RTC_DRV_SA1100=m -CONFIG_EXT2_FS=m -CONFIG_EXT3_FS=m -# CONFIG_DNOTIFY is not set -CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_CODEPAGE=850 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-15" -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_DEFAULT="iso8859-15" -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_15=y -CONFIG_MAGIC_SYSRQ=y diff --git a/arch/arm/configs/pcontrol_g20_defconfig b/arch/arm/configs/pcontrol_g20_defconfig deleted file mode 100755 index c75c9fced..000000000 --- a/arch/arm/configs/pcontrol_g20_defconfig +++ /dev/null @@ -1,175 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_CROSS_COMPILE="/opt/arm-2010q1/bin/arm-none-linux-gnueabi-" -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_TREE_PREEMPT_RCU=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_NAMESPACES=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -# CONFIG_SYSCTL_SYSCALL is not set -# CONFIG_KALLSYMS is not set -# CONFIG_VM_EVENT_COUNTERS is not set -# CONFIG_COMPAT_BRK is not set -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_LBDAF is not set -# CONFIG_BLK_DEV_BSG is not set -CONFIG_DEFAULT_DEADLINE=y -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91SAM9G20=y -CONFIG_MACH_PCONTROL_G20=y -CONFIG_AT91_PROGRAMMABLE_CLOCKS=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200 mem=128M mtdparts=atmel_nand:128k(bootstrap)ro,256k(uboot)ro,128k(env1)ro,128k(env2)ro,2M(linux),-(root) root=/dev/mmcblk0p1 rootwait rw" -CONFIG_VFP=y -CONFIG_BINFMT_MISC=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_VLAN_8021Q=y -# CONFIG_WIRELESS is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FW_LOADER is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_PHRAM=m -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_ATMEL_TCLIB=y -CONFIG_EEPROM_AT24=m -CONFIG_SCSI=m -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=m -CONFIG_SCSI_MULTI_LUN=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_NETDEVICES=y -CONFIG_MACVLAN=m -CONFIG_TUN=m -CONFIG_SMSC_PHY=m -CONFIG_BROADCOM_PHY=m -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -CONFIG_MACB=y -CONFIG_SMSC911X=m -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_WLAN is not set -CONFIG_PPP=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_MPPE=m -CONFIG_INPUT_POLLDEV=y -CONFIG_INPUT_SPARSEKMAP=y -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=m -CONFIG_INPUT_EVBUG=m -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=m -CONFIG_KEYBOARD_MATRIX=m -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=m -CONFIG_INPUT_GPIO_ROTARY_ENCODER=m -# CONFIG_SERIO is not set -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_SERIAL_MAX3100=m -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -CONFIG_R3964=m -CONFIG_I2C=m -CONFIG_I2C_CHARDEV=m -# CONFIG_I2C_HELPER_AUTO is not set -CONFIG_I2C_GPIO=m -CONFIG_SPI=y -CONFIG_SPI_ATMEL=m -CONFIG_SPI_SPIDEV=m -CONFIG_GPIO_SYSFS=y -CONFIG_W1=m -CONFIG_W1_MASTER_GPIO=m -CONFIG_W1_SLAVE_DS2431=m -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_AT91SAM9X_WATCHDOG=y -# CONFIG_MFD_SUPPORT is not set -# CONFIG_HID_SUPPORT is not set -CONFIG_USB=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=m -CONFIG_USB_LIBUSUAL=y -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_USB_GADGET=y -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_USB_G_HID=m -CONFIG_MMC=y -CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_MMC_ATMELMCI=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_AT91SAM9=y -CONFIG_AUXDISPLAY=y -CONFIG_UIO=y -CONFIG_UIO_PDRV=y -CONFIG_STAGING=y -# CONFIG_STAGING_EXCLUDE_BUILD is not set -CONFIG_IIO=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_XATTR is not set -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V4=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_15=y -CONFIG_NLS_UTF8=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_CRYPTO=y -CONFIG_CRYPTO_ANSI_CPRNG=y -# CONFIG_CRYPTO_HW is not set -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/pleb_defconfig b/arch/arm/configs/pleb_defconfig deleted file mode 100755 index cb08cc561..000000000 --- a/arch/arm/configs/pleb_defconfig +++ /dev/null @@ -1,57 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -# CONFIG_HOTPLUG is not set -# CONFIG_SHMEM is not set -CONFIG_MODULES=y -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_SA1100=y -CONFIG_SA1100_PLEB=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttySA0,9600 mem=16M@0xc0000000 mem=16M@0xc8000000 root=/dev/ram initrd=0xc0400000,4M" -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_SYN_COOKIES=y -# CONFIG_IPV6 is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_SA1100=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -# CONFIG_INPUT is not set -# CONFIG_SERIO is not set -# CONFIG_VT is not set -CONFIG_SERIAL_SA1100=y -CONFIG_SERIAL_SA1100_CONSOLE=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_XATTR is not set -# CONFIG_DNOTIFY is not set -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_NFS_FS=m -CONFIG_NFS_V3=y -CONFIG_NLS=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y diff --git a/arch/arm/configs/pnx4008_defconfig b/arch/arm/configs/pnx4008_defconfig deleted file mode 100755 index 35a31ccac..000000000 --- a/arch/arm/configs/pnx4008_defconfig +++ /dev/null @@ -1,472 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_AUDIT=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_MODULE_SRCVERSION_ALL=y -CONFIG_ARCH_PNX4008=y -CONFIG_PREEMPT=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=64M console=ttyS0,115200" -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_AOUT=m -CONFIG_BINFMT_MISC=m -CONFIG_PM=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_SYN_COOKIES=y -CONFIG_INET_AH=m -CONFIG_INET_ESP=m -CONFIG_INET_IPCOMP=m -CONFIG_IPV6_PRIVACY=y -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_TUNNEL=m -CONFIG_NETFILTER=y -CONFIG_IP_VS=m -CONFIG_IP_VS_PROTO_TCP=y -CONFIG_IP_VS_PROTO_UDP=y -CONFIG_IP_VS_PROTO_ESP=y -CONFIG_IP_VS_PROTO_AH=y -CONFIG_IP_VS_RR=m -CONFIG_IP_VS_WRR=m -CONFIG_IP_VS_LC=m -CONFIG_IP_VS_WLC=m -CONFIG_IP_VS_LBLC=m -CONFIG_IP_VS_LBLCR=m -CONFIG_IP_VS_DH=m -CONFIG_IP_VS_SH=m -CONFIG_IP_VS_SED=m -CONFIG_IP_VS_NQ=m -CONFIG_IP_VS_FTP=m -CONFIG_IP_NF_QUEUE=m -CONFIG_IP6_NF_QUEUE=m -CONFIG_DECNET_NF_GRABULATOR=m -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_BRIDGE_EBT_BROUTE=m -CONFIG_BRIDGE_EBT_T_FILTER=m -CONFIG_BRIDGE_EBT_T_NAT=m -CONFIG_BRIDGE_EBT_802_3=m -CONFIG_BRIDGE_EBT_AMONG=m -CONFIG_BRIDGE_EBT_ARP=m -CONFIG_BRIDGE_EBT_IP=m -CONFIG_BRIDGE_EBT_LIMIT=m -CONFIG_BRIDGE_EBT_MARK=m -CONFIG_BRIDGE_EBT_PKTTYPE=m -CONFIG_BRIDGE_EBT_STP=m -CONFIG_BRIDGE_EBT_VLAN=m -CONFIG_BRIDGE_EBT_ARPREPLY=m -CONFIG_BRIDGE_EBT_DNAT=m -CONFIG_BRIDGE_EBT_MARK_T=m -CONFIG_BRIDGE_EBT_REDIRECT=m -CONFIG_BRIDGE_EBT_SNAT=m -CONFIG_BRIDGE_EBT_LOG=m -CONFIG_IP_SCTP=m -CONFIG_ATM=y -CONFIG_ATM_CLIP=y -CONFIG_ATM_LANE=m -CONFIG_ATM_MPOA=m -CONFIG_ATM_BR2684=m -CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m -CONFIG_DECNET=m -CONFIG_LLC2=m -CONFIG_IPX=m -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -CONFIG_IPDDP_DECAP=y -CONFIG_X25=m -CONFIG_LAPB=m -CONFIG_ECONET=m -CONFIG_ECONET_AUNUDP=y -CONFIG_ECONET_NATIVE=y -CONFIG_WAN_ROUTER=m -CONFIG_NET_SCHED=y -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m -CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m -CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_NETEM=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m -CONFIG_NET_PKTGEN=m -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_SLRAM=m -CONFIG_MTD_PHRAM=m -CONFIG_MTD_MTDRAM=m -CONFIG_MTD_DOC2000=m -CONFIG_MTD_DOC2001=m -CONFIG_MTD_DOC2001PLUS=m -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_NANDSIM=m -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_CRYPTOLOOP=y -CONFIG_BLK_DEV_NBD=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_CDROM_PKTCDVD=m -CONFIG_EEPROM_LEGACY=m -CONFIG_SCSI=m -CONFIG_BLK_DEV_SD=m -CONFIG_CHR_DEV_ST=m -CONFIG_CHR_DEV_OSST=m -CONFIG_BLK_DEV_SR=m -CONFIG_CHR_DEV_SG=m -CONFIG_CHR_DEV_SCH=m -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SPI_ATTRS=m -CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_DEBUG=m -CONFIG_NETDEVICES=y -CONFIG_DUMMY=m -CONFIG_BONDING=m -CONFIG_EQUALIZER=m -CONFIG_TUN=m -CONFIG_NET_ETHERNET=y -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET=m -# CONFIG_USB_NET_CDC_SUBSET is not set -CONFIG_WAN=y -CONFIG_HDLC=m -CONFIG_HDLC_RAW=m -CONFIG_HDLC_RAW_ETH=m -CONFIG_HDLC_CISCO=m -CONFIG_HDLC_FR=m -CONFIG_HDLC_PPP=m -CONFIG_HDLC_X25=m -CONFIG_DLCI=m -CONFIG_WAN_ROUTER_DRIVERS=m -CONFIG_LAPBETHER=m -CONFIG_X25_ASY=m -CONFIG_ATM_TCP=m -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_PPPOE=m -CONFIG_PPPOATM=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -CONFIG_SLIP_MODE_SLIP6=y -CONFIG_NETCONSOLE=m -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_JOYDEV=m -CONFIG_INPUT_EVDEV=m -CONFIG_INPUT_EVBUG=m -CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_NEWTON=m -CONFIG_KEYBOARD_SUNKBD=m -CONFIG_KEYBOARD_XTKBD=m -CONFIG_MOUSE_PS2=m -CONFIG_MOUSE_SERIAL=m -CONFIG_MOUSE_VSXXXAA=m -CONFIG_INPUT_JOYSTICK=y -CONFIG_JOYSTICK_ANALOG=m -CONFIG_JOYSTICK_A3D=m -CONFIG_JOYSTICK_ADI=m -CONFIG_JOYSTICK_COBRA=m -CONFIG_JOYSTICK_GF2K=m -CONFIG_JOYSTICK_GRIP=m -CONFIG_JOYSTICK_GRIP_MP=m -CONFIG_JOYSTICK_GUILLEMOT=m -CONFIG_JOYSTICK_INTERACT=m -CONFIG_JOYSTICK_SIDEWINDER=m -CONFIG_JOYSTICK_TMDC=m -CONFIG_JOYSTICK_IFORCE=m -CONFIG_JOYSTICK_IFORCE_USB=y -CONFIG_JOYSTICK_IFORCE_232=y -CONFIG_JOYSTICK_WARRIOR=m -CONFIG_JOYSTICK_MAGELLAN=m -CONFIG_JOYSTICK_SPACEORB=m -CONFIG_JOYSTICK_SPACEBALL=m -CONFIG_JOYSTICK_STINGER=m -CONFIG_JOYSTICK_JOYDUMP=m -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_GUNZE=m -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=m -CONFIG_SERIO_SERPORT=m -CONFIG_SERIO_RAW=m -CONFIG_GAMEPORT_NS558=m -CONFIG_GAMEPORT_L4=m -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_8250_RSA=y -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_SPI=y -CONFIG_SPI_BITBANG=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_SOFT_WATCHDOG=m -CONFIG_USBPCWATCHDOG=m -# CONFIG_VGA_CONSOLE is not set -CONFIG_SOUND=m -CONFIG_SND=m -CONFIG_SND_SEQUENCER=m -CONFIG_SND_SEQ_DUMMY=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_SEQUENCER_OSS=y -CONFIG_SND_DUMMY=m -CONFIG_SND_VIRMIDI=m -CONFIG_SND_MTPAV=m -CONFIG_SND_SERIAL_U16550=m -CONFIG_SND_MPU401=m -CONFIG_SND_USB_AUDIO=m -CONFIG_SOUND_PRIME=m -CONFIG_USB_HID=m -CONFIG_USB_HIDDEV=y -CONFIG_USB_KBD=m -CONFIG_USB_MOUSE=m -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=y -CONFIG_USB_SL811_HCD=m -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m -CONFIG_USB_STORAGE=m -CONFIG_USB_STORAGE_DATAFAB=m -CONFIG_USB_STORAGE_FREECOM=m -CONFIG_USB_STORAGE_USBAT=m -CONFIG_USB_STORAGE_SDDR09=m -CONFIG_USB_STORAGE_SDDR55=m -CONFIG_USB_STORAGE_JUMPSHOT=m -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_BELKIN=m -CONFIG_USB_SERIAL_WHITEHEAT=m -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -CONFIG_USB_SERIAL_CYPRESS_M8=m -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_IPAQ=m -CONFIG_USB_SERIAL_IR=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_EDGEPORT_TI=m -CONFIG_USB_SERIAL_IPW=m -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KLSI=m -CONFIG_USB_SERIAL_KOBIL_SCT=m -CONFIG_USB_SERIAL_MCT_U232=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_USB_SERIAL_SAFE=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m -CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_RIO500=m -CONFIG_USB_LEGOTOWER=m -CONFIG_USB_LCD=m -CONFIG_USB_LED=m -CONFIG_USB_CYTHERM=m -CONFIG_USB_TEST=m -CONFIG_USB_ATM=m -CONFIG_USB_SPEEDTOUCH=m -CONFIG_USB_GADGET=m -CONFIG_USB_GADGET_DUMMY_HCD=y -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_MMC=m -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT3_FS=m -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_REISERFS_FS=m -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -CONFIG_REISERFS_FS_SECURITY=y -CONFIG_JFS_FS=m -CONFIG_JFS_POSIX_ACL=y -CONFIG_JFS_STATISTICS=y -CONFIG_XFS_FS=m -CONFIG_XFS_QUOTA=y -CONFIG_XFS_POSIX_ACL=y -CONFIG_XFS_RT=y -CONFIG_INOTIFY=y -CONFIG_QUOTA=y -CONFIG_QFMT_V1=m -CONFIG_QFMT_V2=m -CONFIG_AUTOFS_FS=m -CONFIG_AUTOFS4_FS=m -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_NTFS_FS=m -CONFIG_TMPFS=y -CONFIG_ADFS_FS=m -CONFIG_AFFS_FS=m -CONFIG_HFS_FS=m -CONFIG_HFSPLUS_FS=m -CONFIG_BEFS_FS=m -CONFIG_BFS_FS=m -CONFIG_EFS_FS=m -CONFIG_JFFS2_FS=m -CONFIG_CRAMFS=y -CONFIG_VXFS_FS=m -CONFIG_MINIX_FS=m -CONFIG_HPFS_FS=m -CONFIG_QNX4FS_FS=m -CONFIG_ROMFS_FS=m -CONFIG_SYSV_FS=m -CONFIG_UFS_FS=m -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=m -CONFIG_NFSD_V4=y -CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -CONFIG_CIFS=m -CONFIG_NCP_FS=m -CONFIG_NCPFS_PACKET_SIGNING=y -CONFIG_NCPFS_IOCTL_LOCKING=y -CONFIG_NCPFS_STRONG=y -CONFIG_NCPFS_NFS_NS=y -CONFIG_NCPFS_OS2_NS=y -CONFIG_NCPFS_NLS=y -CONFIG_NCPFS_EXTRAS=y -CONFIG_CODA_FS=m -CONFIG_AFS_FS=m -CONFIG_PARTITION_ADVANCED=y -CONFIG_ACORN_PARTITION=y -CONFIG_ACORN_PARTITION_ICS=y -CONFIG_ACORN_PARTITION_RISCIX=y -CONFIG_OSF_PARTITION=y -CONFIG_AMIGA_PARTITION=y -CONFIG_ATARI_PARTITION=y -CONFIG_MAC_PARTITION=y -CONFIG_BSD_DISKLABEL=y -CONFIG_MINIX_SUBPARTITION=y -CONFIG_SOLARIS_X86_PARTITION=y -CONFIG_UNIXWARE_DISKLABEL=y -CONFIG_LDM_PARTITION=y -CONFIG_SGI_PARTITION=y -CONFIG_ULTRIX_PARTITION=y -CONFIG_SUN_PARTITION=y -CONFIG_NLS_DEFAULT="cp437" -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_MUTEXES=y -# CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_SECURITY=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRC16=m diff --git a/arch/arm/configs/pxa168_defconfig b/arch/arm/configs/pxa168_defconfig deleted file mode 100755 index 74d7e0104..000000000 --- a/arch/arm/configs/pxa168_defconfig +++ /dev/null @@ -1,70 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_MMP=y -CONFIG_MACH_ASPENITE=y -CONFIG_MACH_ZYLONITE2=y -CONFIG_MACH_AVENGERS_LITE=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/nfs rootfstype=nfs nfsroot=192.168.2.100:/nfsroot/ ip=192.168.2.101:192.168.2.100::255.255.255.0::eth0:on console=ttyS0,115200 mem=128M" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_STANDALONE is not set -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -# CONFIG_BLK_DEV is not set -# CONFIG_MISC_DEVICES is not set -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_INOTIFY=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_PREEMPT is not set -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/pxa255-idp_defconfig b/arch/arm/configs/pxa255-idp_defconfig deleted file mode 100755 index 917a070b4..000000000 --- a/arch/arm/configs/pxa255-idp_defconfig +++ /dev/null @@ -1,59 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_MODULES=y -CONFIG_ARCH_PXA=y -CONFIG_ARCH_PXA_IDP=y -# CONFIG_ARM_THUMB is not set -CONFIG_LEDS=y -CONFIG_LEDS_CPU=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/nfs ip=dhcp console=ttyS0,115200 mem=64M" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_IPV6 is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_2 is not set -# CONFIG_MTD_CFI_I1 is not set -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_IDE=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO_SERPORT is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_FB=y -CONFIG_FB_PXA=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -CONFIG_LOGO=y -CONFIG_EXT2_FS=y -CONFIG_MSDOS_FS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_ISO8859_1=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/pxa3xx_defconfig b/arch/arm/configs/pxa3xx_defconfig deleted file mode 100755 index 1677a0607..000000000 --- a/arch/arm/configs/pxa3xx_defconfig +++ /dev/null @@ -1,134 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=18 -CONFIG_SYSFS_DEPRECATED_V2=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_KALLSYMS_ALL=y -CONFIG_SLAB=y -CONFIG_MODULES=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_PXA=y -CONFIG_MACH_LITTLETON=y -CONFIG_MACH_TAVOREVB=y -CONFIG_MACH_SAAR=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/nfs rootfstype=nfs nfsroot=192.168.1.100:/nfsroot/ ip=192.168.1.101:192.168.1.100::255.255.255.0::eth0:on console=ttyS0,115200 mem=64M debug" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_STANDALONE is not set -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y -CONFIG_MTD_NAND_PXA3xx=y -CONFIG_MTD_NAND_PXA3xx_BUILTIN=y -CONFIG_MTD_ONENAND=y -CONFIG_MTD_ONENAND_VERIFY_WRITE=y -CONFIG_MTD_ONENAND_GENERIC=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -# CONFIG_MISC_DEVICES is not set -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -CONFIG_KEYBOARD_PXA27x=y -CONFIG_KEYBOARD_PXA930_ROTARY=y -CONFIG_MOUSE_PXA930_TRKBALL=y -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -# CONFIG_I2C_HELPER_AUTO is not set -CONFIG_I2C_PXA=y -CONFIG_SPI=y -CONFIG_SPI_PXA2XX=y -CONFIG_GPIO_MAX732X=y -CONFIG_GPIO_PCA953X=y -CONFIG_GPIO_PCF857X=y -CONFIG_GPIO_MAX7301=y -CONFIG_POWER_SUPPLY=y -CONFIG_POWER_SUPPLY_DEBUG=y -CONFIG_PDA_POWER=y -CONFIG_BATTERY_DA9030=y -# CONFIG_HWMON is not set -CONFIG_PMIC_DA903X=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_DEBUG=y -CONFIG_REGULATOR_VIRTUAL_CONSUMER=y -CONFIG_REGULATOR_DA903X=y -CONFIG_FB=y -CONFIG_FB_PXA=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_LCD_TDO24M=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_BACKLIGHT_GENERIC is not set -CONFIG_BACKLIGHT_DA903X=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -CONFIG_FONTS=y -CONFIG_FONT_6x11=y -CONFIG_LOGO=y -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_MMC=y -CONFIG_MMC_PXA=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m -CONFIG_LEDS_GPIO=m -CONFIG_LEDS_DA903X=m -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_LEDS_TRIGGER_BACKLIGHT=m -CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_FS_WBUF_VERIFY=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_LZO=y -CONFIG_JFFS2_RUBIN=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NLS=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_SHIRQ=y -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y -# CONFIG_SCHED_DEBUG is not set -CONFIG_DEBUG_SPINLOCK=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_FTRACE is not set -CONFIG_DEBUG_USER=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set diff --git a/arch/arm/configs/pxa910_defconfig b/arch/arm/configs/pxa910_defconfig deleted file mode 100755 index 1cd381e1d..000000000 --- a/arch/arm/configs/pxa910_defconfig +++ /dev/null @@ -1,70 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_MMP=y -CONFIG_MACH_TAVOREVB=y -CONFIG_MACH_TTC_DKB=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/nfs rootfstype=nfs nfsroot=192.168.2.100:/nfsroot/ ip=192.168.2.101:192.168.2.100::255.255.255.0::eth0:on console=ttyS0,115200 mem=128M" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_STANDALONE is not set -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -# CONFIG_BLK_DEV is not set -# CONFIG_MISC_DEVICES is not set -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_INOTIFY=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_PREEMPT is not set -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/qil-a9260_defconfig b/arch/arm/configs/qil-a9260_defconfig deleted file mode 100755 index 9160f3b77..000000000 --- a/arch/arm/configs/qil-a9260_defconfig +++ /dev/null @@ -1,115 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91SAM9260=y -CONFIG_MACH_QIL_A9260=y -CONFIG_AT91_SLOW_CLOCK=y -CONFIG_AT91_EARLY_USART0=y -# CONFIG_ARM_THUMB is not set -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=64M console=ttyS1,115200" -CONFIG_FPE_NWFPE=y -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y -CONFIG_BLK_DEV_LOOP=y -# CONFIG_MISC_DEVICES is not set -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -CONFIG_MACB=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_SPI=y -CONFIG_SPI_ATMEL=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_NOWAYOUT=y -# CONFIG_VGA_CONSOLE is not set -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_ETH=m -CONFIG_MMC=y -CONFIG_MMC_AT91=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_M41T94=y -CONFIG_EXT2_FS=y -CONFIG_INOTIFY=y -CONFIG_FUSE_FS=m -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y -# CONFIG_CRYPTO_HW is not set diff --git a/arch/arm/configs/raumfeld_defconfig b/arch/arm/configs/raumfeld_defconfig deleted file mode 100755 index f7caa909b..000000000 --- a/arch/arm/configs/raumfeld_defconfig +++ /dev/null @@ -1,208 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_LBDAF is not set -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_PXA=y -CONFIG_MACH_RAUMFELD_RC=y -CONFIG_MACH_RAUMFELD_CONNECTOR=y -CONFIG_MACH_RAUMFELD_SPEAKER=y -CONFIG_NO_HZ=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_CMDLINE="console=ttyS0,115200 rw" -CONFIG_CPU_FREQ=y -CONFIG_CPU_IDLE=y -CONFIG_PM=y -CONFIG_APM_EMULATION=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_SYN_COOKIES=y -# CONFIG_INET_LRO is not set -CONFIG_IPV6=y -CONFIG_CFG80211=y -CONFIG_CFG80211_REG_DEBUG=y -CONFIG_MAC80211=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_NFTL=y -CONFIG_NFTL_RW=y -CONFIG_MTD_BLOCK2MTD=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_PXA3xx=y -CONFIG_MTD_UBI=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_ISL29003=y -CONFIG_TI_DAC7512=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SMSC911X=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_LIBERTAS=y -CONFIG_LIBERTAS_SDIO=m -CONFIG_USB_USBNET=y -# CONFIG_USB_NET_AX8817X is not set -# CONFIG_USB_NET_NET1080 is not set -CONFIG_USB_NET_MCS7830=y -# CONFIG_USB_NET_CDC_SUBSET is not set -# CONFIG_USB_NET_ZAURUS is not set -CONFIG_INPUT_EVDEV=y -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_EETI=m -CONFIG_INPUT_MISC=y -CONFIG_INPUT_GPIO_ROTARY_ENCODER=y -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_PXA=y -CONFIG_SPI=y -CONFIG_SPI_DEBUG=y -CONFIG_SPI_GPIO=y -CONFIG_SPI_SPIDEV=y -CONFIG_DEBUG_GPIO=y -CONFIG_W1_MASTER_GPIO=m -CONFIG_POWER_SUPPLY=y -CONFIG_PDA_POWER=y -CONFIG_BATTERY_DS2760=m -CONFIG_SENSORS_LIS3_SPI=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_DEBUG=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_REGULATOR_MAX8660=y -CONFIG_FB=y -CONFIG_FB_PXA=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_BACKLIGHT_GENERIC is not set -CONFIG_BACKLIGHT_PWM=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -# CONFIG_LOGO_LINUX_CLUT224 is not set -CONFIG_SOUND=y -CONFIG_SND=y -# CONFIG_SND_DRIVERS is not set -# CONFIG_SND_USB is not set -CONFIG_SND_SOC=y -CONFIG_SND_PXA2XX_SOC=y -CONFIG_SND_SOC_RAUMFELD=y -CONFIG_HID_DRAGONRISE=y -CONFIG_HID_GYRATION=y -CONFIG_HID_TWINHAN=y -CONFIG_HID_NTRIG=y -CONFIG_HID_PANTHERLORD=y -CONFIG_HID_PETALYNX=y -CONFIG_HID_SAMSUNG=y -CONFIG_HID_SONY=y -CONFIG_HID_SUNPLUS=y -CONFIG_HID_GREENASIA=y -CONFIG_HID_SMARTJOYPLUS=y -CONFIG_HID_TOPSEED=y -CONFIG_HID_THRUSTMASTER=y -CONFIG_HID_ZEROPLUS=y -CONFIG_USB=y -CONFIG_USB_DEBUG=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_MMC=y -CONFIG_MMC_PXA=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_LT3593=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_BACKLIGHT=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_PXA=y -CONFIG_DMADEVICES=y -CONFIG_UIO=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XIP=y -CONFIG_EXT3_FS=y -CONFIG_INOTIFY=y -CONFIG_FSCACHE=y -CONFIG_FSCACHE_STATS=y -CONFIG_CACHEFILES=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_UBIFS_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_NFS_FSCACHE=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_737=y -CONFIG_NLS_CODEPAGE_775=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_CODEPAGE_852=y -CONFIG_NLS_CODEPAGE_855=y -CONFIG_NLS_CODEPAGE_857=y -CONFIG_NLS_CODEPAGE_860=y -CONFIG_NLS_CODEPAGE_861=y -CONFIG_NLS_CODEPAGE_862=y -CONFIG_NLS_CODEPAGE_863=y -CONFIG_NLS_CODEPAGE_864=y -CONFIG_NLS_CODEPAGE_865=y -CONFIG_NLS_CODEPAGE_866=y -CONFIG_NLS_CODEPAGE_869=y -CONFIG_NLS_CODEPAGE_936=y -CONFIG_NLS_CODEPAGE_950=y -CONFIG_NLS_CODEPAGE_932=y -CONFIG_NLS_CODEPAGE_949=y -CONFIG_NLS_CODEPAGE_874=y -CONFIG_NLS_ISO8859_8=y -CONFIG_NLS_CODEPAGE_1250=y -CONFIG_NLS_CODEPAGE_1251=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=y -CONFIG_NLS_ISO8859_3=y -CONFIG_NLS_ISO8859_4=y -CONFIG_NLS_ISO8859_5=y -CONFIG_NLS_ISO8859_6=y -CONFIG_NLS_ISO8859_7=y -CONFIG_NLS_ISO8859_9=y -CONFIG_NLS_ISO8859_13=y -CONFIG_NLS_ISO8859_14=y -CONFIG_NLS_ISO8859_15=y -CONFIG_NLS_KOI8_R=y -CONFIG_NLS_KOI8_U=y -CONFIG_NLS_UTF8=y -CONFIG_PRINTK_TIME=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set diff --git a/arch/arm/configs/realview-smp_defconfig b/arch/arm/configs/realview-smp_defconfig deleted file mode 100755 index abe61bf37..000000000 --- a/arch/arm/configs/realview-smp_defconfig +++ /dev/null @@ -1,101 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_REALVIEW=y -CONFIG_MACH_REALVIEW_EB=y -CONFIG_REALVIEW_EB_ARM11MP=y -CONFIG_MACH_REALVIEW_PB11MP=y -CONFIG_SMP=y -CONFIG_HOTPLUG_CPU=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M" -CONFIG_VFP=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP=y -CONFIG_ARM_CHARLCD=y -CONFIG_NETDEVICES=y -CONFIG_SMSC_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -CONFIG_SMSC911X=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_SERIO_SERPORT is not set -CONFIG_SERIO_AMBAKMI=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=16 -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_VERSATILE=y -CONFIG_SPI=y -CONFIG_GPIOLIB=y -# CONFIG_HWMON is not set -CONFIG_FB=y -CONFIG_FB_ARMCLCD=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y -# CONFIG_SND_DRIVERS is not set -CONFIG_SND_ARMAACI=y -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_MMC=y -CONFIG_MMC_ARMMMCI=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_DS1307=y -CONFIG_RTC_DRV_PL031=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_FTRACE is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set diff --git a/arch/arm/configs/realview_defconfig b/arch/arm/configs/realview_defconfig deleted file mode 100755 index 7079cbe89..000000000 --- a/arch/arm/configs/realview_defconfig +++ /dev/null @@ -1,100 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_REALVIEW=y -CONFIG_MACH_REALVIEW_EB=y -CONFIG_REALVIEW_EB_ARM11MP=y -CONFIG_MACH_REALVIEW_PB11MP=y -CONFIG_MACH_REALVIEW_PB1176=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M" -CONFIG_VFP=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP=y -CONFIG_ARM_CHARLCD=y -CONFIG_NETDEVICES=y -CONFIG_SMSC_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -CONFIG_SMSC911X=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_SERIO_SERPORT is not set -CONFIG_SERIO_AMBAKMI=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=16 -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_VERSATILE=y -CONFIG_SPI=y -CONFIG_GPIOLIB=y -# CONFIG_HWMON is not set -CONFIG_FB=y -CONFIG_FB_ARMCLCD=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y -# CONFIG_SND_DRIVERS is not set -CONFIG_SND_ARMAACI=y -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_MMC=y -CONFIG_MMC_ARMMMCI=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_DS1307=y -CONFIG_RTC_DRV_PL031=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_FTRACE is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set diff --git a/arch/arm/configs/rpc_defconfig b/arch/arm/configs/rpc_defconfig deleted file mode 100755 index af278f7a2..000000000 --- a/arch/arm/configs/rpc_defconfig +++ /dev/null @@ -1,135 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_RPC=y -CONFIG_CPU_ARM610=y -CONFIG_CPU_ARM710=y -CONFIG_CPU_SA110=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_AOUT=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -CONFIG_PARPORT=y -CONFIG_PARPORT_PC=y -CONFIG_PARPORT_PC_FIFO=y -CONFIG_BLK_DEV_FD=y -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=m -CONFIG_BLK_DEV_SR=y -CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_ARXESCSI=m -CONFIG_SCSI_CUMANA_2=m -CONFIG_SCSI_EESOXSCSI=m -CONFIG_SCSI_POWERTECSCSI=y -CONFIG_SCSI_CUMANA_1=m -CONFIG_SCSI_OAK1=m -CONFIG_ATA=y -CONFIG_PATA_ICSIDE=y -CONFIG_PATA_PLATFORM=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_ARM_ETHER1=y -CONFIG_ARM_ETHER3=y -CONFIG_ARM_ETHERH=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_PPP=m -CONFIG_PPPOE=m -CONFIG_INPUT_EVDEV=y -# CONFIG_MOUSE_PS2 is not set -CONFIG_MOUSE_RISCPC=y -# CONFIG_SERIO_SERPORT is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=16 -CONFIG_SERIAL_8250_RUNTIME_UARTS=8 -CONFIG_SERIAL_8250_ACORN=y -CONFIG_LEGACY_PTY_COUNT=64 -CONFIG_PRINTER=m -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -# CONFIG_HWMON is not set -CONFIG_FB=y -CONFIG_FB_ACORN=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FONTS=y -CONFIG_FONT_8x16=y -CONFIG_FONT_ACORN_8x8=y -CONFIG_LOGO=y -CONFIG_SOUND=m -CONFIG_SOUND_PRIME=m -CONFIG_SOUND_OSS=m -CONFIG_SOUND_VIDC=m -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_PCF8583=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_INOTIFY=y -CONFIG_AUTOFS4_FS=m -CONFIG_ISO9660_FS=y -CONFIG_JOLIET=y -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_ADFS_FS=y -CONFIG_NFS_FS=y -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION_CUMANA is not set -# CONFIG_ACORN_PARTITION_EESOX is not set -CONFIG_BSD_DISKLABEL=y -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_KOI8_R=m -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig deleted file mode 100755 index f9096c1b0..000000000 --- a/arch/arm/configs/s3c2410_defconfig +++ /dev/null @@ -1,489 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=m -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_S3C2410=y -CONFIG_S3C_BOOT_ERROR_RESET=y -CONFIG_S3C_ADC=y -CONFIG_S3C24XX_PWM=y -CONFIG_ARCH_SMDK2410=y -CONFIG_ARCH_H1940=y -CONFIG_MACH_N30=y -CONFIG_ARCH_BAST=y -CONFIG_MACH_OTOM=y -CONFIG_MACH_AML_M5900=y -CONFIG_MACH_TCT_HAMMER=y -CONFIG_MACH_VR1000=y -CONFIG_MACH_QT2410=y -CONFIG_MACH_JIVE=y -CONFIG_MACH_SMDK2412=y -CONFIG_MACH_VSTMS=y -CONFIG_MACH_SMDK2416=y -CONFIG_MACH_ANUBIS=y -CONFIG_MACH_NEO1973_GTA02=y -CONFIG_MACH_OSIRIS=y -CONFIG_MACH_OSIRIS_DVS=m -CONFIG_MACH_RX3715=y -CONFIG_ARCH_S3C2440=y -CONFIG_MACH_NEXCODER_2440=y -CONFIG_SMDK2440_CPU2442=y -CONFIG_MACH_AT2440EVB=y -CONFIG_MACH_MINI2440=y -CONFIG_MACH_RX1950=y -CONFIG_MACH_SMDK2443=y -# CONFIG_ARM_THUMB is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/hda1 ro init=/bin/bash console=ttySAC0" -CONFIG_FPE_NWFPE=y -CONFIG_FPE_NWFPE_XP=y -CONFIG_BINFMT_AOUT=y -CONFIG_PM=y -CONFIG_APM_EMULATION=m -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=m -CONFIG_NET_KEY=m -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE=m -CONFIG_INET_AH=m -CONFIG_INET_ESP=m -CONFIG_INET_IPCOMP=m -# CONFIG_INET_LRO is not set -CONFIG_TCP_CONG_ADVANCED=y -CONFIG_TCP_CONG_HSTCP=m -CONFIG_TCP_CONG_HYBLA=m -CONFIG_TCP_CONG_SCALABLE=m -CONFIG_TCP_CONG_LP=m -CONFIG_TCP_CONG_VENO=m -CONFIG_TCP_CONG_YEAH=m -CONFIG_TCP_CONG_ILLINOIS=m -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m -CONFIG_IPV6_TUNNEL=m -CONFIG_NETFILTER=y -CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NF_CONNTRACK=m -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CT_PROTO_DCCP=m -CONFIG_NF_CT_PROTO_SCTP=m -CONFIG_NF_CT_PROTO_UDPLITE=m -CONFIG_NF_CONNTRACK_AMANDA=m -CONFIG_NF_CONNTRACK_FTP=m -CONFIG_NF_CONNTRACK_H323=m -CONFIG_NF_CONNTRACK_IRC=m -CONFIG_NF_CONNTRACK_NETBIOS_NS=m -CONFIG_NF_CONNTRACK_PPTP=m -CONFIG_NF_CONNTRACK_SANE=m -CONFIG_NF_CONNTRACK_SIP=m -CONFIG_NF_CONNTRACK_TFTP=m -CONFIG_NF_CT_NETLINK=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -CONFIG_NETFILTER_XT_TARGET_LED=m -CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_TARGET_NFLOG=m -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -CONFIG_NETFILTER_XT_MATCH_DSCP=m -CONFIG_NETFILTER_XT_MATCH_ESP=m -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -CONFIG_NETFILTER_XT_MATCH_HELPER=m -CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -CONFIG_NETFILTER_XT_MATCH_OWNER=m -CONFIG_NETFILTER_XT_MATCH_POLICY=m -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -CONFIG_NETFILTER_XT_MATCH_RATEEST=m -CONFIG_NETFILTER_XT_MATCH_REALM=m -CONFIG_NETFILTER_XT_MATCH_RECENT=m -CONFIG_NETFILTER_XT_MATCH_SCTP=m -CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_TIME=m -CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_IP_VS=m -CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_ADDRTYPE=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT=m -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m -CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_IP6_NF_QUEUE=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_TARGET_LOG=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIUART_LL=y -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIVHCI=m -CONFIG_CFG80211=m -CONFIG_MAC80211=m -CONFIG_MAC80211_MESH=y -CONFIG_MAC80211_LEDS=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_ROM=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_S3C2410=y -CONFIG_PARPORT=y -CONFIG_PARPORT_PC=m -CONFIG_PARPORT_AX88796=m -CONFIG_PARPORT_1284=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_UB=m -CONFIG_BLK_DEV_RAM=y -CONFIG_ATA_OVER_ETH=m -CONFIG_EEPROM_AT25=m -CONFIG_EEPROM_LEGACY=m -CONFIG_EEPROM_93CX6=m -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECD=y -CONFIG_BLK_DEV_IDETAPE=m -CONFIG_BLK_DEV_PLATFORM=y -CONFIG_SCSI=y -CONFIG_SCSI_TGT=m -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=m -CONFIG_BLK_DEV_SR=m -CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_SCH=m -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_DM9000=y -CONFIG_INPUT_EVDEV=y -CONFIG_MOUSE_APPLETOUCH=m -CONFIG_MOUSE_BCM5974=m -CONFIG_INPUT_JOYSTICK=y -CONFIG_JOYSTICK_ANALOG=m -CONFIG_JOYSTICK_A3D=m -CONFIG_JOYSTICK_ADI=m -CONFIG_JOYSTICK_COBRA=m -CONFIG_JOYSTICK_GF2K=m -CONFIG_JOYSTICK_GRIP=m -CONFIG_JOYSTICK_GRIP_MP=m -CONFIG_JOYSTICK_GUILLEMOT=m -CONFIG_JOYSTICK_INTERACT=m -CONFIG_JOYSTICK_SIDEWINDER=m -CONFIG_JOYSTICK_TMDC=m -CONFIG_JOYSTICK_IFORCE=m -CONFIG_JOYSTICK_MAGELLAN=m -CONFIG_JOYSTICK_SPACEORB=m -CONFIG_JOYSTICK_SPACEBALL=m -CONFIG_JOYSTICK_STINGER=m -CONFIG_JOYSTICK_TWIDJOY=m -CONFIG_JOYSTICK_ZHENHUA=m -CONFIG_JOYSTICK_DB9=m -CONFIG_JOYSTICK_GAMECON=m -CONFIG_JOYSTICK_TURBOGRAFX=m -CONFIG_JOYSTICK_JOYDUMP=m -CONFIG_JOYSTICK_XPAD=m -CONFIG_JOYSTICK_XPAD_FF=y -CONFIG_JOYSTICK_XPAD_LEDS=y -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -CONFIG_INPUT_MISC=y -CONFIG_INPUT_ATI_REMOTE=m -CONFIG_INPUT_ATI_REMOTE2=m -CONFIG_INPUT_KEYSPAN_REMOTE=m -CONFIG_INPUT_POWERMATE=m -CONFIG_INPUT_YEALINK=m -CONFIG_INPUT_CM109=m -CONFIG_INPUT_UINPUT=m -CONFIG_INPUT_GPIO_ROTARY_ENCODER=m -CONFIG_SERIAL_NONSTANDARD=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=8 -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_SAMSUNG=y -CONFIG_SERIAL_SAMSUNG_CONSOLE=y -CONFIG_PRINTER=y -CONFIG_PPDEV=y -CONFIG_HW_RANDOM=y -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_S3C2410=y -CONFIG_I2C_SIMTEC=y -CONFIG_SPI=y -CONFIG_SPI_GPIO=m -CONFIG_SPI_S3C24XX=m -CONFIG_SPI_S3C24XX_GPIO=m -CONFIG_SPI_SPIDEV=m -CONFIG_SPI_TLE62X0=m -CONFIG_SENSORS_LM75=m -CONFIG_SENSORS_LM78=m -CONFIG_SENSORS_LM85=m -CONFIG_WATCHDOG=y -CONFIG_S3C2410_WATCHDOG=y -CONFIG_MFD_SM501=y -CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_S3C2410=y -CONFIG_FB_SM501=y -CONFIG_BACKLIGHT_PWM=m -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_SEQUENCER=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_SEQUENCER_OSS=y -CONFIG_SND_VERBOSE_PRINTK=y -# CONFIG_SND_DRIVERS is not set -# CONFIG_SND_ARM is not set -# CONFIG_SND_SPI is not set -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_USB_CAIAQ=m -CONFIG_SND_SOC=y -CONFIG_SND_S3C24XX_SOC=y -CONFIG_SND_S3C24XX_SOC_JIVE_WM8750=m -CONFIG_SND_S3C24XX_SOC_SMDK2443_WM9710=m -CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650=m -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m -CONFIG_USB_WDM=m -CONFIG_USB_STORAGE=m -CONFIG_USB_STORAGE_DATAFAB=m -CONFIG_USB_STORAGE_FREECOM=m -CONFIG_USB_STORAGE_ISD200=m -CONFIG_USB_STORAGE_USBAT=m -CONFIG_USB_STORAGE_SDDR09=m -CONFIG_USB_STORAGE_SDDR55=m -CONFIG_USB_STORAGE_JUMPSHOT=m -CONFIG_USB_STORAGE_ALAUDA=m -CONFIG_USB_STORAGE_ONETOUCH=m -CONFIG_USB_STORAGE_KARMA=m -CONFIG_USB_STORAGE_CYPRESS_ATACB=m -CONFIG_USB_LIBUSUAL=y -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m -CONFIG_USB_USS720=m -CONFIG_USB_SERIAL=y -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_FTDI_SIO=y -CONFIG_USB_SERIAL_NAVMAN=m -CONFIG_USB_SERIAL_PL2303=y -CONFIG_USB_SERIAL_OPTION=m -CONFIG_USB_EMI62=m -CONFIG_USB_EMI26=m -CONFIG_USB_ADUTUX=m -CONFIG_USB_SEVSEG=m -CONFIG_USB_RIO500=m -CONFIG_USB_LEGOTOWER=m -CONFIG_USB_LCD=m -CONFIG_USB_LED=m -CONFIG_USB_CYPRESS_CY7C63=m -CONFIG_USB_CYTHERM=m -CONFIG_USB_IDMOUSE=m -CONFIG_USB_FTDI_ELAN=m -CONFIG_USB_APPLEDISPLAY=m -CONFIG_USB_LD=m -CONFIG_USB_TRANCEVIBRATOR=m -CONFIG_USB_IOWARRIOR=m -CONFIG_USB_TEST=m -CONFIG_MMC=y -CONFIG_SDIO_UART=m -CONFIG_MMC_TEST=m -CONFIG_MMC_SDHCI=m -CONFIG_MMC_SPI=m -CONFIG_MMC_S3C=y -CONFIG_LEDS_CLASS=m -CONFIG_LEDS_S3C24XX=m -CONFIG_LEDS_H1940=m -CONFIG_LEDS_PCA9532=m -CONFIG_LEDS_GPIO=m -CONFIG_LEDS_PCA955X=m -CONFIG_LEDS_DAC124S085=m -CONFIG_LEDS_PWM=m -CONFIG_LEDS_BD2802=m -CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_S3C=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT4_FS=m -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_INOTIFY=y -CONFIG_AUTOFS_FS=m -CONFIG_AUTOFS4_FS=m -CONFIG_FUSE_FS=m -CONFIG_ISO9660_FS=y -CONFIG_JOLIET=y -CONFIG_UDF_FS=m -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_NTFS_FS=m -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_CONFIGFS_FS=m -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_CRAMFS=y -CONFIG_SQUASHFS=m -CONFIG_ROMFS_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=m -CONFIG_NFSD_V3_ACL=y -CONFIG_NFSD_V4=y -CONFIG_CIFS=m -CONFIG_PARTITION_ADVANCED=y -CONFIG_BSD_DISKLABEL=y -CONFIG_SOLARIS_X86_PARTITION=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=m -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_MUTEXES=y -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set diff --git a/arch/arm/configs/s3c6400_defconfig b/arch/arm/configs/s3c6400_defconfig deleted file mode 100755 index ba6a51508..000000000 --- a/arch/arm/configs/s3c6400_defconfig +++ /dev/null @@ -1,93 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_ALL=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_S3C64XX=y -CONFIG_S3C_BOOT_ERROR_RESET=y -CONFIG_MACH_SMDK6400=y -CONFIG_MACH_ANW6410=y -CONFIG_MACH_SMDK6410=y -CONFIG_MACH_NCP=y -CONFIG_MACH_HMT=y -CONFIG_MACH_SMARTQ5=y -CONFIG_MACH_SMARTQ7=y -CONFIG_CPU_32v6K=y -CONFIG_AEABI=y -CONFIG_CMDLINE="console=ttySAC0,115200 root=/dev/ram init=/linuxrc initrd=0x51000000,6M ramdisk_size=6144" -CONFIG_VFP=y -CONFIG_PM=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_S3C2410=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_EEPROM_AT24=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_SAMSUNG=y -CONFIG_SERIAL_SAMSUNG_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_S3C2410=y -CONFIG_SPI=y -CONFIG_SPI_GPIO=m -CONFIG_SPI_S3C64XX=m -CONFIG_FB=y -CONFIG_FB_S3C=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_LCD_LTV350QV=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_PWM=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_SOUND=y -CONFIG_SND=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_SOC=m -CONFIG_SND_S3C24XX_SOC=m -CONFIG_SND_SOC_SMDK_WM9713=m -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_MMC=y -CONFIG_MMC_DEBUG=y -CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_SDIO_UART=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_S3C=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_S3C=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_INOTIFY=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_CRAMFS=y -CONFIG_ROMFS_FS=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_RT_MUTEXES=y -CONFIG_DEBUG_SPINLOCK=y -CONFIG_DEBUG_MUTEXES=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/s5p64x0_defconfig b/arch/arm/configs/s5p64x0_defconfig deleted file mode 100755 index ad6b61b0b..000000000 --- a/arch/arm/configs/s5p64x0_defconfig +++ /dev/null @@ -1,68 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_ALL=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_S5P64X0=y -CONFIG_S3C_BOOT_ERROR_RESET=y -CONFIG_S3C_LOWLEVEL_UART_PORT=1 -CONFIG_MACH_SMDK6440=y -CONFIG_MACH_SMDK6450=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_CPU_32v6K=y -CONFIG_AEABI=y -CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc" -CONFIG_FPE_NWFPE=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -# CONFIG_MISC_DEVICES is not set -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_NR_UARTS=3 -CONFIG_SERIAL_SAMSUNG=y -CONFIG_SERIAL_SAMSUNG_CONSOLE=y -CONFIG_HW_RANDOM=y -# CONFIG_HWMON is not set -CONFIG_DISPLAY_SUPPORT=y -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_INOTIFY=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_CRAMFS=y -CONFIG_ROMFS_FS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_RT_MUTEXES=y -CONFIG_DEBUG_SPINLOCK=y -CONFIG_DEBUG_MUTEXES=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -CONFIG_DEBUG_S3C_UART=1 -CONFIG_CRYPTO=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/s5pc100_defconfig b/arch/arm/configs/s5pc100_defconfig deleted file mode 100755 index 41bafc94d..000000000 --- a/arch/arm/configs/s5pc100_defconfig +++ /dev/null @@ -1,49 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_ALL=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_S5PC100=y -CONFIG_MACH_SMDKC100=y -CONFIG_AEABI=y -CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=cramfs init=/linuxrc console=ttySAC2,115200 mem=128M" -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_EEPROM_AT24=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_SAMSUNG=y -CONFIG_SERIAL_SAMSUNG_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_MMC=y -CONFIG_MMC_DEBUG=y -CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_SDIO_UART=y -CONFIG_MMC_SDHCI=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_INOTIFY=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_CRAMFS=y -CONFIG_ROMFS_FS=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_RT_MUTEXES=y -CONFIG_DEBUG_SPINLOCK=y -CONFIG_DEBUG_MUTEXES=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/s5pv210_defconfig b/arch/arm/configs/s5pv210_defconfig deleted file mode 100755 index fa9899022..000000000 --- a/arch/arm/configs/s5pv210_defconfig +++ /dev/null @@ -1,73 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_ALL=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_S5PV210=y -CONFIG_S3C_LOWLEVEL_UART_PORT=1 -CONFIG_S3C_DEV_FB=y -CONFIG_S5PV210_SETUP_FB_24BPP=y -CONFIG_MACH_AQUILA=y -CONFIG_MACH_GONI=y -CONFIG_MACH_SMDKC110=y -CONFIG_MACH_SMDKV210=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_VMSPLIT_2G=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc" -CONFIG_VFP=y -CONFIG_NEON=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -# CONFIG_MISC_DEVICES is not set -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_SAMSUNG=y -CONFIG_SERIAL_SAMSUNG_CONSOLE=y -CONFIG_HW_RANDOM=y -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_EXT2_FS=y -CONFIG_INOTIFY=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_CRAMFS=y -CONFIG_ROMFS_FS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_BSD_DISKLABEL=y -CONFIG_SOLARIS_X86_PARTITION=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_PREEMPT is not set -CONFIG_DEBUG_RT_MUTEXES=y -CONFIG_DEBUG_SPINLOCK=y -CONFIG_DEBUG_MUTEXES=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -CONFIG_EARLY_PRINTK=y -CONFIG_DEBUG_S3C_UART=1 -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/sam9_l9260_defconfig b/arch/arm/configs/sam9_l9260_defconfig deleted file mode 100755 index ecf253152..000000000 --- a/arch/arm/configs/sam9_l9260_defconfig +++ /dev/null @@ -1,148 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_AUDIT=y -CONFIG_LOG_BUF_SHIFT=15 -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91SAM9260=y -CONFIG_MACH_SAM9_L9260=y -CONFIG_MTD_AT91_DATAFLASH_CARD=y -CONFIG_PREEMPT=y -CONFIG_LEDS=y -CONFIG_LEDS_CPU=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200 mem=64M initrd=0x21100000,4194304 root=/dev/ram0 rw" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=y -CONFIG_NET_KEY=y -CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_IPV6 is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_BLOCK2MTD=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_MTD_NAND_PLATFORM=y -CONFIG_MTD_UBI=y -CONFIG_MTD_UBI_BEB_RESERVE=3 -CONFIG_MTD_UBI_GLUEBI=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -# CONFIG_MISC_DEVICES is not set -CONFIG_RAID_ATTRS=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -CONFIG_MACB=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=16 -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_LIBUSUAL=y -CONFIG_USB_GADGET=y -CONFIG_MMC=y -CONFIG_MMC_DEBUG=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_DS1553=y -CONFIG_RTC_DRV_DS1742=y -CONFIG_RTC_DRV_M48T86=y -CONFIG_RTC_DRV_V3020=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_INOTIFY=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_737=y -CONFIG_NLS_CODEPAGE_775=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_CODEPAGE_852=y -CONFIG_NLS_CODEPAGE_855=y -CONFIG_NLS_CODEPAGE_857=y -CONFIG_NLS_CODEPAGE_860=y -CONFIG_NLS_CODEPAGE_861=y -CONFIG_NLS_CODEPAGE_862=y -CONFIG_NLS_CODEPAGE_863=y -CONFIG_NLS_CODEPAGE_864=y -CONFIG_NLS_CODEPAGE_865=y -CONFIG_NLS_CODEPAGE_866=y -CONFIG_NLS_CODEPAGE_869=y -CONFIG_NLS_CODEPAGE_936=y -CONFIG_NLS_CODEPAGE_950=y -CONFIG_NLS_CODEPAGE_932=y -CONFIG_NLS_CODEPAGE_949=y -CONFIG_NLS_CODEPAGE_874=y -CONFIG_NLS_ISO8859_8=y -CONFIG_NLS_CODEPAGE_1250=y -CONFIG_NLS_CODEPAGE_1251=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=y -CONFIG_NLS_ISO8859_3=y -CONFIG_NLS_ISO8859_4=y -CONFIG_NLS_ISO8859_5=y -CONFIG_NLS_ISO8859_6=y -CONFIG_NLS_ISO8859_7=y -CONFIG_NLS_ISO8859_9=y -CONFIG_NLS_ISO8859_13=y -CONFIG_NLS_ISO8859_14=y -CONFIG_NLS_ISO8859_15=y -CONFIG_NLS_KOI8_R=y -CONFIG_NLS_KOI8_U=y -CONFIG_NLS_UTF8=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_UNUSED_SYMBOLS=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/shannon_defconfig b/arch/arm/configs/shannon_defconfig deleted file mode 100755 index b0b96942f..000000000 --- a/arch/arm/configs/shannon_defconfig +++ /dev/null @@ -1,48 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_MODULES=y -CONFIG_ARCH_SA1100=y -CONFIG_SA1100_SHANNON=y -CONFIG_PCCARD=y -CONFIG_PCMCIA_SA1100=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttySA0,9600 console=tty1 root=/dev/mtdblock2 init=/linuxrc" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_IPV6 is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_SA1100=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_IDE=m -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_NET_PCMCIA=y -CONFIG_PCMCIA_PCNET=y -CONFIG_PCMCIA_SMC91C92=y -CONFIG_SERIAL_SA1100=y -CONFIG_SERIAL_SA1100_CONSOLE=y -CONFIG_WATCHDOG=y -CONFIG_SA1100_WATCHDOG=y -CONFIG_FB=y -CONFIG_FB_SA1100=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_SOUND=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_JFFS2_FS=y -CONFIG_MINIX_FS=y -CONFIG_NFS_FS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_DEBUG_USER=y diff --git a/arch/arm/configs/shark_defconfig b/arch/arm/configs/shark_defconfig deleted file mode 100755 index caa07db90..000000000 --- a/arch/arm/configs/shark_defconfig +++ /dev/null @@ -1,81 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_SHARK=y -CONFIG_LEDS=y -CONFIG_LEDS_TIMER=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_STANDALONE is not set -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_PARPORT=m -CONFIG_PARPORT_PC=m -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECD=m -CONFIG_SCSI=m -CONFIG_BLK_DEV_SD=m -CONFIG_CHR_DEV_ST=m -CONFIG_BLK_DEV_SR=m -CONFIG_CHR_DEV_SG=m -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_NET_PCI=y -CONFIG_CS89x0=y -# CONFIG_SERIO_SERPORT is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_PRINTER=m -# CONFIG_HWMON is not set -CONFIG_FB=y -CONFIG_FB_CYBER2000=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_SOUND=m -CONFIG_SOUND_PRIME=m -CONFIG_SOUND_OSS=m -CONFIG_SOUND_SB=m -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_CMOS=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFSD=m -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_ISO8859_1=m -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_DEBUG_USER=y diff --git a/arch/arm/configs/simpad_defconfig b/arch/arm/configs/simpad_defconfig deleted file mode 100755 index d3358155b..000000000 --- a/arch/arm/configs/simpad_defconfig +++ /dev/null @@ -1,111 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_LOCALVERSION="oe1" -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_EXPERT=y -CONFIG_KALLSYMS_ALL=y -CONFIG_KALLSYMS_EXTRA_PASS=y -CONFIG_MODULES=y -CONFIG_ARCH_SA1100=y -CONFIG_SA1100_SIMPAD=y -CONFIG_PCCARD=y -CONFIG_PCMCIA_SA1100=y -CONFIG_PREEMPT=y -CONFIG_LEDS=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mtdparts=sa1100:512k(boot),1m(kernel),-(root) console=ttySA0 root=1f02 noinitrd mem=64M jffs2_orphaned_inodes=delete rootfstype=jffs2" -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_MISC=m -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_IPV6 is not set -CONFIG_IRDA=m -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -CONFIG_IRTTY_SIR=m -CONFIG_SA1100_FIR=m -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_CFI_I2 is not set -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_RAM=y -CONFIG_MTD_SA1100=y -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_RAM=m -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_NET_ETHERNET=y -CONFIG_NET_PCI=y -CONFIG_NET_PCMCIA=y -CONFIG_PCMCIA_3C589=m -CONFIG_PCMCIA_3C574=m -CONFIG_PCMCIA_PCNET=m -CONFIG_PCMCIA_SMC91C92=m -CONFIG_PCMCIA_XIRC2PS=m -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPPOE=m -CONFIG_INPUT_MOUSEDEV_SCREEN_X=800 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=600 -CONFIG_INPUT_EVDEV=m -CONFIG_INPUT_EVBUG=y -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_SERIO=m -CONFIG_SERIAL_SA1100=y -CONFIG_SERIAL_SA1100_CONSOLE=y -CONFIG_FB=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -CONFIG_SOUND=y -CONFIG_EXT2_FS=m -CONFIG_EXT3_FS=m -CONFIG_REISERFS_FS=m -CONFIG_REISERFS_PROC_INFO=y -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=m -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_SMB_FS=m -CONFIG_NLS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_15=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/spear3xx_defconfig b/arch/arm/configs/spear3xx_defconfig deleted file mode 100755 index fea7e1f02..000000000 --- a/arch/arm/configs/spear3xx_defconfig +++ /dev/null @@ -1,53 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_EXTRA_PASS=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_PLAT_SPEAR=y -CONFIG_BOARD_SPEAR300_EVB=y -CONFIG_BOARD_SPEAR310_EVB=y -CONFIG_BOARD_SPEAR320_EVB=y -CONFIG_BINFMT_MISC=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_INPUT_FF_MEMLESS=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -CONFIG_RAW_DRIVER=y -CONFIG_MAX_RAW_DEVS=8192 -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_PL061=y -# CONFIG_HWMON is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_AUTOFS4_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_IOCHARSET="ascii" -CONFIG_TMPFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=m -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_SPINLOCK=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -CONFIG_DEBUG_INFO=y -# CONFIG_CRC32 is not set diff --git a/arch/arm/configs/spear6xx_defconfig b/arch/arm/configs/spear6xx_defconfig deleted file mode 100755 index cef2e836a..000000000 --- a/arch/arm/configs/spear6xx_defconfig +++ /dev/null @@ -1,49 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_EXTRA_PASS=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_PLAT_SPEAR=y -CONFIG_ARCH_SPEAR6XX=y -CONFIG_BOARD_SPEAR600_EVB=y -CONFIG_BINFMT_MISC=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_INPUT_FF_MEMLESS=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_RAW_DRIVER=y -CONFIG_MAX_RAW_DEVS=8192 -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_PL061=y -# CONFIG_HWMON is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_AUTOFS4_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_IOCHARSET="ascii" -CONFIG_TMPFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=m -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_SPINLOCK=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -CONFIG_DEBUG_INFO=y -# CONFIG_CRC32 is not set diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig deleted file mode 100755 index 70158273c..000000000 --- a/arch/arm/configs/spitz_defconfig +++ /dev/null @@ -1,275 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_EXPERT=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=m -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_PXA=y -CONFIG_PXA_SHARPSL=y -CONFIG_MACH_AKITA=y -CONFIG_MACH_BORZOI=y -CONFIG_PCCARD=y -CONFIG_PCMCIA_PXA2XX=y -CONFIG_PREEMPT=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 debug" -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_AOUT=m -CONFIG_BINFMT_MISC=m -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_SYN_COOKIES=y -# CONFIG_INET_LRO is not set -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_TUNNEL=m -CONFIG_NETFILTER=y -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_ADDRTYPE=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m -CONFIG_IP6_NF_QUEUE=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -CONFIG_IRDA=m -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -CONFIG_PXA_FICP=m -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIDTL1=m -CONFIG_BT_HCIBT3C=m -CONFIG_BT_HCIBLUECARD=m -CONFIG_BT_HCIBTUART=m -CONFIG_BT_HCIVHCI=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_ROM=y -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y -CONFIG_MTD_NAND_SHARPSL=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECS=y -CONFIG_SCSI=m -CONFIG_BLK_DEV_SD=m -CONFIG_CHR_DEV_ST=m -CONFIG_CHR_DEV_OSST=m -CONFIG_BLK_DEV_SR=m -CONFIG_CHR_DEV_SG=m -CONFIG_SCSI_MULTI_LUN=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET=m -# CONFIG_USB_NET_CDC_SUBSET is not set -CONFIG_NET_PCMCIA=y -CONFIG_PCMCIA_PCNET=m -CONFIG_PPP=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_BSDCOMP=m -CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=m -# CONFIG_SERIO is not set -CONFIG_SERIAL_8250=m -CONFIG_SERIAL_8250_CS=m -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_SPI=y -CONFIG_SPI_PXA2XX=y -CONFIG_FB=y -CONFIG_FB_PXA=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_LCD_CORGI=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -CONFIG_USB_KBD=m -CONFIG_USB_MOUSE=m -CONFIG_HID_A4TECH=m -CONFIG_HID_APPLE=m -CONFIG_HID_BELKIN=m -CONFIG_HID_CHERRY=m -CONFIG_HID_CHICONY=m -CONFIG_HID_CYPRESS=m -CONFIG_HID_EZKEY=m -CONFIG_HID_GYRATION=m -CONFIG_HID_LOGITECH=m -CONFIG_HID_MICROSOFT=m -CONFIG_HID_MONTEREY=m -CONFIG_HID_PANTHERLORD=m -CONFIG_HID_PETALYNX=m -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_HID_SUNPLUS=m -CONFIG_USB=m -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=m -CONFIG_USB_OHCI_HCD=m -CONFIG_USB_SL811_HCD=m -CONFIG_USB_SL811_CS=m -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m -CONFIG_USB_STORAGE=m -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_BELKIN=m -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -CONFIG_USB_SERIAL_CYPRESS_M8=m -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_IPAQ=m -CONFIG_USB_SERIAL_IR=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_EDGEPORT_TI=m -CONFIG_USB_SERIAL_GARMIN=m -CONFIG_USB_SERIAL_IPW=m -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KLSI=m -CONFIG_USB_SERIAL_KOBIL_SCT=m -CONFIG_USB_SERIAL_MCT_U232=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_USB_SERIAL_SAFE=m -CONFIG_USB_SERIAL_TI=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m -CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_EMI62=m -CONFIG_USB_EMI26=m -CONFIG_USB_RIO500=m -CONFIG_USB_LEGOTOWER=m -CONFIG_USB_LCD=m -CONFIG_USB_LED=m -CONFIG_USB_CYTHERM=m -CONFIG_USB_IDMOUSE=m -CONFIG_USB_GADGET=m -CONFIG_USB_GADGET_DUMMY_HCD=y -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_MMC=y -CONFIG_MMC_PXA=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_XATTR is not set -CONFIG_INOTIFY=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_RUBIN=y -CONFIG_CRAMFS=m -CONFIG_NFS_FS=m -CONFIG_NFS_V3=y -CONFIG_NFS_V4=y -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_DEFAULT="cp437" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_UTF8=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_PREEMPT is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_FTRACE is not set -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_TWOFISH=m -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRC_CCITT=y -CONFIG_LIBCRC32C=m diff --git a/arch/arm/configs/stamp9g20_defconfig b/arch/arm/configs/stamp9g20_defconfig deleted file mode 100755 index d5e260b8b..000000000 --- a/arch/arm/configs/stamp9g20_defconfig +++ /dev/null @@ -1,129 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_TREE_PREEMPT_RCU=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_LBDAF is not set -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91SAM9G20=y -CONFIG_MACH_PORTUXG20=y -CONFIG_MACH_STAMP9G20=y -CONFIG_AT91_PROGRAMMABLE_CLOCKS=y -CONFIG_AT91_SLOW_CLOCK=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw" -CONFIG_KEXEC=y -CONFIG_CPU_IDLE=y -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -# CONFIG_WIRELESS is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -# CONFIG_MISC_DEVICES is not set -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_MACB=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_WLAN is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_GPIO=y -CONFIG_SPI=y -CONFIG_SPI_ATMEL=y -CONFIG_SPI_SPIDEV=y -CONFIG_GPIO_SYSFS=y -CONFIG_W1=y -CONFIG_W1_MASTER_GPIO=y -CONFIG_W1_SLAVE_THERM=y -CONFIG_W1_SLAVE_DS2431=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_AT91SAM9X_WATCHDOG=y -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=m -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_MMC=y -# CONFIG_MMC_AT91 is not set -CONFIG_MMC_ATMELMCI=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_AT91SAM9=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_INOTIFY=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_15=y -CONFIG_NLS_UTF8=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_ARM_UNWIND is not set diff --git a/arch/arm/configs/tct_hammer_defconfig b/arch/arm/configs/tct_hammer_defconfig deleted file mode 100755 index 95c0f0d63..000000000 --- a/arch/arm/configs/tct_hammer_defconfig +++ /dev/null @@ -1,70 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -# CONFIG_KALLSYMS is not set -# CONFIG_BUG is not set -# CONFIG_ELF_CORE is not set -# CONFIG_SHMEM is not set -CONFIG_SLOB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_S3C2410=y -CONFIG_MACH_TCT_HAMMER=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=64M root=/dev/ram0 init=/linuxrc rw" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=10240 -# CONFIG_MISC_DEVICES is not set -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -# CONFIG_VT_CONSOLE is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -CONFIG_USB=y -CONFIG_USB_DEBUG=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_S3C2410=y -CONFIG_USB_ETH=m -CONFIG_EXT2_FS=y -# CONFIG_DNOTIFY is not set -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -# CONFIG_PROC_SYSCTL is not set -CONFIG_JFFS2_FS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_DEBUG_KERNEL=y -# CONFIG_DETECT_SOFTLOCKUP is not set -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig deleted file mode 100755 index 8845f1c99..000000000 --- a/arch/arm/configs/tegra_defconfig +++ /dev/null @@ -1,146 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_CGROUPS=y -CONFIG_CGROUP_DEBUG=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_SCHED=y -CONFIG_RT_GROUP_SCHED=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_EMBEDDED=y -# CONFIG_SYSCTL_SYSCALL is not set -# CONFIG_ELF_CORE is not set -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_TEGRA=y -CONFIG_MACH_HARMONY=y -CONFIG_MACH_KAEN=y -CONFIG_MACH_PAZ00=y -CONFIG_MACH_TRIMSLICE=y -CONFIG_MACH_WARIO=y -CONFIG_TEGRA_DEBUG_UARTD=y -CONFIG_ARM_ERRATA_742230=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_SMP=y -CONFIG_NR_CPUS=2 -CONFIG_PREEMPT=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_HIGHMEM=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_VFP=y -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_INET_ESP=y -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -CONFIG_IPV6=y -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=y -CONFIG_INET6_ESP=y -CONFIG_INET6_IPCOMP=y -CONFIG_IPV6_MIP6=y -CONFIG_IPV6_TUNNEL=y -CONFIG_IPV6_MULTIPLE_TABLES=y -# CONFIG_WIRELESS is not set -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_BLK_DEV_LOOP=y -CONFIG_MISC_DEVICES=y -CONFIG_AD525X_DPOT=y -CONFIG_AD525X_DPOT_I2C=y -CONFIG_ICS932S401=y -CONFIG_APDS9802ALS=y -CONFIG_ISL29003=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_R8169=y -# CONFIG_NETDEV_10000 is not set -# CONFIG_WLAN is not set -# CONFIG_INPUT is not set -# CONFIG_SERIO is not set -# CONFIG_VT is not set -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -# CONFIG_I2C_COMPAT is not set -# CONFIG_I2C_HELPER_AUTO is not set -CONFIG_I2C_TEGRA=y -CONFIG_SENSORS_LM90=y -CONFIG_MFD_TPS6586X=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_TPS6586X=y -# CONFIG_USB_SUPPORT is not set -CONFIG_MMC=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SDHCI_TEGRA=y -CONFIG_STAGING=y -# CONFIG_STAGING_EXCLUDE_BUILD is not set -CONFIG_IIO=y -CONFIG_SENSORS_ISL29018=y -CONFIG_SENSORS_AK8975=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -# CONFIG_DNOTIFY is not set -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_NFS_FS=y -CONFIG_ROOT_NFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_EFI_PARTITION=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DETECT_HUNG_TASK=y -CONFIG_SCHEDSTATS=y -CONFIG_TIMER_STATS=y -CONFIG_DEBUG_SLAB=y -# CONFIG_DEBUG_PREEMPT is not set -CONFIG_DEBUG_MUTEXES=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_VM=y -CONFIG_DEBUG_SG=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_DEBUG_LL=y -CONFIG_EARLY_PRINTK=y -CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_AES=y -CONFIG_CRYPTO_ARC4=y -CONFIG_CRYPTO_TWOFISH=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRC_CCITT=y -CONFIG_CRC16=y diff --git a/arch/arm/configs/trizeps4_defconfig b/arch/arm/configs/trizeps4_defconfig deleted file mode 100755 index 3162173fa..000000000 --- a/arch/arm/configs/trizeps4_defconfig +++ /dev/null @@ -1,226 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -CONFIG_KALLSYMS_EXTRA_PASS=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_MODULE_SRCVERSION_ALL=y -CONFIG_ARCH_PXA=y -CONFIG_TRIZEPS_PXA=y -CONFIG_MACH_TRIZEPS4=y -CONFIG_PCCARD=y -# CONFIG_PCMCIA_LOAD_CIS is not set -CONFIG_PCMCIA_PXA2XX=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_CMDLINE="root=fe01 console=ttyS0,38400n8 loglevel=5" -CONFIG_FPE_NWFPE=y -CONFIG_FPE_NWFPE_XP=y -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=m -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_IPV6 is not set -CONFIG_NETFILTER=y -CONFIG_IP_NF_QUEUE=m -CONFIG_VLAN_8021Q=m -CONFIG_IRDA=m -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -CONFIG_IRDA_ULTRA=y -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -CONFIG_IRTTY_SIR=m -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m -CONFIG_CFG80211=y -CONFIG_CONNECTOR=y -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y -CONFIG_MTD_REDBOOT_PARTS_READONLY=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_LE_BYTE_SWAP=y -CONFIG_MTD_CFI_GEOMETRY=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_BLOCK2MTD=y -CONFIG_MTD_DOC2000=y -CONFIG_MTD_DOC2001=y -CONFIG_MTD_DOC2001PLUS=y -CONFIG_MTD_DOCPROBE_ADVANCED=y -CONFIG_MTD_DOCPROBE_ADDRESS=0x4000000 -CONFIG_MTD_DOCPROBE_HIGH=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_DISKONCHIP=y -CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y -CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x4000000 -CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y -CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y -CONFIG_MTD_ONENAND=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_NBD=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=8 -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECS=m -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_ATA=m -CONFIG_PATA_PCMCIA=m -CONFIG_PATA_PLATFORM=m -CONFIG_NETDEVICES=y -CONFIG_PHYLIB=y -CONFIG_NET_ETHERNET=y -CONFIG_DM9000=y -CONFIG_HOSTAP=y -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_HOSTAP_CS=y -CONFIG_HERMES=y -CONFIG_PCMCIA_HERMES=y -CONFIG_PCMCIA_SPECTRUM=y -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_INPUT_MOUSEDEV_SCREEN_X=640 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480 -CONFIG_INPUT_EVDEV=y -CONFIG_KEYBOARD_ATKBD=m -# CONFIG_MOUSE_PS2 is not set -CONFIG_MOUSE_SERIAL=m -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=m -CONFIG_SERIO_LIBPS2=y -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_PXA=y -CONFIG_I2C_PXA_SLAVE=y -CONFIG_WATCHDOG=y -CONFIG_SA1100_WATCHDOG=y -CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FB_PXA=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -CONFIG_LOGO=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_SEQUENCER=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y -CONFIG_SND_VERBOSE_PRINTK=y -CONFIG_SND_DEBUG=y -CONFIG_SND_PXA2XX_AC97=y -CONFIG_SND_USB_AUDIO=m -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=m -CONFIG_USB_SERIAL=m -CONFIG_USB_GADGET=m -CONFIG_USB_GADGET_DUMMY_HCD=y -CONFIG_MMC=y -CONFIG_MMC_PXA=y -CONFIG_NEW_LEDS=y -CONFIG_RTC_CLASS=y -# CONFIG_RTC_HCTOSYS is not set -CONFIG_RTC_DRV_PCF8583=m -CONFIG_RTC_DRV_SA1100=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_INOTIFY=y -CONFIG_AUTOFS4_FS=y -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-15" -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=y -CONFIG_NFSD_V4=y -CONFIG_SMB_FS=m -CONFIG_CIFS=m -CONFIG_PARTITION_ADVANCED=y -CONFIG_LDM_PARTITION=y -CONFIG_NLS_DEFAULT="iso8859-15" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_UTF8=m -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_USER=y -CONFIG_KEYS=y -CONFIG_KEYS_DEBUG_PROC_KEYS=y -CONFIG_SECURITY=y -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRC_CCITT=y -CONFIG_CRC16=y -CONFIG_LIBCRC32C=y diff --git a/arch/arm/configs/u300_defconfig b/arch/arm/configs/u300_defconfig deleted file mode 100755 index 4a5a12681..000000000 --- a/arch/arm/configs/u300_defconfig +++ /dev/null @@ -1,74 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_EXPERT=y -# CONFIG_AIO is not set -# CONFIG_VM_EVENT_COUNTERS is not set -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_LBDAF is not set -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_U300=y -CONFIG_MACH_U300=y -CONFIG_MACH_U300_BS335=y -CONFIG_MACH_U300_DUAL_RAM=y -CONFIG_U300_DEBUG=y -CONFIG_MACH_U300_SPIDUMMY=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/ram0 rw rootfstype=rootfs console=ttyAMA0,115200n8 lpj=515072" -CONFIG_CPU_IDLE=y -CONFIG_FPE_NWFPE=y -CONFIG_PM=y -# CONFIG_SUSPEND is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -# CONFIG_MISC_DEVICES is not set -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=16 -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_REGULATOR=y -CONFIG_FB=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_MMC=y -CONFIG_MMC_ARMMMCI=y -CONFIG_RTC_CLASS=y -# CONFIG_RTC_HCTOSYS is not set -CONFIG_RTC_DRV_COH901331=y -CONFIG_DMADEVICES=y -CONFIG_COH901318=y -# CONFIG_DNOTIFY is not set -CONFIG_FUSE_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_PRINTK_TIME=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -CONFIG_TIMER_STATS=y -# CONFIG_DEBUG_PREEMPT is not set -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_CRC32 is not set diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig deleted file mode 100755 index a5cce242a..000000000 --- a/arch/arm/configs/u8500_defconfig +++ /dev/null @@ -1,105 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_ALL=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_LBDAF is not set -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_U8500=y -CONFIG_UX500_SOC_DB5500=y -CONFIG_UX500_SOC_DB8500=y -CONFIG_MACH_U8500=y -CONFIG_MACH_U5500=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_SMP=y -CONFIG_NR_CPUS=2 -CONFIG_HOTPLUG_CPU=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_CMDLINE="root=/dev/ram0 console=ttyAMA2,115200n8" -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y -CONFIG_VFP=y -CONFIG_NEON=y -CONFIG_NET=y -CONFIG_PHONET=y -CONFIG_PHONET_PIPECTRLR=y -# CONFIG_WIRELESS is not set -CONFIG_CAIF=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=65536 -CONFIG_MISC_DEVICES=y -CONFIG_AB8500_PWM=y -CONFIG_SENSORS_BH1780=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -CONFIG_KEYBOARD_NOMADIK=y -CONFIG_KEYBOARD_STMPE=y -CONFIG_KEYBOARD_TC3589X=y -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_BU21013=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_AB8500_PONKEY=y -# CONFIG_SERIO is not set -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_NOMADIK=y -CONFIG_I2C=y -CONFIG_I2C_NOMADIK=y -CONFIG_SPI=y -CONFIG_SPI_PL022=y -CONFIG_GPIO_STMPE=y -CONFIG_GPIO_TC3589X=y -# CONFIG_HWMON is not set -CONFIG_MFD_STMPE=y -CONFIG_MFD_TC3589X=y -CONFIG_AB8500_CORE=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_AB8500=y -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_MMC=y -CONFIG_MMC_ARMMMCI=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_LP5521=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_AB8500=y -CONFIG_RTC_DRV_PL031=y -CONFIG_DMADEVICES=y -CONFIG_STE_DMA40=y -CONFIG_STAGING=y -# CONFIG_STAGING_EXCLUDE_BUILD is not set -CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT3_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_CONFIGFS_FS=m -# CONFIG_MISC_FILESYSTEMS is not set -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -# CONFIG_DEBUG_PREEMPT is not set -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_FTRACE is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y diff --git a/arch/arm/configs/usb-a9260_defconfig b/arch/arm/configs/usb-a9260_defconfig deleted file mode 100755 index 2e39f38b9..000000000 --- a/arch/arm/configs/usb-a9260_defconfig +++ /dev/null @@ -1,106 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91SAM9260=y -CONFIG_MACH_USB_A9260=y -CONFIG_AT91_SLOW_CLOCK=y -# CONFIG_ARM_THUMB is not set -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=64M console=ttyS0,115200" -CONFIG_FPE_NWFPE=y -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y -CONFIG_BLK_DEV_LOOP=y -# CONFIG_MISC_DEVICES is not set -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -CONFIG_MACB=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_SPI=y -CONFIG_SPI_ATMEL=y -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_ETH=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_EXT2_FS=y -CONFIG_INOTIFY=y -CONFIG_FUSE_FS=m -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y -# CONFIG_CRYPTO_HW is not set diff --git a/arch/arm/configs/versatile_defconfig b/arch/arm/configs/versatile_defconfig deleted file mode 100755 index cdd4d2bd3..000000000 --- a/arch/arm/configs/versatile_defconfig +++ /dev/null @@ -1,84 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MACH_VERSATILE_AB=y -CONFIG_LEDS=y -CONFIG_LEDS_CPU=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=1f03 mem=32M" -CONFIG_FPE_NWFPE=y -CONFIG_VFP=y -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_EEPROM_LEGACY=m -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -# CONFIG_SERIO_SERPORT is not set -CONFIG_SERIO_AMBAKMI=y -CONFIG_SERIAL_8250=m -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_8250_RSA=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=16 -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=m -# CONFIG_HWMON is not set -CONFIG_FB=y -CONFIG_FB_ARMCLCD=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FONTS=y -CONFIG_FONT_ACORN_8x8=y -CONFIG_SOUND=y -CONFIG_SND=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_ARMAACI=m -CONFIG_MMC=y -CONFIG_MMC_ARMMMCI=m -CONFIG_EXT2_FS=y -CONFIG_VFAT_FS=m -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=y -CONFIG_MINIX_FS=y -CONFIG_ROMFS_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=y -CONFIG_NFSD_V3=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_ISO8859_1=m -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y diff --git a/arch/arm/configs/vexpress_defconfig b/arch/arm/configs/vexpress_defconfig deleted file mode 100755 index f2de51f0b..000000000 --- a/arch/arm/configs/vexpress_defconfig +++ /dev/null @@ -1,140 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_CGROUPS=y -CONFIG_CPUSETS=y -# CONFIG_UTS_NS is not set -# CONFIG_IPC_NS is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set -# CONFIG_NET_NS is not set -CONFIG_BLK_DEV_INITRD=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_PROFILING=y -CONFIG_OPROFILE=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_LBDAF is not set -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_VEXPRESS=y -CONFIG_ARCH_VEXPRESS_CA9X4=y -# CONFIG_SWP_EMULATE is not set -CONFIG_SMP=y -CONFIG_VMSPLIT_2G=y -CONFIG_HOTPLUG_CPU=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M" -CONFIG_VFP=y -CONFIG_NEON=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -# CONFIG_WIRELESS is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_ARM_INTEGRATOR=y -CONFIG_MISC_DEVICES=y -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_ATA=y -# CONFIG_SATA_PMP is not set -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SMSC911X=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_WLAN is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_SERIO_SERPORT is not set -CONFIG_SERIO_AMBAKMI=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=16 -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -CONFIG_FB=y -CONFIG_FB_ARMCLCD=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y -# CONFIG_SND_DRIVERS is not set -CONFIG_SND_ARMAACI=y -CONFIG_HID_DRAGONRISE=y -CONFIG_HID_GYRATION=y -CONFIG_HID_TWINHAN=y -CONFIG_HID_NTRIG=y -CONFIG_HID_PANTHERLORD=y -CONFIG_HID_PETALYNX=y -CONFIG_HID_SAMSUNG=y -CONFIG_HID_SONY=y -CONFIG_HID_SUNPLUS=y -CONFIG_HID_GREENASIA=y -CONFIG_HID_SMARTJOYPLUS=y -CONFIG_HID_TOPSEED=y -CONFIG_HID_THRUSTMASTER=y -CONFIG_HID_ZEROPLUS=y -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_MON=y -CONFIG_USB_ISP1760_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_MMC=y -CONFIG_MMC_ARMMMCI=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_PL031=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -# CONFIG_EXT3_FS_XATTR is not set -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -# CONFIG_RPCSEC_GSS_KRB5 is not set -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DETECT_HUNG_TASK=y -# CONFIG_SCHED_DEBUG is not set -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -CONFIG_EARLY_PRINTK=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set diff --git a/arch/arm/configs/viper_defconfig b/arch/arm/configs/viper_defconfig deleted file mode 100755 index 1d01ddd33..000000000 --- a/arch/arm/configs/viper_defconfig +++ /dev/null @@ -1,174 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=13 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_EXPERT=y -# CONFIG_ELF_CORE is not set -# CONFIG_SHMEM is not set -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_PXA=y -CONFIG_ARCH_VIPER=y -CONFIG_IWMMXT=y -CONFIG_PCCARD=m -CONFIG_PCMCIA_PXA2XX=m -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=31:02 rootfstype=jffs2 ro console=ttyS0,115200" -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m -CONFIG_FPE_FASTFPE=y -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_SYN_COOKIES=y -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_FW_LOADER=m -CONFIG_MTD=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=0 -CONFIG_MTD_CHAR=m -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set -# CONFIG_MTD_CFI_I2 is not set -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_RAM=y -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_PXA2XX=y -CONFIG_BLK_DEV_LOOP=m -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=m -CONFIG_ATA=m -# CONFIG_SATA_PMP is not set -CONFIG_PATA_PCMCIA=m -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_USB_PEGASUS=m -CONFIG_USB_USBNET=m -# CONFIG_USB_NET_CDC_SUBSET is not set -CONFIG_NET_PCMCIA=y -CONFIG_PPP=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_INPUT_MOUSEDEV=m -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=m -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_FUJITSU=m -CONFIG_TOUCHSCREEN_ELO=m -CONFIG_TOUCHSCREEN_MTOUCH=m -CONFIG_TOUCHSCREEN_INEXIO=m -CONFIG_TOUCHSCREEN_HTCPEN=m -CONFIG_TOUCHSCREEN_PENMOUNT=m -CONFIG_TOUCHSCREEN_TOUCHRIGHT=m -CONFIG_TOUCHSCREEN_TOUCHWIN=m -CONFIG_TOUCHSCREEN_TOUCHIT213=m -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=m -# CONFIG_CONSOLE_TRANSLATIONS is not set -# CONFIG_VT_CONSOLE is not set -CONFIG_SERIAL_8250=m -CONFIG_SERIAL_8250_NR_UARTS=5 -CONFIG_SERIAL_8250_RUNTIME_UARTS=5 -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -# CONFIG_I2C_HELPER_AUTO is not set -CONFIG_I2C_PXA=y -CONFIG_GPIO_SYSFS=y -CONFIG_WATCHDOG=y -CONFIG_FB=y -CONFIG_FB_PXA=m -CONFIG_FB_PXA_PARAMETERS=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_PWM=m -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=m -CONFIG_LOGO=y -CONFIG_SOUND=m -CONFIG_SND=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_PXA2XX_AC97=m -CONFIG_USB=m -CONFIG_USB_DEVICEFS=y -CONFIG_USB_ISP116X_HCD=m -CONFIG_USB_SL811_HCD=m -CONFIG_USB_R8A66597_HCD=m -CONFIG_USB_ACM=m -CONFIG_USB_STORAGE=m -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_MCT_U232=m -CONFIG_USB_GADGET=m -CONFIG_USB_ETH=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_USB_G_PRINTER=m -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_DS1307=m -CONFIG_RTC_DRV_SA1100=m -CONFIG_EXT2_FS=m -CONFIG_EXT3_FS=m -# CONFIG_EXT3_FS_XATTR is not set -# CONFIG_DNOTIFY is not set -CONFIG_INOTIFY=y -CONFIG_VFAT_FS=m -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=m -CONFIG_NFSD_V3=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_UTF8=m -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_MUTEXES=y -CONFIG_SYSCTL_SYSCALL_CHECK=y -# CONFIG_FTRACE is not set -CONFIG_DEBUG_ERRORS=y -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRC_T10DIF=m diff --git a/arch/arm/configs/xcep_defconfig b/arch/arm/configs/xcep_defconfig deleted file mode 100755 index 721832ffe..000000000 --- a/arch/arm/configs/xcep_defconfig +++ /dev/null @@ -1,99 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_LOCALVERSION=".xcep-itech" -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -# CONFIG_UID16 is not set -# CONFIG_SHMEM is not set -# CONFIG_VM_EVENT_COUNTERS is not set -# CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y -CONFIG_KPROBES=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_MODULE_SRCVERSION_ALL=y -# CONFIG_BLOCK is not set -CONFIG_ARCH_PXA=y -CONFIG_MACH_XCEP=y -CONFIG_IWMMXT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=mtd4 rootfstype=jffs2 ro console=ttyS0,115200" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=m -CONFIG_UNIX=y -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -# CONFIG_FW_LOADER is not set -CONFIG_MTD_CONCAT=y -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_PXA2XX=y -# CONFIG_MISC_DEVICES is not set -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=m -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_PXA=m -CONFIG_HWMON=m -CONFIG_SENSORS_ADM1021=m -CONFIG_SENSORS_MAX6650=m -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_SA1100=m -CONFIG_DMADEVICES=y -# CONFIG_DNOTIFY is not set -# CONFIG_INOTIFY_USER is not set -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_FS_WBUF_VERIFY=y -CONFIG_NFS_FS=m -CONFIG_NFS_V3=y -CONFIG_NLS=m -CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_UTF8=m -CONFIG_PRINTK_TIME=y -CONFIG_STRIP_ASM_SYMS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -# CONFIG_DEBUG_BUGVERBOSE is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -# CONFIG_FTRACE is not set -# CONFIG_ARM_UNWIND is not set -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set -CONFIG_LIBCRC32C=m diff --git a/arch/arm/configs/zeus_defconfig b/arch/arm/configs/zeus_defconfig deleted file mode 100755 index 59577ad3f..000000000 --- a/arch/arm/configs/zeus_defconfig +++ /dev/null @@ -1,189 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_TINY_RCU=y -CONFIG_LOG_BUF_SHIFT=13 -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_PXA=y -CONFIG_MACH_ARCOM_ZEUS=y -CONFIG_PCCARD=m -CONFIG_PCMCIA_PXA2XX=m -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=31:02 rootfstype=jffs2 ro console=ttyS0,115200" -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m -CONFIG_FPE_NWFPE=y -CONFIG_PM=y -CONFIG_APM_EMULATION=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_SYN_COOKIES=y -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_CFG80211=m -CONFIG_LIB80211=m -CONFIG_MAC80211=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_REDBOOT_PARTS_READONLY=y -CONFIG_MTD_CHAR=m -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set -# CONFIG_MTD_CFI_I2 is not set -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_RAM=y -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_PXA2XX=y -CONFIG_BLK_DEV_LOOP=m -CONFIG_EEPROM_AT24=m -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=m -CONFIG_ATA=m -# CONFIG_SATA_PMP is not set -CONFIG_PATA_PCMCIA=m -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_DM9000=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_RT2X00=m -CONFIG_RT73USB=m -CONFIG_NET_PCMCIA=y -CONFIG_PPP=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=m -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_FUJITSU=m -CONFIG_TOUCHSCREEN_ELO=m -CONFIG_TOUCHSCREEN_MTOUCH=m -CONFIG_TOUCHSCREEN_INEXIO=m -CONFIG_TOUCHSCREEN_HTCPEN=m -CONFIG_TOUCHSCREEN_PENMOUNT=m -CONFIG_TOUCHSCREEN_TOUCHRIGHT=m -CONFIG_TOUCHSCREEN_TOUCHWIN=m -CONFIG_TOUCHSCREEN_TOUCHIT213=m -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=m -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=7 -CONFIG_SERIAL_8250_RUNTIME_UARTS=7 -# CONFIG_LEGACY_PTYS is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -# CONFIG_I2C_HELPER_AUTO is not set -CONFIG_I2C_GPIO=y -CONFIG_I2C_PXA=y -CONFIG_SPI=y -CONFIG_SPI_PXA2XX=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_PCA953X=y -CONFIG_SENSORS_LM75=m -CONFIG_WATCHDOG=y -CONFIG_FB=y -CONFIG_FB_PXA=m -CONFIG_FB_PXA_PARAMETERS=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=m -CONFIG_LOGO=y -CONFIG_SOUND=m -CONFIG_SND=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -# CONFIG_SND_SUPPORT_OLD_API is not set -CONFIG_SND_PXA2XX_AC97=m -# CONFIG_SND_SPI is not set -# CONFIG_SND_PCMCIA is not set -CONFIG_SND_SOC=m -CONFIG_SND_PXA2XX_SOC=m -# CONFIG_HID_SUPPORT is not set -CONFIG_USB=m -CONFIG_USB_DEVICEFS=y -CONFIG_USB_OHCI_HCD=m -CONFIG_USB_ACM=m -CONFIG_USB_STORAGE=m -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_MCT_U232=m -CONFIG_USB_GADGET=m -CONFIG_USB_GADGET_PXA27X=y -CONFIG_USB_ETH=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_USB_G_PRINTER=m -CONFIG_MMC=y -# CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_PXA=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m -CONFIG_LEDS_GPIO=m -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_LEDS_TRIGGER_BACKLIGHT=m -CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_ISL1208=m -CONFIG_RTC_DRV_PXA=m -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_XATTR is not set -# CONFIG_DNOTIFY is not set -CONFIG_INOTIFY=y -CONFIG_VFAT_FS=m -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=m -CONFIG_NFSD_V3=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_UTF8=m -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_MUTEXES=y -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_DEBUG_ERRORS=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRC_T10DIF=m From a0f0b7271cd6670d477fb5524a9a9f39a8c2ba36 Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 4 Oct 2012 12:28:02 +1300 Subject: [PATCH 18/52] Enable a couple more frequencies and change some voltages a fraction --- arch/arm/mach-msm/acpuclock-7x30.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-msm/acpuclock-7x30.c b/arch/arm/mach-msm/acpuclock-7x30.c index becc1f5d2..49126f484 100755 --- a/arch/arm/mach-msm/acpuclock-7x30.c +++ b/arch/arm/mach-msm/acpuclock-7x30.c @@ -124,12 +124,12 @@ static struct clkctl_acpu_speed acpu_freq_tbl[] = { { 0, 122880, PLL_3, 5, 5, 61440000, 850, VDD_RAW(850) }, { 0, 184320, PLL_3, 5, 4, 61440000, 850, VDD_RAW(850) }, { 0, MAX_AXI_KHZ, AXI, 1, 0, 61440000, 850, VDD_RAW(850) }, - { 1, 245760, PLL_3, 5, 2, 61440000, 875, VDD_RAW(900) }, + { 1, 245760, PLL_3, 5, 2, 61440000, 875, VDD_RAW(875) }, { 1, 368640, PLL_3, 5, 1, 122800000, 900, VDD_RAW(900) }, - { 0, 480000, PLL_2, 3, 0, 122800000, 900, VDD_RAW(900), &pll2_tbl[0]}, - { 0, 600000, PLL_2, 3, 0, 122800000, 925, VDD_RAW(925), &pll2_tbl[1]}, + { 1, 480000, PLL_2, 3, 0, 122800000, 925, VDD_RAW(925), &pll2_tbl[0]}, + { 1, 600000, PLL_2, 3, 0, 122800000, 950, VDD_RAW(950), &pll2_tbl[1]}, /* AXI has MSMC1 implications. See above. */ - { 1, 768000, PLL_1, 2, 0, 153600000, 1000, VDD_RAW(1000) }, + { 1, 768000, PLL_1, 2, 0, 153600000, 975, VDD_RAW(975) }, /* * AXI has MSMC1 implications. See above. */ From 11939c7fd0ad9a6abc0db0ad1a3d52d468a9aeac Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 4 Oct 2012 13:07:10 +1300 Subject: [PATCH 19/52] LED, Voltage and remove SPI configs from device as per Blefish https://github.com/PaulMilbank/android_kernel_huawei_u8800/commit/e18146b0faaeee150614a18f08b340b15f883954#L1L3618 --- arch/arm/configs/u8800_defconfig | 64 ++----------- arch/arm/mach-msm/acpuclock-7x30.c | 2 +- arch/arm/mach-msm/board-hw7x30.c | 142 +---------------------------- drivers/leds/leds-msm-pmic.c | 2 +- 4 files changed, 10 insertions(+), 200 deletions(-) diff --git a/arch/arm/configs/u8800_defconfig b/arch/arm/configs/u8800_defconfig index b31dd37f9..5431837d4 100644 --- a/arch/arm/configs/u8800_defconfig +++ b/arch/arm/configs/u8800_defconfig @@ -382,7 +382,7 @@ CONFIG_MSM_DALRPC=y CONFIG_MSM_DALRPC_TEST=m CONFIG_MSM_CPU_FREQ_SET_MIN_MAX=y CONFIG_MSM_CPU_FREQ_MAX=1024000 -CONFIG_MSM_CPU_FREQ_MIN=122880 +CONFIG_MSM_CPU_FREQ_MIN=368640 # CONFIG_MSM_AVS_HW is not set # CONFIG_MSM_HW3D is not set CONFIG_AMSS_7X25_VERSION_2009=y @@ -1061,7 +1061,9 @@ CONFIG_BLK_DEV_LOOP=y # # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_UB is not set -# CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=1 +CONFIG_BLK_DEV_RAM_SIZE=16384 # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # CONFIG_MG_DISK is not set @@ -1083,7 +1085,6 @@ CONFIG_ANDROID_PMEM=y # CONFIG_HMC6352 is not set # CONFIG_SENSORS_AK8975 is not set # CONFIG_DS1682 is not set -# CONFIG_TI_DAC7512 is not set CONFIG_UID_STAT=y # CONFIG_BMP085 is not set # CONFIG_WL127X_RFKILL is not set @@ -1106,7 +1107,6 @@ CONFIG_PMIC8XXX_UPL=y # EEPROM support # # CONFIG_EEPROM_AT24 is not set -# CONFIG_EEPROM_AT25 is not set # CONFIG_EEPROM_LEGACY is not set # CONFIG_EEPROM_MAX6875 is not set # CONFIG_EEPROM_93CX6 is not set @@ -1116,7 +1116,6 @@ CONFIG_PMIC8XXX_UPL=y # Texas Instruments shared transport line discipline # # CONFIG_TI_ST is not set -# CONFIG_SENSORS_LIS3_SPI is not set # CONFIG_SENSORS_LIS3_I2C is not set CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -1213,7 +1212,6 @@ CONFIG_NET_ETHERNET=y # CONFIG_AX88796 is not set # CONFIG_SMC91X is not set # CONFIG_DM9000 is not set -# CONFIG_ENC28J60 is not set # CONFIG_ETHOC is not set # CONFIG_SMC911X is not set # CONFIG_SMSC911X is not set @@ -1226,7 +1224,6 @@ CONFIG_NET_ETHERNET=y # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set # CONFIG_B44 is not set -# CONFIG_KS8851 is not set # CONFIG_KS8851_MLL is not set # CONFIG_FTMAC100 is not set # CONFIG_NETDEV_1000 is not set @@ -1332,8 +1329,6 @@ CONFIG_KEYBOARD_PMIC8XXX=y # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set CONFIG_INPUT_TOUCHSCREEN=y -# CONFIG_TOUCHSCREEN_ADS7846 is not set -# CONFIG_TOUCHSCREEN_AD7877 is not set # CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_ATMEL_MAXTOUCH is not set # CONFIG_TOUCHSCREEN_ATMEL_MXT is not set @@ -1358,7 +1353,6 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_TOUCHWIN is not set # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set -# CONFIG_TOUCHSCREEN_TSC2005 is not set # CONFIG_TOUCHSCREEN_TSC2007 is not set # CONFIG_TOUCHSCREEN_W90X900 is not set # CONFIG_TOUCHSCREEN_ST1232 is not set @@ -1390,7 +1384,7 @@ CONFIG_INPUT_GPIO=y # CONFIG_PMIC8058_OTHC is not set # CONFIG_BOSCH_BMA150 is not set CONFIG_HUAWEI_FEATURE_PROXIMITY_EVERLIGHT_APS_12D=y -# CONFIG_HUAWEI_FEATURE_PROXIMITY_EVERLIGHT_APS_9900 is not set +CONFIG_HUAWEI_FEATURE_PROXIMITY_EVERLIGHT_APS_9900=y # # Hardware I/O ports @@ -1424,8 +1418,6 @@ CONFIG_DEVKMEM=y # # Non-8250 serial port support # -# CONFIG_SERIAL_MAX3100 is not set -# CONFIG_SERIAL_MAX3107 is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_MSM=y # CONFIG_SERIAL_MSM_CONSOLE is not set @@ -1437,7 +1429,6 @@ CONFIG_SERIAL_MSM_CLOCK_CONTROL=y # CONFIG_SERIAL_TIMBERDALE is not set # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set -# CONFIG_SERIAL_IFX6X60 is not set # CONFIG_SERIAL_MSM_SMD is not set # CONFIG_SERIAL_XILINX_PS_UART is not set @@ -1516,27 +1507,7 @@ CONFIG_HUAWEI_FEATURE_SENSORS_AK8975=y # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set -CONFIG_SPI=y -# CONFIG_SPI_DEBUG is not set -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -# CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_BITBANG is not set -# CONFIG_SPI_GPIO is not set -# CONFIG_SPI_OC_TINY is not set -# CONFIG_SPI_PXA2XX_PCI is not set -CONFIG_SPI_QSD=y -# CONFIG_SPI_XILINX is not set -# CONFIG_SPI_DESIGNWARE is not set - -# -# SPI Protocol Masters -# -# CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_TLE62X0 is not set +# CONFIG_SPI is not set # CONFIG_SLIMBUS is not set # @@ -1582,10 +1553,6 @@ CONFIG_GPIO_SYSFS=y # # SPI GPIO expanders: # -# CONFIG_GPIO_MAX7301 is not set -# CONFIG_GPIO_MCP23S08 is not set -# CONFIG_GPIO_MC33880 is not set -# CONFIG_GPIO_74X164 is not set # # AC97 GPIO expanders: @@ -1631,7 +1598,6 @@ CONFIG_HWMON=y # # CONFIG_SENSORS_AD7414 is not set # CONFIG_SENSORS_AD7418 is not set -# CONFIG_SENSORS_ADCXX is not set # CONFIG_SENSORS_ADM1021 is not set # CONFIG_SENSORS_ADM1025 is not set # CONFIG_SENSORS_ADM1026 is not set @@ -1657,7 +1623,6 @@ CONFIG_HWMON=y # CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM70 is not set # CONFIG_SENSORS_LM73 is not set # CONFIG_SENSORS_LM75 is not set # CONFIG_SENSORS_LM77 is not set @@ -1674,7 +1639,6 @@ CONFIG_HWMON=y # CONFIG_SENSORS_LTC4245 is not set # CONFIG_SENSORS_LTC4261 is not set # CONFIG_SENSORS_LM95241 is not set -# CONFIG_SENSORS_MAX1111 is not set # CONFIG_SENSORS_MAX16065 is not set # CONFIG_SENSORS_MAX1619 is not set # CONFIG_SENSORS_MAX6639 is not set @@ -1698,7 +1662,6 @@ CONFIG_SENSORS_MSM_ADC=y # CONFIG_SENSORS_SCH5627 is not set # CONFIG_SENSORS_ADS1015 is not set # CONFIG_SENSORS_ADS7828 is not set -# CONFIG_SENSORS_ADS7871 is not set # CONFIG_SENSORS_AMC6821 is not set # CONFIG_SENSORS_THMC50 is not set # CONFIG_SENSORS_TMP102 is not set @@ -1767,13 +1730,10 @@ CONFIG_TIMPANI_CODEC=y # CONFIG_MFD_MAX8998 is not set # CONFIG_MFD_WM8400 is not set # CONFIG_MFD_WM831X_I2C is not set -# CONFIG_MFD_WM831X_SPI is not set # CONFIG_MFD_WM8350_I2C is not set # CONFIG_MFD_WM8994 is not set # CONFIG_MFD_PCF50633 is not set -# CONFIG_MFD_MC13XXX is not set # CONFIG_ABX500_CORE is not set -# CONFIG_EZX_PCAP is not set # CONFIG_MFD_WL1273_CORE is not set CONFIG_MFD_PM8XXX=y # CONFIG_MFD_PM8921_CORE is not set @@ -1804,7 +1764,6 @@ CONFIG_REGULATOR=y # CONFIG_REGULATOR_TPS6507X is not set # CONFIG_REGULATOR_ISL6271A is not set # CONFIG_REGULATOR_AD5398 is not set -# CONFIG_REGULATOR_TPS6524X is not set # CONFIG_REGULATOR_GPIO is not set # CONFIG_REGULATOR_PM8058_XO is not set CONFIG_MEDIA_SUPPORT=y @@ -2195,7 +2154,6 @@ CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_EMU10K1_SEQ is not set # CONFIG_SND_DRIVERS is not set # CONFIG_SND_ARM is not set -# CONFIG_SND_SPI is not set CONFIG_SND_USB=y # CONFIG_SND_USB_AUDIO is not set # CONFIG_SND_USB_UA101 is not set @@ -2482,7 +2440,6 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_LP5523 is not set # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PM8XXX is not set -# CONFIG_LEDS_DAC124S085 is not set # CONFIG_LEDS_REGULATOR is not set # CONFIG_LEDS_BD2802 is not set # CONFIG_LEDS_MSM_PMIC is not set @@ -2541,15 +2498,6 @@ CONFIG_RTC_INTF_ALARM_DEV=y # # SPI RTC drivers # -# CONFIG_RTC_DRV_M41T93 is not set -# CONFIG_RTC_DRV_M41T94 is not set -# CONFIG_RTC_DRV_DS1305 is not set -# CONFIG_RTC_DRV_DS1390 is not set -# CONFIG_RTC_DRV_MAX6902 is not set -# CONFIG_RTC_DRV_R9701 is not set -# CONFIG_RTC_DRV_RS5C348 is not set -# CONFIG_RTC_DRV_DS3234 is not set -# CONFIG_RTC_DRV_PCF2123 is not set # # Platform RTC drivers diff --git a/arch/arm/mach-msm/acpuclock-7x30.c b/arch/arm/mach-msm/acpuclock-7x30.c index 49126f484..0182f01a4 100755 --- a/arch/arm/mach-msm/acpuclock-7x30.c +++ b/arch/arm/mach-msm/acpuclock-7x30.c @@ -124,7 +124,7 @@ static struct clkctl_acpu_speed acpu_freq_tbl[] = { { 0, 122880, PLL_3, 5, 5, 61440000, 850, VDD_RAW(850) }, { 0, 184320, PLL_3, 5, 4, 61440000, 850, VDD_RAW(850) }, { 0, MAX_AXI_KHZ, AXI, 1, 0, 61440000, 850, VDD_RAW(850) }, - { 1, 245760, PLL_3, 5, 2, 61440000, 875, VDD_RAW(875) }, + { 0, 245760, PLL_3, 5, 2, 61440000, 875, VDD_RAW(875) }, { 1, 368640, PLL_3, 5, 1, 122800000, 900, VDD_RAW(900) }, { 1, 480000, PLL_2, 3, 0, 122800000, 925, VDD_RAW(925), &pll2_tbl[0]}, { 1, 600000, PLL_2, 3, 0, 122800000, 950, VDD_RAW(950), &pll2_tbl[1]}, diff --git a/arch/arm/mach-msm/board-hw7x30.c b/arch/arm/mach-msm/board-hw7x30.c index de43f9b29..de30d8905 100755 --- a/arch/arm/mach-msm/board-hw7x30.c +++ b/arch/arm/mach-msm/board-hw7x30.c @@ -19,7 +19,6 @@ #include #include #ifdef CONFIG_SPI_QSD -#include #endif #include #include @@ -4443,141 +4442,6 @@ static struct msm_pm_platform_data msm_pm_data[MSM_PM_SLEEP_MODE_NR] = { }, }; -static struct resource qsd_spi_resources[] = { - { - .name = "spi_irq_in", - .start = INT_SPI_INPUT, - .end = INT_SPI_INPUT, - .flags = IORESOURCE_IRQ, - }, - { - .name = "spi_irq_out", - .start = INT_SPI_OUTPUT, - .end = INT_SPI_OUTPUT, - .flags = IORESOURCE_IRQ, - }, - { - .name = "spi_irq_err", - .start = INT_SPI_ERROR, - .end = INT_SPI_ERROR, - .flags = IORESOURCE_IRQ, - }, - { - .name = "spi_base", - .start = 0xA8000000, - .end = 0xA8000000 + SZ_4K - 1, - .flags = IORESOURCE_MEM, - }, - { - .name = "spidm_channels", - .flags = IORESOURCE_DMA, - }, - { - .name = "spidm_crci", - .flags = IORESOURCE_DMA, - }, -}; - -#define AMDH0_BASE_PHYS 0xAC200000 -#define ADMH0_GP_CTL (ct_adm_base + 0x3D8) -static int msm_qsd_spi_dma_config(void) -{ - void __iomem *ct_adm_base = 0; - u32 spi_mux = 0; - int ret = 0; - - ct_adm_base = ioremap(AMDH0_BASE_PHYS, PAGE_SIZE); - if (!ct_adm_base) { - pr_err("%s: Could not remap %x\n", __func__, AMDH0_BASE_PHYS); - return -ENOMEM; - } - - spi_mux = (ioread32(ADMH0_GP_CTL) & (0x3 << 12)) >> 12; - - qsd_spi_resources[4].start = DMOV_USB_CHAN; - qsd_spi_resources[4].end = DMOV_TSIF_CHAN; - - switch (spi_mux) { - case (1): - qsd_spi_resources[5].start = DMOV_HSUART1_RX_CRCI; - qsd_spi_resources[5].end = DMOV_HSUART1_TX_CRCI; - break; - case (2): - qsd_spi_resources[5].start = DMOV_HSUART2_RX_CRCI; - qsd_spi_resources[5].end = DMOV_HSUART2_TX_CRCI; - break; - case (3): - qsd_spi_resources[5].start = DMOV_CE_OUT_CRCI; - qsd_spi_resources[5].end = DMOV_CE_IN_CRCI; - break; - default: - ret = -ENOENT; - } - - iounmap(ct_adm_base); - - return ret; -} - -static struct platform_device qsd_device_spi = { - .name = "spi_qsd", - .id = 0, - .num_resources = ARRAY_SIZE(qsd_spi_resources), - .resource = qsd_spi_resources, -}; - -#ifdef CONFIG_SPI_QSD -static struct spi_board_info lcdc_sharp_spi_board_info[] __initdata = { - { - .modalias = "lcdc_sharp_ls038y7dx01", - .mode = SPI_MODE_1, - .bus_num = 0, - .chip_select = 0, - .max_speed_hz = 26331429, - } -}; -static struct spi_board_info lcdc_toshiba_spi_board_info[] __initdata = { - { - .modalias = "lcdc_toshiba_ltm030dd40", - .mode = SPI_MODE_3|SPI_CS_HIGH, - .bus_num = 0, - .chip_select = 0, - .max_speed_hz = 9963243, - } -}; -#endif - -static struct msm_gpio qsd_spi_gpio_config_data[] = { - { GPIO_CFG(45, 1, GPIO_CFG_INPUT, GPIO_CFG_NO_PULL, GPIO_CFG_2MA), "spi_clk" }, - { GPIO_CFG(46, 1, GPIO_CFG_INPUT, GPIO_CFG_NO_PULL, GPIO_CFG_2MA), "spi_cs0" }, - { GPIO_CFG(47, 1, GPIO_CFG_INPUT, GPIO_CFG_NO_PULL, GPIO_CFG_8MA), "spi_mosi" }, - { GPIO_CFG(48, 1, GPIO_CFG_INPUT, GPIO_CFG_NO_PULL, GPIO_CFG_2MA), "spi_miso" }, -}; - -static int msm_qsd_spi_gpio_config(void) -{ - return msm_gpios_request_enable(qsd_spi_gpio_config_data, - ARRAY_SIZE(qsd_spi_gpio_config_data)); -} - -static void msm_qsd_spi_gpio_release(void) -{ - msm_gpios_disable_free(qsd_spi_gpio_config_data, - ARRAY_SIZE(qsd_spi_gpio_config_data)); -} - -static struct msm_spi_platform_data qsd_spi_pdata = { - .max_clock_speed = 26331429, - .gpio_config = msm_qsd_spi_gpio_config, - .gpio_release = msm_qsd_spi_gpio_release, - .dma_config = msm_qsd_spi_dma_config, -}; - -static void __init msm_qsd_spi_init(void) -{ - qsd_device_spi.dev.platform_data = &qsd_spi_pdata; -} - #ifdef CONFIG_USB_EHCI_MSM_72K static void msm_hsusb_vbus_power(unsigned phy_info, int on) { @@ -6878,8 +6742,7 @@ static struct platform_device *devices[] __initdata = { #ifdef CONFIG_USB_G_ANDROID &android_usb_device, #endif - &qsd_device_spi, - + #ifdef CONFIG_MSM_SSBI &msm_device_ssbi_pmic1, #endif @@ -9044,8 +8907,7 @@ static void __init msm7x30_init(void) /* removed several lines */ // (void)lcdc_sharp_panel_device; // (void)msm_camera_sensor_mt9e013; - msm_qsd_spi_init(); - + /* #ifdef CONFIG_SPI_QSD if (machine_is_msm7x30_fluid()) diff --git a/drivers/leds/leds-msm-pmic.c b/drivers/leds/leds-msm-pmic.c index f52142edd..b484d67f2 100755 --- a/drivers/leds/leds-msm-pmic.c +++ b/drivers/leds/leds-msm-pmic.c @@ -137,7 +137,7 @@ static void msm_keypad_bl_led_set(struct led_classdev *led_cdev, int ret = 0; if(machine_is_msm7x30_u8800() || machine_is_msm7x30_u8800_51() || machine_is_msm8255_u8800_pro() ) { - ret = pmic_set_keyled_intensity(LED_KEYPAD, value/16); + ret = pmic_set_keyled_intensity(LED_KEYPAD, value/31); } else if( machine_is_msm8255_u8860lp() ||machine_is_msm8255_u8860_51()) From 1734c5b16df20d9e15fb63b991d33dfb244ebab4 Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 4 Oct 2012 13:18:34 +1300 Subject: [PATCH 20/52] Remove HDMI as we don't have it as per blefish: https://github.com/PaulMilbank/android_kernel_huawei_u8800/commit/a5f8868208886ea91eb7bdb9e44173057db54e8e --- arch/arm/mach-msm/board-hw7x30.c | 367 +------------------------------ 1 file changed, 3 insertions(+), 364 deletions(-) diff --git a/arch/arm/mach-msm/board-hw7x30.c b/arch/arm/mach-msm/board-hw7x30.c index de30d8905..6ee072eca 100755 --- a/arch/arm/mach-msm/board-hw7x30.c +++ b/arch/arm/mach-msm/board-hw7x30.c @@ -4282,7 +4282,8 @@ static struct ofn_atlab_platform_data optnav_data = { }, }; -static int hdmi_comm_power(int on, int show); +//PaulM Removed +/*static int hdmi_comm_power(int on, int show); static int hdmi_init_irq(void); static int hdmi_enable_5v(int on); static int hdmi_core_power(int on, int show); @@ -4298,7 +4299,7 @@ static struct msm_hdmi_platform_data adv7520_hdmi_data = { .cec_power = hdmi_cec_power, .check_hdcp_hw_support = hdmi_check_hdcp_hw_support, }; - +*/ #ifdef CONFIG_BOSCH_BMA150 static struct regulator_bulk_data sensors_ldo[] = { @@ -4700,367 +4701,6 @@ static struct msm_gpio dtv_panel_irq_gpios[] = { "hdmi_int" }, }; -static struct msm_gpio dtv_panel_gpios[] = { - { GPIO_CFG(120, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "wca_mclk" }, - { GPIO_CFG(121, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "wca_sd0" }, - { GPIO_CFG(122, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "wca_sd1" }, - { GPIO_CFG(123, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "wca_sd2" }, - { GPIO_CFG(124, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_8MA), "dtv_pclk" }, - { GPIO_CFG(125, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_en" }, - { GPIO_CFG(126, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_vsync" }, - { GPIO_CFG(127, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_hsync" }, - { GPIO_CFG(128, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_data0" }, - { GPIO_CFG(129, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_data1" }, - { GPIO_CFG(130, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_data2" }, - { GPIO_CFG(131, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_data3" }, - { GPIO_CFG(132, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_data4" }, - { GPIO_CFG(160, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_data5" }, - { GPIO_CFG(161, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_data6" }, - { GPIO_CFG(162, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_data7" }, - { GPIO_CFG(163, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_data8" }, - { GPIO_CFG(164, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_data9" }, - { GPIO_CFG(165, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_dat10" }, - { GPIO_CFG(166, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_dat11" }, - { GPIO_CFG(167, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_dat12" }, - { GPIO_CFG(168, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_dat13" }, - { GPIO_CFG(169, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_dat14" }, - { GPIO_CFG(170, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_dat15" }, - { GPIO_CFG(171, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_dat16" }, - { GPIO_CFG(172, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_dat17" }, - { GPIO_CFG(173, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_dat18" }, - { GPIO_CFG(174, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_dat19" }, - { GPIO_CFG(175, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_dat20" }, - { GPIO_CFG(176, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_dat21" }, - { GPIO_CFG(177, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_dat22" }, - { GPIO_CFG(178, 1, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_4MA), "dtv_dat23" }, -}; - - -#ifdef HDMI_RESET -static unsigned dtv_reset_gpio = - GPIO_CFG(37, 0, GPIO_CFG_OUTPUT, GPIO_CFG_NO_PULL, GPIO_CFG_2MA); -#endif - -static struct regulator_bulk_data hdmi_core_regs[] = { - { .supply = "ldo8", .min_uV = 1800000, .max_uV = 1800000 }, -}; - -static struct regulator_bulk_data hdmi_comm_regs[] = { - { .supply = "ldo8", .min_uV = 1800000, .max_uV = 1800000 }, - { .supply = "ldo10", .min_uV = 2600000, .max_uV = 2600000 }, -}; - -static struct regulator_bulk_data hdmi_cec_regs[] = { - { .supply = "ldo17", .min_uV = 2600000, .max_uV = 2600000 }, -}; - -static int __init hdmi_init_regs(void) -{ - int rc; - - rc = regulator_bulk_get(NULL, ARRAY_SIZE(hdmi_core_regs), - hdmi_core_regs); - - if (rc) { - pr_err("%s: could not get %s regulators: %d\n", - __func__, "core", rc); - goto out; - } - - rc = regulator_bulk_set_voltage(ARRAY_SIZE(hdmi_core_regs), - hdmi_core_regs); - - if (rc) { - pr_err("%s: could not set %s voltages: %d\n", - __func__, "core", rc); - goto free_core; - } - - rc = regulator_bulk_get(NULL, ARRAY_SIZE(hdmi_comm_regs), - hdmi_comm_regs); - - if (rc) { - pr_err("%s: could not get %s regulators: %d\n", - __func__, "comm", rc); - goto free_core; - } - - rc = regulator_bulk_set_voltage(ARRAY_SIZE(hdmi_comm_regs), - hdmi_comm_regs); - - if (rc) { - pr_err("%s: could not set %s voltages: %d\n", - __func__, "comm", rc); - goto free_comm; - } - - rc = regulator_bulk_get(NULL, ARRAY_SIZE(hdmi_cec_regs), - hdmi_cec_regs); - - if (rc) { - pr_err("%s: could not get %s regulators: %d\n", - __func__, "cec", rc); - goto free_comm; - } - - rc = regulator_bulk_set_voltage(ARRAY_SIZE(hdmi_cec_regs), - hdmi_cec_regs); - - if (rc) { - pr_err("%s: could not set %s voltages: %d\n", - __func__, "cec", rc); - goto free_cec; - } - - return 0; - -free_cec: - regulator_bulk_free(ARRAY_SIZE(hdmi_cec_regs), hdmi_cec_regs); -free_comm: - regulator_bulk_free(ARRAY_SIZE(hdmi_comm_regs), hdmi_comm_regs); -free_core: - regulator_bulk_free(ARRAY_SIZE(hdmi_core_regs), hdmi_core_regs); -out: - return rc; -} - -static int hdmi_init_irq(void) -{ - int rc = msm_gpios_enable(dtv_panel_irq_gpios, - ARRAY_SIZE(dtv_panel_irq_gpios)); - if (rc < 0) { - pr_err("%s: gpio enable failed: %d\n", __func__, rc); - return rc; - } - pr_info("%s\n", __func__); - - return 0; -} - -static int hdmi_enable_5v(int on) -{ - int pmic_gpio_hdmi_5v_en ; - - if (machine_is_msm8x55_svlte_surf() || machine_is_msm8x55_svlte_ffa() || - machine_is_msm7x30_fluid()) - pmic_gpio_hdmi_5v_en = PMIC_GPIO_HDMI_5V_EN_V2 ; - else - pmic_gpio_hdmi_5v_en = PMIC_GPIO_HDMI_5V_EN_V3 ; - - pr_info("%s: %d\n", __func__, on); - if (on) { - int rc; - rc = gpio_request(PM8058_GPIO_PM_TO_SYS(pmic_gpio_hdmi_5v_en), - "hdmi_5V_en"); - if (rc) { - pr_err("%s PMIC_GPIO_HDMI_5V_EN gpio_request failed\n", - __func__); - return rc; - } - gpio_set_value_cansleep( - PM8058_GPIO_PM_TO_SYS(pmic_gpio_hdmi_5v_en), 1); - } else { - gpio_set_value_cansleep( - PM8058_GPIO_PM_TO_SYS(pmic_gpio_hdmi_5v_en), 0); - gpio_free(PM8058_GPIO_PM_TO_SYS(pmic_gpio_hdmi_5v_en)); - } - return 0; -} - -static int hdmi_comm_power(int on, int show) -{ - if (show) - pr_info("%s: i2c comm: %d \n", __func__, on); - return on ? - regulator_bulk_enable(ARRAY_SIZE(hdmi_comm_regs), - hdmi_comm_regs) : - regulator_bulk_disable(ARRAY_SIZE(hdmi_comm_regs), - hdmi_comm_regs); -} - -static int hdmi_core_power(int on, int show) -{ - if (show) - pr_info("%s: %d \n", __func__, on); - return on ? - regulator_bulk_enable(ARRAY_SIZE(hdmi_core_regs), - hdmi_core_regs) : - regulator_bulk_disable(ARRAY_SIZE(hdmi_core_regs), - hdmi_core_regs); -} - -static int hdmi_cec_power(int on) -{ - pr_info("%s: %d \n", __func__, on); - return on ? regulator_bulk_enable(ARRAY_SIZE(hdmi_cec_regs), - hdmi_cec_regs) : - regulator_bulk_disable(ARRAY_SIZE(hdmi_cec_regs), - hdmi_cec_regs); -} - -#if defined(CONFIG_FB_MSM_HDMI_ADV7520_PANEL) || defined(CONFIG_BOSCH_BMA150) -/* there is an i2c address conflict between adv7520 and bma150 sensor after - * power up on fluid. As a solution, the default address of adv7520's packet - * memory is changed as soon as possible - */ -static int __init fluid_i2c_address_fixup(void) -{ - unsigned char wBuff[16]; - unsigned char rBuff[16]; - struct i2c_msg msgs[3]; - int res; - int rc = -EINVAL; - struct i2c_adapter *adapter; - - if (machine_is_msm7x30_fluid()) { - adapter = i2c_get_adapter(0); - if (!adapter) { - pr_err("%s: invalid i2c adapter\n", __func__); - return PTR_ERR(adapter); - } - - /* turn on LDO8 */ - rc = hdmi_core_power(1, 0); - if (rc) { - pr_err("%s: could not enable hdmi core regs: %d", - __func__, rc); - goto adapter_put; - } - - /* change packet memory address to 0x74 */ - wBuff[0] = 0x45; - wBuff[1] = 0x74; - - msgs[0].addr = ADV7520_I2C_ADDR; - msgs[0].flags = 0; - msgs[0].buf = (unsigned char *) wBuff; - msgs[0].len = 2; - - res = i2c_transfer(adapter, msgs, 1); - if (res != 1) { - pr_err("%s: error writing adv7520\n", __func__); - goto ldo8_disable; - } - - /* powerdown adv7520 using bit 6 */ - /* i2c read first */ - wBuff[0] = 0x41; - - msgs[0].addr = ADV7520_I2C_ADDR; - msgs[0].flags = 0; - msgs[0].buf = (unsigned char *) wBuff; - msgs[0].len = 1; - - msgs[1].addr = ADV7520_I2C_ADDR; - msgs[1].flags = I2C_M_RD; - msgs[1].buf = rBuff; - msgs[1].len = 1; - res = i2c_transfer(adapter, msgs, 2); - if (res != 2) { - pr_err("%s: error reading adv7520\n", __func__); - goto ldo8_disable; - } - - /* i2c write back */ - wBuff[0] = 0x41; - wBuff[1] = rBuff[0] | 0x40; - - msgs[0].addr = ADV7520_I2C_ADDR; - msgs[0].flags = 0; - msgs[0].buf = (unsigned char *) wBuff; - msgs[0].len = 2; - - res = i2c_transfer(adapter, msgs, 1); - if (res != 1) { - pr_err("%s: error writing adv7520\n", __func__); - goto ldo8_disable; - } - - /* for successful fixup, we release the i2c adapter */ - /* but leave ldo8 on so that the adv7520 is not repowered */ - i2c_put_adapter(adapter); - pr_info("%s: fluid i2c address conflict resolved\n", __func__); - } - return 0; - -ldo8_disable: - hdmi_core_power(0, 0); -adapter_put: - i2c_put_adapter(adapter); - return rc; -} -fs_initcall_sync(fluid_i2c_address_fixup); -#endif - -static bool hdmi_check_hdcp_hw_support(void) -{ - if (machine_is_msm7x30_fluid()) - return false; - else - return true; -} - -static int dtv_panel_power(int on) -{ - int flag_on = !!on; - static int dtv_power_save_on; - int rc; - - if (dtv_power_save_on == flag_on) - return 0; - - dtv_power_save_on = flag_on; - pr_info("%s: %d\n", __func__, on); - -#ifdef HDMI_RESET - if (on) { - /* reset Toshiba WeGA chip -- toggle reset pin -- gpio_180 */ - rc = gpio_tlmm_config(dtv_reset_gpio, GPIO_CFG_ENABLE); - if (rc) { - pr_err("%s: gpio_tlmm_config(%#x)=%d\n", - __func__, dtv_reset_gpio, rc); - return rc; - } - - /* bring reset line low to hold reset*/ - gpio_set_value(37, 0); - } -#endif - - if (on) { - rc = msm_gpios_enable(dtv_panel_gpios, - ARRAY_SIZE(dtv_panel_gpios)); - if (rc < 0) { - printk(KERN_ERR "%s: gpio enable failed: %d\n", - __func__, rc); - return rc; - } - } else { - rc = msm_gpios_disable(dtv_panel_gpios, - ARRAY_SIZE(dtv_panel_gpios)); - if (rc < 0) { - printk(KERN_ERR "%s: gpio disable failed: %d\n", - __func__, rc); - return rc; - } - } - - mdelay(5); /* ensure power is stable */ - -#ifdef HDMI_RESET - if (on) { - gpio_set_value(37, 1); /* bring reset line high */ - mdelay(10); /* 10 msec before IO can be accessed */ - } -#endif - - return rc; -} - -static struct lcdc_platform_data dtv_pdata = { - .lcdc_power_save = dtv_panel_power, -}; - /*disable QC's In Band Sleep mode with BCM4329 bluetooth chip*/ #ifdef CONFIG_HUAWEI_KERNEL static struct msm_serial_hs_platform_data msm_uart_dm1_pdata = { @@ -5717,7 +5357,6 @@ static void __init msm_fb_add_devices(void) msm_fb_register_device("mdp", &mdp_pdata); msm_fb_register_device("pmdh", &mddi_pdata); /* removed several lines */ -// msm_fb_register_device("dtv", &dtv_pdata); // msm_fb_register_device("tvenc", &atv_pdata); #ifdef CONFIG_FB_MSM_TVOUT msm_fb_register_device("tvout_device", NULL); From 9b1d1b4b4745676f6611ed53f61c2abd6490a67c Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 4 Oct 2012 13:25:56 +1300 Subject: [PATCH 21/52] Remove marimba touchscreen, we don't use it. As per Blefish: https://github.com/PaulMilbank/android_kernel_huawei_u8800/commit/2484c1252d22ddf332d55de1f1fa9be8d26727bf --- arch/arm/mach-msm/board-hw7x30.c | 169 +------------------------------ 1 file changed, 1 insertion(+), 168 deletions(-) diff --git a/arch/arm/mach-msm/board-hw7x30.c b/arch/arm/mach-msm/board-hw7x30.c index 6ee072eca..a09e0e706 100755 --- a/arch/arm/mach-msm/board-hw7x30.c +++ b/arch/arm/mach-msm/board-hw7x30.c @@ -3097,170 +3097,6 @@ static struct marimba_fm_platform_data marimba_fm_pdata = { #define BAHAMA_SLAVE_ID_FM_ADDR 0x2A #define BAHAMA_SLAVE_ID_QMEMBIST_ADDR 0x7B -static const char *tsadc_id = "MADC"; - -static struct regulator_bulk_data regs_tsadc_marimba[] = { - { .supply = "gp12", .min_uV = 2200000, .max_uV = 2200000 }, - { .supply = "s2", .min_uV = 1300000, .max_uV = 1300000 }, -}; - -static struct regulator_bulk_data regs_tsadc_timpani[] = { - { .supply = "s3", .min_uV = 1800000, .max_uV = 1800000 }, - { .supply = "gp12", .min_uV = 2200000, .max_uV = 2200000 }, - { .supply = "gp16", .min_uV = 1200000, .max_uV = 1200000 }, -}; - -static struct regulator_bulk_data *regs_tsadc; -static int regs_tsadc_count; - -static int marimba_tsadc_power(int vreg_on) -{ - int rc = 0; - int tsadc_adie_type = adie_get_detected_codec_type(); - - switch (tsadc_adie_type) { - case TIMPANI_ID: - rc = pmapp_clock_vote(tsadc_id, PMAPP_CLOCK_ID_D1, - vreg_on ? PMAPP_CLOCK_VOTE_ON : PMAPP_CLOCK_VOTE_OFF); - if (rc) { - pr_err("%s: unable to %svote for d1 clk\n", - __func__, vreg_on ? "" : "de-"); - goto D1_vote_fail; - } - - /* fall through */ - case MARIMBA_ID: - rc = pmapp_clock_vote(tsadc_id, PMAPP_CLOCK_ID_DO, - vreg_on ? PMAPP_CLOCK_VOTE_ON : PMAPP_CLOCK_VOTE_OFF); - if (rc) { - pr_err("%s: unable to %svote for d1 clk\n", - __func__, vreg_on ? "" : "de-"); - goto D0_vote_fail; - } - - WARN_ON(regs_tsadc_count == 0); - - rc = vreg_on ? - regulator_bulk_enable(regs_tsadc_count, regs_tsadc) : - regulator_bulk_disable(regs_tsadc_count, regs_tsadc); - - if (rc) { - pr_err("%s: regulator %sable failed: %d\n", - __func__, vreg_on ? "en" : "dis", rc); - goto regulator_switch_fail; - } - - break; - default: - pr_err("%s:Adie %d not supported\n", - __func__, tsadc_adie_type); - return -ENODEV; - } - - msleep(5); /* ensure power is stable */ - - return 0; - -regulator_switch_fail: - pmapp_clock_vote(tsadc_id, PMAPP_CLOCK_ID_DO, - vreg_on ? PMAPP_CLOCK_VOTE_OFF : PMAPP_CLOCK_VOTE_ON); -D0_vote_fail: - if (tsadc_adie_type == TIMPANI_ID) - pmapp_clock_vote(tsadc_id, PMAPP_CLOCK_ID_D1, - vreg_on ? PMAPP_CLOCK_VOTE_OFF : PMAPP_CLOCK_VOTE_ON); -D1_vote_fail: - return rc; -} - -static int marimba_tsadc_init(void) -{ - int rc = 0; - int tsadc_adie_type = adie_get_detected_codec_type(); - - switch (tsadc_adie_type) { - case MARIMBA_ID: - regs_tsadc = regs_tsadc_marimba; - regs_tsadc_count = ARRAY_SIZE(regs_tsadc_marimba); - break; - case TIMPANI_ID: - regs_tsadc = regs_tsadc_timpani; - regs_tsadc_count = ARRAY_SIZE(regs_tsadc_timpani); - break; - default: - pr_err("%s:Adie %d not supported\n", - __func__, tsadc_adie_type); - rc = -ENODEV; - goto out; - } - - rc = regulator_bulk_get(NULL, regs_tsadc_count, regs_tsadc); - if (rc) { - pr_err("%s: could not get regulators: %d\n", - __func__, rc); - goto out; - } - - rc = regulator_bulk_set_voltage(regs_tsadc_count, regs_tsadc); - if (rc) { - pr_err("%s: could not set regulator voltages: %d\n", - __func__, rc); - goto vreg_free; - } - - return 0; - -vreg_free: - regulator_bulk_free(regs_tsadc_count, regs_tsadc); -out: - regs_tsadc = NULL; - regs_tsadc_count = 0; - return rc; -} - -static int marimba_tsadc_exit(void) -{ - regulator_bulk_free(regs_tsadc_count, regs_tsadc); - regs_tsadc_count = 0; - regs_tsadc = NULL; - - return 0; -} - - -static struct msm_ts_platform_data msm_ts_data = { - .min_x = 0, - .max_x = 4096, - .min_y = 0, - .max_y = 4096, - .min_press = 0, - .max_press = 255, - .inv_x = 4096, - .inv_y = 4096, - .can_wakeup = false, -}; - -static struct marimba_tsadc_platform_data marimba_tsadc_pdata = { - .marimba_tsadc_power = marimba_tsadc_power, - .init = marimba_tsadc_init, - .exit = marimba_tsadc_exit, - .tsadc_prechg_en = true, - .can_wakeup = false, - .setup = { - .pen_irq_en = true, - .tsadc_en = true, - }, - .params2 = { - .input_clk_khz = 2400, - .sample_prd = TSADC_CLK_3, - }, - .params3 = { - .prechg_time_nsecs = 6400, - .stable_time_nsecs = 6400, - .tsadc_test_mode = 0, - }, - .tssc_data = &msm_ts_data, -}; - static struct regulator_bulk_data codec_regs[] = { { .supply = "s4", .min_uV = 2200000, .max_uV = 2200000 }, }; @@ -3380,8 +3216,6 @@ static struct marimba_platform_data timpani_pdata = { .marimba_setup = msm_timpani_setup_power, .marimba_shutdown = msm_timpani_shutdown_power, .codec = &timpani_codec_pdata, - .tsadc = &marimba_tsadc_pdata, - .tsadc_ssbi_adap = MARIMBA_SSBI_ADAP, }; #define TIMPANI_I2C_SLAVE_ADDR 0xD @@ -8584,8 +8418,7 @@ static void __init msm7x30_init(void) ARRAY_SIZE(msm_i2c_board_info)); if (!machine_is_msm8x55_svlte_ffa() && !machine_is_msm7x30_fluid()) - marimba_pdata.tsadc = &marimba_tsadc_pdata; - + if (machine_is_msm7x30_fluid()) i2c_register_board_info(0, cy8info, ARRAY_SIZE(cy8info)); From 3b9deb2dfef08dce844fb5c48a6d21f80e72184a Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 4 Oct 2012 13:33:47 +1300 Subject: [PATCH 22/52] Change buffer cache flushing as per: https://github.com/PaulMilbank/android_kernel_huawei_u8800/commit/e9e6eb712d935b71b7fbbac7e64fae059b8ee5c0 --- arch/arm/mach-msm/memory.c | 39 ++++++-------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/arch/arm/mach-msm/memory.c b/arch/arm/mach-msm/memory.c index 33db3fa48..53ecb3ebe 100755 --- a/arch/arm/mach-msm/memory.c +++ b/arch/arm/mach-msm/memory.c @@ -93,56 +93,29 @@ void flush_axi_bus_buffer(void) #define CACHE_LINE_SIZE 32 -/* These cache related routines make the assumption that the associated - * physical memory is contiguous. They will operate on all (L1 - * and L2 if present) caches. +/* These cache related routines make the assumption (if outer cache is + * available) that the associated physical memory is contiguous. + * They will operate on all (L1 and L2 if present) caches. */ void clean_and_invalidate_caches(unsigned long vstart, unsigned long length, unsigned long pstart) { - unsigned long vaddr; - - for (vaddr = vstart; vaddr < vstart + length; vaddr += CACHE_LINE_SIZE) - asm ("mcr p15, 0, %0, c7, c14, 1" : : "r" (vaddr)); -#ifdef CONFIG_OUTER_CACHE + dmac_flush_range((void *)vstart, (void *) (vstart + length)); outer_flush_range(pstart, pstart + length); -#endif - asm ("mcr p15, 0, %0, c7, c10, 4" : : "r" (0)); - asm ("mcr p15, 0, %0, c7, c5, 0" : : "r" (0)); - - flush_axi_bus_buffer(); } void clean_caches(unsigned long vstart, unsigned long length, unsigned long pstart) { - unsigned long vaddr; - - for (vaddr = vstart; vaddr < vstart + length; vaddr += CACHE_LINE_SIZE) - asm ("mcr p15, 0, %0, c7, c10, 1" : : "r" (vaddr)); -#ifdef CONFIG_OUTER_CACHE + dmac_clean_range((void *)vstart, (void *) (vstart + length)); outer_clean_range(pstart, pstart + length); -#endif - asm ("mcr p15, 0, %0, c7, c10, 4" : : "r" (0)); - asm ("mcr p15, 0, %0, c7, c5, 0" : : "r" (0)); - - flush_axi_bus_buffer(); } void invalidate_caches(unsigned long vstart, unsigned long length, unsigned long pstart) { - unsigned long vaddr; - - for (vaddr = vstart; vaddr < vstart + length; vaddr += CACHE_LINE_SIZE) - asm ("mcr p15, 0, %0, c7, c6, 1" : : "r" (vaddr)); -#ifdef CONFIG_OUTER_CACHE + dmac_inv_range((void *)vstart, (void *) (vstart + length)); outer_inv_range(pstart, pstart + length); -#endif - asm ("mcr p15, 0, %0, c7, c10, 4" : : "r" (0)); - asm ("mcr p15, 0, %0, c7, c5, 0" : : "r" (0)); - - flush_axi_bus_buffer(); } void *alloc_bootmem_aligned(unsigned long size, unsigned long alignment) From 773d6ddc1efa1bca1fe93423a79b91dea25494e4 Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 4 Oct 2012 13:45:09 +1300 Subject: [PATCH 23/52] Invalidate cache before processing as per: https://github.com/PaulMilbank/android_kernel_huawei_u8800/commit/a77370557e9cfe4dc8d6ca8f86623cbc7639c57c --- drivers/video/msm/vidc/common/enc/venc.c | 4 +++- drivers/video/msm/vidc/common/enc/venc_internal.c | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/video/msm/vidc/common/enc/venc.c b/drivers/video/msm/vidc/common/enc/venc.c index 697dd5763..811c125eb 100755 --- a/drivers/video/msm/vidc/common/enc/venc.c +++ b/drivers/video/msm/vidc/common/enc/venc.c @@ -252,6 +252,8 @@ static void vid_enc_output_frame_done(struct video_client_ctx *client_ctx, /* Timestamp pass-through from input frame */ venc_msg->venc_msg_info.buf.timestamp = vcd_frame_data->time_stamp; + venc_msg->venc_msg_info.buf.sz = + vcd_frame_data->alloc_len; /* Decoded picture width and height */ venc_msg->venc_msg_info.msgdata_size = @@ -269,7 +271,7 @@ static void vid_enc_output_frame_done(struct video_client_ctx *client_ctx, msm_ion_do_cache_op(client_ctx->user_ion_client, buff_handle, (unsigned long *) kernel_vaddr, - (unsigned long)venc_msg->venc_msg_info.buf.len, + (unsigned long)venc_msg->venc_msg_info.buf.sz, ION_IOC_CLEAN_INV_CACHES); } } diff --git a/drivers/video/msm/vidc/common/enc/venc_internal.c b/drivers/video/msm/vidc/common/enc/venc_internal.c index 73d6c467b..2b1240cb1 100755 --- a/drivers/video/msm/vidc/common/enc/venc_internal.c +++ b/drivers/video/msm/vidc/common/enc/venc_internal.c @@ -1722,6 +1722,7 @@ u32 vid_enc_fill_output_buffer(struct video_client_ctx *client_ctx, struct file *file; s32 buffer_index = -1; u32 vcd_status = VCD_ERR_FAIL; + struct ion_handle *buff_handle = NULL; struct vcd_frame_data vcd_frame; @@ -1737,9 +1738,13 @@ u32 vid_enc_fill_output_buffer(struct video_client_ctx *client_ctx, memset((void *)&vcd_frame, 0, sizeof(struct vcd_frame_data)); + vidc_get_fd_info(client_ctx, BUFFER_TYPE_OUTPUT, + pmem_fd, kernel_vaddr, buffer_index, + &buff_handle); vcd_frame.virtual = (u8 *) kernel_vaddr; vcd_frame.frm_clnt_data = (u32) output_frame_info->clientdata; vcd_frame.alloc_len = output_frame_info->sz; + vcd_frame.buff_ion_handle = buff_handle; vcd_status = vcd_fill_output_buffer(client_ctx->vcd_handle, &vcd_frame); From c75be264cc20db5a7160e8eb2131d4c6749f34ab Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 4 Oct 2012 17:23:47 +1300 Subject: [PATCH 24/52] Change rear speaker to music and reduce volume a little to reduce distortion as per DZO: https://github.com/PaulMilbank/kernel_huawei/commit/59013ca383b162a00b875f212c452c3b5b0f4cce --- arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c b/arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c index 364931375..cfaa4e56c 100755 --- a/arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c +++ b/arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c @@ -1344,7 +1344,7 @@ static struct snddev_icodec_data snddev_ispeaker_rx_data_u8820 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), .name = "speaker_stereo_rx", .copp_id = 0, - .acdb_id = ACDB_ID_SPKR_PHONE_MONO, //7, + .acdb_id = ACDB_ID_SPKR_PHONE_MUSIC_MONO, //7, //ACDB_ID_SPKR_PHONE_MONO, //7, .profile = &ispeaker_rx_profile_u8820, .channel_mode = 1,//single channel for u8800_51 .pmctl_id = NULL, @@ -1352,10 +1352,10 @@ static struct snddev_icodec_data snddev_ispeaker_rx_data_u8820 = { .default_sample_rate = 48000, .pamp_on = &msm_snddev_poweramp_on, .pamp_off = &msm_snddev_poweramp_off, - .max_voice_rx_vol[VOC_NB_INDEX] = 200, - .min_voice_rx_vol[VOC_NB_INDEX] = -1300, - .max_voice_rx_vol[VOC_WB_INDEX] = 200, - .min_voice_rx_vol[VOC_WB_INDEX] = -1300 + .max_voice_rx_vol[VOC_NB_INDEX] = 100, + .min_voice_rx_vol[VOC_NB_INDEX] = -1400, + .max_voice_rx_vol[VOC_WB_INDEX] = 100, + .min_voice_rx_vol[VOC_WB_INDEX] = -1400 }; static struct platform_device msm_ispeaker_rx_device_u8820 = { From cec59768fb995c47a007f2cf23113d704aa54b2b Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 4 Oct 2012 17:41:20 +1300 Subject: [PATCH 25/52] Save a bit of power on the ondemand governer. --- drivers/cpufreq/cpufreq_ondemand.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c index 46295260a..1ea97e71e 100755 --- a/drivers/cpufreq/cpufreq_ondemand.c +++ b/drivers/cpufreq/cpufreq_ondemand.c @@ -32,13 +32,13 @@ */ #define DEF_FREQUENCY_DOWN_DIFFERENTIAL (10) -#define DEF_FREQUENCY_UP_THRESHOLD (90) -#define DEF_SAMPLING_DOWN_FACTOR (1) +#define DEF_FREQUENCY_UP_THRESHOLD (85) +#define DEF_SAMPLING_DOWN_FACTOR (5) #define MAX_SAMPLING_DOWN_FACTOR (100000) -#define MICRO_FREQUENCY_DOWN_DIFFERENTIAL (3) +#define MICRO_FREQUENCY_DOWN_DIFFERENTIAL (5) #define MICRO_FREQUENCY_UP_THRESHOLD (95) #define MICRO_FREQUENCY_MIN_SAMPLE_RATE (10000) -#define MIN_FREQUENCY_UP_THRESHOLD (11) +#define MIN_FREQUENCY_UP_THRESHOLD (10) #define MAX_FREQUENCY_UP_THRESHOLD (100) #define MIN_FREQUENCY_DOWN_DIFFERENTIAL (1) From c4b466e2076e02d49408fed906d0306f4203d32f Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 4 Oct 2012 17:45:00 +1300 Subject: [PATCH 26/52] tune smartass a bit more and add 245MHZ back in as it works on ICS --- arch/arm/mach-msm/acpuclock-7x30.c | 2 +- drivers/cpufreq/cpufreq_smartass2.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-msm/acpuclock-7x30.c b/arch/arm/mach-msm/acpuclock-7x30.c index 0182f01a4..49126f484 100755 --- a/arch/arm/mach-msm/acpuclock-7x30.c +++ b/arch/arm/mach-msm/acpuclock-7x30.c @@ -124,7 +124,7 @@ static struct clkctl_acpu_speed acpu_freq_tbl[] = { { 0, 122880, PLL_3, 5, 5, 61440000, 850, VDD_RAW(850) }, { 0, 184320, PLL_3, 5, 4, 61440000, 850, VDD_RAW(850) }, { 0, MAX_AXI_KHZ, AXI, 1, 0, 61440000, 850, VDD_RAW(850) }, - { 0, 245760, PLL_3, 5, 2, 61440000, 875, VDD_RAW(875) }, + { 1, 245760, PLL_3, 5, 2, 61440000, 875, VDD_RAW(875) }, { 1, 368640, PLL_3, 5, 1, 122800000, 900, VDD_RAW(900) }, { 1, 480000, PLL_2, 3, 0, 122800000, 925, VDD_RAW(925), &pll2_tbl[0]}, { 1, 600000, PLL_2, 3, 0, 122800000, 950, VDD_RAW(950), &pll2_tbl[1]}, diff --git a/drivers/cpufreq/cpufreq_smartass2.c b/drivers/cpufreq/cpufreq_smartass2.c index 6d54d8f74..f81891d82 100644 --- a/drivers/cpufreq/cpufreq_smartass2.c +++ b/drivers/cpufreq/cpufreq_smartass2.c @@ -87,14 +87,14 @@ static unsigned long min_cpu_load; * The minimum amount of time to spend at a frequency before we can ramp up. * Notice we ignore this when we are below the ideal frequency. */ -#define DEFAULT_UP_RATE_US 48000; +#define DEFAULT_UP_RATE_US 50000; static unsigned long up_rate_us; /* * The minimum amount of time to spend at a frequency before we can ramp down. * Notice we ignore this when we are above the ideal frequency. */ -#define DEFAULT_DOWN_RATE_US 60000; +#define DEFAULT_DOWN_RATE_US 50000; static unsigned long down_rate_us; /* From 4241a87355a62d748415b6849f14602ed47f6c04 Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 4 Oct 2012 18:34:48 +1300 Subject: [PATCH 27/52] call kgsl_sharedmem_uninit_sysfs() and device_unregister only if kgsl_driver.virtdev has been populated as per: https://github.com/PaulMilbank/htc7x30-3.0/commit/9bd7da9a0ccf95b47a9fe59c8b33c7f4b0a626c9 --- drivers/gpu/msm/kgsl.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/msm/kgsl.c b/drivers/gpu/msm/kgsl.c index 8b1d464cc..1036277a8 100755 --- a/drivers/gpu/msm/kgsl.c +++ b/drivers/gpu/msm/kgsl.c @@ -2378,7 +2378,17 @@ static void kgsl_core_exit(void) kgsl_mmu_ptpool_destroy(kgsl_driver.ptpool); kgsl_driver.ptpool = NULL; + /* + * We call kgsl_sharedmem_uninit_sysfs() and device_unregister() + * only if kgsl_driver.virtdev has been populated. + * We check at least one member of kgsl_driver.virtdev to + * see if it is not NULL (and thus, has been populated). + */ + + if (kgsl_driver.virtdev.class) { + kgsl_sharedmem_uninit_sysfs(); device_unregister(&kgsl_driver.virtdev); + } if (kgsl_driver.class) { class_destroy(kgsl_driver.class); From 4118292096db6d018666bdfc77391845aa3ae6ed Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 5 Oct 2012 13:55:41 +1300 Subject: [PATCH 28/52] Fix a chance of data corruption as per: https://github.com/PaulMilbank/android_kernel_huawei_u8800/commit/18181ad478e4592b82ed0acaeba0e320bbcf5ff6 --- drivers/char/diag/diagchar_core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/char/diag/diagchar_core.c b/drivers/char/diag/diagchar_core.c index afe0b7c8c..d199e8862 100755 --- a/drivers/char/diag/diagchar_core.c +++ b/drivers/char/diag/diagchar_core.c @@ -193,6 +193,7 @@ static int diagchar_open(struct inode *inode, struct file *file) return -ENOMEM; } } + driver->data_ready[i] = 0x0; driver->data_ready[i] |= MSG_MASKS_TYPE; driver->data_ready[i] |= EVENT_MASKS_TYPE; driver->data_ready[i] |= LOG_MASKS_TYPE; From 2bb05a2cbab402eaedafc9a266f92c2a367b751a Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 5 Oct 2012 17:03:30 +1300 Subject: [PATCH 29/52] Revert a mistaken change. Didnt seem to affect anything, but better to not have wrong speaker IDs being called --- arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c b/arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c index cfaa4e56c..ef65ceda9 100755 --- a/arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c +++ b/arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c @@ -62,7 +62,7 @@ static struct snddev_icodec_data snddev_iearpiece_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), .name = "handset_rx", .copp_id = 0, - .acdb_id = ACDB_ID_SPKR_PHONE_MUSIC_MONO, //7, //ACDB_ID_SPKR_PHONE_MONO, //7, + .acdb_id = ACDB_ID_HANDSET_SPKR, .profile = &iearpiece_profile, .channel_mode = 1, .pmctl_id = NULL, From 84420d177cc80274b99cb402b6a5f289dc3c8eec Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 5 Oct 2012 17:09:11 +1300 Subject: [PATCH 30/52] trying with 245mhz back in as minimum by default. --- arch/arm/configs/u8800_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/configs/u8800_defconfig b/arch/arm/configs/u8800_defconfig index 5431837d4..d19caf982 100644 --- a/arch/arm/configs/u8800_defconfig +++ b/arch/arm/configs/u8800_defconfig @@ -382,7 +382,7 @@ CONFIG_MSM_DALRPC=y CONFIG_MSM_DALRPC_TEST=m CONFIG_MSM_CPU_FREQ_SET_MIN_MAX=y CONFIG_MSM_CPU_FREQ_MAX=1024000 -CONFIG_MSM_CPU_FREQ_MIN=368640 +CONFIG_MSM_CPU_FREQ_MIN=245760 # CONFIG_MSM_AVS_HW is not set # CONFIG_MSM_HW3D is not set CONFIG_AMSS_7X25_VERSION_2009=y From ca146463077b57b91d8da08a276222d0234dddac Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 7 Oct 2012 12:21:43 +1300 Subject: [PATCH 31/52] zram and 368mhz minimum --- arch/arm/configs/u8800_defconfig | 4 ++-- arch/arm/mach-msm/acpuclock-7x30.c | 2 +- drivers/cpufreq/cpufreq_smartass2.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/configs/u8800_defconfig b/arch/arm/configs/u8800_defconfig index d19caf982..3090b8aa2 100644 --- a/arch/arm/configs/u8800_defconfig +++ b/arch/arm/configs/u8800_defconfig @@ -382,7 +382,7 @@ CONFIG_MSM_DALRPC=y CONFIG_MSM_DALRPC_TEST=m CONFIG_MSM_CPU_FREQ_SET_MIN_MAX=y CONFIG_MSM_CPU_FREQ_MAX=1024000 -CONFIG_MSM_CPU_FREQ_MIN=245760 +CONFIG_MSM_CPU_FREQ_MIN=368640 # CONFIG_MSM_AVS_HW is not set # CONFIG_MSM_HW3D is not set CONFIG_AMSS_7X25_VERSION_2009=y @@ -2556,7 +2556,7 @@ CONFIG_HUAWEI_FEATURE_NV_LOG_CONTROL=y # CONFIG_VT6656 is not set # CONFIG_IIO is not set # CONFIG_XVMALLOC is not set -# CONFIG_ZRAM is not set +CONFIG_ZRAM=y # CONFIG_FB_SM7XX is not set # CONFIG_EASYCAP is not set CONFIG_MACH_NO_WESTBRIDGE=y diff --git a/arch/arm/mach-msm/acpuclock-7x30.c b/arch/arm/mach-msm/acpuclock-7x30.c index 49126f484..0182f01a4 100755 --- a/arch/arm/mach-msm/acpuclock-7x30.c +++ b/arch/arm/mach-msm/acpuclock-7x30.c @@ -124,7 +124,7 @@ static struct clkctl_acpu_speed acpu_freq_tbl[] = { { 0, 122880, PLL_3, 5, 5, 61440000, 850, VDD_RAW(850) }, { 0, 184320, PLL_3, 5, 4, 61440000, 850, VDD_RAW(850) }, { 0, MAX_AXI_KHZ, AXI, 1, 0, 61440000, 850, VDD_RAW(850) }, - { 1, 245760, PLL_3, 5, 2, 61440000, 875, VDD_RAW(875) }, + { 0, 245760, PLL_3, 5, 2, 61440000, 875, VDD_RAW(875) }, { 1, 368640, PLL_3, 5, 1, 122800000, 900, VDD_RAW(900) }, { 1, 480000, PLL_2, 3, 0, 122800000, 925, VDD_RAW(925), &pll2_tbl[0]}, { 1, 600000, PLL_2, 3, 0, 122800000, 950, VDD_RAW(950), &pll2_tbl[1]}, diff --git a/drivers/cpufreq/cpufreq_smartass2.c b/drivers/cpufreq/cpufreq_smartass2.c index f81891d82..a9ccaf0fd 100644 --- a/drivers/cpufreq/cpufreq_smartass2.c +++ b/drivers/cpufreq/cpufreq_smartass2.c @@ -52,7 +52,7 @@ static unsigned int awake_ideal_freq; * that practically when sleep_ideal_freq==0 the awake_ideal_freq is used * also when suspended). */ -#define DEFAULT_SLEEP_IDEAL_FREQ 245000 +#define DEFAULT_SLEEP_IDEAL_FREQ 368640 static unsigned int sleep_ideal_freq; /* @@ -74,7 +74,7 @@ static unsigned int ramp_down_step; /* * CPU freq will be increased if measured load > max_cpu_load; */ -#define DEFAULT_MAX_CPU_LOAD 75 +#define DEFAULT_MAX_CPU_LOAD 70 static unsigned long max_cpu_load; /* From 8bd7c09d9535471cffd9569276786672fb20829e Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 7 Oct 2012 14:18:16 +1300 Subject: [PATCH 32/52] 1.8ghz Back and zram and swap enabled. --- arch/arm/configs/u8800_defconfig | 6 +++--- arch/arm/mach-msm/acpuclock-7x30.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/configs/u8800_defconfig b/arch/arm/configs/u8800_defconfig index 3090b8aa2..20b398c59 100644 --- a/arch/arm/configs/u8800_defconfig +++ b/arch/arm/configs/u8800_defconfig @@ -45,7 +45,7 @@ CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_LZO is not set CONFIG_DEFAULT_HOSTNAME="Paul Ubuntu" -# CONFIG_SWAP is not set +CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y # CONFIG_POSIX_MQUEUE is not set @@ -2165,12 +2165,12 @@ CONFIG_SND_SOC=y # # MSM SoC Audio support # +CONFIG_SND_MSM7KV2_SOC=y CONFIG_SND_MSM7KV2_DAI_SOC=y CONFIG_SND_MSM_SOC_MSM7KV2=y -CONFIG_SND_MSM7KV2_SOC=y +CONFIG_SND_MVS_SOC=y CONFIG_SND_MSM_MVS7x30_SOC=y CONFIG_SND_MSM_MVS_DAI_SOC=y -CONFIG_SND_MVS_SOC=y # CONFIG_SND_SOC_QDSP6 is not set CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ALL_CODECS is not set diff --git a/arch/arm/mach-msm/acpuclock-7x30.c b/arch/arm/mach-msm/acpuclock-7x30.c index 0182f01a4..c05e54cf7 100755 --- a/arch/arm/mach-msm/acpuclock-7x30.c +++ b/arch/arm/mach-msm/acpuclock-7x30.c @@ -140,7 +140,7 @@ static struct clkctl_acpu_speed acpu_freq_tbl[] = { { 1, 1516800, PLL_2, 3, 0, UINT_MAX, 1300, VDD_RAW(1300), &pll2_tbl[6]}, { 1, 1612800, PLL_2, 3, 0, UINT_MAX, 1350, VDD_RAW(1350), &pll2_tbl[7]}, { 1, 1708800, PLL_2, 3, 0, UINT_MAX, 1400, VDD_RAW(1400), &pll2_tbl[8]}, - { 0, 1804800, PLL_2, 3, 0, UINT_MAX, 1425, VDD_RAW(1425), &pll2_tbl[9]}, + { 1, 1804800, PLL_2, 3, 0, UINT_MAX, 1425, VDD_RAW(1425), &pll2_tbl[9]}, { 0 } }; From 39f445dcb1dc29a7fc1b635b6230293ad112e369 Mon Sep 17 00:00:00 2001 From: Paul Date: Tue, 9 Oct 2012 21:36:26 +1300 Subject: [PATCH 33/52] Set some kernel flags as per Ezet: https://github.com/ezeteze/u8800-kernel/commit/9abebbe178b4fa86297c038b2be2da3944f44296 --- Makefile | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 38621001a..684977189 100755 --- a/Makefile +++ b/Makefile @@ -192,7 +192,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ # Default value for CROSS_COMPILE is not to prefix executables # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile export KBUILD_BUILDHOST := $(SUBARCH) -MARCH ?= armv7-a +ARCH ?= arm CROSS_COMPILE ?= /home/milbank/Build/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi- # Architecture as present in compile.h @@ -351,11 +351,12 @@ CC = $(srctree)/scripts/gcc-wrapper.py $(REAL_CC) CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \ -Wbitwise -Wno-return-void $(CF) -CFLAGS_MODULE = -AFLAGS_MODULE = -LDFLAGS_MODULE = -CFLAGS_KERNEL = -AFLAGS_KERNEL = +MODFLAGS = -DMODULE +CFLAGS_MODULE = $(MODFLAGS) -fgcse -fsched-spec-load-dangerous -fforce-addr -ffast-math -funsafe-math-optimizations -fsingle-precision-constant -mtune=cortex-a8 -march=armv7-a -mfpu=vfpv3 -ftree-vectorize -pipe +AFLAGS_MODULE = $(MODFLAGS) +LDFLAGS_MODULE = -T $(srctree)/scripts/module-common.lds +CFLAGS_KERNEL = -fgcse -fsched-spec-load-dangerous -fforce-addr -ffast-math -funsafe-math-optimizations -fsingle-precision-constant -mtune=cortex-a8 -march=armv7-a -mfpu=vfpv3 -ftree-vectorize -pipe +AFLAGS_KERNEL = -fgcse -fsingle-precision-constant -mtune=cortex-a8 -march=armv7-a -mfpu=vfpv3 -ftree-vectorize CFLAGS_GCOV = -fprofile-arcs -ftest-coverage @@ -373,7 +374,11 @@ KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -fno-common \ -Werror-implicit-function-declaration \ -Wno-format-security \ - -fno-delete-null-pointer-checks + -fno-delete-null-pointer-checks \ + -mtune=cortex-a8 \ + -march=armv7-a + -mfpu=vfpv3 + KBUILD_AFLAGS_KERNEL := KBUILD_CFLAGS_KERNEL := KBUILD_AFLAGS := -D__ASSEMBLY__ From 5e950b75524d0b1228296bd5f2df532cd2fc567f Mon Sep 17 00:00:00 2001 From: Paul Date: Tue, 9 Oct 2012 21:53:00 +1300 Subject: [PATCH 34/52] Small sio tweak --- block/sio-iosched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/sio-iosched.c b/block/sio-iosched.c index c52a67c55..f5e2ca607 100644 --- a/block/sio-iosched.c +++ b/block/sio-iosched.c @@ -30,7 +30,7 @@ static const int async_read_expire = 4 * HZ; /* ditto for async, these limits static const int async_write_expire = 16 * HZ; /* ditto for async, these limits are SOFT! */ static const int writes_starved = 2; /* max times reads can starve a write */ -static const int fifo_batch = 8; /* # of sequential requests treated as one +static const int fifo_batch = 2; /* # of sequential requests treated as one by the above parameters. For throughput. */ /* Elevator data */ From 7e71a639d7b5a08822302bbabdcf45a2de3919ce Mon Sep 17 00:00:00 2001 From: Paul Date: Tue, 9 Oct 2012 22:05:02 +1300 Subject: [PATCH 35/52] Small LPj fix as per Franco --- init/calibrate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/calibrate.c b/init/calibrate.c index aae2f40fe..de01fccf3 100755 --- a/init/calibrate.c +++ b/init/calibrate.c @@ -269,7 +269,7 @@ void __cpuinit calibrate_delay(void) if (!printed) pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n", lpj/(500000/HZ), - (lpj/(5000/HZ)) % 100, lpj); + (lpj * 10 /(50000/HZ)) % 100, lpj); loops_per_jiffy = lpj; printed = true; From 329cb0fb798ebd76aaecbf7745e0e1ea31c26c75 Mon Sep 17 00:00:00 2001 From: Paul Date: Tue, 9 Oct 2012 22:41:07 +1300 Subject: [PATCH 36/52] Add Flush for adreno 20X targets as per: https://github.com/virtuous/htc7x30-3.0/commit/faf07f952f9960a17e6a71fc7de0c3339151768e --- drivers/gpu/msm/adreno.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c index 5bc74182e..cc988168d 100755 --- a/drivers/gpu/msm/adreno.c +++ b/drivers/gpu/msm/adreno.c @@ -273,6 +273,14 @@ static void adreno_setstate(struct kgsl_device *device, int sizedwords = 0; unsigned int mh_mmu_invalidate = 0x00000003; /*invalidate all and tc */ + /* + * Fix target freeze issue by adding TLB flush for each submit + * on A20X based targets. + */ + if (adreno_is_a20x(adreno_dev)) + flags |= KGSL_MMUFLAGS_TLBFLUSH; + + /* * If possible, then set the state via the command stream to avoid * a CPU idle. Otherwise, use the default setstate which uses register From cc326624f53e7465e595a06d5a121367f993985b Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 11 Oct 2012 23:04:43 +1300 Subject: [PATCH 37/52] Sound and wifi drivers from official 3.08pro kernel. Does not fix sound and will test with wifi. --- arch/arm/mach-msm/qdsp5v2/Makefile | 2 + arch/arm/mach-msm/qdsp5v2/adsp.c | 0 arch/arm/mach-msm/qdsp5v2/adsp.h | 0 arch/arm/mach-msm/qdsp5v2/adsp_driver.c | 0 arch/arm/mach-msm/qdsp5v2/adsp_info.c | 0 arch/arm/mach-msm/qdsp5v2/afe.c | 0 arch/arm/mach-msm/qdsp5v2/audio_a2dp_in.c | 4 +- arch/arm/mach-msm/qdsp5v2/audio_aac.c | 0 arch/arm/mach-msm/qdsp5v2/audio_aac_in.c | 4 +- arch/arm/mach-msm/qdsp5v2/audio_acdb.c | 3 +- arch/arm/mach-msm/qdsp5v2/audio_adpcm.c | 0 arch/arm/mach-msm/qdsp5v2/audio_amrnb.c | 0 arch/arm/mach-msm/qdsp5v2/audio_amrnb_in.c | 2 +- arch/arm/mach-msm/qdsp5v2/audio_amrwb.c | 0 arch/arm/mach-msm/qdsp5v2/audio_dev_ctl.c | 0 arch/arm/mach-msm/qdsp5v2/audio_evrc.c | 0 arch/arm/mach-msm/qdsp5v2/audio_evrc_in.c | 2 +- arch/arm/mach-msm/qdsp5v2/audio_fm.c | 0 arch/arm/mach-msm/qdsp5v2/audio_interct.c | 0 arch/arm/mach-msm/qdsp5v2/audio_lpa.c | 48 +- arch/arm/mach-msm/qdsp5v2/audio_mp3.c | 0 arch/arm/mach-msm/qdsp5v2/audio_mvs.c | 30 +- arch/arm/mach-msm/qdsp5v2/audio_out.c | 0 arch/arm/mach-msm/qdsp5v2/audio_pcm.c | 0 arch/arm/mach-msm/qdsp5v2/audio_pcm_in.c | 4 +- arch/arm/mach-msm/qdsp5v2/audio_qcelp.c | 0 arch/arm/mach-msm/qdsp5v2/audio_qcelp_in.c | 2 +- arch/arm/mach-msm/qdsp5v2/audio_wma.c | 0 arch/arm/mach-msm/qdsp5v2/audio_wmapro.c | 0 arch/arm/mach-msm/qdsp5v2/audpp.c | 0 arch/arm/mach-msm/qdsp5v2/audpreproc.c | 0 arch/arm/mach-msm/qdsp5v2/aux_pcm.c | 0 arch/arm/mach-msm/qdsp5v2/lpa.c | 0 arch/arm/mach-msm/qdsp5v2/mi2s.c | 0 arch/arm/mach-msm/qdsp5v2/mp3_funcs.c | 0 arch/arm/mach-msm/qdsp5v2/pcm_funcs.c | 0 .../mach-msm/qdsp5v2/snddev_data_marimba.c | 178 ++++-- .../mach-msm/qdsp5v2/snddev_data_timpani.c | 553 +++++++++++++++++- .../qdsp5v2/snddev_data_timpani_c8860.c | 36 ++ arch/arm/mach-msm/qdsp5v2/snddev_ecodec.c | 0 arch/arm/mach-msm/qdsp5v2/snddev_icodec.c | 0 arch/arm/mach-msm/qdsp5v2/snddev_mi2s.c | 0 arch/arm/mach-msm/qdsp5v2/snddev_virtual.c | 0 .../mach-msm/qdsp5v2/timpani_profile_7x30.h | 172 +++++- .../qdsp5v2/timpani_profile_7x30_c8860.h | 46 +- arch/arm/mach-msm/qdsp5v2/voice.c | 2 +- drivers/net/wireless/libra/libra_sdioif.c | 77 +-- .../net/wireless/libra/qcomwlan7x27a_pwrif.c | 0 drivers/net/wireless/libra/qcomwlan_pwrif.c | 5 +- sound/soc/msm/Kconfig | 8 + sound/soc/msm/Makefile | 5 +- sound/soc/msm/lpass-dma.c | 0 sound/soc/msm/lpass-i2s.c | 0 sound/soc/msm/lpass-pcm.c | 0 sound/soc/msm/lpass-pcm.h | 0 sound/soc/msm/msm-compr-q6.c | 12 +- sound/soc/msm/msm-dai-fe.c | 39 +- sound/soc/msm/msm-dai-q6.c | 320 ++++++++-- sound/soc/msm/msm-dai.c | 0 sound/soc/msm/msm-mvs.c | 0 sound/soc/msm/msm-pcm-afe.c | 0 sound/soc/msm/msm-pcm-afe.h | 0 sound/soc/msm/msm-pcm-hostless.c | 0 sound/soc/msm/msm-pcm-lpa.c | 38 +- sound/soc/msm/msm-pcm-q6.c | 29 +- sound/soc/msm/msm-pcm-q6.h | 2 +- sound/soc/msm/msm-pcm-routing.c | 211 ++++++- sound/soc/msm/msm-pcm-routing.h | 15 +- sound/soc/msm/msm-pcm-voice.c | 33 +- sound/soc/msm/msm-pcm-voice.h | 0 sound/soc/msm/msm-pcm-voip.c | 0 sound/soc/msm/msm-pcm.c | 0 sound/soc/msm/msm-pcm.h | 0 sound/soc/msm/msm-voip.c | 0 sound/soc/msm/msm7201.c | 0 sound/soc/msm/msm7k-pcm.c | 0 sound/soc/msm/msm7kv2-dai.c | 0 sound/soc/msm/msm7kv2-dsp.c | 0 sound/soc/msm/msm7kv2-pcm.c | 0 sound/soc/msm/msm7kv2-pcm.h | 0 sound/soc/msm/msm7x30.c | 0 sound/soc/msm/msm8660-apq-wm8903.c | 0 sound/soc/msm/msm8660.c | 0 sound/soc/msm/msm8960.c | 281 +++++++-- sound/soc/msm/msm8x60-dai.c | 0 sound/soc/msm/msm8x60-pcm.c | 0 sound/soc/msm/msm8x60-pcm.h | 0 sound/soc/msm/msm8x60.c | 0 sound/soc/msm/msm_audio_mvs.h | 0 sound/soc/msm/mvs-dai.c | 0 sound/soc/msm/qdsp6/Makefile | 0 sound/soc/msm/qdsp6/q6adm.c | 226 ++++++- sound/soc/msm/qdsp6/q6afe.c | 262 ++++++++- sound/soc/msm/qdsp6/q6asm.c | 68 ++- sound/soc/msm/qdsp6/q6voice.c | 524 ++++++++++++++++- sound/soc/msm/qdsp6/q6voice.h | 73 ++- 96 files changed, 2894 insertions(+), 422 deletions(-) mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/adsp.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/adsp.h mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/adsp_driver.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/adsp_info.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/afe.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_a2dp_in.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_aac.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_aac_in.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_adpcm.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_amrnb.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_amrnb_in.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_amrwb.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_dev_ctl.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_evrc.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_evrc_in.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_fm.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_interct.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_lpa.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_mp3.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_mvs.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_out.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_pcm.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_pcm_in.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_qcelp.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_qcelp_in.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_wma.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audio_wmapro.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audpp.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/audpreproc.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/aux_pcm.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/lpa.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/mi2s.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/mp3_funcs.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/pcm_funcs.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/snddev_ecodec.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/snddev_icodec.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/snddev_mi2s.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/snddev_virtual.c mode change 100755 => 100644 arch/arm/mach-msm/qdsp5v2/voice.c mode change 100755 => 100644 drivers/net/wireless/libra/libra_sdioif.c mode change 100755 => 100644 drivers/net/wireless/libra/qcomwlan7x27a_pwrif.c mode change 100755 => 100644 sound/soc/msm/Kconfig mode change 100755 => 100644 sound/soc/msm/Makefile mode change 100755 => 100644 sound/soc/msm/lpass-dma.c mode change 100755 => 100644 sound/soc/msm/lpass-i2s.c mode change 100755 => 100644 sound/soc/msm/lpass-pcm.c mode change 100755 => 100644 sound/soc/msm/lpass-pcm.h mode change 100644 => 100755 sound/soc/msm/msm-compr-q6.c mode change 100755 => 100644 sound/soc/msm/msm-dai-fe.c mode change 100755 => 100644 sound/soc/msm/msm-dai.c mode change 100755 => 100644 sound/soc/msm/msm-mvs.c mode change 100755 => 100644 sound/soc/msm/msm-pcm-afe.c mode change 100755 => 100644 sound/soc/msm/msm-pcm-afe.h mode change 100755 => 100644 sound/soc/msm/msm-pcm-hostless.c mode change 100755 => 100644 sound/soc/msm/msm-pcm-voice.h mode change 100755 => 100644 sound/soc/msm/msm-pcm-voip.c mode change 100755 => 100644 sound/soc/msm/msm-pcm.c mode change 100755 => 100644 sound/soc/msm/msm-pcm.h mode change 100755 => 100644 sound/soc/msm/msm-voip.c mode change 100755 => 100644 sound/soc/msm/msm7201.c mode change 100755 => 100644 sound/soc/msm/msm7k-pcm.c mode change 100755 => 100644 sound/soc/msm/msm7kv2-dai.c mode change 100755 => 100644 sound/soc/msm/msm7kv2-dsp.c mode change 100755 => 100644 sound/soc/msm/msm7kv2-pcm.c mode change 100755 => 100644 sound/soc/msm/msm7kv2-pcm.h mode change 100755 => 100644 sound/soc/msm/msm7x30.c mode change 100755 => 100644 sound/soc/msm/msm8660-apq-wm8903.c mode change 100755 => 100644 sound/soc/msm/msm8660.c mode change 100755 => 100644 sound/soc/msm/msm8x60-dai.c mode change 100755 => 100644 sound/soc/msm/msm8x60-pcm.c mode change 100755 => 100644 sound/soc/msm/msm8x60-pcm.h mode change 100755 => 100644 sound/soc/msm/msm8x60.c mode change 100755 => 100644 sound/soc/msm/msm_audio_mvs.h mode change 100755 => 100644 sound/soc/msm/mvs-dai.c mode change 100755 => 100644 sound/soc/msm/qdsp6/Makefile diff --git a/arch/arm/mach-msm/qdsp5v2/Makefile b/arch/arm/mach-msm/qdsp5v2/Makefile index 3f5e30a20..050c77755 100755 --- a/arch/arm/mach-msm/qdsp5v2/Makefile +++ b/arch/arm/mach-msm/qdsp5v2/Makefile @@ -7,7 +7,9 @@ obj-y += snddev_icodec.o endif obj-$(CONFIG_MARIMBA_CODEC) += snddev_data_marimba.o +# /*< DTS2011051303410 dongchen 20110516 begin */ obj-$(CONFIG_TIMPANI_CODEC) += snddev_data_timpani.o snddev_data_timpani_c8860.o +# /* DTS2011051303410 dongchen 20110516 end >*/ obj-y += audio_pcm.o audpp.o audio_mp3.o audio_wma.o audio_aac.o audio_amrnb.o obj-y += audio_amrwb.o audio_wmapro.o audio_adpcm.o audio_evrc.o audio_qcelp.o diff --git a/arch/arm/mach-msm/qdsp5v2/adsp.c b/arch/arm/mach-msm/qdsp5v2/adsp.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/adsp.h b/arch/arm/mach-msm/qdsp5v2/adsp.h old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/adsp_driver.c b/arch/arm/mach-msm/qdsp5v2/adsp_driver.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/adsp_info.c b/arch/arm/mach-msm/qdsp5v2/adsp_info.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/afe.c b/arch/arm/mach-msm/qdsp5v2/afe.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_a2dp_in.c b/arch/arm/mach-msm/qdsp5v2/audio_a2dp_in.c old mode 100755 new mode 100644 index 6166de262..60b5c200c --- a/arch/arm/mach-msm/qdsp5v2/audio_a2dp_in.c +++ b/arch/arm/mach-msm/qdsp5v2/audio_a2dp_in.c @@ -372,10 +372,8 @@ static int auda2dp_in_enc_config(struct audio_a2dp_in *audio, int enable) memset(&cmd, 0, sizeof(cmd)); if (audio->build_id[17] == '1') { cmd.cmd_id = AUDPREPROC_AUDREC_CMD_ENC_CFG_2; - MM_ERR("sending AUDPREPROC_AUDREC_CMD_ENC_CFG_2 command"); } else { cmd.cmd_id = AUDPREPROC_AUDREC_CMD_ENC_CFG; - MM_ERR("sending AUDPREPROC_AUDREC_CMD_ENC_CFG command"); } cmd.stream_id = audio->enc_id; @@ -950,7 +948,7 @@ static int auda2dp_in_open(struct inode *inode, struct file *file) goto evt_error; } audio->build_id = socinfo_get_build_id(); - MM_ERR("build id used is = %s\n", audio->build_id); + MM_DBG("Modem build id = %s\n", audio->build_id); file->private_data = audio; audio->opened = 1; rc = 0; diff --git a/arch/arm/mach-msm/qdsp5v2/audio_aac.c b/arch/arm/mach-msm/qdsp5v2/audio_aac.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_aac_in.c b/arch/arm/mach-msm/qdsp5v2/audio_aac_in.c old mode 100755 new mode 100644 index da77140e7..010fd90a9 --- a/arch/arm/mach-msm/qdsp5v2/audio_aac_in.c +++ b/arch/arm/mach-msm/qdsp5v2/audio_aac_in.c @@ -575,7 +575,6 @@ static int audaac_in_enc_config(struct audio_in *audio, int enable) { struct audpreproc_audrec_cmd_enc_cfg cmd; memset(&cmd, 0, sizeof(cmd)); - MM_ERR("build_id[17] = %c", audio->build_id[17]); if (audio->build_id[17] == '1') { cmd.cmd_id = AUDPREPROC_AUDREC_CMD_ENC_CFG_2; MM_ERR("sending AUDPREPROC_AUDREC_CMD_ENC_CFG_2 command"); @@ -1412,9 +1411,8 @@ static int audaac_in_open(struct inode *inode, struct file *file) MM_DBG("write buf: phy addr 0x%08x kernel addr 0x%08x\n", audio->out_phys, (int)audio->out_data); } - MM_ERR("trying to get the build id\n"); audio->build_id = socinfo_get_build_id(); - MM_ERR("build id used is = %s\n", audio->build_id); + MM_DBG("Modem build id = %s\n", audio->build_id); /* Initialize buffer */ audio->out[0].data = audio->out_data + 0; diff --git a/arch/arm/mach-msm/qdsp5v2/audio_acdb.c b/arch/arm/mach-msm/qdsp5v2/audio_acdb.c index e95e5fdb7..f97022637 100755 --- a/arch/arm/mach-msm/qdsp5v2/audio_acdb.c +++ b/arch/arm/mach-msm/qdsp5v2/audio_acdb.c @@ -1368,11 +1368,13 @@ static s32 acdb_get_calibration(void) acdb_cmd.command_id = ACDB_GET_DEVICE_TABLE; acdb_cmd.device_id = acdb_data.device_info->acdb_id; + /*< DTS2010120204486 dongchen 20101223 begin */ #ifdef CONFIG_HUAWEI_KERNEL acdb_cmd.network_id = ACDB_GSM_NB; //0x0108b155 #else acdb_cmd.network_id = 0x0108B153; #endif + /* DTS2010120204486 dongchen 20101223 end >*/ acdb_cmd.sample_rate_id = acdb_data.device_info->sample_rate; acdb_cmd.total_bytes = ACDB_BUF_SIZE; acdb_cmd.phys_buf = (u32 *)acdb_data.phys_addr; @@ -3292,7 +3294,6 @@ static s32 acdb_calibrate_device(void *data) result = acdb_initialize_data(); if (result) goto done; - MM_ERR("acdb_data.build_id[17] = %c\n", acdb_data.build_id[17]); if (acdb_data.build_id[17] != '0') { result = initialize_modem_acdb(); if (result < 0) diff --git a/arch/arm/mach-msm/qdsp5v2/audio_adpcm.c b/arch/arm/mach-msm/qdsp5v2/audio_adpcm.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_amrnb.c b/arch/arm/mach-msm/qdsp5v2/audio_amrnb.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_amrnb_in.c b/arch/arm/mach-msm/qdsp5v2/audio_amrnb_in.c old mode 100755 new mode 100644 index e1af44f64..bdb5bb1e8 --- a/arch/arm/mach-msm/qdsp5v2/audio_amrnb_in.c +++ b/arch/arm/mach-msm/qdsp5v2/audio_amrnb_in.c @@ -863,7 +863,7 @@ static int audamrnb_in_open(struct inode *inode, struct file *file) goto evt_error; } audio->build_id = socinfo_get_build_id(); - MM_ERR("build id used is = %s\n", audio->build_id); + MM_DBG("Modem build id = %s\n", audio->build_id); file->private_data = audio; audio->opened = 1; diff --git a/arch/arm/mach-msm/qdsp5v2/audio_amrwb.c b/arch/arm/mach-msm/qdsp5v2/audio_amrwb.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_dev_ctl.c b/arch/arm/mach-msm/qdsp5v2/audio_dev_ctl.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_evrc.c b/arch/arm/mach-msm/qdsp5v2/audio_evrc.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_evrc_in.c b/arch/arm/mach-msm/qdsp5v2/audio_evrc_in.c old mode 100755 new mode 100644 index c0861532e..50621c994 --- a/arch/arm/mach-msm/qdsp5v2/audio_evrc_in.c +++ b/arch/arm/mach-msm/qdsp5v2/audio_evrc_in.c @@ -1470,7 +1470,7 @@ static int audevrc_in_open(struct inode *inode, struct file *file) audio->opened = 1; audio->out_frame_cnt++; audio->build_id = socinfo_get_build_id(); - MM_ERR("build id used is = %s\n", audio->build_id); + MM_DBG("Modem build id = %s\n", audio->build_id); done: mutex_unlock(&audio->lock); diff --git a/arch/arm/mach-msm/qdsp5v2/audio_fm.c b/arch/arm/mach-msm/qdsp5v2/audio_fm.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_interct.c b/arch/arm/mach-msm/qdsp5v2/audio_interct.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_lpa.c b/arch/arm/mach-msm/qdsp5v2/audio_lpa.c old mode 100755 new mode 100644 index 0bfd59f5d..c38fefc22 --- a/arch/arm/mach-msm/qdsp5v2/audio_lpa.c +++ b/arch/arm/mach-msm/qdsp5v2/audio_lpa.c @@ -556,8 +556,6 @@ static void audlpa_async_send_buffer(struct audio *audio) if ((signed)(temp >= 0) && ((signed)(next_buf->buf.data_len - temp) >= 0)) { - MM_DBG("audlpa_async_send_buffer - sending the" - "rest of the buffer bassedon AV sync"); cmd.buf_ptr = (unsigned) (next_buf->paddr + (next_buf->buf.data_len - temp)); @@ -569,21 +567,6 @@ static void audlpa_async_send_buffer(struct audio *audio) audplay_send_queue0(audio, &cmd, sizeof(cmd)); audio->out_needed = 0; audio->drv_status |= ADRV_STATUS_OBUF_GIVEN; - } else if ((signed)(temp >= 0) && - ((signed)(next_buf->buf.data_len - - temp) < 0)) { - MM_DBG("audlpa_async_send_buffer - else case:" - "sending the rest of the buffer bassedon" - "AV sync"); - cmd.buf_ptr = (unsigned) next_buf->paddr; - cmd.buf_size = next_buf->buf.data_len >> 1; - cmd.partition_number = 0; - audio->bytecount_given = audio->bytecount_head + - next_buf->buf.data_len; - wmb(); - audplay_send_queue0(audio, &cmd, sizeof(cmd)); - audio->out_needed = 0; - audio->drv_status |= ADRV_STATUS_OBUF_GIVEN; } } } @@ -620,19 +603,15 @@ static void audlpa_async_send_data(struct audio *audio, unsigned needed, temp = audio->bytecount_head; used_buf = list_first_entry(&audio->out_queue, struct audlpa_buffer_node, list); - if (audio->device_switch != - DEVICE_SWITCH_STATE_COMPLETE) { - audio->bytecount_head += - used_buf->buf.data_len; - temp = audio->bytecount_head; - list_del(&used_buf->list); - evt_payload.aio_buf = used_buf->buf; - audlpa_post_event(audio, - AUDIO_EVENT_WRITE_DONE, - evt_payload); - kfree(used_buf); - audio->drv_status &= ~ADRV_STATUS_OBUF_GIVEN; - } + + audio->bytecount_head += used_buf->buf.data_len; + temp = audio->bytecount_head; + list_del(&used_buf->list); + evt_payload.aio_buf = used_buf->buf; + audlpa_post_event(audio, AUDIO_EVENT_WRITE_DONE, + evt_payload); + kfree(used_buf); + audio->drv_status &= ~ADRV_STATUS_OBUF_GIVEN; } } if (audio->out_needed) { @@ -1168,15 +1147,6 @@ static long audio_ioctl(struct file *file, unsigned int cmd, unsigned long arg) audio->wflush = 1; audio_ioport_reset(audio); if (audio->running) { - if (!(audio->drv_status & ADRV_STATUS_PAUSE)) { - rc = audpp_pause(audio->dec_id, (int) arg); - if (rc < 0) { - MM_ERR("%s: pause cmd failed rc=%d\n", - __func__, rc); - rc = -EINTR; - break; - } - } audpp_flush(audio->dec_id); rc = wait_event_interruptible(audio->write_wait, !audio->wflush); diff --git a/arch/arm/mach-msm/qdsp5v2/audio_mp3.c b/arch/arm/mach-msm/qdsp5v2/audio_mp3.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_mvs.c b/arch/arm/mach-msm/qdsp5v2/audio_mvs.c old mode 100755 new mode 100644 index fae240120..dc41bf41d --- a/arch/arm/mach-msm/qdsp5v2/audio_mvs.c +++ b/arch/arm/mach-msm/qdsp5v2/audio_mvs.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2012, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -276,7 +276,7 @@ union codec_param { struct audio_mvs_dl_reply { struct rpc_reply_hdr reply_hdr; - uint32_t voc_pkt[Q5V2_MVS_MAX_VOC_PKT_SIZE/4]; + uint32_t voc_pkt[MVS_MAX_VOC_PKT_SIZE/4]; uint32_t valid_frame_info_ptr; uint32_t frame_mode; @@ -288,7 +288,7 @@ struct audio_mvs_dl_reply { struct audio_mvs_buf_node { struct list_head list; - struct q5v2_msm_audio_mvs_frame frame; + struct msm_audio_mvs_frame frame; }; /* Each buffer is 20 ms, queue holds 200 ms of data. */ @@ -933,15 +933,10 @@ static void audio_mvs_process_rpc_request(uint32_t procedure, pr_debug("%s: UL AMR frame_type %d\n", __func__, be32_to_cpu(*args)); - } else if (frame_mode == MVS_FRAME_MODE_PCM_UL) { - /* PCM don't have frame_type */ + } else if ((frame_mode == MVS_FRAME_MODE_PCM_UL) || + (frame_mode == MVS_FRAME_MODE_VOC_TX)) { + /* PCM and EVRC don't have frame_type */ buf_node->frame.frame_type = 0; - } else if (frame_mode == MVS_FRAME_MODE_VOC_TX) { - /* Extracting EVRC current buffer frame rate*/ - buf_node->frame.frame_type = be32_to_cpu(*args); - - pr_debug("%s: UL EVRC frame_type %d\n", - __func__, be32_to_cpu(*args)); } else if (frame_mode == MVS_FRAME_MODE_G711_UL) { /* Extract G711 frame type. */ buf_node->frame.frame_type = be32_to_cpu(*args); @@ -1070,7 +1065,7 @@ static void audio_mvs_process_rpc_request(uint32_t procedure, cpu_to_be32(AUDIO_MVS_PKT_NORMAL); } else if (frame_mode == MVS_FRAME_MODE_VOC_RX) { dl_reply.cdc_param.gnr_arg.param1 = - cpu_to_be32(buf_node->frame.frame_type); + cpu_to_be32(audio->rate_type); dl_reply.cdc_param.gnr_arg.param2 = 0; dl_reply.cdc_param.\ gnr_arg.valid_pkt_status_ptr = @@ -1432,7 +1427,7 @@ static ssize_t audio_mvs_read(struct file *file, if ((audio->state == AUDIO_MVS_STARTED) && (!list_empty(&audio->out_queue))) { - if (count >= sizeof(struct q5v2_msm_audio_mvs_frame)) { + if (count >= sizeof(struct msm_audio_mvs_frame)) { buf_node = list_first_entry(&audio->out_queue, struct audio_mvs_buf_node, list); @@ -1440,8 +1435,7 @@ static ssize_t audio_mvs_read(struct file *file, rc = copy_to_user(buf, &buf_node->frame, - sizeof(struct q5v2_msm_audio_mvs_frame) - ); + sizeof(struct msm_audio_mvs_frame)); if (rc == 0) { rc = buf_node->frame.len + @@ -1459,7 +1453,7 @@ static ssize_t audio_mvs_read(struct file *file, } else { pr_err("%s: Read count %d < sizeof(frame) %d", __func__, count, - sizeof(struct q5v2_msm_audio_mvs_frame)); + sizeof(struct msm_audio_mvs_frame)); rc = -ENOMEM; } @@ -1497,7 +1491,7 @@ static ssize_t audio_mvs_write(struct file *file, mutex_lock(&audio->in_lock); if (audio->state == AUDIO_MVS_STARTED) { - if (count <= sizeof(struct q5v2_msm_audio_mvs_frame)) { + if (count <= sizeof(struct msm_audio_mvs_frame)) { if (!list_empty(&audio->free_in_queue)) { buf_node = list_first_entry(&audio->free_in_queue, @@ -1517,7 +1511,7 @@ static ssize_t audio_mvs_write(struct file *file, } else { pr_err("%s: Write count %d < sizeof(frame) %d", __func__, count, - sizeof(struct q5v2_msm_audio_mvs_frame)); + sizeof(struct msm_audio_mvs_frame)); rc = -ENOMEM; } diff --git a/arch/arm/mach-msm/qdsp5v2/audio_out.c b/arch/arm/mach-msm/qdsp5v2/audio_out.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_pcm.c b/arch/arm/mach-msm/qdsp5v2/audio_pcm.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_pcm_in.c b/arch/arm/mach-msm/qdsp5v2/audio_pcm_in.c old mode 100755 new mode 100644 index 43f3d262d..a5a9bd27e --- a/arch/arm/mach-msm/qdsp5v2/audio_pcm_in.c +++ b/arch/arm/mach-msm/qdsp5v2/audio_pcm_in.c @@ -638,7 +638,6 @@ static long audpcm_in_ioctl(struct file *file, rc = -EFAULT; break; } - MM_ERR("build_id[17] = %c\n", audio->build_id[17]); if (audio->build_id[17] == '1') { audio->enc_type = ENC_TYPE_EXT_WAV | audio->mode; if (cfg.channel_count == 1) { @@ -683,7 +682,6 @@ static long audpcm_in_ioctl(struct file *file, MM_ERR("wrong build_id = %s\n", audio->build_id); return -ENODEV; } - MM_ERR("buffer size configured is = %d\n", audio->buffer_size); audio->samp_rate = cfg.sample_rate; audio->channel_mode = cfg.channel_count; break; @@ -941,7 +939,7 @@ static int audpcm_in_open(struct inode *inode, struct file *file) audio->opened = 1; rc = 0; audio->build_id = socinfo_get_build_id(); - MM_ERR("build id used is = %s\n", audio->build_id); + MM_DBG("Modem build id = %s\n", audio->build_id); done: mutex_unlock(&audio->lock); return rc; diff --git a/arch/arm/mach-msm/qdsp5v2/audio_qcelp.c b/arch/arm/mach-msm/qdsp5v2/audio_qcelp.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_qcelp_in.c b/arch/arm/mach-msm/qdsp5v2/audio_qcelp_in.c old mode 100755 new mode 100644 index 11599f8e5..d34499dff --- a/arch/arm/mach-msm/qdsp5v2/audio_qcelp_in.c +++ b/arch/arm/mach-msm/qdsp5v2/audio_qcelp_in.c @@ -1475,7 +1475,7 @@ static int audqcelp_in_open(struct inode *inode, struct file *file) audio->opened = 1; audio->out_frame_cnt++; audio->build_id = socinfo_get_build_id(); - MM_ERR("build id used is = %s\n", audio->build_id); + MM_DBG("Modem build id = %s\n", audio->build_id); done: mutex_unlock(&audio->lock); return rc; diff --git a/arch/arm/mach-msm/qdsp5v2/audio_wma.c b/arch/arm/mach-msm/qdsp5v2/audio_wma.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_wmapro.c b/arch/arm/mach-msm/qdsp5v2/audio_wmapro.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/audpp.c b/arch/arm/mach-msm/qdsp5v2/audpp.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/audpreproc.c b/arch/arm/mach-msm/qdsp5v2/audpreproc.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/aux_pcm.c b/arch/arm/mach-msm/qdsp5v2/aux_pcm.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/lpa.c b/arch/arm/mach-msm/qdsp5v2/lpa.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/mi2s.c b/arch/arm/mach-msm/qdsp5v2/mi2s.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/mp3_funcs.c b/arch/arm/mach-msm/qdsp5v2/mp3_funcs.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/pcm_funcs.c b/arch/arm/mach-msm/qdsp5v2/pcm_funcs.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c b/arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c index ef65ceda9..f2ca9d9de 100755 --- a/arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c +++ b/arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c @@ -83,6 +83,7 @@ static struct platform_device msm_iearpiece_device = { .dev = { .platform_data = &snddev_iearpiece_data }, }; +/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -117,10 +118,10 @@ static struct snddev_icodec_data snddev_iearpiece_data_u8800 = { .pamp_on = NULL, .pamp_off = NULL, .property = SIDE_TONE_MASK, - .max_voice_rx_vol[VOC_NB_INDEX] = 1000, - .min_voice_rx_vol[VOC_NB_INDEX] = -1000, - .max_voice_rx_vol[VOC_WB_INDEX] = 1000, - .min_voice_rx_vol[VOC_WB_INDEX] = -1000 + .max_voice_rx_vol[VOC_NB_INDEX] = -700, + .min_voice_rx_vol[VOC_NB_INDEX] = -2200, + .max_voice_rx_vol[VOC_WB_INDEX] = -700, + .min_voice_rx_vol[VOC_WB_INDEX] = -2200 }; static struct platform_device msm_iearpiece_device_u8800 = { @@ -193,7 +194,7 @@ static struct adie_codec_dev_profile iearpiece_profile_u8800_51 = { .settings = iearpiece_settings_u8800_51, .setting_sz = ARRAY_SIZE(iearpiece_settings_u8800_51), }; - +/*< DTS2012072504870 caiying 20120725 begin */ static struct snddev_icodec_data snddev_iearpiece_data_u8800_51 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), .name = "handset_rx", @@ -207,12 +208,12 @@ static struct snddev_icodec_data snddev_iearpiece_data_u8800_51 = { .pamp_on = NULL, .pamp_off = NULL, .property = SIDE_TONE_MASK, - .max_voice_rx_vol[VOC_NB_INDEX] = -200, - .min_voice_rx_vol[VOC_NB_INDEX] = -1700, - .max_voice_rx_vol[VOC_WB_INDEX] = -200, - .min_voice_rx_vol[VOC_WB_INDEX] = -1700 + .max_voice_rx_vol[VOC_NB_INDEX] = 800, + .min_voice_rx_vol[VOC_NB_INDEX] = -700, + .max_voice_rx_vol[VOC_WB_INDEX] = 800, + .min_voice_rx_vol[VOC_WB_INDEX] = -700 }; - +/* DTS2012072504870 caiying 20120725 end >*/ static struct platform_device msm_iearpiece_device_u8800_51 = { .name = "snddev_icodec", .id = 0, @@ -220,7 +221,9 @@ static struct platform_device msm_iearpiece_device_u8800_51 = { }; /* U8800-51 device end >*/ #endif +/* DTS2011010400519 dongchen 20110104 end >*/ +/*< DTS2011021900121 dongchen 20110217 begin */ /* HAC handset */ static struct adie_codec_action_unit iearpiece_hac_48KHz_osr256_actions[] = HANDSET_HAC_RX_48000_OSR_256; @@ -263,6 +266,7 @@ static struct platform_device msm_iearpiece_hac_device = { .id = 35, .dev = { .platform_data = &snddev_iearpiece_hac_data }, }; +/* DTS2011021900121 dongchen 20110217 end >*/ static struct adie_codec_action_unit imic_8KHz_osr256_actions[] = HANDSET_TX_8000_OSR_256; @@ -322,6 +326,7 @@ static struct platform_device msm_imic_device = { .dev = { .platform_data = &snddev_imic_data }, }; +/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -504,6 +509,7 @@ static struct platform_device msm_imic_device_u8800_51 = { }; /* U8800-51 device end >*/ #endif +/* DTS2011010400519 dongchen 20110104 end >*/ static struct adie_codec_action_unit ihs_stereo_rx_48KHz_osr256_actions[] = HEADSET_STEREO_RX_LEGACY_48000_OSR_256; @@ -545,6 +551,7 @@ static struct platform_device msm_ihs_stereo_rx_device = { .dev = { .platform_data = &snddev_ihs_stereo_rx_data }, }; +/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -576,10 +583,10 @@ static struct snddev_icodec_data snddev_ihs_stereo_rx_data_u8800 = { .default_sample_rate = 48000, .pamp_on = msm_snddev_hsed_voltage_on, .pamp_off = msm_snddev_hsed_voltage_off, - .max_voice_rx_vol[VOC_NB_INDEX] = -500, - .min_voice_rx_vol[VOC_NB_INDEX] = -2000, - .max_voice_rx_vol[VOC_WB_INDEX] = -700, - .min_voice_rx_vol[VOC_WB_INDEX] = -2200 + .max_voice_rx_vol[VOC_NB_INDEX] = -300, + .min_voice_rx_vol[VOC_NB_INDEX] = -1800, + .max_voice_rx_vol[VOC_WB_INDEX] = -500, + .min_voice_rx_vol[VOC_WB_INDEX] = -2000 }; static struct platform_device msm_ihs_stereo_rx_device_u8800 = { @@ -649,7 +656,7 @@ static struct adie_codec_dev_profile ihs_stereo_rx_profile_u8800_51 = { .settings = ihs_stereo_rx_settings_u8800_51, .setting_sz = ARRAY_SIZE(ihs_stereo_rx_settings_u8800_51), }; - +/*< DTS2012072504870 caiying 20120725 begin */ static struct snddev_icodec_data snddev_ihs_stereo_rx_data_u8800_51 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), .name = "headset_stereo_rx", @@ -660,12 +667,12 @@ static struct snddev_icodec_data snddev_ihs_stereo_rx_data_u8800_51 = { .default_sample_rate = 48000, .pamp_on = msm_snddev_hsed_voltage_on, .pamp_off = msm_snddev_hsed_voltage_off, - .max_voice_rx_vol[VOC_NB_INDEX] = -300, - .min_voice_rx_vol[VOC_NB_INDEX] = -1800, - .max_voice_rx_vol[VOC_WB_INDEX] = -500, - .min_voice_rx_vol[VOC_WB_INDEX] = -2000 + .max_voice_rx_vol[VOC_NB_INDEX] = 400, + .min_voice_rx_vol[VOC_NB_INDEX] = -1100, + .max_voice_rx_vol[VOC_WB_INDEX] = 400, + .min_voice_rx_vol[VOC_WB_INDEX] = -1100 }; - +/* DTS2012072504870 caiying 20120725 end >*/ static struct platform_device msm_ihs_stereo_rx_device_u8800_51 = { .name = "snddev_icodec", .id = 2, @@ -673,6 +680,8 @@ static struct platform_device msm_ihs_stereo_rx_device_u8800_51 = { }; /* U8800-51 device end >*/ #endif +/* DTS2011010400519 dongchen 20110104 end >*/ +/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -804,6 +813,7 @@ static struct platform_device msm_ihs_music_stereo_rx_device_u8800_51 = { }; /* U8800-51 device end >*/ #endif +/* DTS2011010400519 dongchen 20110104 end >*/ static struct adie_codec_action_unit ihs_mono_rx_48KHz_osr256_actions[] = HEADSET_RX_LEGACY_48000_OSR_256; @@ -1017,6 +1027,7 @@ static struct platform_device msm_ihs_mono_tx_device = { .dev = { .platform_data = &snddev_ihs_mono_tx_data }, }; +/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -1193,6 +1204,7 @@ static struct platform_device msm_ihs_mono_tx_device_u8800_51 = { }; /* U8800-51 device end >*/ #endif +/* DTS2011010400519 dongchen 20110104 end >*/ static struct adie_codec_action_unit ifmradio_handset_osr64_actions[] = FM_HANDSET_OSR_64; @@ -1275,6 +1287,7 @@ static struct platform_device msm_ispeaker_rx_device = { }; +/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -1300,7 +1313,7 @@ static struct snddev_icodec_data snddev_ispeaker_rx_data_u8800 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), .name = "speaker_stereo_rx", .copp_id = 0, - .acdb_id = ACDB_ID_SPKR_PHONE_MUSIC_MONO, //7, //ACDB_ID_SPKR_PHONE_MONO, //7, + .acdb_id = ACDB_ID_SPKR_PHONE_MONO, //7, .profile = &ispeaker_rx_profile_u8800, .channel_mode = 1,//single channel for u8800 .pmctl_id = NULL, @@ -1308,10 +1321,10 @@ static struct snddev_icodec_data snddev_ispeaker_rx_data_u8800 = { .default_sample_rate = 48000, .pamp_on = &msm_snddev_poweramp_on, .pamp_off = &msm_snddev_poweramp_off, - .max_voice_rx_vol[VOC_NB_INDEX] = 0, - .min_voice_rx_vol[VOC_NB_INDEX] = -1500, - .max_voice_rx_vol[VOC_WB_INDEX] = 0, - .min_voice_rx_vol[VOC_WB_INDEX] = -1500 + .max_voice_rx_vol[VOC_NB_INDEX] = 200, + .min_voice_rx_vol[VOC_NB_INDEX] = -1300, + .max_voice_rx_vol[VOC_WB_INDEX] = 200, + .min_voice_rx_vol[VOC_WB_INDEX] = -1300 }; static struct platform_device msm_ispeaker_rx_device_u8800 = { @@ -1322,6 +1335,7 @@ static struct platform_device msm_ispeaker_rx_device_u8800 = { /* U8800 device end >*/ /*< U8820 device begin */ +/*< DTS2011012602886 dongchen 20110126 begin */ static struct adie_codec_action_unit ispeaker_rx_48KHz_osr256_actions_u8820[] = SPEAKER_RX_48000_OSR_256_U8820; @@ -1344,7 +1358,7 @@ static struct snddev_icodec_data snddev_ispeaker_rx_data_u8820 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), .name = "speaker_stereo_rx", .copp_id = 0, - .acdb_id = ACDB_ID_SPKR_PHONE_MUSIC_MONO, //7, //ACDB_ID_SPKR_PHONE_MONO, //7, + .acdb_id = ACDB_ID_SPKR_PHONE_MONO, //7, .profile = &ispeaker_rx_profile_u8820, .channel_mode = 1,//single channel for u8800_51 .pmctl_id = NULL, @@ -1352,10 +1366,10 @@ static struct snddev_icodec_data snddev_ispeaker_rx_data_u8820 = { .default_sample_rate = 48000, .pamp_on = &msm_snddev_poweramp_on, .pamp_off = &msm_snddev_poweramp_off, - .max_voice_rx_vol[VOC_NB_INDEX] = 100, - .min_voice_rx_vol[VOC_NB_INDEX] = -1400, - .max_voice_rx_vol[VOC_WB_INDEX] = 100, - .min_voice_rx_vol[VOC_WB_INDEX] = -1400 + .max_voice_rx_vol[VOC_NB_INDEX] = 200, + .min_voice_rx_vol[VOC_NB_INDEX] = -1300, + .max_voice_rx_vol[VOC_WB_INDEX] = 200, + .min_voice_rx_vol[VOC_WB_INDEX] = -1300 }; static struct platform_device msm_ispeaker_rx_device_u8820 = { @@ -1363,6 +1377,7 @@ static struct platform_device msm_ispeaker_rx_device_u8820 = { .id = 8, .dev = { .platform_data = &snddev_ispeaker_rx_data_u8820 }, }; +/* DTS2011012602886 dongchen 20110126 end >*/ /* U8820 device end >*/ /*< U8800-51 device begin */ @@ -1383,7 +1398,7 @@ static struct adie_codec_dev_profile ispeaker_rx_profile_u8800_51 = { .settings = ispeaker_rx_settings_u8800_51, .setting_sz = ARRAY_SIZE(ispeaker_rx_settings_u8800_51), }; - +/*< DTS2012072504870 caiying 20120725 begin */ static struct snddev_icodec_data snddev_ispeaker_rx_data_u8800_51 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), .name = "speaker_stereo_rx", @@ -1396,12 +1411,12 @@ static struct snddev_icodec_data snddev_ispeaker_rx_data_u8800_51 = { .default_sample_rate = 48000, .pamp_on = &msm_snddev_poweramp_on, .pamp_off = &msm_snddev_poweramp_off, - .max_voice_rx_vol[VOC_NB_INDEX] = 200, - .min_voice_rx_vol[VOC_NB_INDEX] = -1300, - .max_voice_rx_vol[VOC_WB_INDEX] = 200, - .min_voice_rx_vol[VOC_WB_INDEX] = -1300 + .max_voice_rx_vol[VOC_NB_INDEX] = 500, + .min_voice_rx_vol[VOC_NB_INDEX] = -1000, + .max_voice_rx_vol[VOC_WB_INDEX] = 500, + .min_voice_rx_vol[VOC_WB_INDEX] = -1000 }; - +/* DTS2012072504870 caiying 20120725 end >*/ static struct platform_device msm_ispeaker_rx_device_u8800_51 = { .name = "snddev_icodec", .id = 8, @@ -1409,6 +1424,8 @@ static struct platform_device msm_ispeaker_rx_device_u8800_51 = { }; /* U8800-51 device end >*/ #endif +/* DTS2011010400519 dongchen 20110104 end >*/ +/*< DTS2011031005289 dongchen 20110329 begin */ /*< speaker ptt rx device begin */ static struct adie_codec_action_unit ispeaker_ptt_rx_48KHz_osr256_actions[] = SPEAKER_PTT_RX_48000_OSR_256; @@ -1509,6 +1526,8 @@ static struct platform_device msm_ispeaker_ptt_tx_device = { .dev = { .platform_data = &snddev_ispeaker_ptt_tx_data }, }; /* speaker ptt tx device end >*/ +/* DTS2011031005289 dongchen 20110329 end >*/ +/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -1557,6 +1576,7 @@ static struct platform_device msm_ispeaker_music_mono_rx_device_u8800 = { /* U8800 device end >*/ /*< U8820 device begin */ +/*< DTS2011012602886 dongchen 20110126 begin */ static struct adie_codec_action_unit ispeaker_music_mono_rx_48KHz_osr256_actions_u8820[] = SPEAKER_MUSIC_MONO_RX_48000_OSR_256_U8820; @@ -1599,6 +1619,7 @@ static struct platform_device msm_ispeaker_music_mono_rx_device_u8820 = { .dev = { .platform_data = &snddev_ispeaker_music_mono_rx_data_u8820 }, }; +/* DTS2011012602886 dongchen 20110126 end >*/ /* U8820 device end >*/ /*< U8800-51 device begin */ @@ -1646,6 +1667,7 @@ static struct platform_device msm_ispeaker_music_mono_rx_device_u8800_51 = { }; /* U8800-51 device end >*/ #endif +/* DTS2011010400519 dongchen 20110104 end >*/ static struct adie_codec_action_unit ifmradio_speaker_osr64_actions[] = FM_SPEAKER_OSR_64; @@ -1684,6 +1706,7 @@ static struct platform_device msm_ifmradio_speaker_device = { .dev = { .platform_data = &snddev_ifmradio_speaker_data }, }; +/*< DTS2010061001230 dongchen 20100610 begin */ //configure to capless mode due to SR.00329728 and our headset is class AB rather than class D. #ifdef CONFIG_HUAWEI_KERNEL static struct adie_codec_action_unit ifmradio_headset_osr64_actions[] = @@ -1692,6 +1715,7 @@ static struct adie_codec_action_unit ifmradio_headset_osr64_actions[] = static struct adie_codec_action_unit ifmradio_headset_osr64_actions[] = FM_HEADSET_STEREO_CLASS_D_LEGACY_OSR_64; #endif +/* DTS2010061001230 SR.00329728 dongchen 20100610 end >*/ static struct adie_codec_hwsetting_entry ifmradio_headset_settings[] = { { @@ -1708,6 +1732,7 @@ static struct adie_codec_dev_profile ifmradio_headset_profile = { .setting_sz = ARRAY_SIZE(ifmradio_headset_settings), }; +/* < DTS2010061100256 dongchen 20100611 begin */ #ifdef CONFIG_HUAWEI_KERNEL static struct snddev_icodec_data snddev_ifmradio_headset_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_FM), @@ -1735,6 +1760,7 @@ static struct snddev_icodec_data snddev_ifmradio_headset_data = { .dev_vol_type = SNDDEV_DEV_VOL_DIGITAL, }; #endif +/*DTS2010061100256 dongchen 20100611 end> */ static struct platform_device msm_ifmradio_headset_device = { .name = "snddev_icodec", @@ -1818,6 +1844,7 @@ struct platform_device msm_bt_sco_mic_device = { .dev = { .platform_data = &snddev_bt_sco_mic_data }, }; +/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -1889,6 +1916,7 @@ struct platform_device msm_bt_sco_earpiece_device_u8800_51 = { }; /* U8800-51 device end >*/ #endif +/* DTS2011010400519 dongchen 20110104 end >*/ static struct adie_codec_action_unit idual_mic_endfire_8KHz_osr256_actions[] = MIC1_LEFT_LINE_IN_RIGHT_8000_OSR_256; @@ -2021,6 +2049,7 @@ static struct platform_device msm_idual_mic_broadside_device = { .dev = { .platform_data = &snddev_idual_mic_broadside_data }, }; +/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -2191,6 +2220,7 @@ static struct platform_device msm_idual_mic_broadside_device_u8800_51 = { }; /* U8800-51 device end >*/ #endif +/* DTS2011010400519 dongchen 20110104 end >*/ static struct adie_codec_action_unit ispk_dual_mic_ef_8KHz_osr256_actions[] = SPEAKER_MIC1_LEFT_LINE_IN_RIGHT_8000_OSR_256; @@ -2347,6 +2377,7 @@ static struct adie_codec_action_unit itty_hs_mono_rx_8KHz_osr256_actions[] = static struct adie_codec_action_unit itty_hs_mono_rx_16KHz_osr256_actions[] = TTY_HEADSET_MONO_RX_CLASS_D_16000_OSR_256; +/*< DTS2011012105219 yinzhaoyang modify 20110122 begin */ /* huawei TTY devices did not use Class D*/ #ifdef CONFIG_HUAWEI_KERNEL static struct adie_codec_action_unit itty_hs_mono_rx_48KHz_osr256_actions[] = @@ -2355,6 +2386,7 @@ static struct adie_codec_action_unit itty_hs_mono_rx_48KHz_osr256_actions[] = static struct adie_codec_action_unit itty_hs_mono_rx_48KHz_osr256_actions[] = TTY_HEADSET_MONO_RX_CLASS_D_48000_OSR_256; #endif +/* DTS2011012105219 yinzhaoyang modify 20110122 end > */ static struct adie_codec_hwsetting_entry itty_hs_mono_rx_settings[] = { { @@ -2460,6 +2492,7 @@ static struct platform_device msm_ispeaker_tx_device = { .dev = { .platform_data = &snddev_ispeaker_tx_data }, }; +/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -2633,6 +2666,7 @@ static struct platform_device msm_ispeaker_tx_device_u8800_51 = { }; /* U8800-51 device end >*/ #endif +/* DTS2011010400519 dongchen 20110104 end >*/ static struct adie_codec_action_unit iearpiece_ffa_48KHz_osr256_actions[] = HANDSET_RX_48000_OSR_256_FFA; @@ -2733,6 +2767,7 @@ static struct platform_device msm_imic_ffa_device = { }; +/*< DTS2010081201753 dongchen 20100926 begin */ #ifdef CONFIG_HUAWEI_KERNEL static struct adie_codec_action_unit ihs_stereo_speaker_stereo_rx_48KHz_osr256_actions[] = @@ -2742,6 +2777,7 @@ static struct adie_codec_action_unit ihs_stereo_speaker_stereo_rx_48KHz_osr256_actions[] = HEADSET_STEREO_SPEAKER_STEREO_RX_CAPLESS_48000_OSR_256; #endif +/* DTS2010081201753 dongchen 20100926 end >*/ static struct adie_codec_hwsetting_entry @@ -2785,6 +2821,7 @@ static struct platform_device msm_ihs_stereo_speaker_stereo_rx_device = { .dev = { .platform_data = &snddev_ihs_stereo_speaker_stereo_rx_data }, }; +/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -2931,19 +2968,26 @@ static struct platform_device msm_ihs_stereo_speaker_stereo_rx_device_u8800_51 = }; /* U8800-51 device end >*/ #endif +/* DTS2011010400519 dongchen 20110104 end >*/ +/* < DTS2010061100001 chenlei 20100527 begin*/ #ifdef CONFIG_HUAWEI_KERNEL +/* < DTS2010061100404 chenlei 20100611 begin*/ static enum hsed_controller handset_secondary_mic_tx_pmctl_id[] = {PM_HSED_CONTROLLER_0}; +/* DTS2010061100404 chenlei 20100611 end >*/ static struct adie_codec_action_unit handset_secondary_mic_tx_8KHz_osr256_actions[] = HANDSET_SECONDARY_MIC_TX_8000_OSR_256; static struct adie_codec_action_unit handset_secondary_mic_tx_16KHz_osr256_actions[] = HANDSET_SECONDARY_MIC_TX_16000_OSR_256; +/*< DTS2011030301679 dongchen 20110303 begin */ static struct adie_codec_action_unit handset_secondary_mic_tx_48KHz_osr256_actions[] = HANDSET_SECONDARY_MIC_TX_48000_OSR_256; +/* DTS2011030301679 dongchen 20110303 end >*/ +/*< DTS2011030301679 dongchen 20110303 begin */ static struct adie_codec_hwsetting_entry handset_secondary_mic_tx_settings[] = { { .freq_plan = 8000, @@ -2964,6 +3008,7 @@ static struct adie_codec_hwsetting_entry handset_secondary_mic_tx_settings[] = { .action_sz = ARRAY_SIZE(handset_secondary_mic_tx_48KHz_osr256_actions), } }; +/* DTS2011030301679 dongchen 20110303 end >*/ static struct adie_codec_dev_profile handset_secondary_mic_tx_profile = { .path_type = ADIE_CODEC_TX, @@ -2971,6 +3016,7 @@ static struct adie_codec_dev_profile handset_secondary_mic_tx_profile = { .setting_sz = ARRAY_SIZE(handset_secondary_mic_tx_settings), }; +/*< DTS2011030301679 dongchen 20110303 begin */ /* set default_sample_rate to 48000, keep the same as handset_tx device */ static struct snddev_icodec_data snddev_handset_secondary_mic_tx_data = { .capability = (SNDDEV_CAP_TX | SNDDEV_CAP_VOICE), @@ -2985,6 +3031,7 @@ static struct snddev_icodec_data snddev_handset_secondary_mic_tx_data = { .pamp_on = NULL, .pamp_off = NULL, }; +/* DTS2011030301679 dongchen 20110303 end >*/ static struct platform_device msm_handset_secondary_mic_tx_device = { .name = "snddev_icodec", @@ -2992,6 +3039,7 @@ static struct platform_device msm_handset_secondary_mic_tx_device = { .dev = { .platform_data = &snddev_handset_secondary_mic_tx_data }, }; #endif +/* DTS2010061100001 chenlei 20100527 end >*/ static struct snddev_mi2s_data snddev_mi2s_stereo_rx_data = { .capability = SNDDEV_CAP_RX , @@ -3030,6 +3078,7 @@ static struct platform_device msm_snddev_mi2s_fm_tx_device = { .dev = { .platform_data = &snddev_mi2s_fm_tx_data}, }; +/*< DTS2011012604575 dongchen 20110127 begin */ #ifdef CONFIG_HUAWEI_KERNEL /* ANALOG FM SPEAKER DEVICE */ static struct adie_codec_action_unit ifm_analog_speaker_48KHz_osr256_actions[] = @@ -3107,6 +3156,7 @@ static struct platform_device msm_snddev_analog_fm_hs_device = { .dev = { .platform_data = &snddev_analog_fm_hs_data }, }; #endif //#ifdef CONFIG_HUAWEI_KERNEL +/* DTS2011012604575 dongchen 20110127 end >*/ static struct snddev_icodec_data snddev_fluid_imic_tx_data = { .capability = (SNDDEV_CAP_TX | SNDDEV_CAP_VOICE), @@ -3316,6 +3366,8 @@ static struct platform_device *snd_devices_surf[] __initdata = { &msm_uplink_rx_device, }; +/*< DTS2011010400519 dongchen 20110104 begin */ +/* */ + /* DTS2010072400226 dongchen 20100724 end >*/ + /* < DTS2010061100001 chenlei 20100527 begin*/ &msm_handset_secondary_mic_tx_device, + /* DTS2010061100001 chenlei 20100527 end >*/ + /*< DTS2010062500999 dongchen 20100625 begin */ &msm_ihs_stereo_speaker_stereo_rx_device_u8800, + /* DTS2010062500999 dongchen 20100625 end >*/ + /*< DTS2010120204486 dongchen 20101223 begin */ &msm_ispeaker_music_mono_rx_device_u8800, &msm_snddev_mi2s_stereo_rx_device, + /* DTS2010120204486 dongchen 20101223 end >*/ + /*< DTS2010122105598 dongchen 20101221 begin */ &msm_ihs_music_stereo_rx_device_u8800, + /* DTS2010122105598 dongchen 20101221 end >*/ }; #endif +/*BU5D09852 lgq, sound device switch failure, 20100512 end>*/ +/* DTS2011010400519 dongchen 20110104 end >*/ +/*< DTS2011010400519 dongchen 20110104 begin */ +/*< DTS2010122004868 dongchen 20101220 begin */ #ifdef CONFIG_HUAWEI_KERNEL static struct platform_device *snd_devices_u8820[] __initdata = { &msm_iearpiece_device_u8820, @@ -3353,7 +3421,9 @@ static struct platform_device *snd_devices_u8820[] __initdata = { &msm_bt_sco_earpiece_device_u8820, &msm_bt_sco_mic_device, &msm_ifmradio_handset_device, + /*< DTS2011012602886 dongchen 20110126 begin */ &msm_ispeaker_rx_device_u8820, + /* DTS2011012602886 dongchen 20110126 end >*/ &msm_ifmradio_speaker_device, &msm_ifmradio_headset_device, &msm_itty_hs_mono_tx_device, @@ -3364,13 +3434,23 @@ static struct platform_device *snd_devices_u8820[] __initdata = { &msm_spk_idual_mic_broadside_device, &msm_handset_secondary_mic_tx_device, &msm_ihs_stereo_speaker_stereo_rx_device_u8820, + /*< DTS2010120204486 dongchen 20101223 begin */ + /*< DTS2011012602886 dongchen 20110126 begin */ &msm_ispeaker_music_mono_rx_device_u8820, + /* DTS2011012602886 dongchen 20110126 end >*/ &msm_snddev_mi2s_stereo_rx_device, + /* DTS2010120204486 dongchen 20101223 end >*/ + /*< DTS2010122105598 dongchen 20101221 begin */ &msm_ihs_music_stereo_rx_device_u8820, + /* DTS2010122105598 dongchen 20101221 end >*/ + /*< DTS2011021803548 dongchen 20110218 begin */ &msm_snddev_analog_fm_speaker_device, &msm_snddev_analog_fm_hs_device, + /* DTS2011021803548 dongchen 20110218 end >*/ + /*< DTS2011031005289 dongchen 20110329 begin */ &msm_ispeaker_ptt_rx_device, &msm_ispeaker_ptt_tx_device, + /* DTS2011031005289 dongchen 20110329 end >*/ }; static struct platform_device *snd_devices_u8800_51[] __initdata = { @@ -3392,14 +3472,24 @@ static struct platform_device *snd_devices_u8800_51[] __initdata = { &msm_spk_idual_mic_broadside_device, &msm_handset_secondary_mic_tx_device, &msm_ihs_stereo_speaker_stereo_rx_device_u8800_51, + /*< DTS2010120204486 dongchen 20101223 begin */ &msm_ispeaker_music_mono_rx_device_u8800_51, &msm_snddev_mi2s_stereo_rx_device, + /* DTS2010120204486 dongchen 20101223 end >*/ + /*< DTS2010122105598 dongchen 20101221 begin */ &msm_ihs_music_stereo_rx_device_u8800_51, + /* DTS2010122105598 dongchen 20101221 end >*/ + /*< DTS2011012604575 dongchen 20110127 begin */ &msm_snddev_analog_fm_speaker_device, &msm_snddev_analog_fm_hs_device, + /* DTS2011012604575 dongchen 20110127 end >*/ + /*< DTS2011021900121 dongchen 20110217 begin */ &msm_iearpiece_hac_device, + /* DTS2011021900121 dongchen 20110217 end >*/ }; #endif +/* DTS2010122004868 dongchen 20101220 end >*/ +/* DTS2011010400519 dongchen 20110104 end >*/ static struct platform_device *snd_devices_fluid[] __initdata = { @@ -3525,7 +3615,11 @@ void __ref msm_snddev_init(void) else if (machine_is_msm7x30_fluid()) platform_add_devices(snd_devices_fluid, ARRAY_SIZE(snd_devices_fluid)); + /**/ + /*< DTS2011050601476 dongchen 20110506 begin */ + /* delete DTS2011041501614, snd_devices_u8860 is in snddev_data_timpani.c */ + /* DTS2011050601476 dongchen 20110506 end >*/ + /*< DTS2011051303410 dongchen 20110516 begin */ + /* delete DTS2011050700551, QTR8615 use snddev_data_timpani.c */ + /* DTS2011051303410 dongchen 20110516 end >*/ + /* DTS2010112702297 wangquanli 201001125 end >*/ + /* DTS2010122004868 dongchen 20101220 end >*/ + /* DTS2010092400487 lijianzhao 20100924 end >*/ #endif + /*BU5D09852 lgq, sound device switch failure, 20100512 end>*/ else pr_err("%s: Unknown machine type\n", __func__); } diff --git a/arch/arm/mach-msm/qdsp5v2/snddev_data_timpani.c b/arch/arm/mach-msm/qdsp5v2/snddev_data_timpani.c index adb4927b4..d13ef0f45 100755 --- a/arch/arm/mach-msm/qdsp5v2/snddev_data_timpani.c +++ b/arch/arm/mach-msm/qdsp5v2/snddev_data_timpani.c @@ -25,7 +25,12 @@ #include #include "timpani_profile_7x30.h" #include - +/* < DTS2012022402932 gaolin 20120224 begin */ +/*< DTS2011122606588 yinzhaoyang 20111230 begin */ +#include +#include "../smd_private.h" +/* DTS2011122606588 yinzhaoyang 20111230 end > */ +/* DTS2012022402932 gaolin 20120224 end > */ /* define the value for BT_SCO */ #define BT_SCO_PCM_CTL_VAL (PCM_CTL__RPCM_WIDTH__LINEAR_V |\ PCM_CTL__TPCM_WIDTH__LINEAR_V) @@ -33,8 +38,10 @@ DATA_FORMAT_PADDING_INFO__TPCM_FORMAT_V) #define BT_SCO_AUX_CODEC_INTF AUX_CODEC_INTF_CTL__PCMINTF_DATA_EN_V +/*< DTS2011051303410 dongchen 20110516 begin */ extern struct platform_device *snd_devices_c8860[]; extern int arraysize_c8860; +/* DTS2011051303410 dongchen 20110516 end >*/ #ifdef CONFIG_DEBUG_FS static struct dentry *debugfs_hsed_config; @@ -747,7 +754,9 @@ static struct adie_codec_dev_profile ihs_stereo_speaker_stereo_rx_profile = { .setting_sz = ARRAY_SIZE(ihs_stereo_speaker_stereo_rx_settings), }; +/*< DTS2011101304810 dongchen 20111013 begin */ /* acdb_id from ACDB_ID_HEADSET_STEREO_PLUS_SPKR_STEREO_RX to ACDB_ID_HEADSET_STEREO_PLUS_SPKR_MONO_RX */ +/*< DTS2011061605311 dongchen 20110614 begin */ /* set msm_snddev_poweramp_4music_on as pamp_on func */ static struct snddev_icodec_data snddev_ihs_stereo_speaker_stereo_rx_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -766,6 +775,8 @@ static struct snddev_icodec_data snddev_ihs_stereo_speaker_stereo_rx_data = { .max_voice_rx_vol[VOC_WB_INDEX] = -900, .min_voice_rx_vol[VOC_WB_INDEX] = -2400, }; +/* DTS2011061605311 dongchen 20110614 end >*/ +/* DTS2011101304810 dongchen 20111013 end >*/ static struct platform_device msm_ihs_stereo_speaker_stereo_rx_device = { .name = "snddev_icodec", @@ -968,6 +979,7 @@ static struct platform_device msm_auxpga_lb_hs_device = { .dev = { .platform_data = &snddev_auxpga_lb_hs_data }, }; +/*< DTS2011050601476 dongchen 20110506 begin */ /****************************************************************/ /** HUAWEI ADDED DEVICE **/ /****************************************************************/ @@ -991,7 +1003,11 @@ static struct adie_codec_dev_profile iearpiece_profile_u8860 = { .setting_sz = ARRAY_SIZE(iearpiece_settings_u8860), }; +/* < DTS2012033005129 mengdong81003944 20120401 begin */ +/* rx volume from 0dB to 6dB */ +/*< DTS2011080400504 dongchen 20110805 begin */ /* rx volume from 6dB to 0dB */ +/*< DTS2011061705385 dongchen 20110617 begin */ /* rx volume from -7dB to 6dB */ static struct snddev_icodec_data snddev_iearpiece_data_u8860 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -1006,11 +1022,14 @@ static struct snddev_icodec_data snddev_iearpiece_data_u8860 = { .pamp_on = NULL, .pamp_off = NULL, .property = SIDE_TONE_MASK, - .max_voice_rx_vol[VOC_NB_INDEX] = 0, - .min_voice_rx_vol[VOC_NB_INDEX] = -1500, - .max_voice_rx_vol[VOC_WB_INDEX] = -700, - .min_voice_rx_vol[VOC_WB_INDEX] = -2200, + .max_voice_rx_vol[VOC_NB_INDEX] = 600, + .min_voice_rx_vol[VOC_NB_INDEX] = -900, + .max_voice_rx_vol[VOC_WB_INDEX] = 600, + .min_voice_rx_vol[VOC_WB_INDEX] = -900, }; +/* DTS2011061705385 dongchen 20110617 end >*/ +/* DTS2011080400504 dongchen 20110805 end >*/ +/* DTS2012033005129 mengdong81003944 20120401 end > */ static struct platform_device msm_iearpiece_device_u8860 = { .name = "snddev_icodec", @@ -1078,8 +1097,11 @@ static struct adie_codec_dev_profile ispkr_stereo_profile_u8860 = { .setting_sz = ARRAY_SIZE(ispkr_stereo_settings_u8860), }; +/*< DTS2011090100008 dongchen 20110901 begin */ /* rx volume from -8dB to 3dB */ +/*< DTS2011080400504 dongchen 20110805 begin */ /* rx volume from -2dB to -8dB */ +/*< DTS2011053005461 dongchen 20110530 begin */ /* set to mono device */ static struct snddev_icodec_data snddev_ispkr_stereo_data_u8860 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -1098,6 +1120,9 @@ static struct snddev_icodec_data snddev_ispkr_stereo_data_u8860 = { .max_voice_rx_vol[VOC_WB_INDEX] = 300, .min_voice_rx_vol[VOC_WB_INDEX] = -1200 }; +/* DTS2011053005461 dongchen 20110530 end >*/ +/* DTS2011080400504 dongchen 20110805 end >*/ +/* DTS2011090100008 dongchen 20110901 end >*/ static struct platform_device msm_ispkr_stereo_device_u8860 = { .name = "snddev_icodec", @@ -1186,7 +1211,11 @@ static struct adie_codec_dev_profile headset_ab_cpls_profile_u8860 = { .setting_sz = ARRAY_SIZE(headset_ab_cpls_settings_u8860), }; +/* < DTS2012033005129 mengdong81003944 20120401 begin */ +/* rxvolume from 2dB to 3dB */ +/*< DTS2011092500702 dongchen 20110926 begin */ /* rxvolume from -4dB to 2dB */ +/*< DTS2011061705385 dongchen 20110617 begin */ /* rxvolume from -7dB to -4dB */ static struct snddev_icodec_data snddev_ihs_stereo_rx_data_u8860 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -1203,11 +1232,14 @@ static struct snddev_icodec_data snddev_ihs_stereo_rx_data_u8860 = { .property = SIDE_TONE_MASK, .voltage_on = msm_snddev_hsed_voltage_on, .voltage_off = msm_snddev_hsed_voltage_off, - .max_voice_rx_vol[VOC_NB_INDEX] = 200, - .min_voice_rx_vol[VOC_NB_INDEX] = -1300, - .max_voice_rx_vol[VOC_WB_INDEX] = -500, - .min_voice_rx_vol[VOC_WB_INDEX] = -2000, + .max_voice_rx_vol[VOC_NB_INDEX] = -300, + .min_voice_rx_vol[VOC_NB_INDEX] = -1800, + .max_voice_rx_vol[VOC_WB_INDEX] = -300, + .min_voice_rx_vol[VOC_WB_INDEX] = -1800, }; +/* DTS2011061705385 dongchen 20110617 end >*/ +/* DTS2011092500702 dongchen 20110926 end >*/ +/* DTS2012033005129 mengdong81003944 20120401 end > */ static struct platform_device msm_headset_stereo_device_u8860 = { .name = "snddev_icodec", @@ -1265,10 +1297,66 @@ static struct platform_device msm_idual_mic_broadside_device_u8860 = { .id = 13, .dev = { .platform_data = &snddev_idual_mic_broadside_data_u8860 }, }; +/* < DTS2012022402932 gaolin 20120224 begin */ +/*< DTS2011122606588 yinzhaoyang 20111230 begin */ +/* ES HANDSET DUAL MIC BROADSIDE */ +static struct adie_codec_action_unit idual_mic_bs_8KHz_osr256_actions_u8860_es[] = + AMIC_BROADSIDE_DUAL_8000_OSR_256_U8860_es; + +static struct adie_codec_hwsetting_entry idual_mic_broadside_settings_u8860_es[] = { + { + .freq_plan = 8000, + .osr = 256, + .actions = idual_mic_bs_8KHz_osr256_actions_u8860_es, + .action_sz = ARRAY_SIZE(idual_mic_bs_8KHz_osr256_actions_u8860_es), + }, /* 8KHz profile can be used for 16KHz */ + { + .freq_plan = 16000, + .osr = 256, + .actions = idual_mic_bs_8KHz_osr256_actions_u8860_es, + .action_sz = ARRAY_SIZE(idual_mic_bs_8KHz_osr256_actions_u8860_es), + }, /* 8KHz profile can be used for 16KHz */ + { + .freq_plan = 48000, + .osr = 256, + .actions = idual_mic_bs_8KHz_osr256_actions_u8860_es, + .action_sz = ARRAY_SIZE(idual_mic_bs_8KHz_osr256_actions_u8860_es), + } +}; + +static struct adie_codec_dev_profile idual_mic_broadside_profile_u8860_es = { + .path_type = ADIE_CODEC_TX, + .settings = idual_mic_broadside_settings_u8860_es, + .setting_sz = ARRAY_SIZE(idual_mic_broadside_settings_u8860_es), +}; + +static struct snddev_icodec_data snddev_idual_mic_broadside_data_u8860_es = { + .capability = (SNDDEV_CAP_TX | SNDDEV_CAP_VOICE), + .name = "handset_dual_mic_broadside_tx", + .copp_id = 0, + .acdb_id = ACDB_ID_HANDSET_MIC_BROADSIDE, + .profile = &idual_mic_broadside_profile_u8860_es, + .channel_mode = 2, + .default_sample_rate = 48000, + .pmctl_id = idual_mic_broadside_pmctl_id, + .pmctl_id_sz = ARRAY_SIZE(idual_mic_broadside_pmctl_id), + .pamp_on = NULL, + .pamp_off = NULL, +}; + +static struct platform_device msm_idual_mic_broadside_device_u8860_es = { + .name = "snddev_icodec", + .id = 13, + .dev = { .platform_data = &snddev_idual_mic_broadside_data_u8860_es }, +}; +/* DTS2011122606588 yinzhaoyang 20111230 end > */ +/* DTS2012022402932 gaolin 20120224 end > */ /* SPEAKER MUSIC STEREO DEVICE */ +/*< DTS2011050903865 dongchen 20110513 begin */ static struct adie_codec_action_unit ispkr_music_stereo_48KHz_osr256_actions_u8860[] = SPEAKER_PRI_MUSIC_STEREO_48000_OSR_256_U8860; +/* DTS2011050903865 dongchen 20110513 end >*/ static struct adie_codec_hwsetting_entry ispkr_music_stereo_settings_u8860[] = { { @@ -1285,7 +1373,9 @@ static struct adie_codec_dev_profile ispkr_music_stereo_profile_u8860 = { .setting_sz = ARRAY_SIZE(ispkr_music_stereo_settings_u8860), }; +/*< DTS2011061605311 dongchen 20110614 begin */ /* set ACDB_ID_SPKR_PHONE_MUSIC_MONO as acdb_id */ +/*< DTS2011053005461 dongchen 20110530 begin */ /* set to mono device, use music tpa parameter */ static struct snddev_icodec_data snddev_ispkr_music_stereo_data_u8860 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -1304,6 +1394,8 @@ static struct snddev_icodec_data snddev_ispkr_music_stereo_data_u8860 = { .max_voice_rx_vol[VOC_WB_INDEX] = 1000, .min_voice_rx_vol[VOC_WB_INDEX] = -500 }; +/* DTS2011053005461 dongchen 20110530 end >*/ +/* DTS2011061605311 dongchen 20110614 end >*/ static struct platform_device msm_ispkr_music_stereo_device_u8860 = { .name = "snddev_icodec", @@ -1330,6 +1422,7 @@ static struct adie_codec_dev_profile headset_ab_cpls_music_profile_u8860 = { .setting_sz = ARRAY_SIZE(headset_ab_cpls_music_settings_u8860), }; +/*< DTS2011061605311 dongchen 20110614 begin */ /* set ACDB_ID_HEADSET_SPKR_MUSIC_STEREO as acdb_id */ static struct snddev_icodec_data snddev_ihs_music_stereo_rx_data_u8860 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -1351,6 +1444,7 @@ static struct snddev_icodec_data snddev_ihs_music_stereo_rx_data_u8860 = { .max_voice_rx_vol[VOC_WB_INDEX] = -900, .min_voice_rx_vol[VOC_WB_INDEX] = -2400, }; +/* DTS2011061605311 dongchen 20110614 end >*/ static struct platform_device msm_headset_music_stereo_device_u8860 = { .name = "snddev_icodec", @@ -1377,6 +1471,7 @@ static struct adie_codec_dev_profile iearpiece_hac_profile_u8860 = { .setting_sz = ARRAY_SIZE(iearpiece_hac_settings_u8860), }; +/*< DTS2011061605311 dongchen 20110614 begin */ /* set ACDB_ID_HANDSET_HAC_SPKR as acdb_id */ static struct snddev_icodec_data snddev_iearpiece_hac_data_u8860 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -1388,15 +1483,18 @@ static struct snddev_icodec_data snddev_iearpiece_hac_data_u8860 = { .pmctl_id = NULL, .pmctl_id_sz = 0, .default_sample_rate = 48000, + /**/ .property = SIDE_TONE_MASK, .max_voice_rx_vol[VOC_NB_INDEX] = -700, .min_voice_rx_vol[VOC_NB_INDEX] = -2200, .max_voice_rx_vol[VOC_WB_INDEX] = -1400, .min_voice_rx_vol[VOC_WB_INDEX] = -2900, }; +/* DTS2011061605311 dongchen 20110614 end >*/ static struct platform_device msm_iearpiece_hac_device_u8860 = { .name = "snddev_icodec", @@ -1464,6 +1562,7 @@ static struct adie_codec_dev_profile ifm_analog_speaker_profile = { .setting_sz = ARRAY_SIZE(ifm_analog_speaker_settings), }; +/*< DTS2011082205270 dongchen 20110824 begin */ /* set msm_snddev_poweramp_4music_on as pamp_on for FM Speaker */ static struct snddev_icodec_data snddev_analog_fm_speaker_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -1478,6 +1577,7 @@ static struct snddev_icodec_data snddev_analog_fm_speaker_data = { .pamp_on = &msm_snddev_poweramp_4music_on, .pamp_off = &msm_snddev_poweramp_off, }; +/* DTS2011082205270 dongchen 20110824 end >*/ static struct platform_device msm_snddev_analog_fm_speaker_device = { .name = "snddev_icodec", @@ -1523,6 +1623,290 @@ static struct platform_device msm_snddev_analog_fm_hs_device = { }; #endif +/* DTS2011050601476 dongchen 20110506 end >*/ +/* < DTS2012022402932 gaolin 20120224 begin */ +/* */ +/* AMIC Primary mono, common for SPEAKER MONO TX and HANDSET MONO TX */ +static struct snddev_icodec_data snddev_imic_data_u8730 = { + .capability = (SNDDEV_CAP_TX | SNDDEV_CAP_VOICE), + .name = "handset_tx", + .copp_id = 0, + .acdb_id = ACDB_ID_HANDSET_MIC, + .profile = &imic_profile_u8860, + .channel_mode = 1, + .pmctl_id = imic_pmctl_id_u8860, + .pmctl_id_sz = ARRAY_SIZE(imic_pmctl_id_u8860), + .default_sample_rate = 48000, + .pamp_on = msm_snddev_tx_route_config, + .pamp_off = msm_snddev_tx_route_deconfig, +}; + +static struct platform_device msm_imic_device_u8730 = { + .name = "snddev_icodec", + .id = 20, + .dev = { .platform_data = &snddev_imic_data_u8730 }, +}; + + +/* SPEAKER MONO TX */ +static struct snddev_icodec_data snddev_ispkr_mic_data_u8730 = { + .capability = (SNDDEV_CAP_TX | SNDDEV_CAP_VOICE), + .name = "speaker_mono_tx", + .copp_id = 0, + .acdb_id = ACDB_ID_SPKR_PHONE_MIC, + .profile = &imic_profile_u8860, + .channel_mode = 1, + .pmctl_id = ispk_pmctl_id_u8860, + .pmctl_id_sz = ARRAY_SIZE(ispk_pmctl_id_u8860), + .default_sample_rate = 48000, + .pamp_on = msm_snddev_tx_route_config, + .pamp_off = msm_snddev_tx_route_deconfig, +}; + +static struct platform_device msm_ispkr_mic_device_u8730 = { + .name = "snddev_icodec", + .id = 18, + .dev = { .platform_data = &snddev_ispkr_mic_data_u8730 }, +}; +/* HANDSET DUAL MIC BROADSIDE */ +/* < DTS2012012101655 liurennianKF62391 20120129 begin */ +static struct adie_codec_action_unit idual_mic_bs_8KHz_osr256_actions_u8730[] = + AMIC_BROADSIDE_DUAL_8000_OSR_256_U8730; + +static struct adie_codec_hwsetting_entry idual_mic_broadside_settings_u8730[] = { + { + .freq_plan = 8000, + .osr = 256, + .actions = idual_mic_bs_8KHz_osr256_actions_u8730, + .action_sz = ARRAY_SIZE(idual_mic_bs_8KHz_osr256_actions_u8730), + }, /* 8KHz profile can be used for 16KHz */ + { + .freq_plan = 16000, + .osr = 256, + .actions = idual_mic_bs_8KHz_osr256_actions_u8730, + .action_sz = ARRAY_SIZE(idual_mic_bs_8KHz_osr256_actions_u8730), + }, /* 8KHz profile can be used for 16KHz */ + { + .freq_plan = 48000, + .osr = 256, + .actions = idual_mic_bs_8KHz_osr256_actions_u8730, + .action_sz = ARRAY_SIZE(idual_mic_bs_8KHz_osr256_actions_u8730), + } +}; + +static struct adie_codec_dev_profile idual_mic_broadside_profile_u8730 = { + .path_type = ADIE_CODEC_TX, + .settings = idual_mic_broadside_settings_u8730, + .setting_sz = ARRAY_SIZE(idual_mic_broadside_settings_u8730), +}; + +static struct snddev_icodec_data snddev_idual_mic_broadside_data_u8730 = { + .capability = (SNDDEV_CAP_TX | SNDDEV_CAP_VOICE), + .name = "handset_dual_mic_broadside_tx", + .copp_id = 0, + .acdb_id = ACDB_ID_HANDSET_MIC_BROADSIDE, + .profile = &idual_mic_broadside_profile_u8730, + .channel_mode = 2, + .default_sample_rate = 48000, + .pmctl_id = idual_mic_broadside_pmctl_id, + .pmctl_id_sz = ARRAY_SIZE(idual_mic_broadside_pmctl_id), + .pamp_on = msm_snddev_tx_route_config, + .pamp_off = msm_snddev_tx_route_deconfig, +}; +/* DTS2012012101655 liurennianKF62391 20120129 end > */ +static struct platform_device msm_idual_mic_broadside_device_u8730 = { + .name = "snddev_icodec", + .id = 13, + .dev = { .platform_data = &snddev_idual_mic_broadside_data_u8730 }, +}; + +/* HANDSET SECONDARY MIC DEVICE */ + +static struct snddev_icodec_data snddev_handset_secondary_mic_tx_data_u8730 = { + .capability = (SNDDEV_CAP_TX | SNDDEV_CAP_VOICE), + .name = "handset_secondary_mic_tx", + .copp_id = 0, + .acdb_id = ACDB_ID_HANDSET_MIC, + .profile = &handset_secondary_mic_tx_profile, + .channel_mode = 1, + .pmctl_id = handset_secondary_mic_tx_pmctl_id, + .pmctl_id_sz = ARRAY_SIZE(handset_secondary_mic_tx_pmctl_id), + .default_sample_rate = 48000, + .pamp_on = msm_snddev_tx_route_config, + .pamp_off = msm_snddev_tx_route_deconfig, +}; + +static struct platform_device msm_handset_secondary_mic_tx_device_u8730 = { + .name = "snddev_icodec", + .id = 250, + .dev = { .platform_data = &snddev_handset_secondary_mic_tx_data_u8730 }, +}; +/* DTS2011092905909 yinzhaoyang 20110929 end >*/ + +/* < DTS2012010706112 liurennianKF62391 20120109 begin */ +/****************************************************************/ +/** HUAWEI ADDED DEVICE U8680 **/ +/****************************************************************/ +/* HANDSET DUAL MIC BROADSIDE */ +static struct adie_codec_action_unit idual_mic_bs_8KHz_osr256_actions_u8680[] = + AMIC_BROADSIDE_DUAL_8000_OSR_256_U8680; + +static struct adie_codec_hwsetting_entry idual_mic_broadside_settings_u8680[] = { + { + .freq_plan = 8000, + .osr = 256, + .actions = idual_mic_bs_8KHz_osr256_actions_u8680, + .action_sz = ARRAY_SIZE(idual_mic_bs_8KHz_osr256_actions_u8680), + }, /* 8KHz profile can be used for 16KHz */ + { + .freq_plan = 16000, + .osr = 256, + .actions = idual_mic_bs_8KHz_osr256_actions_u8680, + .action_sz = ARRAY_SIZE(idual_mic_bs_8KHz_osr256_actions_u8680), + }, /* 8KHz profile can be used for 16KHz */ + { + .freq_plan = 48000, + .osr = 256, + .actions = idual_mic_bs_8KHz_osr256_actions_u8680, + .action_sz = ARRAY_SIZE(idual_mic_bs_8KHz_osr256_actions_u8680), + } +}; + +static struct adie_codec_dev_profile idual_mic_broadside_profile_u8680 = { + .path_type = ADIE_CODEC_TX, + .settings = idual_mic_broadside_settings_u8680, + .setting_sz = ARRAY_SIZE(idual_mic_broadside_settings_u8680), +}; + +static struct snddev_icodec_data snddev_idual_mic_broadside_data_u8680 = { + .capability = (SNDDEV_CAP_TX | SNDDEV_CAP_VOICE), + .name = "handset_dual_mic_broadside_tx", + .copp_id = 0, + .acdb_id = ACDB_ID_HANDSET_MIC_BROADSIDE, + .profile = &idual_mic_broadside_profile_u8680, + .channel_mode = 2, + .default_sample_rate = 48000, + .pmctl_id = idual_mic_broadside_pmctl_id, + .pmctl_id_sz = ARRAY_SIZE(idual_mic_broadside_pmctl_id), + .pamp_on = NULL, + .pamp_off = NULL, +}; + +static struct platform_device msm_idual_mic_broadside_device_u8680 = { + .name = "snddev_icodec", + .id = 13, + .dev = { .platform_data = &snddev_idual_mic_broadside_data_u8680 }, +}; +static struct snddev_icodec_data snddev_ihs_stereo_rx_data_u8680 = { + .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), + .name = "headset_stereo_rx", + .copp_id = 0, + .acdb_id = ACDB_ID_HEADSET_SPKR_STEREO, + .profile = &headset_ab_cpls_profile_u8860, + .channel_mode = 2, + .pmctl_id = NULL, + .pmctl_id_sz = 0, + .default_sample_rate = 48000, + .pamp_on = NULL, + .pamp_off = NULL, + .property = SIDE_TONE_MASK, + .voltage_on = msm_snddev_hsed_voltage_on, + .voltage_off = msm_snddev_hsed_voltage_off, + .max_voice_rx_vol[VOC_NB_INDEX] = 600, + .min_voice_rx_vol[VOC_NB_INDEX] = -900, + .max_voice_rx_vol[VOC_WB_INDEX] = -500, + .min_voice_rx_vol[VOC_WB_INDEX] = -2000, +}; + +static struct platform_device msm_headset_stereo_device_u8680 = { + .name = "snddev_icodec", + .id = 2, + .dev = { .platform_data = &snddev_ihs_stereo_rx_data_u8680 }, +}; + +static struct snddev_icodec_data snddev_iearpiece_data_u8680 = { + .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), + .name = "handset_rx", + .copp_id = 0, + .acdb_id = ACDB_ID_HANDSET_SPKR, + .profile = &iearpiece_profile_u8860, + .channel_mode = 1, + .pmctl_id = NULL, + .pmctl_id_sz = 0, + .default_sample_rate = 48000, + .pamp_on = NULL, + .pamp_off = NULL, + .property = SIDE_TONE_MASK, + .max_voice_rx_vol[VOC_NB_INDEX] =1200, + .min_voice_rx_vol[VOC_NB_INDEX] = -300, + .max_voice_rx_vol[VOC_WB_INDEX] = -700, + .min_voice_rx_vol[VOC_WB_INDEX] = -2200, +}; + +static struct platform_device msm_iearpiece_device_u8680 = { + .name = "snddev_icodec", + .id = 19, + .dev = { .platform_data = &snddev_iearpiece_data_u8680 }, +}; +/* DTS2012010706112 liurennianKF62391 20120109 end >*/ +/* DTS2012022402932 gaolin 20120224 end > */ static struct platform_device *snd_devices_ffa[] __initdata = { &msm_iearpiece_ffa_device, @@ -1552,6 +1936,7 @@ static struct platform_device *snd_devices_ffa[] __initdata = { &msm_auxpga_lb_lo_device, }; +/*< DTS2011050601476 dongchen 20110506 begin */ #ifdef CONFIG_HUAWEI_KERNEL static struct platform_device *snd_devices_u8860[] __initdata = { &msm_iearpiece_device_u8860, @@ -1575,8 +1960,88 @@ static struct platform_device *snd_devices_u8860[] __initdata = { &msm_snddev_analog_fm_speaker_device, &msm_snddev_analog_fm_hs_device, }; +/* < DTS2012022402932 gaolin 20120224 begin */ +/*< DTS2011122606588 yinzhaoyang 20111230 begin */ +static struct platform_device *snd_devices_u8860_es[] __initdata = { + &msm_iearpiece_device_u8860, + &msm_imic_device_u8860, + &msm_ispkr_stereo_device_u8860, + &msm_headset_mic_device_u8860, + &msm_snddev_mi2s_fm_tx_device, + &msm_bt_sco_earpiece_device, + &msm_bt_sco_mic_device, + &msm_ispkr_mic_device_u8860, + &msm_headset_stereo_device_u8860, + &msm_itty_mono_tx_device, + &msm_itty_mono_rx_device, + &msm_ihs_stereo_speaker_stereo_rx_device, + &msm_spk_idual_mic_broadside_device, + &msm_idual_mic_broadside_device_u8860_es, + &msm_ispkr_music_stereo_device_u8860, + &msm_headset_music_stereo_device_u8860, + &msm_iearpiece_hac_device_u8860, + &msm_handset_secondary_mic_tx_device, + &msm_snddev_analog_fm_speaker_device, + &msm_snddev_analog_fm_hs_device, +}; +/* DTS2011122606588 yinzhaoyang 20111230 end > */ +/* < DTS2012010706112 liurennianKF62391 20120109 begin */ +static struct platform_device *snd_devices_u8680[] __initdata = { + &msm_iearpiece_device_u8680, + &msm_imic_device_u8860, + &msm_ispkr_stereo_device_u8860, + &msm_headset_mic_device_u8860, + &msm_snddev_mi2s_fm_tx_device, + &msm_bt_sco_earpiece_device, + &msm_bt_sco_mic_device, + &msm_ispkr_mic_device_u8860, + &msm_headset_stereo_device_u8680, + &msm_itty_mono_tx_device, + &msm_itty_mono_rx_device, + &msm_ihs_stereo_speaker_stereo_rx_device, + &msm_spk_idual_mic_broadside_device, + &msm_idual_mic_broadside_device_u8680, + &msm_ispkr_music_stereo_device_u8860, + &msm_headset_music_stereo_device_u8860, + &msm_iearpiece_hac_device_u8860, + &msm_handset_secondary_mic_tx_device, + &msm_snddev_analog_fm_speaker_device, + &msm_snddev_analog_fm_hs_device, +}; +/* DTS2012010706112 liurennianKF62391 20120109 end >*/ +#endif +/* DTS2011050601476 dongchen 20110506 end >*/ +/* */ +/* DTS2011092905909 yinzhaoyang 20110929 end >*/ +/* DTS2012022402932 gaolin 20120224 end > */ +/*< DTS2011050601476 dongchen 20110506 begin */ void __ref msm_snddev_init_timpani(void) { #ifndef CONFIG_HUAWEI_KERNEL @@ -1590,6 +2055,12 @@ void __ref msm_snddev_init_timpani(void) pr_err("failed to create msm_head_config debug fs entry\n"); #endif #else //#ifndef CONFIG_HUAWEI_KERNEL + /* < DTS2012022402932 gaolin 20120224 begin */ + /*< DTS2011122606588 yinzhaoyang 20111230 begin */ + smem_huawei_vender *vender_para_ptr; + const char *country_name = "es"; + /* DTS2011122606588 yinzhaoyang 20111230 end > */ + /* DTS2012022402932 gaolin 20120224 end > */ if (machine_is_msm7x30_ffa() || machine_is_msm8x55_ffa() || machine_is_msm8x55_svlte_ffa()) { platform_add_devices(snd_devices_ffa, @@ -1601,14 +2072,68 @@ void __ref msm_snddev_init_timpani(void) if (!debugfs_hsed_config) pr_err("failed to create msm_head_config debug fs entry\n"); #endif + /* */ || machine_is_msm8255_u8860_92() - || machine_is_msm8255_u8680() - || machine_is_msm8255_u8860_51() - || machine_is_msm8255_u8730()) + || machine_is_msm8255_u8860_51()) + /* DTS2012010706112 liurennianKF62391 20120109 end >*/ + /* DTS2011120702244 liwei 20111207 end > */ + /* DTS2011102401822 liwei 20111024 end > */ + /* DTS2011092905909 yinzhaoyang 20110929 end >*/ + /* DTS2011091200073 zhangbo 20110912 end> */ + /* DTS2011091502092 liyuping 20110915 end> */ + /* DTS2011082302564 liwei 20110823 end > */ + /* DTS2011071600361 liyuping 20110716 end> */ + /* DTS2011062600102 sunhonghui 20110626 end> */ { - platform_add_devices(snd_devices_u8860, ARRAY_SIZE(snd_devices_u8860)); + /*< DTS2011122606588 yinzhaoyang 20111230 begin */ + vender_para_ptr = (smem_huawei_vender*)smem_alloc(SMEM_ID_VENDOR0, sizeof(smem_huawei_vender)); + if (!vender_para_ptr) + { + pr_info("%s: Can't find vender parameter\n", __func__); + return; + } + pr_info("vendor:%s,country:%s\n", vender_para_ptr->vender_para.vender_name, vender_para_ptr->vender_para.country_name); + + /* choose audio parameter table according to the vender name */ + if(!memcmp(vender_para_ptr->vender_para.country_name, country_name, strlen(country_name))) + { + platform_add_devices(snd_devices_u8860_es, ARRAY_SIZE(snd_devices_u8860_es)); + } + else + { + platform_add_devices(snd_devices_u8860, ARRAY_SIZE(snd_devices_u8860)); + } + /* DTS2011122606588 yinzhaoyang 20111230 end > */ + + /*< DTS2011051303410 dongchen 20110516 begin */ + /**/ + }else if (machine_is_msm8255_u8730() + || machine_is_msm8255_u8667()) + /* DTS2011120702244 liwei 20111207 end > */ + { + platform_add_devices(snd_devices_u8730, ARRAY_SIZE(snd_devices_u8730)); + /* DTS2011092905909 yinzhaoyang 20110929 end >*/ + /* DTS2012022402932 gaolin 20120224 end > */ }else if (machine_is_msm8255_c8860()) { platform_add_devices(snd_devices_c8860, arraysize_c8860); @@ -1617,6 +2142,8 @@ void __ref msm_snddev_init_timpani(void) { platform_add_devices(snd_devices_u8860, ARRAY_SIZE(snd_devices_u8860)); } + /* DTS2011051303410 dongchen 20110516 end >*/ #endif //#ifndef CONFIG_HUAWEI_KERNEL } +/* DTS2011050601476 dongchen 20110506 end >*/ diff --git a/arch/arm/mach-msm/qdsp5v2/snddev_data_timpani_c8860.c b/arch/arm/mach-msm/qdsp5v2/snddev_data_timpani_c8860.c index 5b55cc512..25a500ab2 100755 --- a/arch/arm/mach-msm/qdsp5v2/snddev_data_timpani_c8860.c +++ b/arch/arm/mach-msm/qdsp5v2/snddev_data_timpani_c8860.c @@ -1,3 +1,4 @@ +/*< DTS2011051303410 dongchen 20110516 begin */ /* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -174,9 +175,11 @@ static struct platform_device msm_itty_mono_rx_device = { .dev = { .platform_data = &snddev_itty_mono_rx_data }, }; +/*< DTS2011092207134 dongchen 20110923 begin */ static struct adie_codec_action_unit ihs_stereo_speaker_stereo_rx_48KHz_osr256_actions[] = HEADSET_STEREO_SPEAKER_STEREO_RX_CAPLESS_48000_OSR_256_C8860; +/* DTS2011092207134 dongchen 20110923 end >*/ static struct adie_codec_hwsetting_entry @@ -196,7 +199,9 @@ static struct adie_codec_dev_profile ihs_stereo_speaker_stereo_rx_profile = { .setting_sz = ARRAY_SIZE(ihs_stereo_speaker_stereo_rx_settings), }; +/*< DTS2011101304810 dongchen 20111013 begin */ /* acdb_id from ACDB_ID_HEADSET_STEREO_PLUS_SPKR_STEREO_RX to ACDB_ID_HEADSET_STEREO_PLUS_SPKR_MONO_RX */ +/*< DTS2011061605311 dongchen 20110614 begin */ /* set msm_snddev_poweramp_4music_on as pamp_on func */ static struct snddev_icodec_data snddev_ihs_stereo_speaker_stereo_rx_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -215,6 +220,8 @@ static struct snddev_icodec_data snddev_ihs_stereo_speaker_stereo_rx_data = { .max_voice_rx_vol[VOC_WB_INDEX] = -500, .min_voice_rx_vol[VOC_WB_INDEX] = -2000, }; +/* DTS2011061605311 dongchen 20110614 end >*/ +/* DTS2011101304810 dongchen 20111013 end >*/ static struct platform_device msm_ihs_stereo_speaker_stereo_rx_device = { .name = "snddev_icodec", @@ -298,7 +305,9 @@ static struct adie_codec_dev_profile iearpiece_profile = { .setting_sz = ARRAY_SIZE(iearpiece_settings), }; +/*< DTS2011092901202 dongchen 20110929 begin */ /* min rx volume from -9 to -4 */ +/*< DTS2011062505020 dongchen 20110625 begin */ /* rx volume from -7dB to 6dB */ static struct snddev_icodec_data snddev_iearpiece_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -318,6 +327,8 @@ static struct snddev_icodec_data snddev_iearpiece_data = { .max_voice_rx_vol[VOC_WB_INDEX] = -100, .min_voice_rx_vol[VOC_WB_INDEX] = -1100, }; +/* DTS2011062505020 dongchen 20110625 end >*/ +/* DTS2011092901202 dongchen 20110929 end >*/ static struct platform_device msm_iearpiece_device = { .name = "snddev_icodec", @@ -385,7 +396,9 @@ static struct adie_codec_dev_profile ispkr_stereo_profile = { .setting_sz = ARRAY_SIZE(ispkr_stereo_settings), }; +/*< DTS2011092901202 dongchen 20110929 begin */ /* min volume from -17 to -12 */ +/*< DTS2011053005461 dongchen 20110530 begin */ static struct snddev_icodec_data snddev_ispkr_stereo_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), .name = "speaker_stereo_rx", @@ -403,6 +416,8 @@ static struct snddev_icodec_data snddev_ispkr_stereo_data = { .max_voice_rx_vol[VOC_WB_INDEX] = -200, .min_voice_rx_vol[VOC_WB_INDEX] = -1200 }; +/* DTS2011053005461 dongchen 20110530 end >*/ +/* DTS2011092901202 dongchen 20110929 end >*/ static struct platform_device msm_ispkr_stereo_device = { .name = "snddev_icodec", @@ -491,7 +506,9 @@ static struct adie_codec_dev_profile headset_ab_cpls_profile = { .setting_sz = ARRAY_SIZE(headset_ab_cpls_settings), }; +/*< DTS2011101600449 dongchen 20111017 begin */ /* rx volume from -4dB to -7dB */ +/*< DTS2011062505020 dongchen 20110625 begin */ /* rx volume from -7dB to -4dB */ static struct snddev_icodec_data snddev_ihs_stereo_rx_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -513,6 +530,8 @@ static struct snddev_icodec_data snddev_ihs_stereo_rx_data = { .max_voice_rx_vol[VOC_WB_INDEX] = -1400, .min_voice_rx_vol[VOC_WB_INDEX] = -2900, }; +/* DTS2011062505020 dongchen 20110625 end >*/ +/* DTS2011101600449 dongchen 20111017 end >*/ static struct platform_device msm_headset_stereo_device = { .name = "snddev_icodec", @@ -572,8 +591,10 @@ static struct platform_device msm_idual_mic_broadside_device = { }; /* SPEAKER MUSIC STEREO DEVICE */ +/*< DTS2011050903865 dongchen 20110513 begin */ static struct adie_codec_action_unit ispkr_music_stereo_48KHz_osr256_actions[] = SPEAKER_PRI_MUSIC_STEREO_48000_OSR_256_C8860; +/* DTS2011050903865 dongchen 20110513 end >*/ static struct adie_codec_hwsetting_entry ispkr_music_stereo_settings[] = { { @@ -590,7 +611,9 @@ static struct adie_codec_dev_profile ispkr_music_stereo_profile = { .setting_sz = ARRAY_SIZE(ispkr_music_stereo_settings), }; +/*< DTS2011061605311 dongchen 20110614 begin */ /* set ACDB_ID_SPKR_PHONE_MUSIC_MONO as acdb_id */ +/*< DTS2011053005461 dongchen 20110530 begin */ static struct snddev_icodec_data snddev_ispkr_music_stereo_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), .name = "speaker_music_rx", @@ -608,6 +631,8 @@ static struct snddev_icodec_data snddev_ispkr_music_stereo_data = { .max_voice_rx_vol[VOC_WB_INDEX] = 1000, .min_voice_rx_vol[VOC_WB_INDEX] = -500 }; +/* DTS2011053005461 dongchen 20110530 end >*/ +/* DTS2011061605311 dongchen 20110614 end >*/ static struct platform_device msm_ispkr_music_stereo_device = { .name = "snddev_icodec", @@ -634,6 +659,7 @@ static struct adie_codec_dev_profile headset_ab_cpls_music_profile = { .setting_sz = ARRAY_SIZE(headset_ab_cpls_music_settings), }; +/*< DTS2011061605311 dongchen 20110614 begin */ /* set ACDB_ID_HEADSET_SPKR_MUSIC_STEREO as acdb_id */ static struct snddev_icodec_data snddev_ihs_music_stereo_rx_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -655,6 +681,7 @@ static struct snddev_icodec_data snddev_ihs_music_stereo_rx_data = { .max_voice_rx_vol[VOC_WB_INDEX] = -900, .min_voice_rx_vol[VOC_WB_INDEX] = -2400, }; +/* DTS2011061605311 dongchen 20110614 end >*/ static struct platform_device msm_headset_music_stereo_device = { .name = "snddev_icodec", @@ -681,7 +708,9 @@ static struct adie_codec_dev_profile iearpiece_hac_profile = { .setting_sz = ARRAY_SIZE(iearpiece_hac_settings), }; +/*< DTS2011062505020 dongchen 20110625 begin */ /* rx volume from -7dB to 6dB */ +/*< DTS2011061605311 dongchen 20110614 begin */ /* set ACDB_ID_HANDSET_HAC_SPKR as acdb_id */ static struct snddev_icodec_data snddev_iearpiece_hac_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -693,15 +722,19 @@ static struct snddev_icodec_data snddev_iearpiece_hac_data = { .pmctl_id = NULL, .pmctl_id_sz = 0, .default_sample_rate = 48000, + /**/ .property = SIDE_TONE_MASK, .max_voice_rx_vol[VOC_NB_INDEX] = 600, .min_voice_rx_vol[VOC_NB_INDEX] = -900, .max_voice_rx_vol[VOC_WB_INDEX] = -100, .min_voice_rx_vol[VOC_WB_INDEX] = -1600, }; +/* DTS2011061605311 dongchen 20110614 end >*/ +/* DTS2011062505020 dongchen 20110625 end >*/ static struct platform_device msm_iearpiece_hac_device = { .name = "snddev_icodec", @@ -769,6 +802,7 @@ static struct adie_codec_dev_profile ifm_analog_speaker_profile = { .setting_sz = ARRAY_SIZE(ifm_analog_speaker_settings), }; +/*< DTS2011082205270 dongchen 20110824 begin */ /* set msm_snddev_poweramp_4music_on as pamp_on for FM Speaker */ static struct snddev_icodec_data snddev_analog_fm_speaker_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -783,6 +817,7 @@ static struct snddev_icodec_data snddev_analog_fm_speaker_data = { .pamp_on = &msm_snddev_poweramp_4music_on, .pamp_off = &msm_snddev_poweramp_off, }; +/* DTS2011082205270 dongchen 20110824 end >*/ static struct platform_device msm_snddev_analog_fm_speaker_device = { .name = "snddev_icodec", @@ -853,3 +888,4 @@ struct platform_device *snd_devices_c8860[] __initdata = { int arraysize_c8860 = ARRAY_SIZE(snd_devices_c8860); +/* DTS2011051303410 dongchen 20110516 end >*/ \ No newline at end of file diff --git a/arch/arm/mach-msm/qdsp5v2/snddev_ecodec.c b/arch/arm/mach-msm/qdsp5v2/snddev_ecodec.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/snddev_icodec.c b/arch/arm/mach-msm/qdsp5v2/snddev_icodec.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/snddev_mi2s.c b/arch/arm/mach-msm/qdsp5v2/snddev_mi2s.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/snddev_virtual.c b/arch/arm/mach-msm/qdsp5v2/snddev_virtual.c old mode 100755 new mode 100644 diff --git a/arch/arm/mach-msm/qdsp5v2/timpani_profile_7x30.h b/arch/arm/mach-msm/qdsp5v2/timpani_profile_7x30.h index ec31ee539..e2d925e95 100755 --- a/arch/arm/mach-msm/qdsp5v2/timpani_profile_7x30.h +++ b/arch/arm/mach-msm/qdsp5v2/timpani_profile_7x30.h @@ -169,6 +169,7 @@ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} }; +/*< DTS2011050601476 dongchen 20110506 begin */ #ifdef CONFIG_HUAWEI_KERNEL /* RX EAR */ #define EAR_PRI_MONO_8000_OSR_256_U8860 \ @@ -198,6 +199,7 @@ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/*< DTS2011053005461 dongchen 20110530 begin */ /* disable sidetone (0x8c, 0x03, 0x02) to (0x8c, 0x05, 0x05)*/ #define AMIC_PRI_MONO_8000_OSR_256_U8860 \ {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ @@ -236,8 +238,10 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0xAB, 0x09, 0x09)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/* DTS2011053005461 dongchen 20110530 end >*/ /* RX SPEAKER */ +/*< DTS2011053005461 dongchen 20110530 begin */ /* mono differential (0x3A, 0x24, 0x24) to (0x3A, 0x20, 0x20), add (0x3B, 0x04, 0x04) */ #define SPEAKER_PRI_STEREO_48000_OSR_256_U8860 \ {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ @@ -284,7 +288,9 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0x04, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} }; +/* DTS2011053005461 dongchen 20110530 end >*/ +/*< DTS2011053005461 dongchen 20110530 begin */ /* disable SIDETONE (0x8c, 0x03, 0x02) to (0x8c, 0x05, 0x05)*/ #define AMIC1_HEADSET_TX_MONO_PRIMARY_OSR256_U8860 \ {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF}, \ @@ -321,6 +327,7 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x14, 0xFF, 0x64)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x11, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0x00)} } +/* DTS2011053005461 dongchen 20110530 end >*/ /* RX HPH CLASS AB CAPLESS */ #define HEADSET_AB_CPLS_48000_OSR_256_U8860 \ @@ -366,8 +373,11 @@ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/*< DTS2011061605311 dongchen 20110614 begin */ /* (0xE0, 0xFE, 0x10) to (0xE0, 0xFE, 0x0C) line out analog gain -3dB */ +/*< DTS2011050903865 dongchen 20110513 begin */ /* RX SPEAKER MUSIC */ +/*< DTS2011053005461 dongchen 20110530 begin */ /* mono differential (0x3A, 0x24, 0x24) to (0x3A, 0x20, 0x20), add (0x3B, 0x04, 0x04) */ #define SPEAKER_PRI_MUSIC_STEREO_48000_OSR_256_U8860 \ {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ @@ -414,6 +424,9 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0x04, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} }; +/* DTS2011053005461 dongchen 20110530 end >*/ +/* DTS2011050903865 dongchen 20110513 end >*/ +/* DTS2011061605311 dongchen 20110614 end >*/ /* AMIC Secondary mono */ /* (0x0D, 0xFF, 0xD0) to (0x0D, 0xFF, 0xE1) connect AUX_IN */ @@ -458,6 +471,7 @@ /* AMIC broadside dual */ /* (0x0E, 0xFF, 0xc2) to (0x0E, 0xFF, 0xE1)*/ +/*< DTS2011053005461 dongchen 20110530 begin */ /* disable sidetone gain (0x8c, 0x03, 0x02) to (0x8c, 0x05, 0x05)*/ #define AMIC_BROADSIDE_DUAL_8000_OSR_256_U8860 \ {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ @@ -497,6 +511,133 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x11, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/* DTS2011053005461 dongchen 20110530 end >*/ +/* < DTS2012022402932 gaolin 20120224 begin */ +/* < DTS2012010706112 liurennianKF62391 20120109 begin */ +/*(0xA0, 0x01, 0x01)(0x8b, 0xff, 0xF6)(0x8c, 0x03, 0x02)*/ + +#define AMIC_BROADSIDE_DUAL_8000_OSR_256_U8680 \ + {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x05, 0x05)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x05, 0x00)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x0C, 0x00)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0x30)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x86, 0xFF, 0xAC)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x87, 0xFF, 0xAC)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0xF0)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x82, 0xFF, 0x1E)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0xA3, 0x01, 0x01)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x93, 0xFF, 0x00)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x94, 0xFF, 0x1B)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x99, 0x0F, 0x04)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x9F, 0x03, 0x03)}, \ + {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_READY}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0D, 0xFF, 0xD0)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0E, 0xFF, 0xE1)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x11, 0xFF, 0xBC)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0xBC)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x14, 0xFF, 0x65)}, \ + {ADIE_CODEC_ACTION_DELAY_WAIT, 0xbb8 }, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x0C, 0x0C)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8b, 0xff, 0xF0)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8c, 0x03, 0x02)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x86, 0xFF, 0x10)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x87, 0xFF, 0x10)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0xC0)}, \ + {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_ANALOG_READY}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0xF0)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x0C, 0x00)}, \ + {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0D, 0xFF, 0x00)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0E, 0xFF, 0x00)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x14, 0xFF, 0x64)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x11, 0xFF, 0x00)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0x00)}, \ + {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/* DTS2012010706112 liurennianKF62391 20120109 end > */ +/*< DTS2011122606588 yinzhaoyang 20111230 begin */ +/*(0xA0, 0x01, 0x01)(0x8b, 0xff, 0xF6)(0x8c, 0x03, 0x02)*/ + +#define AMIC_BROADSIDE_DUAL_8000_OSR_256_U8860_es \ + {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x05, 0x05)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x05, 0x00)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x0C, 0x00)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0x30)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x86, 0xFF, 0xAC)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x87, 0xFF, 0xAC)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0xF0)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x82, 0xFF, 0x1E)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0xA3, 0x01, 0x01)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x93, 0xFF, 0x00)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x94, 0xFF, 0x1B)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x99, 0x0F, 0x04)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x9F, 0x03, 0x03)}, \ + {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_READY}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0D, 0xFF, 0xD0)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0E, 0xFF, 0xE1)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x11, 0xFF, 0xBC)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0xBC)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x14, 0xFF, 0x65)}, \ + {ADIE_CODEC_ACTION_DELAY_WAIT, 0xbb8 }, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x0C, 0x0C)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8b, 0xff, 0xED)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8c, 0x03, 0x02)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x86, 0xFF, 0x10)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x87, 0xFF, 0x10)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0xC0)}, \ + {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_ANALOG_READY}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0xF0)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x0C, 0x00)}, \ + {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0D, 0xFF, 0x00)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0E, 0xFF, 0x00)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x14, 0xFF, 0x64)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x11, 0xFF, 0x00)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0x00)}, \ + {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/* DTS2011122606588 yinzhaoyang 20111230 end > */ +/* < DTS2012012101655 liurennianKF62391 20120129 begin */ +#define AMIC_BROADSIDE_DUAL_8000_OSR_256_U8730 \ + {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x05, 0x05)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x05, 0x00)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x0C, 0x00)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0x30)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x86, 0xFF, 0xAC)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x87, 0xFF, 0xAC)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0xF0)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x82, 0xFF, 0x1E)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0xA3, 0x01, 0x01)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x93, 0xFF, 0x00)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x94, 0xFF, 0x1B)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x99, 0x0F, 0x04)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x9F, 0x03, 0x03)}, \ + {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_READY}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0D, 0xFF, 0xD0)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0E, 0xFF, 0xE1)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x11, 0xFF, 0xBC)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0xBC)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x14, 0xFF, 0x65)}, \ + {ADIE_CODEC_ACTION_DELAY_WAIT, 0xbb8 }, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x0C, 0x0C)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8b, 0xff, 0xE9)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8c, 0x03, 0x02)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x86, 0xFF, 0x10)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x87, 0xFF, 0x10)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0xC0)}, \ + {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_ANALOG_READY}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0xF0)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x0C, 0x00)}, \ + {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0D, 0xFF, 0x00)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0E, 0xFF, 0x00)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x14, 0xFF, 0x64)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x11, 0xFF, 0x00)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0x00)}, \ + {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/* DTS2012012101655 liurennianKF62391 20120129 end > */ +/* DTS2012022402932 gaolin 20120224 end > */ /* RX HPH CLASS AB CAPLESS */ #define HEADSET_AB_CPLS_MUSIC_48000_OSR_256_U8860 \ @@ -570,17 +711,22 @@ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/* < DTS2012041008758 duhongyan 20120426 begin */ +/* Change ADIE_CODEC_DIGITAL_OFF back to ADIE_CODEC_FLASH_IMAGE to avoid FM electric noise, after 404026 SBA update */ +/*< DTS2011101304786 dongchen 20111013 begin */ /* use ADIE_CODEC_DIGITAL_OFF instead of ADIE_CODEC_FLASH_IMAGE, can avoid FM electric noise */ /* disconnect class D HPA (0x33, 0xFF, 0x3F) to (0x33, 0xFF, 0x30) */ /* delete useless (0x3C, 0x27, 0x24) */ +/*< DTS2011082205270 dongchen 20110824 begin */ /* (0x38, 0xFF, 0xAA) to (0x38, 0xFF, 0x99) AUXPGA from 0dB to -3dB */ +/*< DTS2011061605311 dongchen 20110614 begin */ /* (0x38, 0xFF, 0x66) to (0x38, 0xFF, 0xAA) AUXPGA 0dB, (0x36, 0xFE, 0x24) to (0x36, 0xFE, 0x08) Left/Right Gain -1.5dB */ /* 0x33 Enable Aux PGA */ /* 0x38 set Aux PGA Left/Right Gain -12dB */ /* 0x3c connet Aux PGA and RX1 from HPH */ /* 0x36 0x37 set Left/Right Gain 12dB */ #define FM_ANALOG_HEADSET_48000_OSR_256 \ - {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF}, \ + {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ {ADIE_CODEC_ACTION_DELAY_WAIT, 0xBB8}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x02, 0x02)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x02, 0x00)}, \ @@ -626,18 +772,27 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x31, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/* DTS2011061605311 dongchen 20110614 end >*/ +/* DTS2011082205270 dongchen 20110824 end >*/ +/* DTS2011101304786 dongchen 20111013 end >*/ +/* DTS2012041008758 duhongyan 20120426 end > */ +/* < DTS2012041008758 duhongyan 20120426 begin */ +/* Change ADIE_CODEC_DIGITAL_OFF back to ADIE_CODEC_FLASH_IMAGE to avoid FM electric noise, after 404026 SBA update */ +/*< DTS2011101304786 dongchen 20111013 begin */ /* use ADIE_CODEC_DIGITAL_OFF instead of ADIE_CODEC_FLASH_IMAGE, can avoid FM electric noise */ +/*< DTS2011061605311 dongchen 20110614 begin */ /* mono differential (0x3A, 0xFC, 0xB4) to (0x3A, 0xFC, 0xA0), add (0x3B, 0xFC, 0x14) */ /* (0x38, 0xFF, 0x66) to (0x38, 0xFF, 0xBB) set Aux PGA Left/Right Gain 3dB */ /* (0xE0, 0xFE, 0x10) to (0xE0, 0xFE, 0x04) Lineout analog gain 0dB */ +/*< DTS2011050903865 dongchen 20110513 begin */ /* (0x33, 0xF0, 0x30) Enable Aux PGA */ /* (0x38, 0xFF, 0x66) set Aux PGA Left/Right Gain 12dB */ /* (0x3A, 0xFC, 0xB4) connet Aux PGA and RX1 from FM Speaker */ /* (0x34, 0xFD, 0x24)set Left Gain 12dB */ /* (0x35, 0xFD, 0x24)set Left Gain 12dB */ #define FM_ANALOG_SPEAKER_48000_OSR_256 \ - {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF}, \ + {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ {ADIE_CODEC_ACTION_DELAY_WAIT, 0xBB8}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x02, 0x02)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x02, 0x00)}, \ @@ -686,8 +841,13 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0xFC, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/* DTS2011050903865 dongchen 20110513 end >*/ +/* DTS2011061605311 dongchen 20110614 end >*/ +/* DTS2011101304786 dongchen 20111013 end >*/ +/* DTS2012041008758 duhongyan 20120426 end > */ #endif +/* DTS2011050601476 dongchen 20110506 end >*/ /* * RX HPH PRIMARY @@ -880,11 +1040,15 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x33, 0x80, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/*< DTS2011101600449 dongchen 20111017 begin */ /* codec rx gain from 0dB to 3dB (0x84, 0xFF, 0x00) to (0x84, 0xFF, 0x03) */ /* HPH_VOL set from -9dB to -12dB (0xE2, 0xFE, 0x1C) to (0xE2, 0xFE, 0x24) */ +/*< DTS2011101402198 zhangcunfei 20111014 begin */ /* HPH_VOL set from -12dB to -9dB (0xE2, 0xFE, 0x24) to (0xE2, 0xFE, 0x1c) */ +/*< DTS2011092207134 dongchen 20110923 begin */ /* HPH_VOL set from -6 to -12dB (0xE2, 0xFE, 0x14) to (0xE2, 0xFE, 0x24) */ /* LINE_AVOL set from -4.5 to 1.5dB add (0xE0, 0xFE, 0x00) */ +/*< DTS2011061605311 dongchen 20110614 begin */ /* mono differential (0x3A, 0x24, 0x24) to (0x3A, 0x20, 0x20), add (0x3B, 0x04, 0x04) */ /* HPH_VOL set to -6dB (0xE2, 0xFE, 0x04) to (0xE2, 0xFE, 0x14), (0xE3, 0xFE, 0x04) to (0xE3, 0xFE, 0x14) */ #define HEADSET_STEREO_SPEAKER_STEREO_RX_CAPLESS_48000_OSR_256 \ @@ -950,6 +1114,10 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0x04, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/* DTS2011061605311 dongchen 20110614 end >*/ +/* DTS2011092207134 dongchen 20110923 end >*/ +/* DTS2011101402198 zhangcunfei 20111014 end >*/ +/* DTS2011101600449 dongchen 20111017 end >*/ #define HS_DMIC2_STEREO_8000_OSR_256 \ {{ADIE_CODEC_ACTION_DELAY_WAIT, 0xbb8 }, \ diff --git a/arch/arm/mach-msm/qdsp5v2/timpani_profile_7x30_c8860.h b/arch/arm/mach-msm/qdsp5v2/timpani_profile_7x30_c8860.h index bb8811efe..c599ae533 100755 --- a/arch/arm/mach-msm/qdsp5v2/timpani_profile_7x30_c8860.h +++ b/arch/arm/mach-msm/qdsp5v2/timpani_profile_7x30_c8860.h @@ -1,3 +1,4 @@ +/*< DTS2011051303410 dongchen 20110516 begin */ /* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -58,6 +59,7 @@ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/*< DTS2011053005461 dongchen 20110530 begin */ /* disable sidetone (0x8c, 0x03, 0x02) to (0x8c, 0x05, 0x05)*/ #define AMIC_PRI_MONO_8000_OSR_256_C8860 \ {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ @@ -96,8 +98,10 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0xAB, 0x09, 0x09)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/* DTS2011053005461 dongchen 20110530 end >*/ /* RX SPEAKER */ +/*< DTS2011053005461 dongchen 20110530 begin */ /* mono differential (0x3A, 0x24, 0x24) to (0x3A, 0x20, 0x20), add (0x3B, 0x04, 0x04) */ #define SPEAKER_PRI_STEREO_48000_OSR_256_C8860 \ {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ @@ -144,7 +148,9 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0x04, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} }; +/* DTS2011053005461 dongchen 20110530 end >*/ +/*< DTS2011053005461 dongchen 20110530 begin */ /* disable SIDETONE (0x8c, 0x03, 0x02) to (0x8c, 0x05, 0x05)*/ #define AMIC1_HEADSET_TX_MONO_PRIMARY_OSR256_C8860 \ {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF}, \ @@ -181,6 +187,7 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x14, 0xFF, 0x64)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x11, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0x00)} } +/* DTS2011053005461 dongchen 20110530 end >*/ /* RX HPH CLASS AB CAPLESS */ #define HEADSET_AB_CPLS_48000_OSR_256_C8860 \ @@ -226,8 +233,11 @@ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/*< DTS2011061605311 dongchen 20110614 begin */ /* (0xE0, 0xFE, 0x10) to (0xE0, 0xFE, 0x0C) line out analog gain -3dB */ +/*< DTS2011050903865 dongchen 20110513 begin */ /* RX SPEAKER MUSIC */ +/*< DTS2011053005461 dongchen 20110530 begin */ /* mono differential (0x3A, 0x24, 0x24) to (0x3A, 0x20, 0x20), add (0x3B, 0x04, 0x04) */ #define SPEAKER_PRI_MUSIC_STEREO_48000_OSR_256_C8860 \ {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ @@ -274,6 +284,9 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0x04, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} }; +/* DTS2011053005461 dongchen 20110530 end >*/ +/* DTS2011050903865 dongchen 20110513 end >*/ +/* DTS2011061605311 dongchen 20110614 end >*/ /* AMIC Secondary mono */ /* (0x0D, 0xFF, 0xD0) to (0x0D, 0xFF, 0xE1) connect AUX_IN */ @@ -318,6 +331,7 @@ /* AMIC broadside dual */ /* (0x0E, 0xFF, 0xc2) to (0x0E, 0xFF, 0xE1)*/ +/*< DTS2011053005461 dongchen 20110530 begin */ /* disable sidetone gain (0x8c, 0x03, 0x02) to (0x8c, 0x05, 0x05)*/ #define AMIC_BROADSIDE_DUAL_8000_OSR_256_C8860 \ {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ @@ -357,7 +371,9 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x11, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/* DTS2011053005461 dongchen 20110530 end >*/ +/*< DTS2011092901202 dongchen 20110929 begin */ /* HPH_VOL set from -1.5 to -4.5 dB (0xE2, 0xFE, 0x04) to (0xE2, 0xFE, 0x10) */ /* RX HPH CLASS AB CAPLESS */ #define HEADSET_AB_CPLS_MUSIC_48000_OSR_256_C8860 \ @@ -402,6 +418,7 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x31, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/* DTS2011092901202 dongchen 20110929 end >*/ /* RX HAC EAR */ #define EAR_HAC_PRI_MONO_8000_OSR_256_C8860 \ @@ -431,17 +448,22 @@ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/* < DTS2012041008758 duhongyan 20120426 begin */ +/* Change ADIE_CODEC_DIGITAL_OFF back to ADIE_CODEC_FLASH_IMAGE to avoid FM electric noise, after 404026 SBA update */ +/*< DTS2011101304786 dongchen 20111013 begin */ /* use ADIE_CODEC_DIGITAL_OFF instead of ADIE_CODEC_FLASH_IMAGE, can avoid FM electric noise */ /* disconnect class D HPA (0x33, 0xFF, 0x3F) to (0x33, 0xFF, 0x30) */ /* delete useless (0x3C, 0x27, 0x24) */ +/*< DTS2011082205270 dongchen 20110824 begin */ /* (0x38, 0xFF, 0xAA) to (0x38, 0xFF, 0x99) AUXPGA from 0dB to -3dB */ +/*< DTS2011061605311 dongchen 20110614 begin */ /* (0x38, 0xFF, 0x66) to (0x38, 0xFF, 0xAA) AUXPGA 0dB, (0x36, 0xFE, 0x24) to (0x36, 0xFE, 0x08) Left/Right Gain -1.5dB */ /* 0x33 Enable Aux PGA */ /* 0x38 set Aux PGA Left/Right Gain -12dB */ /* 0x3c connet Aux PGA and RX1 from HPH */ /* 0x36 0x37 set Left/Right Gain 12dB */ #define FM_ANALOG_HEADSET_48000_OSR_256_C8860 \ - {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF}, \ + {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ {ADIE_CODEC_ACTION_DELAY_WAIT, 0xBB8}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x02, 0x02)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x02, 0x00)}, \ @@ -487,18 +509,27 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x31, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/* DTS2011061605311 dongchen 20110614 end >*/ +/* DTS2011082205270 dongchen 20110824 end >*/ +/* DTS2011101304786 dongchen 20111013 end >*/ +/* DTS2012041008758 duhongyan 20120426 end > */ +/* < DTS2012041008758 duhongyan 20120426 begin */ +/* Change ADIE_CODEC_DIGITAL_OFF back to ADIE_CODEC_FLASH_IMAGE to avoid FM electric noise, after 404026 SBA update */ +/*< DTS2011101304786 dongchen 20111013 begin */ /* use ADIE_CODEC_DIGITAL_OFF instead of ADIE_CODEC_FLASH_IMAGE, can avoid FM electric noise */ +/*< DTS2011061605311 dongchen 20110614 begin */ /* mono differential (0x3A, 0xFC, 0xB4) to (0x3A, 0xFC, 0xA0), add (0x3B, 0xFC, 0x14) */ /* (0x38, 0xFF, 0x66) to (0x38, 0xFF, 0xBB) set Aux PGA Left/Right Gain 3dB */ /* (0xE0, 0xFE, 0x10) to (0xE0, 0xFE, 0x04) Lineout analog gain 0dB */ +/*< DTS2011050903865 dongchen 20110513 begin */ /* (0x33, 0xF0, 0x30) Enable Aux PGA */ /* (0x38, 0xFF, 0x66) set Aux PGA Left/Right Gain -12dB */ /* (0x3A, 0xFC, 0xB4) connet Aux PGA and RX1 from FM Speaker */ /* (0x34, 0xFD, 0x24)set Left Gain 12dB */ /* (0x35, 0xFD, 0x24)set Left Gain 12dB */ #define FM_ANALOG_SPEAKER_48000_OSR_256_C8860 \ - {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF}, \ + {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ {ADIE_CODEC_ACTION_DELAY_WAIT, 0xBB8}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x02, 0x02)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x02, 0x00)}, \ @@ -547,11 +578,18 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0xFC, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/* DTS2011050903865 dongchen 20110513 end >*/ +/* DTS2011061605311 dongchen 20110614 end >*/ +/* DTS2011101304786 dongchen 20111013 end >*/ +/* DTS2012041008758 duhongyan 20120426 end > */ +/*< DTS2011101600449 dongchen 20111017 begin */ /* codec rx gain from 0dB to 3dB (0x84, 0xFF, 0x00) to (0x84, 0xFF, 0x03) */ /* HPH_VOL from -19.5dB to -22.5dB (0xE2, 0xFE, 0x38) to (0xE2, 0xFE, 0x40) */ +/*< DTS2011092901202 dongchen 20110929 begin */ /* HPH_VOL set from -6 to -19.5dB (0xE2, 0xFE, 0x14) to (0xE2, 0xFE, 0x38) */ /* LINE_AVOL set from -4.5 to 1.5dB add (0xE0, 0xFE, 0x00) */ +/*< DTS2011092207134 dongchen 20110923 begin */ /* because U8860 change ADIE setting, define standalone C8860 setting to remain the same as before */ /* mono differential (0x3A, 0x24, 0x24) to (0x3A, 0x20, 0x20), add (0x3B, 0x04, 0x04) */ /* HPH_VOL set to -6dB (0xE2, 0xFE, 0x04) to (0xE2, 0xFE, 0x14), (0xE3, 0xFE, 0x04) to (0xE3, 0xFE, 0x14) */ @@ -616,5 +654,9 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0x04, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } +/* DTS2011092207134 dongchen 20110923 end >*/ +/* DTS2011092901202 dongchen 20110929 end >*/ +/* DTS2011101600449 dongchen 20111017 end >*/ +/* DTS2011051303410 dongchen 20110516 end >*/ #endif diff --git a/arch/arm/mach-msm/qdsp5v2/voice.c b/arch/arm/mach-msm/qdsp5v2/voice.c old mode 100755 new mode 100644 index 3d6b2af93..026acb33a --- a/arch/arm/mach-msm/qdsp5v2/voice.c +++ b/arch/arm/mach-msm/qdsp5v2/voice.c @@ -494,7 +494,7 @@ static int voice_cmd_device_info(struct voice_data *v) cmd.rx_sample = v->dev_rx.sample/1000; cmd.tx_sample = v->dev_tx.sample/1000; - MM_INFO("rx_vol=%d, rx_sample=%d\n", cmd.rx_volume, v->dev_rx.sample); + MM_DBG("rx_vol=%d, rx_sample=%d\n", cmd.rx_volume, v->dev_rx.sample); err = dalrpc_fcn_5(VOICE_DALRPC_CMD, v->handle, &cmd, sizeof(struct voice_device)); diff --git a/drivers/net/wireless/libra/libra_sdioif.c b/drivers/net/wireless/libra/libra_sdioif.c old mode 100755 new mode 100644 index 8cfc0fa85..3955642de --- a/drivers/net/wireless/libra/libra_sdioif.c +++ b/drivers/net/wireless/libra/libra_sdioif.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2012, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2009-2011, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -28,39 +28,6 @@ static unsigned short libra_sdio_card_id; static suspend_handler_t *libra_suspend_hldr; static resume_handler_t *libra_resume_hldr; -static notify_card_removal_t *libra_notify_card_removal_hdlr; -static shutdown_handler_t *libra_sdio_shutdown_hdlr; - -int libra_enable_sdio_irq_in_chip(struct sdio_func *func, u8 enable) -{ - unsigned char reg = 0; - int err = 0; - - sdio_claim_host(func); - - /* Read the value into reg */ - libra_sdiocmd52(func, SDIO_CCCR_IENx, ®, 0, &err); - if (err) - printk(KERN_ERR "%s: Could not read SDIO_CCCR_IENx register " - "err=%d\n", __func__, err); - - if (libra_mmc_host) { - if (enable) { - reg |= 1 << func->num; - reg |= 1; - } else { - reg &= ~(1 << func->num); - } - libra_sdiocmd52(func, SDIO_CCCR_IENx, ®, 1, &err); - if (err) - printk(KERN_ERR "%s: Could not enable/disable irq " - "err=%d\n", __func__, err); - } - sdio_release_host(func); - - return err; -} -EXPORT_SYMBOL(libra_enable_sdio_irq_in_chip); /** * libra_sdio_configure() - Function to configure the SDIO device param @@ -122,8 +89,6 @@ int libra_sdio_configure(sdio_irq_handler_t libra_sdio_rxhandler, goto cfg_error; } - libra_enable_sdio_irq_in_chip(func, 0); - sdio_release_host(func); return 0; @@ -399,8 +364,6 @@ static int libra_sdio_probe(struct sdio_func *func, static void libra_sdio_remove(struct sdio_func *func) { - if (libra_notify_card_removal_hdlr) - libra_notify_card_removal_hdlr(); libra_sdio_func = NULL; printk(KERN_INFO "%s : Module removed.\n", __func__); @@ -453,31 +416,6 @@ static int libra_sdio_resume(struct device *dev) #define libra_sdio_resume 0 #endif -static void libra_sdio_shutdown(struct device *dev) -{ - if (libra_sdio_shutdown_hdlr) { - libra_sdio_shutdown_hdlr(); - printk(KERN_INFO "%s : Notified shutdown event to Libra driver.\n", - __func__); - } -} - -int libra_sdio_register_shutdown_hdlr( - shutdown_handler_t *libra_shutdown_hdlr) -{ - libra_sdio_shutdown_hdlr = libra_shutdown_hdlr; - return 0; -} -EXPORT_SYMBOL(libra_sdio_register_shutdown_hdlr); - -int libra_sdio_notify_card_removal( - notify_card_removal_t *libra_sdio_notify_card_removal_hdlr) -{ - libra_notify_card_removal_hdlr = libra_sdio_notify_card_removal_hdlr; - return 0; -} -EXPORT_SYMBOL(libra_sdio_notify_card_removal); - static struct sdio_device_id libra_sdioid[] = { {.class = 0, .vendor = LIBRA_MAN_ID, .device = LIBRA_REV_1_0_CARD_ID}, {.class = 0, .vendor = VOLANS_MAN_ID, .device = VOLANS_REV_2_0_CARD_ID}, @@ -490,12 +428,11 @@ static const struct dev_pm_ops libra_sdio_pm_ops = { }; static struct sdio_driver libra_sdiofn_driver = { - .name = "libra_sdiofn", - .id_table = libra_sdioid, - .probe = libra_sdio_probe, - .remove = libra_sdio_remove, - .drv.pm = &libra_sdio_pm_ops, - .drv.shutdown = libra_sdio_shutdown, + .name = "libra_sdiofn", + .id_table = libra_sdioid, + .probe = libra_sdio_probe, + .remove = libra_sdio_remove, + .drv.pm = &libra_sdio_pm_ops, }; static int __init libra_sdioif_init(void) @@ -505,8 +442,6 @@ static int __init libra_sdioif_init(void) libra_mmc_host_index = -1; libra_suspend_hldr = NULL; libra_resume_hldr = NULL; - libra_notify_card_removal_hdlr = NULL; - libra_sdio_shutdown_hdlr = NULL; sdio_register_driver(&libra_sdiofn_driver); diff --git a/drivers/net/wireless/libra/qcomwlan7x27a_pwrif.c b/drivers/net/wireless/libra/qcomwlan7x27a_pwrif.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/libra/qcomwlan_pwrif.c b/drivers/net/wireless/libra/qcomwlan_pwrif.c index 94ea0b395..6a0c78f2b 100755 --- a/drivers/net/wireless/libra/qcomwlan_pwrif.c +++ b/drivers/net/wireless/libra/qcomwlan_pwrif.c @@ -154,7 +154,7 @@ int vos_chip_power_qrf8615(int on) /* WLAN VREG settings */ for (i = 0; i < ARRAY_SIZE(vregs_qwlan_name); i++) { - if (on && !wlan_on) { + if (vregs_qwlan[i] == NULL) { vregs_qwlan[i] = regulator_get(NULL, vregs_qwlan_name[i]); if (IS_ERR(vregs_qwlan[i])) { @@ -187,7 +187,8 @@ int vos_chip_power_qrf8615(int on) goto vreg_fail; } } - + } + if (on && !wlan_on) { if (vregs_qwlan_peek_current[i]) { rc = regulator_set_optimum_mode(vregs_qwlan[i], vregs_qwlan_peek_current[i]); diff --git a/sound/soc/msm/Kconfig b/sound/soc/msm/Kconfig old mode 100755 new mode 100644 index 9e0549b51..1ed5f74bc --- a/sound/soc/msm/Kconfig +++ b/sound/soc/msm/Kconfig @@ -80,6 +80,13 @@ config SND_SOC_MSM8660_LPAIF config SND_VOIP_PCM tristate +config SND_SOC_MSM_QDSP6_HDMI_AUDIO + tristate "Soc QDSP6 HDMI Audio DAI driver" + depends on FB_MSM_HDMI_MSM_PANEL + default n + help + To support HDMI Audio on MSM8960 over QDSP6. + config MSM_8x60_VOIP tristate "SoC Machine driver for voip" depends on SND_SOC_MSM8X60 @@ -120,6 +127,7 @@ config SND_SOC_MSM8960 select SND_SOC_MSM_STUB select SND_SOC_WCD9310 select SND_SOC_MSM_HOSTLESS_PCM + select SND_SOC_MSM_QDSP6_HDMI_AUDIO default n help To add support for SoC audio on MSM8960 and APQ8064 boards diff --git a/sound/soc/msm/Makefile b/sound/soc/msm/Makefile old mode 100755 new mode 100644 index 3b257a603..1b3014e24 --- a/sound/soc/msm/Makefile +++ b/sound/soc/msm/Makefile @@ -56,12 +56,13 @@ obj-$(CONFIG_SND_SOC_MSM8X60) += snd-soc-lpass-dma.o obj-$(CONFIG_SND_SOC_MSM_QDSP6_INTF) += qdsp6/ -snd-soc-qdsp6-objs := msm-dai-q6.o msm-pcm-q6.o msm-pcm-routing.o msm-dai-fe.o msm-compr-q6.o +snd-soc-qdsp6-objs := msm-dai-q6.o msm-pcm-q6.o msm-multi-ch-pcm-q6.o msm-pcm-routing.o msm-dai-fe.o msm-compr-q6.o +obj-$(CONFIG_SND_SOC_MSM_QDSP6_HDMI_AUDIO) += msm-dai-q6-hdmi.o obj-$(CONFIG_SND_SOC_VOICE) += msm-pcm-voice.o msm-pcm-voip.o snd-soc-qdsp6-objs += msm-pcm-lpa.o msm-pcm-afe.o obj-$(CONFIG_SND_SOC_QDSP6) += snd-soc-qdsp6.o -snd-soc-msm8960-objs := msm8960.o +snd-soc-msm8960-objs := msm8960.o apq8064.o obj-$(CONFIG_SND_SOC_MSM8960) += snd-soc-msm8960.o # Generic MSM drivers diff --git a/sound/soc/msm/lpass-dma.c b/sound/soc/msm/lpass-dma.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/lpass-i2s.c b/sound/soc/msm/lpass-i2s.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/lpass-pcm.c b/sound/soc/msm/lpass-pcm.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/lpass-pcm.h b/sound/soc/msm/lpass-pcm.h old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm-compr-q6.c b/sound/soc/msm/msm-compr-q6.c old mode 100644 new mode 100755 index cf6f1e747..590d4af71 --- a/sound/soc/msm/msm-compr-q6.c +++ b/sound/soc/msm/msm-compr-q6.c @@ -88,10 +88,10 @@ static void compr_event_handler(uint32_t opcode, atomic_inc(&prtd->out_count); wake_up(&the_locks.write_wait); if (!atomic_read(&prtd->start)) { - prtd->pending_buffer = 1; + atomic_set(&prtd->pending_buffer, 1); break; } else - prtd->pending_buffer = 0; + atomic_set(&prtd->pending_buffer, 0); if (runtime->status->hw_ptr >= runtime->control->appl_ptr) break; @@ -131,8 +131,7 @@ static void compr_event_handler(uint32_t opcode, case APR_BASIC_RSP_RESULT: { switch (payload[0]) { case ASM_SESSION_CMD_RUN: { - if (!prtd->pending_buffer && - !atomic_read(&prtd->start)) + if (!atomic_read(&prtd->pending_buffer)) break; pr_debug("%s:writing %d bytes" " of buffer[%d] to dsp\n", @@ -156,6 +155,7 @@ static void compr_event_handler(uint32_t opcode, prtd->out_head = (prtd->out_head + 1) & (runtime->periods - 1); + atomic_set(&prtd->pending_buffer, 0); } break; case ASM_STREAM_CMD_FLUSH: @@ -302,7 +302,7 @@ static int msm_compr_open(struct snd_pcm_substream *substream) pr_info("snd_pcm_hw_constraint_integer failed\n"); prtd->dsp_cnt = 0; - prtd->pending_buffer = 1; + atomic_set(&prtd->pending_buffer, 1); compr->codec = FORMAT_MP3; populate_codec_list(compr, runtime); runtime->private_data = compr; @@ -321,7 +321,7 @@ static int msm_compr_playback_close(struct snd_pcm_substream *substream) pr_debug("%s\n", __func__); dir = IN; - + atomic_set(&prtd->pending_buffer, 0); q6asm_cmd(prtd->audio_client, CMD_CLOSE); q6asm_audio_client_buf_free_contiguous(dir, prtd->audio_client); diff --git a/sound/soc/msm/msm-dai-fe.c b/sound/soc/msm/msm-dai-fe.c old mode 100755 new mode 100644 index 16d149e50..8f71e8332 --- a/sound/soc/msm/msm-dai-fe.c +++ b/sound/soc/msm/msm-dai-fe.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -75,7 +75,7 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { .rates = SNDRV_PCM_RATE_8000_48000, .formats = SNDRV_PCM_FMTBIT_S16_LE, .channels_min = 1, - .channels_max = 2, + .channels_max = 6, .rate_min = 8000, .rate_max = 48000, }, @@ -236,6 +236,41 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { .ops = &msm_fe_dai_ops, .name = "AFE-PROXY", }, + { + .playback = { + .stream_name = "HDMI_Rx Hostless Playback", + .rates = SNDRV_PCM_RATE_8000_48000, + .formats = SNDRV_PCM_FMTBIT_S16_LE, + .channels_min = 1, + .channels_max = 2, + .rate_min = 8000, + .rate_max = 48000, + }, + .ops = &msm_fe_dai_ops, + .name = "HDMI_HOSTLESS" + }, + { + .playback = { + .stream_name = "AUXPCM Hostless Playback", + .rates = SNDRV_PCM_RATE_8000, + .formats = SNDRV_PCM_FMTBIT_S16_LE, + .channels_min = 1, + .channels_max = 1, + .rate_min = 8000, + .rate_max = 8000, + }, + .capture = { + .stream_name = "AUXPCM Hostless Capture", + .rates = SNDRV_PCM_RATE_8000, + .formats = SNDRV_PCM_FMTBIT_S16_LE, + .channels_min = 1, + .channels_max = 1, + .rate_min = 8000, + .rate_max = 48000, + }, + .ops = &msm_fe_dai_ops, + .name = "AUXPCM_HOSTLESS", + }, }; static __devinit int msm_fe_dai_dev_probe(struct platform_device *pdev) diff --git a/sound/soc/msm/msm-dai-q6.c b/sound/soc/msm/msm-dai-q6.c index 5e02797c8..09517954f 100755 --- a/sound/soc/msm/msm-dai-q6.c +++ b/sound/soc/msm/msm-dai-q6.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -23,7 +23,6 @@ #include #include #include -#include #include #include @@ -41,6 +40,17 @@ struct msm_dai_q6_dai_data { static struct clk *pcm_clk; +static u8 num_of_bits_set(u8 sd_line_mask) +{ + u8 num_bits_set = 0; + + while (sd_line_mask) { + num_bits_set++; + sd_line_mask = sd_line_mask & (sd_line_mask - 1); + } + return num_bits_set; +} + static int msm_dai_q6_cdc_hw_params(struct snd_pcm_hw_params *params, struct snd_soc_dai *dai, int stream) { @@ -66,78 +76,185 @@ static int msm_dai_q6_cdc_hw_params(struct snd_pcm_hw_params *params, /* Q6 only supports 16 as now */ dai_data->port_config.mi2s.bitwidth = 16; dai_data->port_config.mi2s.line = 1; + return 0; +} + +static int msm_dai_q6_mi2s_hw_params(struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai, int stream) +{ + struct msm_dai_q6_dai_data *dai_data = dev_get_drvdata(dai->dev); + struct msm_mi2s_data *mi2s_pdata = + (struct msm_mi2s_data *) dai->dev->platform_data; + + dai_data->channels = params_channels(params); + if (num_of_bits_set(mi2s_pdata->sd_lines) == 1) { + switch (dai_data->channels) { + case 2: + dai_data->port_config.mi2s.channel = MSM_AFE_STEREO; + break; + case 1: + dai_data->port_config.mi2s.channel = MSM_AFE_MONO; + break; + default: + pr_warn("greater than stereo has not been validated"); + break; + } + } + /* Q6 only supports 16 as now */ + dai_data->port_config.mi2s.bitwidth = 16; return 0; } -static int msm_dai_q6_cdc_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) +static int msm_dai_q6_mi2s_platform_data_validation( + struct snd_soc_dai *dai) { + u8 num_of_sd_lines; struct msm_dai_q6_dai_data *dai_data = dev_get_drvdata(dai->dev); + struct msm_mi2s_data *mi2s_pdata = + (struct msm_mi2s_data *)dai->dev->platform_data; + struct snd_soc_dai_driver *dai_driver = + (struct snd_soc_dai_driver *)dai->driver; - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: - dai_data->port_config.mi2s.ws = 1; /* CPU is master */ + num_of_sd_lines = num_of_bits_set(mi2s_pdata->sd_lines); + + switch (num_of_sd_lines) { + case 1: + switch (mi2s_pdata->sd_lines) { + case MSM_MI2S_SD0: + dai_data->port_config.mi2s.line = AFE_I2S_SD0; + break; + case MSM_MI2S_SD1: + dai_data->port_config.mi2s.line = AFE_I2S_SD1; + break; + case MSM_MI2S_SD2: + dai_data->port_config.mi2s.line = AFE_I2S_SD2; + break; + case MSM_MI2S_SD3: + dai_data->port_config.mi2s.line = AFE_I2S_SD3; + break; + default: + pr_err("%s: invalid SD line\n", + __func__); + goto error_invalid_data; + } break; - case SND_SOC_DAIFMT_CBM_CFM: - dai_data->port_config.mi2s.ws = 0; /* CPU is slave */ + case 2: + switch (mi2s_pdata->sd_lines) { + case MSM_MI2S_SD0 | MSM_MI2S_SD1: + dai_data->port_config.mi2s.line = AFE_I2S_QUAD01; + break; + case MSM_MI2S_SD2 | MSM_MI2S_SD3: + dai_data->port_config.mi2s.line = AFE_I2S_QUAD23; + break; + default: + pr_err("%s: invalid SD line\n", + __func__); + goto error_invalid_data; + } + break; + case 3: + switch (mi2s_pdata->sd_lines) { + case MSM_MI2S_SD0 | MSM_MI2S_SD1 | MSM_MI2S_SD2: + dai_data->port_config.mi2s.line = AFE_I2S_6CHS; + break; + default: + pr_err("%s: invalid SD lines\n", + __func__); + goto error_invalid_data; + } + break; + case 4: + switch (mi2s_pdata->sd_lines) { + case MSM_MI2S_SD0 | MSM_MI2S_SD1 | MSM_MI2S_SD2 | MSM_MI2S_SD3: + dai_data->port_config.mi2s.line = AFE_I2S_8CHS; + break; + default: + pr_err("%s: invalid SD lines\n", + __func__); + goto error_invalid_data; + } break; default: - return -EINVAL; + pr_err("%s: invalid SD lines\n", __func__); + goto error_invalid_data; } + if (mi2s_pdata->capability == MSM_MI2S_CAP_RX) + dai_driver->playback.channels_max = num_of_sd_lines << 1; return 0; + +error_invalid_data: + return -EINVAL; } -static int msm_dai_q6_hdmi_hw_params(struct snd_pcm_hw_params *params, - struct snd_soc_dai *dai) +static int msm_dai_q6_cdc_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) { struct msm_dai_q6_dai_data *dai_data = dev_get_drvdata(dai->dev); - dev_dbg(dai->dev, "%s start HDMI port\n", __func__); - - dai_data->channels = params_channels(params); - switch (dai_data->channels) { - case 2: - dai_data->port_config.hdmi.channel_mode = 0; /* Put in macro */ + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBS_CFS: + dai_data->port_config.mi2s.ws = 1; /* CPU is master */ + break; + case SND_SOC_DAIFMT_CBM_CFM: + dai_data->port_config.mi2s.ws = 0; /* CPU is slave */ break; default: return -EINVAL; - break; } - /* Q6 only supports 16 as now */ - dai_data->port_config.hdmi.bitwidth = 16; - dai_data->port_config.hdmi.data_type = 0; - dai_data->rate = params_rate(params); - return 0; } + static int msm_dai_q6_slim_bus_hw_params(struct snd_pcm_hw_params *params, struct snd_soc_dai *dai, int stream) { struct msm_dai_q6_dai_data *dai_data = dev_get_drvdata(dai->dev); u8 pgd_la, inf_la; + u16 *slave_port_mapping; memset(dai_data->port_config.slimbus.slave_port_mapping, 0, sizeof(dai_data->port_config.slimbus.slave_port_mapping)); dai_data->channels = params_channels(params); + + slave_port_mapping = dai_data->port_config.slimbus.slave_port_mapping; + switch (dai_data->channels) { + case 4: + if (dai->id == SLIMBUS_0_TX) { + slave_port_mapping[0] = 7; + slave_port_mapping[1] = 8; + slave_port_mapping[2] = 9; + slave_port_mapping[3] = 10; + } else { + return -EINVAL; + } + break; + case 3: + if (dai->id == SLIMBUS_0_TX) { + slave_port_mapping[0] = 7; + slave_port_mapping[1] = 8; + slave_port_mapping[2] = 9; + } else { + return -EINVAL; + } + break; case 2: if (dai->id == SLIMBUS_0_RX) { - dai_data->port_config.slimbus.slave_port_mapping[0] = 1; - dai_data->port_config.slimbus.slave_port_mapping[1] = 2; + slave_port_mapping[0] = 1; + slave_port_mapping[1] = 2; } else { - dai_data->port_config.slimbus.slave_port_mapping[0] = 7; - dai_data->port_config.slimbus.slave_port_mapping[1] = 8; + slave_port_mapping[0] = 7; + slave_port_mapping[1] = 8; } break; case 1: if (dai->id == SLIMBUS_0_RX) - dai_data->port_config.slimbus.slave_port_mapping[0] = 1; + slave_port_mapping[0] = 1; else - dai_data->port_config.slimbus.slave_port_mapping[0] = 7; + slave_port_mapping[0] = 7; break; default: return -EINVAL; @@ -278,10 +395,11 @@ static int msm_dai_q6_hw_params(struct snd_pcm_substream *substream, switch (dai->id) { case PRIMARY_I2S_TX: case PRIMARY_I2S_RX: + case SECONDARY_I2S_RX: rc = msm_dai_q6_cdc_hw_params(params, dai, substream->stream); break; - case HDMI_RX: - rc = msm_dai_q6_hdmi_hw_params(params, dai); + case MI2S_RX: + rc = msm_dai_q6_mi2s_hw_params(params, dai, substream->stream); break; case SLIMBUS_0_RX: case SLIMBUS_0_TX: @@ -300,6 +418,11 @@ static int msm_dai_q6_hw_params(struct snd_pcm_substream *substream, case RT_PROXY_DAI_002_RX: rc = msm_dai_q6_afe_rtproxy_hw_params(params, dai); break; + case VOICE_PLAYBACK_TX: + case VOICE_RECORD_RX: + case VOICE_RECORD_TX: + rc = 0; + break; default: dev_err(dai->dev, "invalid AFE port ID\n"); rc = -EINVAL; @@ -315,10 +438,6 @@ static void msm_dai_q6_auxpcm_shutdown(struct snd_pcm_substream *substream, struct msm_dai_q6_dai_data *dai_data = dev_get_drvdata(dai->dev); int rc = 0; - rc = adm_close(dai->id); - if (IS_ERR_VALUE(rc)) - dev_err(dai->dev, "fail to close ADM COPP\n"); - pr_debug("%s: dai->id = %d", __func__, dai->id); if (test_bit(STATUS_PORT_STARTED, dai_data->status_mask)) { @@ -343,7 +462,18 @@ static void msm_dai_q6_shutdown(struct snd_pcm_substream *substream, int rc = 0; if (test_bit(STATUS_PORT_STARTED, dai_data->status_mask)) { - rc = afe_close(dai->id); /* can block */ + switch (dai->id) { + case VOICE_PLAYBACK_TX: + case VOICE_RECORD_TX: + case VOICE_RECORD_RX: + pr_debug("%s, stop pseudo port:%d\n", + __func__, dai->id); + rc = afe_stop_pseudo_port(dai->id); + break; + default: + rc = afe_close(dai->id); /* can block */ + break; + } if (IS_ERR_VALUE(rc)) dev_err(dai->dev, "fail to close AFE port\n"); pr_debug("%s: dai_data->status_mask = %ld\n", __func__, @@ -478,8 +608,17 @@ static int msm_dai_q6_trigger(struct snd_pcm_substream *substream, int cmd, case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: if (!test_bit(STATUS_PORT_STARTED, dai_data->status_mask)) { - afe_port_start_nowait(dai->id, &dai_data->port_config, - dai_data->rate); + switch (dai->id) { + case VOICE_PLAYBACK_TX: + case VOICE_RECORD_TX: + case VOICE_RECORD_RX: + afe_pseudo_port_start_nowait(dai->id); + break; + default: + afe_port_start_nowait(dai->id, + &dai_data->port_config, dai_data->rate); + break; + } set_bit(STATUS_PORT_STARTED, dai_data->status_mask); } @@ -488,7 +627,16 @@ static int msm_dai_q6_trigger(struct snd_pcm_substream *substream, int cmd, case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: if (test_bit(STATUS_PORT_STARTED, dai_data->status_mask)) { - afe_port_stop_nowait(dai->id); + switch (dai->id) { + case VOICE_PLAYBACK_TX: + case VOICE_RECORD_TX: + case VOICE_RECORD_RX: + afe_pseudo_port_stop_nowait(dai->id); + break; + default: + afe_port_stop_nowait(dai->id); + break; + } clear_bit(STATUS_PORT_STARTED, dai_data->status_mask); } @@ -558,6 +706,31 @@ static int msm_dai_q6_dai_auxpcm_remove(struct snd_soc_dai *dai) return 0; } +static int msm_dai_q6_dai_mi2s_probe(struct snd_soc_dai *dai) +{ + struct msm_dai_q6_dai_data *dai_data; + int rc = 0; + + dai_data = kzalloc(sizeof(struct msm_dai_q6_dai_data), + GFP_KERNEL); + + if (!dai_data) { + dev_err(dai->dev, "DAI-%d: fail to allocate dai data\n", + dai->id); + rc = -ENOMEM; + goto rtn; + } else + dev_set_drvdata(dai->dev, dai_data); + + rc = msm_dai_q6_mi2s_platform_data_validation(dai); + if (rc != 0) { + pr_err("%s: The msm_dai_q6_mi2s_platform_data_validation failed\n", + __func__); + kfree(dai_data); + } +rtn: + return rc; +} static int msm_dai_q6_dai_probe(struct snd_soc_dai *dai) { @@ -586,7 +759,17 @@ static int msm_dai_q6_dai_remove(struct snd_soc_dai *dai) /* If AFE port is still up, close it */ if (test_bit(STATUS_PORT_STARTED, dai_data->status_mask)) { - rc = afe_close(dai->id); /* can block */ + switch (dai->id) { + case VOICE_PLAYBACK_TX: + case VOICE_RECORD_TX: + case VOICE_RECORD_RX: + pr_debug("%s, stop pseudo port:%d\n", + __func__, dai->id); + rc = afe_stop_pseudo_port(dai->id); + break; + default: + rc = afe_close(dai->id); /* can block */ + } if (IS_ERR_VALUE(rc)) dev_err(dai->dev, "fail to close AFE port\n"); clear_bit(STATUS_PORT_STARTED, dai_data->status_mask); @@ -605,6 +788,8 @@ static int msm_dai_q6_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) switch (dai->id) { case PRIMARY_I2S_TX: case PRIMARY_I2S_RX: + case MI2S_RX: + case SECONDARY_I2S_RX: rc = msm_dai_q6_cdc_set_fmt(dai, fmt); break; default: @@ -637,7 +822,7 @@ static struct snd_soc_dai_driver msm_dai_q6_i2s_rx_dai = { SNDRV_PCM_RATE_16000, .formats = SNDRV_PCM_FMTBIT_S16_LE, .channels_min = 1, - .channels_max = 2, + .channels_max = 4, .rate_min = 8000, .rate_max = 48000, }, @@ -691,14 +876,15 @@ static struct snd_soc_dai_driver msm_dai_q6_afe_tx_dai = { .remove = msm_dai_q6_dai_remove, }; -static struct snd_soc_dai_driver msm_dai_q6_hdmi_rx_dai = { +static struct snd_soc_dai_driver msm_dai_q6_voice_playback_tx_dai = { .playback = { - .rates = SNDRV_PCM_RATE_48000, + .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 | + SNDRV_PCM_RATE_16000, .formats = SNDRV_PCM_FMTBIT_S16_LE, - .channels_min = 2, + .channels_min = 1, .channels_max = 2, .rate_max = 48000, - .rate_min = 48000, + .rate_min = 8000, }, .ops = &msm_dai_q6_ops, .probe = msm_dai_q6_dai_probe, @@ -735,6 +921,21 @@ static struct snd_soc_dai_driver msm_dai_q6_slimbus_tx_dai = { .remove = msm_dai_q6_dai_remove, }; +static struct snd_soc_dai_driver msm_dai_q6_incall_record_dai = { + .capture = { + .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 | + SNDRV_PCM_RATE_16000, + .formats = SNDRV_PCM_FMTBIT_S16_LE, + .channels_min = 1, + .channels_max = 2, + .rate_min = 8000, + .rate_max = 48000, + }, + .ops = &msm_dai_q6_ops, + .probe = msm_dai_q6_dai_probe, + .remove = msm_dai_q6_dai_remove, +}; + static struct snd_soc_dai_driver msm_dai_q6_bt_sco_rx_dai = { .playback = { .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000, @@ -818,6 +1019,20 @@ static struct snd_soc_dai_driver msm_dai_q6_aux_pcm_tx_dai = { }, }; +static struct snd_soc_dai_driver msm_dai_q6_mi2s_rx_dai = { + .playback = { + .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 | + SNDRV_PCM_RATE_16000, + .formats = SNDRV_PCM_FMTBIT_S16_LE, + .channels_min = 1, + .rate_min = 8000, + .rate_max = 48000, + }, + .ops = &msm_dai_q6_ops, + .probe = msm_dai_q6_dai_mi2s_probe, + .remove = msm_dai_q6_dai_probe, +}; + /* To do: change to register DAIs as batch */ static __devinit int msm_dai_q6_dev_probe(struct platform_device *pdev) { @@ -827,6 +1042,7 @@ static __devinit int msm_dai_q6_dev_probe(struct platform_device *pdev) switch (pdev->id) { case PRIMARY_I2S_RX: + case SECONDARY_I2S_RX: rc = snd_soc_register_dai(&pdev->dev, &msm_dai_q6_i2s_rx_dai); break; case PRIMARY_I2S_TX: @@ -840,8 +1056,9 @@ static __devinit int msm_dai_q6_dev_probe(struct platform_device *pdev) rc = snd_soc_register_dai(&pdev->dev, &msm_dai_q6_aux_pcm_tx_dai); break; - case HDMI_RX: - rc = snd_soc_register_dai(&pdev->dev, &msm_dai_q6_hdmi_rx_dai); + case MI2S_RX: + rc = snd_soc_register_dai(&pdev->dev, + &msm_dai_q6_mi2s_rx_dai); break; case SLIMBUS_0_RX: rc = snd_soc_register_dai(&pdev->dev, @@ -872,6 +1089,15 @@ static __devinit int msm_dai_q6_dev_probe(struct platform_device *pdev) case RT_PROXY_DAI_002_TX: rc = snd_soc_register_dai(&pdev->dev, &msm_dai_q6_afe_tx_dai); break; + case VOICE_PLAYBACK_TX: + rc = snd_soc_register_dai(&pdev->dev, + &msm_dai_q6_voice_playback_tx_dai); + break; + case VOICE_RECORD_RX: + case VOICE_RECORD_TX: + rc = snd_soc_register_dai(&pdev->dev, + &msm_dai_q6_incall_record_dai); + break; default: rc = -ENODEV; break; diff --git a/sound/soc/msm/msm-dai.c b/sound/soc/msm/msm-dai.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm-mvs.c b/sound/soc/msm/msm-mvs.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm-pcm-afe.c b/sound/soc/msm/msm-pcm-afe.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm-pcm-afe.h b/sound/soc/msm/msm-pcm-afe.h old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm-pcm-hostless.c b/sound/soc/msm/msm-pcm-hostless.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm-pcm-lpa.c b/sound/soc/msm/msm-pcm-lpa.c index f644722c2..83fd69134 100755 --- a/sound/soc/msm/msm-pcm-lpa.c +++ b/sound/soc/msm/msm-pcm-lpa.c @@ -95,10 +95,12 @@ static void event_handler(uint32_t opcode, atomic_inc(&prtd->out_count); wake_up(&the_locks.write_wait); if (!atomic_read(&prtd->start)) { - prtd->pending_buffer = 1; + atomic_set(&prtd->pending_buffer, 1); break; } else - prtd->pending_buffer = 0; + atomic_set(&prtd->pending_buffer, 0); + if (runtime->status->hw_ptr >= runtime->control->appl_ptr) + break; pr_debug("%s:writing %d bytes of buffer to dsp 2\n", __func__, prtd->pcm_count); @@ -121,6 +123,7 @@ static void event_handler(uint32_t opcode, else prtd->out_head = (prtd->out_head + 1) & (runtime->periods - 1); + atomic_set(&prtd->pending_buffer, 0); break; } case ASM_DATA_CMDRSP_EOS: @@ -131,8 +134,10 @@ static void event_handler(uint32_t opcode, case APR_BASIC_RSP_RESULT: { switch (payload[0]) { case ASM_SESSION_CMD_RUN: { - if (!prtd->pending_buffer && - !atomic_read(&prtd->start)) + if (!atomic_read(&prtd->pending_buffer)) + break; + if (runtime->status->hw_ptr >= + runtime->control->appl_ptr) break; pr_debug("%s:writing %d bytes" " of buffer to dsp\n", @@ -152,6 +157,7 @@ static void event_handler(uint32_t opcode, prtd->out_head = (prtd->out_head + 1) & (runtime->periods - 1); + atomic_set(&prtd->pending_buffer, 0); } break; case ASM_STREAM_CMD_FLUSH: @@ -303,7 +309,7 @@ static int msm_pcm_open(struct snd_pcm_substream *substream) pr_debug("snd_pcm_hw_constraint_integer failed\n"); prtd->dsp_cnt = 0; - prtd->pending_buffer = 1; + atomic_set(&prtd->pending_buffer, 1); runtime->private_data = prtd; lpa_audio.prtd = prtd; lpa_set_volume(lpa_audio.volume); @@ -339,10 +345,29 @@ static int msm_pcm_playback_close(struct snd_pcm_substream *substream) struct snd_soc_pcm_runtime *soc_prtd = substream->private_data; struct msm_audio *prtd = runtime->private_data; int dir = 0; + int rc = 0; - pr_debug("%s\n", __func__); + /* + If routing is still enabled, we need to issue EOS to + the DSP + To issue EOS to dsp, we need to be run state otherwise + EOS is not honored. + */ + if (msm_routing_check_backend_enabled(soc_prtd->dai_link->be_id)) { + rc = q6asm_run(prtd->audio_client, 0, 0, 0); + atomic_set(&prtd->pending_buffer, 0); + prtd->cmd_ack = 0; + q6asm_cmd_nowait(prtd->audio_client, CMD_EOS); + pr_debug("%s\n", __func__); + rc = wait_event_timeout(the_locks.eos_wait, + prtd->cmd_ack, 5 * HZ); + if (rc < 0) + pr_err("EOS cmd timeout\n"); + prtd->pcm_irq_pos = 0; + } dir = IN; + atomic_set(&prtd->pending_buffer, 0); lpa_audio.prtd = NULL; q6asm_cmd(prtd->audio_client, CMD_CLOSE); q6asm_audio_client_buf_free_contiguous(dir, @@ -460,6 +485,7 @@ static int msm_pcm_ioctl(struct snd_pcm_substream *substream, switch (cmd) { case SNDRV_PCM_IOCTL1_RESET: + prtd->cmd_ack = 0; rc = q6asm_cmd(prtd->audio_client, CMD_FLUSH); if (rc < 0) pr_err("%s: flush cmd failed rc=%d\n", __func__, rc); diff --git a/sound/soc/msm/msm-pcm-q6.c b/sound/soc/msm/msm-pcm-q6.c index 738e024b1..ed880e815 100755 --- a/sound/soc/msm/msm-pcm-q6.c +++ b/sound/soc/msm/msm-pcm-q6.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -39,6 +39,11 @@ struct snd_msm { struct snd_pcm *pcm; }; +#define PLAYBACK_NUM_PERIODS 8 +#define PLAYBACK_PERIOD_SIZE 2048 +#define CAPTURE_NUM_PERIODS 16 +#define CAPTURE_PERIOD_SIZE 320 + static struct snd_pcm_hardware msm_pcm_hardware_capture = { .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_BLOCK_TRANSFER | @@ -51,11 +56,11 @@ static struct snd_pcm_hardware msm_pcm_hardware_capture = { .rate_max = 48000, .channels_min = 1, .channels_max = 2, - .buffer_bytes_max = 320 * 8, - .period_bytes_min = 320, - .period_bytes_max = 320, - .periods_min = 8, - .periods_max = 8, + .buffer_bytes_max = CAPTURE_NUM_PERIODS * CAPTURE_PERIOD_SIZE, + .period_bytes_min = CAPTURE_PERIOD_SIZE, + .period_bytes_max = CAPTURE_PERIOD_SIZE, + .periods_min = CAPTURE_NUM_PERIODS, + .periods_max = CAPTURE_NUM_PERIODS, .fifo_size = 0, }; @@ -71,11 +76,11 @@ static struct snd_pcm_hardware msm_pcm_hardware_playback = { .rate_max = 48000, .channels_min = 1, .channels_max = 2, - .buffer_bytes_max = 2048 * 8, - .period_bytes_min = 2048, - .period_bytes_max = 2048, - .periods_min = 8, - .periods_max = 8, + .buffer_bytes_max = PLAYBACK_NUM_PERIODS * PLAYBACK_PERIOD_SIZE, + .period_bytes_min = PLAYBACK_PERIOD_SIZE, + .period_bytes_max = PLAYBACK_PERIOD_SIZE, + .periods_min = PLAYBACK_NUM_PERIODS, + .periods_max = PLAYBACK_NUM_PERIODS, .fifo_size = 0, }; @@ -84,7 +89,7 @@ static unsigned int supported_sample_rates[] = { 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }; -static uint32_t in_frame_info[8][2]; +static uint32_t in_frame_info[CAPTURE_NUM_PERIODS][2]; static struct snd_pcm_hw_constraint_list constraints_sample_rates = { .count = ARRAY_SIZE(supported_sample_rates), diff --git a/sound/soc/msm/msm-pcm-q6.h b/sound/soc/msm/msm-pcm-q6.h index 214bd9d50..e5551ea68 100755 --- a/sound/soc/msm/msm-pcm-q6.h +++ b/sound/soc/msm/msm-pcm-q6.h @@ -77,7 +77,7 @@ struct msm_audio { int out_head; int periods; int mmap_flag; - int pending_buffer; + atomic_t pending_buffer; }; #endif /*_MSM_PCM_H*/ diff --git a/sound/soc/msm/msm-pcm-routing.c b/sound/soc/msm/msm-pcm-routing.c index 9a076d6a3..f99cf6e56 100755 --- a/sound/soc/msm/msm-pcm-routing.c +++ b/sound/soc/msm/msm-pcm-routing.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -114,6 +114,11 @@ static struct msm_pcm_routing_bdai_data msm_bedais[MSM_BACKEND_DAI_MAX] = { { RT_PROXY_PORT_001_TX, 0, NULL, 0, 0}, { PCM_RX, 0, NULL, 0, 0}, { PCM_TX, 0, NULL, 0, 0}, + { VOICE_PLAYBACK_TX, 0, NULL, 0, 0}, + { VOICE_RECORD_RX, 0, NULL, 0, 0}, + { VOICE_RECORD_TX, 0, NULL, 0, 0}, + { MI2S_RX, 0, NULL, 0, 0}, + { SECONDARY_I2S_RX, 0, NULL, 0, 0}, }; @@ -157,6 +162,7 @@ void msm_pcm_routing_reg_phy_stream(int fedai_id, int dspst_id, int stream_type) { int i, session_type, path_type, port_type; struct route_payload payload; + u32 channels; if (fedai_id > MSM_FRONTEND_DAI_MM_MAX_ID) { /* bad ID assigned in machine driver */ @@ -186,11 +192,23 @@ void msm_pcm_routing_reg_phy_stream(int fedai_id, int dspst_id, int stream_type) port_type) && msm_bedais[i].active && (test_bit(fedai_id, &msm_bedais[i].fe_sessions))) { - adm_open(msm_bedais[i].port_id, + + channels = params_channels(msm_bedais[i].hw_params); + + if ((stream_type == SNDRV_PCM_STREAM_PLAYBACK) && + (channels > 2)) + adm_multi_ch_copp_open(msm_bedais[i].port_id, + path_type, + params_rate(msm_bedais[i].hw_params), + channels, + DEFAULT_COPP_TOPOLOGY); + else + adm_open(msm_bedais[i].port_id, path_type, params_rate(msm_bedais[i].hw_params), params_channels(msm_bedais[i].hw_params), DEFAULT_COPP_TOPOLOGY); + payload.copp_ids[payload.num_copps++] = msm_bedais[i].port_id; } @@ -238,6 +256,7 @@ void msm_pcm_routing_dereg_phy_stream(int fedai_id, int stream_type) static void msm_pcm_routing_process_audio(u16 reg, u16 val, int set) { int session_type, path_type; + u32 channels; pr_debug("%s: reg %x val %x set %x\n", __func__, reg, val, set); @@ -259,17 +278,36 @@ static void msm_pcm_routing_process_audio(u16 reg, u16 val, int set) mutex_lock(&routing_lock); if (set) { + if (!test_bit(val, &msm_bedais[reg].fe_sessions) && + (msm_bedais[reg].port_id == VOICE_PLAYBACK_TX)) + voc_start_playback(set); + set_bit(val, &msm_bedais[reg].fe_sessions); if (msm_bedais[reg].active && fe_dai_map[val][session_type] != INVALID_SESSION) { - adm_open(msm_bedais[reg].port_id, path_type, + + channels = params_channels(msm_bedais[reg].hw_params); + + if ((session_type == SESSION_TYPE_RX) && (channels > 2)) + adm_multi_ch_copp_open(msm_bedais[reg].port_id, + path_type, + params_rate(msm_bedais[reg].hw_params), + channels, + DEFAULT_COPP_TOPOLOGY); + else + adm_open(msm_bedais[reg].port_id, + path_type, params_rate(msm_bedais[reg].hw_params), params_channels(msm_bedais[reg].hw_params), DEFAULT_COPP_TOPOLOGY); + msm_pcm_routing_build_matrix(val, fe_dai_map[val][session_type], path_type); } } else { + if (test_bit(val, &msm_bedais[reg].fe_sessions) && + (msm_bedais[reg].port_id == VOICE_PLAYBACK_TX)) + voc_start_playback(set); clear_bit(val, &msm_bedais[reg].fe_sessions); if (msm_bedais[reg].active && fe_dai_map[val][session_type] != INVALID_SESSION) { @@ -278,6 +316,9 @@ static void msm_pcm_routing_process_audio(u16 reg, u16 val, int set) fe_dai_map[val][session_type], path_type); } } + if ((msm_bedais[reg].port_id == VOICE_RECORD_RX) + || (msm_bedais[reg].port_id == VOICE_RECORD_TX)) + voc_start_record(msm_bedais[reg].port_id, set); mutex_unlock(&routing_lock); } @@ -654,6 +695,21 @@ static const struct snd_kcontrol_new pri_i2s_rx_mixer_controls[] = { msm_routing_put_audio_mixer), }; +static const struct snd_kcontrol_new sec_i2s_rx_mixer_controls[] = { + SOC_SINGLE_EXT("MultiMedia1", MSM_BACKEND_DAI_SEC_I2S_RX , + MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), + SOC_SINGLE_EXT("MultiMedia2", MSM_BACKEND_DAI_SEC_I2S_RX, + MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), + SOC_SINGLE_EXT("MultiMedia3", MSM_BACKEND_DAI_SEC_I2S_RX, + MSM_FRONTEND_DAI_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), + SOC_SINGLE_EXT("MultiMedia4", MSM_BACKEND_DAI_SEC_I2S_RX, + MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), +}; + static const struct snd_kcontrol_new slimbus_rx_mixer_controls[] = { SOC_SINGLE_EXT("MultiMedia1", MSM_BACKEND_DAI_SLIMBUS_0_RX , MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer, @@ -669,6 +725,21 @@ static const struct snd_kcontrol_new slimbus_rx_mixer_controls[] = { msm_routing_put_audio_mixer), }; +static const struct snd_kcontrol_new mi2s_rx_mixer_controls[] = { + SOC_SINGLE_EXT("MultiMedia1", MSM_BACKEND_DAI_MI2S_RX , + MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), + SOC_SINGLE_EXT("MultiMedia2", MSM_BACKEND_DAI_MI2S_RX, + MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), + SOC_SINGLE_EXT("MultiMedia3", MSM_BACKEND_DAI_MI2S_RX, + MSM_FRONTEND_DAI_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), + SOC_SINGLE_EXT("MultiMedia4", MSM_BACKEND_DAI_MI2S_RX, + MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), +}; + static const struct snd_kcontrol_new hdmi_mixer_controls[] = { SOC_SINGLE_EXT("MultiMedia1", MSM_BACKEND_DAI_HDMI_RX, MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer, @@ -683,6 +754,15 @@ static const struct snd_kcontrol_new hdmi_mixer_controls[] = { MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), }; + /* incall music delivery mixer */ +static const struct snd_kcontrol_new incall_music_delivery_mixer_controls[] = { + SOC_SINGLE_EXT("MultiMedia1", MSM_BACKEND_DAI_VOICE_PLAYBACK_TX, + MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), + SOC_SINGLE_EXT("MultiMedia2", MSM_BACKEND_DAI_VOICE_PLAYBACK_TX, + MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), +}; static const struct snd_kcontrol_new int_bt_sco_rx_mixer_controls[] = { SOC_SINGLE_EXT("MultiMedia1", MSM_BACKEND_DAI_INT_BT_SCO_RX, @@ -763,6 +843,12 @@ static const struct snd_kcontrol_new mmul1_mixer_controls[] = { SOC_SINGLE_EXT("AFE_PCM_TX", MSM_BACKEND_DAI_AFE_PCM_TX, MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), + SOC_SINGLE_EXT("VOC_REC_DL", MSM_BACKEND_DAI_INCALL_RECORD_RX, + MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), + SOC_SINGLE_EXT("VOC_REC_UL", MSM_BACKEND_DAI_INCALL_RECORD_TX, + MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), }; static const struct snd_kcontrol_new mmul2_mixer_controls[] = { @@ -780,6 +866,15 @@ static const struct snd_kcontrol_new pri_rx_voice_mixer_controls[] = { msm_routing_put_voice_mixer), }; +static const struct snd_kcontrol_new sec_i2s_rx_voice_mixer_controls[] = { + SOC_SINGLE_EXT("CSVoice", MSM_BACKEND_DAI_SEC_I2S_RX, + MSM_FRONTEND_DAI_CS_VOICE, 1, 0, msm_routing_get_voice_mixer, + msm_routing_put_voice_mixer), + SOC_SINGLE_EXT("Voip", MSM_BACKEND_DAI_SEC_I2S_RX, + MSM_FRONTEND_DAI_VOIP, 1, 0, msm_routing_get_voice_mixer, + msm_routing_put_voice_mixer), +}; + static const struct snd_kcontrol_new slimbus_rx_voice_mixer_controls[] = { SOC_SINGLE_EXT("CSVoice", MSM_BACKEND_DAI_SLIMBUS_0_RX, MSM_FRONTEND_DAI_CS_VOICE, 1, 0, msm_routing_get_voice_mixer, @@ -868,6 +963,18 @@ static const struct snd_kcontrol_new sbus_0_rx_port_mixer_controls[] = { SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_RX, MSM_BACKEND_DAI_SLIMBUS_0_TX, 1, 0, msm_routing_get_port_mixer, msm_routing_put_port_mixer), + SOC_SINGLE_EXT("AUX_PCM_UL_TX", MSM_BACKEND_DAI_SLIMBUS_0_RX, + MSM_BACKEND_DAI_AUXPCM_TX, 1, 0, msm_routing_get_port_mixer, + msm_routing_put_port_mixer), +}; + +static const struct snd_kcontrol_new auxpcm_rx_port_mixer_controls[] = { + SOC_SINGLE_EXT("AUX_PCM_UL_TX", MSM_BACKEND_DAI_AUXPCM_RX, + MSM_BACKEND_DAI_AUXPCM_TX, 1, 0, msm_routing_get_port_mixer, + msm_routing_put_port_mixer), + SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_AUXPCM_RX, + MSM_BACKEND_DAI_SLIMBUS_0_TX, 1, 0, msm_routing_get_port_mixer, + msm_routing_put_port_mixer), }; static const struct snd_kcontrol_new fm_switch_mixer_controls = @@ -1084,12 +1191,21 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { 0, 0, 0, 0), SND_SOC_DAPM_AIF_OUT("INTFM_UL_HL", "INT_FM_HOSTLESS Capture", 0, 0, 0, 0), + SND_SOC_DAPM_AIF_IN("HDMI_DL_HL", "HDMI_HOSTLESS Playback", 0, 0, 0, 0), + SND_SOC_DAPM_AIF_IN("AUXPCM_DL_HL", "AUXPCM_HOSTLESS Playback", + 0, 0, 0, 0), + SND_SOC_DAPM_AIF_OUT("AUXPCM_UL_HL", "AUXPCM_HOSTLESS Capture", + 0, 0, 0, 0), + /* Backend AIF */ /* Stream name equals to backend dai link stream name */ SND_SOC_DAPM_AIF_OUT("PRI_I2S_RX", "Primary I2S Playback", 0, 0, 0, 0), + SND_SOC_DAPM_AIF_OUT("SEC_I2S_RX", "Secondary I2S Playback", + 0, 0, 0 , 0), SND_SOC_DAPM_AIF_OUT("SLIMBUS_0_RX", "Slimbus Playback", 0, 0, 0, 0), SND_SOC_DAPM_AIF_OUT("HDMI", "HDMI Playback", 0, 0, 0 , 0), + SND_SOC_DAPM_AIF_OUT("MI2S_RX", "MI2S Playback", 0, 0, 0, 0), SND_SOC_DAPM_AIF_IN("PRI_I2S_TX", "Primary I2S Capture", 0, 0, 0, 0), SND_SOC_DAPM_AIF_IN("SLIMBUS_0_TX", "Slimbus Capture", 0, 0, 0, 0), SND_SOC_DAPM_AIF_OUT("INT_BT_SCO_RX", "Internal BT-SCO Playback", @@ -1103,6 +1219,13 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { SND_SOC_DAPM_AIF_OUT("PCM_RX", "AFE Playback", 0, 0, 0 , 0), SND_SOC_DAPM_AIF_IN("PCM_TX", "AFE Capture", + 0, 0, 0 , 0), + /* incall */ + SND_SOC_DAPM_AIF_OUT("VOICE_PLAYBACK_TX", "Voice Farend Playback", + 0, 0, 0 , 0), + SND_SOC_DAPM_AIF_IN("INCALL_RECORD_TX", "Voice Uplink Capture", + 0, 0, 0, 0), + SND_SOC_DAPM_AIF_IN("INCALL_RECORD_RX", "Voice Downlink Capture", 0, 0, 0, 0), SND_SOC_DAPM_AIF_OUT("AUX_PCM_RX", "AUX PCM Playback", 0, 0, 0, 0), SND_SOC_DAPM_AIF_IN("AUX_PCM_TX", "AUX PCM Capture", 0, 0, 0, 0), @@ -1112,20 +1235,32 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { /* Mixer definitions */ SND_SOC_DAPM_MIXER("PRI_RX Audio Mixer", SND_SOC_NOPM, 0, 0, pri_i2s_rx_mixer_controls, ARRAY_SIZE(pri_i2s_rx_mixer_controls)), + SND_SOC_DAPM_MIXER("SEC_RX Audio Mixer", SND_SOC_NOPM, 0, 0, + sec_i2s_rx_mixer_controls, ARRAY_SIZE(sec_i2s_rx_mixer_controls)), SND_SOC_DAPM_MIXER("SLIMBUS_0_RX Audio Mixer", SND_SOC_NOPM, 0, 0, slimbus_rx_mixer_controls, ARRAY_SIZE(slimbus_rx_mixer_controls)), SND_SOC_DAPM_MIXER("HDMI Mixer", SND_SOC_NOPM, 0, 0, hdmi_mixer_controls, ARRAY_SIZE(hdmi_mixer_controls)), + SND_SOC_DAPM_MIXER("MI2S_RX Audio Mixer", SND_SOC_NOPM, 0, 0, + mi2s_rx_mixer_controls, ARRAY_SIZE(mi2s_rx_mixer_controls)), SND_SOC_DAPM_MIXER("MultiMedia1 Mixer", SND_SOC_NOPM, 0, 0, mmul1_mixer_controls, ARRAY_SIZE(mmul1_mixer_controls)), SND_SOC_DAPM_MIXER("MultiMedia2 Mixer", SND_SOC_NOPM, 0, 0, mmul2_mixer_controls, ARRAY_SIZE(mmul2_mixer_controls)), SND_SOC_DAPM_MIXER("AUX_PCM_RX Audio Mixer", SND_SOC_NOPM, 0, 0, auxpcm_rx_mixer_controls, ARRAY_SIZE(auxpcm_rx_mixer_controls)), + /* incall */ + SND_SOC_DAPM_MIXER("Incall_Music Audio Mixer", SND_SOC_NOPM, 0, 0, + incall_music_delivery_mixer_controls, + ARRAY_SIZE(incall_music_delivery_mixer_controls)), /* Voice Mixer */ SND_SOC_DAPM_MIXER("PRI_RX_Voice Mixer", SND_SOC_NOPM, 0, 0, pri_rx_voice_mixer_controls, ARRAY_SIZE(pri_rx_voice_mixer_controls)), + SND_SOC_DAPM_MIXER("SEC_RX_Voice Mixer", + SND_SOC_NOPM, 0, 0, + sec_i2s_rx_voice_mixer_controls, + ARRAY_SIZE(sec_i2s_rx_voice_mixer_controls)), SND_SOC_DAPM_MIXER("SLIM_0_RX_Voice Mixer", SND_SOC_NOPM, 0, 0, slimbus_rx_voice_mixer_controls, @@ -1161,6 +1296,9 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { SND_SOC_DAPM_MIXER("SLIMBUS_0_RX Port Mixer", SND_SOC_NOPM, 0, 0, sbus_0_rx_port_mixer_controls, ARRAY_SIZE(sbus_0_rx_port_mixer_controls)), + SND_SOC_DAPM_MIXER("AUXPCM_RX Port Mixer", + SND_SOC_NOPM, 0, 0, auxpcm_rx_port_mixer_controls, + ARRAY_SIZE(auxpcm_rx_port_mixer_controls)), }; static const struct snd_soc_dapm_route intercon[] = { @@ -1170,6 +1308,12 @@ static const struct snd_soc_dapm_route intercon[] = { {"PRI_RX Audio Mixer", "MultiMedia4", "MM_DL4"}, {"PRI_I2S_RX", NULL, "PRI_RX Audio Mixer"}, + {"SEC_RX Audio Mixer", "MultiMedia1", "MM_DL1"}, + {"SEC_RX Audio Mixer", "MultiMedia2", "MM_DL2"}, + {"SEC_RX Audio Mixer", "MultiMedia3", "MM_DL3"}, + {"SEC_RX Audio Mixer", "MultiMedia4", "MM_DL4"}, + {"SEC_I2S_RX", NULL, "SEC_RX Audio Mixer"}, + {"SLIMBUS_0_RX Audio Mixer", "MultiMedia1", "MM_DL1"}, {"SLIMBUS_0_RX Audio Mixer", "MultiMedia2", "MM_DL2"}, {"SLIMBUS_0_RX Audio Mixer", "MultiMedia3", "MM_DL3"}, @@ -1182,6 +1326,19 @@ static const struct snd_soc_dapm_route intercon[] = { {"HDMI Mixer", "MultiMedia4", "MM_DL4"}, {"HDMI", NULL, "HDMI Mixer"}, + /* incall */ + {"Incall_Music Audio Mixer", "MultiMedia1", "MM_DL1"}, + {"Incall_Music Audio Mixer", "MultiMedia2", "MM_DL2"}, + {"VOICE_PLAYBACK_TX", NULL, "Incall_Music Audio Mixer"}, + + {"MultiMedia1 Mixer", "VOC_REC_UL", "INCALL_RECORD_TX"}, + {"MultiMedia1 Mixer", "VOC_REC_DL", "INCALL_RECORD_RX"}, + {"MI2S_RX Audio Mixer", "MultiMedia1", "MM_DL1"}, + {"MI2S_RX Audio Mixer", "MultiMedia2", "MM_DL2"}, + {"MI2S_RX Audio Mixer", "MultiMedia3", "MM_DL3"}, + {"MI2S_RX Audio Mixer", "MultiMedia4", "MM_DL4"}, + {"MI2S_RX", NULL, "MI2S_RX Audio Mixer"}, + {"MultiMedia1 Mixer", "PRI_TX", "PRI_I2S_TX"}, {"MultiMedia1 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"}, {"MultiMedia1 Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"}, @@ -1222,6 +1379,10 @@ static const struct snd_soc_dapm_route intercon[] = { {"PRI_RX_Voice Mixer", "Voip", "VOIP_DL"}, {"PRI_I2S_RX", NULL, "PRI_RX_Voice Mixer"}, + {"SEC_RX_Voice Mixer", "CSVoice", "CS-VOICE_DL1"}, + {"SEC_RX_Voice Mixer", "Voip", "VOIP_DL"}, + {"SEC_I2S_RX", NULL, "SEC_RX_Voice Mixer"}, + {"SLIM_0_RX_Voice Mixer", "CSVoice", "CS-VOICE_DL1"}, {"SLIM_0_RX_Voice Mixer", "Voip", "VOIP_DL"}, {"SLIMBUS_0_RX", NULL, "SLIM_0_RX_Voice Mixer"}, @@ -1241,6 +1402,7 @@ static const struct snd_soc_dapm_route intercon[] = { {"HDMI_RX_Voice Mixer", "CSVoice", "CS-VOICE_DL1"}, {"HDMI_RX_Voice Mixer", "Voip", "VOIP_DL"}, {"HDMI", NULL, "HDMI_RX_Voice Mixer"}, + {"HDMI", NULL, "HDMI_DL_HL"}, {"Voice_Tx Mixer", "PRI_TX_Voice", "PRI_I2S_TX"}, {"Voice_Tx Mixer", "SLIM_0_TX_Voice", "SLIMBUS_0_TX"}, @@ -1260,9 +1422,16 @@ static const struct snd_soc_dapm_route intercon[] = { {"SLIM0_UL_HL", NULL, "SLIMBUS_0_TX"}, {"INT_FM_RX", NULL, "INTFM_DL_HL"}, {"INTFM_UL_HL", NULL, "INT_FM_TX"}, + {"AUX_PCM_RX", NULL, "AUXPCM_DL_HL"}, + {"AUXPCM_UL_HL", NULL, "AUX_PCM_TX"}, {"SLIMBUS_0_RX Port Mixer", "INTERNAL_FM_TX", "INT_FM_TX"}, {"SLIMBUS_0_RX Port Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"}, + {"SLIMBUS_0_RX Port Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"}, {"SLIMBUS_0_RX", NULL, "SLIMBUS_0_RX Port Mixer"}, + + {"AUXPCM_RX Port Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"}, + {"AUXPCM_RX Port Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"}, + {"AUX_PCM_RX", NULL, "AUXPCM_RX Port Mixer"}, }; static int msm_pcm_routing_hw_params(struct snd_pcm_substream *substream, @@ -1301,7 +1470,7 @@ static int msm_pcm_routing_close(struct snd_pcm_substream *substream) mutex_lock(&routing_lock); - for_each_set_bit(i, &bedai->fe_sessions, MSM_FRONTEND_DAI_MM_MAX_ID) { + for_each_set_bit(i, &bedai->fe_sessions, MSM_FRONTEND_DAI_MM_SIZE) { if (fe_dai_map[i][session_type] != INVALID_SESSION) adm_close(bedai->port_id); } @@ -1320,6 +1489,7 @@ static int msm_pcm_routing_prepare(struct snd_pcm_substream *substream) unsigned int be_id = rtd->dai_link->be_id; int i, path_type, session_type; struct msm_pcm_routing_bdai_data *bedai; + u32 channels; if (be_id >= MSM_BACKEND_DAI_MAX) { pr_err("%s: unexpected be_id %d\n", __func__, be_id); @@ -1355,12 +1525,24 @@ static int msm_pcm_routing_prepare(struct snd_pcm_substream *substream) */ bedai->active = 1; - for_each_set_bit(i, &bedai->fe_sessions, MSM_FRONTEND_DAI_MM_MAX_ID) { + for_each_set_bit(i, &bedai->fe_sessions, MSM_FRONTEND_DAI_MM_SIZE) { if (fe_dai_map[i][session_type] != INVALID_SESSION) { - adm_open(bedai->port_id, path_type, + + channels = params_channels(bedai->hw_params); + if ((substream->stream == SNDRV_PCM_STREAM_PLAYBACK) && + (channels > 2)) + adm_multi_ch_copp_open(bedai->port_id, + path_type, + params_rate(bedai->hw_params), + channels, + DEFAULT_COPP_TOPOLOGY); + else + adm_open(bedai->port_id, + path_type, params_rate(bedai->hw_params), params_channels(bedai->hw_params), DEFAULT_COPP_TOPOLOGY); + msm_pcm_routing_build_matrix(i, fe_dai_map[i][session_type], path_type); } @@ -1454,6 +1636,23 @@ static struct platform_driver msm_routing_pcm_driver = { .remove = __devexit_p(msm_routing_pcm_remove), }; +int msm_routing_check_backend_enabled(int fedai_id) +{ + int i; + if (fedai_id >= MSM_FRONTEND_DAI_MM_MAX_ID) { + /* bad ID assigned in machine driver */ + pr_err("%s: bad MM ID\n", __func__); + return 0; + } + for (i = 0; i < MSM_BACKEND_DAI_MAX; i++) { + if ((test_bit(fedai_id, + &msm_bedais[i].fe_sessions))) { + return msm_bedais[i].active; + } + } + return 0; +} + static int __init msm_soc_routing_platform_init(void) { mutex_init(&routing_lock); diff --git a/sound/soc/msm/msm-pcm-routing.h b/sound/soc/msm/msm-pcm-routing.h index b3a8210f3..5a93796a1 100755 --- a/sound/soc/msm/msm-pcm-routing.h +++ b/sound/soc/msm/msm-pcm-routing.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -26,6 +26,12 @@ #define LPASS_BE_AFE_PCM_TX "(Backend) RT_PROXY_DAI_002_TX" #define LPASS_BE_AUXPCM_RX "(Backend) AUX_PCM_RX" #define LPASS_BE_AUXPCM_TX "(Backend) AUX_PCM_TX" +#define LPASS_BE_VOICE_PLAYBACK_TX "(Backend) VOICE_PLAYBACK_TX" +#define LPASS_BE_INCALL_RECORD_RX "(Backend) INCALL_RECORD_TX" +#define LPASS_BE_INCALL_RECORD_TX "(Backend) INCALL_RECORD_RX" +#define LPASS_BE_SEC_I2S_RX "(Backend) SECONDARY_I2S_RX" + +#define LPASS_BE_MI2S_RX "(Backend) MI2S_RX" /* For multimedia front-ends, asm session is allocated dynamically. * Hence, asm session/multimedia front-end mapping has to be maintained. @@ -62,6 +68,11 @@ enum { MSM_BACKEND_DAI_AFE_PCM_TX, MSM_BACKEND_DAI_AUXPCM_RX, MSM_BACKEND_DAI_AUXPCM_TX, + MSM_BACKEND_DAI_VOICE_PLAYBACK_TX, + MSM_BACKEND_DAI_INCALL_RECORD_RX, + MSM_BACKEND_DAI_INCALL_RECORD_TX, + MSM_BACKEND_DAI_MI2S_RX, + MSM_BACKEND_DAI_SEC_I2S_RX, MSM_BACKEND_DAI_MAX, }; @@ -74,4 +85,6 @@ void msm_pcm_routing_reg_phy_stream(int fedai_id, int dspst_id, void msm_pcm_routing_dereg_phy_stream(int fedai_id, int stream_type); int lpa_set_volume(unsigned volume); + +int msm_routing_check_backend_enabled(int fedai_id); #endif /*_MSM_PCM_H*/ diff --git a/sound/soc/msm/msm-pcm-voice.c b/sound/soc/msm/msm-pcm-voice.c index 5b5050987..eafe0f92d 100755 --- a/sound/soc/msm/msm-pcm-voice.c +++ b/sound/soc/msm/msm-pcm-voice.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -270,8 +270,8 @@ static int msm_voice_slowtalk_put(struct snd_kcontrol *kcontrol, pr_debug("%s: st enable=%d\n", __func__, st_enable); - voc_set_slowtalk_enable(voc_get_session_id(VOICE_SESSION_NAME), - st_enable); + voc_set_pp_enable(voc_get_session_id(VOICE_SESSION_NAME), + MODULE_ID_VOICE_MODULE_ST, st_enable); return 0; } @@ -280,7 +280,30 @@ static int msm_voice_slowtalk_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { ucontrol->value.integer.value[0] = - voc_get_slowtalk_enable(voc_get_session_id(VOICE_SESSION_NAME)); + voc_get_pp_enable(voc_get_session_id(VOICE_SESSION_NAME), + MODULE_ID_VOICE_MODULE_ST); + return 0; +} + +static int msm_voice_fens_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + int fens_enable = ucontrol->value.integer.value[0]; + + pr_debug("%s: fens enable=%d\n", __func__, fens_enable); + + voc_set_pp_enable(voc_get_session_id(VOICE_SESSION_NAME), + MODULE_ID_VOICE_MODULE_FENS, fens_enable); + + return 0; +} + +static int msm_voice_fens_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + ucontrol->value.integer.value[0] = + voc_get_pp_enable(voc_get_session_id(VOICE_SESSION_NAME), + MODULE_ID_VOICE_MODULE_FENS); return 0; } @@ -295,6 +318,8 @@ static struct snd_kcontrol_new msm_voice_controls[] = { msm_voice_widevoice_get, msm_voice_widevoice_put), SOC_SINGLE_EXT("Slowtalk Enable", SND_SOC_NOPM, 0, 1, 0, msm_voice_slowtalk_get, msm_voice_slowtalk_put), + SOC_SINGLE_EXT("FENS Enable", SND_SOC_NOPM, 0, 1, 0, + msm_voice_fens_get, msm_voice_fens_put), }; static struct snd_pcm_ops msm_pcm_ops = { diff --git a/sound/soc/msm/msm-pcm-voice.h b/sound/soc/msm/msm-pcm-voice.h old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm-pcm-voip.c b/sound/soc/msm/msm-pcm-voip.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm-pcm.c b/sound/soc/msm/msm-pcm.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm-pcm.h b/sound/soc/msm/msm-pcm.h old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm-voip.c b/sound/soc/msm/msm-voip.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm7201.c b/sound/soc/msm/msm7201.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm7k-pcm.c b/sound/soc/msm/msm7k-pcm.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm7kv2-dai.c b/sound/soc/msm/msm7kv2-dai.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm7kv2-dsp.c b/sound/soc/msm/msm7kv2-dsp.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm7kv2-pcm.c b/sound/soc/msm/msm7kv2-pcm.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm7kv2-pcm.h b/sound/soc/msm/msm7kv2-pcm.h old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm7x30.c b/sound/soc/msm/msm7x30.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm8660-apq-wm8903.c b/sound/soc/msm/msm8660-apq-wm8903.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm8660.c b/sound/soc/msm/msm8660.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm8960.c b/sound/soc/msm/msm8960.c index bfc004e79..1ed73e2ef 100755 --- a/sound/soc/msm/msm8960.c +++ b/sound/soc/msm/msm8960.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -24,6 +25,7 @@ #include #include #include +#include #include "msm-pcm-routing.h" #include "../codecs/wcd9310.h" @@ -51,6 +53,11 @@ #define GPIO_AUX_PCM_SYNC 65 #define GPIO_AUX_PCM_CLK 66 +#define TABLA_EXT_CLK_RATE 12288000 + +#define TABLA_MBHC_DEF_BUTTONS 8 +#define TABLA_MBHC_DEF_RLOADS 5 + static u32 top_spk_pamp_gpio = PM8921_GPIO_PM_TO_SYS(18); static u32 bottom_spk_pamp_gpio = PM8921_GPIO_PM_TO_SYS(19); static int msm8960_spk_control; @@ -62,17 +69,6 @@ static int msm8960_slim_0_tx_ch = 1; static int msm8960_btsco_rate = BTSCO_RATE_8KHZ; static int msm8960_btsco_ch = 1; -struct tabla_mbhc_calibration tabla_cal = { - .bias = TABLA_MICBIAS2, - .tldoh = 100, - .bg_fast_settle = 100, - .mic_current = TABLA_PID_MIC_5_UA, - .mic_pid = 100, - .hph_current = TABLA_PID_MIC_5_UA, - .setup_plug_removal_delay = 1000000, - .shutdown_plug_removal = 100000, -}; - static struct clk *codec_clk; static int clk_users; @@ -81,6 +77,8 @@ static int msm8960_headset_gpios_configured; static struct snd_soc_jack hs_jack; static struct snd_soc_jack button_jack; +static void *tabla_mbhc_cal; + static void msm8960_enable_ext_spk_amp_gpio(u32 spk_amp_gpio) { int ret = 0; @@ -301,51 +299,52 @@ static int msm8960_spkramp_event(struct snd_soc_dapm_widget *w, } return 0; } - -static int msm8960_mclk_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event) +int msm8960_enable_codec_ext_clk( + struct snd_soc_codec *codec, int enable) { - pr_debug("%s: event = %d\n", __func__, event); - - switch (event) { - case SND_SOC_DAPM_PRE_PMU: - + pr_debug("%s: enable = %d\n", __func__, enable); + if (enable) { clk_users++; pr_debug("%s: clk_users = %d\n", __func__, clk_users); - if (clk_users != 1) return 0; codec_clk = clk_get(NULL, "i2s_spkr_osr_clk"); if (codec_clk) { - clk_set_rate(codec_clk, 12288000); + clk_set_rate(codec_clk, TABLA_EXT_CLK_RATE); clk_enable(codec_clk); - tabla_mclk_enable(w->codec, 1); - + tabla_mclk_enable(codec, 1); } else { pr_err("%s: Error setting Tabla MCLK\n", __func__); clk_users--; return -EINVAL; } - break; - case SND_SOC_DAPM_POST_PMD: - + } else { pr_debug("%s: clk_users = %d\n", __func__, clk_users); - if (clk_users == 0) return 0; - clk_users--; - if (!clk_users) { pr_debug("%s: disabling MCLK. clk_users = %d\n", - __func__, clk_users); - + __func__, clk_users); clk_disable(codec_clk); clk_put(codec_clk); - tabla_mclk_enable(w->codec, 0); + tabla_mclk_enable(codec, 0); } - break; + } + return 0; +} + +static int msm8960_mclk_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + pr_debug("%s: event = %d\n", __func__, event); + + switch (event) { + case SND_SOC_DAPM_PRE_PMU: + return msm8960_enable_codec_ext_clk(w->codec, 1); + case SND_SOC_DAPM_POST_PMD: + return msm8960_enable_codec_ext_clk(w->codec, 0); } return 0; } @@ -480,7 +479,7 @@ static int msm8960_slim_0_rx_ch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { pr_debug("%s: msm8960_slim_0_rx_ch = %d\n", __func__, - msm8960_slim_0_rx_ch); + msm8960_slim_0_rx_ch); ucontrol->value.integer.value[0] = msm8960_slim_0_rx_ch - 1; return 0; } @@ -491,7 +490,7 @@ static int msm8960_slim_0_rx_ch_put(struct snd_kcontrol *kcontrol, msm8960_slim_0_rx_ch = ucontrol->value.integer.value[0] + 1; pr_debug("%s: msm8960_slim_0_rx_ch = %d\n", __func__, - msm8960_slim_0_rx_ch); + msm8960_slim_0_rx_ch); return 1; } @@ -499,7 +498,7 @@ static int msm8960_slim_0_tx_ch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { pr_debug("%s: msm8960_slim_0_tx_ch = %d\n", __func__, - msm8960_slim_0_tx_ch); + msm8960_slim_0_tx_ch); ucontrol->value.integer.value[0] = msm8960_slim_0_tx_ch - 1; return 0; } @@ -510,15 +509,14 @@ static int msm8960_slim_0_tx_ch_put(struct snd_kcontrol *kcontrol, msm8960_slim_0_tx_ch = ucontrol->value.integer.value[0] + 1; pr_debug("%s: msm8960_slim_0_tx_ch = %d\n", __func__, - msm8960_slim_0_tx_ch); + msm8960_slim_0_tx_ch); return 1; } static int msm8960_btsco_rate_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - pr_debug("%s: msm8960_btsco_rate = %d", __func__, - msm8960_btsco_rate); + pr_debug("%s: msm8960_btsco_rate = %d", __func__, msm8960_btsco_rate); ucontrol->value.integer.value[0] = msm8960_btsco_rate; return 0; } @@ -537,8 +535,7 @@ static int msm8960_btsco_rate_put(struct snd_kcontrol *kcontrol, msm8960_btsco_rate = BTSCO_RATE_8KHZ; break; } - pr_debug("%s: msm8960_btsco_rate = %d\n", __func__, - msm8960_btsco_rate); + pr_debug("%s: msm8960_btsco_rate = %d\n", __func__, msm8960_btsco_rate); return 0; } @@ -569,6 +566,83 @@ static int msm8960_btsco_init(struct snd_soc_pcm_runtime *rtd) return 0; } +static void *def_tabla_mbhc_cal(void) +{ + void *tabla_cal; + struct tabla_mbhc_btn_detect_cfg *btn_cfg; + u16 *btn_low, *btn_high; + u8 *n_ready, *n_cic, *gain; + + tabla_cal = kzalloc(TABLA_MBHC_CAL_SIZE(TABLA_MBHC_DEF_BUTTONS, + TABLA_MBHC_DEF_RLOADS), + GFP_KERNEL); + if (!tabla_cal) { + pr_err("%s: out of memory\n", __func__); + return NULL; + } + +#define S(X, Y) ((TABLA_MBHC_CAL_GENERAL_PTR(tabla_cal)->X) = (Y)) + S(t_ldoh, 100); + S(t_bg_fast_settle, 100); + S(t_shutdown_plug_rem, 255); + S(mbhc_nsa, 4); + S(mbhc_navg, 4); +#undef S +#define S(X, Y) ((TABLA_MBHC_CAL_PLUG_DET_PTR(tabla_cal)->X) = (Y)) + S(mic_current, TABLA_PID_MIC_5_UA); + S(hph_current, TABLA_PID_MIC_5_UA); + S(t_mic_pid, 100); + S(t_ins_complete, 250); + S(t_ins_retry, 200); +#undef S +#define S(X, Y) ((TABLA_MBHC_CAL_PLUG_TYPE_PTR(tabla_cal)->X) = (Y)) + S(v_no_mic, 30); + S(v_hs_max, 1550); +#undef S +#define S(X, Y) ((TABLA_MBHC_CAL_BTN_DET_PTR(tabla_cal)->X) = (Y)) + S(c[0], 62); + S(c[1], 124); + S(nc, 1); + S(n_meas, 3); + S(mbhc_nsc, 11); + S(n_btn_meas, 1); + S(n_btn_con, 2); + S(num_btn, TABLA_MBHC_DEF_BUTTONS); + S(v_btn_press_delta_sta, 100); + S(v_btn_press_delta_cic, 50); +#undef S + btn_cfg = TABLA_MBHC_CAL_BTN_DET_PTR(tabla_cal); + btn_low = tabla_mbhc_cal_btn_det_mp(btn_cfg, TABLA_BTN_DET_V_BTN_LOW); + btn_high = tabla_mbhc_cal_btn_det_mp(btn_cfg, TABLA_BTN_DET_V_BTN_HIGH); + btn_low[0] = -50; + btn_high[0] = 10; + btn_low[1] = 11; + btn_high[1] = 38; + btn_low[2] = 39; + btn_high[2] = 64; + btn_low[3] = 65; + btn_high[3] = 91; + btn_low[4] = 92; + btn_high[4] = 115; + btn_low[5] = 116; + btn_high[5] = 141; + btn_low[6] = 142; + btn_high[6] = 163; + btn_low[7] = 164; + btn_high[7] = 250; + n_ready = tabla_mbhc_cal_btn_det_mp(btn_cfg, TABLA_BTN_DET_N_READY); + n_ready[0] = 48; + n_ready[1] = 38; + n_cic = tabla_mbhc_cal_btn_det_mp(btn_cfg, TABLA_BTN_DET_N_CIC); + n_cic[0] = 60; + n_cic[1] = 47; + gain = tabla_mbhc_cal_btn_det_mp(btn_cfg, TABLA_BTN_DET_GAIN); + gain[0] = 11; + gain[1] = 9; + + return tabla_cal; +} + static int msm8960_audrx_init(struct snd_soc_pcm_runtime *rtd) { int err; @@ -603,21 +677,24 @@ static int msm8960_audrx_init(struct snd_soc_pcm_runtime *rtd) snd_soc_dapm_sync(dapm); err = snd_soc_jack_new(codec, "Headset Jack", - (SND_JACK_HEADSET | SND_JACK_OC_HPHL | SND_JACK_OC_HPHR), - &hs_jack); + (SND_JACK_HEADSET | SND_JACK_OC_HPHL | + SND_JACK_OC_HPHR), + &hs_jack); if (err) { pr_err("failed to create new jack\n"); return err; } err = snd_soc_jack_new(codec, "Button Jack", - SND_JACK_BTN_0, &button_jack); + TABLA_JACK_BUTTON_MASK, &button_jack); if (err) { pr_err("failed to create new jack\n"); return err; } - tabla_hs_detect(codec, &hs_jack, &button_jack, &tabla_cal); + tabla_hs_detect(codec, &hs_jack, &button_jack, tabla_mbhc_cal, + TABLA_MICBIAS2, msm8960_enable_codec_ext_clk, 0, + TABLA_EXT_CLK_RATE); return 0; } @@ -639,7 +716,8 @@ static struct snd_soc_dsp_link fe_media = { }, }; -static struct snd_soc_dsp_link slimbus0_hl_media = { +/* bi-directional media definition for hostless PCM device */ +static struct snd_soc_dsp_link bidir_hl_media = { .playback = true, .capture = true, .trigger = { @@ -648,9 +726,8 @@ static struct snd_soc_dsp_link slimbus0_hl_media = { }, }; -static struct snd_soc_dsp_link int_fm_hl_media = { +static struct snd_soc_dsp_link hdmi_rx_hl = { .playback = true, - .capture = true, .trigger = { SND_SOC_DSP_TRIGGER_POST, SND_SOC_DSP_TRIGGER_POST @@ -701,6 +778,23 @@ static int msm8960_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, return 0; } +static int msm8960_hdmi_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, + struct snd_pcm_hw_params *params) +{ + struct snd_interval *rate = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_RATE); + + struct snd_interval *channels = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_CHANNELS); + + pr_debug("%s channels->min %u channels->max %u ()\n", __func__, + channels->min, channels->max); + + rate->min = rate->max = 48000; + + return 0; +} + static int msm8960_btsco_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) { @@ -844,7 +938,7 @@ static struct snd_soc_dai_link msm8960_dai[] = { .name = "MSM8960 Media2", .stream_name = "MultiMedia2", .cpu_dai_name = "MultiMedia2", - .platform_name = "msm-pcm-dsp", + .platform_name = "msm-multi-ch-pcm-dsp", .dynamic = 1, .dsp_link = &fe_media, .be_id = MSM_FRONTEND_DAI_MULTIMEDIA2, @@ -885,7 +979,7 @@ static struct snd_soc_dai_link msm8960_dai[] = { .cpu_dai_name = "SLIMBUS0_HOSTLESS", .platform_name = "msm-pcm-hostless", .dynamic = 1, - .dsp_link = &slimbus0_hl_media, + .dsp_link = &bidir_hl_media, .no_host_mode = SND_SOC_DAI_LINK_NO_HOST, .ignore_suspend = 1, /* .be_id = do not care */ @@ -896,7 +990,7 @@ static struct snd_soc_dai_link msm8960_dai[] = { .cpu_dai_name = "INT_FM_HOSTLESS", .platform_name = "msm-pcm-hostless", .dynamic = 1, - .dsp_link = &int_fm_hl_media, + .dsp_link = &bidir_hl_media, .no_host_mode = SND_SOC_DAI_LINK_NO_HOST, .ignore_suspend = 1, /* .be_id = do not care */ @@ -928,6 +1022,28 @@ static struct snd_soc_dai_link msm8960_dai[] = { .dsp_link = &lpa_fe_media, .be_id = MSM_FRONTEND_DAI_MULTIMEDIA4, }, + { + .name = "AUXPCM Hostless", + .stream_name = "AUXPCM Hostless", + .cpu_dai_name = "AUXPCM_HOSTLESS", + .platform_name = "msm-pcm-hostless", + .dynamic = 1, + .dsp_link = &bidir_hl_media, + .no_host_mode = SND_SOC_DAI_LINK_NO_HOST, + .ignore_suspend = 1, + }, + /* HDMI Hostless */ + { + .name = "HDMI_RX_HOSTLESS", + .stream_name = "HDMI_RX_HOSTLESS", + .cpu_dai_name = "HDMI_HOSTLESS", + .platform_name = "msm-pcm-hostless", + .dynamic = 1, + .dsp_link = &hdmi_rx_hl, + .no_host_mode = SND_SOC_DAI_LINK_NO_HOST, + .no_codec = 1, + .ignore_suspend = 1, + }, /* Backend DAI Links */ { .name = LPASS_BE_SLIMBUS_0_RX, @@ -1004,14 +1120,14 @@ static struct snd_soc_dai_link msm8960_dai[] = { { .name = LPASS_BE_HDMI, .stream_name = "HDMI Playback", - .cpu_dai_name = "msm-dai-q6.8", + .cpu_dai_name = "msm-dai-q6-hdmi.8", .platform_name = "msm-pcm-routing", .codec_name = "msm-stub-codec.1", .codec_dai_name = "msm-stub-rx", .no_pcm = 1, .no_codec = 1, .be_id = MSM_BACKEND_DAI_HDMI_RX, - .be_hw_params_fixup = msm8960_be_hw_params_fixup, + .be_hw_params_fixup = msm8960_hdmi_be_hw_params_fixup, }, /* Backend AFE DAI Links */ { @@ -1060,6 +1176,45 @@ static struct snd_soc_dai_link msm8960_dai[] = { .be_id = MSM_BACKEND_DAI_AUXPCM_TX, .be_hw_params_fixup = msm8960_auxpcm_be_params_fixup, }, + /* Incall Music BACK END DAI Link */ + { + .name = LPASS_BE_VOICE_PLAYBACK_TX, + .stream_name = "Voice Farend Playback", + .cpu_dai_name = "msm-dai-q6.32773", + .platform_name = "msm-pcm-routing", + .codec_name = "msm-stub-codec.1", + .codec_dai_name = "msm-stub-rx", + .no_pcm = 1, + .no_codec = 1, + .be_id = MSM_BACKEND_DAI_VOICE_PLAYBACK_TX, + .be_hw_params_fixup = msm8960_be_hw_params_fixup, + }, + /* Incall Record Uplink BACK END DAI Link */ + { + .name = LPASS_BE_INCALL_RECORD_TX, + .stream_name = "Voice Uplink Capture", + .cpu_dai_name = "msm-dai-q6.32772", + .platform_name = "msm-pcm-routing", + .codec_name = "msm-stub-codec.1", + .codec_dai_name = "msm-stub-tx", + .no_pcm = 1, + .no_codec = 1, + .be_id = MSM_BACKEND_DAI_INCALL_RECORD_TX, + .be_hw_params_fixup = msm8960_be_hw_params_fixup, + }, + /* Incall Record Downlink BACK END DAI Link */ + { + .name = LPASS_BE_INCALL_RECORD_RX, + .stream_name = "Voice Downlink Capture", + .cpu_dai_name = "msm-dai-q6.32771", + .platform_name = "msm-pcm-routing", + .codec_name = "msm-stub-codec.1", + .codec_dai_name = "msm-stub-tx", + .no_pcm = 1, + .no_codec = 1, + .be_id = MSM_BACKEND_DAI_INCALL_RECORD_RX, + .be_hw_params_fixup = msm8960_be_hw_params_fixup, + }, }; struct snd_soc_card snd_soc_card_msm8960 = { @@ -1125,9 +1280,21 @@ static int __init msm8960_audio_init(void) { int ret; + if (!cpu_is_msm8960() && !cpu_is_msm8930()) { + pr_err("%s: Not the right machine type\n", __func__); + return -ENODEV ; + } + + tabla_mbhc_cal = def_tabla_mbhc_cal(); + if (!tabla_mbhc_cal) { + pr_err("Calibration data allocation failed\n"); + return -ENOMEM; + } + msm8960_snd_device = platform_device_alloc("soc-audio", 0); if (!msm8960_snd_device) { pr_err("Platform device allocation failed\n"); + kfree(tabla_mbhc_cal); return -ENOMEM; } @@ -1135,6 +1302,7 @@ static int __init msm8960_audio_init(void) ret = platform_device_add(msm8960_snd_device); if (ret) { platform_device_put(msm8960_snd_device); + kfree(tabla_mbhc_cal); return ret; } @@ -1151,8 +1319,13 @@ module_init(msm8960_audio_init); static void __exit msm8960_audio_exit(void) { + if (!cpu_is_msm8960() && !cpu_is_msm8930()) { + pr_err("%s: Not the right machine type\n", __func__); + return ; + } msm8960_free_headset_mic_gpios(); platform_device_unregister(msm8960_snd_device); + kfree(tabla_mbhc_cal); } module_exit(msm8960_audio_exit); diff --git a/sound/soc/msm/msm8x60-dai.c b/sound/soc/msm/msm8x60-dai.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm8x60-pcm.c b/sound/soc/msm/msm8x60-pcm.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm8x60-pcm.h b/sound/soc/msm/msm8x60-pcm.h old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm8x60.c b/sound/soc/msm/msm8x60.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/msm_audio_mvs.h b/sound/soc/msm/msm_audio_mvs.h old mode 100755 new mode 100644 diff --git a/sound/soc/msm/mvs-dai.c b/sound/soc/msm/mvs-dai.c old mode 100755 new mode 100644 diff --git a/sound/soc/msm/qdsp6/Makefile b/sound/soc/msm/qdsp6/Makefile old mode 100755 new mode 100644 diff --git a/sound/soc/msm/qdsp6/q6adm.c b/sound/soc/msm/qdsp6/q6adm.c index ee6116acb..2710fbb3e 100755 --- a/sound/soc/msm/qdsp6/q6adm.c +++ b/sound/soc/msm/qdsp6/q6adm.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2010-2012, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -40,6 +40,9 @@ struct adm_ctl { wait_queue_head_t wait; }; +static struct acdb_cal_block mem_addr_audproc[MAX_AUDPROC_TYPES]; +static struct acdb_cal_block mem_addr_audvol[MAX_AUDPROC_TYPES]; + static struct adm_ctl this_adm; static int32_t adm_callback(struct apr_client_data *data, void *priv) @@ -100,7 +103,8 @@ static int32_t adm_callback(struct apr_client_data *data, void *priv) } switch (data->opcode) { - case ADM_CMDRSP_COPP_OPEN: { + case ADM_CMDRSP_COPP_OPEN: + case ADM_CMDRSP_MULTI_CHANNEL_COPP_OPEN: { struct adm_copp_open_respond *open = data->payload; if (open->copp_id == INVALID_COPP_ID) { pr_err("%s: invalid coppid rxed %d\n", @@ -130,16 +134,18 @@ static int32_t adm_callback(struct apr_client_data *data, void *priv) return 0; } -void send_cal(int port_id, struct acdb_cal_block *aud_cal) +static int send_adm_cal_block(int port_id, struct acdb_cal_block *aud_cal) { - s32 result; + s32 result = 0; struct adm_set_params_command adm_params; int index = afe_get_port_index(port_id); pr_debug("%s: Port id %d, index %d\n", __func__, port_id, index); if (!aud_cal || aud_cal->cal_size == 0) { - pr_err("%s: No calibration data to send!\n", __func__); + pr_debug("%s: No ADM cal to send for port_id = %d!\n", + __func__, port_id); + result = -EINVAL; goto done; } @@ -165,21 +171,28 @@ void send_cal(int port_id, struct acdb_cal_block *aud_cal) if (result < 0) { pr_err("%s: Set params failed port = %d payload = 0x%x\n", __func__, port_id, aud_cal->cal_paddr); + result = -EINVAL; goto done; } /* Wait for the callback */ result = wait_event_timeout(this_adm.wait, atomic_read(&this_adm.copp_stat[index]), msecs_to_jiffies(TIMEOUT_MS)); - if (!result) + if (!result) { pr_err("%s: Set params timed out port = %d, payload = 0x%x\n", __func__, port_id, aud_cal->cal_paddr); + result = -EINVAL; + goto done; + } + + result = 0; done: - return; + return result; } -void send_adm_cal(int port_id, int path) +static void send_adm_cal(int port_id, int path) { + int result = 0; s32 acdb_path; struct acdb_cal_block aud_cal; @@ -187,22 +200,62 @@ void send_adm_cal(int port_id, int path) /* Maps audio_dev_ctrl path definition to ACDB definition */ acdb_path = path - 1; - if ((acdb_path >= NUM_AUDPROC_BUFFERS) || - (acdb_path < 0)) { - pr_err("%s: Path is not RX or TX, path = %d\n", - __func__, path); - goto done; - } pr_debug("%s: Sending audproc cal\n", __func__); get_audproc_cal(acdb_path, &aud_cal); - send_cal(port_id, &aud_cal); + + /* map & cache buffers used */ + if ((mem_addr_audproc[acdb_path].cal_paddr != aud_cal.cal_paddr) && + (aud_cal.cal_size > 0)) { + if (mem_addr_audproc[acdb_path].cal_paddr != 0) + adm_memory_unmap_regions( + &mem_addr_audproc[acdb_path].cal_paddr, + &mem_addr_audproc[acdb_path].cal_size, 1); + + result = adm_memory_map_regions(&aud_cal.cal_paddr, 0, + &aud_cal.cal_size, 1); + if (result < 0) + pr_err("ADM audproc mmap did not work! path = %d, " + "addr = 0x%x, size = %d\n", acdb_path, + aud_cal.cal_paddr, aud_cal.cal_size); + else + mem_addr_audproc[acdb_path] = aud_cal; + } + + if (!send_adm_cal_block(port_id, &aud_cal)) + pr_debug("%s: Audproc cal sent for port id: %d, path %d\n", + __func__, port_id, acdb_path); + else + pr_debug("%s: Audproc cal not sent for port id: %d, path %d\n", + __func__, port_id, acdb_path); pr_debug("%s: Sending audvol cal\n", __func__); get_audvol_cal(acdb_path, &aud_cal); - send_cal(port_id, &aud_cal); -done: - return; + + /* map & cache buffers used */ + if ((mem_addr_audvol[acdb_path].cal_paddr != aud_cal.cal_paddr) && + (aud_cal.cal_size > 0)) { + if (mem_addr_audvol[acdb_path].cal_paddr != 0) + adm_memory_unmap_regions( + &mem_addr_audvol[acdb_path].cal_paddr, + &mem_addr_audvol[acdb_path].cal_size, 1); + + result = adm_memory_map_regions(&aud_cal.cal_paddr, 0, + &aud_cal.cal_size, 1); + if (result < 0) + pr_err("ADM audvol mmap did not work! path = %d, " + "addr = 0x%x, size = %d\n", acdb_path, + aud_cal.cal_paddr, aud_cal.cal_size); + else + mem_addr_audvol[acdb_path] = aud_cal; + } + + if (!send_adm_cal_block(port_id, &aud_cal)) + pr_debug("%s: Audvol cal sent for port id: %d, path %d\n", + __func__, port_id, acdb_path); + else + pr_debug("%s: Audvol cal not sent for port id: %d, path %d\n", + __func__, port_id, acdb_path); } int adm_open(int port_id, int path, int rate, int channel_mode, int topology) @@ -263,7 +316,9 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology) if ((open.topology_id == VPM_TX_SM_ECNS_COPP_TOPOLOGY) || (open.topology_id == - VPM_TX_DM_FLUENCE_COPP_TOPOLOGY)) + VPM_TX_DM_FLUENCE_COPP_TOPOLOGY) || + (open.topology_id == + VPM_TX_QMIC_FLUENCE_COPP_TOPOLOGY)) rate = 16000; } @@ -306,6 +361,133 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology) return ret; } + +int adm_multi_ch_copp_open(int port_id, int path, int rate, int channel_mode, + int topology) +{ + struct adm_multi_ch_copp_open_command open; + int ret = 0; + int index; + + pr_debug("%s: port %d path:%d rate:%d channel :%d\n", __func__, + port_id, path, rate, channel_mode); + + port_id = afe_convert_virtual_to_portid(port_id); + + if (afe_validate_port(port_id) < 0) { + pr_err("%s port idi[%d] is invalid\n", __func__, port_id); + return -ENODEV; + } + + index = afe_get_port_index(port_id); + pr_debug("%s: Port ID %d, index %d\n", __func__, port_id, index); + + if (this_adm.apr == NULL) { + this_adm.apr = apr_register("ADSP", "ADM", adm_callback, + 0xFFFFFFFF, &this_adm); + if (this_adm.apr == NULL) { + pr_err("%s: Unable to register ADM\n", __func__); + ret = -ENODEV; + return ret; + } + rtac_set_adm_handle(this_adm.apr); + } + + /* Create a COPP if port id are not enabled */ + if (atomic_read(&this_adm.copp_cnt[index]) == 0) { + + open.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, + APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); + + open.hdr.pkt_size = + sizeof(struct adm_multi_ch_copp_open_command); + open.hdr.opcode = ADM_CMD_MULTI_CHANNEL_COPP_OPEN; + memset(open.dev_channel_mapping, 0, 8); + + if (channel_mode == 1) { + open.dev_channel_mapping[0] = PCM_CHANNEL_FC; + } else if (channel_mode == 2) { + open.dev_channel_mapping[0] = PCM_CHANNEL_FL; + open.dev_channel_mapping[1] = PCM_CHANNEL_FR; + } else if (channel_mode == 6) { + open.dev_channel_mapping[0] = PCM_CHANNEL_FL; + open.dev_channel_mapping[1] = PCM_CHANNEL_FR; + open.dev_channel_mapping[2] = PCM_CHANNEL_LFE; + open.dev_channel_mapping[3] = PCM_CHANNEL_FC; + open.dev_channel_mapping[4] = PCM_CHANNEL_LB; + open.dev_channel_mapping[5] = PCM_CHANNEL_RB; + } else { + pr_err("%s invalid num_chan %d\n", __func__, + channel_mode); + return -EINVAL; + } + + + open.hdr.src_svc = APR_SVC_ADM; + open.hdr.src_domain = APR_DOMAIN_APPS; + open.hdr.src_port = port_id; + open.hdr.dest_svc = APR_SVC_ADM; + open.hdr.dest_domain = APR_DOMAIN_ADSP; + open.hdr.dest_port = port_id; + open.hdr.token = port_id; + + open.mode = path; + open.endpoint_id1 = port_id; + open.endpoint_id2 = 0xFFFF; + + /* convert path to acdb path */ + if (path == ADM_PATH_PLAYBACK) + open.topology_id = get_adm_rx_topology(); + else { + open.topology_id = get_adm_tx_topology(); + if ((open.topology_id == + VPM_TX_SM_ECNS_COPP_TOPOLOGY) || + (open.topology_id == + VPM_TX_DM_FLUENCE_COPP_TOPOLOGY) || + (open.topology_id == + VPM_TX_QMIC_FLUENCE_COPP_TOPOLOGY)) + rate = 16000; + } + + if (open.topology_id == 0) + open.topology_id = topology; + + open.channel_config = channel_mode & 0x00FF; + open.rate = rate; + + pr_debug("%s: channel_config=%d port_id=%d rate=%d" + " topology_id=0x%X\n", __func__, open.channel_config, + open.endpoint_id1, open.rate, + open.topology_id); + + atomic_set(&this_adm.copp_stat[index], 0); + + ret = apr_send_pkt(this_adm.apr, (uint32_t *)&open); + if (ret < 0) { + pr_err("%s:ADM enable for port %d failed\n", + __func__, port_id); + ret = -EINVAL; + goto fail_cmd; + } + /* Wait for the callback with copp id */ + ret = wait_event_timeout(this_adm.wait, + atomic_read(&this_adm.copp_stat[index]), + msecs_to_jiffies(TIMEOUT_MS)); + if (!ret) { + pr_err("%s ADM open failed for port %d\n", __func__, + port_id); + ret = -EINVAL; + goto fail_cmd; + } + } + atomic_inc(&this_adm.copp_cnt[index]); + return 0; + +fail_cmd: + + return ret; +} + int adm_matrix_map(int session_id, int path, int num_copps, unsigned int *port_id, int copp_id) { @@ -403,7 +585,7 @@ int adm_memory_map_regions(uint32_t *buf_add, uint32_t mempool_id, int i = 0; int cmd_size = 0; - pr_info("%s\n", __func__); + pr_debug("%s\n", __func__); if (this_adm.apr == NULL) { this_adm.apr = apr_register("ADSP", "ADM", adm_callback, 0xFFFFFFFF, &this_adm); @@ -478,7 +660,7 @@ int adm_memory_unmap_regions(uint32_t *buf_add, uint32_t *bufsz, int i = 0; int cmd_size = 0; - pr_info("%s\n", __func__); + pr_debug("%s\n", __func__); if (this_adm.apr == NULL) { pr_err("%s APR handle NULL\n", __func__); @@ -561,7 +743,7 @@ int adm_close(int port_id) if (afe_validate_port(port_id) < 0) return -EINVAL; - pr_info("%s port_id=%d index %d\n", __func__, port_id, index); + pr_debug("%s port_id=%d index %d\n", __func__, port_id, index); if (!(atomic_read(&this_adm.copp_cnt[index]))) { pr_err("%s: copp count for port[%d]is 0\n", __func__, port_id); diff --git a/sound/soc/msm/qdsp6/q6afe.c b/sound/soc/msm/qdsp6/q6afe.c index 017c1b618..ef01fb3e2 100755 --- a/sound/soc/msm/qdsp6/q6afe.c +++ b/sound/soc/msm/qdsp6/q6afe.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2010-2012, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -36,6 +37,8 @@ struct afe_ctl { static struct afe_ctl this_afe; +static uint32_t afe_cal_addr[MAX_AUDPROC_TYPES]; + #define TIMEOUT_MS 1000 #define Q6AFE_MAX_VOLUME 0x3FFF @@ -56,6 +59,7 @@ static int32_t afe_callback(struct apr_client_data *data, void *priv) pr_debug("task_name = %s pid = %d\n", this_afe.task->comm, this_afe.task->pid); send_sig(SIGUSR1, this_afe.task, 0); + return 0; } if (data->payload_size) { uint32_t *payload; @@ -73,6 +77,7 @@ static int32_t afe_callback(struct apr_client_data *data, void *priv) if (data->opcode == APR_BASIC_RSP_RESULT) { switch (payload[0]) { case AFE_PORT_AUDIO_IF_CONFIG: + case AFE_PORT_MULTI_CHAN_HDMI_AUDIO_IF_CONFIG: case AFE_PORT_CMD_STOP: case AFE_PORT_CMD_START: case AFE_PORT_CMD_LOOPBACK: @@ -276,7 +281,7 @@ int afe_sizeof_cfg_cmd(u16 port_id) ret_size = SIZEOF_CFG_CMD(afe_port_mi2s_cfg); break; case HDMI_RX: - ret_size = SIZEOF_CFG_CMD(afe_port_hdmi_cfg); + ret_size = SIZEOF_CFG_CMD(afe_port_hdmi_multi_ch_cfg); break; case SLIMBUS_0_RX: case SLIMBUS_0_TX: @@ -313,6 +318,63 @@ int afe_q6_interface_prepare(void) return ret; } +static void afe_send_cal_block(int32_t path, u16 port_id) +{ + int result = 0; + struct acdb_cal_block cal_block; + struct afe_port_cmd_set_param_no_payload afe_cal; + pr_debug("%s: path %d\n", __func__, path); + + get_afe_cal(path, &cal_block); + if (cal_block.cal_size <= 0) { + pr_debug("%s: No AFE cal to send!\n", __func__); + goto done; + } + + if (afe_cal_addr[path] != cal_block.cal_paddr) { + if (afe_cal_addr[path] != 0) + afe_cmd_memory_unmap_nowait(afe_cal_addr[path]); + afe_cmd_memory_map_nowait(cal_block.cal_paddr, + cal_block.cal_size); + afe_cal_addr[path] = cal_block.cal_paddr; + } + + afe_cal.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, + APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); + afe_cal.hdr.pkt_size = sizeof(afe_cal); + afe_cal.hdr.src_port = 0; + afe_cal.hdr.dest_port = 0; + afe_cal.hdr.token = 0; + afe_cal.hdr.opcode = AFE_PORT_CMD_SET_PARAM; + afe_cal.port_id = port_id; + afe_cal.payload_size = cal_block.cal_size; + afe_cal.payload_address = cal_block.cal_paddr; + + pr_debug("%s: AFE cal sent for device port = %d, path = %d, " + "cal size = %d, cal addr = 0x%x\n", __func__, + port_id, path, cal_block.cal_size, cal_block.cal_paddr); + + result = apr_send_pkt(this_afe.apr, (uint32_t *) &afe_cal); + if (result < 0) { + pr_err("%s: AFE cal for port %d failed\n", + __func__, port_id); + } + + pr_debug("%s: AFE cal sent for path %d device!\n", __func__, path); +done: + return; +} + +void afe_send_cal(u16 port_id) +{ + pr_debug("%s\n", __func__); + + if (afe_get_port_type(port_id) == MSM_AFE_PORT_TYPE_TX) + afe_send_cal_block(TX_CAL, port_id); + else if (afe_get_port_type(port_id) == MSM_AFE_PORT_TYPE_RX) + afe_send_cal_block(RX_CAL, port_id); +} + int afe_port_start_nowait(u16 port_id, union afe_port_config *afe_config, u32 rate) /* This function is no blocking */ { @@ -325,7 +387,7 @@ int afe_port_start_nowait(u16 port_id, union afe_port_config *afe_config, ret = -EINVAL; return ret; } - pr_info("%s: %d %d\n", __func__, port_id, rate); + pr_debug("%s: %d %d\n", __func__, port_id, rate); if ((port_id == RT_PROXY_DAI_001_RX) || (port_id == RT_PROXY_DAI_002_TX)) @@ -339,13 +401,25 @@ int afe_port_start_nowait(u16 port_id, union afe_port_config *afe_config, ret = -ENODEV; return ret; } - config.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, + + if (port_id == HDMI_RX) { + config.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); - config.hdr.pkt_size = afe_sizeof_cfg_cmd(port_id); - config.hdr.src_port = 0; - config.hdr.dest_port = 0; - config.hdr.token = 0; - config.hdr.opcode = AFE_PORT_AUDIO_IF_CONFIG; + config.hdr.pkt_size = afe_sizeof_cfg_cmd(port_id); + config.hdr.src_port = 0; + config.hdr.dest_port = 0; + config.hdr.token = 0; + config.hdr.opcode = AFE_PORT_MULTI_CHAN_HDMI_AUDIO_IF_CONFIG; + } else { + + config.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, + APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); + config.hdr.pkt_size = afe_sizeof_cfg_cmd(port_id); + config.hdr.src_port = 0; + config.hdr.dest_port = 0; + config.hdr.token = 0; + config.hdr.opcode = AFE_PORT_AUDIO_IF_CONFIG; + } if (afe_validate_port(port_id) < 0) { @@ -364,6 +438,10 @@ int afe_port_start_nowait(u16 port_id, union afe_port_config *afe_config, ret = -EINVAL; goto fail_cmd; } + + /* send AFE cal */ + afe_send_cal(port_id); + start.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); start.hdr.pkt_size = sizeof(start); @@ -677,6 +755,39 @@ int afe_apply_gain(u16 port_id, u16 gain) fail_cmd: return ret; } + +int afe_pseudo_port_start_nowait(u16 port_id) +{ + int ret = 0; + struct afe_pseudoport_start_command start; + + pr_debug("%s: port_id=%d\n", __func__, port_id); + if (this_afe.apr == NULL) { + pr_err("%s: AFE APR is not registered\n", __func__); + return -ENODEV; + } + + + start.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, + APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); + start.hdr.pkt_size = sizeof(start); + start.hdr.src_port = 0; + start.hdr.dest_port = 0; + start.hdr.token = 0; + start.hdr.opcode = AFE_PSEUDOPORT_CMD_START; + start.port_id = port_id; + start.timing = 1; + + atomic_set(&this_afe.state, 1); + ret = apr_send_pkt(this_afe.apr, (uint32_t *) &start); + if (ret < 0) { + pr_err("%s: AFE enable for port %d failed %d\n", + __func__, port_id, ret); + return -EINVAL; + } + return 0; +} + int afe_start_pseudo_port(u16 port_id) { int ret = 0; @@ -703,8 +814,7 @@ int afe_start_pseudo_port(u16 port_id) if (ret < 0) { pr_err("%s: AFE enable for port %d failed %d\n", __func__, port_id, ret); - ret = -EINVAL; - return ret; + return -EINVAL; } ret = wait_event_timeout(this_afe.wait, @@ -712,11 +822,43 @@ int afe_start_pseudo_port(u16 port_id) msecs_to_jiffies(TIMEOUT_MS)); if (!ret) { pr_err("%s: wait_event timeout\n", __func__); - ret = -EINVAL; - return ret; + return -EINVAL; + } + + return 0; +} + +int afe_pseudo_port_stop_nowait(u16 port_id) +{ + int ret = 0; + struct afe_pseudoport_stop_command stop; + + pr_debug("%s: port_id=%d\n", __func__, port_id); + + if (this_afe.apr == NULL) { + pr_err("%s: AFE is already closed\n", __func__); + return -EINVAL; + } + + stop.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, + APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); + stop.hdr.pkt_size = sizeof(stop); + stop.hdr.src_port = 0; + stop.hdr.dest_port = 0; + stop.hdr.token = 0; + stop.hdr.opcode = AFE_PSEUDOPORT_CMD_STOP; + stop.port_id = port_id; + stop.reserved = 0; + + atomic_set(&this_afe.state, 1); + ret = apr_send_pkt(this_afe.apr, (uint32_t *) &stop); + if (ret < 0) { + pr_err("%s: AFE close failed %d\n", __func__, ret); + return -EINVAL; } return 0; + } int afe_stop_pseudo_port(u16 port_id) @@ -728,8 +870,7 @@ int afe_stop_pseudo_port(u16 port_id) if (this_afe.apr == NULL) { pr_err("%s: AFE is already closed\n", __func__); - ret = -EINVAL; - return ret; + return -EINVAL; } stop.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, @@ -746,8 +887,7 @@ int afe_stop_pseudo_port(u16 port_id) ret = apr_send_pkt(this_afe.apr, (uint32_t *) &stop); if (ret < 0) { pr_err("%s: AFE close failed %d\n", __func__, ret); - ret = -EINVAL; - return ret; + return -EINVAL; } ret = wait_event_timeout(this_afe.wait, @@ -755,8 +895,7 @@ int afe_stop_pseudo_port(u16 port_id) msecs_to_jiffies(TIMEOUT_MS)); if (!ret) { pr_err("%s: wait_event timeout\n", __func__); - ret = -EINVAL; - return ret; + return -EINVAL; } return 0; @@ -813,6 +952,45 @@ int afe_cmd_memory_map(u32 dma_addr_p, u32 dma_buf_sz) return 0; } +int afe_cmd_memory_map_nowait(u32 dma_addr_p, u32 dma_buf_sz) +{ + int ret = 0; + struct afe_cmd_memory_map mregion; + + pr_debug("%s:\n", __func__); + + if (this_afe.apr == NULL) { + this_afe.apr = apr_register("ADSP", "AFE", afe_callback, + 0xFFFFFFFF, &this_afe); + pr_debug("%s: Register AFE\n", __func__); + if (this_afe.apr == NULL) { + pr_err("%s: Unable to register AFE\n", __func__); + ret = -ENODEV; + return ret; + } + } + + mregion.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, + APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); + mregion.hdr.pkt_size = sizeof(mregion); + mregion.hdr.src_port = 0; + mregion.hdr.dest_port = 0; + mregion.hdr.token = 0; + mregion.hdr.opcode = AFE_SERVICE_CMD_MEMORY_MAP; + mregion.phy_addr = dma_addr_p; + mregion.mem_sz = dma_buf_sz; + mregion.mem_id = 0; + mregion.rsvd = 0; + + ret = apr_send_pkt(this_afe.apr, (uint32_t *) &mregion); + if (ret < 0) { + pr_err("%s: AFE memory map cmd failed %d\n", + __func__, ret); + ret = -EINVAL; + } + return 0; +} + int afe_cmd_memory_unmap(u32 dma_addr_p) { int ret = 0; @@ -843,7 +1021,7 @@ int afe_cmd_memory_unmap(u32 dma_addr_p) atomic_set(&this_afe.state, 1); ret = apr_send_pkt(this_afe.apr, (uint32_t *) &mregion); if (ret < 0) { - pr_err("%s: AFE memory map cmd failed %d\n", + pr_err("%s: AFE memory unmap cmd failed %d\n", __func__, ret); ret = -EINVAL; return ret; @@ -857,7 +1035,42 @@ int afe_cmd_memory_unmap(u32 dma_addr_p) ret = -EINVAL; return ret; } + return 0; +} + +int afe_cmd_memory_unmap_nowait(u32 dma_addr_p) +{ + int ret = 0; + struct afe_cmd_memory_unmap mregion; + + pr_debug("%s:\n", __func__); + + if (this_afe.apr == NULL) { + this_afe.apr = apr_register("ADSP", "AFE", afe_callback, + 0xFFFFFFFF, &this_afe); + pr_debug("%s: Register AFE\n", __func__); + if (this_afe.apr == NULL) { + pr_err("%s: Unable to register AFE\n", __func__); + ret = -ENODEV; + return ret; + } + } + + mregion.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, + APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); + mregion.hdr.pkt_size = sizeof(mregion); + mregion.hdr.src_port = 0; + mregion.hdr.dest_port = 0; + mregion.hdr.token = 0; + mregion.hdr.opcode = AFE_SERVICE_CMD_MEMORY_UNMAP; + mregion.phy_addr = dma_addr_p; + ret = apr_send_pkt(this_afe.apr, (uint32_t *) &mregion); + if (ret < 0) { + pr_err("%s: AFE memory unmap cmd failed %d\n", + __func__, ret); + ret = -EINVAL; + } return 0; } @@ -1228,7 +1441,7 @@ int afe_port_stop_nowait(int port_id) ret = -EINVAL; goto fail_cmd; } - pr_info("%s: port_id=%d\n", __func__, port_id); + pr_debug("%s: port_id=%d\n", __func__, port_id); port_id = afe_convert_virtual_to_portid(port_id); stop.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, @@ -1266,7 +1479,7 @@ int afe_close(int port_id) ret = -EINVAL; goto fail_cmd; } - pr_info("%s: port_id=%d\n", __func__, port_id); + pr_debug("%s: port_id=%d\n", __func__, port_id); port_id = afe_convert_virtual_to_portid(port_id); stop.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, @@ -1327,12 +1540,17 @@ static int __init afe_init(void) static void __exit afe_exit(void) { + int i; #ifdef CONFIG_DEBUG_FS if (debugfs_afelb) debugfs_remove(debugfs_afelb); if (debugfs_afelb_gain) debugfs_remove(debugfs_afelb_gain); #endif + for (i = 0; i < MAX_AUDPROC_TYPES; i++) { + if (afe_cal_addr[i] != 0) + afe_cmd_memory_unmap_nowait(afe_cal_addr[i]); + } } device_initcall(afe_init); diff --git a/sound/soc/msm/qdsp6/q6asm.c b/sound/soc/msm/qdsp6/q6asm.c index ab7f9f7d1..dc49f12ff 100755 --- a/sound/soc/msm/qdsp6/q6asm.c +++ b/sound/soc/msm/qdsp6/q6asm.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved. + * Copyright (c) 2010-2012, Code Aurora Forum. All rights reserved. * Author: Brian Swetland * * This software is licensed under the terms of the GNU General Public @@ -515,6 +515,7 @@ int q6asm_audio_client_buf_alloc(unsigned int dir, pr_err("%s:map_buffer failed," "error = %ld\n", __func__, PTR_ERR((void *)buf[cnt].mem_buffer)); + mutex_unlock(&ac->cmd_lock); goto fail; } buf[cnt].data = @@ -522,6 +523,7 @@ int q6asm_audio_client_buf_alloc(unsigned int dir, if (!buf[cnt].data) { pr_err("%s:invalid vaddr," " iomap failed\n", __func__); + mutex_unlock(&ac->cmd_lock); goto fail; } buf[cnt].used = 1; @@ -944,6 +946,7 @@ void *q6asm_is_cpu_buf_avail(int dir, struct audio_client *ac, uint32_t *size, idx = port->cpu_buf; if (port->buf == NULL) { pr_debug("%s:Buffer pointer null\n", __func__); + mutex_unlock(&port->lock); return NULL; } /* dir 0: used = 0 means buf in use @@ -1190,6 +1193,9 @@ int q6asm_open_write(struct audio_client *ac, uint32_t format) case FORMAT_LINEAR_PCM: open.format = LINEAR_PCM; break; + case FORMAT_MULTI_CHANNEL_LINEAR_PCM: + open.format = MULTI_CHANNEL_PCM; + break; case FORMAT_MPEG4_AAC: open.format = MPEG4_AAC; break; @@ -1758,6 +1764,66 @@ int q6asm_media_format_block_pcm(struct audio_client *ac, return -EINVAL; } +int q6asm_media_format_block_multi_ch_pcm(struct audio_client *ac, + uint32_t rate, uint32_t channels) +{ + struct asm_stream_media_format_update fmt; + u8 *channel_mapping; + int rc = 0; + + pr_debug("%s:session[%d]rate[%d]ch[%d]\n", __func__, ac->session, rate, + channels); + + q6asm_add_hdr(ac, &fmt.hdr, sizeof(fmt), TRUE); + + fmt.hdr.opcode = ASM_DATA_CMD_MEDIA_FORMAT_UPDATE; + + fmt.format = MULTI_CHANNEL_PCM; + fmt.cfg_size = sizeof(struct asm_multi_channel_pcm_fmt_blk); + fmt.write_cfg.multi_ch_pcm_cfg.num_channels = channels; + fmt.write_cfg.multi_ch_pcm_cfg.bits_per_sample = 16; + fmt.write_cfg.multi_ch_pcm_cfg.sample_rate = rate; + fmt.write_cfg.multi_ch_pcm_cfg.is_signed = 1; + fmt.write_cfg.multi_ch_pcm_cfg.is_interleaved = 1; + channel_mapping = + fmt.write_cfg.multi_ch_pcm_cfg.channel_mapping; + + memset(channel_mapping, 0, PCM_FORMAT_MAX_NUM_CHANNEL); + + if (channels == 1) { + channel_mapping[0] = PCM_CHANNEL_FL; + } else if (channels == 2) { + channel_mapping[0] = PCM_CHANNEL_FL; + channel_mapping[1] = PCM_CHANNEL_FR; + } else if (channels == 6) { + channel_mapping[0] = PCM_CHANNEL_FC; + channel_mapping[1] = PCM_CHANNEL_FL; + channel_mapping[2] = PCM_CHANNEL_FR; + channel_mapping[3] = PCM_CHANNEL_LB; + channel_mapping[4] = PCM_CHANNEL_RB; + channel_mapping[5] = PCM_CHANNEL_LFE; + } else { + pr_err("%s: ERROR.unsupported num_ch = %u\n", __func__, + channels); + return -EINVAL; + } + + rc = apr_send_pkt(ac->apr, (uint32_t *) &fmt); + if (rc < 0) { + pr_err("%s:Comamnd open failed\n", __func__); + goto fail_cmd; + } + rc = wait_event_timeout(ac->cmd_wait, + (atomic_read(&ac->cmd_state) == 0), 5*HZ); + if (!rc) { + pr_err("%s:timeout. waited for FORMAT_UPDATE\n", __func__); + goto fail_cmd; + } + return 0; +fail_cmd: + return -EINVAL; +} + int q6asm_media_format_block_aac(struct audio_client *ac, struct asm_aac_cfg *cfg) { diff --git a/sound/soc/msm/qdsp6/q6voice.c b/sound/soc/msm/qdsp6/q6voice.c index c899b2a52..2acf59ead 100755 --- a/sound/soc/msm/qdsp6/q6voice.c +++ b/sound/soc/msm/qdsp6/q6voice.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -52,8 +52,12 @@ static int voice_send_cvp_deregister_cal_cmd(struct voice_data *v); static int voice_send_cvp_register_vol_cal_table_cmd(struct voice_data *v); static int voice_send_cvp_deregister_vol_cal_table_cmd(struct voice_data *v); static int voice_send_set_widevoice_enable_cmd(struct voice_data *v); -static int voice_send_set_slowtalk_enable_cmd(struct voice_data *v); - +static int voice_send_set_pp_enable_cmd(struct voice_data *v, + uint32_t module_id, int enable); +static int voice_cvs_stop_playback(struct voice_data *v); +static int voice_cvs_start_playback(struct voice_data *v); +static int voice_cvs_start_record(struct voice_data *v, uint32_t rec_mode); +static int voice_cvs_stop_record(struct voice_data *v); static int32_t qdsp_mvm_callback(struct apr_client_data *data, void *priv); static int32_t qdsp_cvs_callback(struct apr_client_data *data, void *priv); @@ -1760,9 +1764,10 @@ static int voice_send_set_widevoice_enable_cmd(struct voice_data *v) return -EINVAL; } -static int voice_send_set_slowtalk_enable_cmd(struct voice_data *v) +static int voice_send_set_pp_enable_cmd(struct voice_data *v, + uint32_t module_id, int enable) { - struct cvs_set_slowtalk_enable_cmd cvs_set_st_cmd; + struct cvs_set_pp_enable_cmd cvs_set_pp_cmd; int ret = 0; void *apr_cvs; u16 cvs_handle; @@ -1780,24 +1785,26 @@ static int voice_send_set_slowtalk_enable_cmd(struct voice_data *v) cvs_handle = voice_get_cvs_handle(v); /* fill in the header */ - cvs_set_st_cmd.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, + cvs_set_pp_cmd.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); - cvs_set_st_cmd.hdr.pkt_size = APR_PKT_SIZE(APR_HDR_SIZE, - sizeof(cvs_set_st_cmd) - APR_HDR_SIZE); - cvs_set_st_cmd.hdr.src_port = v->session_id; - cvs_set_st_cmd.hdr.dest_port = cvs_handle; - cvs_set_st_cmd.hdr.token = 0; - cvs_set_st_cmd.hdr.opcode = VSS_ICOMMON_CMD_SET_UI_PROPERTY; - - cvs_set_st_cmd.vss_set_st.module_id = MODULE_ID_VOICE_MODULE_ST; - cvs_set_st_cmd.vss_set_st.param_id = VOICE_PARAM_MOD_ENABLE; - cvs_set_st_cmd.vss_set_st.param_size = MOD_ENABLE_PARAM_LEN; - cvs_set_st_cmd.vss_set_st.reserved = 0; - cvs_set_st_cmd.vss_set_st.enable = v->st_enable; - cvs_set_st_cmd.vss_set_st.reserved_field = 0; + cvs_set_pp_cmd.hdr.pkt_size = APR_PKT_SIZE(APR_HDR_SIZE, + sizeof(cvs_set_pp_cmd) - APR_HDR_SIZE); + cvs_set_pp_cmd.hdr.src_port = v->session_id; + cvs_set_pp_cmd.hdr.dest_port = cvs_handle; + cvs_set_pp_cmd.hdr.token = 0; + cvs_set_pp_cmd.hdr.opcode = VSS_ICOMMON_CMD_SET_UI_PROPERTY; + + cvs_set_pp_cmd.vss_set_pp.module_id = module_id; + cvs_set_pp_cmd.vss_set_pp.param_id = VOICE_PARAM_MOD_ENABLE; + cvs_set_pp_cmd.vss_set_pp.param_size = MOD_ENABLE_PARAM_LEN; + cvs_set_pp_cmd.vss_set_pp.reserved = 0; + cvs_set_pp_cmd.vss_set_pp.enable = enable; + cvs_set_pp_cmd.vss_set_pp.reserved_field = 0; + pr_debug("voice_send_set_pp_enable_cmd, module_id=%d, enable=%d\n", + module_id, enable); v->cvs_state = CMD_STATUS_FAIL; - ret = apr_send_pkt(apr_cvs, (uint32_t *) &cvs_set_st_cmd); + ret = apr_send_pkt(apr_cvs, (uint32_t *) &cvs_set_pp_cmd); if (ret < 0) { pr_err("Fail: sending cvs set slowtalk enable,\n"); goto fail; @@ -1914,11 +1921,23 @@ static int voice_setup_vocproc(struct voice_data *v) /* enable slowtalk if st_enable is set */ if (v->st_enable) - voice_send_set_slowtalk_enable_cmd(v); + voice_send_set_pp_enable_cmd(v, MODULE_ID_VOICE_MODULE_ST, + v->st_enable); + if (v->fens_enable) + voice_send_set_pp_enable_cmd(v, MODULE_ID_VOICE_MODULE_FENS, + v->fens_enable); if (is_voip_session(v->session_id)) voice_send_netid_timing_cmd(v); + /* Start in-call music delivery if this feature is enabled */ + if (v->music_info.play_enable) + voice_cvs_start_playback(v); + + /* Start in-call recording if this feature is enabled */ + if (v->rec_info.rec_enable) + voice_cvs_start_record(v, v->rec_info.rec_mode); + rtac_add_voice(voice_get_cvs_handle(v), voice_get_cvp_handle(v), v->dev_rx.port_id, v->dev_tx.port_id, @@ -2150,6 +2169,10 @@ static int voice_destroy_vocproc(struct voice_data *v) mvm_handle = voice_get_mvm_handle(v); cvp_handle = voice_get_cvp_handle(v); + /* stop playback or recording */ + v->music_info.force = 1; + voice_cvs_stop_playback(v); + voice_cvs_stop_record(v); /* send stop voice cmd */ voice_send_stop_voice_cmd(v); @@ -2322,6 +2345,423 @@ static int voice_send_vol_index_cmd(struct voice_data *v) return 0; } +static int voice_cvs_start_record(struct voice_data *v, uint32_t rec_mode) +{ + int ret = 0; + void *apr_cvs; + u16 cvs_handle; + + struct cvs_start_record_cmd cvs_start_record; + + if (v == NULL) { + pr_err("%s: v is NULL\n", __func__); + return -EINVAL; + } + apr_cvs = common.apr_q6_cvs; + + if (!apr_cvs) { + pr_err("%s: apr_cvs is NULL.\n", __func__); + return -EINVAL; + } + + cvs_handle = voice_get_cvs_handle(v); + + if (!v->rec_info.recording) { + cvs_start_record.hdr.hdr_field = APR_HDR_FIELD( + APR_MSG_TYPE_SEQ_CMD, + APR_HDR_LEN(APR_HDR_SIZE), + APR_PKT_VER); + cvs_start_record.hdr.pkt_size = APR_PKT_SIZE(APR_HDR_SIZE, + sizeof(cvs_start_record) - APR_HDR_SIZE); + cvs_start_record.hdr.src_port = v->session_id; + cvs_start_record.hdr.dest_port = cvs_handle; + cvs_start_record.hdr.token = 0; + cvs_start_record.hdr.opcode = VSS_ISTREAM_CMD_START_RECORD; + + if (rec_mode == VOC_REC_UPLINK) { + cvs_start_record.rec_mode.rx_tap_point = + VSS_TAP_POINT_NONE; + cvs_start_record.rec_mode.tx_tap_point = + VSS_TAP_POINT_STREAM_END; + } else if (rec_mode == VOC_REC_DOWNLINK) { + cvs_start_record.rec_mode.rx_tap_point = + VSS_TAP_POINT_STREAM_END; + cvs_start_record.rec_mode.tx_tap_point = + VSS_TAP_POINT_NONE; + } else if (rec_mode == VOC_REC_BOTH) { + cvs_start_record.rec_mode.rx_tap_point = + VSS_TAP_POINT_STREAM_END; + cvs_start_record.rec_mode.tx_tap_point = + VSS_TAP_POINT_STREAM_END; + } else { + pr_err("%s: Invalid in-call rec_mode %d\n", __func__, + rec_mode); + + ret = -EINVAL; + goto fail; + } + + v->cvs_state = CMD_STATUS_FAIL; + + ret = apr_send_pkt(apr_cvs, (uint32_t *) &cvs_start_record); + if (ret < 0) { + pr_err("%s: Error %d sending START_RECORD\n", __func__, + ret); + + goto fail; + } + + ret = wait_event_timeout(v->cvs_wait, + (v->cvs_state == CMD_STATUS_SUCCESS), + msecs_to_jiffies(TIMEOUT_MS)); + + if (!ret) { + pr_err("%s: wait_event timeout\n", __func__); + + goto fail; + } + v->rec_info.recording = 1; + } else { + pr_debug("%s: Start record already sent\n", __func__); + } + + return 0; + +fail: + return ret; +} + +static int voice_cvs_stop_record(struct voice_data *v) +{ + int ret = 0; + void *apr_cvs; + u16 cvs_handle; + struct apr_hdr cvs_stop_record; + + if (v == NULL) { + pr_err("%s: v is NULL\n", __func__); + return -EINVAL; + } + apr_cvs = common.apr_q6_cvs; + + if (!apr_cvs) { + pr_err("%s: apr_cvs is NULL.\n", __func__); + return -EINVAL; + } + + cvs_handle = voice_get_cvs_handle(v); + + if (v->rec_info.recording) { + cvs_stop_record.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, + APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); + cvs_stop_record.pkt_size = APR_PKT_SIZE(APR_HDR_SIZE, + sizeof(cvs_stop_record) - APR_HDR_SIZE); + cvs_stop_record.src_port = v->session_id; + cvs_stop_record.dest_port = cvs_handle; + cvs_stop_record.token = 0; + cvs_stop_record.opcode = VSS_ISTREAM_CMD_STOP_RECORD; + + v->cvs_state = CMD_STATUS_FAIL; + + ret = apr_send_pkt(apr_cvs, (uint32_t *) &cvs_stop_record); + if (ret < 0) { + pr_err("%s: Error %d sending STOP_RECORD\n", + __func__, ret); + + goto fail; + } + + ret = wait_event_timeout(v->cvs_wait, + (v->cvs_state == CMD_STATUS_SUCCESS), + msecs_to_jiffies(TIMEOUT_MS)); + if (!ret) { + pr_err("%s: wait_event timeout\n", __func__); + + goto fail; + } + v->rec_info.recording = 0; + } else { + pr_debug("%s: Stop record already sent\n", __func__); + } + + return 0; + +fail: + + return ret; +} + +int voc_start_record(uint32_t port_id, uint32_t set) +{ + int ret = 0; + int rec_mode = 0; + u16 cvs_handle; + int i, rec_set = 0; + + for (i = 0; i < MAX_VOC_SESSIONS; i++) { + struct voice_data *v = &common.voice[i]; + pr_debug("%s: i:%d port_id: %d, set: %d\n", + __func__, i, port_id, set); + + mutex_lock(&v->lock); + rec_mode = v->rec_info.rec_mode; + rec_set = set; + if (set) { + if ((v->rec_route_state.ul_flag != 0) && + (v->rec_route_state.dl_flag != 0)) { + pr_debug("%s: i=%d, rec mode already set.\n", + __func__, i); + mutex_unlock(&v->lock); + if (i < MAX_VOC_SESSIONS) + continue; + else + return 0; + } + + if (port_id == VOICE_RECORD_TX) { + if ((v->rec_route_state.ul_flag == 0) + && (v->rec_route_state.dl_flag == 0)) { + rec_mode = VOC_REC_UPLINK; + v->rec_route_state.ul_flag = 1; + } else if ((v->rec_route_state.ul_flag == 0) + && (v->rec_route_state.dl_flag != 0)) { + voice_cvs_stop_record(v); + rec_mode = VOC_REC_BOTH; + v->rec_route_state.ul_flag = 1; + } + } else if (port_id == VOICE_RECORD_RX) { + if ((v->rec_route_state.ul_flag == 0) + && (v->rec_route_state.dl_flag == 0)) { + rec_mode = VOC_REC_DOWNLINK; + v->rec_route_state.dl_flag = 1; + } else if ((v->rec_route_state.ul_flag != 0) + && (v->rec_route_state.dl_flag == 0)) { + voice_cvs_stop_record(v); + rec_mode = VOC_REC_BOTH; + v->rec_route_state.dl_flag = 1; + } + } + rec_set = 1; + } else { + if ((v->rec_route_state.ul_flag == 0) && + (v->rec_route_state.dl_flag == 0)) { + pr_debug("%s: i=%d, rec already stops.\n", + __func__, i); + mutex_unlock(&v->lock); + if (i < MAX_VOC_SESSIONS) + continue; + else + return 0; + } + + if (port_id == VOICE_RECORD_TX) { + if ((v->rec_route_state.ul_flag != 0) + && (v->rec_route_state.dl_flag == 0)) { + v->rec_route_state.ul_flag = 0; + rec_set = 0; + } else if ((v->rec_route_state.ul_flag != 0) + && (v->rec_route_state.dl_flag != 0)) { + voice_cvs_stop_record(v); + v->rec_route_state.ul_flag = 0; + rec_mode = VOC_REC_DOWNLINK; + rec_set = 1; + } + } else if (port_id == VOICE_RECORD_RX) { + if ((v->rec_route_state.ul_flag == 0) + && (v->rec_route_state.dl_flag != 0)) { + v->rec_route_state.dl_flag = 0; + rec_set = 0; + } else if ((v->rec_route_state.ul_flag != 0) + && (v->rec_route_state.dl_flag != 0)) { + voice_cvs_stop_record(v); + v->rec_route_state.dl_flag = 0; + rec_mode = VOC_REC_UPLINK; + rec_set = 1; + } + } + } + pr_debug("%s: i=%d, mode =%d, set =%d\n", __func__, + i, rec_mode, rec_set); + cvs_handle = voice_get_cvs_handle(v); + + if (cvs_handle != 0) { + if (rec_set) + ret = voice_cvs_start_record(v, rec_mode); + else + ret = voice_cvs_stop_record(v); + } + + /* Cache the value */ + v->rec_info.rec_enable = rec_set; + v->rec_info.rec_mode = rec_mode; + + mutex_unlock(&v->lock); + } + + return ret; +} + +static int voice_cvs_start_playback(struct voice_data *v) +{ + int ret = 0; + struct apr_hdr cvs_start_playback; + void *apr_cvs; + u16 cvs_handle; + + if (v == NULL) { + pr_err("%s: v is NULL\n", __func__); + return -EINVAL; + } + apr_cvs = common.apr_q6_cvs; + + if (!apr_cvs) { + pr_err("%s: apr_cvs is NULL.\n", __func__); + return -EINVAL; + } + + cvs_handle = voice_get_cvs_handle(v); + + if (!v->music_info.playing && v->music_info.count) { + cvs_start_playback.hdr_field = APR_HDR_FIELD( + APR_MSG_TYPE_SEQ_CMD, + APR_HDR_LEN(APR_HDR_SIZE), + APR_PKT_VER); + cvs_start_playback.pkt_size = APR_PKT_SIZE(APR_HDR_SIZE, + sizeof(cvs_start_playback) - APR_HDR_SIZE); + cvs_start_playback.src_port = v->session_id; + cvs_start_playback.dest_port = cvs_handle; + cvs_start_playback.token = 0; + cvs_start_playback.opcode = VSS_ISTREAM_CMD_START_PLAYBACK; + + v->cvs_state = CMD_STATUS_FAIL; + + ret = apr_send_pkt(apr_cvs, (uint32_t *) &cvs_start_playback); + + if (ret < 0) { + pr_err("%s: Error %d sending START_PLAYBACK\n", + __func__, ret); + + goto fail; + } + + ret = wait_event_timeout(v->cvs_wait, + (v->cvs_state == CMD_STATUS_SUCCESS), + msecs_to_jiffies(TIMEOUT_MS)); + if (!ret) { + pr_err("%s: wait_event timeout\n", __func__); + + goto fail; + } + + v->music_info.playing = 1; + } else { + pr_debug("%s: Start playback already sent\n", __func__); + } + + return 0; + +fail: + return ret; +} + +static int voice_cvs_stop_playback(struct voice_data *v) +{ + int ret = 0; + struct apr_hdr cvs_stop_playback; + void *apr_cvs; + u16 cvs_handle; + + if (v == NULL) { + pr_err("%s: v is NULL\n", __func__); + return -EINVAL; + } + apr_cvs = common.apr_q6_cvs; + + if (!apr_cvs) { + pr_err("%s: apr_cvs is NULL.\n", __func__); + return -EINVAL; + } + + cvs_handle = voice_get_cvs_handle(v); + + if (v->music_info.playing && ((!v->music_info.count) || + (v->music_info.force))) { + cvs_stop_playback.hdr_field = + APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, + APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); + cvs_stop_playback.pkt_size = APR_PKT_SIZE(APR_HDR_SIZE, + sizeof(cvs_stop_playback) - APR_HDR_SIZE); + cvs_stop_playback.src_port = v->session_id; + cvs_stop_playback.dest_port = cvs_handle; + cvs_stop_playback.token = 0; + + cvs_stop_playback.opcode = VSS_ISTREAM_CMD_STOP_PLAYBACK; + + v->cvs_state = CMD_STATUS_FAIL; + + ret = apr_send_pkt(apr_cvs, (uint32_t *) &cvs_stop_playback); + if (ret < 0) { + pr_err("%s: Error %d sending STOP_PLAYBACK\n", + __func__, ret); + + + goto fail; + } + + ret = wait_event_timeout(v->cvs_wait, + (v->cvs_state == CMD_STATUS_SUCCESS), + msecs_to_jiffies(TIMEOUT_MS)); + if (!ret) { + pr_err("%s: wait_event timeout\n", __func__); + + goto fail; + } + + v->music_info.playing = 0; + v->music_info.force = 0; + } else { + pr_debug("%s: Stop playback already sent\n", __func__); + } + + return 0; + +fail: + return ret; +} + +int voc_start_playback(uint32_t set) +{ + int ret = 0; + u16 cvs_handle; + int i; + + + for (i = 0; i < MAX_VOC_SESSIONS; i++) { + struct voice_data *v = &common.voice[i]; + + mutex_lock(&v->lock); + v->music_info.play_enable = set; + if (set) + v->music_info.count++; + else + v->music_info.count--; + pr_debug("%s: music_info count =%d\n", __func__, + v->music_info.count); + + cvs_handle = voice_get_cvs_handle(v); + if (cvs_handle != 0) { + if (set) + ret = voice_cvs_start_playback(v); + else + ret = voice_cvs_stop_playback(v); + } + + mutex_unlock(&v->lock); + } + + return ret; +} + int voc_disable_cvp(uint16_t session_id) { struct voice_data *v = voice_get_session(session_id); @@ -2403,7 +2843,14 @@ int voc_enable_cvp(uint16_t session_id) /* enable slowtalk */ if (v->st_enable) - voice_send_set_slowtalk_enable_cmd(v); + voice_send_set_pp_enable_cmd(v, + MODULE_ID_VOICE_MODULE_ST, + v->st_enable); + /* enable FENS */ + if (v->fens_enable) + voice_send_set_pp_enable_cmd(v, + MODULE_ID_VOICE_MODULE_FENS, + v->fens_enable); get_sidetone_cal(&sidetone_cal_data); if (v->dev_tx.port_id != RT_PROXY_PORT_001_TX && @@ -2540,7 +2987,7 @@ uint32_t voc_get_widevoice_enable(uint16_t session_id) return ret; } -int voc_set_slowtalk_enable(uint16_t session_id, uint32_t st_enable) +int voc_set_pp_enable(uint16_t session_id, uint32_t module_id, uint32_t enable) { struct voice_data *v = voice_get_session(session_id); int ret = 0; @@ -2552,18 +2999,27 @@ int voc_set_slowtalk_enable(uint16_t session_id, uint32_t st_enable) } mutex_lock(&v->lock); + if (module_id == MODULE_ID_VOICE_MODULE_ST) + v->st_enable = enable; + else if (module_id == MODULE_ID_VOICE_MODULE_FENS) + v->fens_enable = enable; - v->st_enable = st_enable; - - if (v->voc_state == VOC_RUN) - ret = voice_send_set_slowtalk_enable_cmd(v); - + if (v->voc_state == VOC_RUN) { + if (module_id == MODULE_ID_VOICE_MODULE_ST) + ret = voice_send_set_pp_enable_cmd(v, + MODULE_ID_VOICE_MODULE_ST, + enable); + else if (module_id == MODULE_ID_VOICE_MODULE_FENS) + ret = voice_send_set_pp_enable_cmd(v, + MODULE_ID_VOICE_MODULE_FENS, + enable); + } mutex_unlock(&v->lock); return ret; } -uint32_t voc_get_slowtalk_enable(uint16_t session_id) +int voc_get_pp_enable(uint16_t session_id, uint32_t module_id) { struct voice_data *v = voice_get_session(session_id); int ret = 0; @@ -2575,8 +3031,10 @@ uint32_t voc_get_slowtalk_enable(uint16_t session_id) } mutex_lock(&v->lock); - - ret = v->st_enable; + if (module_id == MODULE_ID_VOICE_MODULE_ST) + ret = v->st_enable; + else if (module_id == MODULE_ID_VOICE_MODULE_FENS) + ret = v->fens_enable; mutex_unlock(&v->lock); @@ -2937,6 +3395,10 @@ static int32_t qdsp_cvs_callback(struct apr_client_data *data, void *priv) case VSS_ICOMMON_CMD_MAP_MEMORY: case VSS_ICOMMON_CMD_UNMAP_MEMORY: case VSS_ICOMMON_CMD_SET_UI_PROPERTY: + case VSS_ISTREAM_CMD_START_PLAYBACK: + case VSS_ISTREAM_CMD_STOP_PLAYBACK: + case VSS_ISTREAM_CMD_START_RECORD: + case VSS_ISTREAM_CMD_STOP_RECORD: pr_debug("%s: cmd = 0x%x\n", __func__, ptr[0]); v->cvs_state = CMD_STATUS_SUCCESS; wake_up(&v->cvs_wait); diff --git a/sound/soc/msm/qdsp6/q6voice.h b/sound/soc/msm/qdsp6/q6voice.h index edde0aa68..2dc08d6b8 100755 --- a/sound/soc/msm/qdsp6/q6voice.h +++ b/sound/soc/msm/qdsp6/q6voice.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -17,6 +17,10 @@ #define MAX_VOC_PKT_SIZE 642 #define SESSION_NAME_LEN 20 +#define VOC_REC_UPLINK 0x00 +#define VOC_REC_DOWNLINK 0x01 +#define VOC_REC_BOTH 0x02 + struct voice_header { uint32_t id; uint32_t data_len; @@ -43,6 +47,11 @@ struct voice_dev_route_state { u16 tx_route_flag; }; +struct voice_rec_route_state { + u16 ul_flag; + u16 dl_flag; +}; + enum { VOC_INIT = 0, VOC_RUN, @@ -314,10 +323,41 @@ struct mvm_set_widevoice_enable_cmd { #define VSS_ISTREAM_CMD_SET_ENC_DTX_MODE 0x0001101D /* Set encoder DTX mode. */ +#define MODULE_ID_VOICE_MODULE_FENS 0x00010EEB #define MODULE_ID_VOICE_MODULE_ST 0x00010EE3 #define VOICE_PARAM_MOD_ENABLE 0x00010E00 #define MOD_ENABLE_PARAM_LEN 4 +#define VSS_ISTREAM_CMD_START_PLAYBACK 0x00011238 +/* Start in-call music delivery on the Tx voice path. */ + +#define VSS_ISTREAM_CMD_STOP_PLAYBACK 0x00011239 +/* Stop the in-call music delivery on the Tx voice path. */ + +#define VSS_ISTREAM_CMD_START_RECORD 0x00011236 +/* Start in-call conversation recording. */ +#define VSS_ISTREAM_CMD_STOP_RECORD 0x00011237 +/* Stop in-call conversation recording. */ + +#define VSS_TAP_POINT_NONE 0x00010F78 +/* Indicates no tapping for specified path. */ + +#define VSS_TAP_POINT_STREAM_END 0x00010F79 +/* Indicates that specified path should be tapped at the end of the stream. */ + +struct vss_istream_cmd_start_record_t { + uint32_t rx_tap_point; + /* Tap point to use on the Rx path. Supported values are: + * VSS_TAP_POINT_NONE : Do not record Rx path. + * VSS_TAP_POINT_STREAM_END : Rx tap point is at the end of the stream. + */ + uint32_t tx_tap_point; + /* Tap point to use on the Tx path. Supported values are: + * VSS_TAP_POINT_NONE : Do not record tx path. + * VSS_TAP_POINT_STREAM_END : Tx tap point is at the end of the stream. + */ +} __packed; + struct vss_istream_cmd_create_passive_control_session_t { char name[SESSION_NAME_LEN]; /**< @@ -462,7 +502,7 @@ struct vss_istream_cmd_register_calibration_data_t { /* Size of the calibration data in bytes. */ }; -struct vss_icommon_cmd_set_ui_property_st_enable_t { +struct vss_icommon_cmd_set_ui_property_enable_t { uint32_t module_id; /* Unique ID of the module. */ uint32_t param_id; @@ -534,9 +574,13 @@ struct cvs_deregister_cal_data_cmd { struct apr_hdr hdr; } __packed; -struct cvs_set_slowtalk_enable_cmd { +struct cvs_set_pp_enable_cmd { + struct apr_hdr hdr; + struct vss_icommon_cmd_set_ui_property_enable_t vss_set_pp; +} __packed; +struct cvs_start_record_cmd { struct apr_hdr hdr; - struct vss_icommon_cmd_set_ui_property_st_enable_t vss_set_st; + struct vss_istream_cmd_start_record_t rec_mode; } __packed; /* TO CVP commands */ @@ -747,13 +791,16 @@ struct mvs_driver_info { }; struct incall_rec_info { - uint32_t pending; + uint32_t rec_enable; uint32_t rec_mode; + uint32_t recording; }; struct incall_music_info { - uint32_t pending; + uint32_t play_enable; uint32_t playing; + int count; + int force; }; struct voice_data { @@ -786,10 +833,18 @@ struct voice_data { uint8_t wv_enable; /* slowtalk enable value */ uint32_t st_enable; + /* FENC enable value */ + uint32_t fens_enable; struct voice_dev_route_state voc_route_state; u16 session_id; + + struct incall_rec_info rec_info; + + struct incall_music_info music_info; + + struct voice_rec_route_state rec_route_state; }; #define MAX_VOC_SESSIONS 2 @@ -834,8 +889,8 @@ enum { }; /* called by alsa driver */ -int voc_set_slowtalk_enable(uint16_t session_id, uint32_t st_enable); -uint32_t voc_get_slowtalk_enable(uint16_t session_id); +int voc_set_pp_enable(uint16_t session_id, uint32_t module_id, uint32_t enable); +int voc_get_pp_enable(uint16_t session_id, uint32_t module_id); int voc_set_widevoice_enable(uint16_t session_id, uint32_t wv_enable); uint32_t voc_get_widevoice_enable(uint16_t session_id); uint8_t voc_get_tty_mode(uint16_t session_id); @@ -856,4 +911,6 @@ uint8_t voc_get_route_flag(uint16_t session_id, uint8_t path_dir); #define VOIP_SESSION_NAME "VoIP session" uint16_t voc_get_session_id(char *name); +int voc_start_playback(uint32_t set); +int voc_start_record(uint32_t port_id, uint32_t set); #endif From 768af19eb147ce273060ec2282f3d538291863fb Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 12 Oct 2012 20:53:40 +1300 Subject: [PATCH 38/52] readahead bump --- include/linux/mm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index c73fdf857..a6beec755 100755 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1473,7 +1473,7 @@ int write_one_page(struct page *page, int wait); void task_dirty_inc(struct task_struct *tsk); /* readahead.c */ -#define VM_MAX_READAHEAD 128 /* kbytes */ +#define VM_MAX_READAHEAD 1024 /* kbytes */ #define VM_MIN_READAHEAD 16 /* kbytes (includes current page) */ int force_page_cache_readahead(struct address_space *mapping, struct file *filp, From efc0733dcfcd634135332146a041faeb679dc5e4 Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 12 Oct 2012 21:01:17 +1300 Subject: [PATCH 39/52] small bluetooth fix https://github.com/Blefish/android_kernel_huawei_u8800/commit/a25cf1fb87e1094a7b3a6317e1931b6646edd350 --- net/bluetooth/l2cap_core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 3b5ad95c9..f355e3d2d 100755 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -5525,8 +5525,11 @@ static void l2cap_logical_link_worker(struct work_struct *work) container_of(work, struct l2cap_logical_link_work, work); struct sock *sk = log_link_work->chan->l2cap_sk; - l2cap_logical_link_complete(log_link_work->chan, log_link_work->status); + if (sk) { + l2cap_logical_link_complete(log_link_work->chan, + log_link_work->status); sock_put(sk); +} hci_chan_put(log_link_work->chan); kfree(log_link_work); } From bc733e6cdd2edf6928ae9dda82acb27e77e42540 Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 12 Oct 2012 21:16:34 +1300 Subject: [PATCH 40/52] Try the sound settings from official huawei pro source --- .../include/mach/qdsp5v2/marimba_profile.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-msm/include/mach/qdsp5v2/marimba_profile.h b/arch/arm/mach-msm/include/mach/qdsp5v2/marimba_profile.h index 5a6aca216..348a3e84c 100755 --- a/arch/arm/mach-msm/include/mach/qdsp5v2/marimba_profile.h +++ b/arch/arm/mach-msm/include/mach/qdsp5v2/marimba_profile.h @@ -288,13 +288,13 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x13, 0xfc, 0x58)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x14, 0xff, 0x65)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x15, 0xff, 0x64)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x82, 0xff, 0x5e)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x82, 0xff, 0x5A)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x10, 0xFF, 0x68)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_READY}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0D, 0xF0, 0xd0)}, \ {ADIE_CODEC_ACTION_DELAY_WAIT, 0xbb8}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x14, 0x14)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8b, 0xff, 0xe6)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8b, 0xff, 0xf4)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8c, 0x03, 0x02)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x86, 0xff, 0x0c)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0x50, 0x40)}, \ @@ -1572,8 +1572,8 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x23, 0xff, 0x20)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0xFF, 0x08)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3c, 0xFF, 0x08)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x84, 0xff, 0x0b)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x85, 0xff, 0x0b)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x84, 0xff, 0x05)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x85, 0xff, 0x05)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0x0f, 0x0c)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_ANALOG_READY}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8a, 0x03, 0x03)}, \ @@ -3450,8 +3450,8 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x33, 0x80, 0x80)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x34, 0xf0, 0xf0)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x23, 0xff, 0x20)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0xFF, 0x14)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3c, 0xFF, 0x14)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0xFF, 0x04)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3c, 0xFF, 0x04)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x84, 0xff, 0x00)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x85, 0xff, 0x00)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0x0f, 0x0c)}, \ @@ -3876,10 +3876,10 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0D, 0xF0, 0xD0)}, \ {ADIE_CODEC_ACTION_DELAY_WAIT, 0xbb8}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x1c, 0x1c)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8b, 0xff, 0xce)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8b, 0xff, 0xCE)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8c, 0x03, 0x03)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x87, 0xff, 0x0e)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x86, 0xff, 0x0e)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x87, 0xff, 0x0E)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x86, 0xff, 0x0E)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0xc0)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_ANALOG_READY}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0x30, 0x30)}, \ From 0ff47a72f988556677c30d16a57693c46920c795 Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 12 Oct 2012 21:17:34 +1300 Subject: [PATCH 41/52] Bluetooth header input as per: https://github.com/Blefish/android_kernel_huawei_u8800/commit/deca001bbb77e7685fd64777723e7137ed1bb4b5 --- net/bluetooth/l2cap_core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index f355e3d2d..2af925d5e 100755 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -3354,6 +3354,7 @@ int l2cap_build_conf_req(struct sock *sk, void *data) break; case L2CAP_MODE_STREAMING: + l2cap_setup_txwin(pi); rfc.txwin_size = 0; rfc.max_transmit = 0; rfc.retrans_timeout = 0; From bd80faccebad737615c718c823e8bd46cef9cb96 Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 12 Oct 2012 22:36:45 +1300 Subject: [PATCH 42/52] Fix kgsl cleanup code as per: https://github.com/Blefish/android_kernel_huawei_u8800/commit/f6fdd27fa66d4c5a25a2d8a9a56e874867eda6b7 --- drivers/gpu/msm/kgsl.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/msm/kgsl.c b/drivers/gpu/msm/kgsl.c index 1036277a8..e01a1d7cc 100755 --- a/drivers/gpu/msm/kgsl.c +++ b/drivers/gpu/msm/kgsl.c @@ -1656,10 +1656,19 @@ static long kgsl_ioctl_map_user_mem(struct kgsl_device_private *dev_priv, kgsl_check_idle(dev_priv->device); return result; - error_put_file_ptr: + error_put_file_ptr: + switch (entry->memtype) { + case KGSL_MEM_ENTRY_PMEM: + case KGSL_MEM_ENTRY_ASHMEM: if (entry->priv_data) - fput(entry->priv_data); - + break; + case KGSL_MEM_ENTRY_ION: + ion_unmap_dma(kgsl_ion_client, entry->priv_data); + ion_free(kgsl_ion_client, entry->priv_data); + break; + default: + break; +} error: kfree(entry); kgsl_check_idle(dev_priv->device); From 4e1ba1147c8e0922500fae68cbda7b3c7258ce6b Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 12 Oct 2012 23:02:05 +1300 Subject: [PATCH 43/52] SIO as default --- arch/arm/configs/u8800_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/configs/u8800_defconfig b/arch/arm/configs/u8800_defconfig index 20b398c59..b9d443519 100644 --- a/arch/arm/configs/u8800_defconfig +++ b/arch/arm/configs/u8800_defconfig @@ -177,9 +177,9 @@ CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y # CONFIG_DEFAULT_CFQ is not set CONFIG_IOSCHED_SIO=y -# CONFIG_DEFAULT_SIO is not set -CONFIG_DEFAULT_NOOP=y -CONFIG_DEFAULT_IOSCHED="noop" +CONFIG_DEFAULT_SIO=y +CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="sio" # CONFIG_INLINE_SPIN_TRYLOCK is not set # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set # CONFIG_INLINE_SPIN_LOCK is not set From f2eec8c0acc6fd46c4510f50c531bce33c83d63b Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 12 Oct 2012 23:26:59 +1300 Subject: [PATCH 44/52] make smartass wakeup a little more responsive --- drivers/cpufreq/cpufreq_smartass2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/cpufreq/cpufreq_smartass2.c b/drivers/cpufreq/cpufreq_smartass2.c index a9ccaf0fd..7713e3bb0 100644 --- a/drivers/cpufreq/cpufreq_smartass2.c +++ b/drivers/cpufreq/cpufreq_smartass2.c @@ -101,7 +101,7 @@ static unsigned long down_rate_us; * The frequency to set when waking up from sleep. * When sleep_ideal_freq=0 this will have no effect. */ -#define DEFAULT_SLEEP_WAKEUP_FREQ 386640 +#define DEFAULT_SLEEP_WAKEUP_FREQ 480000 static unsigned int sleep_wakeup_freq; /* From df014bac01a2ffab6982e5ef3e7e1921aafd10d9 Mon Sep 17 00:00:00 2001 From: Paul Date: Sat, 13 Oct 2012 07:51:50 +1300 Subject: [PATCH 45/52] reduce readadhed a little --- include/linux/mm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index a6beec755..c137940dd 100755 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1473,7 +1473,7 @@ int write_one_page(struct page *page, int wait); void task_dirty_inc(struct task_struct *tsk); /* readahead.c */ -#define VM_MAX_READAHEAD 1024 /* kbytes */ +#define VM_MAX_READAHEAD 512 /* kbytes */ #define VM_MIN_READAHEAD 16 /* kbytes (includes current page) */ int force_page_cache_readahead(struct address_space *mapping, struct file *filp, From ffa1e36aece451400c8c69209c84a501b50fee1e Mon Sep 17 00:00:00 2001 From: Paul Date: Sat, 13 Oct 2012 08:06:19 +1300 Subject: [PATCH 46/52] Try CAF wifi drivers --- drivers/net/wireless/libra/libra_sdioif.c | 77 +++++++++++++++++++-- drivers/net/wireless/libra/qcomwlan_pwrif.c | 5 +- 2 files changed, 73 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/libra/libra_sdioif.c b/drivers/net/wireless/libra/libra_sdioif.c index 3955642de..8cfc0fa85 100644 --- a/drivers/net/wireless/libra/libra_sdioif.c +++ b/drivers/net/wireless/libra/libra_sdioif.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2011, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2009-2012, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -28,6 +28,39 @@ static unsigned short libra_sdio_card_id; static suspend_handler_t *libra_suspend_hldr; static resume_handler_t *libra_resume_hldr; +static notify_card_removal_t *libra_notify_card_removal_hdlr; +static shutdown_handler_t *libra_sdio_shutdown_hdlr; + +int libra_enable_sdio_irq_in_chip(struct sdio_func *func, u8 enable) +{ + unsigned char reg = 0; + int err = 0; + + sdio_claim_host(func); + + /* Read the value into reg */ + libra_sdiocmd52(func, SDIO_CCCR_IENx, ®, 0, &err); + if (err) + printk(KERN_ERR "%s: Could not read SDIO_CCCR_IENx register " + "err=%d\n", __func__, err); + + if (libra_mmc_host) { + if (enable) { + reg |= 1 << func->num; + reg |= 1; + } else { + reg &= ~(1 << func->num); + } + libra_sdiocmd52(func, SDIO_CCCR_IENx, ®, 1, &err); + if (err) + printk(KERN_ERR "%s: Could not enable/disable irq " + "err=%d\n", __func__, err); + } + sdio_release_host(func); + + return err; +} +EXPORT_SYMBOL(libra_enable_sdio_irq_in_chip); /** * libra_sdio_configure() - Function to configure the SDIO device param @@ -89,6 +122,8 @@ int libra_sdio_configure(sdio_irq_handler_t libra_sdio_rxhandler, goto cfg_error; } + libra_enable_sdio_irq_in_chip(func, 0); + sdio_release_host(func); return 0; @@ -364,6 +399,8 @@ static int libra_sdio_probe(struct sdio_func *func, static void libra_sdio_remove(struct sdio_func *func) { + if (libra_notify_card_removal_hdlr) + libra_notify_card_removal_hdlr(); libra_sdio_func = NULL; printk(KERN_INFO "%s : Module removed.\n", __func__); @@ -416,6 +453,31 @@ static int libra_sdio_resume(struct device *dev) #define libra_sdio_resume 0 #endif +static void libra_sdio_shutdown(struct device *dev) +{ + if (libra_sdio_shutdown_hdlr) { + libra_sdio_shutdown_hdlr(); + printk(KERN_INFO "%s : Notified shutdown event to Libra driver.\n", + __func__); + } +} + +int libra_sdio_register_shutdown_hdlr( + shutdown_handler_t *libra_shutdown_hdlr) +{ + libra_sdio_shutdown_hdlr = libra_shutdown_hdlr; + return 0; +} +EXPORT_SYMBOL(libra_sdio_register_shutdown_hdlr); + +int libra_sdio_notify_card_removal( + notify_card_removal_t *libra_sdio_notify_card_removal_hdlr) +{ + libra_notify_card_removal_hdlr = libra_sdio_notify_card_removal_hdlr; + return 0; +} +EXPORT_SYMBOL(libra_sdio_notify_card_removal); + static struct sdio_device_id libra_sdioid[] = { {.class = 0, .vendor = LIBRA_MAN_ID, .device = LIBRA_REV_1_0_CARD_ID}, {.class = 0, .vendor = VOLANS_MAN_ID, .device = VOLANS_REV_2_0_CARD_ID}, @@ -428,11 +490,12 @@ static const struct dev_pm_ops libra_sdio_pm_ops = { }; static struct sdio_driver libra_sdiofn_driver = { - .name = "libra_sdiofn", - .id_table = libra_sdioid, - .probe = libra_sdio_probe, - .remove = libra_sdio_remove, - .drv.pm = &libra_sdio_pm_ops, + .name = "libra_sdiofn", + .id_table = libra_sdioid, + .probe = libra_sdio_probe, + .remove = libra_sdio_remove, + .drv.pm = &libra_sdio_pm_ops, + .drv.shutdown = libra_sdio_shutdown, }; static int __init libra_sdioif_init(void) @@ -442,6 +505,8 @@ static int __init libra_sdioif_init(void) libra_mmc_host_index = -1; libra_suspend_hldr = NULL; libra_resume_hldr = NULL; + libra_notify_card_removal_hdlr = NULL; + libra_sdio_shutdown_hdlr = NULL; sdio_register_driver(&libra_sdiofn_driver); diff --git a/drivers/net/wireless/libra/qcomwlan_pwrif.c b/drivers/net/wireless/libra/qcomwlan_pwrif.c index 6a0c78f2b..94ea0b395 100755 --- a/drivers/net/wireless/libra/qcomwlan_pwrif.c +++ b/drivers/net/wireless/libra/qcomwlan_pwrif.c @@ -154,7 +154,7 @@ int vos_chip_power_qrf8615(int on) /* WLAN VREG settings */ for (i = 0; i < ARRAY_SIZE(vregs_qwlan_name); i++) { - if (vregs_qwlan[i] == NULL) { + if (on && !wlan_on) { vregs_qwlan[i] = regulator_get(NULL, vregs_qwlan_name[i]); if (IS_ERR(vregs_qwlan[i])) { @@ -187,8 +187,7 @@ int vos_chip_power_qrf8615(int on) goto vreg_fail; } } - } - if (on && !wlan_on) { + if (vregs_qwlan_peek_current[i]) { rc = regulator_set_optimum_mode(vregs_qwlan[i], vregs_qwlan_peek_current[i]); From f5efc659d67f34c294aaefd9d242e6b85f3d4363 Mon Sep 17 00:00:00 2001 From: Paul Date: Sat, 13 Oct 2012 12:20:50 +1300 Subject: [PATCH 47/52] Revert to original sound settings --- .../include/mach/qdsp5v2/marimba_profile.h | 18 +- arch/arm/mach-msm/qdsp5v2/Makefile | 2 - arch/arm/mach-msm/qdsp5v2/adsp.c | 0 arch/arm/mach-msm/qdsp5v2/adsp.h | 0 arch/arm/mach-msm/qdsp5v2/adsp_driver.c | 0 arch/arm/mach-msm/qdsp5v2/adsp_info.c | 0 arch/arm/mach-msm/qdsp5v2/afe.c | 0 arch/arm/mach-msm/qdsp5v2/audio_a2dp_in.c | 4 +- arch/arm/mach-msm/qdsp5v2/audio_aac.c | 0 arch/arm/mach-msm/qdsp5v2/audio_aac_in.c | 4 +- arch/arm/mach-msm/qdsp5v2/audio_acdb.c | 3 +- arch/arm/mach-msm/qdsp5v2/audio_adpcm.c | 0 arch/arm/mach-msm/qdsp5v2/audio_amrnb.c | 0 arch/arm/mach-msm/qdsp5v2/audio_amrnb_in.c | 2 +- arch/arm/mach-msm/qdsp5v2/audio_amrwb.c | 0 arch/arm/mach-msm/qdsp5v2/audio_dev_ctl.c | 0 arch/arm/mach-msm/qdsp5v2/audio_evrc.c | 0 arch/arm/mach-msm/qdsp5v2/audio_evrc_in.c | 2 +- arch/arm/mach-msm/qdsp5v2/audio_fm.c | 0 arch/arm/mach-msm/qdsp5v2/audio_interct.c | 0 arch/arm/mach-msm/qdsp5v2/audio_lpa.c | 48 +- arch/arm/mach-msm/qdsp5v2/audio_mp3.c | 0 arch/arm/mach-msm/qdsp5v2/audio_mvs.c | 30 +- arch/arm/mach-msm/qdsp5v2/audio_out.c | 0 arch/arm/mach-msm/qdsp5v2/audio_pcm.c | 0 arch/arm/mach-msm/qdsp5v2/audio_pcm_in.c | 4 +- arch/arm/mach-msm/qdsp5v2/audio_qcelp.c | 0 arch/arm/mach-msm/qdsp5v2/audio_qcelp_in.c | 2 +- arch/arm/mach-msm/qdsp5v2/audio_wma.c | 0 arch/arm/mach-msm/qdsp5v2/audio_wmapro.c | 0 arch/arm/mach-msm/qdsp5v2/audpp.c | 0 arch/arm/mach-msm/qdsp5v2/audpreproc.c | 0 arch/arm/mach-msm/qdsp5v2/aux_pcm.c | 0 arch/arm/mach-msm/qdsp5v2/lpa.c | 0 arch/arm/mach-msm/qdsp5v2/mi2s.c | 0 arch/arm/mach-msm/qdsp5v2/mp3_funcs.c | 0 arch/arm/mach-msm/qdsp5v2/pcm_funcs.c | 0 .../mach-msm/qdsp5v2/snddev_data_marimba.c | 178 ++---- .../mach-msm/qdsp5v2/snddev_data_timpani.c | 553 +----------------- .../qdsp5v2/snddev_data_timpani_c8860.c | 36 -- arch/arm/mach-msm/qdsp5v2/snddev_ecodec.c | 0 arch/arm/mach-msm/qdsp5v2/snddev_icodec.c | 0 arch/arm/mach-msm/qdsp5v2/snddev_mi2s.c | 0 arch/arm/mach-msm/qdsp5v2/snddev_virtual.c | 0 .../mach-msm/qdsp5v2/timpani_profile_7x30.h | 172 +----- .../qdsp5v2/timpani_profile_7x30_c8860.h | 46 +- arch/arm/mach-msm/qdsp5v2/voice.c | 2 +- sound/soc/msm/Kconfig | 8 - sound/soc/msm/Makefile | 5 +- sound/soc/msm/lpass-dma.c | 0 sound/soc/msm/lpass-i2s.c | 0 sound/soc/msm/lpass-pcm.c | 0 sound/soc/msm/lpass-pcm.h | 0 sound/soc/msm/msm-compr-q6.c | 12 +- sound/soc/msm/msm-dai-fe.c | 39 +- sound/soc/msm/msm-dai-q6.c | 320 ++-------- sound/soc/msm/msm-dai.c | 0 sound/soc/msm/msm-mvs.c | 0 sound/soc/msm/msm-pcm-afe.c | 0 sound/soc/msm/msm-pcm-afe.h | 0 sound/soc/msm/msm-pcm-hostless.c | 0 sound/soc/msm/msm-pcm-lpa.c | 38 +- sound/soc/msm/msm-pcm-q6.c | 29 +- sound/soc/msm/msm-pcm-q6.h | 2 +- sound/soc/msm/msm-pcm-routing.c | 211 +------ sound/soc/msm/msm-pcm-routing.h | 15 +- sound/soc/msm/msm-pcm-voice.c | 33 +- sound/soc/msm/msm-pcm-voice.h | 0 sound/soc/msm/msm-pcm-voip.c | 0 sound/soc/msm/msm-pcm.c | 0 sound/soc/msm/msm-pcm.h | 0 sound/soc/msm/msm-voip.c | 0 sound/soc/msm/msm7201.c | 0 sound/soc/msm/msm7k-pcm.c | 0 sound/soc/msm/msm7kv2-dai.c | 0 sound/soc/msm/msm7kv2-dsp.c | 0 sound/soc/msm/msm7kv2-pcm.c | 0 sound/soc/msm/msm7kv2-pcm.h | 0 sound/soc/msm/msm7x30.c | 0 sound/soc/msm/msm8660-apq-wm8903.c | 0 sound/soc/msm/msm8660.c | 0 sound/soc/msm/msm8960.c | 281 ++------- sound/soc/msm/msm8x60-dai.c | 0 sound/soc/msm/msm8x60-pcm.c | 0 sound/soc/msm/msm8x60-pcm.h | 0 sound/soc/msm/msm8x60.c | 0 sound/soc/msm/msm_audio_mvs.h | 0 sound/soc/msm/mvs-dai.c | 0 sound/soc/msm/qdsp6/Makefile | 0 sound/soc/msm/qdsp6/q6adm.c | 226 +------ sound/soc/msm/qdsp6/q6afe.c | 262 +-------- sound/soc/msm/qdsp6/q6asm.c | 68 +-- sound/soc/msm/qdsp6/q6voice.c | 524 +---------------- sound/soc/msm/qdsp6/q6voice.h | 73 +-- 94 files changed, 358 insertions(+), 2894 deletions(-) mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/adsp.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/adsp.h mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/adsp_driver.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/adsp_info.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/afe.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_a2dp_in.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_aac.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_aac_in.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_adpcm.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_amrnb.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_amrnb_in.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_amrwb.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_dev_ctl.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_evrc.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_evrc_in.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_fm.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_interct.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_lpa.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_mp3.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_mvs.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_out.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_pcm.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_pcm_in.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_qcelp.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_qcelp_in.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_wma.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audio_wmapro.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audpp.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/audpreproc.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/aux_pcm.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/lpa.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/mi2s.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/mp3_funcs.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/pcm_funcs.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/snddev_ecodec.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/snddev_icodec.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/snddev_mi2s.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/snddev_virtual.c mode change 100644 => 100755 arch/arm/mach-msm/qdsp5v2/voice.c mode change 100644 => 100755 sound/soc/msm/Kconfig mode change 100644 => 100755 sound/soc/msm/Makefile mode change 100644 => 100755 sound/soc/msm/lpass-dma.c mode change 100644 => 100755 sound/soc/msm/lpass-i2s.c mode change 100644 => 100755 sound/soc/msm/lpass-pcm.c mode change 100644 => 100755 sound/soc/msm/lpass-pcm.h mode change 100755 => 100644 sound/soc/msm/msm-compr-q6.c mode change 100644 => 100755 sound/soc/msm/msm-dai-fe.c mode change 100644 => 100755 sound/soc/msm/msm-dai.c mode change 100644 => 100755 sound/soc/msm/msm-mvs.c mode change 100644 => 100755 sound/soc/msm/msm-pcm-afe.c mode change 100644 => 100755 sound/soc/msm/msm-pcm-afe.h mode change 100644 => 100755 sound/soc/msm/msm-pcm-hostless.c mode change 100644 => 100755 sound/soc/msm/msm-pcm-voice.h mode change 100644 => 100755 sound/soc/msm/msm-pcm-voip.c mode change 100644 => 100755 sound/soc/msm/msm-pcm.c mode change 100644 => 100755 sound/soc/msm/msm-pcm.h mode change 100644 => 100755 sound/soc/msm/msm-voip.c mode change 100644 => 100755 sound/soc/msm/msm7201.c mode change 100644 => 100755 sound/soc/msm/msm7k-pcm.c mode change 100644 => 100755 sound/soc/msm/msm7kv2-dai.c mode change 100644 => 100755 sound/soc/msm/msm7kv2-dsp.c mode change 100644 => 100755 sound/soc/msm/msm7kv2-pcm.c mode change 100644 => 100755 sound/soc/msm/msm7kv2-pcm.h mode change 100644 => 100755 sound/soc/msm/msm7x30.c mode change 100644 => 100755 sound/soc/msm/msm8660-apq-wm8903.c mode change 100644 => 100755 sound/soc/msm/msm8660.c mode change 100644 => 100755 sound/soc/msm/msm8x60-dai.c mode change 100644 => 100755 sound/soc/msm/msm8x60-pcm.c mode change 100644 => 100755 sound/soc/msm/msm8x60-pcm.h mode change 100644 => 100755 sound/soc/msm/msm8x60.c mode change 100644 => 100755 sound/soc/msm/msm_audio_mvs.h mode change 100644 => 100755 sound/soc/msm/mvs-dai.c mode change 100644 => 100755 sound/soc/msm/qdsp6/Makefile diff --git a/arch/arm/mach-msm/include/mach/qdsp5v2/marimba_profile.h b/arch/arm/mach-msm/include/mach/qdsp5v2/marimba_profile.h index 348a3e84c..5a6aca216 100755 --- a/arch/arm/mach-msm/include/mach/qdsp5v2/marimba_profile.h +++ b/arch/arm/mach-msm/include/mach/qdsp5v2/marimba_profile.h @@ -288,13 +288,13 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x13, 0xfc, 0x58)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x14, 0xff, 0x65)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x15, 0xff, 0x64)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x82, 0xff, 0x5A)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x82, 0xff, 0x5e)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x10, 0xFF, 0x68)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_READY}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0D, 0xF0, 0xd0)}, \ {ADIE_CODEC_ACTION_DELAY_WAIT, 0xbb8}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x14, 0x14)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8b, 0xff, 0xf4)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8b, 0xff, 0xe6)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8c, 0x03, 0x02)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x86, 0xff, 0x0c)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0x50, 0x40)}, \ @@ -1572,8 +1572,8 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x23, 0xff, 0x20)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0xFF, 0x08)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3c, 0xFF, 0x08)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x84, 0xff, 0x05)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x85, 0xff, 0x05)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x84, 0xff, 0x0b)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x85, 0xff, 0x0b)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0x0f, 0x0c)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_ANALOG_READY}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8a, 0x03, 0x03)}, \ @@ -3450,8 +3450,8 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x33, 0x80, 0x80)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x34, 0xf0, 0xf0)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x23, 0xff, 0x20)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0xFF, 0x04)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3c, 0xFF, 0x04)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0xFF, 0x14)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3c, 0xFF, 0x14)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x84, 0xff, 0x00)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x85, 0xff, 0x00)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0x0f, 0x0c)}, \ @@ -3876,10 +3876,10 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0D, 0xF0, 0xD0)}, \ {ADIE_CODEC_ACTION_DELAY_WAIT, 0xbb8}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x1c, 0x1c)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8b, 0xff, 0xCE)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8b, 0xff, 0xce)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8c, 0x03, 0x03)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x87, 0xff, 0x0E)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x86, 0xff, 0x0E)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x87, 0xff, 0x0e)}, \ + {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x86, 0xff, 0x0e)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0xc0)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_ANALOG_READY}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0x30, 0x30)}, \ diff --git a/arch/arm/mach-msm/qdsp5v2/Makefile b/arch/arm/mach-msm/qdsp5v2/Makefile index 050c77755..3f5e30a20 100755 --- a/arch/arm/mach-msm/qdsp5v2/Makefile +++ b/arch/arm/mach-msm/qdsp5v2/Makefile @@ -7,9 +7,7 @@ obj-y += snddev_icodec.o endif obj-$(CONFIG_MARIMBA_CODEC) += snddev_data_marimba.o -# /*< DTS2011051303410 dongchen 20110516 begin */ obj-$(CONFIG_TIMPANI_CODEC) += snddev_data_timpani.o snddev_data_timpani_c8860.o -# /* DTS2011051303410 dongchen 20110516 end >*/ obj-y += audio_pcm.o audpp.o audio_mp3.o audio_wma.o audio_aac.o audio_amrnb.o obj-y += audio_amrwb.o audio_wmapro.o audio_adpcm.o audio_evrc.o audio_qcelp.o diff --git a/arch/arm/mach-msm/qdsp5v2/adsp.c b/arch/arm/mach-msm/qdsp5v2/adsp.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/adsp.h b/arch/arm/mach-msm/qdsp5v2/adsp.h old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/adsp_driver.c b/arch/arm/mach-msm/qdsp5v2/adsp_driver.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/adsp_info.c b/arch/arm/mach-msm/qdsp5v2/adsp_info.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/afe.c b/arch/arm/mach-msm/qdsp5v2/afe.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_a2dp_in.c b/arch/arm/mach-msm/qdsp5v2/audio_a2dp_in.c old mode 100644 new mode 100755 index 60b5c200c..6166de262 --- a/arch/arm/mach-msm/qdsp5v2/audio_a2dp_in.c +++ b/arch/arm/mach-msm/qdsp5v2/audio_a2dp_in.c @@ -372,8 +372,10 @@ static int auda2dp_in_enc_config(struct audio_a2dp_in *audio, int enable) memset(&cmd, 0, sizeof(cmd)); if (audio->build_id[17] == '1') { cmd.cmd_id = AUDPREPROC_AUDREC_CMD_ENC_CFG_2; + MM_ERR("sending AUDPREPROC_AUDREC_CMD_ENC_CFG_2 command"); } else { cmd.cmd_id = AUDPREPROC_AUDREC_CMD_ENC_CFG; + MM_ERR("sending AUDPREPROC_AUDREC_CMD_ENC_CFG command"); } cmd.stream_id = audio->enc_id; @@ -948,7 +950,7 @@ static int auda2dp_in_open(struct inode *inode, struct file *file) goto evt_error; } audio->build_id = socinfo_get_build_id(); - MM_DBG("Modem build id = %s\n", audio->build_id); + MM_ERR("build id used is = %s\n", audio->build_id); file->private_data = audio; audio->opened = 1; rc = 0; diff --git a/arch/arm/mach-msm/qdsp5v2/audio_aac.c b/arch/arm/mach-msm/qdsp5v2/audio_aac.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_aac_in.c b/arch/arm/mach-msm/qdsp5v2/audio_aac_in.c old mode 100644 new mode 100755 index 010fd90a9..da77140e7 --- a/arch/arm/mach-msm/qdsp5v2/audio_aac_in.c +++ b/arch/arm/mach-msm/qdsp5v2/audio_aac_in.c @@ -575,6 +575,7 @@ static int audaac_in_enc_config(struct audio_in *audio, int enable) { struct audpreproc_audrec_cmd_enc_cfg cmd; memset(&cmd, 0, sizeof(cmd)); + MM_ERR("build_id[17] = %c", audio->build_id[17]); if (audio->build_id[17] == '1') { cmd.cmd_id = AUDPREPROC_AUDREC_CMD_ENC_CFG_2; MM_ERR("sending AUDPREPROC_AUDREC_CMD_ENC_CFG_2 command"); @@ -1411,8 +1412,9 @@ static int audaac_in_open(struct inode *inode, struct file *file) MM_DBG("write buf: phy addr 0x%08x kernel addr 0x%08x\n", audio->out_phys, (int)audio->out_data); } + MM_ERR("trying to get the build id\n"); audio->build_id = socinfo_get_build_id(); - MM_DBG("Modem build id = %s\n", audio->build_id); + MM_ERR("build id used is = %s\n", audio->build_id); /* Initialize buffer */ audio->out[0].data = audio->out_data + 0; diff --git a/arch/arm/mach-msm/qdsp5v2/audio_acdb.c b/arch/arm/mach-msm/qdsp5v2/audio_acdb.c index f97022637..e95e5fdb7 100755 --- a/arch/arm/mach-msm/qdsp5v2/audio_acdb.c +++ b/arch/arm/mach-msm/qdsp5v2/audio_acdb.c @@ -1368,13 +1368,11 @@ static s32 acdb_get_calibration(void) acdb_cmd.command_id = ACDB_GET_DEVICE_TABLE; acdb_cmd.device_id = acdb_data.device_info->acdb_id; - /*< DTS2010120204486 dongchen 20101223 begin */ #ifdef CONFIG_HUAWEI_KERNEL acdb_cmd.network_id = ACDB_GSM_NB; //0x0108b155 #else acdb_cmd.network_id = 0x0108B153; #endif - /* DTS2010120204486 dongchen 20101223 end >*/ acdb_cmd.sample_rate_id = acdb_data.device_info->sample_rate; acdb_cmd.total_bytes = ACDB_BUF_SIZE; acdb_cmd.phys_buf = (u32 *)acdb_data.phys_addr; @@ -3294,6 +3292,7 @@ static s32 acdb_calibrate_device(void *data) result = acdb_initialize_data(); if (result) goto done; + MM_ERR("acdb_data.build_id[17] = %c\n", acdb_data.build_id[17]); if (acdb_data.build_id[17] != '0') { result = initialize_modem_acdb(); if (result < 0) diff --git a/arch/arm/mach-msm/qdsp5v2/audio_adpcm.c b/arch/arm/mach-msm/qdsp5v2/audio_adpcm.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_amrnb.c b/arch/arm/mach-msm/qdsp5v2/audio_amrnb.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_amrnb_in.c b/arch/arm/mach-msm/qdsp5v2/audio_amrnb_in.c old mode 100644 new mode 100755 index bdb5bb1e8..e1af44f64 --- a/arch/arm/mach-msm/qdsp5v2/audio_amrnb_in.c +++ b/arch/arm/mach-msm/qdsp5v2/audio_amrnb_in.c @@ -863,7 +863,7 @@ static int audamrnb_in_open(struct inode *inode, struct file *file) goto evt_error; } audio->build_id = socinfo_get_build_id(); - MM_DBG("Modem build id = %s\n", audio->build_id); + MM_ERR("build id used is = %s\n", audio->build_id); file->private_data = audio; audio->opened = 1; diff --git a/arch/arm/mach-msm/qdsp5v2/audio_amrwb.c b/arch/arm/mach-msm/qdsp5v2/audio_amrwb.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_dev_ctl.c b/arch/arm/mach-msm/qdsp5v2/audio_dev_ctl.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_evrc.c b/arch/arm/mach-msm/qdsp5v2/audio_evrc.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_evrc_in.c b/arch/arm/mach-msm/qdsp5v2/audio_evrc_in.c old mode 100644 new mode 100755 index 50621c994..c0861532e --- a/arch/arm/mach-msm/qdsp5v2/audio_evrc_in.c +++ b/arch/arm/mach-msm/qdsp5v2/audio_evrc_in.c @@ -1470,7 +1470,7 @@ static int audevrc_in_open(struct inode *inode, struct file *file) audio->opened = 1; audio->out_frame_cnt++; audio->build_id = socinfo_get_build_id(); - MM_DBG("Modem build id = %s\n", audio->build_id); + MM_ERR("build id used is = %s\n", audio->build_id); done: mutex_unlock(&audio->lock); diff --git a/arch/arm/mach-msm/qdsp5v2/audio_fm.c b/arch/arm/mach-msm/qdsp5v2/audio_fm.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_interct.c b/arch/arm/mach-msm/qdsp5v2/audio_interct.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_lpa.c b/arch/arm/mach-msm/qdsp5v2/audio_lpa.c old mode 100644 new mode 100755 index c38fefc22..0bfd59f5d --- a/arch/arm/mach-msm/qdsp5v2/audio_lpa.c +++ b/arch/arm/mach-msm/qdsp5v2/audio_lpa.c @@ -556,6 +556,8 @@ static void audlpa_async_send_buffer(struct audio *audio) if ((signed)(temp >= 0) && ((signed)(next_buf->buf.data_len - temp) >= 0)) { + MM_DBG("audlpa_async_send_buffer - sending the" + "rest of the buffer bassedon AV sync"); cmd.buf_ptr = (unsigned) (next_buf->paddr + (next_buf->buf.data_len - temp)); @@ -567,6 +569,21 @@ static void audlpa_async_send_buffer(struct audio *audio) audplay_send_queue0(audio, &cmd, sizeof(cmd)); audio->out_needed = 0; audio->drv_status |= ADRV_STATUS_OBUF_GIVEN; + } else if ((signed)(temp >= 0) && + ((signed)(next_buf->buf.data_len - + temp) < 0)) { + MM_DBG("audlpa_async_send_buffer - else case:" + "sending the rest of the buffer bassedon" + "AV sync"); + cmd.buf_ptr = (unsigned) next_buf->paddr; + cmd.buf_size = next_buf->buf.data_len >> 1; + cmd.partition_number = 0; + audio->bytecount_given = audio->bytecount_head + + next_buf->buf.data_len; + wmb(); + audplay_send_queue0(audio, &cmd, sizeof(cmd)); + audio->out_needed = 0; + audio->drv_status |= ADRV_STATUS_OBUF_GIVEN; } } } @@ -603,15 +620,19 @@ static void audlpa_async_send_data(struct audio *audio, unsigned needed, temp = audio->bytecount_head; used_buf = list_first_entry(&audio->out_queue, struct audlpa_buffer_node, list); - - audio->bytecount_head += used_buf->buf.data_len; - temp = audio->bytecount_head; - list_del(&used_buf->list); - evt_payload.aio_buf = used_buf->buf; - audlpa_post_event(audio, AUDIO_EVENT_WRITE_DONE, - evt_payload); - kfree(used_buf); - audio->drv_status &= ~ADRV_STATUS_OBUF_GIVEN; + if (audio->device_switch != + DEVICE_SWITCH_STATE_COMPLETE) { + audio->bytecount_head += + used_buf->buf.data_len; + temp = audio->bytecount_head; + list_del(&used_buf->list); + evt_payload.aio_buf = used_buf->buf; + audlpa_post_event(audio, + AUDIO_EVENT_WRITE_DONE, + evt_payload); + kfree(used_buf); + audio->drv_status &= ~ADRV_STATUS_OBUF_GIVEN; + } } } if (audio->out_needed) { @@ -1147,6 +1168,15 @@ static long audio_ioctl(struct file *file, unsigned int cmd, unsigned long arg) audio->wflush = 1; audio_ioport_reset(audio); if (audio->running) { + if (!(audio->drv_status & ADRV_STATUS_PAUSE)) { + rc = audpp_pause(audio->dec_id, (int) arg); + if (rc < 0) { + MM_ERR("%s: pause cmd failed rc=%d\n", + __func__, rc); + rc = -EINTR; + break; + } + } audpp_flush(audio->dec_id); rc = wait_event_interruptible(audio->write_wait, !audio->wflush); diff --git a/arch/arm/mach-msm/qdsp5v2/audio_mp3.c b/arch/arm/mach-msm/qdsp5v2/audio_mp3.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_mvs.c b/arch/arm/mach-msm/qdsp5v2/audio_mvs.c old mode 100644 new mode 100755 index dc41bf41d..fae240120 --- a/arch/arm/mach-msm/qdsp5v2/audio_mvs.c +++ b/arch/arm/mach-msm/qdsp5v2/audio_mvs.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2010-2012, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -276,7 +276,7 @@ union codec_param { struct audio_mvs_dl_reply { struct rpc_reply_hdr reply_hdr; - uint32_t voc_pkt[MVS_MAX_VOC_PKT_SIZE/4]; + uint32_t voc_pkt[Q5V2_MVS_MAX_VOC_PKT_SIZE/4]; uint32_t valid_frame_info_ptr; uint32_t frame_mode; @@ -288,7 +288,7 @@ struct audio_mvs_dl_reply { struct audio_mvs_buf_node { struct list_head list; - struct msm_audio_mvs_frame frame; + struct q5v2_msm_audio_mvs_frame frame; }; /* Each buffer is 20 ms, queue holds 200 ms of data. */ @@ -933,10 +933,15 @@ static void audio_mvs_process_rpc_request(uint32_t procedure, pr_debug("%s: UL AMR frame_type %d\n", __func__, be32_to_cpu(*args)); - } else if ((frame_mode == MVS_FRAME_MODE_PCM_UL) || - (frame_mode == MVS_FRAME_MODE_VOC_TX)) { - /* PCM and EVRC don't have frame_type */ + } else if (frame_mode == MVS_FRAME_MODE_PCM_UL) { + /* PCM don't have frame_type */ buf_node->frame.frame_type = 0; + } else if (frame_mode == MVS_FRAME_MODE_VOC_TX) { + /* Extracting EVRC current buffer frame rate*/ + buf_node->frame.frame_type = be32_to_cpu(*args); + + pr_debug("%s: UL EVRC frame_type %d\n", + __func__, be32_to_cpu(*args)); } else if (frame_mode == MVS_FRAME_MODE_G711_UL) { /* Extract G711 frame type. */ buf_node->frame.frame_type = be32_to_cpu(*args); @@ -1065,7 +1070,7 @@ static void audio_mvs_process_rpc_request(uint32_t procedure, cpu_to_be32(AUDIO_MVS_PKT_NORMAL); } else if (frame_mode == MVS_FRAME_MODE_VOC_RX) { dl_reply.cdc_param.gnr_arg.param1 = - cpu_to_be32(audio->rate_type); + cpu_to_be32(buf_node->frame.frame_type); dl_reply.cdc_param.gnr_arg.param2 = 0; dl_reply.cdc_param.\ gnr_arg.valid_pkt_status_ptr = @@ -1427,7 +1432,7 @@ static ssize_t audio_mvs_read(struct file *file, if ((audio->state == AUDIO_MVS_STARTED) && (!list_empty(&audio->out_queue))) { - if (count >= sizeof(struct msm_audio_mvs_frame)) { + if (count >= sizeof(struct q5v2_msm_audio_mvs_frame)) { buf_node = list_first_entry(&audio->out_queue, struct audio_mvs_buf_node, list); @@ -1435,7 +1440,8 @@ static ssize_t audio_mvs_read(struct file *file, rc = copy_to_user(buf, &buf_node->frame, - sizeof(struct msm_audio_mvs_frame)); + sizeof(struct q5v2_msm_audio_mvs_frame) + ); if (rc == 0) { rc = buf_node->frame.len + @@ -1453,7 +1459,7 @@ static ssize_t audio_mvs_read(struct file *file, } else { pr_err("%s: Read count %d < sizeof(frame) %d", __func__, count, - sizeof(struct msm_audio_mvs_frame)); + sizeof(struct q5v2_msm_audio_mvs_frame)); rc = -ENOMEM; } @@ -1491,7 +1497,7 @@ static ssize_t audio_mvs_write(struct file *file, mutex_lock(&audio->in_lock); if (audio->state == AUDIO_MVS_STARTED) { - if (count <= sizeof(struct msm_audio_mvs_frame)) { + if (count <= sizeof(struct q5v2_msm_audio_mvs_frame)) { if (!list_empty(&audio->free_in_queue)) { buf_node = list_first_entry(&audio->free_in_queue, @@ -1511,7 +1517,7 @@ static ssize_t audio_mvs_write(struct file *file, } else { pr_err("%s: Write count %d < sizeof(frame) %d", __func__, count, - sizeof(struct msm_audio_mvs_frame)); + sizeof(struct q5v2_msm_audio_mvs_frame)); rc = -ENOMEM; } diff --git a/arch/arm/mach-msm/qdsp5v2/audio_out.c b/arch/arm/mach-msm/qdsp5v2/audio_out.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_pcm.c b/arch/arm/mach-msm/qdsp5v2/audio_pcm.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_pcm_in.c b/arch/arm/mach-msm/qdsp5v2/audio_pcm_in.c old mode 100644 new mode 100755 index a5a9bd27e..43f3d262d --- a/arch/arm/mach-msm/qdsp5v2/audio_pcm_in.c +++ b/arch/arm/mach-msm/qdsp5v2/audio_pcm_in.c @@ -638,6 +638,7 @@ static long audpcm_in_ioctl(struct file *file, rc = -EFAULT; break; } + MM_ERR("build_id[17] = %c\n", audio->build_id[17]); if (audio->build_id[17] == '1') { audio->enc_type = ENC_TYPE_EXT_WAV | audio->mode; if (cfg.channel_count == 1) { @@ -682,6 +683,7 @@ static long audpcm_in_ioctl(struct file *file, MM_ERR("wrong build_id = %s\n", audio->build_id); return -ENODEV; } + MM_ERR("buffer size configured is = %d\n", audio->buffer_size); audio->samp_rate = cfg.sample_rate; audio->channel_mode = cfg.channel_count; break; @@ -939,7 +941,7 @@ static int audpcm_in_open(struct inode *inode, struct file *file) audio->opened = 1; rc = 0; audio->build_id = socinfo_get_build_id(); - MM_DBG("Modem build id = %s\n", audio->build_id); + MM_ERR("build id used is = %s\n", audio->build_id); done: mutex_unlock(&audio->lock); return rc; diff --git a/arch/arm/mach-msm/qdsp5v2/audio_qcelp.c b/arch/arm/mach-msm/qdsp5v2/audio_qcelp.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_qcelp_in.c b/arch/arm/mach-msm/qdsp5v2/audio_qcelp_in.c old mode 100644 new mode 100755 index d34499dff..11599f8e5 --- a/arch/arm/mach-msm/qdsp5v2/audio_qcelp_in.c +++ b/arch/arm/mach-msm/qdsp5v2/audio_qcelp_in.c @@ -1475,7 +1475,7 @@ static int audqcelp_in_open(struct inode *inode, struct file *file) audio->opened = 1; audio->out_frame_cnt++; audio->build_id = socinfo_get_build_id(); - MM_DBG("Modem build id = %s\n", audio->build_id); + MM_ERR("build id used is = %s\n", audio->build_id); done: mutex_unlock(&audio->lock); return rc; diff --git a/arch/arm/mach-msm/qdsp5v2/audio_wma.c b/arch/arm/mach-msm/qdsp5v2/audio_wma.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/audio_wmapro.c b/arch/arm/mach-msm/qdsp5v2/audio_wmapro.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/audpp.c b/arch/arm/mach-msm/qdsp5v2/audpp.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/audpreproc.c b/arch/arm/mach-msm/qdsp5v2/audpreproc.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/aux_pcm.c b/arch/arm/mach-msm/qdsp5v2/aux_pcm.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/lpa.c b/arch/arm/mach-msm/qdsp5v2/lpa.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/mi2s.c b/arch/arm/mach-msm/qdsp5v2/mi2s.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/mp3_funcs.c b/arch/arm/mach-msm/qdsp5v2/mp3_funcs.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/pcm_funcs.c b/arch/arm/mach-msm/qdsp5v2/pcm_funcs.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c b/arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c index f2ca9d9de..ef65ceda9 100755 --- a/arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c +++ b/arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c @@ -83,7 +83,6 @@ static struct platform_device msm_iearpiece_device = { .dev = { .platform_data = &snddev_iearpiece_data }, }; -/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -118,10 +117,10 @@ static struct snddev_icodec_data snddev_iearpiece_data_u8800 = { .pamp_on = NULL, .pamp_off = NULL, .property = SIDE_TONE_MASK, - .max_voice_rx_vol[VOC_NB_INDEX] = -700, - .min_voice_rx_vol[VOC_NB_INDEX] = -2200, - .max_voice_rx_vol[VOC_WB_INDEX] = -700, - .min_voice_rx_vol[VOC_WB_INDEX] = -2200 + .max_voice_rx_vol[VOC_NB_INDEX] = 1000, + .min_voice_rx_vol[VOC_NB_INDEX] = -1000, + .max_voice_rx_vol[VOC_WB_INDEX] = 1000, + .min_voice_rx_vol[VOC_WB_INDEX] = -1000 }; static struct platform_device msm_iearpiece_device_u8800 = { @@ -194,7 +193,7 @@ static struct adie_codec_dev_profile iearpiece_profile_u8800_51 = { .settings = iearpiece_settings_u8800_51, .setting_sz = ARRAY_SIZE(iearpiece_settings_u8800_51), }; -/*< DTS2012072504870 caiying 20120725 begin */ + static struct snddev_icodec_data snddev_iearpiece_data_u8800_51 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), .name = "handset_rx", @@ -208,12 +207,12 @@ static struct snddev_icodec_data snddev_iearpiece_data_u8800_51 = { .pamp_on = NULL, .pamp_off = NULL, .property = SIDE_TONE_MASK, - .max_voice_rx_vol[VOC_NB_INDEX] = 800, - .min_voice_rx_vol[VOC_NB_INDEX] = -700, - .max_voice_rx_vol[VOC_WB_INDEX] = 800, - .min_voice_rx_vol[VOC_WB_INDEX] = -700 + .max_voice_rx_vol[VOC_NB_INDEX] = -200, + .min_voice_rx_vol[VOC_NB_INDEX] = -1700, + .max_voice_rx_vol[VOC_WB_INDEX] = -200, + .min_voice_rx_vol[VOC_WB_INDEX] = -1700 }; -/* DTS2012072504870 caiying 20120725 end >*/ + static struct platform_device msm_iearpiece_device_u8800_51 = { .name = "snddev_icodec", .id = 0, @@ -221,9 +220,7 @@ static struct platform_device msm_iearpiece_device_u8800_51 = { }; /* U8800-51 device end >*/ #endif -/* DTS2011010400519 dongchen 20110104 end >*/ -/*< DTS2011021900121 dongchen 20110217 begin */ /* HAC handset */ static struct adie_codec_action_unit iearpiece_hac_48KHz_osr256_actions[] = HANDSET_HAC_RX_48000_OSR_256; @@ -266,7 +263,6 @@ static struct platform_device msm_iearpiece_hac_device = { .id = 35, .dev = { .platform_data = &snddev_iearpiece_hac_data }, }; -/* DTS2011021900121 dongchen 20110217 end >*/ static struct adie_codec_action_unit imic_8KHz_osr256_actions[] = HANDSET_TX_8000_OSR_256; @@ -326,7 +322,6 @@ static struct platform_device msm_imic_device = { .dev = { .platform_data = &snddev_imic_data }, }; -/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -509,7 +504,6 @@ static struct platform_device msm_imic_device_u8800_51 = { }; /* U8800-51 device end >*/ #endif -/* DTS2011010400519 dongchen 20110104 end >*/ static struct adie_codec_action_unit ihs_stereo_rx_48KHz_osr256_actions[] = HEADSET_STEREO_RX_LEGACY_48000_OSR_256; @@ -551,7 +545,6 @@ static struct platform_device msm_ihs_stereo_rx_device = { .dev = { .platform_data = &snddev_ihs_stereo_rx_data }, }; -/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -583,10 +576,10 @@ static struct snddev_icodec_data snddev_ihs_stereo_rx_data_u8800 = { .default_sample_rate = 48000, .pamp_on = msm_snddev_hsed_voltage_on, .pamp_off = msm_snddev_hsed_voltage_off, - .max_voice_rx_vol[VOC_NB_INDEX] = -300, - .min_voice_rx_vol[VOC_NB_INDEX] = -1800, - .max_voice_rx_vol[VOC_WB_INDEX] = -500, - .min_voice_rx_vol[VOC_WB_INDEX] = -2000 + .max_voice_rx_vol[VOC_NB_INDEX] = -500, + .min_voice_rx_vol[VOC_NB_INDEX] = -2000, + .max_voice_rx_vol[VOC_WB_INDEX] = -700, + .min_voice_rx_vol[VOC_WB_INDEX] = -2200 }; static struct platform_device msm_ihs_stereo_rx_device_u8800 = { @@ -656,7 +649,7 @@ static struct adie_codec_dev_profile ihs_stereo_rx_profile_u8800_51 = { .settings = ihs_stereo_rx_settings_u8800_51, .setting_sz = ARRAY_SIZE(ihs_stereo_rx_settings_u8800_51), }; -/*< DTS2012072504870 caiying 20120725 begin */ + static struct snddev_icodec_data snddev_ihs_stereo_rx_data_u8800_51 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), .name = "headset_stereo_rx", @@ -667,12 +660,12 @@ static struct snddev_icodec_data snddev_ihs_stereo_rx_data_u8800_51 = { .default_sample_rate = 48000, .pamp_on = msm_snddev_hsed_voltage_on, .pamp_off = msm_snddev_hsed_voltage_off, - .max_voice_rx_vol[VOC_NB_INDEX] = 400, - .min_voice_rx_vol[VOC_NB_INDEX] = -1100, - .max_voice_rx_vol[VOC_WB_INDEX] = 400, - .min_voice_rx_vol[VOC_WB_INDEX] = -1100 + .max_voice_rx_vol[VOC_NB_INDEX] = -300, + .min_voice_rx_vol[VOC_NB_INDEX] = -1800, + .max_voice_rx_vol[VOC_WB_INDEX] = -500, + .min_voice_rx_vol[VOC_WB_INDEX] = -2000 }; -/* DTS2012072504870 caiying 20120725 end >*/ + static struct platform_device msm_ihs_stereo_rx_device_u8800_51 = { .name = "snddev_icodec", .id = 2, @@ -680,8 +673,6 @@ static struct platform_device msm_ihs_stereo_rx_device_u8800_51 = { }; /* U8800-51 device end >*/ #endif -/* DTS2011010400519 dongchen 20110104 end >*/ -/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -813,7 +804,6 @@ static struct platform_device msm_ihs_music_stereo_rx_device_u8800_51 = { }; /* U8800-51 device end >*/ #endif -/* DTS2011010400519 dongchen 20110104 end >*/ static struct adie_codec_action_unit ihs_mono_rx_48KHz_osr256_actions[] = HEADSET_RX_LEGACY_48000_OSR_256; @@ -1027,7 +1017,6 @@ static struct platform_device msm_ihs_mono_tx_device = { .dev = { .platform_data = &snddev_ihs_mono_tx_data }, }; -/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -1204,7 +1193,6 @@ static struct platform_device msm_ihs_mono_tx_device_u8800_51 = { }; /* U8800-51 device end >*/ #endif -/* DTS2011010400519 dongchen 20110104 end >*/ static struct adie_codec_action_unit ifmradio_handset_osr64_actions[] = FM_HANDSET_OSR_64; @@ -1287,7 +1275,6 @@ static struct platform_device msm_ispeaker_rx_device = { }; -/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -1313,7 +1300,7 @@ static struct snddev_icodec_data snddev_ispeaker_rx_data_u8800 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), .name = "speaker_stereo_rx", .copp_id = 0, - .acdb_id = ACDB_ID_SPKR_PHONE_MONO, //7, + .acdb_id = ACDB_ID_SPKR_PHONE_MUSIC_MONO, //7, //ACDB_ID_SPKR_PHONE_MONO, //7, .profile = &ispeaker_rx_profile_u8800, .channel_mode = 1,//single channel for u8800 .pmctl_id = NULL, @@ -1321,10 +1308,10 @@ static struct snddev_icodec_data snddev_ispeaker_rx_data_u8800 = { .default_sample_rate = 48000, .pamp_on = &msm_snddev_poweramp_on, .pamp_off = &msm_snddev_poweramp_off, - .max_voice_rx_vol[VOC_NB_INDEX] = 200, - .min_voice_rx_vol[VOC_NB_INDEX] = -1300, - .max_voice_rx_vol[VOC_WB_INDEX] = 200, - .min_voice_rx_vol[VOC_WB_INDEX] = -1300 + .max_voice_rx_vol[VOC_NB_INDEX] = 0, + .min_voice_rx_vol[VOC_NB_INDEX] = -1500, + .max_voice_rx_vol[VOC_WB_INDEX] = 0, + .min_voice_rx_vol[VOC_WB_INDEX] = -1500 }; static struct platform_device msm_ispeaker_rx_device_u8800 = { @@ -1335,7 +1322,6 @@ static struct platform_device msm_ispeaker_rx_device_u8800 = { /* U8800 device end >*/ /*< U8820 device begin */ -/*< DTS2011012602886 dongchen 20110126 begin */ static struct adie_codec_action_unit ispeaker_rx_48KHz_osr256_actions_u8820[] = SPEAKER_RX_48000_OSR_256_U8820; @@ -1358,7 +1344,7 @@ static struct snddev_icodec_data snddev_ispeaker_rx_data_u8820 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), .name = "speaker_stereo_rx", .copp_id = 0, - .acdb_id = ACDB_ID_SPKR_PHONE_MONO, //7, + .acdb_id = ACDB_ID_SPKR_PHONE_MUSIC_MONO, //7, //ACDB_ID_SPKR_PHONE_MONO, //7, .profile = &ispeaker_rx_profile_u8820, .channel_mode = 1,//single channel for u8800_51 .pmctl_id = NULL, @@ -1366,10 +1352,10 @@ static struct snddev_icodec_data snddev_ispeaker_rx_data_u8820 = { .default_sample_rate = 48000, .pamp_on = &msm_snddev_poweramp_on, .pamp_off = &msm_snddev_poweramp_off, - .max_voice_rx_vol[VOC_NB_INDEX] = 200, - .min_voice_rx_vol[VOC_NB_INDEX] = -1300, - .max_voice_rx_vol[VOC_WB_INDEX] = 200, - .min_voice_rx_vol[VOC_WB_INDEX] = -1300 + .max_voice_rx_vol[VOC_NB_INDEX] = 100, + .min_voice_rx_vol[VOC_NB_INDEX] = -1400, + .max_voice_rx_vol[VOC_WB_INDEX] = 100, + .min_voice_rx_vol[VOC_WB_INDEX] = -1400 }; static struct platform_device msm_ispeaker_rx_device_u8820 = { @@ -1377,7 +1363,6 @@ static struct platform_device msm_ispeaker_rx_device_u8820 = { .id = 8, .dev = { .platform_data = &snddev_ispeaker_rx_data_u8820 }, }; -/* DTS2011012602886 dongchen 20110126 end >*/ /* U8820 device end >*/ /*< U8800-51 device begin */ @@ -1398,7 +1383,7 @@ static struct adie_codec_dev_profile ispeaker_rx_profile_u8800_51 = { .settings = ispeaker_rx_settings_u8800_51, .setting_sz = ARRAY_SIZE(ispeaker_rx_settings_u8800_51), }; -/*< DTS2012072504870 caiying 20120725 begin */ + static struct snddev_icodec_data snddev_ispeaker_rx_data_u8800_51 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), .name = "speaker_stereo_rx", @@ -1411,12 +1396,12 @@ static struct snddev_icodec_data snddev_ispeaker_rx_data_u8800_51 = { .default_sample_rate = 48000, .pamp_on = &msm_snddev_poweramp_on, .pamp_off = &msm_snddev_poweramp_off, - .max_voice_rx_vol[VOC_NB_INDEX] = 500, - .min_voice_rx_vol[VOC_NB_INDEX] = -1000, - .max_voice_rx_vol[VOC_WB_INDEX] = 500, - .min_voice_rx_vol[VOC_WB_INDEX] = -1000 + .max_voice_rx_vol[VOC_NB_INDEX] = 200, + .min_voice_rx_vol[VOC_NB_INDEX] = -1300, + .max_voice_rx_vol[VOC_WB_INDEX] = 200, + .min_voice_rx_vol[VOC_WB_INDEX] = -1300 }; -/* DTS2012072504870 caiying 20120725 end >*/ + static struct platform_device msm_ispeaker_rx_device_u8800_51 = { .name = "snddev_icodec", .id = 8, @@ -1424,8 +1409,6 @@ static struct platform_device msm_ispeaker_rx_device_u8800_51 = { }; /* U8800-51 device end >*/ #endif -/* DTS2011010400519 dongchen 20110104 end >*/ -/*< DTS2011031005289 dongchen 20110329 begin */ /*< speaker ptt rx device begin */ static struct adie_codec_action_unit ispeaker_ptt_rx_48KHz_osr256_actions[] = SPEAKER_PTT_RX_48000_OSR_256; @@ -1526,8 +1509,6 @@ static struct platform_device msm_ispeaker_ptt_tx_device = { .dev = { .platform_data = &snddev_ispeaker_ptt_tx_data }, }; /* speaker ptt tx device end >*/ -/* DTS2011031005289 dongchen 20110329 end >*/ -/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -1576,7 +1557,6 @@ static struct platform_device msm_ispeaker_music_mono_rx_device_u8800 = { /* U8800 device end >*/ /*< U8820 device begin */ -/*< DTS2011012602886 dongchen 20110126 begin */ static struct adie_codec_action_unit ispeaker_music_mono_rx_48KHz_osr256_actions_u8820[] = SPEAKER_MUSIC_MONO_RX_48000_OSR_256_U8820; @@ -1619,7 +1599,6 @@ static struct platform_device msm_ispeaker_music_mono_rx_device_u8820 = { .dev = { .platform_data = &snddev_ispeaker_music_mono_rx_data_u8820 }, }; -/* DTS2011012602886 dongchen 20110126 end >*/ /* U8820 device end >*/ /*< U8800-51 device begin */ @@ -1667,7 +1646,6 @@ static struct platform_device msm_ispeaker_music_mono_rx_device_u8800_51 = { }; /* U8800-51 device end >*/ #endif -/* DTS2011010400519 dongchen 20110104 end >*/ static struct adie_codec_action_unit ifmradio_speaker_osr64_actions[] = FM_SPEAKER_OSR_64; @@ -1706,7 +1684,6 @@ static struct platform_device msm_ifmradio_speaker_device = { .dev = { .platform_data = &snddev_ifmradio_speaker_data }, }; -/*< DTS2010061001230 dongchen 20100610 begin */ //configure to capless mode due to SR.00329728 and our headset is class AB rather than class D. #ifdef CONFIG_HUAWEI_KERNEL static struct adie_codec_action_unit ifmradio_headset_osr64_actions[] = @@ -1715,7 +1692,6 @@ static struct adie_codec_action_unit ifmradio_headset_osr64_actions[] = static struct adie_codec_action_unit ifmradio_headset_osr64_actions[] = FM_HEADSET_STEREO_CLASS_D_LEGACY_OSR_64; #endif -/* DTS2010061001230 SR.00329728 dongchen 20100610 end >*/ static struct adie_codec_hwsetting_entry ifmradio_headset_settings[] = { { @@ -1732,7 +1708,6 @@ static struct adie_codec_dev_profile ifmradio_headset_profile = { .setting_sz = ARRAY_SIZE(ifmradio_headset_settings), }; -/* < DTS2010061100256 dongchen 20100611 begin */ #ifdef CONFIG_HUAWEI_KERNEL static struct snddev_icodec_data snddev_ifmradio_headset_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_FM), @@ -1760,7 +1735,6 @@ static struct snddev_icodec_data snddev_ifmradio_headset_data = { .dev_vol_type = SNDDEV_DEV_VOL_DIGITAL, }; #endif -/*DTS2010061100256 dongchen 20100611 end> */ static struct platform_device msm_ifmradio_headset_device = { .name = "snddev_icodec", @@ -1844,7 +1818,6 @@ struct platform_device msm_bt_sco_mic_device = { .dev = { .platform_data = &snddev_bt_sco_mic_data }, }; -/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -1916,7 +1889,6 @@ struct platform_device msm_bt_sco_earpiece_device_u8800_51 = { }; /* U8800-51 device end >*/ #endif -/* DTS2011010400519 dongchen 20110104 end >*/ static struct adie_codec_action_unit idual_mic_endfire_8KHz_osr256_actions[] = MIC1_LEFT_LINE_IN_RIGHT_8000_OSR_256; @@ -2049,7 +2021,6 @@ static struct platform_device msm_idual_mic_broadside_device = { .dev = { .platform_data = &snddev_idual_mic_broadside_data }, }; -/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -2220,7 +2191,6 @@ static struct platform_device msm_idual_mic_broadside_device_u8800_51 = { }; /* U8800-51 device end >*/ #endif -/* DTS2011010400519 dongchen 20110104 end >*/ static struct adie_codec_action_unit ispk_dual_mic_ef_8KHz_osr256_actions[] = SPEAKER_MIC1_LEFT_LINE_IN_RIGHT_8000_OSR_256; @@ -2377,7 +2347,6 @@ static struct adie_codec_action_unit itty_hs_mono_rx_8KHz_osr256_actions[] = static struct adie_codec_action_unit itty_hs_mono_rx_16KHz_osr256_actions[] = TTY_HEADSET_MONO_RX_CLASS_D_16000_OSR_256; -/*< DTS2011012105219 yinzhaoyang modify 20110122 begin */ /* huawei TTY devices did not use Class D*/ #ifdef CONFIG_HUAWEI_KERNEL static struct adie_codec_action_unit itty_hs_mono_rx_48KHz_osr256_actions[] = @@ -2386,7 +2355,6 @@ static struct adie_codec_action_unit itty_hs_mono_rx_48KHz_osr256_actions[] = static struct adie_codec_action_unit itty_hs_mono_rx_48KHz_osr256_actions[] = TTY_HEADSET_MONO_RX_CLASS_D_48000_OSR_256; #endif -/* DTS2011012105219 yinzhaoyang modify 20110122 end > */ static struct adie_codec_hwsetting_entry itty_hs_mono_rx_settings[] = { { @@ -2492,7 +2460,6 @@ static struct platform_device msm_ispeaker_tx_device = { .dev = { .platform_data = &snddev_ispeaker_tx_data }, }; -/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -2666,7 +2633,6 @@ static struct platform_device msm_ispeaker_tx_device_u8800_51 = { }; /* U8800-51 device end >*/ #endif -/* DTS2011010400519 dongchen 20110104 end >*/ static struct adie_codec_action_unit iearpiece_ffa_48KHz_osr256_actions[] = HANDSET_RX_48000_OSR_256_FFA; @@ -2767,7 +2733,6 @@ static struct platform_device msm_imic_ffa_device = { }; -/*< DTS2010081201753 dongchen 20100926 begin */ #ifdef CONFIG_HUAWEI_KERNEL static struct adie_codec_action_unit ihs_stereo_speaker_stereo_rx_48KHz_osr256_actions[] = @@ -2777,7 +2742,6 @@ static struct adie_codec_action_unit ihs_stereo_speaker_stereo_rx_48KHz_osr256_actions[] = HEADSET_STEREO_SPEAKER_STEREO_RX_CAPLESS_48000_OSR_256; #endif -/* DTS2010081201753 dongchen 20100926 end >*/ static struct adie_codec_hwsetting_entry @@ -2821,7 +2785,6 @@ static struct platform_device msm_ihs_stereo_speaker_stereo_rx_device = { .dev = { .platform_data = &snddev_ihs_stereo_speaker_stereo_rx_data }, }; -/*< DTS2011010400519 dongchen 20110104 begin */ /* Add huawei devices */ #ifdef CONFIG_HUAWEI_KERNEL /*< U8800 device begin */ @@ -2968,26 +2931,19 @@ static struct platform_device msm_ihs_stereo_speaker_stereo_rx_device_u8800_51 = }; /* U8800-51 device end >*/ #endif -/* DTS2011010400519 dongchen 20110104 end >*/ -/* < DTS2010061100001 chenlei 20100527 begin*/ #ifdef CONFIG_HUAWEI_KERNEL -/* < DTS2010061100404 chenlei 20100611 begin*/ static enum hsed_controller handset_secondary_mic_tx_pmctl_id[] = {PM_HSED_CONTROLLER_0}; -/* DTS2010061100404 chenlei 20100611 end >*/ static struct adie_codec_action_unit handset_secondary_mic_tx_8KHz_osr256_actions[] = HANDSET_SECONDARY_MIC_TX_8000_OSR_256; static struct adie_codec_action_unit handset_secondary_mic_tx_16KHz_osr256_actions[] = HANDSET_SECONDARY_MIC_TX_16000_OSR_256; -/*< DTS2011030301679 dongchen 20110303 begin */ static struct adie_codec_action_unit handset_secondary_mic_tx_48KHz_osr256_actions[] = HANDSET_SECONDARY_MIC_TX_48000_OSR_256; -/* DTS2011030301679 dongchen 20110303 end >*/ -/*< DTS2011030301679 dongchen 20110303 begin */ static struct adie_codec_hwsetting_entry handset_secondary_mic_tx_settings[] = { { .freq_plan = 8000, @@ -3008,7 +2964,6 @@ static struct adie_codec_hwsetting_entry handset_secondary_mic_tx_settings[] = { .action_sz = ARRAY_SIZE(handset_secondary_mic_tx_48KHz_osr256_actions), } }; -/* DTS2011030301679 dongchen 20110303 end >*/ static struct adie_codec_dev_profile handset_secondary_mic_tx_profile = { .path_type = ADIE_CODEC_TX, @@ -3016,7 +2971,6 @@ static struct adie_codec_dev_profile handset_secondary_mic_tx_profile = { .setting_sz = ARRAY_SIZE(handset_secondary_mic_tx_settings), }; -/*< DTS2011030301679 dongchen 20110303 begin */ /* set default_sample_rate to 48000, keep the same as handset_tx device */ static struct snddev_icodec_data snddev_handset_secondary_mic_tx_data = { .capability = (SNDDEV_CAP_TX | SNDDEV_CAP_VOICE), @@ -3031,7 +2985,6 @@ static struct snddev_icodec_data snddev_handset_secondary_mic_tx_data = { .pamp_on = NULL, .pamp_off = NULL, }; -/* DTS2011030301679 dongchen 20110303 end >*/ static struct platform_device msm_handset_secondary_mic_tx_device = { .name = "snddev_icodec", @@ -3039,7 +2992,6 @@ static struct platform_device msm_handset_secondary_mic_tx_device = { .dev = { .platform_data = &snddev_handset_secondary_mic_tx_data }, }; #endif -/* DTS2010061100001 chenlei 20100527 end >*/ static struct snddev_mi2s_data snddev_mi2s_stereo_rx_data = { .capability = SNDDEV_CAP_RX , @@ -3078,7 +3030,6 @@ static struct platform_device msm_snddev_mi2s_fm_tx_device = { .dev = { .platform_data = &snddev_mi2s_fm_tx_data}, }; -/*< DTS2011012604575 dongchen 20110127 begin */ #ifdef CONFIG_HUAWEI_KERNEL /* ANALOG FM SPEAKER DEVICE */ static struct adie_codec_action_unit ifm_analog_speaker_48KHz_osr256_actions[] = @@ -3156,7 +3107,6 @@ static struct platform_device msm_snddev_analog_fm_hs_device = { .dev = { .platform_data = &snddev_analog_fm_hs_data }, }; #endif //#ifdef CONFIG_HUAWEI_KERNEL -/* DTS2011012604575 dongchen 20110127 end >*/ static struct snddev_icodec_data snddev_fluid_imic_tx_data = { .capability = (SNDDEV_CAP_TX | SNDDEV_CAP_VOICE), @@ -3366,8 +3316,6 @@ static struct platform_device *snd_devices_surf[] __initdata = { &msm_uplink_rx_device, }; -/*< DTS2011010400519 dongchen 20110104 begin */ -/* */ - /* DTS2010072400226 dongchen 20100724 end >*/ - /* < DTS2010061100001 chenlei 20100527 begin*/ &msm_handset_secondary_mic_tx_device, - /* DTS2010061100001 chenlei 20100527 end >*/ - /*< DTS2010062500999 dongchen 20100625 begin */ &msm_ihs_stereo_speaker_stereo_rx_device_u8800, - /* DTS2010062500999 dongchen 20100625 end >*/ - /*< DTS2010120204486 dongchen 20101223 begin */ &msm_ispeaker_music_mono_rx_device_u8800, &msm_snddev_mi2s_stereo_rx_device, - /* DTS2010120204486 dongchen 20101223 end >*/ - /*< DTS2010122105598 dongchen 20101221 begin */ &msm_ihs_music_stereo_rx_device_u8800, - /* DTS2010122105598 dongchen 20101221 end >*/ }; #endif -/*BU5D09852 lgq, sound device switch failure, 20100512 end>*/ -/* DTS2011010400519 dongchen 20110104 end >*/ -/*< DTS2011010400519 dongchen 20110104 begin */ -/*< DTS2010122004868 dongchen 20101220 begin */ #ifdef CONFIG_HUAWEI_KERNEL static struct platform_device *snd_devices_u8820[] __initdata = { &msm_iearpiece_device_u8820, @@ -3421,9 +3353,7 @@ static struct platform_device *snd_devices_u8820[] __initdata = { &msm_bt_sco_earpiece_device_u8820, &msm_bt_sco_mic_device, &msm_ifmradio_handset_device, - /*< DTS2011012602886 dongchen 20110126 begin */ &msm_ispeaker_rx_device_u8820, - /* DTS2011012602886 dongchen 20110126 end >*/ &msm_ifmradio_speaker_device, &msm_ifmradio_headset_device, &msm_itty_hs_mono_tx_device, @@ -3434,23 +3364,13 @@ static struct platform_device *snd_devices_u8820[] __initdata = { &msm_spk_idual_mic_broadside_device, &msm_handset_secondary_mic_tx_device, &msm_ihs_stereo_speaker_stereo_rx_device_u8820, - /*< DTS2010120204486 dongchen 20101223 begin */ - /*< DTS2011012602886 dongchen 20110126 begin */ &msm_ispeaker_music_mono_rx_device_u8820, - /* DTS2011012602886 dongchen 20110126 end >*/ &msm_snddev_mi2s_stereo_rx_device, - /* DTS2010120204486 dongchen 20101223 end >*/ - /*< DTS2010122105598 dongchen 20101221 begin */ &msm_ihs_music_stereo_rx_device_u8820, - /* DTS2010122105598 dongchen 20101221 end >*/ - /*< DTS2011021803548 dongchen 20110218 begin */ &msm_snddev_analog_fm_speaker_device, &msm_snddev_analog_fm_hs_device, - /* DTS2011021803548 dongchen 20110218 end >*/ - /*< DTS2011031005289 dongchen 20110329 begin */ &msm_ispeaker_ptt_rx_device, &msm_ispeaker_ptt_tx_device, - /* DTS2011031005289 dongchen 20110329 end >*/ }; static struct platform_device *snd_devices_u8800_51[] __initdata = { @@ -3472,24 +3392,14 @@ static struct platform_device *snd_devices_u8800_51[] __initdata = { &msm_spk_idual_mic_broadside_device, &msm_handset_secondary_mic_tx_device, &msm_ihs_stereo_speaker_stereo_rx_device_u8800_51, - /*< DTS2010120204486 dongchen 20101223 begin */ &msm_ispeaker_music_mono_rx_device_u8800_51, &msm_snddev_mi2s_stereo_rx_device, - /* DTS2010120204486 dongchen 20101223 end >*/ - /*< DTS2010122105598 dongchen 20101221 begin */ &msm_ihs_music_stereo_rx_device_u8800_51, - /* DTS2010122105598 dongchen 20101221 end >*/ - /*< DTS2011012604575 dongchen 20110127 begin */ &msm_snddev_analog_fm_speaker_device, &msm_snddev_analog_fm_hs_device, - /* DTS2011012604575 dongchen 20110127 end >*/ - /*< DTS2011021900121 dongchen 20110217 begin */ &msm_iearpiece_hac_device, - /* DTS2011021900121 dongchen 20110217 end >*/ }; #endif -/* DTS2010122004868 dongchen 20101220 end >*/ -/* DTS2011010400519 dongchen 20110104 end >*/ static struct platform_device *snd_devices_fluid[] __initdata = { @@ -3615,11 +3525,7 @@ void __ref msm_snddev_init(void) else if (machine_is_msm7x30_fluid()) platform_add_devices(snd_devices_fluid, ARRAY_SIZE(snd_devices_fluid)); - /**/ - /*< DTS2011050601476 dongchen 20110506 begin */ - /* delete DTS2011041501614, snd_devices_u8860 is in snddev_data_timpani.c */ - /* DTS2011050601476 dongchen 20110506 end >*/ - /*< DTS2011051303410 dongchen 20110516 begin */ - /* delete DTS2011050700551, QTR8615 use snddev_data_timpani.c */ - /* DTS2011051303410 dongchen 20110516 end >*/ - /* DTS2010112702297 wangquanli 201001125 end >*/ - /* DTS2010122004868 dongchen 20101220 end >*/ - /* DTS2010092400487 lijianzhao 20100924 end >*/ #endif - /*BU5D09852 lgq, sound device switch failure, 20100512 end>*/ else pr_err("%s: Unknown machine type\n", __func__); } diff --git a/arch/arm/mach-msm/qdsp5v2/snddev_data_timpani.c b/arch/arm/mach-msm/qdsp5v2/snddev_data_timpani.c index d13ef0f45..adb4927b4 100755 --- a/arch/arm/mach-msm/qdsp5v2/snddev_data_timpani.c +++ b/arch/arm/mach-msm/qdsp5v2/snddev_data_timpani.c @@ -25,12 +25,7 @@ #include #include "timpani_profile_7x30.h" #include -/* < DTS2012022402932 gaolin 20120224 begin */ -/*< DTS2011122606588 yinzhaoyang 20111230 begin */ -#include -#include "../smd_private.h" -/* DTS2011122606588 yinzhaoyang 20111230 end > */ -/* DTS2012022402932 gaolin 20120224 end > */ + /* define the value for BT_SCO */ #define BT_SCO_PCM_CTL_VAL (PCM_CTL__RPCM_WIDTH__LINEAR_V |\ PCM_CTL__TPCM_WIDTH__LINEAR_V) @@ -38,10 +33,8 @@ DATA_FORMAT_PADDING_INFO__TPCM_FORMAT_V) #define BT_SCO_AUX_CODEC_INTF AUX_CODEC_INTF_CTL__PCMINTF_DATA_EN_V -/*< DTS2011051303410 dongchen 20110516 begin */ extern struct platform_device *snd_devices_c8860[]; extern int arraysize_c8860; -/* DTS2011051303410 dongchen 20110516 end >*/ #ifdef CONFIG_DEBUG_FS static struct dentry *debugfs_hsed_config; @@ -754,9 +747,7 @@ static struct adie_codec_dev_profile ihs_stereo_speaker_stereo_rx_profile = { .setting_sz = ARRAY_SIZE(ihs_stereo_speaker_stereo_rx_settings), }; -/*< DTS2011101304810 dongchen 20111013 begin */ /* acdb_id from ACDB_ID_HEADSET_STEREO_PLUS_SPKR_STEREO_RX to ACDB_ID_HEADSET_STEREO_PLUS_SPKR_MONO_RX */ -/*< DTS2011061605311 dongchen 20110614 begin */ /* set msm_snddev_poweramp_4music_on as pamp_on func */ static struct snddev_icodec_data snddev_ihs_stereo_speaker_stereo_rx_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -775,8 +766,6 @@ static struct snddev_icodec_data snddev_ihs_stereo_speaker_stereo_rx_data = { .max_voice_rx_vol[VOC_WB_INDEX] = -900, .min_voice_rx_vol[VOC_WB_INDEX] = -2400, }; -/* DTS2011061605311 dongchen 20110614 end >*/ -/* DTS2011101304810 dongchen 20111013 end >*/ static struct platform_device msm_ihs_stereo_speaker_stereo_rx_device = { .name = "snddev_icodec", @@ -979,7 +968,6 @@ static struct platform_device msm_auxpga_lb_hs_device = { .dev = { .platform_data = &snddev_auxpga_lb_hs_data }, }; -/*< DTS2011050601476 dongchen 20110506 begin */ /****************************************************************/ /** HUAWEI ADDED DEVICE **/ /****************************************************************/ @@ -1003,11 +991,7 @@ static struct adie_codec_dev_profile iearpiece_profile_u8860 = { .setting_sz = ARRAY_SIZE(iearpiece_settings_u8860), }; -/* < DTS2012033005129 mengdong81003944 20120401 begin */ -/* rx volume from 0dB to 6dB */ -/*< DTS2011080400504 dongchen 20110805 begin */ /* rx volume from 6dB to 0dB */ -/*< DTS2011061705385 dongchen 20110617 begin */ /* rx volume from -7dB to 6dB */ static struct snddev_icodec_data snddev_iearpiece_data_u8860 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -1022,14 +1006,11 @@ static struct snddev_icodec_data snddev_iearpiece_data_u8860 = { .pamp_on = NULL, .pamp_off = NULL, .property = SIDE_TONE_MASK, - .max_voice_rx_vol[VOC_NB_INDEX] = 600, - .min_voice_rx_vol[VOC_NB_INDEX] = -900, - .max_voice_rx_vol[VOC_WB_INDEX] = 600, - .min_voice_rx_vol[VOC_WB_INDEX] = -900, + .max_voice_rx_vol[VOC_NB_INDEX] = 0, + .min_voice_rx_vol[VOC_NB_INDEX] = -1500, + .max_voice_rx_vol[VOC_WB_INDEX] = -700, + .min_voice_rx_vol[VOC_WB_INDEX] = -2200, }; -/* DTS2011061705385 dongchen 20110617 end >*/ -/* DTS2011080400504 dongchen 20110805 end >*/ -/* DTS2012033005129 mengdong81003944 20120401 end > */ static struct platform_device msm_iearpiece_device_u8860 = { .name = "snddev_icodec", @@ -1097,11 +1078,8 @@ static struct adie_codec_dev_profile ispkr_stereo_profile_u8860 = { .setting_sz = ARRAY_SIZE(ispkr_stereo_settings_u8860), }; -/*< DTS2011090100008 dongchen 20110901 begin */ /* rx volume from -8dB to 3dB */ -/*< DTS2011080400504 dongchen 20110805 begin */ /* rx volume from -2dB to -8dB */ -/*< DTS2011053005461 dongchen 20110530 begin */ /* set to mono device */ static struct snddev_icodec_data snddev_ispkr_stereo_data_u8860 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -1120,9 +1098,6 @@ static struct snddev_icodec_data snddev_ispkr_stereo_data_u8860 = { .max_voice_rx_vol[VOC_WB_INDEX] = 300, .min_voice_rx_vol[VOC_WB_INDEX] = -1200 }; -/* DTS2011053005461 dongchen 20110530 end >*/ -/* DTS2011080400504 dongchen 20110805 end >*/ -/* DTS2011090100008 dongchen 20110901 end >*/ static struct platform_device msm_ispkr_stereo_device_u8860 = { .name = "snddev_icodec", @@ -1211,11 +1186,7 @@ static struct adie_codec_dev_profile headset_ab_cpls_profile_u8860 = { .setting_sz = ARRAY_SIZE(headset_ab_cpls_settings_u8860), }; -/* < DTS2012033005129 mengdong81003944 20120401 begin */ -/* rxvolume from 2dB to 3dB */ -/*< DTS2011092500702 dongchen 20110926 begin */ /* rxvolume from -4dB to 2dB */ -/*< DTS2011061705385 dongchen 20110617 begin */ /* rxvolume from -7dB to -4dB */ static struct snddev_icodec_data snddev_ihs_stereo_rx_data_u8860 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -1232,14 +1203,11 @@ static struct snddev_icodec_data snddev_ihs_stereo_rx_data_u8860 = { .property = SIDE_TONE_MASK, .voltage_on = msm_snddev_hsed_voltage_on, .voltage_off = msm_snddev_hsed_voltage_off, - .max_voice_rx_vol[VOC_NB_INDEX] = -300, - .min_voice_rx_vol[VOC_NB_INDEX] = -1800, - .max_voice_rx_vol[VOC_WB_INDEX] = -300, - .min_voice_rx_vol[VOC_WB_INDEX] = -1800, + .max_voice_rx_vol[VOC_NB_INDEX] = 200, + .min_voice_rx_vol[VOC_NB_INDEX] = -1300, + .max_voice_rx_vol[VOC_WB_INDEX] = -500, + .min_voice_rx_vol[VOC_WB_INDEX] = -2000, }; -/* DTS2011061705385 dongchen 20110617 end >*/ -/* DTS2011092500702 dongchen 20110926 end >*/ -/* DTS2012033005129 mengdong81003944 20120401 end > */ static struct platform_device msm_headset_stereo_device_u8860 = { .name = "snddev_icodec", @@ -1297,66 +1265,10 @@ static struct platform_device msm_idual_mic_broadside_device_u8860 = { .id = 13, .dev = { .platform_data = &snddev_idual_mic_broadside_data_u8860 }, }; -/* < DTS2012022402932 gaolin 20120224 begin */ -/*< DTS2011122606588 yinzhaoyang 20111230 begin */ -/* ES HANDSET DUAL MIC BROADSIDE */ -static struct adie_codec_action_unit idual_mic_bs_8KHz_osr256_actions_u8860_es[] = - AMIC_BROADSIDE_DUAL_8000_OSR_256_U8860_es; - -static struct adie_codec_hwsetting_entry idual_mic_broadside_settings_u8860_es[] = { - { - .freq_plan = 8000, - .osr = 256, - .actions = idual_mic_bs_8KHz_osr256_actions_u8860_es, - .action_sz = ARRAY_SIZE(idual_mic_bs_8KHz_osr256_actions_u8860_es), - }, /* 8KHz profile can be used for 16KHz */ - { - .freq_plan = 16000, - .osr = 256, - .actions = idual_mic_bs_8KHz_osr256_actions_u8860_es, - .action_sz = ARRAY_SIZE(idual_mic_bs_8KHz_osr256_actions_u8860_es), - }, /* 8KHz profile can be used for 16KHz */ - { - .freq_plan = 48000, - .osr = 256, - .actions = idual_mic_bs_8KHz_osr256_actions_u8860_es, - .action_sz = ARRAY_SIZE(idual_mic_bs_8KHz_osr256_actions_u8860_es), - } -}; - -static struct adie_codec_dev_profile idual_mic_broadside_profile_u8860_es = { - .path_type = ADIE_CODEC_TX, - .settings = idual_mic_broadside_settings_u8860_es, - .setting_sz = ARRAY_SIZE(idual_mic_broadside_settings_u8860_es), -}; - -static struct snddev_icodec_data snddev_idual_mic_broadside_data_u8860_es = { - .capability = (SNDDEV_CAP_TX | SNDDEV_CAP_VOICE), - .name = "handset_dual_mic_broadside_tx", - .copp_id = 0, - .acdb_id = ACDB_ID_HANDSET_MIC_BROADSIDE, - .profile = &idual_mic_broadside_profile_u8860_es, - .channel_mode = 2, - .default_sample_rate = 48000, - .pmctl_id = idual_mic_broadside_pmctl_id, - .pmctl_id_sz = ARRAY_SIZE(idual_mic_broadside_pmctl_id), - .pamp_on = NULL, - .pamp_off = NULL, -}; - -static struct platform_device msm_idual_mic_broadside_device_u8860_es = { - .name = "snddev_icodec", - .id = 13, - .dev = { .platform_data = &snddev_idual_mic_broadside_data_u8860_es }, -}; -/* DTS2011122606588 yinzhaoyang 20111230 end > */ -/* DTS2012022402932 gaolin 20120224 end > */ /* SPEAKER MUSIC STEREO DEVICE */ -/*< DTS2011050903865 dongchen 20110513 begin */ static struct adie_codec_action_unit ispkr_music_stereo_48KHz_osr256_actions_u8860[] = SPEAKER_PRI_MUSIC_STEREO_48000_OSR_256_U8860; -/* DTS2011050903865 dongchen 20110513 end >*/ static struct adie_codec_hwsetting_entry ispkr_music_stereo_settings_u8860[] = { { @@ -1373,9 +1285,7 @@ static struct adie_codec_dev_profile ispkr_music_stereo_profile_u8860 = { .setting_sz = ARRAY_SIZE(ispkr_music_stereo_settings_u8860), }; -/*< DTS2011061605311 dongchen 20110614 begin */ /* set ACDB_ID_SPKR_PHONE_MUSIC_MONO as acdb_id */ -/*< DTS2011053005461 dongchen 20110530 begin */ /* set to mono device, use music tpa parameter */ static struct snddev_icodec_data snddev_ispkr_music_stereo_data_u8860 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -1394,8 +1304,6 @@ static struct snddev_icodec_data snddev_ispkr_music_stereo_data_u8860 = { .max_voice_rx_vol[VOC_WB_INDEX] = 1000, .min_voice_rx_vol[VOC_WB_INDEX] = -500 }; -/* DTS2011053005461 dongchen 20110530 end >*/ -/* DTS2011061605311 dongchen 20110614 end >*/ static struct platform_device msm_ispkr_music_stereo_device_u8860 = { .name = "snddev_icodec", @@ -1422,7 +1330,6 @@ static struct adie_codec_dev_profile headset_ab_cpls_music_profile_u8860 = { .setting_sz = ARRAY_SIZE(headset_ab_cpls_music_settings_u8860), }; -/*< DTS2011061605311 dongchen 20110614 begin */ /* set ACDB_ID_HEADSET_SPKR_MUSIC_STEREO as acdb_id */ static struct snddev_icodec_data snddev_ihs_music_stereo_rx_data_u8860 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -1444,7 +1351,6 @@ static struct snddev_icodec_data snddev_ihs_music_stereo_rx_data_u8860 = { .max_voice_rx_vol[VOC_WB_INDEX] = -900, .min_voice_rx_vol[VOC_WB_INDEX] = -2400, }; -/* DTS2011061605311 dongchen 20110614 end >*/ static struct platform_device msm_headset_music_stereo_device_u8860 = { .name = "snddev_icodec", @@ -1471,7 +1377,6 @@ static struct adie_codec_dev_profile iearpiece_hac_profile_u8860 = { .setting_sz = ARRAY_SIZE(iearpiece_hac_settings_u8860), }; -/*< DTS2011061605311 dongchen 20110614 begin */ /* set ACDB_ID_HANDSET_HAC_SPKR as acdb_id */ static struct snddev_icodec_data snddev_iearpiece_hac_data_u8860 = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -1483,18 +1388,15 @@ static struct snddev_icodec_data snddev_iearpiece_hac_data_u8860 = { .pmctl_id = NULL, .pmctl_id_sz = 0, .default_sample_rate = 48000, - /**/ .property = SIDE_TONE_MASK, .max_voice_rx_vol[VOC_NB_INDEX] = -700, .min_voice_rx_vol[VOC_NB_INDEX] = -2200, .max_voice_rx_vol[VOC_WB_INDEX] = -1400, .min_voice_rx_vol[VOC_WB_INDEX] = -2900, }; -/* DTS2011061605311 dongchen 20110614 end >*/ static struct platform_device msm_iearpiece_hac_device_u8860 = { .name = "snddev_icodec", @@ -1562,7 +1464,6 @@ static struct adie_codec_dev_profile ifm_analog_speaker_profile = { .setting_sz = ARRAY_SIZE(ifm_analog_speaker_settings), }; -/*< DTS2011082205270 dongchen 20110824 begin */ /* set msm_snddev_poweramp_4music_on as pamp_on for FM Speaker */ static struct snddev_icodec_data snddev_analog_fm_speaker_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -1577,7 +1478,6 @@ static struct snddev_icodec_data snddev_analog_fm_speaker_data = { .pamp_on = &msm_snddev_poweramp_4music_on, .pamp_off = &msm_snddev_poweramp_off, }; -/* DTS2011082205270 dongchen 20110824 end >*/ static struct platform_device msm_snddev_analog_fm_speaker_device = { .name = "snddev_icodec", @@ -1623,290 +1523,6 @@ static struct platform_device msm_snddev_analog_fm_hs_device = { }; #endif -/* DTS2011050601476 dongchen 20110506 end >*/ -/* < DTS2012022402932 gaolin 20120224 begin */ -/* */ -/* AMIC Primary mono, common for SPEAKER MONO TX and HANDSET MONO TX */ -static struct snddev_icodec_data snddev_imic_data_u8730 = { - .capability = (SNDDEV_CAP_TX | SNDDEV_CAP_VOICE), - .name = "handset_tx", - .copp_id = 0, - .acdb_id = ACDB_ID_HANDSET_MIC, - .profile = &imic_profile_u8860, - .channel_mode = 1, - .pmctl_id = imic_pmctl_id_u8860, - .pmctl_id_sz = ARRAY_SIZE(imic_pmctl_id_u8860), - .default_sample_rate = 48000, - .pamp_on = msm_snddev_tx_route_config, - .pamp_off = msm_snddev_tx_route_deconfig, -}; - -static struct platform_device msm_imic_device_u8730 = { - .name = "snddev_icodec", - .id = 20, - .dev = { .platform_data = &snddev_imic_data_u8730 }, -}; - - -/* SPEAKER MONO TX */ -static struct snddev_icodec_data snddev_ispkr_mic_data_u8730 = { - .capability = (SNDDEV_CAP_TX | SNDDEV_CAP_VOICE), - .name = "speaker_mono_tx", - .copp_id = 0, - .acdb_id = ACDB_ID_SPKR_PHONE_MIC, - .profile = &imic_profile_u8860, - .channel_mode = 1, - .pmctl_id = ispk_pmctl_id_u8860, - .pmctl_id_sz = ARRAY_SIZE(ispk_pmctl_id_u8860), - .default_sample_rate = 48000, - .pamp_on = msm_snddev_tx_route_config, - .pamp_off = msm_snddev_tx_route_deconfig, -}; - -static struct platform_device msm_ispkr_mic_device_u8730 = { - .name = "snddev_icodec", - .id = 18, - .dev = { .platform_data = &snddev_ispkr_mic_data_u8730 }, -}; -/* HANDSET DUAL MIC BROADSIDE */ -/* < DTS2012012101655 liurennianKF62391 20120129 begin */ -static struct adie_codec_action_unit idual_mic_bs_8KHz_osr256_actions_u8730[] = - AMIC_BROADSIDE_DUAL_8000_OSR_256_U8730; - -static struct adie_codec_hwsetting_entry idual_mic_broadside_settings_u8730[] = { - { - .freq_plan = 8000, - .osr = 256, - .actions = idual_mic_bs_8KHz_osr256_actions_u8730, - .action_sz = ARRAY_SIZE(idual_mic_bs_8KHz_osr256_actions_u8730), - }, /* 8KHz profile can be used for 16KHz */ - { - .freq_plan = 16000, - .osr = 256, - .actions = idual_mic_bs_8KHz_osr256_actions_u8730, - .action_sz = ARRAY_SIZE(idual_mic_bs_8KHz_osr256_actions_u8730), - }, /* 8KHz profile can be used for 16KHz */ - { - .freq_plan = 48000, - .osr = 256, - .actions = idual_mic_bs_8KHz_osr256_actions_u8730, - .action_sz = ARRAY_SIZE(idual_mic_bs_8KHz_osr256_actions_u8730), - } -}; - -static struct adie_codec_dev_profile idual_mic_broadside_profile_u8730 = { - .path_type = ADIE_CODEC_TX, - .settings = idual_mic_broadside_settings_u8730, - .setting_sz = ARRAY_SIZE(idual_mic_broadside_settings_u8730), -}; - -static struct snddev_icodec_data snddev_idual_mic_broadside_data_u8730 = { - .capability = (SNDDEV_CAP_TX | SNDDEV_CAP_VOICE), - .name = "handset_dual_mic_broadside_tx", - .copp_id = 0, - .acdb_id = ACDB_ID_HANDSET_MIC_BROADSIDE, - .profile = &idual_mic_broadside_profile_u8730, - .channel_mode = 2, - .default_sample_rate = 48000, - .pmctl_id = idual_mic_broadside_pmctl_id, - .pmctl_id_sz = ARRAY_SIZE(idual_mic_broadside_pmctl_id), - .pamp_on = msm_snddev_tx_route_config, - .pamp_off = msm_snddev_tx_route_deconfig, -}; -/* DTS2012012101655 liurennianKF62391 20120129 end > */ -static struct platform_device msm_idual_mic_broadside_device_u8730 = { - .name = "snddev_icodec", - .id = 13, - .dev = { .platform_data = &snddev_idual_mic_broadside_data_u8730 }, -}; - -/* HANDSET SECONDARY MIC DEVICE */ - -static struct snddev_icodec_data snddev_handset_secondary_mic_tx_data_u8730 = { - .capability = (SNDDEV_CAP_TX | SNDDEV_CAP_VOICE), - .name = "handset_secondary_mic_tx", - .copp_id = 0, - .acdb_id = ACDB_ID_HANDSET_MIC, - .profile = &handset_secondary_mic_tx_profile, - .channel_mode = 1, - .pmctl_id = handset_secondary_mic_tx_pmctl_id, - .pmctl_id_sz = ARRAY_SIZE(handset_secondary_mic_tx_pmctl_id), - .default_sample_rate = 48000, - .pamp_on = msm_snddev_tx_route_config, - .pamp_off = msm_snddev_tx_route_deconfig, -}; - -static struct platform_device msm_handset_secondary_mic_tx_device_u8730 = { - .name = "snddev_icodec", - .id = 250, - .dev = { .platform_data = &snddev_handset_secondary_mic_tx_data_u8730 }, -}; -/* DTS2011092905909 yinzhaoyang 20110929 end >*/ - -/* < DTS2012010706112 liurennianKF62391 20120109 begin */ -/****************************************************************/ -/** HUAWEI ADDED DEVICE U8680 **/ -/****************************************************************/ -/* HANDSET DUAL MIC BROADSIDE */ -static struct adie_codec_action_unit idual_mic_bs_8KHz_osr256_actions_u8680[] = - AMIC_BROADSIDE_DUAL_8000_OSR_256_U8680; - -static struct adie_codec_hwsetting_entry idual_mic_broadside_settings_u8680[] = { - { - .freq_plan = 8000, - .osr = 256, - .actions = idual_mic_bs_8KHz_osr256_actions_u8680, - .action_sz = ARRAY_SIZE(idual_mic_bs_8KHz_osr256_actions_u8680), - }, /* 8KHz profile can be used for 16KHz */ - { - .freq_plan = 16000, - .osr = 256, - .actions = idual_mic_bs_8KHz_osr256_actions_u8680, - .action_sz = ARRAY_SIZE(idual_mic_bs_8KHz_osr256_actions_u8680), - }, /* 8KHz profile can be used for 16KHz */ - { - .freq_plan = 48000, - .osr = 256, - .actions = idual_mic_bs_8KHz_osr256_actions_u8680, - .action_sz = ARRAY_SIZE(idual_mic_bs_8KHz_osr256_actions_u8680), - } -}; - -static struct adie_codec_dev_profile idual_mic_broadside_profile_u8680 = { - .path_type = ADIE_CODEC_TX, - .settings = idual_mic_broadside_settings_u8680, - .setting_sz = ARRAY_SIZE(idual_mic_broadside_settings_u8680), -}; - -static struct snddev_icodec_data snddev_idual_mic_broadside_data_u8680 = { - .capability = (SNDDEV_CAP_TX | SNDDEV_CAP_VOICE), - .name = "handset_dual_mic_broadside_tx", - .copp_id = 0, - .acdb_id = ACDB_ID_HANDSET_MIC_BROADSIDE, - .profile = &idual_mic_broadside_profile_u8680, - .channel_mode = 2, - .default_sample_rate = 48000, - .pmctl_id = idual_mic_broadside_pmctl_id, - .pmctl_id_sz = ARRAY_SIZE(idual_mic_broadside_pmctl_id), - .pamp_on = NULL, - .pamp_off = NULL, -}; - -static struct platform_device msm_idual_mic_broadside_device_u8680 = { - .name = "snddev_icodec", - .id = 13, - .dev = { .platform_data = &snddev_idual_mic_broadside_data_u8680 }, -}; -static struct snddev_icodec_data snddev_ihs_stereo_rx_data_u8680 = { - .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), - .name = "headset_stereo_rx", - .copp_id = 0, - .acdb_id = ACDB_ID_HEADSET_SPKR_STEREO, - .profile = &headset_ab_cpls_profile_u8860, - .channel_mode = 2, - .pmctl_id = NULL, - .pmctl_id_sz = 0, - .default_sample_rate = 48000, - .pamp_on = NULL, - .pamp_off = NULL, - .property = SIDE_TONE_MASK, - .voltage_on = msm_snddev_hsed_voltage_on, - .voltage_off = msm_snddev_hsed_voltage_off, - .max_voice_rx_vol[VOC_NB_INDEX] = 600, - .min_voice_rx_vol[VOC_NB_INDEX] = -900, - .max_voice_rx_vol[VOC_WB_INDEX] = -500, - .min_voice_rx_vol[VOC_WB_INDEX] = -2000, -}; - -static struct platform_device msm_headset_stereo_device_u8680 = { - .name = "snddev_icodec", - .id = 2, - .dev = { .platform_data = &snddev_ihs_stereo_rx_data_u8680 }, -}; - -static struct snddev_icodec_data snddev_iearpiece_data_u8680 = { - .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), - .name = "handset_rx", - .copp_id = 0, - .acdb_id = ACDB_ID_HANDSET_SPKR, - .profile = &iearpiece_profile_u8860, - .channel_mode = 1, - .pmctl_id = NULL, - .pmctl_id_sz = 0, - .default_sample_rate = 48000, - .pamp_on = NULL, - .pamp_off = NULL, - .property = SIDE_TONE_MASK, - .max_voice_rx_vol[VOC_NB_INDEX] =1200, - .min_voice_rx_vol[VOC_NB_INDEX] = -300, - .max_voice_rx_vol[VOC_WB_INDEX] = -700, - .min_voice_rx_vol[VOC_WB_INDEX] = -2200, -}; - -static struct platform_device msm_iearpiece_device_u8680 = { - .name = "snddev_icodec", - .id = 19, - .dev = { .platform_data = &snddev_iearpiece_data_u8680 }, -}; -/* DTS2012010706112 liurennianKF62391 20120109 end >*/ -/* DTS2012022402932 gaolin 20120224 end > */ static struct platform_device *snd_devices_ffa[] __initdata = { &msm_iearpiece_ffa_device, @@ -1936,7 +1552,6 @@ static struct platform_device *snd_devices_ffa[] __initdata = { &msm_auxpga_lb_lo_device, }; -/*< DTS2011050601476 dongchen 20110506 begin */ #ifdef CONFIG_HUAWEI_KERNEL static struct platform_device *snd_devices_u8860[] __initdata = { &msm_iearpiece_device_u8860, @@ -1960,88 +1575,8 @@ static struct platform_device *snd_devices_u8860[] __initdata = { &msm_snddev_analog_fm_speaker_device, &msm_snddev_analog_fm_hs_device, }; -/* < DTS2012022402932 gaolin 20120224 begin */ -/*< DTS2011122606588 yinzhaoyang 20111230 begin */ -static struct platform_device *snd_devices_u8860_es[] __initdata = { - &msm_iearpiece_device_u8860, - &msm_imic_device_u8860, - &msm_ispkr_stereo_device_u8860, - &msm_headset_mic_device_u8860, - &msm_snddev_mi2s_fm_tx_device, - &msm_bt_sco_earpiece_device, - &msm_bt_sco_mic_device, - &msm_ispkr_mic_device_u8860, - &msm_headset_stereo_device_u8860, - &msm_itty_mono_tx_device, - &msm_itty_mono_rx_device, - &msm_ihs_stereo_speaker_stereo_rx_device, - &msm_spk_idual_mic_broadside_device, - &msm_idual_mic_broadside_device_u8860_es, - &msm_ispkr_music_stereo_device_u8860, - &msm_headset_music_stereo_device_u8860, - &msm_iearpiece_hac_device_u8860, - &msm_handset_secondary_mic_tx_device, - &msm_snddev_analog_fm_speaker_device, - &msm_snddev_analog_fm_hs_device, -}; -/* DTS2011122606588 yinzhaoyang 20111230 end > */ -/* < DTS2012010706112 liurennianKF62391 20120109 begin */ -static struct platform_device *snd_devices_u8680[] __initdata = { - &msm_iearpiece_device_u8680, - &msm_imic_device_u8860, - &msm_ispkr_stereo_device_u8860, - &msm_headset_mic_device_u8860, - &msm_snddev_mi2s_fm_tx_device, - &msm_bt_sco_earpiece_device, - &msm_bt_sco_mic_device, - &msm_ispkr_mic_device_u8860, - &msm_headset_stereo_device_u8680, - &msm_itty_mono_tx_device, - &msm_itty_mono_rx_device, - &msm_ihs_stereo_speaker_stereo_rx_device, - &msm_spk_idual_mic_broadside_device, - &msm_idual_mic_broadside_device_u8680, - &msm_ispkr_music_stereo_device_u8860, - &msm_headset_music_stereo_device_u8860, - &msm_iearpiece_hac_device_u8860, - &msm_handset_secondary_mic_tx_device, - &msm_snddev_analog_fm_speaker_device, - &msm_snddev_analog_fm_hs_device, -}; -/* DTS2012010706112 liurennianKF62391 20120109 end >*/ -#endif -/* DTS2011050601476 dongchen 20110506 end >*/ -/* */ -/* DTS2011092905909 yinzhaoyang 20110929 end >*/ -/* DTS2012022402932 gaolin 20120224 end > */ -/*< DTS2011050601476 dongchen 20110506 begin */ void __ref msm_snddev_init_timpani(void) { #ifndef CONFIG_HUAWEI_KERNEL @@ -2055,12 +1590,6 @@ void __ref msm_snddev_init_timpani(void) pr_err("failed to create msm_head_config debug fs entry\n"); #endif #else //#ifndef CONFIG_HUAWEI_KERNEL - /* < DTS2012022402932 gaolin 20120224 begin */ - /*< DTS2011122606588 yinzhaoyang 20111230 begin */ - smem_huawei_vender *vender_para_ptr; - const char *country_name = "es"; - /* DTS2011122606588 yinzhaoyang 20111230 end > */ - /* DTS2012022402932 gaolin 20120224 end > */ if (machine_is_msm7x30_ffa() || machine_is_msm8x55_ffa() || machine_is_msm8x55_svlte_ffa()) { platform_add_devices(snd_devices_ffa, @@ -2072,68 +1601,14 @@ void __ref msm_snddev_init_timpani(void) if (!debugfs_hsed_config) pr_err("failed to create msm_head_config debug fs entry\n"); #endif - /* */ || machine_is_msm8255_u8860_92() - || machine_is_msm8255_u8860_51()) - /* DTS2012010706112 liurennianKF62391 20120109 end >*/ - /* DTS2011120702244 liwei 20111207 end > */ - /* DTS2011102401822 liwei 20111024 end > */ - /* DTS2011092905909 yinzhaoyang 20110929 end >*/ - /* DTS2011091200073 zhangbo 20110912 end> */ - /* DTS2011091502092 liyuping 20110915 end> */ - /* DTS2011082302564 liwei 20110823 end > */ - /* DTS2011071600361 liyuping 20110716 end> */ - /* DTS2011062600102 sunhonghui 20110626 end> */ - { - /*< DTS2011122606588 yinzhaoyang 20111230 begin */ - vender_para_ptr = (smem_huawei_vender*)smem_alloc(SMEM_ID_VENDOR0, sizeof(smem_huawei_vender)); - if (!vender_para_ptr) - { - pr_info("%s: Can't find vender parameter\n", __func__); - return; - } - pr_info("vendor:%s,country:%s\n", vender_para_ptr->vender_para.vender_name, vender_para_ptr->vender_para.country_name); - - /* choose audio parameter table according to the vender name */ - if(!memcmp(vender_para_ptr->vender_para.country_name, country_name, strlen(country_name))) - { - platform_add_devices(snd_devices_u8860_es, ARRAY_SIZE(snd_devices_u8860_es)); - } - else - { - platform_add_devices(snd_devices_u8860, ARRAY_SIZE(snd_devices_u8860)); - } - /* DTS2011122606588 yinzhaoyang 20111230 end > */ - - /*< DTS2011051303410 dongchen 20110516 begin */ - /**/ - }else if (machine_is_msm8255_u8730() - || machine_is_msm8255_u8667()) - /* DTS2011120702244 liwei 20111207 end > */ - { - platform_add_devices(snd_devices_u8730, ARRAY_SIZE(snd_devices_u8730)); - /* DTS2011092905909 yinzhaoyang 20110929 end >*/ - /* DTS2012022402932 gaolin 20120224 end > */ + platform_add_devices(snd_devices_u8860, ARRAY_SIZE(snd_devices_u8860)); }else if (machine_is_msm8255_c8860()) { platform_add_devices(snd_devices_c8860, arraysize_c8860); @@ -2142,8 +1617,6 @@ void __ref msm_snddev_init_timpani(void) { platform_add_devices(snd_devices_u8860, ARRAY_SIZE(snd_devices_u8860)); } - /* DTS2011051303410 dongchen 20110516 end >*/ #endif //#ifndef CONFIG_HUAWEI_KERNEL } -/* DTS2011050601476 dongchen 20110506 end >*/ diff --git a/arch/arm/mach-msm/qdsp5v2/snddev_data_timpani_c8860.c b/arch/arm/mach-msm/qdsp5v2/snddev_data_timpani_c8860.c index 25a500ab2..5b55cc512 100755 --- a/arch/arm/mach-msm/qdsp5v2/snddev_data_timpani_c8860.c +++ b/arch/arm/mach-msm/qdsp5v2/snddev_data_timpani_c8860.c @@ -1,4 +1,3 @@ -/*< DTS2011051303410 dongchen 20110516 begin */ /* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -175,11 +174,9 @@ static struct platform_device msm_itty_mono_rx_device = { .dev = { .platform_data = &snddev_itty_mono_rx_data }, }; -/*< DTS2011092207134 dongchen 20110923 begin */ static struct adie_codec_action_unit ihs_stereo_speaker_stereo_rx_48KHz_osr256_actions[] = HEADSET_STEREO_SPEAKER_STEREO_RX_CAPLESS_48000_OSR_256_C8860; -/* DTS2011092207134 dongchen 20110923 end >*/ static struct adie_codec_hwsetting_entry @@ -199,9 +196,7 @@ static struct adie_codec_dev_profile ihs_stereo_speaker_stereo_rx_profile = { .setting_sz = ARRAY_SIZE(ihs_stereo_speaker_stereo_rx_settings), }; -/*< DTS2011101304810 dongchen 20111013 begin */ /* acdb_id from ACDB_ID_HEADSET_STEREO_PLUS_SPKR_STEREO_RX to ACDB_ID_HEADSET_STEREO_PLUS_SPKR_MONO_RX */ -/*< DTS2011061605311 dongchen 20110614 begin */ /* set msm_snddev_poweramp_4music_on as pamp_on func */ static struct snddev_icodec_data snddev_ihs_stereo_speaker_stereo_rx_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -220,8 +215,6 @@ static struct snddev_icodec_data snddev_ihs_stereo_speaker_stereo_rx_data = { .max_voice_rx_vol[VOC_WB_INDEX] = -500, .min_voice_rx_vol[VOC_WB_INDEX] = -2000, }; -/* DTS2011061605311 dongchen 20110614 end >*/ -/* DTS2011101304810 dongchen 20111013 end >*/ static struct platform_device msm_ihs_stereo_speaker_stereo_rx_device = { .name = "snddev_icodec", @@ -305,9 +298,7 @@ static struct adie_codec_dev_profile iearpiece_profile = { .setting_sz = ARRAY_SIZE(iearpiece_settings), }; -/*< DTS2011092901202 dongchen 20110929 begin */ /* min rx volume from -9 to -4 */ -/*< DTS2011062505020 dongchen 20110625 begin */ /* rx volume from -7dB to 6dB */ static struct snddev_icodec_data snddev_iearpiece_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -327,8 +318,6 @@ static struct snddev_icodec_data snddev_iearpiece_data = { .max_voice_rx_vol[VOC_WB_INDEX] = -100, .min_voice_rx_vol[VOC_WB_INDEX] = -1100, }; -/* DTS2011062505020 dongchen 20110625 end >*/ -/* DTS2011092901202 dongchen 20110929 end >*/ static struct platform_device msm_iearpiece_device = { .name = "snddev_icodec", @@ -396,9 +385,7 @@ static struct adie_codec_dev_profile ispkr_stereo_profile = { .setting_sz = ARRAY_SIZE(ispkr_stereo_settings), }; -/*< DTS2011092901202 dongchen 20110929 begin */ /* min volume from -17 to -12 */ -/*< DTS2011053005461 dongchen 20110530 begin */ static struct snddev_icodec_data snddev_ispkr_stereo_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), .name = "speaker_stereo_rx", @@ -416,8 +403,6 @@ static struct snddev_icodec_data snddev_ispkr_stereo_data = { .max_voice_rx_vol[VOC_WB_INDEX] = -200, .min_voice_rx_vol[VOC_WB_INDEX] = -1200 }; -/* DTS2011053005461 dongchen 20110530 end >*/ -/* DTS2011092901202 dongchen 20110929 end >*/ static struct platform_device msm_ispkr_stereo_device = { .name = "snddev_icodec", @@ -506,9 +491,7 @@ static struct adie_codec_dev_profile headset_ab_cpls_profile = { .setting_sz = ARRAY_SIZE(headset_ab_cpls_settings), }; -/*< DTS2011101600449 dongchen 20111017 begin */ /* rx volume from -4dB to -7dB */ -/*< DTS2011062505020 dongchen 20110625 begin */ /* rx volume from -7dB to -4dB */ static struct snddev_icodec_data snddev_ihs_stereo_rx_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -530,8 +513,6 @@ static struct snddev_icodec_data snddev_ihs_stereo_rx_data = { .max_voice_rx_vol[VOC_WB_INDEX] = -1400, .min_voice_rx_vol[VOC_WB_INDEX] = -2900, }; -/* DTS2011062505020 dongchen 20110625 end >*/ -/* DTS2011101600449 dongchen 20111017 end >*/ static struct platform_device msm_headset_stereo_device = { .name = "snddev_icodec", @@ -591,10 +572,8 @@ static struct platform_device msm_idual_mic_broadside_device = { }; /* SPEAKER MUSIC STEREO DEVICE */ -/*< DTS2011050903865 dongchen 20110513 begin */ static struct adie_codec_action_unit ispkr_music_stereo_48KHz_osr256_actions[] = SPEAKER_PRI_MUSIC_STEREO_48000_OSR_256_C8860; -/* DTS2011050903865 dongchen 20110513 end >*/ static struct adie_codec_hwsetting_entry ispkr_music_stereo_settings[] = { { @@ -611,9 +590,7 @@ static struct adie_codec_dev_profile ispkr_music_stereo_profile = { .setting_sz = ARRAY_SIZE(ispkr_music_stereo_settings), }; -/*< DTS2011061605311 dongchen 20110614 begin */ /* set ACDB_ID_SPKR_PHONE_MUSIC_MONO as acdb_id */ -/*< DTS2011053005461 dongchen 20110530 begin */ static struct snddev_icodec_data snddev_ispkr_music_stereo_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), .name = "speaker_music_rx", @@ -631,8 +608,6 @@ static struct snddev_icodec_data snddev_ispkr_music_stereo_data = { .max_voice_rx_vol[VOC_WB_INDEX] = 1000, .min_voice_rx_vol[VOC_WB_INDEX] = -500 }; -/* DTS2011053005461 dongchen 20110530 end >*/ -/* DTS2011061605311 dongchen 20110614 end >*/ static struct platform_device msm_ispkr_music_stereo_device = { .name = "snddev_icodec", @@ -659,7 +634,6 @@ static struct adie_codec_dev_profile headset_ab_cpls_music_profile = { .setting_sz = ARRAY_SIZE(headset_ab_cpls_music_settings), }; -/*< DTS2011061605311 dongchen 20110614 begin */ /* set ACDB_ID_HEADSET_SPKR_MUSIC_STEREO as acdb_id */ static struct snddev_icodec_data snddev_ihs_music_stereo_rx_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -681,7 +655,6 @@ static struct snddev_icodec_data snddev_ihs_music_stereo_rx_data = { .max_voice_rx_vol[VOC_WB_INDEX] = -900, .min_voice_rx_vol[VOC_WB_INDEX] = -2400, }; -/* DTS2011061605311 dongchen 20110614 end >*/ static struct platform_device msm_headset_music_stereo_device = { .name = "snddev_icodec", @@ -708,9 +681,7 @@ static struct adie_codec_dev_profile iearpiece_hac_profile = { .setting_sz = ARRAY_SIZE(iearpiece_hac_settings), }; -/*< DTS2011062505020 dongchen 20110625 begin */ /* rx volume from -7dB to 6dB */ -/*< DTS2011061605311 dongchen 20110614 begin */ /* set ACDB_ID_HANDSET_HAC_SPKR as acdb_id */ static struct snddev_icodec_data snddev_iearpiece_hac_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -722,19 +693,15 @@ static struct snddev_icodec_data snddev_iearpiece_hac_data = { .pmctl_id = NULL, .pmctl_id_sz = 0, .default_sample_rate = 48000, - /**/ .property = SIDE_TONE_MASK, .max_voice_rx_vol[VOC_NB_INDEX] = 600, .min_voice_rx_vol[VOC_NB_INDEX] = -900, .max_voice_rx_vol[VOC_WB_INDEX] = -100, .min_voice_rx_vol[VOC_WB_INDEX] = -1600, }; -/* DTS2011061605311 dongchen 20110614 end >*/ -/* DTS2011062505020 dongchen 20110625 end >*/ static struct platform_device msm_iearpiece_hac_device = { .name = "snddev_icodec", @@ -802,7 +769,6 @@ static struct adie_codec_dev_profile ifm_analog_speaker_profile = { .setting_sz = ARRAY_SIZE(ifm_analog_speaker_settings), }; -/*< DTS2011082205270 dongchen 20110824 begin */ /* set msm_snddev_poweramp_4music_on as pamp_on for FM Speaker */ static struct snddev_icodec_data snddev_analog_fm_speaker_data = { .capability = (SNDDEV_CAP_RX | SNDDEV_CAP_VOICE), @@ -817,7 +783,6 @@ static struct snddev_icodec_data snddev_analog_fm_speaker_data = { .pamp_on = &msm_snddev_poweramp_4music_on, .pamp_off = &msm_snddev_poweramp_off, }; -/* DTS2011082205270 dongchen 20110824 end >*/ static struct platform_device msm_snddev_analog_fm_speaker_device = { .name = "snddev_icodec", @@ -888,4 +853,3 @@ struct platform_device *snd_devices_c8860[] __initdata = { int arraysize_c8860 = ARRAY_SIZE(snd_devices_c8860); -/* DTS2011051303410 dongchen 20110516 end >*/ \ No newline at end of file diff --git a/arch/arm/mach-msm/qdsp5v2/snddev_ecodec.c b/arch/arm/mach-msm/qdsp5v2/snddev_ecodec.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/snddev_icodec.c b/arch/arm/mach-msm/qdsp5v2/snddev_icodec.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/snddev_mi2s.c b/arch/arm/mach-msm/qdsp5v2/snddev_mi2s.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/snddev_virtual.c b/arch/arm/mach-msm/qdsp5v2/snddev_virtual.c old mode 100644 new mode 100755 diff --git a/arch/arm/mach-msm/qdsp5v2/timpani_profile_7x30.h b/arch/arm/mach-msm/qdsp5v2/timpani_profile_7x30.h index e2d925e95..ec31ee539 100755 --- a/arch/arm/mach-msm/qdsp5v2/timpani_profile_7x30.h +++ b/arch/arm/mach-msm/qdsp5v2/timpani_profile_7x30.h @@ -169,7 +169,6 @@ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} }; -/*< DTS2011050601476 dongchen 20110506 begin */ #ifdef CONFIG_HUAWEI_KERNEL /* RX EAR */ #define EAR_PRI_MONO_8000_OSR_256_U8860 \ @@ -199,7 +198,6 @@ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/*< DTS2011053005461 dongchen 20110530 begin */ /* disable sidetone (0x8c, 0x03, 0x02) to (0x8c, 0x05, 0x05)*/ #define AMIC_PRI_MONO_8000_OSR_256_U8860 \ {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ @@ -238,10 +236,8 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0xAB, 0x09, 0x09)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/* DTS2011053005461 dongchen 20110530 end >*/ /* RX SPEAKER */ -/*< DTS2011053005461 dongchen 20110530 begin */ /* mono differential (0x3A, 0x24, 0x24) to (0x3A, 0x20, 0x20), add (0x3B, 0x04, 0x04) */ #define SPEAKER_PRI_STEREO_48000_OSR_256_U8860 \ {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ @@ -288,9 +284,7 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0x04, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} }; -/* DTS2011053005461 dongchen 20110530 end >*/ -/*< DTS2011053005461 dongchen 20110530 begin */ /* disable SIDETONE (0x8c, 0x03, 0x02) to (0x8c, 0x05, 0x05)*/ #define AMIC1_HEADSET_TX_MONO_PRIMARY_OSR256_U8860 \ {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF}, \ @@ -327,7 +321,6 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x14, 0xFF, 0x64)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x11, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0x00)} } -/* DTS2011053005461 dongchen 20110530 end >*/ /* RX HPH CLASS AB CAPLESS */ #define HEADSET_AB_CPLS_48000_OSR_256_U8860 \ @@ -373,11 +366,8 @@ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/*< DTS2011061605311 dongchen 20110614 begin */ /* (0xE0, 0xFE, 0x10) to (0xE0, 0xFE, 0x0C) line out analog gain -3dB */ -/*< DTS2011050903865 dongchen 20110513 begin */ /* RX SPEAKER MUSIC */ -/*< DTS2011053005461 dongchen 20110530 begin */ /* mono differential (0x3A, 0x24, 0x24) to (0x3A, 0x20, 0x20), add (0x3B, 0x04, 0x04) */ #define SPEAKER_PRI_MUSIC_STEREO_48000_OSR_256_U8860 \ {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ @@ -424,9 +414,6 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0x04, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} }; -/* DTS2011053005461 dongchen 20110530 end >*/ -/* DTS2011050903865 dongchen 20110513 end >*/ -/* DTS2011061605311 dongchen 20110614 end >*/ /* AMIC Secondary mono */ /* (0x0D, 0xFF, 0xD0) to (0x0D, 0xFF, 0xE1) connect AUX_IN */ @@ -471,7 +458,6 @@ /* AMIC broadside dual */ /* (0x0E, 0xFF, 0xc2) to (0x0E, 0xFF, 0xE1)*/ -/*< DTS2011053005461 dongchen 20110530 begin */ /* disable sidetone gain (0x8c, 0x03, 0x02) to (0x8c, 0x05, 0x05)*/ #define AMIC_BROADSIDE_DUAL_8000_OSR_256_U8860 \ {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ @@ -511,133 +497,6 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x11, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/* DTS2011053005461 dongchen 20110530 end >*/ -/* < DTS2012022402932 gaolin 20120224 begin */ -/* < DTS2012010706112 liurennianKF62391 20120109 begin */ -/*(0xA0, 0x01, 0x01)(0x8b, 0xff, 0xF6)(0x8c, 0x03, 0x02)*/ - -#define AMIC_BROADSIDE_DUAL_8000_OSR_256_U8680 \ - {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x05, 0x05)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x05, 0x00)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x0C, 0x00)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0x30)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x86, 0xFF, 0xAC)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x87, 0xFF, 0xAC)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0xF0)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x82, 0xFF, 0x1E)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0xA3, 0x01, 0x01)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x93, 0xFF, 0x00)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x94, 0xFF, 0x1B)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x99, 0x0F, 0x04)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x9F, 0x03, 0x03)}, \ - {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_READY}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0D, 0xFF, 0xD0)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0E, 0xFF, 0xE1)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x11, 0xFF, 0xBC)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0xBC)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x14, 0xFF, 0x65)}, \ - {ADIE_CODEC_ACTION_DELAY_WAIT, 0xbb8 }, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x0C, 0x0C)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8b, 0xff, 0xF0)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8c, 0x03, 0x02)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x86, 0xFF, 0x10)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x87, 0xFF, 0x10)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0xC0)}, \ - {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_ANALOG_READY}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0xF0)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x0C, 0x00)}, \ - {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0D, 0xFF, 0x00)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0E, 0xFF, 0x00)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x14, 0xFF, 0x64)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x11, 0xFF, 0x00)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0x00)}, \ - {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/* DTS2012010706112 liurennianKF62391 20120109 end > */ -/*< DTS2011122606588 yinzhaoyang 20111230 begin */ -/*(0xA0, 0x01, 0x01)(0x8b, 0xff, 0xF6)(0x8c, 0x03, 0x02)*/ - -#define AMIC_BROADSIDE_DUAL_8000_OSR_256_U8860_es \ - {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x05, 0x05)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x05, 0x00)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x0C, 0x00)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0x30)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x86, 0xFF, 0xAC)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x87, 0xFF, 0xAC)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0xF0)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x82, 0xFF, 0x1E)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0xA3, 0x01, 0x01)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x93, 0xFF, 0x00)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x94, 0xFF, 0x1B)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x99, 0x0F, 0x04)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x9F, 0x03, 0x03)}, \ - {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_READY}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0D, 0xFF, 0xD0)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0E, 0xFF, 0xE1)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x11, 0xFF, 0xBC)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0xBC)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x14, 0xFF, 0x65)}, \ - {ADIE_CODEC_ACTION_DELAY_WAIT, 0xbb8 }, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x0C, 0x0C)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8b, 0xff, 0xED)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8c, 0x03, 0x02)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x86, 0xFF, 0x10)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x87, 0xFF, 0x10)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0xC0)}, \ - {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_ANALOG_READY}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0xF0)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x0C, 0x00)}, \ - {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0D, 0xFF, 0x00)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0E, 0xFF, 0x00)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x14, 0xFF, 0x64)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x11, 0xFF, 0x00)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0x00)}, \ - {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/* DTS2011122606588 yinzhaoyang 20111230 end > */ -/* < DTS2012012101655 liurennianKF62391 20120129 begin */ -#define AMIC_BROADSIDE_DUAL_8000_OSR_256_U8730 \ - {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x05, 0x05)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x05, 0x00)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x0C, 0x00)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0x30)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x86, 0xFF, 0xAC)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x87, 0xFF, 0xAC)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0xF0)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x82, 0xFF, 0x1E)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0xA3, 0x01, 0x01)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x93, 0xFF, 0x00)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x94, 0xFF, 0x1B)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x99, 0x0F, 0x04)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x9F, 0x03, 0x03)}, \ - {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_READY}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0D, 0xFF, 0xD0)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0E, 0xFF, 0xE1)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x11, 0xFF, 0xBC)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0xBC)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x14, 0xFF, 0x65)}, \ - {ADIE_CODEC_ACTION_DELAY_WAIT, 0xbb8 }, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x0C, 0x0C)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8b, 0xff, 0xE9)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8c, 0x03, 0x02)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x86, 0xFF, 0x10)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x87, 0xFF, 0x10)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0xC0)}, \ - {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_ANALOG_READY}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x8A, 0xF0, 0xF0)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x83, 0x0C, 0x00)}, \ - {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0D, 0xFF, 0x00)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x0E, 0xFF, 0x00)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x14, 0xFF, 0x64)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x11, 0xFF, 0x00)}, \ - {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0x00)}, \ - {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/* DTS2012012101655 liurennianKF62391 20120129 end > */ -/* DTS2012022402932 gaolin 20120224 end > */ /* RX HPH CLASS AB CAPLESS */ #define HEADSET_AB_CPLS_MUSIC_48000_OSR_256_U8860 \ @@ -711,22 +570,17 @@ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/* < DTS2012041008758 duhongyan 20120426 begin */ -/* Change ADIE_CODEC_DIGITAL_OFF back to ADIE_CODEC_FLASH_IMAGE to avoid FM electric noise, after 404026 SBA update */ -/*< DTS2011101304786 dongchen 20111013 begin */ /* use ADIE_CODEC_DIGITAL_OFF instead of ADIE_CODEC_FLASH_IMAGE, can avoid FM electric noise */ /* disconnect class D HPA (0x33, 0xFF, 0x3F) to (0x33, 0xFF, 0x30) */ /* delete useless (0x3C, 0x27, 0x24) */ -/*< DTS2011082205270 dongchen 20110824 begin */ /* (0x38, 0xFF, 0xAA) to (0x38, 0xFF, 0x99) AUXPGA from 0dB to -3dB */ -/*< DTS2011061605311 dongchen 20110614 begin */ /* (0x38, 0xFF, 0x66) to (0x38, 0xFF, 0xAA) AUXPGA 0dB, (0x36, 0xFE, 0x24) to (0x36, 0xFE, 0x08) Left/Right Gain -1.5dB */ /* 0x33 Enable Aux PGA */ /* 0x38 set Aux PGA Left/Right Gain -12dB */ /* 0x3c connet Aux PGA and RX1 from HPH */ /* 0x36 0x37 set Left/Right Gain 12dB */ #define FM_ANALOG_HEADSET_48000_OSR_256 \ - {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ + {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF}, \ {ADIE_CODEC_ACTION_DELAY_WAIT, 0xBB8}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x02, 0x02)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x02, 0x00)}, \ @@ -772,27 +626,18 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x31, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/* DTS2011061605311 dongchen 20110614 end >*/ -/* DTS2011082205270 dongchen 20110824 end >*/ -/* DTS2011101304786 dongchen 20111013 end >*/ -/* DTS2012041008758 duhongyan 20120426 end > */ -/* < DTS2012041008758 duhongyan 20120426 begin */ -/* Change ADIE_CODEC_DIGITAL_OFF back to ADIE_CODEC_FLASH_IMAGE to avoid FM electric noise, after 404026 SBA update */ -/*< DTS2011101304786 dongchen 20111013 begin */ /* use ADIE_CODEC_DIGITAL_OFF instead of ADIE_CODEC_FLASH_IMAGE, can avoid FM electric noise */ -/*< DTS2011061605311 dongchen 20110614 begin */ /* mono differential (0x3A, 0xFC, 0xB4) to (0x3A, 0xFC, 0xA0), add (0x3B, 0xFC, 0x14) */ /* (0x38, 0xFF, 0x66) to (0x38, 0xFF, 0xBB) set Aux PGA Left/Right Gain 3dB */ /* (0xE0, 0xFE, 0x10) to (0xE0, 0xFE, 0x04) Lineout analog gain 0dB */ -/*< DTS2011050903865 dongchen 20110513 begin */ /* (0x33, 0xF0, 0x30) Enable Aux PGA */ /* (0x38, 0xFF, 0x66) set Aux PGA Left/Right Gain 12dB */ /* (0x3A, 0xFC, 0xB4) connet Aux PGA and RX1 from FM Speaker */ /* (0x34, 0xFD, 0x24)set Left Gain 12dB */ /* (0x35, 0xFD, 0x24)set Left Gain 12dB */ #define FM_ANALOG_SPEAKER_48000_OSR_256 \ - {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ + {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF}, \ {ADIE_CODEC_ACTION_DELAY_WAIT, 0xBB8}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x02, 0x02)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x02, 0x00)}, \ @@ -841,13 +686,8 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0xFC, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/* DTS2011050903865 dongchen 20110513 end >*/ -/* DTS2011061605311 dongchen 20110614 end >*/ -/* DTS2011101304786 dongchen 20111013 end >*/ -/* DTS2012041008758 duhongyan 20120426 end > */ #endif -/* DTS2011050601476 dongchen 20110506 end >*/ /* * RX HPH PRIMARY @@ -1040,15 +880,11 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x33, 0x80, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/*< DTS2011101600449 dongchen 20111017 begin */ /* codec rx gain from 0dB to 3dB (0x84, 0xFF, 0x00) to (0x84, 0xFF, 0x03) */ /* HPH_VOL set from -9dB to -12dB (0xE2, 0xFE, 0x1C) to (0xE2, 0xFE, 0x24) */ -/*< DTS2011101402198 zhangcunfei 20111014 begin */ /* HPH_VOL set from -12dB to -9dB (0xE2, 0xFE, 0x24) to (0xE2, 0xFE, 0x1c) */ -/*< DTS2011092207134 dongchen 20110923 begin */ /* HPH_VOL set from -6 to -12dB (0xE2, 0xFE, 0x14) to (0xE2, 0xFE, 0x24) */ /* LINE_AVOL set from -4.5 to 1.5dB add (0xE0, 0xFE, 0x00) */ -/*< DTS2011061605311 dongchen 20110614 begin */ /* mono differential (0x3A, 0x24, 0x24) to (0x3A, 0x20, 0x20), add (0x3B, 0x04, 0x04) */ /* HPH_VOL set to -6dB (0xE2, 0xFE, 0x04) to (0xE2, 0xFE, 0x14), (0xE3, 0xFE, 0x04) to (0xE3, 0xFE, 0x14) */ #define HEADSET_STEREO_SPEAKER_STEREO_RX_CAPLESS_48000_OSR_256 \ @@ -1114,10 +950,6 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0x04, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/* DTS2011061605311 dongchen 20110614 end >*/ -/* DTS2011092207134 dongchen 20110923 end >*/ -/* DTS2011101402198 zhangcunfei 20111014 end >*/ -/* DTS2011101600449 dongchen 20111017 end >*/ #define HS_DMIC2_STEREO_8000_OSR_256 \ {{ADIE_CODEC_ACTION_DELAY_WAIT, 0xbb8 }, \ diff --git a/arch/arm/mach-msm/qdsp5v2/timpani_profile_7x30_c8860.h b/arch/arm/mach-msm/qdsp5v2/timpani_profile_7x30_c8860.h index c599ae533..bb8811efe 100755 --- a/arch/arm/mach-msm/qdsp5v2/timpani_profile_7x30_c8860.h +++ b/arch/arm/mach-msm/qdsp5v2/timpani_profile_7x30_c8860.h @@ -1,4 +1,3 @@ -/*< DTS2011051303410 dongchen 20110516 begin */ /* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -59,7 +58,6 @@ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/*< DTS2011053005461 dongchen 20110530 begin */ /* disable sidetone (0x8c, 0x03, 0x02) to (0x8c, 0x05, 0x05)*/ #define AMIC_PRI_MONO_8000_OSR_256_C8860 \ {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ @@ -98,10 +96,8 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0xAB, 0x09, 0x09)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/* DTS2011053005461 dongchen 20110530 end >*/ /* RX SPEAKER */ -/*< DTS2011053005461 dongchen 20110530 begin */ /* mono differential (0x3A, 0x24, 0x24) to (0x3A, 0x20, 0x20), add (0x3B, 0x04, 0x04) */ #define SPEAKER_PRI_STEREO_48000_OSR_256_C8860 \ {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ @@ -148,9 +144,7 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0x04, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} }; -/* DTS2011053005461 dongchen 20110530 end >*/ -/*< DTS2011053005461 dongchen 20110530 begin */ /* disable SIDETONE (0x8c, 0x03, 0x02) to (0x8c, 0x05, 0x05)*/ #define AMIC1_HEADSET_TX_MONO_PRIMARY_OSR256_C8860 \ {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF}, \ @@ -187,7 +181,6 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x14, 0xFF, 0x64)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x11, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0x00)} } -/* DTS2011053005461 dongchen 20110530 end >*/ /* RX HPH CLASS AB CAPLESS */ #define HEADSET_AB_CPLS_48000_OSR_256_C8860 \ @@ -233,11 +226,8 @@ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/*< DTS2011061605311 dongchen 20110614 begin */ /* (0xE0, 0xFE, 0x10) to (0xE0, 0xFE, 0x0C) line out analog gain -3dB */ -/*< DTS2011050903865 dongchen 20110513 begin */ /* RX SPEAKER MUSIC */ -/*< DTS2011053005461 dongchen 20110530 begin */ /* mono differential (0x3A, 0x24, 0x24) to (0x3A, 0x20, 0x20), add (0x3B, 0x04, 0x04) */ #define SPEAKER_PRI_MUSIC_STEREO_48000_OSR_256_C8860 \ {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ @@ -284,9 +274,6 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0x04, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} }; -/* DTS2011053005461 dongchen 20110530 end >*/ -/* DTS2011050903865 dongchen 20110513 end >*/ -/* DTS2011061605311 dongchen 20110614 end >*/ /* AMIC Secondary mono */ /* (0x0D, 0xFF, 0xD0) to (0x0D, 0xFF, 0xE1) connect AUX_IN */ @@ -331,7 +318,6 @@ /* AMIC broadside dual */ /* (0x0E, 0xFF, 0xc2) to (0x0E, 0xFF, 0xE1)*/ -/*< DTS2011053005461 dongchen 20110530 begin */ /* disable sidetone gain (0x8c, 0x03, 0x02) to (0x8c, 0x05, 0x05)*/ #define AMIC_BROADSIDE_DUAL_8000_OSR_256_C8860 \ {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ @@ -371,9 +357,7 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x11, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x12, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/* DTS2011053005461 dongchen 20110530 end >*/ -/*< DTS2011092901202 dongchen 20110929 begin */ /* HPH_VOL set from -1.5 to -4.5 dB (0xE2, 0xFE, 0x04) to (0xE2, 0xFE, 0x10) */ /* RX HPH CLASS AB CAPLESS */ #define HEADSET_AB_CPLS_MUSIC_48000_OSR_256_C8860 \ @@ -418,7 +402,6 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x31, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/* DTS2011092901202 dongchen 20110929 end >*/ /* RX HAC EAR */ #define EAR_HAC_PRI_MONO_8000_OSR_256_C8860 \ @@ -448,22 +431,17 @@ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/* < DTS2012041008758 duhongyan 20120426 begin */ -/* Change ADIE_CODEC_DIGITAL_OFF back to ADIE_CODEC_FLASH_IMAGE to avoid FM electric noise, after 404026 SBA update */ -/*< DTS2011101304786 dongchen 20111013 begin */ /* use ADIE_CODEC_DIGITAL_OFF instead of ADIE_CODEC_FLASH_IMAGE, can avoid FM electric noise */ /* disconnect class D HPA (0x33, 0xFF, 0x3F) to (0x33, 0xFF, 0x30) */ /* delete useless (0x3C, 0x27, 0x24) */ -/*< DTS2011082205270 dongchen 20110824 begin */ /* (0x38, 0xFF, 0xAA) to (0x38, 0xFF, 0x99) AUXPGA from 0dB to -3dB */ -/*< DTS2011061605311 dongchen 20110614 begin */ /* (0x38, 0xFF, 0x66) to (0x38, 0xFF, 0xAA) AUXPGA 0dB, (0x36, 0xFE, 0x24) to (0x36, 0xFE, 0x08) Left/Right Gain -1.5dB */ /* 0x33 Enable Aux PGA */ /* 0x38 set Aux PGA Left/Right Gain -12dB */ /* 0x3c connet Aux PGA and RX1 from HPH */ /* 0x36 0x37 set Left/Right Gain 12dB */ #define FM_ANALOG_HEADSET_48000_OSR_256_C8860 \ - {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ + {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF}, \ {ADIE_CODEC_ACTION_DELAY_WAIT, 0xBB8}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x02, 0x02)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x02, 0x00)}, \ @@ -509,27 +487,18 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x31, 0xFF, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/* DTS2011061605311 dongchen 20110614 end >*/ -/* DTS2011082205270 dongchen 20110824 end >*/ -/* DTS2011101304786 dongchen 20111013 end >*/ -/* DTS2012041008758 duhongyan 20120426 end > */ -/* < DTS2012041008758 duhongyan 20120426 begin */ -/* Change ADIE_CODEC_DIGITAL_OFF back to ADIE_CODEC_FLASH_IMAGE to avoid FM electric noise, after 404026 SBA update */ -/*< DTS2011101304786 dongchen 20111013 begin */ /* use ADIE_CODEC_DIGITAL_OFF instead of ADIE_CODEC_FLASH_IMAGE, can avoid FM electric noise */ -/*< DTS2011061605311 dongchen 20110614 begin */ /* mono differential (0x3A, 0xFC, 0xB4) to (0x3A, 0xFC, 0xA0), add (0x3B, 0xFC, 0x14) */ /* (0x38, 0xFF, 0x66) to (0x38, 0xFF, 0xBB) set Aux PGA Left/Right Gain 3dB */ /* (0xE0, 0xFE, 0x10) to (0xE0, 0xFE, 0x04) Lineout analog gain 0dB */ -/*< DTS2011050903865 dongchen 20110513 begin */ /* (0x33, 0xF0, 0x30) Enable Aux PGA */ /* (0x38, 0xFF, 0x66) set Aux PGA Left/Right Gain -12dB */ /* (0x3A, 0xFC, 0xB4) connet Aux PGA and RX1 from FM Speaker */ /* (0x34, 0xFD, 0x24)set Left Gain 12dB */ /* (0x35, 0xFD, 0x24)set Left Gain 12dB */ #define FM_ANALOG_SPEAKER_48000_OSR_256_C8860 \ - {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_FLASH_IMAGE}, \ + {{ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF}, \ {ADIE_CODEC_ACTION_DELAY_WAIT, 0xBB8}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x02, 0x02)}, \ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x80, 0x02, 0x00)}, \ @@ -578,18 +547,11 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0xFC, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/* DTS2011050903865 dongchen 20110513 end >*/ -/* DTS2011061605311 dongchen 20110614 end >*/ -/* DTS2011101304786 dongchen 20111013 end >*/ -/* DTS2012041008758 duhongyan 20120426 end > */ -/*< DTS2011101600449 dongchen 20111017 begin */ /* codec rx gain from 0dB to 3dB (0x84, 0xFF, 0x00) to (0x84, 0xFF, 0x03) */ /* HPH_VOL from -19.5dB to -22.5dB (0xE2, 0xFE, 0x38) to (0xE2, 0xFE, 0x40) */ -/*< DTS2011092901202 dongchen 20110929 begin */ /* HPH_VOL set from -6 to -19.5dB (0xE2, 0xFE, 0x14) to (0xE2, 0xFE, 0x38) */ /* LINE_AVOL set from -4.5 to 1.5dB add (0xE0, 0xFE, 0x00) */ -/*< DTS2011092207134 dongchen 20110923 begin */ /* because U8860 change ADIE setting, define standalone C8860 setting to remain the same as before */ /* mono differential (0x3A, 0x24, 0x24) to (0x3A, 0x20, 0x20), add (0x3B, 0x04, 0x04) */ /* HPH_VOL set to -6dB (0xE2, 0xFE, 0x04) to (0xE2, 0xFE, 0x14), (0xE3, 0xFE, 0x04) to (0xE3, 0xFE, 0x14) */ @@ -654,9 +616,5 @@ {ADIE_CODEC_ACTION_ENTRY, ADIE_CODEC_PACK_ENTRY(0x3B, 0x04, 0x00)}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_ANALOG_OFF}, \ {ADIE_CODEC_ACTION_STAGE_REACHED, ADIE_CODEC_DIGITAL_OFF} } -/* DTS2011092207134 dongchen 20110923 end >*/ -/* DTS2011092901202 dongchen 20110929 end >*/ -/* DTS2011101600449 dongchen 20111017 end >*/ -/* DTS2011051303410 dongchen 20110516 end >*/ #endif diff --git a/arch/arm/mach-msm/qdsp5v2/voice.c b/arch/arm/mach-msm/qdsp5v2/voice.c old mode 100644 new mode 100755 index 026acb33a..3d6b2af93 --- a/arch/arm/mach-msm/qdsp5v2/voice.c +++ b/arch/arm/mach-msm/qdsp5v2/voice.c @@ -494,7 +494,7 @@ static int voice_cmd_device_info(struct voice_data *v) cmd.rx_sample = v->dev_rx.sample/1000; cmd.tx_sample = v->dev_tx.sample/1000; - MM_DBG("rx_vol=%d, rx_sample=%d\n", cmd.rx_volume, v->dev_rx.sample); + MM_INFO("rx_vol=%d, rx_sample=%d\n", cmd.rx_volume, v->dev_rx.sample); err = dalrpc_fcn_5(VOICE_DALRPC_CMD, v->handle, &cmd, sizeof(struct voice_device)); diff --git a/sound/soc/msm/Kconfig b/sound/soc/msm/Kconfig old mode 100644 new mode 100755 index 1ed5f74bc..9e0549b51 --- a/sound/soc/msm/Kconfig +++ b/sound/soc/msm/Kconfig @@ -80,13 +80,6 @@ config SND_SOC_MSM8660_LPAIF config SND_VOIP_PCM tristate -config SND_SOC_MSM_QDSP6_HDMI_AUDIO - tristate "Soc QDSP6 HDMI Audio DAI driver" - depends on FB_MSM_HDMI_MSM_PANEL - default n - help - To support HDMI Audio on MSM8960 over QDSP6. - config MSM_8x60_VOIP tristate "SoC Machine driver for voip" depends on SND_SOC_MSM8X60 @@ -127,7 +120,6 @@ config SND_SOC_MSM8960 select SND_SOC_MSM_STUB select SND_SOC_WCD9310 select SND_SOC_MSM_HOSTLESS_PCM - select SND_SOC_MSM_QDSP6_HDMI_AUDIO default n help To add support for SoC audio on MSM8960 and APQ8064 boards diff --git a/sound/soc/msm/Makefile b/sound/soc/msm/Makefile old mode 100644 new mode 100755 index 1b3014e24..3b257a603 --- a/sound/soc/msm/Makefile +++ b/sound/soc/msm/Makefile @@ -56,13 +56,12 @@ obj-$(CONFIG_SND_SOC_MSM8X60) += snd-soc-lpass-dma.o obj-$(CONFIG_SND_SOC_MSM_QDSP6_INTF) += qdsp6/ -snd-soc-qdsp6-objs := msm-dai-q6.o msm-pcm-q6.o msm-multi-ch-pcm-q6.o msm-pcm-routing.o msm-dai-fe.o msm-compr-q6.o -obj-$(CONFIG_SND_SOC_MSM_QDSP6_HDMI_AUDIO) += msm-dai-q6-hdmi.o +snd-soc-qdsp6-objs := msm-dai-q6.o msm-pcm-q6.o msm-pcm-routing.o msm-dai-fe.o msm-compr-q6.o obj-$(CONFIG_SND_SOC_VOICE) += msm-pcm-voice.o msm-pcm-voip.o snd-soc-qdsp6-objs += msm-pcm-lpa.o msm-pcm-afe.o obj-$(CONFIG_SND_SOC_QDSP6) += snd-soc-qdsp6.o -snd-soc-msm8960-objs := msm8960.o apq8064.o +snd-soc-msm8960-objs := msm8960.o obj-$(CONFIG_SND_SOC_MSM8960) += snd-soc-msm8960.o # Generic MSM drivers diff --git a/sound/soc/msm/lpass-dma.c b/sound/soc/msm/lpass-dma.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/lpass-i2s.c b/sound/soc/msm/lpass-i2s.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/lpass-pcm.c b/sound/soc/msm/lpass-pcm.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/lpass-pcm.h b/sound/soc/msm/lpass-pcm.h old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm-compr-q6.c b/sound/soc/msm/msm-compr-q6.c old mode 100755 new mode 100644 index 590d4af71..cf6f1e747 --- a/sound/soc/msm/msm-compr-q6.c +++ b/sound/soc/msm/msm-compr-q6.c @@ -88,10 +88,10 @@ static void compr_event_handler(uint32_t opcode, atomic_inc(&prtd->out_count); wake_up(&the_locks.write_wait); if (!atomic_read(&prtd->start)) { - atomic_set(&prtd->pending_buffer, 1); + prtd->pending_buffer = 1; break; } else - atomic_set(&prtd->pending_buffer, 0); + prtd->pending_buffer = 0; if (runtime->status->hw_ptr >= runtime->control->appl_ptr) break; @@ -131,7 +131,8 @@ static void compr_event_handler(uint32_t opcode, case APR_BASIC_RSP_RESULT: { switch (payload[0]) { case ASM_SESSION_CMD_RUN: { - if (!atomic_read(&prtd->pending_buffer)) + if (!prtd->pending_buffer && + !atomic_read(&prtd->start)) break; pr_debug("%s:writing %d bytes" " of buffer[%d] to dsp\n", @@ -155,7 +156,6 @@ static void compr_event_handler(uint32_t opcode, prtd->out_head = (prtd->out_head + 1) & (runtime->periods - 1); - atomic_set(&prtd->pending_buffer, 0); } break; case ASM_STREAM_CMD_FLUSH: @@ -302,7 +302,7 @@ static int msm_compr_open(struct snd_pcm_substream *substream) pr_info("snd_pcm_hw_constraint_integer failed\n"); prtd->dsp_cnt = 0; - atomic_set(&prtd->pending_buffer, 1); + prtd->pending_buffer = 1; compr->codec = FORMAT_MP3; populate_codec_list(compr, runtime); runtime->private_data = compr; @@ -321,7 +321,7 @@ static int msm_compr_playback_close(struct snd_pcm_substream *substream) pr_debug("%s\n", __func__); dir = IN; - atomic_set(&prtd->pending_buffer, 0); + q6asm_cmd(prtd->audio_client, CMD_CLOSE); q6asm_audio_client_buf_free_contiguous(dir, prtd->audio_client); diff --git a/sound/soc/msm/msm-dai-fe.c b/sound/soc/msm/msm-dai-fe.c old mode 100644 new mode 100755 index 8f71e8332..16d149e50 --- a/sound/soc/msm/msm-dai-fe.c +++ b/sound/soc/msm/msm-dai-fe.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -75,7 +75,7 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { .rates = SNDRV_PCM_RATE_8000_48000, .formats = SNDRV_PCM_FMTBIT_S16_LE, .channels_min = 1, - .channels_max = 6, + .channels_max = 2, .rate_min = 8000, .rate_max = 48000, }, @@ -236,41 +236,6 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { .ops = &msm_fe_dai_ops, .name = "AFE-PROXY", }, - { - .playback = { - .stream_name = "HDMI_Rx Hostless Playback", - .rates = SNDRV_PCM_RATE_8000_48000, - .formats = SNDRV_PCM_FMTBIT_S16_LE, - .channels_min = 1, - .channels_max = 2, - .rate_min = 8000, - .rate_max = 48000, - }, - .ops = &msm_fe_dai_ops, - .name = "HDMI_HOSTLESS" - }, - { - .playback = { - .stream_name = "AUXPCM Hostless Playback", - .rates = SNDRV_PCM_RATE_8000, - .formats = SNDRV_PCM_FMTBIT_S16_LE, - .channels_min = 1, - .channels_max = 1, - .rate_min = 8000, - .rate_max = 8000, - }, - .capture = { - .stream_name = "AUXPCM Hostless Capture", - .rates = SNDRV_PCM_RATE_8000, - .formats = SNDRV_PCM_FMTBIT_S16_LE, - .channels_min = 1, - .channels_max = 1, - .rate_min = 8000, - .rate_max = 48000, - }, - .ops = &msm_fe_dai_ops, - .name = "AUXPCM_HOSTLESS", - }, }; static __devinit int msm_fe_dai_dev_probe(struct platform_device *pdev) diff --git a/sound/soc/msm/msm-dai-q6.c b/sound/soc/msm/msm-dai-q6.c index 09517954f..5e02797c8 100755 --- a/sound/soc/msm/msm-dai-q6.c +++ b/sound/soc/msm/msm-dai-q6.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -40,17 +41,6 @@ struct msm_dai_q6_dai_data { static struct clk *pcm_clk; -static u8 num_of_bits_set(u8 sd_line_mask) -{ - u8 num_bits_set = 0; - - while (sd_line_mask) { - num_bits_set++; - sd_line_mask = sd_line_mask & (sd_line_mask - 1); - } - return num_bits_set; -} - static int msm_dai_q6_cdc_hw_params(struct snd_pcm_hw_params *params, struct snd_soc_dai *dai, int stream) { @@ -76,185 +66,78 @@ static int msm_dai_q6_cdc_hw_params(struct snd_pcm_hw_params *params, /* Q6 only supports 16 as now */ dai_data->port_config.mi2s.bitwidth = 16; dai_data->port_config.mi2s.line = 1; - return 0; -} - -static int msm_dai_q6_mi2s_hw_params(struct snd_pcm_hw_params *params, - struct snd_soc_dai *dai, int stream) -{ - struct msm_dai_q6_dai_data *dai_data = dev_get_drvdata(dai->dev); - struct msm_mi2s_data *mi2s_pdata = - (struct msm_mi2s_data *) dai->dev->platform_data; - - dai_data->channels = params_channels(params); - if (num_of_bits_set(mi2s_pdata->sd_lines) == 1) { - switch (dai_data->channels) { - case 2: - dai_data->port_config.mi2s.channel = MSM_AFE_STEREO; - break; - case 1: - dai_data->port_config.mi2s.channel = MSM_AFE_MONO; - break; - default: - pr_warn("greater than stereo has not been validated"); - break; - } - } - /* Q6 only supports 16 as now */ - dai_data->port_config.mi2s.bitwidth = 16; return 0; } -static int msm_dai_q6_mi2s_platform_data_validation( - struct snd_soc_dai *dai) +static int msm_dai_q6_cdc_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) { - u8 num_of_sd_lines; struct msm_dai_q6_dai_data *dai_data = dev_get_drvdata(dai->dev); - struct msm_mi2s_data *mi2s_pdata = - (struct msm_mi2s_data *)dai->dev->platform_data; - struct snd_soc_dai_driver *dai_driver = - (struct snd_soc_dai_driver *)dai->driver; - - num_of_sd_lines = num_of_bits_set(mi2s_pdata->sd_lines); - switch (num_of_sd_lines) { - case 1: - switch (mi2s_pdata->sd_lines) { - case MSM_MI2S_SD0: - dai_data->port_config.mi2s.line = AFE_I2S_SD0; - break; - case MSM_MI2S_SD1: - dai_data->port_config.mi2s.line = AFE_I2S_SD1; - break; - case MSM_MI2S_SD2: - dai_data->port_config.mi2s.line = AFE_I2S_SD2; - break; - case MSM_MI2S_SD3: - dai_data->port_config.mi2s.line = AFE_I2S_SD3; - break; - default: - pr_err("%s: invalid SD line\n", - __func__); - goto error_invalid_data; - } - break; - case 2: - switch (mi2s_pdata->sd_lines) { - case MSM_MI2S_SD0 | MSM_MI2S_SD1: - dai_data->port_config.mi2s.line = AFE_I2S_QUAD01; - break; - case MSM_MI2S_SD2 | MSM_MI2S_SD3: - dai_data->port_config.mi2s.line = AFE_I2S_QUAD23; - break; - default: - pr_err("%s: invalid SD line\n", - __func__); - goto error_invalid_data; - } - break; - case 3: - switch (mi2s_pdata->sd_lines) { - case MSM_MI2S_SD0 | MSM_MI2S_SD1 | MSM_MI2S_SD2: - dai_data->port_config.mi2s.line = AFE_I2S_6CHS; - break; - default: - pr_err("%s: invalid SD lines\n", - __func__); - goto error_invalid_data; - } + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBS_CFS: + dai_data->port_config.mi2s.ws = 1; /* CPU is master */ break; - case 4: - switch (mi2s_pdata->sd_lines) { - case MSM_MI2S_SD0 | MSM_MI2S_SD1 | MSM_MI2S_SD2 | MSM_MI2S_SD3: - dai_data->port_config.mi2s.line = AFE_I2S_8CHS; - break; - default: - pr_err("%s: invalid SD lines\n", - __func__); - goto error_invalid_data; - } + case SND_SOC_DAIFMT_CBM_CFM: + dai_data->port_config.mi2s.ws = 0; /* CPU is slave */ break; default: - pr_err("%s: invalid SD lines\n", __func__); - goto error_invalid_data; + return -EINVAL; } - if (mi2s_pdata->capability == MSM_MI2S_CAP_RX) - dai_driver->playback.channels_max = num_of_sd_lines << 1; return 0; - -error_invalid_data: - return -EINVAL; } -static int msm_dai_q6_cdc_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) +static int msm_dai_q6_hdmi_hw_params(struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) { struct msm_dai_q6_dai_data *dai_data = dev_get_drvdata(dai->dev); - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: - dai_data->port_config.mi2s.ws = 1; /* CPU is master */ - break; - case SND_SOC_DAIFMT_CBM_CFM: - dai_data->port_config.mi2s.ws = 0; /* CPU is slave */ + dev_dbg(dai->dev, "%s start HDMI port\n", __func__); + + dai_data->channels = params_channels(params); + switch (dai_data->channels) { + case 2: + dai_data->port_config.hdmi.channel_mode = 0; /* Put in macro */ break; default: return -EINVAL; + break; } + /* Q6 only supports 16 as now */ + dai_data->port_config.hdmi.bitwidth = 16; + dai_data->port_config.hdmi.data_type = 0; + dai_data->rate = params_rate(params); + return 0; } - static int msm_dai_q6_slim_bus_hw_params(struct snd_pcm_hw_params *params, struct snd_soc_dai *dai, int stream) { struct msm_dai_q6_dai_data *dai_data = dev_get_drvdata(dai->dev); u8 pgd_la, inf_la; - u16 *slave_port_mapping; memset(dai_data->port_config.slimbus.slave_port_mapping, 0, sizeof(dai_data->port_config.slimbus.slave_port_mapping)); dai_data->channels = params_channels(params); - - slave_port_mapping = dai_data->port_config.slimbus.slave_port_mapping; - switch (dai_data->channels) { - case 4: - if (dai->id == SLIMBUS_0_TX) { - slave_port_mapping[0] = 7; - slave_port_mapping[1] = 8; - slave_port_mapping[2] = 9; - slave_port_mapping[3] = 10; - } else { - return -EINVAL; - } - break; - case 3: - if (dai->id == SLIMBUS_0_TX) { - slave_port_mapping[0] = 7; - slave_port_mapping[1] = 8; - slave_port_mapping[2] = 9; - } else { - return -EINVAL; - } - break; case 2: if (dai->id == SLIMBUS_0_RX) { - slave_port_mapping[0] = 1; - slave_port_mapping[1] = 2; + dai_data->port_config.slimbus.slave_port_mapping[0] = 1; + dai_data->port_config.slimbus.slave_port_mapping[1] = 2; } else { - slave_port_mapping[0] = 7; - slave_port_mapping[1] = 8; + dai_data->port_config.slimbus.slave_port_mapping[0] = 7; + dai_data->port_config.slimbus.slave_port_mapping[1] = 8; } break; case 1: if (dai->id == SLIMBUS_0_RX) - slave_port_mapping[0] = 1; + dai_data->port_config.slimbus.slave_port_mapping[0] = 1; else - slave_port_mapping[0] = 7; + dai_data->port_config.slimbus.slave_port_mapping[0] = 7; break; default: return -EINVAL; @@ -395,11 +278,10 @@ static int msm_dai_q6_hw_params(struct snd_pcm_substream *substream, switch (dai->id) { case PRIMARY_I2S_TX: case PRIMARY_I2S_RX: - case SECONDARY_I2S_RX: rc = msm_dai_q6_cdc_hw_params(params, dai, substream->stream); break; - case MI2S_RX: - rc = msm_dai_q6_mi2s_hw_params(params, dai, substream->stream); + case HDMI_RX: + rc = msm_dai_q6_hdmi_hw_params(params, dai); break; case SLIMBUS_0_RX: case SLIMBUS_0_TX: @@ -418,11 +300,6 @@ static int msm_dai_q6_hw_params(struct snd_pcm_substream *substream, case RT_PROXY_DAI_002_RX: rc = msm_dai_q6_afe_rtproxy_hw_params(params, dai); break; - case VOICE_PLAYBACK_TX: - case VOICE_RECORD_RX: - case VOICE_RECORD_TX: - rc = 0; - break; default: dev_err(dai->dev, "invalid AFE port ID\n"); rc = -EINVAL; @@ -438,6 +315,10 @@ static void msm_dai_q6_auxpcm_shutdown(struct snd_pcm_substream *substream, struct msm_dai_q6_dai_data *dai_data = dev_get_drvdata(dai->dev); int rc = 0; + rc = adm_close(dai->id); + if (IS_ERR_VALUE(rc)) + dev_err(dai->dev, "fail to close ADM COPP\n"); + pr_debug("%s: dai->id = %d", __func__, dai->id); if (test_bit(STATUS_PORT_STARTED, dai_data->status_mask)) { @@ -462,18 +343,7 @@ static void msm_dai_q6_shutdown(struct snd_pcm_substream *substream, int rc = 0; if (test_bit(STATUS_PORT_STARTED, dai_data->status_mask)) { - switch (dai->id) { - case VOICE_PLAYBACK_TX: - case VOICE_RECORD_TX: - case VOICE_RECORD_RX: - pr_debug("%s, stop pseudo port:%d\n", - __func__, dai->id); - rc = afe_stop_pseudo_port(dai->id); - break; - default: - rc = afe_close(dai->id); /* can block */ - break; - } + rc = afe_close(dai->id); /* can block */ if (IS_ERR_VALUE(rc)) dev_err(dai->dev, "fail to close AFE port\n"); pr_debug("%s: dai_data->status_mask = %ld\n", __func__, @@ -608,17 +478,8 @@ static int msm_dai_q6_trigger(struct snd_pcm_substream *substream, int cmd, case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: if (!test_bit(STATUS_PORT_STARTED, dai_data->status_mask)) { - switch (dai->id) { - case VOICE_PLAYBACK_TX: - case VOICE_RECORD_TX: - case VOICE_RECORD_RX: - afe_pseudo_port_start_nowait(dai->id); - break; - default: - afe_port_start_nowait(dai->id, - &dai_data->port_config, dai_data->rate); - break; - } + afe_port_start_nowait(dai->id, &dai_data->port_config, + dai_data->rate); set_bit(STATUS_PORT_STARTED, dai_data->status_mask); } @@ -627,16 +488,7 @@ static int msm_dai_q6_trigger(struct snd_pcm_substream *substream, int cmd, case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: if (test_bit(STATUS_PORT_STARTED, dai_data->status_mask)) { - switch (dai->id) { - case VOICE_PLAYBACK_TX: - case VOICE_RECORD_TX: - case VOICE_RECORD_RX: - afe_pseudo_port_stop_nowait(dai->id); - break; - default: - afe_port_stop_nowait(dai->id); - break; - } + afe_port_stop_nowait(dai->id); clear_bit(STATUS_PORT_STARTED, dai_data->status_mask); } @@ -706,31 +558,6 @@ static int msm_dai_q6_dai_auxpcm_remove(struct snd_soc_dai *dai) return 0; } -static int msm_dai_q6_dai_mi2s_probe(struct snd_soc_dai *dai) -{ - struct msm_dai_q6_dai_data *dai_data; - int rc = 0; - - dai_data = kzalloc(sizeof(struct msm_dai_q6_dai_data), - GFP_KERNEL); - - if (!dai_data) { - dev_err(dai->dev, "DAI-%d: fail to allocate dai data\n", - dai->id); - rc = -ENOMEM; - goto rtn; - } else - dev_set_drvdata(dai->dev, dai_data); - - rc = msm_dai_q6_mi2s_platform_data_validation(dai); - if (rc != 0) { - pr_err("%s: The msm_dai_q6_mi2s_platform_data_validation failed\n", - __func__); - kfree(dai_data); - } -rtn: - return rc; -} static int msm_dai_q6_dai_probe(struct snd_soc_dai *dai) { @@ -759,17 +586,7 @@ static int msm_dai_q6_dai_remove(struct snd_soc_dai *dai) /* If AFE port is still up, close it */ if (test_bit(STATUS_PORT_STARTED, dai_data->status_mask)) { - switch (dai->id) { - case VOICE_PLAYBACK_TX: - case VOICE_RECORD_TX: - case VOICE_RECORD_RX: - pr_debug("%s, stop pseudo port:%d\n", - __func__, dai->id); - rc = afe_stop_pseudo_port(dai->id); - break; - default: - rc = afe_close(dai->id); /* can block */ - } + rc = afe_close(dai->id); /* can block */ if (IS_ERR_VALUE(rc)) dev_err(dai->dev, "fail to close AFE port\n"); clear_bit(STATUS_PORT_STARTED, dai_data->status_mask); @@ -788,8 +605,6 @@ static int msm_dai_q6_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) switch (dai->id) { case PRIMARY_I2S_TX: case PRIMARY_I2S_RX: - case MI2S_RX: - case SECONDARY_I2S_RX: rc = msm_dai_q6_cdc_set_fmt(dai, fmt); break; default: @@ -822,7 +637,7 @@ static struct snd_soc_dai_driver msm_dai_q6_i2s_rx_dai = { SNDRV_PCM_RATE_16000, .formats = SNDRV_PCM_FMTBIT_S16_LE, .channels_min = 1, - .channels_max = 4, + .channels_max = 2, .rate_min = 8000, .rate_max = 48000, }, @@ -876,15 +691,14 @@ static struct snd_soc_dai_driver msm_dai_q6_afe_tx_dai = { .remove = msm_dai_q6_dai_remove, }; -static struct snd_soc_dai_driver msm_dai_q6_voice_playback_tx_dai = { +static struct snd_soc_dai_driver msm_dai_q6_hdmi_rx_dai = { .playback = { - .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 | - SNDRV_PCM_RATE_16000, + .rates = SNDRV_PCM_RATE_48000, .formats = SNDRV_PCM_FMTBIT_S16_LE, - .channels_min = 1, + .channels_min = 2, .channels_max = 2, .rate_max = 48000, - .rate_min = 8000, + .rate_min = 48000, }, .ops = &msm_dai_q6_ops, .probe = msm_dai_q6_dai_probe, @@ -921,21 +735,6 @@ static struct snd_soc_dai_driver msm_dai_q6_slimbus_tx_dai = { .remove = msm_dai_q6_dai_remove, }; -static struct snd_soc_dai_driver msm_dai_q6_incall_record_dai = { - .capture = { - .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 | - SNDRV_PCM_RATE_16000, - .formats = SNDRV_PCM_FMTBIT_S16_LE, - .channels_min = 1, - .channels_max = 2, - .rate_min = 8000, - .rate_max = 48000, - }, - .ops = &msm_dai_q6_ops, - .probe = msm_dai_q6_dai_probe, - .remove = msm_dai_q6_dai_remove, -}; - static struct snd_soc_dai_driver msm_dai_q6_bt_sco_rx_dai = { .playback = { .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000, @@ -1019,20 +818,6 @@ static struct snd_soc_dai_driver msm_dai_q6_aux_pcm_tx_dai = { }, }; -static struct snd_soc_dai_driver msm_dai_q6_mi2s_rx_dai = { - .playback = { - .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 | - SNDRV_PCM_RATE_16000, - .formats = SNDRV_PCM_FMTBIT_S16_LE, - .channels_min = 1, - .rate_min = 8000, - .rate_max = 48000, - }, - .ops = &msm_dai_q6_ops, - .probe = msm_dai_q6_dai_mi2s_probe, - .remove = msm_dai_q6_dai_probe, -}; - /* To do: change to register DAIs as batch */ static __devinit int msm_dai_q6_dev_probe(struct platform_device *pdev) { @@ -1042,7 +827,6 @@ static __devinit int msm_dai_q6_dev_probe(struct platform_device *pdev) switch (pdev->id) { case PRIMARY_I2S_RX: - case SECONDARY_I2S_RX: rc = snd_soc_register_dai(&pdev->dev, &msm_dai_q6_i2s_rx_dai); break; case PRIMARY_I2S_TX: @@ -1056,9 +840,8 @@ static __devinit int msm_dai_q6_dev_probe(struct platform_device *pdev) rc = snd_soc_register_dai(&pdev->dev, &msm_dai_q6_aux_pcm_tx_dai); break; - case MI2S_RX: - rc = snd_soc_register_dai(&pdev->dev, - &msm_dai_q6_mi2s_rx_dai); + case HDMI_RX: + rc = snd_soc_register_dai(&pdev->dev, &msm_dai_q6_hdmi_rx_dai); break; case SLIMBUS_0_RX: rc = snd_soc_register_dai(&pdev->dev, @@ -1089,15 +872,6 @@ static __devinit int msm_dai_q6_dev_probe(struct platform_device *pdev) case RT_PROXY_DAI_002_TX: rc = snd_soc_register_dai(&pdev->dev, &msm_dai_q6_afe_tx_dai); break; - case VOICE_PLAYBACK_TX: - rc = snd_soc_register_dai(&pdev->dev, - &msm_dai_q6_voice_playback_tx_dai); - break; - case VOICE_RECORD_RX: - case VOICE_RECORD_TX: - rc = snd_soc_register_dai(&pdev->dev, - &msm_dai_q6_incall_record_dai); - break; default: rc = -ENODEV; break; diff --git a/sound/soc/msm/msm-dai.c b/sound/soc/msm/msm-dai.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm-mvs.c b/sound/soc/msm/msm-mvs.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm-pcm-afe.c b/sound/soc/msm/msm-pcm-afe.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm-pcm-afe.h b/sound/soc/msm/msm-pcm-afe.h old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm-pcm-hostless.c b/sound/soc/msm/msm-pcm-hostless.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm-pcm-lpa.c b/sound/soc/msm/msm-pcm-lpa.c index 83fd69134..f644722c2 100755 --- a/sound/soc/msm/msm-pcm-lpa.c +++ b/sound/soc/msm/msm-pcm-lpa.c @@ -95,12 +95,10 @@ static void event_handler(uint32_t opcode, atomic_inc(&prtd->out_count); wake_up(&the_locks.write_wait); if (!atomic_read(&prtd->start)) { - atomic_set(&prtd->pending_buffer, 1); + prtd->pending_buffer = 1; break; } else - atomic_set(&prtd->pending_buffer, 0); - if (runtime->status->hw_ptr >= runtime->control->appl_ptr) - break; + prtd->pending_buffer = 0; pr_debug("%s:writing %d bytes of buffer to dsp 2\n", __func__, prtd->pcm_count); @@ -123,7 +121,6 @@ static void event_handler(uint32_t opcode, else prtd->out_head = (prtd->out_head + 1) & (runtime->periods - 1); - atomic_set(&prtd->pending_buffer, 0); break; } case ASM_DATA_CMDRSP_EOS: @@ -134,10 +131,8 @@ static void event_handler(uint32_t opcode, case APR_BASIC_RSP_RESULT: { switch (payload[0]) { case ASM_SESSION_CMD_RUN: { - if (!atomic_read(&prtd->pending_buffer)) - break; - if (runtime->status->hw_ptr >= - runtime->control->appl_ptr) + if (!prtd->pending_buffer && + !atomic_read(&prtd->start)) break; pr_debug("%s:writing %d bytes" " of buffer to dsp\n", @@ -157,7 +152,6 @@ static void event_handler(uint32_t opcode, prtd->out_head = (prtd->out_head + 1) & (runtime->periods - 1); - atomic_set(&prtd->pending_buffer, 0); } break; case ASM_STREAM_CMD_FLUSH: @@ -309,7 +303,7 @@ static int msm_pcm_open(struct snd_pcm_substream *substream) pr_debug("snd_pcm_hw_constraint_integer failed\n"); prtd->dsp_cnt = 0; - atomic_set(&prtd->pending_buffer, 1); + prtd->pending_buffer = 1; runtime->private_data = prtd; lpa_audio.prtd = prtd; lpa_set_volume(lpa_audio.volume); @@ -345,29 +339,10 @@ static int msm_pcm_playback_close(struct snd_pcm_substream *substream) struct snd_soc_pcm_runtime *soc_prtd = substream->private_data; struct msm_audio *prtd = runtime->private_data; int dir = 0; - int rc = 0; - /* - If routing is still enabled, we need to issue EOS to - the DSP - To issue EOS to dsp, we need to be run state otherwise - EOS is not honored. - */ - if (msm_routing_check_backend_enabled(soc_prtd->dai_link->be_id)) { - rc = q6asm_run(prtd->audio_client, 0, 0, 0); - atomic_set(&prtd->pending_buffer, 0); - prtd->cmd_ack = 0; - q6asm_cmd_nowait(prtd->audio_client, CMD_EOS); - pr_debug("%s\n", __func__); - rc = wait_event_timeout(the_locks.eos_wait, - prtd->cmd_ack, 5 * HZ); - if (rc < 0) - pr_err("EOS cmd timeout\n"); - prtd->pcm_irq_pos = 0; - } + pr_debug("%s\n", __func__); dir = IN; - atomic_set(&prtd->pending_buffer, 0); lpa_audio.prtd = NULL; q6asm_cmd(prtd->audio_client, CMD_CLOSE); q6asm_audio_client_buf_free_contiguous(dir, @@ -485,7 +460,6 @@ static int msm_pcm_ioctl(struct snd_pcm_substream *substream, switch (cmd) { case SNDRV_PCM_IOCTL1_RESET: - prtd->cmd_ack = 0; rc = q6asm_cmd(prtd->audio_client, CMD_FLUSH); if (rc < 0) pr_err("%s: flush cmd failed rc=%d\n", __func__, rc); diff --git a/sound/soc/msm/msm-pcm-q6.c b/sound/soc/msm/msm-pcm-q6.c index ed880e815..738e024b1 100755 --- a/sound/soc/msm/msm-pcm-q6.c +++ b/sound/soc/msm/msm-pcm-q6.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -39,11 +39,6 @@ struct snd_msm { struct snd_pcm *pcm; }; -#define PLAYBACK_NUM_PERIODS 8 -#define PLAYBACK_PERIOD_SIZE 2048 -#define CAPTURE_NUM_PERIODS 16 -#define CAPTURE_PERIOD_SIZE 320 - static struct snd_pcm_hardware msm_pcm_hardware_capture = { .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_BLOCK_TRANSFER | @@ -56,11 +51,11 @@ static struct snd_pcm_hardware msm_pcm_hardware_capture = { .rate_max = 48000, .channels_min = 1, .channels_max = 2, - .buffer_bytes_max = CAPTURE_NUM_PERIODS * CAPTURE_PERIOD_SIZE, - .period_bytes_min = CAPTURE_PERIOD_SIZE, - .period_bytes_max = CAPTURE_PERIOD_SIZE, - .periods_min = CAPTURE_NUM_PERIODS, - .periods_max = CAPTURE_NUM_PERIODS, + .buffer_bytes_max = 320 * 8, + .period_bytes_min = 320, + .period_bytes_max = 320, + .periods_min = 8, + .periods_max = 8, .fifo_size = 0, }; @@ -76,11 +71,11 @@ static struct snd_pcm_hardware msm_pcm_hardware_playback = { .rate_max = 48000, .channels_min = 1, .channels_max = 2, - .buffer_bytes_max = PLAYBACK_NUM_PERIODS * PLAYBACK_PERIOD_SIZE, - .period_bytes_min = PLAYBACK_PERIOD_SIZE, - .period_bytes_max = PLAYBACK_PERIOD_SIZE, - .periods_min = PLAYBACK_NUM_PERIODS, - .periods_max = PLAYBACK_NUM_PERIODS, + .buffer_bytes_max = 2048 * 8, + .period_bytes_min = 2048, + .period_bytes_max = 2048, + .periods_min = 8, + .periods_max = 8, .fifo_size = 0, }; @@ -89,7 +84,7 @@ static unsigned int supported_sample_rates[] = { 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }; -static uint32_t in_frame_info[CAPTURE_NUM_PERIODS][2]; +static uint32_t in_frame_info[8][2]; static struct snd_pcm_hw_constraint_list constraints_sample_rates = { .count = ARRAY_SIZE(supported_sample_rates), diff --git a/sound/soc/msm/msm-pcm-q6.h b/sound/soc/msm/msm-pcm-q6.h index e5551ea68..214bd9d50 100755 --- a/sound/soc/msm/msm-pcm-q6.h +++ b/sound/soc/msm/msm-pcm-q6.h @@ -77,7 +77,7 @@ struct msm_audio { int out_head; int periods; int mmap_flag; - atomic_t pending_buffer; + int pending_buffer; }; #endif /*_MSM_PCM_H*/ diff --git a/sound/soc/msm/msm-pcm-routing.c b/sound/soc/msm/msm-pcm-routing.c index f99cf6e56..9a076d6a3 100755 --- a/sound/soc/msm/msm-pcm-routing.c +++ b/sound/soc/msm/msm-pcm-routing.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -114,11 +114,6 @@ static struct msm_pcm_routing_bdai_data msm_bedais[MSM_BACKEND_DAI_MAX] = { { RT_PROXY_PORT_001_TX, 0, NULL, 0, 0}, { PCM_RX, 0, NULL, 0, 0}, { PCM_TX, 0, NULL, 0, 0}, - { VOICE_PLAYBACK_TX, 0, NULL, 0, 0}, - { VOICE_RECORD_RX, 0, NULL, 0, 0}, - { VOICE_RECORD_TX, 0, NULL, 0, 0}, - { MI2S_RX, 0, NULL, 0, 0}, - { SECONDARY_I2S_RX, 0, NULL, 0, 0}, }; @@ -162,7 +157,6 @@ void msm_pcm_routing_reg_phy_stream(int fedai_id, int dspst_id, int stream_type) { int i, session_type, path_type, port_type; struct route_payload payload; - u32 channels; if (fedai_id > MSM_FRONTEND_DAI_MM_MAX_ID) { /* bad ID assigned in machine driver */ @@ -192,23 +186,11 @@ void msm_pcm_routing_reg_phy_stream(int fedai_id, int dspst_id, int stream_type) port_type) && msm_bedais[i].active && (test_bit(fedai_id, &msm_bedais[i].fe_sessions))) { - - channels = params_channels(msm_bedais[i].hw_params); - - if ((stream_type == SNDRV_PCM_STREAM_PLAYBACK) && - (channels > 2)) - adm_multi_ch_copp_open(msm_bedais[i].port_id, - path_type, - params_rate(msm_bedais[i].hw_params), - channels, - DEFAULT_COPP_TOPOLOGY); - else - adm_open(msm_bedais[i].port_id, + adm_open(msm_bedais[i].port_id, path_type, params_rate(msm_bedais[i].hw_params), params_channels(msm_bedais[i].hw_params), DEFAULT_COPP_TOPOLOGY); - payload.copp_ids[payload.num_copps++] = msm_bedais[i].port_id; } @@ -256,7 +238,6 @@ void msm_pcm_routing_dereg_phy_stream(int fedai_id, int stream_type) static void msm_pcm_routing_process_audio(u16 reg, u16 val, int set) { int session_type, path_type; - u32 channels; pr_debug("%s: reg %x val %x set %x\n", __func__, reg, val, set); @@ -278,36 +259,17 @@ static void msm_pcm_routing_process_audio(u16 reg, u16 val, int set) mutex_lock(&routing_lock); if (set) { - if (!test_bit(val, &msm_bedais[reg].fe_sessions) && - (msm_bedais[reg].port_id == VOICE_PLAYBACK_TX)) - voc_start_playback(set); - set_bit(val, &msm_bedais[reg].fe_sessions); if (msm_bedais[reg].active && fe_dai_map[val][session_type] != INVALID_SESSION) { - - channels = params_channels(msm_bedais[reg].hw_params); - - if ((session_type == SESSION_TYPE_RX) && (channels > 2)) - adm_multi_ch_copp_open(msm_bedais[reg].port_id, - path_type, - params_rate(msm_bedais[reg].hw_params), - channels, - DEFAULT_COPP_TOPOLOGY); - else - adm_open(msm_bedais[reg].port_id, - path_type, + adm_open(msm_bedais[reg].port_id, path_type, params_rate(msm_bedais[reg].hw_params), params_channels(msm_bedais[reg].hw_params), DEFAULT_COPP_TOPOLOGY); - msm_pcm_routing_build_matrix(val, fe_dai_map[val][session_type], path_type); } } else { - if (test_bit(val, &msm_bedais[reg].fe_sessions) && - (msm_bedais[reg].port_id == VOICE_PLAYBACK_TX)) - voc_start_playback(set); clear_bit(val, &msm_bedais[reg].fe_sessions); if (msm_bedais[reg].active && fe_dai_map[val][session_type] != INVALID_SESSION) { @@ -316,9 +278,6 @@ static void msm_pcm_routing_process_audio(u16 reg, u16 val, int set) fe_dai_map[val][session_type], path_type); } } - if ((msm_bedais[reg].port_id == VOICE_RECORD_RX) - || (msm_bedais[reg].port_id == VOICE_RECORD_TX)) - voc_start_record(msm_bedais[reg].port_id, set); mutex_unlock(&routing_lock); } @@ -695,21 +654,6 @@ static const struct snd_kcontrol_new pri_i2s_rx_mixer_controls[] = { msm_routing_put_audio_mixer), }; -static const struct snd_kcontrol_new sec_i2s_rx_mixer_controls[] = { - SOC_SINGLE_EXT("MultiMedia1", MSM_BACKEND_DAI_SEC_I2S_RX , - MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer, - msm_routing_put_audio_mixer), - SOC_SINGLE_EXT("MultiMedia2", MSM_BACKEND_DAI_SEC_I2S_RX, - MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer, - msm_routing_put_audio_mixer), - SOC_SINGLE_EXT("MultiMedia3", MSM_BACKEND_DAI_SEC_I2S_RX, - MSM_FRONTEND_DAI_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer, - msm_routing_put_audio_mixer), - SOC_SINGLE_EXT("MultiMedia4", MSM_BACKEND_DAI_SEC_I2S_RX, - MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer, - msm_routing_put_audio_mixer), -}; - static const struct snd_kcontrol_new slimbus_rx_mixer_controls[] = { SOC_SINGLE_EXT("MultiMedia1", MSM_BACKEND_DAI_SLIMBUS_0_RX , MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer, @@ -725,21 +669,6 @@ static const struct snd_kcontrol_new slimbus_rx_mixer_controls[] = { msm_routing_put_audio_mixer), }; -static const struct snd_kcontrol_new mi2s_rx_mixer_controls[] = { - SOC_SINGLE_EXT("MultiMedia1", MSM_BACKEND_DAI_MI2S_RX , - MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer, - msm_routing_put_audio_mixer), - SOC_SINGLE_EXT("MultiMedia2", MSM_BACKEND_DAI_MI2S_RX, - MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer, - msm_routing_put_audio_mixer), - SOC_SINGLE_EXT("MultiMedia3", MSM_BACKEND_DAI_MI2S_RX, - MSM_FRONTEND_DAI_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer, - msm_routing_put_audio_mixer), - SOC_SINGLE_EXT("MultiMedia4", MSM_BACKEND_DAI_MI2S_RX, - MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer, - msm_routing_put_audio_mixer), -}; - static const struct snd_kcontrol_new hdmi_mixer_controls[] = { SOC_SINGLE_EXT("MultiMedia1", MSM_BACKEND_DAI_HDMI_RX, MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer, @@ -754,15 +683,6 @@ static const struct snd_kcontrol_new hdmi_mixer_controls[] = { MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), }; - /* incall music delivery mixer */ -static const struct snd_kcontrol_new incall_music_delivery_mixer_controls[] = { - SOC_SINGLE_EXT("MultiMedia1", MSM_BACKEND_DAI_VOICE_PLAYBACK_TX, - MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer, - msm_routing_put_audio_mixer), - SOC_SINGLE_EXT("MultiMedia2", MSM_BACKEND_DAI_VOICE_PLAYBACK_TX, - MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer, - msm_routing_put_audio_mixer), -}; static const struct snd_kcontrol_new int_bt_sco_rx_mixer_controls[] = { SOC_SINGLE_EXT("MultiMedia1", MSM_BACKEND_DAI_INT_BT_SCO_RX, @@ -843,12 +763,6 @@ static const struct snd_kcontrol_new mmul1_mixer_controls[] = { SOC_SINGLE_EXT("AFE_PCM_TX", MSM_BACKEND_DAI_AFE_PCM_TX, MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), - SOC_SINGLE_EXT("VOC_REC_DL", MSM_BACKEND_DAI_INCALL_RECORD_RX, - MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer, - msm_routing_put_audio_mixer), - SOC_SINGLE_EXT("VOC_REC_UL", MSM_BACKEND_DAI_INCALL_RECORD_TX, - MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer, - msm_routing_put_audio_mixer), }; static const struct snd_kcontrol_new mmul2_mixer_controls[] = { @@ -866,15 +780,6 @@ static const struct snd_kcontrol_new pri_rx_voice_mixer_controls[] = { msm_routing_put_voice_mixer), }; -static const struct snd_kcontrol_new sec_i2s_rx_voice_mixer_controls[] = { - SOC_SINGLE_EXT("CSVoice", MSM_BACKEND_DAI_SEC_I2S_RX, - MSM_FRONTEND_DAI_CS_VOICE, 1, 0, msm_routing_get_voice_mixer, - msm_routing_put_voice_mixer), - SOC_SINGLE_EXT("Voip", MSM_BACKEND_DAI_SEC_I2S_RX, - MSM_FRONTEND_DAI_VOIP, 1, 0, msm_routing_get_voice_mixer, - msm_routing_put_voice_mixer), -}; - static const struct snd_kcontrol_new slimbus_rx_voice_mixer_controls[] = { SOC_SINGLE_EXT("CSVoice", MSM_BACKEND_DAI_SLIMBUS_0_RX, MSM_FRONTEND_DAI_CS_VOICE, 1, 0, msm_routing_get_voice_mixer, @@ -963,18 +868,6 @@ static const struct snd_kcontrol_new sbus_0_rx_port_mixer_controls[] = { SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_SLIMBUS_0_RX, MSM_BACKEND_DAI_SLIMBUS_0_TX, 1, 0, msm_routing_get_port_mixer, msm_routing_put_port_mixer), - SOC_SINGLE_EXT("AUX_PCM_UL_TX", MSM_BACKEND_DAI_SLIMBUS_0_RX, - MSM_BACKEND_DAI_AUXPCM_TX, 1, 0, msm_routing_get_port_mixer, - msm_routing_put_port_mixer), -}; - -static const struct snd_kcontrol_new auxpcm_rx_port_mixer_controls[] = { - SOC_SINGLE_EXT("AUX_PCM_UL_TX", MSM_BACKEND_DAI_AUXPCM_RX, - MSM_BACKEND_DAI_AUXPCM_TX, 1, 0, msm_routing_get_port_mixer, - msm_routing_put_port_mixer), - SOC_SINGLE_EXT("SLIM_0_TX", MSM_BACKEND_DAI_AUXPCM_RX, - MSM_BACKEND_DAI_SLIMBUS_0_TX, 1, 0, msm_routing_get_port_mixer, - msm_routing_put_port_mixer), }; static const struct snd_kcontrol_new fm_switch_mixer_controls = @@ -1191,21 +1084,12 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { 0, 0, 0, 0), SND_SOC_DAPM_AIF_OUT("INTFM_UL_HL", "INT_FM_HOSTLESS Capture", 0, 0, 0, 0), - SND_SOC_DAPM_AIF_IN("HDMI_DL_HL", "HDMI_HOSTLESS Playback", 0, 0, 0, 0), - SND_SOC_DAPM_AIF_IN("AUXPCM_DL_HL", "AUXPCM_HOSTLESS Playback", - 0, 0, 0, 0), - SND_SOC_DAPM_AIF_OUT("AUXPCM_UL_HL", "AUXPCM_HOSTLESS Capture", - 0, 0, 0, 0), - /* Backend AIF */ /* Stream name equals to backend dai link stream name */ SND_SOC_DAPM_AIF_OUT("PRI_I2S_RX", "Primary I2S Playback", 0, 0, 0, 0), - SND_SOC_DAPM_AIF_OUT("SEC_I2S_RX", "Secondary I2S Playback", - 0, 0, 0 , 0), SND_SOC_DAPM_AIF_OUT("SLIMBUS_0_RX", "Slimbus Playback", 0, 0, 0, 0), SND_SOC_DAPM_AIF_OUT("HDMI", "HDMI Playback", 0, 0, 0 , 0), - SND_SOC_DAPM_AIF_OUT("MI2S_RX", "MI2S Playback", 0, 0, 0, 0), SND_SOC_DAPM_AIF_IN("PRI_I2S_TX", "Primary I2S Capture", 0, 0, 0, 0), SND_SOC_DAPM_AIF_IN("SLIMBUS_0_TX", "Slimbus Capture", 0, 0, 0, 0), SND_SOC_DAPM_AIF_OUT("INT_BT_SCO_RX", "Internal BT-SCO Playback", @@ -1219,13 +1103,6 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { SND_SOC_DAPM_AIF_OUT("PCM_RX", "AFE Playback", 0, 0, 0 , 0), SND_SOC_DAPM_AIF_IN("PCM_TX", "AFE Capture", - 0, 0, 0 , 0), - /* incall */ - SND_SOC_DAPM_AIF_OUT("VOICE_PLAYBACK_TX", "Voice Farend Playback", - 0, 0, 0 , 0), - SND_SOC_DAPM_AIF_IN("INCALL_RECORD_TX", "Voice Uplink Capture", - 0, 0, 0, 0), - SND_SOC_DAPM_AIF_IN("INCALL_RECORD_RX", "Voice Downlink Capture", 0, 0, 0, 0), SND_SOC_DAPM_AIF_OUT("AUX_PCM_RX", "AUX PCM Playback", 0, 0, 0, 0), SND_SOC_DAPM_AIF_IN("AUX_PCM_TX", "AUX PCM Capture", 0, 0, 0, 0), @@ -1235,32 +1112,20 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { /* Mixer definitions */ SND_SOC_DAPM_MIXER("PRI_RX Audio Mixer", SND_SOC_NOPM, 0, 0, pri_i2s_rx_mixer_controls, ARRAY_SIZE(pri_i2s_rx_mixer_controls)), - SND_SOC_DAPM_MIXER("SEC_RX Audio Mixer", SND_SOC_NOPM, 0, 0, - sec_i2s_rx_mixer_controls, ARRAY_SIZE(sec_i2s_rx_mixer_controls)), SND_SOC_DAPM_MIXER("SLIMBUS_0_RX Audio Mixer", SND_SOC_NOPM, 0, 0, slimbus_rx_mixer_controls, ARRAY_SIZE(slimbus_rx_mixer_controls)), SND_SOC_DAPM_MIXER("HDMI Mixer", SND_SOC_NOPM, 0, 0, hdmi_mixer_controls, ARRAY_SIZE(hdmi_mixer_controls)), - SND_SOC_DAPM_MIXER("MI2S_RX Audio Mixer", SND_SOC_NOPM, 0, 0, - mi2s_rx_mixer_controls, ARRAY_SIZE(mi2s_rx_mixer_controls)), SND_SOC_DAPM_MIXER("MultiMedia1 Mixer", SND_SOC_NOPM, 0, 0, mmul1_mixer_controls, ARRAY_SIZE(mmul1_mixer_controls)), SND_SOC_DAPM_MIXER("MultiMedia2 Mixer", SND_SOC_NOPM, 0, 0, mmul2_mixer_controls, ARRAY_SIZE(mmul2_mixer_controls)), SND_SOC_DAPM_MIXER("AUX_PCM_RX Audio Mixer", SND_SOC_NOPM, 0, 0, auxpcm_rx_mixer_controls, ARRAY_SIZE(auxpcm_rx_mixer_controls)), - /* incall */ - SND_SOC_DAPM_MIXER("Incall_Music Audio Mixer", SND_SOC_NOPM, 0, 0, - incall_music_delivery_mixer_controls, - ARRAY_SIZE(incall_music_delivery_mixer_controls)), /* Voice Mixer */ SND_SOC_DAPM_MIXER("PRI_RX_Voice Mixer", SND_SOC_NOPM, 0, 0, pri_rx_voice_mixer_controls, ARRAY_SIZE(pri_rx_voice_mixer_controls)), - SND_SOC_DAPM_MIXER("SEC_RX_Voice Mixer", - SND_SOC_NOPM, 0, 0, - sec_i2s_rx_voice_mixer_controls, - ARRAY_SIZE(sec_i2s_rx_voice_mixer_controls)), SND_SOC_DAPM_MIXER("SLIM_0_RX_Voice Mixer", SND_SOC_NOPM, 0, 0, slimbus_rx_voice_mixer_controls, @@ -1296,9 +1161,6 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { SND_SOC_DAPM_MIXER("SLIMBUS_0_RX Port Mixer", SND_SOC_NOPM, 0, 0, sbus_0_rx_port_mixer_controls, ARRAY_SIZE(sbus_0_rx_port_mixer_controls)), - SND_SOC_DAPM_MIXER("AUXPCM_RX Port Mixer", - SND_SOC_NOPM, 0, 0, auxpcm_rx_port_mixer_controls, - ARRAY_SIZE(auxpcm_rx_port_mixer_controls)), }; static const struct snd_soc_dapm_route intercon[] = { @@ -1308,12 +1170,6 @@ static const struct snd_soc_dapm_route intercon[] = { {"PRI_RX Audio Mixer", "MultiMedia4", "MM_DL4"}, {"PRI_I2S_RX", NULL, "PRI_RX Audio Mixer"}, - {"SEC_RX Audio Mixer", "MultiMedia1", "MM_DL1"}, - {"SEC_RX Audio Mixer", "MultiMedia2", "MM_DL2"}, - {"SEC_RX Audio Mixer", "MultiMedia3", "MM_DL3"}, - {"SEC_RX Audio Mixer", "MultiMedia4", "MM_DL4"}, - {"SEC_I2S_RX", NULL, "SEC_RX Audio Mixer"}, - {"SLIMBUS_0_RX Audio Mixer", "MultiMedia1", "MM_DL1"}, {"SLIMBUS_0_RX Audio Mixer", "MultiMedia2", "MM_DL2"}, {"SLIMBUS_0_RX Audio Mixer", "MultiMedia3", "MM_DL3"}, @@ -1326,19 +1182,6 @@ static const struct snd_soc_dapm_route intercon[] = { {"HDMI Mixer", "MultiMedia4", "MM_DL4"}, {"HDMI", NULL, "HDMI Mixer"}, - /* incall */ - {"Incall_Music Audio Mixer", "MultiMedia1", "MM_DL1"}, - {"Incall_Music Audio Mixer", "MultiMedia2", "MM_DL2"}, - {"VOICE_PLAYBACK_TX", NULL, "Incall_Music Audio Mixer"}, - - {"MultiMedia1 Mixer", "VOC_REC_UL", "INCALL_RECORD_TX"}, - {"MultiMedia1 Mixer", "VOC_REC_DL", "INCALL_RECORD_RX"}, - {"MI2S_RX Audio Mixer", "MultiMedia1", "MM_DL1"}, - {"MI2S_RX Audio Mixer", "MultiMedia2", "MM_DL2"}, - {"MI2S_RX Audio Mixer", "MultiMedia3", "MM_DL3"}, - {"MI2S_RX Audio Mixer", "MultiMedia4", "MM_DL4"}, - {"MI2S_RX", NULL, "MI2S_RX Audio Mixer"}, - {"MultiMedia1 Mixer", "PRI_TX", "PRI_I2S_TX"}, {"MultiMedia1 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"}, {"MultiMedia1 Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"}, @@ -1379,10 +1222,6 @@ static const struct snd_soc_dapm_route intercon[] = { {"PRI_RX_Voice Mixer", "Voip", "VOIP_DL"}, {"PRI_I2S_RX", NULL, "PRI_RX_Voice Mixer"}, - {"SEC_RX_Voice Mixer", "CSVoice", "CS-VOICE_DL1"}, - {"SEC_RX_Voice Mixer", "Voip", "VOIP_DL"}, - {"SEC_I2S_RX", NULL, "SEC_RX_Voice Mixer"}, - {"SLIM_0_RX_Voice Mixer", "CSVoice", "CS-VOICE_DL1"}, {"SLIM_0_RX_Voice Mixer", "Voip", "VOIP_DL"}, {"SLIMBUS_0_RX", NULL, "SLIM_0_RX_Voice Mixer"}, @@ -1402,7 +1241,6 @@ static const struct snd_soc_dapm_route intercon[] = { {"HDMI_RX_Voice Mixer", "CSVoice", "CS-VOICE_DL1"}, {"HDMI_RX_Voice Mixer", "Voip", "VOIP_DL"}, {"HDMI", NULL, "HDMI_RX_Voice Mixer"}, - {"HDMI", NULL, "HDMI_DL_HL"}, {"Voice_Tx Mixer", "PRI_TX_Voice", "PRI_I2S_TX"}, {"Voice_Tx Mixer", "SLIM_0_TX_Voice", "SLIMBUS_0_TX"}, @@ -1422,16 +1260,9 @@ static const struct snd_soc_dapm_route intercon[] = { {"SLIM0_UL_HL", NULL, "SLIMBUS_0_TX"}, {"INT_FM_RX", NULL, "INTFM_DL_HL"}, {"INTFM_UL_HL", NULL, "INT_FM_TX"}, - {"AUX_PCM_RX", NULL, "AUXPCM_DL_HL"}, - {"AUXPCM_UL_HL", NULL, "AUX_PCM_TX"}, {"SLIMBUS_0_RX Port Mixer", "INTERNAL_FM_TX", "INT_FM_TX"}, {"SLIMBUS_0_RX Port Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"}, - {"SLIMBUS_0_RX Port Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"}, {"SLIMBUS_0_RX", NULL, "SLIMBUS_0_RX Port Mixer"}, - - {"AUXPCM_RX Port Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"}, - {"AUXPCM_RX Port Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"}, - {"AUX_PCM_RX", NULL, "AUXPCM_RX Port Mixer"}, }; static int msm_pcm_routing_hw_params(struct snd_pcm_substream *substream, @@ -1470,7 +1301,7 @@ static int msm_pcm_routing_close(struct snd_pcm_substream *substream) mutex_lock(&routing_lock); - for_each_set_bit(i, &bedai->fe_sessions, MSM_FRONTEND_DAI_MM_SIZE) { + for_each_set_bit(i, &bedai->fe_sessions, MSM_FRONTEND_DAI_MM_MAX_ID) { if (fe_dai_map[i][session_type] != INVALID_SESSION) adm_close(bedai->port_id); } @@ -1489,7 +1320,6 @@ static int msm_pcm_routing_prepare(struct snd_pcm_substream *substream) unsigned int be_id = rtd->dai_link->be_id; int i, path_type, session_type; struct msm_pcm_routing_bdai_data *bedai; - u32 channels; if (be_id >= MSM_BACKEND_DAI_MAX) { pr_err("%s: unexpected be_id %d\n", __func__, be_id); @@ -1525,24 +1355,12 @@ static int msm_pcm_routing_prepare(struct snd_pcm_substream *substream) */ bedai->active = 1; - for_each_set_bit(i, &bedai->fe_sessions, MSM_FRONTEND_DAI_MM_SIZE) { + for_each_set_bit(i, &bedai->fe_sessions, MSM_FRONTEND_DAI_MM_MAX_ID) { if (fe_dai_map[i][session_type] != INVALID_SESSION) { - - channels = params_channels(bedai->hw_params); - if ((substream->stream == SNDRV_PCM_STREAM_PLAYBACK) && - (channels > 2)) - adm_multi_ch_copp_open(bedai->port_id, - path_type, - params_rate(bedai->hw_params), - channels, - DEFAULT_COPP_TOPOLOGY); - else - adm_open(bedai->port_id, - path_type, + adm_open(bedai->port_id, path_type, params_rate(bedai->hw_params), params_channels(bedai->hw_params), DEFAULT_COPP_TOPOLOGY); - msm_pcm_routing_build_matrix(i, fe_dai_map[i][session_type], path_type); } @@ -1636,23 +1454,6 @@ static struct platform_driver msm_routing_pcm_driver = { .remove = __devexit_p(msm_routing_pcm_remove), }; -int msm_routing_check_backend_enabled(int fedai_id) -{ - int i; - if (fedai_id >= MSM_FRONTEND_DAI_MM_MAX_ID) { - /* bad ID assigned in machine driver */ - pr_err("%s: bad MM ID\n", __func__); - return 0; - } - for (i = 0; i < MSM_BACKEND_DAI_MAX; i++) { - if ((test_bit(fedai_id, - &msm_bedais[i].fe_sessions))) { - return msm_bedais[i].active; - } - } - return 0; -} - static int __init msm_soc_routing_platform_init(void) { mutex_init(&routing_lock); diff --git a/sound/soc/msm/msm-pcm-routing.h b/sound/soc/msm/msm-pcm-routing.h index 5a93796a1..b3a8210f3 100755 --- a/sound/soc/msm/msm-pcm-routing.h +++ b/sound/soc/msm/msm-pcm-routing.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -26,12 +26,6 @@ #define LPASS_BE_AFE_PCM_TX "(Backend) RT_PROXY_DAI_002_TX" #define LPASS_BE_AUXPCM_RX "(Backend) AUX_PCM_RX" #define LPASS_BE_AUXPCM_TX "(Backend) AUX_PCM_TX" -#define LPASS_BE_VOICE_PLAYBACK_TX "(Backend) VOICE_PLAYBACK_TX" -#define LPASS_BE_INCALL_RECORD_RX "(Backend) INCALL_RECORD_TX" -#define LPASS_BE_INCALL_RECORD_TX "(Backend) INCALL_RECORD_RX" -#define LPASS_BE_SEC_I2S_RX "(Backend) SECONDARY_I2S_RX" - -#define LPASS_BE_MI2S_RX "(Backend) MI2S_RX" /* For multimedia front-ends, asm session is allocated dynamically. * Hence, asm session/multimedia front-end mapping has to be maintained. @@ -68,11 +62,6 @@ enum { MSM_BACKEND_DAI_AFE_PCM_TX, MSM_BACKEND_DAI_AUXPCM_RX, MSM_BACKEND_DAI_AUXPCM_TX, - MSM_BACKEND_DAI_VOICE_PLAYBACK_TX, - MSM_BACKEND_DAI_INCALL_RECORD_RX, - MSM_BACKEND_DAI_INCALL_RECORD_TX, - MSM_BACKEND_DAI_MI2S_RX, - MSM_BACKEND_DAI_SEC_I2S_RX, MSM_BACKEND_DAI_MAX, }; @@ -85,6 +74,4 @@ void msm_pcm_routing_reg_phy_stream(int fedai_id, int dspst_id, void msm_pcm_routing_dereg_phy_stream(int fedai_id, int stream_type); int lpa_set_volume(unsigned volume); - -int msm_routing_check_backend_enabled(int fedai_id); #endif /*_MSM_PCM_H*/ diff --git a/sound/soc/msm/msm-pcm-voice.c b/sound/soc/msm/msm-pcm-voice.c index eafe0f92d..5b5050987 100755 --- a/sound/soc/msm/msm-pcm-voice.c +++ b/sound/soc/msm/msm-pcm-voice.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -270,8 +270,8 @@ static int msm_voice_slowtalk_put(struct snd_kcontrol *kcontrol, pr_debug("%s: st enable=%d\n", __func__, st_enable); - voc_set_pp_enable(voc_get_session_id(VOICE_SESSION_NAME), - MODULE_ID_VOICE_MODULE_ST, st_enable); + voc_set_slowtalk_enable(voc_get_session_id(VOICE_SESSION_NAME), + st_enable); return 0; } @@ -280,30 +280,7 @@ static int msm_voice_slowtalk_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { ucontrol->value.integer.value[0] = - voc_get_pp_enable(voc_get_session_id(VOICE_SESSION_NAME), - MODULE_ID_VOICE_MODULE_ST); - return 0; -} - -static int msm_voice_fens_put(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) -{ - int fens_enable = ucontrol->value.integer.value[0]; - - pr_debug("%s: fens enable=%d\n", __func__, fens_enable); - - voc_set_pp_enable(voc_get_session_id(VOICE_SESSION_NAME), - MODULE_ID_VOICE_MODULE_FENS, fens_enable); - - return 0; -} - -static int msm_voice_fens_get(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) -{ - ucontrol->value.integer.value[0] = - voc_get_pp_enable(voc_get_session_id(VOICE_SESSION_NAME), - MODULE_ID_VOICE_MODULE_FENS); + voc_get_slowtalk_enable(voc_get_session_id(VOICE_SESSION_NAME)); return 0; } @@ -318,8 +295,6 @@ static struct snd_kcontrol_new msm_voice_controls[] = { msm_voice_widevoice_get, msm_voice_widevoice_put), SOC_SINGLE_EXT("Slowtalk Enable", SND_SOC_NOPM, 0, 1, 0, msm_voice_slowtalk_get, msm_voice_slowtalk_put), - SOC_SINGLE_EXT("FENS Enable", SND_SOC_NOPM, 0, 1, 0, - msm_voice_fens_get, msm_voice_fens_put), }; static struct snd_pcm_ops msm_pcm_ops = { diff --git a/sound/soc/msm/msm-pcm-voice.h b/sound/soc/msm/msm-pcm-voice.h old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm-pcm-voip.c b/sound/soc/msm/msm-pcm-voip.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm-pcm.c b/sound/soc/msm/msm-pcm.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm-pcm.h b/sound/soc/msm/msm-pcm.h old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm-voip.c b/sound/soc/msm/msm-voip.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm7201.c b/sound/soc/msm/msm7201.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm7k-pcm.c b/sound/soc/msm/msm7k-pcm.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm7kv2-dai.c b/sound/soc/msm/msm7kv2-dai.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm7kv2-dsp.c b/sound/soc/msm/msm7kv2-dsp.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm7kv2-pcm.c b/sound/soc/msm/msm7kv2-pcm.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm7kv2-pcm.h b/sound/soc/msm/msm7kv2-pcm.h old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm7x30.c b/sound/soc/msm/msm7x30.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm8660-apq-wm8903.c b/sound/soc/msm/msm8660-apq-wm8903.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm8660.c b/sound/soc/msm/msm8660.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm8960.c b/sound/soc/msm/msm8960.c index 1ed73e2ef..bfc004e79 100755 --- a/sound/soc/msm/msm8960.c +++ b/sound/soc/msm/msm8960.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -25,7 +24,6 @@ #include #include #include -#include #include "msm-pcm-routing.h" #include "../codecs/wcd9310.h" @@ -53,11 +51,6 @@ #define GPIO_AUX_PCM_SYNC 65 #define GPIO_AUX_PCM_CLK 66 -#define TABLA_EXT_CLK_RATE 12288000 - -#define TABLA_MBHC_DEF_BUTTONS 8 -#define TABLA_MBHC_DEF_RLOADS 5 - static u32 top_spk_pamp_gpio = PM8921_GPIO_PM_TO_SYS(18); static u32 bottom_spk_pamp_gpio = PM8921_GPIO_PM_TO_SYS(19); static int msm8960_spk_control; @@ -69,6 +62,17 @@ static int msm8960_slim_0_tx_ch = 1; static int msm8960_btsco_rate = BTSCO_RATE_8KHZ; static int msm8960_btsco_ch = 1; +struct tabla_mbhc_calibration tabla_cal = { + .bias = TABLA_MICBIAS2, + .tldoh = 100, + .bg_fast_settle = 100, + .mic_current = TABLA_PID_MIC_5_UA, + .mic_pid = 100, + .hph_current = TABLA_PID_MIC_5_UA, + .setup_plug_removal_delay = 1000000, + .shutdown_plug_removal = 100000, +}; + static struct clk *codec_clk; static int clk_users; @@ -77,8 +81,6 @@ static int msm8960_headset_gpios_configured; static struct snd_soc_jack hs_jack; static struct snd_soc_jack button_jack; -static void *tabla_mbhc_cal; - static void msm8960_enable_ext_spk_amp_gpio(u32 spk_amp_gpio) { int ret = 0; @@ -299,52 +301,51 @@ static int msm8960_spkramp_event(struct snd_soc_dapm_widget *w, } return 0; } -int msm8960_enable_codec_ext_clk( - struct snd_soc_codec *codec, int enable) + +static int msm8960_mclk_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) { - pr_debug("%s: enable = %d\n", __func__, enable); - if (enable) { + pr_debug("%s: event = %d\n", __func__, event); + + switch (event) { + case SND_SOC_DAPM_PRE_PMU: + clk_users++; pr_debug("%s: clk_users = %d\n", __func__, clk_users); + if (clk_users != 1) return 0; codec_clk = clk_get(NULL, "i2s_spkr_osr_clk"); if (codec_clk) { - clk_set_rate(codec_clk, TABLA_EXT_CLK_RATE); + clk_set_rate(codec_clk, 12288000); clk_enable(codec_clk); - tabla_mclk_enable(codec, 1); + tabla_mclk_enable(w->codec, 1); + } else { pr_err("%s: Error setting Tabla MCLK\n", __func__); clk_users--; return -EINVAL; } - } else { + break; + case SND_SOC_DAPM_POST_PMD: + pr_debug("%s: clk_users = %d\n", __func__, clk_users); + if (clk_users == 0) return 0; + clk_users--; + if (!clk_users) { pr_debug("%s: disabling MCLK. clk_users = %d\n", - __func__, clk_users); + __func__, clk_users); + clk_disable(codec_clk); clk_put(codec_clk); - tabla_mclk_enable(codec, 0); + tabla_mclk_enable(w->codec, 0); } - } - return 0; -} - -static int msm8960_mclk_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event) -{ - pr_debug("%s: event = %d\n", __func__, event); - - switch (event) { - case SND_SOC_DAPM_PRE_PMU: - return msm8960_enable_codec_ext_clk(w->codec, 1); - case SND_SOC_DAPM_POST_PMD: - return msm8960_enable_codec_ext_clk(w->codec, 0); + break; } return 0; } @@ -479,7 +480,7 @@ static int msm8960_slim_0_rx_ch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { pr_debug("%s: msm8960_slim_0_rx_ch = %d\n", __func__, - msm8960_slim_0_rx_ch); + msm8960_slim_0_rx_ch); ucontrol->value.integer.value[0] = msm8960_slim_0_rx_ch - 1; return 0; } @@ -490,7 +491,7 @@ static int msm8960_slim_0_rx_ch_put(struct snd_kcontrol *kcontrol, msm8960_slim_0_rx_ch = ucontrol->value.integer.value[0] + 1; pr_debug("%s: msm8960_slim_0_rx_ch = %d\n", __func__, - msm8960_slim_0_rx_ch); + msm8960_slim_0_rx_ch); return 1; } @@ -498,7 +499,7 @@ static int msm8960_slim_0_tx_ch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { pr_debug("%s: msm8960_slim_0_tx_ch = %d\n", __func__, - msm8960_slim_0_tx_ch); + msm8960_slim_0_tx_ch); ucontrol->value.integer.value[0] = msm8960_slim_0_tx_ch - 1; return 0; } @@ -509,14 +510,15 @@ static int msm8960_slim_0_tx_ch_put(struct snd_kcontrol *kcontrol, msm8960_slim_0_tx_ch = ucontrol->value.integer.value[0] + 1; pr_debug("%s: msm8960_slim_0_tx_ch = %d\n", __func__, - msm8960_slim_0_tx_ch); + msm8960_slim_0_tx_ch); return 1; } static int msm8960_btsco_rate_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - pr_debug("%s: msm8960_btsco_rate = %d", __func__, msm8960_btsco_rate); + pr_debug("%s: msm8960_btsco_rate = %d", __func__, + msm8960_btsco_rate); ucontrol->value.integer.value[0] = msm8960_btsco_rate; return 0; } @@ -535,7 +537,8 @@ static int msm8960_btsco_rate_put(struct snd_kcontrol *kcontrol, msm8960_btsco_rate = BTSCO_RATE_8KHZ; break; } - pr_debug("%s: msm8960_btsco_rate = %d\n", __func__, msm8960_btsco_rate); + pr_debug("%s: msm8960_btsco_rate = %d\n", __func__, + msm8960_btsco_rate); return 0; } @@ -566,83 +569,6 @@ static int msm8960_btsco_init(struct snd_soc_pcm_runtime *rtd) return 0; } -static void *def_tabla_mbhc_cal(void) -{ - void *tabla_cal; - struct tabla_mbhc_btn_detect_cfg *btn_cfg; - u16 *btn_low, *btn_high; - u8 *n_ready, *n_cic, *gain; - - tabla_cal = kzalloc(TABLA_MBHC_CAL_SIZE(TABLA_MBHC_DEF_BUTTONS, - TABLA_MBHC_DEF_RLOADS), - GFP_KERNEL); - if (!tabla_cal) { - pr_err("%s: out of memory\n", __func__); - return NULL; - } - -#define S(X, Y) ((TABLA_MBHC_CAL_GENERAL_PTR(tabla_cal)->X) = (Y)) - S(t_ldoh, 100); - S(t_bg_fast_settle, 100); - S(t_shutdown_plug_rem, 255); - S(mbhc_nsa, 4); - S(mbhc_navg, 4); -#undef S -#define S(X, Y) ((TABLA_MBHC_CAL_PLUG_DET_PTR(tabla_cal)->X) = (Y)) - S(mic_current, TABLA_PID_MIC_5_UA); - S(hph_current, TABLA_PID_MIC_5_UA); - S(t_mic_pid, 100); - S(t_ins_complete, 250); - S(t_ins_retry, 200); -#undef S -#define S(X, Y) ((TABLA_MBHC_CAL_PLUG_TYPE_PTR(tabla_cal)->X) = (Y)) - S(v_no_mic, 30); - S(v_hs_max, 1550); -#undef S -#define S(X, Y) ((TABLA_MBHC_CAL_BTN_DET_PTR(tabla_cal)->X) = (Y)) - S(c[0], 62); - S(c[1], 124); - S(nc, 1); - S(n_meas, 3); - S(mbhc_nsc, 11); - S(n_btn_meas, 1); - S(n_btn_con, 2); - S(num_btn, TABLA_MBHC_DEF_BUTTONS); - S(v_btn_press_delta_sta, 100); - S(v_btn_press_delta_cic, 50); -#undef S - btn_cfg = TABLA_MBHC_CAL_BTN_DET_PTR(tabla_cal); - btn_low = tabla_mbhc_cal_btn_det_mp(btn_cfg, TABLA_BTN_DET_V_BTN_LOW); - btn_high = tabla_mbhc_cal_btn_det_mp(btn_cfg, TABLA_BTN_DET_V_BTN_HIGH); - btn_low[0] = -50; - btn_high[0] = 10; - btn_low[1] = 11; - btn_high[1] = 38; - btn_low[2] = 39; - btn_high[2] = 64; - btn_low[3] = 65; - btn_high[3] = 91; - btn_low[4] = 92; - btn_high[4] = 115; - btn_low[5] = 116; - btn_high[5] = 141; - btn_low[6] = 142; - btn_high[6] = 163; - btn_low[7] = 164; - btn_high[7] = 250; - n_ready = tabla_mbhc_cal_btn_det_mp(btn_cfg, TABLA_BTN_DET_N_READY); - n_ready[0] = 48; - n_ready[1] = 38; - n_cic = tabla_mbhc_cal_btn_det_mp(btn_cfg, TABLA_BTN_DET_N_CIC); - n_cic[0] = 60; - n_cic[1] = 47; - gain = tabla_mbhc_cal_btn_det_mp(btn_cfg, TABLA_BTN_DET_GAIN); - gain[0] = 11; - gain[1] = 9; - - return tabla_cal; -} - static int msm8960_audrx_init(struct snd_soc_pcm_runtime *rtd) { int err; @@ -677,24 +603,21 @@ static int msm8960_audrx_init(struct snd_soc_pcm_runtime *rtd) snd_soc_dapm_sync(dapm); err = snd_soc_jack_new(codec, "Headset Jack", - (SND_JACK_HEADSET | SND_JACK_OC_HPHL | - SND_JACK_OC_HPHR), - &hs_jack); + (SND_JACK_HEADSET | SND_JACK_OC_HPHL | SND_JACK_OC_HPHR), + &hs_jack); if (err) { pr_err("failed to create new jack\n"); return err; } err = snd_soc_jack_new(codec, "Button Jack", - TABLA_JACK_BUTTON_MASK, &button_jack); + SND_JACK_BTN_0, &button_jack); if (err) { pr_err("failed to create new jack\n"); return err; } - tabla_hs_detect(codec, &hs_jack, &button_jack, tabla_mbhc_cal, - TABLA_MICBIAS2, msm8960_enable_codec_ext_clk, 0, - TABLA_EXT_CLK_RATE); + tabla_hs_detect(codec, &hs_jack, &button_jack, &tabla_cal); return 0; } @@ -716,8 +639,7 @@ static struct snd_soc_dsp_link fe_media = { }, }; -/* bi-directional media definition for hostless PCM device */ -static struct snd_soc_dsp_link bidir_hl_media = { +static struct snd_soc_dsp_link slimbus0_hl_media = { .playback = true, .capture = true, .trigger = { @@ -726,8 +648,9 @@ static struct snd_soc_dsp_link bidir_hl_media = { }, }; -static struct snd_soc_dsp_link hdmi_rx_hl = { +static struct snd_soc_dsp_link int_fm_hl_media = { .playback = true, + .capture = true, .trigger = { SND_SOC_DSP_TRIGGER_POST, SND_SOC_DSP_TRIGGER_POST @@ -778,23 +701,6 @@ static int msm8960_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, return 0; } -static int msm8960_hdmi_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, - struct snd_pcm_hw_params *params) -{ - struct snd_interval *rate = hw_param_interval(params, - SNDRV_PCM_HW_PARAM_RATE); - - struct snd_interval *channels = hw_param_interval(params, - SNDRV_PCM_HW_PARAM_CHANNELS); - - pr_debug("%s channels->min %u channels->max %u ()\n", __func__, - channels->min, channels->max); - - rate->min = rate->max = 48000; - - return 0; -} - static int msm8960_btsco_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) { @@ -938,7 +844,7 @@ static struct snd_soc_dai_link msm8960_dai[] = { .name = "MSM8960 Media2", .stream_name = "MultiMedia2", .cpu_dai_name = "MultiMedia2", - .platform_name = "msm-multi-ch-pcm-dsp", + .platform_name = "msm-pcm-dsp", .dynamic = 1, .dsp_link = &fe_media, .be_id = MSM_FRONTEND_DAI_MULTIMEDIA2, @@ -979,7 +885,7 @@ static struct snd_soc_dai_link msm8960_dai[] = { .cpu_dai_name = "SLIMBUS0_HOSTLESS", .platform_name = "msm-pcm-hostless", .dynamic = 1, - .dsp_link = &bidir_hl_media, + .dsp_link = &slimbus0_hl_media, .no_host_mode = SND_SOC_DAI_LINK_NO_HOST, .ignore_suspend = 1, /* .be_id = do not care */ @@ -990,7 +896,7 @@ static struct snd_soc_dai_link msm8960_dai[] = { .cpu_dai_name = "INT_FM_HOSTLESS", .platform_name = "msm-pcm-hostless", .dynamic = 1, - .dsp_link = &bidir_hl_media, + .dsp_link = &int_fm_hl_media, .no_host_mode = SND_SOC_DAI_LINK_NO_HOST, .ignore_suspend = 1, /* .be_id = do not care */ @@ -1022,28 +928,6 @@ static struct snd_soc_dai_link msm8960_dai[] = { .dsp_link = &lpa_fe_media, .be_id = MSM_FRONTEND_DAI_MULTIMEDIA4, }, - { - .name = "AUXPCM Hostless", - .stream_name = "AUXPCM Hostless", - .cpu_dai_name = "AUXPCM_HOSTLESS", - .platform_name = "msm-pcm-hostless", - .dynamic = 1, - .dsp_link = &bidir_hl_media, - .no_host_mode = SND_SOC_DAI_LINK_NO_HOST, - .ignore_suspend = 1, - }, - /* HDMI Hostless */ - { - .name = "HDMI_RX_HOSTLESS", - .stream_name = "HDMI_RX_HOSTLESS", - .cpu_dai_name = "HDMI_HOSTLESS", - .platform_name = "msm-pcm-hostless", - .dynamic = 1, - .dsp_link = &hdmi_rx_hl, - .no_host_mode = SND_SOC_DAI_LINK_NO_HOST, - .no_codec = 1, - .ignore_suspend = 1, - }, /* Backend DAI Links */ { .name = LPASS_BE_SLIMBUS_0_RX, @@ -1120,14 +1004,14 @@ static struct snd_soc_dai_link msm8960_dai[] = { { .name = LPASS_BE_HDMI, .stream_name = "HDMI Playback", - .cpu_dai_name = "msm-dai-q6-hdmi.8", + .cpu_dai_name = "msm-dai-q6.8", .platform_name = "msm-pcm-routing", .codec_name = "msm-stub-codec.1", .codec_dai_name = "msm-stub-rx", .no_pcm = 1, .no_codec = 1, .be_id = MSM_BACKEND_DAI_HDMI_RX, - .be_hw_params_fixup = msm8960_hdmi_be_hw_params_fixup, + .be_hw_params_fixup = msm8960_be_hw_params_fixup, }, /* Backend AFE DAI Links */ { @@ -1176,45 +1060,6 @@ static struct snd_soc_dai_link msm8960_dai[] = { .be_id = MSM_BACKEND_DAI_AUXPCM_TX, .be_hw_params_fixup = msm8960_auxpcm_be_params_fixup, }, - /* Incall Music BACK END DAI Link */ - { - .name = LPASS_BE_VOICE_PLAYBACK_TX, - .stream_name = "Voice Farend Playback", - .cpu_dai_name = "msm-dai-q6.32773", - .platform_name = "msm-pcm-routing", - .codec_name = "msm-stub-codec.1", - .codec_dai_name = "msm-stub-rx", - .no_pcm = 1, - .no_codec = 1, - .be_id = MSM_BACKEND_DAI_VOICE_PLAYBACK_TX, - .be_hw_params_fixup = msm8960_be_hw_params_fixup, - }, - /* Incall Record Uplink BACK END DAI Link */ - { - .name = LPASS_BE_INCALL_RECORD_TX, - .stream_name = "Voice Uplink Capture", - .cpu_dai_name = "msm-dai-q6.32772", - .platform_name = "msm-pcm-routing", - .codec_name = "msm-stub-codec.1", - .codec_dai_name = "msm-stub-tx", - .no_pcm = 1, - .no_codec = 1, - .be_id = MSM_BACKEND_DAI_INCALL_RECORD_TX, - .be_hw_params_fixup = msm8960_be_hw_params_fixup, - }, - /* Incall Record Downlink BACK END DAI Link */ - { - .name = LPASS_BE_INCALL_RECORD_RX, - .stream_name = "Voice Downlink Capture", - .cpu_dai_name = "msm-dai-q6.32771", - .platform_name = "msm-pcm-routing", - .codec_name = "msm-stub-codec.1", - .codec_dai_name = "msm-stub-tx", - .no_pcm = 1, - .no_codec = 1, - .be_id = MSM_BACKEND_DAI_INCALL_RECORD_RX, - .be_hw_params_fixup = msm8960_be_hw_params_fixup, - }, }; struct snd_soc_card snd_soc_card_msm8960 = { @@ -1280,21 +1125,9 @@ static int __init msm8960_audio_init(void) { int ret; - if (!cpu_is_msm8960() && !cpu_is_msm8930()) { - pr_err("%s: Not the right machine type\n", __func__); - return -ENODEV ; - } - - tabla_mbhc_cal = def_tabla_mbhc_cal(); - if (!tabla_mbhc_cal) { - pr_err("Calibration data allocation failed\n"); - return -ENOMEM; - } - msm8960_snd_device = platform_device_alloc("soc-audio", 0); if (!msm8960_snd_device) { pr_err("Platform device allocation failed\n"); - kfree(tabla_mbhc_cal); return -ENOMEM; } @@ -1302,7 +1135,6 @@ static int __init msm8960_audio_init(void) ret = platform_device_add(msm8960_snd_device); if (ret) { platform_device_put(msm8960_snd_device); - kfree(tabla_mbhc_cal); return ret; } @@ -1319,13 +1151,8 @@ module_init(msm8960_audio_init); static void __exit msm8960_audio_exit(void) { - if (!cpu_is_msm8960() && !cpu_is_msm8930()) { - pr_err("%s: Not the right machine type\n", __func__); - return ; - } msm8960_free_headset_mic_gpios(); platform_device_unregister(msm8960_snd_device); - kfree(tabla_mbhc_cal); } module_exit(msm8960_audio_exit); diff --git a/sound/soc/msm/msm8x60-dai.c b/sound/soc/msm/msm8x60-dai.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm8x60-pcm.c b/sound/soc/msm/msm8x60-pcm.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm8x60-pcm.h b/sound/soc/msm/msm8x60-pcm.h old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm8x60.c b/sound/soc/msm/msm8x60.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/msm_audio_mvs.h b/sound/soc/msm/msm_audio_mvs.h old mode 100644 new mode 100755 diff --git a/sound/soc/msm/mvs-dai.c b/sound/soc/msm/mvs-dai.c old mode 100644 new mode 100755 diff --git a/sound/soc/msm/qdsp6/Makefile b/sound/soc/msm/qdsp6/Makefile old mode 100644 new mode 100755 diff --git a/sound/soc/msm/qdsp6/q6adm.c b/sound/soc/msm/qdsp6/q6adm.c index 2710fbb3e..ee6116acb 100755 --- a/sound/soc/msm/qdsp6/q6adm.c +++ b/sound/soc/msm/qdsp6/q6adm.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2012, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -40,9 +40,6 @@ struct adm_ctl { wait_queue_head_t wait; }; -static struct acdb_cal_block mem_addr_audproc[MAX_AUDPROC_TYPES]; -static struct acdb_cal_block mem_addr_audvol[MAX_AUDPROC_TYPES]; - static struct adm_ctl this_adm; static int32_t adm_callback(struct apr_client_data *data, void *priv) @@ -103,8 +100,7 @@ static int32_t adm_callback(struct apr_client_data *data, void *priv) } switch (data->opcode) { - case ADM_CMDRSP_COPP_OPEN: - case ADM_CMDRSP_MULTI_CHANNEL_COPP_OPEN: { + case ADM_CMDRSP_COPP_OPEN: { struct adm_copp_open_respond *open = data->payload; if (open->copp_id == INVALID_COPP_ID) { pr_err("%s: invalid coppid rxed %d\n", @@ -134,18 +130,16 @@ static int32_t adm_callback(struct apr_client_data *data, void *priv) return 0; } -static int send_adm_cal_block(int port_id, struct acdb_cal_block *aud_cal) +void send_cal(int port_id, struct acdb_cal_block *aud_cal) { - s32 result = 0; + s32 result; struct adm_set_params_command adm_params; int index = afe_get_port_index(port_id); pr_debug("%s: Port id %d, index %d\n", __func__, port_id, index); if (!aud_cal || aud_cal->cal_size == 0) { - pr_debug("%s: No ADM cal to send for port_id = %d!\n", - __func__, port_id); - result = -EINVAL; + pr_err("%s: No calibration data to send!\n", __func__); goto done; } @@ -171,28 +165,21 @@ static int send_adm_cal_block(int port_id, struct acdb_cal_block *aud_cal) if (result < 0) { pr_err("%s: Set params failed port = %d payload = 0x%x\n", __func__, port_id, aud_cal->cal_paddr); - result = -EINVAL; goto done; } /* Wait for the callback */ result = wait_event_timeout(this_adm.wait, atomic_read(&this_adm.copp_stat[index]), msecs_to_jiffies(TIMEOUT_MS)); - if (!result) { + if (!result) pr_err("%s: Set params timed out port = %d, payload = 0x%x\n", __func__, port_id, aud_cal->cal_paddr); - result = -EINVAL; - goto done; - } - - result = 0; done: - return result; + return; } -static void send_adm_cal(int port_id, int path) +void send_adm_cal(int port_id, int path) { - int result = 0; s32 acdb_path; struct acdb_cal_block aud_cal; @@ -200,62 +187,22 @@ static void send_adm_cal(int port_id, int path) /* Maps audio_dev_ctrl path definition to ACDB definition */ acdb_path = path - 1; + if ((acdb_path >= NUM_AUDPROC_BUFFERS) || + (acdb_path < 0)) { + pr_err("%s: Path is not RX or TX, path = %d\n", + __func__, path); + goto done; + } pr_debug("%s: Sending audproc cal\n", __func__); get_audproc_cal(acdb_path, &aud_cal); - - /* map & cache buffers used */ - if ((mem_addr_audproc[acdb_path].cal_paddr != aud_cal.cal_paddr) && - (aud_cal.cal_size > 0)) { - if (mem_addr_audproc[acdb_path].cal_paddr != 0) - adm_memory_unmap_regions( - &mem_addr_audproc[acdb_path].cal_paddr, - &mem_addr_audproc[acdb_path].cal_size, 1); - - result = adm_memory_map_regions(&aud_cal.cal_paddr, 0, - &aud_cal.cal_size, 1); - if (result < 0) - pr_err("ADM audproc mmap did not work! path = %d, " - "addr = 0x%x, size = %d\n", acdb_path, - aud_cal.cal_paddr, aud_cal.cal_size); - else - mem_addr_audproc[acdb_path] = aud_cal; - } - - if (!send_adm_cal_block(port_id, &aud_cal)) - pr_debug("%s: Audproc cal sent for port id: %d, path %d\n", - __func__, port_id, acdb_path); - else - pr_debug("%s: Audproc cal not sent for port id: %d, path %d\n", - __func__, port_id, acdb_path); + send_cal(port_id, &aud_cal); pr_debug("%s: Sending audvol cal\n", __func__); get_audvol_cal(acdb_path, &aud_cal); - - /* map & cache buffers used */ - if ((mem_addr_audvol[acdb_path].cal_paddr != aud_cal.cal_paddr) && - (aud_cal.cal_size > 0)) { - if (mem_addr_audvol[acdb_path].cal_paddr != 0) - adm_memory_unmap_regions( - &mem_addr_audvol[acdb_path].cal_paddr, - &mem_addr_audvol[acdb_path].cal_size, 1); - - result = adm_memory_map_regions(&aud_cal.cal_paddr, 0, - &aud_cal.cal_size, 1); - if (result < 0) - pr_err("ADM audvol mmap did not work! path = %d, " - "addr = 0x%x, size = %d\n", acdb_path, - aud_cal.cal_paddr, aud_cal.cal_size); - else - mem_addr_audvol[acdb_path] = aud_cal; - } - - if (!send_adm_cal_block(port_id, &aud_cal)) - pr_debug("%s: Audvol cal sent for port id: %d, path %d\n", - __func__, port_id, acdb_path); - else - pr_debug("%s: Audvol cal not sent for port id: %d, path %d\n", - __func__, port_id, acdb_path); + send_cal(port_id, &aud_cal); +done: + return; } int adm_open(int port_id, int path, int rate, int channel_mode, int topology) @@ -316,9 +263,7 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology) if ((open.topology_id == VPM_TX_SM_ECNS_COPP_TOPOLOGY) || (open.topology_id == - VPM_TX_DM_FLUENCE_COPP_TOPOLOGY) || - (open.topology_id == - VPM_TX_QMIC_FLUENCE_COPP_TOPOLOGY)) + VPM_TX_DM_FLUENCE_COPP_TOPOLOGY)) rate = 16000; } @@ -361,133 +306,6 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology) return ret; } - -int adm_multi_ch_copp_open(int port_id, int path, int rate, int channel_mode, - int topology) -{ - struct adm_multi_ch_copp_open_command open; - int ret = 0; - int index; - - pr_debug("%s: port %d path:%d rate:%d channel :%d\n", __func__, - port_id, path, rate, channel_mode); - - port_id = afe_convert_virtual_to_portid(port_id); - - if (afe_validate_port(port_id) < 0) { - pr_err("%s port idi[%d] is invalid\n", __func__, port_id); - return -ENODEV; - } - - index = afe_get_port_index(port_id); - pr_debug("%s: Port ID %d, index %d\n", __func__, port_id, index); - - if (this_adm.apr == NULL) { - this_adm.apr = apr_register("ADSP", "ADM", adm_callback, - 0xFFFFFFFF, &this_adm); - if (this_adm.apr == NULL) { - pr_err("%s: Unable to register ADM\n", __func__); - ret = -ENODEV; - return ret; - } - rtac_set_adm_handle(this_adm.apr); - } - - /* Create a COPP if port id are not enabled */ - if (atomic_read(&this_adm.copp_cnt[index]) == 0) { - - open.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, - APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); - - open.hdr.pkt_size = - sizeof(struct adm_multi_ch_copp_open_command); - open.hdr.opcode = ADM_CMD_MULTI_CHANNEL_COPP_OPEN; - memset(open.dev_channel_mapping, 0, 8); - - if (channel_mode == 1) { - open.dev_channel_mapping[0] = PCM_CHANNEL_FC; - } else if (channel_mode == 2) { - open.dev_channel_mapping[0] = PCM_CHANNEL_FL; - open.dev_channel_mapping[1] = PCM_CHANNEL_FR; - } else if (channel_mode == 6) { - open.dev_channel_mapping[0] = PCM_CHANNEL_FL; - open.dev_channel_mapping[1] = PCM_CHANNEL_FR; - open.dev_channel_mapping[2] = PCM_CHANNEL_LFE; - open.dev_channel_mapping[3] = PCM_CHANNEL_FC; - open.dev_channel_mapping[4] = PCM_CHANNEL_LB; - open.dev_channel_mapping[5] = PCM_CHANNEL_RB; - } else { - pr_err("%s invalid num_chan %d\n", __func__, - channel_mode); - return -EINVAL; - } - - - open.hdr.src_svc = APR_SVC_ADM; - open.hdr.src_domain = APR_DOMAIN_APPS; - open.hdr.src_port = port_id; - open.hdr.dest_svc = APR_SVC_ADM; - open.hdr.dest_domain = APR_DOMAIN_ADSP; - open.hdr.dest_port = port_id; - open.hdr.token = port_id; - - open.mode = path; - open.endpoint_id1 = port_id; - open.endpoint_id2 = 0xFFFF; - - /* convert path to acdb path */ - if (path == ADM_PATH_PLAYBACK) - open.topology_id = get_adm_rx_topology(); - else { - open.topology_id = get_adm_tx_topology(); - if ((open.topology_id == - VPM_TX_SM_ECNS_COPP_TOPOLOGY) || - (open.topology_id == - VPM_TX_DM_FLUENCE_COPP_TOPOLOGY) || - (open.topology_id == - VPM_TX_QMIC_FLUENCE_COPP_TOPOLOGY)) - rate = 16000; - } - - if (open.topology_id == 0) - open.topology_id = topology; - - open.channel_config = channel_mode & 0x00FF; - open.rate = rate; - - pr_debug("%s: channel_config=%d port_id=%d rate=%d" - " topology_id=0x%X\n", __func__, open.channel_config, - open.endpoint_id1, open.rate, - open.topology_id); - - atomic_set(&this_adm.copp_stat[index], 0); - - ret = apr_send_pkt(this_adm.apr, (uint32_t *)&open); - if (ret < 0) { - pr_err("%s:ADM enable for port %d failed\n", - __func__, port_id); - ret = -EINVAL; - goto fail_cmd; - } - /* Wait for the callback with copp id */ - ret = wait_event_timeout(this_adm.wait, - atomic_read(&this_adm.copp_stat[index]), - msecs_to_jiffies(TIMEOUT_MS)); - if (!ret) { - pr_err("%s ADM open failed for port %d\n", __func__, - port_id); - ret = -EINVAL; - goto fail_cmd; - } - } - atomic_inc(&this_adm.copp_cnt[index]); - return 0; - -fail_cmd: - - return ret; -} - int adm_matrix_map(int session_id, int path, int num_copps, unsigned int *port_id, int copp_id) { @@ -585,7 +403,7 @@ int adm_memory_map_regions(uint32_t *buf_add, uint32_t mempool_id, int i = 0; int cmd_size = 0; - pr_debug("%s\n", __func__); + pr_info("%s\n", __func__); if (this_adm.apr == NULL) { this_adm.apr = apr_register("ADSP", "ADM", adm_callback, 0xFFFFFFFF, &this_adm); @@ -660,7 +478,7 @@ int adm_memory_unmap_regions(uint32_t *buf_add, uint32_t *bufsz, int i = 0; int cmd_size = 0; - pr_debug("%s\n", __func__); + pr_info("%s\n", __func__); if (this_adm.apr == NULL) { pr_err("%s APR handle NULL\n", __func__); @@ -743,7 +561,7 @@ int adm_close(int port_id) if (afe_validate_port(port_id) < 0) return -EINVAL; - pr_debug("%s port_id=%d index %d\n", __func__, port_id, index); + pr_info("%s port_id=%d index %d\n", __func__, port_id, index); if (!(atomic_read(&this_adm.copp_cnt[index]))) { pr_err("%s: copp count for port[%d]is 0\n", __func__, port_id); diff --git a/sound/soc/msm/qdsp6/q6afe.c b/sound/soc/msm/qdsp6/q6afe.c index ef01fb3e2..017c1b618 100755 --- a/sound/soc/msm/qdsp6/q6afe.c +++ b/sound/soc/msm/qdsp6/q6afe.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2012, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -17,7 +17,6 @@ #include #include #include -#include #include #include @@ -37,8 +36,6 @@ struct afe_ctl { static struct afe_ctl this_afe; -static uint32_t afe_cal_addr[MAX_AUDPROC_TYPES]; - #define TIMEOUT_MS 1000 #define Q6AFE_MAX_VOLUME 0x3FFF @@ -59,7 +56,6 @@ static int32_t afe_callback(struct apr_client_data *data, void *priv) pr_debug("task_name = %s pid = %d\n", this_afe.task->comm, this_afe.task->pid); send_sig(SIGUSR1, this_afe.task, 0); - return 0; } if (data->payload_size) { uint32_t *payload; @@ -77,7 +73,6 @@ static int32_t afe_callback(struct apr_client_data *data, void *priv) if (data->opcode == APR_BASIC_RSP_RESULT) { switch (payload[0]) { case AFE_PORT_AUDIO_IF_CONFIG: - case AFE_PORT_MULTI_CHAN_HDMI_AUDIO_IF_CONFIG: case AFE_PORT_CMD_STOP: case AFE_PORT_CMD_START: case AFE_PORT_CMD_LOOPBACK: @@ -281,7 +276,7 @@ int afe_sizeof_cfg_cmd(u16 port_id) ret_size = SIZEOF_CFG_CMD(afe_port_mi2s_cfg); break; case HDMI_RX: - ret_size = SIZEOF_CFG_CMD(afe_port_hdmi_multi_ch_cfg); + ret_size = SIZEOF_CFG_CMD(afe_port_hdmi_cfg); break; case SLIMBUS_0_RX: case SLIMBUS_0_TX: @@ -318,63 +313,6 @@ int afe_q6_interface_prepare(void) return ret; } -static void afe_send_cal_block(int32_t path, u16 port_id) -{ - int result = 0; - struct acdb_cal_block cal_block; - struct afe_port_cmd_set_param_no_payload afe_cal; - pr_debug("%s: path %d\n", __func__, path); - - get_afe_cal(path, &cal_block); - if (cal_block.cal_size <= 0) { - pr_debug("%s: No AFE cal to send!\n", __func__); - goto done; - } - - if (afe_cal_addr[path] != cal_block.cal_paddr) { - if (afe_cal_addr[path] != 0) - afe_cmd_memory_unmap_nowait(afe_cal_addr[path]); - afe_cmd_memory_map_nowait(cal_block.cal_paddr, - cal_block.cal_size); - afe_cal_addr[path] = cal_block.cal_paddr; - } - - afe_cal.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, - APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); - afe_cal.hdr.pkt_size = sizeof(afe_cal); - afe_cal.hdr.src_port = 0; - afe_cal.hdr.dest_port = 0; - afe_cal.hdr.token = 0; - afe_cal.hdr.opcode = AFE_PORT_CMD_SET_PARAM; - afe_cal.port_id = port_id; - afe_cal.payload_size = cal_block.cal_size; - afe_cal.payload_address = cal_block.cal_paddr; - - pr_debug("%s: AFE cal sent for device port = %d, path = %d, " - "cal size = %d, cal addr = 0x%x\n", __func__, - port_id, path, cal_block.cal_size, cal_block.cal_paddr); - - result = apr_send_pkt(this_afe.apr, (uint32_t *) &afe_cal); - if (result < 0) { - pr_err("%s: AFE cal for port %d failed\n", - __func__, port_id); - } - - pr_debug("%s: AFE cal sent for path %d device!\n", __func__, path); -done: - return; -} - -void afe_send_cal(u16 port_id) -{ - pr_debug("%s\n", __func__); - - if (afe_get_port_type(port_id) == MSM_AFE_PORT_TYPE_TX) - afe_send_cal_block(TX_CAL, port_id); - else if (afe_get_port_type(port_id) == MSM_AFE_PORT_TYPE_RX) - afe_send_cal_block(RX_CAL, port_id); -} - int afe_port_start_nowait(u16 port_id, union afe_port_config *afe_config, u32 rate) /* This function is no blocking */ { @@ -387,7 +325,7 @@ int afe_port_start_nowait(u16 port_id, union afe_port_config *afe_config, ret = -EINVAL; return ret; } - pr_debug("%s: %d %d\n", __func__, port_id, rate); + pr_info("%s: %d %d\n", __func__, port_id, rate); if ((port_id == RT_PROXY_DAI_001_RX) || (port_id == RT_PROXY_DAI_002_TX)) @@ -401,25 +339,13 @@ int afe_port_start_nowait(u16 port_id, union afe_port_config *afe_config, ret = -ENODEV; return ret; } - - if (port_id == HDMI_RX) { - config.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, - APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); - config.hdr.pkt_size = afe_sizeof_cfg_cmd(port_id); - config.hdr.src_port = 0; - config.hdr.dest_port = 0; - config.hdr.token = 0; - config.hdr.opcode = AFE_PORT_MULTI_CHAN_HDMI_AUDIO_IF_CONFIG; - } else { - - config.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, + config.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); - config.hdr.pkt_size = afe_sizeof_cfg_cmd(port_id); - config.hdr.src_port = 0; - config.hdr.dest_port = 0; - config.hdr.token = 0; - config.hdr.opcode = AFE_PORT_AUDIO_IF_CONFIG; - } + config.hdr.pkt_size = afe_sizeof_cfg_cmd(port_id); + config.hdr.src_port = 0; + config.hdr.dest_port = 0; + config.hdr.token = 0; + config.hdr.opcode = AFE_PORT_AUDIO_IF_CONFIG; if (afe_validate_port(port_id) < 0) { @@ -438,10 +364,6 @@ int afe_port_start_nowait(u16 port_id, union afe_port_config *afe_config, ret = -EINVAL; goto fail_cmd; } - - /* send AFE cal */ - afe_send_cal(port_id); - start.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); start.hdr.pkt_size = sizeof(start); @@ -755,39 +677,6 @@ int afe_apply_gain(u16 port_id, u16 gain) fail_cmd: return ret; } - -int afe_pseudo_port_start_nowait(u16 port_id) -{ - int ret = 0; - struct afe_pseudoport_start_command start; - - pr_debug("%s: port_id=%d\n", __func__, port_id); - if (this_afe.apr == NULL) { - pr_err("%s: AFE APR is not registered\n", __func__); - return -ENODEV; - } - - - start.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, - APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); - start.hdr.pkt_size = sizeof(start); - start.hdr.src_port = 0; - start.hdr.dest_port = 0; - start.hdr.token = 0; - start.hdr.opcode = AFE_PSEUDOPORT_CMD_START; - start.port_id = port_id; - start.timing = 1; - - atomic_set(&this_afe.state, 1); - ret = apr_send_pkt(this_afe.apr, (uint32_t *) &start); - if (ret < 0) { - pr_err("%s: AFE enable for port %d failed %d\n", - __func__, port_id, ret); - return -EINVAL; - } - return 0; -} - int afe_start_pseudo_port(u16 port_id) { int ret = 0; @@ -814,7 +703,8 @@ int afe_start_pseudo_port(u16 port_id) if (ret < 0) { pr_err("%s: AFE enable for port %d failed %d\n", __func__, port_id, ret); - return -EINVAL; + ret = -EINVAL; + return ret; } ret = wait_event_timeout(this_afe.wait, @@ -822,43 +712,11 @@ int afe_start_pseudo_port(u16 port_id) msecs_to_jiffies(TIMEOUT_MS)); if (!ret) { pr_err("%s: wait_event timeout\n", __func__); - return -EINVAL; - } - - return 0; -} - -int afe_pseudo_port_stop_nowait(u16 port_id) -{ - int ret = 0; - struct afe_pseudoport_stop_command stop; - - pr_debug("%s: port_id=%d\n", __func__, port_id); - - if (this_afe.apr == NULL) { - pr_err("%s: AFE is already closed\n", __func__); - return -EINVAL; - } - - stop.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, - APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); - stop.hdr.pkt_size = sizeof(stop); - stop.hdr.src_port = 0; - stop.hdr.dest_port = 0; - stop.hdr.token = 0; - stop.hdr.opcode = AFE_PSEUDOPORT_CMD_STOP; - stop.port_id = port_id; - stop.reserved = 0; - - atomic_set(&this_afe.state, 1); - ret = apr_send_pkt(this_afe.apr, (uint32_t *) &stop); - if (ret < 0) { - pr_err("%s: AFE close failed %d\n", __func__, ret); - return -EINVAL; + ret = -EINVAL; + return ret; } return 0; - } int afe_stop_pseudo_port(u16 port_id) @@ -870,7 +728,8 @@ int afe_stop_pseudo_port(u16 port_id) if (this_afe.apr == NULL) { pr_err("%s: AFE is already closed\n", __func__); - return -EINVAL; + ret = -EINVAL; + return ret; } stop.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, @@ -887,7 +746,8 @@ int afe_stop_pseudo_port(u16 port_id) ret = apr_send_pkt(this_afe.apr, (uint32_t *) &stop); if (ret < 0) { pr_err("%s: AFE close failed %d\n", __func__, ret); - return -EINVAL; + ret = -EINVAL; + return ret; } ret = wait_event_timeout(this_afe.wait, @@ -895,7 +755,8 @@ int afe_stop_pseudo_port(u16 port_id) msecs_to_jiffies(TIMEOUT_MS)); if (!ret) { pr_err("%s: wait_event timeout\n", __func__); - return -EINVAL; + ret = -EINVAL; + return ret; } return 0; @@ -952,45 +813,6 @@ int afe_cmd_memory_map(u32 dma_addr_p, u32 dma_buf_sz) return 0; } -int afe_cmd_memory_map_nowait(u32 dma_addr_p, u32 dma_buf_sz) -{ - int ret = 0; - struct afe_cmd_memory_map mregion; - - pr_debug("%s:\n", __func__); - - if (this_afe.apr == NULL) { - this_afe.apr = apr_register("ADSP", "AFE", afe_callback, - 0xFFFFFFFF, &this_afe); - pr_debug("%s: Register AFE\n", __func__); - if (this_afe.apr == NULL) { - pr_err("%s: Unable to register AFE\n", __func__); - ret = -ENODEV; - return ret; - } - } - - mregion.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, - APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); - mregion.hdr.pkt_size = sizeof(mregion); - mregion.hdr.src_port = 0; - mregion.hdr.dest_port = 0; - mregion.hdr.token = 0; - mregion.hdr.opcode = AFE_SERVICE_CMD_MEMORY_MAP; - mregion.phy_addr = dma_addr_p; - mregion.mem_sz = dma_buf_sz; - mregion.mem_id = 0; - mregion.rsvd = 0; - - ret = apr_send_pkt(this_afe.apr, (uint32_t *) &mregion); - if (ret < 0) { - pr_err("%s: AFE memory map cmd failed %d\n", - __func__, ret); - ret = -EINVAL; - } - return 0; -} - int afe_cmd_memory_unmap(u32 dma_addr_p) { int ret = 0; @@ -1021,7 +843,7 @@ int afe_cmd_memory_unmap(u32 dma_addr_p) atomic_set(&this_afe.state, 1); ret = apr_send_pkt(this_afe.apr, (uint32_t *) &mregion); if (ret < 0) { - pr_err("%s: AFE memory unmap cmd failed %d\n", + pr_err("%s: AFE memory map cmd failed %d\n", __func__, ret); ret = -EINVAL; return ret; @@ -1035,42 +857,7 @@ int afe_cmd_memory_unmap(u32 dma_addr_p) ret = -EINVAL; return ret; } - return 0; -} - -int afe_cmd_memory_unmap_nowait(u32 dma_addr_p) -{ - int ret = 0; - struct afe_cmd_memory_unmap mregion; - - pr_debug("%s:\n", __func__); - - if (this_afe.apr == NULL) { - this_afe.apr = apr_register("ADSP", "AFE", afe_callback, - 0xFFFFFFFF, &this_afe); - pr_debug("%s: Register AFE\n", __func__); - if (this_afe.apr == NULL) { - pr_err("%s: Unable to register AFE\n", __func__); - ret = -ENODEV; - return ret; - } - } - - mregion.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, - APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); - mregion.hdr.pkt_size = sizeof(mregion); - mregion.hdr.src_port = 0; - mregion.hdr.dest_port = 0; - mregion.hdr.token = 0; - mregion.hdr.opcode = AFE_SERVICE_CMD_MEMORY_UNMAP; - mregion.phy_addr = dma_addr_p; - ret = apr_send_pkt(this_afe.apr, (uint32_t *) &mregion); - if (ret < 0) { - pr_err("%s: AFE memory unmap cmd failed %d\n", - __func__, ret); - ret = -EINVAL; - } return 0; } @@ -1441,7 +1228,7 @@ int afe_port_stop_nowait(int port_id) ret = -EINVAL; goto fail_cmd; } - pr_debug("%s: port_id=%d\n", __func__, port_id); + pr_info("%s: port_id=%d\n", __func__, port_id); port_id = afe_convert_virtual_to_portid(port_id); stop.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, @@ -1479,7 +1266,7 @@ int afe_close(int port_id) ret = -EINVAL; goto fail_cmd; } - pr_debug("%s: port_id=%d\n", __func__, port_id); + pr_info("%s: port_id=%d\n", __func__, port_id); port_id = afe_convert_virtual_to_portid(port_id); stop.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, @@ -1540,17 +1327,12 @@ static int __init afe_init(void) static void __exit afe_exit(void) { - int i; #ifdef CONFIG_DEBUG_FS if (debugfs_afelb) debugfs_remove(debugfs_afelb); if (debugfs_afelb_gain) debugfs_remove(debugfs_afelb_gain); #endif - for (i = 0; i < MAX_AUDPROC_TYPES; i++) { - if (afe_cal_addr[i] != 0) - afe_cmd_memory_unmap_nowait(afe_cal_addr[i]); - } } device_initcall(afe_init); diff --git a/sound/soc/msm/qdsp6/q6asm.c b/sound/soc/msm/qdsp6/q6asm.c index dc49f12ff..ab7f9f7d1 100755 --- a/sound/soc/msm/qdsp6/q6asm.c +++ b/sound/soc/msm/qdsp6/q6asm.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 2010-2012, Code Aurora Forum. All rights reserved. + * Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved. * Author: Brian Swetland * * This software is licensed under the terms of the GNU General Public @@ -515,7 +515,6 @@ int q6asm_audio_client_buf_alloc(unsigned int dir, pr_err("%s:map_buffer failed," "error = %ld\n", __func__, PTR_ERR((void *)buf[cnt].mem_buffer)); - mutex_unlock(&ac->cmd_lock); goto fail; } buf[cnt].data = @@ -523,7 +522,6 @@ int q6asm_audio_client_buf_alloc(unsigned int dir, if (!buf[cnt].data) { pr_err("%s:invalid vaddr," " iomap failed\n", __func__); - mutex_unlock(&ac->cmd_lock); goto fail; } buf[cnt].used = 1; @@ -946,7 +944,6 @@ void *q6asm_is_cpu_buf_avail(int dir, struct audio_client *ac, uint32_t *size, idx = port->cpu_buf; if (port->buf == NULL) { pr_debug("%s:Buffer pointer null\n", __func__); - mutex_unlock(&port->lock); return NULL; } /* dir 0: used = 0 means buf in use @@ -1193,9 +1190,6 @@ int q6asm_open_write(struct audio_client *ac, uint32_t format) case FORMAT_LINEAR_PCM: open.format = LINEAR_PCM; break; - case FORMAT_MULTI_CHANNEL_LINEAR_PCM: - open.format = MULTI_CHANNEL_PCM; - break; case FORMAT_MPEG4_AAC: open.format = MPEG4_AAC; break; @@ -1764,66 +1758,6 @@ int q6asm_media_format_block_pcm(struct audio_client *ac, return -EINVAL; } -int q6asm_media_format_block_multi_ch_pcm(struct audio_client *ac, - uint32_t rate, uint32_t channels) -{ - struct asm_stream_media_format_update fmt; - u8 *channel_mapping; - int rc = 0; - - pr_debug("%s:session[%d]rate[%d]ch[%d]\n", __func__, ac->session, rate, - channels); - - q6asm_add_hdr(ac, &fmt.hdr, sizeof(fmt), TRUE); - - fmt.hdr.opcode = ASM_DATA_CMD_MEDIA_FORMAT_UPDATE; - - fmt.format = MULTI_CHANNEL_PCM; - fmt.cfg_size = sizeof(struct asm_multi_channel_pcm_fmt_blk); - fmt.write_cfg.multi_ch_pcm_cfg.num_channels = channels; - fmt.write_cfg.multi_ch_pcm_cfg.bits_per_sample = 16; - fmt.write_cfg.multi_ch_pcm_cfg.sample_rate = rate; - fmt.write_cfg.multi_ch_pcm_cfg.is_signed = 1; - fmt.write_cfg.multi_ch_pcm_cfg.is_interleaved = 1; - channel_mapping = - fmt.write_cfg.multi_ch_pcm_cfg.channel_mapping; - - memset(channel_mapping, 0, PCM_FORMAT_MAX_NUM_CHANNEL); - - if (channels == 1) { - channel_mapping[0] = PCM_CHANNEL_FL; - } else if (channels == 2) { - channel_mapping[0] = PCM_CHANNEL_FL; - channel_mapping[1] = PCM_CHANNEL_FR; - } else if (channels == 6) { - channel_mapping[0] = PCM_CHANNEL_FC; - channel_mapping[1] = PCM_CHANNEL_FL; - channel_mapping[2] = PCM_CHANNEL_FR; - channel_mapping[3] = PCM_CHANNEL_LB; - channel_mapping[4] = PCM_CHANNEL_RB; - channel_mapping[5] = PCM_CHANNEL_LFE; - } else { - pr_err("%s: ERROR.unsupported num_ch = %u\n", __func__, - channels); - return -EINVAL; - } - - rc = apr_send_pkt(ac->apr, (uint32_t *) &fmt); - if (rc < 0) { - pr_err("%s:Comamnd open failed\n", __func__); - goto fail_cmd; - } - rc = wait_event_timeout(ac->cmd_wait, - (atomic_read(&ac->cmd_state) == 0), 5*HZ); - if (!rc) { - pr_err("%s:timeout. waited for FORMAT_UPDATE\n", __func__); - goto fail_cmd; - } - return 0; -fail_cmd: - return -EINVAL; -} - int q6asm_media_format_block_aac(struct audio_client *ac, struct asm_aac_cfg *cfg) { diff --git a/sound/soc/msm/qdsp6/q6voice.c b/sound/soc/msm/qdsp6/q6voice.c index 2acf59ead..c899b2a52 100755 --- a/sound/soc/msm/qdsp6/q6voice.c +++ b/sound/soc/msm/qdsp6/q6voice.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -52,12 +52,8 @@ static int voice_send_cvp_deregister_cal_cmd(struct voice_data *v); static int voice_send_cvp_register_vol_cal_table_cmd(struct voice_data *v); static int voice_send_cvp_deregister_vol_cal_table_cmd(struct voice_data *v); static int voice_send_set_widevoice_enable_cmd(struct voice_data *v); -static int voice_send_set_pp_enable_cmd(struct voice_data *v, - uint32_t module_id, int enable); -static int voice_cvs_stop_playback(struct voice_data *v); -static int voice_cvs_start_playback(struct voice_data *v); -static int voice_cvs_start_record(struct voice_data *v, uint32_t rec_mode); -static int voice_cvs_stop_record(struct voice_data *v); +static int voice_send_set_slowtalk_enable_cmd(struct voice_data *v); + static int32_t qdsp_mvm_callback(struct apr_client_data *data, void *priv); static int32_t qdsp_cvs_callback(struct apr_client_data *data, void *priv); @@ -1764,10 +1760,9 @@ static int voice_send_set_widevoice_enable_cmd(struct voice_data *v) return -EINVAL; } -static int voice_send_set_pp_enable_cmd(struct voice_data *v, - uint32_t module_id, int enable) +static int voice_send_set_slowtalk_enable_cmd(struct voice_data *v) { - struct cvs_set_pp_enable_cmd cvs_set_pp_cmd; + struct cvs_set_slowtalk_enable_cmd cvs_set_st_cmd; int ret = 0; void *apr_cvs; u16 cvs_handle; @@ -1785,26 +1780,24 @@ static int voice_send_set_pp_enable_cmd(struct voice_data *v, cvs_handle = voice_get_cvs_handle(v); /* fill in the header */ - cvs_set_pp_cmd.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, + cvs_set_st_cmd.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); - cvs_set_pp_cmd.hdr.pkt_size = APR_PKT_SIZE(APR_HDR_SIZE, - sizeof(cvs_set_pp_cmd) - APR_HDR_SIZE); - cvs_set_pp_cmd.hdr.src_port = v->session_id; - cvs_set_pp_cmd.hdr.dest_port = cvs_handle; - cvs_set_pp_cmd.hdr.token = 0; - cvs_set_pp_cmd.hdr.opcode = VSS_ICOMMON_CMD_SET_UI_PROPERTY; - - cvs_set_pp_cmd.vss_set_pp.module_id = module_id; - cvs_set_pp_cmd.vss_set_pp.param_id = VOICE_PARAM_MOD_ENABLE; - cvs_set_pp_cmd.vss_set_pp.param_size = MOD_ENABLE_PARAM_LEN; - cvs_set_pp_cmd.vss_set_pp.reserved = 0; - cvs_set_pp_cmd.vss_set_pp.enable = enable; - cvs_set_pp_cmd.vss_set_pp.reserved_field = 0; - pr_debug("voice_send_set_pp_enable_cmd, module_id=%d, enable=%d\n", - module_id, enable); + cvs_set_st_cmd.hdr.pkt_size = APR_PKT_SIZE(APR_HDR_SIZE, + sizeof(cvs_set_st_cmd) - APR_HDR_SIZE); + cvs_set_st_cmd.hdr.src_port = v->session_id; + cvs_set_st_cmd.hdr.dest_port = cvs_handle; + cvs_set_st_cmd.hdr.token = 0; + cvs_set_st_cmd.hdr.opcode = VSS_ICOMMON_CMD_SET_UI_PROPERTY; + + cvs_set_st_cmd.vss_set_st.module_id = MODULE_ID_VOICE_MODULE_ST; + cvs_set_st_cmd.vss_set_st.param_id = VOICE_PARAM_MOD_ENABLE; + cvs_set_st_cmd.vss_set_st.param_size = MOD_ENABLE_PARAM_LEN; + cvs_set_st_cmd.vss_set_st.reserved = 0; + cvs_set_st_cmd.vss_set_st.enable = v->st_enable; + cvs_set_st_cmd.vss_set_st.reserved_field = 0; v->cvs_state = CMD_STATUS_FAIL; - ret = apr_send_pkt(apr_cvs, (uint32_t *) &cvs_set_pp_cmd); + ret = apr_send_pkt(apr_cvs, (uint32_t *) &cvs_set_st_cmd); if (ret < 0) { pr_err("Fail: sending cvs set slowtalk enable,\n"); goto fail; @@ -1921,23 +1914,11 @@ static int voice_setup_vocproc(struct voice_data *v) /* enable slowtalk if st_enable is set */ if (v->st_enable) - voice_send_set_pp_enable_cmd(v, MODULE_ID_VOICE_MODULE_ST, - v->st_enable); - if (v->fens_enable) - voice_send_set_pp_enable_cmd(v, MODULE_ID_VOICE_MODULE_FENS, - v->fens_enable); + voice_send_set_slowtalk_enable_cmd(v); if (is_voip_session(v->session_id)) voice_send_netid_timing_cmd(v); - /* Start in-call music delivery if this feature is enabled */ - if (v->music_info.play_enable) - voice_cvs_start_playback(v); - - /* Start in-call recording if this feature is enabled */ - if (v->rec_info.rec_enable) - voice_cvs_start_record(v, v->rec_info.rec_mode); - rtac_add_voice(voice_get_cvs_handle(v), voice_get_cvp_handle(v), v->dev_rx.port_id, v->dev_tx.port_id, @@ -2169,10 +2150,6 @@ static int voice_destroy_vocproc(struct voice_data *v) mvm_handle = voice_get_mvm_handle(v); cvp_handle = voice_get_cvp_handle(v); - /* stop playback or recording */ - v->music_info.force = 1; - voice_cvs_stop_playback(v); - voice_cvs_stop_record(v); /* send stop voice cmd */ voice_send_stop_voice_cmd(v); @@ -2345,423 +2322,6 @@ static int voice_send_vol_index_cmd(struct voice_data *v) return 0; } -static int voice_cvs_start_record(struct voice_data *v, uint32_t rec_mode) -{ - int ret = 0; - void *apr_cvs; - u16 cvs_handle; - - struct cvs_start_record_cmd cvs_start_record; - - if (v == NULL) { - pr_err("%s: v is NULL\n", __func__); - return -EINVAL; - } - apr_cvs = common.apr_q6_cvs; - - if (!apr_cvs) { - pr_err("%s: apr_cvs is NULL.\n", __func__); - return -EINVAL; - } - - cvs_handle = voice_get_cvs_handle(v); - - if (!v->rec_info.recording) { - cvs_start_record.hdr.hdr_field = APR_HDR_FIELD( - APR_MSG_TYPE_SEQ_CMD, - APR_HDR_LEN(APR_HDR_SIZE), - APR_PKT_VER); - cvs_start_record.hdr.pkt_size = APR_PKT_SIZE(APR_HDR_SIZE, - sizeof(cvs_start_record) - APR_HDR_SIZE); - cvs_start_record.hdr.src_port = v->session_id; - cvs_start_record.hdr.dest_port = cvs_handle; - cvs_start_record.hdr.token = 0; - cvs_start_record.hdr.opcode = VSS_ISTREAM_CMD_START_RECORD; - - if (rec_mode == VOC_REC_UPLINK) { - cvs_start_record.rec_mode.rx_tap_point = - VSS_TAP_POINT_NONE; - cvs_start_record.rec_mode.tx_tap_point = - VSS_TAP_POINT_STREAM_END; - } else if (rec_mode == VOC_REC_DOWNLINK) { - cvs_start_record.rec_mode.rx_tap_point = - VSS_TAP_POINT_STREAM_END; - cvs_start_record.rec_mode.tx_tap_point = - VSS_TAP_POINT_NONE; - } else if (rec_mode == VOC_REC_BOTH) { - cvs_start_record.rec_mode.rx_tap_point = - VSS_TAP_POINT_STREAM_END; - cvs_start_record.rec_mode.tx_tap_point = - VSS_TAP_POINT_STREAM_END; - } else { - pr_err("%s: Invalid in-call rec_mode %d\n", __func__, - rec_mode); - - ret = -EINVAL; - goto fail; - } - - v->cvs_state = CMD_STATUS_FAIL; - - ret = apr_send_pkt(apr_cvs, (uint32_t *) &cvs_start_record); - if (ret < 0) { - pr_err("%s: Error %d sending START_RECORD\n", __func__, - ret); - - goto fail; - } - - ret = wait_event_timeout(v->cvs_wait, - (v->cvs_state == CMD_STATUS_SUCCESS), - msecs_to_jiffies(TIMEOUT_MS)); - - if (!ret) { - pr_err("%s: wait_event timeout\n", __func__); - - goto fail; - } - v->rec_info.recording = 1; - } else { - pr_debug("%s: Start record already sent\n", __func__); - } - - return 0; - -fail: - return ret; -} - -static int voice_cvs_stop_record(struct voice_data *v) -{ - int ret = 0; - void *apr_cvs; - u16 cvs_handle; - struct apr_hdr cvs_stop_record; - - if (v == NULL) { - pr_err("%s: v is NULL\n", __func__); - return -EINVAL; - } - apr_cvs = common.apr_q6_cvs; - - if (!apr_cvs) { - pr_err("%s: apr_cvs is NULL.\n", __func__); - return -EINVAL; - } - - cvs_handle = voice_get_cvs_handle(v); - - if (v->rec_info.recording) { - cvs_stop_record.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, - APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); - cvs_stop_record.pkt_size = APR_PKT_SIZE(APR_HDR_SIZE, - sizeof(cvs_stop_record) - APR_HDR_SIZE); - cvs_stop_record.src_port = v->session_id; - cvs_stop_record.dest_port = cvs_handle; - cvs_stop_record.token = 0; - cvs_stop_record.opcode = VSS_ISTREAM_CMD_STOP_RECORD; - - v->cvs_state = CMD_STATUS_FAIL; - - ret = apr_send_pkt(apr_cvs, (uint32_t *) &cvs_stop_record); - if (ret < 0) { - pr_err("%s: Error %d sending STOP_RECORD\n", - __func__, ret); - - goto fail; - } - - ret = wait_event_timeout(v->cvs_wait, - (v->cvs_state == CMD_STATUS_SUCCESS), - msecs_to_jiffies(TIMEOUT_MS)); - if (!ret) { - pr_err("%s: wait_event timeout\n", __func__); - - goto fail; - } - v->rec_info.recording = 0; - } else { - pr_debug("%s: Stop record already sent\n", __func__); - } - - return 0; - -fail: - - return ret; -} - -int voc_start_record(uint32_t port_id, uint32_t set) -{ - int ret = 0; - int rec_mode = 0; - u16 cvs_handle; - int i, rec_set = 0; - - for (i = 0; i < MAX_VOC_SESSIONS; i++) { - struct voice_data *v = &common.voice[i]; - pr_debug("%s: i:%d port_id: %d, set: %d\n", - __func__, i, port_id, set); - - mutex_lock(&v->lock); - rec_mode = v->rec_info.rec_mode; - rec_set = set; - if (set) { - if ((v->rec_route_state.ul_flag != 0) && - (v->rec_route_state.dl_flag != 0)) { - pr_debug("%s: i=%d, rec mode already set.\n", - __func__, i); - mutex_unlock(&v->lock); - if (i < MAX_VOC_SESSIONS) - continue; - else - return 0; - } - - if (port_id == VOICE_RECORD_TX) { - if ((v->rec_route_state.ul_flag == 0) - && (v->rec_route_state.dl_flag == 0)) { - rec_mode = VOC_REC_UPLINK; - v->rec_route_state.ul_flag = 1; - } else if ((v->rec_route_state.ul_flag == 0) - && (v->rec_route_state.dl_flag != 0)) { - voice_cvs_stop_record(v); - rec_mode = VOC_REC_BOTH; - v->rec_route_state.ul_flag = 1; - } - } else if (port_id == VOICE_RECORD_RX) { - if ((v->rec_route_state.ul_flag == 0) - && (v->rec_route_state.dl_flag == 0)) { - rec_mode = VOC_REC_DOWNLINK; - v->rec_route_state.dl_flag = 1; - } else if ((v->rec_route_state.ul_flag != 0) - && (v->rec_route_state.dl_flag == 0)) { - voice_cvs_stop_record(v); - rec_mode = VOC_REC_BOTH; - v->rec_route_state.dl_flag = 1; - } - } - rec_set = 1; - } else { - if ((v->rec_route_state.ul_flag == 0) && - (v->rec_route_state.dl_flag == 0)) { - pr_debug("%s: i=%d, rec already stops.\n", - __func__, i); - mutex_unlock(&v->lock); - if (i < MAX_VOC_SESSIONS) - continue; - else - return 0; - } - - if (port_id == VOICE_RECORD_TX) { - if ((v->rec_route_state.ul_flag != 0) - && (v->rec_route_state.dl_flag == 0)) { - v->rec_route_state.ul_flag = 0; - rec_set = 0; - } else if ((v->rec_route_state.ul_flag != 0) - && (v->rec_route_state.dl_flag != 0)) { - voice_cvs_stop_record(v); - v->rec_route_state.ul_flag = 0; - rec_mode = VOC_REC_DOWNLINK; - rec_set = 1; - } - } else if (port_id == VOICE_RECORD_RX) { - if ((v->rec_route_state.ul_flag == 0) - && (v->rec_route_state.dl_flag != 0)) { - v->rec_route_state.dl_flag = 0; - rec_set = 0; - } else if ((v->rec_route_state.ul_flag != 0) - && (v->rec_route_state.dl_flag != 0)) { - voice_cvs_stop_record(v); - v->rec_route_state.dl_flag = 0; - rec_mode = VOC_REC_UPLINK; - rec_set = 1; - } - } - } - pr_debug("%s: i=%d, mode =%d, set =%d\n", __func__, - i, rec_mode, rec_set); - cvs_handle = voice_get_cvs_handle(v); - - if (cvs_handle != 0) { - if (rec_set) - ret = voice_cvs_start_record(v, rec_mode); - else - ret = voice_cvs_stop_record(v); - } - - /* Cache the value */ - v->rec_info.rec_enable = rec_set; - v->rec_info.rec_mode = rec_mode; - - mutex_unlock(&v->lock); - } - - return ret; -} - -static int voice_cvs_start_playback(struct voice_data *v) -{ - int ret = 0; - struct apr_hdr cvs_start_playback; - void *apr_cvs; - u16 cvs_handle; - - if (v == NULL) { - pr_err("%s: v is NULL\n", __func__); - return -EINVAL; - } - apr_cvs = common.apr_q6_cvs; - - if (!apr_cvs) { - pr_err("%s: apr_cvs is NULL.\n", __func__); - return -EINVAL; - } - - cvs_handle = voice_get_cvs_handle(v); - - if (!v->music_info.playing && v->music_info.count) { - cvs_start_playback.hdr_field = APR_HDR_FIELD( - APR_MSG_TYPE_SEQ_CMD, - APR_HDR_LEN(APR_HDR_SIZE), - APR_PKT_VER); - cvs_start_playback.pkt_size = APR_PKT_SIZE(APR_HDR_SIZE, - sizeof(cvs_start_playback) - APR_HDR_SIZE); - cvs_start_playback.src_port = v->session_id; - cvs_start_playback.dest_port = cvs_handle; - cvs_start_playback.token = 0; - cvs_start_playback.opcode = VSS_ISTREAM_CMD_START_PLAYBACK; - - v->cvs_state = CMD_STATUS_FAIL; - - ret = apr_send_pkt(apr_cvs, (uint32_t *) &cvs_start_playback); - - if (ret < 0) { - pr_err("%s: Error %d sending START_PLAYBACK\n", - __func__, ret); - - goto fail; - } - - ret = wait_event_timeout(v->cvs_wait, - (v->cvs_state == CMD_STATUS_SUCCESS), - msecs_to_jiffies(TIMEOUT_MS)); - if (!ret) { - pr_err("%s: wait_event timeout\n", __func__); - - goto fail; - } - - v->music_info.playing = 1; - } else { - pr_debug("%s: Start playback already sent\n", __func__); - } - - return 0; - -fail: - return ret; -} - -static int voice_cvs_stop_playback(struct voice_data *v) -{ - int ret = 0; - struct apr_hdr cvs_stop_playback; - void *apr_cvs; - u16 cvs_handle; - - if (v == NULL) { - pr_err("%s: v is NULL\n", __func__); - return -EINVAL; - } - apr_cvs = common.apr_q6_cvs; - - if (!apr_cvs) { - pr_err("%s: apr_cvs is NULL.\n", __func__); - return -EINVAL; - } - - cvs_handle = voice_get_cvs_handle(v); - - if (v->music_info.playing && ((!v->music_info.count) || - (v->music_info.force))) { - cvs_stop_playback.hdr_field = - APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, - APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER); - cvs_stop_playback.pkt_size = APR_PKT_SIZE(APR_HDR_SIZE, - sizeof(cvs_stop_playback) - APR_HDR_SIZE); - cvs_stop_playback.src_port = v->session_id; - cvs_stop_playback.dest_port = cvs_handle; - cvs_stop_playback.token = 0; - - cvs_stop_playback.opcode = VSS_ISTREAM_CMD_STOP_PLAYBACK; - - v->cvs_state = CMD_STATUS_FAIL; - - ret = apr_send_pkt(apr_cvs, (uint32_t *) &cvs_stop_playback); - if (ret < 0) { - pr_err("%s: Error %d sending STOP_PLAYBACK\n", - __func__, ret); - - - goto fail; - } - - ret = wait_event_timeout(v->cvs_wait, - (v->cvs_state == CMD_STATUS_SUCCESS), - msecs_to_jiffies(TIMEOUT_MS)); - if (!ret) { - pr_err("%s: wait_event timeout\n", __func__); - - goto fail; - } - - v->music_info.playing = 0; - v->music_info.force = 0; - } else { - pr_debug("%s: Stop playback already sent\n", __func__); - } - - return 0; - -fail: - return ret; -} - -int voc_start_playback(uint32_t set) -{ - int ret = 0; - u16 cvs_handle; - int i; - - - for (i = 0; i < MAX_VOC_SESSIONS; i++) { - struct voice_data *v = &common.voice[i]; - - mutex_lock(&v->lock); - v->music_info.play_enable = set; - if (set) - v->music_info.count++; - else - v->music_info.count--; - pr_debug("%s: music_info count =%d\n", __func__, - v->music_info.count); - - cvs_handle = voice_get_cvs_handle(v); - if (cvs_handle != 0) { - if (set) - ret = voice_cvs_start_playback(v); - else - ret = voice_cvs_stop_playback(v); - } - - mutex_unlock(&v->lock); - } - - return ret; -} - int voc_disable_cvp(uint16_t session_id) { struct voice_data *v = voice_get_session(session_id); @@ -2843,14 +2403,7 @@ int voc_enable_cvp(uint16_t session_id) /* enable slowtalk */ if (v->st_enable) - voice_send_set_pp_enable_cmd(v, - MODULE_ID_VOICE_MODULE_ST, - v->st_enable); - /* enable FENS */ - if (v->fens_enable) - voice_send_set_pp_enable_cmd(v, - MODULE_ID_VOICE_MODULE_FENS, - v->fens_enable); + voice_send_set_slowtalk_enable_cmd(v); get_sidetone_cal(&sidetone_cal_data); if (v->dev_tx.port_id != RT_PROXY_PORT_001_TX && @@ -2987,7 +2540,7 @@ uint32_t voc_get_widevoice_enable(uint16_t session_id) return ret; } -int voc_set_pp_enable(uint16_t session_id, uint32_t module_id, uint32_t enable) +int voc_set_slowtalk_enable(uint16_t session_id, uint32_t st_enable) { struct voice_data *v = voice_get_session(session_id); int ret = 0; @@ -2999,27 +2552,18 @@ int voc_set_pp_enable(uint16_t session_id, uint32_t module_id, uint32_t enable) } mutex_lock(&v->lock); - if (module_id == MODULE_ID_VOICE_MODULE_ST) - v->st_enable = enable; - else if (module_id == MODULE_ID_VOICE_MODULE_FENS) - v->fens_enable = enable; - if (v->voc_state == VOC_RUN) { - if (module_id == MODULE_ID_VOICE_MODULE_ST) - ret = voice_send_set_pp_enable_cmd(v, - MODULE_ID_VOICE_MODULE_ST, - enable); - else if (module_id == MODULE_ID_VOICE_MODULE_FENS) - ret = voice_send_set_pp_enable_cmd(v, - MODULE_ID_VOICE_MODULE_FENS, - enable); - } + v->st_enable = st_enable; + + if (v->voc_state == VOC_RUN) + ret = voice_send_set_slowtalk_enable_cmd(v); + mutex_unlock(&v->lock); return ret; } -int voc_get_pp_enable(uint16_t session_id, uint32_t module_id) +uint32_t voc_get_slowtalk_enable(uint16_t session_id) { struct voice_data *v = voice_get_session(session_id); int ret = 0; @@ -3031,10 +2575,8 @@ int voc_get_pp_enable(uint16_t session_id, uint32_t module_id) } mutex_lock(&v->lock); - if (module_id == MODULE_ID_VOICE_MODULE_ST) - ret = v->st_enable; - else if (module_id == MODULE_ID_VOICE_MODULE_FENS) - ret = v->fens_enable; + + ret = v->st_enable; mutex_unlock(&v->lock); @@ -3395,10 +2937,6 @@ static int32_t qdsp_cvs_callback(struct apr_client_data *data, void *priv) case VSS_ICOMMON_CMD_MAP_MEMORY: case VSS_ICOMMON_CMD_UNMAP_MEMORY: case VSS_ICOMMON_CMD_SET_UI_PROPERTY: - case VSS_ISTREAM_CMD_START_PLAYBACK: - case VSS_ISTREAM_CMD_STOP_PLAYBACK: - case VSS_ISTREAM_CMD_START_RECORD: - case VSS_ISTREAM_CMD_STOP_RECORD: pr_debug("%s: cmd = 0x%x\n", __func__, ptr[0]); v->cvs_state = CMD_STATUS_SUCCESS; wake_up(&v->cvs_wait); diff --git a/sound/soc/msm/qdsp6/q6voice.h b/sound/soc/msm/qdsp6/q6voice.h index 2dc08d6b8..edde0aa68 100755 --- a/sound/soc/msm/qdsp6/q6voice.h +++ b/sound/soc/msm/qdsp6/q6voice.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -17,10 +17,6 @@ #define MAX_VOC_PKT_SIZE 642 #define SESSION_NAME_LEN 20 -#define VOC_REC_UPLINK 0x00 -#define VOC_REC_DOWNLINK 0x01 -#define VOC_REC_BOTH 0x02 - struct voice_header { uint32_t id; uint32_t data_len; @@ -47,11 +43,6 @@ struct voice_dev_route_state { u16 tx_route_flag; }; -struct voice_rec_route_state { - u16 ul_flag; - u16 dl_flag; -}; - enum { VOC_INIT = 0, VOC_RUN, @@ -323,41 +314,10 @@ struct mvm_set_widevoice_enable_cmd { #define VSS_ISTREAM_CMD_SET_ENC_DTX_MODE 0x0001101D /* Set encoder DTX mode. */ -#define MODULE_ID_VOICE_MODULE_FENS 0x00010EEB #define MODULE_ID_VOICE_MODULE_ST 0x00010EE3 #define VOICE_PARAM_MOD_ENABLE 0x00010E00 #define MOD_ENABLE_PARAM_LEN 4 -#define VSS_ISTREAM_CMD_START_PLAYBACK 0x00011238 -/* Start in-call music delivery on the Tx voice path. */ - -#define VSS_ISTREAM_CMD_STOP_PLAYBACK 0x00011239 -/* Stop the in-call music delivery on the Tx voice path. */ - -#define VSS_ISTREAM_CMD_START_RECORD 0x00011236 -/* Start in-call conversation recording. */ -#define VSS_ISTREAM_CMD_STOP_RECORD 0x00011237 -/* Stop in-call conversation recording. */ - -#define VSS_TAP_POINT_NONE 0x00010F78 -/* Indicates no tapping for specified path. */ - -#define VSS_TAP_POINT_STREAM_END 0x00010F79 -/* Indicates that specified path should be tapped at the end of the stream. */ - -struct vss_istream_cmd_start_record_t { - uint32_t rx_tap_point; - /* Tap point to use on the Rx path. Supported values are: - * VSS_TAP_POINT_NONE : Do not record Rx path. - * VSS_TAP_POINT_STREAM_END : Rx tap point is at the end of the stream. - */ - uint32_t tx_tap_point; - /* Tap point to use on the Tx path. Supported values are: - * VSS_TAP_POINT_NONE : Do not record tx path. - * VSS_TAP_POINT_STREAM_END : Tx tap point is at the end of the stream. - */ -} __packed; - struct vss_istream_cmd_create_passive_control_session_t { char name[SESSION_NAME_LEN]; /**< @@ -502,7 +462,7 @@ struct vss_istream_cmd_register_calibration_data_t { /* Size of the calibration data in bytes. */ }; -struct vss_icommon_cmd_set_ui_property_enable_t { +struct vss_icommon_cmd_set_ui_property_st_enable_t { uint32_t module_id; /* Unique ID of the module. */ uint32_t param_id; @@ -574,13 +534,9 @@ struct cvs_deregister_cal_data_cmd { struct apr_hdr hdr; } __packed; -struct cvs_set_pp_enable_cmd { - struct apr_hdr hdr; - struct vss_icommon_cmd_set_ui_property_enable_t vss_set_pp; -} __packed; -struct cvs_start_record_cmd { +struct cvs_set_slowtalk_enable_cmd { struct apr_hdr hdr; - struct vss_istream_cmd_start_record_t rec_mode; + struct vss_icommon_cmd_set_ui_property_st_enable_t vss_set_st; } __packed; /* TO CVP commands */ @@ -791,16 +747,13 @@ struct mvs_driver_info { }; struct incall_rec_info { - uint32_t rec_enable; + uint32_t pending; uint32_t rec_mode; - uint32_t recording; }; struct incall_music_info { - uint32_t play_enable; + uint32_t pending; uint32_t playing; - int count; - int force; }; struct voice_data { @@ -833,18 +786,10 @@ struct voice_data { uint8_t wv_enable; /* slowtalk enable value */ uint32_t st_enable; - /* FENC enable value */ - uint32_t fens_enable; struct voice_dev_route_state voc_route_state; u16 session_id; - - struct incall_rec_info rec_info; - - struct incall_music_info music_info; - - struct voice_rec_route_state rec_route_state; }; #define MAX_VOC_SESSIONS 2 @@ -889,8 +834,8 @@ enum { }; /* called by alsa driver */ -int voc_set_pp_enable(uint16_t session_id, uint32_t module_id, uint32_t enable); -int voc_get_pp_enable(uint16_t session_id, uint32_t module_id); +int voc_set_slowtalk_enable(uint16_t session_id, uint32_t st_enable); +uint32_t voc_get_slowtalk_enable(uint16_t session_id); int voc_set_widevoice_enable(uint16_t session_id, uint32_t wv_enable); uint32_t voc_get_widevoice_enable(uint16_t session_id); uint8_t voc_get_tty_mode(uint16_t session_id); @@ -911,6 +856,4 @@ uint8_t voc_get_route_flag(uint16_t session_id, uint8_t path_dir); #define VOIP_SESSION_NAME "VoIP session" uint16_t voc_get_session_id(char *name); -int voc_start_playback(uint32_t set); -int voc_start_record(uint32_t port_id, uint32_t set); #endif From 0f6129265d1a96eec67fb7ea04bf2d0acf5be429 Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 14 Oct 2012 21:36:39 +1300 Subject: [PATCH 48/52] add a line I forgot --- drivers/gpu/msm/kgsl.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/msm/kgsl.c b/drivers/gpu/msm/kgsl.c index e01a1d7cc..32547753b 100755 --- a/drivers/gpu/msm/kgsl.c +++ b/drivers/gpu/msm/kgsl.c @@ -1660,15 +1660,16 @@ static long kgsl_ioctl_map_user_mem(struct kgsl_device_private *dev_priv, switch (entry->memtype) { case KGSL_MEM_ENTRY_PMEM: case KGSL_MEM_ENTRY_ASHMEM: - if (entry->priv_data) - break; + if (entry->priv_data) + fput(entry->priv_data); + break; case KGSL_MEM_ENTRY_ION: - ion_unmap_dma(kgsl_ion_client, entry->priv_data); - ion_free(kgsl_ion_client, entry->priv_data); - break; + ion_unmap_dma(kgsl_ion_client, entry->priv_data); + ion_free(kgsl_ion_client, entry->priv_data); + break; default: - break; -} + break; + } error: kfree(entry); kgsl_check_idle(dev_priv->device); From b75f19db1f0347334ca79c6df2cbbce86d79b7a5 Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 14 Oct 2012 21:37:04 +1300 Subject: [PATCH 49/52] Back to huawei wifi drivers with no caf changes --- drivers/net/wireless/libra/Makefile | 0 drivers/net/wireless/libra/libra_sdioif.c | 77 ++------------------- drivers/net/wireless/libra/qcomwlan_pwrif.c | 5 +- 3 files changed, 9 insertions(+), 73 deletions(-) mode change 100755 => 100644 drivers/net/wireless/libra/Makefile diff --git a/drivers/net/wireless/libra/Makefile b/drivers/net/wireless/libra/Makefile old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/libra/libra_sdioif.c b/drivers/net/wireless/libra/libra_sdioif.c index 8cfc0fa85..3955642de 100644 --- a/drivers/net/wireless/libra/libra_sdioif.c +++ b/drivers/net/wireless/libra/libra_sdioif.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2012, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2009-2011, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -28,39 +28,6 @@ static unsigned short libra_sdio_card_id; static suspend_handler_t *libra_suspend_hldr; static resume_handler_t *libra_resume_hldr; -static notify_card_removal_t *libra_notify_card_removal_hdlr; -static shutdown_handler_t *libra_sdio_shutdown_hdlr; - -int libra_enable_sdio_irq_in_chip(struct sdio_func *func, u8 enable) -{ - unsigned char reg = 0; - int err = 0; - - sdio_claim_host(func); - - /* Read the value into reg */ - libra_sdiocmd52(func, SDIO_CCCR_IENx, ®, 0, &err); - if (err) - printk(KERN_ERR "%s: Could not read SDIO_CCCR_IENx register " - "err=%d\n", __func__, err); - - if (libra_mmc_host) { - if (enable) { - reg |= 1 << func->num; - reg |= 1; - } else { - reg &= ~(1 << func->num); - } - libra_sdiocmd52(func, SDIO_CCCR_IENx, ®, 1, &err); - if (err) - printk(KERN_ERR "%s: Could not enable/disable irq " - "err=%d\n", __func__, err); - } - sdio_release_host(func); - - return err; -} -EXPORT_SYMBOL(libra_enable_sdio_irq_in_chip); /** * libra_sdio_configure() - Function to configure the SDIO device param @@ -122,8 +89,6 @@ int libra_sdio_configure(sdio_irq_handler_t libra_sdio_rxhandler, goto cfg_error; } - libra_enable_sdio_irq_in_chip(func, 0); - sdio_release_host(func); return 0; @@ -399,8 +364,6 @@ static int libra_sdio_probe(struct sdio_func *func, static void libra_sdio_remove(struct sdio_func *func) { - if (libra_notify_card_removal_hdlr) - libra_notify_card_removal_hdlr(); libra_sdio_func = NULL; printk(KERN_INFO "%s : Module removed.\n", __func__); @@ -453,31 +416,6 @@ static int libra_sdio_resume(struct device *dev) #define libra_sdio_resume 0 #endif -static void libra_sdio_shutdown(struct device *dev) -{ - if (libra_sdio_shutdown_hdlr) { - libra_sdio_shutdown_hdlr(); - printk(KERN_INFO "%s : Notified shutdown event to Libra driver.\n", - __func__); - } -} - -int libra_sdio_register_shutdown_hdlr( - shutdown_handler_t *libra_shutdown_hdlr) -{ - libra_sdio_shutdown_hdlr = libra_shutdown_hdlr; - return 0; -} -EXPORT_SYMBOL(libra_sdio_register_shutdown_hdlr); - -int libra_sdio_notify_card_removal( - notify_card_removal_t *libra_sdio_notify_card_removal_hdlr) -{ - libra_notify_card_removal_hdlr = libra_sdio_notify_card_removal_hdlr; - return 0; -} -EXPORT_SYMBOL(libra_sdio_notify_card_removal); - static struct sdio_device_id libra_sdioid[] = { {.class = 0, .vendor = LIBRA_MAN_ID, .device = LIBRA_REV_1_0_CARD_ID}, {.class = 0, .vendor = VOLANS_MAN_ID, .device = VOLANS_REV_2_0_CARD_ID}, @@ -490,12 +428,11 @@ static const struct dev_pm_ops libra_sdio_pm_ops = { }; static struct sdio_driver libra_sdiofn_driver = { - .name = "libra_sdiofn", - .id_table = libra_sdioid, - .probe = libra_sdio_probe, - .remove = libra_sdio_remove, - .drv.pm = &libra_sdio_pm_ops, - .drv.shutdown = libra_sdio_shutdown, + .name = "libra_sdiofn", + .id_table = libra_sdioid, + .probe = libra_sdio_probe, + .remove = libra_sdio_remove, + .drv.pm = &libra_sdio_pm_ops, }; static int __init libra_sdioif_init(void) @@ -505,8 +442,6 @@ static int __init libra_sdioif_init(void) libra_mmc_host_index = -1; libra_suspend_hldr = NULL; libra_resume_hldr = NULL; - libra_notify_card_removal_hdlr = NULL; - libra_sdio_shutdown_hdlr = NULL; sdio_register_driver(&libra_sdiofn_driver); diff --git a/drivers/net/wireless/libra/qcomwlan_pwrif.c b/drivers/net/wireless/libra/qcomwlan_pwrif.c index 94ea0b395..6a0c78f2b 100755 --- a/drivers/net/wireless/libra/qcomwlan_pwrif.c +++ b/drivers/net/wireless/libra/qcomwlan_pwrif.c @@ -154,7 +154,7 @@ int vos_chip_power_qrf8615(int on) /* WLAN VREG settings */ for (i = 0; i < ARRAY_SIZE(vregs_qwlan_name); i++) { - if (on && !wlan_on) { + if (vregs_qwlan[i] == NULL) { vregs_qwlan[i] = regulator_get(NULL, vregs_qwlan_name[i]); if (IS_ERR(vregs_qwlan[i])) { @@ -187,7 +187,8 @@ int vos_chip_power_qrf8615(int on) goto vreg_fail; } } - + } + if (on && !wlan_on) { if (vregs_qwlan_peek_current[i]) { rc = regulator_set_optimum_mode(vregs_qwlan[i], vregs_qwlan_peek_current[i]); From 0956eebd9563afccc1cd03b16d4079a984234c81 Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 14 Oct 2012 21:37:19 +1300 Subject: [PATCH 50/52] reduce readahead again --- include/linux/mm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index c137940dd..c853b21e7 100755 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1473,7 +1473,7 @@ int write_one_page(struct page *page, int wait); void task_dirty_inc(struct task_struct *tsk); /* readahead.c */ -#define VM_MAX_READAHEAD 512 /* kbytes */ +#define VM_MAX_READAHEAD 256 /* kbytes */ #define VM_MIN_READAHEAD 16 /* kbytes (includes current page) */ int force_page_cache_readahead(struct address_space *mapping, struct file *filp, From 678a80f7a23f34967551738b90a2f68859fa795f Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 14 Oct 2012 21:39:57 +1300 Subject: [PATCH 51/52] Revert LPJ change --- init/calibrate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/calibrate.c b/init/calibrate.c index de01fccf3..aae2f40fe 100755 --- a/init/calibrate.c +++ b/init/calibrate.c @@ -269,7 +269,7 @@ void __cpuinit calibrate_delay(void) if (!printed) pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n", lpj/(500000/HZ), - (lpj * 10 /(50000/HZ)) % 100, lpj); + (lpj/(5000/HZ)) % 100, lpj); loops_per_jiffy = lpj; printed = true; From a346cdbfbf9af15f3d7dbe6e62bf8fbe2e4fe8d4 Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 14 Oct 2012 21:45:34 +1300 Subject: [PATCH 52/52] Up Default Lowmemorykiller values --- drivers/staging/android/lowmemorykiller.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c index afea2fa8a..ddf9012fc 100755 --- a/drivers/staging/android/lowmemorykiller.c +++ b/drivers/staging/android/lowmemorykiller.c @@ -47,10 +47,10 @@ static int lowmem_adj[6] = { }; static int lowmem_adj_size = 4; static size_t lowmem_minfree[6] = { - 3 * 512, /* 6MB */ - 2 * 1024, /* 8MB */ - 4 * 1024, /* 16MB */ - 16 * 1024, /* 64MB */ + 4 * 512, /* 6MB - PaulM 8MB */ + 4 * 1024, /* 8MB - PaulM 16MB */ + 8 * 1024, /* 16MB - PaulM 32MB */ + 24 * 1024, /* 64MB - PaulM 96MB */ }; static int lowmem_minfree_size = 4;