Doug / smarc-fsl-linux-kernel | Embedian Git Server

Commit 035114fbdbf8c88fbf80a160716be9d0078f01ee

Authored by Jayachandran C 2013-03-24 01:27:59 +0800

Committed by Ralf Baechle 2013-05-08 07:19:05 +0800

Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches

MIPS: Netlogic: Support for multiple built-in device trees

This enables us to have a default device tree per SoC family to be built
into the kernel. The default device tree for XLP3xx has been added as part
of this change. Later this can be used to provide support default boards
for XLP2xx and XLP9xx SoCs.

Kconfig options are provided for each default device tree so that just the
needed ones can be selected to be built into the kernel.

Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Patchwork: http://patchwork.linux-mips.org/patch/5023/
Acked-by: John Crispin <blogic@openwrt.org>

Showing 5 changed files with 158 additions and 8 deletions Inline Diff

arch/mips/netlogic/Kconfig
arch/mips/netlogic/dts/Makefile
arch/mips/netlogic/dts/xlp_evp.dts
arch/mips/netlogic/dts/xlp_svp.dts
arch/mips/netlogic/xlp/setup.c

arch/mips/netlogic/Kconfig

Diff comments View file @ 035114f

 if NLM_XLP_BOARD || NLM_XLR_BOARD
 if NLM_XLP_BOARD
 config DT_XLP_EVP
-	bool "Built-in device tree for XLP EVP/SVP boards"
+	bool "Built-in device tree for XLP EVP boards"
 	default y
 	help
-	  Add an FDT blob for XLP EVP and SVP boards into the kernel.
+	  Add an FDT blob for XLP EVP boards into the kernel.
 	  This DTB will be used if the firmware does not pass in a DTB
-          pointer to the kernel.  The corresponding DTS file is at
+	  pointer to the kernel.  The corresponding DTS file is at
-          arch/mips/netlogic/dts/xlp_evp.dts
+	  arch/mips/netlogic/dts/xlp_evp.dts
+config DT_XLP_SVP
+	bool "Built-in device tree for XLP SVP boards"
+	default y
+	help
+	  Add an FDT blob for XLP VP boards into the kernel.
+	  This DTB will be used if the firmware does not pass in a DTB
+	  pointer to the kernel.  The corresponding DTS file is at
+	  arch/mips/netlogic/dts/xlp_svp.dts
 config NLM_MULTINODE
 	bool "Support for multi-chip boards"
 	depends on NLM_XLP_BOARD
 	default n
 	help
 	  Add support for boards with 2 or 4 XLPs connected over ICI.
 if NLM_MULTINODE
 choice
 	prompt "Number of XLPs on the board"
 	default NLM_MULTINODE_2
 	help
 	  In the multi-node case, specify the number of SoCs on the board.
 config NLM_MULTINODE_2
 	bool "Dual-XLP board"
 	help
 	  Support boards with upto two XLPs connected over ICI.
 config NLM_MULTINODE_4
 	bool "Quad-XLP board"
 	help
 	  Support boards with upto four XLPs connected over ICI.
 endchoice
 endif
 endif
 config NLM_COMMON
 	bool
 endif

arch/mips/netlogic/dts/Makefile

Diff comments View file @ 035114f

1	obj-$(CONFIG_DT_XLP_EVP) := xlp_evp.dtb.o	1	obj-$(CONFIG_DT_XLP_EVP) := xlp_evp.dtb.o
		2	obj-$(CONFIG_DT_XLP_SVP) += xlp_svp.dtb.o
2		3

arch/mips/netlogic/dts/xlp_evp.dts

Diff comments View file @ 035114f

