CVS commit: [netbsd-10] src

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    src
Committed By:   martin
Date:           Sun May 28 10:14:36 UTC 2023

Modified Files:
        src/distrib/sets/lists/dtb [netbsd-10]: ad.earmv7hf
        src/sys/arch/arm/imx [netbsd-10]: imx23_usb.c imxusb.c imxusbvar.h
        src/sys/arch/arm/nxp [netbsd-10]: files.imx imx6_ccm.c imx6_ccmreg.h
            imx6_ccmvar.h imx6_clk.c imx6_gpc.c imx6_iomux.c imx6_pcie.c
            imx6_platform.c imx6_reg.h imx6_spi.c imx6_usb.c imx6_usbphy.c
            imx_sdhc.c
        src/sys/arch/evbarm/conf [netbsd-10]: GENERIC
        src/sys/dtb/arm [netbsd-10]: Makefile
Added Files:
        src/sys/arch/arm/nxp [netbsd-10]: imx6sx_clk.c

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #182):

        sys/arch/arm/nxp/imx6_platform.c: revision 1.8 (via patch)
        sys/arch/arm/nxp/imx6_platform.c: revision 1.9 (via patch)
        sys/arch/arm/nxp/imx6_ccmvar.h: revision 1.2
        sys/arch/arm/nxp/imx6_ccmvar.h: revision 1.3
        distrib/sets/lists/dtb/ad.earmv7hf: revision 1.10
        sys/arch/arm/nxp/imx6sx_clk.c: revision 1.1
        sys/arch/arm/nxp/imx6_ccm.c: revision 1.3
        sys/arch/arm/nxp/imx6sx_clk.c: revision 1.2
        sys/arch/arm/nxp/imx6_ccm.c: revision 1.4
        sys/arch/arm/nxp/imx6sx_clk.c: revision 1.3
        sys/arch/arm/nxp/imx6_spi.c: revision 1.8
        sys/arch/arm/nxp/imx_sdhc.c: revision 1.8
        sys/arch/arm/imx/imxusb.c: revision 1.19
        sys/arch/arm/nxp/imx6_usb.c: revision 1.7
        sys/arch/arm/nxp/imx6_usb.c: revision 1.8
        sys/arch/arm/nxp/files.imx: revision 1.3
        sys/arch/arm/nxp/imx6_clk.c: revision 1.5
        sys/arch/arm/nxp/imx6_clk.c: revision 1.6
        sys/arch/arm/nxp/imx6_reg.h: revision 1.2
        sys/arch/arm/nxp/imx6_gpc.c: revision 1.4
        sys/arch/arm/imx/imx23_usb.c: revision 1.6
        sys/dtb/arm/Makefile: revision 1.6
        sys/arch/arm/imx/imxusbvar.h: revision 1.7
        sys/arch/evbarm/conf/GENERIC: revision 1.119
        sys/arch/arm/nxp/imx6_ccmreg.h: revision 1.2
        sys/arch/arm/nxp/imx6_iomux.c: revision 1.3
        sys/arch/arm/nxp/imx6_usbphy.c: revision 1.3
        sys/arch/arm/nxp/imx6_pcie.c: revision 1.7

In preparation of imx6sx support, move imx6q-specific definitions from
imx6_ccm.c to imx6_clk.c, and prefix with IMX6Q/imx6q:
- Clock IDs and related struct imx_clock_id
- Clock Parents and Divider Tables
- struct imx6_clk
and related static functions

Add a pointer to struct imx6_clk, and it's size to imx6ccm_softc

Pass a pointer to imx6ccm_softc to all functions from imx6_ccm.c
NFCI

i.mx6sx CPU support in the CCM module: the clock tree si different from
the i.mx6q
- move i.mx6q-specific functions and data to imx6_clk.c
- add i.mx6sx specific imx6sx_clk.c
- add a imx6sxccm device
i.mx6sx platform support:
- the i.mx6sx has a third AIPS, so KERNEL_IO_IOREG map has to be larger
- the uart clock is at 24Mhz instead of 80.

