Skip to contentSkip to conversation

Add MK808 RK3066 device

PATCH New Paweł Jarosz 4 participants 8 messages Oct 8, 2016 – Oct 21, 2016

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

v3 cover Add MK808 RK3066 device

Add MK808 RK3066 device

This patchset adds support for Rikomagic MK808 v1 device with RK901 wifi.

It is hdmi stick with two usb ports(host and otg), sdmmc, wifi and uart onboard.

It is RK3066 based.

Pawe? Jarosz (2):
devicetree: Add vendor prefix for Rikomagic
ARM: dts: rockchip: Add rk3066 MK808 board

 Documentation/devicetree/bindings/arm/rockchip.txt |   4 +
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/rk3066a-mk808.dts                | 196 +++++++++++++++++++++
 4 files changed, 202 insertions(+)
 create mode 100644 arch/arm/boot/dts/rk3066a-mk808.dts
Signature · 1 line
2.7.4
#1 lore raw

PATCH v3 1/2 devicetree: Add vendor prefix for Rikomagic

Add Rikomagic to vendor-prefixes.txt

---

Changes in v2:
- none

Changes in v3:
- none

 Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0
index 69caf14..3edfa08 100644
@@ -224,6 +224,7 @@ realtek Realtek Semiconductor Corp.
 renesas	Renesas Electronics Corporation
 richtek	Richtek Technology Corporation
 ricoh	Ricoh Co. Ltd.
+rikomagic	Rikomagic
 rockchip	Fuzhou Rockchip Electronics Co., Ltd
 samsung	Samsung Semiconductor
 sandisk	Sandisk Corporation
Signature · 1 line
2.7.4
maintainer
#2 lore raw

PATCH v3 1/2 devicetree: Add vendor prefix for Rikomagic

Am Samstag, 8. Oktober 2016, 22:22:05 CEST schrieb Pawe? Jarosz:

Quoted 20 lines

Add Rikomagic to vendor-prefixes.txt

---

Changes in v2:
- none

Changes in v3:
- none

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

b/Documentation/devicetree/bindings/vendor-prefixes.txt index 69caf14..3edfa08 100644

Documentation/devicetree/bindings/vendor-prefixes.txt realtek Realtek Semiconductor Corp. · line 227

Quoted 4 lines
Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0
@@ -224,6 +224,7 @@ realtek Realtek Semiconductor Corp.
 renesas	Renesas Electronics Corporation
 richtek	Richtek Technology Corporation
 ricoh	Ricoh Co. Ltd.
+rikomagic	Rikomagic

^ Rikomagic Tech Corp. Ltd

