projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm64: dts: rockchip: update isp-flash gpio for rk3399-android-6.0
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm64
/
boot
/
dts
/
rockchip
/
rk3399-android-6.0.dtsi
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 3c93ff73d1ef5d57dd34144e0de74409a88072c0..7bd0b69de5ea23f17a738aa5736fae77790ef679 100644
(file)
--- 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,isp,dsiphy,reg = <0xff968000 0x8000>;
rockchip,grf = <&grf>;
rockchip,cru = <&cru>;
- rockchip,gpios = <&gpio
2 12
GPIO_ACTIVE_HIGH>;
+ rockchip,gpios = <&gpio
1 3
GPIO_ACTIVE_HIGH>;
rockchip,isp,iommu-enable = <1>;
power-domains = <&power RK3399_PD_ISP0>;
status = "disabled";
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,isp,dsiphy,reg = <0xff968000 0x8000>;
rockchip,grf = <&grf>;
rockchip,cru = <&cru>;
- rockchip,gpios = <&gpio
2 12
GPIO_ACTIVE_HIGH>;
+ rockchip,gpios = <&gpio
1 3
GPIO_ACTIVE_HIGH>;
rockchip,isp,iommu-enable = <1>;
power-domains = <&power RK3399_PD_ISP1>;
status = "disabled";
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*/
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>;
};
};
};
};