config: ebale PWM for AC200

5 files changed, 58 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 022ff51cba1e..52878aa809ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-tqc-a01
 	pkgver = 5.11.4
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.kernel.org/
 	arch = aarch64
 	license = GPL2
@@ -21,10 +21,10 @@ pkgbase = linux-tqc-a01
 	source = 0002-net-phy-Add-support-for-AC200-EPHY.patch
 	source = 0002-net-stmmac-sun8i-Use-devm_regulator_get-for-PHY-regu.patch
 	source = 0003-net-stmmac-sun8i-Rename-PHY-regulator-variable-to-re.patch
+	source = 0003-arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch
 	source = 0004-net-stmmac-sun8i-Add-support-for-enabling-a-regulato.patch
 	source = 0005-drm-gem-cma-Export-with-handle-allocator.patch
 	source = 0006-drm-sun4i-Add-GEM-allocator.patch
-	source = 0007-arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch
 	source = 0010-general-h6-add-dma-i2c-ir-spi-uart.patch
 	source = 0011-mmc-sunxi-fix-unusuable-eMMC-on-some-H6-boards-by-di.patch
 	source = fix-missing-H6-spi-pins.patch
@@ -37,20 +37,20 @@ pkgbase = linux-tqc-a01
 	source = 90-linux.hook
 	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.11.4.xz
 	md5sums = d2985a3f16ef1ea3405c04c406e29dcc
-	md5sums = 257beb93e91b190184f1a161f66d3206
+	md5sums = f5de0dfcddc871280a60d99ea3284317
 	md5sums = 17aa0c69176c68cd98b4522740a1b747
 	md5sums = f9b6f367eef351eaa89b23a9b1ffc5a2
 	md5sums = bc7904920675ba8d38f21d46ffac33b5
 	md5sums = 94a69594f90309c50c83a5cc8579fb54
 	md5sums = e1868e41094baff9eceba481fc097c79
+	md5sums = 5a15e321aa56da359a8b0c62cda99013
 	md5sums = 5d42a68276c8f9e8b3de040fa2579b84
 	md5sums = 335382823f6dc2aae2f6038b7aee339e
 	md5sums = cb38b30491472097c3b9b475de39127f
-	md5sums = 6fd2f4aaa791c975aef5968f32eecb4c
 	md5sums = bc65c0b9e4d6fb2fe3a81b8358886885
 	md5sums = f27a8190e862a7edcf2b09cc27aef180
 	md5sums = 11dfddadb815a896a2db65812e66e6fa
-	md5sums = 5e0c36c663ebe0721fb96b9f2bfef451
+	md5sums = a81cb45032d0ce8b9d26a4585eeb75c5
 	md5sums = 7f1a96e24f5150f790df94398e9525a3
 	md5sums = 61c5ff73c136ed07a7aadbf58db3d96a
 	md5sums = 584777ae88bce2c5659960151b64c7d8
diff --git a/0007-arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch b/0003-arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch
index fd11bccf8300..c837c245b58e 100644
--- a/0007-arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch
+++ b/0003-arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch
@@ -1,13 +1,15 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 1b08baab634bebd4ef94ca449b81d7550c91abf0 Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <jernej.skrabec@siol.net>
-Date: Fri, 16 Aug 2019 16:40:20 +0200
-Subject: [PATCH] arm64: dts: allwinner: h6: Add AC200 EPHY related nodes
+Date: Sun, 12 Jan 2020 12:09:12 +0100
+Subject: [PATCH 3/4] arm64: dts: allwinner: h6: Add AC200 EPHY related nodes
 
 Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 ---
- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 56 ++++++++++++++++++++
- 1 file changed, 56 insertions(+)
+ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 63 ++++++++++++++++++++
+ 1 file changed, 63 insertions(+)
 
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
+index 3329283e38ab..81caf1e96407 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
 @@ -16,6 +16,16 @@
