Skip to content

Commit

Permalink
ARM: tegra: Sort nodes by unit-address, then alphabetically
Browse files Browse the repository at this point in the history 
Nodes in device tree should be sorted by unit-address, followed by nodes
without a unit-address, sorted alphabetically. Some exceptions are the
top-level aliases, chosen, firmware, memory and reserved-memory nodes,
which are expected to come first.

These rules apply recursively with some exceptions, such as pinmux nodes
or regulator nodes, which often follow more complicated ordering (often
by "importance").

While at it, change the name of some of the nodes to follow standard
naming conventions, which helps with the sorting order and reduces the
amount of warnings from the DT validation tools.

Signed-off-by: Thierry Reding <treding@nvidia.com>
  • Loading branch information
@thierryreding
thierryreding committed Jan 23, 2023
1 parent 1b929c0 commit d1e34a8
Show file tree
Hide file tree
Showing 49 changed files with 1,770 additions and 1,760 deletions.
240 changes: 120 additions & 120 deletions arch/arm/boot/dts/tegra114-asus-tf701t.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@
serial2 = &uartb; /* GPS */
};

firmware {
trusted-foundations {
compatible = "tlm,trusted-foundations";
tlm,version-major = <2>;
tlm,version-minor = <8>;
};
};

memory@80000000 {
reg = <0x80000000 0x80000000>;
};
Expand Down Expand Up @@ -109,18 +117,28 @@
};

codec_default: pinmux-codec-default {
interrupt {
nvidia,pins = "gpio_w2_aud_pw2",
"gpio_w3_aud_pw3";
nvidia,function = "spi6";
nvidia,pull = <TEGRA_PIN_PULL_UP>;
nvidia,tristate = <TEGRA_PIN_DISABLE>;
nvidia,enable-input = <TEGRA_PIN_ENABLE>;
};

ldo1-en {
nvidia,pins = "sdmmc1_wp_n_pv3";
nvidia,function = "sdmmc1";
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
nvidia,tristate = <TEGRA_PIN_DISABLE>;
nvidia,enable-input = <TEGRA_PIN_DISABLE>;
};
};

interrupt {
nvidia,pins = "gpio_w2_aud_pw2",
"gpio_w3_aud_pw3";
nvidia,function = "spi6";
gpio_hall_sensor_default: pinmux-gpio-hall-sensor-default {
ulpi_data4_po5 {
nvidia,pins = "ulpi_data4_po5";
nvidia,function = "spi2";
nvidia,pull = <TEGRA_PIN_PULL_UP>;
nvidia,tristate = <TEGRA_PIN_DISABLE>;
nvidia,enable-input = <TEGRA_PIN_ENABLE>;
Expand All @@ -146,16 +164,6 @@
};
};

gpio_hall_sensor_default: pinmux-gpio-hall-sensor-default {
ulpi_data4_po5 {
nvidia,pins = "ulpi_data4_po5";
nvidia,function = "spi2";
nvidia,pull = <TEGRA_PIN_PULL_UP>;
nvidia,tristate = <TEGRA_PIN_DISABLE>;
nvidia,enable-input = <TEGRA_PIN_ENABLE>;
};
};

hp_det_default: pinmux-hp-det-default {
gmi_iordy_pi5 {
nvidia,pins = "kb_row7_pr7";
Expand Down Expand Up @@ -198,6 +206,16 @@
};

sdmmc3_default: pinmux-sdmmc3-default {
drive_sdio3 {
nvidia,pins = "drive_sdio3";
nvidia,high-speed-mode = <TEGRA_PIN_ENABLE>;
nvidia,schmitt = <TEGRA_PIN_DISABLE>;
nvidia,pull-down-strength = <22>;
nvidia,pull-up-strength = <36>;
nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_FASTEST>;
nvidia,slew-rate-falling = <TEGRA_PIN_SLEW_RATE_FASTEST>;
};

sdmmc3_clk_pa6 {
nvidia,pins = "sdmmc3_clk_pa6";
nvidia,function = "sdmmc3";
Expand All @@ -221,16 +239,6 @@
nvidia,tristate = <TEGRA_PIN_DISABLE>;
nvidia,enable-input = <TEGRA_PIN_ENABLE>;
};

drive_sdio3 {
nvidia,pins = "drive_sdio3";
nvidia,high-speed-mode = <TEGRA_PIN_ENABLE>;
nvidia,schmitt = <TEGRA_PIN_DISABLE>;
nvidia,pull-down-strength = <22>;
nvidia,pull-up-strength = <36>;
nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_FASTEST>;
nvidia,slew-rate-falling = <TEGRA_PIN_SLEW_RATE_FASTEST>;
};
};

sdmmc3_vdd_default: pinmux-sdmmc3-vdd-default {
Expand Down Expand Up @@ -298,6 +306,14 @@
pinctrl-0 = <&codec_default>;
};

temp_sensor: temperature-sensor@4c {
compatible = "onnn,nct1008";
reg = <0x4c>;

vcc-supply = <&vdd_3v3_sys>;
#thermal-sensor-cells = <1>;
};

motion-tracker@68 {
compatible = "invensense,mpu6500";
reg = <0x68>;
Expand All @@ -312,14 +328,6 @@
pinctrl-names = "default";
pinctrl-0 = <&imu_default>;
};

temp_sensor: temperature-sensor@4c {
compatible = "onnn,nct1008";
reg = <0x4c>;

vcc-supply = <&vdd_3v3_sys>;
#thermal-sensor-cells = <1>;
};
};

i2c@7000c400 {
Expand Down Expand Up @@ -368,6 +376,66 @@
#gpio-cells = <2>;
};

pinmux {
compatible = "ti,tps65913-pinctrl";
ti,palmas-enable-dvfs1;

pinctrl-names = "default";
pinctrl-0 = <&palmas_default>;

palmas_default: pinmux {
pin_gpio0 {
pins = "gpio0";
function = "gpio";
};

pin_gpio1 {
pins = "gpio1";
function = "gpio";
};

pin_gpio2 {
pins = "gpio2";
function = "gpio";
};

pin_gpio3 {
pins = "gpio3";
function = "gpio";
};

pin_gpio4 {
pins = "gpio4";
function = "gpio";
};

pin_gpio5 {
pins = "gpio5";
function = "gpio";
};

pin_gpio6 {
pins = "gpio6";
function = "gpio";
};

pin_gpio7 {
pins = "gpio7";
function = "gpio";
};

pin_powergood {
pins = "powergood";
function = "powergood";
};

pin_vac {
pins = "vac";
function = "vac";
};
};
};

pmic {
compatible = "ti,tps65913-pmic", "ti,palmas-pmic";

Expand Down Expand Up @@ -528,66 +596,6 @@
interrupt-parent = <&palmas>;
interrupts = <8 0>;
};

pinmux {
compatible = "ti,tps65913-pinctrl";
ti,palmas-enable-dvfs1;

pinctrl-names = "default";
pinctrl-0 = <&palmas_default>;

palmas_default: pinmux {
pin_powergood {
pins = "powergood";
function = "powergood";
};

pin_vac {
pins = "vac";
function = "vac";
};

pin_gpio0 {
pins = "gpio0";
function = "gpio";
};

pin_gpio1 {
pins = "gpio1";
function = "gpio";
};

pin_gpio2 {
pins = "gpio2";
function = "gpio";
};

pin_gpio3 {
pins = "gpio3";
function = "gpio";
};

pin_gpio4 {
pins = "gpio4";
function = "gpio";
};

pin_gpio5 {
pins = "gpio5";
function = "gpio";
};

pin_gpio6 {
pins = "gpio6";
function = "gpio";
};

pin_gpio7 {
pins = "gpio7";
function = "gpio";
};
};
};
};
};

