From c4d989f037b0f4ce83db38d8c1d99f78118f0537 Mon Sep 17 00:00:00 2001 From: Icenowy Zheng Date: Wed, 23 Dec 2020 03:13:02 +0800 Subject: [PATCH] sunxi: fix PineCube Ethernet by removing conflicting patches from Olimex (#2493) These patches are for Olimex S3-OLinuXino, which is not yet support by Armbian. Remove them to prevent DT node conflict. Signed-off-by: Icenowy Zheng --- ...-support-needed-for-OLinuXino-S3-boa.patch | 379 ------------------ ...limex_0032-Fixed-p2m-function-name-n.patch | 27 -- ...-support-needed-for-OLinuXino-S3-boa.patch | 379 ------------------ ...limex_0032-Fixed-p2m-function-name-n.patch | 27 -- 4 files changed, 812 deletions(-) delete mode 100644 patch/kernel/sunxi-current/olimex_0031-sun8i-s3-initial-support-needed-for-OLinuXino-S3-boa.patch delete mode 100644 patch/kernel/sunxi-current/olimex_0032-Fixed-p2m-function-name-n.patch delete mode 100644 patch/kernel/sunxi-dev/olimex_0031-sun8i-s3-initial-support-needed-for-OLinuXino-S3-boa.patch delete mode 100644 patch/kernel/sunxi-dev/olimex_0032-Fixed-p2m-function-name-n.patch diff --git a/patch/kernel/sunxi-current/olimex_0031-sun8i-s3-initial-support-needed-for-OLinuXino-S3-boa.patch b/patch/kernel/sunxi-current/olimex_0031-sun8i-s3-initial-support-needed-for-OLinuXino-S3-boa.patch deleted file mode 100644 index c74d43f034..0000000000 --- a/patch/kernel/sunxi-current/olimex_0031-sun8i-s3-initial-support-needed-for-OLinuXino-S3-boa.patch +++ /dev/null @@ -1,379 +0,0 @@ -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 6fd0cd808..f3ca6a6f5 100644 ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -1214,6 +1214,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ - sun8i-r16-parrot.dtb \ - sun8i-r40-bananapi-m2-ultra.dtb \ - sun8i-s3-lichee-zero-plus.dtb \ -+ sun8i-s3-olinuxino.dtb \ - sun8i-s3-pinecube.dtb \ - sun8i-t3-cqa3t-bv3.dtb \ - sun8i-v3s-licheepi-zero.dtb \ -diff --git a/arch/arm/boot/dts/sun8i-s3-olinuxino.dts b/arch/arm/boot/dts/sun8i-s3-olinuxino.dts -new file mode 100644 -index 000000000..e06c7aaea ---- /dev/null -+++ b/arch/arm/boot/dts/sun8i-s3-olinuxino.dts -@@ -0,0 +1,256 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (C) 2020 Dimitar Gamishev -+*/ -+ -+/dts-v1/; -+#include "sun8i-v3.dtsi" -+ -+#include "sunxi-common-regulators.dtsi" -+#include -+#include -+#include -+ -+/ { -+ model = "Olimex S3-OLinuXino"; -+ compatible = "olimex,s3-olinuxino", "sochip,s3", -+ "allwinner,sun8i-v3"; -+ -+ aliases { -+ serial0 = &uart1; -+ ethernet0 = &emac; -+ }; -+ -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ reg_vcc3v3: vcc3v3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc3v3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ }; -+ backlight: backlight { -+ compatible = "pwm-backlight"; -+ pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>; -+ brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>; -+ default-brightness-level = <8>; -+ -+ }; -+ -+ panel: panel { -+ compatible = "olimex,lcd-olinuxino-7"; -+ backlight = <&backlight>; -+ enable-gpios = <&pio 4 18 GPIO_ACTIVE_HIGH>; /* PE18 */ -+ pinctrl-names = "default"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ port { -+ panel_input: endpoint { -+ remote-endpoint = <&tcon0_out_lcd>; -+ }; -+ }; -+ -+ }; -+ leds { -+ compatible = "gpio-leds"; -+ -+ status_led { -+ label = "mp130:orange:status"; -+ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; -+ }; -+ }; -+ -+}; -+ -+ -+&mmc0 { -+ broken-cd; -+ bus-width = <4>; -+ vmmc-supply = <®_vcc3v3>; -+ status = "okay"; -+}; -+ -+&emac { -+ status = "okay"; -+}; -+ -+&mmc1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc1_pins>; -+ vmmc-supply = <®_vcc3v3>; -+ bus-width = <4>; -+ non-removable; -+ status = "okay"; -+ -+ rtl8723bs: sdio_wifi@1 { -+ reg = <1>; -+ }; -+}; -+ -+&uart1 { -+ pinctrl-0 = <&uart1_pg_pins>; -+ pinctrl-names = "default"; -+ status = "okay"; -+}; -+ -+&i2c0 { -+ status="okay"; -+ axp209: pmic@34 { -+ reg = <0x34>; -+ interrupt-parent = <&nmi_intc>; -+ interrupts = <0 IRQ_TYPE_LEVEL_LOW>; -+ }; -+}; -+ -+&usb_otg { -+ dr_mode = "peripheral"; -+ status = "okay"; -+}; -+ -+&de { -+ status="okay"; -+}; -+ -+&tcon0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&lcd_rgb666_pins>; -+ status = "okay"; -+}; -+ -+&tcon0_out { -+ tcon0_out_lcd: endpoint@0 { -+ reg = <0>; -+ remote-endpoint = <&panel_input>; -+ }; -+}; -+ -+#include "axp209.dtsi" -+ -+&ac_power_supply { -+ status = "okay"; -+}; -+ -+&battery_power_supply { -+ status = "okay"; -+}; -+ -+®_dcdc2 { -+ regulator-always-on; -+ regulator-min-microvolt = <1100000>; -+ regulator-max-microvolt = <1100000>; -+ regulator-name = "vcc-emac"; -+}; -+ -+®_dcdc3 { -+ regulator-always-on; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-name = "vcc3v3"; -+}; -+ -+®_ldo2 { -+ regulator-always-on; -+ regulator-min-microvolt = <3000000>; -+ regulator-max-microvolt = <3000000>; -+ regulator-name = "vcc-pll"; -+}; -+ -+®_ldo3 { -+ regulator-always-on; -+ regulator-min-microvolt = <1200000>; -+ regulator-max-microvolt = <1200000>; -+ regulator-name = "dvdd"; -+}; -+ -+®_ldo4 { -+ regulator-min-microvolt = <2400000>; -+ regulator-max-microvolt = <2400000>; -+ regulator-name = "avdd-csi"; -+}; -+ -+&pio { -+ vcc-pa-supply = <®_vcc3v3>; -+ vcc-pc-supply = <®_vcc3v3>; -+ vcc-pe-supply = <®_ldo3>; -+ vcc-pf-supply = <®_vcc3v3>; -+ vcc-pg-supply = <®_ldo4>; -+ -+ led_pins_olinuxinolime: led-pins { -+ pins = "PH2"; -+ function = "gpio_out"; -+ drive-strength = <20>; -+ }; -+}; -+ -+ -+®_usb0_vbus { -+ gpio = <&pio 2 10 GPIO_ACTIVE_HIGH>; /* PB10 */ -+ status = "okay"; -+}; -+ -+&emac { -+ phy-handle = <&int_mii_phy>; -+ phy-mode = "mii"; -+ allwinner,leds-active-low; -+ status = "okay"; -+}; -+ -+&csi1 { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&csi1_pins>; -+ port { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ /* Parallel bus endpoint */ -+ csi_from_ov2640: endpoint { -+ remote-endpoint = <&ov2640_to_csi>; -+ hsync-active = <0>; -+ vsync-active = <0>; -+ bus-width = <10>; -+ pclk-sample = <1>; -+ }; -+ }; -+}; -+ -+&i2c1 { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&i2c1_pins>; -+ -+ ov2640: camera@30 { -+ compatible = "ovti,ov2640"; -+ reg = <0x30>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&csi1_mclk>; -+ clocks = <&ccu CLK_CSI1_MCLK>; -+ clock-names = "xvclk"; -+ assigned-clocks = <&ccu CLK_CSI1_MCLK>; -+ assigned-clock-rates = <24000000>; -+ reset-gpios = <&pio 4 17 GPIO_ACTIVE_LOW>; -+ powerdown-gpios = <&pio 4 15 GPIO_ACTIVE_HIGH>; -+ -+ port { -+ ov2640_to_csi: endpoint { -+ remote-endpoint = <&csi_from_ov2640>; -+ bus-width = <10>; -+ }; -+ }; -+ }; -+}; -+ -+ -+&pwm { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pwm_pin>; -+ status = "okay"; -+}; -+ -+&usbphy { -+ usb0_id_det-gpios = <&pio 6 9 GPIO_ACTIVE_HIGH>; -+ usb0_vbus-supply = <®_usb0_vbus>; -+ status = "okay"; -+}; -diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi -index 0c7341676..35b9f2637 100644 ---- a/arch/arm/boot/dts/sun8i-v3s.dtsi -+++ b/arch/arm/boot/dts/sun8i-v3s.dtsi -@@ -197,6 +197,13 @@ tcon0_out: port@1 { - }; - }; - -+ nmi_intc: interrupt-controller@1c00030 { -+ compatible = "allwinner,sun7i-a20-sc-nmi"; -+ interrupt-controller; -+ #interrupt-cells = <2>; -+ reg = <0x01c00030 0x0c>; -+ interrupts = ; -+ }; - - mmc0: mmc@1c0f000 { - compatible = "allwinner,sun7i-a20-mmc"; -@@ -352,11 +359,22 @@ i2c1_pe_pins: i2c1-pe-pins { - pins = "PE21", "PE22"; - function = "i2c1"; - }; -+ -+ i2c1_pins: i2c1-pins { -+ pins = "PE21", "PE22"; -+ function = "i2c1"; -+ -+ }; - - uart0_pb_pins: uart0-pb-pins { - pins = "PB8", "PB9"; - function = "uart0"; - }; -+ -+ uart1_pg_pins: uart1-pg-pins { -+ pins = "PG6", "PG7"; -+ function = "uart1"; -+ }; - - uart2_pins: uart2-pins { - pins = "PB0", "PB1"; -@@ -383,6 +401,33 @@ spi0_pins: spi0-pins { - pins = "PC0", "PC1", "PC2", "PC3"; - function = "spi0"; - }; -+ -+ pwm_pin: pwm-pin { -+ pins = "PB4"; -+ function = "pwm"; -+ }; -+ -+ lcd_rgb666_pins: lcd-rgb666-pins { -+ pins = "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", -+ "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", -+ "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", -+ "PD18", "PD19", "PD20", "PD21"; -+ function = "lcd"; -+ }; -+ -+ csi1_pins: csi-pins { -+ pins = "PE0", "PE2", "PE3", "PE6", -+ "PE7", "PE8", "PE9", "PE10", "PE11", -+ "PE12","PE13","PE14","PE15"; -+ -+ function = "csi"; -+ }; -+ csi1_mclk: csi1-mclk { -+ pins = "PE1"; -+ function = "csi"; -+ }; -+ -+ - }; - - timer@1c20c00 { -@@ -546,5 +591,29 @@ gic: interrupt-controller@1c81000 { - #interrupt-cells = <3>; - interrupts = ; - }; -+ pwm: pwm@1c21400 { -+ compatible = "allwinner,sun8i-h3-pwm"; -+ reg = <0x01c21400 0x8>; -+ clocks = <&osc24M>; -+ #pwm-cells = <3>; -+ status = "disabled"; -+ }; -+ -+ -+ /* -+ codec: codec@1c22c00 { -+ #sound-dai-cells = <0>; -+ compatible = "allwinner,sun8i-h3-codec"; -+ reg = <0x01c22c00 0x400>; -+ interrupts = ; -+ clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>; -+ clock-names = "apb", "codec"; -+ resets = <&ccu RST_BUS_CODEC>; -+ dmas = <&dma 15>, <&dma 15>; -+ dma-names = "rx", "tx"; -+ allwinner,codec-analog-controls = <&codec_analog>; -+ status = "disabled"; -+ };*/ -+ - }; - }; diff --git a/patch/kernel/sunxi-current/olimex_0032-Fixed-p2m-function-name-n.patch b/patch/kernel/sunxi-current/olimex_0032-Fixed-p2m-function-name-n.patch deleted file mode 100644 index 48539e8c39..0000000000 --- a/patch/kernel/sunxi-current/olimex_0032-Fixed-p2m-function-name-n.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c9461669c81624409660cfbc01bfcfff44b6e2e5 Mon Sep 17 00:00:00 2001 -From: hehopmajieh -Date: Tue, 31 Mar 2020 15:46:37 +0300 -Subject: [PATCH 32/48] Fixed p2m function name \n OV2640 cam module enabled in - defconfig - ---- - arch/arm/boot/dts/sun8i-v3s.dtsi | 2 +- - arch/arm/configs/olinuxino_defconfig | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi -index 4408ec5508f2..88672b0be6a1 100644 ---- a/arch/arm/boot/dts/sun8i-v3s.dtsi -+++ b/arch/arm/boot/dts/sun8i-v3s.dtsi -@@ -411,7 +411,7 @@ spi0_pins: spi0-pins { - - pwm_pin: pwm-pin { - pins = "PB4"; -- function = "pwm"; -+ function = "pwm0"; - }; - - lcd_rgb666_pins: lcd-rgb666-pins { --- -2.25.1 - diff --git a/patch/kernel/sunxi-dev/olimex_0031-sun8i-s3-initial-support-needed-for-OLinuXino-S3-boa.patch b/patch/kernel/sunxi-dev/olimex_0031-sun8i-s3-initial-support-needed-for-OLinuXino-S3-boa.patch deleted file mode 100644 index c74d43f034..0000000000 --- a/patch/kernel/sunxi-dev/olimex_0031-sun8i-s3-initial-support-needed-for-OLinuXino-S3-boa.patch +++ /dev/null @@ -1,379 +0,0 @@ -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 6fd0cd808..f3ca6a6f5 100644 ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -1214,6 +1214,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ - sun8i-r16-parrot.dtb \ - sun8i-r40-bananapi-m2-ultra.dtb \ - sun8i-s3-lichee-zero-plus.dtb \ -+ sun8i-s3-olinuxino.dtb \ - sun8i-s3-pinecube.dtb \ - sun8i-t3-cqa3t-bv3.dtb \ - sun8i-v3s-licheepi-zero.dtb \ -diff --git a/arch/arm/boot/dts/sun8i-s3-olinuxino.dts b/arch/arm/boot/dts/sun8i-s3-olinuxino.dts -new file mode 100644 -index 000000000..e06c7aaea ---- /dev/null -+++ b/arch/arm/boot/dts/sun8i-s3-olinuxino.dts -@@ -0,0 +1,256 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (C) 2020 Dimitar Gamishev -+*/ -+ -+/dts-v1/; -+#include "sun8i-v3.dtsi" -+ -+#include "sunxi-common-regulators.dtsi" -+#include -+#include -+#include -+ -+/ { -+ model = "Olimex S3-OLinuXino"; -+ compatible = "olimex,s3-olinuxino", "sochip,s3", -+ "allwinner,sun8i-v3"; -+ -+ aliases { -+ serial0 = &uart1; -+ ethernet0 = &emac; -+ }; -+ -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ reg_vcc3v3: vcc3v3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc3v3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ }; -+ backlight: backlight { -+ compatible = "pwm-backlight"; -+ pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>; -+ brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>; -+ default-brightness-level = <8>; -+ -+ }; -+ -+ panel: panel { -+ compatible = "olimex,lcd-olinuxino-7"; -+ backlight = <&backlight>; -+ enable-gpios = <&pio 4 18 GPIO_ACTIVE_HIGH>; /* PE18 */ -+ pinctrl-names = "default"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ port { -+ panel_input: endpoint { -+ remote-endpoint = <&tcon0_out_lcd>; -+ }; -+ }; -+ -+ }; -+ leds { -+ compatible = "gpio-leds"; -+ -+ status_led { -+ label = "mp130:orange:status"; -+ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; -+ }; -+ }; -+ -+}; -+ -+ -+&mmc0 { -+ broken-cd; -+ bus-width = <4>; -+ vmmc-supply = <®_vcc3v3>; -+ status = "okay"; -+}; -+ -+&emac { -+ status = "okay"; -+}; -+ -+&mmc1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc1_pins>; -+ vmmc-supply = <®_vcc3v3>; -+ bus-width = <4>; -+ non-removable; -+ status = "okay"; -+ -+ rtl8723bs: sdio_wifi@1 { -+ reg = <1>; -+ }; -+}; -+ -+&uart1 { -+ pinctrl-0 = <&uart1_pg_pins>; -+ pinctrl-names = "default"; -+ status = "okay"; -+}; -+ -+&i2c0 { -+ status="okay"; -+ axp209: pmic@34 { -+ reg = <0x34>; -+ interrupt-parent = <&nmi_intc>; -+ interrupts = <0 IRQ_TYPE_LEVEL_LOW>; -+ }; -+}; -+ -+&usb_otg { -+ dr_mode = "peripheral"; -+ status = "okay"; -+}; -+ -+&de { -+ status="okay"; -+}; -+ -+&tcon0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&lcd_rgb666_pins>; -+ status = "okay"; -+}; -+ -+&tcon0_out { -+ tcon0_out_lcd: endpoint@0 { -+ reg = <0>; -+ remote-endpoint = <&panel_input>; -+ }; -+}; -+ -+#include "axp209.dtsi" -+ -+&ac_power_supply { -+ status = "okay"; -+}; -+ -+&battery_power_supply { -+ status = "okay"; -+}; -+ -+®_dcdc2 { -+ regulator-always-on; -+ regulator-min-microvolt = <1100000>; -+ regulator-max-microvolt = <1100000>; -+ regulator-name = "vcc-emac"; -+}; -+ -+®_dcdc3 { -+ regulator-always-on; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-name = "vcc3v3"; -+}; -+ -+®_ldo2 { -+ regulator-always-on; -+ regulator-min-microvolt = <3000000>; -+ regulator-max-microvolt = <3000000>; -+ regulator-name = "vcc-pll"; -+}; -+ -+®_ldo3 { -+ regulator-always-on; -+ regulator-min-microvolt = <1200000>; -+ regulator-max-microvolt = <1200000>; -+ regulator-name = "dvdd"; -+}; -+ -+®_ldo4 { -+ regulator-min-microvolt = <2400000>; -+ regulator-max-microvolt = <2400000>; -+ regulator-name = "avdd-csi"; -+}; -+ -+&pio { -+ vcc-pa-supply = <®_vcc3v3>; -+ vcc-pc-supply = <®_vcc3v3>; -+ vcc-pe-supply = <®_ldo3>; -+ vcc-pf-supply = <®_vcc3v3>; -+ vcc-pg-supply = <®_ldo4>; -+ -+ led_pins_olinuxinolime: led-pins { -+ pins = "PH2"; -+ function = "gpio_out"; -+ drive-strength = <20>; -+ }; -+}; -+ -+ -+®_usb0_vbus { -+ gpio = <&pio 2 10 GPIO_ACTIVE_HIGH>; /* PB10 */ -+ status = "okay"; -+}; -+ -+&emac { -+ phy-handle = <&int_mii_phy>; -+ phy-mode = "mii"; -+ allwinner,leds-active-low; -+ status = "okay"; -+}; -+ -+&csi1 { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&csi1_pins>; -+ port { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ /* Parallel bus endpoint */ -+ csi_from_ov2640: endpoint { -+ remote-endpoint = <&ov2640_to_csi>; -+ hsync-active = <0>; -+ vsync-active = <0>; -+ bus-width = <10>; -+ pclk-sample = <1>; -+ }; -+ }; -+}; -+ -+&i2c1 { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&i2c1_pins>; -+ -+ ov2640: camera@30 { -+ compatible = "ovti,ov2640"; -+ reg = <0x30>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&csi1_mclk>; -+ clocks = <&ccu CLK_CSI1_MCLK>; -+ clock-names = "xvclk"; -+ assigned-clocks = <&ccu CLK_CSI1_MCLK>; -+ assigned-clock-rates = <24000000>; -+ reset-gpios = <&pio 4 17 GPIO_ACTIVE_LOW>; -+ powerdown-gpios = <&pio 4 15 GPIO_ACTIVE_HIGH>; -+ -+ port { -+ ov2640_to_csi: endpoint { -+ remote-endpoint = <&csi_from_ov2640>; -+ bus-width = <10>; -+ }; -+ }; -+ }; -+}; -+ -+ -+&pwm { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pwm_pin>; -+ status = "okay"; -+}; -+ -+&usbphy { -+ usb0_id_det-gpios = <&pio 6 9 GPIO_ACTIVE_HIGH>; -+ usb0_vbus-supply = <®_usb0_vbus>; -+ status = "okay"; -+}; -diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi -index 0c7341676..35b9f2637 100644 ---- a/arch/arm/boot/dts/sun8i-v3s.dtsi -+++ b/arch/arm/boot/dts/sun8i-v3s.dtsi -@@ -197,6 +197,13 @@ tcon0_out: port@1 { - }; - }; - -+ nmi_intc: interrupt-controller@1c00030 { -+ compatible = "allwinner,sun7i-a20-sc-nmi"; -+ interrupt-controller; -+ #interrupt-cells = <2>; -+ reg = <0x01c00030 0x0c>; -+ interrupts = ; -+ }; - - mmc0: mmc@1c0f000 { - compatible = "allwinner,sun7i-a20-mmc"; -@@ -352,11 +359,22 @@ i2c1_pe_pins: i2c1-pe-pins { - pins = "PE21", "PE22"; - function = "i2c1"; - }; -+ -+ i2c1_pins: i2c1-pins { -+ pins = "PE21", "PE22"; -+ function = "i2c1"; -+ -+ }; - - uart0_pb_pins: uart0-pb-pins { - pins = "PB8", "PB9"; - function = "uart0"; - }; -+ -+ uart1_pg_pins: uart1-pg-pins { -+ pins = "PG6", "PG7"; -+ function = "uart1"; -+ }; - - uart2_pins: uart2-pins { - pins = "PB0", "PB1"; -@@ -383,6 +401,33 @@ spi0_pins: spi0-pins { - pins = "PC0", "PC1", "PC2", "PC3"; - function = "spi0"; - }; -+ -+ pwm_pin: pwm-pin { -+ pins = "PB4"; -+ function = "pwm"; -+ }; -+ -+ lcd_rgb666_pins: lcd-rgb666-pins { -+ pins = "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", -+ "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", -+ "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", -+ "PD18", "PD19", "PD20", "PD21"; -+ function = "lcd"; -+ }; -+ -+ csi1_pins: csi-pins { -+ pins = "PE0", "PE2", "PE3", "PE6", -+ "PE7", "PE8", "PE9", "PE10", "PE11", -+ "PE12","PE13","PE14","PE15"; -+ -+ function = "csi"; -+ }; -+ csi1_mclk: csi1-mclk { -+ pins = "PE1"; -+ function = "csi"; -+ }; -+ -+ - }; - - timer@1c20c00 { -@@ -546,5 +591,29 @@ gic: interrupt-controller@1c81000 { - #interrupt-cells = <3>; - interrupts = ; - }; -+ pwm: pwm@1c21400 { -+ compatible = "allwinner,sun8i-h3-pwm"; -+ reg = <0x01c21400 0x8>; -+ clocks = <&osc24M>; -+ #pwm-cells = <3>; -+ status = "disabled"; -+ }; -+ -+ -+ /* -+ codec: codec@1c22c00 { -+ #sound-dai-cells = <0>; -+ compatible = "allwinner,sun8i-h3-codec"; -+ reg = <0x01c22c00 0x400>; -+ interrupts = ; -+ clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>; -+ clock-names = "apb", "codec"; -+ resets = <&ccu RST_BUS_CODEC>; -+ dmas = <&dma 15>, <&dma 15>; -+ dma-names = "rx", "tx"; -+ allwinner,codec-analog-controls = <&codec_analog>; -+ status = "disabled"; -+ };*/ -+ - }; - }; diff --git a/patch/kernel/sunxi-dev/olimex_0032-Fixed-p2m-function-name-n.patch b/patch/kernel/sunxi-dev/olimex_0032-Fixed-p2m-function-name-n.patch deleted file mode 100644 index 48539e8c39..0000000000 --- a/patch/kernel/sunxi-dev/olimex_0032-Fixed-p2m-function-name-n.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c9461669c81624409660cfbc01bfcfff44b6e2e5 Mon Sep 17 00:00:00 2001 -From: hehopmajieh -Date: Tue, 31 Mar 2020 15:46:37 +0300 -Subject: [PATCH 32/48] Fixed p2m function name \n OV2640 cam module enabled in - defconfig - ---- - arch/arm/boot/dts/sun8i-v3s.dtsi | 2 +- - arch/arm/configs/olinuxino_defconfig | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi -index 4408ec5508f2..88672b0be6a1 100644 ---- a/arch/arm/boot/dts/sun8i-v3s.dtsi -+++ b/arch/arm/boot/dts/sun8i-v3s.dtsi -@@ -411,7 +411,7 @@ spi0_pins: spi0-pins { - - pwm_pin: pwm-pin { - pins = "PB4"; -- function = "pwm"; -+ function = "pwm0"; - }; - - lcd_rgb666_pins: lcd-rgb666-pins { --- -2.25.1 -