diff options
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | MAINTAINERS | 15 | ||||
| -rw-r--r-- | arch/arm/boot/dts/exynos5410-odroidxu.dts | 3 |
3 files changed, 10 insertions, 9 deletions
@@ -88,6 +88,7 @@ Kay Sievers <[email protected]> Kenneth W Chen <[email protected]> Konstantin Khlebnikov <[email protected]> <[email protected]> Koushik <[email protected]> +Krzysztof Kozlowski <[email protected]> <[email protected]> Krzysztof Kozlowski <[email protected]> <[email protected]> Kuninori Morimoto <[email protected]> Leonid I Ananiev <[email protected]> diff --git a/MAINTAINERS b/MAINTAINERS index a4379016ea34..ecf066a399e3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1614,7 +1614,7 @@ N: rockchip ARM/SAMSUNG EXYNOS ARM ARCHITECTURES M: Kukjin Kim <[email protected]> -M: Krzysztof Kozlowski <[email protected]> +M: Krzysztof Kozlowski <[email protected]> L: [email protected] (moderated for non-subscribers) L: [email protected] (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 <[email protected]> +M: Krzysztof Kozlowski <[email protected]> +M: Bartlomiej Zolnierkiewicz <[email protected]> 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 <[email protected]> -M: Krzysztof Kozlowski <[email protected]> +M: Krzysztof Kozlowski <[email protected]> +M: Bartlomiej Zolnierkiewicz <[email protected]> S: Supported F: drivers/*/max14577*.c @@ -9238,7 +9240,7 @@ F: drivers/pinctrl/sh-pfc/ PIN CONTROLLER - SAMSUNG M: Tomasz Figa <[email protected]> -M: Krzysztof Kozlowski <[email protected]> +M: Krzysztof Kozlowski <[email protected]> M: Sylwester Nawrocki <[email protected]> L: [email protected] (moderated for non-subscribers) L: [email protected] (moderated for non-subscribers) @@ -10171,7 +10173,7 @@ S: Maintained F: drivers/platform/x86/samsung-laptop.c SAMSUNG AUDIO (ASoC) DRIVERS -M: Krzysztof Kozlowski <[email protected]> +M: Krzysztof Kozlowski <[email protected]> M: Sangbeom Kim <[email protected]> M: Sylwester Nawrocki <[email protected]> L: [email protected] (moderated for non-subscribers) @@ -10186,7 +10188,8 @@ F: drivers/video/fbdev/s3c-fb.c SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS M: Sangbeom Kim <[email protected]> -M: Krzysztof Kozlowski <[email protected]> +M: Krzysztof Kozlowski <[email protected]> +M: Bartlomiej Zolnierkiewicz <[email protected]> S: Supported diff --git a/arch/arm/boot/dts/exynos5410-odroidxu.dts b/arch/arm/boot/dts/exynos5410-odroidxu.dts index d9499310a301..f6d135245a4b 100644 --- a/arch/arm/boot/dts/exynos5410-odroidxu.dts +++ b/arch/arm/boot/dts/exynos5410-odroidxu.dts @@ -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>; }; |