Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27bda036 authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: nomadik: move remaining PrimeCells to device tree



The two remaining PrimeCells, RNG and RTC, are migrated to the
device tree for device tree boot.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 1b542757
Loading
Loading
Loading
Loading
+12 −0
Original line number Original line Diff line number Diff line
@@ -76,5 +76,17 @@
			interrupts = <28>;
			interrupts = <28>;
			status = "disabled";
			status = "disabled";
		};
		};

		rng: rng@101b0000 {
			compatible = "arm,primecell";
			reg = <0x101b0000 0x1000>;
		};

		rtc: rtc@101e8000 {
			compatible = "arm,pl031", "arm,primecell";
			reg = <0x101e8000 0x1000>;
			interrupt-parent = <&vica>;
			interrupts = <10>;
		};
	};
	};
};
};
+9 −2
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>
#include <asm/mach/time.h>
#include <asm/mach-types.h>


#include <asm/cacheflush.h>
#include <asm/cacheflush.h>
#include <asm/hardware/cache-l2x0.h>
#include <asm/hardware/cache-l2x0.h>
@@ -154,8 +155,10 @@ static int __init cpu8815_init(void)
	cpu8815_add_gpios(cpu8815_gpio_base, ARRAY_SIZE(cpu8815_gpio_base),
	cpu8815_add_gpios(cpu8815_gpio_base, ARRAY_SIZE(cpu8815_gpio_base),
			  IRQ_GPIO0, &pdata);
			  IRQ_GPIO0, &pdata);
	cpu8815_add_pinctrl(NULL, "pinctrl-stn8815");
	cpu8815_add_pinctrl(NULL, "pinctrl-stn8815");
	if (machine_is_nomadik()) {
		amba_apb_device_add(NULL, "rng", NOMADIK_RNG_BASE, SZ_4K, 0, 0, NULL, 0);
		amba_apb_device_add(NULL, "rng", NOMADIK_RNG_BASE, SZ_4K, 0, 0, NULL, 0);
		amba_apb_device_add(NULL, "rtc-pl031", NOMADIK_RTC_BASE, SZ_4K, IRQ_RTC_RTT, 0, NULL, 0);
		amba_apb_device_add(NULL, "rtc-pl031", NOMADIK_RTC_BASE, SZ_4K, IRQ_RTC_RTT, 0, NULL, 0);
	}
	return 0;
	return 0;
}
}
arch_initcall(cpu8815_init);
arch_initcall(cpu8815_init);
@@ -252,6 +255,10 @@ static struct of_dev_auxdata cpu8815_auxdata_lookup[] __initdata = {
		"uart0", NULL),
		"uart0", NULL),
	OF_DEV_AUXDATA("arm,primecell", NOMADIK_UART1_BASE,
	OF_DEV_AUXDATA("arm,primecell", NOMADIK_UART1_BASE,
		"uart1", NULL),
		"uart1", NULL),
	OF_DEV_AUXDATA("arm,primecell", NOMADIK_RNG_BASE,
		"rng", NULL),
	OF_DEV_AUXDATA("arm,primecell", NOMADIK_RTC_BASE,
		"rtc-pl031", NULL),
	{ /* sentinel */ },
	{ /* sentinel */ },
};
};