Commit Graph

61431 Commits

Author SHA1 Message Date
hjc
bd946e8d24 rk3368 lcdc: add CABC mode config
Signed-off-by: hjc <hjc@rock-chips.com>
2015-01-12 17:11:34 +08:00
dkl
61ed90154e clk: rk3368: add clk_pll_ops_3368_low_jitter and modify dclk_lcdc ops
In order to provide low jitter dclk_lcdc for dislay(especially HDMI),
we neeed to set dclk_lcdc's src pll with max VCO. Thus we add
clk_pll_ops_3368_low_jitter type pll to get pll low jitter setting
from a table. Also dclk_lcdc ops in rk3368 is modifided to get best
parent rate from a table firstly, or caculate a parent rate if not
found in the table.

Signed-off-by: dkl <dkl@rock-chips.com>
2015-01-12 15:31:16 +08:00
Huang, Tao
2879802a3c Merge branch develop-3.10 2015-01-07 14:30:39 +08:00
许盛飞
f5458974e1 battery: update rk818-battery driver
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
2015-01-05 15:07:36 +08:00
hjc
f93e3bcf22 rk fb: define data format for fbdc
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-31 18:20:13 +08:00
Mark Yao
2fddf40afc rk_fb: update uboot & kernel logo parse
Sometimes we want to display logo at hdmi screen. but hdmi uboot
resolution maybe different with framebuffer size, so we need read
logo config from regs and decide how to display logo at kernel.

now only support uboot logo size = kernel logo size

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-12-29 16:30:03 +08:00
Huang, Tao
6b278a8e82 Merge branch develop-3.10 2014-12-26 22:26:34 +08:00
Huang, Tao
37e1b87010 Revert "rk: ion: fix compilation error on arm64"
This reverts commit 6ba08d968d.
2014-12-26 22:26:28 +08:00
lyz
7844ff3788 usb: ehci: backport ehci-platform.c driver from kernel-3.18 2014-12-24 18:50:05 +08:00
CMY
be6254128b rk: ion: ion's heap id order by heap type
need update android, including:
    hardware/rk29/libgralloc_ump/
    hardware/rk29/camera/
    external/rk-pcba-test/
2014-12-23 18:16:22 +08:00
Huang, Tao
79437e3372 LSK Android 14.12 v3.10
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJUkXoFAAoJECTWi3JdVIfQT7QH/RNU1mHpDln1QSGGatOzKzDo
 sYU0A5aUlsjeoh6LUzohz6tSSUOMSEE8lHJo8lN/iI8kIRuiZX4TND1Chap/1s7x
 VlqnWGpKIIsILt4zypK/RL/Xfz0Kyj9K+uUOc6JJJWYIjLUdavR9dVojwE830Czm
 QzHH5P0AmxPUtahN/N2FLjpbTDERPRcjyQ2hkMB5vhvrHXJeP3uNjGS5pGmhHWdl
 gA+410QXAAc7U+rgheh8xlHlykCsi+it7n6K+aO9t5JbD34m7JhMy6WWALGdLOrD
 lqzbxyRG27Cs0JGTjPPiKFomo7b/o895NIaqxxBh6h2iVv2fPssfyvEYGxNUYcM=
 =6dK4
 -----END PGP SIGNATURE-----

Merge tag 'lsk-v3.10-android-14.12'

LSK Android 14.12 v3.10

Conflicts:
	include/linux/clk-provider.h
2014-12-19 20:02:18 +08:00
Mark Brown
f891dfcd5f Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-12-13 11:40:22 +00:00
Mark Brown
3e5fe00cd3 Merge remote-tracking branch 'lsk/v3.10/topic/genpd' into linux-linaro-lsk 2014-12-13 11:39:36 +00:00
Tomasz Figa
6920cae74d PM / Domains: Add generic OF-based PM domain look-up
This patch introduces generic code to perform PM domain look-up using
device tree and automatically bind devices to their PM domains.

Generic device tree bindings are introduced to specify PM domains of
devices in their device tree nodes.

Backwards compatibility with legacy Samsung-specific PM domain bindings
is provided, but for now the new code is not compiled when
CONFIG_ARCH_EXYNOS is selected to avoid collision with legacy code.
This will change as soon as the Exynos PM domain code gets converted to
use the generic framework in further patch.

