November 2019 - U-Boot

[U-Boot] [PATCH 00/26] Add and update drivers for MediaTek MT76x8 SoCs
by Weijie Gao 02 Jan '20

02 Jan '20

This patch series have the following changes: - Add pinctrl(both pinmux and pinconf) driver, reset controller driver and clock gating driver for mt7628. - Add mt7628 platform to mtk-sd driver. - Modify mt7628's ethernet & usb phy driver to take advantages from the new drivers. - Update mt7621-spi driver with a new transfer method. - Enable fifo, disable flow control, and enable non-DM implementation for mtk hsuart driver. - Enanble the new drivers for currently existed mt7628 boards. Weijie Gao (26): serial: serial_mtk: enable FIFO and disable flow control serial: serial_mtk: add non-DM version for SPL dts: mtmips: move uart property clock-frequency into mt7628an.dtsi dts: mtmips: enable high-speed UART support for mt7628 spi: mt7621-spi: remove data cache and rewrite its xfer function spi: mt7621-spi: restore default register value after each xfer pinctrl: add support for MediaTek MT7628 dts: mtmips: add pinctrl node for mt7628 dts: mtmips: add default pinctrl for uart nodes reset: add reset controller driver for MediaTek MIPS platform dts: mtmips: update reset controller node for mt7628 clk: add clock gating driver for MediaTek MIPS platform dts: mtmips: add gate clock node for mt7628 phy: mt76x8-usb-phy: add slew rate calibration and remove non-mt7628 part net: mt7628-eth: remove hardcoded gpio settings and regmap-based phy reset net: mt7628-eth: remove phy link up detection net: mt7628-eth: free rx descriptor on receiving failure net: mt7628-eth: add support to isolate LAN/WAN ports dts: mtmips: enable eth port0 led function for all boards mmc: mtk-sd: add support for MediaTek MT7620/MT7628 SoCs mmc: mtk-sd: add a dts property cd-active-high for builtin-cd mode dts: mtmips: add mmc related nodes for mt7628an.dtsi dts: mtmips: add default pinctrl for gardena-smart-gateway-mt7688 dts: mtmips: add default pinctrl to eth nodes for all boards configs: mtmips: change all boards to use mtk high-speed uart driver configs: mtmips: add necessary drivers for mtmips boards .../mips/dts/gardena-smart-gateway-mt7688.dts | 18 +- arch/mips/dts/linkit-smart-7688.dts | 15 +- arch/mips/dts/mt7628a.dtsi | 241 +++++++- ...gardena-smart-gateway-mt7688-ram_defconfig | 2 +- .../gardena-smart-gateway-mt7688_defconfig | 8 +- configs/linkit-smart-7688-ram_defconfig | 2 +- configs/linkit-smart-7688_defconfig | 8 +- drivers/clk/Kconfig | 8 + drivers/clk/Makefile | 1 + drivers/clk/clk-mtmips-cg.c | 63 ++ drivers/mmc/Kconfig | 2 +- drivers/mmc/mtk-sd.c | 32 +- drivers/net/mt7628-eth.c | 108 ++-- drivers/phy/Kconfig | 2 + drivers/phy/mt76x8-usb-phy.c | 225 +++++-- drivers/pinctrl/Kconfig | 1 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/mtmips/Kconfig | 13 + drivers/pinctrl/mtmips/Makefile | 7 + drivers/pinctrl/mtmips/pinctrl-mt7628.c | 585 ++++++++++++++++++ .../pinctrl/mtmips/pinctrl-mtmips-common.c | 87 +++ .../pinctrl/mtmips/pinctrl-mtmips-common.h | 53 ++ drivers/reset/Kconfig | 7 + drivers/reset/Makefile | 1 + drivers/reset/reset-mtmips.c | 82 +++ drivers/serial/serial.c | 2 + drivers/serial/serial_mtk.c | 223 ++++++- drivers/spi/mt7621_spi.c | 227 ++++--- .../configs/gardena-smart-gateway-mt7688.h | 2 +- include/configs/linkit-smart-7688.h | 2 +- include/dt-bindings/clk/mt7628-clk.h | 31 + include/dt-bindings/reset/mt7628-reset.h | 36 ++ 32 files changed, 1795 insertions(+), 300 deletions(-) create mode 100644 drivers/clk/clk-mtmips-cg.c create mode 100644 drivers/pinctrl/mtmips/Kconfig create mode 100644 drivers/pinctrl/mtmips/Makefile create mode 100644 drivers/pinctrl/mtmips/pinctrl-mt7628.c create mode 100644 drivers/pinctrl/mtmips/pinctrl-mtmips-common.c create mode 100644 drivers/pinctrl/mtmips/pinctrl-mtmips-common.h create mode 100644 drivers/reset/reset-mtmips.c create mode 100644 include/dt-bindings/clk/mt7628-clk.h create mode 100644 include/dt-bindings/reset/mt7628-reset.h -- 2.17.1

