Module Name: src
Committed By: martin
Date: Sat Sep 28 12:21:29 UTC 2019
Modified Files:
src/sys/arch/arm/nvidia [netbsd-9]: tegra210_pinmux.c tegra_pinmux.c
tegra_pinmux.h
Log Message:
Pull up following revision(s) (requested by skrll in ticket #263):
sys/arch/arm/nvidia/tegra_pinmux.h: revision 1.2
sys/arch/arm/nvidia/tegra_pinmux.c: revision 1.3
sys/arch/arm/nvidia/tegra210_pinmux.c: revision 1.2
Update tegra_pinmux to support all bindings (pins and pin groups)
Update tegra210_pinmux.c with all defined pins and groups.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.10.1 src/sys/arch/arm/nvidia/tegra210_pinmux.c \
src/sys/arch/arm/nvidia/tegra_pinmux.h
cvs rdiff -u -r1.2 -r1.2.4.1 src/sys/arch/arm/nvidia/tegra_pinmux.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra210_pinmux.c
diff -u src/sys/arch/arm/nvidia/tegra210_pinmux.c:1.1 src/sys/arch/arm/nvidia/tegra210_pinmux.c:1.1.10.1
--- src/sys/arch/arm/nvidia/tegra210_pinmux.c:1.1 Fri Sep 22 14:36:22 2017
+++ src/sys/arch/arm/nvidia/tegra210_pinmux.c Sat Sep 28 12:21:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra210_pinmux.c,v 1.1 2017/09/22 14:36:22 jmcneill Exp $ */
+/* $NetBSD: tegra210_pinmux.c,v 1.1.10.1 2019/09/28 12:21:29 martin Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra210_pinmux.c,v 1.1 2017/09/22 14:36:22 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra210_pinmux.c,v 1.1.10.1 2019/09/28 12:21:29 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -36,171 +36,222 @@ __KERNEL_RCSID(0, "$NetBSD: tegra210_pin
#include <arm/nvidia/tegra_pinmux.h>
+#define TEGRA_PIN(n, r, f1, f2, f3, f4) \
+ { \
+ .tpp_name = n, \
+ .tpp_reg = (r), \
+ .tpp_type = TEGRA_PINMUX, \
+ .tpp_functions = { \
+ f1, f2, f3, f4 \
+ } \
+ }
+
+#define TEGRA_PINGROUP(n, r, drvdn_m, drvup_m, slwrr_m, slwrf_m) \
+ { \
+ .tpp_name = "drive_" n, \
+ .tpp_reg = (r) - 0x8d4, \
+ .tpp_type = TEGRA_PADCTRL, \
+ .tpp_dg = { \
+ .drvdn_mask = drvdn_m, \
+ .drvup_mask = drvup_m, \
+ .slwrr_mask = slwrr_m, \
+ .slwrf_mask = slwrf_m \
+ } \
+ }
+
+// 9.15 Pinmux registers
static const struct tegra_pinmux_pins tegra210_pins[] = {
- { "sdmmc1_clk_pm0", 0x00, { "sdmmc1", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc1_cmd_pm1", 0x04, { "sdmmc1", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc1_dat3_pm2", 0x08, { "sdmmc1", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc1_dat2_pm3", 0x0c, { "sdmmc1", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc1_dat1_pm4", 0x10, { "sdmmc1", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc1_dat0_pm5", 0x14, { "sdmmc1", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc3_clk_pp0", 0x1c, { "sdmmc3", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc3_cmd_pp1", 0x20, { "sdmmc3", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc3_dat0_pp5", 0x24, { "sdmmc3", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc3_dat1_pp4", 0x28, { "sdmmc3", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc3_dat2_pp3", 0x2c, { "sdmmc3", "rsvd1", "rsvd2", "rsvd3" } },
- { "sdmmc3_dat3_pp2", 0x30, { "sdmmc3", "rsvd1", "rsvd2", "rsvd3" } },
- { "pex_l0_rst_n_pa0", 0x38, { "pe0", "rsvd1", "rsvd2", "rsvd3" } },
- { "pex_l0_clkreq_n_pa1", 0x3c, { "pe0", "rsvd1", "rsvd2", "rsvd3" } },
- { "pex_wake_n_pa2", 0x40, { "pe", "rsvd1", "rsvd2", "rsvd3" } },
- { "pex_l1_rst_n_pa3", 0x44, { "pe1", "rsvd1", "rsvd2", "rsvd3" } },
- { "pex_l1_clkreq_n_pa4", 0x48, { "pe1", "rsvd1", "rsvd2", "rsvd3" } },
- { "sata_led_active_pa5", 0x4c, { "sata", "rsvd1", "rsvd2", "rsvd3" } },
- { "spi1_mosi_pc0", 0x50, { "spi1", "rsvd1", "rsvd2", "rsvd3" } },
- { "spi1_miso_pc1", 0x54, { "spi1", "rsvd1", "rsvd2", "rsvd3" } },
- { "spi1_sck_pc2", 0x58, { "spi1", "rsvd1", "rsvd2", "rsvd3" } },
- { "spi1_cs0_pc3", 0x5c, { "spi1", "rsvd1", "rsvd2", "rsvd3" } },
- { "spi1_cs1_pc4", 0x60, { "spi1", "rsvd1", "rsvd2", "rsvd3" } },
- { "spi2_mosi_pb4", 0x64, { "spi2", "dtv", "rsvd2", "rsvd3" } },
- { "spi2_miso_pb5", 0x68, { "spi2", "dtv", "rsvd2", "rsvd3" } },
- { "spi2_sck_pb6", 0x6c, { "spi2", "dtv", "rsvd2", "rsvd3" } },
- { "spi2_cs0_pb7", 0x70, { "spi2", "dtv", "rsvd2", "rsvd3" } },
- { "spi2_cs1_pdd0", 0x74, { "spi2", "rsvd1", "rsvd2", "rsvd3" } },
- { "spi4_mosi_pc7", 0x78, { "spi4", "rsvd1", "rsvd2", "rsvd3" } },
- { "spi4_miso_pd0", 0x7c, { "spi4", "rsvd1", "rsvd2", "rsvd3" } },
- { "spi4_sck_pc5", 0x80, { "spi4", "rsvd1", "rsvd2", "rsvd3" } },
- { "spi4_cs0_pc6", 0x84, { "spi4", "rsvd1", "rsvd2", "rsvd3" } },
- { "qspi_sck_pee0", 0x88, { "qspi", "rsvd1", "rsvd2", "rsvd3" } },
- { "qspi_cs_n_pee1", 0x8c, { "qspi", "rsvd1", "rsvd2", "rsvd3" } },
- { "qspi_io0_pee2", 0x90, { "qspi", "rsvd1", "rsvd2", "rsvd3" } },
- { "qspi_io1_pee3", 0x94, { "qspi", "rsvd1", "rsvd2", "rsvd3" } },
- { "qspi_io2_pee4", 0x98, { "qspi", "rsvd1", "rsvd2", "rsvd3" } },
- { "qspi_io3_pee5", 0x9c, { "qspi", "rsvd1", "rsvd2", "rsvd3" } },
- { "dmic1_clk_pe0", 0xa4, { "dmic1", "i2s3", "rsvd2", "rsvd3" } },
- { "dmic1_dat_pe1", 0xa8, { "dmic1", "i2s3", "rsvd2", "rsvd3" } },
- { "dmic2_clk_pe2", 0xac, { "dmic2", "i2s3", "rsvd2", "rsvd3" } },
- { "dmic2_dat_pe3", 0xb0, { "dmic2", "i2s3", "rsvd2", "rsvd3" } },
- { "dmic3_clk_pe4", 0xb4, { "dmic3", "i2s5a", "rsvd2", "rsvd3" } },
- { "dmic3_dat_pe5", 0xb8, { "dmic3", "i2s5a", "rsvd2", "rsvd3" } },
- { "gen1_i2c_scl_pj1", 0xbc, { "i2c1", "rsvd1", "rsvd2", "rsvd3" } },
- { "gen1_i2c_sda_pj0", 0xc0, { "i2c1", "rsvd1", "rsvd2", "rsvd3" } },
- { "gen2_i2c_scl_pj2", 0xc4, { "i2c2", "rsvd1", "rsvd2", "rsvd3" } },
- { "gen2_i2c_sda_pj3", 0xc8, { "i2c2", "rsvd1", "rsvd2", "rsvd3" } },
- { "gen3_i2c_scl_pf0", 0xcc, { "i2c3", "rsvd1", "rsvd2", "rsvd3" } },
- { "gen3_i2c_sda_pf1", 0xd0, { "i2c3", "rsvd1", "rsvd2", "rsvd3" } },
- { "cam_i2c_scl_ps2", 0xd4, { "i2c3", "i2cvi", "rsvd2", "rsvd3" } },
- { "cam_i2c_sda_ps3", 0xd8, { "i2c3", "i2cvi", "rsvd2", "rsvd3" } },
- { "pwr_i2c_scl_py3", 0xdc, { "i2cpmu", "rsvd1", "rsvd2", "rsvd3" } },
- { "pwr_i2c_sda_py4", 0xe0, { "i2cpmu", "rsvd1", "rsvd2", "rsvd3" } },
- { "uart1_tx_pu0", 0xe4, { "uarta", "rsvd1", "rsvd2", "rsvd3" } },
- { "uart1_rx_pu1", 0xe8, { "uarta", "rsvd1", "rsvd2", "rsvd3" } },
- { "uart1_rts_pu2", 0xec, { "uarta", "rsvd1", "rsvd2", "rsvd3" } },
- { "uart1_cts_pu3", 0xf0, { "uarta", "rsvd1", "rsvd2", "rsvd3" } },
- { "uart2_tx_pg0", 0xf4, { "uartb", "i2s4a", "spdif", "uart" } },
- { "uart2_rx_pg1", 0xf8, { "uartb", "i2s4a", "spdif", "uart" } },
- { "uart2_rts_pg2", 0xfc, { "uartb", "i2s4a", "rsvd2", "uart" } },
- { "uart2_cts_pg3", 0x100, { "uartb", "i2s4a", "rsvd2", "uart" } },
- { "uart3_tx_pd1", 0x104, { "uartc", "spi4", "rsvd2", "rsvd3" } },
- { "uart3_rx_pd2", 0x108, { "uartc", "spi4", "rsvd2", "rsvd3" } },
- { "uart3_rts_pd3", 0x10c, { "uartc", "spi4", "rsvd2", "rsvd3" } },
- { "uart3_cts_pd4", 0x110, { "uartc", "spi4", "rsvd2", "rsvd3" } },
- { "uart4_tx_pi4", 0x114, { "uartd", "uart", "rsvd2", "rsvd3" } },
- { "uart4_rx_pi5", 0x118, { "uartd", "uart", "rsvd2", "rsvd3" } },
- { "uart4_rts_pi6", 0x11c, { "uartd", "uart", "rsvd2", "rsvd3" } },
- { "uart4_cts_pi7", 0x120, { "uartd", "uart", "rsvd2", "rsvd3" } },
- { "dap1_fs_pb0", 0x124, { "i2s1", "rsvd1", "rsvd2", "rsvd3" } },
- { "dap1_din_pb1", 0x128, { "i2s1", "rsvd1", "rsvd2", "rsvd3" } },
- { "dap1_dout_pb2", 0x12c, { "i2s1", "rsvd1", "rsvd2", "rsvd3" } },
- { "dap1_sclk_pb3", 0x130, { "i2s1", "rsvd1", "rsvd2", "rsvd3" } },
- { "dap2_fs_paa0", 0x134, { "i2s2", "rsvd1", "rsvd2", "rsvd3" } },
- { "dap2_din_paa2", 0x138, { "i2s2", "rsvd1", "rsvd2", "rsvd3" } },
- { "dap2_dout_paa3", 0x13c, { "i2s2", "rsvd1", "rsvd2", "rsvd3" } },
- { "dap2_sclk_paa1", 0x140, { "i2s2", "rsvd1", "rsvd2", "rsvd3" } },
- { "dap4_fs_pj4", 0x144, { "i2s4b", "rsvd1", "rsvd2", "rsvd3" } },
- { "dap4_din_pj5", 0x148, { "i2s4b", "rsvd1", "rsvd2", "rsvd3" } },
- { "dap4_dout_pj6", 0x14c, { "i2s4b", "rsvd1", "rsvd2", "rsvd3" } },
- { "dap4_sclk_pj7", 0x150, { "i2s4b", "rsvd1", "rsvd2", "rsvd3" } },
- { "cam1_mclk_ps0", 0x154, { "extperiph3", "rsvd1", "rsvd2", "rsvd3" } },
- { "cam2_mclk_ps1", 0x158, { "extperiph3", "rsvd1", "rsvd2", "rsvd3" } },
- { "jtag_rtck", 0x15c, { "jtag", "rsvd1", "rsvd2", "rsvd3" } },
- { "clk_32k_in", 0x160, { } },
- { "clk_32k_out_py5", 0x164, { "soc", "blink", "rsvd2", "rsvd3" } },
- { "batt_bcl", 0x168, { "bcl", "rsvd1", "rsvd2", "rsvd3" } },
- { "clk_req", 0x16c, { } },
- { "cpu_pwr_req", 0x170, { } },
- { "pwr_int_n", 0x174, { } },
- { "shutdown", 0x178, { } },
- { "core_pwr_req", 0x17c, { } },
- { "aud_mclk_pbb0", 0x180, { "aud", "rsvd1", "rsvd2", "rsvd3" } },
- { "dvfs_pwm_pbb1", 0x184, { "rsvd0", "cldvfs", "spi3", "rsvd3" } },
- { "dvfs_clk_pbb2", 0x188, { "rsvd0", "cldvfs", "spi3", "rsvd3" } },
- { "gpio_x1_aud_pbb3", 0x18c, { "rsvd0", "rsvd1", "spi3", "rsvd3" } },
- { "gpio_x3_aud_pbb4", 0x190, { "rsvd0", "rsvd1", "spi3", "rsvd3" } },
- { "pcc7", 0x194, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "hdmi_cec_pcc0", 0x198, { "cec", "rsvd1", "rsvd2", "rsvd3" } },
- { "hdmi_int_dp_hpd_pcc1", 0x19c, { "dp", "rsvd1", "rsvd2", "rsvd3" } },
- { "spdif_out_pcc2", 0x1a0, { "spdif", "rsvd1", "rsvd2", "rsvd3" } },
- { "spdif_in_pcc3", 0x1a4, { "spdif", "rsvd1", "rsvd2", "rsvd3" } },
- { "usb_vbus_en0_pcc4", 0x1a8, { "usb", "rsvd1", "rsvd2", "rsvd3" } },
- { "usb_vbus_en1_pcc5", 0x1ac, { "usb", "rsvd1", "rsvd2", "rsvd3" } },
- { "dp_hpd0_pcc6", 0x1b0, { "dp", "rsvd1", "rsvd2", "rsvd3" } },
- { "wifi_en_ph0", 0x1b4, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "wifi_rst_ph1", 0x1b8, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "wifi_wake_ap_ph2", 0x1bc, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "ap_wake_bt_ph3", 0x1c0, { "rsvd0", "uartb", "spdif", "rsvd3" } },
- { "bt_rst_ph4", 0x1c4, { "rsvd0", "uartb", "spdif", "rsvd3" } },
- { "bt_wake_ap_ph5", 0x1c8, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "ap_wake_nfc_ph7", 0x1cc, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "nfc_en_pi0", 0x1d0, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "nfc_int_pi1", 0x1d4, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "gps_en_pi2", 0x1d8, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "gps_rst_pi3", 0x1dc, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "cam_rst_ps4", 0x1e0, { "vgp1", "rsvd1", "rsvd2", "rsvd3" } },
- { "cam_af_en_ps5", 0x1e4, { "vimclk", "vgp2", "rsvd2", "rsvd3" } },
- { "cam_flash_en_ps6", 0x1e8, { "vimclk", "vgp3", "rsvd2", "rsvd3" } },
- { "cam1_pwdn_ps7", 0x1ec, { "vgp4", "rsvd1", "rsvd2", "rsvd3" } },
- { "cam2_pwdn_pt0", 0x1f0, { "vgp5", "rsvd1", "rsvd2", "rsvd3" } },
- { "cam1_strobe_pt1", 0x1f4, { "vgp6", "rsvd1", "rsvd2", "rsvd3" } },
- { "lcd_te_py2", 0x1f8, { "displaya", "rsvd1", "rsvd2", "rsvd3" } },
- { "lcd_bl_pwm_pv0", 0x1fc, { "displaya", "pwm0", "sor0", "rsvd3" } },
- { "lcd_bl_en_pv1", 0x200, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "lcd_rst_pv2", 0x204, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "lcd_gpio1_pv3", 0x208, { "displayb", "rsvd1", "rsvd2", "rsvd3" } },
- { "lcd_gpio2_pv4", 0x20c, { "displayb", "pwm1", "rsvd2", "sor1" } },
- { "ap_ready_pv5", 0x210, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "touch_rst_pv6", 0x214, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "touch_clk_pv7", 0x218, { "touch", "rsvd1", "rsvd2", "rsvd3" } },
- { "modem_wake_ap_px0", 0x21c, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "touch_int_px1", 0x220, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "motion_int_px2", 0x224, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "als_prox_int_px3", 0x228, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "temp_alert_px4", 0x22c, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "button_power_on_px5", 0x230, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "button_vol_up_px6", 0x234, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "button_vol_down_px7", 0x238, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "button_slide_sw_py0", 0x23c, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "button_home_py1", 0x240, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "pa6", 0x244, { "sata", "rsvd1", "rsvd2", "rsvd3" } },
- { "pe6", 0x248, { "rsvd0", "i2s5a", "pwm2", "rsvd3" } },
- { "pe7", 0x24c, { "rsvd0", "i2s5a", "pwm3", "rsvd3" } },
- { "ph6", 0x250, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "pk0", 0x254, { "iqc0", "i2s5b", "rsvd2", "rsvd3" } },
- { "pk1", 0x258, { "iqc0", "i2s5b", "rsvd2", "rsvd3" } },
- { "pk2", 0x25c, { "iqc0", "i2s5b", "rsvd2", "rsvd3" } },
- { "pk3", 0x260, { "iqc0", "i2s5b", "rsvd2", "rsvd3" } },
- { "pk4", 0x264, { "iqc1", "rsvd1", "rsvd2", "rsvd3" } },
- { "pk5", 0x268, { "iqc1", "rsvd1", "rsvd2", "rsvd3" } },
- { "pk6", 0x26c, { "iqc1", "rsvd1", "rsvd2", "rsvd3" } },
- { "pk7", 0x270, { "iqc1", "rsvd1", "rsvd2", "rsvd3" } },
- { "pl0", 0x274, { "rsvd0", "rsvd1", "rsvd2", "rsvd3" } },
- { "pl1", 0x278, { "soc", "rsvd1", "rsvd2", "rsvd3" } },
- { "pz0", 0x27c, { "vimclk2", "rsvd1", "rsvd2", "rsvd3" } },
- { "pz1", 0x280, { "vimclk2", "sdmmc1", "rsvd2", "rsvd3" } },
- { "pz2", 0x284, { "sdmmc3", "ccla", "rsvd2", "rsvd3" } },
- { "pz3", 0x288, { "sdmmc1", "rsvd1", "rsvd2", "rsvd3" } },
- { "pz4", 0x28c, { "sdmmc1", "rsvd1", "rsvd2", "rsvd3" } },
- { "pz5", 0x290, { "soc", "rsvd1", "rsvd2", "rsvd3" } },
+ TEGRA_PIN("sdmmc1_clk_pm0", 0x00, "sdmmc1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("sdmmc1_cmd_pm1", 0x04, "sdmmc1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("sdmmc1_dat3_pm2", 0x08, "sdmmc1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("sdmmc1_dat2_pm3", 0x0c, "sdmmc1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("sdmmc1_dat1_pm4", 0x10, "sdmmc1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("sdmmc1_dat0_pm5", 0x14, "sdmmc1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("sdmmc3_clk_pp0", 0x1c, "sdmmc3", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("sdmmc3_cmd_pp1", 0x20, "sdmmc3", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("sdmmc3_dat0_pp5", 0x24, "sdmmc3", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("sdmmc3_dat1_pp4", 0x28, "sdmmc3", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("sdmmc3_dat2_pp3", 0x2c, "sdmmc3", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("sdmmc3_dat3_pp2", 0x30, "sdmmc3", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pex_l0_rst_n_pa0", 0x38, "pe0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pex_l0_clkreq_n_pa1", 0x3c, "pe0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pex_wake_n_pa2", 0x40, "pe", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pex_l1_rst_n_pa3", 0x44, "pe1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pex_l1_clkreq_n_pa4", 0x48, "pe1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("sata_led_active_pa5", 0x4c, "sata", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("spi1_mosi_pc0", 0x50, "spi1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("spi1_miso_pc1", 0x54, "spi1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("spi1_sck_pc2", 0x58, "spi1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("spi1_cs0_pc3", 0x5c, "spi1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("spi1_cs1_pc4", 0x60, "spi1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("spi2_mosi_pb4", 0x64, "spi2", "dtv", "rsvd2", "rsvd3"),
+ TEGRA_PIN("spi2_miso_pb5", 0x68, "spi2", "dtv", "rsvd2", "rsvd3"),
+ TEGRA_PIN("spi2_sck_pb6", 0x6c, "spi2", "dtv", "rsvd2", "rsvd3"),
+ TEGRA_PIN("spi2_cs0_pb7", 0x70, "spi2", "dtv", "rsvd2", "rsvd3"),
+ TEGRA_PIN("spi2_cs1_pdd0", 0x74, "spi2", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("spi4_mosi_pc7", 0x78, "spi4", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("spi4_miso_pd0", 0x7c, "spi4", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("spi4_sck_pc5", 0x80, "spi4", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("spi4_cs0_pc6", 0x84, "spi4", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("qspi_sck_pee0", 0x88, "qspi", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("qspi_cs_n_pee1", 0x8c, "qspi", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("qspi_io0_pee2", 0x90, "qspi", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("qspi_io1_pee3", 0x94, "qspi", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("qspi_io2_pee4", 0x98, "qspi", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("qspi_io3_pee5", 0x9c, "qspi", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("dmic1_clk_pe0", 0xa4, "dmic1", "i2s3", "rsvd2", "rsvd3"),
+ TEGRA_PIN("dmic1_dat_pe1", 0xa8, "dmic1", "i2s3", "rsvd2", "rsvd3"),
+ TEGRA_PIN("dmic2_clk_pe2", 0xac, "dmic2", "i2s3", "rsvd2", "rsvd3"),
+ TEGRA_PIN("dmic2_dat_pe3", 0xb0, "dmic2", "i2s3", "rsvd2", "rsvd3"),
+ TEGRA_PIN("dmic3_clk_pe4", 0xb4, "dmic3", "i2s5a", "rsvd2", "rsvd3"),
+ TEGRA_PIN("dmic3_dat_pe5", 0xb8, "dmic3", "i2s5a", "rsvd2", "rsvd3"),
+ TEGRA_PIN("gen1_i2c_scl_pj1", 0xbc, "i2c1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("gen1_i2c_sda_pj0", 0xc0, "i2c1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("gen2_i2c_scl_pj2", 0xc4, "i2c2", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("gen2_i2c_sda_pj3", 0xc8, "i2c2", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("gen3_i2c_scl_pf0", 0xcc, "i2c3", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("gen3_i2c_sda_pf1", 0xd0, "i2c3", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("cam_i2c_scl_ps2", 0xd4, "i2c3", "i2cvi", "rsvd2", "rsvd3"),
+ TEGRA_PIN("cam_i2c_sda_ps3", 0xd8, "i2c3", "i2cvi", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pwr_i2c_scl_py3", 0xdc, "i2cpmu", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pwr_i2c_sda_py4", 0xe0, "i2cpmu", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("uart1_tx_pu0", 0xe4, "uarta", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("uart1_rx_pu1", 0xe8, "uarta", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("uart1_rts_pu2", 0xec, "uarta", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("uart1_cts_pu3", 0xf0, "uarta", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("uart2_tx_pg0", 0xf4, "uartb", "i2s4a", "spdif", "uart"),
+ TEGRA_PIN("uart2_rx_pg1", 0xf8, "uartb", "i2s4a", "spdif", "uart"),
+ TEGRA_PIN("uart2_rts_pg2", 0xfc, "uartb", "i2s4a", "rsvd2", "uart"),
+ TEGRA_PIN("uart2_cts_pg3", 0x100, "uartb", "i2s4a", "rsvd2", "uart"),
+ TEGRA_PIN("uart3_tx_pd1", 0x104, "uartc", "spi4", "rsvd2", "rsvd3"),
+ TEGRA_PIN("uart3_rx_pd2", 0x108, "uartc", "spi4", "rsvd2", "rsvd3"),
+ TEGRA_PIN("uart3_rts_pd3", 0x10c, "uartc", "spi4", "rsvd2", "rsvd3"),
+ TEGRA_PIN("uart3_cts_pd4", 0x110, "uartc", "spi4", "rsvd2", "rsvd3"),
+ TEGRA_PIN("uart4_tx_pi4", 0x114, "uartd", "uart", "rsvd2", "rsvd3"),
+ TEGRA_PIN("uart4_rx_pi5", 0x118, "uartd", "uart", "rsvd2", "rsvd3"),
+ TEGRA_PIN("uart4_rts_pi6", 0x11c, "uartd", "uart", "rsvd2", "rsvd3"),
+ TEGRA_PIN("uart4_cts_pi7", 0x120, "uartd", "uart", "rsvd2", "rsvd3"),
+ TEGRA_PIN("dap1_fs_pb0", 0x124, "i2s1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("dap1_din_pb1", 0x128, "i2s1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("dap1_dout_pb2", 0x12c, "i2s1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("dap1_sclk_pb3", 0x130, "i2s1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("dap2_fs_paa0", 0x134, "i2s2", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("dap2_din_paa2", 0x138, "i2s2", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("dap2_dout_paa3", 0x13c, "i2s2", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("dap2_sclk_paa1", 0x140, "i2s2", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("dap4_fs_pj4", 0x144, "i2s4b", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("dap4_din_pj5", 0x148, "i2s4b", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("dap4_dout_pj6", 0x14c, "i2s4b", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("dap4_sclk_pj7", 0x150, "i2s4b", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("cam1_mclk_ps0", 0x154, "extperiph3", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("cam2_mclk_ps1", 0x158, "extperiph3", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("jtag_rtck", 0x15c, "jtag", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("clk_32k_in", 0x160, NULL, NULL, NULL, NULL),
+ TEGRA_PIN("clk_32k_out_py5", 0x164, "soc", "blink", "rsvd2", "rsvd3"),
+ TEGRA_PIN("batt_bcl", 0x168, "bcl", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("clk_req", 0x16c, NULL, NULL, NULL, NULL),
+ TEGRA_PIN("cpu_pwr_req", 0x170, NULL, NULL, NULL, NULL),
+ TEGRA_PIN("pwr_int_n", 0x174, NULL, NULL, NULL, NULL),
+ TEGRA_PIN("shutdown", 0x178, NULL, NULL, NULL, NULL),
+ TEGRA_PIN("core_pwr_req", 0x17c, NULL, NULL, NULL, NULL),
+ TEGRA_PIN("aud_mclk_pbb0", 0x180, "aud", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("dvfs_pwm_pbb1", 0x184, "rsvd0", "cldvfs", "spi3", "rsvd3"),
+ TEGRA_PIN("dvfs_clk_pbb2", 0x188, "rsvd0", "cldvfs", "spi3", "rsvd3"),
+ TEGRA_PIN("gpio_x1_aud_pbb3", 0x18c, "rsvd0", "rsvd1", "spi3", "rsvd3"),
+ TEGRA_PIN("gpio_x3_aud_pbb4", 0x190, "rsvd0", "rsvd1", "spi3", "rsvd3"),
+ TEGRA_PIN("pcc7", 0x194, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("hdmi_cec_pcc0", 0x198, "cec", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("hdmi_int_dp_hpd_pcc1", 0x19c, "dp", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("spdif_out_pcc2", 0x1a0, "spdif", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("spdif_in_pcc3", 0x1a4, "spdif", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("usb_vbus_en0_pcc4", 0x1a8, "usb", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("usb_vbus_en1_pcc5", 0x1ac, "usb", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("dp_hpd0_pcc6", 0x1b0, "dp", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("wifi_en_ph0", 0x1b4, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("wifi_rst_ph1", 0x1b8, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("wifi_wake_ap_ph2", 0x1bc, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("ap_wake_bt_ph3", 0x1c0, "rsvd0", "uartb", "spdif", "rsvd3"),
+ TEGRA_PIN("bt_rst_ph4", 0x1c4, "rsvd0", "uartb", "spdif", "rsvd3"),
+ TEGRA_PIN("bt_wake_ap_ph5", 0x1c8, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("ap_wake_nfc_ph7", 0x1cc, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("nfc_en_pi0", 0x1d0, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("nfc_int_pi1", 0x1d4, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("gps_en_pi2", 0x1d8, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("gps_rst_pi3", 0x1dc, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("cam_rst_ps4", 0x1e0, "vgp1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("cam_af_en_ps5", 0x1e4, "vimclk", "vgp2", "rsvd2", "rsvd3"),
+ TEGRA_PIN("cam_flash_en_ps6", 0x1e8, "vimclk", "vgp3", "rsvd2", "rsvd3"),
+ TEGRA_PIN("cam1_pwdn_ps7", 0x1ec, "vgp4", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("cam2_pwdn_pt0", 0x1f0, "vgp5", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("cam1_strobe_pt1", 0x1f4, "vgp6", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("lcd_te_py2", 0x1f8, "displaya", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("lcd_bl_pwm_pv0", 0x1fc, "displaya", "pwm0", "sor0", "rsvd3"),
+ TEGRA_PIN("lcd_bl_en_pv1", 0x200, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("lcd_rst_pv2", 0x204, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("lcd_gpio1_pv3", 0x208, "displayb", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("lcd_gpio2_pv4", 0x20c, "displayb", "pwm1", "rsvd2", "sor1"),
+ TEGRA_PIN("ap_ready_pv5", 0x210, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("touch_rst_pv6", 0x214, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("touch_clk_pv7", 0x218, "touch", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("modem_wake_ap_px0", 0x21c, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("touch_int_px1", 0x220, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("motion_int_px2", 0x224, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("als_prox_int_px3", 0x228, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("temp_alert_px4", 0x22c, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("button_power_on_px5", 0x230, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("button_vol_up_px6", 0x234, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("button_vol_down_px7", 0x238, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("button_slide_sw_py0", 0x23c, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("button_home_py1", 0x240, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pa6", 0x244, "sata", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pe6", 0x248, "rsvd0", "i2s5a", "pwm2", "rsvd3"),
+ TEGRA_PIN("pe7", 0x24c, "rsvd0", "i2s5a", "pwm3", "rsvd3"),
+ TEGRA_PIN("ph6", 0x250, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pk0", 0x254, "iqc0", "i2s5b", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pk1", 0x258, "iqc0", "i2s5b", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pk2", 0x25c, "iqc0", "i2s5b", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pk3", 0x260, "iqc0", "i2s5b", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pk4", 0x264, "iqc1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pk5", 0x268, "iqc1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pk6", 0x26c, "iqc1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pk7", 0x270, "iqc1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pl0", 0x274, "rsvd0", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pl1", 0x278, "soc", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pz0", 0x27c, "vimclk2", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pz1", 0x280, "vimclk2", "sdmmc1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pz2", 0x284, "sdmmc3", "ccla", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pz3", 0x288, "sdmmc1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pz4", 0x28c, "sdmmc1", "rsvd1", "rsvd2", "rsvd3"),
+ TEGRA_PIN("pz5", 0x290, "soc", "rsvd1", "rsvd2", "rsvd3"),
+
+ TEGRA_PINGROUP("pa6", 0x9c0, __BITS(16, 12), __BITS(24, 20), 0, 0),
+ TEGRA_PINGROUP("pcc7", 0x9c4, __BITS(16, 12), __BITS(24, 20), 0, 0),
+ TEGRA_PINGROUP("pe6", 0x9c8, __BITS(16, 12), __BITS(24, 20), 0, 0),
+ TEGRA_PINGROUP("pe7", 0x9cc, __BITS(16, 12), __BITS(24, 20), 0, 0),
+ TEGRA_PINGROUP("ph6", 0x9d0, __BITS(16, 12), __BITS(24, 20), 0, 0),
+ TEGRA_PINGROUP("pk0", 0x9d4, 0, 0, __BITS(30, 28), __BITS(31, 30)),
+ TEGRA_PINGROUP("pk1", 0x9d8, 0, 0, __BITS(30, 28), __BITS(31, 30)),
+ TEGRA_PINGROUP("pk2", 0x9dc, 0, 0, __BITS(30, 28), __BITS(31, 30)),
+ TEGRA_PINGROUP("pk3", 0x9e0, 0, 0, __BITS(30, 28), __BITS(31, 30)),
+ TEGRA_PINGROUP("pk4", 0x9e4, 0, 0, __BITS(30, 28), __BITS(31, 30)),
+ TEGRA_PINGROUP("pk5", 0x9e8, 0, 0, __BITS(30, 28), __BITS(31, 30)),
+ TEGRA_PINGROUP("pk6", 0x9ec, 0, 0, __BITS(30, 28), __BITS(31, 30)),
+ TEGRA_PINGROUP("pk7", 0x9f0, 0, 0, __BITS(30, 28), __BITS(31, 30)),
+ TEGRA_PINGROUP("pl0", 0x9f4, 0, 0, __BITS(30, 28), __BITS(31, 30)),
+ TEGRA_PINGROUP("pl1", 0x9f8, 0, 0, __BITS(30, 28), __BITS(31, 30)),
+ TEGRA_PINGROUP("pz0", 0x9fc, __BITS(18, 12), __BITS(26, 20), 0, 0),
+ TEGRA_PINGROUP("pz1", 0xa00, __BITS(18, 12), __BITS(26, 20), 0, 0),
+ TEGRA_PINGROUP("pz2", 0xa04, __BITS(18, 12), __BITS(26, 20), 0, 0),
+ TEGRA_PINGROUP("pz3", 0xa08, __BITS(18, 12), __BITS(26, 20), 0, 0),
+ TEGRA_PINGROUP("pz4", 0xa0c, __BITS(18, 12), __BITS(26, 20), 0, 0),
+ TEGRA_PINGROUP("pz5", 0xa10, __BITS(18, 12), __BITS(26, 20), 0, 0),
+ TEGRA_PINGROUP("sdmmc1",0xa98, __BITS(18, 12), __BITS(26, 20), __BITS(30, 28), __BITS(31, 30)),
+ TEGRA_PINGROUP("sdmmc2",0xa9c, __BITS(7, 2), __BITS(13, 8), __BITS(30, 28), __BITS(31, 30)),
+ TEGRA_PINGROUP("sdmmc3",0xab0, __BITS(18, 12), __BITS(26, 20), __BITS(30, 28), __BITS(31, 30)),
+ TEGRA_PINGROUP("sdmmc4",0xab4, __BITS(7, 2), __BITS(13, 8), __BITS(30, 28), __BITS(31, 30)),
};
+
const struct tegra_pinmux_conf tegra210_pinmux_conf = {
.npins = __arraycount(tegra210_pins),
.pins = tegra210_pins,
Index: src/sys/arch/arm/nvidia/tegra_pinmux.h
diff -u src/sys/arch/arm/nvidia/tegra_pinmux.h:1.1 src/sys/arch/arm/nvidia/tegra_pinmux.h:1.1.10.1
--- src/sys/arch/arm/nvidia/tegra_pinmux.h:1.1 Fri Sep 22 14:36:22 2017
+++ src/sys/arch/arm/nvidia/tegra_pinmux.h Sat Sep 28 12:21:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_pinmux.h,v 1.1 2017/09/22 14:36:22 jmcneill Exp $ */
+/* $NetBSD: tegra_pinmux.h,v 1.1.10.1 2019/09/28 12:21:29 martin Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -34,9 +34,21 @@
#define TEGRA_PINMUX_MAXFUNC 4
struct tegra_pinmux_pins {
- const char *name;
- u_int reg;
- const char *functions[TEGRA_PINMUX_MAXFUNC];
+ const char *tpp_name;
+ u_int tpp_reg;
+ enum tegra_pin_type {
+ TEGRA_PINMUX,
+ TEGRA_PADCTRL
+ } tpp_type;
+ union {
+ const char *tpp_functions[TEGRA_PINMUX_MAXFUNC];
+ struct {
+ uint32_t drvdn_mask;
+ uint32_t drvup_mask;
+ uint32_t slwrr_mask;
+ uint32_t slwrf_mask;
+ } tpp_dg;
+ };
};
struct tegra_pinmux_conf {
Index: src/sys/arch/arm/nvidia/tegra_pinmux.c
diff -u src/sys/arch/arm/nvidia/tegra_pinmux.c:1.2 src/sys/arch/arm/nvidia/tegra_pinmux.c:1.2.4.1
--- src/sys/arch/arm/nvidia/tegra_pinmux.c:1.2 Mon Jul 16 23:11:47 2018
+++ src/sys/arch/arm/nvidia/tegra_pinmux.c Sat Sep 28 12:21:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_pinmux.c,v 1.2 2018/07/16 23:11:47 christos Exp $ */
+/* $NetBSD: tegra_pinmux.c,v 1.2.4.1 2019/09/28 12:21:29 martin Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_tegra.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_pinmux.c,v 1.2 2018/07/16 23:11:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_pinmux.c,v 1.2.4.1 2019/09/28 12:21:29 martin Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -90,7 +90,7 @@ tegra_pinmux_lookup_byname(struct tegra_
for (n = 0; n < sc->sc_conf->npins; n++) {
pin_def = &sc->sc_conf->pins[n];
- if (strcmp(pin_def->name, name) == 0)
+ if (strcmp(pin_def->tpp_name, name) == 0)
return pin_def;
}
@@ -108,16 +108,16 @@ tegra_pinmux_lookup_func(const struct te
return -1;
for (n = 0, valid = 0; n < TEGRA_PINMUX_MAXFUNC; n++) {
- if (pin_def->functions[n] == NULL)
+ if (pin_def->tpp_functions[n] == NULL)
continue;
++valid;
- if (strcmp(pin_def->functions[n], func) == 0)
+ if (strcmp(pin_def->tpp_functions[n], func) == 0)
return n;
}
if (valid > 0)
aprint_error("%s: pin %s does not support function %s\n",
- __func__, pin_def->name, func);
+ __func__, pin_def->tpp_name, func);
return -1;
}
@@ -129,56 +129,79 @@ tegra_pinmux_pin_config(struct tegra_pin
uint32_t cfg;
u_int val;
- cfg = PINMUX_READ(sc, pin_def->reg);
- const uint32_t ocfg = cfg;
+ if (pin_def->tpp_type == TEGRA_PINMUX) {
+ cfg = PINMUX_READ(sc, pin_def->tpp_reg);
+ const uint32_t ocfg = cfg;
+
+ const int func = tegra_pinmux_lookup_func(pin_def, phandle);
+ if (func != -1) {
+ cfg &= ~PINMUX_PM;
+ cfg |= __SHIFTIN(func, PINMUX_PM);
+ }
+ if (of_getprop_uint32(phandle, "nvidia,pull", &val) == 0) {
+ cfg &= ~PINMUX_PUPD;
+ cfg |= __SHIFTIN(val, PINMUX_PUPD);
+ }
+ if (of_getprop_uint32(phandle, "nvidia,tristate", &val) == 0) {
+ cfg &= ~PINMUX_TRISTATE;
+ cfg |= __SHIFTIN(val, PINMUX_TRISTATE);
+ }
+ if (of_getprop_uint32(phandle, "nvidia,open-drain", &val) == 0) {
+ cfg &= ~PINMUX_E_OD;
+ cfg |= __SHIFTIN(val, PINMUX_E_OD);
+ }
+ if (of_getprop_uint32(phandle, "nvidia,lock", &val) == 0) {
+ cfg &= ~PINMUX_LOCK;
+ cfg |= __SHIFTIN(val, PINMUX_LOCK);
+ }
+ if (of_getprop_uint32(phandle, "nvidia,io-hv", &val) == 0) {
+ cfg &= ~PINMUX_E_IO_HV;
+ cfg |= __SHIFTIN(val, PINMUX_E_IO_HV);
+ }
+ if (of_getprop_uint32(phandle, "nvidia,high-speed-mode", &val) == 0) {
+ cfg &= ~PINMUX_E_HSM;
+ cfg |= __SHIFTIN(val, PINMUX_E_HSM);
+ }
+ if (of_getprop_uint32(phandle, "nvidia,schmitt", &val) == 0) {
+ cfg &= ~PINMUX_E_SCHMT;
+ cfg |= __SHIFTIN(val, PINMUX_E_SCHMT);
+ }
+ if (of_getprop_uint32(phandle, "nvidia,drive-type", &val) == 0) {
+ cfg &= ~PINMUX_DRV_TYPE;
+ cfg |= __SHIFTIN(val, PINMUX_DRV_TYPE);
+ }
+ aprint_debug_dev(sc->sc_dev, "pin %s %08x -> %08x\n",
+ pin_def->tpp_name, ocfg, cfg);
+ if (cfg != ocfg)
+ PINMUX_WRITE(sc, pin_def->tpp_reg, cfg);
+
+ } else {
+ cfg = PADCTRL_READ(sc, pin_def->tpp_reg);
+ const uint32_t ocfg = cfg;
+
+ if (of_getprop_uint32(phandle, "nvidia,pull-down-strength", &val) == 0) {
+ cfg &= ~pin_def->tpp_dg.drvdn_mask;
+ cfg |= __SHIFTIN(val, pin_def->tpp_dg.drvdn_mask);
+ }
+ if (of_getprop_uint32(phandle, "nvidia,pull-up-strength", &val) == 0) {
+ cfg &= ~pin_def->tpp_dg.drvup_mask;
+ cfg |= __SHIFTIN(val, pin_def->tpp_dg.drvup_mask);
+ }
+ if (of_getprop_uint32(phandle, "nvidia,slew-rate-falling", &val) == 0) {
+ cfg &= ~pin_def->tpp_dg.slwrf_mask;
+ cfg |= __SHIFTIN(val, pin_def->tpp_dg.slwrf_mask);
+ }
+ if (of_getprop_uint32(phandle, "nvidia,slew-rate-rising", &val) == 0) {
+ cfg &= ~pin_def->tpp_dg.slwrr_mask;
+ cfg |= __SHIFTIN(val, pin_def->tpp_dg.slwrr_mask);
+ }
- const int func = tegra_pinmux_lookup_func(pin_def, phandle);
- if (func != -1) {
- cfg &= ~PINMUX_PM;
- cfg |= __SHIFTIN(func, PINMUX_PM);
- }
- if (of_getprop_uint32(phandle, "nvidia,pull", &val) == 0) {
- cfg &= ~PINMUX_PUPD;
- cfg |= __SHIFTIN(val, PINMUX_PUPD);
- }
- if (of_getprop_uint32(phandle, "nvidia,tristate", &val) == 0) {
- cfg &= ~PINMUX_TRISTATE;
- cfg |= __SHIFTIN(val, PINMUX_TRISTATE);
- }
- if (of_getprop_uint32(phandle, "nvidia,open-drain", &val) == 0) {
- cfg &= ~PINMUX_E_OD;
- cfg |= __SHIFTIN(val, PINMUX_E_OD);
- }
- if (of_getprop_uint32(phandle, "nvidia,lock", &val) == 0) {
- cfg &= ~PINMUX_LOCK;
- cfg |= __SHIFTIN(val, PINMUX_LOCK);
- }
- if (of_getprop_uint32(phandle, "nvidia,io-hv", &val) == 0) {
- cfg &= ~PINMUX_E_IO_HV;
- cfg |= __SHIFTIN(val, PINMUX_E_IO_HV);
- }
- if (of_getprop_uint32(phandle, "nvidia,high-speed-mode", &val) == 0) {
- cfg &= ~PINMUX_E_HSM;
- cfg |= __SHIFTIN(val, PINMUX_E_HSM);
- }
- if (of_getprop_uint32(phandle, "nvidia,schmitt", &val) == 0) {
- cfg &= ~PINMUX_E_SCHMT;
- cfg |= __SHIFTIN(val, PINMUX_E_SCHMT);
- }
- if (of_getprop_uint32(phandle, "nvidia,drive-type", &val) == 0) {
- cfg &= ~PINMUX_DRV_TYPE;
- cfg |= __SHIFTIN(val, PINMUX_DRV_TYPE);
+ aprint_debug_dev(sc->sc_dev, "pin %s %08x -> %08x\n",
+ pin_def->tpp_name, ocfg, cfg);
+ if (cfg != ocfg)
+ PADCTRL_WRITE(sc, pin_def->tpp_reg, cfg);
}
- aprint_debug_dev(sc->sc_dev, "pin %s %08x -> %08x\n", pin_def->name, ocfg, cfg);
- if (cfg != ocfg)
- PINMUX_WRITE(sc, pin_def->reg, cfg);
-
- /*
- * Not yet supported (PADCTRL):
- * nvidia,pull-down-strength, nvidia,pull-up-strength
- * nvidia,slew-rate-rising, nvidia,slew-rate-falling
- */
}
static int
