From 9da0a1481f2d1c1a0557da1d15a2d24eb7e766ac Mon Sep 17 00:00:00 2001 From: Teresa Gámez Date: Fri, 10 Oct 2014 11:14:32 +0200 Subject: ARM: dts: split phyCORE-AM335x device tree MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To support different module variants, split the phyCORE dts in dts and dtsi. Configurable parts which are supported by barebox are spi nor flash and i2c eeprom. Signed-off-by: Teresa Gámez Signed-off-by: Sascha Hauer --- arch/arm/boards/phytec-phycore-am335x/board.c | 4 ++-- arch/arm/boards/phytec-phycore-am335x/lowlevel.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'arch/arm/boards') diff --git a/arch/arm/boards/phytec-phycore-am335x/board.c b/arch/arm/boards/phytec-phycore-am335x/board.c index 035866b969..64e3904256 100644 --- a/arch/arm/boards/phytec-phycore-am335x/board.c +++ b/arch/arm/boards/phytec-phycore-am335x/board.c @@ -34,7 +34,7 @@ static int pcm051_coredevice_init(void) { - if (!of_machine_is_compatible("phytec,pcm051")) + if (!of_machine_is_compatible("phytec,phycore-am335x-som")) return 0; am33xx_register_ethaddr(0, 0); @@ -58,7 +58,7 @@ static char *xloadslots[] = { static int pcm051_devices_init(void) { - if (!of_machine_is_compatible("phytec,pcm051")) + if (!of_machine_is_compatible("phytec,phycore-am335x-som")) return 0; switch (bootsource_get()) { diff --git a/arch/arm/boards/phytec-phycore-am335x/lowlevel.c b/arch/arm/boards/phytec-phycore-am335x/lowlevel.c index 66bae806c4..47902d0087 100644 --- a/arch/arm/boards/phytec-phycore-am335x/lowlevel.c +++ b/arch/arm/boards/phytec-phycore-am335x/lowlevel.c @@ -117,7 +117,7 @@ struct pcm051_sdram_timings timings[] = { }, }; -extern char __dtb_am335x_phytec_phycore_start[]; +extern char __dtb_am335x_phytec_phycore_som_start[]; /** * @brief The basic entry point for board initialization. @@ -153,7 +153,7 @@ static noinline void pcm051_board_init(int sdram) omap_uart_lowlevel_init((void *)AM33XX_UART0_BASE); putc_ll('>'); - fdt = __dtb_am335x_phytec_phycore_start - get_runtime_offset(); + fdt = __dtb_am335x_phytec_phycore_som_start - get_runtime_offset(); am335x_barebox_entry(fdt); } @@ -198,7 +198,7 @@ ENTRY_FUNCTION(start_am33xx_phytec_phycore_sdram, r0, r1, r2) { void *fdt; - fdt = __dtb_am335x_phytec_phycore_start - get_runtime_offset(); + fdt = __dtb_am335x_phytec_phycore_som_start - get_runtime_offset(); am335x_barebox_entry(fdt); } -- cgit v1.2.3