diff options
| author | Olof Johansson <olof@lixom.net> | 2014-10-14 23:31:13 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-10-14 23:31:13 -0700 |
| commit | e17fd8e58a1eb39e23f29da065ccc1498f022ed7 (patch) | |
| tree | 4ab0b1ad5f6b32d16cab7e0fd0005035ee9d1fbe /arch/arm/boot/dts | |
| parent | 6d81dc87c0fac76efabcde6884fcbe4cec874a83 (diff) | |
| parent | f6f1ae82bd288bceed5a93594a8a081845f11b41 (diff) | |
| download | blackbird-op-linux-e17fd8e58a1eb39e23f29da065ccc1498f022ed7.tar.gz blackbird-op-linux-e17fd8e58a1eb39e23f29da065ccc1498f022ed7.zip | |
Merge tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
Merge "Samsung fixes for v3.18" from Kukjin Kim:
- fix ifdef around cpu_*_do_[suspend, resume] ops to check
CONFIG_ARM_CPU_SUSPEND and not CONFIG_PM_SLEEP
- fix exynos_defconfig build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=n
- fix enabling Samsung PM debug functionality due to recently merged
patches and previous merge conflicts
- fix pull-up setting in sd4_width8 pin group for exynos4x12
* tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: mm: Fix ifdef around cpu_*_do_[suspend, resume] ops
ARM: EXYNOS: Fix build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=n
ARM: SAMSUNG: Restore Samsung PM Debug functionality
ARM: dts: Fix pull setting in sd4_width8 pin group for exynos4x12
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi index 99b26df8dbc7..0865a2e33f97 100644 --- a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi +++ b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi @@ -675,7 +675,7 @@ sd4_bus8: sd4-bus-width8 { samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6"; samsung,pin-function = <4>; - samsung,pin-pud = <4>; + samsung,pin-pud = <3>; samsung,pin-drv = <3>; }; |
