| Message ID | 20181130075849.16941-6-wens@csie.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | media: sun6i: Separate H3 compatible from A31 | expand |
On Fri, Nov 30, 2018 at 1:29 PM Chen-Yu Tsai <wens@csie.org> wrote: > > The Bananapi M2+ comes with an optional sensor based on the ov5640 from > Omnivision. Enable the support for it in the DT. > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> > --- > arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi | 87 +++++++++++++++++++ > 1 file changed, 87 insertions(+) > > diff --git a/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi b/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi > index b3283aeb5b7d..d97a98acf378 100644 > --- a/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi > +++ b/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi > @@ -89,6 +89,42 @@ > }; > }; > > + reg_cam_avdd: cam-avdd { > + compatible = "regulator-fixed"; > + regulator-name = "csi-avdd"; > + regulator-min-microvolt = <2800000>; > + regulator-max-microvolt = <2800000>; > + startup-delay-us = <200>; /* 50 us + board delays */ > + enable-active-high; > + gpio = <&pio 3 14 GPIO_ACTIVE_HIGH>; /* PD14 */ > + }; > + > + reg_cam_dovdd: cam-dovdd { > + compatible = "regulator-fixed"; > + regulator-name = "csi-dovdd"; > + regulator-min-microvolt = <2800000>; > + regulator-max-microvolt = <2800000>; > + /* > + * This regulator also powers the pull-ups for the I2C bus. > + * For some reason, if this is turned off, subsequent use > + * of the I2C bus, even when turned on, does not work. > + */ > + startup-delay-us = <200>; /* 50 us + board delays */ > + regulator-always-on; > + enable-active-high; > + gpio = <&pio 3 14 GPIO_ACTIVE_HIGH>; /* PD14 */ > + }; > + > + reg_cam_dvdd: cam-dvdd { > + compatible = "regulator-fixed"; > + regulator-name = "csi-dvdd"; > + regulator-min-microvolt = <1500000>; > + regulator-max-microvolt = <1500000>; > + startup-delay-us = <200>; /* 50 us + board delays */ > + enable-active-high; > + gpio = <&pio 3 14 GPIO_ACTIVE_HIGH>; /* PD14 */ > + }; > + > reg_gmac_3v3: gmac-3v3 { > compatible = "regulator-fixed"; > regulator-name = "gmac-3v3"; > @@ -106,6 +142,26 @@ > }; > }; > > +&csi { > + status = "okay"; > + > + port { > + #address-cells = <1>; > + #size-cells = <0>; > + > + /* Parallel bus endpoint */ > + csi_from_ov5640: endpoint { > + remote-endpoint = <&ov5640_to_csi>; > + bus-width = <8>; > + data-shift = <2>; If I'm not wrong, the data-shift is not available in sun6i at-least in conf register.
On Mon, Dec 3, 2018 at 5:52 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > On Fri, Nov 30, 2018 at 1:29 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > The Bananapi M2+ comes with an optional sensor based on the ov5640 from > > Omnivision. Enable the support for it in the DT. > > > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> > > --- > > arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi | 87 +++++++++++++++++++ > > 1 file changed, 87 insertions(+) > > > > diff --git a/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi b/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi > > index b3283aeb5b7d..d97a98acf378 100644 > > --- a/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi > > +++ b/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi > > @@ -89,6 +89,42 @@ > > }; > > }; > > > > + reg_cam_avdd: cam-avdd { > > + compatible = "regulator-fixed"; > > + regulator-name = "csi-avdd"; > > + regulator-min-microvolt = <2800000>; > > + regulator-max-microvolt = <2800000>; > > + startup-delay-us = <200>; /* 50 us + board delays */ > > + enable-active-high; > > + gpio = <&pio 3 14 GPIO_ACTIVE_HIGH>; /* PD14 */ > > + }; > > + > > + reg_cam_dovdd: cam-dovdd { > > + compatible = "regulator-fixed"; > > + regulator-name = "csi-dovdd"; > > + regulator-min-microvolt = <2800000>; > > + regulator-max-microvolt = <2800000>; > > + /* > > + * This regulator also powers the pull-ups for the I2C bus. > > + * For some reason, if this is turned off, subsequent use > > + * of the I2C bus, even when turned on, does not work. > > + */ > > + startup-delay-us = <200>; /* 50 us + board delays */ > > + regulator-always-on; > > + enable-active-high; > > + gpio = <&pio 3 14 GPIO_ACTIVE_HIGH>; /* PD14 */ > > + }; > > + > > + reg_cam_dvdd: cam-dvdd { > > + compatible = "regulator-fixed"; > > + regulator-name = "csi-dvdd"; > > + regulator-min-microvolt = <1500000>; > > + regulator-max-microvolt = <1500000>; > > + startup-delay-us = <200>; /* 50 us + board delays */ > > + enable-active-high; > > + gpio = <&pio 3 14 GPIO_ACTIVE_HIGH>; /* PD14 */ > > + }; > > + > > reg_gmac_3v3: gmac-3v3 { > > compatible = "regulator-fixed"; > > regulator-name = "gmac-3v3"; > > @@ -106,6 +142,26 @@ > > }; > > }; > > > > +&csi { > > + status = "okay"; > > + > > + port { > > + #address-cells = <1>; > > + #size-cells = <0>; > > + > > + /* Parallel bus endpoint */ > > + csi_from_ov5640: endpoint { > > + remote-endpoint = <&ov5640_to_csi>; > > + bus-width = <8>; > > + data-shift = <2>; > > If I'm not wrong, the data-shift is not available in sun6i at-least in > conf register. Indeed. Seems only a few drivers actually take this into account. Since this is just an example, I'm not going to respin it. ChenYu
diff --git a/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi b/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi index b3283aeb5b7d..d97a98acf378 100644 --- a/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi +++ b/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi @@ -89,6 +89,42 @@ }; }; + reg_cam_avdd: cam-avdd { + compatible = "regulator-fixed"; + regulator-name = "csi-avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + startup-delay-us = <200>; /* 50 us + board delays */ + enable-active-high; + gpio = <&pio 3 14 GPIO_ACTIVE_HIGH>; /* PD14 */ + }; + + reg_cam_dovdd: cam-dovdd { + compatible = "regulator-fixed"; + regulator-name = "csi-dovdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + /* + * This regulator also powers the pull-ups for the I2C bus. + * For some reason, if this is turned off, subsequent use + * of the I2C bus, even when turned on, does not work. + */ + startup-delay-us = <200>; /* 50 us + board delays */ + regulator-always-on; + enable-active-high; + gpio = <&pio 3 14 GPIO_ACTIVE_HIGH>; /* PD14 */ + }; + + reg_cam_dvdd: cam-dvdd { + compatible = "regulator-fixed"; + regulator-name = "csi-dvdd"; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; + startup-delay-us = <200>; /* 50 us + board delays */ + enable-active-high; + gpio = <&pio 3 14 GPIO_ACTIVE_HIGH>; /* PD14 */ + }; + reg_gmac_3v3: gmac-3v3 { compatible = "regulator-fixed"; regulator-name = "gmac-3v3"; @@ -106,6 +142,26 @@ }; }; +&csi { + status = "okay"; + + port { + #address-cells = <1>; + #size-cells = <0>; + + /* Parallel bus endpoint */ + csi_from_ov5640: endpoint { + remote-endpoint = <&ov5640_to_csi>; + bus-width = <8>; + data-shift = <2>; + hsync-active = <1>; /* Active high */ + vsync-active = <0>; /* Active low */ + data-active = <1>; /* Active high */ + pclk-sample = <1>; /* Rising */ + }; + }; +}; + &de { status = "okay"; }; @@ -149,6 +205,37 @@ }; }; +&i2c2 { + status = "okay"; + + ov5640: camera@3c { + compatible = "ovti,ov5640"; + reg = <0x3c>; + pinctrl-names = "default"; + pinctrl-0 = <&csi_mclk_pin>; + clocks = <&ccu CLK_CSI_MCLK>; + clock-names = "xclk"; + + reset-gpios = <&pio 4 14 GPIO_ACTIVE_LOW>; /* PE14 */ + powerdown-gpios = <&pio 4 15 GPIO_ACTIVE_HIGH>; /* PE15 */ + AVDD-supply = <®_cam_avdd>; + DOVDD-supply = <®_cam_dovdd>; + DVDD-supply = <®_cam_dvdd>; + + port { + ov5640_to_csi: endpoint { + remote-endpoint = <&csi_from_ov5640>; + bus-width = <8>; + data-shift = <2>; + hsync-active = <1>; /* Active high */ + vsync-active = <0>; /* Active low */ + data-active = <1>; /* Active high */ + pclk-sample = <1>; /* Rising */ + }; + }; + }; +}; + &ir { pinctrl-names = "default"; pinctrl-0 = <&ir_pins_a>;
The Bananapi M2+ comes with an optional sensor based on the ov5640 from Omnivision. Enable the support for it in the DT. Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+)