From 66b796a5600fe5bde3f9d6e65e7b226c305b74d4 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Wed, 19 Sep 2012 00:37:21 +0000 Subject: tegra: Rename Medcom to Medcom-Wide Medcom is the marketing name for an older, PXA-based version of the same device. In order to avoid confusion, rename the Tegra-based version to the new marketing name. Signed-off-by: Thierry Reding Acked-by: Stephen Warren Signed-off-by: Tom Warren --- board/avionic-design/dts/tegra20-medcom-wide.dts | 58 ++++++++++++++++++++++++ board/avionic-design/dts/tegra20-medcom.dts | 58 ------------------------ board/avionic-design/medcom-wide/Makefile | 48 ++++++++++++++++++++ board/avionic-design/medcom/Makefile | 48 -------------------- 4 files changed, 106 insertions(+), 106 deletions(-) create mode 100644 board/avionic-design/dts/tegra20-medcom-wide.dts delete mode 100644 board/avionic-design/dts/tegra20-medcom.dts create mode 100644 board/avionic-design/medcom-wide/Makefile delete mode 100644 board/avionic-design/medcom/Makefile (limited to 'board/avionic-design') diff --git a/board/avionic-design/dts/tegra20-medcom-wide.dts b/board/avionic-design/dts/tegra20-medcom-wide.dts new file mode 100644 index 0000000000..f916122421 --- /dev/null +++ b/board/avionic-design/dts/tegra20-medcom-wide.dts @@ -0,0 +1,58 @@ +/dts-v1/; + +/include/ ARCH_CPU_DTS + +/ { + model = "Avionic Design Medcom-Wide"; + compatible = "ad,medcom-wide", "nvidia,tegra20"; + + aliases { + usb0 = "/usb@c5008000"; + }; + + memory { + reg = <0x00000000 0x20000000>; + }; + + clocks { + clk_32k: clk_32k { + clock-frequency = <32000>; + }; + + osc { + clock-frequency = <12000000>; + }; + }; + + clock@60006000 { + clocks = <&clk_32k &osc>; + }; + + serial@70006300 { + clock-frequency = <216000000>; + }; + + i2c@7000c000 { + status = "disabled"; + }; + + i2c@7000c400 { + status = "disabled"; + }; + + i2c@7000c500 { + status = "disabled"; + }; + + i2c@7000d000 { + status = "disabled"; + }; + + usb@c5000000 { + status = "disabled"; + }; + + usb@c5004000 { + status = "disabled"; + }; +}; diff --git a/board/avionic-design/dts/tegra20-medcom.dts b/board/avionic-design/dts/tegra20-medcom.dts deleted file mode 100644 index 02864fbc7c..0000000000 --- a/board/avionic-design/dts/tegra20-medcom.dts +++ /dev/null @@ -1,58 +0,0 @@ -/dts-v1/; - -/include/ ARCH_CPU_DTS - -/ { - model = "Avionic Design Medcom-Wide"; - compatible = "ad,medcom", "nvidia,tegra20"; - - aliases { - usb0 = "/usb@c5008000"; - }; - - memory { - reg = <0x00000000 0x20000000>; - }; - - clocks { - clk_32k: clk_32k { - clock-frequency = <32000>; - }; - - osc { - clock-frequency = <12000000>; - }; - }; - - clock@60006000 { - clocks = <&clk_32k &osc>; - }; - - serial@70006300 { - clock-frequency = <216000000>; - }; - - i2c@7000c000 { - status = "disabled"; - }; - - i2c@7000c400 { - status = "disabled"; - }; - - i2c@7000c500 { - status = "disabled"; - }; - - i2c@7000d000 { - status = "disabled"; - }; - - usb@c5000000 { - status = "disabled"; - }; - - usb@c5004000 { - status = "disabled"; - }; -}; diff --git a/board/avionic-design/medcom-wide/Makefile b/board/avionic-design/medcom-wide/Makefile new file mode 100644 index 0000000000..864bc0ec01 --- /dev/null +++ b/board/avionic-design/medcom-wide/Makefile @@ -0,0 +1,48 @@ +# +# (C) Copyright 2010,2011 +# NVIDIA Corporation +# (C) Copyright 2011,2012 +# Avionic Design GmbH +# +# 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 $(TOPDIR)/config.mk + +$(shell mkdir -p $(obj)../common $(obj)../../nvidia/common) + +LIB = $(obj)lib$(BOARD).o + +COBJS := ../../nvidia/common/board.o +COBJS += ../common/tamonten.o + +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(call cmd_link_o_target, $(OBJS)) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/board/avionic-design/medcom/Makefile b/board/avionic-design/medcom/Makefile deleted file mode 100644 index 864bc0ec01..0000000000 --- a/board/avionic-design/medcom/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# -# (C) Copyright 2010,2011 -# NVIDIA Corporation -# (C) Copyright 2011,2012 -# Avionic Design GmbH -# -# 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 $(TOPDIR)/config.mk - -$(shell mkdir -p $(obj)../common $(obj)../../nvidia/common) - -LIB = $(obj)lib$(BOARD).o - -COBJS := ../../nvidia/common/board.o -COBJS += ../common/tamonten.o - -SRCS := $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) - -$(LIB): $(obj).depend $(OBJS) - $(call cmd_link_o_target, $(OBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### -- cgit