svn commit: r355278 - in projects/nfsv42/sys: amd64/conf amd64/vmm/amd arm/freescale/imx arm/samsung/exynos arm/versatile arm/xilinx arm64/arm64 arm64/rockchip arm64/rockchip/clk cddl/contrib/opens...

Mon Dec 2 00:11:15 UTC 2019

Author: rmacklem
Date: Mon Dec  2 00:11:12 2019
New Revision: 355278
URL: https://svnweb.freebsd.org/changeset/base/355278

Log:
  Merge in an up to date head kernel.

Added:
  projects/nfsv42/sys/arm64/rockchip/clk/rk3399_cru_dt.h
     - copied unchanged from r355277, head/sys/arm64/rockchip/clk/rk3399_cru_dt.h
  projects/nfsv42/sys/arm64/rockchip/rk_tsadc.c
     - copied unchanged from r355277, head/sys/arm64/rockchip/rk_tsadc.c
  projects/nfsv42/sys/arm64/rockchip/rk_tsadc_if.m
     - copied unchanged from r355277, head/sys/arm64/rockchip/rk_tsadc_if.m
  projects/nfsv42/sys/gnu/dts/arm/aspeed-ast2600-evb.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm/aspeed-ast2600-evb.dts
  projects/nfsv42/sys/gnu/dts/arm/aspeed-bmc-facebook-minipack.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm/aspeed-bmc-facebook-minipack.dts
  projects/nfsv42/sys/gnu/dts/arm/aspeed-bmc-facebook-wedge100.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm/aspeed-bmc-facebook-wedge100.dts
  projects/nfsv42/sys/gnu/dts/arm/aspeed-bmc-facebook-wedge40.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm/aspeed-bmc-facebook-wedge40.dts
  projects/nfsv42/sys/gnu/dts/arm/aspeed-bmc-lenovo-hr855xg2.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm/aspeed-bmc-lenovo-hr855xg2.dts
  projects/nfsv42/sys/gnu/dts/arm/aspeed-bmc-opp-mihawk.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm/aspeed-bmc-opp-mihawk.dts
  projects/nfsv42/sys/gnu/dts/arm/aspeed-g6-pinctrl.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm/aspeed-g6-pinctrl.dtsi
  projects/nfsv42/sys/gnu/dts/arm/aspeed-g6.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm/aspeed-g6.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx6ul-kontron-n6310-s-43.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm/imx6ul-kontron-n6310-s-43.dts
  projects/nfsv42/sys/gnu/dts/arm/imx6ul-kontron-n6310-s.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm/imx6ul-kontron-n6310-s.dts
  projects/nfsv42/sys/gnu/dts/arm/imx6ul-kontron-n6310-som.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm/imx6ul-kontron-n6310-som.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx6ul-phytec-phycore-som.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm/imx6ul-phytec-phycore-som.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx6ul-phytec-segin-ff-rdk-nand.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm/imx6ul-phytec-segin-ff-rdk-nand.dts
  projects/nfsv42/sys/gnu/dts/arm/imx6ul-phytec-segin-peb-eval-01.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm/imx6ul-phytec-segin-peb-eval-01.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx6ul-phytec-segin.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm/imx6ul-phytec-segin.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx6ull-phytec-phycore-som.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm/imx6ull-phytec-phycore-som.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx6ull-phytec-segin-ff-rdk-emmc.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm/imx6ull-phytec-segin-ff-rdk-emmc.dts
  projects/nfsv42/sys/gnu/dts/arm/imx6ull-phytec-segin-ff-rdk-nand.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm/imx6ull-phytec-segin-ff-rdk-nand.dts
  projects/nfsv42/sys/gnu/dts/arm/imx6ull-phytec-segin-lc-rdk-nand.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm/imx6ull-phytec-segin-lc-rdk-nand.dts
  projects/nfsv42/sys/gnu/dts/arm/imx6ull-phytec-segin-peb-eval-01.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm/imx6ull-phytec-segin-peb-eval-01.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx6ull-phytec-segin.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm/imx6ull-phytec-segin.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx7d-zii-rmu2.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm/imx7d-zii-rmu2.dts
  projects/nfsv42/sys/gnu/dts/arm/mmp2-olpc-xo-1-75.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm/mmp2-olpc-xo-1-75.dts
  projects/nfsv42/sys/gnu/dts/arm/mt7629-rfb.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm/mt7629-rfb.dts
  projects/nfsv42/sys/gnu/dts/arm/mt7629.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm/mt7629.dtsi
  projects/nfsv42/sys/gnu/dts/arm/rk3229-xms6.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm/rk3229-xms6.dts
  projects/nfsv42/sys/gnu/dts/arm/rk3288-veyron-edp.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm/rk3288-veyron-edp.dtsi
  projects/nfsv42/sys/gnu/dts/arm/rk3288-veyron-fievel.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm/rk3288-veyron-fievel.dts
  projects/nfsv42/sys/gnu/dts/arm/rk3288-veyron-tiger.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm/rk3288-veyron-tiger.dts
  projects/nfsv42/sys/gnu/dts/arm/ste-ab8500.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm/ste-ab8500.dtsi
  projects/nfsv42/sys/gnu/dts/arm/sun8i-s3-lichee-zero-plus.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm/sun8i-s3-lichee-zero-plus.dts
  projects/nfsv42/sys/gnu/dts/arm/sun8i-v3.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm/sun8i-v3.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/allwinner/sun50i-a64-olinuxino-emmc.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/allwinner/sun50i-a64-olinuxino-emmc.dts
  projects/nfsv42/sys/gnu/dts/arm64/allwinner/sun50i-h6-tanix-tx6.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/allwinner/sun50i-h6-tanix-tx6.dts
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-g12-common.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/amlogic/meson-g12-common.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-g12b-a311d-khadas-vim3.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/amlogic/meson-g12b-a311d-khadas-vim3.dts
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-g12b-a311d.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/amlogic/meson-g12b-a311d.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-g12b-khadas-vim3.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/amlogic/meson-g12b-khadas-vim3.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-g12b-s922x-khadas-vim3.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/amlogic/meson-g12b-s922x-khadas-vim3.dts
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-g12b-s922x.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/amlogic/meson-g12b-s922x.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-khadas-vim3.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/amlogic/meson-khadas-vim3.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-sm1-khadas-vim3l.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/amlogic/meson-sm1-khadas-vim3l.dts
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-sm1-sei610.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/amlogic/meson-sm1-sei610.dts
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-sm1.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/amlogic/meson-sm1.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/freescale/fsl-ls1046a-frwy.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/freescale/fsl-ls1046a-frwy.dts
  projects/nfsv42/sys/gnu/dts/arm64/freescale/imx8mn-ddr4-evk.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/freescale/imx8mn-ddr4-evk.dts
  projects/nfsv42/sys/gnu/dts/arm64/freescale/imx8mn.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/freescale/imx8mn.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/freescale/imx8mq-hummingboard-pulse.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/freescale/imx8mq-hummingboard-pulse.dts
  projects/nfsv42/sys/gnu/dts/arm64/freescale/imx8mq-nitrogen.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/freescale/imx8mq-nitrogen.dts
  projects/nfsv42/sys/gnu/dts/arm64/freescale/imx8mq-pico-pi.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/freescale/imx8mq-pico-pi.dts
  projects/nfsv42/sys/gnu/dts/arm64/freescale/imx8mq-sr-som.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/freescale/imx8mq-sr-som.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/freescale/imx8qxp-ai_ml.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/freescale/imx8qxp-ai_ml.dts
  projects/nfsv42/sys/gnu/dts/arm64/marvell/armada-3720-turris-mox.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/marvell/armada-3720-turris-mox.dts
  projects/nfsv42/sys/gnu/dts/arm64/qcom/msm8916-longcheer-l8150.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/qcom/msm8916-longcheer-l8150.dts
  projects/nfsv42/sys/gnu/dts/arm64/qcom/msm8916-samsung-a2015-common.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/qcom/msm8916-samsung-a2015-common.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/qcom/msm8916-samsung-a3u-eur.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/qcom/msm8916-samsung-a3u-eur.dts
  projects/nfsv42/sys/gnu/dts/arm64/qcom/msm8916-samsung-a5u-eur.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/qcom/msm8916-samsung-a5u-eur.dts
  projects/nfsv42/sys/gnu/dts/arm64/qcom/msm8998-asus-novago-tp370ql.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/qcom/msm8998-asus-novago-tp370ql.dts
  projects/nfsv42/sys/gnu/dts/arm64/qcom/msm8998-clamshell.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/qcom/msm8998-clamshell.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/qcom/msm8998-hp-envy-x2.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/qcom/msm8998-hp-envy-x2.dts
  projects/nfsv42/sys/gnu/dts/arm64/qcom/msm8998-lenovo-miix-630.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/qcom/msm8998-lenovo-miix-630.dts
  projects/nfsv42/sys/gnu/dts/arm64/qcom/pm8150.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/qcom/pm8150.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/qcom/pm8150b.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/qcom/pm8150b.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/qcom/pm8150l.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/qcom/pm8150l.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/qcom/sdm850-lenovo-yoga-c630.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/qcom/sdm850-lenovo-yoga-c630.dts
  projects/nfsv42/sys/gnu/dts/arm64/qcom/sm8150-mtp.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/qcom/sm8150-mtp.dts
  projects/nfsv42/sys/gnu/dts/arm64/qcom/sm8150.dtsi
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/qcom/sm8150.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/rockchip/rk3399-leez-p710.dts
     - copied unchanged from r355277, head/sys/gnu/dts/arm64/rockchip/rk3399-leez-p710.dts
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/bus/moxtet.h
     - copied unchanged from r355277, head/sys/gnu/dts/include/dt-bindings/bus/moxtet.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/clock/ast2600-clock.h
     - copied unchanged from r355277, head/sys/gnu/dts/include/dt-bindings/clock/ast2600-clock.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/clock/imx8mn-clock.h
     - copied unchanged from r355277, head/sys/gnu/dts/include/dt-bindings/clock/imx8mn-clock.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/clock/ingenic,tcu.h
     - copied unchanged from r355277, head/sys/gnu/dts/include/dt-bindings/clock/ingenic,tcu.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/clock/mt6779-clk.h
     - copied unchanged from r355277, head/sys/gnu/dts/include/dt-bindings/clock/mt6779-clk.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-sm8150.h
     - copied unchanged from r355277, head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-sm8150.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/clock/rk3308-cru.h
     - copied unchanged from r355277, head/sys/gnu/dts/include/dt-bindings/clock/rk3308-cru.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/gce/mt8183-gce.h
     - copied unchanged from r355277, head/sys/gnu/dts/include/dt-bindings/gce/mt8183-gce.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/interconnect/qcom,qcs404.h
     - copied unchanged from r355277, head/sys/gnu/dts/include/dt-bindings/interconnect/qcom,qcs404.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/memory/mt8183-larb-port.h
     - copied unchanged from r355277, head/sys/gnu/dts/include/dt-bindings/memory/mt8183-larb-port.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/phy/phy-lantiq-vrx200-pcie.h
     - copied unchanged from r355277, head/sys/gnu/dts/include/dt-bindings/phy/phy-lantiq-vrx200-pcie.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/power/meson-g12a-power.h
     - copied unchanged from r355277, head/sys/gnu/dts/include/dt-bindings/power/meson-g12a-power.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/power/meson-sm1-power.h
     - copied unchanged from r355277, head/sys/gnu/dts/include/dt-bindings/power/meson-sm1-power.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/regulator/active-semi,8865-regulator.h
     - copied unchanged from r355277, head/sys/gnu/dts/include/dt-bindings/regulator/active-semi,8865-regulator.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/reset-controller/
     - copied from r355277, head/sys/gnu/dts/include/dt-bindings/reset-controller/
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/reset/amlogic,meson-g12a-audio-reset.h
     - copied unchanged from r355277, head/sys/gnu/dts/include/dt-bindings/reset/amlogic,meson-g12a-audio-reset.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/reset/mt7629-resets.h
     - copied unchanged from r355277, head/sys/gnu/dts/include/dt-bindings/reset/mt7629-resets.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/soc/ti,sci_pm_domain.h
     - copied unchanged from r355277, head/sys/gnu/dts/include/dt-bindings/soc/ti,sci_pm_domain.h
  projects/nfsv42/sys/powerpc/pseries/phyp_dbg.c
     - copied unchanged from r355277, head/sys/powerpc/pseries/phyp_dbg.c
Deleted:
  projects/nfsv42/sys/dev/trm/
  projects/nfsv42/sys/gnu/dts/arm/imx6ul-phytec-pcl063.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx6ul-phytec-peb-eval-01.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx6ul-phytec-phyboard-segin-full.dts
  projects/nfsv42/sys/gnu/dts/arm/imx6ul-phytec-phyboard-segin.dtsi
  projects/nfsv42/sys/gnu/dts/arm/rk3288-fennec.dts
  projects/nfsv42/sys/modules/trm/
