diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2015-07-06 16:22:16 +0100 |
|---|---|---|
| committer | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2015-07-06 16:22:16 +0100 |
| commit | 2e5d24d7857fadf6d40a7a940f45210d6f322182 (patch) | |
| tree | da14130ff146504ab2a6abaaf411f28bb116b095 | |
| parent | af6f64ea07a8f7a4a7174f7b3df2d4ddea797891 (diff) | |
HACK: fix merge issueintegration-linux-qcomlt-v4.2-rc1
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
| -rw-r--r-- | arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi index a055a9d9aa71a..d4bd4094e511e 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi @@ -40,14 +40,14 @@ compatible = "smsc,usb3503"; reset-gpios = <&pm8916_gpios 3 GPIO_ACTIVE_LOW>; initial-mode = <1>; - pinctrl-names = "default"; - pinctrl-0 = <&usb_hub_reset_pm_default>; + // pinctrl-names = "default"; + // pinctrl-0 = <&usb_hub_reset_pm_default>; }; usb_id: usb-id { - interrupt-parent = <&msm_gpio>; + interrupt-parent = <&msmgpio>; compatible = "linux,extcon-usb-gpio"; - id-gpio = <&msm_gpio 121 GPIO_ACTIVE_HIGH>; + id-gpio = <&msmgpio 121 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&usb_id_default>; }; @@ -62,14 +62,14 @@ led@1 { label = "apq8016-sbc:green:user1"; - gpios = <&msm_gpio 21 GPIO_ACTIVE_HIGH>; + gpios = <&msmgpio 21 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; default-state = "off"; }; led@2 { label = "apq8016-sbc:green:user2"; - gpios = <&msm_gpio 120 GPIO_ACTIVE_HIGH>; + gpios = <&msmgpio 120 GPIO_ACTIVE_HIGH>; linux,default-trigger = "mmc0"; default-state = "off"; }; @@ -136,9 +136,9 @@ interrupt-map-mask = <0xffffffff>; interrupt-map = <0 &intc 0 125 0 1 &intc 0 221 0 - 2 &msm_gpio 38 0>; + 2 &msmgpio 38 0>; interrupt-names = "hc_irq", "pwr_irq", "status_irq"; - cd-gpios = <&msm_gpio 38 0x1>; + cd-gpios = <&msmgpio 38 0x1>; status = "okay"; }; @@ -170,13 +170,13 @@ status = "ok"; compatible = "adi,adv7533"; reg = <0>; - interrupt-parent = <&msm_gpio>; + interrupt-parent = <&msmgpio>; //interrupts = <31 2>; i2c-bus = <&blsp_i2c4>; adi,input-depth = <8>; adi,input-colorspace = "rgb"; adi,dsi-lanes = <4>; - pd-gpios = <&msm_gpio 32 0>; + pd-gpios = <&msmgpio 32 0>; pinctrl-names = "default","sleep"; pinctrl-0 = <&adv7533_int_active &adv7533_switch_active>; pinctrl-1 = <&adv7533_int_suspend &adv7533_switch_suspend>; |