Permalink
Browse files

Merged with EasyPad 971 kernel snapshot

  • Loading branch information...
1 parent adaa7cc commit 0d083e144bf38f207deb9563cec7e4ce8434552a @omegamoon committed Feb 20, 2013
Showing with 30,942 additions and 351 deletions.
  1. +2 −0 README.md
  2. +26 −33 arch/arm/configs/mk808_defconfig
  3. +3 −2 drivers/adc/core.c
  4. +1 −1 drivers/adc/plat/rk29_adc.c
  5. +6 −12 drivers/adc/plat/rk30_adc.c
  6. +11 −0 drivers/bluetooth/Kconfig
  7. +7 −16 drivers/gpio/gpiolib.c
  8. +3 −2 drivers/i2c/busses/Kconfig
  9. +1 −1 drivers/i2c/busses/i2c-rk30.c
  10. +6 −0 drivers/input/touchscreen/Kconfig
  11. +2 −0 drivers/input/touchscreen/Makefile
  12. +703 −0 drivers/input/touchscreen/ct36x_ts.c
  13. +2,048 −0 drivers/input/touchscreen/ts36100.dat
  14. +41 −1 drivers/media/video/Kconfig
  15. +4 −0 drivers/media/video/Makefile
  16. +3,046 −0 drivers/media/video/gc0329.c
  17. +1 −1 drivers/media/video/ov2659.c
  18. +1 −1 drivers/media/video/ov5640.c
  19. +3 −0 drivers/media/video/ov5640_for_td8801.c
  20. +42 −35 drivers/media/video/rk29_camera_oneframe.c
  21. +1 −1 drivers/media/video/rk30_camera.c
  22. +84 −81 drivers/media/video/rk30_camera_oneframe.c
  23. +6,093 −0 drivers/media/video/s5k5ca.c
  24. +242 −0 drivers/media/video/s5k5ca.h
  25. +715 −4 drivers/media/video/sid130B.c
  26. +2,728 −0 drivers/media/video/siv121d.c
  27. +2,884 −0 drivers/media/video/sp0838.c
  28. +17 −0 drivers/mfd/wm831x-core.c
  29. +31 −0 drivers/misc/3g_module/Kconfig
  30. +6 −0 drivers/misc/3g_module/Makefile
  31. +352 −0 drivers/misc/3g_module/mi700.c
  32. 0 drivers/misc/{ → 3g_module}/mt6229.c
  33. 0 drivers/misc/{ → 3g_module}/mu509.c
  34. 0 drivers/misc/{ → 3g_module}/mw100.c
  35. +228 −0 drivers/misc/3g_module/sew868.c
  36. 0 drivers/misc/{ → 3g_module}/ste.c
  37. +1 −11 drivers/misc/Kconfig
  38. +1 −4 drivers/misc/Makefile
  39. +18 −58 drivers/misc/gps/rk29_gps.c
  40. +2 −0 drivers/mtd/rknand/rknand_base.h
  41. +23 −5 drivers/mtd/rknand/rknand_base_ko.c
  42. +8 −1 drivers/power/Kconfig
  43. +4 −0 drivers/power/Makefile
  44. +375 −0 drivers/power/oz8806_battery.c
  45. +98 −0 drivers/power/parameter.c
  46. +132 −0 drivers/power/parameter.h
  47. +6 −1 drivers/usb/gadget/epautoconf.c
  48. +1 −1 drivers/usb/gadget/f_adb.c
  49. +1 −1 drivers/usb/gadget/storage_common.c
  50. +8 −0 drivers/usb/serial/Kconfig
  51. +1 −0 drivers/usb/serial/Makefile
  52. +29 −1 drivers/usb/serial/option.c
  53. +14 −0 drivers/usb/serial/usb-serial.c
  54. +83 −0 drivers/usb/serial/usiserial.c
  55. +4 −0 drivers/video/backlight/rk2818_backlight.h
  56. +2 −0 drivers/video/display/screen/Kconfig
  57. +2 −1 drivers/video/display/screen/Makefile
  58. +76 −0 drivers/video/display/screen/lcd_hv070wsa.c
  59. +6 −4 drivers/video/hdmi/Kconfig
  60. +5 −0 drivers/video/hdmi/chips/Kconfig
  61. +2 −2 drivers/video/hdmi/chips/Makefile
  62. +2 −1 drivers/video/hdmi/chips/{ → anx7150}/anx7150.c
  63. 0 drivers/video/hdmi/chips/{ → anx7150}/anx7150.h
  64. 0 drivers/video/hdmi/chips/{ → anx7150}/anx7150_hw.c
  65. 0 drivers/video/hdmi/chips/{ → anx7150}/anx7150_hw.h
  66. +304 −0 drivers/video/hdmi/chips/rk610/rk610_hdmi.c
  67. +36 −0 drivers/video/hdmi/chips/rk610/rk610_hdmi.h
  68. +1,271 −0 drivers/video/hdmi/chips/rk610/rk610_hdmi_hw.c
  69. +258 −0 drivers/video/hdmi/chips/rk610/rk610_hdmi_hw.h
  70. +6 −0 drivers/video/hdmi/hdmi-backlight.c
  71. +1 −1 drivers/video/hdmi/hdmi-codec.c
  72. +13 −7 drivers/video/hdmi/hdmi-core.c
  73. +20 −12 drivers/video/hdmi/hdmi-fb.c
  74. +1 −1 fs/fat/fatent.c
  75. +12 −1 include/linux/adc.h
  76. +58 −38 include/linux/mfd/rk610_core.h
  77. +2 −2 include/linux/mfd/tps65910.h
  78. +2 −0 include/linux/mfd/wm831x/core.h
  79. +27 −0 include/linux/mi700.h
  80. +1 −1 include/linux/mma7660.h
  81. +25 −0 include/linux/sew868.h
  82. +5 −0 include/media/v4l2-chip-ident.h
  83. +1 −1 kernel/power/wakelock.c
  84. +1 −1 kernel/sched.c
  85. +7 −1 net/rfkill/rfkill-rk.c
  86. +1 −0 scripts/pnmtologo.c
  87. +8 −0 sound/soc/codecs/Kconfig
  88. +4 −1 sound/soc/codecs/Makefile
  89. +9 −0 sound/soc/codecs/rk610_codec.c
  90. +1,400 −0 sound/soc/codecs/rt3261-dsp.c
  91. +39 −0 sound/soc/codecs/rt3261-dsp.h
  92. +3,144 −0 sound/soc/codecs/rt3261.c
  93. +2,151 −0 sound/soc/codecs/rt3261.h
  94. +485 −0 sound/soc/codecs/rt3261_ioctl.c
  95. +41 −0 sound/soc/codecs/rt3261_ioctl.h
  96. +314 −0 sound/soc/codecs/rt5623.c
  97. +506 −0 sound/soc/codecs/rt5623.h
  98. +23 −1 sound/soc/codecs/rt5631.c
  99. +179 −0 sound/soc/codecs/rt_codec_ioctl.c
  100. +78 −0 sound/soc/codecs/rt_codec_ioctl.h
  101. +18 −1 sound/soc/rk29/Kconfig
  102. +2 −0 sound/soc/rk29/Makefile
  103. +247 −0 sound/soc/rk29/rk29_rt3261.c