This patch was originally submitted by Tomasz Figa when he was employed
by Samsung.

Link: http://marc.info/?l=linux-pm&m=139955349702152&w=2
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Rob Herring <robh@kernel.org>
Tested-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit aa42240ab2)
Signed-off-by: Mark Brown <broonie@kernel.org>

Conflicts:
	include/linux/pm_domain.h
2014-12-12 20:06:29 +00:00
Ulf Hansson
99afc71dc9 PM / Domains: Add a detach callback to the struct dev_pm_domain
The intent of this callback is to simplify detachment of devices from
their PM domains. Further patches will show the benefit.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit c3099a5294)
Signed-off-by: Mark Brown <broonie@kernel.org>
2014-12-12 20:06:03 +00:00
hjc
cd1569d3fb rk3368 lcdc: support win mirror and update NO_DUAL mode
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-12 15:16:04 +08:00
dkl
0ceff91bfa rk3368: clk: add CLKOPS_RATE_RK3368_DCLK_LCDC for dclk_vop0
Signed-off-by: dkl <dkl@rock-chips.com>
2014-12-12 14:25:08 +08:00
Huang, Tao
801c2bd378 Merge branch develop-3.10 into develop-3.10-next 2014-12-12 14:12:56 +08:00
Huang, Tao
4abd927beb Revert "rk3368 lcdc: support win mirror and update NO_DUAL mode"
This reverts commit fd18d428fa.
2014-12-12 14:11:55 +08:00
dkl
d5e51e3f22 rk3368: reset: add soft_reset id
Signed-off-by: dkl <dkl@rock-chips.com>
2014-12-12 12:00:13 +08:00
CMY
2ce890be5d rk: mem: protect memory region that specified by uboot on kernel booting 2014-12-11 12:59:21 +08:00
hjc
fd18d428fa rk3368 lcdc: support win mirror and update NO_DUAL mode
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-10 20:11:35 +08:00
Huang, Tao
5c1a4b1d0a Merge branch develop-3.10 into develop-3.10-next 2014-12-10 20:09:28 +08:00
Mark Brown
7d8d2b5924 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-12-10 11:40:18 +00:00
Huang, Tao
47b1e48e85 mmc: rockchip: covert dsb() to dsb(sy) 2014-12-10 19:24:11 +08:00
Huang, Tao
5624f0b836 rockchip: clk: covert dsb() to dsb(sy) 2014-12-10 19:23:04 +08:00
lyz
23805582e3 phy: backport generic phy framework from kernel-3.18 2014-12-09 20:36:43 +08:00
Huang, Tao
040cf4804a Merge branch develop-3.10 into develop-3.10-next 2014-12-09 15:10:34 +08:00
Mark Brown
32a13f39f5 Merge remote-tracking branch 'lsk/v3.10/topic/clk-divider' into linux-linaro-lsk 2014-12-08 19:27:55 +00:00
Maxime COQUELIN
87ad06cba7 clk: divider: Add round to closest divider
In some cases, we want to be able to round the divider to the closest one,
instead than rounding up.

This patch adds a new CLK_DIVIDER_ROUND_CLOSEST flag to specify the divider
has to round to closest div, keeping rounding up as de default behaviour.

Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
(cherry picked from commit 774b514390)
Signed-off-by: Mark Brown <broonie@kernel.org>

Conflicts:
	include/linux/clk-provider.h
