Skip to content

Commit

Permalink
merge from toybrick
Browse files Browse the repository at this point in the history
Signed-off-by: chensq <chensq@rock-chips.com>
  • Loading branch information
chensq committed Mar 4, 2021
2 parents 7051ad3 + 8de4986 commit 56b9639
Show file tree
Hide file tree
Showing 734 changed files with 71,021 additions and 8,960 deletions.
1 change: 0 additions & 1 deletion .checkpatch.conf

This file was deleted.

29 changes: 29 additions & 0 deletions Documentation/ABI/testing/configfs-usb-gadget-uvc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ Date: Dec 2014
KernelVersion: 3.20
Description: Control descriptors

All attributes read only:
bInterfaceNumber - USB interface number for this
streaming interface

What: /config/usb-gadget/gadget/functions/uvc.name/control/class
Date: Dec 2014
KernelVersion: 3.20
Expand Down Expand Up @@ -109,6 +113,10 @@ Date: Dec 2014
KernelVersion: 3.20
Description: Streaming descriptors

All attributes read only:
bInterfaceNumber - USB interface number for this
streaming interface

What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class
Date: Dec 2014
KernelVersion: 3.20
Expand Down Expand Up @@ -160,6 +168,10 @@ Description: Specific MJPEG format descriptors

All attributes read only,
except bmaControls and bDefaultFrameIndex:
bFormatIndex - unique id for this format descriptor;
only defined after parent header is
linked into the streaming class;
read-only
bmaControls - this format's data for bmaControls in
the streaming header
bmInterfaceFlags - specifies interlace information,
Expand All @@ -177,6 +189,10 @@ Date: Dec 2014
KernelVersion: 3.20
Description: Specific MJPEG frame descriptors

bFrameIndex - unique id for this framedescriptor;
only defined after parent format is
linked into the streaming header;
read-only
dwFrameInterval - indicates how frame interval can be
programmed; a number of values
separated by newline can be specified
Expand Down Expand Up @@ -204,6 +220,10 @@ Date: Dec 2014
KernelVersion: 3.20
Description: Specific uncompressed format descriptors

bFormatIndex - unique id for this format descriptor;
only defined after parent header is
linked into the streaming class;
read-only
bmaControls - this format's data for bmaControls in
the streaming header
bmInterfaceFlags - specifies interlace information,
Expand All @@ -224,6 +244,10 @@ Date: Dec 2014
KernelVersion: 3.20
Description: Specific uncompressed frame descriptors

bFrameIndex - unique id for this framedescriptor;
only defined after parent format is
linked into the streaming header;
read-only
dwFrameInterval - indicates how frame interval can be
programmed; a number of values
separated by newline can be specified
Expand Down Expand Up @@ -263,3 +287,8 @@ Description: Specific streaming header descriptors
is connected
bmInfo - capabilities of this video streaming
interface

What: /sys/class/udc/udc.name/device/gadget/video4linux/video.name/function_name
Date: May 2018
KernelVersion: 4.19
Description: UVC configfs function instance name
5 changes: 5 additions & 0 deletions Documentation/devicetree/bindings/arm/arch_timer.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ to deliver its interrupts via SPIs.
architecturally-defined reset values. Only supported for 32-bit
systems which follow the ARMv7 architected reset values.

- arm,no-tick-in-suspend : The main counter does not tick when the system is in
low-power system suspend on some SoCs. This behavior does not match the
Architecture Reference Manual's specification that the system counter "must
be implemented in an always-on power domain."


Example:

Expand Down
7 changes: 7 additions & 0 deletions Documentation/devicetree/bindings/arm/rockchip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -128,20 +128,27 @@ Rockchip platforms device tree bindings
- compatible = "rockchip,linux", "rockchip,rk3399";
- compatible = "rockchip,rk3399-excavator-linux", "rockchip,rk3399-excavator-v10-linux";

- Rockchip RK3399 evb ind board (Linux):
Required root node properties:
- compatible = "rockchip,linux", "rockchip,rk3399";
- compatible = "rockchip,rk3399-evb-ind-lpddr4-linux";

- Rockchip RK3399pro evb:
Required root node properties:
- compatible = "rockchip,rk3399pro-evb-v10", "rockchip,rk3399pro";
- compatible = "rockchip,rk3399pro-evb-v10-linux", "rockchip,rk3399pro";
- compatible = "rockchip,rk3399pro-evb-v11-linux", "rockchip,rk3399pro";
- compatible = "rockchip,rk3399pro-evb-v13-linux", "rockchip,rk3399pro";
- compatible = "rockchip,rk3399pro-evb-v13-multi-cam", "rockchip,rk3399pro";
- compatible = "rockchip,rk3399pro-evb-v14-linux", "rockchip,rk3399pro";

