diff options
| author | Olof Johansson <olof@lixom.net> | 2015-02-06 11:03:28 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-02-06 11:03:28 +0300 |
| commit | 6f8c8f6baf919da1804291f3abd9414c3f71b838 (patch) | |
| tree | 5396b71346659a174f7e8c050d3edad11140d9b1 /net/openvswitch/vport-gre.c | |
| parent | 7679f31f143bb3b770b80855af254bb6ee0a1f89 (diff) | |
| parent | c25d8cbcd840b2c9774a285ea728e72dd56aea2e (diff) | |
| download | linux-6f8c8f6baf919da1804291f3abd9414c3f71b838.tar.xz | |
Merge tag 'v3.20-rockchip-dts3' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
Merge "ARM: rockchip: third (and last) batch of dts updates for 3.20" from
Heiko Stübner:
Change are regulator nodes for the cpu and gpu regulators on the act8846
variant of the rk3288-evb and the setting of a clock for the watchdog.
Also the lcd and hdmi controllers on both the firefly and the evb get
enabled and let us now boot into fbcon console sucessfully.
* tag 'v3.20-rockchip-dts3' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: dts: rockchip: move the hdmi ddc-i2c-bus property to the actual boards
ARM: dts: rockchip: enable vops and hdmi output on rk3288-firefly and -evb
ARM: dts: rockchip: housekeeping off i2c0 on rk3288-evb boards
ARM: dts: rockchip: add cpu and gpu regulators to rk3288-evb-act8846
ARM: dts: rockchip: add rk3288 watchdog clock
clk: rockchip: add id for watchdog pclk on rk3288
clk: rockchip: add clock IDs for the PVTM clocks
clk: rockchip: add clock ID for usbphy480m_src
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'net/openvswitch/vport-gre.c')
0 files changed, 0 insertions, 0 deletions