github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-10 07:32:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
268,585 Commits 1 Branch 934 Tags 20 GiB
aec101d68e
Commit Graph

1033 Commits

Author SHA1 Message Date
xxx
9bb82849cd Revert "correct bugs for 'cpu hclk and pclk is 1:1'" 
This reverts commit db009dd476.
 2012-09-05 19:24:24 -07:00
xxx
db009dd476 correct bugs for 'cpu hclk and pclk is 1:1' 2012-09-05 19:18:35 -07:00
hxy
afdaaa54c2 rk3066b: update rk610 core 2012-09-05 18:16:08 +08:00
hxy
7d31697362 rk3066b: add M701 machine config 2012-09-05 17:04:13 +08:00
黄涛
b2be450f10 Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb 
Conflicts:
	include/net/cfg80211.h
 2012-08-21 14:14:24 +08:00
黄涛
109b0ba094 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb 
Conflicts:
	Makefile
	drivers/net/tun.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/usb/core/hub.c
	sound/soc/codecs/wm8994.c
 2012-08-21 13:11:48 +08:00
黄涛
d7fb2169b6 Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0 
Conflicts:
	arch/arm/mach-rk30/include/mach/rk30_camera.h
	arch/arm/plat-rk/include/plat/rk_camera.h
	drivers/gpio/gpio-tps65910.c
	drivers/media/video/rk30_camera_oneframe.c
	drivers/mmc/host/rk29_sdmmc.c
	drivers/net/wireless/Kconfig
	drivers/net/wireless/Makefile
	drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c
	drivers/regulator/rk30-pwm-regulator.c
	drivers/usb/dwc_otg/dwc_otg_driver.c
	drivers/usb/dwc_otg/dwc_otg_hcd.c
	drivers/usb/dwc_otg/dwc_otg_pcd.c
	sound/soc/codecs/Makefile
	sound/soc/rk29/Kconfig
 2012-08-17 21:48:20 +08:00
张晴
3fd8816a56 rk30:sdk:support wm8326 early suspend and modify dcdc or ldo mode when in early suspend 2012-08-17 14:30:45 +08:00
Arnd Bergmann
9f75ebd871 ARM: pxa: remove irq_to_gpio from ezx-pcap driver 
commit 59ee93a528 upstream.

The irq_to_gpio function was removed from the pxa platform
in linux-3.2, and this driver has been broken since.

There is actually no in-tree user of this driver that adds
this platform device, but the driver can and does get enabled
on some platforms.

Without this patch, building ezx_defconfig results in:

drivers/mfd/ezx-pcap.c: In function 'pcap_isr_work':
drivers/mfd/ezx-pcap.c:205:2: error: implicit declaration of function 'irq_to_gpio' [-Werror=implicit-function-declaration]

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Daniel Ribeiro <drwyrm@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-08-15 12:04:30 -07:00
Theodore Ts'o
b6b847a93b random: remove rand_initialize_irq() 
commit c5857ccf29 upstream.

With the new interrupt sampling system, we are no longer using the
timer_rand_state structure in the irq descriptor, so we can stop
initializing it now.

[ Merged in fixes from Sedat to find some last missing references to
  rand_initialize_irq() ]

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-08-15 12:04:28 -07:00
Mark Brown
f99ef862a7 mfd: wm831x: Feed the device UUID into device_add_randomness() 
commit 27130f0cc3 upstream.

wm831x devices contain a unique ID value. Feed this into the newly added
device_add_randomness() to add some per device seed data to the pool.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-08-15 12:04:28 -07:00
Theodore Ts'o
aa88dea227 random: make 'add_interrupt_randomness()' do something sane 
commit 775f4b297b upstream.

We've been moving away from add_interrupt_randomness() for various
reasons: it's too expensive to do on every interrupt, and flooding the
CPU with interrupts could theoretically cause bogus floods of entropy
from a somewhat externally controllable source.

This solves both problems by limiting the actual randomness addition
to just once a second or after 64 interrupts, whicever comes first.
During that time, the interrupt cycle data is buffered up in a per-cpu
pool.  Also, we make sure the the nonblocking pool used by urandom is
initialized before we start feeding the normal input pool.  This
assures that /dev/urandom is returning unpredictable data as soon as
possible.

(Based on an original patch by Linus, but significantly modified by
tytso.)