1	/*	1	/*
2	* XLP8XX Device Tree Source for EVP boards	2	* XLP8XX Device Tree Source for EVP boards
3	*/	3	*/
4		4
5	/dts-v1/;	5	/dts-v1/;
6	/ {	6	/ {
7	model = "netlogic,XLP-EVP";	7	model = "netlogic,XLP-EVP";
8	compatible = "netlogic,xlp";	8	compatible = "netlogic,xlp";
9	#address-cells = <2>;	9	#address-cells = <2>;
10	#size-cells = <2>;	10	#size-cells = <2>;
11		11
12	memory {	12	memory {
13	device_type = "memory";	13	device_type = "memory";
14	reg = <0 0x00100000 0 0x0FF00000 // 255M at 1M	14	reg = <0 0x00100000 0 0x0FF00000 // 255M at 1M
15	0 0x20000000 0 0xa0000000 // 2560M at 512M	15	0 0x20000000 0 0xa0000000 // 2560M at 512M
16	0 0xe0000000 1 0x00000000>;	16	0 0xe0000000 1 0x00000000>;
17	};	17	};
18		18
19	soc {	19	soc {
20	#address-cells = <2>;	20	#address-cells = <2>;
21	#size-cells = <1>;	21	#size-cells = <1>;
22	compatible = "simple-bus";	22	compatible = "simple-bus";
23	ranges = <0 0 0 0x18000000 0x04000000 // PCIe CFG	23	ranges = <0 0 0 0x18000000 0x04000000 // PCIe CFG
24	1 0 0 0x16000000 0x01000000>; // GBU chipselects	24	1 0 0 0x16000000 0x01000000>; // GBU chipselects
25		25
26	serial0: serial@30000 {	26	serial0: serial@30000 {
27	device_type = "serial";	27	device_type = "serial";
28	compatible = "ns16550";	28	compatible = "ns16550";
29	reg = <0 0x30100 0xa00>;	29	reg = <0 0x30100 0xa00>;
30	reg-shift = <2>;	30	reg-shift = <2>;
31	reg-io-width = <4>;	31	reg-io-width = <4>;
32	clock-frequency = <133333333>;	32	clock-frequency = <133333333>;
33	interrupt-parent = <&pic>;	33	interrupt-parent = <&pic>;
34	interrupts = <17>;	34	interrupts = <17>;
35	};	35	};
36	serial1: serial@31000 {	36	serial1: serial@31000 {
37	device_type = "serial";	37	device_type = "serial";
38	compatible = "ns16550";	38	compatible = "ns16550";
39	reg = <0 0x31100 0xa00>;	39	reg = <0 0x31100 0xa00>;
40	reg-shift = <2>;	40	reg-shift = <2>;
41	reg-io-width = <4>;	41	reg-io-width = <4>;
42	clock-frequency = <133333333>;	42	clock-frequency = <133333333>;
43	interrupt-parent = <&pic>;	43	interrupt-parent = <&pic>;
44	interrupts = <18>;	44	interrupts = <18>;
45	};	45	};
46	i2c0: ocores@32000 {	46	i2c0: ocores@32000 {
47	compatible = "opencores,i2c-ocores";	47	compatible = "opencores,i2c-ocores";
48	#address-cells = <1>;	48	#address-cells = <1>;
49	#size-cells = <0>;	49	#size-cells = <0>;
50	reg = <0 0x32100 0xa00>;	50	reg = <0 0x32100 0xa00>;
51	reg-shift = <2>;	51	reg-shift = <2>;
52	reg-io-width = <4>;	52	reg-io-width = <4>;
53	clock-frequency = <32000000>;	53	clock-frequency = <32000000>;
54	interrupt-parent = <&pic>;	54	interrupt-parent = <&pic>;
55	interrupts = <30>;	55	interrupts = <30>;
56	};	56	};
57	i2c1: ocores@33000 {	57	i2c1: ocores@33000 {
58	compatible = "opencores,i2c-ocores";	58	compatible = "opencores,i2c-ocores";
59	#address-cells = <1>;	59	#address-cells = <1>;
60	#size-cells = <0>;	60	#size-cells = <0>;
61	reg = <0 0x33100 0xa00>;	61	reg = <0 0x33100 0xa00>;
62	reg-shift = <2>;	62	reg-shift = <2>;
63	reg-io-width = <4>;	63	reg-io-width = <4>;
64	clock-frequency = <32000000>;	64	clock-frequency = <32000000>;
65	interrupt-parent = <&pic>;	65	interrupt-parent = <&pic>;
66	interrupts = <31>;	66	interrupts = <31>;
67		67
68	rtc@68 {	68	rtc@68 {
69	compatible = "dallas,ds1374";	69	compatible = "dallas,ds1374";
70	reg = <0x68>;	70	reg = <0x68>;
71	};	71	};
72		72
73	dtt@4c {	73	dtt@4c {
74	compatible = "national,lm90";	74	compatible = "national,lm90";
75	reg = <0x4c>;	75	reg = <0x4c>;
76	};	76	};
77	};	77	};
78	pic: pic@4000 {	78	pic: pic@4000 {
79	interrupt-controller;	79	interrupt-controller;
80	#address-cells = <0>;	80	#address-cells = <0>;
81	#interrupt-cells = <1>;	81	#interrupt-cells = <1>;
82	reg = <0 0x4000 0x200>;	82	reg = <0 0x4000 0x200>;
83	};	83	};
84		84
85	nor_flash@1,0 {	85	nor_flash@1,0 {
86	compatible = "cfi-flash";	86	compatible = "cfi-flash";
87	#address-cells = <1>;	87	#address-cells = <1>;
88	#size-cells = <1>;	88	#size-cells = <1>;
89	bank-width = <2>;	89	bank-width = <2>;
90	reg = <1 0 0x1000000>;	90	reg = <1 0 0x1000000>;
91		91
92	partition@0 {	92	partition@0 {
93	label = "x-loader";	93	label = "x-loader";
94	reg = <0x0 0x100000>; /* 1M */	94	reg = <0x0 0x100000>; /* 1M */
95	read-only;	95	read-only;
96	};	96	};
97		97
98	partition@100000 {	98	partition@100000 {
99	label = "u-boot";	99	label = "u-boot";
100	reg = <0x100000 0x100000>; /* 1M */	100	reg = <0x100000 0x100000>; /* 1M */
101	};	101	};
102		102
103	partition@200000 {	103	partition@200000 {
104	label = "kernel";	104	label = "kernel";
105	reg = <0x200000 0x500000>; /* 5M */	105	reg = <0x200000 0x500000>; /* 5M */
106	};	106	};
107		107
108	partition@700000 {	108	partition@700000 {
109	label = "rootfs";	109	label = "rootfs";
110	reg = <0x700000 0x800000>; /* 8M */	110	reg = <0x700000 0x800000>; /* 8M */
111	};	111	};
112		112
113	partition@f00000 {	113	partition@f00000 {
114	label = "env";	114	label = "env";
115	reg = <0xf00000 0x100000>; /* 1M */	115	reg = <0xf00000 0x100000>; /* 1M */
116	read-only;	116	read-only;
117	};	117	};
118	};	118	};
119	};	119	};
120		120
121	chosen {	121	chosen {
122	bootargs = "console=ttyS0,115200 rdinit=/sbin/init";	122	bootargs = "console=ttyS0,115200 rdinit=/sbin/init";
123	};	123	};
124	};	124	};
125		125