Add i.mx6sx compatible entries to drivers that should work as is.

Fix typo, preventing i2c4 from attaching
remove commented out entries, leftover from the imx6q ccm code.
introduce imx6sx_platform_bootstrap(), which calls imx_platform_bootstrap()
and then checks for an "arm,cortex-a9-twd-timer" compatible entry in the
fdt. If not present, create one so that a9ptmr will attach.
We need this entry as this is the only timer we support for this platform,
but the upstream imx6sx.dtsi is missing the entry for it (and all A9 CPUs
have it anyway).

Thanks to Jared McNeill for advices and review.

Also build dtb files for CONFIG_SOC_IMX6SX

experimental IMX6SX support:
- add options SOC_IMX6SX
- add imx6sxccm device
tested on a UDOO Neo Full board.

known to work:
- uart (console)
- sdmmc0
- ethernet (enet0)
known to not work:
- USB (device not detected).

needs a modified device tree at this time (add arm,cortex-a9-twd-timer entry
copied from the imx6qdl dtsi); for unkown reason the imx6sx.dtsi file lacks
an entry for the a9ptmr although it is present in the soc (and, from what I
understood, in all cortex A9 SoCs).

Add imx6sx dtb files

The i.mx6sx has 2 OTG and one host-only USB controller, while the 6q has
only one OTG.

Add a "uintptr_t data" argument to all sc_*_md_hook callbacks, which
gets the sc_md_hook_data value when called.

In imx6_usb.c use this to pass the number of OTG controllers to the callbacks.
imx6_usb_init() can then properly call init_otg() or init_h1() for unit 1.

In imx6_usb_attach(), test if there is a vbus-supply property in the fdt,
and enable the regulator if present.

Now the USB port of the UDOO Neo works.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.2.1 src/distrib/sets/lists/dtb/ad.earmv7hf
cvs rdiff -u -r1.5 -r1.5.6.1 src/sys/arch/arm/imx/imx23_usb.c
cvs rdiff -u -r1.18 -r1.18.6.1 src/sys/arch/arm/imx/imxusb.c
cvs rdiff -u -r1.6 -r1.6.28.1 src/sys/arch/arm/imx/imxusbvar.h
cvs rdiff -u -r1.2 -r1.2.4.1 src/sys/arch/arm/nxp/files.imx \
    src/sys/arch/arm/nxp/imx6_ccm.c
cvs rdiff -u -r1.1 -r1.1.20.1 src/sys/arch/arm/nxp/imx6_ccmreg.h \
    src/sys/arch/arm/nxp/imx6_ccmvar.h src/sys/arch/arm/nxp/imx6_reg.h
cvs rdiff -u -r1.4 -r1.4.4.1 src/sys/arch/arm/nxp/imx6_clk.c
cvs rdiff -u -r1.3 -r1.3.18.1 src/sys/arch/arm/nxp/imx6_gpc.c
cvs rdiff -u -r1.2 -r1.2.18.1 src/sys/arch/arm/nxp/imx6_iomux.c \
    src/sys/arch/arm/nxp/imx6_usbphy.c
cvs rdiff -u -r1.6 -r1.6.18.1 src/sys/arch/arm/nxp/imx6_pcie.c
cvs rdiff -u -r1.6 -r1.6.16.1 src/sys/arch/arm/nxp/imx6_platform.c
cvs rdiff -u -r1.7 -r1.7.18.1 src/sys/arch/arm/nxp/imx6_spi.c
cvs rdiff -u -r1.6 -r1.6.6.1 src/sys/arch/arm/nxp/imx6_usb.c
cvs rdiff -u -r0 -r1.3.2.2 src/sys/arch/arm/nxp/imx6sx_clk.c
cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/arch/arm/nxp/imx_sdhc.c
cvs rdiff -u -r1.115 -r1.115.2.1 src/sys/arch/evbarm/conf/GENERIC
cvs rdiff -u -r1.5 -r1.5.4.1 src/sys/dtb/arm/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.