Merge tag 'gpio-fixes-for-v5.7' of... (ad3073bc) · Commits · 戴 / test

drivers/gpio/gpio-bcm-kona.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -625,7 +625,7 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev)

		kona_gpio->reg_base = devm_platform_ioremap_resource(pdev, 0);
		if (IS_ERR(kona_gpio->reg_base)) {
		ret = -ENXIO;
		ret = PTR_ERR(kona_gpio->reg_base);
		goto err_irq_domain;
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -127,8 +127,8 @@ static int mlxbf2_gpio_lock_acquire(struct mlxbf2_gpio_context *gs)
		{
		u32 arm_gpio_lock_val;

		spin_lock(&gs->gc.bgpio_lock);
		mutex_lock(yu_arm_gpio_lock_param.lock);
		spin_lock(&gs->gc.bgpio_lock);

		arm_gpio_lock_val = readl(yu_arm_gpio_lock_param.io);

		@@ -136,8 +136,8 @@ static int mlxbf2_gpio_lock_acquire(struct mlxbf2_gpio_context *gs)
		* When lock active bit[31] is set, ModeX is write enabled
		*/
		if (YU_LOCK_ACTIVE_BIT(arm_gpio_lock_val)) {
		mutex_unlock(yu_arm_gpio_lock_param.lock);
		spin_unlock(&gs->gc.bgpio_lock);
		mutex_unlock(yu_arm_gpio_lock_param.lock);
		return -EINVAL;
		}

		@@ -152,8 +152,8 @@ static int mlxbf2_gpio_lock_acquire(struct mlxbf2_gpio_context *gs)
		static void mlxbf2_gpio_lock_release(struct mlxbf2_gpio_context *gs)
		{
		writel(YU_ARM_GPIO_LOCK_RELEASE, yu_arm_gpio_lock_param.io);
		mutex_unlock(yu_arm_gpio_lock_param.lock);
		spin_unlock(&gs->gc.bgpio_lock);
		mutex_unlock(yu_arm_gpio_lock_param.lock);
		}

		/*

+2 −2

Original line number	Diff line number	Diff line
		@@ -660,8 +660,8 @@ static int pxa_gpio_probe(struct platform_device *pdev)
		pchip->irq1 = irq1;

		gpio_reg_base = devm_platform_ioremap_resource(pdev, 0);
		if (!gpio_reg_base)
		return -EINVAL;
		if (IS_ERR(gpio_reg_base))
		return PTR_ERR(gpio_reg_base);

		clk = clk_get(&pdev->dev, NULL);
		if (IS_ERR(clk)) {