Commit 8c0cf40f authored by Jerome Brunet's avatar Jerome Brunet Committed by Kevin Hilman
Browse files

arm64: dts: meson-axg: sort nodes consistently 



Sort DT nodes by address when possible, by node node name otherwise.

Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent 6f59dc1a

arch/arm64/boot/dts/amlogic/meson-axg-s400.dts

+106 −106
Original line number Diff line number Diff line
@@ -60,6 +60,37 @@ 
		serial1 = &uart_A;

	};



	linein: audio-codec@0 {

		#sound-dai-cells = <0>;

		compatible = "everest,es7241";

		VDDA-supply = <&vcc_3v3>;

		VDDP-supply = <&vcc_3v3>;

		VDDD-supply = <&vcc_3v3>;

		status = "okay";

		sound-name-prefix = "Linein";

	};



	lineout: audio-codec@1 {

		#sound-dai-cells = <0>;

		compatible = "everest,es7154";

		VDD-supply = <&vcc_3v3>;

		PVDD-supply = <&vcc_5v>;

		status = "okay";

		sound-name-prefix = "Lineout";

	};



	spdif_dit: audio-codec@2 {

		#sound-dai-cells = <0>;

		compatible = "linux,spdif-dit";

		status = "okay";

		sound-name-prefix = "DIT";

	};



	emmc_pwrseq: emmc-pwrseq {

		compatible = "mmc-pwrseq-emmc";

		reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;

	};



	main_12v: regulator-main_12v {

		compatible = "regulator-fixed";

		regulator-name = "12V";
@@ -68,15 +99,26 @@ 
		regulator-always-on;

	};



	vddio_boot: regulator-vddio_boot {

	vcc_3v3: regulator-vcc_3v3 {

		compatible = "regulator-fixed";

		regulator-name = "VDDIO_BOOT";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-name = "VCC_3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vddao_3v3>;

		regulator-always-on;

	};



	vcc_5v: regulator-vcc_5v {

		compatible = "regulator-fixed";

		regulator-name = "VCC5V";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		vin-supply = <&main_12v>;



		gpio = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	vddao_3v3: regulator-vddao_3v3 {

		compatible = "regulator-fixed";

		regulator-name = "VDDAO_3V3";
@@ -95,26 +137,15 @@ 
		regulator-always-on;

	};



	vcc_3v3: regulator-vcc_3v3 {

	vddio_boot: regulator-vddio_boot {

		compatible = "regulator-fixed";

		regulator-name = "VCC_3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-name = "VDDIO_BOOT";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		vin-supply = <&vddao_3v3>;

		regulator-always-on;

	};



	vcc_5v: regulator-vcc_5v {

		compatible = "regulator-fixed";

		regulator-name = "VCC5V";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		vin-supply = <&main_12v>;



		gpio = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	usb_pwr: regulator-usb_pwr {

		compatible = "regulator-fixed";

		regulator-name = "USB_PWR";
@@ -126,11 +157,6 @@ 
		enable-active-high;

	};



	emmc_pwrseq: emmc-pwrseq {

		compatible = "mmc-pwrseq-emmc";

		reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;

	};



	sdio_pwrseq: sdio-pwrseq {

		compatible = "mmc-pwrseq-simple";

		reset-gpios = <&gpio GPIOX_7 GPIO_ACTIVE_LOW>;
@@ -138,13 +164,6 @@ 
		clock-names = "ext_clock";

	};



	wifi32k: wifi32k {

		compatible = "pwm-clock";

		#clock-cells = <0>;

		clock-frequency = <32768>;

		pwms = <&pwm_ab 0 30518 0>; /* PWM_A at 32.768KHz */

	};



	speaker-leds {

		compatible = "gpio-leds";
@@ -179,32 +198,6 @@ 
		};

	};



	linein: audio-codec@0 {

		#sound-dai-cells = <0>;

		compatible = "everest,es7241";

		VDDA-supply = <&vcc_3v3>;

		VDDP-supply = <&vcc_3v3>;

		VDDD-supply = <&vcc_3v3>;

		status = "okay";

		sound-name-prefix = "Linein";

	};



	lineout: audio-codec@1 {

		#sound-dai-cells = <0>;

		compatible = "everest,es7154";

		VDD-supply = <&vcc_3v3>;

		PVDD-supply = <&vcc_5v>;

		status = "okay";

		sound-name-prefix = "Lineout";

	};



	spdif_dit: audio-codec@2 {

		#sound-dai-cells = <0>;

		compatible = "linux,spdif-dit";

		status = "okay";

		sound-name-prefix = "DIT";

	};



	sound {

		compatible = "amlogic,axg-sound-card";

		model = "AXG-S400";
@@ -311,6 +304,13 @@ 
			};

		};

	};



	wifi32k: wifi32k {

		compatible = "pwm-clock";

		#clock-cells = <0>;

		clock-frequency = <32768>;

		pwms = <&pwm_ab 0 30518 0>; /* PWM_A at 32.768KHz */

	};

};