arch/mips/netlogic/dts/xlp_svp.dts

Diff comments View file @ 035114f

File was created	1	/*
	2	* XLP3XX Device Tree Source for SVP boards
	3	*/
	4
	5	/dts-v1/;
	6	/ {
	7	model = "netlogic,XLP-SVP";
	8	compatible = "netlogic,xlp";
	9	#address-cells = <2>;
	10	#size-cells = <2>;
	11
	12	memory {
	13	device_type = "memory";
	14	reg = <0 0x00100000 0 0x0FF00000 // 255M at 1M
	15	0 0x20000000 0 0xa0000000 // 2560M at 512M
	16	0 0xe0000000 0 0x40000000>;
	17	};
	18
	19	soc {
	20	#address-cells = <2>;
	21	#size-cells = <1>;
	22	compatible = "simple-bus";
	23	ranges = <0 0 0 0x18000000 0x04000000 // PCIe CFG
	24	1 0 0 0x16000000 0x01000000>; // GBU chipselects
	25
	26	serial0: serial@30000 {
	27	device_type = "serial";
	28	compatible = "ns16550";
	29	reg = <0 0x30100 0xa00>;
	30	reg-shift = <2>;
	31	reg-io-width = <4>;
	32	clock-frequency = <133333333>;
	33	interrupt-parent = <&pic>;
	34	interrupts = <17>;
	35	};
	36	serial1: serial@31000 {
	37	device_type = "serial";
	38	compatible = "ns16550";
	39	reg = <0 0x31100 0xa00>;
	40	reg-shift = <2>;
	41	reg-io-width = <4>;
	42	clock-frequency = <133333333>;
	43	interrupt-parent = <&pic>;
	44	interrupts = <18>;
	45	};
	46	i2c0: ocores@32000 {
	47	compatible = "opencores,i2c-ocores";
	48	#address-cells = <1>;
	49	#size-cells = <0>;
	50	reg = <0 0x32100 0xa00>;
	51	reg-shift = <2>;
	52	reg-io-width = <4>;
	53	clock-frequency = <32000000>;
	54	interrupt-parent = <&pic>;
	55	interrupts = <30>;
	56	};
	57	i2c1: ocores@33000 {
	58	compatible = "opencores,i2c-ocores";
	59	#address-cells = <1>;
	60	#size-cells = <0>;
	61	reg = <0 0x33100 0xa00>;
	62	reg-shift = <2>;
	63	reg-io-width = <4>;
	64	clock-frequency = <32000000>;
	65	interrupt-parent = <&pic>;
	66	interrupts = <31>;
	67
	68	rtc@68 {
	69	compatible = "dallas,ds1374";
	70	reg = <0x68>;
	71	};
	72
	73	dtt@4c {
	74	compatible = "national,lm90";
	75	reg = <0x4c>;
	76	};
	77	};
	78	pic: pic@4000 {
	79	interrupt-controller;
	80	#address-cells = <0>;
	81	#interrupt-cells = <1>;
	82	reg = <0 0x4000 0x200>;
	83	};
	84
	85	nor_flash@1,0 {
	86	compatible = "cfi-flash";
	87	#address-cells = <1>;
	88	#size-cells = <1>;
	89	bank-width = <2>;
	90	reg = <1 0 0x1000000>;
	91
	92	partition@0 {
	93	label = "x-loader";
	94	reg = <0x0 0x100000>; /* 1M */
	95	read-only;
	96	};
	97
	98	partition@100000 {
	99	label = "u-boot";
	100	reg = <0x100000 0x100000>; /* 1M */
	101	};
	102
	103	partition@200000 {
	104	label = "kernel";
	105	reg = <0x200000 0x500000>; /* 5M */
	106	};
	107
	108	partition@700000 {
	109	label = "rootfs";
	110	reg = <0x700000 0x800000>; /* 8M */
	111	};
	112
	113	partition@f00000 {
	114	label = "env";
	115	reg = <0xf00000 0x100000>; /* 1M */
	116	read-only;
	117	};
	118	};
	119	};
	120
	121	chosen {
	122	bootargs = "console=ttyS0,115200 rdinit=/sbin/init";
	123	};
	124	};
	125

