Hi Russ,
On 05/07/12 23:00, Russ Dill wrote:
> This removes several boot warnings from board-omap3beagle.c:
>
> - gpio_request: gpio--22 (DVI reset) status -22
> - Unable to get DVI reset GPIO
>
> There is a combination of leftover code and revision confusion.
> Additionally, xM support is currently a hack.
>
> For original Beagleboard this removes the double initialization of GPIO
> 170, properly configures it as an output, and wraps the initialization
> in an if block so that xM does not attempt to request it.
>
> For Beagleboard xM it removes reference to GPIO 129 which was part
> of rev A1 and A2 designs, but never functioned. It then properly assigns
> beagle_dvi_device.reset_gpio in beagle_twl_gpio_setup and removes the
> hack of initializing it high.
>
> Unfortunately, there is no way to tell the difference between xM A2 and
> A3. However, GPIO 129 does not function on rev A1 and A2, and the TWL
> GPIO used on A3 and beyond is not used on rev A1 and A2, there are no
> problems created by this fix.
>
> Tested on Beagleboard-xM Rev C1 and Beagleboard Rev B4.
>
> Signed-off-by: Russ Dill <Russ.Dill@xxxxxx>
> ---
> arch/arm/mach-omap2/board-omap3beagle.c | 35 +++++++++++++++++--------------
> 1 file changed, 19 insertions(+), 16 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
> index 3b9647a..fcb7b56 100644
> --- a/arch/arm/mach-omap2/board-omap3beagle.c
> +++ b/arch/arm/mach-omap2/board-omap3beagle.c
> @@ -86,7 +86,7 @@ static struct {
> } beagle_config = {
> .mmc1_gpio_wp = -EINVAL,
> .usb_pwr_level = GPIOF_OUT_INIT_LOW,
> - .reset_gpio = 129,
> + .reset_gpio = -EINVAL,
While, you are at this one, can you please add a comment
on what device does this gpio reset?
> .usr_button_gpio = 4,
> };
>
> @@ -238,12 +238,17 @@ static struct omap_dss_board_info beagle_dss_data = {
>
> static void __init beagle_display_init(void)
> {
> - int r;
> -
> - r = gpio_request_one(beagle_dvi_device.reset_gpio, GPIOF_OUT_INIT_LOW,
> - "DVI reset");
> - if (r < 0)
> - printk(KERN_ERR "Unable to get DVI reset GPIO\n");
> + if (beagle_config.reset_gpio != -EINVAL) {
Should this be:
if (gpio_is_valid(beagle_config.reset_gpio)) {
?
> + int r;
> +
> + omap_mux_init_gpio(beagle_config.reset_gpio, OMAP_PIN_OUTPUT);
> + r = gpio_request_one(beagle_config.reset_gpio,
> + GPIOF_OUT_INIT_LOW, "DVI reset");
> + if (r < 0)
> + printk(KERN_ERR "Unable to get DVI reset GPIO\n");
> + else
> + beagle_dvi_device.reset_gpio = beagle_config.reset_gpio;
> + }
> }
>
> #include "sdram-micron-mt46h32m32lf-6.h"
> @@ -296,11 +301,14 @@ static int beagle_twl_gpio_setup(struct device *dev,
> if (r)
> pr_err("%s: unable to configure nDVI_PWR_EN\n",
> __func__);
> - r = gpio_request_one(gpio + 2, GPIOF_OUT_INIT_HIGH,
> - "DVI_LDO_EN");
> +
> + r = gpio_request_one(gpio + 2, GPIOF_OUT_INIT_LOW,
> + "DVI_PU");
> if (r)
> - pr_err("%s: unable to configure DVI_LDO_EN\n",
> - __func__);
> + pr_err("%s: unable to get DVI_PU GPIO\n", __func__);
> + else
> + beagle_dvi_device.reset_gpio = gpio + 2;
> +
> } else {
> /*
> * REVISIT: need ehci-omap hooks for external VBUS
> @@ -309,7 +317,6 @@ static int beagle_twl_gpio_setup(struct device *dev,
> if (gpio_request_one(gpio + 1, GPIOF_IN, "EHCI_nOC"))
> pr_err("%s: unable to configure EHCI_nOC\n", __func__);
> }
> - beagle_dvi_device.reset_gpio = beagle_config.reset_gpio;
>
> gpio_request_one(gpio + TWL4030_GPIO_MAX, beagle_config.usb_pwr_level,
> "nEN_USB_PWR");
> @@ -540,10 +547,6 @@ static void __init omap3_beagle_init(void)
> omap_sdrc_init(mt46h32m32lf6_sdrc_params,
> mt46h32m32lf6_sdrc_params);
>
> - omap_mux_init_gpio(170, OMAP_PIN_INPUT);
> - /* REVISIT leave DVI powered down until it's needed ... */
> - gpio_request_one(170, GPIOF_OUT_INIT_HIGH, "DVI_nPD");
> -
> usb_musb_init(NULL);
> usbhs_init(&usbhs_bdata);
> omap_nand_flash_init(NAND_BUSWIDTH_16, omap3beagle_nand_partitions,
--
Regards,
Igor.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