Modified:
  projects/nfsv42/sys/amd64/conf/GENERIC
  projects/nfsv42/sys/amd64/vmm/amd/amdvi_hw.c
  projects/nfsv42/sys/arm/freescale/imx/imx_gpio.c
  projects/nfsv42/sys/arm/samsung/exynos/chrome_kb.c
  projects/nfsv42/sys/arm/samsung/exynos/exynos_uart.c
  projects/nfsv42/sys/arm/versatile/pl050.c
  projects/nfsv42/sys/arm/xilinx/uart_dev_cdnc.c
  projects/nfsv42/sys/arm64/arm64/locore.S
  projects/nfsv42/sys/arm64/arm64/pmap.c
  projects/nfsv42/sys/arm64/rockchip/clk/rk3328_cru.c
  projects/nfsv42/sys/arm64/rockchip/clk/rk3399_cru.c
  projects/nfsv42/sys/arm64/rockchip/clk/rk_cru.h
  projects/nfsv42/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/nfsv42/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/nfsv42/sys/conf/NOTES
  projects/nfsv42/sys/conf/files
  projects/nfsv42/sys/conf/files.arm64
  projects/nfsv42/sys/conf/files.powerpc
  projects/nfsv42/sys/conf/kern.mk
  projects/nfsv42/sys/conf/makeLINT.mk
  projects/nfsv42/sys/contrib/ipfilter/netinet/fil.c
  projects/nfsv42/sys/contrib/ipfilter/netinet/ip_fil.h
  projects/nfsv42/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
  projects/nfsv42/sys/dev/ahci/ahci_pci.c
  projects/nfsv42/sys/dev/bwn/if_bwnvar.h
  projects/nfsv42/sys/dev/cfi/cfi_dev.c
  projects/nfsv42/sys/dev/cxgbe/common/common.h
  projects/nfsv42/sys/dev/cxgbe/common/t4_hw.c
  projects/nfsv42/sys/dev/cxgbe/t4_main.c
  projects/nfsv42/sys/dev/cxgbe/tom/t4_listen.c
  projects/nfsv42/sys/dev/gpio/gpiobus.c
  projects/nfsv42/sys/dev/gpio/gpiobusvar.h
  projects/nfsv42/sys/dev/gpio/gpioiic.c
  projects/nfsv42/sys/dev/gpio/gpiokeys.c
  projects/nfsv42/sys/dev/gpio/ofw_gpiobus.c
  projects/nfsv42/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
  projects/nfsv42/sys/dev/iwm/if_iwm.c
  projects/nfsv42/sys/dev/iwm/if_iwm_binding.c
  projects/nfsv42/sys/dev/iwm/if_iwm_binding.h
  projects/nfsv42/sys/dev/iwm/if_iwm_constants.h
  projects/nfsv42/sys/dev/iwm/if_iwm_fw.c
  projects/nfsv42/sys/dev/iwm/if_iwm_led.c
  projects/nfsv42/sys/dev/iwm/if_iwm_led.h
  projects/nfsv42/sys/dev/iwm/if_iwm_mac_ctxt.c
  projects/nfsv42/sys/dev/iwm/if_iwm_mac_ctxt.h
  projects/nfsv42/sys/dev/iwm/if_iwm_phy_ctxt.c
  projects/nfsv42/sys/dev/iwm/if_iwm_phy_ctxt.h
  projects/nfsv42/sys/dev/iwm/if_iwm_power.c
  projects/nfsv42/sys/dev/iwm/if_iwm_power.h
  projects/nfsv42/sys/dev/iwm/if_iwm_scan.c
  projects/nfsv42/sys/dev/iwm/if_iwm_scan.h
  projects/nfsv42/sys/dev/iwm/if_iwm_sf.c
  projects/nfsv42/sys/dev/iwm/if_iwm_sf.h
  projects/nfsv42/sys/dev/iwm/if_iwm_sta.c
  projects/nfsv42/sys/dev/iwm/if_iwm_sta.h
  projects/nfsv42/sys/dev/iwm/if_iwm_time_event.c
  projects/nfsv42/sys/dev/iwm/if_iwm_time_event.h
  projects/nfsv42/sys/dev/iwm/if_iwm_util.c
  projects/nfsv42/sys/dev/iwm/if_iwm_util.h
  projects/nfsv42/sys/dev/iwm/if_iwmreg.h
  projects/nfsv42/sys/dev/iwm/if_iwmvar.h
  projects/nfsv42/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
  projects/nfsv42/sys/dev/ofw/ofw_bus_subr.h
  projects/nfsv42/sys/dev/quicc/quicc_bfe_fdt.c
  projects/nfsv42/sys/dev/rp/rp_isa.c
  projects/nfsv42/sys/dev/rp/rp_pci.c
  projects/nfsv42/sys/dev/snp/snp.c
  projects/nfsv42/sys/dev/usb/controller/ehci_pci.c
  projects/nfsv42/sys/dev/usb/input/uep.c
  projects/nfsv42/sys/dev/usb/input/ukbd.c
  projects/nfsv42/sys/dev/usb/input/ums.c
  projects/nfsv42/sys/fs/devfs/devfs_devs.c
  projects/nfsv42/sys/fs/devfs/devfs_int.h
  projects/nfsv42/sys/fs/devfs/devfs_vnops.c
  projects/nfsv42/sys/fs/nfs/nfs.h
  projects/nfsv42/sys/fs/nfs/nfs_commonport.c
  projects/nfsv42/sys/fs/nfs/nfs_commonsubs.c
  projects/nfsv42/sys/fs/nfs/nfsport.h
  projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c
  projects/nfsv42/sys/fs/tmpfs/tmpfs_vnops.c
  projects/nfsv42/sys/gnu/dts/arm/am335x-boneblue.dts
  projects/nfsv42/sys/gnu/dts/arm/am335x-cm-t335.dts
  projects/nfsv42/sys/gnu/dts/arm/am335x-icev2.dts
  projects/nfsv42/sys/gnu/dts/arm/am33xx-l4.dtsi
  projects/nfsv42/sys/gnu/dts/arm/am3517-evm.dts
  projects/nfsv42/sys/gnu/dts/arm/am3517.dtsi
  projects/nfsv42/sys/gnu/dts/arm/am3874-iceboard.dts
  projects/nfsv42/sys/gnu/dts/arm/am4372.dtsi
  projects/nfsv42/sys/gnu/dts/arm/am437x-l4.dtsi
  projects/nfsv42/sys/gnu/dts/arm/aspeed-ast2500-evb.dts
  projects/nfsv42/sys/gnu/dts/arm/aspeed-bmc-facebook-tiogapass.dts
  projects/nfsv42/sys/gnu/dts/arm/aspeed-bmc-inspur-fp5280g2.dts
  projects/nfsv42/sys/gnu/dts/arm/aspeed-bmc-opp-swift.dts
  projects/nfsv42/sys/gnu/dts/arm/aspeed-bmc-opp-vesnin.dts
  projects/nfsv42/sys/gnu/dts/arm/aspeed-g4.dtsi
  projects/nfsv42/sys/gnu/dts/arm/aspeed-g5.dtsi
  projects/nfsv42/sys/gnu/dts/arm/at91-ariag25.dts
  projects/nfsv42/sys/gnu/dts/arm/at91-ariettag25.dts
  projects/nfsv42/sys/gnu/dts/arm/at91-cosino.dtsi
  projects/nfsv42/sys/gnu/dts/arm/at91-cosino_mega2560.dts
  projects/nfsv42/sys/gnu/dts/arm/at91-kizboxmini.dts
  projects/nfsv42/sys/gnu/dts/arm/at91sam9261ek.dts
  projects/nfsv42/sys/gnu/dts/arm/at91sam9263ek.dts
  projects/nfsv42/sys/gnu/dts/arm/at91sam9g15.dtsi
  projects/nfsv42/sys/gnu/dts/arm/at91sam9g15ek.dts
  projects/nfsv42/sys/gnu/dts/arm/at91sam9g25ek.dts
  projects/nfsv42/sys/gnu/dts/arm/at91sam9g35ek.dts
  projects/nfsv42/sys/gnu/dts/arm/at91sam9m10g45ek.dts
  projects/nfsv42/sys/gnu/dts/arm/at91sam9rlek.dts
  projects/nfsv42/sys/gnu/dts/arm/at91sam9x25ek.dts
  projects/nfsv42/sys/gnu/dts/arm/at91sam9x35ek.dts
  projects/nfsv42/sys/gnu/dts/arm/at91sam9x5.dtsi
  projects/nfsv42/sys/gnu/dts/arm/at91sam9x5_lcd.dtsi
  projects/nfsv42/sys/gnu/dts/arm/at91sam9x5dm.dtsi
  projects/nfsv42/sys/gnu/dts/arm/at91sam9x5ek.dtsi
  projects/nfsv42/sys/gnu/dts/arm/bcm2835-rpi-a-plus.dts
  projects/nfsv42/sys/gnu/dts/arm/bcm2835-rpi-a.dts
  projects/nfsv42/sys/gnu/dts/arm/bcm2835-rpi-b-plus.dts
  projects/nfsv42/sys/gnu/dts/arm/bcm2835-rpi-b-rev2.dts
  projects/nfsv42/sys/gnu/dts/arm/bcm2835-rpi-b.dts
  projects/nfsv42/sys/gnu/dts/arm/bcm2835-rpi-cm1-io1.dts
  projects/nfsv42/sys/gnu/dts/arm/bcm2835-rpi-cm1.dtsi
  projects/nfsv42/sys/gnu/dts/arm/bcm2835-rpi-zero-w.dts
  projects/nfsv42/sys/gnu/dts/arm/bcm2835-rpi-zero.dts
  projects/nfsv42/sys/gnu/dts/arm/bcm2835-rpi.dtsi
  projects/nfsv42/sys/gnu/dts/arm/bcm2836-rpi-2-b.dts
  projects/nfsv42/sys/gnu/dts/arm/bcm2837-rpi-3-a-plus.dts
  projects/nfsv42/sys/gnu/dts/arm/bcm2837-rpi-3-b-plus.dts
  projects/nfsv42/sys/gnu/dts/arm/bcm2837-rpi-3-b.dts
  projects/nfsv42/sys/gnu/dts/arm/bcm2837-rpi-cm3-io3.dts
  projects/nfsv42/sys/gnu/dts/arm/bcm2837-rpi-cm3.dtsi
  projects/nfsv42/sys/gnu/dts/arm/bcm283x.dtsi
  projects/nfsv42/sys/gnu/dts/arm/da850-evm.dts
  projects/nfsv42/sys/gnu/dts/arm/dra7-l4.dtsi
  projects/nfsv42/sys/gnu/dts/arm/ep7211-edb7211.dts
  projects/nfsv42/sys/gnu/dts/arm/exynos3250.dtsi
  projects/nfsv42/sys/gnu/dts/arm/exynos4.dtsi
  projects/nfsv42/sys/gnu/dts/arm/exynos4210-universal_c210.dts
  projects/nfsv42/sys/gnu/dts/arm/exynos4412-itop-elite.dts
  projects/nfsv42/sys/gnu/dts/arm/exynos4412-itop-scp-core.dtsi
  projects/nfsv42/sys/gnu/dts/arm/exynos4412-odroidu3.dts
  projects/nfsv42/sys/gnu/dts/arm/exynos4412-odroidx.dts
  projects/nfsv42/sys/gnu/dts/arm/exynos4412-origen.dts
  projects/nfsv42/sys/gnu/dts/arm/exynos5250-arndale.dts
  projects/nfsv42/sys/gnu/dts/arm/exynos5250-snow-common.dtsi
  projects/nfsv42/sys/gnu/dts/arm/exynos5250.dtsi
  projects/nfsv42/sys/gnu/dts/arm/exynos5420-peach-pit.dts
  projects/nfsv42/sys/gnu/dts/arm/exynos5420.dtsi
  projects/nfsv42/sys/gnu/dts/arm/exynos54xx.dtsi
  projects/nfsv42/sys/gnu/dts/arm/exynos5800-peach-pi.dts
  projects/nfsv42/sys/gnu/dts/arm/exynos5800.dtsi
  projects/nfsv42/sys/gnu/dts/arm/gemini-dlink-dir-685.dts
  projects/nfsv42/sys/gnu/dts/arm/gemini-nas4220b.dts
  projects/nfsv42/sys/gnu/dts/arm/gemini-sl93512r.dts
  projects/nfsv42/sys/gnu/dts/arm/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts
  projects/nfsv42/sys/gnu/dts/arm/imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts
  projects/nfsv42/sys/gnu/dts/arm/imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts
  projects/nfsv42/sys/gnu/dts/arm/imx25-pdk.dts
  projects/nfsv42/sys/gnu/dts/arm/imx27-apf27dev.dts
  projects/nfsv42/sys/gnu/dts/arm/imx27-eukrea-mbimxsd27-baseboard.dts
  projects/nfsv42/sys/gnu/dts/arm/imx27-phytec-phycard-s-rdk.dts
  projects/nfsv42/sys/gnu/dts/arm/imx27-phytec-phycore-rdk.dts
  projects/nfsv42/sys/gnu/dts/arm/imx53-m53menlo.dts
  projects/nfsv42/sys/gnu/dts/arm/imx6-logicpd-baseboard.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx6-logicpd-som.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx6qdl-colibri.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx6qdl-nit6xlite.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx6qdl-phytec-pbab01.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx6qdl-sabreauto.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx6qdl-wandboard.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx6qdl.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx6sl.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx6sll.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx6sx.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx6ul-opos6uldev.dts
  projects/nfsv42/sys/gnu/dts/arm/imx6ul.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx7-colibri.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx7d-cl-som-imx7.dts
  projects/nfsv42/sys/gnu/dts/arm/imx7d-zii-rpu2.dts
  projects/nfsv42/sys/gnu/dts/arm/imx7d.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx7s.dtsi
  projects/nfsv42/sys/gnu/dts/arm/imx7ulp.dtsi
  projects/nfsv42/sys/gnu/dts/arm/kirkwood-ts219.dtsi
  projects/nfsv42/sys/gnu/dts/arm/logicpd-som-lv.dtsi
  projects/nfsv42/sys/gnu/dts/arm/logicpd-torpedo-baseboard.dtsi
  projects/nfsv42/sys/gnu/dts/arm/logicpd-torpedo-som.dtsi
  projects/nfsv42/sys/gnu/dts/arm/ls1021a.dtsi
  projects/nfsv42/sys/gnu/dts/arm/meson8b-ec100.dts
  projects/nfsv42/sys/gnu/dts/arm/meson8b-mxq.dts
  projects/nfsv42/sys/gnu/dts/arm/meson8b-odroidc1.dts
  projects/nfsv42/sys/gnu/dts/arm/meson8b.dtsi
  projects/nfsv42/sys/gnu/dts/arm/mmp2.dtsi
  projects/nfsv42/sys/gnu/dts/arm/nspire-classic.dtsi
  projects/nfsv42/sys/gnu/dts/arm/nspire-cx.dts
  projects/nfsv42/sys/gnu/dts/arm/nspire.dtsi
  projects/nfsv42/sys/gnu/dts/arm/omap3-gta04.dtsi
  projects/nfsv42/sys/gnu/dts/arm/omap3-n950-n9.dtsi
  projects/nfsv42/sys/gnu/dts/arm/omap34xx.dtsi
  projects/nfsv42/sys/gnu/dts/arm/omap36xx.dtsi
  projects/nfsv42/sys/gnu/dts/arm/omap4-droid4-xt894.dts
  projects/nfsv42/sys/gnu/dts/arm/omap4-l4-abe.dtsi
  projects/nfsv42/sys/gnu/dts/arm/omap4-l4.dtsi
  projects/nfsv42/sys/gnu/dts/arm/omap4-panda-common.dtsi
  projects/nfsv42/sys/gnu/dts/arm/omap4-sdp.dts
  projects/nfsv42/sys/gnu/dts/arm/omap4-var-som-om44-wlan.dtsi
  projects/nfsv42/sys/gnu/dts/arm/omap4.dtsi
  projects/nfsv42/sys/gnu/dts/arm/omap5-board-common.dtsi
  projects/nfsv42/sys/gnu/dts/arm/omap5.dtsi
  projects/nfsv42/sys/gnu/dts/arm/omap54xx-clocks.dtsi
  projects/nfsv42/sys/gnu/dts/arm/r8a77470.dtsi
  projects/nfsv42/sys/gnu/dts/arm/r8a7779.dtsi
  projects/nfsv42/sys/gnu/dts/arm/rk3036.dtsi
  projects/nfsv42/sys/gnu/dts/arm/rk3288-evb.dtsi
  projects/nfsv42/sys/gnu/dts/arm/rk3288-tinker.dtsi
  projects/nfsv42/sys/gnu/dts/arm/rk3288-veyron-chromebook.dtsi
  projects/nfsv42/sys/gnu/dts/arm/rk3288-veyron-jaq.dts
  projects/nfsv42/sys/gnu/dts/arm/rk3288-veyron-jerry.dts
  projects/nfsv42/sys/gnu/dts/arm/rk3288-veyron-minnie.dts
  projects/nfsv42/sys/gnu/dts/arm/rk3288-veyron-pinky.dts
  projects/nfsv42/sys/gnu/dts/arm/rk3288-veyron-speedy.dts
  projects/nfsv42/sys/gnu/dts/arm/rk3288-veyron.dtsi
  projects/nfsv42/sys/gnu/dts/arm/socfpga.dtsi
  projects/nfsv42/sys/gnu/dts/arm/socfpga_arria10.dtsi
  projects/nfsv42/sys/gnu/dts/arm/socfpga_arria10_socdk_nand.dts
  projects/nfsv42/sys/gnu/dts/arm/socfpga_cyclone5_vining_fpga.dts
  projects/nfsv42/sys/gnu/dts/arm/ste-dbx5x0.dtsi
  projects/nfsv42/sys/gnu/dts/arm/ste-href-ab8500.dtsi
  projects/nfsv42/sys/gnu/dts/arm/ste-href-family-pinctrl.dtsi
  projects/nfsv42/sys/gnu/dts/arm/ste-href-stuib.dtsi
  projects/nfsv42/sys/gnu/dts/arm/ste-href.dtsi
  projects/nfsv42/sys/gnu/dts/arm/ste-hrefprev60-stuib.dts
  projects/nfsv42/sys/gnu/dts/arm/ste-hrefv60plus-stuib.dts
  projects/nfsv42/sys/gnu/dts/arm/ste-nomadik-nhk15.dts
  projects/nfsv42/sys/gnu/dts/arm/ste-snowball.dts
  projects/nfsv42/sys/gnu/dts/arm/stm32429i-eval.dts
  projects/nfsv42/sys/gnu/dts/arm/stm32f429.dtsi
  projects/nfsv42/sys/gnu/dts/arm/stm32f746.dtsi
  projects/nfsv42/sys/gnu/dts/arm/stm32h743i-eval.dts
  projects/nfsv42/sys/gnu/dts/arm/stm32mp157-pinctrl.dtsi
  projects/nfsv42/sys/gnu/dts/arm/stm32mp157a-dk1.dts
  projects/nfsv42/sys/gnu/dts/arm/stm32mp157c-ed1.dts
  projects/nfsv42/sys/gnu/dts/arm/stm32mp157c-ev1.dts
  projects/nfsv42/sys/gnu/dts/arm/stm32mp157c.dtsi
  projects/nfsv42/sys/gnu/dts/arm/sun4i-a10-a1000.dts
  projects/nfsv42/sys/gnu/dts/arm/sun4i-a10-ba10-tvbox.dts
  projects/nfsv42/sys/gnu/dts/arm/sun4i-a10-cubieboard.dts
  projects/nfsv42/sys/gnu/dts/arm/sun4i-a10-hackberry.dts
  projects/nfsv42/sys/gnu/dts/arm/sun4i-a10-itead-iteaduino-plus.dts
  projects/nfsv42/sys/gnu/dts/arm/sun4i-a10-jesurun-q5.dts
  projects/nfsv42/sys/gnu/dts/arm/sun4i-a10-marsboard.dts
  projects/nfsv42/sys/gnu/dts/arm/sun4i-a10-olinuxino-lime.dts
  projects/nfsv42/sys/gnu/dts/arm/sun4i-a10-pcduino.dts
  projects/nfsv42/sys/gnu/dts/arm/sun4i-a10.dtsi
  projects/nfsv42/sys/gnu/dts/arm/sun5i-a10s-olinuxino-micro.dts
  projects/nfsv42/sys/gnu/dts/arm/sun5i-a10s-wobo-i5.dts
  projects/nfsv42/sys/gnu/dts/arm/sun5i-a13-q8-tablet.dts
  projects/nfsv42/sys/gnu/dts/arm/sun5i.dtsi
  projects/nfsv42/sys/gnu/dts/arm/sun6i-a31-colombus.dts
  projects/nfsv42/sys/gnu/dts/arm/sun6i-a31-hummingbird.dts
  projects/nfsv42/sys/gnu/dts/arm/sun6i-a31-i7.dts
  projects/nfsv42/sys/gnu/dts/arm/sun6i-a31-m9.dts
  projects/nfsv42/sys/gnu/dts/arm/sun6i-a31-mele-a1000g-quad.dts
  projects/nfsv42/sys/gnu/dts/arm/sun6i-a31.dtsi
  projects/nfsv42/sys/gnu/dts/arm/sun6i-a31s-cs908.dts
  projects/nfsv42/sys/gnu/dts/arm/sun6i-a31s-sina31s.dts
  projects/nfsv42/sys/gnu/dts/arm/sun6i-a31s-sinovoip-bpi-m2.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-bananapi-m1-plus.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-bananapi.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-bananapro.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-cubieboard2.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-cubietruck.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-hummingbird.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-i12-tvbox.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-icnova-swac.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-itead-ibox.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-lamobo-r1.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-m3.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-olimex-som-evb.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-olimex-som204-evb.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-olinuxino-lime.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-olinuxino-lime2.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-olinuxino-micro.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-orangepi-mini.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-orangepi.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-pcduino3-nano.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-pcduino3.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20-wits-pro-a20-dkt.dts
  projects/nfsv42/sys/gnu/dts/arm/sun7i-a20.dtsi
  projects/nfsv42/sys/gnu/dts/arm/sun8i-a23-a33.dtsi
  projects/nfsv42/sys/gnu/dts/arm/sun8i-a23-ippo-q8h-v1.2.dts
  projects/nfsv42/sys/gnu/dts/arm/sun8i-a23-ippo-q8h-v5.dts
  projects/nfsv42/sys/gnu/dts/arm/sun8i-a23-q8-tablet.dts
  projects/nfsv42/sys/gnu/dts/arm/sun8i-a83t-cubietruck-plus.dts
  projects/nfsv42/sys/gnu/dts/arm/sun8i-a83t-tbs-a711.dts
  projects/nfsv42/sys/gnu/dts/arm/sun8i-a83t.dtsi
  projects/nfsv42/sys/gnu/dts/arm/sun8i-r40.dtsi
  projects/nfsv42/sys/gnu/dts/arm/sun8i-v3s.dtsi
  projects/nfsv42/sys/gnu/dts/arm/sun9i-a80-cubieboard4.dts
  projects/nfsv42/sys/gnu/dts/arm/sun9i-a80-optimus.dts
  projects/nfsv42/sys/gnu/dts/arm/sun9i-a80.dtsi
  projects/nfsv42/sys/gnu/dts/arm/sunxi-h3-h5.dtsi
  projects/nfsv42/sys/gnu/dts/arm/vexpress-v2m-rs1.dtsi
  projects/nfsv42/sys/gnu/dts/arm/vexpress-v2m.dtsi
  projects/nfsv42/sys/gnu/dts/arm/vf610-zii-cfu1.dts
  projects/nfsv42/sys/gnu/dts/arm/vf610-zii-scu4-aib.dts
  projects/nfsv42/sys/gnu/dts/arm/vf610-zii-spb4.dts
  projects/nfsv42/sys/gnu/dts/arm64/allwinner/sun50i-a64-orangepi-win.dts
  projects/nfsv42/sys/gnu/dts/arm64/allwinner/sun50i-a64-pine64-plus.dts
  projects/nfsv42/sys/gnu/dts/arm64/allwinner/sun50i-a64-pinebook.dts
  projects/nfsv42/sys/gnu/dts/arm64/allwinner/sun50i-a64-sopine-baseboard.dts
  projects/nfsv42/sys/gnu/dts/arm64/allwinner/sun50i-a64.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/allwinner/sun50i-h6-beelink-gs1.dts
  projects/nfsv42/sys/gnu/dts/arm64/allwinner/sun50i-h6-orangepi-3.dts
  projects/nfsv42/sys/gnu/dts/arm64/allwinner/sun50i-h6-orangepi.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/allwinner/sun50i-h6-pine-h64.dts
  projects/nfsv42/sys/gnu/dts/arm64/allwinner/sun50i-h6.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/altera/socfpga_stratix10.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-axg.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-g12a-sei510.dts
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-g12a-u200.dts
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-g12a-x96-max.dts
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-g12a.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-g12b-odroid-n2.dts
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-g12b.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-gx.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-gxbb-nanopi-k2.dts
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-gxbb-nexbox-a95x.dts
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-gxbb-odroidc2.dts
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-gxbb-p201.dts
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-gxbb-p20x.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-gxbb-wetek-hub.dts
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-gxbb-wetek-play2.dts
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-gxbb.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-gxl-s905w-tx3-mini.dts
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-gxl-s905x-hwacom-amazetv.dts
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-gxl-s905x-khadas-vim.dts
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-gxl-s905x-nexbox-a95x.dts
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-gxl.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-gxm-khadas-vim2.dts
  projects/nfsv42/sys/gnu/dts/arm64/amlogic/meson-gxm.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/arm/fvp-base-revc.dts
  projects/nfsv42/sys/gnu/dts/arm64/arm/rtsm_ve-motherboard.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/arm/vexpress-v2m-rs1.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/bitmain/bm1880.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/broadcom/stingray/stingray-pinctrl.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/broadcom/stingray/stingray.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/freescale/fsl-ls1012a.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/freescale/fsl-ls1028a-qds.dts
  projects/nfsv42/sys/gnu/dts/arm64/freescale/fsl-ls1028a-rdb.dts
  projects/nfsv42/sys/gnu/dts/arm64/freescale/fsl-ls1028a.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/freescale/fsl-ls1043a.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/freescale/fsl-ls1046a.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/freescale/fsl-ls1088a-qds.dts
  projects/nfsv42/sys/gnu/dts/arm64/freescale/fsl-ls1088a.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/freescale/fsl-ls208xa.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/freescale/fsl-lx2160a.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/freescale/imx8mm-evk.dts
  projects/nfsv42/sys/gnu/dts/arm64/freescale/imx8mm.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/freescale/imx8mq-evk.dts
  projects/nfsv42/sys/gnu/dts/arm64/freescale/imx8mq-librem5-devkit.dts
  projects/nfsv42/sys/gnu/dts/arm64/freescale/imx8mq-zii-ultra.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/freescale/imx8mq.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/freescale/imx8qxp-mek.dts
  projects/nfsv42/sys/gnu/dts/arm64/freescale/imx8qxp.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/intel/socfpga_agilex.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/marvell/armada-37xx.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/marvell/armada-7040-db.dts
  projects/nfsv42/sys/gnu/dts/arm64/marvell/armada-8040-clearfog-gt-8k.dts
  projects/nfsv42/sys/gnu/dts/arm64/marvell/armada-8040-db.dts
  projects/nfsv42/sys/gnu/dts/arm64/marvell/armada-8040-mcbin.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/marvell/armada-ap806-quad.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/marvell/armada-ap806.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/marvell/armada-cp110.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/mediatek/mt7622-bananapi-bpi-r64.dts
  projects/nfsv42/sys/gnu/dts/arm64/mediatek/mt7622.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/mediatek/mt8183-evb.dts
  projects/nfsv42/sys/gnu/dts/arm64/mediatek/mt8183.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/nvidia/tegra194-p2888.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/nvidia/tegra194-p2972-0000.dts
  projects/nfsv42/sys/gnu/dts/arm64/nvidia/tegra194.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/qcom/msm8996.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/qcom/msm8998.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/qcom/pm8998.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/qcom/pms405.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/qcom/qcs404-evb.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/qcom/qcs404.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/qcom/sdm845-cheza.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/qcom/sdm845-db845c.dts
  projects/nfsv42/sys/gnu/dts/arm64/qcom/sdm845-mtp.dts
  projects/nfsv42/sys/gnu/dts/arm64/qcom/sdm845.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/renesas/hihope-common.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/renesas/hihope-rzg2-ex.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a774a1.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a774c0-cat874.dts
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a774c0.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a7795-es1-salvator-x.dts
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a7795-es1.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a7795-salvator-x.dts
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a7795-salvator-xs.dts
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a7795.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a7796-salvator-x.dts
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a7796-salvator-xs.dts
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a7796.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a77965-salvator-x.dts
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a77965-salvator-xs.dts
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a77965.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a77970-eagle.dts
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a77970-v3msk.dts
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a77970.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a77980-condor.dts
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a77980-v3hsk.dts
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a77980.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a77990-ebisu.dts
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a77990.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a77995-draak.dts
  projects/nfsv42/sys/gnu/dts/arm64/renesas/r8a77995.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/renesas/salvator-common.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/renesas/ulcb-kf.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/renesas/ulcb.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/rockchip/rk3328-rock64.dts
  projects/nfsv42/sys/gnu/dts/arm64/rockchip/rk3328.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/rockchip/rk3399-gru-kevin.dts
  projects/nfsv42/sys/gnu/dts/arm64/rockchip/rk3399-hugsun-x99.dts
  projects/nfsv42/sys/gnu/dts/arm64/rockchip/rk3399-rockpro64.dts
  projects/nfsv42/sys/gnu/dts/arm64/ti/k3-am65-main.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/ti/k3-am65-mcu.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/ti/k3-am65-wakeup.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/ti/k3-am65.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/ti/k3-am654-base-board.dts
  projects/nfsv42/sys/gnu/dts/arm64/ti/k3-j721e-common-proc-board.dts
  projects/nfsv42/sys/gnu/dts/arm64/ti/k3-j721e-main.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/ti/k3-j721e-mcu-wakeup.dtsi
  projects/nfsv42/sys/gnu/dts/arm64/ti/k3-j721e.dtsi
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/bus/ti-sysc.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/clock/bcm2835.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/clock/g12a-clkc.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/clock/imx8-clock.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/clock/jz4740-cgu.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/clock/mt8183-clk.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/clock/omap5.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-qcs404.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/clock/sun8i-v3s-ccu.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/leds/common.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/pinctrl/k3.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/reset/amlogic,meson-gxbb-reset.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/reset/amlogic,meson8b-reset.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/reset/hisi,hi6220-resets.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/reset/imx8mq-reset.h
  projects/nfsv42/sys/gnu/dts/include/dt-bindings/reset/sun8i-v3s-ccu.h
  projects/nfsv42/sys/i386/conf/GENERIC
  projects/nfsv42/sys/kern/kern_conf.c
  projects/nfsv42/sys/kern/kern_exit.c
  projects/nfsv42/sys/kern/kern_linker.c
  projects/nfsv42/sys/kern/kern_lock.c
  projects/nfsv42/sys/kern/kern_malloc.c
  projects/nfsv42/sys/kern/kern_rmlock.c
  projects/nfsv42/sys/kern/kern_sig.c
  projects/nfsv42/sys/kern/subr_firmware.c
  projects/nfsv42/sys/kern/subr_lock.c
  projects/nfsv42/sys/kern/subr_smp.c
  projects/nfsv42/sys/kern/subr_witness.c
  projects/nfsv42/sys/kern/sys_procdesc.c
  projects/nfsv42/sys/kern/tty.c
  projects/nfsv42/sys/kern/tty_pts.c
  projects/nfsv42/sys/kern/uipc_ktls.c
  projects/nfsv42/sys/kern/vfs_cache.c
  projects/nfsv42/sys/kern/vfs_vnops.c
  projects/nfsv42/sys/modules/Makefile
  projects/nfsv42/sys/netinet/cc/cc_dctcp.c
  projects/nfsv42/sys/netinet/in_mcast.c
  projects/nfsv42/sys/netinet/ip_carp.c
  projects/nfsv42/sys/netinet/sctp_input.c
  projects/nfsv42/sys/netinet/sctp_usrreq.c
  projects/nfsv42/sys/netinet/tcp_input.c
  projects/nfsv42/sys/netinet/tcp_output.c
  projects/nfsv42/sys/netinet/tcp_stacks/rack.c
  projects/nfsv42/sys/netinet/tcp_stacks/tcp_rack.h
  projects/nfsv42/sys/netinet/tcp_syncache.c
  projects/nfsv42/sys/netinet/tcp_syncache.h
  projects/nfsv42/sys/netinet/tcp_usrreq.c
  projects/nfsv42/sys/netinet/tcp_var.h
  projects/nfsv42/sys/netinet/toecore.c
  projects/nfsv42/sys/netinet/toecore.h
  projects/nfsv42/sys/netinet6/dest6.c
  projects/nfsv42/sys/netinet6/frag6.c
  projects/nfsv42/sys/netinet6/icmp6.c
  projects/nfsv42/sys/netinet6/in6_mcast.c
  projects/nfsv42/sys/netinet6/ip6_input.c
  projects/nfsv42/sys/netinet6/ip6_mroute.c
  projects/nfsv42/sys/netinet6/mld6.c
  projects/nfsv42/sys/netinet6/nd6_nbr.c
  projects/nfsv42/sys/netinet6/nd6_rtr.c
  projects/nfsv42/sys/netinet6/route6.c
  projects/nfsv42/sys/netinet6/sctp6_usrreq.c
  projects/nfsv42/sys/netinet6/udp6_usrreq.c
  projects/nfsv42/sys/netipsec/xform_ah.c
  projects/nfsv42/sys/netipsec/xform_esp.c
  projects/nfsv42/sys/powerpc/powerpc/machdep.c
  projects/nfsv42/sys/powerpc/pseries/phyp_console.c
  projects/nfsv42/sys/powerpc/psim/uart_iobus.c
  projects/nfsv42/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
  projects/nfsv42/sys/sys/lock.h
  projects/nfsv42/sys/sys/lockmgr.h
  projects/nfsv42/sys/sys/refcount.h
  projects/nfsv42/sys/sys/smp.h
  projects/nfsv42/sys/sys/vnode.h
  projects/nfsv42/sys/ufs/ffs/ffs_alloc.c
  projects/nfsv42/sys/ufs/ffs/ffs_snapshot.c
  projects/nfsv42/sys/vm/memguard.c
  projects/nfsv42/sys/vm/swap_pager.c
  projects/nfsv42/sys/vm/uma.h
  projects/nfsv42/sys/vm/uma_core.c
  projects/nfsv42/sys/vm/uma_int.h
  projects/nfsv42/sys/vm/vm_fault.c
  projects/nfsv42/sys/vm/vm_map.c
  projects/nfsv42/sys/vm/vm_mmap.c
  projects/nfsv42/sys/vm/vm_object.c
  projects/nfsv42/sys/vm/vm_object.h
  projects/nfsv42/sys/vm/vm_page.h
  projects/nfsv42/sys/vm/vnode_pager.c
  projects/nfsv42/sys/x86/include/bus_dma.h
  projects/nfsv42/sys/x86/iommu/busdma_dmar.c
  projects/nfsv42/sys/x86/iommu/intel_ctx.c
  projects/nfsv42/sys/x86/iommu/intel_dmar.h
  projects/nfsv42/sys/x86/iommu/intel_gas.c
  projects/nfsv42/sys/x86/x86/busdma_machdep.c
  projects/nfsv42/sys/x86/x86/cpu_machdep.c