(according to http://www.rikomagic.com/en/index.html)

But I can change that myself. I'll just need to wait a bit more if Rob or Mark want to Ack this vendor-prefix addition.

Heiko

#3 lore raw

PATCH v3 1/2 devicetree: Add vendor prefix for Rikomagic

Quoted 12 lines

Documentation/devicetree/bindings/vendor-prefixes.txt realtek Realtek Semiconductor Corp. · line 227

Quoted 10 lines
(quoted diff) +0 -0

b/Documentation/devicetree/bindings/vendor-prefixes.txt index 69caf14..3edfa08 100644

Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0
@@ -224,6 +224,7 @@ realtek Realtek Semiconductor Corp.
  renesas	Renesas Electronics Corporation
  richtek	Richtek Technology Corporation
  ricoh	Ricoh Co. Ltd.
+rikomagic	Rikomagic

^ Rikomagic Tech Corp. Ltd

Quoted 7 lines

(according to http://www.rikomagic.com/en/index.html)

But I can change that myself. I'll just need to wait a bit more if Rob or Mark want to Ack this vendor-prefix addition.

Heiko

Sorry for that.

Pawe?

#4 lore raw

PATCH v3 1/2 devicetree: Add vendor prefix for Rikomagic

In reply to Heiko Stuebner
Quoted 27 lines · Heiko Stuebner

Am Samstag, 8. Oktober 2016, 22:22:05 CEST schrieb Pawe? Jarosz:

Quoted 20 lines

Add Rikomagic to vendor-prefixes.txt

---

Changes in v2:
- none

Changes in v3:
- none

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

b/Documentation/devicetree/bindings/vendor-prefixes.txt index 69caf14..3edfa08 100644

Documentation/devicetree/bindings/vendor-prefixes.txt realtek Realtek Semiconductor Corp. · line 227

Quoted 4 lines
Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0
@@ -224,6 +224,7 @@ realtek Realtek Semiconductor Corp.
 renesas      Renesas Electronics Corporation
 richtek      Richtek Technology Corporation
 ricoh        Ricoh Co. Ltd.
+rikomagic    Rikomagic

^ Rikomagic Tech Corp. Ltd

Quoted 4 lines

(according to http://www.rikomagic.com/en/index.html)

But I can change that myself. I'll just need to wait a bit more if Rob or Mark want to Ack this vendor-prefix addition.

#5 lore raw

PATCH v3 2/2 ARM: dts: rockchip: Add rk3066 MK808 board

In reply to Paweł Jarosz

MK808 is a tv stick which has rockchip rk3066 CPU inside, two usb ports
- host and otg, micro sd card slot and onboard wifi RK901.

---

Changes in v2:
- included Heiko sugestion.

Changes in v3:
- added regulators for mmc0 and mmc1
- added proper pincontrol for mmc1
- removed regulator-always-on flag from vcc_io

 Documentation/devicetree/bindings/arm/rockchip.txt |   4 +
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/rk3066a-mk808.dts                | 196 +++++++++++++++++++++
 3 files changed, 201 insertions(+)
 create mode 100644 arch/arm/boot/dts/rk3066a-mk808.dts
Documentation/devicetree/bindings/arm/rockchip.txt +4 -0
index 55f388f..c09595b 100644
@@ -17,6 +17,10 @@ Rockchip platforms device tree bindings
     Required root node properties:
       - compatible = "chipspark,rayeager-px2", "rockchip,rk3066a";
 
+- Rikomagic MK808 v1 board:
+    Required root node properties:
+      - compatible = "rikomagic,mk808", "rockchip,rk3066a";
+
 - Radxa Rock board:
     Required root node properties:
       - compatible = "radxa,rock", "rockchip,rk3188";
arch/arm/boot/dts/Makefile +1 -0
index befcd26..f19cc1d 100644
@@ -639,6 +639,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 	rk3036-kylin.dtb \
 	rk3066a-bqcurie2.dtb \
 	rk3066a-marsboard.dtb \
+	rk3066a-mk808.dtb \
 	rk3066a-rayeager.dtb \
 	rk3188-radxarock.dtb \
 	rk3228-evb.dtb \
arch/arm/boot/dts/rk3066a-mk808.dts new file +196 -0

196 lines not on this page · raw message

Signature · 1 line
2.7.4
#6 lore raw

PATCH v3 2/2 ARM: dts: rockchip: Add rk3066 MK808 board

? 2016/10/9 4:22, Pawe? Jarosz ??:

Quoted 4 lines

MK808 is a tv stick which has rockchip rk3066 CPU inside, two usb ports
- host and otg, micro sd card slot and onboard wifi RK901.

It looks okay to me, so feel free to add

Quoted 246 lines

---

Changes in v2:
- included Heiko sugestion.

Changes in v3:
- added regulators for mmc0 and mmc1
- added proper pincontrol for mmc1
- removed regulator-always-on flag from vcc_io

 Documentation/devicetree/bindings/arm/rockchip.txt |   4 +
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/rk3066a-mk808.dts                | 196 +++++++++++++++++++++
 3 files changed, 201 insertions(+)
 create mode 100644 arch/arm/boot/dts/rk3066a-mk808.dts
Documentation/devicetree/bindings/arm/rockchip.txt +4 -0
index 55f388f..c09595b 100644
@@ -17,6 +17,10 @@ Rockchip platforms device tree bindings
     Required root node properties:
       - compatible = "chipspark,rayeager-px2", "rockchip,rk3066a";
 
+- Rikomagic MK808 v1 board:
+    Required root node properties:
+      - compatible = "rikomagic,mk808", "rockchip,rk3066a";
+
 - Radxa Rock board:
     Required root node properties:
       - compatible = "radxa,rock", "rockchip,rk3188";
arch/arm/boot/dts/Makefile +1 -0
index befcd26..f19cc1d 100644
@@ -639,6 +639,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 	rk3036-kylin.dtb \
 	rk3066a-bqcurie2.dtb \
 	rk3066a-marsboard.dtb \
+	rk3066a-mk808.dtb \
 	rk3066a-rayeager.dtb \
 	rk3188-radxarock.dtb \
 	rk3228-evb.dtb \
arch/arm/boot/dts/rk3066a-mk808.dts new file +196 -0
new file mode 100644
index 0000000..0123fa4
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2016 Pawe? Jarosz <[email protected]>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+#include "rk3066a.dtsi"
+
+/ {
+	model = "Rikomagic MK808";
+	compatible = "rikomagic,mk808", "rockchip,rk3066a";
+
+	chosen {
+		stdout-path = "serial2:115200n8";
+	};
+
+	memory at 60000000 {
+		device_type = "memory";
+		reg = <0x60000000 0x40000000>;
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		blue {
+			label = "mk808:blue:power";
+			gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;
+			default-state = "off";
+			linux,default-trigger = "default-on";
+		};
+	};
+
+	vcc_io: vcc-io {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_io";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+	};
+
+	vcc_host: usb-host-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio0 6 GPIO_ACTIVE_HIGH>;
+		pinctrl-0 = <&host_drv>;
+		pinctrl-names = "default";
+		regulator-always-on;
+		regulator-name = "host-pwr";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		startup-delay-us = <100000>;
+		vin-supply = <&vcc_io>;
+	};
+
+	vcc_otg: usb-otg-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio0 5 GPIO_ACTIVE_HIGH>;
+		pinctrl-0 = <&otg_drv>;
+		pinctrl-names = "default";
+		regulator-always-on;
+		regulator-name = "vcc_otg";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		startup-delay-us = <100000>;
+		vin-supply = <&vcc_io>;
+	};
+
+	vcc_sd: sdmmc-regulator {
+		compatible = "regulator-fixed";
+		gpio = <&gpio3 7 GPIO_ACTIVE_LOW>;
+		pinctrl-0 = <&sdmmc_pwr>;
+		pinctrl-names = "default";
+		regulator-name = "vcc_sd";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		startup-delay-us = <100000>;
+		vin-supply = <&vcc_io>;
+	};
+
+	vcc_wifi: sdio-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio3 24 GPIO_ACTIVE_HIGH>;
+		pinctrl-0 = <&wifi_pwr>;
+		pinctrl-names = "default";
+		regulator-name = "vcc_wifi";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		startup-delay-us = <100000>;
+		vin-supply = <&vcc_io>;
+	};
+};
+
+&mmc0 {
+	bus-width = <4>;
+	cap-mmc-highspeed;
+	cap-sd-highspeed;
+	num-slots = <1>;
+	status = "okay";
+	vmmc-supply = <&vcc_sd>;
+};
+
+&mmc1 {
+	bus-width = <4>;
+	disable-wp;
+	non-removable;
+	num-slots = <1>;
+	pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;
+	pinctrl-names = "default";
+	status = "okay";
+	vmmc-supply = <&vcc_wifi>;
+};
+
+&pinctrl {
+	usb-host {
+		host_drv: host-drv {
+			rockchip,pins = <RK_GPIO0 6 RK_FUNC_GPIO &pcfg_pull_default>;
+		};
+	};
+
+	usb-otg {
+		otg_drv: otg-drv {
+			rockchip,pins = <RK_GPIO0 5 RK_FUNC_GPIO &pcfg_pull_default>;
+		};
+	};
+
+	sdmmc {
+		sdmmc_pwr: sdmmc-pwr {
+			rockchip,pins = <RK_GPIO3 7 RK_FUNC_GPIO &pcfg_pull_default>;
+		};
+	};
+
+	sdio {
+		wifi_pwr: wifi-pwr {
+			rockchip,pins = <RK_GPIO3 24 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+};
+
+&uart2 {
+	status = "okay";
+};
+
+&usb_host {
+	status = "okay";
+};
+
+&usb_otg {
+	status = "okay";
+};
+
+&usbphy {
+	status = "okay";
+};
+
+&wdt {
+	status = "okay";
+};
+
Signature · 2 lines
Best Regards
Shawn Lin
maintainer
#7 lore raw

v3 cover Add MK808 RK3066 device

In reply to Paweł Jarosz

Am Samstag, 8. Oktober 2016, 22:21:47 CEST schrieb Pawe? Jarosz:

Quoted 4 lines

Add MK808 RK3066 device

This patchset adds support for Rikomagic MK808 v1 device with RK901 wifi.

Quoted 8 lines

It is hdmi stick with two usb ports(host and otg), sdmmc, wifi and uart onboard.

It is RK3066 based.

Pawe? Jarosz (2):
devicetree: Add vendor prefix for Rikomagic
ARM: dts: rockchip: Add rk3066 MK808 board

applied both patches with received tags for 4.10.

If you have time could try to do a followup patch, adding (and testing) the usbphy supplies please?

Should be like

&usbphy0 {
	phy-supply = <&vcc_otg>;
};
&usbphy1 {
	phy-supply = <&vcc_host>;
};

That way we can drop the regulator-always-on property from those two supplies.

Thanks
Heiko