[PATCH 0/3] Khadas VIM support (Amlogic Meson GXL S905X)

[PATCH 0/3] Khadas VIM support (Amlogic Meson GXL S905X)

[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

 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

-- 
2.12.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

[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 <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>
---
 Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 9946aedcf146..65e5d077f97b 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -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
-- 
2.12.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

[Martin Blumenstingl]

Signed-off-by: Martin Blumenstingl <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>
---
 Documentation/devicetree/bindings/arm/amlogic.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt
index c246cd2730d9..354b76da95fa 100644
--- a/Documentation/devicetree/bindings/arm/amlogic.txt
+++ b/Documentation/devicetree/bindings/arm/amlogic.txt
@@ -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)
-- 
2.12.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

[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 <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>
---
 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

diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index 3f94bce33b7f..6a316f863d73 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -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
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
new file mode 100644
index 000000000000..3c8b0b51ef27
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2017 Martin Blumenstingl <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>.
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/input/input.h>
+
+#include "meson-gxl-s905x-p212.dtsi"
+
+/ {
+	compatible = "khadas,vim", "amlogic,s905x", "amlogic,meson-gxl";
+	model = "Khadas VIM";
+
+	adc-keys {
+		compatible = "adc-keys";
+		io-channels = <&saradc 0>;
+		io-channel-names = "buttons";
+		keyup-threshold-microvolt = <1710000>;
+
+		button-function {
+			label = "Function";
+			linux,code = <KEY_FN>;
+			press-threshold-microvolt = <10000>;
+		};
+	};
+
+	aliases {
+		serial2 = &uart_AO_B;
+	};
+
+	gpio-keys-polled {
+		compatible = "gpio-keys-polled";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		poll-interval = <100>;
+
+		button@0 {
+			label = "power";
+			linux,code = <KEY_POWER>;
+			gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;
+		};
+	};
+
+	pwmleds {
+		compatible = "pwm-leds";
+
+		power {
+			label = "vim:red:power";
+			pwms = <&pwm_AO_ab 1 7812500 0>;
+			max-brightness = <255>;
+			linux,default-trigger = "default-on";
+		};
+	};
+};
+
+&i2c_A {
+	status = "okay";
+	pinctrl-0 = <&i2c_a_pins>;
+	pinctrl-names = "default";
+};
+
+&i2c_B {
+	status = "okay";
+	pinctrl-0 = <&i2c_b_pins>;
+	pinctrl-names = "default";
+
+	rtc: rtc@51 {
+		/* has to be enabled manually when a battery is connected: */
+		status = "disabled";
+		compatible = "haoyu,hym8563";
+		reg = <0x51>;
+		#clock-cells = <0>;
+		clock-frequency = <32768>;
+		clock-output-names = "xin32k";
+	};
+};
+
+&ir {
+	linux,rc-map-name = "rc-geekbox";
+};
+
+&pwm_AO_ab {
+	status = "okay";
+	pinctrl-0 = <&pwm_ao_a_3_pins>, <&pwm_ao_b_pins>;
+	pinctrl-names = "default";
+	clocks = <&clkc CLKID_FCLK_DIV4>;
+	clock-names = "clkin0";
+};
+
+&pwm_ef {
+	pinctrl-0 = <&pwm_e_pins>, <&pwm_f_clk_pins>;
+};
+
+&sd_emmc_a {
+	brcmf: bcrmf@1 {
+		reg = <1>;
+		compatible = "brcm,bcm4329-fmac";
+	};
+};
+
+/* This is brought out on the Linux_RX (18) and Linux_TX (19) pins: */
+&uart_AO {
+	status = "okay";
+};
+
+/* This is brought out on the UART_RX_AO_B (15) and UART_TX_AO_B (16) pins: */
+&uart_AO_B {
+	status = "okay";
+	pinctrl-0 = <&uart_ao_b_pins>;
+	pinctrl-names = "default";
+};
-- 
2.12.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 0/3] Khadas VIM support (Amlogic Meson GXL S905X)

[Neil Armstrong]

On 03/04/2017 10:51 PM, Martin Blumenstingl wrote:
> 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
> 

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

Tested-by: Neil Armstrong <narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>

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

Neil
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

[Rob Herring]

On Sat, Mar 04, 2017 at 10:51:24PM +0100, Martin Blumenstingl wrote:
> 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 <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>
> ---
>  Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
>  1 file changed, 1 insertion(+)

Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

[Rob Herring]

On Sat, Mar 04, 2017 at 10:51:25PM +0100, Martin Blumenstingl wrote:
> Signed-off-by: Martin Blumenstingl <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>
> ---
>  Documentation/devicetree/bindings/arm/amlogic.txt | 2 ++
>  1 file changed, 2 insertions(+)

Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

[Andreas Färber]

Am 15.03.2017 um 20:57 schrieb Rob Herring:
> On Sat, Mar 04, 2017 at 10:51:24PM +0100, Martin Blumenstingl wrote:
>> 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 <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>
>> ---
>>  Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
>>  1 file changed, 1 insertion(+)
> 
> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>

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

-- 
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

[Martin Blumenstingl]

On Thu, Mar 16, 2017 at 7:00 AM, Andreas Färber <afaerber-l3A5Bk7waGM@public.gmane.org> wrote:
> Am 15.03.2017 um 20:57 schrieb Rob Herring:
>> On Sat, Mar 04, 2017 at 10:51:24PM +0100, Martin Blumenstingl wrote:
>>> 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 <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>
>>> ---
>>>  Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
>>>  1 file changed, 1 insertion(+)
>>
>> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
>
> 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]

