projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
exynos5250-snow-common.dtsi
diff --git
a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index
fadbea7
..
d5d5191
100644
(file)
--- a/
arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/
arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@
-19,7
+19,8
@@
i2c104 = &i2c_104;
};
i2c104 = &i2c_104;
};
- memory {
+ memory@40000000 {
+ device_type = "memory";
reg = <0x40000000 0x80000000>;
};
reg = <0x40000000 0x80000000>;
};
@@
-260,7
+261,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_irq>;
phy = <&hdmiphy>;
pinctrl-names = "default";
pinctrl-0 = <&hdmi_hpd_irq>;
phy = <&hdmiphy>;
@@
-440,7
+441,7
@@
* double-pulling gets us out of spec in some cases.
*/
&i2c2_bus {
* double-pulling gets us out of spec in some cases.
*/
&i2c2_bus {
- samsung,pin-pud = <
0
>;
+ samsung,pin-pud = <
EXYNOS_PIN_PULL_NONE
>;
};
&i2c_2 {
};
&i2c_2 {
@@
-572,81
+573,81
@@
&pinctrl_0 {
wifi_en: wifi-en {
samsung,pins = "gpx0-1";
&pinctrl_0 {
wifi_en: wifi-en {
samsung,pins = "gpx0-1";
- samsung,pin-function = <
1
>;
- samsung,pin-pud = <
0
>;
- samsung,pin-drv = <
0
>;
+ samsung,pin-function = <
EXYNOS_PIN_FUNC_OUTPUT
>;
+ samsung,pin-pud = <
EXYNOS_PIN_PULL_NONE
>;
+ samsung,pin-drv = <
EXYNOS4_PIN_DRV_LV1
>;
};
wifi_rst: wifi-rst {
samsung,pins = "gpx0-2";
};
wifi_rst: wifi-rst {
samsung,pins = "gpx0-2";
- samsung,pin-function = <
1
>;
- samsung,pin-pud = <
0
>;
- samsung,pin-drv = <
0
>;
+ samsung,pin-function = <
EXYNOS_PIN_FUNC_OUTPUT
>;
+ samsung,pin-pud = <
EXYNOS_PIN_PULL_NONE
>;
+ samsung,pin-drv = <
EXYNOS4_PIN_DRV_LV1
>;
};
power_key_irq: power-key-irq {
samsung,pins = "gpx1-3";
};
power_key_irq: power-key-irq {
samsung,pins = "gpx1-3";
- 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 = <
EXYNOS4_PIN_DRV_LV1
>;
};
ec_irq: ec-irq {
samsung,pins = "gpx1-6";
};
ec_irq: ec-irq {
samsung,pins = "gpx1-6";
- 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
>;
};
tps65090_irq: tps65090-irq {
samsung,pins = "gpx2-6";
};
tps65090_irq: tps65090-irq {
samsung,pins = "gpx2-6";
- 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
>;
};
usb3_vbus_en: usb3-vbus-en {
samsung,pins = "gpx2-7";
};
usb3_vbus_en: usb3-vbus-en {
samsung,pins = "gpx2-7";
- samsung,pin-function = <
1
>;
- samsung,pin-pud = <
0
>;
- samsung,pin-drv = <
0
>;
+ samsung,pin-function = <
EXYNOS_PIN_FUNC_OUTPUT
>;
+ samsung,pin-pud = <
EXYNOS_PIN_PULL_NONE
>;
+ samsung,pin-drv = <
EXYNOS4_PIN_DRV_LV1
>;
};
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
>;
};
lid_irq: lid-irq {
samsung,pins = "gpx3-5";
};
lid_irq: lid-irq {
samsung,pins = "gpx3-5";
- 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 = <
EXYNOS4_PIN_DRV_LV1
>;
};
hdmi_hpd_irq: hdmi-hpd-irq {
samsung,pins = "gpx3-7";
};
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 = <
EXYNOS4_PIN_DRV_LV1
>;
};
};
&pinctrl_1 {
arb_their_claim: arb-their-claim {
samsung,pins = "gpe0-4";
};
};
&pinctrl_1 {
arb_their_claim: arb-their-claim {
samsung,pins = "gpe0-4";
- samsung,pin-function = <
0
>;
- samsung,pin-pud = <
3
>;
- samsung,pin-drv = <
0
>;
+ samsung,pin-function = <
EXYNOS_PIN_FUNC_INPUT
>;
+ samsung,pin-pud = <
EXYNOS_PIN_PULL_UP
>;
+ samsung,pin-drv = <
EXYNOS4_PIN_DRV_LV1
>;
};
arb_our_claim: arb-our-claim {
samsung,pins = "gpf0-3";
};
arb_our_claim: arb-our-claim {
samsung,pins = "gpf0-3";
- samsung,pin-function = <
1
>;
- samsung,pin-pud = <
0
>;
- samsung,pin-drv = <
0
>;
+ samsung,pin-function = <
EXYNOS_PIN_FUNC_OUTPUT
>;
+ samsung,pin-pud = <
EXYNOS_PIN_PULL_NONE
>;
+ samsung,pin-drv = <
EXYNOS4_PIN_DRV_LV1
>;
};
};
};
};
@@
-657,16
+658,16
@@
};
&sd3_bus4 {
};
&sd3_bus4 {
- samsung,pin-drv = <
0
>;
+ samsung,pin-drv = <
EXYNOS4_PIN_DRV_LV1
>;
};
&sd3_clk {
};
&sd3_clk {
- samsung,pin-drv = <
0
>;
+ samsung,pin-drv = <
EXYNOS4_PIN_DRV_LV1
>;
};
&sd3_cmd {
};
&sd3_cmd {
- samsung,pin-pud = <
3
>;
- samsung,pin-drv = <
0
>;
+ samsung,pin-pud = <
EXYNOS_PIN_PULL_UP
>;
+ samsung,pin-drv = <
EXYNOS4_PIN_DRV_LV1
>;
};
&spi_1 {
};
&spi_1 {