12 Jan, 2012
1 commit
-
* git://git.infradead.org/battery-2.6: (68 commits)
power_supply: Mark da9052 driver as broken
power_supply: Drop usage of nowarn variant of sysfs_create_link()
s3c_adc_battery: Average over more than one adc sample
power_supply: Add DA9052 battery driver
isp1704_charger: Fix missing check
jz4740-battery: Fix signedness bug
power_supply: Assume mains power by default
sbs-battery: Fix devicetree match table
ARM: rx51: Add bq27200 i2c board info
sbs-battery: Change power supply name
devicetree-bindings: Propagate bq20z75->sbs rename to dt bindings
devicetree-bindings: Add vendor entry for Smart Battery Systems
sbs-battery: Rename internals to new name
bq20z75: Rename to sbs-battery
wm97xx_battery: Use DEFINE_MUTEX() for work_lock
max8997_charger: Remove duplicate module.h
lp8727_charger: Some minor fixes for the header
lp8727_charger: Add header file
power_supply: Convert drivers/power/* to use module_platform_driver()
power_supply: Add "unknown" in power supply type
...
06 Jan, 2012
1 commit
-
Acked-by: Tony Lindgren
Signed-off-by: Anton Vorontsov
04 Jan, 2012
1 commit
-
* imx/board: (4 commits)
Enable 32 bit flash support for iMX21ADS board
ARM: mx31pdk: Add MC13783 RTC support
iomux-mx25: configuration to support CSPI3 on CSI pins
MX1:apf9328: Add i2c supportUpdated to v3.2-rc6, conflicts:
arch/arm/kernel/setup.c
14 Dec, 2011
2 commits
-
Commit 10299e2e4e3ed3b16503d4e04edd48b33083f4e2 (ARM: RX-51:
Enable isp1704 power on/off) added power management for isp1704.However, the transceiver should be powered on by default,
otherwise USB doesn't work at all for networking during
boot.All kernels after v3.0 are affected.
Cc: stable@kernel.org
Signed-off-by: Felipe Contreras
Reviewed-by: Sebastian Reichel
[tony@atomide.com: updated comments]
Signed-off-by: Tony Lindgren -
Enable TSC2005 touchscreen driver on the RX-51 board by providing the
needed platform data.Signed-off-by: Aaro Koskinen
Reviewed-by: Sebastian Reichel
Signed-off-by: Tony Lindgren
18 Nov, 2011
1 commit
-
As suggested by Russell King - ARM Linux ,
there's no need to keep local prototypes in non-local headers.Add mach-omap1/common.h and mach-omap2/common.h and move the
local prototypes there from plat/common.h and mach/omap4-common.h.Signed-off-by: Tony Lindgren
Signed-off-by: Russell King
21 Sep, 2011
1 commit
-
The model_id is no longer needed within the platform_data
for the TPA driver since the model of TPA specified
with the device name (tpa6130a2/tpa6140a2).Also update rx51 (the only affected user) to use the device name rather
than platform data.Signed-off-by: Peter Ujfalusi
Tested-by: Jarkko Nikula
Acked-by: Liam Girdwood
Acked-by: Tony Lindgren
Signed-off-by: Mark Brown
30 Jul, 2011
1 commit
-
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (430 commits)
[media] ir-mce_kbd-decoder: include module.h for its facilities
[media] ov5642: include module.h for its facilities
[media] em28xx: Fix DVB-C maxsize for em2884
[media] tda18271c2dd: Fix saw filter configuration for DVB-C @6MHz
[media] v4l: mt9v032: Fix Bayer pattern
[media] V4L: mt9m111: rewrite set_pixfmt
[media] V4L: mt9m111: fix missing return value check mt9m111_reg_clear
[media] V4L: initial driver for ov5642 CMOS sensor
[media] V4L: sh_mobile_ceu_camera: fix Oops when USERPTR mapping fails
[media] V4L: soc-camera: remove soc-camera bus and devices on it
[media] V4L: soc-camera: un-export the soc-camera bus
[media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier
[media] V4L: add media bus configuration subdev operations
[media] V4L: soc-camera: group struct field initialisations together
[media] V4L: soc-camera: remove now unused soc-camera specific PM hooks
[media] V4L: pxa-camera: switch to using standard PM hooks
[media] NetUP Dual DVB-T/C CI RF: force card hardware revision by module param
[media] Don't OOPS if videobuf_dvb_get_frontend return NULL
[media] NetUP Dual DVB-T/C CI RF: load firmware according card revision
[media] omap3isp: Support configurable HS/VS polarities
...Fix up conflicts:
- arch/arm/mach-omap2/board-rx51-peripherals.c:
cleanup regulator supply definitions in mach-omap2
vs
OMAP3: RX-51: define vdds_csib regulator supply
- drivers/staging/tm6000/tm6000-alsa.c (trivial)
28 Jul, 2011
1 commit
-
The RX-51 uses the CSIb IO complex for camera operation. The
board file is missing definition for the regulator supplying
the CSIb complex, so this is added for better power
management.Signed-off-by: Kalle Jokiniemi
Acked-by: Laurent Pinchart
Acked-by: Sakari Ailus
Signed-off-by: Mauro Carvalho Chehab
27 Jul, 2011
1 commit
-
* 'next/devel2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (47 commits)
OMAP: Add debugfs node to show the summary of all clocks
OMAP2+: hwmod: Follow the recommended PRCM module enable sequence
OMAP2+: clock: allow per-SoC clock init code to prevent clockdomain calls from clock code
OMAP2+: clockdomain: Add per clkdm lock to prevent concurrent state programming
OMAP2+: PM: idle clkdms only if already in idle
OMAP2+: clockdomain: add clkdm_in_hwsup()
OMAP2+: clockdomain: Add 2 APIs to control clockdomain from hwmod framework
OMAP: clockdomain: Remove redundant call to pwrdm_wait_transition()
OMAP4: hwmod: Introduce the module control in hwmod control
OMAP4: cm: Add two new APIs for modulemode control
OMAP4: hwmod data: Add modulemode entry in omap_hwmod structure
OMAP4: hwmod data: Add PRM context register offset
OMAP4: prm: Remove deprecated functions
OMAP4: prm: Replace warm reset API with the offset based version
OMAP4: hwmod: Replace RSTCTRL absolute address with offset macros
OMAP: hwmod: Wait the idle status to be disabled
OMAP4: hwmod: Replace CLKCTRL absolute address with offset macros
OMAP2+: hwmod: Init clkdm field at boot time
OMAP4: hwmod data: Add clock domain attribute
OMAP4: clock data: Add missing divider selection for auxclks
...
21 Jul, 2011
1 commit
-
…it/kgene/linux-samsung into next/board
11 Jul, 2011
1 commit
-
Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-rx51-peripherals.c
05 Jul, 2011
2 commits
-
The vaux2 (VCSI) regulator is left on by the bootloader
in rx-51. Since there the product has shipped and there
won't be any bootloader updates to fix this issue, we
need to define all the regulators and declare full
constraints for the regulator FW. This will allow the
regulator FW to disable unused regulators.Also this helps in adding more fine grain regulator
support for rx-51 in the future.Thanks for Mark Brown for pointing out the correct
solution.Signed-off-by: Kalle Jokiniemi
Cc: Mark Brown
Signed-off-by: Tony Lindgren -
Platform support for lp5523 led chip
Signed-off-by: Ameya Palande
Signed-off-by: Mathias Nyman
Signed-off-by: Tony Lindgren
04 Jul, 2011
4 commits
-
Allign the platform data names for twl4030 audio submodule:
twl4030_audio_data: for the core MFD driver
twl4030_codec_data: for ASoC codec driver
twl4030_vibra_data: for the input/ForceFeedback driverTo avoid breakage, change all depending drivers, files
to use the new types.Signed-off-by: Peter Ujfalusi
Acked-by: Samuel Ortiz -
Some regulator config can be moved out from board files,
since they are close to identical.Signed-off-by: Peter Ujfalusi
Acked-by: Tony Lindgren -
Reduce the amount of duplicated code by moving the common
configuration for twl4030/5030/tpsxx to the twl-common file.
Use the omap3_pmic_get_config function from board files to
properly configure the PMIC with the common fields.Signed-off-by: Peter Ujfalusi
Acked-by: Tony Lindgren -
Pointers to statically declared platform device structures which are
registered with platform_device_register() are then used during run time
to access these structure members, for example from platform_uevent()
and much more. Therefore, these structures should never be placed inside
sections which are dropped after boot. Fix platform devices incorrectly
tagged with __initdata which happen to exist inside OMAP sub-trees.This bug has exhibited itself on my ARM/OMAP1 based Amstrad Delta
videophone after commit 6d3163ce86dd386b4f7bda80241d7fea2bc0bb1d, "mm:
check if any page in a pageblock is reserved before marking it
MIGRATE_RESERVE", resulting in reading from several
/sys/device/platform/*/uevent files always ending up with segmentation
faults.Signed-off-by: Janusz Krzysztofik
Acked-by: Felipe Balbi
Cc: Varadarajan, Charulatha
Cc: Jarkko Nikula
Signed-off-by: Tony Lindgren
14 Jun, 2011
1 commit
-
to use REGULATOR_SUPPLY arrays.
CC: Mark Brown
CC: Mike Rapoport
CC: Nishant Kamat
CC: Steve Sakoman
CC: Felipe Balbi
CC: Santosh Shilimkar
CC: peter.barada@logicpd.com
Signed-off-by: Oleg Drokin
Acked-by: Felipe Balbi
Signed-off-by: Tony Lindgren
01 Jun, 2011
2 commits
-
Speaker amplifier is accidentally powered up in early TWL gpio setup. This
causes a few mA of needless battery current consumption. Without this patch
the amplifier can be shutdown only by having one active audio playback and
shutdown cycle to speaker output.Thanks to Kalle Jokiniemi for noticing the issue.
Signed-off-by: Jarkko Nikula
Cc: Kalle Jokiniemi
Signed-off-by: Tony Lindgren -
The V28_A domain in Nokia N900 that supplies VDD voltages to TLV320AIC34 and
TPA6130A2 should not be shutdown. This is because otherwise there will be
leak from VIO to VDD in TLV320AIC34 and this leak consumes more battery
current that is saved from keeping V28_A off. With this patch the battery
current consumption is approximately 1.5 mA lower.Thanks to Kalle Jokiniemi for noticing the issue.
Signed-off-by: Jarkko Nikula
Cc: Kalle Jokiniemi
Signed-off-by: Tony Lindgren
28 May, 2011
1 commit
-
* git://git.infradead.org/battery-2.6:
PXA: Use dev_pm_ops in z2_battery
ds2760_battery: Fix rated capacity of the hx4700 1800mAh battery
ds2760_battery: Fix indexing of the 4 active full EEPROM registers
power: Make test_power driver more dynamic.
bq27x00_battery: Name of cycle count property
max8903_charger: Add GENERIC_HARDIRQS as a dependency (fixes S390 build)
ARM: RX-51: Enable isp1704 power on/off
isp1704_charger: Allow board specific powering routine
gpio-charger: Add gpio_charger_resume
power_supply: Add driver for MAX8903 charger
27 May, 2011
2 commits
-
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (57 commits)
regulator: Fix 88pm8607.c printk format warning
input: Add support for Qualcomm PMIC8XXX power key
input: Add Qualcomm pm8xxx keypad controller driver
mfd: Add omap-usbhs runtime PM support
mfd: Fix ASIC3 SD Host Controller Configuration size
mfd: Fix omap_usbhs_alloc_children error handling
mfd: Fix omap usbhs crash when rmmoding ehci or ohci
mfd: Add ASIC3 LED support
leds: Add ASIC3 LED support
mfd: Update twl4030-code maintainer e-mail address
mfd: Correct the name and bitmask for ab8500-gpadc BTempPullUp
mfd: Add manual ab8500-gpadc batt temp activation for AB8500 3.0
mfd: Provide ab8500-core enumerators for chip cuts
mfd: Check twl4030-power remove script error condition after i2cwrite
mfd: Fix twl6030 irq definitions
mfd: Add phoenix lite (twl6025) support to twl6030
mfd: Avoid to use constraint name in 88pm860x regulator driver
mfd: Remove checking on max8925 regulator[0]
mfd: Remove unused parameter from 88pm860x API
mfd: Avoid to allocate 88pm860x static platform data
... -
Modifying the macro name Main_Ref to all caps(MAIN_REF).
Suggested by Nishanth Menon
Signed-off-by: Lesly A M
Cc: Nishanth Menon
Cc: David Derrick
Signed-off-by: Samuel Ortiz
12 May, 2011
1 commit
-
use gpio_request_() instead of multiple gpiolib calls,
remove unneeded variables, etc.Signed-off-by: Igor Grinberg
Signed-off-by: Tony Lindgren
03 May, 2011
1 commit
-
Introduce omap_pmic_init that registers i2c bus and PMIC device on that
bus and add omap2/3/4 wrappers for common cases.Signed-off-by: Mike Rapoport
Signed-off-by: Tony Lindgren
20 Apr, 2011
1 commit
-
The isp1704 usb tranceiver is used for charging and can be
disabled when not in use. Provide the powering routine to
the driver via platform data.Also changed the indent of ".name" variable in rx51_charger_device
definition to use tabs same way as the new ".dev" variable indent.
Put this in the same patch since the indent fix is only needed
when there are multiple members in the struct definition.Loosely based on earlier patches from Heikki Krogerus in
Nokia N900 maemo kernel.Signed-off-by: Kalle Jokiniemi
Acked-By: Heikki Krogerus
Acked-by: Tony Lindgren
Signed-off-by: Anton Vorontsov
11 Mar, 2011
1 commit
-
Hwmod adaptation design requires each of the DSS HW IP to be a platform driver.
So a platform_driver for VENC is created and init exit methods are moved from core.c
to its driver probe,remove. pdev member has to be maintained by its own drivers.Also, venc_vdda_dac reading is moved to venc.c.
VENC platform driver is registered from inside omap_dss_probe, in the order desired.
Signed-off-by: Senthilvadivu Guruswamy
Signed-off-by: Sumit Semwal
Signed-off-by: Tomi Valkeinen
03 Mar, 2011
2 commits
-
…mmc' into omap-for-linus
Conflicts:
arch/arm/mach-omap2/omap_hwmod_44xx_data.c -
Add support for vibra
Signed-off-by: Ilkka Koskinen
Signed-off-by: Tony Lindgren
02 Mar, 2011
1 commit
-
Modifying the device & driver name from "mmci-omap-hs" to
"omap_hsmmc".Signed-off-by: Kishore Kadiyala
Acked-by: Benoit Cousson
Signed-off-by: Tony Lindgren
26 Feb, 2011
1 commit
-
Add SI4713 FM transmitter supplies, platform data and setup to RX-51/N900.
It is connected to line output signals of TLV320AIC34 codec A part.
Driver can be either built-in or a module. It can be tuned with v4l2-ctl
from ivtv-utils. Following examples illustrate the use of it:v4l2-ctl -d /dev/radio0 --set-ctrl=mute=0 (power up)
v4l2-ctl -d /dev/radio0 -f 107900 (tune 107.9 MHz)v4l2-ctl -d /dev/radio0 --set-ctrl=mute=1 (power down)
Signed-off-by: Jarkko Nikula
Signed-off-by: Tony Lindgren
23 Dec, 2010
2 commits
-
Commmit 60d24ee "Added video data to support tvout on rx51" broke the DSS
on RX51/N900 since it added DSS VENC support but a patch adding needed
supply is missing from tree and no framebuffers are initialized.This patch is basically cleaned up version of original one:
http://marc.info/?l=linux-omap&m=129070041402418&w=2Signed-off-by: Jarkko Nikula
Cc: Srikar
Cc: Mark Brown
Acked-by: Tomi Valkeinen
Signed-off-by: Tony Lindgren -
It is much more cleaner to use REGULATOR_SUPPLY macro and a device name
instead of having a reference to rx51_display_device.dev with #if defined()
guards.Signed-off-by: Jarkko Nikula
Acked-by: Tomi Valkeinen
Signed-off-by: Tony Lindgren
21 Dec, 2010
3 commits
-
If the TPA6130 is compiled as module the id and power_gpio values are
arbitrary at module probing time since the rx51_tpa6130a2_data was marked as
__initdata. Fix this by using __initdata_or_module. Then __initdata is
defined only if the kernel is built without CONFIG_MODULES and omitted
otherwise.Signed-off-by: Jarkko Nikula
Signed-off-by: Tony Lindgren -
Upcoming ASoC core and tlv320aic3x changes makes possible to take b part of
TLV320AIC34 into use on RX51/N900. Prepare to this by adding virtual supplies
and platform data for b part of the codec.Signed-off-by: Jarkko Nikula
Signed-off-by: Tony Lindgren -
Remove second tlv320aic3x.h inclusion that came along the commit f0fba2a
"ASoC: multi-component - ASoC Multi-Component Support".Signed-off-by: Jarkko Nikula
Cc: Liam Girdwood
Signed-off-by: Tony Lindgren
03 Dec, 2010
1 commit
-
When OneNAND support is disabled, the platform code defines NULL
board_onenand_data and empty init function for us. By utilizing this we
can avoid cluttering board files with dummy definitions/wrappers.Signed-off-by: Aaro Koskinen
Signed-off-by: Tony Lindgren
17 Nov, 2010
1 commit
-
Starting on OMAP4, the pin mux configuration is located in two
different partitions of the control module (CODE_PAD and WKUP_PAD).
The first one is inside the core power domain whereas the second
one is inside the wakeup.
- Add the capability to add any number of partition during board init
time depending of Soc partitioning.
- Add some init flags as well in order to avoid explicit Soc version
check inside the mux core code.
- Add a comment with mux0 mode on top of omap_mux/board/
if the current mux mode is not the default one.Thanks to Tony Lindgren for the following improvements:
- Add omap_mux_get for getting the partition data so platform level
device code can use it.
- Fix the rx51 board code to use the new API.
- Do not store the partition for each mux entry. Look up the partition
for debugfs instead.Thanks to Dan Murphy for testing on OMAP4 and reporting
a couple of bugs.
Thanks to Anand Gadiyar for testing on OMAP3 zoom and
bug report.Signed-off-by: Benoit Cousson
Signed-off-by: Tony Lindgren
Tested-by: Murphy Dan
Cc: Paul Walmsley
Cc: Kevin Hilman
Cc: Santosh Shilimkar
Cc: Anand Gadiyar
27 Oct, 2010
1 commit
-
* git://git.infradead.org/battery-2.6:
power_supply: Makefile cleanup
bq27x00_battery: Add missing kfree(di->bus) in bq27x00_battery_remove()
power_supply: Introduce maximum current property
power_supply: Add types for USB chargers
ds2782_battery: Fix units
power_supply: Add driver for TWL4030/TPS65950 BCI charger
bq20z75: Add support for more power supply properties
wm831x_power: Add missing kfree(wm831x_power) in wm831x_power_remove()
jz4740-battery: Add missing kfree(jz_battery) in jz_battery_remove()
ds2760_battery: Add missing kfree(di) in ds2760_battery_remove()
olpc_battery: Fix endian neutral breakage for s16 values
ds2760_battery: Fix W1 and W1_SLAVE_DS2760 dependency
pcf50633-charger: Add missing sysfs_remove_group()
power_supply: Add driver for TI BQ20Z75 gas gauge IC
wm831x_power: Remove duplicate chg mask
omap: rx51: Add support for USB chargers
power_supply: Add isp1704 charger detection driver