4 59

[U-Boot] [PATCH v4 0/5] of-platdata: Avoid building libfdt
by Simon Glass 02 Jan '20

02 Jan '20

The original patch of this series was sent in September but unfortunately caused build problems on some boards, since they don't comply with the of-platdata rules. With of-platdata, the idea is to compile the device tree into C structures to save space and avoid needing to use libfdt. But some boards use of-platdata while also using libfdt in a few areas, thus defeating the purpose of of-platdata. This series includes the original two patches http://patchwork.ozlabs.org/patch/1167420/ http://patchwork.ozlabs.org/patch/1167367/ as well as a few other patches to fix the build errors. Overall this reduces code size and provides better error messages when unavailable functions are used. Board maintainers should still take a look at the result, adjusting the of-platdata support as needed. Changes in v4: - Add new patch for rockchip build errors - Add new patch for omap MMC build errors - Add new patch for rockchip chromebook build errors - Pull out patches into a new series - Add new patches to handle build failures Changes in v3: - Fix eth_dev_get_mac_address() call dev_read...() only when available Simon Glass (5): rockchip: Avoid using libfdt with of-platdata omap: mmc: Avoid using libfdt with of-platdata rockchip: pinctrl: Disable full pinctrl for SPL dm: core: Don't include ofnode functions with of-platdata spl: Allow SPL/TPL to use of-platdata without libfdt configs/chromebit_mickey_defconfig | 1 + configs/chromebook_jerry_defconfig | 1 + configs/chromebook_minnie_defconfig | 1 + configs/chromebook_speedy_defconfig | 1 + drivers/clk/rockchip/clk_rk3328.c | 14 ++++++++++++-- drivers/core/Makefile | 4 +++- drivers/mmc/davinci_mmc.c | 6 ++++++ drivers/pinctrl/rockchip/pinctrl-rockchip-core.c | 6 ++++-- include/dm/read.h | 3 +-- lib/Kconfig | 4 ++-- net/eth-uclass.c | 2 +- 11 files changed, 33 insertions(+), 10 deletions(-) -- 2.24.0.rc1.363.gb1bccd3e3d-goog

5 12

[U-Boot] [PATCH v2 1/3] mach-imx: bootaux: print stack pointer and reset vector
by Igor Opaniuk 30 Dec '19

30 Dec '19

From: Igor Opaniuk <igor.opaniuk(a)toradex.com> 1. Change information printed about loaded M4 binary, print the stack pointer and reset vector addressed. 2. Add sanity check for the address provided as param. Signed-off-by: Igor Opaniuk <igor.opaniuk(a)toradex.com> --- arch/arm/mach-imx/imx_bootaux.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c index 3d9422d5a2..ee786f7d06 100644 --- a/arch/arm/mach-imx/imx_bootaux.c +++ b/arch/arm/mach-imx/imx_bootaux.c @@ -20,6 +20,9 @@ int arch_auxiliary_core_up(u32 core_id, ulong boot_private_data) stack = *(u32 *)boot_private_data; pc = *(u32 *)(boot_private_data + 4); + printf("## Starting auxiliary core stack = 0x%08lX, pc = 0x%08lX...\n", + stack, pc); + /* Set the stack and pc to M4 bootROM */ writel(stack, M4_BOOTROM_BASE_ADDR); writel(pc, M4_BOOTROM_BASE_ADDR + 4); @@ -80,7 +83,8 @@ static int do_bootaux(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) addr = simple_strtoul(argv[1], NULL, 16); - printf("## Starting auxiliary core at 0x%08lX ...\n", addr); + if (!addr) + return CMD_RET_FAILURE; ret = arch_auxiliary_core_up(0, addr); if (ret) -- 2.17.1

