From dc32bac71ffc9e630ec53aa45e2a0dc09d8579c7 Mon Sep 17 00:00:00 2001 From: zhu Date: Thu, 25 Jul 2019 20:45:54 +0800 Subject: [PATCH 66/97] overlay: Add ov4657 camera module support Signed-off-by: zhu --- .../dts/rockchip/overlays-rockpi4/Makefile | 3 +- .../rockchip/overlays-rockpi4/hw_intfc.conf | 7 +++-- .../overlays-rockpi4/ov5647-overlay.dts | 31 +++++++++++++++++++ .../boot/dts/rockchip/rockpi-4b-linux.dts | 20 +++++++++++- drivers/media/i2c/ov5647.c | 2 +- 5 files changed, 58 insertions(+), 5 deletions(-) create mode 100644 arch/arm64/boot/dts/rockchip/overlays-rockpi4/ov5647-overlay.dts diff --git a/arch/arm64/boot/dts/rockchip/overlays-rockpi4/Makefile b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/Makefile index 8ef4882feb61..85d76b2e59db 100644 --- a/arch/arm64/boot/dts/rockchip/overlays-rockpi4/Makefile +++ b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/Makefile @@ -15,7 +15,8 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \ hifiberry-dacplus.dtbo \ raspberrypi-7-inch-lcd.dtbo \ cpufreq.dtbo \ - imx219.dtbo + imx219.dtbo \ + ov5647.dtbo targets += dtbs dtbs_install targets += $(dtbo-y) diff --git a/arch/arm64/boot/dts/rockchip/overlays-rockpi4/hw_intfc.conf b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/hw_intfc.conf index 80b509f309c9..024fe765fef4 100644 --- a/arch/arm64/boot/dts/rockchip/overlays-rockpi4/hw_intfc.conf +++ b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/hw_intfc.conf @@ -59,5 +59,8 @@ intfc:dtoverlay=console-on-ttyS2 # setting cpu frequency over-2GHz #intfc:dtoverlay=cpufreq -# Add imx219 camera module support -#intfc:dtoverlay=imx219 \ No newline at end of file +# Add imx219 camera module support. Need disabled ov5647 camera module. +#intfc:dtoverlay=imx219 + +# Add ov5647 camera module support. Need disabled imx219 camera module. +#intfc:dtoverlay=ov5647 \ No newline at end of file diff --git a/arch/arm64/boot/dts/rockchip/overlays-rockpi4/ov5647-overlay.dts b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/ov5647-overlay.dts new file mode 100644 index 000000000000..b988b3b66583 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/ov5647-overlay.dts @@ -0,0 +1,31 @@ +/dts-v1/; +/plugin/; + +/ { + model = "ROCK PI 4B"; + compatible = "rockchip,rockpi","rockchip,rk3399"; + + fragment@0 { + target = <&i2c4>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@1 { + target = <&camera2>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@2 { + target = <&mipi_in_ucam0>; + + __overlay__ { + remote-endpoint = <&ucam_out1>; + }; + }; +}; diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c index b8b011ece42f..6835d3e83bef 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -857,7 +857,7 @@ static int ov5647_probe(struct i2c_client *client, } xclk_freq = clk_get_rate(sensor->xclk); - if (xclk_freq != 25000000) { + if (xclk_freq != 6000000) { dev_err(dev, "Unsupported clock frequency: %u\n", xclk_freq); return -EINVAL; } -- 2.25.1