From 6937eb7d9442509aed1cf7eab1e01bc9ccf5de94 Mon Sep 17 00:00:00 2001
From: Martin Stein <martin.stein@genode-labs.com>
Date: Thu, 18 Feb 2021 17:24:10 +0100
Subject: [PATCH] drivers_nic-rpi: use usb_net and usb_host

Ref #3961
---
 .../gems/recipes/pkg/drivers_nic-rpi/archives |  3 +-
 .../raw/drivers_nic-rpi/drivers.config        | 46 +++++++++++++++----
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/repos/gems/recipes/pkg/drivers_nic-rpi/archives b/repos/gems/recipes/pkg/drivers_nic-rpi/archives
index dafa721a02..019983636f 100644
--- a/repos/gems/recipes/pkg/drivers_nic-rpi/archives
+++ b/repos/gems/recipes/pkg/drivers_nic-rpi/archives
@@ -1,3 +1,4 @@
 _/src/platform_drv
-_/src/usb_drv
+_/src/usb_host_drv
+_/src/usb_net_drv
 _/raw/drivers_nic-rpi
diff --git a/repos/gems/recipes/raw/drivers_nic-rpi/drivers.config b/repos/gems/recipes/raw/drivers_nic-rpi/drivers.config
index d573a6f720..779d9a70de 100644
--- a/repos/gems/recipes/raw/drivers_nic-rpi/drivers.config
+++ b/repos/gems/recipes/raw/drivers_nic-rpi/drivers.config
@@ -13,10 +13,23 @@
 		<service name="Uplink"/>
 	</parent-provides>
 
-	<start name="rpi_platform_drv" caps="200">
+	<start name="rpi_new_platform_drv" caps="200">
 		<resource name="RAM" quantum="2M"/>
 		<provides> <service name="Platform"/> </provides>
-		<config/>
+		<config>
+
+			<device name="dwc_otg">
+				<io_mem address="0x20980000" size="0x10000"/>
+				<irq number="9"/>
+				<property name="compatible" value="brcm,bcm2835-usb"/>
+				<power-domain name="usb"/>
+			</device>
+
+			<policy label_prefix="rpi_usb_host_drv">
+				<device name="dwc_otg"/>
+			</policy>
+
+		</config>
 		<route>
 			<service name="IRQ">    <parent/> </service>
 			<service name="IO_MEM"> <parent/> </service>
@@ -29,20 +42,35 @@
 		</route>
 	</start>
 
-	<start name="rpi_usb_drv" caps="120">
-		<resource name="RAM" quantum="20M"/>
-		<config mode="uplink_client" ehci="yes"> <nic mac="02:00:00:00:01:01"/> </config>
+	<start name="rpi_usb_host_drv" caps="120">
+		<resource name="RAM" quantum="10M"/>
+		<provides> <service name="Usb"/> </provides>
+		<config bios_handoff="yes">
+			<policy label_prefix="usb_net_drv" vendor_id="0x0424" product_id="0xec00"/> }
+		</config>
 		<route>
-			<service name="IRQ">      <parent/> </service>
-			<service name="IO_MEM">   <parent/> </service>
 			<service name="ROM">      <parent/> </service>
 			<service name="PD">       <parent/> </service>
 			<service name="RM">       <parent/> </service>
 			<service name="CPU">      <parent/> </service>
 			<service name="LOG">      <parent/> </service>
 			<service name="Timer">    <parent/> </service>
-			<service name="Uplink">   <parent/> </service>
-			<service name="Platform"> <child name="rpi_platform_drv"/> </service>
+			<service name="Platform"> <child name="rpi_new_platform_drv"/> </service>
+		</route>
+	</start>
+
+	<start name="usb_net_drv" caps="120">
+		<resource name="RAM" quantum="15M"/>
+		<config mode="uplink_client" mac="02:00:00:00:01:01" />
+		<route>
+			<service name="ROM">    <parent/> </service>
+			<service name="PD">     <parent/> </service>
+			<service name="RM">     <parent/> </service>
+			<service name="CPU">    <parent/> </service>
+			<service name="LOG">    <parent/> </service>
+			<service name="Timer">  <parent/> </service>
+			<service name="Uplink"> <parent/> </service>
+			<service name="Usb">    <child name="rpi_usb_host_drv"/> </service>
 		</route>
 	</start>