Tested-by: Eric Wustrow <ewust@umich.edu>
Reported-by: Eric Wustrow <ewust@umich.edu>
Reported-by: Nadia Heninger <nadiah@cs.ucsd.edu>
Reported-by: Zakir Durumeric <zakir@umich.edu>
Reported-by: J. Alex Halderman <jhalderm@umich.edu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-08-15 12:04:12 -07:00
张晴
13da9d54f5 rk2928:fix alarm lose intterupt problem 2012-08-11 16:40:07 +08:00
lw@rock-chips.com
3e43263500 phonepad:fix alarm lose intterupt problem 2012-08-11 11:37:55 +08:00
张晴
6eb300d28f rk30☎️Solve the power button interrupt failure 2012-08-11 10:05:07 +08:00
张晴
426997197d rk2928:support pmic tps65910 2012-08-09 18:07:51 +08:00
lw@rock-chips.com
ad51d8c8bb phonepad:modify tps65910_pre_init to fix rtc bug 2012-08-05 13:03:32 +08:00
lw
59bbb75276 phonepad:modify tps65910 gpio base 2012-08-03 16:57:12 +08:00
黄涛
9c3702facd Revert "rk30:sdk:Support both of compatible pmic wm8326 and tps65910" 
This reverts commit f99e7676f5.
 2012-08-01 11:14:03 +08:00
