From 5b47f2d92ba02a5dc2b31a677fd8150ad3c68b6a Mon Sep 17 00:00:00 2001 From: Oleksandr Tyshchenko Date: Tue, 6 Aug 2013 14:03:27 +0300 Subject: sdp4430: Initialize board id using CONFIG_MACH_TYPE Use CONFIG_MACH_TYPE generic macro to set the machine type number in the common arm code instead of setting it in the board code. Signed-off-by: Oleksandr Tyshchenko --- board/ti/sdp4430/sdp.c | 1 - 1 file changed, 1 deletion(-) (limited to 'board/ti/sdp4430') diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c index 25daaa9..b20ca9e 100644 --- a/board/ti/sdp4430/sdp.c +++ b/board/ti/sdp4430/sdp.c @@ -28,7 +28,6 @@ int board_init(void) { gpmc_init(); - gd->bd->bi_arch_number = MACH_TYPE_OMAP_4430SDP; gd->bd->bi_boot_params = (0x80000000 + 0x100); /* boot param addr */ return 0; -- cgit v1.1 From e633ac019642689e3a2dd95bd644b3a10c7bbbb4 Mon Sep 17 00:00:00 2001 From: Taras Kondratiuk Date: Tue, 6 Aug 2013 15:18:51 +0300 Subject: ARM: OMAP4460: sdp: Limit TPS mux config to 4460 TPS mux config is 4460 specific, so it should be limited to 4460 only. Signed-off-by: Taras Kondratiuk --- board/ti/sdp4430/sdp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'board/ti/sdp4430') diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c index b20ca9e..79270a9 100644 --- a/board/ti/sdp4430/sdp.c +++ b/board/ti/sdp4430/sdp.c @@ -65,7 +65,8 @@ void set_muxconf_regs_essential(void) sizeof(wkup_padconf_array_essential) / sizeof(struct pad_conf_entry)); - if (omap_revision() >= OMAP4460_ES1_0) + if ((omap_revision() >= OMAP4460_ES1_0) && + (omap_revision() < OMAP4470_ES1_0)) do_set_mux((*ctrl)->control_padconf_wkup_base, wkup_padconf_array_essential_4460, sizeof(wkup_padconf_array_essential_4460) / -- cgit v1.1