From: dalong.zhang Date: Fri, 7 Apr 2017 03:40:53 +0000 (+0800) Subject: arm64: dts: rockchip: update isp-flash gpio for rk3399-android-6.0 X-Git-Tag: firefly_0821_release~72 X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=776ad2409a442a6c2898a00c51629ce1dcf56de0;hp=5776aafc5bed08447fdb578d19f40159f4981d0c arm64: dts: rockchip: update isp-flash gpio for rk3399-android-6.0 Change-Id: If4bcebe0022d0bb3d46cdb1858340082bb16b404 Signed-off-by: dalong.zhang --- diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android-6.0.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android-6.0.dtsi index 3c93ff73d1ef..7bd0b69de5ea 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-android-6.0.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-android-6.0.dtsi @@ -334,7 +334,7 @@ rockchip,isp,dsiphy,reg = <0xff968000 0x8000>; rockchip,grf = <&grf>; rockchip,cru = <&cru>; - rockchip,gpios = <&gpio2 12 GPIO_ACTIVE_HIGH>; + rockchip,gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; rockchip,isp,iommu-enable = <1>; power-domains = <&power RK3399_PD_ISP0>; status = "disabled"; @@ -384,7 +384,7 @@ rockchip,isp,dsiphy,reg = <0xff968000 0x8000>; rockchip,grf = <&grf>; rockchip,cru = <&cru>; - rockchip,gpios = <&gpio2 12 GPIO_ACTIVE_HIGH>; + rockchip,gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; rockchip,isp,iommu-enable = <1>; power-domains = <&power RK3399_PD_ISP1>; status = "disabled"; @@ -550,7 +550,7 @@ isp_flash_trigger_as_gpio: isp_flash_trigger_as_gpio { /*ISP_FLASHTRIGOU*/ - rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_none>; + rockchip,pins = <1 3 RK_FUNC_GPIO &pcfg_pull_none>; }; };