Page MenuHomeFreeBSD
Files F102925015

D41907.id128155.diff
No OneTemporary
Actions

D41907.id128155.diff
View Options

diff --git a/sys/arm/allwinner/files.allwinner b/sys/arm/allwinner/files.allwinner
--- a/sys/arm/allwinner/files.allwinner
+++ b/sys/arm/allwinner/files.allwinner
@@ -22,7 +22,7 @@
arm/allwinner/if_awg.c optional awg syscon
arm/allwinner/if_emac.c optional emac
arm/allwinner/sunxi_dma_if.m optional a10_dmac | a31_dmac
-dev/iicbus/twsi/a10_twsi.c optional twsi
+dev/iicbus/controller/twsi/a10_twsi.c optional twsi
dev/usb/controller/generic_ohci.c optional ohci
dev/usb/controller/generic_usb_if.m optional ohci
dev/usb/controller/generic_ehci.c optional ehci
diff --git a/sys/arm/mv/files.arm7 b/sys/arm/mv/files.arm7
--- a/sys/arm/mv/files.arm7
+++ b/sys/arm/mv/files.arm7
@@ -22,7 +22,7 @@
arm/mv/armadaxp/armadaxp_mp.c optional smp
arm/mv/armadaxp/mptramp.S optional smp
dev/cesa/cesa.c optional cesa
-dev/iicbus/twsi/mv_twsi.c optional twsi
+dev/iicbus/controller/twsi/mv_twsi.c optional twsi
dev/mge/if_mge.c optional mge
dev/neta/if_mvneta_fdt.c optional neta fdt
dev/neta/if_mvneta.c optional neta mdio mii
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -93,7 +93,7 @@
dev/video/crtc_if.m optional vt
dev/hwpmc/hwpmc_arm.c optional hwpmc
dev/hwpmc/hwpmc_armv7.c optional hwpmc
-dev/iicbus/twsi/twsi.c optional twsi
+dev/iicbus/controller/twsi/twsi.c optional twsi
dev/ofw/ofw_pcib.c optional fdt pci
dev/pci/pci_host_generic.c optional pci_host_generic pci
dev/pci/pci_host_generic_fdt.c optional pci_host_generic pci fdt
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -337,9 +337,9 @@
clean "ice_ddp.fw"
dev/iicbus/sy8106a.c optional sy8106a fdt
-dev/iicbus/twsi/mv_twsi.c optional twsi fdt
-dev/iicbus/twsi/a10_twsi.c optional twsi fdt
-dev/iicbus/twsi/twsi.c optional twsi fdt
+dev/iicbus/controller/twsi/mv_twsi.c optional twsi fdt
+dev/iicbus/controller/twsi/a10_twsi.c optional twsi fdt
+dev/iicbus/controller/twsi/twsi.c optional twsi fdt
dev/ipmi/ipmi.c optional ipmi
dev/ipmi/ipmi_acpi.c optional ipmi acpi
diff --git a/sys/dev/iicbus/twsi/a10_twsi.c b/sys/dev/iicbus/controller/twsi/a10_twsi.c
rename from sys/dev/iicbus/twsi/a10_twsi.c
rename to sys/dev/iicbus/controller/twsi/a10_twsi.c
--- a/sys/dev/iicbus/twsi/a10_twsi.c
+++ b/sys/dev/iicbus/controller/twsi/a10_twsi.c
@@ -41,7 +41,7 @@
#include <dev/iicbus/iiconf.h>
#include <dev/iicbus/iicbus.h>
-#include <dev/iicbus/twsi/twsi.h>
+#include <dev/iicbus/controller/twsi/twsi.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/dev/iicbus/twsi/mv_twsi.c b/sys/dev/iicbus/controller/twsi/mv_twsi.c
rename from sys/dev/iicbus/twsi/mv_twsi.c
rename to sys/dev/iicbus/controller/twsi/mv_twsi.c
--- a/sys/dev/iicbus/twsi/mv_twsi.c
+++ b/sys/dev/iicbus/controller/twsi/mv_twsi.c
@@ -63,7 +63,7 @@
#include <arm/mv/mvreg.h>
#include <arm/mv/mvvar.h>
-#include <dev/iicbus/twsi/twsi.h>
+#include <dev/iicbus/controller/twsi/twsi.h>
#include "iicbus_if.h"
diff --git a/sys/dev/iicbus/twsi/twsi.h b/sys/dev/iicbus/controller/twsi/twsi.h
rename from sys/dev/iicbus/twsi/twsi.h
rename to sys/dev/iicbus/controller/twsi/twsi.h
diff --git a/sys/dev/iicbus/twsi/twsi.c b/sys/dev/iicbus/controller/twsi/twsi.c
rename from sys/dev/iicbus/twsi/twsi.c
rename to sys/dev/iicbus/controller/twsi/twsi.c
--- a/sys/dev/iicbus/twsi/twsi.c
+++ b/sys/dev/iicbus/controller/twsi/twsi.c
@@ -56,7 +56,7 @@
#include <dev/iicbus/iiconf.h>
#include <dev/iicbus/iicbus.h>
-#include <dev/iicbus/twsi/twsi.h>
+#include <dev/iicbus/controller/twsi/twsi.h>
#include "iicbus_if.h"

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 19, 7:49 PM (15 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14721889
Default Alt Text
D41907.id128155.diff (3 KB)

Event Timeline