Page MenuHomeFreeBSD

D43184.diff
No OneTemporary

D43184.diff

diff --git a/sys/arm/rockchip/files.rk32xx b/sys/arm/rockchip/files.rk32xx
--- a/sys/arm/rockchip/files.rk32xx
+++ b/sys/arm/rockchip/files.rk32xx
@@ -2,7 +2,7 @@
arm/rockchip/rk32xx_machdep.c standard
arm/rockchip/rk32xx_mp.c optional smp
-arm64/rockchip/rk_i2c.c standard
+dev/iicbus/controller/rockchip/rk_i2c.c standard
arm64/rockchip/rk_iodomain.c standard
arm64/rockchip/rk_gpio.c standard
arm64/rockchip/rk_grf.c standard
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -344,6 +344,7 @@
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/iicbus/controller/rockchip/rk_i2c.c optional rk_i2c fdt
dev/ipmi/ipmi.c optional ipmi
dev/ipmi/ipmi_acpi.c optional ipmi acpi
@@ -660,7 +661,6 @@
arm64/rockchip/rk3568_pcie.c optional fdt pci soc_rockchip_rk3568
arm64/rockchip/rk3568_pciephy.c optional fdt pci soc_rockchip_rk3568
arm64/rockchip/rk_dwc3.c optional fdt rk_dwc3 soc_rockchip_rk3399 | fdt rk_dwc3 soc_rockchip_rk3568
-arm64/rockchip/rk_i2c.c optional fdt rk_i2c soc_rockchip_rk3328 | fdt rk_i2c soc_rockchip_rk3399 | fdt rk_i2c soc_rockchip_rk3568
arm64/rockchip/rk_i2s.c optional fdt sound soc_rockchip_rk3328 | fdt sound soc_rockchip_rk3399
arm64/rockchip/rk_otp.c optional fdt soc_rockchip_rk3568
arm64/rockchip/rk_otp_if.m optional fdt soc_rockchip_rk3568
diff --git a/sys/arm64/rockchip/rk_i2c.c b/sys/dev/iicbus/controller/rockchip/rk_i2c.c
rename from sys/arm64/rockchip/rk_i2c.c
rename to sys/dev/iicbus/controller/rockchip/rk_i2c.c
diff --git a/sys/modules/rockchip/rk_i2c/Makefile b/sys/modules/rockchip/rk_i2c/Makefile
--- a/sys/modules/rockchip/rk_i2c/Makefile
+++ b/sys/modules/rockchip/rk_i2c/Makefile
@@ -1,5 +1,5 @@
-.PATH: ${SRCTOP}/sys/arm64/rockchip
+.PATH: ${SRCTOP}/sys/dev/iicbus/controller/rockchip
KMOD= rk_i2c
SRCS= rk_i2c.c

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 15, 10:27 PM (12 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16665781
Default Alt Text
D43184.diff (1 KB)

Event Timeline