diff options
| author | changhuang.liang <changhuang.liang@starfivetech.com> | 2022-05-24 12:14:48 +0300 |
|---|---|---|
| committer | Jianlong Huang <jianlong.huang@starfivetech.com> | 2022-06-13 06:39:17 +0300 |
| commit | 7403b3185f3959d7e38472b62eae1d69af79cdcd (patch) | |
| tree | 22e5ad11c7128e4d4567571aed34129851fdca1d | |
| parent | f68398485085fec165a62d5077b3ed7ffc47470f (diff) | |
| download | linux-7403b3185f3959d7e38472b62eae1d69af79cdcd.tar.xz | |
dts/starfive: fixed v4l2 conflict
Signed-off-by: changhuang.liang <changhuang.liang@starfivetech.com>
| -rwxr-xr-x | arch/riscv/boot/dts/starfive/jh7100-common.dtsi | 6 | ||||
| -rwxr-xr-x | arch/riscv/boot/dts/starfive/jh7100.dtsi | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/riscv/boot/dts/starfive/jh7100-common.dtsi b/arch/riscv/boot/dts/starfive/jh7100-common.dtsi index 4c8d9279566f..3e4a1bcfa44b 100755 --- a/arch/riscv/boot/dts/starfive/jh7100-common.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7100-common.dtsi @@ -479,7 +479,6 @@ data-protocol = <0>; }; #endif - #if 0 /* TODO: Used for EVB board, should comment here for starlight board, remove it later*/ ov5640: ov5640@3c { @@ -526,7 +525,6 @@ }; }; }; - #endif }; &i2c2 { @@ -545,6 +543,10 @@ port { panel_dsi_port: endpoint { remote-endpoint = <&dsi_out_port>; + }; + }; + }; + imx219sub@10 { compatible = "imx219"; reg = <0x10>; diff --git a/arch/riscv/boot/dts/starfive/jh7100.dtsi b/arch/riscv/boot/dts/starfive/jh7100.dtsi index 9a52f5176412..19a0027204bf 100755 --- a/arch/riscv/boot/dts/starfive/jh7100.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7100.dtsi @@ -947,7 +947,6 @@ }; }; -#if 0 i2sadc0: i2sadc0@10400000 { compatible = "snps,designware-i2sadc0"; reg = <0x0 0x10400000 0x0 0x1000>; |