Khadas VIM support (Amlogic Meson GXL S905X)

PATCH Superseded Martin Blumenstingl 6 participants 16 messages Mar 4, 2017 – Mar 22, 2017

Subsystems (2)

Device tree bindings Arm/Amlogic Meson SoC support

lore

Share & tools

lore

Martin Blumenstingl

author reviewer

2017-03-04 21:51 UTC #0 lore raw

cover Khadas VIM support (Amlogic Meson GXL S905X)

This series adds support for the Khadas VIM and Khadas VIM Pro boards (both are provided through a single .dts as the only two differences are the eMMC size and different SDIO WIFI chips - both are Broadcom brcmfmac based though).
More details can be found on the official website: [0]

I have tested this on a Khadas VIM Pro board. It would be nice if someone with a non-Pro board could give it a try as well.

This patchset depends on:
- "ARM64: defconfig: enable the leds-pwm driver and default-on trigger" see [1] - already merged in v4.12/defconfig of Kevin's Amlogic tree
- "meson-gxl pinctrl - add the missing PWM pins" see [2]
- "brcmfmac: add support for BCM43455 with modalias sdio:c00v02D0dA9BF" see [3], this is NOT a direct dependency (it's only required to get WIFI working on the Khadas VIM Pro) and it's already merged for v4.11 (commit a62a77881b1b6708ffeddd9bf0529494f7b199e3)

[0] http://khadas.com/vim/
[1] http://lists.infradead.org/pipermail/linux-amlogic/2017-February/002474.html
[2] http://lists.infradead.org/pipermail/linux-amlogic/2017-March/002658.html
[3] https://www.spinics.net/lists/linux-mmc/msg41627.html

Martin Blumenstingl (3):
devicetree: add vendor prefix for Khadas
dt-bindings: amlogic: add the Khadas VIM
ARM64: dts: meson-gxl: add support for the Khadas VIM board

 Documentation/devicetree/bindings/arm/amlogic.txt  |   2 +
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm64/boot/dts/amlogic/Makefile               |   1 +
 .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts     | 114 +++++++++++++++++++++
 4 files changed, 118 insertions(+)
 create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts

Signature · 1 line

2.12.0

Martin Blumenstingl

author reviewer

2017-03-04 21:51 UTC #1 lore raw

PATCH 1/3 devicetree: add vendor prefix for Khadas

Khadas is a new sub-brand of Shenzhen Wesion Technology CO.,LTD. They are developing Amlogic and Rockchip based "DIY boxes" (single board computers): http://khadas.com/
They are best know for their latest product: the Khadas VIM (an Amlogic GXL S905X based SBC).

Signed-off-by Martin Blumenstingl <[email protected]>

---
 Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
 1 file changed, 1 insertion(+)

Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0

index 9946aedcf146..65e5d077f97b 100644
@@ -155,6 +155,7 @@ jedec	JEDEC Solid State Technology Association
 karo	Ka-Ro electronics GmbH
 keithkoep	Keith & Koep GmbH
 keymile	Keymile GmbH
+khadas	Khadas
 kinetic Kinetic Technologies
 kosagi	Sutajio Ko-Usagi PTE Ltd.
 kyo	Kyocera Corporation

Signature · 1 line

2.12.0

Rob Herring

maintainer

2017-03-15 19:57 UTC #2 lore raw

PATCH 1/3 devicetree: add vendor prefix for Khadas

Quoted 10 lines · Martin Blumenstingl

Khadas is a new sub-brand of Shenzhen Wesion Technology CO.,LTD. They are developing Amlogic and Rockchip based "DIY boxes" (single board computers): http://khadas.com/
They are best know for their latest product: the Khadas VIM (an Amlogic GXL S905X based SBC).
Signed-off-by Martin Blumenstingl <[email protected]>
---
 Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
 1 file changed, 1 insertion(+)

Acked-by Rob Herring <[email protected]>

Andreas Färber

2017-03-16 06:00 UTC #3 lore raw

PATCH 1/3 devicetree: add vendor prefix for Khadas

Am 15.03.2017 um 20:57 schrieb Rob Herring:

Quoted 7 lines · Martin Blumenstingl

Quoted 6 lines
Khadas is a new sub-brand of Shenzhen Wesion Technology CO.,LTD. They are developing Amlogic and Rockchip based "DIY boxes" (single board computers): http://khadas.com/
They are best know for their latest product: the Khadas VIM (an Amlogic GXL S905X based SBC).

Quoted 6 lines

Quoted 4 lines
Signed-off-by Martin Blumenstingl <[email protected]>
---
 Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
 1 file changed, 1 insertion(+)
Acked-by Rob Herring <[email protected]>

Shouldn't the entry reflect what is in the commit message rather than just repeat the prefix? I.e., something like "Khadas by Shenzhen Wesion Technology Co., Ltd." (which I believe is the official spelling and spacing of these abbreviations also for the commit message).

An Acked-by from the CC'ed vendor would also be desirable. :)

Regards,
Andreas

Signature · 3 lines

SUSE Linux GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany
GF: Felix Imend?rffer, Jane Smithard, Graham Norton
HRB 21284 (AG N?rnberg)

Martin Blumenstingl

author reviewer

2017-03-16 21:14 UTC #4 lore raw

PATCH 1/3 devicetree: add vendor prefix for Khadas

Quoted 13 lines · Andreas F?rber

Am 15.03.2017 um 20:57 schrieb Rob Herring:
Quoted 12 lines · Martin Blumenstingl
Quoted 10 lines
Khadas is a new sub-brand of Shenzhen Wesion Technology CO.,LTD. They are developing Amlogic and Rockchip based "DIY boxes" (single board computers): http://khadas.com/
They are best know for their latest product: the Khadas VIM (an Amlogic GXL S905X based SBC).
Signed-off-by Martin Blumenstingl <[email protected]>
---
 Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
 1 file changed, 1 insertion(+)

Quoted 6 lines

Quoted 1 line
Acked-by Rob Herring <[email protected]>
Shouldn't the entry reflect what is in the commit message rather than just repeat the prefix? I.e., something like "Khadas by Shenzhen Wesion Technology Co., Ltd." (which I believe is the official spelling and spacing of these abbreviations also for the commit message).

I took the spelling for "Shenzhen Wesion Technology CO.,LTD." from their website: [0]

Quoted 1 line

An Acked-by from the CC'ed vendor would also be desirable. :)

I asked Gouwa, one of the people behind the Khadas VIM boards for clarification some time ago:
"Khadas is a new brand power by Shenzhen Wesion Technology, 'Khadas' is brand, 'VIM' is product serial name, like 'Apple + iPhone'" I think I used the vendor-prefixes "pine64" and "radxa" as reference (see [1]) when I wrote the patch - and none of the existing entries seems to follow the "brand by parent company" schema.

@Gouwa, Rob: could you please share your opinion on what the official "vendor" name for the "khadas" prefix should be?

Regards,
Martin

[0] http://szwesion.com/contact/
[1] http://lxr.free-electrons.com/source/Documentation/devicetree/bindings/vendor-prefixes.txt

Gouwa

2017-03-17 03:13 UTC #5 lore raw

Re: Re: [PATCH 1/3] devicetree: add vendor prefix for Khadas

Hi, Martin & Rob:
Regarding Khadas and Wesion, we tend to keep them relatively independent, and as the commit on vendor-prefixes.txt, both following is okay:
+khadas Khadas
+khadas Khadas.com

We have corrected the misspellings of our company name on our website
from:
Shenzhen Wesion Technology CO.,LTD.
to:
Shenzhen Wesion Technology Co., Ltd.

Sorry for the trouble we made.

Something a little different~
Gouwa / 汪锋烽
Shenzhen Wesion Technology Co., Ltd.
深圳市世野科技有限公司
TEL: 0755-23076626
FAX: 0755-23076696
ADD: 深圳市宝安区宝源路名优采购中心C#301

From: Martin Blumenstingl
Date: 2017-03-17 05:14
To: Andreas Färber; Rob Herring; gouwa
CC: mark.rutland; devicetree; narmstrong; khilman; will.deacon; catalin.marinas; carlo; linux-amlogic; linux-arm-kernel; jbrunet
Subject: Re: [PATCH 1/3] devicetree: add vendor prefix for Khadas

Quoted 13 lines · Andreas Färber

Am 15.03.2017 um 20:57 schrieb Rob Herring:
Quoted 12 lines · Martin Blumenstingl
Quoted 10 lines
Khadas is a new sub-brand of Shenzhen Wesion Technology CO.,LTD. They are developing Amlogic and Rockchip based "DIY boxes" (single board computers): http://khadas.com/
They are best know for their latest product: the Khadas VIM (an Amlogic GXL S905X based SBC).
Signed-off-by Martin Blumenstingl <[email protected]>
---
 Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
 1 file changed, 1 insertion(+)

Quoted 6 lines

Quoted 1 line
Acked-by Rob Herring <[email protected]>
Shouldn't the entry reflect what is in the commit message rather than just repeat the prefix? I.e., something like "Khadas by Shenzhen Wesion Technology Co., Ltd." (which I believe is the official spelling and spacing of these abbreviations also for the commit message).

I took the spelling for "Shenzhen Wesion Technology CO.,LTD." from their website: [0]

Quoted 1 line

An Acked-by from the CC'ed vendor would also be desirable. :)

@Gouwa, Rob: could you please share your opinion on what the official "vendor" name for the "khadas" prefix should be?

Regards,
Martin

[0] http://szwesion.com/contact/
[1] http://lxr.free-electrons.com/source/Documentation/devicetree/bindings/vendor-prefixes.txt

Martin Blumenstingl

author reviewer

2017-03-04 21:51 UTC #6 lore raw

PATCH 2/3 dt-bindings: amlogic: add the Khadas VIM

In reply to Martin Blumenstingl

Signed-off-by Martin Blumenstingl <[email protected]>

---
 Documentation/devicetree/bindings/arm/amlogic.txt | 2 ++
 1 file changed, 2 insertions(+)

Documentation/devicetree/bindings/arm/amlogic.txt +2 -0

index c246cd2730d9..354b76da95fa 100644
@@ -43,6 +43,8 @@ Board compatible values:
   - "wetek,hub" (Meson gxbb)
   - "wetek,play2" (Meson gxbb)
   - "amlogic,p212" (Meson gxl s905x)
+  - "khadas,vim" (Meson gxl s905x)
+
   - "amlogic,p230" (Meson gxl s905d)
   - "amlogic,p231" (Meson gxl s905d)
   - "amlogic,q200" (Meson gxm s912)

Signature · 1 line

2.12.0

Rob Herring

maintainer

2017-03-15 19:58 UTC #7 lore raw

PATCH 2/3 dt-bindings: amlogic: add the Khadas VIM

Quoted 4 lines · Martin Blumenstingl

Signed-off-by Martin Blumenstingl <[email protected]>
---
 Documentation/devicetree/bindings/arm/amlogic.txt | 2 ++
 1 file changed, 2 insertions(+)

Acked-by Rob Herring <[email protected]>

Martin Blumenstingl

author reviewer

2017-03-04 21:51 UTC #8 lore raw

PATCH 3/3 ARM64: dts: meson-gxl: add support for the Khadas VIM board

In reply to Martin Blumenstingl

The Khadas VIM series consists of two boards which are almost identical:
They are both using the same GXL S905X SoC, 100Mbit/s ethernet (through the SoC-internal PHY), 2GB DDR3 memory, a micro-SD card slot, onboard eMMC, Broadcom based SDIO WIFI, 2x USB A and 1x USB Type-C (the latter with OTG support). The red LED is driven by PWM_AO_B (which allows dimming), while the blue LED is managed by the firmware. The differences are:
- the VIM Pro has a 16GB eMMC module, while the VIM only has 8GB
- the VIM Pro uses an AP6255 a/b/g/n/ac WIFI module, while the VIM comes with an AP6212 b/g/n SDIO WIFI module
(the Vim uses an 8GB eMMC module, while

The boards are based on Amlogic's GXL S905X P212 reference design, which is why most of the functionality (all MMC controllers and power sequences, IR remote input, the main UART, ADC and ethernet) is simply inherited from meson-gxl-s905x-p212.dtsi.

Signed-off-by Martin Blumenstingl <[email protected]>

---
 arch/arm64/boot/dts/amlogic/Makefile               |   1 +
 .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts     | 114 +++++++++++++++++++++
 2 files changed, 115 insertions(+)
 create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts

arch/arm64/boot/dts/amlogic/Makefile +1 -0

index 3f94bce33b7f..6a316f863d73 100644
@@ -7,6 +7,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-meta.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-telos.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-hub.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-play2.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-khadas-vim.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p230.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts new file +114 -0

114 lines not on this page · raw message

Signature · 1 line

2.12.0

Neil Armstrong

2017-03-06 16:12 UTC #9 lore raw

cover Khadas VIM support (Amlogic Meson GXL S905X)

In reply to Martin Blumenstingl

Quoted 30 lines · Martin Blumenstingl

This series adds support for the Khadas VIM and Khadas VIM Pro boards (both are provided through a single .dts as the only two differences are the eMMC size and different SDIO WIFI chips - both are Broadcom brcmfmac based though).
More details can be found on the official website: [0]
I have tested this on a Khadas VIM Pro board. It would be nice if someone with a non-Pro board could give it a try as well.
This patchset depends on:
- "ARM64: defconfig: enable the leds-pwm driver and default-on trigger" see [1] - already merged in v4.12/defconfig of Kevin's Amlogic tree
- "meson-gxl pinctrl - add the missing PWM pins" see [2]
- "brcmfmac: add support for BCM43455 with modalias sdio:c00v02D0dA9BF" see [3], this is NOT a direct dependency (it's only required to get WIFI working on the Khadas VIM Pro) and it's already merged for v4.11 (commit a62a77881b1b6708ffeddd9bf0529494f7b199e3)
[0] http://khadas.com/vim/
[1] http://lists.infradead.org/pipermail/linux-amlogic/2017-February/002474.html
[2] http://lists.infradead.org/pipermail/linux-amlogic/2017-March/002658.html
[3] https://www.spinics.net/lists/linux-mmc/msg41627.html
Martin Blumenstingl (3):
devicetree: add vendor prefix for Khadas
dt-bindings: amlogic: add the Khadas VIM
ARM64: dts: meson-gxl: add support for the Khadas VIM board

Quoted 7 lines

 Documentation/devicetree/bindings/arm/amlogic.txt  |   2 +
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm64/boot/dts/amlogic/Makefile               |   1 +
 .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts     | 114 +++++++++++++++++++++
 4 files changed, 118 insertions(+)
 create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts

Thanks for the work,
I just tested and it works on a non-pro version,

Tested-by Neil Armstrong <[email protected]>

BTW, you should list the other dependencies like the p212 patch.

Neil

Martin Blumenstingl

author reviewer

2017-03-18 12:36 UTC #10 lore raw

v2 cover Khadas VIM support (Amlogic Meson GXL S905X)

In reply to Martin Blumenstingl

I have tested this on a Khadas VIM Pro board. It would be nice if someone with a non-Pro board could give it a try as well.

This patchset depends on:
- "meson-gxl pinctrl - add the missing PWM pins" see [2]
- "ARM64: dts: meson-gxl: improve support for the P212 reference design" see [4] - already merged in v4.12/dt64 of Kevin's Amlogic tree
- "ARM64: defconfig: enable the leds-pwm driver and default-on trigger" see [1] - already merged in v4.12/defconfig of Kevin's Amlogic tree
- "brcmfmac: add support for BCM43455 with modalias sdio:c00v02D0dA9BF" see [3], this is NOT a direct dependency (it's only required to get WIFI working on the Khadas VIM Pro) and it's already merged for v4.11 (commit a62a77881b1b6708ffeddd9bf0529494f7b199e3)

Changes since v1:
- updated the cover-letter to inclulde the P212 reference design patch as dependency. also re-ordered the dependencies so the PWM series is on top (as it's the only dependency which is not merged yet)
- rebased onto the v4.12/dt64 branch of Kevin's Amlogic tree
- added Rob Herring's ACK on patch #1 and #2
- added Neil Armstrong's Tested-By to patch #3

Martin Blumenstingl (3):
devicetree: add vendor prefix for Khadas
dt-bindings: amlogic: add the Khadas VIM
ARM64: dts: meson-gxl: add support for the Khadas VIM board

 Documentation/devicetree/bindings/arm/amlogic.txt  |   2 +
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm64/boot/dts/amlogic/Makefile               |   1 +
 .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts     | 114 +++++++++++++++++++++
 4 files changed, 118 insertions(+)
 create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts

Signature · 1 line

2.12.0

Martin Blumenstingl

author reviewer

2017-03-18 12:36 UTC #11 lore raw

PATCH v2 1/3 devicetree: add vendor prefix for Khadas

Khadas is a new sub-brand of "Shenzhen Wesion Technology Co., Ltd.". They are developing Amlogic and Rockchip based "DIY boxes" (single board computers): http://khadas.com/
They are best know for their latest product: the Khadas VIM (an Amlogic GXL S905X based SBC).

Signed-off-by Martin Blumenstingl <[email protected]>

Acked-by Rob Herring <[email protected]>

---
 Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
 1 file changed, 1 insertion(+)

Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0

index da05060803b2..4dcc3a7bcf2d 100644
@@ -160,6 +160,7 @@ jedec	JEDEC Solid State Technology Association
 karo	Ka-Ro electronics GmbH
 keithkoep	Keith & Koep GmbH
 keymile	Keymile GmbH
+khadas	Khadas
 kinetic Kinetic Technologies
 kosagi	Sutajio Ko-Usagi PTE Ltd.
 kyo	Kyocera Corporation

Signature · 1 line

2.12.0

Martin Blumenstingl

author reviewer

2017-03-18 12:36 UTC #12 lore raw

PATCH v2 2/3 dt-bindings: amlogic: add the Khadas VIM

In reply to Martin Blumenstingl

Signed-off-by Martin Blumenstingl <[email protected]>

Acked-by Rob Herring <[email protected]>

---
 Documentation/devicetree/bindings/arm/amlogic.txt | 2 ++
 1 file changed, 2 insertions(+)

Documentation/devicetree/bindings/arm/amlogic.txt +2 -0

index b3241a6802f6..bfd5b558477d 100644
@@ -43,6 +43,8 @@ Board compatible values:
   - "wetek,hub" (Meson gxbb)
   - "wetek,play2" (Meson gxbb)
   - "amlogic,p212" (Meson gxl s905x)
+  - "khadas,vim" (Meson gxl s905x)
+
   - "amlogic,p230" (Meson gxl s905d)
   - "amlogic,p231" (Meson gxl s905d)
   - "hwacom,amazetv" (Meson gxl s905x)

Signature · 1 line

2.12.0

Martin Blumenstingl

author reviewer

2017-03-18 12:36 UTC #13 lore raw

PATCH v2 3/3 ARM64: dts: meson-gxl: add support for the Khadas VIM board

In reply to Martin Blumenstingl

Signed-off-by Martin Blumenstingl <[email protected]>

Tested-by Neil Armstrong <[email protected]>

---
 arch/arm64/boot/dts/amlogic/Makefile               |   1 +
 .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts     | 114 +++++++++++++++++++++
 2 files changed, 115 insertions(+)
 create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts

arch/arm64/boot/dts/amlogic/Makefile +1 -0

index 99ddfc8087d1..b9ad2db7398b 100644
@@ -7,6 +7,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-meta.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-telos.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-hub.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-play2.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-khadas-vim.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p230.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts new file +114 -0

114 lines not on this page · raw message

Signature · 1 line

2.12.0

Kevin Hilman

maintainer

2017-03-22 17:50 UTC #14 lore raw

v2 cover Khadas VIM support (Amlogic Meson GXL S905X)

In reply to Martin Blumenstingl

Quoted 5 lines · Martin Blumenstingl

This series adds support for the Khadas VIM and Khadas VIM Pro boards (both are provided through a single .dts as the only two differences are the eMMC size and different SDIO WIFI chips - both are Broadcom brcmfmac based though).
More details can be found on the official website: [0]

Oops, I replied to the wrong version. This version (v2) is the one applied to v4.12/dt64 branch.

Kevin

Kevin Hilman

maintainer Applied

2017-03-22 16:17 UTC #15 lore raw

cover Khadas VIM support (Amlogic Meson GXL S905X)

In reply to Martin Blumenstingl

Quoted 8 lines · Martin Blumenstingl

This series adds support for the Khadas VIM and Khadas VIM Pro boards (both are provided through a single .dts as the only two differences are the eMMC size and different SDIO WIFI chips - both are Broadcom brcmfmac based though).
More details can be found on the official website: [0]
I have tested this on a Khadas VIM Pro board. It would be nice if someone with a non-Pro board could give it a try as well.

Applied to v4.12/dt64

After all the discussion, I left patch 1 as is.

Kevin