@@ -27,44 +29,45 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
  	cpus {
  		#address-cells = <1>;
  		#size-cells = <0>;
-@@ -319,6 +329,10 @@
- 			cpu_speed_grade: cpu-speed-grade@1c {
- 				reg = <0x1c 0x4>;
+@@ -248,6 +258,10 @@
+ 			ths_calibration: thermal-sensor-calibration@14 {
+ 				reg = <0x14 0x8>;
  			};
 +
-+			ephy_calib: ephy_calib@2c {
++			ephy_calibration: ephy-calibration@2c {
 +				reg = <0x2c 0x2>;
 +			};
  		};
  
  		watchdog: watchdog@30090a0 {
-@@ -364,6 +378,13 @@
+@@ -291,6 +305,14 @@
+ 				function = "emac";
  				drive-strength = <40>;
  			};
- 
++			
++			/omit-if-no-ref/
 +			ext_rmii_pins: rmii_pins {
 +				pins = "PA0", "PA1", "PA2", "PA3", "PA4",
 +				       "PA5", "PA6", "PA7", "PA8", "PA9";
 +				function = "emac";
 +				drive-strength = <40>;
 +			};
-+
+ 
  			hdmi_pins: hdmi-pins {
  				pins = "PH8", "PH9", "PH10";
- 				function = "hdmi";
-@@ -384,6 +405,11 @@
+@@ -311,6 +333,11 @@
+ 				pins = "PD23", "PD24";
  				function = "i2c2";
  			};
- 
++			
 +			i2c3_pins: i2c3-pins {
 +				pins = "PB17", "PB18";
 +				function = "i2c3";
 +			};
-+
+ 
  			mmc0_pins: mmc0-pins {
  				pins = "PF0", "PF1", "PF2", "PF3",
- 				       "PF4", "PF5";
-@@ -410,6 +436,11 @@
+@@ -329,6 +356,11 @@
  				bias-pull-up;
  			};
  
@@ -73,15 +76,16 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 +				function = "pwm1";
 +			};
 +
- 			/omit-if-no-ref/
- 			spi0_pins: spi0-pins {
- 				pins = "PC0", "PC2", "PC3";
-@@ -640,6 +671,31 @@
+ 			mmc2_pins: mmc2-pins {
+ 				pins = "PC1", "PC4", "PC5", "PC6",
+ 				       "PC7", "PC8", "PC9", "PC10",
+@@ -504,6 +536,37 @@
  			#size-cells = <0>;
  		};
  
 +		i2c3: i2c@5002c00 {
-+			compatible = "allwinner,sun6i-a31-i2c";
++			compatible = "allwinner,sun50i-h6-i2c",
++				     "allwinner,sun6i-a31-i2c";
 +			reg = <0x05002c00 0x400>;
 +			interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
 +			clocks = <&ccu CLK_BUS_I2C3>;
@@ -95,12 +99,17 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 +			ac200: mfd@10 {
 +				compatible = "x-powers,ac200";
 +				reg = <0x10>;
-+				clocks = <&ac200_pwm_clk>;
++				interrupt-parent = <&pio>;
++				interrupts = <1 20 IRQ_TYPE_LEVEL_LOW>;
++				interrupt-controller;
++				#interrupt-cells = <1>;
 +
 +				ac200_ephy: phy {
 +					compatible = "x-powers,ac200-ephy";
-+					nvmem-cells = <&ephy_calib>;
-+					nvmem-cell-names = "ephy_calib";
++					clocks = <&ac200_pwm_clk>;
++					nvmem-cells = <&ephy_calibration>;
++					nvmem-cell-names = "calibration";
++					status = "disabled";
 +				};
 +			};
 +		};
@@ -108,3 +117,6 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
  		emac: ethernet@5020000 {
  			compatible = "allwinner,sun50i-h6-emac",
  				     "allwinner,sun50i-a64-emac";
+-- 
+2.20.1
+
diff --git a/PKGBUILD b/PKGBUILD
index c5dbe2207e35..ed1235a605c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ _srcname=linux-5.11
 _kernelname=${pkgbase#linux}
 _desc="AArch64 kernel for TQC A01"
 pkgver=5.11.4
-pkgrel=4
+pkgrel=5
 arch=('aarch64')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -23,10 +23,10 @@ source=("http://cdn.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
         '0002-net-phy-Add-support-for-AC200-EPHY.patch'
         '0002-net-stmmac-sun8i-Use-devm_regulator_get-for-PHY-regu.patch'
         '0003-net-stmmac-sun8i-Rename-PHY-regulator-variable-to-re.patch'
+        '0003-arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch'
         '0004-net-stmmac-sun8i-Add-support-for-enabling-a-regulato.patch'
         '0005-drm-gem-cma-Export-with-handle-allocator.patch'
         '0006-drm-sun4i-Add-GEM-allocator.patch'
-        '0007-arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch'
         '0010-general-h6-add-dma-i2c-ir-spi-uart.patch'
         '0011-mmc-sunxi-fix-unusuable-eMMC-on-some-H6-boards-by-di.patch'
         'fix-missing-H6-spi-pins.patch'
@@ -42,20 +42,20 @@ source=("http://cdn.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
 source+=("https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz")
 
 md5sums=('d2985a3f16ef1ea3405c04c406e29dcc'
-         '257beb93e91b190184f1a161f66d3206'
+         'f5de0dfcddc871280a60d99ea3284317'
          '17aa0c69176c68cd98b4522740a1b747'
          'f9b6f367eef351eaa89b23a9b1ffc5a2'
          'bc7904920675ba8d38f21d46ffac33b5'
          '94a69594f90309c50c83a5cc8579fb54'
          'e1868e41094baff9eceba481fc097c79'
+         '5a15e321aa56da359a8b0c62cda99013'
          '5d42a68276c8f9e8b3de040fa2579b84'
          '335382823f6dc2aae2f6038b7aee339e'
          'cb38b30491472097c3b9b475de39127f'
-         '6fd2f4aaa791c975aef5968f32eecb4c'
          'bc65c0b9e4d6fb2fe3a81b8358886885'
          'f27a8190e862a7edcf2b09cc27aef180'
          '11dfddadb815a896a2db65812e66e6fa'
-         '5e0c36c663ebe0721fb96b9f2bfef451'
+         'a81cb45032d0ce8b9d26a4585eeb75c5'
          '7f1a96e24f5150f790df94398e9525a3'
          '61c5ff73c136ed07a7aadbf58db3d96a'
          '584777ae88bce2c5659960151b64c7d8'
@@ -77,10 +77,10 @@ prepare() {
   patch -p1 < ../0002-net-phy-Add-support-for-AC200-EPHY.patch
   patch -p1 < ../0002-net-stmmac-sun8i-Use-devm_regulator_get-for-PHY-regu.patch
   patch -p1 < ../0003-net-stmmac-sun8i-Rename-PHY-regulator-variable-to-re.patch
+  patch -p1 < ../0003-arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch
   patch -p1 < ../0004-net-stmmac-sun8i-Add-support-for-enabling-a-regulato.patch
   patch -p1 < ../0005-drm-gem-cma-Export-with-handle-allocator.patch
   patch -p1 < ../0006-drm-sun4i-Add-GEM-allocator.patch
-  patch -p1 < ../0007-arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch
   patch -p1 < ../0010-general-h6-add-dma-i2c-ir-spi-uart.patch
   patch -p1 < ../0011-mmc-sunxi-fix-unusuable-eMMC-on-some-H6-boards-by-di.patch
   patch -p1 < ../fix-missing-H6-spi-pins.patch
@@ -114,7 +114,7 @@ build() {
   # ... or manually edit .config
 
   # Copy back our configuration (use with new kernel version)
-  #cp ./.config ../${pkgbase}.config
+  cp ./.config ../${pkgbase}.config
 
   ####################
   # stop here
diff --git a/config b/config
index 99ab0339cb18..120c73d3db05 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
-#
+
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.11.4-1 Kernel Configuration
+# Linux/arm64 5.11.4-4 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
 CONFIG_CC_IS_GCC=y
@@ -3112,6 +3112,7 @@ CONFIG_SFP=m
 #
 # MII PHY device drivers
 #
+CONFIG_AC200_PHY=y
 CONFIG_AMD_PHY=m
 CONFIG_MESON_GXL_PHY=m
 # CONFIG_ADIN_PHY is not set
@@ -4874,6 +4875,7 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_BCM590XX is not set
 # CONFIG_MFD_BD9571MWV is not set
 # CONFIG_MFD_AC100 is not set
+CONFIG_MFD_AC200=y
 CONFIG_MFD_AXP20X=y
 CONFIG_MFD_AXP20X_I2C=y
 CONFIG_MFD_AXP20X_RSB=y
@@ -9036,7 +9038,7 @@ CONFIG_PWM_MEDIATEK=m
 # CONFIG_PWM_PCA9685 is not set
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_PWM_SL28CPLD=m
-CONFIG_PWM_SUN4I=m
+CONFIG_PWM_SUN4I=y
 # CONFIG_PWM_TEGRA is not set
 
 #
@@ -9212,7 +9214,7 @@ CONFIG_QCOM_QFPROM=y
 # CONFIG_NVMEM_SPMI_SDAM is not set
 CONFIG_ROCKCHIP_EFUSE=y
 # CONFIG_ROCKCHIP_OTP is not set
-CONFIG_NVMEM_SUNXI_SID=m
+CONFIG_NVMEM_SUNXI_SID=y
 CONFIG_MESON_EFUSE=m
 # CONFIG_MESON_MX_EFUSE is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
diff --git a/sun50i-h6-tqc-a01.dts b/sun50i-h6-tqc-a01.dts
index 71048c67a381..df6a3e869684 100644
--- a/sun50i-h6-tqc-a01.dts
+++ b/sun50i-h6-tqc-a01.dts
@@ -60,15 +60,6 @@
 		regulator-always-on;
 	};
 
-	reg_gmac_2v5: gmac-2v5 {
-		compatible = "regulator-fixed";
-		regulator-name = "gmac-2v5";
-		regulator-min-microvolt = <2500000>;
-		regulator-max-microvolt = <2500000>;
-		enable-active-high;
-		gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; /* PD6 */
-	};
-
 	reg_vcc33_wifi: vcc33-wifi {
 		/* Always on 3.3V regulator for WiFi and BT */
 		compatible = "regulator-fixed";
@@ -93,7 +84,7 @@
 		compatible = "mmc-pwrseq-simple";
 		clocks = <&rtc 1>;
 		clock-names = "ext_clock";
-		reset-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PL8 */
+		reset-gpios = <&r_pio 0 8 GPIO_ACTIVE_LOW>; /* PL8 */
 		post-power-on-delay-ms = <200>;
 	};
 };
@@ -131,9 +122,6 @@
     pinctrl-0 = <&ext_rmii_pins>;
     phy-mode = "rmii";
     phy-handle = <&ext_rmii_phy>;
-    phy-supply = <&reg_aldo2>;
-    allwinner,rx-delay-ps = <1500>;
-    allwinner,tx-delay-ps = <700>;
     status = "okay";
 };
 
@@ -239,8 +227,7 @@
 			};
 
 			reg_aldo2: aldo2 {
-                regulator-always-on;
-                regulator-enable-ramp-delay = <0x186a0>;
+				regulator-always-on;
 				regulator-min-microvolt = <3300000>;
 				regulator-max-microvolt = <3300000>;
 				regulator-name = "vcc33-audio-tv-ephy-mac";