- Rockchip RK3399pro evb avb:
Required root node properties:
- compatible = "rockchip,rk3399pro-evb-v10-avb", "rockchip,rk3399pro";
- compatible = "rockchip,rk3399pro-evb-v11-avb", "rockchip,rk3399pro";
- compatible = "rockchip,rk3399pro-evb-lp4-v11-avb", "rockchip,rk3399pro";
- compatible = "rockchip,rk3399pro-evb-v13-multi-cam-avb", "rockchip,rk3399pro";
- compatible = "rockchip,rk3399pro-evb-v14-multi-cam-avb", "rockchip,rk3399pro";

- Rockchip RK3326 f863 board:
Required root node properties:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@ Optional properties:
- vdd1-supply: phandle to vdd1 regulator device node
- vdd2-supply: phandle to vdd2 regulator device node
- vdd3-supply: phandle to vdd3 regulator device node
- chipone,mipi-lane-pn-swap: enable mipi lane p/n swap
- chipone,rgb-color-swap-mode: set output RGB color swap mode,
must be one of following values:
- 0: Group_0[Red], Group_1[Green], Group_2[Blue]
- 1: Group_0[Red], Group_1[Blue], Group_2[Green]
- 2: Group_0[Green], Group_1[Red], Group_2[Blue]
- 3: Group_0[Green], Group_1[Blue], Group_2[Red]
- 4: Group_0[Blue], Group_1[Red], Group_2[Green]
- 5: Group_0[Blue], Group_1[Green], Group_2[Red]
if not specified the value defaults to 5.

Example:

Expand Down
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/dram/rk3368_dram_timing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ Required properties:

- phy_odt : define the phy odt in ohm, default value isPHY_RTT_279ohm

- ddr_2t : define the uptcl CMD/CLK 2T mode, default value is ENABLE_DDR_2T.

the driver strength and odt value are defined at include/dt-bindings/dram/rockchip,rk3368.h

Example:
Expand All @@ -73,5 +75,6 @@ Example:
phy_cmd_drv = <PHY_RON_34ohm>;
phy_dqs_drv = <PHY_RON_34ohm>;
phy_odt = <PHY_RTT_279ohm>;
ddr_2t = <ENABLE_DDR_2T>;
};
};
40 changes: 40 additions & 0 deletions Documentation/devicetree/bindings/media/i2c/ar0144.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
* Aptina AR0144 MIPI sensor

Required Properties:
- compatible: should be "aptina,ar0144"
- clocks: reference to the 24M xvclk input clock.
- clock-names: should be "xvclk".
- dovdd-supply: Digital I/O voltage supply, 1.8/2.8 volts
- avdd-supply: Analog voltage supply, 2.8 volts
- dvdd-supply: Digital core voltage supply, 1.2 volts
- reset-gpios: Low active reset gpio

The device node must contain one 'port' child node for its digital output
video port, in accordance with the video interface bindings defined in
Documentation/devicetree/bindings/media/video-interfaces.txt.

Example:
ar0144: ar0144@10 {
compatible = "aptina,ar0144";
status = "okay";
reg = <0x10>;
clocks = <&cru SCLK_CIF_OUT>;
clock-names = "xvclk";

//conflict with csi-ctl-gpios
reset-gpios = <&gpio4 26 GPIO_ACTIVE_LOW>;
pwdn-gpios = <&gpio4 25 GPIO_ACTIVE_HIGH>;
pinctrl-names = "rockchip,camera_default";
pinctrl-0 = <&cif_clkout>;
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
port {
ucam_out3: endpoint {
remote-endpoint = <&mipi_in_ucam3>;
data-lanes = <1>;
};
};
};

47 changes: 47 additions & 0 deletions Documentation/devicetree/bindings/media/i2c/bf20a2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
* BF20A2 1/10-Inch 0.3Mp SOC Camera

The BYD BF20A2 is a 1/10-inch SOC camera, with an active array size of
640H x 480V. It is programmable through a SCCB. The BF20A2 sensor supports
SVGA. It also can support YUV422 or raw RGB output formats.

Required Properties:
- compatible: Must be "byd,bf20a2"
- reg: I2C slave address
- clocks: reference to the xvclk input clock.
- clock-names: should be "xvclk".
- dovdd-supply: Digital I/O voltage supply, 1.7~3.1 volts
- avdd-supply: Analog voltage supply, 2.8 volts
- powerdown-gpios: High active powerdown gpio

The device node must contain one 'port' child node for its digital output
video port, in accordance with the video interface bindings defined in
Documentation/devicetree/bindings/media/video-interfaces.txt.

Example:
&i2c2 {
status = "okay";

bf20a2: bf20a2@6e {
status = "okay";
compatible = "byd,bf20a2";
reg = <0x6e>;
clocks = <&cru SCLK_CIF_OUT>;
clock-names = "xvclk";

avdd-supply = <&vcc2v8_dvp>;
dovdd-supply = <&vcc2v8_dvp>;
pinctrl-names = "default";
pinctrl-0 = <&cif_clkout_m0>;
pwdn-gpios = <&gpio2 13 GPIO_ACTIVE_HIGH>;
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";

port {
bf20a2_out: endpoint {
remote-endpoint = <&dvp_in_bcam>;
};
};
};
};
45 changes: 45 additions & 0 deletions Documentation/devicetree/bindings/media/i2c/gc2053.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
* GalaxyCore GC2053 MIPI sensor

