projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
exynos4412-odroid-common.dtsi
diff --git
a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index
58ad48e
..
8aa19ba
100644
(file)
--- a/
arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/
arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@
-163,26
+163,26
@@
/* RSTN signal for eMMC */
&sd1_cd {
/* RSTN signal for eMMC */
&sd1_cd {
- samsung,pin-pud = <
0
>;
- samsung,pin-drv = <
0
>;
+ samsung,pin-pud = <
EXYNOS_PIN_PULL_NONE
>;
+ samsung,pin-drv = <
EXYNOS4_PIN_DRV_LV1
>;
};
&pinctrl_1 {
gpio_power_key: power_key {
samsung,pins = "gpx1-3";
};
&pinctrl_1 {
gpio_power_key: power_key {
samsung,pins = "gpx1-3";
- samsung,pin-pud = <
0
>;
+ samsung,pin-pud = <
EXYNOS_PIN_PULL_NONE
>;
};
max77686_irq: max77686-irq {
samsung,pins = "gpx3-2";
};
max77686_irq: max77686-irq {
samsung,pins = "gpx3-2";
- samsung,pin-function = <
0
>;
- samsung,pin-pud = <
0
>;
- samsung,pin-drv = <
0
>;
+ samsung,pin-function = <
EXYNOS_PIN_FUNC_INPUT
>;
+ samsung,pin-pud = <
EXYNOS_PIN_PULL_NONE
>;
+ samsung,pin-drv = <
EXYNOS4_PIN_DRV_LV1
>;
};
hdmi_hpd: hdmi-hpd {
samsung,pins = "gpx3-7";
};
hdmi_hpd: hdmi-hpd {
samsung,pins = "gpx3-7";
- samsung,pin-pud = <
1
>;
+ samsung,pin-pud = <
EXYNOS_PIN_PULL_DOWN
>;
};
};
};
};
@@
-227,7
+227,7
@@
};
&hdmi {
};
&hdmi {
- hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+ hpd-gpio
s
= <&gpx3 7 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&hdmi_hpd>;
vdd-supply = <&ldo8_reg>;
pinctrl-names = "default";
pinctrl-0 = <&hdmi_hpd>;
vdd-supply = <&ldo8_reg>;