4 11

[U-Boot] [PATCH v4 0/7] usb: kbd: implement special keys
by Heinrich Schuchardt 30 Dec '19

30 Dec '19

GRUB uses function keys. So we should support these with an USB keyboard. Provide support for F1-F12, Insert, Delete, Home, End, Page Up, Page Down. Simplify the code beforehand. Enhance the keyboard unit test. In total I could not see any increase of u-boot.img on the TBS2910 but as the special keys are only needed in the context of the UEFI subsystem it makes sense to save several hundred bytes on other boards. size of u-boot.bin for tbs2910_defconfig 390080 with patch usb: kbd: implement special keys 389968 with all my patches 389968 tbs_defconfig, function keys enabled 390080 v4: reduce code size by avoiding string constants and introducing a configuration switch CONFIG_USB_KEYBOARD_FN_KEYS v3: rebase on current git HEAD v2: enhance the keyboard unit test Heinrich Schuchardt (7): usb: kbd: fix typo usb: kbd: signature of usb_kbd_put_queue() usb: kbd: simplify coding for arrow keys usb: kbd: implement special keys usb: kbd: move USB_KBD_BOOT_REPORT_SIZE to usb.h dm: test: usb: rework keyboard test sandbox: enable USB_KEYBOARD_FN_KEYS common/usb_kbd.c | 97 +++++----- configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_flattree_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + drivers/usb/Kconfig | 6 + drivers/usb/emul/sandbox_keyb.c | 27 ++- include/usb.h | 6 + test/dm/usb.c | 284 ++++++++++++++++++++++++++++- 9 files changed, 364 insertions(+), 60 deletions(-) -- 2.24.0

3 13

[U-Boot] [PATCH v1 0/6] imx: colibri imx6/imx7: apalis imx6: migrate to DM_ETH
by Igor Opaniuk 29 Dec '19

29 Dec '19

Migrate to DM_ETH and remove hardcoded pinmux configuration. Igor Opaniuk (6): ARM: dts: imx6_colibri: introduce fec node colibri_imx6: migrate to DM_ETH ARM: dts: imx6_apalis: introduce fec node apalis_imx6: migrate to DM_ETH ARM: dts: imx7: imx7_colibri: introduce fec node colibri_imx7: migrate to DM_ETH arch/arm/dts/imx6-apalis.dts | 22 ++++ arch/arm/dts/imx6-colibri.dts | 20 ++++ arch/arm/dts/imx7-colibri.dtsi | 116 ++++++++++++++++++++++ arch/arm/dts/imx7d.dtsi | 3 + arch/arm/dts/imx7s.dtsi | 1 + board/toradex/apalis_imx6/apalis_imx6.c | 51 ---------- board/toradex/colibri_imx6/colibri_imx6.c | 59 +---------- board/toradex/colibri_imx7/colibri_imx7.c | 44 -------- configs/apalis_imx6_defconfig | 3 + configs/colibri_imx6_defconfig | 3 + configs/colibri_imx7_defconfig | 5 +- configs/colibri_imx7_emmc_defconfig | 5 +- include/configs/apalis_imx6.h | 6 -- include/configs/colibri_imx6.h | 8 -- include/configs/colibri_imx7.h | 11 -- 15 files changed, 180 insertions(+), 177 deletions(-) -- 2.17.1

4 18

[U-Boot] [RESEND PATCH 00/10] GE boards initial DM conversion
by Robert Beckett 29 Dec '19

29 Dec '19

