From b445740e194caa9f660785866805e5f5b70ffe19 Mon Sep 17 00:00:00 2001 From: Thomas Makin Date: Sat, 19 Sep 2026 17:05:22 -0500 Subject: [PATCH] assorted changes --- tegra210-nx.dtsi | 39 ++++- tegra210-odin.dts | 2 +- tegra210b01-nx.dtsi | 263 ++++++++---------------------- tegra210b01-vali.dts | 371 ++++++++++++++----------------------------- 4 files changed, 224 insertions(+), 451 deletions(-) diff --git a/tegra210-nx.dtsi b/tegra210-nx.dtsi index 6af5580..16c0d00 100644 --- a/tegra210-nx.dtsi +++ b/tegra210-nx.dtsi @@ -11,10 +11,9 @@ #include #include "tegra210.dtsi" -#include "tegra210-prods.dtsi" / { - aliases { + aliases { i2c1 = "/i2c@7000c000"; i2c2 = "/i2c@7000c400"; i2c3 = "/i2c@7000c500"; @@ -550,7 +549,7 @@ reg = <0x36>; interrupt-parent = <&gpio>; - interrupts = ; + interrupts = ; /* Actual is 5000 but driver does not account for CGAIN */ /* And does not take into account Rsense and CGAIN for capacity */ @@ -579,7 +578,7 @@ compatible = "rohm,bm92t"; reg = <0x18>; interrupt-parent = <&gpio>; - interrupts = ; + interrupts = ; #extcon-cells = <1>; pd_bat_chg-supply = <&battery_charger>; vbus-source-supply = <&v_vdd5v3>; @@ -594,11 +593,37 @@ rohm,pd-12v-current-limit-ma = <1500>; rohm,pd-15v-current-limit-ma = <1200>; - port { - usb_con_ep: endpoint { - remote-endpoint = <&usb_port_0>; + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + usb_con_ep: endpoint { + remote-endpoint = <&usb_port_0>; + }; }; }; + + // connector { + // compatible = "usb-c-connector"; + // power-role = "dual"; + // data-role = "dual"; + // try-power-role = "sink"; + // displayport = <&sor1>; + + // ports { + // #address-cells = <1>; + // #size-cells = <0>; + + // port@0 { + // reg = <0>; + // usb_con_ep: endpoint { + // remote-endpoint = <&usb_port_0>; + // }; + // }; + // }; + // }; }; tmp451: temperature-sensor@4c { diff --git a/tegra210-odin.dts b/tegra210-odin.dts index 3569df4..81d7f8b 100644 --- a/tegra210-odin.dts +++ b/tegra210-odin.dts @@ -56,7 +56,7 @@ status = "okay"; compatible = "brcm,bcm4356-fmac"; reg = <1>; - reset-gpios = ; + reset-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_LOW>; }; }; }; diff --git a/tegra210b01-nx.dtsi b/tegra210b01-nx.dtsi index 0ab56d0..4445910 100644 --- a/tegra210b01-nx.dtsi +++ b/tegra210b01-nx.dtsi @@ -1,12 +1,10 @@ // SPDX-License-Identifier: GPL-2.0 #include -#include #include #include #include #include "tegra210b01.dtsi" -#include "tegra210b01-prods.dtsi" / { aliases { @@ -189,7 +187,7 @@ reg = <0x36>; interrupt-parent = <&gpio>; - interrupts = ; + interrupts = ; /* Actual is 5000 but driver does not account for CGAIN */ /* And does not take into account Rsense and CGAIN for capacity */ @@ -227,7 +225,7 @@ compatible = "rohm,bm92t"; reg = <0x18>; interrupt-parent = <&gpio>; - interrupts = ; + interrupts = ; #extcon-cells = <1>; pd_bat_chg-supply = <&battery_charger>; vbus-source-supply = <&v_vdd5v3>; @@ -243,29 +241,36 @@ rohm,pd-12v-current-limit-ma = <1500>; rohm,pd-15v-current-limit-ma = <1200>; - // connector@0 { - // compatible = "usb-c-connector"; - // reg = <0>; - // label = "USB-C"; - // data-role = "dual"; + // ports { + // #address-cells = <1>; + // #size-cells = <0>; - // ports { - // #address-cells = <1>; - // #size-cells = <0>; - - // port@0 { - // reg = <0>; - - // usb_con_ep: endpoint { - // remote-endpoint = <&hs_typec_p0>; - // }; + // port@0 { + // reg = <0>; + // usb_con_ep: endpoint { + // remote-endpoint = <&usb_port_0>; // }; // }; // }; - port { - usb_con_ep: endpoint { - remote-endpoint = <&usb_port_0>; + connector { + compatible = "usb-c-connector"; + label = "USB-C"; + power-role = "dual"; + data-role = "dual"; + try-power-role = "sink"; + displayport = <&sor1>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + usb_con_ep: endpoint { + remote-endpoint = <&usb_port_0>; + }; + }; }; }; }; @@ -1714,154 +1719,56 @@ thermal-zones { - diode-thermal { + cpu-thermal { + polling-delay-passive = <250>; + polling-delay = <500>; status = "okay"; - polling-delay = <0>; - polling-delay-passive = <1100>; trips { - gpu_shutdown { - temperature = <92500>; + cpu_trip_critical: critical { + temperature = <96500>; hysteresis = <0>; type = "critical"; - writable; }; - gpu_throttle { - temperature = <86000>; - hysteresis = <0>; - type = "passive"; - writable; + cpu_trip_hot: hot { + temperature = <70000>; + hysteresis = <2000>; + type = "hot"; }; - gpu_scaling_trip0: gpu-scaling-trip0 { - temperature = <(TEGRA210B01_GPU_DVFS_THERMAL_MIN)>; - hysteresis = <0>; /* millicelsius */ - type = "active"; - }; - gpu_scaling_trip1: gpu-scaling-trip1 { - temperature = ; - hysteresis = <1000>; /* millicelsius */ - type = "active"; - }; - gpu_scaling_trip2: gpu-scaling-trip2 { - temperature = ; - hysteresis = <1000>; /* millicelsius */ - type = "active"; - }; - gpu_scaling_trip3: gpu-scaling-trip3 { - temperature = ; - hysteresis = <1000>; /* millicelsius */ - type = "active"; - }; - gpu_scaling_trip4: gpu-scaling-trip4 { - temperature = ; - hysteresis = <1000>; /* millicelsius */ - type = "active"; - }; - gpu_scaling_trip5: gpu-scaling-trip5 { - temperature = ; - hysteresis = <1000>; /* millicelsius */ + + cpu_trip_active: active { + temperature = <50000>; + hysteresis = <2000>; type = "active"; }; - gpu_vmax_trip1: gpu-vmax-trip1 { - temperature = ; - hysteresis = <1000>; /* millicelsius */ - type = "active"; - }; - core_dvfs_floor_trip0: core_dvfs_floor_trip0 { - temperature = ; - hysteresis = <1000>; - type = "active"; - }; - - core_dvfs_cap_trip0: core_dvfs_cap_trip0 { - temperature = ; - hysteresis = <1000>; - type = "active"; - }; - soc_critical { - temperature = <96000>; - hysteresis = <0>; - type = "critical"; - writable; - }; - soc_emergency { - temperature = <85000>; + cpu_trip_passive: passive { + temperature = <30000>; hysteresis = <2000>; type = "passive"; - writable; - }; - dfll_floor_trip0: dfll-floor-trip0 { - temperature = ; - hysteresis = <1000>; /* millicelsius */ - type = "active"; - }; - }; - cooling-maps { - core_dvfs_floor_map0 { - trip = <&core_dvfs_floor_trip0>; - cooling-device = <&core_dvfs_floor 1 1>; - }; - core_dvfs_cap_map0 { - trip = <&core_dvfs_cap_trip0>; - cooling-device = <&core_dvfs_cap 1 1>; - }; - - dfll-floor-map0 { - trip = <&dfll_floor_trip0>; - cooling-device = <&dfll_floor 1 1>; - }; - }; - }; - - pllx-thermal { - polling-delay-passive = <500>; - - trips { - cpu_heavy { - temperature = <94500>; - hysteresis = <0>; - type = "hot"; - writable; - }; - cpu_throttle { - temperature = <90500>; - hysteresis = <0>; - type = "passive"; - writable; - }; - cpu_critical { - temperature = <96000>; - hysteresis = <0>; - type = "critical"; - writable; - }; - dfll_cap_trip0: dfll-cap-trip0 { - temperature = ; - hysteresis = <1000>; /* millicelsius */ - type = "active"; - }; - dfll_cap_trip1: dfll-cap-trip1 { - temperature = ; - hysteresis = <1000>; /* millicelsius */ - type = "active"; }; }; cooling-maps { map0 { - trip = <&{/thermal-zones/pllx-thermal/trips/cpu_heavy}>; - cdev-type = "tegra-heavy"; - cooling-device = <&throttle_heavy 1 1>; + cooling-device = <&fan 3 3>; + trip = <&cpu_trip_critical>; }; - dfll-cap-map0 { - trip = <&dfll_cap_trip0>; - cooling-device = <&dfll_cap 1 1>; + + map1 { + cooling-device = <&fan 2 2>; + trip = <&cpu_trip_hot>; }; - dfll-cap-map1 { - trip = <&dfll_cap_trip1>; - cooling-device = <&dfll_cap 2 2>; + + map2 { + cooling-device = <&fan 1 1>; + trip = <&cpu_trip_active>; + }; + + map3 { + cooling-device = <&fan 0 0>; + trip = <&cpu_trip_passive>; }; }; }; @@ -1924,11 +1831,11 @@ vddio-pex-ctl-supply = <&max77620_sd3>; pci@1,0 { - nvidia,num-lanes = <2>; + // nvidia,num-lanes = <2>; use 4 from default phys = <&{/padctl@7009f000/pads/pcie/lanes/pcie-3}>, /* Referred to plat config */ <&{/padctl@7009f000/pads/pcie/lanes/pcie-2}>; phy-names = "pcie-0", "pcie-1"; - status = "okay"; + status = "disabled"; }; pci@2,0 { @@ -1941,7 +1848,7 @@ status = "okay"; compatible = "brcm,bcm4356-fmac"; reg = <1>; - reset-gpios = ; + reset-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_LOW>; }; }; }; @@ -2019,10 +1926,11 @@ }; }; - // usb3-0 { - // status = "okay"; - // nvidia,usb2-companion = <0>; - // }; + usb3-0 { + status = "okay"; + nvidia,usb2-companion = <0>; + maximum-speed = "super-speed"; + }; }; }; @@ -2265,6 +2173,7 @@ function = "gpio"; }; + /* max77812 chip enable */ gpio1 { pins = "gpio1"; function = "fps-out"; @@ -2274,6 +2183,7 @@ maxim,active-fps-power-down-slot = <0>; }; + /* max77812 vio and force m3vout force */ gpio2 { pins = "gpio2"; function = "fps-out"; @@ -2283,6 +2193,7 @@ maxim,active-fps-power-down-slot = <0>; }; + /* vdd_3v3 */ gpio3 { pins = "gpio3"; function = "fps-out"; @@ -2503,44 +2414,6 @@ }; }; - dfll_cap: dfll-cdev-cap { - compatible = "nvidia,tegra-dfll-cdev-action"; - act-dev = <&tegra_clk_dfll>; - cdev-type = "DFLL-cap"; - #cooling-cells = <2>; /* min followed by max */ - }; - - dfll_floor: dfll-cdev-floor { - compatible = "nvidia,tegra-dfll-cdev-action"; - act-dev = <&tegra_clk_dfll>; - cdev-type = "DFLL-floor"; - #cooling-cells = <2>; /* min followed by max */ - }; - - // gpu_scaling_cdev: gpu-scaling-cdev { - // cooling-min-state = <0>; - // cooling-max-state = <5>; - // #cooling-cells = <2>; - // compatible = "nvidia,tegra210-rail-scaling-cdev"; - // cdev-type = "gpu_scaling"; - // nvidia,constraint; - // nvidia,trips = <&gpu_scaling_trip0 800 &gpu_scaling_trip1 0 - // &gpu_scaling_trip2 0 &gpu_scaling_trip3 0 - // &gpu_scaling_trip4 0 &gpu_scaling_trip5 0>; - // }; - - // gpu_vmax_cdev: gpu-vmax-cdev { - // cooling-min-state = <0>; - // cooling-max-state = <1>; - // #cooling-cells = <2>; - // compatible = "nvidia,tegra210-rail-vmax-cdev"; - // cdev-type = "GPU-cap"; - // nvidia,constraint-ucm2; - // nvidia,trips = <&gpu_vmax_trip1 1010 1010>; - // clocks = <&tegra_car TEGRA210_CLK_CAP_VGPU_GBUS>; - // clock-names = "cap-clk"; - // status = "disabled"; - // }; dummy_cool_dev: dummy-cool-dev { compatible = "dummy-cooling-dev"; #cooling-cells = <2>; /* min followed by max */ diff --git a/tegra210b01-vali.dts b/tegra210b01-vali.dts index 8e3c0b0..ae929ea 100644 --- a/tegra210b01-vali.dts +++ b/tegra210b01-vali.dts @@ -9,9 +9,8 @@ pinmux: pinmux@700008d4 { status = "okay"; - pinctrl-names = "default", "drive"; + pinctrl-names = "default"; pinctrl-0 = <&pinmux_default>; - pinctrl-1 = <&drive_default>; pinmux_default: common { /* SFIO Pin Configuration */ @@ -21,6 +20,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x10>; + nvidia,pull-up-strength = <0x10>; }; dvfs_pwm_pbb1 { /* 3184 */ @@ -29,6 +30,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x04>; + nvidia,pull-up-strength = <0x14>; }; dap1_din_pb1 { /* 3128 */ @@ -69,6 +72,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x10>; + nvidia,pull-up-strength = <0x10>; }; dmic1_dat_pe1 { /* 30a8 */ @@ -77,6 +82,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x10>; + nvidia,pull-up-strength = <0x10>; }; dmic2_clk_pe2 { /* 30ac */ @@ -85,6 +92,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x10>; + nvidia,pull-up-strength = <0x10>; }; dmic2_dat_pe3 { /* 30b0 */ @@ -93,6 +102,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x10>; + nvidia,pull-up-strength = <0x10>; }; /* SD Card Power Enable */ @@ -102,6 +113,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x1F>; + nvidia,pull-up-strength = <0x1F>; }; /* Gamecard Power Enable */ @@ -111,6 +124,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x1F>; + nvidia,pull-up-strength = <0x1F>; }; gen3_i2c_scl_pf0 { /* 30cc */ @@ -121,6 +136,8 @@ nvidia,enable-input = ; nvidia,io-high-voltage = ; nvidia,lpdr = ; + nvidia,pull-down-strength = <0x7>; + nvidia,pull-up-strength = <0x00>; }; gen3_i2c_sda_pf1 { /* 30d0 */ @@ -131,6 +148,8 @@ nvidia,enable-input = ; nvidia,io-high-voltage = ; nvidia,lpdr = ; + nvidia,pull-down-strength = <0x7>; + nvidia,pull-up-strength = <0x00>; }; cam_i2c_scl_ps2 { /* 30d4 */ @@ -140,6 +159,8 @@ nvidia,tristate = ; nvidia,enable-input = ; nvidia,io-high-voltage = ; + nvidia,pull-down-strength = <0x1F>; + nvidia,pull-up-strength = <0x00>; }; /* Gamecard Detect */ @@ -150,6 +171,8 @@ nvidia,tristate = ; nvidia,enable-input = ; nvidia,io-high-voltage = ; + nvidia,pull-down-strength = <0x1F>; + nvidia,pull-up-strength = <0x00>; }; cam1_mclk_ps0 { /* 3154 */ @@ -158,6 +181,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x10>; + nvidia,pull-up-strength = <0x10>; }; /* Charger IC (BQ24193) Battery Charge Status */ @@ -167,6 +192,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x10>; + nvidia,pull-up-strength = <0x10>; }; pex_l0_clkreq_n_pa1 { /* 303c PARKED */ @@ -356,6 +383,8 @@ nvidia,tristate = ; nvidia,enable-input = ; nvidia,io-high-voltage = ; + nvidia,pull-down-strength = <0x1F>; + nvidia,pull-up-strength = <0x00>; }; pwr_i2c_sda_py4 { /* 30e0 */ @@ -365,6 +394,8 @@ nvidia,tristate = ; nvidia,enable-input = ; nvidia,io-high-voltage = ; + nvidia,pull-down-strength = <0x1F>; + nvidia,pull-up-strength = <0x00>; }; clk_32k_in { /* 3160 */ @@ -448,6 +479,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x10>; + nvidia,pull-up-strength = <0x10>; }; /* NFC Power Enable */ @@ -457,6 +490,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x10>; + nvidia,pull-up-strength = <0x10>; }; /* NFC IRQ */ @@ -466,6 +501,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x10>; + nvidia,pull-up-strength = <0x10>; }; /* Touchscreen (4CD60D) Reset */ @@ -475,6 +512,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x10>; + nvidia,pull-up-strength = <0x10>; }; gen1_i2c_scl_pj1 { /* 30bc */ @@ -484,6 +523,8 @@ nvidia,tristate = ; nvidia,enable-input = ; nvidia,io-high-voltage = ; + nvidia,pull-down-strength = <0x1F>; + nvidia,pull-up-strength = <0x00>; }; gen1_i2c_sda_pj0 { /* 30c0 */ @@ -493,6 +534,8 @@ nvidia,tristate = ; nvidia,enable-input = ; nvidia,io-high-voltage = ; + nvidia,pull-down-strength = <0x1F>; + nvidia,pull-up-strength = <0x00>; }; gen2_i2c_scl_pj2 { /* 30c4 */ @@ -502,6 +545,8 @@ nvidia,tristate = ; nvidia,enable-input = ; nvidia,io-high-voltage = ; + nvidia,pull-down-strength = <0x4>; + nvidia,pull-up-strength = <0x00>; }; gen2_i2c_sda_pj3 { /* 30c8 */ @@ -511,6 +556,8 @@ nvidia,tristate = ; nvidia,enable-input = ; nvidia,io-high-voltage = ; + nvidia,pull-down-strength = <0x4>; + nvidia,pull-up-strength = <0x00>; }; uart1_tx_pu0 { /* 30e4 */ @@ -718,6 +765,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x04>; + nvidia,pull-up-strength = <0x14>; }; uart3_rx_pd2 { /* 3108 */ @@ -726,6 +775,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x04>; + nvidia,pull-up-strength = <0x14>; }; uart3_rts_pd3 { /* 310C */ @@ -734,6 +785,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x04>; + nvidia,pull-up-strength = <0x14>; }; uart3_cts_pd4 { /* 3110 */ @@ -742,6 +795,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x04>; + nvidia,pull-up-strength = <0x14>; }; uart4_tx_pi4 { /* 3114 */ @@ -844,6 +899,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x1F>; + nvidia,pull-up-strength = <0x1F>; }; /* Gamecard Reset */ @@ -853,6 +910,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x04>; + nvidia,pull-up-strength = <0x14>; }; /* Audio Codec (ALC5639) Alert */ @@ -862,6 +921,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x04>; + nvidia,pull-up-strength = <0x14>; }; /* Joycon (L) Wake Detect */ @@ -887,6 +948,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x10>; + nvidia,pull-up-strength = <0x10>; }; /* Charger IC (BQ24193) Battery Charge Enable */ @@ -896,6 +959,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x10>; + nvidia,pull-up-strength = <0x10>; }; /* Fan Tachometer */ @@ -926,13 +991,13 @@ }; /* 5V Regulator - Battery */ - // pa5 { /* 304c */ - // nvidia,pins = "pa5"; - // nvidia,function = "rsvd1"; - // nvidia,pull = ; - // nvidia,tristate = ; - // nvidia,enable-input = ; - // }; + sata_led_active_pa5 { /* 304c */ + nvidia,pins = "sata_led_active_pa5"; + nvidia,function = "rsvd1"; + nvidia,pull = ; + nvidia,tristate = ; + nvidia,enable-input = ; + }; als_prox_int_px3 { /* 3228 */ nvidia,pins = "als_prox_int_px3"; @@ -976,6 +1041,8 @@ nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,pull-down-strength = <0x14>; + nvidia,pull-up-strength = <0x14>; }; /* Touchscreen (4CD60D) IRQ */ @@ -1032,13 +1099,13 @@ }; /* LCD Backlight Power Enable */ - // lcd_bl_en_pv1 { /* 3200 */ - // nvidia,pins = "lcd_bl_en_pv1"; - // nvidia,function = "rsvd0"; - // nvidia,pull = ; - // nvidia,tristate = ; - // nvidia,enable-input = ; - // }; + lcd_bl_en_pv1 { /* 3200 */ + nvidia,pins = "lcd_bl_en_pv1"; + nvidia,function = "rsvd0"; + nvidia,pull = ; + nvidia,tristate = ; + nvidia,enable-input = ; + }; /* LCD Reset */ lcd_rst_pv2 { /* 3204 */ @@ -1270,238 +1337,46 @@ nvidia,tristate = ; nvidia,enable-input = ; }; - }; - drive_default: drive { - aud_mclk_pbb0 { - nvidia,pins = "aud_mclk_pbb0"; - nvidia,pull-down-strength = <0x10>; - nvidia,pull-up-strength = <0x10>; - }; - cam1_mclk_ps0 { - nvidia,pins = "cam1_mclk_ps0"; - nvidia,pull-down-strength = <0x10>; - nvidia,pull-up-strength = <0x10>; - }; - cam2_mclk_ps1 { - nvidia,pins = "cam2_mclk_ps1"; - nvidia,pull-down-strength = <0x10>; - nvidia,pull-up-strength = <0x10>; - }; - cam_af_en_ps5 { - nvidia,pins = "cam_af_en_ps5"; - nvidia,pull-down-strength = <0x10>; - nvidia,pull-up-strength = <0x10>; - }; - cam_flash_en_ps6 { - nvidia,pins = "cam_flash_en_ps6"; - nvidia,pull-down-strength = <0x10>; - nvidia,pull-up-strength = <0x10>; - }; - cam_i2c_scl_ps2 { - nvidia,pins = "cam_i2c_scl_ps2"; - nvidia,pull-down-strength = <0x1F>; - nvidia,pull-up-strength = <0x00>; - }; - cam_i2c_sda_ps3 { - nvidia,pins = "cam_i2c_sda_ps3"; - nvidia,pull-down-strength = <0x1F>; - nvidia,pull-up-strength = <0x00>; - }; - dmic3_clk_pe4 { - nvidia,pins = "dmic3_clk_pe4"; - nvidia,pull-down-strength = <0x1F>; - nvidia,pull-up-strength = <0x1F>; - }; - dmic3_dat_pe5 { - nvidia,pins = "dmic3_dat_pe5"; - nvidia,pull-down-strength = <0x1F>; - nvidia,pull-up-strength = <0x1F>; - }; - dap4_din_pj5 { - nvidia,pins = "dap4_din_pj5"; - nvidia,pull-down-strength = <0x10>; - nvidia,pull-up-strength = <0x10>; - }; - dap4_dout_pj6 { - nvidia,pins = "dap4_dout_pj6"; - nvidia,pull-down-strength = <0x10>; - nvidia,pull-up-strength = <0x10>; - }; - dap4_fs_pj4 { - nvidia,pins = "dap4_fs_pj4"; - nvidia,pull-down-strength = <0x10>; - nvidia,pull-up-strength = <0x10>; - }; - dap4_sclk_pj7 { - nvidia,pins = "dap4_sclk_pj7"; - nvidia,pull-down-strength = <0x10>; - nvidia,pull-up-strength = <0x10>; - }; - dmic1_clk_pe0 { - nvidia,pins = "dmic1_clk_pe0"; - nvidia,pull-down-strength = <0x10>; - nvidia,pull-up-strength = <0x10>; - }; - dmic1_dat_pe1 { - nvidia,pins = "dmic1_dat_pe1"; - nvidia,pull-down-strength = <0x10>; - nvidia,pull-up-strength = <0x10>; - }; - dmic2_clk_pe2 { - nvidia,pins = "dmic2_clk_pe2"; - nvidia,pull-down-strength = <0x10>; - nvidia,pull-up-strength = <0x10>; - }; - dmic2_dat_pe3 { - nvidia,pins = "dmic2_dat_pe3"; - nvidia,pull-down-strength = <0x10>; - nvidia,pull-up-strength = <0x10>; - }; - touch_clk_pv7 { - nvidia,pins = "touch_clk_pv7"; - nvidia,pull-down-strength = <0x14>; - nvidia,pull-up-strength = <0x14>; - }; - gen1_i2c_scl_pj1 { - nvidia,pins = "gen1_i2c_scl_pj1"; - nvidia,pull-down-strength = <0x1F>; - nvidia,pull-up-strength = <0x00>; - }; - gen1_i2c_sda_pj0 { - nvidia,pins = "gen1_i2c_sda_pj0"; - nvidia,pull-down-strength = <0x1F>; - nvidia,pull-up-strength = <0x00>; - }; - gen2_i2c_scl_pj2 { - nvidia,pins = "gen2_i2c_scl_pj2"; - nvidia,pull-down-strength = <0x4>; - nvidia,pull-up-strength = <0x00>; - }; - gen2_i2c_sda_pj3 { - nvidia,pins = "gen2_i2c_sda_pj3"; - nvidia,pull-down-strength = <0x4>; - nvidia,pull-up-strength = <0x00>; - }; - gen3_i2c_scl_pf0 { - nvidia,pins = "gen3_i2c_scl_pf0"; - nvidia,pull-down-strength = <0x7>; - nvidia,pull-up-strength = <0x00>; - }; - gen3_i2c_sda_pf1 { - nvidia,pins = "gen3_i2c_sda_pf1"; - nvidia,pull-down-strength = <0x7>; - nvidia,pull-up-strength = <0x00>; - }; - pwr_i2c_scl_py3 { - nvidia,pins = "pwr_i2c_scl_py3"; - nvidia,pull-down-strength = <0x1F>; - nvidia,pull-up-strength = <0x00>; - }; - pwr_i2c_sda_py4 { - nvidia,pins = "pwr_i2c_sda_py4"; - nvidia,pull-down-strength = <0x1F>; - nvidia,pull-up-strength = <0x00>; - }; - spi1_cs0_pc3 { - nvidia,pins = "spi1_cs0_pc3"; - nvidia,pull-down-strength = <0x00>; - nvidia,pull-up-strength = <0x00>; - }; - spi1_cs1_pc4 { - nvidia,pins = "spi1_cs1_pc4"; - nvidia,pull-down-strength = <0x00>; - nvidia,pull-up-strength = <0x00>; - }; - spi1_miso_pc1 { - nvidia,pins = "spi1_miso_pc1"; - nvidia,pull-down-strength = <0x00>; - nvidia,pull-up-strength = <0x00>; - }; - spi1_mosi_pc0 { - nvidia,pins = "spi1_mosi_pc0"; - nvidia,pull-down-strength = <0x00>; - nvidia,pull-up-strength = <0x00>; - }; - spi1_sck_pc2 { - nvidia,pins = "spi1_sck_pc2"; - nvidia,pull-down-strength = <0x00>; - nvidia,pull-up-strength = <0x00>; - }; - spi2_cs0_pb7 { - nvidia,pins = "spi2_cs0_pb7"; - nvidia,pull-down-strength = <0x00>; - nvidia,pull-up-strength = <0x00>; - }; - spi2_cs1_pdd0 { - nvidia,pins = "spi2_cs1_pdd0"; - nvidia,pull-down-strength = <0x00>; - nvidia,pull-up-strength = <0x00>; - }; - spi2_miso_pb5 { - nvidia,pins = "spi2_miso_pb5"; - nvidia,pull-down-strength = <0x00>; - nvidia,pull-up-strength = <0x00>; - }; - spi2_mosi_pb4 { + /* Unused SPI2 pins */ + spi2_mosi_pb4 { /* 3064 */ nvidia,pins = "spi2_mosi_pb4"; - nvidia,pull-down-strength = <0x00>; - nvidia,pull-up-strength = <0x00>; + nvidia,function = "rsvd2"; + nvidia,pull = ; + nvidia,tristate = ; + nvidia,enable-input = ; }; - spi2_sck_pb6 { + + spi2_miso_pb5 { /* 3068 */ + nvidia,pins = "spi2_miso_pb5"; + nvidia,function = "rsvd2"; + nvidia,pull = ; + nvidia,tristate = ; + nvidia,enable-input = ; + }; + + spi2_sck_pb6 { /* 306c */ nvidia,pins = "spi2_sck_pb6"; - nvidia,pull-down-strength = <0x00>; - nvidia,pull-up-strength = <0x00>; + nvidia,function = "rsvd2"; + nvidia,pull = ; + nvidia,tristate = ; + nvidia,enable-input = ; }; - dvfs_clk_pbb2 { - nvidia,pins = "dvfs_clk_pbb2"; - nvidia,pull-down-strength = <0x1F>; - nvidia,pull-up-strength = <0x1F>; + + spi2_cs0_pb7 { /* 3070 */ + nvidia,pins = "spi2_cs0_pb7"; + nvidia,function = "rsvd2"; + nvidia,pull = ; + nvidia,tristate = ; + nvidia,enable-input = ; }; - dvfs_pwm_pbb1 { - nvidia,pins = "dvfs_pwm_pbb1"; - nvidia,pull-down-strength = <0x04>; - nvidia,pull-up-strength = <0x14>; - }; - pz0 { - nvidia,pins = "pz0"; - nvidia,pull-down-strength = <0x10>; - nvidia,pull-up-strength = <0x10>; - }; - pz1 { - nvidia,pins = "pz1"; - nvidia,pull-down-strength = <0x10>; - nvidia,pull-up-strength = <0x10>; - }; - gpio_x1_aud_pbb3 { - nvidia,pins = "gpio_x1_aud_pbb3"; - nvidia,pull-down-strength = <0x04>; - nvidia,pull-up-strength = <0x14>; - }; - gpio_x3_aud_pbb4 { - nvidia,pins = "gpio_x3_aud_pbb4"; - nvidia,pull-down-strength = <0x04>; - nvidia,pull-up-strength = <0x14>; - }; - uart3_tx_pd1 { - nvidia,pins = "uart3_tx_pd1"; - nvidia,pull-down-strength = <0x04>; - nvidia,pull-up-strength = <0x14>; - }; - uart3_rx_pd2 { - nvidia,pins = "uart3_rx_pd2"; - nvidia,pull-down-strength = <0x04>; - nvidia,pull-up-strength = <0x14>; - }; - uart3_rts_pd3 { - nvidia,pins = "uart3_rts_pd3"; - nvidia,pull-down-strength = <0x04>; - nvidia,pull-up-strength = <0x14>; - }; - uart3_cts_pd4 { - nvidia,pins = "uart3_cts_pd4"; - nvidia,pull-down-strength = <0x04>; - nvidia,pull-up-strength = <0x14>; + + spi2_cs1_pdd0 { /* 3074 */ + nvidia,pins = "spi2_cs1_pdd0"; + nvidia,function = "rsvd1"; + nvidia,pull = ; + nvidia,tristate = ; + nvidia,enable-input = ; }; }; }; @@ -1604,9 +1479,9 @@ xusb: usb@70090000 { status = "okay"; - phys = <&{/padctl@7009f000/pads/usb2/lanes/usb2-0}>;//, - //<&{/padctl@7009f000/pads/pcie/lanes/pcie-5}>; - phy-names = "usb2-0";//, "usb3-0"; + phys = <&{/padctl@7009f000/pads/usb2/lanes/usb2-0}>, + <&{/padctl@7009f000/pads/pcie/lanes/pcie-5}>; + phy-names = "usb2-0", "usb3-0"; avdd-usb-supply = <&vdd_3v3>; dvddio-pex-supply = <&max77620_ldo1>; @@ -1616,9 +1491,9 @@ xudc: usb@700d0000 { status = "okay"; - phys = <&{/padctl@7009f000/pads/usb2/lanes/usb2-0}>;//, - //<&{/padctl@7009f000/pads/pcie/lanes/pcie-5}>; - phy-names = "usb2-0";//, "usb3-0"; + phys = <&{/padctl@7009f000/pads/usb2/lanes/usb2-0}>, + <&{/padctl@7009f000/pads/pcie/lanes/pcie-5}>; + phy-names = "usb2-0", "usb3-0"; hvdd-usb-supply = <&vdd_3v3>; avddio-usb-supply = <&max77620_ldo1>;