arch/mips/netlogic/xlp/setup.c

Diff comments View file @ 035114f

 /*
  * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights
  * reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
  * General Public License (GPL) Version 2, available from the file
  * COPYING in the main directory of this source tree, or the NetLogic
  * license below:
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL NETLOGIC OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
  * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <linux/kernel.h>
 #include <linux/serial_8250.h>
 #include <linux/pm.h>
 #include <linux/bootmem.h>
 #include <asm/reboot.h>
 #include <asm/time.h>
 #include <asm/bootinfo.h>
 #include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 #include <linux/of_device.h>
 #include <asm/netlogic/haldefs.h>
 #include <asm/netlogic/common.h>
 #include <asm/netlogic/xlp-hal/iomap.h>
 #include <asm/netlogic/xlp-hal/xlp.h>
 #include <asm/netlogic/xlp-hal/sys.h>
 uint64_t nlm_io_base;
 struct nlm_soc_info nlm_nodes[NLM_NR_NODES];
 cpumask_t nlm_cpumask = CPU_MASK_CPU0;
 unsigned int nlm_threads_per_core;
-extern u32 __dtb_start[];
+extern u32 __dtb_xlp_evp_begin[], __dtb_xlp_svp_begin[], __dtb_start[];
 static void nlm_linux_exit(void)
 {
 	uint64_t sysbase = nlm_get_node(0)->sysbase;
 	nlm_write_sys_reg(sysbase, SYS_CHIP_RESET, 1);
 	for ( ; ; )
 		cpu_wait();
 }
 void __init plat_mem_setup(void)
 {
 	void *fdtp;
 	panic_timeout	= 5;
 	_machine_restart = (void (*)(char *))nlm_linux_exit;
 	_machine_halt	= nlm_linux_exit;
 	pm_power_off	= nlm_linux_exit;
 	/*
 	 * If no FDT pointer is passed in, use the built-in FDT.
 	 * device_tree_init() does not handle CKSEG0 pointers in
 	 * 64-bit, so convert pointer.
 	 */
 	fdtp = (void *)(long)fw_arg0;
