summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-06-14 09:29:53 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2017-06-14 09:29:53 +0200
commitaeca2b925e19a3a06e2410121edaabccf383506e (patch)
tree9e9edef81037398a6fcd367db1d5f7f37fcdfb59
parentaec669a81228828abeb634fb43ff00cca1ced7aa (diff)
parentcf93b5bd399709db0e04269bb6e19d4b777dc7ce (diff)
downloadbarebox-aeca2b925e19a3a06e2410121edaabccf383506e.tar.gz
Merge branch 'for-next/state'
-rw-r--r--arch/arm/dts/imx6qdl-phytec-pbab01.dtsi4
-rw-r--r--arch/arm/dts/state-example.dtsi128
-rw-r--r--common/state/state.c18
3 files changed, 134 insertions, 16 deletions
diff --git a/arch/arm/dts/imx6qdl-phytec-pbab01.dtsi b/arch/arm/dts/imx6qdl-phytec-pbab01.dtsi
index 86ab991..991c7e4 100644
--- a/arch/arm/dts/imx6qdl-phytec-pbab01.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-pbab01.dtsi
@@ -14,3 +14,7 @@
&uart1 {
status = "okay";
};
+
+#ifdef USE_STATE_EXAMPLE
+#include "state-example.dtsi"
+#endif
diff --git a/arch/arm/dts/state-example.dtsi b/arch/arm/dts/state-example.dtsi
new file mode 100644
index 0000000..490ee78
--- /dev/null
+++ b/arch/arm/dts/state-example.dtsi
@@ -0,0 +1,128 @@
+/*
+ * This code is released using a dual license strategy: BSD/GPL
+ * You can choose the licence that better fits your requirements.
+ *
+ * Released under the terms of 3-clause BSD License
+ * Released under the terms of GNU General Public License Version 2.0
+ *
+ */
+
+/*
+ * This contains an example how to use the state framework. This file
+ * can be directly included by imx6qdl-phytec-pbab01.dtsi, other boards
+ * need adjustments. Note that this example may use the partitions in
+ * other ways than intended by phytec, so before using this see below
+ * if it will overwrite some precious data.
+ */
+
+#define STATE_VARS \
+ #address-cells = <1>; \
+ #size-cells = <1>; \
+ mac { \
+ reg = <0x0 0x6>; \
+ type = "mac"; \
+ }; \
+ \
+ number { \
+ reg = <0x8 0x4>; \
+ type = "uint32"; \
+ }; \
+ \
+ name { \
+ reg = <0xc 0x10>; \
+ type = "string"; \
+ }; \
+ \
+ fruit { \
+ reg = <0x1c 0x4>; \
+ type = "enum32"; \
+ names = "apple", "pear", "banana"; \
+ }
+
+/ {
+ aliases {
+ state_nor = &state_nor;
+ state_nand = &state_nand;
+ state_sd = &state_sd;
+ state_eeprom = &state_eeprom;
+ };
+
+ state_nor: state_nor {
+ magic = <0x512890a0>;
+ compatible = "barebox,state";
+ backend-type = "raw";
+ backend = <&backend_state_nor>;
+ backend-storage-type = "circular";
+
+ STATE_VARS;
+ };
+
+ state_nand: state_nand {
+ magic = <0xab67421f>;
+ compatible = "barebox,state";
+ backend-type = "raw";
+ backend = <&backend_state_nand>;
+ backend-storage-type = "circular";
+
+ STATE_VARS;
+ };
+
+ state_sd: state_sd {
+ magic = <0xef784236>;
+ compatible = "barebox,state";
+ backend-type = "raw";
+ backend = <&backend_state_usdhc>;
+ backend-stridesize = <1024>;
+
+ STATE_VARS;
+ };
+
+ state_eeprom: state_eeprom {
+ magic = <0x344682db>;
+ compatible = "barebox,state";
+ backend-type = "raw";
+ backend = <&backend_state_eeprom>;
+ backend-stridesize = <64>;
+
+ STATE_VARS;
+ };
+
+};
+
+&ecspi3 {
+ flash@0 {
+ backend_state_nor: partition@120000 {
+ };
+ };
+};
+
+&gpmi {
+ backend_state_nand: partition@500000 {
+ };
+};
+
+&i2c1 {
+ eeprom@50 {
+ partitions {
+ compatible = "fixed-partitions";
+ #size-cells = <1>;
+ #address-cells = <1>;
+ backend_state_eeprom: state@400 {
+ reg = <0x400 0x400>;
+ label = "state-eeprom";
+ };
+ };
+ };
+};
+
+&usdhc2 {
+ partitions {
+ compatible = "fixed-partitions";
+ #size-cells = <1>;
+ #address-cells = <1>;
+ backend_state_usdhc: state@0x80000 {
+ reg = <0x80000 0x80000>;
+ label = "state-sd";
+ };
+ };
+}; \ No newline at end of file
diff --git a/common/state/state.c b/common/state/state.c
index b4a634f..121ba0c 100644
--- a/common/state/state.c
+++ b/common/state/state.c
@@ -570,10 +570,8 @@ struct state *state_new_from_node(struct device_node *node, char *path,
{
struct state *state;
int ret = 0;
- int len;
const char *backend_type;
- const char *storage_type;
- const char *of_path;
+ const char *storage_type = NULL;
const char *alias;
uint32_t stridesize;
@@ -587,12 +585,6 @@ struct state *state_new_from_node(struct device_node *node, char *path,
if (IS_ERR(state))
return state;
- of_path = of_get_property(node, "backend", &len);
- if (!of_path) {
- ret = -ENODEV;
- goto out_release_state;
- }
-
if (!path) {
struct device_node *partition_node;
@@ -603,7 +595,6 @@ struct state *state_new_from_node(struct device_node *node, char *path,
goto out_release_state;
}
- of_path = partition_node->full_name;
ret = of_find_path_by_node(partition_node, &path, 0);
if (ret) {
if (ret != -EPROBE_DEFER)
@@ -625,12 +616,7 @@ struct state *state_new_from_node(struct device_node *node, char *path,
stridesize = 0;
}
- ret = of_property_read_string(node, "backend-storage-type",
- &storage_type);
- if (ret) {
- storage_type = NULL;
- dev_info(&state->dev, "No backend-storage-type found, using default.\n");
- }
+ of_property_read_string(node, "backend-storage-type", &storage_type);
ret = state_format_init(state, backend_type, node, alias);
if (ret)