summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeung-Woo Kim <sw0312.kim@samsung.com>2019-02-18 15:08:37 +0900
committerSeung-Woo Kim <sw0312.kim@samsung.com>2019-02-18 15:08:37 +0900
commit6cf88d59f6ba79dec0ab78d12ab2c95404204aec (patch)
treeb818b959c305ba33100933fea1571ea0925215cf
parent677147dd03d11c118c1255e3ee0e0fa74892e963 (diff)
downloadlinux-artik7-6cf88d59f6ba79dec0ab78d12ab2c95404204aec.tar.gz
linux-artik7-6cf88d59f6ba79dec0ab78d12ab2c95404204aec.tar.bz2
linux-artik7-6cf88d59f6ba79dec0ab78d12ab2c95404204aec.zip
This reverts commit d636f7529dfa0ca074716fd255c9655acbad5d23. In tizen environment, previous camera image sensor, ARTIK-5M- CAMERA-BOARD MM011-0.1 with S5K4ECGA image sensor is still used. So revert OV5640 camera image sensor. Change-Id: I5584de55165be731d1a863c3e3da2e1949fb0663 Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
-rw-r--r--arch/arm64/boot/dts/nexell/s5p6818-artik710-raptor-common.dtsi21
1 files changed, 9 insertions, 12 deletions
diff --git a/arch/arm64/boot/dts/nexell/s5p6818-artik710-raptor-common.dtsi b/arch/arm64/boot/dts/nexell/s5p6818-artik710-raptor-common.dtsi
index d4b0db02e1a6..4575418cf569 100644
--- a/arch/arm64/boot/dts/nexell/s5p6818-artik710-raptor-common.dtsi
+++ b/arch/arm64/boot/dts/nexell/s5p6818-artik710-raptor-common.dtsi
@@ -223,9 +223,6 @@
PIN_IN(gpioa-10, FUNC0, NONE, STR0);
PIN_IN(gpioa-11, FUNC0, NONE, STR0);
PIN_IN(gpiod-8, FUNC0, NONE, STR0);
-
- /* Enable LDO for MIPI Camera module */
- PIN_OUT(gpioa-6, HIGH, FUNC0, NONE, STR0);
};
key_pwr:key_pwr {
@@ -306,32 +303,32 @@
mipi_csi:mipi_csi@c00d0000 {
data_lane = <2>;
pllval = <750>;
- hssettle = <2 7 15 7>;
+ hssettle = <7 7 7 7>;
status = "okay";
};
clipper_0:clipper0@c0063000 {
interface_type = <NX_CAPTURE_INTERFACE_MIPI_CSI>;
- gpios = <&gpio_a 17 0 &gpio_a 3 0>;
+ gpios = <&gpio_a 17 0 &gpio_a 3 0 &gpio_a 6 0>;
data_order = <NX_VIN_Y0CBY1CR>;
status = "okay";
sensor {
type = <NX_CAPTURE_SENSOR_I2C>;
- i2c_name = "ov5640";
+ i2c_name = "S5K4ECGA";
i2c_adapter = <0>;
- addr = <0x3C>;
+ addr = <0x56>;
};
power {
enable_seq = <
- NX_ACTION_START NX_ACTION_TYPE_GPIO 1 1 0 NX_ACTION_END
- NX_ACTION_START NX_ACTION_TYPE_GPIO 0 0 5 NX_ACTION_END
- NX_ACTION_START NX_ACTION_TYPE_GPIO 1 0 10 NX_ACTION_END
- NX_ACTION_START NX_ACTION_TYPE_GPIO 0 1 50 NX_ACTION_END
+ NX_ACTION_START NX_ACTION_TYPE_GPIO 2 1 2 NX_ACTION_END
+ NX_ACTION_START NX_ACTION_TYPE_GPIO 1 1 1 NX_ACTION_END
+ NX_ACTION_START NX_ACTION_TYPE_GPIO 0 1 1 NX_ACTION_END
>;
disable_seq = <
NX_ACTION_START NX_ACTION_TYPE_GPIO 0 0 1 NX_ACTION_END
- NX_ACTION_START NX_ACTION_TYPE_GPIO 1 1 1 NX_ACTION_END
+ NX_ACTION_START NX_ACTION_TYPE_GPIO 1 0 1 NX_ACTION_END
+ NX_ACTION_START NX_ACTION_TYPE_GPIO 2 0 2 NX_ACTION_END
>;
};
};