View
@@ -20,3 +20,5 @@ Linux kernel release 3.x for Rockchip RK3066 - www.omegamoon.com
- Added mk808 build script
- Added linux flash tools + flash script for mk808 (use at own risk!)
- Updated README and added build- and flash instructions
+
+- Merged with EasyPad 971 kernel snapshot (i97-8326-1.5)
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/arm 3.0.8+ Kernel Configuration
+# Linux/arm 3.0.8 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -869,6 +869,7 @@ CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=y
CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_HIDP is not set
#
# Bluetooth device drivers
@@ -1065,8 +1066,6 @@ CONFIG_APANIC_PLABEL="kpanic"
# CONFIG_STE is not set
# CONFIG_MTK23D is not set
# CONFIG_FM580X is not set
-# CONFIG_MU509 is not set
-# CONFIG_MW100 is not set
# CONFIG_RK29_NEWTON is not set
# CONFIG_RK29_SC8800 is not set
# CONFIG_TDSC8800 is not set
@@ -1090,6 +1089,7 @@ CONFIG_APANIC_PLABEL="kpanic"
#
# CONFIG_TI_ST is not set
# CONFIG_SENSORS_LIS3_I2C is not set
+# CONFIG_3G_MODULE is not set
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -1485,7 +1485,6 @@ CONFIG_I2C4_RK30=y
# CONFIG_I2C4_CONTROLLER_RK29 is not set
CONFIG_I2C4_CONTROLLER_RK30=y
# CONFIG_I2C_GPIO_RK30 is not set
-CONFIG_I2C_DEV_RK29=y
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
@@ -1572,11 +1571,15 @@ CONFIG_TEST_POWER=y
# CONFIG_BATTERY_BQ27x00 is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_BATTERY_OZ8806 is not set
# CONFIG_CHARGER_MAX8903 is not set
# CONFIG_CHARGER_GPIO is not set
+# CONFIG_BATTERY_RK29_ADC is not set
# CONFIG_BATTERY_RK30_ADC is not set
+# CONFIG_BATTERY_TYPE is not set
# CONFIG_POWER_ON_CHARGER_DISPLAY is not set
# CONFIG_WM8326_VBAT_LOW_DETECTION is not set
+# CONFIG_TWL60xx_VBAT_LOW_DETECTION is not set
# CONFIG_HWMON is not set
# CONFIG_THERMAL is not set
# CONFIG_WATCHDOG is not set
@@ -1945,6 +1948,7 @@ CONFIG_DISPLAY_SUPPORT=y
# CONFIG_LCD_HSD100PXN is not set
# CONFIG_LCD_HSD07PFW1 is not set
# CONFIG_LCD_BYD8688FTGF is not set
+# CONFIG_LCD_TQ7025 is not set
# CONFIG_LCD_B101AW06 is not set
# CONFIG_LCD_LS035Y8DX02A is not set
# CONFIG_LCD_LS035Y8DX04A is not set
@@ -1967,6 +1971,7 @@ CONFIG_DISPLAY_SUPPORT=y
# CONFIG_BOX_FB_480P is not set
# CONFIG_BOX_FB_720P is not set
CONFIG_BOX_FB_1080P=y
+# CONFIG_LCD_HV070WSA100 is not set
# CONFIG_DISPLAY_LCD_SUPPORT is not set
# CONFIG_HDMI_ITV is not set
# CONFIG_RK_VGA is not set
@@ -2042,8 +2047,10 @@ CONFIG_SND_DMA_EVENT_STATIC=y
# CONFIG_SND_RK29_SOC_WM8988 is not set
# CONFIG_SND_RK29_SOC_WM8900 is not set
# CONFIG_SND_RK29_SOC_RT5621 is not set
+# CONFIG_SND_RK29_SOC_RT5623 is not set
# CONFIG_SND_RK29_SOC_RT5631 is not set
# CONFIG_SND_RK29_SOC_RT5625 is not set
+# CONFIG_SND_RK29_SOC_RT3261 is not set
# CONFIG_SND_RK29_SOC_CS42L52 is not set
# CONFIG_SND_RK29_SOC_AIC3111 is not set
# CONFIG_SND_RK29_SOC_AIC3262 is not set
@@ -2056,15 +2063,16 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_RK_HDMI_CODEC=y
# CONFIG_SOUND_PRIME is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HIDRAW is not set
#
-# HID support
+# USB Input Devices
#
-CONFIG_HID=y
-# CONFIG_HID_BATTERY_STRENGTH is not set
-# CONFIG_HIDRAW is not set
-# CONFIG_UHID is not set
-CONFIG_HID_GENERIC=y
+CONFIG_USB_HID=y
+# CONFIG_HID_PID is not set
+# CONFIG_USB_HIDDEV is not set
#
# Special HID drivers
@@ -2073,7 +2081,6 @@ CONFIG_HID_A4TECH=y
CONFIG_HID_ACRUX=y
CONFIG_HID_ACRUX_FF=y
CONFIG_HID_APPLE=y
-# CONFIG_HID_AUREAL is not set
CONFIG_HID_BELKIN=y
CONFIG_HID_CHERRY=y
CONFIG_HID_CHICONY=y
@@ -2083,7 +2090,6 @@ CONFIG_HID_DRAGONRISE=y
CONFIG_DRAGONRISE_FF=y
CONFIG_HID_EMS_FF=y
CONFIG_HID_EZKEY=y
-# CONFIG_HID_HOLTEK is not set
CONFIG_HID_KEYTOUCH=y
CONFIG_HID_KYE=y
CONFIG_HID_UCLOGIC=y
@@ -2092,13 +2098,11 @@ CONFIG_HID_GYRATION=y
CONFIG_HID_TWINHAN=y
CONFIG_HID_KENSINGTON=y
CONFIG_HID_LCPOWER=y
-# CONFIG_HID_LENOVO_TPKBD is not set
CONFIG_HID_LOGITECH=y
-# CONFIG_HID_LOGITECH_DJ is not set
CONFIG_LOGITECH_FF=y
CONFIG_LOGIRUMBLEPAD2_FF=y
CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
+# CONFIG_LOGIWII_FF is not set
CONFIG_HID_MICROSOFT=y
CONFIG_HID_MONTEREY=y
CONFIG_HID_MULTITOUCH=y
@@ -2111,38 +2115,26 @@ CONFIG_HID_PICOLCD=y
# CONFIG_HID_PICOLCD_FB is not set
# CONFIG_HID_PICOLCD_BACKLIGHT is not set
# CONFIG_HID_PICOLCD_LEDS is not set
-# CONFIG_HID_PICOLCD_CIR is not set
-# CONFIG_HID_PRIMAX is not set
+# CONFIG_HID_QUANTA is not set
CONFIG_HID_ROCCAT=y
-# CONFIG_HID_SAITEK is not set
+# CONFIG_HID_ROCCAT_ARVO is not set
+# CONFIG_HID_ROCCAT_KONE is not set
+# CONFIG_HID_ROCCAT_KONEPLUS is not set
+# CONFIG_HID_ROCCAT_KOVAPLUS is not set
+# CONFIG_HID_ROCCAT_PYRA is not set
CONFIG_HID_SAMSUNG=y
CONFIG_HID_SONY=y
-# CONFIG_HID_SPEEDLINK is not set
CONFIG_HID_SUNPLUS=y
CONFIG_HID_GREENASIA=y
CONFIG_GREENASIA_FF=y
CONFIG_HID_SMARTJOYPLUS=y
CONFIG_SMARTJOYPLUS_FF=y
-# CONFIG_HID_TIVO is not set
CONFIG_HID_TOPSEED=y
CONFIG_HID_THRUSTMASTER=y
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_ZEROPLUS=y
CONFIG_ZEROPLUS_FF=y
CONFIG_HID_ZYDACRON=y
-# CONFIG_HID_SENSOR_HUB is not set
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=y
-# CONFIG_HID_PID is not set
-# CONFIG_USB_HIDDEV is not set
-
-#
-# I2C HID support
-#
-# CONFIG_I2C_HID is not set
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -2272,6 +2264,7 @@ CONFIG_USB_SERIAL_OPTION=y
# CONFIG_USB_SERIAL_ZIO is not set
# CONFIG_USB_SERIAL_SSU100 is not set
# CONFIG_USB_SERIAL_DEBUG is not set
+# CONFIG_USB_SERIAL_USI is not set
#
# USB Miscellaneous drivers
View
@@ -145,16 +145,17 @@ static void adc_finished(struct adc_host *adc, int result)
}
void adc_core_irq_handle(struct adc_host *adc)
{
+ unsigned long flags;
int result = 0;
- spin_lock(&adc->lock);
+ spin_lock_irqsave(&adc->lock, flags);
result = adc->ops->read(adc);
adc_finished(adc, result);
if(!list_empty(&adc->req_head))
schedule_work(&adc->work);
- spin_unlock(&adc->lock);
+ spin_unlock_irqrestore(&adc->lock, flags);
}
int adc_host_read(struct adc_client *client, enum read_type type)
@@ -123,7 +123,7 @@ static int rk29_adc_probe(struct platform_device *pdev)
goto err_alloc;
}
- ret = request_irq(dev->irq, rk29_adc_irq, 0, pdev->name, dev);
+ ret = request_threaded_irq(dev->irq, NULL, rk29_adc_irq, IRQF_ONESHOT, pdev->name, dev);
if (ret < 0) {
dev_err(&pdev->dev, "failed to attach adc irq\n");
goto err_alloc;
@@ -45,6 +45,7 @@ static void rk30_adc_stop(struct adc_host *adc)
struct rk30_adc_device *dev = adc_priv(adc);
adc_writel(0, dev->regs + ADC_CTRL);
+ udelay(SAMPLE_RATE);
}
static int rk30_adc_read(struct adc_host *adc)
{
@@ -75,18 +76,15 @@ struct adc_test_data {
};
static void callback(struct adc_client *client, void *param, int result)
{
- if(result < 70)
- dev_info(client->adc->dev, "[chn%d] async_read = %d\n", client->chn, result);
- else
- dev_dbg(client->adc->dev, "[chn%d] async_read = %d\n", client->chn, result);
+ dev_dbg(client->adc->dev, "[chn%d] async_read = %d\n", client->chn, result);
return;
}
static void adc_timer(unsigned long data)
{
struct adc_test_data *test=(struct adc_test_data *)data;
queue_work(adc_wq, &test->timer_work);
- add_timer(&test->timer);
+ mod_timer(&test->timer, jiffies+msecs_to_jiffies(20));
}
static void adc_timer_work(struct work_struct *work)
{
@@ -95,10 +93,7 @@ static void adc_timer_work(struct work_struct *work)
timer_work);
adc_async_read(test->client);
sync_read = adc_sync_read(test->client);
- if(sync_read < 70)
- dev_info(test->client->adc->dev, "[chn%d] sync_read = %d\n", test->client->chn, sync_read);
- else
- dev_dbg(test->client->adc->dev, "[chn%d] sync_read = %d\n", test->client->chn, sync_read);
+ dev_dbg(test->client->adc->dev, "[chn%d] sync_read = %d\n", test->client->chn, sync_read);
}
static int rk30_adc_test(void)
@@ -112,8 +107,7 @@ static int rk30_adc_test(void)
test[i]->client = adc_register(i, callback, NULL);
INIT_WORK(&test[i]->timer_work, adc_timer_work);
setup_timer(&test[i]->timer, adc_timer, (unsigned long)test[i]);
- test[i]->timer.expires = jiffies + 1;
- add_timer(&test[i]->timer);
+ mod_timer(&test[i]->timer, jiffies+msecs_to_jiffies(20));
}
return 0;
@@ -141,7 +135,7 @@ static int rk30_adc_probe(struct platform_device *pdev)
goto err_alloc;
}
- ret = request_irq(dev->irq, rk30_adc_irq, 0, pdev->name, dev);
+ ret = request_threaded_irq(dev->irq, NULL, rk30_adc_irq, IRQF_ONESHOT, pdev->name, dev);
if (ret < 0) {
dev_err(&pdev->dev, "failed to attach adc irq\n");
goto err_alloc;
View
@@ -257,4 +257,15 @@ config BT_WILINK
Say Y here to compile support for Texas Instrument's WiLink7 driver
into the kernel or say M to compile it as module.
+
+if BCM4330
+choice
+ prompt "Select the bluetooth module"
+ default BT_MODULE_NH660
+
+ config BT_MODULE_NH660
+ bool "AzureWave NH660"
+endchoice
+endif
+
endmenu
View
@@ -1225,7 +1225,7 @@ int gpio_request(unsigned gpio, const char *label)
spin_unlock_irqrestore(&gpio_lock, flags);
return status;
}
-EXPORT_SYMBOL(gpio_request);//EXPORT_SYMBOL_GPL(gpio_request);
+EXPORT_SYMBOL_GPL(gpio_request);
void gpio_free(unsigned gpio)
{
@@ -1262,9 +1262,7 @@ void gpio_free(unsigned gpio)
spin_unlock_irqrestore(&gpio_lock, flags);
}
-//EXPORT_SYMBOL_GPL(gpio_free);
-EXPORT_SYMBOL(gpio_free);
-
+EXPORT_SYMBOL_GPL(gpio_free);
/**
* gpio_request_one - request a single GPIO with initial configuration
@@ -1420,9 +1418,7 @@ int gpio_direction_input(unsigned gpio)
__func__, gpio, status);
return status;
}
-//EXPORT_SYMBOL_GPL(gpio_direction_input);
-EXPORT_SYMBOL(gpio_direction_input);
-
+EXPORT_SYMBOL_GPL(gpio_direction_input);
int gpio_direction_output(unsigned gpio, int value)
{
@@ -1479,8 +1475,7 @@ int gpio_direction_output(unsigned gpio, int value)
__func__, gpio, status);
return status;
}
-//EXPORT_SYMBOL_GPL(gpio_direction_output);
-EXPORT_SYMBOL(gpio_direction_output);
+EXPORT_SYMBOL_GPL(gpio_direction_output);
/*
gpio pull up or pull down
@@ -1541,8 +1536,7 @@ int gpio_pull_updown(unsigned gpio, unsigned value)
__func__, gpio, status);
return status;
}
-//EXPORT_SYMBOL_GPL(gpio_pull_updown);
-EXPORT_SYMBOL(gpio_pull_updown);
+EXPORT_SYMBOL_GPL(gpio_pull_updown);
/**
* gpio_set_debounce - sets @debounce time for a @gpio
@@ -1632,9 +1626,7 @@ int __gpio_get_value(unsigned gpio)
trace_gpio_value(gpio, 1, value);
return value;
}
-//EXPORT_SYMBOL_GPL(__gpio_get_value);
-EXPORT_SYMBOL(__gpio_get_value);
-
+EXPORT_SYMBOL_GPL(__gpio_get_value);
/**
* __gpio_set_value() - assign a gpio's value
@@ -1658,8 +1650,7 @@ void __gpio_set_value(unsigned gpio, int value)
trace_gpio_value(gpio, 0, value);
chip->set(chip, gpio - chip->base, value);
}
-//EXPORT_SYMBOL_GPL(__gpio_set_value);
-EXPORT_SYMBOL(__gpio_set_value);
+EXPORT_SYMBOL_GPL(__gpio_set_value);
/**
* __gpio_cansleep() - report whether gpio value access will sleep
@@ -907,6 +907,7 @@ if I2C_RK30
endif
config I2C4_RK30
bool "I2C4 Channel Support"
+ depends on !ARCH_RK2928
default y
help
This supports the use of the I2C4 channel on RK Soc.
@@ -1002,9 +1003,9 @@ if I2C_RK29
endif
endif
config I2C_DEV_RK29
- tristate "Rockchip I2C device interface support"
+ tristate "RK29 I2C device interface support"
default n
- depends on I2C_RK29 || I2C_RK30
+ depends on I2C_RK29
help
Nothing
endmenu
Oops, something went wrong.

0 comments on commit 0d083e1

Please sign in to comment.