Commit Graph

1681 Commits

Author SHA1 Message Date
黄涛
79082d3c51 misc: SRAM: Add option to map SRAM as cacheable 2014-08-25 18:23:05 +08:00
张晴
476cbef830 rk312x:rt5025:support pmic rt5025 2014-08-22 10:01:21 +08:00
lyz
295c152c8b usb-uart: add a propertie in dts to enable usb-uart debug 2014-08-15 10:39:10 +08:00
Sun Mingjun
aea970bf5b Support the Rk312X Codec & SPDIF 2014-08-12 08:43:43 +08:00
黄涛
c7412991e9 Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
Conflicts:
	arch/arm/mach-rockchip/vcodec_service.c
	drivers/input/Makefile
2014-08-08 10:21:50 +08:00
黄涛
fcef60e36f Merge tag 'lsk-v3.10-android-14.07' into develop-3.10
LSK v3.10 Android 14.07 release

Conflicts:
	drivers/clocksource/arm_arch_timer.c
	lib/Makefile
2014-08-06 15:34:14 +08:00
dgl
f3fcb4ab6a audio: rk3036 codec driver
add rk3036 audio codec driver program, include DTS node.

Signed-off-by: dgl@rock-chips.com
2014-07-28 10:07:40 +08:00
sugar
466b5f40fc dts: rk312x: add i2s_2ch, i2s_8ch, spdif.
Signed-off-by: sugar <sugar.zhang@rock-chips.com>
2014-07-25 17:57:14 +08:00
Mark Brown
d138bf448f Merge remote-tracking branch 'lsk/v3.10/topic/mailbox' into linux-linaro-lsk 2014-06-13 21:51:19 +01:00
Jassi Brar
cc2e5bd705 Mailbox: Generic: Specify mailbox api bindings
Due to the platform specific nature of remote's firmware, we can't do much
to facilitate shareable client drivers. So the Mailbox api is more like a
bunch of useful functions put together. The only feature that can be
abstracted out is mailbox channel assignment to client drivers, which this
binding specifies.

Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-06-13 21:50:23 +01:00
Mark Brown
fa111b1792 Merge remote-tracking branch 'lsk/v3.10/topic/mm-timer' into linux-linaro-lsk
Conflicts:
	drivers/clocksource/arm_arch_timer.c
2014-06-13 20:59:53 +01:00
Stephen Boyd
e66e53a5b9 Documentation: Add memory mapped ARM architected timer binding
Add a binding for the arm architected timer hardware's memory
mapped interface. The mmio timer hardware is made up of one base
frame and a collection of up to 8 timer frames, where each of the
8 timer frames can have either one or two views. A frame
typically maps to a privilege level (user/kernel, hypervisor,
secure). The first view has full access to the registers within a
frame, while the second view can be restricted to particular
registers within a frame. Each frame must support a physical
timer. It's optional for a frame to support a virtual timer.

Cc: devicetree-discuss@lists.ozlabs.org
Cc: Marc Zyngier <Marc.Zyngier@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Rob Herring <robherring2@gmail.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
(cherry picked from commit d53ef114cf)
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-06-13 16:32:17 +01:00
yxj
3bb54a06c7 add devicetree bindings for rk screen 2014-05-08 09:10:16 +08:00
lintao
55bf73c13b mmc: host: rk_sdmmc:
Add rk32 mmc controller with cap HW_RESET support, default N.
2014-05-06 15:22:20 +08:00
xxm
afe5043b39 Documentation:Documentation/devicetree/bindings/iommu/rockchip,rk32-iommu.txt 2014-05-04 15:29:15 +08:00
xxm
98d6567e46 Documentation : Documentation/devicetree/bindings/arm/mali-midgard.txt 2014-05-04 15:29:15 +08:00
hjc
5198023c6d Documentation: add rockchip fb lcdc lvds specific content 2014-04-30 19:56:23 +08:00
libing
9e41b24fe6 rk3288 mipi dsi: add rockchip_mipidsi_lcd.txt and rockchip_mipidsi.txt,in Documentation/devicetree/bindings/video/ 2014-04-30 17:40:46 +08:00
郭毅
b056ccccbc sensors: add rk_sensor.txt 2014-04-30 16:57:13 +08:00
wlf
600c7a69bd USB: add Documentation/devicetree/bindings/usb/rockchip-usb.txt 2014-04-30 15:39:58 +08:00
许盛飞
e623668278 pwm: add rockchip-pwm.txt 2014-04-30 10:49:48 +08:00
xbw
ced2d8b49c Documentation: devicetree: bindings: mmc:
More detailed description of the specific content.
2014-04-29 17:25:23 +08:00
张晴
de0f0d2cbc rk3288:ricoh619:add dc_det function,add ricoh619.txt 2014-04-29 11:15:29 +08:00
zwl
c555b141ae Doc: add rockchip_hdmi.txt in Documentation/devicetree/bindings/ 2014-04-28 18:10:51 +08:00
lintao
89674ec027 Documentation: devicestree: bindings: mmc:
fix rockchip-dw-mshc.txt
2014-04-28 17:06:02 +08:00
Albin Tonnerre
8d9206dbd4 ARM: perf: add support for the Cortex-A12 PMU
Cortex-A12 implements Performance Monitors compliant with the PMUv2
architecture.

