diff mbox

[U-Boot,1/6] ARM: tegra: rename dummy XUSB padctl implementation

Message ID 1444085961-30107-1-git-send-email-swarren@wwwdotorg.org
State Superseded
Delegated to: Tom Warren
Headers show

Commit Message

Stephen Warren Oct. 5, 2015, 10:59 p.m. UTC 
From: Stephen Warren <swarren@nvidia.com>

A future patch will soon move some of the XUSB padctl code into a common
file in arch/arm/mach-tegra. Rename the existing dummy XUSB padctl file
to avoid conflicting with that, or being confusing.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 arch/arm/mach-tegra/Makefile                               | 2 +-
 arch/arm/mach-tegra/{xusb-padctl.c => xusb-padctl-dummy.c} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename arch/arm/mach-tegra/{xusb-padctl.c => xusb-padctl-dummy.c} (100%)

Comments

Stephen Warren Oct. 21, 2015, 4:39 p.m. UTC | #1 
On 10/05/2015 04:59 PM, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> A future patch will soon move some of the XUSB padctl code into a common
> file in arch/arm/mach-tegra. Rename the existing dummy XUSB padctl file
> to avoid conflicting with that, or being confusing.

Tom,

Is this patch OK? I assume it can be applied now the merge window is over?
diff mbox

Patch

diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index 98431a91f875..2be6ef41fff6 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -23,7 +23,7 @@  obj-y += clock.o
 obj-y += lowlevel_init.o
 obj-y += pinmux-common.o
 obj-y += powergate.o
-obj-y += xusb-padctl.o
+obj-y += xusb-padctl-dummy.o
 obj-$(CONFIG_DISPLAY_CPUINFO) += sys_info.o
 obj-$(CONFIG_TEGRA_GPU) += gpu.o
 obj-$(CONFIG_TEGRA_CLOCK_SCALING) += emc.o
diff --git a/arch/arm/mach-tegra/xusb-padctl.c b/arch/arm/mach-tegra/xusb-padctl-dummy.c
similarity index 100%
rename from arch/arm/mach-tegra/xusb-padctl.c
rename to arch/arm/mach-tegra/xusb-padctl-dummy.c