Commit 880925e8 authored by Yoshihiro Kaneko's avatar Yoshihiro Kaneko Committed by Geert Uytterhoeven

arm64: dts: renesas: r8a77990: ebisu: Sort nodes

Sort nodes.

If node address is present
   * Sort by node address, grouping all nodes with the same compat string
     and sorting the group alphabetically.
Else
   * Sort alphabetically

This should not have any run-time effect.
Signed-off-by: default avatarYoshihiro Kaneko <ykaneko0929@gmail.com>
[geert: Sort sound child nodes]
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent 52f95a09
...@@ -23,12 +23,6 @@ chosen { ...@@ -23,12 +23,6 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory@48000000 {
device_type = "memory";
/* first 128MB is reserved for secure area. */
reg = <0x0 0x48000000 0x0 0x38000000>;
};
audio_clkout: audio-clkout { audio_clkout: audio-clkout {
/* /*
* This is same as <&rcar_sound 0> * This is same as <&rcar_sound 0>
...@@ -107,36 +101,10 @@ thc63lvd1024_out: endpoint { ...@@ -107,36 +101,10 @@ thc63lvd1024_out: endpoint {
}; };
}; };
vga { memory@48000000 {
compatible = "vga-connector"; device_type = "memory";
/* first 128MB is reserved for secure area. */
port { reg = <0x0 0x48000000 0x0 0x38000000>;
vga_in: endpoint {
remote-endpoint = <&adv7123_out>;
};
};
};
vga-encoder {
compatible = "adi,adv7123";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
adv7123_in: endpoint {
remote-endpoint = <&du_out_rgb>;
};
};
port@1 {
reg = <1>;
adv7123_out: endpoint {
remote-endpoint = <&vga_in>;
};
};
};
}; };
reg_1p8v: regulator0 { reg_1p8v: regulator0 {
...@@ -157,15 +125,13 @@ reg_3p3v: regulator1 { ...@@ -157,15 +125,13 @@ reg_3p3v: regulator1 {
regulator-always-on; regulator-always-on;
}; };
vbus0_usb2: regulator-vbus0-usb2 { reg_12p0v: regulator2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "D12.0V";
regulator-name = "USB20_VBUS_CN"; regulator-min-microvolt = <12000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <12000000>;
regulator-max-microvolt = <5000000>; regulator-boot-on;
regulator-always-on;
gpio = <&gpio6 4 GPIO_ACTIVE_HIGH>;
enable-active-high;
}; };
rsnd_ak4613: sound { rsnd_ak4613: sound {
...@@ -176,34 +142,24 @@ rsnd_ak4613: sound { ...@@ -176,34 +142,24 @@ rsnd_ak4613: sound {
simple-audio-card,bitclock-master = <&sndcpu>; simple-audio-card,bitclock-master = <&sndcpu>;
simple-audio-card,frame-master = <&sndcpu>; simple-audio-card,frame-master = <&sndcpu>;
sndcpu: simple-audio-card,cpu {
sound-dai = <&rcar_sound>;
};
sndcodec: simple-audio-card,codec { sndcodec: simple-audio-card,codec {
sound-dai = <&ak4613>; sound-dai = <&ak4613>;
}; };
};
x12_clk: x12 { sndcpu: simple-audio-card,cpu {
compatible = "fixed-clock"; sound-dai = <&rcar_sound>;
#clock-cells = <0>; };
clock-frequency = <24576000>;
}; };
reg_12p0v: regulator2 { vbus0_usb2: regulator-vbus0-usb2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "D12.0V";
regulator-min-microvolt = <12000000>;
regulator-max-microvolt = <12000000>;
regulator-boot-on;
regulator-always-on;
};
x13_clk: x13 { regulator-name = "USB20_VBUS_CN";
compatible = "fixed-clock"; regulator-min-microvolt = <5000000>;
#clock-cells = <0>; regulator-max-microvolt = <5000000>;
clock-frequency = <74250000>;
gpio = <&gpio6 4 GPIO_ACTIVE_HIGH>;
enable-active-high;
}; };
vcc_sdhi0: regulator-vcc-sdhi0 { vcc_sdhi0: regulator-vcc-sdhi0 {
...@@ -253,6 +209,50 @@ vccq_sdhi1: regulator-vccq-sdhi1 { ...@@ -253,6 +209,50 @@ vccq_sdhi1: regulator-vccq-sdhi1 {
states = <3300000 1 states = <3300000 1
1800000 0>; 1800000 0>;
}; };
vga {
compatible = "vga-connector";
port {
vga_in: endpoint {
remote-endpoint = <&adv7123_out>;
};
};
};
vga-encoder {
compatible = "adi,adv7123";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
adv7123_in: endpoint {
remote-endpoint = <&du_out_rgb>;
};
};
port@1 {
reg = <1>;
adv7123_out: endpoint {
remote-endpoint = <&vga_in>;
};
};
};
};
x12_clk: x12 {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <24576000>;
};
x13_clk: x13 {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <74250000>;
};
}; };
&audio_clk_a { &audio_clk_a {
...@@ -547,6 +547,11 @@ pwm5_pins: pwm5 { ...@@ -547,6 +547,11 @@ pwm5_pins: pwm5 {
function = "pwm5"; function = "pwm5";
}; };
scif2_pins: scif2 {
groups = "scif2_data_a";
function = "scif2";
};
sdhi0_pins: sd0 { sdhi0_pins: sd0 {
groups = "sdhi0_data4", "sdhi0_ctrl"; groups = "sdhi0_data4", "sdhi0_ctrl";
function = "sdhi0"; function = "sdhi0";
...@@ -577,20 +582,15 @@ sdhi3_pins: sd3 { ...@@ -577,20 +582,15 @@ sdhi3_pins: sd3 {
power-source = <1800>; power-source = <1800>;
}; };
sound_pins: sound {
groups = "ssi01239_ctrl", "ssi0_data", "ssi1_data";
function = "ssi";
};
sound_clk_pins: sound_clk { sound_clk_pins: sound_clk {
groups = "audio_clk_a", "audio_clk_b_a", "audio_clk_c_a", groups = "audio_clk_a", "audio_clk_b_a", "audio_clk_c_a",
"audio_clkout_a", "audio_clkout1_a"; "audio_clkout_a", "audio_clkout1_a";
function = "audio_clk"; function = "audio_clk";
}; };
scif2_pins: scif2 { sound_pins: sound {
groups = "scif2_data_a"; groups = "ssi01239_ctrl", "ssi0_data", "ssi1_data";
function = "scif2"; function = "ssi";
}; };
usb0_pins: usb { usb0_pins: usb {
...@@ -671,38 +671,6 @@ &scif2 { ...@@ -671,38 +671,6 @@ &scif2 {
status = "okay"; status = "okay";
}; };
&ssi1 {
shared-pin;
};
&usb2_phy0 {
pinctrl-0 = <&usb0_pins>;
pinctrl-names = "default";
vbus-supply = <&vbus0_usb2>;
status = "okay";
};
&usb3_peri0 {
companion = <&xhci0>;
status = "okay";
};
&vin4 {
status = "okay";
};
&vin5 {
status = "okay";
};
&xhci0 {
pinctrl-0 = <&usb30_pins>;
pinctrl-names = "default";
status = "okay";
};
&sdhi0 { &sdhi0 {
pinctrl-0 = <&sdhi0_pins>; pinctrl-0 = <&sdhi0_pins>;
pinctrl-1 = <&sdhi0_pins_uhs>; pinctrl-1 = <&sdhi0_pins_uhs>;
...@@ -746,3 +714,35 @@ &sdhi3 { ...@@ -746,3 +714,35 @@ &sdhi3 {
non-removable; non-removable;
status = "okay"; status = "okay";
}; };
&ssi1 {
shared-pin;
};
&usb2_phy0 {
pinctrl-0 = <&usb0_pins>;
pinctrl-names = "default";
vbus-supply = <&vbus0_usb2>;
status = "okay";
};
&usb3_peri0 {
companion = <&xhci0>;
status = "okay";
};
&vin4 {
status = "okay";
};
&vin5 {
status = "okay";
};
&xhci0 {
pinctrl-0 = <&usb30_pins>;
pinctrl-names = "default";
status = "okay";
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment