[PATCH 10/10] arm64: dts: exynos7870: Re-order properties to match coding style
Krzysztof Kozlowski
krzysztof.kozlowski at oss.qualcomm.com
Fri Sep 11 03:19:18 PDT 2026
Re-order a few properties to match coding style, as pointed out by
dt-check-style, e.g.:
exynos7870-j5y17lte.dts:31: [property-order] property 'ranges' out of canonical order (should sort before '#size-cells')
exynos7870-j5y17lte.dts:47: [property-order] property 'pinctrl-names' must be placed after 'pinctrl-0'
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski at oss.qualcomm.com>
---
.../arm64/boot/dts/exynos/exynos7870-a2corelte.dts | 39 ++++----
arch/arm64/boot/dts/exynos/exynos7870-j5y17lte.dts | 34 ++++---
arch/arm64/boot/dts/exynos/exynos7870-j6lte.dts | 34 ++++---
arch/arm64/boot/dts/exynos/exynos7870-j7xelte.dts | 35 ++++---
arch/arm64/boot/dts/exynos/exynos7870-on7xelte.dts | 39 ++++----
arch/arm64/boot/dts/exynos/exynos7870.dtsi | 108 ++++++++++-----------
6 files changed, 151 insertions(+), 138 deletions(-)
diff --git a/arch/arm64/boot/dts/exynos/exynos7870-a2corelte.dts b/arch/arm64/boot/dts/exynos/exynos7870-a2corelte.dts
index 0888cd2faca4..67f317afd85e 100644
--- a/arch/arm64/boot/dts/exynos/exynos7870-a2corelte.dts
+++ b/arch/arm64/boot/dts/exynos/exynos7870-a2corelte.dts
@@ -34,8 +34,8 @@ gpio-keys {
compatible = "gpio-keys";
label = "GPIO Keys";
- pinctrl-names = "default";
pinctrl-0 = <&key_power &key_voldown &key_volup>;
+ pinctrl-names = "default";
key-power {
label = "Power Key";
@@ -86,9 +86,9 @@ vdd_fixed_proxled: regulator-fixed-proxled {
};
reserved-memory {
+ ranges;
#address-cells = <2>;
#size-cells = <1>;
- ranges;
ramoops at 46800000 {
compatible = "ramoops";
@@ -166,8 +166,8 @@ pmic at 66 {
interrupt-parent = <&gpa0>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
- pinctrl-names = "default";
pinctrl-0 = <&pmic_irq>;
+ pinctrl-names = "default";
regulators {
vdd_buck1: buck1 {
@@ -402,8 +402,8 @@ accelerometer at 1d {
interrupt-parent = <&gpa2>;
interrupts = <3 IRQ_TYPE_EDGE_RISING>;
- pinctrl-names = "default";
pinctrl-0 = <&accel_irq>;
+ pinctrl-names = "default";
st,drdy-int-pin = <1>;
};
@@ -414,8 +414,8 @@ proximity at 48 {
interrupt-parent = <&gpa0>;
interrupts = <5 IRQ_TYPE_EDGE_BOTH>;
- pinctrl-names = "default";
pinctrl-0 = <&proxm_irq>;
+ pinctrl-names = "default";
proximity-near-level = <25>;
};
@@ -435,8 +435,8 @@ touchscreen at 4b {
#address-cells = <1>;
#size-cells = <0>;
- pinctrl-names = "default";
pinctrl-0 = <&touch_irq>;
+ pinctrl-names = "default";
vdd-supply = <&vdd_ldo35>;
@@ -461,18 +461,19 @@ rmi4-f12 at 12 {
};
&mmc0 {
- pinctrl-names = "default";
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_rdqs &sd0_bus1 &sd0_bus4 &sd0_bus8>;
+ pinctrl-names = "default";
vmmc-supply = <&vdd_ldo26>;
vqmmc-supply = <&vdd_ldo27>;
bus-width = <8>;
fifo-depth = <64>;
+ non-removable;
+
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <0 4>;
samsung,dw-mshc-ddr-timing = <2 4>;
- non-removable;
status = "okay";
};
@@ -481,36 +482,37 @@ &mmc1 {
#address-cells = <1>;
#size-cells = <0>;
- pinctrl-names = "default";
pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus1 &sd1_bus4>;
+ pinctrl-names = "default";
mmc-pwrseq = <&pwrseq_mmc1>;
bus-width = <4>;
fifo-depth = <64>;
- samsung,dw-mshc-ciu-div = <3>;
- samsung,dw-mshc-sdr-timing = <0 3>;
- samsung,dw-mshc-ddr-timing = <1 2>;
non-removable;
cap-sd-highspeed;
cap-sdio-irq;
+ samsung,dw-mshc-ciu-div = <3>;
+ samsung,dw-mshc-sdr-timing = <0 3>;
+ samsung,dw-mshc-ddr-timing = <1 2>;
+
status = "okay";
wifi at 1 {
compatible = "brcm,bcm43430a1-fmac", "brcm,bcm4329-fmac";
reg = <0x1>;
- interrupt-names = "host-wake";
interrupt-parent = <&gpa2>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+ interrupt-names = "host-wake";
reset-gpios = <&gpd3 6 GPIO_ACTIVE_LOW>;
};
};
&mmc2 {
- pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus1 &sd2_bus4 &dwmmc2_irq>;
+ pinctrl-names = "default";
vmmc-supply = <&vdd_fixed_mmc2>;
vqmmc-supply = <&vdd_ldo2>;
@@ -518,14 +520,15 @@ &mmc2 {
bus-width = <4>;
card-detect-delay = <200>;
fifo-depth = <64>;
- samsung,dw-mshc-ciu-div = <3>;
- samsung,dw-mshc-sdr-timing = <0 3>;
- samsung,dw-mshc-ddr-timing = <1 2>;
sd-uhs-sdr50;
sd-uhs-sdr104;
broken-cd;
disable-wp;
+ samsung,dw-mshc-ciu-div = <3>;
+ samsung,dw-mshc-sdr-timing = <0 3>;
+ samsung,dw-mshc-ddr-timing = <1 2>;
+
status = "okay";
};
@@ -629,8 +632,8 @@ &serial1 {
bluetooth {
compatible = "brcm,bcm43430a1-bt";
- pinctrl-names = "default";
pinctrl-0 = <&bt_btwake &bt_hostwake &bt_enable>;
+ pinctrl-names = "default";
device-wakeup-gpios = <&gpa1 2 GPIO_ACTIVE_HIGH>;
host-wakeup-gpios = <&gpa1 6 GPIO_ACTIVE_HIGH>;
diff --git a/arch/arm64/boot/dts/exynos/exynos7870-j5y17lte.dts b/arch/arm64/boot/dts/exynos/exynos7870-j5y17lte.dts
index 36c327668db5..84421a3d47ca 100644
--- a/arch/arm64/boot/dts/exynos/exynos7870-j5y17lte.dts
+++ b/arch/arm64/boot/dts/exynos/exynos7870-j5y17lte.dts
@@ -26,9 +26,9 @@ aliases {
};
chosen {
+ ranges;
#address-cells = <2>;
#size-cells = <1>;
- ranges;
stdout-path = &serial2;
@@ -44,35 +44,35 @@ framebuffer at 67000000 {
gpio-keys {
compatible = "gpio-keys";
- pinctrl-names = "default";
pinctrl-0 = <&key_power &key_voldown &key_volup>;
+ pinctrl-names = "default";
key-home {
interrupt-parent = <&gpa1>;
- linux,code = <KEY_HOMEPAGE>;
label = "gpio-keys: KEY_HOMEPAGE";
gpios = <&gpa1 7 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_HOMEPAGE>;
};
key-power {
interrupt-parent = <&gpa0>;
- linux,code = <KEY_POWER>;
label = "gpio-keys: KEY_POWER";
gpios = <&gpa0 0 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_POWER>;
};
key-voldown {
interrupt-parent = <&gpa2>;
- linux,code = <KEY_VOLUMEDOWN>;
label = "gpio-keys: KEY_VOLUMEDOWN";
gpios = <&gpa2 1 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_VOLUMEDOWN>;
};
key-volup {
interrupt-parent = <&gpa2>;
- linux,code = <KEY_VOLUMEUP>;
label = "gpio-keys: KEY_VOLUMEUP";
gpios = <&gpa2 0 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_VOLUMEUP>;
};
};
@@ -98,9 +98,9 @@ vdd_fixed_mmc2: regulator-fixed-mmc2 {
};
reserved-memory {
+ ranges;
#address-cells = <2>;
#size-cells = <1>;
- ranges;
ramoops at 46e00000 {
compatible = "ramoops";
@@ -137,8 +137,8 @@ pmic at 66 {
interrupt-parent = <&gpa0>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
- pinctrl-names = "default";
pinctrl-0 = <&pmic_irq>;
+ pinctrl-names = "default";
regulators {
vdd_buck1: buck1 {
@@ -368,8 +368,8 @@ touchscreen at 50 {
interrupt-parent = <&gpa0>;
interrupts = <6 IRQ_TYPE_EDGE_FALLING>;
- pinctrl-names = "default";
pinctrl-0 = <&touch_irq>;
+ pinctrl-names = "default";
touchscreen-size-x = <720>;
touchscreen-size-y = <1280>;
@@ -379,17 +379,18 @@ touchscreen at 50 {
};
&mmc0 {
- pinctrl-names = "default";
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_rdqs &sd0_bus1 &sd0_bus4 &sd0_bus8>;
+ pinctrl-names = "default";
vmmc-supply = <&vdd_ldo26>;
vqmmc-supply = <&vdd_ldo27>;
fifo-depth = <64>;
+ non-removable;
+
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <0 4>;
samsung,dw-mshc-ddr-timing = <2 4>;
- non-removable;
status = "okay";
};
@@ -398,29 +399,30 @@ &mmc1 {
#address-cells = <1>;
#size-cells = <0>;
- pinctrl-names = "default";
pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus1 &sd1_bus4>;
+ pinctrl-names = "default";
mmc-pwrseq = <&pwrseq_mmc1>;
bus-width = <4>;
fifo-depth = <64>;
- samsung,dw-mshc-ciu-div = <3>;
- samsung,dw-mshc-sdr-timing = <0 3>;
- samsung,dw-mshc-ddr-timing = <1 2>;
non-removable;
cap-sd-highspeed;
cap-sdio-irq;
+ samsung,dw-mshc-ciu-div = <3>;
+ samsung,dw-mshc-sdr-timing = <0 3>;
+ samsung,dw-mshc-ddr-timing = <1 2>;
+
status = "okay";
wifi at 0 {
compatible = "brcm,bcm43455-fmac", "brcm,bcm4329-fmac";
reg = <0x0>;
- interrupt-names = "host-wake";
interrupt-parent = <&gpa2>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+ interrupt-names = "host-wake";
reset-gpios = <&gpd3 6 GPIO_ACTIVE_LOW>;
};
diff --git a/arch/arm64/boot/dts/exynos/exynos7870-j6lte.dts b/arch/arm64/boot/dts/exynos/exynos7870-j6lte.dts
index 02bab3ab2711..8bd6892ae796 100644
--- a/arch/arm64/boot/dts/exynos/exynos7870-j6lte.dts
+++ b/arch/arm64/boot/dts/exynos/exynos7870-j6lte.dts
@@ -34,16 +34,16 @@ gpio-hall-effect-sensor {
compatible = "gpio-keys";
label = "GPIO Hall Effect Sensor";
- pinctrl-names = "default";
pinctrl-0 = <&hall_irq>;
+ pinctrl-names = "default";
event-hall-effect-sensor {
label = "Hall Effect Sensor";
gpios = <&gpa1 3 GPIO_ACTIVE_LOW>;
+ wakeup-source;
linux,input-type = <EV_SW>;
linux,code = <SW_LID>;
linux,can-disable;
- wakeup-source;
};
};
@@ -51,8 +51,8 @@ gpio-keys {
compatible = "gpio-keys";
label = "GPIO Keys";
- pinctrl-names = "default";
pinctrl-0 = <&key_power &key_voldown &key_volup>;
+ pinctrl-names = "default";
key-power {
label = "Power Key";
@@ -95,9 +95,9 @@ vdd_fixed_mmc2: regulator-fixed-mmc2 {
};
reserved-memory {
+ ranges;
#address-cells = <2>;
#size-cells = <1>;
- ranges;
ramoops at 46e00000 {
compatible = "ramoops";
@@ -159,8 +159,8 @@ pmic at 66 {
interrupt-parent = <&gpa0>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
- pinctrl-names = "default";
pinctrl-0 = <&pmic_irq>;
+ pinctrl-names = "default";
regulators {
vdd_buck1: buck1 {
@@ -394,8 +394,8 @@ accelerometer at 1d {
interrupt-parent = <&gpa2>;
interrupts = <3 IRQ_TYPE_EDGE_RISING>;
- pinctrl-names = "default";
pinctrl-0 = <&accel_irq>;
+ pinctrl-names = "default";
mount-matrix = "-1", "0", "0",
"0", "1", "0",
@@ -417,8 +417,8 @@ touchscreen at 20 {
interrupt-parent = <&gpa0>;
interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
- pinctrl-names = "default";
pinctrl-0 = <&touch_irq>;
+ pinctrl-names = "default";
touchscreen-size-x = <720>;
touchscreen-size-y = <1480>;
@@ -428,18 +428,19 @@ touchscreen at 20 {
};
&mmc0 {
- pinctrl-names = "default";
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_rdqs &sd0_bus1 &sd0_bus4 &sd0_bus8>;
+ pinctrl-names = "default";
vmmc-supply = <&vdd_ldo26>;
vqmmc-supply = <&vdd_ldo27>;
bus-width = <8>;
fifo-depth = <64>;
+ non-removable;
+
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <0 4>;
samsung,dw-mshc-ddr-timing = <2 4>;
- non-removable;
status = "okay";
};
@@ -448,36 +449,37 @@ &mmc1 {
#address-cells = <1>;
#size-cells = <0>;
- pinctrl-names = "default";
pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus1 &sd1_bus4>;
+ pinctrl-names = "default";
mmc-pwrseq = <&pwrseq_mmc1>;
bus-width = <4>;
fifo-depth = <64>;
- samsung,dw-mshc-ciu-div = <3>;
- samsung,dw-mshc-sdr-timing = <0 3>;
- samsung,dw-mshc-ddr-timing = <1 2>;
non-removable;
cap-sd-highspeed;
cap-sdio-irq;
+ samsung,dw-mshc-ciu-div = <3>;
+ samsung,dw-mshc-sdr-timing = <0 3>;
+ samsung,dw-mshc-ddr-timing = <1 2>;
+
status = "okay";
wifi at 1 {
compatible = "brcm,bcm43430a1-fmac", "brcm,bcm4329-fmac";
reg = <0x1>;
- interrupt-names = "host-wake";
interrupt-parent = <&gpa2>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+ interrupt-names = "host-wake";
reset-gpios = <&gpd3 6 GPIO_ACTIVE_LOW>;
};
};
&mmc2 {
- pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus1 &sd2_bus4 &dwmmc2_irq>;
+ pinctrl-names = "default";
vmmc-supply = <&vdd_fixed_mmc2>;
vqmmc-supply = <&vdd_ldo2>;
@@ -596,8 +598,8 @@ &serial1 {
bluetooth {
compatible = "brcm,bcm43430a1-bt";
- pinctrl-names = "default";
pinctrl-0 = <&bt_btwake &bt_hostwake &bt_enable>;
+ pinctrl-names = "default";
device-wakeup-gpios = <&gpa1 2 GPIO_ACTIVE_HIGH>;
host-wakeup-gpios = <&gpa1 6 GPIO_ACTIVE_HIGH>;
diff --git a/arch/arm64/boot/dts/exynos/exynos7870-j7xelte.dts b/arch/arm64/boot/dts/exynos/exynos7870-j7xelte.dts
index 079b2b581307..d258eecfbf42 100644
--- a/arch/arm64/boot/dts/exynos/exynos7870-j7xelte.dts
+++ b/arch/arm64/boot/dts/exynos/exynos7870-j7xelte.dts
@@ -26,9 +26,9 @@ aliases {
};
chosen {
+ ranges;
#address-cells = <2>;
#size-cells = <1>;
- ranges;
stdout-path = &serial2;
@@ -46,8 +46,8 @@ gpio-keys {
compatible = "gpio-keys";
label = "GPIO Keys";
- pinctrl-names = "default";
pinctrl-0 = <&key_home &key_power &key_voldown &key_volup>;
+ pinctrl-names = "default";
key-home {
label = "Home Key";
@@ -86,9 +86,9 @@ pwrseq_mmc1: pwrseq-mmc1 {
};
reserved-memory {
+ ranges;
#address-cells = <2>;
#size-cells = <1>;
- ranges;
ramoops at 46e00000 {
compatible = "ramoops";
@@ -136,8 +136,8 @@ pmic at 66 {
interrupt-parent = <&gpa0>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
- pinctrl-names = "default";
pinctrl-0 = <&pmic_irq>;
+ pinctrl-names = "default";
regulators {
vdd_buck1: buck1 {
@@ -346,23 +346,24 @@ touchscreen at 48 {
interrupt-parent = <&gpc3>;
interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
- pinctrl-names = "default";
pinctrl-0 = <&touch_irq>;
+ pinctrl-names = "default";
};
};
&mmc0 {
- pinctrl-names = "default";
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_rdqs &sd0_bus1 &sd0_bus4 &sd0_bus8>;
+ pinctrl-names = "default";
vmmc-supply = <&vdd_ldo26>;
vqmmc-supply = <&vdd_ldo27>;
fifo-depth = <64>;
+ non-removable;
+
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <0 4>;
samsung,dw-mshc-ddr-timing = <2 4>;
- non-removable;
status = "okay";
};
@@ -371,37 +372,38 @@ &mmc1 {
#address-cells = <1>;
#size-cells = <0>;
- pinctrl-names = "default";
pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus1 &sd1_bus4>;
+ pinctrl-names = "default";
mmc-pwrseq = <&pwrseq_mmc1>;
bus-width = <4>;
fifo-depth = <64>;
- samsung,dw-mshc-ciu-div = <3>;
- samsung,dw-mshc-sdr-timing = <0 3>;
- samsung,dw-mshc-ddr-timing = <1 2>;
non-removable;
cap-sd-highspeed;
cap-sdio-irq;
+ samsung,dw-mshc-ciu-div = <3>;
+ samsung,dw-mshc-sdr-timing = <0 3>;
+ samsung,dw-mshc-ddr-timing = <1 2>;
+
status = "okay";
wifi at 1 {
compatible = "brcm,bcm43430a1-fmac", "brcm,bcm4329-fmac";
reg = <0x1>;
- interrupt-names = "host-wake";
interrupt-parent = <&gpa2>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+ interrupt-names = "host-wake";
reset-gpios = <&gpd3 6 GPIO_ACTIVE_LOW>;
};
};
&mmc2 {
- pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus1 &sd2_bus4 &dwmmc2_irq>;
+ pinctrl-names = "default";
vmmc-supply = <&vdd_fixed_mmc2>;
vqmmc-supply = <&vdd_ldo2>;
@@ -409,14 +411,15 @@ &mmc2 {
bus-width = <4>;
card-detect-delay = <200>;
fifo-depth = <64>;
- samsung,dw-mshc-ciu-div = <3>;
- samsung,dw-mshc-sdr-timing = <0 3>;
- samsung,dw-mshc-ddr-timing = <1 2>;
sd-uhs-sdr50;
sd-uhs-sdr104;
broken-cd;
disable-wp;
+ samsung,dw-mshc-ciu-div = <3>;
+ samsung,dw-mshc-sdr-timing = <0 3>;
+ samsung,dw-mshc-ddr-timing = <1 2>;
+
status = "okay";
};
diff --git a/arch/arm64/boot/dts/exynos/exynos7870-on7xelte.dts b/arch/arm64/boot/dts/exynos/exynos7870-on7xelte.dts
index 29be4764f84d..5bb95aab75b2 100644
--- a/arch/arm64/boot/dts/exynos/exynos7870-on7xelte.dts
+++ b/arch/arm64/boot/dts/exynos/exynos7870-on7xelte.dts
@@ -34,8 +34,8 @@ gpio-keys {
compatible = "gpio-keys";
label = "GPIO Keys";
- pinctrl-names = "default";
pinctrl-0 = <&key_home &key_power &key_voldown &key_volup>;
+ pinctrl-names = "default";
key-home {
label = "Home Key";
@@ -84,9 +84,9 @@ vdd_fixed_mmc2: regulator-fixed-mmc2 {
};
reserved-memory {
+ ranges;
#address-cells = <2>;
#size-cells = <1>;
- ranges;
ramoops at 46e00000 {
compatible = "ramoops";
@@ -168,8 +168,8 @@ pmic at 66 {
interrupt-parent = <&gpa0>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
- pinctrl-names = "default";
pinctrl-0 = <&pmic_irq>;
+ pinctrl-names = "default";
regulators {
vdd_buck1: buck1 {
@@ -411,8 +411,8 @@ touchscreen at 70 {
#address-cells = <1>;
#size-cells = <0>;
- pinctrl-names = "default";
pinctrl-0 = <&touch_irq>;
+ pinctrl-names = "default";
syna,reset-delay-ms = <200>;
syna,startup-delay-ms = <200>;
@@ -446,8 +446,8 @@ accelerometer at 1d {
interrupt-parent = <&gpa2>;
interrupts = <3 IRQ_TYPE_EDGE_RISING>;
- pinctrl-names = "default";
pinctrl-0 = <&accel_irq>;
+ pinctrl-names = "default";
mount-matrix = "1", "0", "0",
"0", "-1", "0",
@@ -469,26 +469,27 @@ proximity at 48 {
interrupt-parent = <&gpa0>;
interrupts = <5 IRQ_TYPE_EDGE_BOTH>;
- pinctrl-names = "default";
pinctrl-0 = <&proxm_irq>;
+ pinctrl-names = "default";
proximity-near-level = <25>;
};
};
&mmc0 {
- pinctrl-names = "default";
pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_rdqs &sd0_bus1 &sd0_bus4 &sd0_bus8>;
+ pinctrl-names = "default";
vmmc-supply = <&vdd_ldo26>;
vqmmc-supply = <&vdd_ldo27>;
bus-width = <8>;
fifo-depth = <64>;
+ non-removable;
+
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <0 4>;
samsung,dw-mshc-ddr-timing = <2 4>;
- non-removable;
status = "okay";
};
@@ -497,36 +498,37 @@ &mmc1 {
#address-cells = <1>;
#size-cells = <0>;
- pinctrl-names = "default";
pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus1 &sd1_bus4>;
+ pinctrl-names = "default";
mmc-pwrseq = <&pwrseq_mmc1>;
bus-width = <4>;
fifo-depth = <64>;
- samsung,dw-mshc-ciu-div = <3>;
- samsung,dw-mshc-sdr-timing = <0 3>;
- samsung,dw-mshc-ddr-timing = <1 2>;
non-removable;
cap-sd-highspeed;
cap-sdio-irq;
+ samsung,dw-mshc-ciu-div = <3>;
+ samsung,dw-mshc-sdr-timing = <0 3>;
+ samsung,dw-mshc-ddr-timing = <1 2>;
+
status = "okay";
wifi at 1 {
compatible = "brcm,bcm43430a1-fmac", "brcm,bcm4329-fmac";
reg = <0x1>;
- interrupt-names = "host-wake";
interrupt-parent = <&gpa2>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+ interrupt-names = "host-wake";
reset-gpios = <&gpd3 6 GPIO_ACTIVE_LOW>;
};
};
&mmc2 {
- pinctrl-names = "default";
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus1 &sd2_bus4 &dwmmc2_irq>;
+ pinctrl-names = "default";
vmmc-supply = <&vdd_fixed_mmc2>;
vqmmc-supply = <&vdd_ldo2>;
@@ -534,14 +536,15 @@ &mmc2 {
bus-width = <4>;
card-detect-delay = <200>;
fifo-depth = <64>;
- samsung,dw-mshc-ciu-div = <3>;
- samsung,dw-mshc-sdr-timing = <0 3>;
- samsung,dw-mshc-ddr-timing = <1 2>;
sd-uhs-sdr50;
sd-uhs-sdr104;
broken-cd;
disable-wp;
+ samsung,dw-mshc-ciu-div = <3>;
+ samsung,dw-mshc-sdr-timing = <0 3>;
+ samsung,dw-mshc-ddr-timing = <1 2>;
+
status = "okay";
};
@@ -661,8 +664,8 @@ &serial1 {
bluetooth {
compatible = "brcm,bcm43430a1-bt";
- pinctrl-names = "default";
pinctrl-0 = <&bt_btwake &bt_hostwake &bt_enable>;
+ pinctrl-names = "default";
device-wakeup-gpios = <&gpa1 2 GPIO_ACTIVE_HIGH>;
host-wakeup-gpios = <&gpa1 6 GPIO_ACTIVE_HIGH>;
diff --git a/arch/arm64/boot/dts/exynos/exynos7870.dtsi b/arch/arm64/boot/dts/exynos/exynos7870.dtsi
index 9e3ec6c952f0..c397f577d065 100644
--- a/arch/arm64/boot/dts/exynos/exynos7870.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos7870.dtsi
@@ -156,8 +156,6 @@ cmu_peri: clock-controller at 101f0000 {
reg = <0x101f0000 0x1000>;
#clock-cells = <1>;
- clock-names = "oscclk", "bus", "spi0", "spi1", "spi2",
- "spi3", "spi4", "uart0", "uart1", "uart2";
clocks = <&oscclk>,
<&cmu_mif CLK_GOUT_MIF_CMU_PERI_BUS>,
<&cmu_mif CLK_GOUT_MIF_CMU_PERI_SPI0>,
@@ -168,6 +166,8 @@ cmu_peri: clock-controller at 101f0000 {
<&cmu_mif CLK_GOUT_MIF_CMU_PERI_UART0>,
<&cmu_mif CLK_GOUT_MIF_CMU_PERI_UART1>,
<&cmu_mif CLK_GOUT_MIF_CMU_PERI_UART2>;
+ clock-names = "oscclk", "bus", "spi0", "spi1", "spi2",
+ "spi3", "spi4", "uart0", "uart1", "uart2";
};
cmu_mif: clock-controller at 10460000 {
@@ -175,8 +175,8 @@ cmu_mif: clock-controller at 10460000 {
reg = <0x10460000 0x1000>;
#clock-cells = <1>;
- clock-names = "oscclk";
clocks = <&oscclk>;
+ clock-names = "oscclk";
};
pmu_system_controller: system-controller at 10480000 {
@@ -219,11 +219,11 @@ hsi2c0: i2c at 10510000 {
reg = <0x10510000 0x2000>;
interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&hsi2c0_bus>;
+ pinctrl-names = "default";
- clock-names = "hsi2c";
clocks = <&cmu_mif CLK_GOUT_MIF_HSI2C_IPCLK>;
+ clock-names = "hsi2c";
#address-cells = <1>;
#size-cells = <0>;
@@ -240,14 +240,14 @@ pinctrl_mif: pinctrl at 10530000 {
gpu: gpu at 11400000 {
compatible = "samsung,exynos7870-mali", "arm,mali-t830";
reg = <0x11400000 0x5000>;
- interrupt-names = "job", "mmu", "gpu";
interrupts = <GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 283 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 281 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "job", "mmu", "gpu";
- clock-names = "core", "bus";
clocks = <&cmu_g3d CLK_GOUT_G3D_CLK>,
<&cmu_g3d CLK_GOUT_G3D_ASYNCS_D0_CLK>;
+ clock-names = "core", "bus";
status = "disabled";
};
@@ -257,9 +257,9 @@ cmu_g3d: clock-controller at 11460000 {
reg = <0x11460000 0x1000>;
#clock-cells = <1>;
- clock-names = "oscclk", "switch";
clocks = <&oscclk>,
<&cmu_mif CLK_GOUT_MIF_CMU_G3D_SWITCH>;
+ clock-names = "oscclk", "switch";
};
cmu_mfcmscl: clock-controller at 12cb0000 {
@@ -267,10 +267,10 @@ cmu_mfcmscl: clock-controller at 12cb0000 {
reg = <0x12cb0000 0x1000>;
#clock-cells = <1>;
- clock-names = "oscclk", "mfc", "mscl";
clocks = <&oscclk>,
<&cmu_mif CLK_GOUT_MIF_CMU_MFCMSCL_MFC>,
<&cmu_mif CLK_GOUT_MIF_CMU_MFCMSCL_MSCL>;
+ clock-names = "oscclk", "mfc", "mscl";
};
mmc0: mmc at 13540000 {
@@ -278,9 +278,9 @@ mmc0: mmc at 13540000 {
reg = <0x13540000 0x2000>;
interrupts = <GIC_SPI 245 IRQ_TYPE_LEVEL_HIGH>;
- clock-names = "biu", "ciu";
clocks = <&cmu_fsys CLK_GOUT_FSYS_MMC0_ACLK>,
<&cmu_mif CLK_GOUT_MIF_CMU_FSYS_MMC0>;
+ clock-names = "biu", "ciu";
status = "disabled";
};
@@ -290,9 +290,9 @@ mmc1: mmc at 13550000 {
reg = <0x13550000 0x2000>;
interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
- clock-names = "biu", "ciu";
clocks = <&cmu_fsys CLK_GOUT_FSYS_MMC1_ACLK>,
<&cmu_mif CLK_GOUT_MIF_CMU_FSYS_MMC1>;
+ clock-names = "biu", "ciu";
status = "disabled";
};
@@ -302,9 +302,9 @@ mmc2: mmc at 13560000 {
reg = <0x13560000 0x2000>;
interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
- clock-names = "biu", "ciu";
clocks = <&cmu_fsys CLK_GOUT_FSYS_MMC2_ACLK>,
<&cmu_mif CLK_GOUT_MIF_CMU_FSYS_MMC2>;
+ clock-names = "biu", "ciu";
status = "disabled";
};
@@ -314,9 +314,9 @@ usbdrd_phy: phy at 135c0000 {
reg = <0x135c0000 0x100>;
#phy-cells = <1>;
- clock-names = "phy", "ref";
clocks = <&cmu_fsys CLK_GOUT_FSYS_MUX_USB20DRD_PHYCLOCK_USER>,
<&cmu_fsys CLK_GOUT_FSYS_MUX_USB_PLL>;
+ clock-names = "phy", "ref";
samsung,pmu-syscon = <&pmu_system_controller>;
};
@@ -327,10 +327,10 @@ usbdrd: usb at 13600000 {
#address-cells = <1>;
#size-cells = <1>;
- clock-names = "bus_early", "ref", "ctrl";
clocks = <&cmu_fsys CLK_GOUT_FSYS_USB20DRD_ACLK_HSDRD>,
<&cmu_fsys CLK_GOUT_FSYS_USB20DRD_HSDRD_REF_CLK>,
<&cmu_fsys CLK_GOUT_FSYS_USB20DRD_HCLK_USB20_CTRL>;
+ clock-names = "bus_early", "ref", "ctrl";
status = "disabled";
@@ -339,8 +339,8 @@ usb at 0 {
reg = <0x0 0x10000>;
interrupts = <GIC_SPI 230 IRQ_TYPE_LEVEL_HIGH>;
- phy-names = "usb2-phy";
phys = <&usbdrd_phy 0>;
+ phy-names = "usb2-phy";
usb-role-switch;
snps,usb2-gadget-lpm-disable;
@@ -352,10 +352,10 @@ cmu_fsys: clock-controller at 13730000 {
reg = <0x13730000 0x1000>;
#clock-cells = <1>;
- clock-names = "oscclk", "bus", "usb20drd";
clocks = <&oscclk>,
<&cmu_mif CLK_GOUT_MIF_CMU_FSYS_BUS>,
<&cmu_mif CLK_GOUT_MIF_CMU_FSYS_USB20DRD_REFCLK>;
+ clock-names = "oscclk", "bus", "usb20drd";
};
pinctrl_fsys: pinctrl at 13750000 {
@@ -370,12 +370,12 @@ serial0: serial at 13800000 {
reg = <0x13800000 0x100>;
interrupts = <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&uart0_bus>;
+ pinctrl-names = "default";
- clock-names = "uart", "clk_uart_baud0";
clocks = <&cmu_peri CLK_GOUT_PERI_UART0_PCLK>,
<&cmu_peri CLK_GOUT_PERI_UART0_EXT_UCLK>;
+ clock-names = "uart", "clk_uart_baud0";
samsung,uart-fifosize = <16>;
@@ -388,12 +388,12 @@ serial1: serial at 13810000 {
reg = <0x13810000 0x100>;
interrupts = <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&uart1_bus>;
+ pinctrl-names = "default";
- clock-names = "uart", "clk_uart_baud0";
clocks = <&cmu_peri CLK_GOUT_PERI_UART1_PCLK>,
<&cmu_peri CLK_GOUT_PERI_UART1_EXT_UCLK>;
+ clock-names = "uart", "clk_uart_baud0";
samsung,uart-fifosize = <256>;
@@ -406,12 +406,12 @@ serial2: serial at 13820000 {
reg = <0x13820000 0x100>;
interrupts = <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&uart2_bus>;
+ pinctrl-names = "default";
- clock-names = "uart", "clk_uart_baud0";
clocks = <&cmu_peri CLK_GOUT_PERI_UART2_PCLK>,
<&cmu_peri CLK_GOUT_PERI_UART2_EXT_UCLK>;
+ clock-names = "uart", "clk_uart_baud0";
samsung,uart-fifosize = <256>;
@@ -424,11 +424,11 @@ i2c0: i2c at 13830000 {
reg = <0x13830000 0x100>;
interrupts = <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&i2c0_bus>;
+ pinctrl-names = "default";
- clock-names = "i2c";
clocks = <&cmu_peri CLK_GOUT_PERI_I2C0_PCLK>;
+ clock-names = "i2c";
#address-cells = <1>;
#size-cells = <0>;
@@ -442,11 +442,11 @@ i2c1: i2c at 13840000 {
reg = <0x13840000 0x100>;
interrupts = <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&i2c1_bus>;
+ pinctrl-names = "default";
- clock-names = "i2c";
clocks = <&cmu_peri CLK_GOUT_PERI_I2C1_PCLK>;
+ clock-names = "i2c";
#address-cells = <1>;
#size-cells = <0>;
@@ -460,11 +460,11 @@ i2c2: i2c at 13850000 {
reg = <0x13850000 0x100>;
interrupts = <GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&i2c2_bus>;
+ pinctrl-names = "default";
- clock-names = "i2c";
clocks = <&cmu_peri CLK_GOUT_PERI_I2C2_PCLK>;
+ clock-names = "i2c";
#address-cells = <1>;
#size-cells = <0>;
@@ -478,11 +478,11 @@ i2c3: i2c at 13860000 {
reg = <0x13860000 0x100>;
interrupts = <GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&i2c3_bus>;
+ pinctrl-names = "default";
- clock-names = "i2c";
clocks = <&cmu_peri CLK_GOUT_PERI_I2C3_PCLK>;
+ clock-names = "i2c";
#address-cells = <1>;
#size-cells = <0>;
@@ -496,11 +496,11 @@ i2c4: i2c at 13870000 {
reg = <0x13870000 0x100>;
interrupts = <GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&i2c4_bus>;
+ pinctrl-names = "default";
- clock-names = "i2c";
clocks = <&cmu_peri CLK_GOUT_PERI_I2C4_PCLK>;
+ clock-names = "i2c";
#address-cells = <1>;
#size-cells = <0>;
@@ -514,11 +514,11 @@ i2c5: i2c at 13880000 {
reg = <0x13880000 0x100>;
interrupts = <GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&i2c5_bus>;
+ pinctrl-names = "default";
- clock-names = "i2c";
clocks = <&cmu_peri CLK_GOUT_PERI_I2C5_PCLK>;
+ clock-names = "i2c";
#address-cells = <1>;
#size-cells = <0>;
@@ -532,11 +532,11 @@ i2c6: i2c at 13890000 {
reg = <0x13890000 0x100>;
interrupts = <GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&i2c6_bus>;
+ pinctrl-names = "default";
- clock-names = "i2c";
clocks = <&cmu_peri CLK_GOUT_PERI_I2C6_PCLK>;
+ clock-names = "i2c";
#address-cells = <1>;
#size-cells = <0>;
@@ -550,11 +550,11 @@ hsi2c1: i2c at 138a0000 {
reg = <0x138a0000 0x1000>;
interrupts = <GIC_SPI 449 IRQ_TYPE_LEVEL_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&hsi2c1_bus>;
+ pinctrl-names = "default";
- clock-names = "hsi2c";
clocks = <&cmu_peri CLK_GOUT_PERI_HSI2C1_IPCLK>;
+ clock-names = "hsi2c";
#address-cells = <1>;
#size-cells = <0>;
@@ -568,11 +568,11 @@ hsi2c2: i2c at 138b0000 {
reg = <0x138b0000 0x1000>;
interrupts = <GIC_SPI 450 IRQ_TYPE_LEVEL_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&hsi2c2_bus>;
+ pinctrl-names = "default";
- clock-names = "hsi2c";
clocks = <&cmu_peri CLK_GOUT_PERI_HSI2C2_IPCLK>;
+ clock-names = "hsi2c";
#address-cells = <1>;
#size-cells = <0>;
@@ -586,11 +586,11 @@ hsi2c3: i2c at 138c0000 {
reg = <0x138c0000 0x1000>;
interrupts = <GIC_SPI 451 IRQ_TYPE_LEVEL_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&hsi2c3_bus>;
+ pinctrl-names = "default";
- clock-names = "hsi2c";
clocks = <&cmu_peri CLK_GOUT_PERI_HSI2C3_IPCLK>;
+ clock-names = "hsi2c";
#address-cells = <1>;
#size-cells = <0>;
@@ -604,11 +604,11 @@ i2c7: i2c at 138d0000 {
reg = <0x138d0000 0x100>;
interrupts = <GIC_SPI 453 IRQ_TYPE_LEVEL_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&i2c7_bus>;
+ pinctrl-names = "default";
- clock-names = "i2c";
clocks = <&cmu_peri CLK_GOUT_PERI_I2C7_PCLK>;
+ clock-names = "i2c";
#address-cells = <1>;
#size-cells = <0>;
@@ -622,11 +622,11 @@ i2c8: i2c at 138e0000 {
reg = <0x138e0000 0x100>;
interrupts = <GIC_SPI 454 IRQ_TYPE_LEVEL_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&i2c8_bus>;
+ pinctrl-names = "default";
- clock-names = "i2c";
clocks = <&cmu_peri CLK_GOUT_PERI_I2C8_PCLK>;
+ clock-names = "i2c";
#address-cells = <1>;
#size-cells = <0>;
@@ -640,11 +640,11 @@ hsi2c4: i2c at 138f0000 {
reg = <0x138f0000 0x1000>;
interrupts = <GIC_SPI 456 IRQ_TYPE_LEVEL_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&hsi2c4_bus>;
+ pinctrl-names = "default";
- clock-names = "hsi2c";
clocks = <&cmu_peri CLK_GOUT_PERI_HSI2C4_IPCLK>;
+ clock-names = "hsi2c";
#address-cells = <1>;
#size-cells = <0>;
@@ -658,11 +658,11 @@ hsi2c5: i2c at 13950000 {
reg = <0x13950000 0x1000>;
interrupts = <GIC_SPI 457 IRQ_TYPE_LEVEL_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&hsi2c5_bus>;
+ pinctrl-names = "default";
- clock-names = "hsi2c";
clocks = <&cmu_peri CLK_GOUT_PERI_HSI2C5_IPCLK>;
+ clock-names = "hsi2c";
#address-cells = <1>;
#size-cells = <0>;
@@ -676,11 +676,11 @@ hsi2c6: i2c at 13960000 {
reg = <0x13960000 0x1000>;
interrupts = <GIC_SPI 458 IRQ_TYPE_LEVEL_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&hsi2c6_bus>;
+ pinctrl-names = "default";
- clock-names = "hsi2c";
clocks = <&cmu_peri CLK_GOUT_PERI_HSI2C6_IPCLK>;
+ clock-names = "hsi2c";
#address-cells = <1>;
#size-cells = <0>;
@@ -729,11 +729,11 @@ cmu_isp: clock-controller at 144d0000 {
reg = <0x144d0000 0x1000>;
#clock-cells = <1>;
- clock-names = "oscclk", "cam", "isp", "vra";
clocks = <&oscclk>,
<&cmu_mif CLK_GOUT_MIF_CMU_ISP_CAM>,
<&cmu_mif CLK_GOUT_MIF_CMU_ISP_ISP>,
<&cmu_mif CLK_GOUT_MIF_CMU_ISP_VRA>;
+ clock-names = "oscclk", "cam", "isp", "vra";
};
syscon_cam0: system-controller at 144f1040 {
@@ -818,11 +818,11 @@ cmu_dispaud: clock-controller at 148d0000 {
reg = <0x148d0000 0x1000>;
#clock-cells = <1>;
- clock-names = "oscclk", "bus", "decon_eclk", "decon_vclk";
clocks = <&oscclk>,
<&cmu_mif CLK_GOUT_MIF_CMU_DISPAUD_BUS>,
<&cmu_mif CLK_GOUT_MIF_CMU_DISPAUD_DECON_ECLK>,
<&cmu_mif CLK_GOUT_MIF_CMU_DISPAUD_DECON_VCLK>;
+ clock-names = "oscclk", "bus", "decon_eclk", "decon_vclk";
};
syscon_disp: system-controller at 148f100c {
--
2.53.0
More information about the linux-arm-kernel
mailing list