gpio: omap_gpio: Add xlate function to support GPIO_ACTIVE_LOW
Subsystems (3)
PATCH 1/3 gpio: omap_gpio: Add xlate function to support GPIO_ACTIVE_LOW
The gpio driver doesn't current support knowing whether or not GPIO is active low or high. It simply returns the value. The side effect of this, is that the MMC routines which check the status card detect or write protect must use a u-boot specific dts modification to enable inverting the pin values when GPIO_ACTIVE_LOW is used. This allows the invert option to be removed
drivers/gpio/omap_gpio.c +14 -0
@@ -24,6 +24,7 @@#include <asm/io.h> #include <linux/errno.h> #include <malloc.h> +#include <dt-bindings/gpio/gpio.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -275,12 +276,25 @@ static int omap_gpio_get_function(struct udevice *dev, unsigned offset)return GPIOF_INPUT ; } +static int omap_gpio_xlate (struct udevice *dev,struct gpio_desc *desc, +struct ofnode_phandle_args *args) +{ + desc->offset = args->args[0 ]; + +if (args->args[1 ] &GPIO_ACTIVE_LOW ) + desc->flags =GPIOD_ACTIVE_LOW ; +else + desc->flags =0 ; +return 0 ; +} +static const struct dm_gpio_ops gpio_omap_ops = { .direction_input = omap_gpio_direction_input, .direction_output = omap_gpio_direction_output, .get_value = omap_gpio_get_value, .set_value = omap_gpio_set_value, .get_function = omap_gpio_get_function, + .xlate = omap_gpio_xlate, };static int omap_gpio_probe (struct udevice *dev)
Signature · 1 line
2.17.1
PATCH 2/3 mmc: omap_mmc: Remove invert references with gpio xlate available
With omap_gpio now translating GPIO_ACTIVE_LOW, any boards using the 'invert' option will no longer need to do this. This patch removes the support for 'invert' from the MMC driver.
drivers/mmc/omap_hsmmc.c +0 -10
@@ -83,7 +83,6 @@ struct omap_hsmmc_data {#if CONFIG_IS_ENABLED (DM_MMC )struct gpio_desc cd_gpio;/* Change Detect GPIO */ struct gpio_desc wp_gpio;/* Write Protect GPIO */ -bool cd_inverted;#else int cd_gpio;int wp_gpio;
@@ -1377,8 +1376,6 @@ static int omap_hsmmc_getcd(struct udevice *dev)if (value <0 )return 1 ; -if (priv->cd_inverted) -return !value;return value; }
@@ -1860,10 +1857,6 @@ static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev) }#endif -#ifdef OMAP_HSMMC_USE_GPIO - plat->cd_inverted =fdtdec_get_bool (fdt, node,"cd-inverted" ); -#endif -return 0 ; }#endif
@@ -1892,9 +1885,6 @@ static int omap_hsmmc_probe(struct udevice *dev) priv->base_addr = plat->base_addr; priv->controller_flags = plat->controller_flags; priv->hw_rev = plat->hw_rev; -#ifdef OMAP_HSMMC_USE_GPIO - priv->cd_inverted = plat->cd_inverted; -#endif #ifdef CONFIG_BLK mmc = plat->mmc;
Signature · 1 line
2.17.1
PATCH 2/3 mmc: omap_mmc: Remove invert references with gpio xlate available
Adam,
Quoted 40 lines · Adam Ford
With
omap_gpionow translatingGPIO_ACTIVE_LOW, any boards using the 'invert' option will no longer need to do this. This patch removes the support for 'invert' from the MMC driver.Signed-off-by Adam Ford <[email protected]>drivers/mmc/omap_hsmmc.c +0
-1@@ -83,7 +83,6 @@ struct omap_hsmmc_data {#if CONFIG_IS_ENABLED (DM_MMC )struct gpio_desc cd_gpio;/* Change Detect GPIO */ struct gpio_desc wp_gpio;/* Write Protect GPIO */ -bool cd_inverted;#else int cd_gpio;int
wp_gpio;drivers/mmc/omap_hsmmc.c +0
-6@@ -1377,8 +1376,6 @@ static int omap_hsmmc_getcd(struct udevice *dev)if (value <0 )return 1 ; -if (priv->cd_inverted) -return !value;return value; }@@ -1860,10 +1857,6 @@ static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev) }#endif -#ifdef OMAP_HSMMC_USE_GPIO - plat->cd_inverted =fdtdec_get_bool (fdt, node,"cd-inverted" ); -#endif -return 0 ; }#endif
drivers/mmc/omap_hsmmc.c static int omap_hsmmc_probe(struct udevice *dev) · line 1896
Quoted 5 lines
drivers/mmc/omap_hsmmc.c +0
-2@@ -1892,9 +1885,6 @@ static int omap_hsmmc_probe(struct udevice *dev) priv->base_addr = plat->base_addr; priv->controller_flags = plat->controller_flags; priv->hw_rev = plat->hw_rev; -#ifdef OMAP_HSMMC_USE_GPIO - priv->cd_inverted = plat->cd_inverted;
Could you remove it also from struct omap_hsmmc_plat since it is not used anymore ?
JJ
Quoted 4 lines
drivers/mmc/omap_hsmmc.c +0
-1-#endif #ifdef CONFIG_BLK mmc = plat->mmc;
PATCH 3/3 ARM: DTS: various omap3: Remove cd-inverted from u-boot.dtsi
In reply to Adam FordWith the omap_mmc driver no longer supporting cd-inverted, this patch removes all these references since they are not needed.
arch/arm/dts/am3517-evm-u-boot.dtsi +0 -4
@@ -10,10 +10,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; };
arch/arm/dts/omap3-beagle-u-boot.dtsi +0 -4
@@ -11,10 +11,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; };
arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi +0 -4
@@ -11,10 +11,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; };
arch/arm/dts/omap3-beagle-xm-u-boot.dtsi +0 -4
@@ -11,10 +11,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; };
arch/arm/dts/omap3-evm-37xx-u-boot.dtsi +0 -4
@@ -11,10 +11,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; };
arch/arm/dts/omap3-evm-u-boot.dtsi +0 -4
@@ -11,10 +11,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; };
Signature · 1 line
2.17.1
PATCH 3/3 ARM: DTS: various omap3: Remove cd-inverted from u-boot.dtsi
Hi Adam,
Quoted 85 lines · Adam Ford
With the
omap_mmcdriver no longer supporting cd-inverted, this patch removes all these references since they are not needed.Signed-off-by Adam Ford <[email protected]>arch/arm/dts/am3517-evm-u-boot.dtsi +0
-4@@ -10,10 +10,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; };arch/arm/dts/omap3-beagle-u-boot.dtsi +0
-4@@ -11,10 +11,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; };arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi +0
-4@@ -11,10 +11,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; };arch/arm/dts/omap3-beagle-xm-u-boot.dtsi +0
-4@@ -11,10 +11,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; };arch/arm/dts/omap3-evm-37xx-u-boot.dtsi +0
-4@@ -11,10 +11,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; };arch/arm/dts/omap3-evm-u-boot.dtsi +0
-0
arch/arm/dts/omap3-evm-u-boot.dtsi line 16
Quoted 10 lines
arch/arm/dts/omap3-evm-u-boot.dtsi +0
-4@@ -11,10 +11,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; };
Shouldn't logicpd-torpedo-37xx-devkit-u-boot.dtsi be updated ?
JJ
PATCH 3/3 ARM: DTS: various omap3: Remove cd-inverted from u-boot.dtsi
Quoted 93 lines · Jean-Jacques Hiblot
Hi Adam,
Quoted 88 lines · Adam Ford
With the
omap_mmcdriver no longer supporting cd-inverted, this patch removes all these references since they are not needed.Signed-off-by Adam Ford <[email protected]>arch/arm/dts/am3517-evm-u-boot.dtsi +0
-4@@ -10,10 +10,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; };arch/arm/dts/omap3-beagle-u-boot.dtsi +0
-4@@ -11,10 +11,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; };arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi +0
-4@@ -11,10 +11,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; };arch/arm/dts/omap3-beagle-xm-u-boot.dtsi +0
-4@@ -11,10 +11,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; };arch/arm/dts/omap3-evm-37xx-u-boot.dtsi +0
-4@@ -11,10 +11,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; };arch/arm/dts/omap3-evm-u-boot.dtsi +0
-0@@ -11,10 +11,6 @@ }; };
Quoted 9 lines
arch/arm/dts/omap3-evm-u-boot.dtsi line 16
Quoted 7 lines
arch/arm/dts/omap3-evm-u-boot.dtsi +0
-4-&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; };Shouldn't
logicpd-torpedo-37xx-devkit-u-boot.dtsibe updated ?
I did that already at: https://patchwork.ozlabs.org/patch/965450/
adam
Quoted 6 lines
JJ
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
PATCH 1/3 gpio: omap_gpio: Add xlate function to support GPIO_ACTIVE_LOW
In reply to Adam Ford Adam,
Quoted 26 lines · Adam Ford
The gpio driver doesn't current support knowing whether or not GPIO is active low or high. It simply returns the value. The side effect of this, is that the MMC routines which check the status card detect or write protect must use a u-boot specific dts modification to enable inverting the pin values when
GPIO_ACTIVE_LOWis used. This allows the invert option to be removedSigned-off-by Adam Ford <[email protected]>drivers/gpio/omap_gpio.c +2
-0@@ -24,6 +24,7 @@#include <asm/io.h> #include <linux/errno.h> #include <malloc.h> +#include <dt-bindings/gpio/gpio.h> DECLARE_GLOBAL_DATA_PTR ;@@ -275,12 +276,25 @@ static int omap_gpio_get_function(struct udevice *dev, unsigned offset)return GPIOF_INPUT ; } +static int omap_gpio_xlate(struct udevice *dev, struct gpio_desc *desc,
drivers/gpio/omap_gpio.c static int omap_gpio_get_function(struct udevice *dev, unsigned offset) · line 289
Quoted 10 lines
drivers/gpio/omap_gpio.c +10
-0+ struct ofnode_phandle_args *args) +{ + desc->offset = args->args[0 ]; + +if (args->args[1 ] &GPIO_ACTIVE_LOW ) + desc->flags =GPIOD_ACTIVE_LOW ; +else + desc->flags =0 ; +return 0 ; +}
Do we need this ? It looks a lot like the default behaviour (see gpio_xlate_offs_flags in gpio-uclass.c).
JJ
Quoted 12 lines
Do we need this ? It looks like the default behaviour
static const structdm_gpio_opsgpio_omap_ops= {
.direction_input =omap_gpio_direction_input,
.direction_output =omap_gpio_direction_output,
.get_value =omap_gpio_get_value,
.set_value =omap_gpio_set_value,
.get_function =omap_gpio_get_function,drivers/gpio/omap_gpio.c +1
-0+ .xlate = omap_gpio_xlate, };static int omap_gpio_probe (struct udevice *dev)
PATCH 1/3 gpio: omap_gpio: Add xlate function to support GPIO_ACTIVE_LOW
Quoted 30 lines · Jean-Jacques Hiblot
Adam,
Quoted 25 lines · Adam Ford
The gpio driver doesn't current support knowing whether or not GPIO is active low or high. It simply returns the value. The side effect of this, is that the MMC routines which check the status card detect or write protect must use a u-boot specific dts modification to enable inverting the pin values when
GPIO_ACTIVE_LOWis used. This allows the invert option to be removedSigned-off-by Adam Ford <[email protected]>drivers/gpio/omap_gpio.c +1
-0@@ -24,6 +24,7 @@#include <asm/io.h> #include <linux/errno.h> #include <malloc.h> +#include <dt-bindings/gpio/gpio.h> DECLARE_GLOBAL_DATA_PTR ;@@ -275,12 +276,25 @@ static int omap_gpio_get_function(struct udevice *dev, unsigned offset)return GPIOF_INPUT ; }
Quoted 13 lines
drivers/gpio/omap_gpio.c static int omap_gpio_get_function(struct udevice *dev, unsigned offset) · line 289
Quoted 11 lines
drivers/gpio/omap_gpio.c +11
-0+static int omap_gpio_xlate (struct udevice *dev,struct gpio_desc *desc, +struct ofnode_phandle_args *args) +{ + desc->offset = args->args[0 ]; + +if (args->args[1 ] &GPIO_ACTIVE_LOW ) + desc->flags =GPIOD_ACTIVE_LOW ; +else + desc->flags =0 ; +return 0 ; +}Do we need this ? It looks a lot like the default behaviour (see
gpio_xlate_offs_flagsingpio-uclass.c).
I don't know. I saw that other gpio drivers had the xlate, so it seemed like it made sense to have it here. I'll revert it, and keep the other stuff and see what happens along with removing the entry from the struct.
I don't have the other (non-Logic PD) boards, so I cannot test them.
adam
Quoted 15 lines
JJ
Quoted 12 lines
Do we need this ? It looks like the default behaviour
static const structdm_gpio_opsgpio_omap_ops= {.direction_input = omap_gpio_direction_input, .direction_output = omap_gpio_direction_output, .get_value = omap_gpio_get_value, .set_value = omap_gpio_set_value, .get_function = omap_gpio_get_function, + .xlate = omap_gpio_xlate,};
static int
omap_gpio_probe(struct udevice *dev)