summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-10-19video: mcde: Remove hardware specifics variablesJimmy Rubin
Num_channels, num_overlays and num_dsilinks is not used anymore. ST-Ericsson ID: 362765 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I00340680e9748f6661da148cd7fa3b48d1bb37fe Signed-off-by: Jimmy Rubin <jimmy.rubin@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33968 Reviewed-by: QATOOLS Reviewed-by: Per PERSSON <per.xb.persson@stericsson.com> Reviewed-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com>
2011-10-19ux500: mcde: Remove mcde hardware specificsJimmy Rubin
Removes num_channels, num_dsilinks and num_overlays from mcde platform data in devices-db5500.c and devices-db8500.c ST-Ericsson ID: 362765 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Jimmy Rubin <jimmy.rubin@stericsson.com> Change-Id: Ie345c910660dd2c657e02a3a3e281fd09af0e9bc Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33324 Reviewed-by: QATOOLS Reviewed-by: Per PERSSON <per.xb.persson@stericsson.com> Reviewed-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com>
2011-10-19video: mcde: Remove hardware version handlingJimmy Rubin
Hardware version is not needed anymore, since the probe handles all specific properties that are hardware version dependant. ST-Ericsson ID: 362765 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Jimmy Rubin <jimmy.rubin@stericsson.com> Change-Id: I198c6af00ca1dbe39b269a4f8e17992b773a4fd5 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33323 Reviewed-by: Per PERSSON <per.xb.persson@stericsson.com> Reviewed-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com>
2011-10-19video: mcde: Remove MCDE_1_0_4 version supportJimmy Rubin
This MCDE version is used in db5500 v1 ST-Ericsson ID: 362765 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Jimmy Rubin <jimmy.rubin@stericsson.com> Change-Id: Ib5a4ca054661f06bd3541021b1404f2c000010bc Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33322 Tested-by: Jimmy RUBIN <jimmy.rubin@stericsson.com> Reviewed-by: QATOOLS Reviewed-by: Per PERSSON <per.xb.persson@stericsson.com> Reviewed-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com>
2011-10-19video: mcde: Remove MCDE 3_0_5 version supportJimmy Rubin
This MCDE version is used in db8500 v1. ST-Ericsson ID: 362765 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ie5039e8d2bb838c900f6b14c18cce097f57a393d Signed-off-by: Jimmy Rubin <jimmy.rubin@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33321 Reviewed-by: QATOOLS Reviewed-by: Per PERSSON <per.xb.persson@stericsson.com> Reviewed-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com>
2011-10-19power: ab8500_bm: Increase the VBat thresholdKalle Komierowski
This is to eliminate the risk of charging with a too high current via USB. ST-Ericsson ID: 338533 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: N/A Change-Id: I8ae942c8eb1497812fbb86aa41662562a6a3ec73 Signed-off-by: Kalle Komierowski <karl.komierowski@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34263 Reviewed-by: QATOOLS Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-19arm: ux500: Removing U8400 legacyDaniel Willerud
Removing U8400 legacy from PRCMU and cpufreq drivers ST-Ericsson ID: 364381 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Depends-On: Idcc4acd8ed9a319a52cfaa6c603e346cae965148 Depends-On: Id4f13fece9ad0769ae77366e62e3bad86d718b3a Change-Id: I694b5c08df05f3f09b188730141d0487b404bd45 Signed-off-by: Daniel Willerud <daniel.willerud@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33910 Reviewed-by: Mattias NILSSON <mattias.i.nilsson@stericsson.com> Reviewed-by: QATOOLS Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-19Ux500 ASoC: Add new generic ALSA Control typesKristoffer KARLSSON
Added the definition and implementation for: * Signed multi register controls (1,2,4 and 8) * Signed array cache control * Strobe bit control Both multi register- and array control types have full support for signed longs (64bit) ST-Ericsson Linux next: NA ST-Ericsson ID: 325656 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I3041fe115bc349bfddc3870c160e9087f21f6197 Change-Id: I955b7248b1f81fbbd331cf41edc696c865d61758 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32987 Reviewed-by: Kristoffer KARLSSON <kristoffer.karlsson@stericsson.com> Tested-by: Kristoffer KARLSSON <kristoffer.karlsson@stericsson.com> Reviewed-by: QABUILD Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
2011-10-19serial/amba-pl011: prevent console port from holding regulatorRabin Vincent
Register the console in a console_initcall() to ensure that pl011_console_setup() gets called early and thus the uart_console() macro usage in pl011_power_startup() returns the correct value the first time it is called, so that the vAPE regulator is not taken for the console port. Note that this problem is seen only when the console port is line 0, since even without this patch pl011_console_setup() gets called (and thus the correct console->index is set) after the first port is added. ST-Ericsson ID: 368522 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I7f4ab80e8d8be014bfdbe695ea45007212c9c4ea Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34411 Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com> Reviewed-by: Shreshtha Kumar SAHU <shreshthakumar.sahu@stericsson.com>
2011-10-19Android : Ux500 : USB :Resetting the endpointsSakethram Bommisetti
USB endpoints are not being reset at the time of disabling the functions. Due to this, the endpoint data is not freed. So, during re-assignment of EP's for a new USB configuration, some of EP's are skipped. ST-Ericsson ID: 368396 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I6e5edaa88152ebc767534b1f8fd8f9cc99f18fff Signed-off-by: Sakethram Bommisetti <sakethram.bommisetti@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34357 Reviewed-by: Praveena NADAHALLY <praveen.nadahally@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-10-19drivers/leds/leds-lp5521.c: check if reset is successfulsrinidhi kasagar
make sure that the reset is successful by issuing a dummy read to R channel current register and check its default value. On some platforms, without this dummy read, any further access to {R/G/B}_EXEC will not have any impact. ST-Ericsson ID: 361235 ST-Ericsson Linux next: in -mm tree ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com> Tested-by: Naga Radhesh <naga.radheshy@stericsson.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Change-Id:I964a2602d5e9ccb7cef944fb40dc1b9c57b4f62a Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32930 Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com> Tested-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-10-19regulators: ab5500: support get optimum modeRabin Vincent
ST-Ericsson ID: 366715 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I8c0bda623d849886860d835f744f5fd9c314b5e5 Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34316 Reviewed-by: QATOOLS
2011-10-19u5500: Battery temp monitoring in manual modeRajagopala V
Add support and enable manual mode battery temperature monitoring. As gpadc bdata auto trigger is not working as expected, switch to manual mode. ST-Ericsson Linux next: NA ST-Ericsson ID: 367324 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I0f4b619bb5527730ee779838507b09f6b37efb3a Signed-off-by: Rajagopala V <rajagopala.v@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34364 Reviewed-by: Vijaya Kumar K-1 <vijay.kilari@stericsson.com> Reviewed-by: QATOOLS Reviewed-by: Arun MURTHY <arun.murthy@stericsson.com> Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com>
2011-10-18dma40: combine mem and slave sg-to-lli functionsRabin Vincent
ST-Ericsson ID: 362972 ST-Ericsson FOSS-OUT ID: NA ST-Ericsson Linux next: NA Change-Id: I3ff1e801c557a9ba692ff87d01a01d0555627458 Acked-by: Per Forlin <per.forlin@stericsson.com> Acked-by: Jonas Aaberg <jonas.aberg@stericsson.com> Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34354 Tested-by: Narayanan GOPALAKRISHNAN <narayanan.gopalakrishnan@stericsson.com>
2011-10-18dma40: remove duplicated dev addr codeRabin Vincent
ST-Ericsson ID: 362972 ST-Ericsson FOSS-OUT ID: NA ST-Ericsson Linux next: NA Change-Id: If0e126c3b0705714347ab2cbde980f02f2dfb160 Acked-by: Per Forlin <per.forlin@stericsson.com> Acked-by: Jonas Aaberg <jonas.aberg@stericsson.com> Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34222 Tested-by: Narayanan GOPALAKRISHNAN <narayanan.gopalakrishnan@stericsson.com>
2011-10-18dma40: combine duplicated d40_pool_lli_alloc() callsRabin Vincent
ST-Ericsson ID: 362972 ST-Ericsson FOSS-OUT ID: NA ST-Ericsson Linux next: NA Change-Id: I997bdea14410be097652f6618bf1ee6e88ff2c62 Acked-by: Per Forlin <per.forlin@stericsson.com> Acked-by: Jonas Aaberg <jonas.aberg@stericsson.com> Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34197 Tested-by: Narayanan GOPALAKRISHNAN <narayanan.gopalakrishnan@stericsson.com>
2011-10-18clocksource: fixup ux500 build problemsLinus Walleij
Based on a patch from Arnd Bergmann this fixes up the build problem of assigning a non-existing global when the ux500 PRCMU timer is not linked in by passing its base address to the init function. We also add a missing <linux/errno.h> inclusion and staticize the dummy function. Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> ST-Ericsson ID: 368260 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I87ec2eb27e157433fa12fb4eafc165a6217a869b Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34327 Reviewed-by: QATOOLS Tested-by: Rabin VINCENT <rabin.vincent@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-18u8500: Configure SysClkReqRfClkBufKennet Wallden
Added the possibility to configure SysCl1kReqRfClkBuf - SysClk8ReqRfClkBuf ST-Ericsson ID: 360052 ST-Ericsson Linux next: N/A ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I7813ae4a73701d874e39556c60608ff66e1d016d Signed-off-by: Kennet Wallden <kennet.wallden@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32261 Reviewed-by: Karl-Johan PERNTZ <karl-johan.perntz@stericsson.com> Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com>
2011-10-18mach-ux500: Fixup pins for SD-card/camera flashUlf Hansson
Fixed problem introduced in commit: ux500: camera_flash: add platform data for adp1653 Wrong pin configuration was set for camera flash enable pin. It was set to 22 but should be 21. 22 is SD-card FBCLK pin. Change-Id: Ibda29d091567a6cbecb6efbbb5ec97c6282f824b Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34324
2011-10-18ux500: mcde: Shift the rotation buffer addressbarge
Shift the rotation buffer address by 8k to free space for dma lcla area. Do that for all displays. ST-Ericsson ID: 364165 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Change-Id: I4bc5b72f6d198f26c7b48572cb3843d18c6b8553 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34168 Reviewed-by: Sylvain BARGE <sylvain.barge@stericsson.com> Tested-by: Sylvain BARGE <sylvain.barge@stericsson.com> Reviewed-by: Jimmy RUBIN <jimmy.rubin@stericsson.com>
2011-10-18input: Increase schedule Scan work delayNaga Radhesh
Increase Scan work delay,to reduce CPU load ST-Ericsson ID: 365018 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: NA Signed-off-by: Naga Radhesh <naga.radheshy@stericsson.com> Change-Id: Ibf21ffd807d7603ad4ac68558cff723b801d8c80 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33604 Reviewed-by: QABUILD Reviewed-by: Naveen Kumar GADDIPATI <naveen.gaddipati@stericsson.com> Reviewed-by: Karl-Johan PERNTZ <karl-johan.perntz@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-10-18Bluetooth: rfcomm: Fix sleep in invalid context in rfcomm_security_cfmSzymon Janc
This was triggered by turning off encryption on ACL link when rfcomm was using high security. rfcomm_security_cfm (which is called from rx task) was closing DLC and this involves sending disconnect message (and locking socket). Move closing DLC to rfcomm_process_dlcs and only flag DLC for closure in rfcomm_security_cfm. BUG: sleeping function called from invalid context at net/core/sock.c:2032 in_atomic(): 1, irqs_disabled(): 0, pid: 1788, name: kworker/0:3 [<c0068a08>] (unwind_backtrace+0x0/0x108) from [<c05e25dc>] (dump_stack+0x20/0x24) [<c05e25dc>] (dump_stack+0x20/0x24) from [<c0087ba8>] (__might_sleep+0x110/0x12c) [<c0087ba8>] (__might_sleep+0x110/0x12c) from [<c04801d8>] (lock_sock_nested+0x2c/0x64) [<c04801d8>] (lock_sock_nested+0x2c/0x64) from [<c05670c8>] (l2cap_sock_sendmsg+0x58/0xcc) [<c05670c8>] (l2cap_sock_sendmsg+0x58/0xcc) from [<c047cf6c>] (sock_sendmsg+0xb0/0xd0) [<c047cf6c>] (sock_sendmsg+0xb0/0xd0) from [<c047cfc8>] (kernel_sendmsg+0x3c/0x44) [<c047cfc8>] (kernel_sendmsg+0x3c/0x44) from [<c056b0e8>] (rfcomm_send_frame+0x50/0x58) [<c056b0e8>] (rfcomm_send_frame+0x50/0x58) from [<c056b168>] (rfcomm_send_disc+0x78/0x80) [<c056b168>] (rfcomm_send_disc+0x78/0x80) from [<c056b9f4>] (__rfcomm_dlc_close+0x2d0/0x2fc) [<c056b9f4>] (__rfcomm_dlc_close+0x2d0/0x2fc) from [<c056bbac>] (rfcomm_security_cfm+0x140/0x1e0) [<c056bbac>] (rfcomm_security_cfm+0x140/0x1e0) from [<c0555ec0>] (hci_event_packet+0x1ce8/0x4d84) [<c0555ec0>] (hci_event_packet+0x1ce8/0x4d84) from [<c0550380>] (hci_rx_task+0x1d0/0x2d0) [<c0550380>] (hci_rx_task+0x1d0/0x2d0) from [<c009ee04>] (tasklet_action+0x138/0x1e4) [<c009ee04>] (tasklet_action+0x138/0x1e4) from [<c009f21c>] (__do_softirq+0xcc/0x274) [<c009f21c>] (__do_softirq+0xcc/0x274) from [<c009f6c0>] (do_softirq+0x60/0x6c) [<c009f6c0>] (do_softirq+0x60/0x6c) from [<c009f794>] (local_bh_enable_ip+0xc8/0xd4) [<c009f794>] (local_bh_enable_ip+0xc8/0xd4) from [<c05e5804>] (_raw_spin_unlock_bh+0x48/0x4c) [<c05e5804>] (_raw_spin_unlock_bh+0x48/0x4c) from [<c040d470>] (data_from_chip+0xf4/0xaec) [<c040d470>] (data_from_chip+0xf4/0xaec) from [<c04136c0>] (send_skb_to_core+0x40/0x178) [<c04136c0>] (send_skb_to_core+0x40/0x178) from [<c04139f4>] (cg2900_hu_receive+0x15c/0x2d0) [<c04139f4>] (cg2900_hu_receive+0x15c/0x2d0) from [<c0414cb8>] (hci_uart_tty_receive+0x74/0xa0) [<c0414cb8>] (hci_uart_tty_receive+0x74/0xa0) from [<c02cbd9c>] (flush_to_ldisc+0x188/0x198) [<c02cbd9c>] (flush_to_ldisc+0x188/0x198) from [<c00b2774>] (process_one_work+0x144/0x4b8) [<c00b2774>] (process_one_work+0x144/0x4b8) from [<c00b2e8c>] (worker_thread+0x198/0x468) [<c00b2e8c>] (worker_thread+0x198/0x468) from [<c00b9bc8>] (kthread+0x98/0xa0) [<c00b9bc8>] (kthread+0x98/0xa0) from [<c0061744>] (kernel_thread_exit+0x0/0x8) Change-Id: Iaa50763772d31b0ae506fc993f1c46e02323f6b2 Signed-off-by: Szymon Janc <szymon.janc@tieto.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34153 Reviewed-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com> Reviewed-by: Ulrik LAUREN <ulrik.lauren@stericsson.com>
2011-10-17mmc: boot part lock should lock all boot partsJohan Rudholm
Locking a boot partition read only should automatically make the other boot partition read only as well. Also, the sysfs parent to the boot partitions should have the boot_partition_ro_lock file, since an ro lock applies to both partitions. ST-Ericsson ID: 344197 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Change-Id: I3762e840ab1d393420352521f013c5715f8188a1 Signed-off-by: Johan Rudholm <johan.rudholm@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34249 Reviewed-by: John BECKETT <john.beckett@stericsson.com> Reviewed-by: Ulf HANSSON <ulf.hansson@stericsson.com>
2011-10-17spi/spi-pl022: Call pl022_dma_remove(pl022) only if enable_dma is trueViresh Kumar
pl022_dma_remove() should be called only if enable_dma is true. There is no point calling it when pl022_dma_probe() is not called, which again depends on enable_dma. Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Tested-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Change-Id: Ib39b55c55a657ceab8b2782fd95c6d396a767171 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34215 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-10-17spi/spi-pl022: calculate_effective_freq() must set rate <= requested rateViresh Kumar
There were few issues with calculate_effective_freq() routine: - It was returning first rate found >= requested rate. Now, if system have spi's rate as 83 MHz, with possible prescaled rates as 83, 41.5, 20.75, 13.83 (as we can prescale with multiples of 2). If user has given rate to be programmed as 22 MHz, then driver programmes it to 41.5 MHz. This looks to be incorrect, as user might have given the upper limit of the device, and we are programming it above it. - Driver finds the first satisfying rate and programmes it, but with other values of scr & cpsdvsr, it is possible to get more closer rate. This patch fixes these two issues, with some reformatting inside the code. This also creates a inline routine to calculate prescaled rate based on spi's rate, cpsdvsr and scr. Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Tested-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Change-Id: If7f0d672d9b82a1d15eecd8ac92d95d9ff064bf2 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34214 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-10-17spi/spi-pl022: Don't allocate more sg than required.Viresh Kumar
In routine configure_dma(), if transfer->len = PAGE_SIZE, then pages is one more than required. While leads to one more sg getting allocated. This is wrong. Correct this to allocate correct number of sg. Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Tested-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Change-Id: I853c92d0efae2dab32a76e21d4319fa172317331 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34213 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-10-17spi/spi-pl022: Use GFP_ATOMIC for allocation from taskletViresh Kumar
tasklets don't allow invocation to sleeping routines. In configure_dma() routine, sg_alloc_table() was called with GFP_KERNEL flag and so this causes crash when called from tasklet. Replace GFP_KERNEL with GFP_ATOMIC to get this fixed. Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Tested-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Change-Id: I15b94ca35abbd099712cb0789e1f196a762b5095 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34212 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-10-17spi/spi-pl022: Resolve formatting issuesViresh Kumar
There were few formatting related issues in code. This patch fixes them. Fixes include: - Remove extra blank lines - align code to 80 cols - combine several lines to one line - Replace multiple spaces with tabs - Remove spaces before labels Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Tested-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Change-Id: Id0d608fb8ad47c260b882819f85566eacfd187b4 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34211 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-10-17spi/pl022: remove function cannot exitLinus Walleij
The remove function in the PL022 driver cannot abort the remove function any way, so restructure the code so as not to make that assumption. Remove will now proceed no matter whether it can stop the transfer queue or not. Reported-by: Russell King <linux@arm.linux.org.uk> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Change-Id: Iaa06640f339228657b0b0e20af96284c77180eba Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34210 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-10-17spi/pl022: strengthen FIFO watermark level checksLinus Walleij
The platform configuration can select custom FIFO watermarks, but these may conflict the actual FIFO size of the PL022 variant if set too high. So strengthen the sanity checks to deny any conflicting settings. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Change-Id: Ia74a7eb3fcaa269aafef53daf7cc7c249d96594d Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34209 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-10-17spi/pl022: support runtime PMRabin Vincent
Insert notifiers for the runtime PM API. With this the runtime PM layer kicks in to action where used. Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-by: Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com> Reviewed-by: Jonas Aberg <jonas.aberg@stericsson.com> Reviewed-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> [Rebased to Linux 3.0-rc3, edit description] Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Change-Id: I4852e8975337dd07ed5d410ee9a79481a153e09c Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34208 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-10-17spi/pl022: initialize burstsize from FIFO trigger levelLinus Walleij
Configure the DMA burstsize from the FIFO trigger level supplied with the controller configuration data. This is based on a patch from Virupax, but I rewrote it differently. Reported-by: Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Change-Id: I7a47f731dc7ef00bb905966b816a40d41ef967ee Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34207 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-10-17Ugly-rename amba-pl022 to spi-pl022Linus Walleij
This ugly renaming of the file amba-pl022 to spi-pl022 is done in order to be able to apply PL022 patches from the mainline kernel without hazzle. Grant reorganized all the drivers but to apply his original renaming patch we would have to bring in all patches to all *other* drivers up to that point, which would in turn bring in a large portion of the kernel 3.1 baseline - let's not go there. This is ugly but the alternatives are uglier. When rebasing to a kernel later than this one, remove this patch and use mainline commits as far as possible. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Change-Id: If5a453371f46b09af88febdd03319d1f2fcb612b Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34206
2011-10-17Revert "amba-pl022: Initialize burstsize from FIFO trigger level"Linus Walleij
This reverts commit 7e591da7370c8b843a60ad55a0db944abedb094a. Change-Id: Icb189c8a4f5d3e45d78d0eef6e8f32a6d97a944f Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34205 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-10-17Revert "amba-pl022: Add loopback support for the SPI on 5500"Linus Walleij
This reverts commit 437147f07146843488860f40cafdee22c1ba353f. Change-Id: I239e010168f7a55ba7f1db9d343670948b4dd5dc Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34204 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-10-17Revert "amba-pl022: Clear SSE once the transfer is completed"Linus Walleij
This reverts commit 015a0108f545d8ccd0b961bfcf56a3a1bcdd502d. Change-Id: Ibd21c4e21dd919395874ab13d16f9074105fff1a Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34203 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-10-17Revert "SPI: amba-pl022: Fix build warnings"Linus Walleij
This reverts commit e9bbf70410a2472c75619370e3ac40c344889553. Change-Id: Ic6b0187765169638a11aa4ffd1c2fa57b6809e6d Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34202 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-10-17ux500: recouple gic on bootMarcus Danielsson
On WD reboot gic is in some cases decoupled. ST-Ericsson ID: 364267 Change-Id: Ie818710839a2aad674d93e20fbc5562ce44b4bc5 Signed-off-by: Marcus Danielsson <marcus.danielsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33898 Reviewed-by: QABUILD Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-14arm: u5500: Enable 32bpp for primary displayJayarami Reddy
ST-Ericsson ID: 361885 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ic914e764ee4816fbfcfbba5129426e2ba51a88ab Signed-off-by: Jayarami Reddy <jayarami.reddy@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33780 Reviewed-by: Jimmy RUBIN <jimmy.rubin@stericsson.com>
2011-10-14mmc: boot partition lock supportJohan Rudholm
Enable boot partitions to be power and permanently locked via a sysfs ro_lock node. ST-Ericsson ID: 344197 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Change-Id: I5534c12b0c1867d562e27a2fb2012624ad3009b4 Signed-off-by: John Beckett <john.beckett@stericsson.com> Signed-off-by: Johan Rudholm <johan.rudholm@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33117 Reviewed-by: Ulf HANSSON <ulf.hansson@stericsson.com>
2011-10-14u5500: remove ondemand as default cpufreq governorRabin Vincent
Ondemand needs to be tuned to perform as expected in the video usecases. Change-Id: If4c6c4e9b47c0723f7e5cbc5772b25138c461ca0 Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34072 Reviewed-by: Vijaya Kumar K-1 <vijay.kilari@stericsson.com> Reviewed-by: QABUILD Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-10-14video: mcde: Remove unused MCDE auto syncMarcus Lorentzon
Auto sync for command mode displays are no longer used and should be implemented in fbdev if needed. ST-Ericsson ID: 365249 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Change-Id: Ie67744bebf8d5b7049d055077814460959f86172 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33801 Reviewed-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com> Tested-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com>
2011-10-14ux500: mcde: Remove unused MCDE auto syncMarcus Lorentzon
Auto sync for command mode displays are no longer used and should be implemented in fbdev if needed. ST-Ericsson ID: 365249 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Change-Id: I860d9221dc79d6e5acd53c514d90a8eac57fb18a Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33800 Reviewed-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com> Tested-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com>
2011-10-14cg2900: Add support for 3.25 MbpsLukasz Rymanowski
With this patch it is possible to set baud rate 3.25 Mbps on CG2900 UART. ST-Ericsson ID: 364789 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: Not tested, 364789 Signed-off-by: Lukasz Rymanowski <lukasz.rymanowski@tieto.com> Change-Id: If54af597b949038e9ef4c05d80c9235666e127a4 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32689 Reviewed-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com> Tested-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com> Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com>
2011-10-14ux500: mcde: Remove unused codeMarcus Lorentzon
mcde_get_main_display is not used in the kernel. ST-Ericsson ID: 365249 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Change-Id: I86b947e1273ba0a7340cee06cfa1d7d732d064b8 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33784 Reviewed-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com> Tested-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com>
2011-10-14u8500_defconfig: Enable the Cypress touchscreenAvinash A
ST-Ericsson ID: 366971 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I4724b322f5fba1b4fff49abb525380b98e8801a5 Signed-off-by: Avinash A <Avinash.a@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34062 Reviewed-by: Avinash A <avinash.a@stericsson.com> Tested-by: Avinash A <avinash.a@stericsson.com> Reviewed-by: QABUILD Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com>
2011-10-14Android:Ux500:USB: Boot time detection of USBSakethram Bommisetti
Enabling the usb functions from kernel space rather that enabling from user space using init.rc. Sysfs values in kernel space are not being updated from user space at the time of enumeration during boottime. ST-Ericsson Linux next: NA ST-Ericsson ID: 363818 ST-Ericsson FOSS-OUT ID: NA Change-Id: Ia17e2f9cef5bb1769718617b18fafe09e32226e2 Signed-off-by: Sakethram Bommisetti <sakethram.bommisetti@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33816 Reviewed-by: Praveena NADAHALLY <praveen.nadahally@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-10-14u8500-shrm: Initiate MSR in case of serious bugArun Murthy
During APE-Modem communication, for some reasson if software or hardware fails, instead of calling kernel function BUG() and halting the system making it no more useful until reboot, initiate a MSR. ST-Ericsson Linux next: NA ST-Ericsson ID: 366150 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I59e93b338c3242b506be7775487be065421022b8 Signed-off-by: Arun Murthy <arun.murthy@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33416 Reviewed-by: Bibek BASU <bibek.basu@stericsson.com> Reviewed-by: QABUILD Reviewed-by: Magnus TEMPLING <magnus.templing@stericsson.com> Reviewed-by: Rickard EVERTSSON <rickard.evertsson@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-10-14Power: ab8500_bm: Update battery capacity before notifyKalle Komierowski
Now the battery capacity calculations and the power_supply framework is updated with the new status when battery has been fully charged before clients polling the capacity sysfs node are being notified. ST-Ericsson ID: 358829 ST-Ericsson Linux next: Not tested ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Icd827863bc694e44495487f8536e95ab5fe0714f Signed-off-by: Kalle Komierowski <karl.komierowski@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33880 Reviewed-by: QABUILD Reviewed-by: Johan PALSSON <johan.palsson@stericsson.com>
2011-10-14u8500_defconfig: Enable VPN supportRickard Hammar
ST-Ericsson ID: 353068 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Id6416c09061dd2210d89e4186e7f70e53d804c78 Depends-On: I18aafa2bba6ad118431e6cd0f9bf201a6233befb Signed-off-by: Rickard Hammar <rickard.hammar@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33892 Reviewed-by: QABUILD Reviewed-by: Christian NILSSON <christian.c.nilsson@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>