Skip to contentSkip to conversation

ARM: dts: rockchip: EMAC Rockchip for RK3066 SoCs and MarsBoard RK3066

PATCH New Romain Perier 2 participants 4 messages Nov 2, 2014

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

v3 cover ARM: dts: rockchip: EMAC Rockchip for RK3066 SoCs and MarsBoard RK3066

This patches serie adds EMAC Rockchip support for RK3066 SoCs and defines an initial devicetree source for MarsBoard RK3066.

changes since v2:
- Squashed patch 1,2 and 4 together (this is the the second patch)
- Add dual-licensing for rk3066a-marsboard.dts
- Renamed regulator "vaux33_reg" to "vcc_rmii" as it is written in the schematic

changes since v1:
- Replaced hoayuelectronics by hoayu as suggested by the vendor-prefix doc in dt-bindings

Romain Perier (2):
ARM: dts: rockchip: Add EMAC Rockchip for RK3066 SoCs
ARM: dts: rockchip: Add devicetree source for MarsBoard RK3066

 Documentation/devicetree/bindings/arm/rockchip.txt |   4 +
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/rk3066a-marsboard.dts            | 197 +++++++++++++++++++++
 arch/arm/boot/dts/rk3066a.dtsi                     |  22 +++
 4 files changed, 224 insertions(+)
 create mode 100644 arch/arm/boot/dts/rk3066a-marsboard.dts
Signature · 1 line
1.9.1
#1 lore raw

PATCH v3 1/2 ARM: dts: rockchip: Add EMAC Rockchip for RK3066 SoCs

This patch adds the right pins topology for the MAC and MDIO found in RK3066 SoCs. Boards based on this SoC have an initial support for the emac-rockchip dt-binding.

---
 arch/arm/boot/dts/rk3066a.dtsi | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
arch/arm/boot/dts/rk3066a.dtsi +22 -0
index ad9c2db..7bec55f 100644
@@ -179,6 +179,24 @@
 			bias-disable;
 		};
 
+		emac {
+			emac_xfer: emac-xfer {
+				rockchip,pins = <RK_GPIO1 16 RK_FUNC_2 &pcfg_pull_none>, /* mac_clk */
+						<RK_GPIO1 17 RK_FUNC_2 &pcfg_pull_none>, /* tx_en */
+						<RK_GPIO1 18 RK_FUNC_2 &pcfg_pull_none>, /* txd1 */
+						<RK_GPIO1 19 RK_FUNC_2 &pcfg_pull_none>, /* txd0 */
+						<RK_GPIO1 20 RK_FUNC_2 &pcfg_pull_none>, /* rx_err */
+						<RK_GPIO1 21 RK_FUNC_2 &pcfg_pull_none>, /* crs_dvalid */
+						<RK_GPIO1 22 RK_FUNC_2 &pcfg_pull_none>, /* rxd1 */
+						<RK_GPIO1 23 RK_FUNC_2 &pcfg_pull_none>; /* rxd0 */
+			};
+
+			emac_mdio: emac-mdio {
+				rockchip,pins = <RK_GPIO1 24 RK_FUNC_2 &pcfg_pull_none>, /* mac_md */
+						<RK_GPIO1 25 RK_FUNC_2 &pcfg_pull_none>; /* mac_mdclk */
+			};
+		};
+
 		emmc {
 			emmc_clk: emmc-clk {
 				rockchip,pins = <RK_GPIO3 31 RK_FUNC_2 &pcfg_pull_default>;
@@ -496,3 +514,7 @@
 &wdt {
 	compatible = "rockchip,rk3066-wdt", "snps,dw-wdt";
 };
+
+&emac {
+	compatible = "rockchip,rk3066-emac";
+};
Signature · 1 line
1.9.1
#2 lore raw

PATCH v3 2/2 ARM: dts: rockchip: Add devicetree source for MarsBoard RK3066

In reply to Romain Perier

This patch adds initial support for the Marsboard RK3066. It enables EMAC Rockchip which is the ethernet support on the board and registers it as a supported rockchip platform.

---
 Documentation/devicetree/bindings/arm/rockchip.txt |   4 +
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/rk3066a-marsboard.dts            | 197 +++++++++++++++++++++
 3 files changed, 202 insertions(+)
 create mode 100644 arch/arm/boot/dts/rk3066a-marsboard.dts
Documentation/devicetree/bindings/arm/rockchip.txt +4 -0
index 857f126..eaa3d1a 100644
@@ -1,6 +1,10 @@
 Rockchip platforms device tree bindings
 ---------------------------------------
 
+- MarsBoard RK3066 board:
+    Required root node properties:
+      - compatible = "haoyu,marsboard-rk3066", "rockchip,rk3066a";
+
 - bq Curie 2 tablet:
     Required root node properties:
       - compatible = "mundoreader,bq-curie2", "rockchip,rk3066a";
arch/arm/boot/dts/Makefile +1 -0
index 472c1c3..513b384 100644
@@ -365,6 +365,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \
 	qcom-msm8960-cdp.dtb \
 	qcom-msm8974-sony-xperia-honami.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += \
+	rk3066a-marsboard.dtb \
 	rk3066a-bqcurie2.dtb \
 	rk3188-radxarock.dtb \
 	rk3288-evb-act8846.dtb \
arch/arm/boot/dts/rk3066a-marsboard.dts new file +197 -0

197 lines not on this page · raw message

Signature · 1 line
1.9.1
maintainer Applied
#3 lore raw

v3 cover ARM: dts: rockchip: EMAC Rockchip for RK3066 SoCs and MarsBoard RK3066

In reply to Romain Perier

Am Sonntag, 2. November 2014, 10:19:59 schrieb Romain Perier:

Quoted 9 lines

This patches serie adds EMAC Rockchip support for RK3066 SoCs and defines an initial devicetree source for MarsBoard RK3066.

changes since v2:
- Squashed patch 1,2 and 4 together (this is the the second patch)
- Add dual-licensing for rk3066a-marsboard.dts
- Renamed regulator "vaux33_reg" to "vcc_rmii" as it is written in the schematic

Quoted 7 lines

changes since v1:
- Replaced hoayuelectronics by hoayu as suggested by the vendor-prefix doc
in dt-bindings

Romain Perier (2):
ARM: dts: rockchip: Add EMAC Rockchip for RK3066 SoCs
ARM: dts: rockchip: Add devicetree source for MarsBoard RK3066

applied to my dts branch for 3.19, with two small changes:

- remove FSF address in license header, per checkpatch warning
[I guess the sunxi header I copied it from also contained the address]
- rename vcc_sd0: fixed-regulator to vcc_sd0: sdmmc-regulator to prevent future naming conflicts with more fixed regulators