This patch adds support for the Cortex-A12 PMU to the ARM perf backend.

Signed-off-by: Albin Tonnerre <albin.tonnerre@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

Conflicts:
	arch/arm/kernel/perf_event_v7.c
2014-04-24 20:59:07 +08:00
黄涛
7fe47454f2 Merge tag 'lsk-android-14.04' into develop-3.10
lsk-android 14.04

Conflicts:
	Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
	drivers/pinctrl/pinconf-generic.c
	include/linux/pinctrl/consumer.h
	include/linux/pinctrl/pinconf-generic.h
2014-04-24 19:04:10 +08:00
Mark Brown
b0f285eeb0 Merge branch 'v3.10/topic/pinctrl' of git://git.linaro.org/kernel/linux-linaro-stable into linux-linaro-lsk 2014-04-10 12:36:26 +01:00
Sherman Yin
150e48fdb3 pinctrl: Adds slew-rate, input-enable/disable
This commit adds slew-rate and input-enable/disable support for pinconf
-generic.

Signed-off-by: Sherman Yin <syin@broadcom.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
(cherry picked from commit 8ba3f4d000)
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-04-04 16:24:06 +01:00
Heiko Stübner
aaba68a91d pinctrl: remove bindings for pinconf options needing more thought
Some options currently take arguments in unspecified driver-specific units.
As pointed out by Stephen Warren, driver specific values should not be part
of generic devicetree bindings describing the hardware.

Therefore remove the critical bindings again, before they become part of
an official release.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
(cherry picked from commit 5b81d55c4c)
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-04-04 16:23:01 +01:00
Heiko Stübner
6d27cf9086 pinctrl: set unit for debounce time pinconfig to usec
Currently the debounce time pinconfig option uses an unspecified
"time units" unit. As pinconfig options should use SI units and a
real unit is also necessary for generic dt bindings, change it
to usec. Currently no driver is using the generic pinconfig option
for this, so the unit change is safe to do.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
(cherry picked from commit 256aeb6487)
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-04-04 16:22:53 +01:00
Heiko Stübner
255b8fa40a pinctrl: clarify some dt pinconfig options
The bias-pull-* options use values > 0 to indicate that the pull should
be activated and optionally also indicate the strength of the pull.
Therefore use an default value of 1 for these options.

Split the low-power-mode option into low-power-enable and -disable.

Update the documentation to describe the param arguments better.

Reported-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
(cherry picked from commit 9ee1f7d266)
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-04-04 16:20:25 +01:00
Heiko Stübner
a3aadc7709 pinctrl: add function to parse generic pinconfig properties from a dt node
pinconf_generic_parse_dt_config() takes a node as input and generates an
array of generic pinconfig values from the properties of this node.

As I couldn't find a mechanism to count the number of properties of a node
the function uses internally an array to accept one of parameter and copies
the real present options to a smaller variable at its end.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
(cherry picked from commit 7db9af4b6e)
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-04-04 16:20:17 +01:00
Eduardo Valentin
1c762edb2a thermal: introduce device tree parser
This patch introduces a device tree bindings for
describing the hardware thermal behavior and limits.
Also a parser to read and interpret the data and feed
it in the thermal framework is presented.

This patch introduces a thermal data parser for device
tree. The parsed data is used to build thermal zones
and thermal binding parameters. The output data
can then be used to deploy thermal policies.

This patch adds also documentation regarding this
API and how to define tree nodes to use
this infrastructure.

Note that, in order to be able to have control
on the sensor registration on the DT thermal zone,
it was required to allow changing the thermal zone
.get_temp callback. For this reason, this patch
also removes the 'const' modifier from the .ops
field of thermal zone devices.

Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
(cherry picked from commit 4e5e4705bf)

