Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 522c8ff5 authored by Tushar Behera's avatar Tushar Behera Committed by Kukjin Kim
Browse files

ARM: dts: Sort nodes within Peach-pit/Peach-pi dts files 



Peach-pit and Peach-pi boards are almost similar, hence the DTS file
is also very similar. Sorting nodes in both these files will allow
us to figure out the difference easily.

All the node aliases are sorted in alphabetically increasing order.
There is no functional change with this patch.

Signed-off-by: default avatarTushar Behera <tushar.b@samsung.com>
Reviewed-by: default avatarDoug Anderson <dianders@chromium.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent db91fb2c

arch/arm/boot/dts/exynos5420-peach-pit.dts

+119 −117
Original line number Diff line number Diff line
@@ -25,8 +25,13 @@ 
		"google,pit", "google,peach","samsung,exynos5420",

		"samsung,exynos5";



	memory {

		reg = <0x20000000 0x80000000>;

	backlight {

		compatible = "pwm-backlight";

		pwms = <&pwm 0 1000000 0>;

		brightness-levels = <0 100 500 1000 1500 2000 2500 2800>;

		default-brightness-level = <7>;

		pinctrl-0 = <&pwm0_out>;

		pinctrl-names = "default";

	};



	fixed-rate-clocks {
@@ -50,13 +55,8 @@ 
		};

	};



	backlight {

		compatible = "pwm-backlight";

		pwms = <&pwm 0 1000000 0>;

		brightness-levels = <0 100 500 1000 1500 2000 2500 2800>;

		default-brightness-level = <7>;

		pinctrl-0 = <&pwm0_out>;

		pinctrl-names = "default";

	memory {

		reg = <0x20000000 0x80000000>;

	};



	sound {
@@ -89,64 +89,83 @@ 
	};

};



