-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'nxp-linux-sdk/imx_5.4.y' into imx_5.4.y…
…_android Conflicts: drivers/mxc/gpu-viv/hal/kernel/inc/gc_feature_database.h drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_gfp.c drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx.c Change-Id: I32a62ecd8d9de89363f380143b3bdf99164d8c6c Signed-off-by: Jindong <[email protected]>
- Loading branch information
Showing
59 changed files
with
4,694 additions
and
722 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
arch/arm64/boot/dts/freescale/imx8mp-evk-basler-ov5640.dts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
| /* | ||
| * Copyright 2020 NXP | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU General Public License | ||
| * as published by the Free Software Foundation; either version 2 | ||
| * of the License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| */ | ||
|
|
||
| #include "imx8mp-evk.dts" | ||
|
|
||
| &i2c2 { | ||
| /delete-node/ov5640_mipi@3c; | ||
|
|
||
| basler_camera@36 { | ||
| compatible = "basler,basler-camera-vvcam", "basler-camera-vvcam"; | ||
| reg = <0x36>; | ||
| csi_id = <0x00>; | ||
| status = "okay"; | ||
|
|
||
| port { | ||
| basler_ep_0: endpoint { | ||
| data-lanes = <1 2 3 4>; | ||
| clock-lanes = <0>; | ||
| link-frequencies = /bits/ 64 <248000000>; | ||
| remote-endpoint = <&mipi_csi0_ep>; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &mipi_csi_0 { | ||
| status = "okay"; | ||
|
|
||
| port@0 { | ||
| mipi_csi0_ep: endpoint { | ||
| remote-endpoint = <&basler_ep_0>; | ||
| data-lanes = <4>; | ||
| csis-hs-settle = <16>; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &mipi_csi_1 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &ov5640_1 { | ||
| powerdown-gpios = <&gpio2 11 GPIO_ACTIVE_HIGH>; | ||
| reset-gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; | ||
| csi_id = <1>; | ||
|
|
||
| status = "okay"; | ||
| }; | ||
|
|
||
| &isi_0 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &isi_1 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &isp_0 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &dewarp { | ||
| status = "okay"; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
127 changes: 127 additions & 0 deletions
127
arch/arm64/boot/dts/freescale/imx8mp-evk-dual-ov2775.dts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
| /* | ||
| * Copyright 2020 NXP | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU General Public License | ||
| * as published by the Free Software Foundation; either version 2 | ||
| * of the License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| */ | ||
|
|
||
| #include "imx8mp-evk.dts" | ||
|
|
||
| &i2c2 { | ||
| /delete-node/ov5640_mipi@3c; | ||
|
|
||
| ov2775_0: ov2775_mipi@36 { | ||
| compatible = "ovti,ov2775"; | ||
| reg = <0x36>; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&pinctrl_csi0_pwn>, <&pinctrl_csi0_rst>, <&pinctrl_csi_mclk>; | ||
| clocks = <&clk IMX8MP_CLK_IPP_DO_CLKO2>; | ||
| clock-names = "csi_mclk"; | ||
| assigned-clocks = <&clk IMX8MP_CLK_IPP_DO_CLKO2>; | ||
| assigned-clock-parents = <&clk IMX8MP_CLK_24M>; | ||
| assigned-clock-rates = <24000000>; | ||
| csi_id = <0>; | ||
| pwn-gpios = <&gpio2 11 GPIO_ACTIVE_HIGH>; | ||
| rst-gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; | ||
| mclk = <24000000>; | ||
| mclk_source = <0>; | ||
| status = "okay"; | ||
|
|
||
| port { | ||
| ov2775_mipi_0_ep: endpoint { | ||
| data-lanes = <1 2 3 4>; | ||
| clock-lanes = <0>; | ||
| remote-endpoint = <&mipi_csi0_ep>; | ||
| }; | ||
| }; | ||
|
|
||
| }; | ||
| }; | ||
|
|
||
| &i2c3 { | ||
| clock-frequency = <100000>; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&pinctrl_i2c3>; | ||
| status = "okay"; | ||
|
|
||
| /delete-node/ov5640_mipi@3c; | ||
|
|
||
| ov2775_1: ov2775_mipi@36 { | ||
| compatible = "ovti,ov2775"; | ||
| reg = <0x36>; | ||
| clocks = <&clk IMX8MP_CLK_IPP_DO_CLKO2>; | ||
| clock-names = "csi_mclk"; | ||
| assigned-clocks = <&clk IMX8MP_CLK_IPP_DO_CLKO2>; | ||
| assigned-clock-parents = <&clk IMX8MP_CLK_24M>; | ||
| assigned-clock-rates = <24000000>; | ||
| csi_id = <1>; | ||
| mclk = <24000000>; | ||
| mclk_source = <0>; | ||
| status = "okay"; | ||
|
|
||
| port { | ||
| ov2775_mipi_1_ep: endpoint { | ||
| data-lanes = <1 2 3 4>; | ||
| clock-lanes = <0>; | ||
| remote-endpoint = <&mipi_csi1_ep>; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &cameradev { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &isi_0 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &isi_1 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &isp_0 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &isp_1 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &dewarp { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &mipi_csi_0 { | ||
| status = "okay"; | ||
|
|
||
| port@0 { | ||
| endpoint { | ||
| remote-endpoint = <&ov2775_mipi_0_ep>; | ||
| data-lanes = <4>; | ||
| csis-hs-settle = <16>; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &mipi_csi_1 { | ||
| status = "okay"; | ||
|
|
||
| port@1 { | ||
| reg = <1>; | ||
| mipi_csi1_ep: endpoint { | ||
| remote-endpoint = <&ov2775_mipi_1_ep>; | ||
| data-lanes = <4>; | ||
| csis-hs-settle = <16>; | ||
| }; | ||
| }; | ||
| }; |
Oops, something went wrong.