diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-10-17 08:10:23 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-10-17 08:10:23 +0200 |
| commit | ee6d4a74eb6efa643e7b834b32e04d01c6b29b7f (patch) | |
| tree | 2ca84274dfe2e54729bca7dc4bbfe42611a1ee7f /arch/arm/boards | |
| parent | c59d7ab7317014cc14a98c47e91c2b582d5d08a7 (diff) | |
| parent | 099b135ac30013dfc4b3310a5177cf2f7a17f3c3 (diff) | |
| download | barebox-ee6d4a74eb6efa643e7b834b32e04d01c6b29b7f.tar.gz barebox-ee6d4a74eb6efa643e7b834b32e04d01c6b29b7f.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/arm/boards')
| -rw-r--r-- | arch/arm/boards/chumby_falconwing/falconwing.c | 2 | ||||
| -rw-r--r-- | arch/arm/boards/phytec-som-am335x/board.c | 14 | ||||
| -rw-r--r-- | arch/arm/boards/stm32mp157c-dk2/board.c | 4 |
3 files changed, 8 insertions, 12 deletions
diff --git a/arch/arm/boards/chumby_falconwing/falconwing.c b/arch/arm/boards/chumby_falconwing/falconwing.c index 5554b78d6d..fb4a5d1cf0 100644 --- a/arch/arm/boards/chumby_falconwing/falconwing.c +++ b/arch/arm/boards/chumby_falconwing/falconwing.c @@ -65,7 +65,7 @@ static struct fb_videomode falconwing_vmode = { .xres = 320, .yres = 240, .pixclock = KHZ2PICOS(6250), /* max. 10 MHz */ - /* line lenght should be 64 µs */ + /* line length should be 64 µs */ .left_margin = 28, .hsync_len = 24, .right_margin = 28, diff --git a/arch/arm/boards/phytec-som-am335x/board.c b/arch/arm/boards/phytec-som-am335x/board.c index 441d56348c..c25f33ae20 100644 --- a/arch/arm/boards/phytec-som-am335x/board.c +++ b/arch/arm/boards/phytec-som-am335x/board.c @@ -124,15 +124,11 @@ static int physom_devices_init(void) ARRAY_SIZE(nandslots)); am33xx_bbu_emmc_mlo_register_handler("MLO.emmc", "/dev/mmc1"); - if (IS_ENABLED(CONFIG_STATE)) { - state = state_by_name("am335x_phytec_mac_state"); - if (state) - for (state_i = 0; state_i < 2; state_i++) { - state_ret = state_read_mac(state, - eth_names[state_i], &mac[0]); - if (!state_ret && is_valid_ether_addr(&mac[0])) - eth_register_ethaddr(state_i, mac); - } + state = state_by_name("am335x_phytec_mac_state"); + for (state_i = 0; state_i < 2; state_i++) { + state_ret = state_read_mac(state, eth_names[state_i], &mac[0]); + if (!state_ret && is_valid_ether_addr(&mac[0])) + eth_register_ethaddr(state_i, mac); } if (IS_ENABLED(CONFIG_PHYTEC_SOM_AM335X_OF_AUTOENABLE)) { diff --git a/arch/arm/boards/stm32mp157c-dk2/board.c b/arch/arm/boards/stm32mp157c-dk2/board.c index cbfe21db6a..9cb861af85 100644 --- a/arch/arm/boards/stm32mp157c-dk2/board.c +++ b/arch/arm/boards/stm32mp157c-dk2/board.c @@ -5,7 +5,7 @@ #include <asm/memory.h> #include <mach/stm32.h> -static int dk2_postcore_init(void) +static int dk2_mem_init(void) { if (!of_machine_is_compatible("st,stm32mp157c-dk2")) return 0; @@ -14,4 +14,4 @@ static int dk2_postcore_init(void) return 0; } -mem_initcall(dk2_postcore_init); +mem_initcall(dk2_mem_init); |