add support for videostrong KII Pro
v2 cover add support for videostrong KII Pro
This patch set adds support for the Videostrong KII Pro tv box which is based on the gxbb-p201 reference design. Patch 1 and 4 also adds support for the BCM4335A0 that comes with this device
Device specifications:
SoC – Amlogic S905 quad core ARM Cortex-A53 @ up to 2.0GHz with penta-core Mali-450MP GPU @ 750 MHz System Memory – 2GB DDR3
Storage – 16GB eMMC flash + micro SD card slot up to 32GB
Video Output – HDMI 2.0 up to 4K @ 60Hz, and 3.5mm AV (composite video) jack
Audio – HDMI, AV (stereo audio), optical S/PDIF
Video Codecs – 10-bit H.265 up to 4K60, MPEG/VC-1/AVS+/H.265 up to 4K30
Tuner – Combo DVB-T/T2 and DVB-S/S2 with two connectors
Connectivity – 10/100M Ethernet, 802.11 b/g/n/ac Wi-Fi, and Bluetooth 4.0 (Ampak AP6335) USB – 4x USB 2.0 host ports
Misc – Power button and LED, IR receiver
Power Supply – DC 12V/1A
Dimensions – 130 x 120 x 32 mm
Weight – 187.50 grams
Changes since RFC v1:
- add commit description to the cover letter
- update bluetooth bindings
- use lowercase name for the dts filename,vendor prefix and device compatible
- add copyrights to the new files
- include "meson-gxbb-p20x.dtsi" instead of "meson-gxbb-p201.dts"
Mohammad Rasim (4):
dt-bindings: Add vendor prefix for Videostrong Technology Co., Ltd.
dt-bindings: net: Add compatible for BCM4335A0 bluetooth module
arm64: dts: meson-gxbb: add support for Videostrong KII Pro
Bluetooth: btbcm: Add entry for BCM4335A0 UART bluetooth
.../bindings/net/broadcom-bluetooth.txt | 1 + .../devicetree/bindings/vendor-prefixes.yaml | 2 + arch/arm64/boot/dts/amlogic/Makefile | 1 + .../boot/dts/amlogic/meson-gxbb-kii-pro.dts | 39 +++++++++++++++++++ drivers/bluetooth/btbcm.c | 1 + drivers/bluetooth/hci_bcm.c | 1 + 6 files changed, 45 insertions(+) create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts
Signature · 7 lines
2.23.0 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
RFC PATCH v2 1/4 dt-bindings: Add vendor prefix for Videostrong Technology Co., Ltd.
Videostrong Technology Co., Ltd., A manufacturer of Android Players & STB( Android with DVB Hybrid box &DVB-T2/S2/C/ISDB-T/DTMB-TH/ATSC,,)as well as HD media players.
--- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/vendor-prefixes.yaml +2 -0
@@ -1006,6 +1006,8 @@ patternProperties: description: Variscite Ltd. "^via,.*": description: VIA Technologies, Inc. + "^videostrong,.*": + description: Videostrong Technology Co., Ltd. "^virtio,.*": description: Virtual I/O Device Specification, developed by the OASIS consortium "^vishay,.*":
Signature · 1 line
2.23.0
Re: [RFC PATCH 1/4] dt-bindings: Add vendor prefix for Videostrong Technology Co., Ltd.
Quoted 13 lines · Mohammad Rasim
Videostrong Technology Co., Ltd., A manufacturer of Android Players &
STB( Android with DVB Hybrid box &DVB-T2/S2/C/ISDB-T/DTMB-TH/ATSC,,)as well as HD media players.Signed-off-by Mohammad Rasim <[email protected]>--- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++ 1 file changed, 2 insertions(+)Documentation/devicetree/bindings/vendor-prefixes.yaml +0
-0
Documentation/devicetree/bindings/vendor-prefixes.yaml patternProperties: · line 1013
Quoted 8 lines
Documentation/devicetree/bindings/vendor-prefixes.yaml +2
-0@@ -1006,6 +1006,8 @@ patternProperties: description: Variscite Ltd. "^via,.*": description: VIA Technologies, Inc. + "^videostrong,.*": + description: Videostrong Technology Co., Ltd. "^virtio,.*": description: Virtual I/O Device Specification, developed by the OASIS consortium "^vishay,.*":
RFC PATCH v2 2/4 dt-bindings: net: Add compatible for BCM4335A0 bluetooth module
In reply to Mohammad RasimAvailable in the Ampak AP6335 WiFi/Bluetooth combo
--- Documentation/devicetree/bindings/net/broadcom-bluetooth.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/net/broadcom-bluetooth.txt +1 -0
@@ -14,6 +14,7 @@ Required properties: * "brcm,bcm4330-bt" * "brcm,bcm43438-bt" * "brcm,bcm4345c5" + * "brcm,bcm4335a0" Optional properties:
Signature · 1 line
2.23.0
Re: [RFC PATCH 2/4] dt-bindings: net: Add compatible for BCM4335A0 bluetooth module
Hi,
Quoted 13 lines · Mohammad Rasim
Available in the Ampak AP6335 WiFi/Bluetooth combo
Signed-off-by Mohammad Rasim <[email protected]>--- Documentation/devicetree/bindings/net/broadcom-bluetooth.txt | 1 + 1 file changed, 1 insertion(+)Documentation/devicetree/bindings/net/broadcom-bluetooth.txt +0
-0
Documentation/devicetree/bindings/net/broadcom-bluetooth.txt Required properties: · line 17
Quoted 4 lines
Documentation/devicetree/bindings/net/broadcom-bluetooth.txt +1
-0@@ -14,6 +14,7 @@ Required properties: * "brcm,bcm4330-bt" * "brcm,bcm43438-bt" * "brcm,bcm4345c5" + * "brcm,bcm4335a0"
Is there a specific reason to add a new compatible here ? it the BT interface of the BCM4335A0 different for the actual compatible modules ?
If not, simply use a common "brcm,bcm43438-bt" compatible string.
Neil
Quoted 4 lines
Documentation/devicetree/bindings/net/broadcom-bluetooth.txt +0
-0Optional properties:
Re: [RFC PATCH 2/4] dt-bindings: net: Add compatible for BCM4335A0 bluetooth module
Quoted 23 lines · Neil Armstrong
Hi,
Quoted 13 lines · Mohammad Rasim
Available in the Ampak AP6335 WiFi/Bluetooth combo
Signed-off-by Mohammad Rasim <[email protected]>--- Documentation/devicetree/bindings/net/broadcom-bluetooth.txt | 1 + 1 file changed, 1 insertion(+)Documentation/devicetree/bindings/net/broadcom-bluetooth.txt +0
-0Documentation/devicetree/bindings/net/broadcom-bluetooth.txt Required properties: · line 17
Quoted 4 lines
Documentation/devicetree/bindings/net/broadcom-bluetooth.txt +1
-0@@ -14,6 +14,7 @@ Required properties: * "brcm,bcm4330-bt" * "brcm,bcm43438-bt" * "brcm,bcm4345c5" + * "brcm,bcm4335a0"Is there a specific reason to add a new compatible here ? it the BT interface of the BCM4335A0 different for the actual compatible modules ?
Quoted 1 line
If not, simply use a common "brcm,bcm43438-bt" compatible string.
I added a new compatible so that the dts of the device can describe the exact model of the module, anyone reading the dts might think that the device has a bcm43438 module which is incorrect and just looks weird to me.
previous compatibles like 'bcm4330-bt' are only used for probing and don't appear to be used anywhere else so I guess this is ok by the bluetooth maintainers, if not I will use a previous compatible and add a comment in the dts with the exact model of the chip.
Regards
Quoted 8 lines
Neil
Quoted 4 lines
Documentation/devicetree/bindings/net/broadcom-bluetooth.txt +0
-0Optional properties:
RFC PATCH v2 3/4 arm64: dts: meson-gxbb: add support for Videostrong KII Pro
In reply to Mohammad RasimThis patch adds support for the Videostrong KII Pro tv box which is based on the gxbb-p201 reference design
--- arch/arm64/boot/dts/amlogic/Makefile | 1 + .../boot/dts/amlogic/meson-gxbb-kii-pro.dts | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts
arch/arm64/boot/dts/amlogic/Makefile +1 -0
@@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtb
arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts new file +39 -0
@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* +/* Copyright (c) 2019 Mohammad Rasim <[email protected]> +*/ + +/dts-v1/; + +#include "meson-gxbb-p20x.dtsi" + +/ { + compatible = "videostrong,kii-pro", "amlogic,p201", "amlogic,s905", "amlogic,meson-gxbb"; + model = "Videostrong KII Pro"; + + +}; + +&uart_A { + status = "okay"; + pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; + pinctrl-names = "default"; + uart-has-rtscts; + + bluetooth { + compatible = "brcm,bcm4335a0"; + }; +}; + +ðmac { + status = "okay"; + pinctrl-0 = <ð_rmii_pins>; + pinctrl-names = "default"; + phy-mode = "rmii"; + + snps,reset-gpio = <&gpio GPIOZ_14 0>; + snps,reset-delays-us = <0>, <10000>, <1000000>; + snps,reset-active-low; +}; + +
Signature · 1 line
2.23.0
Re: [RFC PATCH 3/4] arm64: dts: meson-gxbb: add support for Videostrong KII Pro
Quoted 41 lines · Mohammad Rasim
This patch adds support for the Videostrong KII Pro tv box which is based on the gxbb-p201 reference design
Signed-off-by Mohammad Rasim <[email protected]>--- arch/arm64/boot/dts/amlogic/Makefile | 1 + .../boot/dts/amlogic/meson-gxbb-kii-pro.dts | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dtsarch/arm64/boot/dts/amlogic/Makefile +1
-0@@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtbarch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts new file +14
-0@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* +/* Copyright (c) 2019 Mohammad Rasim <[email protected]> +*/ + +/dts-v1/; + +#include "meson-gxbb-p20x.dtsi" + +/ { + compatible = "videostrong,kii-pro", "amlogic,p201", "amlogic,s905", "amlogic,meson-gxbb"; + model = "Videostrong KII Pro"; + +
arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts line 24
Quoted 10 lines
arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts new file +10
-0+}; + +&uart_A { + status = "okay"; + pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; + pinctrl-names = "default"; + uart-has-rtscts; + + bluetooth { + compatible = "brcm,bcm4335a0";
Use "brcm,bcm43438-bt" here if the I/F is compatible.
Quoted 5 lines
arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts new file +4
-0+ }; +}; + +ðmac {
arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts line 39
Quoted 10 lines
arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts new file +10
-0+ status = "okay"; + pinctrl-0 = <ð_rmii_pins>; + pinctrl-names = "default"; + phy-mode = "rmii"; + + snps,reset-gpio = <&gpio GPIOZ_14 0>; + snps,reset-delays-us = <0>, <10000>, <1000000>; + snps,reset-active-low> +}; + +
Did you try to determine the PHY and add a PHY node aswell ? The reset stuff could go in the PHY node.
Neil
Re: [RFC PATCH 3/4] arm64: dts: meson-gxbb: add support for Videostrong KII Pro
Quoted 64 lines · Neil Armstrong
Quoted 41 lines · Mohammad Rasim
This patch adds support for the Videostrong KII Pro tv box which is based on the gxbb-p201 reference design
Signed-off-by Mohammad Rasim <[email protected]>--- arch/arm64/boot/dts/amlogic/Makefile | 1 + .../boot/dts/amlogic/meson-gxbb-kii-pro.dts | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dtsarch/arm64/boot/dts/amlogic/Makefile +1
-0@@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtbarch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts new file +14
-0@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* +/* Copyright (c) 2019 Mohammad Rasim <[email protected]> +*/ + +/dts-v1/; + +#include "meson-gxbb-p20x.dtsi" + +/ { + compatible = "videostrong,kii-pro", "amlogic,p201", "amlogic,s905", "amlogic,meson-gxbb"; + model = "Videostrong KII Pro"; + +arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts line 24
Quoted 10 lines
arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts new file +10
-0+}; + +&uart_A { + status = "okay"; + pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; + pinctrl-names = "default"; + uart-has-rtscts; + + bluetooth { + compatible = "brcm,bcm4335a0";Use "brcm,bcm43438-bt" here if the I/F is compatible.
Quoted 9 lines
arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts new file +9
-0+ }; +}; + +ðmac { + status = "okay"; + pinctrl-0 = <ð_rmii_pins>; + pinctrl-names = "default"; + phy-mode = "rmii"; +
Quoted 8 lines
arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts line 39
Quoted 6 lines
arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts new file +5
-0+ snps,reset-gpio = <&gpio GPIOZ_14 0>; + snps,reset-delays-us = <0>, <10000>, <1000000>; + snps,reset-active-low> +}; + +Did you try to determine the PHY and add a PHY node aswell ? The reset stuff could go in the PHY node.
looking at the PCB I can see the phy is "IP101GR" so I thought I can use the phy node of nextbox-a95x [0] but I get these errors:
``` [ 15.867041] meson8b-dwmac c9410000.ethernet eth0: no phy at addr -1 [ 15.867079] meson8b-dwmac c9410000.ethernet eth0: stmmac_open: Cannot attach to PHY (error: -19) ```
Quoted 2 lines
Neil
RFC PATCH v2 4/4 Bluetooth: btbcm: Add entry for BCM4335A0 UART bluetooth
In reply to Mohammad RasimThis patch adds the device ID for the BCM4335A0 module (part of the AMPAK AP6335 WIFI/Bluetooth combo)
hciconfig output:
```
hci1: Type: Primary Bus: UART
BD Address: 43:35:B0:07:1F:AC ACL MTU: 1021:8 SCO MTU: 64:1
UP RUNNING
RX bytes:5079 acl:0 sco:0 events:567 errors:0
TX bytes:69065 acl:0 sco:0 commands:567 errors:0
Features: 0xbf 0xfe 0xcf 0xff 0xdf 0xff 0x7b 0x87
Packet type: DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3
Link policy: RSWITCH SNIFF
Link mode: SLAVE ACCEPT
Name: 'alarm'
Class: 0x000000
Service Classes: Unspecified
Device Class: Miscellaneous,
HCI Version: 4.0 (0x6) Revision: 0x161
LMP Version: 4.0 (0x6) Subversion: 0x4106
Manufacturer: Broadcom Corporation (15)
```--- drivers/bluetooth/btbcm.c | 1 + drivers/bluetooth/hci_bcm.c | 1 + 2 files changed, 2 insertions(+)
drivers/bluetooth/btbcm.c +1 -0
@@ -339,6 +339,7 @@ static const struct bcm_subver_table bcm_uart_subver_table[] = { { 0x220e, "BCM20702A1" }, /* 001.002.014 */ { 0x4217, "BCM4329B1" }, /* 002.002.023 */ { 0x6106, "BCM4359C0" }, /* 003.001.006 */ + { 0x4106, "BCM4335A0" }, /* 002.001.006 */ { } };
drivers/bluetooth/hci_bcm.c +1 -0
@@ -1422,6 +1422,7 @@ static const struct of_device_id bcm_bluetooth_of_match[] = { { .compatible = "brcm,bcm4345c5" }, { .compatible = "brcm,bcm4330-bt" }, { .compatible = "brcm,bcm43438-bt" }, + { .compatible = "brcm,bcm4335a0" }, { }, };MODULE_DEVICE_TABLE (of, bcm_bluetooth_of_match);
Signature · 1 line
2.23.0
Re: [RFC PATCH 4/4] Bluetooth: btbcm: Add entry for BCM4335A0 UART bluetooth
Quoted 33 lines · Mohammad Rasim
This patch adds the device ID for the BCM4335A0 module (part of the AMPAK AP6335 WIFI/Bluetooth combo)
hciconfig output:
``` hci1: Type: Primary Bus: UART BD Address: 43:35:B0:07:1F:AC ACL MTU: 1021:8 SCO MTU: 64:1 UP RUNNING RX bytes:5079 acl:0 sco:0 events:567 errors:0 TX bytes:69065 acl:0 sco:0 commands:567 errors:0 Features: 0xbf 0xfe 0xcf 0xff 0xdf 0xff 0x7b 0x87 Packet type: DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3 Link policy: RSWITCH SNIFF Link mode: SLAVE ACCEPT Name: 'alarm' Class: 0x000000 Service Classes: Unspecified Device Class: Miscellaneous, HCI Version: 4.0 (0x6) Revision: 0x161 LMP Version: 4.0 (0x6) Subversion: 0x4106 Manufacturer: Broadcom Corporation (15) ```Signed-off-by Mohammad Rasim <[email protected]>--- drivers/bluetooth/btbcm.c | 1 + drivers/bluetooth/hci_bcm.c | 1 + 2 files changed, 2 insertions(+)drivers/bluetooth/btbcm.c +0
-0
drivers/bluetooth/btbcm.c static const struct bcm_subver_table bcm_uart_subver_table[] = { · line 342
Quoted 4 lines
drivers/bluetooth/btbcm.c +1
-0@@ -339,6 +339,7 @@ static const struct bcm_subver_table bcm_uart_subver_table[] = { { 0x220e, "BCM20702A1" }, /* 001.002.014 */ { 0x4217, "BCM4329B1" }, /* 002.002.023 */ { 0x6106, "BCM4359C0" }, /* 003.001.006 */ + { 0x4106, "BCM4335A0" }, /* 002.001.006 */
Ack for this one
drivers/bluetooth/hci_bcm.c static const struct of_device_id bcm_bluetooth_of_match[] = { · line 1425
Quoted 12 lines
drivers/bluetooth/btbcm.c +0
-0{ } };drivers/bluetooth/hci_bcm.c +1
-0@@ -1422,6 +1422,7 @@ static const struct of_device_id bcm_bluetooth_of_match[] = { { .compatible = "brcm,bcm4345c5" }, { .compatible = "brcm,bcm4330-bt" }, { .compatible = "brcm,bcm43438-bt" }, + { .compatible = "brcm,bcm4335a0" },
This could be omitted if the I/F is the same as "brcm,bcm43438-bt".
drivers/bluetooth/hci_bcm.c static const struct of_device_id bcm_bluetooth_of_match[] = { · line 1428
Quoted 4 lines
drivers/bluetooth/hci_bcm.c +0
-0{ }, };MODULE_DEVICE_TABLE (of, bcm_bluetooth_of_match);
Neil