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-spring.dts
diff --git
a/arch/arm/boot/dts/exynos5250-spring.dts
b/arch/arm/boot/dts/exynos5250-spring.dts
index
1d52a79
..
4d7bdb7
100644
(file)
--- a/
arch/arm/boot/dts/exynos5250-spring.dts
+++ b/
arch/arm/boot/dts/exynos5250-spring.dts
@@
-20,7
+20,8
@@
model = "Google Spring";
compatible = "google,spring", "samsung,exynos5250", "samsung,exynos5";
model = "Google Spring";
compatible = "google,spring", "samsung,exynos5250", "samsung,exynos5";
- memory {
+ memory@40000000 {
+ device_type = "memory";
reg = <0x40000000 0x80000000>;
};
reg = <0x40000000 0x80000000>;
};
@@
-357,7
+358,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 {
@@
-460,92
+461,92
@@
&pinctrl_0 {
s5m8767_dvs: s5m8767-dvs {
samsung,pins = "gpd1-0", "gpd1-1", "gpd1-2";
&pinctrl_0 {
s5m8767_dvs: s5m8767-dvs {
samsung,pins = "gpd1-0", "gpd1-1", "gpd1-2";
- 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
>;
};
dp_hpd_gpio: dp-hpd-gpio {
samsung,pins = "gpc3-0";
};
dp_hpd_gpio: dp-hpd-gpio {
samsung,pins = "gpc3-0";
- 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
>;
};
trackpad_irq: trackpad-irq {
samsung,pins = "gpx1-2";
};
trackpad_irq: trackpad-irq {
samsung,pins = "gpx1-2";
- 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
>;
};
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
>;
};
s5m8767_ds: s5m8767-ds {
samsung,pins = "gpx2-3", "gpx2-4", "gpx2-5";
};
s5m8767_ds: s5m8767-ds {
samsung,pins = "gpx2-3", "gpx2-4", "gpx2-5";
- 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
>;
};
s5m8767_irq: s5m8767-irq {
samsung,pins = "gpx3-2";
};
s5m8767_irq: s5m8767-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 {
hsic_reset: hsic-reset {
samsung,pins = "gpe1-0";
};
};
&pinctrl_1 {
hsic_reset: hsic-reset {
samsung,pins = "gpe1-0";
- 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
>;
};
};
&sd1_bus4 {
};
};
&sd1_bus4 {
- samsung,pin-drv = <
0
>;
+ samsung,pin-drv = <
EXYNOS4_PIN_DRV_LV1
>;
};
&sd1_cd {
};
&sd1_cd {
- samsung,pin-drv = <
0
>;
+ samsung,pin-drv = <
EXYNOS4_PIN_DRV_LV1
>;
};
&sd1_clk {
};
&sd1_clk {
- samsung,pin-drv = <
0
>;
+ samsung,pin-drv = <
EXYNOS4_PIN_DRV_LV1
>;
};
&sd1_cmd {
};
&sd1_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 {