Commit 633af91d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-fixes-4.8' of... 

Merge tag 'samsung-fixes-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into fixes

Fix for v4.8-rc1:
1. Select proper eMMC HighSpeed mode on Odroid XU.  DTS was mixing
   "samsung,exynos5250-dw-mshc" compatible (with HS200 as fastest mode)
   with a property "mmc-hs400-1_8v" thus leading to failures during
   probe.

2. Update Krzysztof Kozlowski's email address in maintainers.

* tag 'samsung-fixes-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  MAINTAINERS: Switch to kernel.org account for Krzysztof Kozlowski
  ARM: dts: exynos: Properly select eMMC HighSpeed mode on Odroid XU

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 1ce3b12f 326dce07

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ Kay Sievers <kay.sievers@vrfy.org> 
Kenneth W Chen <kenneth.w.chen@intel.com>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

Koushik <raghavendra.koushik@neterion.com>

Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>

Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

MAINTAINERS

+9 −6
Original line number Diff line number Diff line
@@ -1614,7 +1614,7 @@ N: rockchip 


ARM/SAMSUNG EXYNOS ARM ARCHITECTURES

M:	Kukjin Kim <kgene@kernel.org>

M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

M:	Krzysztof Kozlowski <krzk@kernel.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

S:	Maintained
@@ -7456,7 +7456,8 @@ F: Documentation/devicetree/bindings/sound/max9860.txt 
F:	sound/soc/codecs/max9860.*



MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS

M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

M:	Krzysztof Kozlowski <krzk@kernel.org>

M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

L:	linux-pm@vger.kernel.org

S:	Supported

F:	drivers/power/max14577_charger.c
@@ -7472,7 +7473,8 @@ F: include/dt-bindings/*/*max77802.h 


MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS

M:	Chanwoo Choi <cw00.choi@samsung.com>

M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

M:	Krzysztof Kozlowski <krzk@kernel.org>

M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

L:	linux-kernel@vger.kernel.org

S:	Supported

F:	drivers/*/max14577*.c
@@ -9238,7 +9240,7 @@ F: drivers/pinctrl/sh-pfc/ 


PIN CONTROLLER - SAMSUNG

M:	Tomasz Figa <tomasz.figa@gmail.com>

M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

M:	Krzysztof Kozlowski <krzk@kernel.org>

M:	Sylwester Nawrocki <s.nawrocki@samsung.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
@@ -10171,7 +10173,7 @@ S: Maintained 
F:	drivers/platform/x86/samsung-laptop.c



SAMSUNG AUDIO (ASoC) DRIVERS

M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

M:	Krzysztof Kozlowski <krzk@kernel.org>

M:	Sangbeom Kim <sbkim73@samsung.com>

M:	Sylwester Nawrocki <s.nawrocki@samsung.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -10186,7 +10188,8 @@ F: drivers/video/fbdev/s3c-fb.c 


SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS

M:	Sangbeom Kim <sbkim73@samsung.com>

M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

M:	Krzysztof Kozlowski <krzk@kernel.org>

M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

L:	linux-kernel@vger.kernel.org

L:	linux-samsung-soc@vger.kernel.org

S:	Supported

arch/arm/boot/dts/exynos5410-odroidxu.dts

+0 −3
Original line number Diff line number Diff line
@@ -447,14 +447,11 @@ 
	samsung,dw-mshc-ciu-div = <3>;

	samsung,dw-mshc-sdr-timing = <0 4>;

	samsung,dw-mshc-ddr-timing = <0 2>;

	samsung,dw-mshc-hs400-timing = <0 2>;

	samsung,read-strobe-delay = <90>;

	pinctrl-names = "default";

	pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8 &sd0_cd>;

	bus-width = <8>;

	cap-mmc-highspeed;

	mmc-hs200-1_8v;

	mmc-hs400-1_8v;

	vmmc-supply = <&ldo20_reg>;

	vqmmc-supply = <&ldo11_reg>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE