Skip to contentSkip to conversation

arm64: meson-gx: misc fixes and updates

PATCH In review Christian Hewitt 2 participants 8 messages Sep 9, 2019 – Sep 26, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover arm64: meson-gx: misc fixes and updates

This patchset:

- Fixes bluetooth on Khadas VIM2
- Fixes bluetooth on Khadas VIM
- Fixes GPIO key dt on Khadas VIM
- Updates model for AML-S805X-CC
- Updates model/compatible for AML-S905X-CC

Christian Hewitt (6):
arm64: dts: meson-gxl-s905x-khadas-vim: fix gpio-keys-polled node
arm64: dts: meson-gxl-s905x-khadas-vim: fix uart_A bluetooth node
arm64: dts: meson-gxm-khadas-vim2: fix uart_A bluetooth node
arm64: dts: meson: libretech-ac: update model description
dt-bindings: arm: amlogic: update libretech-cc compatible
arm64: dts: meson: libretech-cc: update model and compatible

 Documentation/devicetree/bindings/arm/amlogic.yaml           | 2 +-
 arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 2 +-
 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts   | 7 ++++---
 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 5 +++--
 arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts        | 3 +++
 5 files changed, 12 insertions(+), 7 deletions(-)
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/6 arm64: dts: meson-gxl-s905x-khadas-vim: fix gpio-keys-polled node

Fix DTC warnings:

arch/arm/dts/meson-gxl-s905x-khadas-vim.dtb: Warning (avoid_unnecessary_addr_size):
/gpio-keys-polled: unnecessary #address-cells/#size-cells
without "ranges" or child "reg" property

Fixes e15d2774b8c ("ARM64: dts: meson-gxl: add support for the Khadas VIM board")
---
 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +1 -3
index 5499e8d..41be2af 100644
@@ -33,11 +33,9 @@
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
 		poll-interval = <100>;
 
-		button@0 {
+		power-button {
 			label = "power";
 			linux,code = <KEY_POWER>;
 			gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;
Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/6 arm64: dts: meson-gxl-s905x-khadas-vim: fix uart_A bluetooth node

In reply to Christian Hewitt
Fixes dd5297cc8b8 ("arm64: dts: meson-gxl-s905x-khadas-vim enable Bluetooth")
---
 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 3 +++
 1 file changed, 3 insertions(+)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +3 -0
index 41be2af..2ab7d84 100644
@@ -190,6 +190,9 @@
 	bluetooth {
 		compatible = "brcm,bcm43438-bt";
 		shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
+		max-speed = <2000000>;
+		clocks = <&wifi32k>;
+		clock-names = "lpo";
 	};
 };
 
Signature · 1 line
2.7.4
#3 lore raw

PATCH 3/6 arm64: dts: meson-gxm-khadas-vim2: fix uart_A bluetooth node

In reply to Christian Hewitt
Fixes 33344e2111a ("arm64: dts: meson-gxm-khadas-vim2: fix Bluetooth support")
---
 arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 3 +++
 1 file changed, 3 insertions(+)
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +3 -0
index 989d33a..d392062 100644
@@ -409,6 +409,9 @@
 	bluetooth {
 		compatible = "brcm,bcm43438-bt";
 		shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
+		max-speed = <2000000>;
+		clocks = <&wifi32k>;
+		clock-names = "lpo";
 	};
 };
 
Signature · 1 line
2.7.4
#4 lore raw

PATCH 4/6 arm64: dts: meson: libretech-ac: update model description

In reply to Christian Hewitt

Shorten the model description to improve readability in some app GUIs that show the string.

---
 arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts +1 -1
index 82b1c48..4d59494 100644
@@ -14,7 +14,7 @@
 / {
 	compatible = "libretech,aml-s805x-ac", "amlogic,s805x",
 		     "amlogic,meson-gxl";
-	model = "Libre Computer Board AML-S805X-AC";
+	model = "Libre Computer AML-S805X-AC";
 
 	aliases {
 		serial0 = &uart_AO;
Signature · 1 line
2.7.4
#5 lore raw

PATCH 5/6 dt-bindings: arm: amlogic: update libretech-cc compatible

In reply to Christian Hewitt

Update the compatible for the Libre Computer aml-s905x-cc to be more descriptive using the format introduced with the aml-s805x-ac board.

---
 Documentation/devicetree/bindings/arm/amlogic.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/arm/amlogic.yaml +1 -1
index 325c6fd..b3c9dbb 100644
@@ -95,7 +95,7 @@ properties:
               - amlogic,p212
               - hwacom,amazetv
               - khadas,vim
-              - libretech,cc
+              - libretech,aml-s905x-cc
               - nexbox,a95x
               - seirobotics,sei510
           - const: amlogic,s905x
Signature · 1 line
2.7.4
#6 lore raw

PATCH 6/6 arm64: dts: meson: libretech-cc: update model and compatible

In reply to Christian Hewitt

Shorten the model description to improve readability in some app GUIs that show the string. Update compatible to be more descriptive, using the format of the LaFrite board in meson-gxl-s805x-libretech-ac.dts.

---
 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts +3 -2
index 4b8ce73..e8348b2 100644
@@ -12,8 +12,9 @@
 #include "meson-gxl-s905x.dtsi"
 
 / {
-	compatible = "libretech,cc", "amlogic,s905x", "amlogic,meson-gxl";
-	model = "Libre Computer Board AML-S905X-CC";
+	compatible = "libretech,aml-s905x-cc", "amlogic,s905x",
+		     "amlogic,meson-gxl";
+	model = "Libre Computer AML-S905X-CC";
 
 	aliases {
 		serial0 = &uart_AO;
Signature · 1 line
2.7.4
maintainer
#7 lore raw
In reply to Christian Hewitt
Quoted 7 lines · Christian Hewitt

This patchset:

- Fixes bluetooth on Khadas VIM2
- Fixes bluetooth on Khadas VIM
- Fixes GPIO key dt on Khadas VIM
- Updates model for AML-S805X-CC
- Updates model/compatible for AML-S905X-CC

Queued for v5.5.

Thanks for the updates/fixups,

Kevin