From b1ec4f4a2b52b88dd679197279db0f8b3088e8e8 Mon Sep 17 00:00:00 2001 From: Thomas Abraham Date: Thu, 27 Dec 2012 13:25:02 -0800 Subject: [PATCH] --- yaml --- r: 355121 b: refs/heads/master c: f692543287930ed6857611ae52a1f2f5f07b44e1 h: refs/heads/master i: 355119: 72ef44dd1f5777aa6bbea96e560ea5a9e1761978 v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/exynos5440.dtsi | 2 +- trunk/drivers/gpio/gpio-samsung.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2f459bc9f4fa..672ee252e161 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 813f13e7d6ad239bb1003041f4cfae13ae27b14d +refs/heads/master: f692543287930ed6857611ae52a1f2f5f07b44e1 diff --git a/trunk/arch/arm/boot/dts/exynos5440.dtsi b/trunk/arch/arm/boot/dts/exynos5440.dtsi index 024269de8ee5..25f0fa69fbfd 100644 --- a/trunk/arch/arm/boot/dts/exynos5440.dtsi +++ b/trunk/arch/arm/boot/dts/exynos5440.dtsi @@ -86,7 +86,7 @@ }; pinctrl { - compatible = "samsung,pinctrl-exynos5440"; + compatible = "samsung,exynos5440-pinctrl"; reg = <0xE0000 0x1000>; interrupt-controller; #interrupt-cells = <2>; diff --git a/trunk/drivers/gpio/gpio-samsung.c b/trunk/drivers/gpio/gpio-samsung.c index 76be7eed79de..d03a606227c1 100644 --- a/trunk/drivers/gpio/gpio-samsung.c +++ b/trunk/drivers/gpio/gpio-samsung.c @@ -3025,7 +3025,7 @@ static __init int samsung_gpiolib_init(void) static const struct of_device_id exynos_pinctrl_ids[] = { { .compatible = "samsung,pinctrl-exynos4210", }, { .compatible = "samsung,pinctrl-exynos4x12", }, - { .compatible = "samsung,pinctrl-exynos5440", }, + { .compatible = "samsung,exynos5440-pinctrl", }, }; for_each_matching_node(pctrl_np, exynos_pinctrl_ids) if (pctrl_np && of_device_is_available(pctrl_np))