mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "pinctrl: bcm2835: implement hook for missing gpio-ranges"

Browse Source 
This reverts commit ceb61ab22d which is
commit d2b67744fd upstream.

It breaks the Android kernel ABI and is not needed for Android devices,
so it is safe to revert for now.  If it is determined that it is needed
in the future, it can be brought back in an abi-preserving way.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I509752798a361ebe2b3e53df526099349b5aba81
This commit is contained in:
Greg Kroah-Hartman
2022-07-28 14:51:45 +02:00
parent eaa4878a26
commit 0889c70b1f
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/pinctrl/bcm/pinctrl-bcm2835.c
View File

@@ -351,22 +351,6 @@ static int bcm2835_gpio_direction_output(struct gpio_chip *chip,
return pinctrl_gpio_direction_output(chip->base + offset); return pinctrl_gpio_direction_output(chip->base + offset);
} }
static int bcm2835_of_gpio_ranges_fallback(struct gpio_chip *gc,
struct device_node *np)
{
struct pinctrl_dev *pctldev = of_pinctrl_get(np);
of_node_put(np);
if (!pctldev)
return 0;
gpiochip_add_pin_range(gc, pinctrl_dev_get_devname(pctldev), 0, 0,
gc->ngpio);
return 0;
}
static const struct gpio_chip bcm2835_gpio_chip = { static const struct gpio_chip bcm2835_gpio_chip = {
.label = MODULE_NAME, .label = MODULE_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
@@ -381,7 +365,6 @@ static const struct gpio_chip bcm2835_gpio_chip = {
.base = -1, .base = -1,
.ngpio = BCM2835_NUM_GPIOS, .ngpio = BCM2835_NUM_GPIOS,
.can_sleep = false, .can_sleep = false,
.of_gpio_ranges_fallback = bcm2835_of_gpio_ranges_fallback,
}; };
static const struct gpio_chip bcm2711_gpio_chip = { static const struct gpio_chip bcm2711_gpio_chip = {
@@ -398,7 +381,6 @@ static const struct gpio_chip bcm2711_gpio_chip = {
.base = -1, .base = -1,
.ngpio = BCM2711_NUM_GPIOS, .ngpio = BCM2711_NUM_GPIOS,
.can_sleep = false, .can_sleep = false,
.of_gpio_ranges_fallback = bcm2835_of_gpio_ranges_fallback,
}; };
static void bcm2835_gpio_irq_handle_bank(struct bcm2835_pinctrl *pc, static void bcm2835_gpio_irq_handle_bank(struct bcm2835_pinctrl *pc,