From: Heiko Stuebner Date: Tue, 27 Oct 2015 23:19:37 +0000 (+0100) Subject: UPSTREAM: ARM: dts: rockchip: move edp-hpd pin definition into common location X-Git-Tag: firefly_0821_release~2371 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=46c1071bcfab1f0a257a7e2f05f8875944424dab;p=firefly-linux-kernel-4.4.55.git UPSTREAM: 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. Change-Id: I49a424eeb755d6bfaf38b91cadfd6d8ff7be8ccf Signed-off-by: Heiko Stuebner Tested-by: Douglas Anderson (cherry pick from commit a4e00345b29dbc93fe7e6f4070458f325261b0ac) --- 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 5f1b20b70053..f2c05e9af0b2 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -1180,6 +1180,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>,