...
 
Commits (10)
......@@ -14,7 +14,7 @@
};
&vm016_1 {
//status = "okay";
status = "okay";
};
&vm016_0_thermal {
......@@ -55,4 +55,8 @@
data-lanes = <1 2>;
clock-lanes = <0>;
};
&vm016_1_ep0 {
link-frequencies = /bits/ 64 < 50000000 >;
};
#endif
......@@ -5,7 +5,7 @@ V = 4.14
PATCHDIR ?= ${LAYER_BASE}/recipes-vm016/linux/linux-mainline-$V
REPO_DIR ?= ${WSDIR}/kernel
GIT_DIFF_REF_FROM_4.14 = a76d8f6e085a2c82e0360de8e9ea6cc137522212
GIT_DIFF_REF_FROM_4.14 = 7a1f2887e3bad8d3951d259927549606aca589e8
GIT_DIFF_REF_TO = $V/vm016-next
PATCHES = \
......
......@@ -18,6 +18,7 @@ IMAGE_INSTALL = "\
valgrind \
gdb \
elito-fbtest \
fbcat \
\
gstreamer1.0 \
gstreamer1.0-plugins-bad-autoconvert \
......
From: "Enrico Scholz" <enrico.scholz@sigma-chemnitz.de>
Subject: 0001-of_camera_selection-enhanced-for-MIPI-support
Date: Thu, 10 Oct 2019 16:16:30 +0200
X-Committed: Thu, 10 Oct 2019 18:28:54 +0200
Patchset containing:
a250a5ebba fixup! of_camera_selection: enhanced for MIPI support
7b60f2d804 of_camera_selection: fix clock setup for VM016-S+
9e851811df of_camera_selection: enhanced for MIPI support
commands/of_camera_selection.c | 641 ++++++++++++++++++++++++++++++---------
1 file changed, 500 insertions(+), 141 deletions(-)
commands/of_camera_selection.c | 643 ++++++++++++++++++++++++++++++---------
1 file changed, 503 insertions(+), 140 deletions(-)
diff --git a/commands/of_camera_selection.c b/commands/of_camera_selection.c
index c73003d40d..2eb650bc53 100644
index c73003d40d..4ed133ea2c 100644
--- a/commands/of_camera_selection.c
+++ b/commands/of_camera_selection.c
@@ -31,28 +31,159 @@
......@@ -300,7 +307,7 @@ index c73003d40d..2eb650bc53 100644
static int is_cam_supported(const char *name)
{
int i;
@@ -97,86 +347,124 @@ static int is_cam_supported(const char *name)
@@ -97,86 +347,128 @@ static int is_cam_supported(const char *name)
return -1;
}
......@@ -395,7 +402,6 @@ index c73003d40d..2eb650bc53 100644
- if (port == get_camera_port(tmp_node, node))
- return tmp_node;
+ ctx->cam_node = tmp_node;
+ ctx->cam = type;
+ if (get_camera_port(ctx))
+ return true;
}
......@@ -425,59 +431,63 @@ index c73003d40d..2eb650bc53 100644
+ int camera;
+ char const *name;
+ char *tmp_name;
+
+ if (find_camera_by_type(ctx, type)) {
+ ctx->cam = type;
+ return true;
+ }
- if (port == get_camera_port(tmp_node, node))
- return tmp_node;
- }
- } else if (strstr(name, "-BW")) {
+ name = type->name;
+
+ if (strstr(name, "-COL")) {
+ tmp_name = xzalloc(strlen(name) + 1);
+
+ strncpy(tmp_name, name, strlen(name) - strlen("-COL"));
+ strcat(tmp_name, "-BW");
} else if (strstr(name, "-BW")) {
- char *tmp = xzalloc(strlen(name) + 2);
+ if (find_camera_by_type(ctx, type))
+ return true;
+ tmp_name = xzalloc(strlen(name) + 2);
- strncpy(tmp, name, strlen(name) - strlen("-BW"));
- tmp = strcat(tmp, "-COL");
+ name = type->name;
+ strncpy(tmp_name, name, strlen(name) - strlen("-BW"));
+ strcat(tmp_name, "-COL");
+ } else {
+ tmp_name = NULL;
+ }
- camera = is_cam_supported(tmp);
- free(tmp);
- if (camera < 0)
- return NULL;
+ if (strstr(name, "-COL")) {
+ tmp_name = xzalloc(strlen(name) + 1);
+ if (!tmp_name)
+ return false;
- for_each_compatible_node_from(tmp_node, node, NULL,
- phytec_cameras[camera].compatible) {
- if (port == get_camera_port(tmp_node, node))
- return tmp_node;
- }
+ strncpy(tmp_name, name, strlen(name) - strlen("-COL"));
+ strcat(tmp_name, "-BW");
+ } else if (strstr(name, "-BW")) {
+ tmp_name = xzalloc(strlen(name) + 2);
+
+ strncpy(tmp_name, name, strlen(name) - strlen("-BW"));
+ strcat(tmp_name, "-COL");
+ } else {
+ tmp_name = NULL;
}
- return NULL;
+ if (!tmp_name)
+ return false;
+
+ camera = is_cam_supported(tmp_name);
+ free(tmp_name);
+
+ if (camera < 0)
+ return NULL;
+
+ type = &phytec_cameras[camera];
+
+ return find_camera_by_type(ctx, type);
+ if (find_camera_by_type(ctx, &phytec_cameras[camera])) {
+ ctx->cam = type;
+ return true;
}
- return NULL;
+ return false;
}
static int of_set_phandle_to_remote_endpoint(struct device_node *cam,
@@ -189,32 +477,40 @@ static int of_set_phandle_to_remote_endpoint(struct device_node *cam,
@@ -189,32 +481,40 @@ static int of_set_phandle_to_remote_endpoint(struct device_node *cam,
p = cpu_to_be32(p);
ret = of_set_property(port, "remote-endpoint", &p, sizeof(p), 1);
......@@ -532,7 +542,7 @@ index c73003d40d..2eb650bc53 100644
if (!deserializer) {
pr_err("Path to deserializer is not vaild.\n");
return -EINVAL;
@@ -222,96 +518,124 @@ static int set_phycam_s_remote_endpoint(struct device_node *root,
@@ -222,96 +522,124 @@ static int set_phycam_s_remote_endpoint(struct device_node *root,
of_set_property(deserializer, "phytec,phycam-s", NULL, 0, 1);
......@@ -719,7 +729,7 @@ index c73003d40d..2eb650bc53 100644
return ret;
}
@@ -319,29 +643,44 @@ static int change_camera(struct device_node *root, void *context)
@@ -319,29 +647,44 @@ static int change_camera(struct device_node *root, void *context)
static int do_of_camera_selection(int argc, char *argv[])
{
struct camera_info *cam_info = xzalloc(sizeof(struct camera_info));
......@@ -770,7 +780,7 @@ index c73003d40d..2eb650bc53 100644
break;
case 'l':
list = 1;
@@ -362,6 +701,21 @@ static int do_of_camera_selection(int argc, char *argv[])
@@ -362,6 +705,21 @@ static int do_of_camera_selection(int argc, char *argv[])
goto free;
}
......@@ -792,7 +802,7 @@ index c73003d40d..2eb650bc53 100644
if (!bus) {
ret = COMMAND_ERROR_USAGE;
goto free;
@@ -373,11 +727,15 @@ static int do_of_camera_selection(int argc, char *argv[])
@@ -373,11 +731,15 @@ static int do_of_camera_selection(int argc, char *argv[])
}
if (optind < argc) {
......@@ -811,7 +821,7 @@ index c73003d40d..2eb650bc53 100644
}
of_register_fixup(change_camera, cam_info);
@@ -390,7 +748,8 @@ free:
@@ -390,7 +752,8 @@ free:
BAREBOX_CMD_HELP_START(of_camera_selection)
BAREBOX_CMD_HELP_TEXT("Options:")
......
From: "Enrico Scholz" <enrico.scholz@sigma-chemnitz.de>
Subject: 0001-onsemi-register
Date: Mon, 24 Sep 2018 16:36:28 +0200
X-Committed: Thu, 9 May 2019 19:58:22 +0200
Date: Fri, 30 Aug 2019 12:51:09 +0200
X-Committed: Fri, 30 Aug 2019 14:04:26 +0200
Patchset containing:
548777e23687 onsemi: initial checkin
71ab301cfb88 onsemi: core: initial checkin
drivers/media/i2c/Kconfig | 2 ++
drivers/media/i2c/Makefile | 1 +
......
From: "Enrico Scholz" <enrico.scholz@sigma-chemnitz.de>
Subject: 0002-dtree
Date: Wed, 3 Jul 2019 16:28:51 +0200
X-Committed: Wed, 3 Jul 2019 18:52:10 +0200
Date: Tue, 24 Sep 2019 12:38:53 +0200
X-Committed: Tue, 24 Sep 2019 12:38:53 +0200
Patchset containing:
82c0433840c8 dtree: vm016: added LVDS refclk
1621b8f5bff1 fixup! dtree: initial checkin of phytec-vm016.dtsi
f8112c6c3784 dtree: initial checkin of phytec-vm016.dtsi
a4041aa56e94 dtree:phytec-nunki: added vm016 setup
7833fc406a14 dtree:phytec-nunki: added thermal-zones node
9a93c187c1d3 dtree:imx6dl: added endpoint for MIPI camera input
8b230ae8ee29 Merge commit '7a1f2887e3ba' into 4.14/vm016-next
59337a72468f dtree:phytec-vm016: initial checkin
665d874f6ad9 dtree:phytec-nunki: added vm016 setup
5bbd70545166 dtree:phytec-nunki: added thermal-zones node
fe24fdf6a2af dtree:imx6dl: added endpoint for MIPI camera input
arch/arm/boot/dts/imx6qdl-phytec-nunki.dtsi | 14 ++
arch/arm/boot/dts/imx6qdl-phytec-vm016.dtsi | 220 ++++++++++++++++++++++++++
......@@ -18,7 +17,7 @@ Patchset containing:
create mode 100644 arch/arm/boot/dts/imx6qdl-phytec-vm016.dtsi
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-nunki.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-nunki.dtsi
index b684a49ec11a..8f47739c94fc 100644
index 32e9b14d660f..0c7efd8c6867 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-nunki.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-nunki.dtsi
@@ -166,6 +166,8 @@
......@@ -280,7 +279,7 @@ index 000000000000..470a9fd0e24a
+ };
+};
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 8884b4a3cafb..d14e282bae28 100644
index 0fedb0c24eca..01e1e70ca10b 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -1169,6 +1169,13 @@
......
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891"
SRCREV = "705d836661fc6d0733445e682564738f768cd024"
SRCREV = "b9c6720b05f1e46727e3c2dd1d10976ff812bc01"
SRC_URI = "\
${URI_PROJECT_BASE}/vm016-test.git \
"
......