[PATCH 1/2] arm: boards: vscom-baltos: Run environment_initcall only on correct board

[PATCH 1/2] arm: boards: vscom-baltos: Run environment_initcall only on correct board

[Teresa Remmet]

Check for the correct hardware before reading the eeprom.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
 arch/arm/boards/vscom-baltos/board.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/boards/vscom-baltos/board.c b/arch/arm/boards/vscom-baltos/board.c
index 39f40a6061f8..c64864d43200 100644
--- a/arch/arm/boards/vscom-baltos/board.c
+++ b/arch/arm/boards/vscom-baltos/board.c
@@ -68,6 +68,9 @@ static int baltos_read_eeprom(void)
 	int rc;
 	unsigned char mac_addr[6];
 
+	if (!of_machine_is_compatible("vscom,onrisc"))
+		return 0;
+
 	rc = read_file_2("/dev/eeprom0",
 			 &size,
 			 (void *)&buf,
-- 
2.7.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] arm: dts: am335x strip: Don't strip timer2 anymore

[Teresa Remmet]

dmtimer has been converted to a real driver and needs a device now.
am335x devices are taken from dt also in mlo. Don't strip the dmtimer device
from the include as we need it now.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
 arch/arm/dts/am33xx-clocks-strip.dtsi | 2 --
 arch/arm/dts/am33xx-strip.dtsi        | 1 -
 2 files changed, 3 deletions(-)

diff --git a/arch/arm/dts/am33xx-clocks-strip.dtsi b/arch/arm/dts/am33xx-clocks-strip.dtsi
index 92906deafe6e..706e1c971202 100644
--- a/arch/arm/dts/am33xx-clocks-strip.dtsi
+++ b/arch/arm/dts/am33xx-clocks-strip.dtsi
@@ -22,7 +22,6 @@
 /delete-node/ &ehrpwm2_tbclk;
 /delete-node/ &clk_32768_ck;
 /delete-node/ &clk_rc32k_ck;
-/delete-node/ &tclkin_ck;
 /delete-node/ &dpll_core_m6_ck;
 /delete-node/ &dpll_mpu_m2_ck;
 /delete-node/ &dpll_ddr_ck;
@@ -40,7 +39,6 @@
 /delete-node/ &pruss_ocp_gclk;
 /delete-node/ &mmu_fck;
 /delete-node/ &timer1_fck;
-/delete-node/ &timer2_fck;
 /delete-node/ &timer3_fck;
 /delete-node/ &timer4_fck;
 /delete-node/ &timer5_fck;
diff --git a/arch/arm/dts/am33xx-strip.dtsi b/arch/arm/dts/am33xx-strip.dtsi
index 0c9d8526304d..b776c9cee740 100644
--- a/arch/arm/dts/am33xx-strip.dtsi
+++ b/arch/arm/dts/am33xx-strip.dtsi
@@ -27,7 +27,6 @@
 /delete-node/ &dcan1;
 /delete-node/ &mailbox;
 /delete-node/ &timer1;
-/delete-node/ &timer2;
 /delete-node/ &timer3;
 /delete-node/ &timer4;
 /delete-node/ &timer5;
-- 
2.7.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] arm: boards: vscom-baltos: Run environment_initcall only on correct board

[Sascha Hauer]

On Mon, Dec 17, 2018 at 03:02:09PM +0100, Teresa Remmet wrote:
> Check for the correct hardware before reading the eeprom.
> 
> Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
> ---
>  arch/arm/boards/vscom-baltos/board.c | 3 +++
>  1 file changed, 3 insertions(+)

Applied, thanks

Sascha

> 
> diff --git a/arch/arm/boards/vscom-baltos/board.c b/arch/arm/boards/vscom-baltos/board.c
> index 39f40a6061f8..c64864d43200 100644
> --- a/arch/arm/boards/vscom-baltos/board.c
> +++ b/arch/arm/boards/vscom-baltos/board.c
> @@ -68,6 +68,9 @@ static int baltos_read_eeprom(void)
>  	int rc;
>  	unsigned char mac_addr[6];
>  
> +	if (!of_machine_is_compatible("vscom,onrisc"))
> +		return 0;
> +
>  	rc = read_file_2("/dev/eeprom0",
>  			 &size,
>  			 (void *)&buf,
> -- 
> 2.7.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox