34a422794d
This backports multiple patches from kernel 4.10 which are adding missing support for the A64 and the pine64 board. These are the device tree files, the pinctlk and the clock driver. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From 42676fa4aa87eda4fc762df495d4bde2ddc4bfce Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
Date: Tue, 11 Oct 2016 17:46:00 +0200
|
|
Subject: pinctrl: sunxi: Use macros from bindings header file for DT parsing
|
|
|
|
Since we have some bindings header for our hardcoded flags, let's use them
|
|
when we can.
|
|
|
|
Acked-by: Chen-Yu Tsai <wens@csie.org>
|
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
---
|
|
drivers/pinctrl/sunxi/pinctrl-sunxi.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
|
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
|
@@ -28,6 +28,8 @@
|
|
#include <linux/platform_device.h>
|
|
#include <linux/slab.h>
|
|
|
|
+#include <dt-bindings/pinctrl/sun4i-a10.h>
|
|
+
|
|
#include "../core.h"
|
|
#include "pinctrl-sunxi.h"
|
|
|
|
@@ -163,9 +165,9 @@ static int sunxi_pctrl_parse_bias_prop(s
|
|
return -EINVAL;
|
|
|
|
switch (val) {
|
|
- case 1:
|
|
+ case SUN4I_PINCTRL_PULL_UP:
|
|
return PIN_CONFIG_BIAS_PULL_UP;
|
|
- case 2:
|
|
+ case SUN4I_PINCTRL_PULL_DOWN:
|
|
return PIN_CONFIG_BIAS_PULL_DOWN;
|
|
}
|
|
|