This searies syncs the device trees from Linux, fixes a couple of issues and starts enabling DM features for GE boards. Denis Zalevskiy (2): configs: ppd: DM for USB and regulators PPD board: ge: bx50v3: Enable DM for PCI and ethernet Ian Ray (4): configs: bx50v3: Fix boot hang with video board: ge: bx50v3: Fix run-time warning board: ge: bx50v3: Fix message output to video console board: ge: pass rtc_status via device tree Robert Beckett (4): board: ge: bx50v3: sync devicetrees from Linux board: ge: ppd: sync device tree from Linux board: ge: bx50v3: use imx wdt board: ge: mx53ppd: use imx wdt arch/arm/dts/Makefile | 7 +- arch/arm/dts/imx53-ppd-uboot.dtsi | 12 + arch/arm/dts/imx53-ppd.dts | 1081 +++++++++++++++++++++++++- arch/arm/dts/imx6q-b450v3.dts | 160 ++++ arch/arm/dts/imx6q-b650v3.dts | 159 ++++ arch/arm/dts/imx6q-b850v3.dts | 302 +++++++ arch/arm/dts/imx6q-ba16.dtsi | 640 +++++++++++++++ arch/arm/dts/imx6q-bx50v3-uboot.dtsi | 12 + arch/arm/dts/imx6q-bx50v3.dts | 78 +- arch/arm/dts/imx6q-bx50v3.dtsi | 381 +++++++++ board/ge/bx50v3/bx50v3.c | 160 ++-- board/ge/common/ge_common.c | 20 +- board/ge/mx53ppd/mx53ppd.c | 8 +- configs/ge_bx50v3_defconfig | 18 + configs/mx53ppd_defconfig | 5 + include/configs/ge_bx50v3.h | 23 +- include/configs/mx53ppd.h | 2 +- 17 files changed, 2865 insertions(+), 203 deletions(-) create mode 100644 arch/arm/dts/imx53-ppd-uboot.dtsi create mode 100644 arch/arm/dts/imx6q-b450v3.dts create mode 100644 arch/arm/dts/imx6q-b650v3.dts create mode 100644 arch/arm/dts/imx6q-b850v3.dts create mode 100644 arch/arm/dts/imx6q-ba16.dtsi create mode 100644 arch/arm/dts/imx6q-bx50v3-uboot.dtsi create mode 100644 arch/arm/dts/imx6q-bx50v3.dtsi -- 2.20.1

4 23

[U-Boot] [PATCH 1/2] board: cm_fx6: Enable DM support for video, fix build error
by sunil.m＠techveda.org 29 Dec '19

29 Dec '19

From: Suniel Mahesh <sunil.m(a)techveda.org> Enable driver model for Video to remove the following compile warning on CM-FX6 SOM based target: ===================== WARNING ====================== This board does not use CONFIG_DM_VIDEO Please update the board to use CONFIG_DM_VIDEO before the v2019.07 release. ==================================================== This change introduced build error as shown: LD u-boot drivers/built-in.o: In function ipu_displays_init' arm-linux-ld.bfd: BFD (GNU Binutils) 2.29.1 assertion fail elf32-arm.c:9509 Makefile:1621: recipe for target 'u-boot' failed make: *** [u-boot] Error 1 The DM converted video driver calls ipu_displays_init in its probe, which inturn calls relevant board_video_skip. Defining ipu_displays_init in the board file fixes build error. Target was compile tested, build was clean. Signed-off-by: Suniel Mahesh <sunil.m(a)techveda.org> --- board/compulab/cm_fx6/cm_fx6.c | 5 +++++ configs/cm_fx6_defconfig | 1 + 2 files changed, 6 insertions(+) diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index feb7a71..38dca2e 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -146,6 +146,11 @@ int board_video_skip(void) static inline void cm_fx6_setup_display(void) {} #endif /* CONFIG_VIDEO_IPUV3 */ +int ipu_displays_init(void) +{ + return board_video_skip(); +} + #ifdef CONFIG_DWC_AHSATA static int cm_fx6_issd_gpios[] = { /* The order of the GPIOs in the array is important! */ diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index a27cdd7..8288095 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -86,4 +86,5 @@ CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO=y +CONFIG_DM_VIDEO=y CONFIG_FDT_FIXUP_PARTITIONS=y -- 2.7.4

2 3

[U-Boot] [PATCH v1 1/2] MAINTAINERS: change apalis_imx6/colibri_imx6 maintainers
by Igor Opaniuk 29 Dec '19

29 Dec '19

From: Igor Opaniuk <igor.opaniuk(a)toradex.com> Take over maintainership for apalis_imx6 and colibri_imx6 modules. Signed-off-by: Igor Opaniuk <igor.opaniuk(a)toradex.com> --- board/toradex/apalis_imx6/MAINTAINERS | 2 +- board/toradex/colibri_imx6/MAINTAINERS | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/toradex/apalis_imx6/MAINTAINERS b/board/toradex/apalis_imx6/MAINTAINERS index 7efe816a78..4a2707e771 100644 --- a/board/toradex/apalis_imx6/MAINTAINERS +++ b/board/toradex/apalis_imx6/MAINTAINERS @@ -1,5 +1,5 @@ Apalis iMX6 -M: Max Krummenacher <max.krummenacher(a)toradex.com> +M: Igor Opaniuk <igor.opaniuk(a)toradex.com> W: http://developer.toradex.com/software/linux/linux-software W: https://www.toradex.com/community S: Maintained diff --git a/board/toradex/colibri_imx6/MAINTAINERS b/board/toradex/colibri_imx6/MAINTAINERS index e25c07306c..76f9446bba 100644 --- a/board/toradex/colibri_imx6/MAINTAINERS +++ b/board/toradex/colibri_imx6/MAINTAINERS @@ -1,5 +1,5 @@ Colibri iMX6 -M: Max Krummenacher <max.krummenacher(a)toradex.com> +M: Igor Opaniuk <igor.opaniuk(a)toradex.com> W: http://developer.toradex.com/software/linux/linux-software W: https://www.toradex.com/community S: Maintained -- 2.17.1

4 6

[U-Boot] [PATCH 1/4] ARM: mx6: ddr: Make debug prints work with tiny printf
by Marek Vasut 29 Dec '19

29 Dec '19

The %08X format returns just zeroes with tiny printf, which is horribly confusing, especially when debugging DRAM calibration problems. Change the format to %08x (with lowercase x), which behaves correctly with either implementation of printf in SPL. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Eric Nelson <eric(a)nelint.com> Cc: Fabio Estevam <fabio.estevam(a)nxp.com> Cc: Stefano Babic <sbabic(a)denx.de> --- arch/arm/mach-imx/mx6/ddr.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-imx/mx6/ddr.c b/arch/arm/mach-imx/mx6/ddr.c index 84b9236249..e6f69e904f 100644 --- a/arch/arm/mach-imx/mx6/ddr.c +++ b/arch/arm/mach-imx/mx6/ddr.c @@ -214,14 +214,14 @@ int mmdc_do_write_level_calibration(struct mx6_ddr_sysinfo const *sysinfo) writel(esdmisc_val, &mmdc0->mdref); writel(zq_val, &mmdc0->mpzqhwctrl); - debug("\tMMDC_MPWLDECTRL0 after write level cal: 0x%08X\n", + debug("\tMMDC_MPWLDECTRL0 after write level cal: 0x%08x\n", readl(&mmdc0->mpwldectrl0)); - debug("\tMMDC_MPWLDECTRL1 after write level cal: 0x%08X\n", + debug("\tMMDC_MPWLDECTRL1 after write level cal: 0x%08x\n", readl(&mmdc0->mpwldectrl1)); if (sysinfo->dsize == 2) { - debug("\tMMDC_MPWLDECTRL0 after write level cal: 0x%08X\n", + debug("\tMMDC_MPWLDECTRL0 after write level cal: 0x%08x\n", readl(&mmdc1->mpwldectrl0)); - debug("\tMMDC_MPWLDECTRL1 after write level cal: 0x%08X\n", + debug("\tMMDC_MPWLDECTRL1 after write level cal: 0x%08x\n", readl(&mmdc1->mpwldectrl1)); } @@ -557,20 +557,20 @@ int mmdc_do_dqs_calibration(struct mx6_ddr_sysinfo const *sysinfo) */ debug("MMDC registers updated from calibration\n"); debug("Read DQS gating calibration:\n"); - debug("\tMPDGCTRL0 PHY0 = 0x%08X\n", readl(&mmdc0->mpdgctrl0)); - debug("\tMPDGCTRL1 PHY0 = 0x%08X\n", readl(&mmdc0->mpdgctrl1)); + debug("\tMPDGCTRL0 PHY0 = 0x%08x\n", readl(&mmdc0->mpdgctrl0)); + debug("\tMPDGCTRL1 PHY0 = 0x%08x\n", readl(&mmdc0->mpdgctrl1)); if (sysinfo->dsize == 2) { - debug("\tMPDGCTRL0 PHY1 = 0x%08X\n", readl(&mmdc1->mpdgctrl0)); - debug("\tMPDGCTRL1 PHY1 = 0x%08X\n", readl(&mmdc1->mpdgctrl1)); + debug("\tMPDGCTRL0 PHY1 = 0x%08x\n", readl(&mmdc1->mpdgctrl0)); + debug("\tMPDGCTRL1 PHY1 = 0x%08x\n", readl(&mmdc1->mpdgctrl1)); } debug("Read calibration:\n"); - debug("\tMPRDDLCTL PHY0 = 0x%08X\n", readl(&mmdc0->mprddlctl)); + debug("\tMPRDDLCTL PHY0 = 0x%08x\n", readl(&mmdc0->mprddlctl)); if (sysinfo->dsize == 2) - debug("\tMPRDDLCTL PHY1 = 0x%08X\n", readl(&mmdc1->mprddlctl)); + debug("\tMPRDDLCTL PHY1 = 0x%08x\n", readl(&mmdc1->mprddlctl)); debug("Write calibration:\n"); - debug("\tMPWRDLCTL PHY0 = 0x%08X\n", readl(&mmdc0->mpwrdlctl)); + debug("\tMPWRDLCTL PHY0 = 0x%08x\n", readl(&mmdc0->mpwrdlctl)); if (sysinfo->dsize == 2) - debug("\tMPWRDLCTL PHY1 = 0x%08X\n", readl(&mmdc1->mpwrdlctl)); + debug("\tMPWRDLCTL PHY1 = 0x%08x\n", readl(&mmdc1->mpwrdlctl)); /* * Registers below are for debugging purposes. These print out -- 2.24.0

3 11

[U-Boot] [PATCH v2 1/4] dt-bindings: add imx-audmux macro definitions
by Baruch Siach 29 Dec '19

29 Dec '19

Import fsl-imx-audmux.h from Linux as of v5.4-rc6. The header is unchanged since v4.18. That would make it easier to import DT files that depend on imx-audmux definitions from the kernel tree. Signed-off-by: Baruch Siach <baruch(a)tkos.co.il> --- v2: New patch in this series. Suggested by Fabio Estevam. --- include/dt-bindings/sound/fsl-imx-audmux.h | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 include/dt-bindings/sound/fsl-imx-audmux.h diff --git a/include/dt-bindings/sound/fsl-imx-audmux.h b/include/dt-bindings/sound/fsl-imx-audmux.h new file mode 100644 index 000000000000..15f138bebe16 --- /dev/null +++ b/include/dt-bindings/sound/fsl-imx-audmux.h @@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __DT_FSL_IMX_AUDMUX_H +#define __DT_FSL_IMX_AUDMUX_H + +#define MX27_AUDMUX_HPCR1_SSI0 0 +#define MX27_AUDMUX_HPCR2_SSI1 1 +#define MX27_AUDMUX_HPCR3_SSI_PINS_4 2 +#define MX27_AUDMUX_PPCR1_SSI_PINS_1 3 +#define MX27_AUDMUX_PPCR2_SSI_PINS_2 4 +#define MX27_AUDMUX_PPCR3_SSI_PINS_3 5 + +#define MX31_AUDMUX_PORT1_SSI0 0 +#define MX31_AUDMUX_PORT2_SSI1 1 +#define MX31_AUDMUX_PORT3_SSI_PINS_3 2 +#define MX31_AUDMUX_PORT4_SSI_PINS_4 3 +#define MX31_AUDMUX_PORT5_SSI_PINS_5 4 +#define MX31_AUDMUX_PORT6_SSI_PINS_6 5 +#define MX31_AUDMUX_PORT7_SSI_PINS_7 6 + +#define MX51_AUDMUX_PORT1_SSI0 0 +#define MX51_AUDMUX_PORT2_SSI1 1 +#define MX51_AUDMUX_PORT3 2 +#define MX51_AUDMUX_PORT4 3 +#define MX51_AUDMUX_PORT5 4 +#define MX51_AUDMUX_PORT6 5 +#define MX51_AUDMUX_PORT7 6 + +/* + * TFCSEL/RFCSEL (i.MX27) or TFSEL/TCSEL/RFSEL/RCSEL (i.MX31/51/53/6Q) + * can be sourced from Rx/Tx. + */ +#define IMX_AUDMUX_RXFS 0x8 +#define IMX_AUDMUX_RXCLK 0x8 + +/* Register definitions for the i.MX21/27 Digital Audio Multiplexer */ +#define IMX_AUDMUX_V1_PCR_INMMASK(x) ((x) & 0xff) +#define IMX_AUDMUX_V1_PCR_INMEN (1 << 8) +#define IMX_AUDMUX_V1_PCR_TXRXEN (1 << 10) +#define IMX_AUDMUX_V1_PCR_SYN (1 << 12) +#define IMX_AUDMUX_V1_PCR_RXDSEL(x) (((x) & 0x7) << 13) +#define IMX_AUDMUX_V1_PCR_RFCSEL(x) (((x) & 0xf) << 20) +#define IMX_AUDMUX_V1_PCR_RCLKDIR (1 << 24) +#define IMX_AUDMUX_V1_PCR_RFSDIR (1 << 25) +#define IMX_AUDMUX_V1_PCR_TFCSEL(x) (((x) & 0xf) << 26) +#define IMX_AUDMUX_V1_PCR_TCLKDIR (1 << 30) +#define IMX_AUDMUX_V1_PCR_TFSDIR (1 << 31) + +/* Register definitions for the i.MX25/31/35/51 Digital Audio Multiplexer */ +#define IMX_AUDMUX_V2_PTCR_TFSDIR (1 << 31) +#define IMX_AUDMUX_V2_PTCR_TFSEL(x) (((x) & 0xf) << 27) +#define IMX_AUDMUX_V2_PTCR_TCLKDIR (1 << 26) +#define IMX_AUDMUX_V2_PTCR_TCSEL(x) (((x) & 0xf) << 22) +#define IMX_AUDMUX_V2_PTCR_RFSDIR (1 << 21) +#define IMX_AUDMUX_V2_PTCR_RFSEL(x) (((x) & 0xf) << 17) +#define IMX_AUDMUX_V2_PTCR_RCLKDIR (1 << 16) +#define IMX_AUDMUX_V2_PTCR_RCSEL(x) (((x) & 0xf) << 12) +#define IMX_AUDMUX_V2_PTCR_SYN (1 << 11) + +#define IMX_AUDMUX_V2_PDCR_RXDSEL(x) (((x) & 0x7) << 13) +#define IMX_AUDMUX_V2_PDCR_TXRXEN (1 << 12) +#define IMX_AUDMUX_V2_PDCR_MODE(x) (((x) & 0x3) << 8) +#define IMX_AUDMUX_V2_PDCR_INMMASK(x) ((x) & 0xff) + +#endif /* __DT_FSL_IMX_AUDMUX_H */ -- 2.24.0

3 11