Olof Johansson [Fri, 22 Jun 2012 22:11:50 +0000 (15:11 -0700)]
ARM: exynos: add pmu nodes to exynos5250 dts
This plumbs up the PMU on the A15s so that we can run perf.
BUG=none
TEST=run perf top
Change-Id: I64638b87e24f8dd7664063d0d5b672993dd1763e
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/20678
Reviewed-by: Sonny Rao <sonnyrao@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Olof Johansson [Fri, 22 Jun 2012 22:05:04 +0000 (15:05 -0700)]
ARM: exynos: add cpu nodes to 5250 device tree
Not technically used for anything, but it's still common to describe
them.
BUG=none
TEST=none
Change-Id: I0c864c08025e5e84816520c917c803782a90e642
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/20677
Reviewed-by: Sonny Rao <sonnyrao@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Alim Akhtar [Wed, 23 May 2012 23:46:49 +0000 (16:46 -0700)]
arm: exynos5: dts: add TMU device node
Adds Thermal Management Unit device node in the device tree list
BUG=chrome-os-partner:8926
TEST=build ok, booted on snow and saw system is tripping when
reached tripping temp.
Change-Id: I0b000cdc44f84f218e1c290740cff63347ddecda
Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
Reviewed-on: https://gerrit-int.chromium.org/18260
Reviewed-by: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Reviewed-on: https://gerrit-int.chromium.org/20484
Reviewed-by: Doug Anderson <dianders@google.com>
Reviewed-by: Grant Grundler <grundler@google.com>
Tested-by: Grant Grundler <grundler@google.com>
Alim Akhtar [Fri, 22 Jun 2012 14:16:46 +0000 (19:46 +0530)]
ARM: exynos5: add tmu clock support
Add support for clock instance for TMU controller
BUG=none
TEST=booted kernel, cat /sys/class/thermal/thermal_zone0/temp
show current temp.
Change-Id: If2d83abeb437b287cab475f102942ea566cf6ab5
Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: Amit Daniel Kachhap <amit.kachhap@linaro.org>
Reviewed-on: https://gerrit-int.chromium.org/20489
Reviewed-by: Doug Anderson <dianders@google.com>
Reviewed-by: Grant Grundler <grundler@google.com>
Tested-by: Grant Grundler <grundler@google.com>
Reviewed-by: Olof Johansson <olofj@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Subash Patel [Thu, 21 Jun 2012 23:36:57 +0000 (16:36 -0700)]
DRM: exynos: return NULL if exynos_pages_to_sg fails
exynos_pages_to_sg() internally calls sg_kmalloc() which can return
no pages when the system is under high memory crunch. One such instance
is chromeos-install in the chromeos. This patch adds check for the return
value of the function in subject to return NULL on failure.
BUG=chrome-os-partner:9481
TEST=built, ran on snow and tried chromeos-install without a crash
Change-Id: I0abda74beaedae002a17de9962d7a462a2a7c2fb
Signed-off-by: Subash Patel <subash.rp@samsung.com>
Reviewed-on: https://gerrit-int.chromium.org/20572
Reviewed-by: Doug Anderson <dianders@google.com>
Tested-by: Doug Anderson <dianders@google.com>
Reviewed-by: Olof Johansson <olofj@google.com>
Commit-Ready: Subash Patel <subash@chromium.org>
Olof Johansson [Fri, 22 Jun 2012 19:51:33 +0000 (12:51 -0700)]
media: exynos: fix permissions on files
BUG=none
TEST=visual inspection
Change-Id: I86e35c5d24a8b9083a5278da304df21ff11776d4
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/20637
Reviewed-by: Doug Anderson <dianders@google.com>
Reviewed-by: Anush Elangovan <anush@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Reviewed-by: Subash Patel <subash@chromium.org>
Olof Johansson [Fri, 22 Jun 2012 19:50:05 +0000 (12:50 -0700)]
drm: vithar: fix permissions on Makefiles
BUG=none
TEST=visual inspection
Change-Id: I65bb901188bee114a8feb86b5fb12f4516594795
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/20636
Reviewed-by: Anush Elangovan <anush@google.com>
Reviewed-by: Doug Anderson <dianders@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Bryan Freed [Fri, 22 Jun 2012 17:34:11 +0000 (10:34 -0700)]
CHROMIUM: ARM: Exynos5: Manually configure the chip select gpio for spidev.
The kernel should not depend on firmware to configure the chip select pin
with function 1 (gpio) for us.
BUG=chrome-os-partner:10755
TEST=Confirm flashrom -p linux_spi:dev=/dev/spidev1.0 --get-size works.
Change-Id: I77c7e5134fa323a82e6f5308566ff05493e493cd
Signed-off-by: Bryan Freed <bfreed@chromium.org>
Signed-off-by: Doug Anderson <dianders@chromium.org>
(dianders resolved trivial merge conflicts)
Reviewed-on: https://gerrit-int.chromium.org/20625
Tested-by: Doug Anderson <dianders@google.com>
Commit-Ready: Doug Anderson <dianders@google.com>
Reviewed-by: Doug Anderson <dianders@google.com>
Reviewed-by: Olof Johansson <olofj@google.com>
Olof Johansson [Thu, 21 Jun 2012 18:29:27 +0000 (11:29 -0700)]
CHROMIUM: ASoC: samsung: don't configure smdk audio everywhere
We want both drivers enabled so the same kernel can boot SMDK and
Daisy/Snow, but we can't have the SMDK driver registering itself on
hardware it doesn't exist on.
Change-Id: I5a446c1a840f539200b26e2f5aadf6b28d7fcb45
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/20547
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Olof Johansson [Thu, 21 Jun 2012 17:54:29 +0000 (10:54 -0700)]
CHROMIUM: ARM: exynos: add max98095 dt entries
Add device tree entries for the codec used on daisy/snow and
the regulator used to power up the codec.
Change-Id: I04d40f6ffa5c0b1e9c78247b9b3c5d8998d31a7f
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/20546
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Olof Johansson [Tue, 12 Jun 2012 16:07:24 +0000 (09:07 -0700)]
CHROMIUM: ARM: enable xclkout for audio on daisy/snow
Daisy/snow need xclkout to be enabled since it's their reference clock
for the audio codec. Enabling the output on smdk shouldn't be
harmful so just do it globally for now.
Note that this should be moved over to be a regular system clock instead
of just being forced on like this.
Change-Id: Ia4f612ff56c6715aa99e9b50e51b5e03874feb8a
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/20545
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Taylor Hutt [Mon, 11 Jun 2012 19:32:37 +0000 (12:32 -0700)]
CHROMIUM: ASoC: samsung: add daisy_max98095.c board
Add the ASoC board plumbing for max98095 on daisy/snow.
Change-Id: I34d390d808574dafc9dd463aaf21a6c7886d97a0
BUG=chrome-os-partner:8920
TEST=Kernel builds.
Signed-off-by: Taylor Hutt <thutt@chromium.org>
[olofj: Changed to device tree and some misc cleanup]
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/19831
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Taylor Hutt [Tue, 12 Jun 2012 15:55:08 +0000 (08:55 -0700)]
CHROMIUM: ARM: exynos: Add audio clocks needed for snow(?)
Adds missing clock definitions needed for audio
This needs to be cleaned up, it's not clear to me why the existing clock
definitions in arch/arm/mach-exynos/clock-audss.c are insufficient. There
are differences, but I don't know how they are expected to be reconciled
between EXYNOS4 and EXYNOS5 at this time.
BUG=chrome-os-partner:8920
TEST=Validated audio output works w/ follow on changes.
Change-Id: I2b082b1e3a132ec6731f8c4faf7108cfe90880de
Signed-off-by: Taylor Hutt <thutt@chromium.org>
[olofj: pruned out some clocks, rewrote the commit description and a
few other things]
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/19830
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Doug Anderson [Wed, 20 Jun 2012 23:55:56 +0000 (16:55 -0700)]
ARM: exynos: dt: turn on wwan-en
This turns on wwan all the time which is fine at the moment.
When we want to optimize for power, we'll need to figure out how
to hook things in such that:
* We turn off 3G when the user has disabled it in the UI (that
would mean we couldn't tell if we're on a 3G sku).
* We turn off 3G during suspend (assuming that we don't want to
keep it on for some reason).
See the bug for more details.
BUG=chrome-os-partner:10528
TEST=Before this change, 'grep "wwan-en" /sys/class/regulator/*/name'
returned nothing. After this change, it showed a match.
TEST=Before this change, saw no 3G module in 'lsusb'. After this
change I saw a 3G module in lsusb.
Change-Id: I34b12cf0ad5d30d246c31aa707f32a16c5351ca8
Signed-off-by: Doug Anderson <dianders@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/20508
Tested-by: Doug Anderson <dianders@google.com>
Reviewed-by: Olof Johansson <olofj@google.com>
Commit-Ready: Doug Anderson <dianders@google.com>
Reviewed-by: Terry Lambert <tlambert@google.com>
Thomas Abraham [Fri, 1 Jun 2012 09:29:19 +0000 (17:29 +0800)]
ARM: Exynos5: Add spi clock support
Add support for clock instances for each spi controller.
BUG=None
TEST=None
Change-Id: Iddfd68dea4b81d0282744dabb79dbdc587dc830d
Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
Acked-by: Jaswinder Singh <jaswinder.singh@linaro.org>
Reviewed-on: https://gerrit-int.chromium.org/17934
Reviewed-by: Olof Johansson <olofj@google.com>
Tested-by: Doug Anderson <dianders@google.com>
Commit-Ready: Doug Anderson <dianders@google.com>
Reviewed-on: https://gerrit-int.chromium.org/20488
Tested-by: Olof Johansson <olofj@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Sean Paul [Thu, 21 Jun 2012 15:56:58 +0000 (11:56 -0400)]
ARM: exynos: Don't toggle GPIO_X1(5) on snow
Don't toggle GPIO_X1(5) on snow since it maps to PD_N on the bridge
chip, and not reset. Also remove the switch on power since both branches
do the same thing.
BUG=None
TEST=Tested on snow
Change-Id: I53789108300eb165caf71bfb302c99ab3ceebb28
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/20509
Tested-by: Sean Paul <seanpaul@google.com>
Reviewed-by: Doug Anderson <dianders@google.com>
Luigi Semenzato [Wed, 20 Jun 2012 00:43:21 +0000 (17:43 -0700)]
CHROMIUM: mkbp: add missing key for UK keyboard
This adds KEY_BACKSLASH at (row,column) 4,10 for the UK keyboard, for
which key 3,11 is not wired.
It also replaces the hex code for KEY_102ND with the correct symbol
(don't know why I didn't use that in the first place).
BUG=chrome-os-partner:10534
TEST=manually tested with UK keyboard
Change-Id: I59b0f6dbf8924e10a5cf358b73b59c7cb387e64f
Reviewed-on: https://gerrit-int.chromium.org/20374
Tested-by: Luigi Semenzato <semenzato@google.com>
Commit-Ready: Luigi Semenzato <semenzato@google.com>
Reviewed-by: Luigi Semenzato <semenzato@google.com>
Reviewed-by: Sonny Rao <sonnyrao@google.com>
Vincent Palatin [Tue, 15 May 2012 18:29:34 +0000 (11:29 -0700)]
CHROMIUM: platform: chromeos_ec: export firmware information
Add sysfs nodes to get firmware version and other EC info.
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BUG=chrome-os-partner:8865
TEST=on Daisy, read the new sysfs nodes
Change-Id: I12528fb9c5dcb59578eaaf75481a5227083fe3d4
Reviewed-on: https://gerrit-int.chromium.org/18002
Reviewed-by: Olof Johansson <olofj@google.com>
Commit-Ready: Vincent Palatin <vpalatin@google.com>
Tested-by: Vincent Palatin <vpalatin@google.com>
Jonathan Kliegman [Wed, 13 Jun 2012 21:11:02 +0000 (17:11 -0400)]
CHROMIUM: mmc: dwmci: Fix dma_ops access when use_dma is false
host->dma_ops is not valid if host->usa_dma is 0 so we
need to protect uses of host->dma_ops
BUG=chrome-os-partner:10459
TEST=Tested again commit
56d5bcff5d69606b9af43cf42a7536de589a913e
and observed no panic on resume
Change-Id: I7d21cc3d3d1e53c95e3d8802dc5230d872388587
Reviewed-on: https://gerrit-int.chromium.org/19870
Tested-by: Jonathan Kliegman <kliegs@google.com>
Reviewed-by: Grant Grundler <grundler@google.com>
Commit-Ready: Jonathan Kliegman <kliegs@google.com>
Amitkumar Karwar [Thu, 7 Jun 2012 04:12:42 +0000 (21:12 -0700)]
UPSTREAM: mwifiex: scan less channels per scan command to improve Tx traffic
Currently 4 channels are scanned per scan command. if scan request
is issued by user during Tx traffic, radio will be out of channel
for "4 * per_chan_scan_time" for each scan command and will not be
able to receive Rx packets. This adds delay in data traffic. We can
minimize it by reducing number of channels scanned per scan command
in this scenario.
We can not always scan 1 channel per scan command due to limitation
of number of command buffers. So we add code to decide number of
channels scanned per scan command in associated state.
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
BUG=chrome-os-partner:8707
TEST=ping+scan test
Change-Id: Ie18901f9306704509ddf7e42825b823131dc9a1d
Reviewed-on: https://gerrit-int.chromium.org/19352
Commit-Ready: Sam Leffler <sleffler@google.com>
Reviewed-by: Sam Leffler <sleffler@google.com>
Tested-by: Sam Leffler <sleffler@google.com>
Amitkumar Karwar [Thu, 7 Jun 2012 04:12:41 +0000 (21:12 -0700)]
UPSTREAM: mwifiex: fix simultaneous scan and Tx traffic problem
If scan operation is started when Tx traffic is already running,
driver locks Tx queue until it gets completed. With this logic
there is a delay for Tx packets.
This patch implements new approach to give Tx path higher priority
in this case. Driver internally sends multiple synchronous scan
commands to firmware when scan is requested by user. Now we will
make sure that Tx queue is empty everytime before sending next scan
command. If Tx queue isn't empty scan command will be postponsed by
20msec. This rule will be followed until Tx queue becomes empty or
timeout of 1 second happens. In case of timeout scan operation will
be aborted.
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
BUG=chrome-os-partner:8707
TEST=ping+scan test
Change-Id: I878220a606c1550becd0cc0634d3e672d3e6b58d
Reviewed-on: https://gerrit-int.chromium.org/19351
Commit-Ready: Sam Leffler <sleffler@google.com>
Reviewed-by: Sam Leffler <sleffler@google.com>
Tested-by: Sam Leffler <sleffler@google.com>
Bing Zhao [Thu, 7 Jun 2012 04:12:40 +0000 (21:12 -0700)]
UPSTREAM?: mwifiex: shorten per channel scan time
Currently the scan time per channel for active scanning is set to
200ms. It takes quite a while to finsh scanning on all channels,
especially with a dual band configuration.
Change the per channel scan time settings to the following values:
passive scan: 110ms
active scan: 30ms
specific scan: 30ms
Above settings have been tested on x86 and arm platforms.
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
BUG=chrome-os-partner:8707
TEST=ping+scan test
Change-Id: Ib85bf163378268b9453cb329ccae603bfb70eeaa
Reviewed-on: https://gerrit-int.chromium.org/19350
Commit-Ready: Sam Leffler <sleffler@google.com>
Reviewed-by: Sam Leffler <sleffler@google.com>
Tested-by: Sam Leffler <sleffler@google.com>
Will Deacon [Fri, 27 Apr 2012 12:08:53 +0000 (13:08 +0100)]
UPSTREAM: ARM: 7408/1: cacheflush: return error to userspace when flushing syscall fails
The cacheflush syscall can fail for two reasons:
(1) The arguments are invalid (nonsensical address range or no VMA)
(2) The region generates a translation fault on a VIPT or PIPT cache
This patch allows do_cache_op to return an error code to userspace in
the case of the above. The various coherent_user_range implementations
are modified to return 0 in the case of VIVT caches or -EFAULT in the
case of an abort on v6/v7 cores.
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
(cherry picked from commit
c5102f5935503ebebad46e137d0eef68f272cc16)
BUG=none
TEST=none
Change-Id: Ia106e7e14d1d60ba5aa363167c9308eaf07437c7
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/19423
Reviewed-by: Doug Anderson <dianders@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Commit-Ready: Doug Anderson <dianders@google.com>
Dima Zavin [Mon, 30 Apr 2012 09:26:14 +0000 (10:26 +0100)]
UPSTREAM: ARM: 7409/1: Do not call flush_cache_user_range with mmap_sem held
We can't be holding the mmap_sem while calling flush_cache_user_range
because the flush can fault. If we fault on a user address, the
page fault handler will try to take mmap_sem again. Since both places
acquire the read lock, most of the time it succeeds. However, if another
thread tries to acquire the write lock on the mmap_sem (e.g. mmap) in
between the call to flush_cache_user_range and the fault, the down_read
in do_page_fault will deadlock.
[will: removed drop of vma parameter as already queued by rmk (7365/1)]
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Dima Zavin <dima@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
(cherry picked from commit
435a7ef52db7d86e67a009b36cac1457f8972391)
BUG=none
TEST=none
Change-Id: I9cca54c78958976a4129f64f115672def556c723
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/19422
Reviewed-by: Doug Anderson <dianders@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Dima Zavin [Thu, 29 Mar 2012 19:44:06 +0000 (20:44 +0100)]
UPSTREAM: ARM: 7365/1: drop unused parameter from flush_cache_user_range
vma isn't used and flush_cache_user_range isn't a standard macro that
is used on several archs with the same prototype. In fact only unicore32
has a macro with the same name (with an identical implementation and no
in-tree users).
This is a part of a patch proposed by Dima Zavin (with Message-id:
1272439931-12795-1-git-send-email-dima@android.com) that didn't get
accepted.
Cc: Dima Zavin <dima@android.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
(cherry picked from commit
4542b6a0fa6b48d9ae6b41c1efeb618b7a221b2a)
BUG=none
TEST=none
Change-Id: I135e80e60ede987f234b914f4371c24894a695af
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/19421
Reviewed-by: Doug Anderson <dianders@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Luigi Semenzato [Thu, 7 Jun 2012 22:07:42 +0000 (15:07 -0700)]
CHROMIUM: mkbp: improve logging
BUG=none
TEST=none
Signed-off-by: Luigi Semenzato <semenzato@chromium.org>
Change-Id: Ibf04bd554c9b897335952471e593125cc09ff1b3
Reviewed-on: https://gerrit-int.chromium.org/19326
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Commit-Ready: Luigi Semenzato <semenzato@google.com>
Tested-by: Luigi Semenzato <semenzato@google.com>
Luigi Semenzato [Tue, 5 Jun 2012 23:38:12 +0000 (16:38 -0700)]
CHROMIUM: chromeos-ec: use level-triggered interrupt
The EC made this change a while ago to better support the firmware,
which checks for keyboard changes by polling the gpio line which
the kernel uses for interrupts.
With this change, there is still an issue in the kernel.
We see two interrupts for each keyboard state change.
One theory is that the level-triggered interrupt generic code
does not clear and unmask the interrupt in the correct order.
Functionally this doesn't cause problems so we'll fix it separately.
There may be a spew of interrupts between probing of chromeos-ec
and probing of mkbp. However, this hasn't been observed.
Also, improve logging.
BUG=chrome-os-partner:10172
TEST=tested manually, verified that bug is gone and kbd still works
Change-Id: I5f244b82c480b154e6744d496bcf800f141906f4
Signed-off-by: Luigi Semenzato <semenzato@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/19093
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Commit-Ready: Luigi Semenzato <semenzato@google.com>
Tested-by: Luigi Semenzato <semenzato@google.com>
Reviewed-by: Doug Anderson <dianders@google.com>
Jonathan Kliegman [Wed, 6 Jun 2012 22:04:43 +0000 (18:04 -0400)]
CHROMIUM: HACK: mmc: core: Do not rescan after resume
Due to problems with rescanning the mmc bus if no card is present,
disable the rescan completely. This is a temporary hack until
better solutions are in place to enable suspend/resume.
Signed-off-by: Jonathan Kliegman <kliegs@chromium.org>
BUG=chrome-os-partner:8921
TEST=power_Resume test of 10 cycles on sd card and mmc boot devices
Change-Id: Ibab6c58089afe209d14453c5dc4ba423429f0710
Reviewed-on: https://gerrit-int.chromium.org/19176
Reviewed-by: Doug Anderson <dianders@google.com>
Tested-by: Jonathan Kliegman <kliegs@google.com>
Reviewed-by: Olof Johansson <olofj@google.com>
Commit-Ready: Jonathan Kliegman <kliegs@google.com>
Bing Zhao [Tue, 29 May 2012 18:41:54 +0000 (11:41 -0700)]
UPSTREAM: mwifiex: backport some 3.5 patches to 3.4
A collection of mwifiex patches since tag 'v3.4'
All following patches are available at the upstream git tree (for 3.5):
(internal tag: m20120416-3.4rc3)
b5abcf0219263f4e961dca71cbe26e06c5b0ee68 mwifiex: corrections in timestamp related code
9558a407dd00f6cd7f93b923768e8ee255fa4444 mwifiex: code cleanup in BSS handling
428ca8a7065354877db63ceabfc493107686eebe mwifiex: update pcie8766 scratch register addresses
59a4cc2539076f868f2a3fcd7a3385a26928a27a mwifiex: use asynchronous firmware loading
13d7ba78b514d8b720a82b9bddaaee0c004f2a1f mwifiex: add support for WPS2.0
5e218b7ab86ed6eb3d1432146c49cbb8733414d0 mwifiex: display correct country information in debugfs "info"
9e04a7c6d45fd70be55fcb48ec49f55dad9928f7 mwifiex: set default regulatory domain
d35ccaa4768ee39f7bb3c23394703d1da587c731 mwifiex: fix typo in RSSI_HIGH event handling
4fb25c5914e0c79e236a327833af7f581225f790 wireless, mwifiex: drop redundant NULL test before call to release_firmware()
da951c2417ec1020d0d00813da36f38e395994e9 wireless: Remove unnecessary ; from while (0) macros
99fec5dee8f717daf2b1789e8ac5913863c6dee8 mwifiex: don't use IEEE80211_MAX_QUEUES
fa444bf88ce2ba17d24dd0bb279e3106acf86bed mwifiex: add set_cqm_rssi_config handler support
7013d3e267ef41b3dfdfedbbe6c3d3e666f0f138 mwifiex: support STATION_INFO_SIGNAL_AVG
958a4a862f41eee27091b726de7ffa08c8488ce9 mwifiex: remove redundant signal handling code
f85aae6bec67075b6f19f14adfced6f1eb9061b9 mwifiex: add cfg80211 dump_station handler
c9919be642252baae7a80cacff52a3ed586b0547 mwifiex: update signal strength in mBm units
Signed-off-by: Bing Zhao <bzhao@marvell.com>
BUG=chrome-os-partner:9887, chrome-os-partner:8923
TEST=iw mlan0 scan reports reasonable data
Change-Id: Ie6bfb097a4204a84f0880b76a67aeeb008f57b05
Reviewed-on: https://gerrit-int.chromium.org/18798
Tested-by: Sam Leffler <sleffler@google.com>
Reviewed-by: Doug Anderson <dianders@google.com>
Commit-Ready: Sam Leffler <sleffler@google.com>
Gabe Black [Thu, 24 May 2012 04:08:33 +0000 (21:08 -0700)]
CHROMIUM: exynos: Stop the PWM timer while configuring it.
The Samsung PWM platform driver configures the PWM it's associated with, but
it leaves it running while it does so. There's no mention of this in the
manual, but it seems to be the case that you can't manually set the count or
compare registers while the timer is running. This change adds some code which
checks whether the PWM is running, stops it, does the configuration, and if
the PWM was running originally turns it back on.
BUG=chrome-os-partner:10126
TEST=Booted on Daisy and saw the backlight work in both U-Boot and ChromeOS.
Change-Id: Iabdfaff69a95241bc4723722448a895b8f860926
Signed-off-by: Gabe Black <gabeblack@google.com>
Signed-off-by: Doug Anderson <dianders@chromium.org>
(cherry picked from commit
994ae76b1454138ea70dba2c1d2f94f5aa307796)
(dianders: slight cleanup with converting bitfield to bool)
Reviewed-on: https://gerrit-int.chromium.org/18779
Commit-Ready: Doug Anderson <dianders@google.com>
Reviewed-by: Doug Anderson <dianders@google.com>
Tested-by: Doug Anderson <dianders@google.com>
Doug Anderson [Thu, 31 May 2012 20:42:23 +0000 (13:42 -0700)]
Revert "CHROMIUM: exynos: Stop the PWM timer while configuring it."
This reverts commit
9cbf14635a19c118da6412fcc66775f2310a0f84
...also known as I627ee40c104b6c26799cbfdec393112a0ef6803c
...the above commit was not a proper cherry-pick. Going to revert,
then do it correctly. The hope is that this will be easier to merge
in later.
BUG=chrome-os-partner:10126
TEST=None
Change-Id: I1be059a92af56c08dc3993a6c234b9e4557e3a75
Signed-off-by: Doug Anderson <dianders@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/18773
Tested-by: Doug Anderson <dianders@google.com>
Commit-Ready: Doug Anderson <dianders@google.com>
Reviewed-by: Doug Anderson <dianders@google.com>
Sam Leffler [Thu, 26 Apr 2012 23:54:35 +0000 (16:54 -0700)]
CHROMIUM: Add CLOCK_SYSTEM_TRACE to export the trace clock to user space.
Add a new clock type CLOCK_SYSTEM_TRACE to retrieve the current trace
clock value (if CONFIG_TRACING is not defined then CLOCK_SYSTEM_TRACE
returns the same value as CLOCK_MONOTONIC_RAW). This allows user event
tracing to timestamp data with the same clock as the kernel. This is
in-lieu of sending event data through trace_write (which is not a viable
option when there are lots of user-space events).
BUG=chromium-os:27809
TEST=manual:run test app to collect trace time and compare to data generated by the system (e.g. reading from trace)
Signed-off-by: Sam Leffler <sleffler@chromium.org>
Change-Id: If2167ed99291e05f8c298638f4118b10b3e710f8
Reviewed-on: https://gerrit.chromium.org/gerrit/21404
Reviewed-by: Olof Johansson <olofj@chromium.org>
Commit-Ready: Sam Leffler <sleffler@chromium.org>
Tested-by: Sam Leffler <sleffler@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/18564
Reviewed-by: Olof Johansson <olofj@google.com>
Tested-by: Sam Leffler <sleffler@google.com>
Commit-Ready: Sam Leffler <sleffler@google.com>
Gabe Black [Thu, 24 May 2012 04:08:33 +0000 (21:08 -0700)]
CHROMIUM: exynos: Stop the PWM timer while configuring it.
The Samsung PWM platform driver configures the PWM it's associated with, but
it leaves it running while it does so. There's no mention of this in the
manual, but it seems to be the case that you can't manually set the count or
compare registers while the timer is running. This change adds some code which
checks whether the PWM is running, stops it, does the configuration, and if
the PWM was running originally turns it back on.
BUG=chrome-os-partner:9816
TEST=Booted on Daisy and saw the backlight work in both U-Boot and ChromeOS.
Change-Id: I627ee40c104b6c26799cbfdec393112a0ef6803c
Signed-off-by: Gabe Black <gabeblack@google.com>
Signed-off-by: Doug Anderson <dianders@chromium.org>
(cherry picked from commit
994ae76b1454138ea70dba2c1d2f94f5aa307796)
(dianders: slight cleanup with converting bitfield to bool)
Reviewed-on: https://gerrit-int.chromium.org/18386
Tested-by: Doug Anderson <dianders@google.com>
Commit-Ready: Doug Anderson <dianders@google.com>
Reviewed-by: Doug Anderson <dianders@google.com>
Olof Johansson [Wed, 30 May 2012 11:18:18 +0000 (04:18 -0700)]
mfd: tps65090: remove platform data
Platform data isn't really needed for this MFD driver; the regulator
data is not passed in through it and the MFD subdev information isn't
really a function of board configuration. So it makes perfect sense to
just hardcode the cells in the driver and not having to specify them on
every board, etc.
BUG=chrome-os-partner:9776
TEST=build, boot, see graphics on console
Change-Id: I94ddd28b037027fdfab5d41a741d8ffedac97ae8
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/18606
Reviewed-by: Doug Anderson <dianders@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Olof Johansson [Wed, 9 May 2012 04:19:58 +0000 (21:19 -0700)]
mfd: tps65090: convert to irq_domain
Convert the tps65090 mfd driver to deal with irq domains instead of
hardcoded irq base.
BUG=chrome-os-partner:9776
TEST=build, boot, see graphics on console
Change-Id: I862c547f4ee45962e9e60ecf9a1db9223e215f87
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/18605
Reviewed-by: Doug Anderson <dianders@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Doug Anderson [Thu, 19 Jan 2012 21:00:51 +0000 (13:00 -0800)]
CHROMIUM: Add PRESUBMIT.cfg to disable whitespace / license check.
This makes it so that we don't need to run 'repo upload --no-verify'.
NOTE: This still doesn't quite put us on par with the normal kernel,
since the pre-upload hook does do some things hardcoded with the
normal path to the kernel in it. We should probably fix that.
BUG=None
TEST=Tried repo upload on sample revert of
'
1d01e738ef649fa8946d67091fff96feefe99988' and only saw warning
about 'BUG=' being missing.
Signed-off-by: Doug Anderson <dianders@chromium.org>
(cherry picked from commit
b6d5c901adbbd8f8ed6b8af13acedae633807481)
Change-Id: I819e083f519ff69ebf56a6ffdc9f367d68151a55
Reviewed-on: https://gerrit-int.chromium.org/18542
Commit-Ready: Doug Anderson <dianders@google.com>
Tested-by: Doug Anderson <dianders@google.com>
Reviewed-by: Katie Roberts-Hoffman <katierh@google.com>
Vincent Palatin [Tue, 15 May 2012 18:29:34 +0000 (11:29 -0700)]
CHROMIUM: mfd: chromeos_ec: add I2C pass-through and other firmware bits
Add an I2C adapter acting as a pass-through to send firmware update EC
commands from userspace (e.g. flashrom).
Also add sysfs nodes to get firmware version and other EC info.
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BUG=chrome-os-partner:8865
TEST=on Daisy, run flashrom -p internal:bus=lpc -w ec.bin
Change-Id: Ib58b183da0e6c79d17689e057b24aae961fdd128
Reviewed-on: https://gerrit-int.chromium.org/17856
Commit-Ready: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Vincent Palatin [Tue, 15 May 2012 18:29:34 +0000 (11:29 -0700)]
CHROMIUM: mfd: chromeos_ec: update EC<->AP protocol
we switch to a common protocol for all platforms.
This will allow us to support flashing commands.
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BUG=chrome-os-partner:9614
TEST=on Daisy, test keyboard input in ChromeOS with new EC.
Change-Id: If5304fabffaa932304bbe7ba1e21d5ee653a2c96
Reviewed-on: https://gerrit-int.chromium.org/17855
Reviewed-by: Luigi Semenzato <semenzato@google.com>
Commit-Ready: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Vincent Palatin [Wed, 16 May 2012 15:34:20 +0000 (08:34 -0700)]
CHROMIUM: mfd: chromeos_ec: use threaded irq for EC
It suits better the I2C-based MFD model and will let us more room to
implement IRQ muxing with an irqchip and level triggered interrupt.
The irq thread is scheduled by SCHED_FIFO which is higher priority than
SCHED_OTHER used by the current workqueue.
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BUG=chrome-os-partner:9594
TEST=on Daisy2 board, test keyboard input in ChromeOS browser.
(cherry picked from commit
c370a8a7d19451adac19cb26bcef06620e2f3d3f)
Change-Id: Ieb8af462d89d792b901381d32f13c9ae28f5e48d
Reviewed-on: https://gerrit-int.chromium.org/17854
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Luigi Semenzato <semenzato@google.com>
Commit-Ready: Vincent Palatin <vpalatin@chromium.org>
Luigi Semenzato [Thu, 17 May 2012 19:45:32 +0000 (12:45 -0700)]
CHROMIUM: mkbp: add keyboard driver
This adds the Matrix Keyboard Protocol driver to kernel 3.4.
This driver is used by Chrome devices.
BUG=chrome-os-partner:8917
TEST=ran the factory keyboard test
Change-Id: I1f3ecd9add0f4a954ed524cccdb7980df06938bd
Signed-off-by: Luigi Semenzato <semenzato@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/17756
Commit-Ready: Luigi Semenzato <semenzato@google.com>
Tested-by: Luigi Semenzato <semenzato@google.com>
Reviewed-by: Olof Johansson <olofj@google.com>
Luigi Semenzato [Thu, 17 May 2012 19:02:26 +0000 (12:02 -0700)]
CHROMIUM: mfd: add chromeos_ec driver to kernel 3.4
This adds the chromeos-ec driver.
BUG=chrome-os-partner:8917
TEST=none (not configured yet)
Change-Id: I999b1d4cb89ce62900659eb0ad7ebbb883f09b50
Signed-off-by: Luigi Semenzato <semenzato@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/17751
Commit-Ready: Luigi Semenzato <semenzato@google.com>
Reviewed-by: Luigi Semenzato <semenzato@google.com>
Tested-by: Luigi Semenzato <semenzato@google.com>
Reviewed-by: Olof Johansson <olofj@google.com>
Olof Johansson [Sun, 27 May 2012 00:12:20 +0000 (17:12 -0700)]
regulator: tps65090: move to device tree based probing
Move away from the platform device probing to a model that only uses device-tree.
There were no in-tree users of the old configuration method, and all known platforms
where this device is in use are ARM platforms that are enabled for device tree,
which makes this a good target for this conversion.
BUG=chrome-os-partner:9776
TEST=build, boot, see graphics on console
Change-Id: I1fc85512ba5757ae7ec598781ea3da5d4adacace
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/18607
Reviewed-by: Doug Anderson <dianders@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Axel Lin [Sat, 24 Mar 2012 02:56:00 +0000 (10:56 +0800)]
regulator: tps65090: Use IS_ERR to check return value of regulator_register
regulator_register never returns NULL.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked by: Venu Byravarasu <vbyravarasu@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
(cherry picked from commit
0ca2d6e65268477a53f959320a43d13b0c4d6b70)
Signed-off-by: Olof Johansson <olofj@chromium.org>
Change-Id: I8da8a184acb381bc0cf9e5bda78335b4edb58f4d
Reviewed-on: https://gerrit-int.chromium.org/17352
Reviewed-by: Doug Anderson <dianders@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Axel Lin [Sat, 24 Mar 2012 02:57:53 +0000 (10:57 +0800)]
regulator: Remove _en_reg, _en_bit and _ops parameters from tps65090_REG macro
Both _en_bit and _ops parameters for all DCDCs and FETs are the same, so we
can hardcode it in tps65090_REG macro.
_en_reg can be calculated by _id + 12, so we can also remove it.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked by: Venu Byravarasu <vbyravarasu@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
(cherry picked from commit
4b3bd55f5445648f981669758599a6172760d37d)
Signed-off-by: Olof Johansson <olofj@chromium.org>
Change-Id: I90eb63ff2f9546b19076c03ede0a6a3ea6286b6d
Reviewed-on: https://gerrit-int.chromium.org/17353
Reviewed-by: Doug Anderson <dianders@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Venu Byravarasu [Thu, 22 Mar 2012 13:04:09 +0000 (18:34 +0530)]
regulator: Add TPS65090 regulator driver
Add TPS65090 regulator driver
TPS65090 PMIC from TI consists of 3 step down converters,
2 always on LDOs and 7 current limited load switches. The
output voltages are ON/OFF controllable and are meant to
supply power to the components on target board.
Signed-off-by: Venu Byravarasu <vbyravarasu@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
(cherry picked from commit
452534e50780697a7e1d3cf87cdfdd2b5a0d3c6b)
Signed-off-by: Olof Johansson <olofj@chromium.org>
Change-Id: I6939ece1153eefc34f7a8906f3e8190c9e9598ec
Reviewed-on: https://gerrit-int.chromium.org/17351
Reviewed-by: Doug Anderson <dianders@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Olof Johansson [Wed, 9 May 2012 04:57:42 +0000 (21:57 -0700)]
mfd: tps65090: fix typo in subdevs
I'm guessing it's a remaining copy-and-paste error from when
the driver framework was based on tps65910.
Change-Id: I2c919108bda6fee68d2a751f13f97dc5e78d16fb
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/17356
Reviewed-by: Doug Anderson <dianders@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Olof Johansson [Thu, 3 May 2012 20:55:23 +0000 (13:55 -0700)]
CHROMIUM: ARM: exynos: soft power off
BUG=chrome-os-partner:9130
TEST=shutdown -P now, watch it power off
Change-Id: I5baadd5e577649bc0fead9d061dcee4f3da07076
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/19375
Reviewed-by: Doug Anderson <dianders@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Reviewed-by: Olof Johansson <olofj@google.com>
Commit-Ready: Doug Anderson <dianders@google.com>
Olof Johansson [Wed, 20 Jun 2012 18:53:33 +0000 (11:53 -0700)]
Merge branch 'topic-0620/samsung-pm-3.4' into chromeos-exynos-3.4
* topic-0620/samsung-pm-3.4: (32 commits)
CHROMIUM: exynos: pwm: Cosmetic tidy of PWM variable names
CHROMIUM: exynos: Stop the PWM timer while configuring it.
CHROMIUM: exynos: Ensure the manual update bit is off before setting it.
exynos5: cpufreq: updated asv voltage table for cpufreq
exynos: daisy: Add support for controlling the 32KHz peripheral clock
trivial: regulator: Fix indentation in MAX77686
ARM: exynos: Add thermal sensor driver platform data support
thermal: exynos: Register the tmu sensor with the kernel thermal layer
thermal: exynos5: Add exynos5 thermal sensor driver support
hwmon: exynos4: Move thermal sensor driver to driver/thermal directory
thermal: Add generic cpufreq cooling implementation
ARM: EXYNOS5: Fix i2c suspend/resume issue
ARM: Add missing clock definition
ARM: EXYNOS: Add WDT reset register definitions
regulator: Support for PMIC-MAX77686.
mfd: Add suport for MAX77686.
i2c: exynos: Add fix for i2c suspend/resume
ARM: EXYNOS: Select ARM_CPU_SUSPEND & S5P_SLEEP if CPU_IDLE enabled
UPSTREAM: cpufreq: exynos: Show list of available frequencies
UPSTREAM: arm: exynos: Adapt to cpuidle core time keeping and irq enable
...
Conflicts:
arch/arm/mach-exynos/include/mach/regs-pmu.h
Change-Id: I1d871adc49be46453f87e6f4487a1711065fc2f1
Olof Johansson [Wed, 20 Jun 2012 18:53:16 +0000 (11:53 -0700)]
Merge branch 'topic-0620/samsung-usb-3.4' into chromeos-exynos-3.4
* topic-0620/samsung-usb-3.4:
usb: ehci: Add vbus setup function to the s5p ehci glue layer
usb: dwc3: Add vbus setup function to the exynos dwc3 glue layer
usb: xhci: Fix error handling in xhci platform
usb: exynos: hack: Removing code for mem request for xhci
usb: dwc3: exynos: hack: Putting the core in host mode
dt: DWC3: exynos: Add DT support to DWC3
dt: EHCI: Add DT support to S5P EHCI driver
DT: OHCI: exynos: Add DT support to OHCI
Olof Johansson [Wed, 20 Jun 2012 18:52:59 +0000 (11:52 -0700)]
Merge branch 'topic-0620/samsung-i2c-3.4' into chromeos-exynos-3.4
* topic-0620/samsung-i2c-3.4:
i2c-s3c2410: Get the i2c bus number from alias id
CHROMIUM: i2c: chromeos_ec: add I2C pass-through
i2c-s3c2410: Use of_match_ptr for defining the of_match_table
UPSTREAM: i2c: Dynamically assign adapter id if it wasn't explictly specified
UPSTREAM: i2c-s3c2410: Add HDMIPHY quirk for S3C2440
UPSTREAM: i2c-s3c2410: Rework device type handling
Olof Johansson [Wed, 20 Jun 2012 18:52:46 +0000 (11:52 -0700)]
Merge branch 'topic-0620/samsung-gscalar-3.4' into chromeos-exynos-3.4
* topic-0620/samsung-gscalar-3.4:
Add V4L2_CID macros for GScaler custom control
media: gscalar: Fix build warnings due to possible uninitialized usage
ARM: EXYNOS: GSCALAR: Add IOMMU mapping to GSC probe
Media: Exynos: Add VB2 modifications for G-Scalar driver
Media: Exynos: Header file support for G-Scaler driver
include: mdev: Add driver_put and module_name_to_driver_data
media: exynos: Fix Tiled format in Gscalar
media: exynos: gscaler: Don't register Gscaler capture device
media: exynos: Add new formats in gscalar driver
media: gscaler: Add new driver for general scaler
UPSTREAM: media: media-dev: Add media devices for EXYNOS5
Olof Johansson [Wed, 20 Jun 2012 18:52:35 +0000 (11:52 -0700)]
Merge branch 'topic-0620/samsung-g2d-mfc-hdmi-3.4' into chromeos-exynos-3.4
* topic-0620/samsung-g2d-mfc-hdmi-3.4: (24 commits)
Media: exynos/mfc: revert VIDIOC_EXPBUF support in MFC decoder
TEMP s5p-mfc: Hack to leave unconsumed mfc input data
TEMP: s5p-mfc: Set display delay to 0x8
HACK: Media: Mixer: Add Xrandr clone logic
media: tv: Switch to i2c8 for HDMI-PHY on Exynos
media: tvout: Fix compilation error on enabling HDMI-CEC on exynos5
arm: exynos: Add missing register definitions for HDMI-CEC
tv: hdmi: Fix build warning in hdmi driver
tv: mixer: Fix build warning in mixer-videobuf2 interface layer
tv: mixer: Fix build warning due to possible uninitialized usage
tv: mixer: Fix build warning due to possible uninitialized usage
ARM: EXYNOS: MFC: Add IOMMU mapping to MFC probe
s5p-mfc: Update the codec_type list in the header
s5p-mfc: MFC v6 requires MV buffer reg update
s5p-mfc: split error condition check
Media: Exynos: MFC fixes to support OMX
MFC: update MFC v4l2 driver to support MFC6.x
ARM: EXYNOS: MIXER: Add IOMMU mapping to MIXER probe
include: v4l: Add exynos5 hdmi related macros
v4l2-common: Add modes supported by exynos5 hdmi
...
Olof Johansson [Wed, 20 Jun 2012 18:52:21 +0000 (11:52 -0700)]
Merge branch 'topic-0620/samsung-fimd-mipi-3.4' into chromeos-exynos-3.4
* topic-0620/samsung-fimd-mipi-3.4:
video: s3c-fb: Pass clock_rate from FIMD platdata
video: s3c-fb: add eDP clock support for s3c-fb
video: s3c-fb: Fix unused variable build warning
video: s3c-fb: Fix function protype build warning
CHROMIUM: exynos: Hack to quiet errors on the console.
CHROMIUM: exynos: Use & to check a bitfield in the mipi driver, not &&.
drivers/video: Enabling MIPI DSIM for DRM
video: backlight: add toshiba mipi-to-lcd driver
video: MIPI: Add code changes for DT support
video: Add MIPI DSI driver support for samsung
Exynos5: FIMD: Fix s2r support for LCD
HACK: video: s3c-fb: add clk and clk_parent for samsung display controller
video: fb: add alpha blending, chroma keying and window positioning
video: s3c-fb: add AUXDATA for device tree support
media: video/Kconfig: Remove unwanted Kconfig dependencies for FIMD
Olof Johansson [Wed, 20 Jun 2012 18:52:04 +0000 (11:52 -0700)]
Merge branch 'topic-0620/samsung-dwmmc-3.4' into chromeos-exynos-3.4
* topic-0620/samsung-dwmmc-3.4:
dwmci: pltfm: Fix build warning in dwmci platform driver
mmc: dwmci: Fix build warning in dwmci due to possible uninitialized usage
UPSTREAM: mmc: dw_mmc: fix the transmission handling in IDMAC
mmc: dw_mmc: Add per instance host capabilities on exynos5
Olof Johansson [Wed, 20 Jun 2012 18:51:51 +0000 (11:51 -0700)]
Merge branch 'topic-0620/samsung-drm-3.4' into chromeos-exynos-3.4
* topic-0620/samsung-drm-3.4:
drm/exynos: Adding IOMMU mapping to NON-CONTIG gem framework
drm/exynos: Add IOMMU support to DRM and DRM-FIMD
drm/exynos: Enabling DPCLKCON required for eDP in DRM FIMD
drm/exynos: setting up DRM FIMD clock
drm/exynos: modifying the resource number for VSYNC interrupt for FIMD
drm/exynos: Modifying exynos drm fimd to support exynos5
drm/exynos: Fix pitch rounding error.
drm/exynos: Add exynos drm specific fb_mmap function
drm/exynos: Add mmap function to exynos drm dmabuf module
UPSTREAM: drm/exynos: added drm prime feature.
Olof Johansson [Wed, 20 Jun 2012 18:51:35 +0000 (11:51 -0700)]
Merge branch 'topic-0620b/samsung-edp-3.4' into chromeos-exynos-3.4
* topic-0620b/samsung-edp-3.4:
drivers: video: exynos: Fix compiler warnings
drivers: video: exynos: Reset and initialize DP before requesting irq
video: dp: add match table for display port driver
video: exynos-dp: Add support for h/w link training
video: exynos-dp: Add support for EVT1 and fix crash when 2 LANES are used
Olof Johansson [Wed, 20 Jun 2012 18:51:20 +0000 (11:51 -0700)]
Merge branch 'topic-0620/samsung-audio-3.4' into chromeos-exynos-3.4
* topic-0620/samsung-audio-3.4:
ASOC: SAMSUNG: Add samsung i2s dev name to make work with DT
i2s: samsung: Fix build warning due to possible uninitialized usage
asoc: samsung: Fix compilation break in Samsung's PCM driver
ASOC: SAMSUNG: Use of_match_ptr for defining the of_match_table
UPSTREAM: ASoC: Samsung: Update Kconfig for Exynos5250 and Exynos4412
ASOC: SAMSUNG: Add dma_prop variable in s3c_dma_params
ASoC: SAMSUNG: Add DT support for i2s
UPSTREAM: dma: pl330: assign a new cookie when restarting tx descriptors in cyclic mode
Olof Johansson [Wed, 20 Jun 2012 18:50:59 +0000 (11:50 -0700)]
Merge branch 'topic-0620/samsung-spi-3.4' into chromeos-exynos-3.4
* topic-0620/samsung-spi-3.4:
mtd: m25p80: Add support for Winbond W25Q80BW
ARM: Exynos4: Fix the incorrect hierarchy of spi controller bus clock
spi: s3c64xx: add device tree support
spi: s3c64xx: Remove the 'set_level' callback from controller data
ARM: Samsung: Modify s3c64xx_spi{0|1|2}_set_platdata function
ARM: Samsung: Remove pdev pointer paremeter from spi gpio setup functions
spi: s3c64xx: move controller information into driver data
spi: s3c64xx: remove unused S3C64XX_SPI_ST_TRLCNTZ macro
Olof Johansson [Wed, 20 Jun 2012 18:50:37 +0000 (11:50 -0700)]
Merge branch 'topic-0620b/samsung-cros-3.4' into chromeos-exynos-3.4
* topic-0620b/samsung-cros-3.4: (28 commits)
CHROMIUM: ARM: exynos: hack in machine file
HACK: Don't init wm8994 except on smdk5250
CHROMIUM: ARM: Exynos5: Manually register spidev on spi1.
CHROMIUM: Daisy: Change backlight PWM frequency to 1KHz
CHROMIUM: ARM: exynos: add UART3 to DEBUG_LL ports
CHROMIUM: ARM: Exynos5: Configure spi_1 for snow and daisy.
CHROMIUM: ARM: exynos: daisy: specify power key in dts
CHROMIUM: ARM: cros5250: Fix the name of the 32k peripheral clock
ARM: exynos: dt: setup wlan+bt
CHROMIUM: ARM: cros5250: add Camera device tree data
CHROMIUM: ARM: cros5250: add WWAN device tree data
CHROMIUM: ARM: cros5250: add hsicreset device tree data
CHROMIUM: exynos: Add the light sensor I2C address and bus information.
CHROMIUM: ARM: cros5250: add tps65090 device tree data
CHROMIUM: dts: add TPM info for daisy/snow
CHROMIUM: dts: Modified the maximum i2c bus frequency for Snow/Daisy
CHROMIUM: dts: Enable the peripheral and coprocessor clocks on Daisy/Snow
CHROMIUM: dts: Add gpios for vbus control to Daisy/Snow dt
CHROMIUM: cros5250: fixup MMC3 fdt
CHROMIUM: dts: exynos: Disable i2c6
...
Prathyush K [Thu, 14 Jun 2012 16:08:50 +0000 (21:38 +0530)]
CHROMIUM: ARM: exynos: hack in machine file
This is an extension of Olof's patch:
"HACK: ARM: exynos: hack in daisy panel init for now" from chromeos-3.4
This includes support for DRM and EDP as well. This should be removed once
resolution and other paramters are passed from device tree.
Change-Id: I1359b0180a2b93088017b9a0820745fe86d926b4
Signed-off-by: Prathyush K <prathyush.k@samsung.com>
Doug Anderson [Fri, 25 May 2012 18:08:30 +0000 (11:08 -0700)]
HACK: Don't init wm8994 except on smdk5250
The wm8994 needs to be device tree enabled, but it's not. We'll
hack it out for now.
BUG=None
TEST=Boot and don't see errors with next CL that moves i2c numbers
(AKA change ID Icde948b84991ae2f106e91e0629fd8cccac26f6a).
Change-Id: Ia433e9c77e1f47d0f4c015351e0349041959d044
Signed-off-by: Doug Anderson <dianders@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/18412
Tested-by: Doug Anderson <dianders@google.com>
Reviewed-by: Abhilash Kesavan <a.kesavan@samsung.com>
Commit-Ready: Doug Anderson <dianders@google.com>
Bryan Freed [Wed, 30 May 2012 20:44:23 +0000 (13:44 -0700)]
CHROMIUM: ARM: Exynos5: Manually register spidev on spi1.
This gives user space apps access to spi1 through /dev/spidev1.0.
BUG=chrome-os-partner:9777
TEST=Confirm flashrom -p linux_spi:dev=/dev/spidev1.0 --get-size works.
Change-Id: Ieb957f9b191895e656e11323fd82fd7d68f18007
Signed-off-by: Bryan Freed <bfreed@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/18705
Commit-Ready: Bryan Freed <bfreed@google.com>
Reviewed-by: Bryan Freed <bfreed@google.com>
Tested-by: Bryan Freed <bfreed@google.com>
Reviewed-by: Olof Johansson <olofj@google.com>
Bernie Thompson [Fri, 23 Mar 2012 22:12:05 +0000 (15:12 -0700)]
CHROMIUM: Daisy: Change backlight PWM frequency to 1KHz
The LCD backlight on Daisy is specified to be 900-1100Hz, the original
clock for the PWM was ~1000Khz, this CL sets the PWM frequency to ~1000Hz.
This change will also impact the SMDK, it will likely resolve a similar
backight not recovering problem there.
This is roughly the same change that happened here:
<https://gerrit-int.chromium.org/15729>
...so keeping the old commit message...
BUG=chrome-os-partner:10126
TEST=Manual, verify LCD backlight PWM is at 1000Hz.
Change-Id: I4e5c956b2d062d1ca75b36f4cb06364b40f3da42
Signed-off-by: Bernie Thompson <bhthompson@chromium.org>
Signed-off-by: Doug Anderson <dianders@chromium.org>
Olof Johansson [Fri, 13 Apr 2012 17:47:20 +0000 (10:47 -0700)]
CHROMIUM: ARM: exynos: add UART3 to DEBUG_LL ports
Turns out that the uart we're using is not supported for DEBUG_LL on
the samsung platform port. I'll upstream this as well.
BUG=none
TEST=boot with DEBUG_LL, see output on serial
Change-Id: Ia8e1d8243205a990acb2ed75a33c2e65c913969d
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/15740
Reviewed-by: Doug Anderson <dianders@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Bryan Freed [Thu, 7 Jun 2012 16:57:36 +0000 (09:57 -0700)]
CHROMIUM: ARM: Exynos5: Configure spi_1 for snow and daisy.
Disable spi_0 and spi_2.
Configure gpios, num-cs, and parent clock for spi_1.
BUG=chrome-os-partner:9777
TEST=Confirm spi_0, 1, and 2 warnings longer occur in the boot dmesg.
Change-Id: I31512d601d4ab712d7d9041ac6ce674113ab58e5
Reviewed-on: https://gerrit-int.chromium.org/19281
Tested-by: Bryan Freed <bfreed@google.com>
Reviewed-by: Olof Johansson <olofj@google.com>
Commit-Ready: Bryan Freed <bfreed@google.com>
Olof Johansson [Tue, 5 Jun 2012 22:42:16 +0000 (15:42 -0700)]
CHROMIUM: ARM: exynos: daisy: specify power key in dts
BUG=chrome-os-partner:8925
TEST=evtest
Change-Id: Ib1f149899728735e767b4977974a0d0fab5f8a13
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/19114
Commit-Ready: Olof Johansson <olofj@google.com>
Reviewed-by: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Reviewed-by: Doug Anderson <dianders@google.com>
Doug Anderson [Tue, 5 Jun 2012 23:09:10 +0000 (16:09 -0700)]
CHROMIUM: ARM: cros5250: Fix the name of the 32k peripheral clock
The name of this clock was corrected in my fixup to this CL:
https://gerrit-int.chromium.org/18444
...unfortunately, I hadn't realized that I also needed to update the
device tree. This fixes it.
BUG=chrome-os-partner:8923
TEST=On Daisy can now see WiFi card. AKA, see this in boot messages:
[ 9.640000] mmc2: new high speed SDIO card at address 0001
TEST=No longer see errors about 32khz clock in dmesg. Was seeing:
[ 0.700000] max77686 0-0009: No configuration data for regulator EN32KHZ
Change-Id: Ia113ebe416b07a0355fe45995439e5043bdce46e
Signed-off-by: Doug Anderson <dianders@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/19091
Tested-by: Doug Anderson <dianders@google.com>
Reviewed-by: Sam Leffler <sleffler@google.com>
Commit-Ready: Doug Anderson <dianders@google.com>
Sam Leffler [Fri, 25 May 2012 00:21:41 +0000 (17:21 -0700)]
ARM: exynos: dt: setup wlan+bt
Initialize the gpio's required to probe the SDIO wlan+bt devices.
Signed-off-by: Sam Leffler <sleffler@chromium.org>
BUG=chrome-os-partner:10088
TEST=boot on snow and verify wifi is probed
Change-Id: Ice9ecd3eea265b2e8cf7f34c759c4c9c844c8ebc
Reviewed-on: https://gerrit-int.chromium.org/18766
Tested-by: Sam Leffler <sleffler@google.com>
Reviewed-by: Olof Johansson <olofj@google.com>
Commit-Ready: Sam Leffler <sleffler@google.com>
Reviewed-by: Sam Leffler <sleffler@google.com>
Terry Lambert [Thu, 31 May 2012 22:20:01 +0000 (15:20 -0700)]
CHROMIUM: ARM: cros5250: add Camera device tree data
Default the camera power regulator in the PMIC to "on"
BUG=chrome-os-partner:8927
TEST=add HSIC change, build, boot, lsusb, see camera device
Change-Id: Ibf9bc32dd84d6bb483818e21ec1719ed057d106d
Reviewed-on: https://gerrit-int.chromium.org/18791
Commit-Ready: Terry Lambert <tlambert@google.com>
Reviewed-by: Terry Lambert <tlambert@google.com>
Tested-by: Terry Lambert <tlambert@google.com>
Terry Lambert [Thu, 31 May 2012 22:15:49 +0000 (15:15 -0700)]
CHROMIUM: ARM: cros5250: add WWAN device tree data
Default the GSM miodem power regulator in the PMIC to "on"
BUG=chrome-os-partner:8924
TEST=add HSIC change, build, boot, lsusb, see 3G modem device
Change-Id: I374b83e23aca602222dcfe137654aa4cbd4d70b0
Reviewed-on: https://gerrit-int.chromium.org/18790
Reviewed-by: Olof Johansson <olofj@google.com>
Tested-by: Terry Lambert <tlambert@google.com>
Commit-Ready: Terry Lambert <tlambert@google.com>
Reviewed-by: Terry Lambert <tlambert@google.com>
Terry Lambert [Thu, 31 May 2012 22:03:57 +0000 (15:03 -0700)]
CHROMIUM: ARM: cros5250: add hsicreset device tree data
Describes the HSIC reset line gpio as a fixed-regulator, defaults it on;
minimal metadata is included for uniqueness, naming identification.
BUG=chrome-os-partner:9351
TEST=add camera/3G/ALS FET change, build, boot, lsusb, see camera or 3G
modem device
Change-Id: If215558bab480754d0cc3637edd1ece6409d482c
Reviewed-on: https://gerrit-int.chromium.org/18786
Tested-by: Terry Lambert <tlambert@google.com>
Reviewed-by: Olof Johansson <olofj@google.com>
Reviewed-by: Terry Lambert <tlambert@google.com>
Commit-Ready: Terry Lambert <tlambert@google.com>
Bryan Freed [Wed, 30 May 2012 21:50:00 +0000 (14:50 -0700)]
CHROMIUM: exynos: Add the light sensor I2C address and bus information.
Add this information to the cros-common dtsi so we can share fdt
between boards.
BUG=chrome-os-partner:8928
TEST=Verify /sys/class/iio/devices/iio:device0/ is populated.
Change-Id: I03ad5998cdbe951de8af6a7dd7cacd92d0150d5e
Signed-off-by: Bryan Freed <bfreed@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/18680
Tested-by: Bryan Freed <bfreed@google.com>
Reviewed-by: Olof Johansson <olofj@google.com>
Commit-Ready: Bryan Freed <bfreed@google.com>
Olof Johansson [Wed, 30 May 2012 09:24:17 +0000 (02:24 -0700)]
CHROMIUM: ARM: cros5250: add tps65090 device tree data
Just descring the FETs right now.
BUG=chrome-os-partner:9776
TEST=build, boot, see graphics on console
Change-Id: I12ab7d74807f323077a78d4e07f4d081c284a659
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/18604
Reviewed-by: Doug Anderson <dianders@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Luigi Semenzato [Fri, 25 May 2012 19:44:01 +0000 (12:44 -0700)]
CHROMIUM: dts: add TPM info for daisy/snow
BUG=chrome-os-partner:8919
TEST=tpmc startup; tpmc test
Change-Id: I1524b4098ea36c44887188557d0845939c0533e1
Reviewed-on: https://gerrit-int.chromium.org/18425
Reviewed-by: Olof Johansson <olofj@google.com>
Commit-Ready: Luigi Semenzato <semenzato@google.com>
Tested-by: Luigi Semenzato <semenzato@google.com>
Abhilash Kesavan [Tue, 22 May 2012 17:58:05 +0000 (10:58 -0700)]
CHROMIUM: dts: Modified the maximum i2c bus frequency for Snow/Daisy
Increase the requested i2c bus frequency to 66KHz (from 20KHz) for
all i2c channels on Daisy/Snow.
Change-Id: I843f88b1d5b70098c1ee73fff8371a349dc0e684
Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Abhilash Kesavan [Fri, 25 May 2012 21:28:29 +0000 (14:28 -0700)]
CHROMIUM: dts: Enable the peripheral and coprocessor clocks on Daisy/Snow
Enabling the 32KHz peripheral and coprocessor clocks at boot time.
Bug=None
Test=Build, boot and see the bootup messages showing the regulator
enabling these clocks.
Change-Id: I24085d8cb151a455c5ad0643ae36c7f242fa7032
Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Reviewed-on: https://gerrit-int.chromium.org/18447
Reviewed-by: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Abhilash Kesavan [Fri, 25 May 2012 20:05:16 +0000 (13:05 -0700)]
CHROMIUM: dts: Add gpios for vbus control to Daisy/Snow dt
Add USB 2.0 EHCI and USB 3.0 XHCI vbus control gpio pins to the
Daisy/Snow device tree file.
Bug=chrome-os-partner:9156
Test=Booted and tested USB 2.0/3.0 port on Daisy
Change-Id: Ic2d35b9734343b9b346fd7c4139e93421c02d08f
Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Reviewed-on: https://gerrit-int.chromium.org/18442
Reviewed-by: Doug Anderson <dianders@google.com>
Commit-Ready: Doug Anderson <dianders@google.com>
Sam Leffler [Fri, 25 May 2012 16:03:49 +0000 (09:03 -0700)]
CHROMIUM: cros5250: fixup MMC3 fdt
Convert the 3.3 MMC3 platform initializations to FDT.
Signed-off-by: sleffler@chromium.org
BUG=chrome-os-partner:9843
TEST=boot and verify device tree settings via /proc
Change-Id: I15daca841c5796f5368008c4f2f15c4765391788
Reviewed-on: https://gerrit-int.chromium.org/18414
Reviewed-by: Doug Anderson <dianders@google.com>
Commit-Ready: Sam Leffler <sleffler@google.com>
Tested-by: Sam Leffler <sleffler@google.com>
Doug Anderson [Fri, 25 May 2012 17:11:07 +0000 (10:11 -0700)]
CHROMIUM: dts: exynos: Disable i2c6
We don't use this i2c on our board. Mark as disabled. Before this
we were getting this error in the log:
[ 1.600000] s3c-i2c s3c2440-i2c.6: invalid gpio[0]: -22
[ 1.600000] s3c-i2c: probe of s3c2440-i2c.6 failed with error -22
BUG=None
TEST=Booted and didn't see the above error.
Change-Id: If3a676fe0839a3fc91eca696e5d2b5db55991151
Signed-off-by: Doug Anderson <dianders@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/18404
Tested-by: Doug Anderson <dianders@google.com>
Reviewed-by: Olof Johansson <olofj@google.com>
Commit-Ready: Doug Anderson <dianders@google.com>
Abhilash Kesavan [Thu, 24 May 2012 04:13:44 +0000 (21:13 -0700)]
CHROMIUM: exynos: daisy: Enable 32KHz AP clock
Ported over from chromeos-3.3.
The AP clock goes to the exynos CPU and is the source for the RTC.
Enable the clock to get the RTC going.
BUG=None
TEST=Boot and test RTC using hwclock on Daisy
Change-Id: Ief1a5616653db427987dafe49c2261c5849b63ea
Original-Signed-off-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Reviewed-on: https://gerrit-int.chromium.org/18279
Reviewed-by: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Doug Anderson [Fri, 25 May 2012 23:21:31 +0000 (16:21 -0700)]
CHROMIUM: exynos: dts: Take "smdk5250" out of daisy/snow dts
Daisy and snow have some important differences from smdk5250. Taking
this out allows us to check for smdk5250. Note that we really
shouldn't be testing for the board itself in the long term, but in the
short term it is helpful.
BUG=None
TEST=Compile and boot; notice that future patch with test for smdk5250
detects that snow is not smdk5250.
Change-Id: I52f01cc7355719e46dcd4dcf09ec9affa399133d
Signed-off-by: Doug Anderson <dianders@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/18459
Tested-by: Doug Anderson <dianders@google.com>
Reviewed-by: Abhilash Kesavan <a.kesavan@samsung.com>
Commit-Ready: Doug Anderson <dianders@google.com>
Doug Anderson [Fri, 18 May 2012 16:02:39 +0000 (09:02 -0700)]
CHROMIUM: ARM: exynos: daisy: dts: Refactor common dts between daisy and snow
Daisy and snow are so similar that we should share as much as possible
between them. This has the side effect of bring snow more up to date.
Also remove the @3a from hdcp as a cleanup.
BUG=None
TEST=Boot snow and daisy
TEST=Running 'dtc exynos5250-daisy.dts' before and after produce same
result (except exynos_hdcp@3a has 3a missing).
TEST=Running 'dtc exynos5250-snow.dts' before and after shows expected
changes.
Change-Id: Ieab6ed0c9492c43f11b77001e1e59ab98a345d82
Signed-off-by: Doug Anderson <dianders@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/17795
Tested-by: Doug Anderson <dianders@google.com>
Reviewed-by: Olof Johansson <olofj@google.com>
Commit-Ready: Doug Anderson <dianders@google.com>
Doug Anderson [Tue, 22 May 2012 19:22:04 +0000 (12:22 -0700)]
CHROMIUM: ARM: exynos: snow: dts: Disable mipi
Snow has nothing connected to MIPI. If you don't disable it and you
try to boot on snow, you'll get lines like:
[ 1.820000] mipi dsi interrupt source (0).
[ 1.820000] mipi dsi interrupt source (0).
BUG=None
TEST=Booted snow and didn't see errors.
Change-Id: I43a2f870909782b9f78785eb4d929067c0e7d588
Signed-off-by: Doug Anderson <dianders@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/18118
Tested-by: Doug Anderson <dianders@google.com>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Commit-Ready: Doug Anderson <dianders@google.com>
Ajay Kumar [Thu, 24 May 2012 13:54:15 +0000 (09:54 -0400)]
CHROMIUM: dts: add display port device node information to Daisy
This modifies the daisy dts file to disable eDP.
Change-Id: I3218bc396f50d9cf50899b347a441ef5f5b097b8
Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Olof Johansson [Thu, 26 Apr 2012 23:59:17 +0000 (16:59 -0700)]
CHROMIUM: ARM: exynos: add snow dts file
BUG=none
TEST=make dtbs
Change-Id: I583c71b6e00098ca50f74f6d9921f6dcc6a267ee
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/16559
Commit-Ready: Olof Johansson <olofj@google.com>
Reviewed-by: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Olof Johansson [Thu, 12 Apr 2012 23:23:21 +0000 (16:23 -0700)]
CHROMIUM: ARM: exynos: add dts for daisy
BUG=chrome-os-partner:8942
TEST=boot with USE=device_tree
Change-Id: Ic6f9fdf5a049cf6249c33c015adffa7d24bac6b2
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/15738
Reviewed-by: Doug Anderson <dianders@google.com>
Reviewed-by: Simon Glass <sjg@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Olof Johansson [Fri, 27 Apr 2012 00:00:14 +0000 (17:00 -0700)]
CHROMIUM: ARM: exynos: add dtb files to dtbs target
BUG=none
TEST=make dtbs
Change-Id: Ib4115d595eae899fd80d3ccc49bbb995fa94ec16
Signed-off-by: Olof Johansson <olofj@chromium.org>
Olof Johansson [Wed, 20 Jun 2012 18:47:51 +0000 (11:47 -0700)]
Merge branch 'topic-0620b/samsung-dt-3.4' into chromeos-exynos-3.4
* topic-0620b/samsung-dt-3.4: (32 commits)
ARM: EXYNOS5: Pass clock_rate from FIMD platdata
ARM: exynos: dt: add all i2c busses to auxdata
exynos5: dts: Modified the maximum i2c bus frequency for exynos5
arm: dts: add display port device node information
ARM: dts: Add nodes for spi controllers for Samsung Exynos5 platforms
ARM: dts: Add nodes for spi controllers for Samsung Exynos4 platforms
ARM: EXYNOS5: Add alias names for i2c controllers
CHROMIUM: ARM: dts: move i2c size/address-cells to dtsi file for exynos5250
arm: exynos5: dts: Move alias names from dts file to dtsi file
ARM: EXYNOS: Add 'sysmmu' property to DTS file for exynos5250
ARM: exynos: move sms911x device node to sromc bus on smdk
ARM: exynos: dts: add sromc bus with ranges
Add aliases for mshc controllers to determine the instance number of the controller.
ARM: EXYNOS5: Add support for MAX77686 chip and regulators.
ARM: EXYNOS5: Interchanging PA of sysmmu for MFC_L and MFC_R
ARM: EXYNOS5: Add EDP device and platform data.
ARM: Exynos5: Enable platform support for SPI controllers
ARM: Exynos4: Enable platform support for SPI controllers
ARM: EXYNOS: Adding DRM-FIMD platform data
ARM: EXYNOS5: Add mixer device DT support
...
Olof Johansson [Wed, 20 Jun 2012 18:39:51 +0000 (11:39 -0700)]
Merge branch 'topic-0620/samsung-arch-3.4' into chromeos-exynos-3.4
* topic-0620/samsung-arch-3.4: (34 commits)
arm: exynos5: add displayport setup
ARM: SAMSUNG: Add set platdata function for G2D
ARM: EXYNOS: SYSMMU: Add IOMMU machine support to Exynos5
ARM: EXYNOS: add setup functions for MIPI DSI
ARM: EXYNOS: Add clock setup functions for FIMD1
ARM: SAMSUNG: add mipi dsim platform specific changes
arm: exynos5: add display port clock instance
ARM: EXYNOS: Add DPCLK to plat data
S5P: SYSMMU: Remove System MMU device driver
ARM: EXYNOS: Adding DRM platform device
ARM: EXYNOS: Add reserve function to increase consistent memory
ARM: EXYNOS: Update Display block cfg and fimd bypass offset register
ARM: EXYNOS5: Setup legacy i2c controller interrupts on SMDK5250
ARM: EXYNOS: Add machine code to support watchdog reset
ARM: EXYNOS5: Add GPIO setup function for TV
ARM: EXYNOS5: Update clock file with hdmi clock
ARM: EXYNOS: Add configuration helper functions for TV/HDMI
ARM: EXYNOS5: Add DMA interface device into platform devices list
ARM: EXYNOS5: Add platform data for wm8994
ARM: EXYNOS: Add static mapping for EXYNOS Audio Subsystem
...
Olof Johansson [Wed, 20 Jun 2012 18:39:10 +0000 (11:39 -0700)]
Merge branch 'topic-0620b/samsung-3d-3.4' into chromeos-exynos-3.4
* topic-0620b/samsung-3d-3.4:
drm: vithar: don't default to enabled
arm: exynos5: Add G3D physical address on Exynos5
arm: exynos5: Add irq definitions for GPU
gpu: vithar: Add DVFS in Kconfig and fix compilation issues
gpu: vithar: Fix for deadlock in mali kbase.
gpu: vithar: Removal of UMP dependent code from Vithar
EXYNOS5: GPU: Makefile hack for vithar
gpu: vithar: Add vithar code base to kernel
Ajay Kumar [Tue, 29 May 2012 11:04:46 +0000 (07:04 -0400)]
ARM: EXYNOS5: Pass clock_rate from FIMD platdata
Passing clock rate from platform data to s3c-fb
Change-Id: I11e85107893d8c5c61a4c46436a07594f4100bbf
Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Olof Johansson [Wed, 9 May 2012 04:19:34 +0000 (21:19 -0700)]
ARM: exynos: dt: add all i2c busses to auxdata
Needed to match device ids for clocks, etc.
Change-Id: If15f98f5a2237fd5acf575d1c289af1769ffee8e
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/17354
Reviewed-by: Doug Anderson <dianders@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Abhilash Kesavan [Tue, 22 May 2012 17:58:05 +0000 (10:58 -0700)]
exynos5: dts: Modified the maximum i2c bus frequency for exynos5
Increase the requested i2c bus frequency to 66KHz (from 20KHz) for
all i2c channels on SMDK.
Change-Id: I54415ff3a5779b8e087b706c9770509bcfcd8147
Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Ajay Kumar [Thu, 24 May 2012 13:54:15 +0000 (09:54 -0400)]
arm: dts: add display port device node information
This modifies the smdk5250 dts file to support eDP.
Note: eDP is disabled on smdk5250.
Change-Id: I7bea7daab27216d509a8d0c09d3799754101a3fc
Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Thomas Abraham [Fri, 1 Jun 2012 09:57:23 +0000 (17:57 +0800)]
ARM: dts: Add nodes for spi controllers for Samsung Exynos5 platforms
Add device nodes for the three instances of spi controllers in Exynos5
platforms and enable instance spi 1 for smdk5250 board.
BUG=None
TEST=enable CONFIG_SPI_S3C64XX
Add Serial Flash part info in m25p80.c file
"{ "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) },"
enable CONFIG_MTD
enable CONFIG_MTD_OF_PARTS
enable CONFIG_MTD_CHAR
enable CONFIG_MTD_M25P80
build and boot smdk5250.
echo "HelloWorld" > /dev/mtd1
dd if=/dev/mtd1 of=/tmp/test count=10 bs=1 seek=1
cat /tmp/test
Change-Id: If2dbbdcda9b6011faf5f6d5029d07c97dcdcf427
Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
Reviewed-on: https://gerrit-int.chromium.org/17936
Reviewed-by: Bryan Freed <bfreed@google.com>
Reviewed-by: Olof Johansson <olofj@google.com>
Tested-by: Doug Anderson <dianders@google.com>
Commit-Ready: Doug Anderson <dianders@google.com>
Thomas Abraham [Fri, 1 Jun 2012 09:53:24 +0000 (17:53 +0800)]
ARM: dts: Add nodes for spi controllers for Samsung Exynos4 platforms
Add device nodes for the three instances of spi controllers in Exynos4
platforms. Enable instance spi 2 for smdkv310 board and disable all
spi instances for origen board.
BUG=None
TEST=None
Change-Id: Idfc2cf965609581d7ea4b156b4c14198577fa45d
Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Reviewed-on: https://gerrit-int.chromium.org/18957
Reviewed-by: Olof Johansson <olofj@google.com>
Tested-by: Doug Anderson <dianders@google.com>
Commit-Ready: Doug Anderson <dianders@google.com>
Padmavathi Venna [Sat, 19 May 2012 10:44:57 +0000 (16:14 +0530)]
ARM: EXYNOS5: Add alias names for i2c controllers
Add aliases for i2c controllers to determine the instance
number of the controller
BUG=None
TEST=Compile and booted
Change-Id: Icde948b84991ae2f106e91e0629fd8cccac26f6a
Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
Signed-off-by: Doug Anderson <dianders@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/17929
Tested-by: Doug Anderson <dianders@google.com>
Reviewed-by: Taylor Hutt <thutt@google.com>
Commit-Ready: Doug Anderson <dianders@google.com>
Reviewed-by: Doug Anderson <dianders@google.com>
Olof Johansson [Mon, 14 May 2012 16:52:04 +0000 (09:52 -0700)]
CHROMIUM: ARM: dts: move i2c size/address-cells to dtsi file for exynos5250
Change-Id: I8df46ef8609489f253d2ceae135f57a0113b59fe
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/17345
Reviewed-by: Doug Anderson <dianders@google.com>
Reviewed-by: Simon Glass <sjg@google.com>
Commit-Ready: Olof Johansson <olofj@google.com>
Tested-by: Olof Johansson <olofj@google.com>
Banajit Goswami [Thu, 24 May 2012 12:48:48 +0000 (18:18 +0530)]
arm: exynos5: dts: Move alias names from dts file to dtsi file
Alias names need not be repeated for every board file.
So move alias names from dts file to dtsi file.
BUG=None
TEST=Compile and boot.
Change-Id: I02918882a2c9b1a1e3301e43736d58152143fc8f
Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
Signed-off-by: Doug Anderson <dianders@chromium.org>
(dianders) Fixed problems compiling non-SMDK dts files.
Reviewed-on: https://gerrit-int.chromium.org/18407
Tested-by: Doug Anderson <dianders@google.com>
Reviewed-by: Olof Johansson <olofj@google.com>
Commit-Ready: Doug Anderson <dianders@google.com>
Olof Johansson [Wed, 20 Jun 2012 17:32:05 +0000 (10:32 -0700)]
Merge ranch 'topic-0620/samsung-vb2-3.4' into chromeos-exynos-3.4
* topic-0620/samsung-vb2-3.4: (28 commits)
FIX: add blank mmap function support for dma_buf_ops
MEDIA: Support of dma_buf export in v4l2-m2m
v4l: vb2-dma-contig: use dma_get_sgtable
v4l: s5p-mfc: support for dmabuf exporting
v4l: s5p-tv: mixer: support for dmabuf exporting
v4l: s5p-fimc: support for dmabuf exporting
v4l: vb2-dma-contig: add support for DMABUF exporting
v4l: vb2: add buffer exporting via dmabuf
v4l: add buffer exporting via dmabuf
Documentation: media: description of DMABUF exporting in V4L2
v4l: vb2-dma-contig: let mmap method to use dma_mmap_coherent call
UPSTREAM: [media] v4l2-ioctl: handle priority handling based on a table lookup
UPSTREAM: [media] v4l2-dev/ioctl: determine the valid ioctls upfront
UPSTREAM: [media] v4l2-dev: make it possible to skip locking for selected ioctls
v4l: s5p-tv: mixer: support for dmabuf importing
v4l: vivi: support for dmabuf importing
v4l: vb2-vmalloc: add support for dmabuf importing
v4l: vb2-dma-contig: add support for dma_buf importing
v4l: vb2-dma-contig: add prepare/finish to dma-contig allocator
v4l: vb2: add prepare/finish callbacks to allocators
...