Directory Properties:
  projects/nfsv42/sys/   (props changed)
  projects/nfsv42/sys/cddl/contrib/opensolaris/   (props changed)
  projects/nfsv42/sys/contrib/ipfilter/   (props changed)
  projects/nfsv42/sys/gnu/dts/arm/   (props changed)
  projects/nfsv42/sys/gnu/dts/arm64/   (props changed)
  projects/nfsv42/sys/gnu/dts/include/   (props changed)

Modified: projects/nfsv42/sys/amd64/conf/GENERIC
==============================================================================

--- projects/nfsv42/sys/amd64/conf/GENERIC	Mon Dec  2 00:00:26 2019	(r355277)
+++ projects/nfsv42/sys/amd64/conf/GENERIC	Mon Dec  2 00:11:12 2019	(r355278)
@@ -150,7 +150,6 @@ device		mpt			# LSI-Logic MPT-Fusion
 device		mps			# LSI-Logic MPT-Fusion 2
 device		mpr			# LSI-Logic MPT-Fusion 3
 device		sym			# NCR/Symbios Logic
-device		trm			# Tekram DC395U/UW/F DC315U adapters
 device		isci			# Intel C600 SAS controller
 device		ocs_fc			# Emulex FC adapters
 device		pvscsi			# VMware PVSCSI