&ethmac {
@@ -345,18 +345,6 @@ 
	status = "okay";

};



&uart_A {

	status = "okay";

	pinctrl-0 = <&uart_a_pins>;

	pinctrl-names = "default";

};



&uart_AO {

	status = "okay";

	pinctrl-0 = <&uart_ao_a_pins>;

	pinctrl-names = "default";

};



&ir {

	status = "okay";

	pinctrl-0 = <&remote_input_ao_pins>;
@@ -403,24 +391,9 @@ 
	pinctrl-names = "default";

};



/* emmc storage */

&sd_emmc_c {

&saradc {

	status = "okay";

	pinctrl-0 = <&emmc_pins>;

	pinctrl-1 = <&emmc_clk_gate_pins>;

	pinctrl-names = "default", "clk-gate";



	bus-width = <8>;

	cap-sd-highspeed;

	cap-mmc-highspeed;

	max-frequency = <180000000>;

	non-removable;

	disable-wp;

	mmc-ddr-1_8v;

	mmc-hs200-1_8v;



	vmmc-supply = <&vcc_3v3>;

	vqmmc-supply = <&vddio_boot>;

	vref-supply = <&vddio_ao18>;

};



/* wifi module */
@@ -450,9 +423,24 @@ 
	};

};



&saradc {

/* emmc storage */

&sd_emmc_c {

	status = "okay";

	vref-supply = <&vddio_ao18>;

	pinctrl-0 = <&emmc_pins>;

	pinctrl-1 = <&emmc_clk_gate_pins>;

	pinctrl-names = "default", "clk-gate";



	bus-width = <8>;

	cap-sd-highspeed;

	cap-mmc-highspeed;

	max-frequency = <180000000>;

	non-removable;

	disable-wp;

	mmc-ddr-1_8v;

	mmc-hs200-1_8v;



	vmmc-supply = <&vcc_3v3>;

	vqmmc-supply = <&vddio_boot>;

};



&spdifout {
@@ -461,45 +449,45 @@ 
	status = "okay";

};



&tdmin_a {

&tdmif_a {

	pinctrl-0 = <&tdma_sclk_pins>, <&tdma_fs_pins>,

		    <&tdma_din0_pins>, <&tdma_dout0_x15_pins>;

	pinctrl-names = "default";

	status = "okay";

};



&tdmin_b {

&tdmif_b {

	pinctrl-0 = <&tdmb_sclk_pins>, <&tdmb_fs_pins>,

		    <&tdmb_din3_pins>, <&mclk_b_pins>;

	pinctrl-names = "default";

	status = "okay";

};



&tdmin_c {

&tdmif_c {

	pinctrl-0 = <&tdmc_sclk_pins>, <&tdmc_fs_pins>,

		    <&tdmc_din1_pins>, <&tdmc_dout2_pins>,

		    <&mclk_c_pins>;

	pinctrl-names = "default";

	status = "okay";

};



&tdmin_lb {

&tdmin_a {

	status = "okay";

};



&tdmout_c {

&tdmin_b {

	status = "okay";

};



&tdmif_a {

	pinctrl-0 = <&tdma_sclk_pins>, <&tdma_fs_pins>,

		    <&tdma_din0_pins>, <&tdma_dout0_x15_pins>;

	pinctrl-names = "default";

&tdmin_c {

	status = "okay";

};



&tdmif_b {

	pinctrl-0 = <&tdmb_sclk_pins>, <&tdmb_fs_pins>,

		    <&tdmb_din3_pins>, <&mclk_b_pins>;

	pinctrl-names = "default";

&tdmin_lb {

	status = "okay";

};



&tdmif_c {

	pinctrl-0 = <&tdmc_sclk_pins>, <&tdmc_fs_pins>,

		    <&tdmc_din1_pins>, <&tdmc_dout2_pins>,

		    <&mclk_c_pins>;

	pinctrl-names = "default";

&tdmout_c {

	status = "okay";

};
@@ -514,3 +502,15 @@ 
&toddr_c {

	status = "okay";

};



&uart_A {

	status = "okay";

	pinctrl-0 = <&uart_a_pins>;

	pinctrl-names = "default";

};



&uart_AO {

	status = "okay";

	pinctrl-0 = <&uart_ao_a_pins>;

	pinctrl-names = "default";

};

arch/arm64/boot/dts/amlogic/meson-axg.dtsi

+879 −879

File changed.

Preview size limit exceeded, changes collapsed.