From: Arnd Bergmann Date: Mon, 28 Jul 2014 12:16:24 +0000 (+0200) Subject: Merge tag 'v3.17-rockchip-rk3xxx-dts' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v3.17-rc1~77^2~10 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1c607f0af075f676d3e138e94d46ba44e15c0f5f;p=linux.git 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 --- 1c607f0af075f676d3e138e94d46ba44e15c0f5f