Signed-off-by: Alex Shi <alex.shi@linaro.org>
2014-03-31 15:47:20 +08:00
luowei
e336df04c0 add rockchip-pinctrl.txt 2014-03-28 15:42:50 +08:00
黄涛
9983901d21 Merge tag 'lsk-android-14.02' into develop-3.10
lsk 14.02 Android release
2014-03-12 21:33:38 +08:00
Haijun Zhang
1c9aaaee2c mmc: core: parse voltage from device-tree
Add function to support getting voltage from device-tree.
If voltage-range is specified in device-tree node, this function
will parse it and return the available voltage mask.

Signed-off-by: Haijun Zhang <haijun.zhang@freescale.com>
Acked-by: Anton Vorontsov <anton@enomsg.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

Conflicts:
	drivers/mmc/core/core.c
2014-03-07 15:43:40 +08:00
Ulf Hansson
7a5e3a0b34 mmc: core: Add DT-bindings for MMC_CAP2_FULL_PWR_CYCLE
The DT-binding for MMC_CAP2_FULL_PWR_CYCLE, is used to indicate whether
it is possible to perform a full power cycle of the card.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
2014-03-07 13:38:39 +08:00
xbw
fbdd2f071b SDMMC-emmc:add the capability to support hs200 mode 2014-03-04 17:47:47 +08:00
Thierry Reding
f419470e45 pwm-backlight: Use new enable_gpio field
Make use of the new enable_gpio field and allow it to be set from DT as
well. Now that all legacy users of platform data have been converted to
initialize this field to an invalid value, it is safe to use the field
from the driver.

Signed-off-by: Thierry Reding <treding@nvidia.com>
2014-02-25 16:57:37 +08:00
张晴
4b91865e1c rk31:pmu:support pmu sleep voltage and sleep mode setting by dts 2014-02-11 16:37:30 +08:00
Mark Brown
4b9c8ddadc Merge tag 'v3.10.29' into linux-linaro-lsk
This is the 3.10.29 stable release
2014-02-10 17:37:43 +00:00
Simon Guinot
509e569526 ata: sata_mv: introduce compatible string "marvell, armada-370-sata"
commit b1f5c73bd5 upstream.

The sata_mv driver supports the SATA IP found in several Marvell SoCs.
As some new SATA registers have been introduced with the Armada 370/XP
SoCs, a way to identify them is needed.

This patch introduces a new compatible string for the SATA IP found in
Armada 370/XP SoCs.

Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Lior Amsalem <alior@marvell.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-06 11:08:15 -08:00
Heiko Stübner
79504bbbd9 pinctrl: remove bindings for pinconf options needing more thought
Some options currently take arguments in unspecified driver-specific units.
As pointed out by Stephen Warren, driver specific values should not be part
of generic devicetree bindings describing the hardware.

Therefore remove the critical bindings again, before they become part of
an official release.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-11-30 12:37:59 +08:00
Heiko Stübner
bedb5b5d93 pinctrl: set unit for debounce time pinconfig to usec
Currently the debounce time pinconfig option uses an unspecified
"time units" unit. As pinconfig options should use SI units and a
real unit is also necessary for generic dt bindings, change it
to usec. Currently no driver is using the generic pinconfig option
for this, so the unit change is safe to do.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-11-30 12:37:51 +08:00
Heiko Stübner
3d3f37a2c2 pinctrl: more clarifications for generic pull configs
PULL_PIN_DEFAULT is meant for hardware completely hiding any pull
settings from the driver, so that it's really only possible to turn
the pull on or off, but it not being possible to determine any
pull settings from software.

Also the binding-documentation for the pull arguments did not match
the changes to the expected values.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-11-30 12:37:43 +08:00
Heiko Stübner
9757d8280e pinctrl: clarify some dt pinconfig options
The bias-pull-* options use values > 0 to indicate that the pull should
be activated and optionally also indicate the strength of the pull.
Therefore use an default value of 1 for these options.

Split the low-power-mode option into low-power-enable and -disable.

Update the documentation to describe the param arguments better.

Reported-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-11-30 12:04:20 +08:00
Heiko Stübner
87c4fbd5ef pinctrl: add function to parse generic pinconfig properties from a dt node
pinconf_generic_parse_dt_config() takes a node as input and generates an
array of generic pinconfig values from the properties of this node.

As I couldn't find a mechanism to count the number of properties of a node
the function uses internally an array to accept one of parameter and copies
the real present options to a smaller variable at its end.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-11-30 12:04:12 +08:00
hhb
94c3b14a94 rk serial: add Documentation/devicetree/bindings/serial/rockchip_uart.txt 2013-11-30 10:02:20 +08:00
Russ Dill
6e701bfc17 misc: SRAM: Add option to map SRAM to allow code execution
This is necessary for platforms that use SRAM to execute suspend/resume stubs.

Signed-off-by: Russ Dill <Russ.Dill@ti.com>
2013-11-21 13:39:20 +08:00