mirror of
https://github.com/linux-sunxi/meta-sunxi.git
synced 2024-12-26 04:58:22 +01:00
Merge pull request #349 from mpromonet/master
sunxi: add cam support to nanopi-neo-air
This commit is contained in:
Marek Belisko
GitHub
commit
44040b0ea4
@ -7,133 +7,6 @@ Patch taken from : https://github.com/armbian/build/blob/master/patch/u-boot/u-b
|
|||||||
|
|
||||||
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
|
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
|
||||||
---
|
---
|
||||||
arch/arm/dts/Makefile | 1 +
|
|
||||||
arch/arm/dts/sun8i-h3-nanopi-r1.dts | 102 ++++++++++++++++++++++++++++++++++++
|
|
||||||
configs/nanopi_r1_defconfig | 22 ++++++++
|
|
||||||
3 files changed, 125 insertions(+)
|
|
||||||
create mode 100644 arch/arm/dts/sun8i-h3-nanopi-r1.dts
|
|
||||||
create mode 100644 configs/nanopi_r1_defconfig
|
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
|
|
||||||
index 9fb3868..6743e32 100644
|
|
||||||
--- a/arch/arm/dts/Makefile
|
|
||||||
+++ b/arch/arm/dts/Makefile
|
|
||||||
@@ -600,6 +600,7 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \
|
|
||||||
sun8i-h3-nanopi-m1-plus.dtb \
|
|
||||||
sun8i-h3-nanopi-neo.dtb \
|
|
||||||
sun8i-h3-nanopi-neo-air.dtb \
|
|
||||||
+ sun8i-h3-nanopi-r1.dtb \
|
|
||||||
sun8i-h3-orangepi-2.dtb \
|
|
||||||
sun8i-h3-orangepi-lite.dtb \
|
|
||||||
sun8i-h3-orangepi-one.dtb \
|
|
||||||
diff --git a/arch/arm/dts/sun8i-h3-nanopi-r1.dts b/arch/arm/dts/sun8i-h3-nanopi-r1.dts
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..9c3c574
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/arch/arm/dts/sun8i-h3-nanopi-r1.dts
|
|
||||||
@@ -0,0 +1,102 @@
|
|
||||||
+/*
|
|
||||||
+ * Copyright (C) 2019 Igor Pecovnik <igor@armbian.com>
|
|
||||||
+ *
|
|
||||||
+ * This file is dual-licensed: you can use it either under the terms
|
|
||||||
+ * of the GPL or the X11 license, at your option. Note that this dual
|
|
||||||
+ * licensing only applies to this file, and not this project as a
|
|
||||||
+ * whole.
|
|
||||||
+ *
|
|
||||||
+ * a) This file 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 file 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.
|
|
||||||
+ *
|
|
||||||
+ * Or, alternatively,
|
|
||||||
+ *
|
|
||||||
+ * b) Permission is hereby granted, free of charge, to any person
|
|
||||||
+ * obtaining a copy of this software and associated documentation
|
|
||||||
+ * files (the "Software"), to deal in the Software without
|
|
||||||
+ * restriction, including without limitation the rights to use,
|
|
||||||
+ * copy, modify, merge, publish, distribute, sublicense, and/or
|
|
||||||
+ * sell copies of the Software, and to permit persons to whom the
|
|
||||||
+ * Software is furnished to do so, subject to the following
|
|
||||||
+ * conditions:
|
|
||||||
+ *
|
|
||||||
+ * The above copyright notice and this permission notice shall be
|
|
||||||
+ * included in all copies or substantial portions of the Software.
|
|
||||||
+ *
|
|
||||||
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
||||||
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
||||||
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
||||||
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
||||||
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
||||||
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
||||||
+ * OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#include "sun8i-h3-nanopi.dtsi"
|
|
||||||
+
|
|
||||||
+/ {
|
|
||||||
+ model = "FriendlyARM NanoPi R1";
|
|
||||||
+ compatible = "friendlyarm,nanopi-neo", "allwinner,sun8i-h3";
|
|
||||||
+
|
|
||||||
+ reg_gmac_3v3: gmac-3v3 {
|
|
||||||
+ compatible = "regulator-fixed";
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ regulator-name = "gmac-3v3";
|
|
||||||
+ regulator-min-microvolt = <3300000>;
|
|
||||||
+ regulator-max-microvolt = <3300000>;
|
|
||||||
+ startup-delay-us = <100000>;
|
|
||||||
+ enable-active-high;
|
|
||||||
+ gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&ehci0 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&pio {
|
|
||||||
+ gmac_power_pin_nanopi: gmac_power_pin@0 {
|
|
||||||
+ pins = "PD6";
|
|
||||||
+ function = "gpio_out";
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&ohci0 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&mmc2 {
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&mmc2_8bit_pins>;
|
|
||||||
+ vmmc-supply = <®_vcc3v3>;
|
|
||||||
+ bus-width = <8>;
|
|
||||||
+ non-removable;
|
|
||||||
+ cap-mmc-hw-reset;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&emac {
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&emac_rgmii_pins>;
|
|
||||||
+ phy-supply = <®_gmac_3v3>;
|
|
||||||
+ phy-handle = <&ext_rgmii_phy>;
|
|
||||||
+ phy-mode = "rgmii";
|
|
||||||
+
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&external_mdio {
|
|
||||||
+ ext_rgmii_phy: ethernet-phy@1 {
|
|
||||||
+ compatible = "ethernet-phy-ieee802.3-c22";
|
|
||||||
+ reg = <7>;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
diff --git a/configs/nanopi_r1_defconfig b/configs/nanopi_r1_defconfig
|
diff --git a/configs/nanopi_r1_defconfig b/configs/nanopi_r1_defconfig
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..e028b41
|
index 0000000..e028b41
|
||||||
|
|||||||
@ -22,11 +22,13 @@ S = "${WORKDIR}/linux-${PV}"
|
|||||||
|
|
||||||
SRC_URI = "https://www.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz \
|
SRC_URI = "https://www.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz \
|
||||||
file://0001-dts-orange-pi-zero-Add-wifi-support.patch \
|
file://0001-dts-orange-pi-zero-Add-wifi-support.patch \
|
||||||
|
file://0002-dts-nanopi-neo-air-add-camera.patch \
|
||||||
file://defconfig \
|
file://defconfig \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI:append:use-mailine-graphics = " file://drm.cfg"
|
SRC_URI:append:use-mailine-graphics = " file://drm.cfg"
|
||||||
SRC_URI:append:bananapi = " file://axp20x.cfg"
|
SRC_URI:append:bananapi = " file://axp20x.cfg"
|
||||||
SRC_URI:append:cubietruck = " file://axp20x.cfg"
|
SRC_URI:append:cubietruck = " file://axp20x.cfg"
|
||||||
|
SRC_URI:append:nanopi-neo-air = " file://cam500b.cfg"
|
||||||
|
|
||||||
FILES_${KERNEL_PACKAGE_NAME}-base:append = " ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"
|
FILES_${KERNEL_PACKAGE_NAME}-base:append = " ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"
|
||||||
|
|||||||
@ -0,0 +1,101 @@
|
|||||||
|
diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
|
||||||
|
index cd3df12b65..33a161692f 100644
|
||||||
|
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
|
||||||
|
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
|
||||||
|
@@ -77,6 +77,39 @@
|
||||||
|
compatible = "mmc-pwrseq-simple";
|
||||||
|
reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
|
||||||
|
};
|
||||||
|
+
|
||||||
|
+ cam_xclk: cam-xclk {
|
||||||
|
+ #clock-cells = <0>;
|
||||||
|
+ compatible = "fixed-clock";
|
||||||
|
+ clock-frequency = <24000000>;
|
||||||
|
+ clock-output-names = "cam-xclk";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ reg_cam_avdd: cam-avdd {
|
||||||
|
+ compatible = "regulator-fixed";
|
||||||
|
+ regulator-name = "cam-avdd";
|
||||||
|
+ regulator-min-microvolt = <2800000>;
|
||||||
|
+ regulator-max-microvolt = <2800000>;
|
||||||
|
+ vin-supply = <®_vcc3v3>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ reg_cam_dovdd: cam-dovdd {
|
||||||
|
+ compatible = "regulator-fixed";
|
||||||
|
+ regulator-name = "cam-dovdd";
|
||||||
|
+ regulator-min-microvolt = <1800000>;
|
||||||
|
+ regulator-max-microvolt = <1800000>;
|
||||||
|
+ vin-supply = <®_vcc3v3>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ reg_cam_dvdd: cam-dvdd {
|
||||||
|
+ compatible = "regulator-fixed";
|
||||||
|
+ regulator-name = "cam-dvdd";
|
||||||
|
+ regulator-min-microvolt = <1500000>;
|
||||||
|
+ regulator-max-microvolt = <1500000>;
|
||||||
|
+ vin-supply = <®_vcc3v3>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+
|
||||||
|
};
|
||||||
|
|
||||||
|
&mmc0 {
|
||||||
|
@@ -141,3 +174,55 @@
|
||||||
|
/* USB VBUS is always on */
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
+
|
||||||
|
+&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 */
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&i2c2 {
|
||||||
|
+ status = "okay";
|
||||||
|
+
|
||||||
|
+ ov5640: camera@3c {
|
||||||
|
+ compatible = "ovti,ov5640";
|
||||||
|
+ reg = <0x3c>;
|
||||||
|
+ clocks = <&cam_xclk>;
|
||||||
|
+ clock-names = "xclk";
|
||||||
|
+
|
||||||
|
+ reset-gpios = <&pio 4 14 GPIO_ACTIVE_LOW>;
|
||||||
|
+ powerdown-gpios = <&pio 4 15 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ 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 */
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+&i2c2_pins {
|
||||||
|
+ bias-pull-up;
|
||||||
|
+};
|
||||||
|
|
||||||
6
recipes-kernel/linux/linux-mainline/cam500b.cfg
Normal file
6
recipes-kernel/linux/linux-mainline/cam500b.cfg
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
CONFIG_MEDIA_PLATFORM_SUPPORT=y
|
||||||
|
CONFIG_V4L_PLATFORM_DRIVERS=y
|
||||||
|
|
||||||
|
CONFIG_VIDEO_OV5640=m
|
||||||
|
CONFIG_VIDEO_SUN6I_CSI=m
|
||||||
|
CONFIG_VIDEO_V4L2=m
|
||||||
Loading…
Reference in New Issue
Block a user