diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2015-10-28 02:19:37 +0300 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2016-04-07 02:25:46 +0300 |
| commit | a4e00345b29dbc93fe7e6f4070458f325261b0ac (patch) | |
| tree | b181cf5febb25c890c78986491d867264c914934 | |
| parent | 6df7ec6186644a4ffb4f0c859327ef41a1145a5f (diff) | |
| download | linux-a4e00345b29dbc93fe7e6f4070458f325261b0ac.tar.xz | |
ARM: dts: rockchip: move edp-hpd pin definition into common location
The edp hotplug pin is fixed on the soc side, anybody wanting to use it
will need the same definition anyway, so move it to a common location.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Tested-by: Douglas Anderson <dianders@chromium.org>
| -rw-r--r-- | arch/arm/boot/dts/rk3288-veyron-jaq.dts | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk3288.dtsi | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/rk3288-veyron-jaq.dts b/arch/arm/boot/dts/rk3288-veyron-jaq.dts index c2f52cfb4d06..5c97e3153526 100644 --- a/arch/arm/boot/dts/rk3288-veyron-jaq.dts +++ b/arch/arm/boot/dts/rk3288-veyron-jaq.dts @@ -142,12 +142,6 @@ }; }; - edp { - edp_hpd: edp_hpd { - rockchip,pins = <7 11 RK_FUNC_2 &pcfg_pull_down>; - }; - }; - hdmi { vcc50_hdmi_en: vcc50-hdmi-en { rockchip,pins = <5 19 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 688cb37b156e..3071e94e86ed 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -1208,6 +1208,12 @@ }; }; + edp { + edp_hpd: edp-hpd { + rockchip,pins = <7 11 RK_FUNC_2 &pcfg_pull_down>; + }; + }; + i2c0 { i2c0_xfer: i2c0-xfer { rockchip,pins = <0 15 RK_FUNC_1 &pcfg_pull_none>, |