张晴
f99e7676f5 rk30:sdk:Support both of compatible pmic wm8326 and tps65910 2012-08-01 11:00:31 +08:00
lw@rock-chips.com
dadb0ed4e9 phonepad:modify pwm regulator and change tps65910 starting time 2012-07-31 18:48:29 +08:00
黄涛
91f521d23d Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb 2012-07-31 14:16:32 +08:00
lw@rock-chips.com
ad7749d9ac phonepad:modify board-rk30-sdk-tps65910.c code 2012-07-31 11:04:52 +08:00
黄涛
71ee502281 Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb 2012-07-31 10:15:18 +08:00
lw
1c375d919e phonepad:improve rtc-tps65910 code 2012-07-30 14:59:31 +08:00
lw@rock-chips.com
722b83e94d phonepad:modify arm voltage to 1.2V 2012-07-27 19:29:45 +08:00
lw
d8f52a4b98 phonepad:add PMIC TPS65910 support 2012-07-26 21:45:55 +08:00
黄涛
de1f128348 Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb 2012-07-19 11:14:29 +08:00
张晴
9ed652e11c rk30☎️Close tps80032 vlow interrupt, only open it when in sleep mode 2012-07-18 16:56:51 +08:00
黄涛
30be6d7972 Merge remote-tracking branch 'common/android-3.0' into develop-3.0-jb 
Conflicts:
	drivers/cpufreq/cpufreq_interactive.c
	drivers/misc/pmem.c
	drivers/net/usb/asix.c
	drivers/net/wireless/ath/ath9k/ani.c
	drivers/net/wireless/ath/ath9k/ar5008_phy.c
	drivers/net/wireless/ath/ath9k/ar9002_hw.c
	drivers/net/wireless/ath/ath9k/ar9003_calib.c
	drivers/net/wireless/ath/ath9k/ar9003_mac.c
	drivers/net/wireless/ath/ath9k/ar9003_phy.h
	drivers/net/wireless/ath/ath9k/calib.c
	drivers/net/wireless/ath/ath9k/hif_usb.c
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/hw.h
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/ath9k/rc.c
	drivers/net/wireless/ath/ath9k/recv.c
	drivers/net/wireless/b43/main.c
	drivers/net/wireless/bcm4319/aiutils.c
	drivers/net/wireless/bcm4319/bcmsdh.c
	drivers/net/wireless/bcm4319/bcmsdh_linux.c
	drivers/net/wireless/bcm4319/bcmsdh_sdmmc.c
	drivers/net/wireless/bcm4319/bcmsdh_sdmmc_linux.c
	drivers/net/wireless/bcm4319/bcmutils.c
	drivers/net/wireless/bcm4319/dhd_common.c
	drivers/net/wireless/bcm4319/dhd_proto.h
	drivers/net/wireless/bcm4319/dhd_sdio.c
	drivers/net/wireless/bcm4319/hndpmu.c
	drivers/net/wireless/bcm4319/include/aidmp.h
	drivers/net/wireless/bcm4319/include/bcmcdc.h
	drivers/net/wireless/bcm4319/include/bcmdefs.h
	drivers/net/wireless/bcm4319/include/bcmdevs.h
	drivers/net/wireless/bcm4319/include/bcmendian.h
	drivers/net/wireless/bcm4319/include/bcmpcispi.h
	drivers/net/wireless/bcm4319/include/bcmperf.h
	drivers/net/wireless/bcm4319/include/bcmsdbus.h
	drivers/net/wireless/bcm4319/include/bcmsdh.h
	drivers/net/wireless/bcm4319/include/bcmsdh_sdmmc.h
	drivers/net/wireless/bcm4319/include/bcmsdpcm.h
	drivers/net/wireless/bcm4319/include/bcmsdspi.h
	drivers/net/wireless/bcm4319/include/bcmsdstd.h
	drivers/net/wireless/bcm4319/include/bcmspi.h
	drivers/net/wireless/bcm4319/include/bcmutils.h
	drivers/net/wireless/bcm4319/include/bcmwifi.h
	drivers/net/wireless/bcm4319/include/dhdioctl.h
	drivers/net/wireless/bcm4319/include/epivers.h
	drivers/net/wireless/bcm4319/include/hndpmu.h
	drivers/net/wireless/bcm4319/include/hndrte_armtrap.h
	drivers/net/wireless/bcm4319/include/hndrte_cons.h
	drivers/net/wireless/bcm4319/include/hndsoc.h
	drivers/net/wireless/bcm4319/include/linux_osl.h
	drivers/net/wireless/bcm4319/include/linuxver.h
	drivers/net/wireless/bcm4319/include/miniopt.h
	drivers/net/wireless/bcm4319/include/msgtrace.h
	drivers/net/wireless/bcm4319/include/osl.h
	drivers/net/wireless/bcm4319/include/packed_section_end.h
	drivers/net/wireless/bcm4319/include/packed_section_start.h
	drivers/net/wireless/bcm4319/include/pcicfg.h
	drivers/net/wireless/bcm4319/include/proto/802.11e.h
	drivers/net/wireless/bcm4319/include/proto/802.1d.h
	drivers/net/wireless/bcm4319/include/proto/bcmeth.h
	drivers/net/wireless/bcm4319/include/proto/bcmevent.h
	drivers/net/wireless/bcm4319/include/proto/bcmip.h
	drivers/net/wireless/bcm4319/include/proto/eapol.h
	drivers/net/wireless/bcm4319/include/proto/ethernet.h
	drivers/net/wireless/bcm4319/include/proto/sdspi.h
	drivers/net/wireless/bcm4319/include/proto/vlan.h
	drivers/net/wireless/bcm4319/include/proto/wpa.h
	drivers/net/wireless/bcm4319/include/sbchipc.h
	drivers/net/wireless/bcm4319/include/sbconfig.h
	drivers/net/wireless/bcm4319/include/sbhnddma.h
	drivers/net/wireless/bcm4319/include/sbpcmcia.h
	drivers/net/wireless/bcm4319/include/sbsdio.h
	drivers/net/wireless/bcm4319/include/sbsdpcmdev.h
	drivers/net/wireless/bcm4319/include/sbsocram.h
	drivers/net/wireless/bcm4319/include/sdio.h
	drivers/net/wireless/bcm4319/include/sdioh.h
	drivers/net/wireless/bcm4319/include/sdiovar.h
	drivers/net/wireless/bcm4319/include/siutils.h
	drivers/net/wireless/bcm4319/include/trxhdr.h
	drivers/net/wireless/bcm4319/include/typedefs.h
	drivers/net/wireless/bcm4319/siutils.c
	drivers/net/wireless/bcm4319/wl_iw.c
	drivers/net/wireless/bcm4319/wl_iw.h
	drivers/net/wireless/bcmdhd/Kconfig
	drivers/net/wireless/bcmdhd/Makefile
	drivers/net/wireless/bcmdhd/bcmevent.c
	drivers/net/wireless/bcmdhd/dhd.h
	drivers/net/wireless/bcmdhd/dhd_cdc.c
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/dhd_wlfc.h
	drivers/net/wireless/bcmdhd/include/Makefile
	drivers/net/wireless/bcmdhd/include/htsf.h
	drivers/net/wireless/bcmdhd/include/proto/802.11.h
	drivers/net/wireless/bcmdhd/include/proto/802.11_bta.h
	drivers/net/wireless/bcmdhd/include/proto/bt_amp_hci.h
	drivers/net/wireless/bcmdhd/include/proto/p2p.h
	drivers/net/wireless/bcmdhd/include/wlfc_proto.h
	drivers/net/wireless/bcmdhd/include/wlioctl.h
	drivers/net/wireless/bcmdhd/linux_osl.c
	drivers/net/wireless/bcmdhd/wl_android.c
	drivers/net/wireless/bcmdhd/wl_android.h
	drivers/net/wireless/bcmdhd/wl_cfg80211.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.h
	drivers/net/wireless/bcmdhd/wl_cfgp2p.c
	drivers/net/wireless/bcmdhd/wl_cfgp2p.h
	drivers/net/wireless/bcmdhd/wl_linux_mon.c
	drivers/net/wireless/bcmdhd/wldev_common.c
	drivers/net/wireless/bcmdhd/wldev_common.h
	drivers/net/wireless/ipw2x00/ipw2200.c
	drivers/net/wireless/iwlwifi/iwl-agn-lib.c
	drivers/net/wireless/iwlwifi/iwl-agn-tx.c
	drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-agn.h
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-hcmd.c
	drivers/net/wireless/iwlwifi/iwl-rx.c
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/libertas/if_spi.c
	drivers/net/wireless/p54/p54spi.c
	drivers/net/wireless/rt2x00/rt2800lib.c
	drivers/net/wireless/rt2x00/rt2800pci.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt2x00.h
	drivers/net/wireless/rt2x00/rt2x00dev.c
	drivers/net/wireless/rt2x00/rt2x00mac.c
	drivers/net/wireless/rt2x00/rt2x00queue.c
	drivers/usb/serial/option.c
 2012-07-12 18:08:01 +08:00