Expand Down Expand Up @@ -668,11 +676,21 @@
clock-output-names = "pmic-oscillator";
};

firmware {
trusted-foundations {
compatible = "tlm,trusted-foundations";
tlm,version-major = <2>;
tlm,version-minor = <8>;
gpio-hall-sensor {
compatible = "gpio-keys";

label = "GPIO Hall Effect Sensor";

pinctrl-names = "default";
pinctrl-0 = <&gpio_hall_sensor_default>;

switch-hall-sensor {
label = "Hall Effect Sensor";
gpios = <&gpio TEGRA_GPIO(O, 5) GPIO_ACTIVE_LOW>;
linux,input-type = <EV_SW>;
linux,code = <SW_LID>;
linux,can-disable;
wakeup-source;
};
};

Expand All @@ -692,36 +710,18 @@
wakeup-source;
};

button-volume-up {
label = "Volume Up";
gpios = <&gpio TEGRA_GPIO(R, 2) GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
debounce-interval = <10>;
};

button-volume-down {
label = "Volume Down";
gpios = <&gpio TEGRA_GPIO(R, 1) GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;
debounce-interval = <10>;
};
};

gpio-hall-sensor {
compatible = "gpio-keys";

label = "GPIO Hall Effect Sensor";

pinctrl-names = "default";
pinctrl-0 = <&gpio_hall_sensor_default>;

switch-hall-sensor {
label = "Hall Effect Sensor";
gpios = <&gpio TEGRA_GPIO(O, 5) GPIO_ACTIVE_LOW>;
linux,input-type = <EV_SW>;
linux,code = <SW_LID>;
linux,can-disable;
wakeup-source;
button-volume-up {
label = "Volume Up";
gpios = <&gpio TEGRA_GPIO(R, 2) GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
debounce-interval = <10>;
};
};

Expand Down
26 changes: 13 additions & 13 deletions arch/arm/boot/dts/tegra114-dalmore.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -909,6 +909,19 @@
#gpio-cells = <2>;
};

pinmux {
compatible = "ti,tps65913-pinctrl";
pinctrl-names = "default";
pinctrl-0 = <&palmas_default>;

palmas_default: pinmux {
pin_gpio6 {
pins = "gpio6";
function = "gpio";
};
};
};

pmic {
compatible = "ti,tps65913-pmic", "ti,palmas-pmic";
smps1-in-supply = <&tps65090_dcdc3_reg>;
Expand Down Expand Up @@ -1065,19 +1078,6 @@
interrupt-parent = <&palmas>;
interrupts = <8 0>;
};

pinmux {
compatible = "ti,tps65913-pinctrl";
pinctrl-names = "default";
pinctrl-0 = <&palmas_default>;

palmas_default: pinmux {
pin_gpio6 {
pins = "gpio6";
function = "gpio";
};
};
};
};
};

Expand Down
14 changes: 8 additions & 6 deletions arch/arm/boot/dts/tegra124-apalis-emc.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
*
*/

#include <dt-bindings/clock/tegra124-car.h>

/ {
clock@60006000 {
emc-timings-1 {
Expand Down Expand Up @@ -1474,12 +1476,12 @@
};
};
};
};

&emc_icc_dvfs_opp_table {
/delete-node/ opp-1200000000-1100;
};
opp-table-actmon {
/delete-node/ opp-1200000000;
};

&emc_bw_dfs_opp_table {
/delete-node/ opp-1200000000;
opp-table-emc {
/delete-node/ opp-1200000000-1100;
};
};
Loading

0 comments on commit d1e34a8

Please sign in to comment.