| Message ID | 1362848769-10914-1-git-send-email-eric.nelson@boundarydevices.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Stefano Babic |
| Headers | show |
On 09/03/2013 18:06, Eric Nelson wrote: > Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> > --- > V2 uses struct hdmi_regs instead of raw offsets. > V3 changes whitespace (line break) > Hi Eric, > arch/arm/imx-common/Makefile | 1 + > arch/arm/imx-common/cmd_hdmidet.c | 37 +++++++++++++++++++++++++++++++++++++ > 2 files changed, 38 insertions(+) > create mode 100644 arch/arm/imx-common/cmd_hdmidet.c > > diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile > index 6309fcd..428a57e 100644 > --- a/arch/arm/imx-common/Makefile > +++ b/arch/arm/imx-common/Makefile > @@ -32,6 +32,7 @@ COBJS-y = iomux-v3.o timer.o cpu.o speed.o > COBJS-$(CONFIG_I2C_MXC) += i2c-mxv7.o > endif > COBJS-$(CONFIG_CMD_BMODE) += cmd_bmode.o > +COBJS-$(CONFIG_CMD_HDMIDETECT) += cmd_hdmidet.o > COBJS := $(sort $(COBJS-y)) > > SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) > diff --git a/arch/arm/imx-common/cmd_hdmidet.c b/arch/arm/imx-common/cmd_hdmidet.c > new file mode 100644 > index 0000000..794bf50 > --- /dev/null > +++ b/arch/arm/imx-common/cmd_hdmidet.c > @@ -0,0 +1,37 @@ > +/* > + * Copyright (C) 2012 Boundary Devices Inc. > + * > + * See file CREDITS for list of people who contributed to this > + * project. > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of > + * the License, or (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, > + * MA 02111-1307 USA > + */ > +#include <common.h> > +#include <asm/arch/imx-regs.h> > +#include <asm/arch/mxc_hdmi.h> > +#include <asm/io.h> > + > +static int do_hdmidet(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) > +{ > + struct hdmi_regs *hdmi = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR; > + u8 reg = readb(&hdmi->phy_stat0) & HDMI_PHY_HPD; > + return (reg&HDMI_PHY_HPD) ? 0 : 1; ^-- I am wondering if checkpatch does not complain about adding a white space here. Apart of that: Acked-by: Stefano Babic <sbabic@denx.de> Best regards, Stefano Babic
On 09/03/2013 18:06, Eric Nelson wrote: > Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> > --- Applied to u-boot-imx, thanks. Best regards, Stefano Babic
diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile index 6309fcd..428a57e 100644 --- a/arch/arm/imx-common/Makefile +++ b/arch/arm/imx-common/Makefile @@ -32,6 +32,7 @@ COBJS-y = iomux-v3.o timer.o cpu.o speed.o COBJS-$(CONFIG_I2C_MXC) += i2c-mxv7.o endif COBJS-$(CONFIG_CMD_BMODE) += cmd_bmode.o +COBJS-$(CONFIG_CMD_HDMIDETECT) += cmd_hdmidet.o COBJS := $(sort $(COBJS-y)) SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/arch/arm/imx-common/cmd_hdmidet.c b/arch/arm/imx-common/cmd_hdmidet.c new file mode 100644 index 0000000..794bf50 --- /dev/null +++ b/arch/arm/imx-common/cmd_hdmidet.c @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2012 Boundary Devices Inc. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ +#include <common.h> +#include <asm/arch/imx-regs.h> +#include <asm/arch/mxc_hdmi.h> +#include <asm/io.h> + +static int do_hdmidet(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + struct hdmi_regs *hdmi = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR; + u8 reg = readb(&hdmi->phy_stat0) & HDMI_PHY_HPD; + return (reg&HDMI_PHY_HPD) ? 0 : 1; +} + +U_BOOT_CMD(hdmidet, 1, 1, do_hdmidet, + "detect HDMI monitor", + "" +);
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> --- V2 uses struct hdmi_regs instead of raw offsets. V3 changes whitespace (line break) arch/arm/imx-common/Makefile | 1 + arch/arm/imx-common/cmd_hdmidet.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 arch/arm/imx-common/cmd_hdmidet.c