diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-07-28 14:16:24 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-07-28 14:16:24 +0200 |
| commit | 1c607f0af075f676d3e138e94d46ba44e15c0f5f (patch) | |
| tree | 2f7ff067e335c9aa60acdbc0df4b74f318cc5b8a /drivers/net/xen-netfront.c | |
| parent | b99cfa66e118ef5535f18228a373a6e2d8fa4275 (diff) | |
| parent | 08567053f5cc4255ab53b75277b6102a3202bd75 (diff) | |
Merge tag 'v3.17-rockchip-rk3xxx-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
Merge "ARM: dts: changes for existing rockchip boards" from Heiko Stuebner:
Collected changes for existing Rockchip boards
- convert to new clock driver
- bring structure in line with recent rk3288 comments
(no soc-nodes, using phandles when adding changes, sorted by address)
- i2c, board-pmic and pwm nodes nodes
- sd card slot and ir receiver on radxa rock
* tag 'v3.17-rockchip-rk3xxx-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: dts: rk3188-radxarock: add GPIO IR receiver node
ARM: dts: rockchip: add pwm nodes
ARM: dts: rockchip: add both clocks to uart nodes
ARM: dts: rk3188-radxarock: enable sd-card slot
ARM: dts: add i2c and regulator nodes to rk3188-radxarock
ARM: dts: rockchip: add tps65910 regulator for bqcurie2
ARM: dts: add rk3066 and rk3188 i2c device nodes and pinctrl settings
ARM: dts: rockchip: oder nodes by register address
ARM: dts: rockchip: remove address from pinctrl nodes
ARM: dts: uses handles to reference nodes for changes
ARM: dts: rockchip: add handles for shared nodes that don't have one yet
ARM: dts: rockchip: remove soc subnodes
arm: dts: rockchip: remove obsolete clock gate definitions
ARM: dts: rockchip: move oscillator input clock into main dtsi
ARM: dts: rockchip: add cru nodes and update device clocks to use it
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/net/xen-netfront.c')
0 files changed, 0 insertions, 0 deletions