From 4be019e326d63704993e8e6dd5a9f87c37cf8638 Mon Sep 17 00:00:00 2001
From: Markus Gothe <markus.gothe@genexis.eu>
Date: Fri, 26 Nov 2021 18:22:37 +0100
Subject: [PATCH] brcm63xx: Update board files with voice names and order

In order for SIP to work correctly we need to provide some
new options to the db files.

Change-Id: Idf52d265e53fefacf281d585a5bc085a0e75f0d3
---
 iopsys-brcm63xx-arm/base-files/etc/board-db/boards/E600      | 2 ++
 iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_G6416  | 2 ++
 iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_G6426  | 2 ++
 iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_G6476  | 2 ++
 iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P3410B | 2 ++
 iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P3414B | 2 ++
 iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P6414  | 2 ++
 iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P6426  | 2 ++
 iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P6476  | 2 ++
 iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_PX2310 | 2 ++
 iopsys-brcm63xx-arm/base-files/etc/board-db/boards/XG6846B   | 2 ++
 iopsys-brcm63xx-arm/base-files/etc/board-db/boards/XGX       | 2 ++
 12 files changed, 24 insertions(+)

diff --git a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/E600 b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/E600
index 41e5044f5..7d84912dd 100644
--- a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/E600
+++ b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/E600
@@ -11,6 +11,8 @@ config board 'board'
 	option hasWifi '1'
 	# Voice
 	option VoicePorts '2'
+	option VoicePortNames 'FXS_1 FXS_2'
+	option VoicePortOrder 'brcm0 brcm1'
 	# Ethernet
 	option ethernetWanPort 'eth4'
 	option ethernetPortNames 'LAN1 LAN2 LAN3 LAN4 WAN'
diff --git a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_G6416 b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_G6416
index 91b19cda3..6c1de83b0 100644
--- a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_G6416
+++ b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_G6416
@@ -12,6 +12,8 @@ config board 'board'
 	option hasCatv '0'
 	# Voice
 	option VoicePorts '2'
+	option VoicePortNames 'Tel_2 Tel_1'
+	option VoicePortOrder 'brcm0 brcm1'
 	# SFP
 	option sfpBus '/dev/i2c-0'
 	# Ethernet
diff --git a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_G6426 b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_G6426
index ed3e2e8f1..964f3fa5d 100644
--- a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_G6426
+++ b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_G6426
@@ -12,6 +12,8 @@ config board 'board'
 	option hasCatv '1'
 	# Voice
 	option VoicePorts '2'
+	option VoicePortNames 'Tel_2 Tel_1'
+	option VoicePortOrder 'brcm0 brcm1'
 	# SFP
 	option sfpBus '/dev/i2c-0'
 	# Ethernet
diff --git a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_G6476 b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_G6476
index ed3e2e8f1..964f3fa5d 100644
--- a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_G6476
+++ b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_G6476
@@ -12,6 +12,8 @@ config board 'board'
 	option hasCatv '1'
 	# Voice
 	option VoicePorts '2'
+	option VoicePortNames 'Tel_2 Tel_1'
+	option VoicePortOrder 'brcm0 brcm1'
 	# SFP
 	option sfpBus '/dev/i2c-0'
 	# Ethernet
diff --git a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P3410B b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P3410B
index 311c664f5..b506fbb38 100644
--- a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P3410B
+++ b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P3410B
@@ -11,6 +11,8 @@ config board 'board'
 	option hasSfp '1'
 	# Voice
 	option VoicePorts '0'
+	option VoicePortNames ''
+	option VoicePortOrder ''
 	# SFP
 	option sfpBus '/dev/i2c-0'
 	# Ethernet
diff --git a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P3414B b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P3414B
index 077fda973..5b21f672c 100644
--- a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P3414B
+++ b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P3414B
@@ -12,6 +12,8 @@ config board 'board'
 	option hasCatv '0'
 	# Voice
 	option VoicePorts '1'
+	option VoicePortNames 'Tel'
+	option VoicePortOrder 'brcm0'
 	# SFP
 	option sfpBus '/dev/i2c-0'
 	# Ethernet
diff --git a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P6414 b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P6414
index fb41cfdc0..c639b1de5 100644
--- a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P6414
+++ b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P6414
@@ -12,6 +12,8 @@ config board 'board'
 	option hasCatv '0'
 	# Voice
 	option VoicePorts '2'
+	option VoicePortNames 'Tel_2 Tel_1'
+	option VoicePortOrder 'brcm0 brcm1'
 	# SFP
 	option sfpBus '/dev/i2c-0'
 	# Ethernet
diff --git a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P6426 b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P6426
index 112280025..769379763 100644
--- a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P6426
+++ b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P6426
@@ -12,6 +12,8 @@ config board 'board'
 	option hasCatv '1'
 	# Voice
 	option VoicePorts '2'
+	option VoicePortNames 'Tel_2 Tel_1'
+	option VoicePortOrder 'brcm0 brcm1'
 	# SFP
 	option sfpBus '/dev/i2c-0'
 	# Ethernet
diff --git a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P6476 b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P6476
index 112280025..769379763 100644
--- a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P6476
+++ b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_P6476
@@ -12,6 +12,8 @@ config board 'board'
 	option hasCatv '1'
 	# Voice
 	option VoicePorts '2'
+	option VoicePortNames 'Tel_2 Tel_1'
+	option VoicePortOrder 'brcm0 brcm1'
 	# SFP
 	option sfpBus '/dev/i2c-0'
 	# Ethernet
diff --git a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_PX2310 b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_PX2310
index f4a698df7..6bb81ab60 100644
--- a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_PX2310
+++ b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/FT_PX2310
@@ -14,6 +14,8 @@ config board 'board'
 	option hasCatv '0'
 	# Voice
 	option VoicePorts '0'
+	option VoicePortNames ''
+	option VoicePortOrder ''
 	# SFP
 	option sfpBus '/dev/i2c-1'
 	# Ethernet
diff --git a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/XG6846B b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/XG6846B
index 33fbd7f8f..4a15ab5ea 100644
--- a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/XG6846B
+++ b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/XG6846B
@@ -13,6 +13,8 @@ config board 'board'
 	option hasSfp '1'
 	# Voice
 	option VoicePorts '0'
+	option VoicePortNames ''
+	option VoicePortOrder ''
 	# SFP
 	option sfpBus '/dev/i2c-0'
 	# Ethernet
diff --git a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/XGX b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/XGX
index 99cf5a7d7..7f031d30f 100644
--- a/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/XGX
+++ b/iopsys-brcm63xx-arm/base-files/etc/board-db/boards/XGX
@@ -13,6 +13,8 @@ config board 'board'
 	option hasSfp '1'
 	# Voice
 	option VoicePorts '0'
+	option VoicePortNames ''
+	option VoicePortOrder ''
 	# SFP
 	option sfpBus '/dev/i2c-1'
 	# Ethernet
-- 
GitLab