Skip to content

Commit 06f8ab9

Browse files
authored
Merge pull request #329 from umang-chheda/rb4-ifp
Rebase monaco-evk-ifp-mezzanine changes to latest version (v3)
2 parents c303059 + 598f345 commit 06f8ab9

2 files changed

Lines changed: 9 additions & 49 deletions

File tree

arch/arm64/boot/dts/qcom/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ dtb-$(CONFIG_ARCH_QCOM) += monaco-evk-el2.dtb
5252
monaco-evk-camera-imx577-dtbs := monaco-evk.dtb monaco-evk-camera-imx577.dtbo
5353
dtb-$(CONFIG_ARCH_QCOM) += monaco-evk-camera-imx577.dtb
5454

55-
monaco-evk-mezzanine-dtbs := monaco-evk.dtb monaco-evk-mezzanine.dtbo
55+
monaco-evk-ifp-mezzanine-dtbs := monaco-evk.dtb monaco-evk-ifp-mezzanine.dtbo
5656

57-
dtb-$(CONFIG_ARCH_QCOM) += monaco-evk-mezzanine.dtb
57+
dtb-$(CONFIG_ARCH_QCOM) += monaco-evk-ifp-mezzanine.dtb
5858
dtb-$(CONFIG_ARCH_QCOM) += msm8216-samsung-fortuna3g.dtb
5959
dtb-$(CONFIG_ARCH_QCOM) += msm8916-acer-a1-724.dtb
6060
dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb

arch/arm64/boot/dts/qcom/monaco-evk-mezzanine.dtso renamed to arch/arm64/boot/dts/qcom/monaco-evk-ifp-mezzanine.dtso

Lines changed: 7 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -9,73 +9,33 @@
99
#include <dt-bindings/gpio/gpio.h>
1010

1111
&{/} {
12-
model = "Qualcomm Technologies, Inc. Monaco-EVK Mezzanine";
12+
model = "Qualcomm Technologies, Inc. Monaco-EVK IFP Mezzanine";
1313

14-
vreg_0p9: regulator-vreg-0p9 {
14+
vreg_0p9: regulator-0v9 {
1515
compatible = "regulator-fixed";
1616
regulator-name = "VREG_0P9";
1717

1818
regulator-min-microvolt = <900000>;
1919
regulator-max-microvolt = <900000>;
2020
regulator-always-on;
2121
regulator-boot-on;
22-
23-
vin-supply = <&vreg_3p3>;
2422
};
2523

26-
vreg_1p8: regulator-vreg-1p8 {
24+
vreg_1p8: regulator-1v8 {
2725
compatible = "regulator-fixed";
2826
regulator-name = "VREG_1P8";
2927

3028
regulator-min-microvolt = <1800000>;
3129
regulator-max-microvolt = <1800000>;
3230
regulator-always-on;
3331
regulator-boot-on;
34-
35-
vin-supply = <&vreg_4p2>;
36-
};
37-
38-
vreg_3p3: regulator-vreg-3p3 {
39-
compatible = "regulator-fixed";
40-
regulator-name = "VREG_3P3";
41-
42-
regulator-min-microvolt = <3300000>;
43-
regulator-max-microvolt = <3300000>;
44-
regulator-always-on;
45-
regulator-boot-on;
46-
47-
vin-supply = <&vreg_4p2>;
48-
};
49-
50-
vreg_4p2: regulator-vreg-4p2 {
51-
compatible = "regulator-fixed";
52-
regulator-name = "VREG_4P2";
53-
54-
regulator-min-microvolt = <4200000>;
55-
regulator-max-microvolt = <4200000>;
56-
regulator-always-on;
57-
regulator-boot-on;
58-
59-
vin-supply = <&vreg_sys_pwr>;
60-
};
61-
62-
vreg_sys_pwr: regulator-vreg-sys-pwr {
63-
compatible = "regulator-fixed";
64-
regulator-name = "VREG_SYS_PWR";
65-
66-
regulator-min-microvolt = <24000000>;
67-
regulator-max-microvolt = <24000000>;
68-
regulator-always-on;
69-
regulator-boot-on;
7032
};
7133
};
7234

7335
&i2c15 {
7436
#address-cells = <1>;
7537
#size-cells = <0>;
7638

77-
status = "okay";
78-
7939
eeprom1: eeprom@52 {
8040
compatible = "giantec,gt24c256c", "atmel,24c256";
8141
reg = <0x52>;
@@ -180,10 +140,10 @@
180140
tc9563_resx_n: tc9563-resx-state {
181141
pins = "gpio124";
182142
function = "gpio";
183-
184143
bias-disable;
185-
input-disable;
186-
output-enable;
187-
power-source = <0>;
144+
/* Reset pin of tc9563 is active low hence set default
145+
* state of this pin to output-high.
146+
*/
147+
output-high;
188148
};
189149
};

0 commit comments

Comments
 (0)