Merge branch 'lee-fixes' into devel (a6175e89) · Commits · 戴 / test

drivers/gpio/gpio-altera.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@
		* @interrupt_trigger : specifies the hardware configured IRQ trigger type
		* (rising, falling, both, high)
		* @mapped_irq : kernel mapped irq number.
		* @irq_chip : IRQ chip configuration
		*/
		struct altera_gpio_chip {
		struct of_mm_gpio_chip mmchip;
		@@ -69,7 +70,7 @@ static void altera_gpio_irq_mask(struct irq_data *d)
		raw_spin_unlock_irqrestore(&altera_gc->gpio_lock, flags);
		}

		/**
		/*
		* This controller's IRQ type is synthesized in hardware, so this function
		* just checks if the requested set_type matches the synthesized IRQ type
		*/

+7 −7

Original line number	Diff line number	Diff line
		@@ -47,13 +47,13 @@

		/**
		* struct it87_gpio - it87-specific GPIO chip
		* @chip the underlying gpio_chip structure
		* @lock a lock to avoid races between operations
		* @io_base base address for gpio ports
		* @io_size size of the port rage starting from io_base.
		* @output_base Super I/O register address for Output Enable register
		* @simple_base Super I/O 'Simple I/O' Enable register
		* @simple_size Super IO 'Simple I/O' Enable register size; this is
		* @chip: the underlying gpio_chip structure
		* @lock: a lock to avoid races between operations
		* @io_base: base address for gpio ports
		* @io_size: size of the port rage starting from io_base.
		* @output_base: Super I/O register address for Output Enable register
		* @simple_base: Super I/O 'Simple I/O' Enable register
		* @simple_size: Super IO 'Simple I/O' Enable register size; this is
		* required because IT87xx chips might only provide Simple I/O
		* switches on a subset of lines, whereas the others keep the
		* same status all time.

+1 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@ static int mlxbf_gpio_resume(struct platform_device *pdev)
		}
		#endif

		static const struct acpi_device_id mlxbf_gpio_acpi_match[] = {
		static const struct acpi_device_id __maybe_unused mlxbf_gpio_acpi_match[] = {
		{ "MLNXBF02", 0 },
		{}
		};

+3 −1

Original line number	Diff line number	Diff line
		@@ -149,6 +149,8 @@ static int mlxbf2_gpio_lock_acquire(struct mlxbf2_gpio_context *gs)
		* Release the YU arm_gpio_lock after changing the direction mode.
		*/
		static void mlxbf2_gpio_lock_release(struct mlxbf2_gpio_context *gs)
		__releases(&gs->gc.bgpio_lock)
		__releases(yu_arm_gpio_lock_param.lock)
		{
		writel(YU_ARM_GPIO_LOCK_RELEASE, yu_arm_gpio_lock_param.io);
		spin_unlock(&gs->gc.bgpio_lock);
		@@ -309,7 +311,7 @@ static int mlxbf2_gpio_resume(struct platform_device *pdev)
		}
		#endif

		static const struct acpi_device_id mlxbf2_gpio_acpi_match[] = {
		static const struct acpi_device_id __maybe_unused mlxbf2_gpio_acpi_match[] = {
		{ "MLNXBF22", 0 },
		{},
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ enum {
		* struct sprd_pmic_eic - PMIC EIC controller
		* @chip: the gpio_chip structure.
		* @intc: the irq_chip structure.
		* @regmap: the regmap from the parent device.
		* @map: the regmap from the parent device.
		* @offset: the EIC controller's offset address of the PMIC.
		* @reg: the array to cache the EIC registers.
		* @buslock: for bus lock/sync and unlock.