-	if (!fdtp)
+	if (!fdtp) {
-		fdtp = __dtb_start;
+		switch (current_cpu_data.processor_id & 0xff00) {
+#ifdef CONFIG_DT_XLP_SVP
+		case PRID_IMP_NETLOGIC_XLP3XX:
+			fdtp = __dtb_xlp_svp_begin;
+			break;
+#endif
+#ifdef CONFIG_DT_XLP_EVP
+		case PRID_IMP_NETLOGIC_XLP8XX:
+			fdtp = __dtb_xlp_evp_begin;
+			break;
+#endif
+		default:
+			/* Pick a built-in if any, and hope for the best */
+			fdtp = __dtb_start;
+			break;
+		}
+	}
 	fdtp = phys_to_virt(__pa(fdtp));
 	early_init_devtree(fdtp);
 }
 const char *get_system_type(void)
 {
 	return "Netlogic XLP Series";
 }
 void __init prom_free_prom_memory(void)
 {
 	/* Nothing yet */
 }
 void xlp_mmu_init(void)
 {
 	/* enable extended TLB and Large Fixed TLB */
 	write_c0_config6(read_c0_config6() | 0x24);
 	/* set page mask of Fixed TLB in config7 */
 	write_c0_config7(PM_DEFAULT_MASK >>
 		(13 + (ffz(PM_DEFAULT_MASK >> 13) / 2)));
 }
 void nlm_percpu_init(int hwcpuid)
 {
 }
 void __init prom_init(void)
 {
 	nlm_io_base = CKSEG1ADDR(XLP_DEFAULT_IO_BASE);
 	xlp_mmu_init();
 	nlm_node_init(0);
 #ifdef CONFIG_SMP
 	cpumask_setall(&nlm_cpumask);
 	nlm_wakeup_secondary_cpus();
 	/* update TLB size after waking up threads */
 	current_cpu_data.tlbsize = ((read_c0_config6() >> 16) & 0xffff) + 1;
 	register_smp_ops(&nlm_smp_ops);
 #endif
 }
 void __init device_tree_init(void)
 {
 	unsigned long base, size;
 	if (!initial_boot_params)
 		return;
 	base = virt_to_phys((void *)initial_boot_params);
 	size = be32_to_cpu(initial_boot_params->totalsize);
 	/* Before we do anything, lets reserve the dt blob */
 	reserve_bootmem(base, size, BOOTMEM_DEFAULT);
 	unflatten_device_tree();
 	/* free the space reserved for the dt blob */
 	free_bootmem(base, size);
 }
 static struct of_device_id __initdata xlp_ids[] = {
 	{ .compatible = "simple-bus", },
 	{},
 };
 int __init xlp8xx_ds_publish_devices(void)
 {
 	if (!of_have_populated_dt())
 		return 0;
 	return of_platform_bus_probe(NULL, xlp_ids, NULL);
 }
 device_initcall(xlp8xx_ds_publish_devices);