From a469790a80236080663861a442fca25bf4d6306b Mon Sep 17 00:00:00 2001
From: Banana Pi -BPI <lionwang@sinovoip.com.cn>
Date: Tue, 12 Nov 2019 21:03:23 +0800
Subject: [PATCH] u-boot-sp: update demo board V3

---
 u-boot-sp/arch/arm/dts/pentagram-common.dts | 21 ++++++++++++++++++++-
 u-boot-sp/arch/arm/dts/pentagram-tppg2.dts  |  7 ++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/u-boot-sp/arch/arm/dts/pentagram-common.dts b/u-boot-sp/arch/arm/dts/pentagram-common.dts
index de247f52e..5e111f620 100755
--- a/u-boot-sp/arch/arm/dts/pentagram-common.dts
+++ b/u-boot-sp/arch/arm/dts/pentagram-common.dts
@@ -52,7 +52,7 @@
 					  PMX_L2SW_P1_MAC_RMII_RXD1     G_MX34_GPIO_P4_2
 					  PMX_L2SW_P1_MAC_RMII_RXER     G_MX31_GPIO_P3_7
 				>;
-#else // Demo board
+#elif 0 // Demo board V2/V3
 				pinmux = <PMX_L2SW_CLK_OUT              G_MX50_GPIO_P6_2
 					  PMX_L2SW_MAC_SMI_MDC          G_MX44_GPIO_P5_4
 					  PMX_L2SW_LED_FLASH0           G_MX54_GPIO_P6_6
@@ -66,6 +66,25 @@
 					  PMX_L2SW_P0_MAC_RMII_RXD1     G_MX49_GPIO_P6_1
 					  PMX_L2SW_P0_MAC_RMII_RXER     G_MX46_GPIO_P5_6
 				>;
+#else // Demo board V3 (BPi)
+				pinmux = <PMX_L2SW_CLK_OUT              G_MX49_GPIO_P6_1
+					  PMX_L2SW_MAC_SMI_MDC          G_MX44_GPIO_P5_4
+					  PMX_L2SW_MAC_SMI_MDIO         G_MX43_GPIO_P5_3
+					  PMX_L2SW_P0_MAC_RMII_TXEN     G_MX52_GPIO_P6_4
+					  PMX_L2SW_P0_MAC_RMII_TXD0     G_MX50_GPIO_P6_2
+					  PMX_L2SW_P0_MAC_RMII_TXD1     G_MX51_GPIO_P6_3
+					  PMX_L2SW_P0_MAC_RMII_CRSDV    G_MX46_GPIO_P5_6
+					  PMX_L2SW_P0_MAC_RMII_RXD0     G_MX47_GPIO_P5_7
+					  PMX_L2SW_P0_MAC_RMII_RXD1     G_MX48_GPIO_P6_0
+					  PMX_L2SW_P0_MAC_RMII_RXER     G_MX45_GPIO_P5_5
+					  PMX_L2SW_P1_MAC_RMII_TXEN     G_MX59_GPIO_P7_3
+					  PMX_L2SW_P1_MAC_RMII_TXD0     G_MX57_GPIO_P7_1
+					  PMX_L2SW_P1_MAC_RMII_TXD1     G_MX58_GPIO_P7_2
+					  PMX_L2SW_P1_MAC_RMII_CRSDV    G_MX54_GPIO_P6_6
+					  PMX_L2SW_P1_MAC_RMII_RXD0     G_MX55_GPIO_P6_7
+					  PMX_L2SW_P1_MAC_RMII_RXD1     G_MX56_GPIO_P7_0
+					  PMX_L2SW_P1_MAC_RMII_RXER     G_MX53_GPIO_P6_5
+				>;
 #endif
 			};
 		};
diff --git a/u-boot-sp/arch/arm/dts/pentagram-tppg2.dts b/u-boot-sp/arch/arm/dts/pentagram-tppg2.dts
index f2a7f6e7c..c078d4831 100644
--- a/u-boot-sp/arch/arm/dts/pentagram-tppg2.dts
+++ b/u-boot-sp/arch/arm/dts/pentagram-tppg2.dts
@@ -20,7 +20,12 @@
 		stdout-path = "serial0:115200n8";
 	};
 
-	sppctl {
+	sppctl: sppctl@0x9c00010 {
+		compatible = "sunplus,sppctl";
+		reg = <0x9c000100 0x100>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_func>;
+
 		pinctrl_func: pinmux_func {
 			net_l2sw {
 				pinmux = <PMX_L2SW_CLK_OUT              G_MX63_GPIO_P7_7