Modified: projects/nfsv42/sys/amd64/vmm/amd/amdvi_hw.c
==============================================================================
--- projects/nfsv42/sys/amd64/vmm/amd/amdvi_hw.c	Mon Dec  2 00:00:26 2019	(r355277)
+++ projects/nfsv42/sys/amd64/vmm/amd/amdvi_hw.c	Mon Dec  2 00:11:12 2019	(r355278)
@@ -66,7 +66,7 @@ SYSCTL_NODE(_hw_vmm, OID_AUTO, amdvi, CTLFLAG_RW, NULL
 /* Print RID or device ID in PCI string format. */
 #define RID2PCI_STR(d) PCI_RID2BUS(d), PCI_RID2SLOT(d), PCI_RID2FUNC(d)
 
-static void amdvi_dump_cmds(struct amdvi_softc *softc);
+static void amdvi_dump_cmds(struct amdvi_softc *softc, int count);
 static void amdvi_print_dev_cap(struct amdvi_softc *softc);
 
 MALLOC_DEFINE(M_AMDVI, "amdvi", "amdvi");
@@ -321,9 +321,7 @@ amdvi_cmd_cmp(struct amdvi_softc *softc, const uint64_
 
 	pa = vtophys(&softc->cmp_data);
 	cmd->opcode = AMDVI_CMP_WAIT_OPCODE;
-	cmd->word0 = (pa & 0xFFFFFFF8) |
-	    (AMDVI_CMP_WAIT_STORE);
-	//(AMDVI_CMP_WAIT_FLUSH | AMDVI_CMP_WAIT_STORE);
+	cmd->word0 = (pa & 0xFFFFFFF8) | AMDVI_CMP_WAIT_STORE;
 	cmd->word1 = (pa >> 32) & 0xFFFFF;
 	cmd->addr = data;
 
@@ -492,26 +490,26 @@ amdvi_wait(struct amdvi_softc *softc)
 	device_printf(softc->dev, "Error: completion failed"
 		      " tail:0x%x, head:0x%x.\n",
 		      ctrl->cmd_tail, ctrl->cmd_head);
-	amdvi_dump_cmds(softc);
+	/* Dump the last command. */
+	amdvi_dump_cmds(softc, 1);
 }
 
 static void
-amdvi_dump_cmds(struct amdvi_softc *softc)
+amdvi_dump_cmds(struct amdvi_softc *softc, int count)
 {
 	struct amdvi_ctrl *ctrl;
 	struct amdvi_cmd *cmd;
 	int off, i;
 
 	ctrl = softc->ctrl;
-	device_printf(softc->dev, "Dump all the commands:\n");
+	device_printf(softc->dev, "Dump last %d command(s):\n", count);
 	/*
 	 * If h/w is stuck in completion, it is the previous command,
 	 * start dumping from previous command onward.
 	 */
 	off = MOD_DEC(ctrl->cmd_head, sizeof(struct amdvi_cmd),
 	    softc->cmd_max);
-	for (i = 0; off != ctrl->cmd_tail &&
-	    i < softc->cmd_max; i++) {
+	for (i = 0; off != ctrl->cmd_tail && i < count; i++) {
 		cmd = (struct amdvi_cmd *)((uint8_t *)softc->cmd + off);
 		printf("  [CMD%d, off:0x%x] opcode= 0x%x 0x%x"
 		    " 0x%x 0x%lx\n", i, off, cmd->opcode,

Modified: projects/nfsv42/sys/arm/freescale/imx/imx_gpio.c
==============================================================================
--- projects/nfsv42/sys/arm/freescale/imx/imx_gpio.c	Mon Dec  2 00:00:26 2019	(r355277)
+++ projects/nfsv42/sys/arm/freescale/imx/imx_gpio.c	Mon Dec  2 00:11:12 2019	(r355278)
@@ -865,6 +865,15 @@ imx51_gpio_detach(device_t dev)
 	return(0);
 }
 
+static phandle_t
+imx51_gpio_get_node(device_t bus, device_t dev)
+{
+	/*
+	 * Share controller node with gpiobus device
+	 */
+	return ofw_bus_get_node(bus);
+}
+
 static device_method_t imx51_gpio_methods[] = {
 	DEVMETHOD(device_probe,		imx51_gpio_probe),
 	DEVMETHOD(device_attach,	imx51_gpio_attach),
@@ -881,6 +890,9 @@ static device_method_t imx51_gpio_methods[] = {
 	DEVMETHOD(pic_post_ithread,	gpio_pic_post_ithread),
 	DEVMETHOD(pic_pre_ithread,	gpio_pic_pre_ithread),
 #endif
+
+	/* OFW methods */
+	DEVMETHOD(ofw_bus_get_node,	imx51_gpio_get_node),
 
 	/* GPIO protocol */
 	DEVMETHOD(gpio_get_bus,		imx51_gpio_get_bus),

Modified: projects/nfsv42/sys/arm/samsung/exynos/chrome_kb.c
==============================================================================
--- projects/nfsv42/sys/arm/samsung/exynos/chrome_kb.c	Mon Dec  2 00:00:26 2019	(r355277)
+++ projects/nfsv42/sys/arm/samsung/exynos/chrome_kb.c	Mon Dec  2 00:11:12 2019	(r355278)
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/ioccom.h>
 #include <sys/filio.h>
-#include <sys/tty.h>
 #include <sys/kbio.h>
 
 #include <machine/bus.h>

Modified: projects/nfsv42/sys/arm/samsung/exynos/exynos_uart.c
==============================================================================
--- projects/nfsv42/sys/arm/samsung/exynos/exynos_uart.c	Mon Dec  2 00:00:26 2019	(r355277)
+++ projects/nfsv42/sys/arm/samsung/exynos/exynos_uart.c	Mon Dec  2 00:11:12 2019	(r355278)
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/cons.h>
-#include <sys/tty.h>
 #include <sys/rman.h>
 #include <machine/bus.h>
 #include <machine/intr.h>

Modified: projects/nfsv42/sys/arm/versatile/pl050.c
==============================================================================
--- projects/nfsv42/sys/arm/versatile/pl050.c	Mon Dec  2 00:00:26 2019	(r355277)
+++ projects/nfsv42/sys/arm/versatile/pl050.c	Mon Dec  2 00:11:12 2019	(r355278)
@@ -35,8 +35,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 #include <sys/rman.h>
 #include <sys/proc.h>
 #include <sys/sched.h>
@@ -52,7 +54,6 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/ioccom.h>
 #include <sys/filio.h>
-#include <sys/tty.h>
 #include <sys/kbio.h>
 
 #include <dev/kbd/kbdreg.h>

Modified: projects/nfsv42/sys/arm/xilinx/uart_dev_cdnc.c
==============================================================================
--- projects/nfsv42/sys/arm/xilinx/uart_dev_cdnc.c	Mon Dec  2 00:00:26 2019	(r355277)
+++ projects/nfsv42/sys/arm/xilinx/uart_dev_cdnc.c	Mon Dec  2 00:11:12 2019	(r355278)
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/cons.h>
-#include <sys/tty.h>
 #include <machine/bus.h>
 
 #include <dev/uart/uart.h>

Modified: projects/nfsv42/sys/arm64/arm64/locore.S
==============================================================================
--- projects/nfsv42/sys/arm64/arm64/locore.S	Mon Dec  2 00:00:26 2019	(r355277)
+++ projects/nfsv42/sys/arm64/arm64/locore.S	Mon Dec  2 00:11:12 2019	(r355278)
@@ -34,6 +34,7 @@
 #include <machine/hypervisor.h>
 #include <machine/param.h>
 #include <machine/pte.h>
+#include <machine/vm.h>
 #include <machine/vmparam.h>
 
 #define	VIRT_BITS	48
@@ -42,10 +43,6 @@
 	.globl	kernbase
 	.set	kernbase, KERNBASE
 
-#define	DEVICE_MEM	0
-#define	NORMAL_UNCACHED	1
-#define	NORMAL_MEM	2
-
 /*
  * We assume:
  *  MMU      on with an identity map, or off
@@ -396,7 +393,7 @@ create_pagetables:
 
 	/* Create the kernel space L2 table */
 	mov	x6, x26
-	mov	x7, #NORMAL_MEM
+	mov	x7, #VM_MEMATTR_WRITE_BACK
 	mov	x8, #(KERNBASE & L2_BLOCK_MASK)
 	mov	x9, x28
 	bl	build_l2_block_pagetable
@@ -433,15 +430,17 @@ create_pagetables:
 	mov	x6, x27		/* The initial page table */
 #if defined(SOCDEV_PA) && defined(SOCDEV_VA)
 	/* Create a table for the UART */
-	mov	x7, #(ATTR_nG | ATTR_IDX(DEVICE_MEM))
+	mov	x7, #(ATTR_nG | ATTR_IDX(VM_MEMATTR_DEVICE))
 	mov	x8, #(SOCDEV_VA)	/* VA start */
 	mov	x9, #(SOCDEV_PA)	/* PA start */
 	mov	x10, #1
 	bl	build_l1_block_pagetable
 #endif
 
-	/* Create the VA = PA map */
-	mov	x7, #(ATTR_nG | ATTR_IDX(NORMAL_UNCACHED))
+	/*
+	 * Create the VA = PA map
+	 */
+	mov	x7, #(ATTR_nG | ATTR_IDX(VM_MEMATTR_UNCACHEABLE))
 	mov	x9, x27
 	mov	x8, x9		/* VA start (== PA start) */
 	mov	x10, #1
@@ -658,10 +657,10 @@ start_mmu:
 
 	.align 3
 mair:
-	.quad	MAIR_ATTR(MAIR_DEVICE_nGnRnE, 0) |	\
-		MAIR_ATTR(MAIR_NORMAL_NC, 1) |		\
-		MAIR_ATTR(MAIR_NORMAL_WB, 2) |		\
-		MAIR_ATTR(MAIR_NORMAL_WT, 3)
+	.quad	MAIR_ATTR(MAIR_DEVICE_nGnRnE, VM_MEMATTR_DEVICE)    |	\
+		MAIR_ATTR(MAIR_NORMAL_NC, VM_MEMATTR_UNCACHEABLE)   |	\
+		MAIR_ATTR(MAIR_NORMAL_WB, VM_MEMATTR_WRITE_BACK)    |	\
+		MAIR_ATTR(MAIR_NORMAL_WT, VM_MEMATTR_WRITE_THROUGH)
 tcr:
 	.quad (TCR_TxSZ(64 - VIRT_BITS) | TCR_TG1_4K | \
 	    TCR_CACHE_ATTRS | TCR_SMP_ATTRS)

Modified: projects/nfsv42/sys/arm64/arm64/pmap.c
==============================================================================
--- projects/nfsv42/sys/arm64/arm64/pmap.c	Mon Dec  2 00:00:26 2019	(r355277)
+++ projects/nfsv42/sys/arm64/arm64/pmap.c	Mon Dec  2 00:11:12 2019	(r355278)
@@ -169,14 +169,6 @@ __FBSDID("$FreeBSD$");
 #define PMAP_INLINE
 #endif
 
-/*
- * These are configured by the mair_el1 register. This is set up in locore.S
- */
-#define	DEVICE_MEMORY	0
-#define	UNCACHED_MEMORY	1
-#define	CACHED_MEMORY	2
-
-
 #ifdef PV_STATS
 #define PV_STAT(x)	do { x ; } while (0)
 #else
@@ -707,7 +699,7 @@ pmap_bootstrap_dmap(vm_offset_t kern_l1, vm_paddr_t mi
 				KASSERT(l2_slot != 0, ("..."));
 				pmap_store(&l2[l2_slot],
 				    (pa & ~L2_OFFSET) | ATTR_DEFAULT | ATTR_XN |
-				    ATTR_IDX(CACHED_MEMORY) | L2_BLOCK);
+				    ATTR_IDX(VM_MEMATTR_WRITE_BACK) | L2_BLOCK);
 			}
 			KASSERT(va == (pa - dmap_phys_base + DMAP_MIN_ADDRESS),
 			    ("..."));
@@ -719,7 +711,7 @@ pmap_bootstrap_dmap(vm_offset_t kern_l1, vm_paddr_t mi
 			l1_slot = ((va - DMAP_MIN_ADDRESS) >> L1_SHIFT);
 			pmap_store(&pagetable_dmap[l1_slot],
 			    (pa & ~L1_OFFSET) | ATTR_DEFAULT | ATTR_XN |
-			    ATTR_IDX(CACHED_MEMORY) | L1_BLOCK);
+			    ATTR_IDX(VM_MEMATTR_WRITE_BACK) | L1_BLOCK);
 		}
 
 		/* Create L2 mappings at the end of the region */
@@ -744,7 +736,7 @@ pmap_bootstrap_dmap(vm_offset_t kern_l1, vm_paddr_t mi
 				l2_slot = pmap_l2_index(va);
 				pmap_store(&l2[l2_slot],
 				    (pa & ~L2_OFFSET) | ATTR_DEFAULT | ATTR_XN |
-				    ATTR_IDX(CACHED_MEMORY) | L2_BLOCK);
+				    ATTR_IDX(VM_MEMATTR_WRITE_BACK) | L2_BLOCK);
 			}
 		}
 
@@ -1043,7 +1035,6 @@ pmap_invalidate_page(pmap_t pmap, vm_offset_t va)
 {
 	uint64_t r;
 
-	sched_pin();
 	dsb(ishst);
 	if (pmap == kernel_pmap) {
 		r = atop(va);
@@ -1054,11 +1045,10 @@ pmap_invalidate_page(pmap_t pmap, vm_offset_t va)
 	}
 	dsb(ish);
 	isb();
-	sched_unpin();
 }
 
 static __inline void
-pmap_invalidate_range_nopin(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
+pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
 {
 	uint64_t end, r, start;
 
@@ -1080,20 +1070,10 @@ pmap_invalidate_range_nopin(pmap_t pmap, vm_offset_t s
 }
 
 static __inline void
-pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
-{
-
-	sched_pin();
-	pmap_invalidate_range_nopin(pmap, sva, eva);
-	sched_unpin();
-}
-
-static __inline void
 pmap_invalidate_all(pmap_t pmap)
 {
 	uint64_t r;
 
-	sched_pin();
 	dsb(ishst);
 	if (pmap == kernel_pmap) {
 		__asm __volatile("tlbi vmalle1is");
@@ -1103,7 +1083,6 @@ pmap_invalidate_all(pmap_t pmap)
 	}
 	dsb(ish);
 	isb();
-	sched_unpin();
 }
 
 /*
@@ -1281,7 +1260,7 @@ void
 pmap_kenter_device(vm_offset_t sva, vm_size_t size, vm_paddr_t pa)
 {
 
-	pmap_kenter(sva, size, pa, DEVICE_MEMORY);
+	pmap_kenter(sva, size, pa, VM_MEMATTR_DEVICE);
 }
 
 /*
@@ -3114,7 +3093,7 @@ pmap_update_entry(pmap_t pmap, pd_entry_t *pte, pd_ent
 	 * lookup the physical address.
 	 */
 	pmap_clear_bits(pte, ATTR_DESCR_VALID);
-	pmap_invalidate_range_nopin(pmap, va, va + size);
+	pmap_invalidate_range(pmap, va, va + size);
 
 	/* Create the new mapping */
 	pmap_store(pte, newpte);
@@ -3288,7 +3267,8 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, v
 	    L3_PAGE);
 	if ((prot & VM_PROT_WRITE) == 0)
 		new_l3 |= ATTR_AP(ATTR_AP_RO);
-	if ((prot & VM_PROT_EXECUTE) == 0 || m->md.pv_memattr == DEVICE_MEMORY)
+	if ((prot & VM_PROT_EXECUTE) == 0 ||
+	    m->md.pv_memattr == VM_MEMATTR_DEVICE)
 		new_l3 |= ATTR_XN;
 	if ((flags & PMAP_ENTER_WIRED) != 0)
 		new_l3 |= ATTR_SW_WIRED;
@@ -3556,7 +3536,8 @@ pmap_enter_2mpage(pmap_t pmap, vm_offset_t va, vm_page
 		new_l2 |= ATTR_SW_MANAGED;
 		new_l2 &= ~ATTR_AF;
 	}
-	if ((prot & VM_PROT_EXECUTE) == 0 || m->md.pv_memattr == DEVICE_MEMORY)
+	if ((prot & VM_PROT_EXECUTE) == 0 ||
+	    m->md.pv_memattr == VM_MEMATTR_DEVICE)
 		new_l2 |= ATTR_XN;
 	if (va < VM_MAXUSER_ADDRESS)
 		new_l2 |= ATTR_AP(ATTR_AP_USER) | ATTR_PXN;
@@ -3858,7 +3839,8 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, v
 	pa = VM_PAGE_TO_PHYS(m);
 	l3_val = pa | ATTR_DEFAULT | ATTR_IDX(m->md.pv_memattr) |
 	    ATTR_AP(ATTR_AP_RO) | L3_PAGE;
-	if ((prot & VM_PROT_EXECUTE) == 0 || m->md.pv_memattr == DEVICE_MEMORY)
+	if ((prot & VM_PROT_EXECUTE) == 0 ||
+	    m->md.pv_memattr == VM_MEMATTR_DEVICE)
 		l3_val |= ATTR_XN;
 	if (va < VM_MAXUSER_ADDRESS)
 		l3_val |= ATTR_AP(ATTR_AP_USER) | ATTR_PXN;
@@ -5236,7 +5218,7 @@ pmap_mapbios(vm_paddr_t pa, vm_size_t size)
 			l2 = pmap_l1_to_l2(pde, va);
 			pmap_load_store(l2,
 			    pa | ATTR_DEFAULT | ATTR_XN |
-			    ATTR_IDX(CACHED_MEMORY) | L2_BLOCK);
+			    ATTR_IDX(VM_MEMATTR_WRITE_BACK) | L2_BLOCK);
 
 			va += L2_SIZE;
 			pa += L2_SIZE;
@@ -5260,7 +5242,7 @@ pmap_mapbios(vm_paddr_t pa, vm_size_t size)
 		/* L3 table is linked */
 		va = trunc_page(va);
 		pa = trunc_page(pa);
-		pmap_kenter(va, size, pa, CACHED_MEMORY);
+		pmap_kenter(va, size, pa, VM_MEMATTR_WRITE_BACK);
 	}
 
 	return ((void *)(va + offset));
@@ -5446,7 +5428,7 @@ pmap_change_attr_locked(vm_offset_t va, vm_size_t size
 				l3 = pmap_load(pte);
 				l3 &= ~ATTR_IDX_MASK;
 				l3 |= ATTR_IDX(mode);
-				if (mode == DEVICE_MEMORY)
+				if (mode == VM_MEMATTR_DEVICE)
 					l3 |= ATTR_XN;
 
 				pmap_update_entry(kernel_pmap, pte, l3, tmpva,
@@ -5522,7 +5504,8 @@ pmap_demote_l1(pmap_t pmap, pt_entry_t *l1, vm_offset_
 
 	if (tmpl1 != 0) {
 		pmap_kenter(tmpl1, PAGE_SIZE,
-		    DMAP_TO_PHYS((vm_offset_t)l1) & ~L3_OFFSET, CACHED_MEMORY);
+		    DMAP_TO_PHYS((vm_offset_t)l1) & ~L3_OFFSET,
+		    VM_MEMATTR_WRITE_BACK);
 		l1 = (pt_entry_t *)(tmpl1 + ((vm_offset_t)l1 & PAGE_MASK));
 	}
 
@@ -5664,7 +5647,8 @@ pmap_demote_l2_locked(pmap_t pmap, pt_entry_t *l2, vm_
 	 */
 	if (tmpl2 != 0) {
 		pmap_kenter(tmpl2, PAGE_SIZE,
-		    DMAP_TO_PHYS((vm_offset_t)l2) & ~L3_OFFSET, CACHED_MEMORY);
+		    DMAP_TO_PHYS((vm_offset_t)l2) & ~L3_OFFSET,
+		    VM_MEMATTR_WRITE_BACK);
 		l2 = (pt_entry_t *)(tmpl2 + ((vm_offset_t)l2 & PAGE_MASK));
 	}
 

Modified: projects/nfsv42/sys/arm64/rockchip/clk/rk3328_cru.c
==============================================================================
--- projects/nfsv42/sys/arm64/rockchip/clk/rk3328_cru.c	Mon Dec  2 00:00:26 2019	(r355277)
+++ projects/nfsv42/sys/arm64/rockchip/clk/rk3328_cru.c	Mon Dec  2 00:11:12 2019	(r355278)
@@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
 #define	PCLK_I2C1		206
 #define	PCLK_I2C2		207
 #define	PCLK_I2C3		208
+#define	PCLK_TSADC		213
 #define	HCLK_SDMMC		317
 #define	HCLK_SDIO		318
 #define	HCLK_EMMC		319
@@ -91,6 +92,8 @@ static struct rk_cru_gate rk3328_gates[] = {
 	CRU_GATE(PCLK_I2C1, "pclk_i2c1", "pclk_bus", 0x23C, 0)
 	CRU_GATE(PCLK_I2C2, "pclk_i2c2", "pclk_bus", 0x23C, 1)
 	CRU_GATE(PCLK_I2C3, "pclk_i2c3", "pclk_bus", 0x23C, 2)
+	CRU_GATE(PCLK_TSADC, "pclk_tsadc", "pclk_bus", 0x23C, 14)
+
 	CRU_GATE(PCLK_GPIO0, "pclk_gpio0", "pclk_bus", 0x240, 7)
 	CRU_GATE(PCLK_GPIO1, "pclk_gpio1", "pclk_bus", 0x240, 8)
 	CRU_GATE(PCLK_GPIO2, "pclk_gpio2", "pclk_bus", 0x240, 9)
@@ -731,6 +734,22 @@ static struct rk_clk_composite_def pclk_bus_pre = {
 	.flags = RK_CLK_COMPOSITE_HAVE_GATE,
 };
 
+/* CRU_CLKSEL_CON22 */
+
+#define SCLK_TSADC		36
+
+static const char *clk_tsadc_parents[] = {"xin24m"};
+static struct rk_clk_composite_def clk_tsadc = {
+	.clkdef = {
+		.id = SCLK_TSADC,
+		.name = "clk_tsadc",
+		.parent_names = clk_tsadc_parents,
+		.parent_cnt = nitems(clk_tsadc_parents),
+	},
+	.div_shift = 0,
+	.div_width = 9,
+};
+
 /* CRU_CLKSEL_CON28 */
 
 #define ACLK_PERI_PRE		137
@@ -1011,6 +1030,10 @@ static struct rk_clk rk3328_clks[] = {
 		.clk.armclk = &armclk,
 	},
 
+	{
+		.type = RK_CLK_COMPOSITE,
+		.clk.composite = &clk_tsadc,
+	},
 	{
 		.type = RK_CLK_COMPOSITE,
 		.clk.composite = &aclk_peri_pre,

Modified: projects/nfsv42/sys/arm64/rockchip/clk/rk3399_cru.c
==============================================================================
--- projects/nfsv42/sys/arm64/rockchip/clk/rk3399_cru.c	Mon Dec  2 00:00:26 2019	(r355277)
+++ projects/nfsv42/sys/arm64/rockchip/clk/rk3399_cru.c	Mon Dec  2 00:11:12 2019	(r355278)
@@ -50,1930 +50,1188 @@ __FBSDID("$FreeBSD$");
 
 #include <arm64/rockchip/clk/rk_cru.h>
 
-/* GATES */
+#include <arm64/rockchip/clk/rk3399_cru_dt.h>
 
-#define	SCLK_USB2PHY0_REF	123
-#define	SCLK_USB2PHY1_REF	124
-#define	SCLK_USB3OTG0_REF	129
-#define	SCLK_USB3OTG1_REF	130
-#define	SCLK_USB3OTG0_SUSPEND	131
-#define	SCLK_USB3OTG1_SUSPEND	132
-#define	ACLK_EMMC_CORE		241
-#define	ACLK_EMMC_NOC		242
-#define	ACLK_EMMC_GRF		243
-#define	ACLK_USB3_NOC		245
-#define	ACLK_USB3OTG0		246
-#define	ACLK_USB3OTG1		247
-#define	ACLK_USB3_RKSOC_AXI_PERF	248
-#define	ACLK_USB3_GRF		249
-#define	PCLK_GPIO2		336
-#define	PCLK_GPIO3		337
-#define	PCLK_GPIO4		338
-#define	PCLK_I2C1		341
-#define	PCLK_I2C2		342
-#define	PCLK_I2C3		343
-#define	PCLK_I2C5		344
-#define	PCLK_I2C6		345
-#define	PCLK_I2C7		346
-#define	PCLK_SPI0		347
-#define	PCLK_SPI1		348
-#define	PCLK_SPI2		349
-#define	PCLK_SPI4		350
-#define	PCLK_SPI5		351
-#define	HCLK_HOST0		456
-#define	HCLK_HOST0_ARB		457
-#define	HCLK_HOST1		458
-#define	HCLK_HOST1_ARB		459
-#define	HCLK_SDMMC		462
+#define	CRU_CLKSEL_CON(x)	(0x100 + (x) * 0x4)
+#define	CRU_CLKGATE_CON(x)	(0x300 + (x) * 0x4)
 
+
+/* GATES */
+
 static struct rk_cru_gate rk3399_gates[] = {
 	/* CRU_CLKGATE_CON0 */
-	CRU_GATE(0, "clk_core_l_lpll_src", "lpll", 0x300, 0)
-	CRU_GATE(0, "clk_core_l_bpll_src", "bpll", 0x300, 1)
-	CRU_GATE(0, "clk_core_l_dpll_src", "dpll", 0x300, 2)
-	CRU_GATE(0, "clk_core_l_gpll_src", "gpll", 0x300, 3)
+	/* 15-8 unused */
+	GATE(SCLK_PVTM_CORE_L, "clk_pvtm_core_l", "xin24m",		0, 7),
+	GATE(0, "pclk_dbg_core_l", "pclk_dbg_core_l_c",			0, 6),
+	GATE(0, "atclk_core_l", "atclk_core_l_c",			0, 5),
+	GATE(0, "aclkm_core_l", "aclkm_core_l_c",			0, 4),
+	GATE(0, "clk_core_l_gpll_src", "gpll",				0, 3),
+	GATE(0, "clk_core_l_dpll_src", "dpll",				0, 2),
+	GATE(0, "clk_core_l_bpll_src", "bpll",				0, 1),
+	GATE(0, "clk_core_l_lpll_src", "lpll",				0, 0),
 
 	/* CRU_CLKGATE_CON1 */
-	CRU_GATE(0, "clk_core_b_lpll_src", "lpll", 0x304, 0)
-	CRU_GATE(0, "clk_core_b_bpll_src", "bpll", 0x304, 1)
-	CRU_GATE(0, "clk_core_b_dpll_src", "dpll", 0x304, 2)
-	CRU_GATE(0, "clk_core_b_gpll_src", "gpll", 0x304, 3)
+	/* 15 - 8 unused */
+	GATE(SCLK_PVTM_CORE_B, "clk_pvtm_core_b", "xin24m",		1, 7),
+	GATE(0, "pclk_dbg_core_b","pclk_dbg_core_b_c",			1, 6),
+	GATE(0, "atclk_core_b", "atclk_core_b_c", 			1, 5),
+	GATE(0, "aclkm_core_b", "aclkm_core_b_c",			1, 4),
+	GATE(0, "clk_core_b_gpll_src", "gpll",				1, 3),
+	GATE(0, "clk_core_b_dpll_src", "dpll",				1, 2),
+	GATE(0, "clk_core_b_bpll_src", "bpll",				1, 1),
+	GATE(0, "clk_core_b_lpll_src", "lpll",				1, 0),
 
+	/* CRU_CLKGATE_CON2 */
+	/* 15 - 11 unused */
+	GATE(0, "npll_cs", "npll",					2, 10),
+	GATE(0, "gpll_cs", "gpll",					2, 9),
+	GATE(0, "cpll_cs", "cpll",					2, 8),
+	GATE(SCLK_CCI_TRACE, "clk_cci_trace", "clk_cci_trace_c",	2, 7),
+	GATE(0, "gpll_cci_trace", "gpll",				2, 6),
+	GATE(0, "cpll_cci_trace", "cpll",				2, 5),
+	GATE(0, "aclk_cci_pre", "aclk_cci_pre_c",			2, 4),
+	GATE(0, "vpll_aclk_cci_src", "vpll",				2, 3),
+	GATE(0, "npll_aclk_cci_src", "npll",				2, 2),
+	GATE(0, "gpll_aclk_cci_src", "gpll",				2, 1),
+	GATE(0, "cpll_aclk_cci_src", "cpll",				2, 0),
+
+	/* CRU_CLKGATE_CON3 */
+	/* 15 - 8 unused */
+	GATE(0, "aclk_center", "aclk_center_c",				3, 7),
+	/* 6 unused */
+	/* 5 unused */
+	GATE(PCLK_DDR, "pclk_ddr", "pclk_ddr_c",			3, 4),
+	GATE(0, "clk_ddrc_gpll_src", "gpll",				3, 3),
+	GATE(0, "clk_ddrc_dpll_src", "dpll",				3, 2),
+	GATE(0, "clk_ddrc_bpll_src", "bpll",				3, 1),
+	GATE(0, "clk_ddrc_lpll_src", "lpll",				3, 0),
+
+
+	/* CRU_CLKGATE_CON4 */
+	/* 15 - 12 unused */
+	GATE(SCLK_PVTM_DDR, "clk_pvtm_ddr", "xin24m",			4, 11),
+	GATE(0, "clk_rga_core", "clk_rga_core_c",			4, 10),
+	GATE(0, "hclk_rga_pre", "hclk_rga_pre_c",			4, 9),
+	GATE(0, "aclk_rga_pre", "aclk_rga_pre_c",			4, 8),
+	GATE(0, "hclk_iep_pre", "hclk_iep_pre_c",			4, 7),
+	GATE(0, "aclk_iep_pre", "aclk_iep_pre_c",			4, 6),
+	GATE(SCLK_VDU_CA, "clk_vdu_ca", "clk_vdu_ca_c",			4, 5),
+	GATE(SCLK_VDU_CORE, "clk_vdu_core", "clk_vdu_core_c",		4, 4),
+	GATE(0, "hclk_vdu_pre", "hclk_vdu_pre_c",			4, 3),
+	GATE(0, "aclk_vdu_pre", "aclk_vdu_pre_c",			4, 2),
+	GATE(0, "hclk_vcodec_pre", "hclk_vcodec_pre_c",			4, 1),
+	GATE(0, "aclk_vcodec_pre", "aclk_vcodec_pre_c",			4, 0),
+
 	/* CRU_CLKGATE_CON5 */
-	CRU_GATE(0, "cpll_aclk_perihp_src", "cpll", 0x314, 0)
-	CRU_GATE(0, "gpll_aclk_perihp_src", "gpll", 0x314, 1)
+	/* 15 - 10 unused */
+	GATE(SCLK_MAC_TX, "clk_rmii_tx", "clk_rmii_src",		5, 9),
+	GATE(SCLK_MAC_RX, "clk_rmii_rx", "clk_rmii_src",		5, 8),
+	GATE(SCLK_MACREF, "clk_mac_ref", "clk_rmii_src",		5, 7),
+	GATE(SCLK_MACREF_OUT, "clk_mac_refout", "clk_rmii_src",		5, 6),
+	GATE(SCLK_MAC, "clk_gmac", "clk_gmac_c",			5, 5),
+	GATE(PCLK_PERIHP, "pclk_perihp", "pclk_perihp_c",		5, 4),
+	GATE(HCLK_PERIHP, "hclk_perihp", "hclk_perihp_c",		5, 3),
+	GATE(ACLK_PERIHP, "aclk_perihp", "aclk_perihp_c",		5, 2),
+	GATE(0, "cpll_aclk_perihp_src", "cpll",				5, 1),
+	GATE(0, "gpll_aclk_perihp_src", "gpll",				5, 0),
 
 	/* CRU_CLKGATE_CON6 */
-	CRU_GATE(0, "gpll_aclk_emmc_src", "gpll", 0x318, 12)
-	CRU_GATE(0, "cpll_aclk_emmc_src", "cpll", 0x318, 13)
-	CRU_GATE(SCLK_USB2PHY0_REF, "clk_usb2phy0_ref", "xin24m", 0x318, 5)
-	CRU_GATE(SCLK_USB2PHY1_REF, "clk_usb2phy1_ref", "xin24m", 0x318, 6)
+	/* 15 unused */
+	GATE(SCLK_EMMC, "clk_emmc", "clk_emmc_c",			6, 14),
+	GATE(0, "cpll_aclk_emmc_src", "cpll",				6, 13),
+	GATE(0, "gpll_aclk_emmc_src", "gpll",				6, 12),
+	GATE(0, "pclk_gmac_pre", "pclk_gmac_pre_c",			6, 11),
+	GATE(0, "aclk_gmac_pre", "aclk_gmac_pre_c",			6, 10),
+	GATE(0, "cpll_aclk_gmac_src", "cpll",				6, 9),
+	GATE(0, "gpll_aclk_gmac_src", "gpll",				6, 8),
+	/* 7 unused */
+	GATE(SCLK_USB2PHY1_REF, "clk_usb2phy1_ref", "xin24m",		6, 6),
+	GATE(SCLK_USB2PHY0_REF, "clk_usb2phy0_ref", "xin24m", 		6, 5),
+	GATE(SCLK_HSICPHY, "clk_hsicphy", "clk_hsicphy_c",		6, 4),
+	GATE(0, "clk_pcie_core_cru", "clk_pcie_core_cru_c",		6, 3),
+	GATE(SCLK_PCIE_PM, "clk_pcie_pm", "clk_pcie_pm_c",		6, 2),
+	GATE(SCLK_SDMMC, "clk_sdmmc", "clk_sdmmc_c",			6, 1),
+	GATE(SCLK_SDIO, "clk_sdio", "clk_sdio_c",			6, 0),
 
 	/* CRU_CLKGATE_CON7 */
-	CRU_GATE(0, "gpll_aclk_perilp0_src", "gpll", 0x31C, 0)
-	CRU_GATE(0, "cpll_aclk_perilp0_src", "cpll", 0x31C, 1)
+	/* 15 - 10 unused */
+	GATE(FCLK_CM0S, "fclk_cm0s", "fclk_cm0s_c",			7, 9),
+	GATE(SCLK_CRYPTO1, "clk_crypto1", "clk_crypto1_c",		7, 8),
+	GATE(SCLK_CRYPTO0, "clk_crypto0", "clk_crypto0_c",		7, 7),
+	GATE(0, "cpll_fclk_cm0s_src", "cpll",				7, 6),
+	GATE(0, "gpll_fclk_cm0s_src", "gpll",				7, 5),
+	GATE(PCLK_PERILP0, "pclk_perilp0", "pclk_perilp0_c",		7, 4),
+	GATE(HCLK_PERILP0, "hclk_perilp0", "hclk_perilp0_c",		7, 3),
+	GATE(ACLK_PERILP0, "aclk_perilp0", "aclk_perilp0_c",		7, 2),
+	GATE(0, "cpll_aclk_perilp0_src", "cpll",			7, 1),
+	GATE(0, "gpll_aclk_perilp0_src", "gpll",			7, 0),
 
 	/* CRU_CLKGATE_CON8 */
-	CRU_GATE(0, "hclk_perilp1_cpll_src", "cpll", 0x320, 1)
-	CRU_GATE(0, "hclk_perilp1_gpll_src", "gpll", 0x320, 0)
+	GATE(SCLK_SPDIF_8CH, "clk_spdif", "clk_spdif_mux",		8, 15),
+	GATE(0, "clk_spdif_frac", "clk_spdif_frac_c",			8, 14),
+	GATE(0, "clk_spdif_div", "clk_spdif_div_c",			8, 13),
+	GATE(SCLK_I2S_8CH_OUT, "clk_i2sout", "clk_i2sout_c",		8, 12),
+	GATE(SCLK_I2S2_8CH, "clk_i2s2", "clk_i2s2_mux",			8, 11),
+	GATE(0, "clk_i2s2_frac", "clk_i2s2_frac_c",			8, 10),
+	GATE(0, "clk_i2s2_div", "clk_i2s2_div_c",			8, 9),
+	GATE(SCLK_I2S1_8CH, "clk_i2s1", "clk_i2s1_mux",			8, 8),
+	GATE(0, "clk_i2s1_frac", "clk_i2s1_frac_c",			8, 7),
+	GATE(0, "clk_i2s1_div", "clk_i2s1_div_c",			8, 6),
+	GATE(SCLK_I2S0_8CH, "clk_i2s0", "clk_i2s0_mux",			8, 5),
+	GATE(0, "clk_i2s0_frac","clk_i2s0_frac_c",			8, 4),
+	GATE(0, "clk_i2s0_div","clk_i2s0_div_c",			8, 3),
+	GATE(PCLK_PERILP1, "pclk_perilp1", "pclk_perilp1_c",		8, 2),
+	GATE(HCLK_PERILP1, "cpll_hclk_perilp1_src", "cpll",		8, 1),
+	GATE(0, "gpll_hclk_perilp1_src", "gpll",			8, 0),
 
-	/* CRU_CLKGATE_CON12 */
-	CRU_GATE(SCLK_USB3OTG0_REF, "sclk_usb3otg0_ref", "xin24m", 0x330, 1)
-	CRU_GATE(SCLK_USB3OTG1_REF, "sclk_usb3otg1_ref", "xin24m", 0x330, 2)
-	CRU_GATE(SCLK_USB3OTG0_SUSPEND, "sclk_usb3otg0_suspend", "xin24m", 0x330, 3)
-	CRU_GATE(SCLK_USB3OTG1_SUSPEND, "sclk_usb3otg1_suspend", "xin24m", 0x330, 4)
+	/* CRU_CLKGATE_CON9 */
+	GATE(SCLK_SPI4, "clk_spi4", "clk_spi4_c", 			9, 15),
+	GATE(SCLK_SPI2, "clk_spi2", "clk_spi2_c",			9, 14),
+	GATE(SCLK_SPI1, "clk_spi1", "clk_spi1_c",			9, 13),
+	GATE(SCLK_SPI0, "clk_spi0", "clk_spi0_c",			9, 12),
+	GATE(SCLK_SARADC, "clk_saradc", "clk_saradc_c",			9, 11),
+	GATE(SCLK_TSADC, "clk_tsadc", "clk_tsadc_c",			9, 10),
+	/* 9 - 8 unused */
+	GATE(0, "clk_uart3_frac", "clk_uart3_frac_c",			9, 7),
+	GATE(0, "clk_uart3_div", "clk_uart3_div_c",			9, 6),
+	GATE(0, "clk_uart2_frac", "clk_uart2_frac_c",			9, 5),
+	GATE(0, "clk_uart2_div", "clk_uart2_div_c",			9, 4),
+	GATE(0, "clk_uart1_frac", "clk_uart1_frac_c",			9, 3),
+	GATE(0, "clk_uart1_div", "clk_uart1_div_c",			9, 2),
+	GATE(0, "clk_uart0_frac", "clk_uart0_frac_c", 			9, 1),
+	GATE(0, "clk_uart0_div", "clk_uart0_div_c",			9, 0),
 
-	/* CRU_CLKGATE_CON20 */
-	CRU_GATE(HCLK_HOST0, "hclk_host0", "hclk_perihp", 0x350, 5)
-	CRU_GATE(HCLK_HOST0_ARB, "hclk_host0_arb", "hclk_perihp", 0x350, 6)
-	CRU_GATE(HCLK_HOST1, "hclk_host1", "hclk_perihp", 0x350, 7)
-	CRU_GATE(HCLK_HOST1_ARB, "hclk_host1_arb", "hclk_perihp", 0x350, 8)
+	/* CRU_CLKGATE_CON10 */
+	GATE(SCLK_VOP1_PWM, "clk_vop1_pwm", "clk_vop1_pwm_c",		10, 15),
+	GATE(SCLK_VOP0_PWM, "clk_vop0_pwm", "clk_vop0_pwm_c",		10, 14),
+	GATE(DCLK_VOP0_DIV, "dclk_vop0_div", "dclk_vop0_div_c",		10, 12),
+	GATE(DCLK_VOP1_DIV, "dclk_vop1_div", "dclk_vop1_div_c",		10, 13),
+	GATE(0, "hclk_vop1_pre", "hclk_vop1_pre_c",			10, 11),
+	GATE(ACLK_VOP1_PRE, "aclk_vop1_pre", "aclk_vop1_pre_c",		10, 10),
+	GATE(0, "hclk_vop0_pre", "hclk_vop0_pre_c",			10, 9),
+	GATE(ACLK_VOP0_PRE, "aclk_vop0_pre", "aclk_vop0_pre_c",		10, 8),
+	GATE(0, "clk_cifout_src", "clk_cifout_src_c",			10, 7),
+	GATE(SCLK_SPDIF_REC_DPTX, "clk_spdif_rec_dptx", "clk_spdif_rec_dptx_c", 10, 6),
+	GATE(SCLK_I2C7, "clk_i2c7", "clk_i2c7_c",			10, 5),
+	GATE(SCLK_I2C3, "clk_i2c3", "clk_i2c3_c",			10, 4),
+	GATE(SCLK_I2C6, "clk_i2c6", "clk_i2c6_c",			10, 3),
+	GATE(SCLK_I2C2, "clk_i2c2", "clk_i2c2_c",			10, 2),
+	GATE(SCLK_I2C5, "clk_i2c5", "clk_i2c5_c",			10, 1),
+	GATE(SCLK_I2C1, "clk_i2c1", "clk_i2c1_c",			10, 0),
 
-	/* CRU_CLKGATE_CON22 */
-	CRU_GATE(PCLK_I2C7, "pclk_rki2c7", "pclk_perilp1", 0x358, 5)
-	CRU_GATE(PCLK_I2C1, "pclk_rki2c1", "pclk_perilp1", 0x358, 6)
-	CRU_GATE(PCLK_I2C5, "pclk_rki2c5", "pclk_perilp1", 0x358, 7)
-	CRU_GATE(PCLK_I2C6, "pclk_rki2c6", "pclk_perilp1", 0x358, 8)
-	CRU_GATE(PCLK_I2C2, "pclk_rki2c2", "pclk_perilp1", 0x358, 9)
-	CRU_GATE(PCLK_I2C3, "pclk_rki2c3", "pclk_perilp1", 0x358, 10)
 
-	/* CRU_CLKGATE_CON23 */
-	CRU_GATE(PCLK_SPI0, "pclk_spi0", "pclk_perilp1", 0x35C, 10)
-	CRU_GATE(PCLK_SPI1, "pclk_spi1", "pclk_perilp1", 0x35C, 11)
-	CRU_GATE(PCLK_SPI2, "pclk_spi2", "pclk_perilp1", 0x35C, 12)
-	CRU_GATE(PCLK_SPI4, "pclk_spi4", "pclk_perilp1", 0x35C, 13)
+	/* CRU_CLKGATE_CON11 */
+	GATE(SCLK_MIPIDPHY_CFG, "clk_mipidphy_cfg", "xin24m",		11, 15),
+	GATE(SCLK_MIPIDPHY_REF, "clk_mipidphy_ref", "xin24m",		11, 14),
+	/* 13-12 unused */
+	GATE(PCLK_EDP, "pclk_edp", "pclk_edp_c",			11, 11),
+	GATE(PCLK_HDCP, "pclk_hdcp", "pclk_hdcp_c",			11, 10),
+	/* 9 unuwsed */
+	GATE(SCLK_DP_CORE, "clk_dp_core", "clk_dp_core_c",		11, 8),
+	GATE(SCLK_HDMI_CEC, "clk_hdmi_cec", "clk_hdmi_cec_c",		11, 7),
+	GATE(SCLK_HDMI_SFR, "clk_hdmi_sfr", "xin24m",			11, 6),
+	GATE(SCLK_ISP1, "clk_isp1", "clk_isp1_c",			11, 5),
+	GATE(SCLK_ISP0, "clk_isp0",  "clk_isp0_c",			11, 4),
+	GATE(HCLK_HDCP, "hclk_hdcp",  "hclk_hdcp_c",			11, 3),
+	GATE(ACLK_HDCP, "aclk_hdcp", "aclk_hdcp_c",			11, 2),
+	GATE(PCLK_VIO, "pclk_vio", "pclk_vio_c",			11, 1),
+	GATE(ACLK_VIO, "aclk_vio", "aclk_vio_c",			11, 0),
 
-	/* CRU_CLKGATE_CON30 */
-	CRU_GATE(ACLK_USB3_NOC, "aclk_usb3_noc", "aclk_usb3", 0x378, 0)
-	CRU_GATE(ACLK_USB3OTG0, "aclk_usb3otg0", "aclk_usb3", 0x378, 1)
-	CRU_GATE(ACLK_USB3OTG1, "aclk_usb3otg1", "aclk_usb3", 0x378, 2)
-	CRU_GATE(ACLK_USB3_RKSOC_AXI_PERF, "aclk_usb3_rksoc_axi_perf", "aclk_usb3", 0x378, 3)
-	CRU_GATE(ACLK_USB3_GRF, "aclk_usb3_grf", "aclk_usb3", 0x378, 4)
+	/* CRU_CLKGATE_CON12 */
+	/* 15 - 14 unused */
+	GATE(HCLK_SD, "hclk_sd", "hclk_sd_c",				12, 13),
+	GATE(ACLK_GIC_PRE, "aclk_gic_pre",  "aclk_gic_pre_c",		12, 12),
+	GATE(HCLK_ISP1, "hclk_isp1", "hclk_isp1_c",			12, 11),
+	GATE(ACLK_ISP1, "aclk_isp1", "aclk_isp1_c",			12, 10),
+	GATE(HCLK_ISP0, "hclk_isp0", "hclk_isp0_c",			12, 9),
+	GATE(ACLK_ISP0, "aclk_isp0",  "aclk_isp0_c",			12, 8),
+	/* 7 unused */
+	GATE(SCLK_PCIEPHY_REF100M, "clk_pciephy_ref100m", "clk_pciephy_ref100m_c", 12, 6),
+	/* 5 unused */
+	GATE(SCLK_USB3OTG1_SUSPEND, "clk_usb3otg1_suspend", "clk_usb3otg1_suspend_c", 12, 4),
+	GATE(SCLK_USB3OTG0_SUSPEND, "clk_usb3otg0_suspend", "clk_usb3otg0_suspend_c", 12, 3),
+	GATE(SCLK_USB3OTG1_REF, "clk_usb3otg1_ref", "xin24m",		12, 2),
+	GATE(SCLK_USB3OTG0_REF, "clk_usb3otg0_ref", "xin24m",		12, 1),
+	GATE(ACLK_USB3, "aclk_usb3",  "aclk_usb3_c", 			12, 0),
 
-	/* CRU_CLKGATE_CON31 */
-	CRU_GATE(PCLK_GPIO2, "pclk_gpio2", "pclk_alive", 0x37c, 3)
-	CRU_GATE(PCLK_GPIO3, "pclk_gpio3", "pclk_alive", 0x37c, 4)
-	CRU_GATE(PCLK_GPIO4, "pclk_gpio4", "pclk_alive", 0x37c, 5)
+	/* CRU_CLKGATE_CON13 */
+	GATE(SCLK_TESTCLKOUT2, "clk_testout2", "clk_testout2_c",	13, 15),
+	GATE(SCLK_TESTCLKOUT1, "clk_testout1",  "clk_testout1_c",	13, 14),
+	GATE(SCLK_SPI5, "clk_spi5",  "clk_spi5_c",			13, 13),
+	GATE(0, "clk_usbphy0_480m_src", "clk_usbphy0_480m",		13, 12),
+	GATE(0, "clk_usbphy1_480m_src", "clk_usbphy1_480m",		13, 12),
+	GATE(0, "clk_test", "clk_test_c",				13, 11),
+	/* 10 unused */
+	GATE(0, "clk_test_frac", "clk_test_frac_c",			13, 9),
+	/* 8 unused */
+	GATE(SCLK_UPHY1_TCPDCORE, "clk_uphy1_tcpdcore", "clk_uphy1_tcpdcore_c", 13, 7),
+	GATE(SCLK_UPHY1_TCPDPHY_REF, "clk_uphy1_tcpdphy_ref", "clk_uphy1_tcpdphy_ref_c", 13, 6),
+	GATE(SCLK_UPHY0_TCPDCORE, "clk_uphy0_tcpdcore", "clk_uphy0_tcpdcore_c", 13, 5),
+	GATE(SCLK_UPHY0_TCPDPHY_REF, "clk_uphy0_tcpdphy_ref", "clk_uphy0_tcpdphy_ref_c", 13, 4),
+	/* 3 - 2 unused */
+	GATE(SCLK_PVTM_GPU, "aclk_pvtm_gpu", "xin24m", 			13, 1),
+	GATE(0, "aclk_gpu_pre", "aclk_gpu_pre_c",			13, 0),
 
-	/* CRU_CLKGATE_CON32 */
-	CRU_GATE(ACLK_EMMC_CORE, "aclk_emmccore", "aclk_emmc", 0x380, 8)
-	CRU_GATE(ACLK_EMMC_NOC, "aclk_emmc_noc", "aclk_emmc", 0x380, 9)
-	CRU_GATE(ACLK_EMMC_GRF, "aclk_emmcgrf", "aclk_emmc", 0x380, 10)
+	/* CRU_CLKGATE_CON14 */
+	/* 15 - 14 unused */
+	GATE(ACLK_PERF_CORE_L, "aclk_perf_core_l", "aclkm_core_l",	14, 13),
+	GATE(ACLK_CORE_ADB400_CORE_L_2_CCI500, "aclk_core_adb400_core_l_2_cci500", "aclkm_core_l", 14, 12),
+	GATE(ACLK_GIC_ADB400_CORE_L_2_GIC, "aclk_core_adb400_core_l_2_gic", "armclkl", 14, 11),
+	GATE(ACLK_GIC_ADB400_GIC_2_CORE_L, "aclk_core_adb400_gic_2_core_l", "armclkl", 14, 10),
+	GATE(0, "clk_dbg_pd_core_l", "armclkl",				14, 9),
+	/* 8 - 7 unused */
+	GATE(ACLK_PERF_CORE_B, "aclk_perf_core_b", "aclkm_core_b", 	14, 6),
+	GATE(ACLK_CORE_ADB400_CORE_B_2_CCI500, "aclk_core_adb400_core_b_2_cci500", "aclkm_core_b", 14, 5),
+	GATE(ACLK_GIC_ADB400_CORE_B_2_GIC, "aclk_core_adb400_core_b_2_gic", "armclkb", 14, 4),
+	GATE(ACLK_GIC_ADB400_GIC_2_CORE_B, "aclk_core_adb400_gic_2_core_b", "armclkb", 14, 3),
+	GATE(0, "pclk_dbg_cxcs_pd_core_b", "pclk_dbg_core_b",		14, 2),
+	GATE(0, "clk_dbg_pd_core_b", "armclkb", 			14, 1),
+	/* 0 unused */
 
-	/* CRU_CLKGATE_CON33 */
-	CRU_GATE(HCLK_SDMMC, "hclk_sdmmc", "hclk_sd", 0x384, 8)
+	/* CRU_CLKGATE_CON15 */
+	/* 15 - 8 unused */
+	GATE(ACLK_CCI_GRF, "aclk_cci_grf", "aclk_cci_pre",		15, 7),
+	GATE(0, "clk_dbg_noc", "clk_cs",				15, 6),
+	GATE(0, "clk_dbg_cxcs", "clk_cs",				15, 5),
+	GATE(ACLK_CCI_NOC1, "aclk_cci_noc1", "aclk_cci_pre",		15, 4),
+	GATE(ACLK_CCI_NOC0, "aclk_cci_noc0", "aclk_cci_pre",		15, 3),
+	GATE(ACLK_CCI, "aclk_cci", "aclk_cci_pre",			15, 2),
+	GATE(ACLK_ADB400M_PD_CORE_B, "aclk_adb400m_pd_core_b", "aclk_cci_pre", 15, 1),
+	GATE(ACLK_ADB400M_PD_CORE_L, "aclk_adb400m_pd_core_l", "aclk_cci_pre", 15, 0),
 
-	/* CRU_CLKGATE_CON34 */
-	CRU_GATE(PCLK_SPI4, "pclk_spi5", "pclk_perilp1", 0x388, 5)
-};
+	/* CRU_CLKGATE_CON16 */
+	/* 15 - 12 unused */
+	GATE(HCLK_RGA_NOC, "hclk_rga_noc", "hclk_rga_pre",		16, 11),
+	GATE(HCLK_RGA, "hclk_rga", "hclk_rga_pre", 			16, 10),
+	GATE(ACLK_RGA_NOC, "aclk_rga_noc", "aclk_rga_pre",		16, 9),
+	GATE(ACLK_RGA, "aclk_rga", "aclk_rga_pre", 			16, 8),
+	/* 7 - 4 unused */
+	GATE(HCLK_IEP_NOC, "hclk_iep_noc", "hclk_iep_pre",		16, 3),
+	GATE(HCLK_IEP, "hclk_iep", "hclk_iep_pre", 			16, 2),
+	GATE(ACLK_IEP_NOC, "aclk_iep_noc", "aclk_iep_pre",		16, 1),
+	GATE(ACLK_IEP, "aclk_iep", "aclk_iep_pre", 			16, 0),
 
 
-/*
- * PLLs
- */
+	/* CRU_CLKGATE_CON17 */
+	/* 15 - 12 unused */
+	GATE(HCLK_VDU_NOC, "hclk_vdu_noc", "hclk_vdu_pre",		17, 11),
+	GATE(HCLK_VDU, "hclk_vdu", "hclk_vdu_pre",			17, 10),
+	GATE(ACLK_VDU_NOC, "aclk_vdu_noc", "aclk_vdu_pre",		17, 9),
+	GATE(ACLK_VDU, "aclk_vdu", "aclk_vdu_pre", 			17, 8),
+	GATE(0, "hclk_vcodec_noc", "hclk_vcodec_pre",			17, 3),
+	GATE(HCLK_VCODEC, "hclk_vcodec", "hclk_vcodec_pre",		17, 2),
+	GATE(0, "aclk_vcodec_noc", "aclk_vcodec_pre",			17, 1),
+	GATE(ACLK_VCODEC, "aclk_vcodec", "aclk_vcodec_pre",		17, 0),
 
-#define PLL_APLLL			1
-#define PLL_APLLB			2
-#define PLL_DPLL			3
-#define PLL_CPLL			4
-#define PLL_GPLL			5
-#define PLL_NPLL			6
-#define PLL_VPLL			7
+	/* CRU_CLKGATE_CON18 */
+	GATE(PCLK_CIC, "pclk_cic", "pclk_ddr",				18, 15),
+	GATE(0, "clk_ddr_mon_timer", "xin24m",				18, 14),
+	GATE(0, "clk_ddr_mon", "clk_ddrc_div2",				18, 13),
+	GATE(PCLK_DDR_MON, "pclk_ddr_mon", "pclk_ddr", 			18, 12),
+	GATE(0, "clk_ddr_cic", "clk_ddrc_div2",				18, 11),
+	GATE(PCLK_CENTER_MAIN_NOC, "pclk_center_main_noc", "pclk_ddr",	18, 10),
+	GATE(0, "clk_ddrcfg_msch1", "clk_ddrc_div2",			18,  9),
+	GATE(0, "clk_ddrphy1", "clk_ddrc_div2",				18,  8),
+	GATE(0, "clk_ddrphy_ctrl1", "clk_ddrc_div2",			18,  7),
+	GATE(0, "clk_ddrc1", "clk_ddrc_div2",				18,  6),
+	GATE(0, "clk_ddr1_msch", "clk_ddrc_div2",			18,  5),
+	GATE(0, "clk_ddrcfg_msch0", "clk_ddrc_div2",			18,  4),
+	GATE(0, "clk_ddrphy0", "clk_ddrc_div2",				18,  3),
+	GATE(0, "clk_ddrphy_ctrl0", "clk_ddrc_div2",			18,  2),
+	GATE(0, "clk_ddrc0", "clk_ddrc_div2",				18,  1),
 
-static struct rk_clk_pll_rate rk3399_pll_rates[] = {
-	{
-		.freq = 2208000000,
-		.refdiv = 1,
-		.fbdiv = 92,
-		.postdiv1 = 1,
-		.postdiv2 = 1,
-		.dsmpd = 1,
-	},
-	{
-		.freq = 2184000000,
-		.refdiv = 1,
-		.fbdiv = 91,
-		.postdiv1 = 1,
-		.postdiv2 = 1,
-		.dsmpd = 1,
-	},
-	{
-		.freq = 2160000000,
-		.refdiv = 1,
-		.fbdiv = 90,
-		.postdiv1 = 1,
-		.postdiv2 = 1,
-		.dsmpd = 1,
-	},
-	{
-		.freq = 2136000000,
-		.refdiv = 1,
-		.fbdiv = 89,
-		.postdiv1 = 1,
-		.postdiv2 = 1,
-		.dsmpd = 1,
-	},
-	{
-		.freq = 2112000000,
-		.refdiv = 1,
-		.fbdiv = 88,
-		.postdiv1 = 1,
-		.postdiv2 = 1,
-		.dsmpd = 1,
-	},
-	{
-		.freq = 2088000000,
-		.refdiv = 1,
-		.fbdiv = 87,
-		.postdiv1 = 1,
-		.postdiv2 = 1,
-		.dsmpd = 1,
-	},
-	{
-		.freq = 2064000000,
-		.refdiv = 1,
-		.fbdiv = 86,
-		.postdiv1 = 1,
-		.postdiv2 = 1,
-		.dsmpd = 1,
-	},
-	{
-		.freq = 2040000000,
-		.refdiv = 1,
-		.fbdiv = 85,
-		.postdiv1 = 1,
-		.postdiv2 = 1,
-		.dsmpd = 1,
-	},
-	{
-		.freq = 2016000000,
-		.refdiv = 1,
-		.fbdiv = 84,
-		.postdiv1 = 1,
-		.postdiv2 = 1,
-		.dsmpd = 1,
-	},
-	{
-		.freq = 1992000000,
-		.refdiv = 1,
-		.fbdiv = 83,
-		.postdiv1 = 1,
-		.postdiv2 = 1,
-		.dsmpd = 1,
-	},
-	{
-		.freq = 1968000000,
-		.refdiv = 1,
-		.fbdiv = 82,
-		.postdiv1 = 1,
-		.postdiv2 = 1,
-		.dsmpd = 1,
-	},
-	{
-		.freq = 1944000000,
-		.refdiv = 1,
-		.fbdiv = 81,
-		.postdiv1 = 1,
-		.postdiv2 = 1,
-		.dsmpd = 1,
-	},
-	{
-		.freq = 1920000000,
-		.refdiv = 1,
-		.fbdiv = 80,
-		.postdiv1 = 1,
-		.postdiv2 = 1,
-		.dsmpd = 1,
-	},
-	{
-		.freq = 1896000000,
-		.refdiv = 1,
-		.fbdiv = 79,
-		.postdiv1 = 1,
-		.postdiv2 = 1,
-		.dsmpd = 1,
-	},
-	{
-		.freq = 1872000000,
-		.refdiv = 1,
-		.fbdiv = 78,
-		.postdiv1 = 1,
-		.postdiv2 = 1,
-		.dsmpd = 1,
-	},
-	{
-		.freq = 1848000000,
-		.refdiv = 1,
-		.fbdiv = 77,
-		.postdiv1 = 1,
-		.postdiv2 = 1,
-		.dsmpd = 1,
-	},
-	{
-		.freq = 1824000000,
-		.refdiv = 1,
-		.fbdiv = 76,
-		.postdiv1 = 1,
-		.postdiv2 = 1,
-		.dsmpd = 1,
-	},
-	{
-		.freq = 1800000000,
-		.refdiv = 1,
-		.fbdiv = 75,
-		.postdiv1 = 1,
-		.postdiv2 = 1,
-		.dsmpd = 1,
-	},
-	{
-		.freq = 1776000000,
-		.refdiv = 1,
-		.fbdiv = 74,
-		.postdiv1 = 1,

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
