Skip to content

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

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
Show whitespace changes
Inline Side-by-side
Showing with 233 additions and 228 deletions
arch/arm/boot/dts/exynos5420-peach-pit.dts
View file @ 522c8ff5
...@@ -25,8 +25,13 @@ / { ...@@ -25,8 +25,13 @@ / {
"google,pit", "google,peach","samsung,exynos5420", "google,pit", "google,peach","samsung,exynos5420",
"samsung,exynos5"; "samsung,exynos5";
memory { backlight {
reg = <0x20000000 0x80000000>; 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 { fixed-rate-clocks {
...@@ -50,13 +55,8 @@ power { ...@@ -50,13 +55,8 @@ power {
}; };
}; };
backlight { memory {
compatible = "pwm-backlight"; reg = <0x20000000 0x80000000>;
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";
}; };
sound { sound {
...@@ -89,64 +89,83 @@ usb301_vbus_reg: regulator-usb301 { ...@@ -89,64 +89,83 @@ usb301_vbus_reg: regulator-usb301 {
}; };
}; };
&pinctrl_0 { &dp {
max98090_irq: max98090-irq { status = "okay";
samsung,pins = "gpx0-2"; pinctrl-names = "default";
samsung,pin-function = <0>; pinctrl-0 = <&dp_hpd_gpio>;
samsung,pin-pud = <0>; samsung,color-space = <0>;
samsung,pin-drv = <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 { display-timings {
samsung,pins = "gpx1-0"; native-mode = <&timing1>;
samsung,pin-function = <0>;
samsung,pin-pud = <0>;
samsung,pin-drv = <0>;
};
power_key_irq: power-key-irq { timing1: timing@1 {
samsung,pins = "gpx1-2"; clock-frequency = <70589280>;
samsung,pin-function = <0>; hactive = <1366>;
samsung,pin-pud = <0>; vactive = <768>;
samsung,pin-drv = <0>; hfront-porch = <40>;
hback-porch = <40>;
hsync-len = <32>;
vback-porch = <10>;
vfront-porch = <12>;
vsync-len = <6>;
}; };
hdmi_hpd_irq: hdmi-hpd-irq {
samsung,pins = "gpx3-7";
samsung,pin-function = <0>;
samsung,pin-pud = <1>;
samsung,pin-drv = <0>;
}; };
};
dp_hpd_gpio: dp_hpd_gpio { &fimd {
samsung,pins = "gpx2-6"; status = "okay";
samsung,pin-function = <0>; samsung,invert-vclk;
samsung,pin-pud = <3>;
samsung,pin-drv = <0>;
};
}; };
&pinctrl_3 { &hdmi {
usb300_vbus_en: usb300-vbus-en { status = "okay";
samsung,pins = "gph0-0"; hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
samsung,pin-function = <1>; pinctrl-names = "default";
samsung,pin-pud = <0>; pinctrl-0 = <&hdmi_hpd_irq>;
samsung,pin-drv = <0>; ddc = <&i2c_2>;
};
&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>;
}; };
};
usb301_vbus_en: usb301-vbus-en { &hsi2c_9 {
samsung,pins = "gph0-1"; status = "okay";
samsung,pin-function = <1>; clock-frequency = <400000>;
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"; status = "okay";
samsung,i2c-sda-delay = <100>;
samsung,i2c-max-bus-freq = <66000>;
samsung,i2c-slave-addr = <0x50>;
}; };
&uart_3 { &i2s0 {
status = "okay"; status = "okay";
}; };
...@@ -189,46 +208,66 @@ slot@0 { ...@@ -189,46 +208,66 @@ slot@0 {
}; };
}; };
&hsi2c_7 {
status = "okay";
max98090: codec@10 { &pinctrl_0 {
compatible = "maxim,max98090"; max98090_irq: max98090-irq {
reg = <0x10>; samsung,pins = "gpx0-2";
interrupts = <2 0>; samsung,pin-function = <0>;
interrupt-parent = <&gpx0>; samsung,pin-pud = <0>;
pinctrl-names = "default"; samsung,pin-drv = <0>;
pinctrl-0 = <&max98090_irq>;
}; };
};
&hsi2c_9 { tpm_irq: tpm-irq {
status = "okay"; samsung,pins = "gpx1-0";
clock-frequency = <400000>; samsung,pin-function = <0>;
samsung,pin-pud = <0>;
samsung,pin-drv = <0>;
};
tpm@20 { power_key_irq: power-key-irq {
compatible = "infineon,slb9645tt"; samsung,pins = "gpx1-2";
reg = <0x20>; samsung,pin-function = <0>;
samsung,pin-pud = <0>;
samsung,pin-drv = <0>;
};
/* Unused irq; but still need to configure the pins */ dp_hpd_gpio: dp_hpd_gpio {
pinctrl-names = "default"; samsung,pins = "gpx2-6";
pinctrl-0 = <&tpm_irq>; samsung,pin-function = <0>;
samsung,pin-pud = <3>;
samsung,pin-drv = <0>;
};
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"; status = "okay";
samsung,i2c-sda-delay = <100>;
samsung,i2c-max-bus-freq = <66000>;
samsung,i2c-slave-addr = <0x50>;
}; };
&hdmi { &uart_3 {
status = "okay"; status = "okay";
hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&hdmi_hpd_irq>;
ddc = <&i2c_2>;
}; };
&usbdrd_phy0 { &usbdrd_phy0 {
...@@ -248,40 +287,3 @@ &watchdog { ...@@ -248,40 +287,3 @@ &watchdog {
timeout-sec = <32>; 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
View file @ 522c8ff5
...@@ -23,8 +23,13 @@ / { ...@@ -23,8 +23,13 @@ / {
"google,pi", "google,peach", "samsung,exynos5800", "google,pi", "google,peach", "samsung,exynos5800",
"samsung,exynos5"; "samsung,exynos5";
memory { backlight {
reg = <0x20000000 0x80000000>; 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 { fixed-rate-clocks {
...@@ -48,13 +53,8 @@ power { ...@@ -48,13 +53,8 @@ power {
}; };
}; };
backlight { memory {
compatible = "pwm-backlight"; reg = <0x20000000 0x80000000>;
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";
}; };
sound { sound {
...@@ -87,64 +87,83 @@ usb301_vbus_reg: regulator-usb301 { ...@@ -87,64 +87,83 @@ usb301_vbus_reg: regulator-usb301 {
}; };
}; };
&pinctrl_0 { &dp {
max98091_irq: max98091-irq { status = "okay";
samsung,pins = "gpx0-2"; pinctrl-names = "default";
samsung,pin-function = <0>; pinctrl-0 = <&dp_hpd_gpio>;
samsung,pin-pud = <0>; samsung,color-space = <0>;
samsung,pin-drv = <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 { display-timings {
samsung,pins = "gpx1-0"; native-mode = <&timing1>;
samsung,pin-function = <0>;
samsung,pin-pud = <0>;
samsung,pin-drv = <0>;
};
power_key_irq: power-key-irq { timing1: timing@1 {
samsung,pins = "gpx1-2"; clock-frequency = <150660000>;
samsung,pin-function = <0>; hactive = <1920>;
samsung,pin-pud = <0>; vactive = <1080>;
samsung,pin-drv = <0>; hfront-porch = <60>;
hback-porch = <172>;
hsync-len = <80>;
vback-porch = <25>;
vfront-porch = <10>;
vsync-len = <10>;
}; };
dp_hpd_gpio: dp_hpd_gpio {
samsung,pins = "gpx2-6";
samsung,pin-function = <0>;
samsung,pin-pud = <3>;
samsung,pin-drv = <0>;
}; };
};
hdmi_hpd_irq: hdmi-hpd-irq { &fimd {
samsung,pins = "gpx3-7"; status = "okay";
samsung,pin-function = <0>; samsung,invert-vclk;
samsung,pin-pud = <1>;
samsung,pin-drv = <0>;
};
}; };
&pinctrl_3 { &hdmi {
usb300_vbus_en: usb300-vbus-en { status = "okay";
samsung,pins = "gph0-0"; hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
samsung,pin-function = <1>; pinctrl-names = "default";
samsung,pin-pud = <0>; pinctrl-0 = <&hdmi_hpd_irq>;
samsung,pin-drv = <0>; ddc = <&i2c_2>;
};
&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>;
}; };
};
usb301_vbus_en: usb301-vbus-en { &hsi2c_9 {
samsung,pins = "gph0-1"; status = "okay";
samsung,pin-function = <1>; clock-frequency = <400000>;
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"; status = "okay";
samsung,i2c-sda-delay = <100>;
samsung,i2c-max-bus-freq = <66000>;
samsung,i2c-slave-addr = <0x50>;
}; };
&uart_3 { &i2s0 {
status = "okay"; status = "okay";
}; };
...@@ -187,79 +206,66 @@ slot@0 { ...@@ -187,79 +206,66 @@ slot@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>;
display-timings {
native-mode = <&timing1>;
timing1: timing@1 { &pinctrl_0 {
clock-frequency = <150660000>; max98091_irq: max98091-irq {
hactive = <1920>; samsung,pins = "gpx0-2";
vactive = <1080>; samsung,pin-function = <0>;
hfront-porch = <60>; samsung,pin-pud = <0>;
hback-porch = <172>; samsung,pin-drv = <0>;
hsync-len = <80>;
vback-porch = <25>;
vfront-porch = <10>;
vsync-len = <10>;
}; };
tpm_irq: tpm-irq {
samsung,pins = "gpx1-0";
samsung,pin-function = <0>;
samsung,pin-pud = <0>;
samsung,pin-drv = <0>;
}; };
};
&fimd { power_key_irq: power-key-irq {
status = "okay"; samsung,pins = "gpx1-2";
samsung,invert-vclk; samsung,pin-function = <0>;
}; samsung,pin-pud = <0>;
samsung,pin-drv = <0>;
};
&hsi2c_7 { dp_hpd_gpio: dp_hpd_gpio {
status = "okay"; samsung,pins = "gpx2-6";
samsung,pin-function = <0>;
samsung,pin-pud = <3>;
samsung,pin-drv = <0>;
};
max98091: codec@10 { hdmi_hpd_irq: hdmi-hpd-irq {
compatible = "maxim,max98091"; samsung,pins = "gpx3-7";
reg = <0x10>; samsung,pin-function = <0>;
interrupts = <2 0>; samsung,pin-pud = <1>;
interrupt-parent = <&gpx0>; samsung,pin-drv = <0>;
pinctrl-names = "default";
pinctrl-0 = <&max98091_irq>;
}; };
}; };
&hsi2c_9 { &pinctrl_3 {
status = "okay"; usb300_vbus_en: usb300-vbus-en {
clock-frequency = <400000>; samsung,pins = "gph0-0";
samsung,pin-function = <1>;
samsung,pin-pud = <0>;
samsung,pin-drv = <0>;
};
tpm@20 { usb301_vbus_en: usb301-vbus-en {
compatible = "infineon,slb9645tt"; samsung,pins = "gph0-1";
reg = <0x20>; samsung,pin-function = <1>;
/* Unused irq; but still need to configure the pins */ samsung,pin-pud = <0>;
pinctrl-names = "default"; samsung,pin-drv = <0>;
pinctrl-0 = <&tpm_irq>;
}; };
}; };
&i2c_2 { &rtc {
status = "okay"; status = "okay";
samsung,i2c-sda-delay = <100>;
samsung,i2c-max-bus-freq = <66000>;
samsung,i2c-slave-addr = <0x50>;
}; };
&hdmi { &uart_3 {
status = "okay"; status = "okay";
hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&hdmi_hpd_irq>;
ddc = <&i2c_2>;
}; };
&usbdrd_phy0 { &usbdrd_phy0 {
...@@ -279,6 +285,3 @@ &watchdog { ...@@ -279,6 +285,3 @@ &watchdog {
timeout-sec = <32>; timeout-sec = <32>;
}; };
&i2s0 {
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7