From: Kevin Hilman Date: Wed, 15 Jan 2014 00:16:51 +0000 (-0800) Subject: Merge tag 'sunxi-dt-for-3.14-2' of https://github.com/mripard/linux into next/dt X-Git-Tag: v3.14-rc1~36^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=69f8fa9bfdf93810c5d29fe36e31018a136c37c2;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge tag 'sunxi-dt-for-3.14-2' of https://github.com/mripard/linux into next/dt From Maxime Ripard: Second round of DT additions for 3.14 Mostly: - Addition of the missing PLLs and module clocks - Addition of the external clocks - Addition of the touchscreen controler - I2C nodes of the Cubietruck * tag 'sunxi-dt-for-3.14-2' of https://github.com/mripard/linux: arm: sun7i: cubietruck: Enable the i2c controllers ARM: dts: sun7i: external clock outputs ARM: dts: sun7i: Change 32768 Hz oscillator node name to clk@N style ARM: dts: sun7i: Add pin muxing options for clock outputs ARM: dts: sun7i: Add rtp controller node ARM: dts: sun5i: Add rtp controller node ARM: dts: sun4i: Add rtp controller node ARM: sun4i: dt: Remove chosen nodes ARM: sun4i: dt: Move the aliases to the DTSI ARM: sunxi: dt: add nodes for the mbus clock ARM: sun7i: dt: mod0 clocks ARM: sun5i: dt: mod0 clocks ARM: sun4i: dt: mod0 clocks ARM: sunxi: add PLL5 and PLL6 support ARM: sunxi: add PLL4 support Signed-off-by: Kevin Hilman --- 69f8fa9bfdf93810c5d29fe36e31018a136c37c2