media/sun6i: Allwinner A64 CSI support
Subsystems (4)
v7 cover media/sun6i: Allwinner A64 CSI support
Add CSI support for Allwinner A64. Here is previous series[1]
Changes for v7:
- Drop quirk change, and add as suggusted by Maxime
- Use csi instead csi0 in pinctrl function Changes for v6:
- set the mod rate in seett_power instead of probe Changes for v5:
- Add mod_rate quirk for better handling clk_set code Changes for v4:
- update the compatible string order
- add proper commit message
- included BPI-M64 patch
- skipped amarula-a64 patch
Changes for v3:
- update dt-bindings for A64
- set mod clock via csi driver
- remove assign clocks from dtsi
- remove i2c-gpio opendrian
- fix avdd and dovdd supplies
- remove vcc-csi pin group supply
[1] https://patchwork.kernel.org/cover/10771163/
Any inputs?
Jagan.
Jagan Teki (5):
dt-bindings: media: sun6i: Add A64 CSI compatible
media: sun6i: Add A64 CSI block support
arm64: dts: allwinner: a64: Add A64 CSI controller
arm64: dts: allwinner: a64: Add pinmux setting for CSI MCLK on PE1 [DO NOT MERGET] arm64: dts: allwinner: bananapi-m64: Add HDF5640 camera module
.../devicetree/bindings/media/sun6i-csi.txt | 1 + .../dts/allwinner/sun50i-a64-bananapi-m64.dts | 65 +++++++++++++++++++ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 25 +++++++ .../platform/sunxi/sun6i-csi/sun6i_csi.c | 13 +++- 4 files changed, 103 insertions(+), 1 deletion(-)
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH v7 1/5 dt-bindings: media: sun6i: Add A64 CSI compatible
Allwinner A64 CSI is a single channel time-multiplexed BT.656 protocol interface.
Add separate compatible string for A64 since it require explicit change in sun6i_csi driver to update default CSI_SCLK rate.
--- Documentation/devicetree/bindings/media/sun6i-csi.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/media/sun6i-csi.txt +1 -0
@@ -8,6 +8,7 @@ Required properties: * "allwinner,sun6i-a31-csi" * "allwinner,sun8i-h3-csi" * "allwinner,sun8i-v3s-csi" + * "allwinner,sun50i-a64-csi" - reg: base address and size of the memory-mapped region. - interrupts: interrupt associated to this IP - clocks: phandles to the clocks feeding the CSI
Signature · 1 line
2.18.0.321.gffc6fa0e3
Re: [PATCH v7 1/5] dt-bindings: media: sun6i: Add A64 CSI compatible
Quoted 8 lines · Jagan Teki
Allwinner A64 CSI is a single channel time-multiplexed BT.656 protocol interface.
Add separate compatible string for A64 since it require explicit change in
sun6i_csidriver to update defaultCSI_SCLKrate.Reviewed-by Rob Herring <[email protected]>
Maxime
Signature · 3 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v7 2/5 media: sun6i: Add A64 CSI block support
In reply to Jagan TekiCSI block in Allwinner A64 has similar features as like in H3, but the default CSI_SCLK rate cannot work properly to drive the connected sensor interface.
The tested mod cock rate is 300 MHz and BSP vfe media driver is also using the same rate. Unfortunately there is no valid information about clock rate in manual or any other sources except the BSP driver. so more faith on BSP code, because same has tested in mainline.
So, add support for A64 CSI block by setting updated mod clock rate.
--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +12 -1
@@ -15,6 +15,7 @@#include <linux/ioctl.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h>
@@ -154,6 +155,7 @@ bool sun6i_csi_is_format_supported(struct sun6i_csi *csi,int sun6i_csi_set_power (struct sun6i_csi *csi,bool enable) {struct sun6i_csi_dev *sdev =sun6i_csi_to_dev (csi); +struct device *dev = sdev->dev;struct regmap *regmap = sdev->regmap;int ret;
@@ -161,15 +163,20 @@ int sun6i_csi_set_power(struct sun6i_csi *csi, bool enable)regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,0 );clk_disable_unprepare (sdev->clk_ram); +if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) +clk_rate_exclusive_put (sdev->clk_mod);clk_disable_unprepare (sdev->clk_mod);reset_control_assert (sdev->rstc_bus);return 0 ; } +if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) +clk_set_rate_exclusive (sdev->clk_mod,300000000 ); + ret =clk_prepare_enable (sdev->clk_mod);if (ret) {dev_err (sdev->dev,"Enable csi clk err %d\n" , ret); -return ret; + goto clk_mod_put; } ret =clk_prepare_enable (sdev->clk_ram);
@@ -192,6 +199,9 @@ int sun6i_csi_set_power(struct sun6i_csi *csi, bool enable)clk_disable_unprepare (sdev->clk_ram); clk_mod_disable:clk_disable_unprepare (sdev->clk_mod); +clk_mod_put: +if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) +clk_rate_exclusive_put (sdev->clk_mod);return ret; }
@@ -895,6 +905,7 @@ static const struct of_device_id sun6i_csi_of_match[] = { { .compatible = "allwinner,sun6i-a31-csi", }, { .compatible = "allwinner,sun8i-h3-csi", }, { .compatible = "allwinner,sun8i-v3s-csi", }, + { .compatible = "allwinner,sun50i-a64-csi", }, {}, }; MODULE_DEVICE_TABLE(of, sun6i_csi_of_match);
Signature · 1 line
2.18.0.321.gffc6fa0e3
Re: [PATCH v7 2/5] media: sun6i: Add A64 CSI block support
Quoted 59 lines · Jagan Teki
CSI block in Allwinner A64 has similar features as like in H3, but the default
CSI_SCLKrate cannot work properly to drive the connected sensor interface.The tested mod cock rate is 300 MHz and BSP vfe media driver is also using the same rate. Unfortunately there is no valid information about clock rate in manual or any other sources except the BSP driver. so more faith on BSP code, because same has tested in mainline.
So, add support for A64 CSI block by setting updated mod clock rate.
--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +8
-1@@ -15,6 +15,7 @@#include <linux/ioctl.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> @@ -154,6 +155,7 @@ bool sun6i_csi_is_format_supported(struct sun6i_csi *csi,int sun6i_csi_set_power (struct sun6i_csi *csi,bool enable) {struct sun6i_csi_dev *sdev =sun6i_csi_to_dev (csi); +struct device *dev = sdev->dev;struct regmap *regmap = sdev->regmap;int ret;@@ -161,15 +163,20 @@ int sun6i_csi_set_power(struct sun6i_csi *csi, bool enable)regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,0 );clk_disable_unprepare (sdev->clk_ram); +if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) +clk_rate_exclusive_put (sdev->clk_mod);clk_disable_unprepare (sdev->clk_mod);reset_control_assert (sdev->rstc_bus);return 0 ; } +if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) +clk_set_rate_exclusive (sdev->clk_mod,300000000 ); + ret =clk_prepare_enable (sdev->clk_mod);if (ret) {dev_err (sdev->dev,"Enable csi clk err %d\n" , ret); -return ret; + goto clk_mod_put; } ret =clk_prepare_enable (sdev->clk_ram);
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c int sun6i_csi_set_power(struct sun6i_csi *csi, bool enable) · line 205
Quoted 7 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +3
-0@@ -192,6 +199,9 @@ int sun6i_csi_set_power(struct sun6i_csi *csi, bool enable)clk_disable_unprepare (sdev->clk_ram); clk_mod_disable:clk_disable_unprepare (sdev->clk_mod); +clk_mod_put: +if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) +clk_rate_exclusive_put (sdev->clk_mod);return ret;
The sequence in the error path and in the disable path aren't the same, why?
Maxime
Signature · 3 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [PATCH v7 2/5] media: sun6i: Add A64 CSI block support
Quoted 59 lines · Maxime Ripard
Quoted 57 lines · Jagan Teki
CSI block in Allwinner A64 has similar features as like in H3, but the default
CSI_SCLKrate cannot work properly to drive the connected sensor interface.The tested mod cock rate is 300 MHz and BSP vfe media driver is also using the same rate. Unfortunately there is no valid information about clock rate in manual or any other sources except the BSP driver. so more faith on BSP code, because same has tested in mainline.
So, add support for A64 CSI block by setting updated mod clock rate.
Signed-off-by Jagan Teki <[email protected]>--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +8
-1@@ -15,6 +15,7 @@#include <linux/ioctl.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> @@ -154,6 +155,7 @@ bool sun6i_csi_is_format_supported(struct sun6i_csi *csi,int sun6i_csi_set_power (struct sun6i_csi *csi,bool enable) {struct sun6i_csi_dev *sdev =sun6i_csi_to_dev (csi); +struct device *dev = sdev->dev;struct regmap *regmap = sdev->regmap;int ret;@@ -161,15 +163,20 @@ int sun6i_csi_set_power(struct sun6i_csi *csi, bool enable)regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,0 );clk_disable_unprepare (sdev->clk_ram); +if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) +clk_rate_exclusive_put (sdev->clk_mod);clk_disable_unprepare (sdev->clk_mod);reset_control_assert (sdev->rstc_bus);return 0 ; } +if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) +clk_set_rate_exclusive (sdev->clk_mod,300000000 ); + ret =clk_prepare_enable (sdev->clk_mod);if (ret) {dev_err (sdev->dev,"Enable csi clk err %d\n" , ret); -return ret; + goto clk_mod_put; }
Quoted 11 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c int sun6i_csi_set_power(struct sun6i_csi *csi, bool enable) · line 205
Quoted 9 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +3
-0ret =clk_prepare_enable (sdev->clk_ram);@@ -192,6 +199,9 @@ int sun6i_csi_set_power(struct sun6i_csi *csi, bool enable)clk_disable_unprepare (sdev->clk_ram); clk_mod_disable:clk_disable_unprepare (sdev->clk_mod); +clk_mod_put: +if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) +clk_rate_exclusive_put (sdev->clk_mod);return ret;The sequence in the error path and in the disable path aren't the same, why?
True, it should be similar sequence, will fix and send next version. thanks!
PATCH v7 3/5 arm64: dts: allwinner: a64: Add A64 CSI controller
In reply to Jagan TekiAdd dts node details for Allwinner A64 CSI controller.
A64 CSI has similar features as like in H3, but the CSI_SCLK need to update it to 300MHz than default clock rate.
--- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +20 -0
@@ -558,6 +558,12 @@ interrupt-controller; #interrupt-cells = <3>; + csi_pins: csi-pins { + pins = "PE0", "PE2", "PE3", "PE4", "PE5", "PE6", + "PE7", "PE8", "PE9", "PE10", "PE11"; + function = "csi"; + }; + i2c0_pins: i2c0_pins { pins = "PH0", "PH1"; function = "i2c0";
@@ -925,6 +931,20 @@ status = "disabled"; }; + csi: csi@1cb0000 { + compatible = "allwinner,sun50i-a64-csi"; + reg = <0x01cb0000 0x1000>; + interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_CSI>, + <&ccu CLK_CSI_SCLK>, + <&ccu CLK_DRAM_CSI>; + clock-names = "bus", "mod", "ram"; + resets = <&ccu RST_BUS_CSI>; + pinctrl-names = "default"; + pinctrl-0 = <&csi_pins>; + status = "disabled"; + }; + hdmi: hdmi@1ee0000 { compatible = "allwinner,sun50i-a64-dw-hdmi", "allwinner,sun8i-a83t-dw-hdmi";
Signature · 1 line
2.18.0.321.gffc6fa0e3
Re: [PATCH v7 3/5] arm64: dts: allwinner: a64: Add A64 CSI controller
Quoted 6 lines · Jagan Teki
Add dts node details for Allwinner A64 CSI controller.
A64 CSI has similar features as like in H3, but the
CSI_SCLKneed to update it to 300MHz than default clock rate.
Maxime
Signature · 3 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v7 4/5 arm64: dts: allwinner: a64: Add pinmux setting for CSI MCLK on PE1
In reply to Jagan TekiSome camera modules have the SoC feeding a master clock to the sensor instead of having a standalone crystal. This clock signal is generated from the clock control unit and output from the CSI MCLK function of pin PE1.
Add a pinmux setting for it for camera sensors to reference.
--- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +5 -0
@@ -564,6 +564,11 @@ function = "csi"; }; + csi_mclk_pin: csi-mclk { + pins = "PE1"; + function = "csi"; + }; + i2c0_pins: i2c0_pins { pins = "PH0", "PH1"; function = "i2c0";
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH v7 5/5 arm64: dts: allwinner: bananapi-m64: Add HDF5640 camera module
In reply to Jagan TekiBananapi M64 comes with an optional sensor based on the ov5640, add support for it with below pin information.
- PE13, PE12 via i2c-gpio bitbanging
- CLK_CSI_MCLK as external clock
- PE1 as external clock pin muxing
- DLDO3 as AVDD supply
- ALDO1 as DOVDD supply
- ELDO3 as DVDD supply
- PE16 gpio for reset pin
- PE17 gpio for powerdown pin
--- .../dts/allwinner/sun50i-a64-bananapi-m64.dts | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts +65 -0
@@ -60,6 +60,41 @@ stdout-path = "serial0:115200n8"; }; + i2c-csi { + compatible = "i2c-gpio"; + sda-gpios = <&pio 4 13 GPIO_ACTIVE_HIGH>; /* CSI0-SDA: PE13 */ + scl-gpios = <&pio 4 12 GPIO_ACTIVE_HIGH>; /* CSI0-SCK: PE12 */ + i2c-gpio,delay-us = <5>; + #address-cells = <1>; + #size-cells = <0>; + + ov5640: camera@3c { + compatible = "ovti,ov5640"; + reg = <0x3c>; + pinctrl-names = "default"; + pinctrl-0 = <&csi_mclk_pin>; + clocks = <&ccu CLK_CSI_MCLK>; + clock-names = "xclk"; + + AVDD-supply = <®_dldo3>; + DOVDD-supply = <®_aldo1>; + DVDD-supply = <®_eldo3>; + reset-gpios = <&pio 4 16 GPIO_ACTIVE_LOW>; /* CSI0-RST: PE16 */ + powerdown-gpios = <&pio 4 17 GPIO_ACTIVE_HIGH>; /* CSI0-PWDN: PE17 */ + + port { + ov5640_ep: endpoint { + remote-endpoint = <&csi_ep>; + bus-width = <8>; + hsync-active = <1>; /* Active high */ + vsync-active = <0>; /* Active low */ + data-active = <1>; /* Active high */ + pclk-sample = <1>; /* Rising */ + }; + }; + }; + }; + hdmi-connector { compatible = "hdmi-connector"; type = "a";
@@ -108,6 +143,24 @@ status = "okay"; }; +&csi { + status = "okay"; + + port { + #address-cells = <1>; + #size-cells = <0>; + + csi_ep: endpoint { + remote-endpoint = <&ov5640_ep>; + bus-width = <8>; + hsync-active = <1>; /* Active high */ + vsync-active = <0>; /* Active low */ + data-active = <1>; /* Active high */ + pclk-sample = <1>; /* Rising */ + }; + }; +}; + &dai { status = "okay"; };
@@ -298,6 +351,12 @@ regulator-name = "vcc-wifi"; }; +®_dldo3 { + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-name = "avdd-csi"; +}; + ®_dldo4 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>;
@@ -315,6 +374,12 @@ regulator-name = "cpvdd"; }; +®_eldo3 { + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; + regulator-name = "dvdd-csi"; +}; + ®_fldo1 { regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>;
Signature · 1 line
2.18.0.321.gffc6fa0e3