2014-12-08 19:26:53 +00:00
Mark Brown
2945d85a83 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-12-08 11:56:03 +00:00
Mark Brown
8d1d9d8058 This is the 3.10.62 stable release
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJUg5eFAAoJEDjbvchgkmk+rjgQAKDGnHhjoqt/0Pipbk2WA4Zo
 PxcAOnVPnyEWVnJHmh3Q4zff4nqyea8HaKYS1bPqI1HL5zT27XvWcLuQz7O3RVM7
 x9YBJ0eOBMFmx2fuBN0m3cAFhesN8yTOl5dzEO2iYc37R93VkR8f5maNTkgdOCY2
 OP4oQnMzkAD2xXnYqieNVVH4gXcnVBEv00aYg5YFyb1rk8GQfOStRkzAldgXOZlF
 7Le7QNDryfupXTZJmpa2WTcAvaEwA0Zyap3alKImuaQk4A033N5fjhdwYa1xhBbS
 8Wh2YpuFmPZjn48UDJCgW6MksxStTWb0q+PZL8nMi5M3LfLDlu6bStE/c2BkMLv4
 ShfWFg0BBBi7g4fyiApIhExBLboI5U4NZIe/McQuOmuufc2sNFmPxY0gfVnBTrWk
 etN6xnKZY+qTIziQPpvqkjmK/XKVs5GWDPLjVtD1ESFVc0EjJ5NtChhrwvXsZv+8
 xA87LOIt5tnUI1bFePs2kmvX/K/kIdpA5uw7FRnPwIndvgyBjY7t15ydES2Xd/2G
 R3zHZoAi0lZmFpAwn1wYPrNHWeWsmOTZB861SpnhDARASG71blU6E998BztleX/F
 fhZPc0viqAUuW92UukVRa2FfWCzo30SGL1a0z+wOY+9EcjSlGCl8r2imlEMJpbTy
 icak2X6HF97v1H+c/4oe
 =tBe/
 -----END PGP SIGNATURE-----

Merge tag 'v3.10.62' into linux-linaro-lsk

This is the 3.10.62 stable release
2014-12-08 11:55:40 +00:00
hjc
b9c889d03e rk fb: update fb config done info.
this commit depend on hwc update,
       including the following directory:

       hardware/rk29/hwcomposer_rga/
       hardware/rk29/libgralloc_ump/
       hardware/libhardware/
2014-12-08 17:06:57 +08:00
Cristina Ciocan
8743a13960 iio: Fix IIO_EVENT_CODE_EXTRACT_DIR bit mask
commit ccf54555da upstream.

The direction field is set on 7 bits, thus we need to AND it with 0111 111 mask
in order to retrieve it, that is 0x7F, not 0xCF as it is now.

Fixes: ade7ef7ba (staging:iio: Differential channel handling)
Signed-off-by: Cristina Ciocan <cristina.ciocan@intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-12-06 15:05:47 -08:00
Benjamin Herrenschmidt
4c8ecdca12 PCI/MSI: Add device flag indicating that 64-bit MSIs don't work
commit f144d1496b upstream.

This can be set by quirks/drivers to be used by the architecture code
that assigns the MSI addresses.

We additionally add verification in the core MSI code that the values
assigned by the architecture do satisfy the limitation in order to fail
gracefully if they don't (ie. the arch hasn't been updated to deal with
that quirk yet).

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-12-06 15:05:47 -08:00
Vincent BENAYOUN
07729b8d98 inetdevice: fixed signed integer overflow
[ Upstream commit 84bc88688e ]

There could be a signed overflow in the following code.

The expression, (32-logmask) is comprised between 0 and 31 included.
It may be equal to 31.
In such a case the left shift will produce a signed integer overflow.
According to the C99 Standard, this is an undefined behavior.
A simple fix is to replace the signed int 1 with the unsigned int 1U.

Signed-off-by: Vincent BENAYOUN <vincent.benayoun@trust-in-soft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-12-06 15:05:46 -08:00
Huang, Tao
d03390bfcd LSK Android 14.11 v3.10
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJUdvtFAAoJECTWi3JdVIfQn3sH/i7lx5lXGQcZ6HsynmZkqA4J
 9G0kenDhW6Rm0YGetIR3DMTNSkrYbL3rBLPd6Vl+CXx8l1hORlostEBvtMnFK0u/
 B289o6qtW7dc8zzYW5jpwMgC+WNeFD4Gn7/x3bDguYLqMPtbbrr3vzsGaKKmScbJ
 AOyOsZR4TVUi+SUzeCbN8YDW9HSQNhVYrA/qcI6ImASOaKYN4i0stHKMUVoI4HxF
 +e9F40P7Lg8zBM4Ss8X9yYlFxX2EwuKLNrelCvXPo6BBcvjZZM4C4MUvh9c8AyDa
 0LiCgVL3fXb4S+bmJwgRKYm5C9TPpulL3VUDn3fGuVqy9HHfBaC62kc8XX8ciAo=
 =aswn
 -----END PGP SIGNATURE-----

