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
/
exynos5422-odroidxu3-common.dtsi
diff --git
a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index
d562530
..
246d298
100644
(file)
--- a/
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@
-21,12
+21,13
@@
#include "exynos-mfc-reserved-memory.dtsi"
/ {
#include "exynos-mfc-reserved-memory.dtsi"
/ {
- memory {
+ memory@40000000 {
+ device_type = "memory";
reg = <0x40000000 0x7EA00000>;
};
chosen {
reg = <0x40000000 0x7EA00000>;
};
chosen {
-
linux,stdout-path = &serial_2
;
+
stdout-path = "serial2:115200n8"
;
};
firmware@02073000 {
};
firmware@02073000 {
@@
-250,7
+251,7
@@
&hdmi {
status = "okay";
&hdmi {
status = "okay";
- hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+ hpd-gpio
s
= <&gpx3 7 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&hdmi_hpd_irq>;
pinctrl-names = "default";
pinctrl-0 = <&hdmi_hpd_irq>;
@@
-548,25
+549,25
@@
&pinctrl_0 {
hdmi_hpd_irq: hdmi-hpd-irq {
samsung,pins = "gpx3-7";
&pinctrl_0 {
hdmi_hpd_irq: hdmi-hpd-irq {
samsung,pins = "gpx3-7";
- samsung,pin-function = <
0
>;
- samsung,pin-pud = <
1
>;
- samsung,pin-drv = <
0
>;
+ samsung,pin-function = <
EXYNOS_PIN_FUNC_INPUT
>;
+ samsung,pin-pud = <
EXYNOS_PIN_PULL_DOWN
>;
+ samsung,pin-drv = <
EXYNOS5420_PIN_DRV_LV1
>;
};
s2mps11_irq: s2mps11-irq {
samsung,pins = "gpx0-4";
};
s2mps11_irq: s2mps11-irq {
samsung,pins = "gpx0-4";
- samsung,pin-function = <
0xf
>;
- samsung,pin-pud = <
0
>;
- samsung,pin-drv = <
0
>;
+ samsung,pin-function = <
EXYNOS_PIN_FUNC_F
>;
+ samsung,pin-pud = <
EXYNOS_PIN_PULL_NONE
>;
+ samsung,pin-drv = <
EXYNOS5420_PIN_DRV_LV1
>;
};
};
&pinctrl_1 {
emmc_nrst_pin: emmc-nrst {
samsung,pins = "gpd1-0";
};
};
&pinctrl_1 {
emmc_nrst_pin: emmc-nrst {
samsung,pins = "gpd1-0";
- 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 = <
EXYNOS5420_PIN_DRV_LV1
>;
};
};
};
};