Commit Graph

535 Commits

Author SHA1 Message Date
张晴
0f91725504 rk3168:act8846:support act8846 pmic reset 2013-01-16 11:21:21 +08:00
张晴
49c796842f rk30:modify pwm clk when in sleep,set clk 660k 2013-01-05 15:14:31 +08:00
黄涛
4c69fdc441 rk30-pwm-regulator: use new pwm API 2013-01-04 18:29:20 +08:00
张晴
5410736e6a rk3168:act8846:support pmic shut down and early suspend 2012-12-27 10:52:41 +08:00
张晴
9749caf03e rk:modify some warnings for pmu 2012-12-26 18:20:38 +08:00
张晴
a8f3e82f3d rk3168:act8846:modify some error 2012-12-25 16:40:10 +08:00
张晴
1aa5034fb1 rk3168:modify defult voltage,modify some warnings 2012-12-20 16:47:10 +08:00
张晴
4d73bba4b4 rk:support act8846 pmic 2012-12-07 11:12:44 +08:00
张晴
02c4f432f2 rk2926:m713:support reset to restart 2012-10-20 16:41:42 +08:00
张晴
8748412f00 rk3066b:support logic voltage can be adjusted to 0.95v 2012-10-19 19:12:35 +08:00
xieyi
ba3e1d5c4e rk2928: act8931: switch charge current when suspend 2012-10-09 18:41:53 +08:00
xieyi
47a75d75d9 rk2928: act8931: support dc_det & charge_ok function 2012-09-27 17:42:39 +08:00
黄涛
4e058c3971 regulator: act8931: fix gcc warning 2012-09-24 11:32:43 +08:00
张晴
623036385b rk2928:a720:cancel the voltage limit of act8931 2012-09-21 19:03:39 +08:00
张晴
5898a6421c rk2928:a720:modify lcdc standby, compat act8931 and tps65910 shutdown device 2012-09-19 15:22:06 +08:00
张晴
707acf2b87 rk2928:m720:compat pmic act8931 and tps65910 2012-09-17 11:52:39 +08:00
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
张晴
78fb57831e rk2928:support pmic act8931 2012-09-05 15:11:18 +08:00
黄涛
c100afb748 rk30-pwm-regulator: revert a14e8087e9 wrong commit 2012-08-29 20:38:29 +08:00
zq
a791bfb086 rk30 and rk2928:support set logic init voltage by pwm 2012-08-27 21:36:17 -07:00
hxy
a14e8087e9 RK3066B:update board iomux config and add two pmu (wm8326 & tps65910) support 2012-08-24 16:31:59 +08:00
黄涛
4d93acfd39 rk3066b: rename rk31 to rk3066b 2012-08-22 21:21:56 +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
黄涛
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
张晴
e592356dbb rk2928:sdk:support pwm set voltage 2012-08-15 17:20:59 +08:00
张晴
afaf51341f rk30:Compatib with wm8326tps65910 and discrete dcdc 2012-08-14 16:11:16 +08:00
张晴
426997197d rk2928:support pmic tps65910 2012-08-09 18:07:51 +08:00
lw
5df44a542d phonepad:add suspend and resume voltage setting function 2012-08-09 16:27:14 +08:00
lw@rock-chips.com
8fa1cf2ff7 phonepad:modify rk30 pwm regulator suspend 2012-08-02 17:28:09 +08:00
lw
8f002da463 phonepad:modify pwm regulator struct definition 2012-07-31 19:09:21 +08:00
lw@rock-chips.com
dadb0ed4e9 phonepad:modify pwm regulator and change tps65910 starting time 2012-07-31 18:48:29 +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
张晴
5419bd8a51 rk30:sdk:modify regulator_set_voltage process 2012-07-30 14:27:28 +08:00
张晴
cd9e20a9fb rk30:sdk:regulator get voltage form pmic registers when set voltage failed 2012-07-28 16:18:32 +08:00
lw
d8f52a4b98 phonepad:add PMIC TPS65910 support 2012-07-26 21:45:55 +08:00
黄涛
a2ad9f9801 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb
Conflicts:
	drivers/net/usb/asix.c
	drivers/net/wireless/iwlwifi/iwl-agn-rs.c
	drivers/usb/serial/option.c
2012-07-12 18:46:41 +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
Axel Lin
efa80b562a regulator: Fix the logic to ensure new voltage setting in valid range
commit f55205f4d4 upstream.

I think this is a typo.
To ensure new voltage setting won't greater than desc->max,
the equation should be desc->min + desc->step * new_val <= desc->max.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-05-21 09:39:58 -07:00
张晴
0692923d2a rk30:phone:add sleep,battery charger,powerbutton ,gpadc and poweroff for TI pmu 80032 2012-05-09 15:01:06 +08:00
张晴
50276f7c94 rk30:phone:add pmu tps80032 2012-05-02 16:39:17 +08:00
lw@rock-chips.com
0b5f75565e rk30_phone:add suspend and resume for discrete regulator 2012-04-25 10:40:51 +08:00
lw@rock-chips.com
3efedf2972 rk30_phone:modify discrete dcdc parameter according to hardware 2012-04-20 18:15:13 +08:00
lw@rock-chips.com
9c719b5a39 rk30_phone:add cpu_dvfs_table control,need modify hardware 2012-04-19 19:47:27 +08:00
lw@rock-chips.com
5e084dfd58 rk30_phone:set VDD_ARM and VDD_LOG of discrete dcdc 2012-04-19 18:05:48 +08:00
lw@rock-chips.com
322bef5abe rk30_phone:add discrete dcdc driver support 2012-04-17 11:08:47 +08:00
张晴
16df70d2a5 rk30:sdk:modify i2c communication of wm8326 and modify init name and voltage 2012-03-26 16:28:07 +08:00
Axel Lin
9225c50983 regulator: Fix setting selector in tps6524x set_voltage function
commit f03570cf17 upstream.

Don't assign the voltage to selector.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-03-19 08:57:58 -07:00