张晴
30d38160f8 rk30☎️support pmic tps80032 vbat low detection,support pmic tps80032 early suspend 2012-07-09 09:49:32 +08:00
张晴
ba1b4e1833 rk30:sdk:Single battery of low-power detection by wm8326 2012-06-21 10:58:35 +08:00
张晴
49a70b05ed rk30:phone loquat:Modify ADC calibration algorithm 2012-06-11 12:49:38 +08:00
张晴
22e9b8cfde rk30:phone loquat:modify the battery capacity reported 2012-06-03 11:28:35 +08:00
张晴
f8869d536a rk30:phone loquat:reduce arm and logic voltage when pmu enter sleep,set spi gpio pullup and down disable when in sleep 2012-05-28 22:19:05 +08:00
张晴
a2cf542e12 rk30:sdk:Solve the RTC alarm automatic startup 2012-05-28 20:22:36 +08:00
张晴
5541fd205e rk30:phone loquat:supply the PMU usb charge 2012-05-22 20:47:57 +08:00
张晴
08fbf78002 rk30:phone loquat:Solve the first reported shutdown failure 2012-05-11 13:05:50 +08:00
张晴
0692923d2a rk30☎️add sleep,battery charger,powerbutton ,gpadc and poweroff for TI pmu 80032 2012-05-09 15:01:06 +08:00
张晴
7fdb181c23 rk30☎️modify the config file and add battery function 2012-05-07 16:17:52 +08:00
宋秀杰
e2d078b5a6 rk30 phone: add codec reset function, modify rk30_i2s.c, do not use SDO1 to SDO3 as i2s mode 2012-05-07 12:43:50 +08:00
张晴
04c1047f22 rk30:phone loquat:add the function of the PMU and opened by default 2012-05-06 19:19:28 +08:00
张晴
035e3ba750 rk30:sdk:Support wm8326 adc for low battery detection 2012-05-03 13:50:32 +08:00
宋秀杰
e691eb848c rk30 phone: add TI aic3262 codec driver 2012-05-02 18:21:14 +08:00
张晴
50276f7c94 rk30☎️add pmu tps80032 2012-05-02 16:39:17 +08:00
张晴
f452ca767c rk30:sdk:close wm8326 i2c shutdown 2012-04-19 19:07:20 +08:00
yzq
729262c1c6 rk610 update hdmi lcd lvds 2012-04-18 19:12:08 -07:00
张晴
26aad1ff66 rk30:sdk:mask interrupt of the wm8326 which is not used 2012-04-18 17:41:24 +08:00
张晴
99fc87322e rk30:sdk:Reduce the delay of the 8326 reset,modify the wakeup order of wm8326 i2c 2012-04-18 15:51:15 +08:00
Nishanth Menon
40788de827 mfd: Clear twl6030 IRQ status register only once 
commit 3f8349e6e9 upstream.

TWL6030 family of PMIC use a shadow interrupt status register
while kernel processes the current interrupt event.
However, any write(0 or 1) to register INT_STS_A, INT_STS_B or
INT_STS_C clears all 3 interrupt status registers.

Since clear of the interrupt is done on 32k clk, depending on I2C
bus speed, we could in-adverently clear the status of a interrupt
status pending on shadow register in the current implementation.
This is due to the fact that multi-byte i2c write operation into
three seperate status register could result in multiple load
and clear of status and result in lost interrupts.

Instead, doing a single byte write to INT_STS_A register with 0x0
will clear all three interrupt status registers without the related
risk.

Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2012-04-13 08:14:08 -07:00