Required Properties:
- compatible: should be "galaxycore,gc2053"
- clocks: reference to the 24M xvclk input clock.
- clock-names: should be "xvclk".
- dovdd-supply: Digital I/O voltage supply, 1.8 volts
- avdd-supply: Analog voltage supply, 2.8 volts
- dvdd-supply: Digital core voltage supply, 1.2 volts
- reset-gpios: Low active reset gpio
- pwdn-gpios: Low active power down gpio

The device node must contain one 'port' child node for its digital output
video port, in accordance with the video interface bindings defined in
Documentation/devicetree/bindings/media/video-interfaces.txt.

Example:
//rk3399pro evb board
&i2c1 {
status = "okay";
gc2053: gc2053@37 {
compatible = "galaxycore,gc2053";
status = "okay";
reg = <0x37>;
clocks = <&cru SCLK_CIF_OUT>;
clock-names = "xvclk";

//conflict with csi-ctl-gpios
reset-gpios = <&gpio4 26 GPIO_ACTIVE_HIGH>;
pwdn-gpios = <&gpio4 25 GPIO_ACTIVE_HIGH>;
pinctrl-names = "rockchip,camera_default";
pinctrl-0 = <&cif_clkout>;
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
port {
ucam_out0: endpoint {
remote-endpoint = <&mipi_in_ucam0>;
data-lanes = <1>;
};
};
};
};

50 changes: 50 additions & 0 deletions Documentation/devicetree/bindings/media/i2c/imx214.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
* Sony IMX214 MIPI sensor

Required Properties:
- compatible: should be "sony,imx214"
- clocks: reference to the 24M xvclk input clock.
- clock-names: should be "xvclk".
- dovdd-supply: Digital I/O voltage supply, 1.8 volts
- avdd-supply: Analog voltage supply, 2.8 volts
- dvdd-supply: Digital core voltage supply, 1.0 volts
- reset-gpios: Low active reset gpio

The device node must contain one 'port' child node for its digital output
video port, in accordance with the video interface bindings defined in
Documentation/devicetree/bindings/media/video-interfaces.txt.

Example:
//rk3399 evb board
&i2c1 {
status = "okay";
imx214_eeprom: imx214_eeprom@0x50 {
compatible = "sony,imx214_eeprom";
status = "okay";
reg = <0x50>;
};
imx214: imx214@10 {
eeprom-ctrl = <&imx214_eeprom>;
compatible = "sony,imx214";
status = "okay";
reg = <0x10>;
clocks = <&cru SCLK_CIF_OUT>;
clock-names = "xvclk";
/* avdd-supply = <>; */
/* dvdd-supply = <>; */
/* dovdd-supply = <>; */
/* pwdn-gpios = <>; */
reset-gpios = <&gpio2 13 GPIO_ACTIVE_LOW>;
pinctrl-names = "rockchip,camera_default";
pinctrl-0 = <&cif_clkout>;
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "YG9626-S600Y7-C";
rockchip,camera-module-lens-name = "LG-50013A7";
port {
ucam_out1: endpoint {
remote-endpoint = <&mipi_in_ucam0>;
data-lanes = <1 2>;
};
};
};
};
39 changes: 39 additions & 0 deletions Documentation/devicetree/bindings/media/i2c/imx291.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
* Sony IMX291 MIPI sensor

Required Properties:
- compatible: should be "sony,imx291"
- clocks: reference to the 37.125M xvclk input clock.
- clock-names: should be "xvclk".
- dovdd-supply: Digital I/O voltage supply, 1.8 volts
- avdd-supply: Analog voltage supply, 2.8 volts
- dvdd-supply: Digital core voltage supply, 1.2 volts
- reset-gpios: Low active reset gpio

The device node must contain one 'port' child node for its digital output
video port, in accordance with the video interface bindings defined in
Documentation/devicetree/bindings/media/video-interfaces.txt.

Example:
imx291: imx291@1a {
compatible = "sony,imx291";
status = "okay";
reg = <0x1a>;
clocks = <&cru SCLK_CIF_OUT>;
clock-names = "xvclk";
//conflict with csi-ctl-gpios
reset-gpios = <&gpio4 26 GPIO_ACTIVE_HIGH>;
pwdn-gpios = <&gpio4 25 GPIO_ACTIVE_HIGH>;
pinctrl-names = "rockchip,camera_default";
pinctrl-0 = <&cif_clkout>;
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
port {
ucam_out0: endpoint {
remote-endpoint = <&mipi_in_ucam0>;
data-lanes = <1 2>;
};
};
};

Loading

0 comments on commit 56b9639

Please sign in to comment.