Merge tag 'lsk-v3.10-android-14.11'

LSK Android 14.11 v3.10

Conflicts:
	arch/arm/include/asm/cputype.h
2014-12-05 21:18:34 +08:00
dkl
c83fb066be rk3368: clk: add codes to make npll only used by dclk_vop
Signed-off-by: dkl <dkl@rock-chips.com>
2014-12-03 19:15:16 +08:00
Huang, Tao
f0f3909f35 Merge branch develop-3.10 into develop-3.10-next 2014-12-03 19:10:23 +08:00
Mark Yao
52e5c707fc rk_fb: use front_regs instead of some global variable
front_regs means this config is scaning on the vop devices

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-12-03 11:40:54 +08:00
Mark Yao
6ba051470a rk_fb: fix iommu problem when hdmi plug or unplug.
There are two thread will update the win config,
one is update_regs handler, another is hdmi hotplug
thread, win config maybe modify by another thread
unexpectly, then vop scan umap address, cause iommu
crash, so we need use a mutex to protect win config.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-12-01 09:02:56 +08:00
dalon.zhang
8a297b0552 camera : cif : v0.1.a Support rk3288 cif driver 2014-11-29 19:38:54 +08:00
许盛飞
6f2cf955a2 rk312x-sleep: arm-off and ddr_selfrefres by soft controled
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
2014-11-28 09:11:21 +08:00
lintao
3aa5e0ae7a Revert "mmc: add rto for infinit sending timeout loop"
This reverts commit 426495888a.
2014-11-27 20:04:34 +08:00
lintao
426495888a mmc: add rto for infinit sending timeout loop
dw_mci write cmd index to CMD register to trigger sending cmd by BIU.
However, if device fall into panic holding cmd/data line to low level cause BIU
cannnot send out cmd forever. So no cmd_done_int will come. AND, cmd response timeout
only valid after cmd been sent. Nothing to break this loop, we need a s/w recovery from
STATE_SENDING_CMD to STATE_IDLE, and the pending one reported as -ETIMEOUT, let caller
decide howto again.

Reported-by: roger.hu <hwg@rock-chips.com>
Signed-off-by: lintao <lintao@rock-chips.com>
Reviewed-and-tested-by: roger.hu <hwg@rock-chips.com>
2014-11-27 15:25:47 +08:00
Mark Brown
38dce4af8d Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-11-22 11:07:41 +00:00
Mark Brown
50881c752b Merge remote-tracking branch 'lsk/v3.10/topic/mailbox' into linux-linaro-lsk
Conflicts:
	drivers/mailbox/mailbox.c
	include/linux/mailbox_controller.h
2014-11-21 23:43:29 +00:00
Jassi Brar
e28a642ae1 mailbox: Introduce framework for mailbox
Introduce common framework for client/protocol drivers and
controller drivers of Inter-Processor-Communication (IPC).

Client driver developers should have a look at
 include/linux/mailbox_client.h to understand the part of
the API exposed to client drivers.
Similarly controller driver developers should have a look
at include/linux/mailbox_controller.h

Reviewed-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
(cherry picked from commit 2b6d83e2b8)
Signed-off-by: Mark Brown <broonie@kernel.org>
2014-11-21 23:41:41 +00:00
Suman Anna
da1660d32f mailbox: rename pl320-ipc specific mailbox.h
The patch 30058677 "ARM / highbank: add support for pl320 IPC"
added a pl320 IPC specific header file as a generic mailbox.h.
This file has been renamed appropriately to allow the
introduction of the generic mailbox API framework.

Acked-by: Mark Langsdorf <mark.langsdorf@calxeda.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Suman Anna <s-anna@ti.com>
Reviewed-by: Mark Brown <broonie@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
(cherry picked from commit f2fc42b6ac)
Signed-off-by: Mark Brown <broonie@kernel.org>

Conflicts:
	arch/arm/mach-highbank/highbank.c
2014-11-21 23:41:30 +00:00
Mark Brown
5d0676ad29 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-11-21 18:53:31 +00:00