> 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
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

[Gouwa]

[-- Attachment #1: Type: text/plain, Size: 2798 bytes --]

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
On Thu, Mar 16, 2017 at 7:00 AM, Andreas Färber <afaerber@suse.de> wrote:
> Am 15.03.2017 um 20:57 schrieb Rob Herring:
>> On Sat, Mar 04, 2017 at 10:51:24PM +0100, Martin Blumenstingl wrote:
>>> 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 <martin.blumenstingl@googlemail.com>
>>> ---
>>>  Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
>>>  1 file changed, 1 insertion(+)
>>
>> Acked-by: Rob Herring <robh@kernel.org>
>
> 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]
 
> 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
 

[-- Attachment #2: Type: text/html, Size: 7039 bytes --]

[PATCH v2 0/3] Khadas VIM support (Amlogic Meson GXL S905X)

[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:
- "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


[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
[4] http://lists.infradead.org/pipermail/linux-amlogic/2017-March/002638.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

-- 
2.12.0

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

[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 <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>
Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
---
 Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index da05060803b2..4dcc3a7bcf2d 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -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
-- 
2.12.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

[Martin Blumenstingl]

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Acked-by: Rob Herring <robh@kernel.org>
---
 Documentation/devicetree/bindings/arm/amlogic.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt
index b3241a6802f6..bfd5b558477d 100644
--- a/Documentation/devicetree/bindings/arm/amlogic.txt
+++ b/Documentation/devicetree/bindings/arm/amlogic.txt
@@ -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)
-- 
2.12.0

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

[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 <martin.blumenstingl@googlemail.com>
Tested-by: Neil Armstrong <narmstrong@baylibre.com>
---
 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

diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index 99ddfc8087d1..b9ad2db7398b 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -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
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
new file mode 100644
index 000000000000..3c8b0b51ef27
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2017 Martin Blumenstingl <martin.blumenstingl@googlemail.com>.
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/input/input.h>
+
+#include "meson-gxl-s905x-p212.dtsi"
+
+/ {
+	compatible = "khadas,vim", "amlogic,s905x", "amlogic,meson-gxl";
+	model = "Khadas VIM";
+
+	adc-keys {
+		compatible = "adc-keys";
+		io-channels = <&saradc 0>;
+		io-channel-names = "buttons";
+		keyup-threshold-microvolt = <1710000>;
+
+		button-function {
+			label = "Function";
+			linux,code = <KEY_FN>;
+			press-threshold-microvolt = <10000>;
+		};
+	};
+
+	aliases {
+		serial2 = &uart_AO_B;
+	};
+
+	gpio-keys-polled {
+		compatible = "gpio-keys-polled";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		poll-interval = <100>;
+
+		button@0 {
+			label = "power";
+			linux,code = <KEY_POWER>;
+			gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;
+		};
+	};
+
+	pwmleds {
+		compatible = "pwm-leds";
+
+		power {
+			label = "vim:red:power";
+			pwms = <&pwm_AO_ab 1 7812500 0>;
+			max-brightness = <255>;
+			linux,default-trigger = "default-on";
+		};
+	};
+};
+
+&i2c_A {
+	status = "okay";
+	pinctrl-0 = <&i2c_a_pins>;
+	pinctrl-names = "default";
+};
+
+&i2c_B {
+	status = "okay";
+	pinctrl-0 = <&i2c_b_pins>;
+	pinctrl-names = "default";
+
+	rtc: rtc@51 {
+		/* has to be enabled manually when a battery is connected: */
+		status = "disabled";
+		compatible = "haoyu,hym8563";
+		reg = <0x51>;
+		#clock-cells = <0>;
+		clock-frequency = <32768>;
+		clock-output-names = "xin32k";
+	};
+};
+
+&ir {
+	linux,rc-map-name = "rc-geekbox";
+};
+
+&pwm_AO_ab {
+	status = "okay";
+	pinctrl-0 = <&pwm_ao_a_3_pins>, <&pwm_ao_b_pins>;
+	pinctrl-names = "default";
+	clocks = <&clkc CLKID_FCLK_DIV4>;
+	clock-names = "clkin0";
+};
+
+&pwm_ef {
+	pinctrl-0 = <&pwm_e_pins>, <&pwm_f_clk_pins>;
+};
+
+&sd_emmc_a {
+	brcmf: bcrmf@1 {
+		reg = <1>;
+		compatible = "brcm,bcm4329-fmac";
+	};
+};
+
+/* This is brought out on the Linux_RX (18) and Linux_TX (19) pins: */
+&uart_AO {
+	status = "okay";
+};
+
+/* This is brought out on the UART_RX_AO_B (15) and UART_TX_AO_B (16) pins: */
+&uart_AO_B {
+	status = "okay";
+	pinctrl-0 = <&uart_ao_b_pins>;
+	pinctrl-names = "default";
+};
-- 
2.12.0

Re: [PATCH 0/3] Khadas VIM support (Amlogic Meson GXL S905X)

[Kevin Hilman]

Martin Blumenstingl <martin.blumenstingl@googlemail.com> writes:

> 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

Re: [PATCH v2 0/3] Khadas VIM support (Amlogic Meson GXL S905X)

[Kevin Hilman]

Martin Blumenstingl <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org> writes:

> 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
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html