Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4460dc21 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

pinctrl: samsung: Use define from dt-bindings for pin mux function 



We already have macros for values used by driver and Device Tree
sources for pin mux configuration.  Use them instead of duplicating
defines.

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent ff60dced

drivers/pinctrl/samsung/pinctrl-exynos.c

+4 −2
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
#include <linux/err.h>

#include <linux/soc/samsung/exynos-pmu.h>



#include <dt-bindings/pinctrl/samsung.h>



#include "pinctrl-samsung.h"

#include "pinctrl-exynos.h"
@@ -176,7 +178,7 @@ static int exynos_irq_request_resources(struct irq_data *irqd) 


	con = readl(bank->pctl_base + reg_con);

	con &= ~(mask << shift);

	con |= EXYNOS_EINT_FUNC << shift;

	con |= EXYNOS_PIN_FUNC_EINT << shift;

	writel(con, bank->pctl_base + reg_con);



	spin_unlock_irqrestore(&bank->slock, flags);
@@ -204,7 +206,7 @@ static void exynos_irq_release_resources(struct irq_data *irqd) 


	con = readl(bank->pctl_base + reg_con);

	con &= ~(mask << shift);

	con |= FUNC_INPUT << shift;

	con |= EXYNOS_PIN_FUNC_INPUT << shift;

	writel(con, bank->pctl_base + reg_con);



	spin_unlock_irqrestore(&bank->slock, flags);

drivers/pinctrl/samsung/pinctrl-exynos.h

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#define EXYNOS7_WKUP_EMASK_OFFSET	0x900

#define EXYNOS7_WKUP_EPEND_OFFSET	0xA00

#define EXYNOS_SVC_OFFSET		0xB08

#define EXYNOS_EINT_FUNC		0xF



/* helpers to access interrupt service register */

#define EXYNOS_SVC_GROUP_SHIFT		3

drivers/pinctrl/samsung/pinctrl-samsung.c

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#include <linux/of_device.h>

#include <linux/spinlock.h>



#include <dt-bindings/pinctrl/samsung.h>



#include "../core.h"

#include "pinctrl-samsung.h"
@@ -586,7 +588,7 @@ static int samsung_gpio_set_direction(struct gpio_chip *gc, 
	data = readl(reg);

	data &= ~(mask << shift);

	if (!input)

		data |= FUNC_OUTPUT << shift;

		data |= EXYNOS_PIN_FUNC_OUTPUT << shift;

	writel(data, reg);



	return 0;

drivers/pinctrl/samsung/pinctrl-samsung.h

+0 −4
Original line number Diff line number Diff line
@@ -25,10 +25,6 @@ 


#include <linux/gpio.h>



/* pinmux function number for pin as gpio output line */

#define FUNC_INPUT	0x0

#define FUNC_OUTPUT	0x1



/**

 * enum pincfg_type - possible pin configuration types supported.

 * @PINCFG_TYPE_FUNC: Function configuration.