Driver model, take 1

150 lines not on this page · raw message

404 lines not on this page · raw message

138 lines not on this page · raw message

103 lines not on this page · raw message

164 lines not on this page · raw message

new file mode 100644
index 0000000..ed29b83
@@ -0,0 +1,31 @@
+/*
+ * (C) Copyright 2012
+ * Pavel Herrmann <[email protected]>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef _COMMON_DM_TREE_H_
+#define _COMMON_DM_TREE_H_ 1
+
+/* we dont want this to be in public headers */
+int init_core_tree(void);
+
+#endif
+

new file mode 100644
index 0000000..75a023f
@@ -0,0 +1,33 @@
+/*
+ * (C) Copyright 2012
+ * Pavel Herrmann <[email protected]>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef _DM_CORE_NUMBERING_H
+#define _DM_CORE_NUMBERING_H 1
+
+/* TODO: this could be compile-time generated */
+
+enum core_id {
+	CORE_INVALID = 0,
+};
+
+#endif

57 lines not on this page · raw message

46 lines not on this page · raw message

154 lines not on this page · raw message

index 581fd2f..77c7508 100644
@@ -25,6 +25,9 @@
 
 #ifndef	__ASM_GBL_DATA_H
 #define __ASM_GBL_DATA_H
+
+#include <linux/list.h>
+
 /*
  * The following data structure is placed in some memory wich is
  * available very early after boot (like DPRAM on MPC8xx/MPC82xx, or

@@ -43,6 +46,12 @@ typedef	struct global_data {
 	unsigned long	fb_base;	/* base address of frame buffer */
 	u8		*ram_buf;	/* emulated RAM buffer */
 	phys_size_t	ram_size;	/* RAM size */
+
+#ifdef CONFIG_DM
+	struct instance	*dm_root;	/* Root instance for Driver Model */
+	struct list_head core_root;	/* Head of core tree */
+#endif
+
 	const void	*fdt_blob;	/* Our device tree, NULL if none */
 	void		**jt;		/* jump table */
 	char		env_buf[32];	/* buffer for getenv() before reloc. */

index c173bf9..b6b3768 100644
@@ -47,6 +47,8 @@
 
 #include <os.h>
 
+#include <dm/manager.h>
+
 DECLARE_GLOBAL_DATA_PTR;
 
 static gd_t gd_mem;

@@ -232,6 +234,23 @@ void board_init_r(gd_t *id, ulong dest_addr)
 	mem_malloc_init((ulong)gd->ram_buf + gd->ram_size - TOTAL_MALLOC_LEN,
 			TOTAL_MALLOC_LEN);
 
+	dm_init();
+	static const struct driver_info info = {
+		.name = "demo_drv",
+		.platform_data = NULL
+	};
+	struct instance *root = get_root_instance();
+	struct instance *demo1, *demo2, *demo3;
+	demo1 =	driver_bind(root, &info);
+		driver_bind(root, &info);
+				driver_bind(demo1, &info);
+				driver_bind(demo1, &info);
+			demo2 = driver_bind(demo1, &info);
+				demo3 = driver_bind(demo2, &info);
+	driver_bind(demo2, &info);
+
+	demo_hello(demo2);
+
 	/* initialize environment */
 	env_relocate();
 

index b6b3768..c79cc62 100644
@@ -239,6 +239,11 @@ void board_init_r(gd_t *id, ulong dest_addr)
 		.name = "demo_drv",
 		.platform_data = NULL
 	};
+	static const struct driver_info gs_info = {
+		.name = "gpio_sandbox",
+		.platform_data = NULL
+	};
+
 	struct instance *root = get_root_instance();
 	struct instance *demo1, *demo2, *demo3;
 	demo1 =	driver_bind(root, &info);

@@ -248,6 +253,7 @@ void board_init_r(gd_t *id, ulong dest_addr)
 			demo2 = driver_bind(demo1, &info);
 				demo3 = driver_bind(demo2, &info);
 	driver_bind(demo2, &info);
+	driver_bind(root, &gs_info);
 
 	demo_hello(demo2);
 

365 lines not on this page · raw message

103 lines not on this page · raw message

index c19e16c..fac73ae 100644
@@ -94,4 +94,23 @@ int gpio_get_value(unsigned gpio);
  */
 int gpio_set_value(unsigned gpio, int value);
 
+/**
+ * Driver model GPIO operations, refer to functions above for description.
+ * These function copy the old API.
+ *
+ * This is trying to be close to Linux GPIO API. Once the U-Boot uses the
+ * new DM GPIO API, this should be really easy to flip over to the Linux
+ * GPIO API-alike interface.
+ */
+struct dm_gpio_ops {
+	int	base;
+	u16	ngpio;
+	int	(*gpio_request)(unsigned gpio, const char *label);
+	int	(*gpio_free)(unsigned gpio);
+	int	(*gpio_direction_input)(unsigned gpio);
+	int	(*gpio_direction_output)(unsigned gpio, int value);
+	int	(*gpio_get_value)(unsigned gpio);
+	int	(*gpio_set_value)(unsigned gpio, int value);
+};
+
 #endif	/* _ASM_GENERIC_GPIO_H_ */

index 9c431bf..0220386 100644
@@ -22,6 +22,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#define CONFIG_DM
+
 #define CONFIG_NR_DRAM_BANKS	1
 #define CONFIG_DRAM_SIZE	(128 << 20)
 

index 75a023f..b543b48 100644
@@ -28,6 +28,7 @@
 
 enum core_id {
 	CORE_INVALID = 0,
+	CORE_GPIO,
 };
 
 #endif

236 lines not on this page · raw message

67 lines not on this page · raw message

index b543b48..8dd6067 100644
@@ -29,6 +29,7 @@
 enum core_id {
 	CORE_INVALID = 0,
 	CORE_GPIO,
+	CORE_DEMO,
 };
 
 #endif

new file mode 100644
index 0000000..9fca7b8
@@ -0,0 +1,37 @@
+/*
+ * (C) Copyright 2012
+ * Pavel Herrmann <[email protected]>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef _DM_DEMO_H_
+#define _DM_DEMO_H_ 1
+
+#include <dm/options.h>
+#include <dm/structures.h>
+
+struct demo_ops {
+	int (*hello)(struct instance *i);
+};
+
+int demo_hello(struct instance *i);
+int demo_list(void);
+
+#endif

106 lines not on this page · raw message

new file mode 100644
index 0000000..df86113
@@ -0,0 +1,33 @@
+/*
+ * (C) Copyright 2012
+ * Pavel Herrmann <[email protected]>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+
+#ifndef _DM_DEBUG_H_
+#define _DM_DEBUG_H_ 1
+
+#include <dm/structures.h>
+
+int dm_dump_all(void);
+int dm_dump(struct instance *i);
+
+#endif