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

Commit 6acf9902 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pinctrl-v3.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl 

Pull pin control fixes from Linus Walleij:
 - Various build warning fixes.
 - Correct the S5P pin count.
 - Handle BIAS_DEFAULT properly in the Palmas driver.

* tag 'pinctrl-v3.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: palmas: do not abort pin configuration for BIAS_DEFAULT
  pinctrl: Correct number of pins for s5pv210
  pinctrl: remove an unnecessary cast
  pinctrl: fix pinconf_dbg_config_write return type
  pinctrl: tegra114: Remove MODULE_ALIAS
parents c31eeace 7fd9ddd5

drivers/pinctrl/pinconf.c

+2 −2
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ exit: 
 * <devicename> <state> <pinname> are values that should match the pinctrl-maps

 * <newvalue> reflects the new config and is driver dependant

 */

static int pinconf_dbg_config_write(struct file *file,

static ssize_t pinconf_dbg_config_write(struct file *file,

	const char __user *user_buf, size_t count, loff_t *ppos)

{

	struct pinctrl_maps *maps_node;
@@ -508,7 +508,7 @@ static int pinconf_dbg_config_write(struct file *file, 
	int i;



	/* Get userspace string and assure termination */

	buf_size = min(count, (size_t)(sizeof(buf)-1));

	buf_size = min(count, sizeof(buf) - 1);

	if (copy_from_user(buf, user_buf, buf_size))

		return -EFAULT;

	buf[buf_size] = 0;

drivers/pinctrl/pinctrl-exynos.c

+6 −6
Original line number Diff line number Diff line
@@ -663,18 +663,18 @@ static void exynos_pinctrl_resume(struct samsung_pinctrl_drv_data *drvdata) 
/* pin banks of s5pv210 pin-controller */

static struct samsung_pin_bank s5pv210_pin_bank[] = {

	EXYNOS_PIN_BANK_EINTG(8, 0x000, "gpa0", 0x00),

	EXYNOS_PIN_BANK_EINTG(6, 0x020, "gpa1", 0x04),

	EXYNOS_PIN_BANK_EINTG(4, 0x020, "gpa1", 0x04),

	EXYNOS_PIN_BANK_EINTG(8, 0x040, "gpb", 0x08),

	EXYNOS_PIN_BANK_EINTG(5, 0x060, "gpc0", 0x0c),

	EXYNOS_PIN_BANK_EINTG(5, 0x080, "gpc1", 0x10),

	EXYNOS_PIN_BANK_EINTG(4, 0x0a0, "gpd0", 0x14),

	EXYNOS_PIN_BANK_EINTG(4, 0x0c0, "gpd1", 0x18),

	EXYNOS_PIN_BANK_EINTG(5, 0x0e0, "gpe0", 0x1c),

	EXYNOS_PIN_BANK_EINTG(8, 0x100, "gpe1", 0x20),

	EXYNOS_PIN_BANK_EINTG(6, 0x120, "gpf0", 0x24),

	EXYNOS_PIN_BANK_EINTG(6, 0x0c0, "gpd1", 0x18),

	EXYNOS_PIN_BANK_EINTG(8, 0x0e0, "gpe0", 0x1c),

	EXYNOS_PIN_BANK_EINTG(5, 0x100, "gpe1", 0x20),

	EXYNOS_PIN_BANK_EINTG(8, 0x120, "gpf0", 0x24),

	EXYNOS_PIN_BANK_EINTG(8, 0x140, "gpf1", 0x28),

	EXYNOS_PIN_BANK_EINTG(8, 0x160, "gpf2", 0x2c),

	EXYNOS_PIN_BANK_EINTG(8, 0x180, "gpf3", 0x30),

	EXYNOS_PIN_BANK_EINTG(6, 0x180, "gpf3", 0x30),

	EXYNOS_PIN_BANK_EINTG(7, 0x1a0, "gpg0", 0x34),

	EXYNOS_PIN_BANK_EINTG(7, 0x1c0, "gpg1", 0x38),

	EXYNOS_PIN_BANK_EINTG(7, 0x1e0, "gpg2", 0x3c),

drivers/pinctrl/pinctrl-palmas.c

+3 −2
Original line number Diff line number Diff line
@@ -891,9 +891,10 @@ static int palmas_pinconf_set(struct pinctrl_dev *pctldev, 
		param = pinconf_to_config_param(configs[i]);

		param_val = pinconf_to_config_argument(configs[i]);



		if (param == PIN_CONFIG_BIAS_PULL_PIN_DEFAULT)

			continue;



		switch (param) {

		case PIN_CONFIG_BIAS_PULL_PIN_DEFAULT:

			return 0;

		case PIN_CONFIG_BIAS_DISABLE:

		case PIN_CONFIG_BIAS_PULL_UP:

		case PIN_CONFIG_BIAS_PULL_DOWN:

drivers/pinctrl/pinctrl-tegra114.c

+2 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Copyright (c) 2012-2013, NVIDIA CORPORATION.  All rights reserved.

 *

 * Arthur:  Pritesh Raithatha <praithatha@nvidia.com>

 * Author:  Pritesh Raithatha <praithatha@nvidia.com>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,
@@ -2763,7 +2763,6 @@ static struct platform_driver tegra114_pinctrl_driver = { 
};

module_platform_driver(tegra114_pinctrl_driver);



MODULE_ALIAS("platform:tegra114-pinctrl");

MODULE_AUTHOR("Pritesh Raithatha <praithatha@nvidia.com>");

MODULE_DESCRIPTION("NVIDIA Tegra114 pincontrol driver");

MODULE_DESCRIPTION("NVIDIA Tegra114 pinctrl driver");

MODULE_LICENSE("GPL v2");