mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/7] mtd: core: Check partitions for empty string
@ 2015-07-17 11:13 Teresa Remmet
  2015-07-17 11:13 ` [PATCH 2/7] drivers: i2c: Only register available devices Teresa Remmet
                   ` (6 more replies)
  0 siblings, 7 replies; 9+ messages in thread
From: Teresa Remmet @ 2015-07-17 11:13 UTC (permalink / raw)
  To: barebox

Make setting partitions a litte bit more robust.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
 drivers/mtd/core.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c
index fda9034..3bdf441 100644
--- a/drivers/mtd/core.c
+++ b/drivers/mtd/core.c
@@ -386,6 +386,9 @@ static int mtd_partition_set(struct device_d *dev, struct param_d *p, const char
 	struct mtd_info *mtdpart, *tmp;
 	int ret;
 
+	if (!val)
+		return -EINVAL;
+
 	list_for_each_entry_safe(mtdpart, tmp, &mtd->partitions, partitions_entry) {
 		ret = mtd_del_partition(mtdpart);
 		if (ret)
-- 
1.9.1


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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH 2/7] drivers: i2c: Only register available devices
  2015-07-17 11:13 [PATCH 1/7] mtd: core: Check partitions for empty string Teresa Remmet
@ 2015-07-17 11:13 ` Teresa Remmet
  2015-07-17 14:59   ` Jan Lübbe
  2015-07-17 11:13 ` [PATCH 3/7] ARM: dts: am335x-phytec boards: Fixup spi flash node name Teresa Remmet
                   ` (5 subsequent siblings)
  6 siblings, 1 reply; 9+ messages in thread
From: Teresa Remmet @ 2015-07-17 11:13 UTC (permalink / raw)
  To: barebox

Only register i2c devices from device tree where status is enabled.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
 drivers/i2c/i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/i2c/i2c.c b/drivers/i2c/i2c.c
index 5d0fa06..f0df666 100644
--- a/drivers/i2c/i2c.c
+++ b/drivers/i2c/i2c.c
@@ -278,7 +278,7 @@ static void of_i2c_register_devices(struct i2c_adapter *adap)
 	if (!IS_ENABLED(CONFIG_OFDEVICE) || !adap->dev.device_node)
 		return;
 
-	for_each_child_of_node(adap->dev.device_node, n) {
+	for_each_available_child_of_node(adap->dev.device_node, n) {
 		struct i2c_board_info info = {};
 		struct i2c_client *result;
 		const __be32 *addr;
-- 
1.9.1


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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH 3/7] ARM: dts: am335x-phytec boards: Fixup spi flash node name
  2015-07-17 11:13 [PATCH 1/7] mtd: core: Check partitions for empty string Teresa Remmet
  2015-07-17 11:13 ` [PATCH 2/7] drivers: i2c: Only register available devices Teresa Remmet
@ 2015-07-17 11:13 ` Teresa Remmet
  2015-07-17 11:13 ` [PATCH 4/7] ARM: dts: phyFLEX-AM335x-som: Disable eeprom on default Teresa Remmet
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Teresa Remmet @ 2015-07-17 11:13 UTC (permalink / raw)
  To: barebox

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
 arch/arm/dts/am335x-phytec-phycore-som.dtsi | 2 +-
 arch/arm/dts/am335x-phytec-phyflex-som.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/dts/am335x-phytec-phycore-som.dtsi b/arch/arm/dts/am335x-phytec-phycore-som.dtsi
index ed8e257..59816d0 100644
--- a/arch/arm/dts/am335x-phytec-phycore-som.dtsi
+++ b/arch/arm/dts/am335x-phytec-phycore-som.dtsi
@@ -162,7 +162,7 @@
 	pinctrl-0 = <&spi0_pins>;
 	status = "disabled";
 
-	flash: m25p80 {
+	flash: m25p80@0 {
 		compatible = "m25p80";
 		spi-max-frequency = <48000000>;
 		reg = <0>;
diff --git a/arch/arm/dts/am335x-phytec-phyflex-som.dtsi b/arch/arm/dts/am335x-phytec-phyflex-som.dtsi
index fc9c9ba..b8c6886 100644
--- a/arch/arm/dts/am335x-phytec-phyflex-som.dtsi
+++ b/arch/arm/dts/am335x-phytec-phyflex-som.dtsi
@@ -151,7 +151,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&spi0_pins>;
 	status = "disabled";
-	flash: m25p80 {
+	flash: m25p80@0 {
 		compatible = "m25p80";
 		spi-max-frequency = <48000000>;
 		reg = <0>;
-- 
1.9.1


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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH 4/7] ARM: dts: phyFLEX-AM335x-som: Disable eeprom on default
  2015-07-17 11:13 [PATCH 1/7] mtd: core: Check partitions for empty string Teresa Remmet
  2015-07-17 11:13 ` [PATCH 2/7] drivers: i2c: Only register available devices Teresa Remmet
  2015-07-17 11:13 ` [PATCH 3/7] ARM: dts: am335x-phytec boards: Fixup spi flash node name Teresa Remmet
@ 2015-07-17 11:13 ` Teresa Remmet
  2015-07-17 11:13 ` [PATCH 5/7] ARM: phytec-som-am335x: Add support for 1024MiB RAM on one chip Teresa Remmet
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Teresa Remmet @ 2015-07-17 11:13 UTC (permalink / raw)
  To: barebox

Only enable eeprom when populated. So disable it in dtsi
file and enable if needed in board dts.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
 arch/arm/dts/am335x-phytec-phyflex-som.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/dts/am335x-phytec-phyflex-som.dtsi b/arch/arm/dts/am335x-phytec-phyflex-som.dtsi
index b8c6886..81ecf9d 100644
--- a/arch/arm/dts/am335x-phytec-phyflex-som.dtsi
+++ b/arch/arm/dts/am335x-phytec-phyflex-som.dtsi
@@ -138,6 +138,7 @@
 		byte_len = <4096>;
 		pagesize = <32>;
 		reg = <0x52>;
+		status = "disabled";
 	};
 };
 
-- 
1.9.1


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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH 5/7] ARM: phytec-som-am335x: Add support for 1024MiB RAM on one chip
  2015-07-17 11:13 [PATCH 1/7] mtd: core: Check partitions for empty string Teresa Remmet
                   ` (2 preceding siblings ...)
  2015-07-17 11:13 ` [PATCH 4/7] ARM: dts: phyFLEX-AM335x-som: Disable eeprom on default Teresa Remmet
@ 2015-07-17 11:13 ` Teresa Remmet
  2015-07-17 11:13 ` [PATCH 6/7] ARM: dts: Add support for all phyCORE-AM335x options Teresa Remmet
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Teresa Remmet @ 2015-07-17 11:13 UTC (permalink / raw)
  To: barebox

Added support for IM8G16D3FBBG15EI 1024MiB RAM on one chip.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
 arch/arm/boards/phytec-som-am335x/lowlevel.c    |  1 +
 arch/arm/boards/phytec-som-am335x/ram-timings.h | 22 +++++++++++++++++++++-
 images/Makefile.am33xx                          |  6 ++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boards/phytec-som-am335x/lowlevel.c b/arch/arm/boards/phytec-som-am335x/lowlevel.c
index 948bfa5..0ff62a3 100644
--- a/arch/arm/boards/phytec-som-am335x/lowlevel.c
+++ b/arch/arm/boards/phytec-som-am335x/lowlevel.c
@@ -124,6 +124,7 @@ PHYTEC_ENTRY_MLO(start_am33xx_phytec_phycore_sram_128mb, am335x_phytec_phycore_s
 PHYTEC_ENTRY_MLO(start_am33xx_phytec_phycore_sram_256mb, am335x_phytec_phycore_som_mlo, PHYCORE_MT41J128M16125IT_256MB);
 PHYTEC_ENTRY_MLO(start_am33xx_phytec_phycore_sram_512mb, am335x_phytec_phycore_som_mlo, PHYCORE_MT41J256M16HA15EIT_512MB);
 PHYTEC_ENTRY_MLO(start_am33xx_phytec_phycore_sram_2x512mb, am335x_phytec_phycore_som_mlo, PHYCORE_MT41J512M8125IT_2x512MB);
+PHYTEC_ENTRY_MLO(start_am33xx_phytec_phycore_sram_1024mb, am335x_phytec_phycore_som_mlo, PHYCORE_IM8G16D3FBBG15EI_1024MB);
 PHYTEC_ENTRY(start_am33xx_phytec_phycore_sdram, am335x_phytec_phycore_som);
 PHYTEC_ENTRY(start_am33xx_phytec_phycore_no_spi_sdram, am335x_phytec_phycore_som_no_spi);
 
diff --git a/arch/arm/boards/phytec-som-am335x/ram-timings.h b/arch/arm/boards/phytec-som-am335x/ram-timings.h
index 3dcee20..698b073 100644
--- a/arch/arm/boards/phytec-som-am335x/ram-timings.h
+++ b/arch/arm/boards/phytec-som-am335x/ram-timings.h
@@ -29,6 +29,7 @@ enum {
 	PHYCORE_MT41J64M1615IT_128MB,
 	PHYCORE_MT41J256M16HA15EIT_512MB,
 	PHYCORE_MT41J512M8125IT_2x512MB,
+	PHYCORE_IM8G16D3FBBG15EI_1024MB,
 
 	PHYCARD_NT5CB128M16BP_256MB,
 };
@@ -133,7 +134,7 @@ struct am335x_sdram_timings physom_timings[] = {
 		},
 	},
 
-	/* 1024MB */
+	/* 2x512MB */
 	[PHYCORE_MT41J512M8125IT_2x512MB] = {
 		.regs = {
 			.emif_read_latency	= 0x7,
@@ -152,6 +153,25 @@ struct am335x_sdram_timings physom_timings[] = {
 		},
 	},
 
+	/* 1024MB */
+	[PHYCORE_IM8G16D3FBBG15EI_1024MB] = {
+		.regs = {
+			.emif_read_latency	= 0x7,
+			.emif_tim1		= 0x0AAAE4DB,
+			.emif_tim2		= 0x268F7FDA,
+			.emif_tim3		= 0x501F88BF,
+			.sdram_config		= 0x61C053B2,
+			.zq_config		= 0x50074BE4,
+			.sdram_ref_ctrl		= 0x00000C30
+		},
+		.data = {
+			.rd_slave_ratio0	= 0x33,
+			.wr_dqs_slave_ratio0	= 0x4a,
+			.fifo_we_slave_ratio0	= 0xa4,
+			.wr_slave_ratio0	= 0x85,
+		},
+	},
+
 	/* 256MB */
 	[PHYCARD_NT5CB128M16BP_256MB] = {
 		.regs = {
diff --git a/images/Makefile.am33xx b/images/Makefile.am33xx
index 657aeb0..df77f19 100644
--- a/images/Makefile.am33xx
+++ b/images/Makefile.am33xx
@@ -57,6 +57,12 @@ FILE_barebox-am33xx-phytec-phycore-mlo-2x512mb.spi.img = start_am33xx_phytec_phy
 am33xx-mlo-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += barebox-am33xx-phytec-phycore-mlo-2x512mb.img
 am33xx-mlospi-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += barebox-am33xx-phytec-phycore-mlo-2x512mb.spi.img
 
+pblx-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += start_am33xx_phytec_phycore_sram_1024mb
+FILE_barebox-am33xx-phytec-phycore-mlo-1024mb.img = start_am33xx_phytec_phycore_sram_1024mb.pblx.mlo
+FILE_barebox-am33xx-phytec-phycore-mlo-1024mb.spi.img = start_am33xx_phytec_phycore_sram_1024mb.pblx.mlospi
+am33xx-mlo-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += barebox-am33xx-phytec-phycore-mlo-1024mb.img
+am33xx-mlospi-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += barebox-am33xx-phytec-phycore-mlo-1024mb.spi.img
+
 pblx-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += start_am33xx_phytec_phyflex_sdram
 FILE_barebox-am33xx-phytec-phyflex.img = start_am33xx_phytec_phyflex_sdram.pblx
 am33xx-barebox-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += barebox-am33xx-phytec-phyflex.img
-- 
1.9.1


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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH 6/7] ARM: dts: Add support for all phyCORE-AM335x options
  2015-07-17 11:13 [PATCH 1/7] mtd: core: Check partitions for empty string Teresa Remmet
                   ` (3 preceding siblings ...)
  2015-07-17 11:13 ` [PATCH 5/7] ARM: phytec-som-am335x: Add support for 1024MiB RAM on one chip Teresa Remmet
@ 2015-07-17 11:13 ` Teresa Remmet
  2015-07-17 11:13 ` [PATCH 7/7] ARM: dts: Add support for all phyFLEX-AM335x options Teresa Remmet
  2015-07-20  5:14 ` [PATCH 1/7] mtd: core: Check partitions for empty string Sascha Hauer
  6 siblings, 0 replies; 9+ messages in thread
From: Teresa Remmet @ 2015-07-17 11:13 UTC (permalink / raw)
  To: barebox

Add support for all possible combinations of phyCORE-AM335x
modules.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
 arch/arm/boards/phytec-som-am335x/lowlevel.c        |  2 ++
 arch/arm/dts/Makefile                               |  1 +
 .../arm/dts/am335x-phytec-phycore-som-no-eeprom.dts | 21 +++++++++++++++++++++
 .../am335x-phytec-phycore-som-no-spi-no-eeprom.dts  | 17 +++++++++++++++++
 images/Makefile.am33xx                              |  8 ++++++++
 5 files changed, 49 insertions(+)
 create mode 100644 arch/arm/dts/am335x-phytec-phycore-som-no-eeprom.dts
 create mode 100644 arch/arm/dts/am335x-phytec-phycore-som-no-spi-no-eeprom.dts

diff --git a/arch/arm/boards/phytec-som-am335x/lowlevel.c b/arch/arm/boards/phytec-som-am335x/lowlevel.c
index 0ff62a3..adc19de 100644
--- a/arch/arm/boards/phytec-som-am335x/lowlevel.c
+++ b/arch/arm/boards/phytec-som-am335x/lowlevel.c
@@ -127,6 +127,8 @@ PHYTEC_ENTRY_MLO(start_am33xx_phytec_phycore_sram_2x512mb, am335x_phytec_phycore
 PHYTEC_ENTRY_MLO(start_am33xx_phytec_phycore_sram_1024mb, am335x_phytec_phycore_som_mlo, PHYCORE_IM8G16D3FBBG15EI_1024MB);
 PHYTEC_ENTRY(start_am33xx_phytec_phycore_sdram, am335x_phytec_phycore_som);
 PHYTEC_ENTRY(start_am33xx_phytec_phycore_no_spi_sdram, am335x_phytec_phycore_som_no_spi);
+PHYTEC_ENTRY(start_am33xx_phytec_phycore_no_eeprom_sdram, am335x_phytec_phycore_som_no_eeprom);
+PHYTEC_ENTRY(start_am33xx_phytec_phycore_no_spi_no_eeprom_sdram, am335x_phytec_phycore_som_no_spi_no_eeprom);
 
 /* phyflex-som */
 PHYTEC_ENTRY_MLO(start_am33xx_phytec_phyflex_sram_256mb, am335x_phytec_phyflex_som_mlo, PHYFLEX_MT41K128M16JT_256MB);
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 06c29c8..3d5cb53 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -33,6 +33,7 @@ pbl-dtb-$(CONFIG_MACH_PCAAXL3) += imx6q-phytec-pbaa03.dtb.o
 pbl-dtb-$(CONFIG_MACH_PCM038) += imx27-phytec-phycore-rdk.dtb.o
 pbl-dtb-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += am335x-phytec-phyflex-som.dtb.o am335x-phytec-phyflex-som-mlo.dtb.o \
 	am335x-phytec-phycore-som.dtb.o am335x-phytec-phycore-som-no-spi.dtb.o am335x-phytec-phycore-som-mlo.dtb.o \
+	am335x-phytec-phycore-som-no-eeprom.dtb.o am335x-phytec-phycore-som-no-spi-no-eeprom.dtb.o \
 	am335x-phytec-phycard-som.dtb.o am335x-phytec-phycard-som-mlo.dtb.o
 pbl-dtb-$(CONFIG_MACH_PHYTEC_PFLA02) += imx6s-phytec-pbab01.dtb.o imx6dl-phytec-pbab01.dtb.o imx6q-phytec-pbab01.dtb.o imx6q-phytec-phyboard-alcor.dtb.o imx6dl-phytec-phyboard-subra.dtb.o
 pbl-dtb-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += armada-xp-openblocks-ax3-4-bb.dtb.o
diff --git a/arch/arm/dts/am335x-phytec-phycore-som-no-eeprom.dts b/arch/arm/dts/am335x-phytec-phycore-som-no-eeprom.dts
new file mode 100644
index 0000000..3dd130e
--- /dev/null
+++ b/arch/arm/dts/am335x-phytec-phycore-som-no-eeprom.dts
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2015 Phytec Messtechnik GmbH
+ * Author: Teresa Remmet <t.remmet@phytec.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+#include "am33xx.dtsi"
+#include "am335x-phytec-phycore-som.dtsi"
+
+/ {
+	model = "Phytec phyCORE AM335x";
+	compatible = "phytec,phycore-am335x-som", "phytec,am335x-som", "ti,am33xx";
+};
+
+&spi0 {
+	status = "okay";
+};
diff --git a/arch/arm/dts/am335x-phytec-phycore-som-no-spi-no-eeprom.dts b/arch/arm/dts/am335x-phytec-phycore-som-no-spi-no-eeprom.dts
new file mode 100644
index 0000000..397be77
--- /dev/null
+++ b/arch/arm/dts/am335x-phytec-phycore-som-no-spi-no-eeprom.dts
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2015 Phytec Messtechnik GmbH
+ * Author:  Teresa Remmet <t.remmet@phytec.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+#include "am33xx.dtsi"
+#include "am335x-phytec-phycore-som.dtsi"
+
+/ {
+	model = "Phytec phyCORE AM335x";
+	compatible = "phytec,phycore-am335x-som", "phytec,am335x-som", "ti,am33xx";
+};
diff --git a/images/Makefile.am33xx b/images/Makefile.am33xx
index df77f19..45813ca 100644
--- a/images/Makefile.am33xx
+++ b/images/Makefile.am33xx
@@ -33,6 +33,14 @@ pblx-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += start_am33xx_phytec_phycore_no_spi_sdra
 FILE_barebox-am33xx-phytec-phycore-no-spi.img = start_am33xx_phytec_phycore_no_spi_sdram.pblx
 am33xx-barebox-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += barebox-am33xx-phytec-phycore-no-spi.img
 
+pblx-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += start_am33xx_phytec_phycore_no_eeprom_sdram
+FILE_barebox-am33xx-phytec-phycore-no-eeprom.img = start_am33xx_phytec_phycore_no_eeprom_sdram.pblx
+am33xx-barebox-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += barebox-am33xx-phytec-phycore-no-eeprom.img
+
+pblx-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += start_am33xx_phytec_phycore_no_spi_no_eeprom_sdram
+FILE_barebox-am33xx-phytec-phycore-no-spi-no-eeprom.img = start_am33xx_phytec_phycore_no_spi_no_eeprom_sdram.pblx
+am33xx-barebox-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += barebox-am33xx-phytec-phycore-no-spi-no-eeprom.img
+
 pblx-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += start_am33xx_phytec_phycore_sram_256mb
 FILE_barebox-am33xx-phytec-phycore-mlo-256mb.img = start_am33xx_phytec_phycore_sram_256mb.pblx.mlo
 FILE_barebox-am33xx-phytec-phycore-mlo-256mb.spi.img = start_am33xx_phytec_phycore_sram_256mb.pblx.mlospi
-- 
1.9.1


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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH 7/7] ARM: dts: Add support for all phyFLEX-AM335x options
  2015-07-17 11:13 [PATCH 1/7] mtd: core: Check partitions for empty string Teresa Remmet
                   ` (4 preceding siblings ...)
  2015-07-17 11:13 ` [PATCH 6/7] ARM: dts: Add support for all phyCORE-AM335x options Teresa Remmet
@ 2015-07-17 11:13 ` Teresa Remmet
  2015-07-20  5:14 ` [PATCH 1/7] mtd: core: Check partitions for empty string Sascha Hauer
  6 siblings, 0 replies; 9+ messages in thread
From: Teresa Remmet @ 2015-07-17 11:13 UTC (permalink / raw)
  To: barebox

Add support for all possible combinations of phyFLEX-AM335x modules.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
 arch/arm/boards/phytec-som-am335x/lowlevel.c       |  3 +++
 arch/arm/dts/Makefile                              |  2 ++
 .../dts/am335x-phytec-phyflex-som-no-eeprom.dts    | 22 ++++++++++++++++++++++
 .../am335x-phytec-phyflex-som-no-spi-no-eeprom.dts | 18 ++++++++++++++++++
 arch/arm/dts/am335x-phytec-phyflex-som-no-spi.dts  | 22 ++++++++++++++++++++++
 images/Makefile.am33xx                             | 12 ++++++++++++
 6 files changed, 79 insertions(+)
 create mode 100644 arch/arm/dts/am335x-phytec-phyflex-som-no-eeprom.dts
 create mode 100644 arch/arm/dts/am335x-phytec-phyflex-som-no-spi-no-eeprom.dts
 create mode 100644 arch/arm/dts/am335x-phytec-phyflex-som-no-spi.dts

diff --git a/arch/arm/boards/phytec-som-am335x/lowlevel.c b/arch/arm/boards/phytec-som-am335x/lowlevel.c
index adc19de..64c1c53 100644
--- a/arch/arm/boards/phytec-som-am335x/lowlevel.c
+++ b/arch/arm/boards/phytec-som-am335x/lowlevel.c
@@ -134,6 +134,9 @@ PHYTEC_ENTRY(start_am33xx_phytec_phycore_no_spi_no_eeprom_sdram, am335x_phytec_p
 PHYTEC_ENTRY_MLO(start_am33xx_phytec_phyflex_sram_256mb, am335x_phytec_phyflex_som_mlo, PHYFLEX_MT41K128M16JT_256MB);
 PHYTEC_ENTRY_MLO(start_am33xx_phytec_phyflex_sram_512mb, am335x_phytec_phyflex_som_mlo, PHYFLEX_MT41K256M16HA_512MB);
 PHYTEC_ENTRY(start_am33xx_phytec_phyflex_sdram, am335x_phytec_phyflex_som);
+PHYTEC_ENTRY(start_am33xx_phytec_phyflex_no_spi_sdram, am335x_phytec_phyflex_som_no_spi);
+PHYTEC_ENTRY(start_am33xx_phytec_phyflex_no_eeprom_sdram, am335x_phytec_phyflex_som_no_eeprom);
+PHYTEC_ENTRY(start_am33xx_phytec_phyflex_no_spi_no_eeprom_sdram, am335x_phytec_phyflex_som_no_spi_no_eeprom);
 
 /* phycard-som */
 PHYTEC_ENTRY_MLO(start_am33xx_phytec_phycard_sram_256mb, am335x_phytec_phycard_som_mlo, PHYCARD_NT5CB128M16BP_256MB);
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 3d5cb53..15d620a 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -32,6 +32,8 @@ pbl-dtb-$(CONFIG_MACH_PCA100) += imx27-phytec-phycard-s-rdk-bb.dtb.o
 pbl-dtb-$(CONFIG_MACH_PCAAXL3) += imx6q-phytec-pbaa03.dtb.o
 pbl-dtb-$(CONFIG_MACH_PCM038) += imx27-phytec-phycore-rdk.dtb.o
 pbl-dtb-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += am335x-phytec-phyflex-som.dtb.o am335x-phytec-phyflex-som-mlo.dtb.o \
+	am335x-phytec-phyflex-som-no-spi.dtb.o am335x-phytec-phyflex-som-no-eeprom.dtb.o \
+	am335x-phytec-phyflex-som-no-spi-no-eeprom.dtb.o \
 	am335x-phytec-phycore-som.dtb.o am335x-phytec-phycore-som-no-spi.dtb.o am335x-phytec-phycore-som-mlo.dtb.o \
 	am335x-phytec-phycore-som-no-eeprom.dtb.o am335x-phytec-phycore-som-no-spi-no-eeprom.dtb.o \
 	am335x-phytec-phycard-som.dtb.o am335x-phytec-phycard-som-mlo.dtb.o
diff --git a/arch/arm/dts/am335x-phytec-phyflex-som-no-eeprom.dts b/arch/arm/dts/am335x-phytec-phyflex-som-no-eeprom.dts
new file mode 100644
index 0000000..0022e14
--- /dev/null
+++ b/arch/arm/dts/am335x-phytec-phyflex-som-no-eeprom.dts
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2015 PHYTEC Messtechnik GmbH
+ * Author: Wadim Egorov <w.egorov@phytec.de>
+ * 	   Teresa Remmet <t.remmet@phytec.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+#include "am33xx.dtsi"
+#include "am335x-phytec-phyflex-som.dtsi"
+
+/ {
+	model = "Phytec phyFLEX AM335x";
+	compatible = "phytec,phyflex-am335x-som", "phytec,am335x-som", "ti,am33xx";
+};
+
+&spi0 {
+	status = "okay";
+};
diff --git a/arch/arm/dts/am335x-phytec-phyflex-som-no-spi-no-eeprom.dts b/arch/arm/dts/am335x-phytec-phyflex-som-no-spi-no-eeprom.dts
new file mode 100644
index 0000000..486aac6
--- /dev/null
+++ b/arch/arm/dts/am335x-phytec-phyflex-som-no-spi-no-eeprom.dts
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2015 PHYTEC Messtechnik GmbH
+ * Author: Wadim Egorov <w.egorov@phytec.de>
+ * 	   Teresa Remmet <t.remmet@phytec.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+#include "am33xx.dtsi"
+#include "am335x-phytec-phyflex-som.dtsi"
+
+/ {
+	model = "Phytec phyFLEX AM335x";
+	compatible = "phytec,phyflex-am335x-som", "phytec,am335x-som", "ti,am33xx";
+};
diff --git a/arch/arm/dts/am335x-phytec-phyflex-som-no-spi.dts b/arch/arm/dts/am335x-phytec-phyflex-som-no-spi.dts
new file mode 100644
index 0000000..5f3a1e0
--- /dev/null
+++ b/arch/arm/dts/am335x-phytec-phyflex-som-no-spi.dts
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2015 PHYTEC Messtechnik GmbH
+ * Author: Wadim Egorov <w.egorov@phytec.de>
+ * 	   Teresa Remmet <t.remmet@phytec.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+#include "am33xx.dtsi"
+#include "am335x-phytec-phyflex-som.dtsi"
+
+/ {
+	model = "Phytec phyFLEX AM335x";
+	compatible = "phytec,phyflex-am335x-som", "phytec,am335x-som", "ti,am33xx";
+};
+
+&at24c32 {
+	status = "okay";
+};
diff --git a/images/Makefile.am33xx b/images/Makefile.am33xx
index 45813ca..375ff90 100644
--- a/images/Makefile.am33xx
+++ b/images/Makefile.am33xx
@@ -75,6 +75,18 @@ pblx-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += start_am33xx_phytec_phyflex_sdram
 FILE_barebox-am33xx-phytec-phyflex.img = start_am33xx_phytec_phyflex_sdram.pblx
 am33xx-barebox-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += barebox-am33xx-phytec-phyflex.img
 
+pblx-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += start_am33xx_phytec_phyflex_no_spi_sdram
+FILE_barebox-am33xx-phytec-phyflex-no-spi.img = start_am33xx_phytec_phyflex_no_spi_sdram.pblx
+am33xx-barebox-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += barebox-am33xx-phytec-phyflex-no-spi.img
+
+pblx-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += start_am33xx_phytec_phyflex_no_eeprom_sdram
+FILE_barebox-am33xx-phytec-phyflex-no-eeprom.img = start_am33xx_phytec_phyflex_no_eeprom_sdram.pblx
+am33xx-barebox-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += barebox-am33xx-phytec-phyflex-no-eeprom.img
+
+pblx-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += start_am33xx_phytec_phyflex_no_spi_no_eeprom_sdram
+FILE_barebox-am33xx-phytec-phyflex-no-spi-no-eeprom.img = start_am33xx_phytec_phyflex_no_spi_no_eeprom_sdram.pblx
+am33xx-barebox-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += barebox-am33xx-phytec-phyflex-no-spi-no-eeprom.img
+
 pblx-$(CONFIG_MACH_PHYTEC_SOM_AM335X) += start_am33xx_phytec_phyflex_sram_256mb
 FILE_barebox-am33xx-phytec-phyflex-mlo-256mb.img = start_am33xx_phytec_phyflex_sram_256mb.pblx.mlo
 FILE_barebox-am33xx-phytec-phyflex-mlo-256mb.spi.img = start_am33xx_phytec_phyflex_sram_256mb.pblx.mlospi
-- 
1.9.1


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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 2/7] drivers: i2c: Only register available devices
  2015-07-17 11:13 ` [PATCH 2/7] drivers: i2c: Only register available devices Teresa Remmet
@ 2015-07-17 14:59   ` Jan Lübbe
  0 siblings, 0 replies; 9+ messages in thread
From: Jan Lübbe @ 2015-07-17 14:59 UTC (permalink / raw)
  To: barebox

On Fr, 2015-07-17 at 13:13 +0200, Teresa Remmet wrote:
> -       for_each_child_of_node(adap->dev.device_node, n) {
> +       for_each_available_child_of_node(adap->dev.device_node, n) {
>                 struct i2c_board_info info = {};

I've submitted an identical patch last week, which was applied by
Sascha.

Regards,
Jan
-- 
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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 1/7] mtd: core: Check partitions for empty string
  2015-07-17 11:13 [PATCH 1/7] mtd: core: Check partitions for empty string Teresa Remmet
                   ` (5 preceding siblings ...)
  2015-07-17 11:13 ` [PATCH 7/7] ARM: dts: Add support for all phyFLEX-AM335x options Teresa Remmet
@ 2015-07-20  5:14 ` Sascha Hauer
  6 siblings, 0 replies; 9+ messages in thread
From: Sascha Hauer @ 2015-07-20  5:14 UTC (permalink / raw)
  To: Teresa Remmet; +Cc: barebox

On Fri, Jul 17, 2015 at 01:13:47PM +0200, Teresa Remmet wrote:
> Make setting partitions a litte bit more robust.
> 
> Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
> ---
>  drivers/mtd/core.c | 3 +++
>  1 file changed, 3 insertions(+)

Applied all except 2/7, thanks

Sascha

-- 
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

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2015-07-20  5:14 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-17 11:13 [PATCH 1/7] mtd: core: Check partitions for empty string Teresa Remmet
2015-07-17 11:13 ` [PATCH 2/7] drivers: i2c: Only register available devices Teresa Remmet
2015-07-17 14:59   ` Jan Lübbe
2015-07-17 11:13 ` [PATCH 3/7] ARM: dts: am335x-phytec boards: Fixup spi flash node name Teresa Remmet
2015-07-17 11:13 ` [PATCH 4/7] ARM: dts: phyFLEX-AM335x-som: Disable eeprom on default Teresa Remmet
2015-07-17 11:13 ` [PATCH 5/7] ARM: phytec-som-am335x: Add support for 1024MiB RAM on one chip Teresa Remmet
2015-07-17 11:13 ` [PATCH 6/7] ARM: dts: Add support for all phyCORE-AM335x options Teresa Remmet
2015-07-17 11:13 ` [PATCH 7/7] ARM: dts: Add support for all phyFLEX-AM335x options Teresa Remmet
2015-07-20  5:14 ` [PATCH 1/7] mtd: core: Check partitions for empty string Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox