aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2017-09-29 10:13:04 -0700
committerSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2017-09-29 10:13:04 -0700
commitf7e6dd8840ded7793c67f2cdf76205aeeaae6fe3 (patch)
tree232c38e76222183bf665a4258bf955082a0c8f53
parent95c020b816e9aa3fca13de25329df3a1688b221c (diff)
dts: db600c: update dts with v2 changesdb600c-v4.13-rc3
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
-rw-r--r--arch/arm/boot/dts/qcom-apq8064-db600c-pins.dtsi1
-rw-r--r--arch/arm/boot/dts/qcom-apq8064-db600c.dts78
2 files changed, 34 insertions, 45 deletions
diff --git a/arch/arm/boot/dts/qcom-apq8064-db600c-pins.dtsi b/arch/arm/boot/dts/qcom-apq8064-db600c-pins.dtsi
index cb2370343c34f..ab653ac409b86 100644
--- a/arch/arm/boot/dts/qcom-apq8064-db600c-pins.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064-db600c-pins.dtsi
@@ -64,6 +64,7 @@
pinconf {
pins = "mpp7", "mpp8";
function = "digital";
+ power-source = <PM8921_MPP_S4>;
output-low;
};
};
diff --git a/arch/arm/boot/dts/qcom-apq8064-db600c.dts b/arch/arm/boot/dts/qcom-apq8064-db600c.dts
index aacb94daaae5c..1d8b511b1e5cf 100644
--- a/arch/arm/boot/dts/qcom-apq8064-db600c.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-db600c.dts
@@ -3,6 +3,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/mfd/qcom-rpm.h>
+
/ {
model = "Qualcomm Technologies, Inc. DB600c";
compatible = "arrow,apq8064-db820c", "qcom,apq8064-sbc", "qcom,apq8064";
@@ -272,21 +273,23 @@
user-led1 {
label = "user1-led";
gpios = <&tlmm_pinmux 7 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "mmc0";
+ //linux,default-trigger = "mmc0";
+ linux,default-trigger = "heartbeat";
default-state = "off";
};
user-led2 {
label = "user2-led";
gpios = <&tlmm_pinmux 35 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "mmc1";
+ //linux,default-trigger = "mmc1";
+ linux,default-trigger = "heartbeat";
default-state = "off";
};
user-led3 {
label = "user3-led";
gpios = <&tlmm_pinmux 86 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "none";
+ linux,default-trigger = "heartbeat";
default-state = "off";
};
@@ -294,12 +297,14 @@
label = "WiFi-led";
gpios = <&pm8921_mpps 7 GPIO_ACTIVE_HIGH>;
default-state = "off";
+ linux,default-trigger = "heartbeat";
};
bt-led {
label = "BT-led";
gpios = <&pm8921_mpps 8 GPIO_ACTIVE_HIGH>;
default-state = "off";
+ linux,default-trigger = "heartbeat";
};
};
@@ -316,54 +321,37 @@
clkoe-gpio = <&pm8921_gpio 22 GPIO_ACTIVE_HIGH>;
};
- phy@1b400000 {
- pinctrl-0 = < &sataclk_pins>;
- status = "okay";
- clkoe-gpio = <&pm8921_mpps 4 GPIO_ACTIVE_HIGH>;
- };
-
- sata@29000000 {
- status = "okay";
- target-supply = <&pm8921_lvs7>;
- };
-
- usb1_phy: phy@12500000 {
- status = "okay";
- vddcx-supply = <&pm8921_s3>;
- v3p3-supply = <&pm8921_l3>;
- v1p8-supply = <&pm8921_l4>;
- };
-
-
- usb3_phy: phy@12520000 {
- status = "okay";
- vddcx-supply = <&pm8921_s3>;
- v3p3-supply = <&pm8921_l3>;
- v1p8-supply = <&pm8921_l23>;
- };
-
- usb4_phy: phy@12530000 {
- status = "okay";
- vddcx-supply = <&pm8921_s3>;
- v3p3-supply = <&pm8921_l3>;
- v1p8-supply = <&pm8921_l23>;
- };
-
- gadget1: gadget@12500000 {
- status = "okay";
- };
-
- /* OTG */
- usb1: usb@12500000 {
+ usb@12500000 {
status = "okay";
+ dr_mode = "otg";
+ ulpi {
+ phy {
+ v3p3-supply = <&pm8921_l3>;
+ v1p8-supply = <&pm8921_l4>;
+ };
+ };
};
- usb3: usb@12520000 {
+ usb@12520000 {
status = "okay";
+ dr_mode = "host";
+ ulpi {
+ phy {
+ v3p3-supply = <&pm8921_l3>;
+ v1p8-supply = <&pm8921_l23>;
+ };
+ };
};
- usb4: usb@12530000 {
+ usb@12530000 {
status = "okay";
+ dr_mode = "host";
+ ulpi {
+ phy {
+ v3p3-supply = <&pm8921_l3>;
+ v1p8-supply = <&pm8921_l23>;
+ };
+ };
};
amba {
@@ -375,7 +363,7 @@
};
/* External micro SD card */
- sdcc@12180000 {
+ sdcc3: sdcc@12180000 {
status = "okay";
vmmc-supply = <&pm8921_l6>;
pinctrl-names = "default";