ARM: uniphier: remove unused uniphier_ld11_boot_device_fixup()

The .boot_device_fixup() is only called by SPL.

Now that 64-bit SoCs of this SoC family no longer support SPL,
debug-uart-ld20.c is never compiled.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c b/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c
index 10093be0e43a174f8385a986e999d9396a712234..11e70a926fc84eb4f4cd152b8c6e8b8e6f5de2f4 100644 (file)
--- a/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c
@@ -58,11 +58,3 @@ int uniphier_ld20_boot_device_is_usb(u32 pinmon)
 {
        return !!(~pinmon & 0x00000780);
 }
-
-unsigned int uniphier_ld11_boot_device_fixup(unsigned int mode)
-{
-       if (mode == BOOT_DEVICE_MMC1 || mode == BOOT_DEVICE_USB)
-               mode = BOOT_DEVICE_BOARD;
-
-       return mode;
-}

diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.c b/arch/arm/mach-uniphier/boot-device/boot-device.c
index 23be8cfcf00df3213f05f5ab9ff14aa1d6d98dc1..3c7643302d9e34fed91a858fa9e3ba79bca6d600 100644 (file)
--- a/arch/arm/mach-uniphier/boot-device/boot-device.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device.c
@@ -91,7 +91,6 @@ static const struct uniphier_boot_device_info uniphier_boot_device_info[] = {
                .boot_device_table = uniphier_ld11_boot_device_table,
                .boot_device_count = &uniphier_ld11_boot_device_count,
                .boot_device_is_usb = uniphier_ld11_boot_device_is_usb,
-               .boot_device_fixup = uniphier_ld11_boot_device_fixup,
                .have_internal_stm = 1,
        },
 #endif
@@ -102,7 +101,6 @@ static const struct uniphier_boot_device_info uniphier_boot_device_info[] = {
                .boot_device_table = uniphier_ld11_boot_device_table,
                .boot_device_count = &uniphier_ld11_boot_device_count,
                .boot_device_is_usb = uniphier_ld20_boot_device_is_usb,
-               .boot_device_fixup = uniphier_ld11_boot_device_fixup,
                .have_internal_stm = 1,
        },
 #endif

diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.h b/arch/arm/mach-uniphier/boot-device/boot-device.h
index 44579f17d3e4c11c05422727cddc4d49fb551fb6..bbb634316b3aac9c725db9a79569fcb2c207ecc6 100644 (file)
--- a/arch/arm/mach-uniphier/boot-device/boot-device.h
+++ b/arch/arm/mach-uniphier/boot-device/boot-device.h
@@ -30,6 +30,5 @@ int uniphier_ld20_boot_device_is_usb(u32 pinmon);
 int uniphier_pxs3_boot_device_is_usb(u32 pinmon);
 
 unsigned int uniphier_pxs2_boot_device_fixup(unsigned int mode);
-unsigned int uniphier_ld11_boot_device_fixup(unsigned int mode);
 
 #endif /* _UNIPHIER_BOOT_DEVICE_H_ */