On Thu, May 04, 2023 at 08:33:00AM +0300, Alexander Shiyan wrote:
> The file devices.h is no longer in use and was mistakenly left in the tree.
> Let's delete it.
>
> Fixes: c7d771e1ab9b ("ARM: clps711x: Switch to devicetree usage")
> Signed-off-by: Alexander Shiyan <eagle.alexander923@xxxxxxxxx>
> ---
> arch/arm/mach-clps711x/devices.c | 127 -------------------------------
> 1 file changed, 127 deletions(-)
> delete mode 100644 arch/arm/mach-clps711x/devices.c
Applied, thanks
Sascha
>
> diff --git a/arch/arm/mach-clps711x/devices.c b/arch/arm/mach-clps711x/devices.c
> deleted file mode 100644
> index a1a261412b..0000000000
> --- a/arch/arm/mach-clps711x/devices.c
> +++ /dev/null
> @@ -1,127 +0,0 @@
> -/*
> - * Copyright (C) 2012 Alexander Shiyan <shc_work@xxxxxxx>
> - *
> - * 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.
> - */
> -
> -#include <common.h>
> -#include <init.h>
> -#include <linux/sizes.h>
> -
> -#include <asm/io.h>
> -#include <asm/memory.h>
> -
> -#include <mach/clps711x/clps711x.h>
> -#include <mach/clps711x/devices.h>
> -
> -static int clps711x_mem_init(void)
> -{
> - ulong memsize = get_ram_size((ulong *)SDRAM0_BASE, SZ_64M);
> -
> - arm_add_mem_device("ram0", SDRAM0_BASE, memsize);
> -
> - return 0;
> -}
> -mem_initcall(clps711x_mem_init);
> -
> -inline static void _clps711x_setup_memcfg(int bank, u32 addr, u32 val)
> -{
> - u32 tmp = readl(addr);
> -
> - tmp &= ~(0xff << (bank * 8));
> - tmp |= val << (bank * 8);
> -
> - writel(tmp, addr);
> -}
> -
> -void clps711x_setup_memcfg(int bank, u32 val)
> -{
> - switch (bank) {
> - case 0 ... 3:
> - _clps711x_setup_memcfg(bank, MEMCFG1, val);
> - break;
> - case 4 ... 5:
> - _clps711x_setup_memcfg(bank - 4, MEMCFG2, val);
> - break;
> - }
> -}
> -
> -static struct resource uart0_resources[] = {
> - DEFINE_RES_MEM(UARTDR1, SZ_128),
> -};
> -
> -static struct resource uart1_resources[] = {
> - DEFINE_RES_MEM(UARTDR2, SZ_128),
> -};
> -
> -void clps711x_add_uart(unsigned int id)
> -{
> - switch (id) {
> - case 0:
> - add_generic_device_res("clps711x-uart", 0, uart0_resources,
> - ARRAY_SIZE(uart0_resources), NULL);
> - break;
> - case 1:
> - add_generic_device_res("clps711x-uart", 1, uart1_resources,
> - ARRAY_SIZE(uart1_resources), NULL);
> - break;
> - }
> -}
> -
> -static struct resource gpio0_resources[] = {
> - DEFINE_RES_MEM(PADR, SZ_1),
> - DEFINE_RES_MEM(PADDR, SZ_1),
> -};
> -
> -static struct resource gpio1_resources[] = {
> - DEFINE_RES_MEM(PBDR, SZ_1),
> - DEFINE_RES_MEM(PBDDR, SZ_1),
> -};
> -
> -static struct resource gpio2_resources[] = {
> - DEFINE_RES_MEM(PCDR, SZ_1),
> - DEFINE_RES_MEM(PCDDR, SZ_1),
> -};
> -
> -static struct resource gpio3_resources[] = {
> - DEFINE_RES_MEM(PDDR, SZ_1),
> - DEFINE_RES_MEM(PDDDR, SZ_1),
> -};
> -
> -static struct resource gpio4_resources[] = {
> - DEFINE_RES_MEM(PEDR, SZ_1),
> - DEFINE_RES_MEM(PEDDR, SZ_1),
> -};
> -
> -static __init int clps711x_gpio_init(void)
> -{
> - add_generic_device_res("clps711x-gpio", 0, gpio0_resources,
> - ARRAY_SIZE(gpio0_resources), NULL);
> - add_generic_device_res("clps711x-gpio", 1, gpio1_resources,
> - ARRAY_SIZE(gpio1_resources), NULL);
> - add_generic_device_res("clps711x-gpio", 2, gpio2_resources,
> - ARRAY_SIZE(gpio2_resources), NULL);
> - add_generic_device_res("clps711x-gpio", 3, gpio3_resources,
> - ARRAY_SIZE(gpio3_resources), NULL);
> - add_generic_device_res("clps711x-gpio", 4, gpio4_resources,
> - ARRAY_SIZE(gpio4_resources), NULL);
> -
> - return 0;
> -}
> -coredevice_initcall(clps711x_gpio_init);
> -
> -static __init int clps711x_syscon_init(void)
> -{
> - /* SYSCON1, SYSFLG1 */
> - add_generic_device("syscon", 1, NULL, SYSCON1, SZ_128,
> - IORESOURCE_MEM, NULL);
> - /* SYSCON2, SYSFLG2 */
> - add_generic_device("syscon", 2, NULL, SYSCON2, SZ_128,
> - IORESOURCE_MEM, NULL);
> -
> - return 0;
> -}
> -postcore_initcall(clps711x_syscon_init);
> --
> 2.39.1
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