&pinctrl_0 {

	max98090_irq: max98090-irq {

		samsung,pins = "gpx0-2";

		samsung,pin-function = <0>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

	};

&dp {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&dp_hpd_gpio>;

	samsung,color-space = <0>;

	samsung,dynamic-range = <0>;

	samsung,ycbcr-coeff = <0>;

	samsung,color-depth = <1>;

	samsung,link-rate = <0x06>;

	samsung,lane-count = <2>;

	samsung,hpd-gpio = <&gpx2 6 0>;



	tpm_irq: tpm-irq {

		samsung,pins = "gpx1-0";

		samsung,pin-function = <0>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

	display-timings {

		native-mode = <&timing1>;



		timing1: timing@1 {

			clock-frequency = <70589280>;

			hactive = <1366>;

			vactive = <768>;

			hfront-porch = <40>;

			hback-porch = <40>;

			hsync-len = <32>;

			vback-porch = <10>;

			vfront-porch = <12>;

			vsync-len = <6>;

		};

	};

};



	power_key_irq: power-key-irq {

		samsung,pins = "gpx1-2";

		samsung,pin-function = <0>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

&fimd {

	status = "okay";

	samsung,invert-vclk;

};



	hdmi_hpd_irq: hdmi-hpd-irq {

		samsung,pins = "gpx3-7";

		samsung,pin-function = <0>;

		samsung,pin-pud = <1>;

		samsung,pin-drv = <0>;

&hdmi {

	status = "okay";

	hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;

	pinctrl-names = "default";

	pinctrl-0 = <&hdmi_hpd_irq>;

	ddc = <&i2c_2>;

};



	dp_hpd_gpio: dp_hpd_gpio {

		samsung,pins = "gpx2-6";

		samsung,pin-function = <0>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <0>;

&hsi2c_7 {

	status = "okay";



	max98090: codec@10 {

		compatible = "maxim,max98090";

		reg = <0x10>;

		interrupts = <2 0>;

		interrupt-parent = <&gpx0>;

		pinctrl-names = "default";

		pinctrl-0 = <&max98090_irq>;

	};

};



&pinctrl_3 {

	usb300_vbus_en: usb300-vbus-en {

		samsung,pins = "gph0-0";

		samsung,pin-function = <1>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

	};

&hsi2c_9 {

	status = "okay";

	clock-frequency = <400000>;



	usb301_vbus_en: usb301-vbus-en {

		samsung,pins = "gph0-1";

		samsung,pin-function = <1>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

	tpm@20 {

		compatible = "infineon,slb9645tt";

		reg = <0x20>;



		/* Unused irq; but still need to configure the pins */

		pinctrl-names = "default";

		pinctrl-0 = <&tpm_irq>;

	};

};



&rtc {

&i2c_2 {

	status = "okay";

	samsung,i2c-sda-delay = <100>;

	samsung,i2c-max-bus-freq = <66000>;

	samsung,i2c-slave-addr = <0x50>;

};



&uart_3 {

&i2s0 {

	status = "okay";

};
@@ -189,46 +208,66 @@ 
	};

};



&hsi2c_7 {

	status = "okay";



	max98090: codec@10 {

		compatible = "maxim,max98090";

		reg = <0x10>;

		interrupts = <2 0>;

		interrupt-parent = <&gpx0>;

		pinctrl-names = "default";

		pinctrl-0 = <&max98090_irq>;

&pinctrl_0 {

	max98090_irq: max98090-irq {

		samsung,pins = "gpx0-2";

		samsung,pin-function = <0>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

	};



	tpm_irq: tpm-irq {

		samsung,pins = "gpx1-0";

		samsung,pin-function = <0>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

	};



&hsi2c_9 {

	status = "okay";

	clock-frequency = <400000>;

	power_key_irq: power-key-irq {

		samsung,pins = "gpx1-2";

		samsung,pin-function = <0>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

	};



	tpm@20 {

		compatible = "infineon,slb9645tt";

		reg = <0x20>;

	dp_hpd_gpio: dp_hpd_gpio {

		samsung,pins = "gpx2-6";

		samsung,pin-function = <0>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <0>;

	};



		/* Unused irq; but still need to configure the pins */

		pinctrl-names = "default";

		pinctrl-0 = <&tpm_irq>;

	hdmi_hpd_irq: hdmi-hpd-irq {

		samsung,pins = "gpx3-7";

		samsung,pin-function = <0>;

		samsung,pin-pud = <1>;

		samsung,pin-drv = <0>;

	};

};



&i2c_2	{

&pinctrl_3 {

	usb300_vbus_en: usb300-vbus-en {

		samsung,pins = "gph0-0";

		samsung,pin-function = <1>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

	};



	usb301_vbus_en: usb301-vbus-en {

		samsung,pins = "gph0-1";

		samsung,pin-function = <1>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

	};

};



&rtc {

	status = "okay";

	samsung,i2c-sda-delay = <100>;

	samsung,i2c-max-bus-freq = <66000>;

	samsung,i2c-slave-addr = <0x50>;

};



&hdmi {

&uart_3 {

	status = "okay";

	hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;

	pinctrl-names = "default";

	pinctrl-0 = <&hdmi_hpd_irq>;

	ddc = <&i2c_2>;

};



&usbdrd_phy0 {
@@ -248,40 +287,3 @@ 
	timeout-sec = <32>;

};

&i2s0 {

	status = "okay";

};



&fimd {

	status = "okay";

	samsung,invert-vclk;

};



&dp {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&dp_hpd_gpio>;

	samsung,color-space = <0>;

	samsung,dynamic-range = <0>;

	samsung,ycbcr-coeff = <0>;

	samsung,color-depth = <1>;

	samsung,link-rate = <0x06>;

	samsung,lane-count = <2>;

	samsung,hpd-gpio = <&gpx2 6 0>;



	display-timings {

		native-mode = <&timing1>;



		timing1: timing@1 {

			clock-frequency = <70589280>;

			hactive = <1366>;

			vactive = <768>;

			hfront-porch = <40>;

			hback-porch = <40>;

			hsync-len = <32>;

			vback-porch = <10>;

			vfront-porch = <12>;

			vsync-len = <6>;

		};

	};

};

arch/arm/boot/dts/exynos5800-peach-pi.dts

+114 −111
Original line number Diff line number Diff line
@@ -23,8 +23,13 @@ 
		"google,pi", "google,peach", "samsung,exynos5800",

		"samsung,exynos5";



	memory {

		reg = <0x20000000 0x80000000>;

	backlight {

		compatible = "pwm-backlight";

		pwms = <&pwm 0 1000000 0>;

		brightness-levels = <0 100 500 1000 1500 2000 2500 2800>;

		default-brightness-level = <7>;

		pinctrl-0 = <&pwm0_out>;

		pinctrl-names = "default";

	};



	fixed-rate-clocks {
@@ -48,13 +53,8 @@ 
		};

	};



	backlight {

		compatible = "pwm-backlight";

		pwms = <&pwm 0 1000000 0>;

		brightness-levels = <0 100 500 1000 1500 2000 2500 2800>;

		default-brightness-level = <7>;

		pinctrl-0 = <&pwm0_out>;

		pinctrl-names = "default";

	memory {

		reg = <0x20000000 0x80000000>;

	};



	sound {
@@ -87,64 +87,83 @@ 
	};

};



&pinctrl_0 {

	max98091_irq: max98091-irq {

		samsung,pins = "gpx0-2";

		samsung,pin-function = <0>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

	};

&dp {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&dp_hpd_gpio>;

	samsung,color-space = <0>;

	samsung,dynamic-range = <0>;

	samsung,ycbcr-coeff = <0>;

	samsung,color-depth = <1>;

	samsung,link-rate = <0x0a>;

	samsung,lane-count = <2>;

	samsung,hpd-gpio = <&gpx2 6 0>;



	tpm_irq: tpm-irq {

		samsung,pins = "gpx1-0";

		samsung,pin-function = <0>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

	display-timings {

		native-mode = <&timing1>;



		timing1: timing@1 {

			clock-frequency = <150660000>;

			hactive = <1920>;

			vactive = <1080>;

			hfront-porch = <60>;

			hback-porch = <172>;

			hsync-len = <80>;

			vback-porch = <25>;

			vfront-porch = <10>;

			vsync-len = <10>;

		};

	};

};



	power_key_irq: power-key-irq {

		samsung,pins = "gpx1-2";

		samsung,pin-function = <0>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

&fimd {

	status = "okay";

	samsung,invert-vclk;

};



	dp_hpd_gpio: dp_hpd_gpio {

		samsung,pins = "gpx2-6";

		samsung,pin-function = <0>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <0>;

&hdmi {

	status = "okay";

	hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;

	pinctrl-names = "default";

	pinctrl-0 = <&hdmi_hpd_irq>;

	ddc = <&i2c_2>;

};



	hdmi_hpd_irq: hdmi-hpd-irq {

		samsung,pins = "gpx3-7";

		samsung,pin-function = <0>;

		samsung,pin-pud = <1>;

		samsung,pin-drv = <0>;

&hsi2c_7 {

	status = "okay";



	max98091: codec@10 {

		compatible = "maxim,max98091";

		reg = <0x10>;

		interrupts = <2 0>;

		interrupt-parent = <&gpx0>;

		pinctrl-names = "default";

		pinctrl-0 = <&max98091_irq>;

	};

};



&pinctrl_3 {

	usb300_vbus_en: usb300-vbus-en {

		samsung,pins = "gph0-0";

		samsung,pin-function = <1>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

	};

&hsi2c_9 {

	status = "okay";

	clock-frequency = <400000>;



	usb301_vbus_en: usb301-vbus-en {

		samsung,pins = "gph0-1";

		samsung,pin-function = <1>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

	tpm@20 {

		compatible = "infineon,slb9645tt";

		reg = <0x20>;



		/* Unused irq; but still need to configure the pins */

		pinctrl-names = "default";

		pinctrl-0 = <&tpm_irq>;

	};

};



&rtc {

&i2c_2 {

	status = "okay";

	samsung,i2c-sda-delay = <100>;

	samsung,i2c-max-bus-freq = <66000>;

	samsung,i2c-slave-addr = <0x50>;

};



&uart_3 {

&i2s0 {

	status = "okay";

};
@@ -187,79 +206,66 @@ 
	};

};



&dp {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&dp_hpd_gpio>;

	samsung,color-space = <0>;

	samsung,dynamic-range = <0>;

	samsung,ycbcr-coeff = <0>;

	samsung,color-depth = <1>;

	samsung,link-rate = <0x0a>;

	samsung,lane-count = <2>;

	samsung,hpd-gpio = <&gpx2 6 0>;



	display-timings {

		native-mode = <&timing1>;



		timing1: timing@1 {

			clock-frequency = <150660000>;

			hactive = <1920>;

			vactive = <1080>;

			hfront-porch = <60>;

			hback-porch = <172>;

			hsync-len = <80>;

			vback-porch = <25>;

			vfront-porch = <10>;

			vsync-len = <10>;

		};

&pinctrl_0 {

	max98091_irq: max98091-irq {

		samsung,pins = "gpx0-2";

		samsung,pin-function = <0>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

	};



	tpm_irq: tpm-irq {

		samsung,pins = "gpx1-0";

		samsung,pin-function = <0>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

	};



&fimd {

	status = "okay";

	samsung,invert-vclk;

	power_key_irq: power-key-irq {

		samsung,pins = "gpx1-2";

		samsung,pin-function = <0>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

	};



&hsi2c_7 {

	status = "okay";

	dp_hpd_gpio: dp_hpd_gpio {

		samsung,pins = "gpx2-6";

		samsung,pin-function = <0>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <0>;

	};



	max98091: codec@10 {

		compatible = "maxim,max98091";

		reg = <0x10>;

		interrupts = <2 0>;

		interrupt-parent = <&gpx0>;

		pinctrl-names = "default";

		pinctrl-0 = <&max98091_irq>;

	hdmi_hpd_irq: hdmi-hpd-irq {

		samsung,pins = "gpx3-7";

		samsung,pin-function = <0>;

		samsung,pin-pud = <1>;

		samsung,pin-drv = <0>;

	};

};



&hsi2c_9 {

	status = "okay";

	clock-frequency = <400000>;

&pinctrl_3 {

	usb300_vbus_en: usb300-vbus-en {

		samsung,pins = "gph0-0";

		samsung,pin-function = <1>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

	};



	tpm@20 {

		compatible = "infineon,slb9645tt";

		reg = <0x20>;

		/* Unused irq; but still need to configure the pins */

		pinctrl-names = "default";

		pinctrl-0 = <&tpm_irq>;

	usb301_vbus_en: usb301-vbus-en {

		samsung,pins = "gph0-1";

		samsung,pin-function = <1>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

	};

};



&i2c_2 {

&rtc {

	status = "okay";

	samsung,i2c-sda-delay = <100>;

	samsung,i2c-max-bus-freq = <66000>;

	samsung,i2c-slave-addr = <0x50>;

};



&hdmi {

&uart_3 {

	status = "okay";

	hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;

	pinctrl-names = "default";

	pinctrl-0 = <&hdmi_hpd_irq>;

	ddc = <&i2c_2>;

};



&usbdrd_phy0 {
@@ -279,6 +285,3 @@ 
	timeout-sec = <32>;

};

&i2s0 {

	status = "okay";

};