[U-Boot] [PATCH 1/4] dm: Sort the uclass IDs after the tegra/PMIC addition

[U-Boot] [PATCH 1/4] dm: Sort the uclass IDs after the tegra/PMIC addition

[Simon Glass]

Tidy up the sort order again.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Joe Hershberger <joe.hershberger@gmail.com>
---

 include/dm/uclass-id.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h
index 4d737f4..c7310d7 100644
--- a/include/dm/uclass-id.h
+++ b/include/dm/uclass-id.h
@@ -39,20 +39,18 @@ enum uclass_id {
 	UCLASS_PCH,		/* x86 platform controller hub */
 	UCLASS_PCI,		/* PCI bus */
 	UCLASS_PCI_GENERIC,	/* Generic PCI bus device */
+	UCLASS_PMIC,		/* PMIC I/O device */
+	UCLASS_REGULATOR,	/* Regulator device */
 	UCLASS_RTC,		/* Real time clock device */
 	UCLASS_SERIAL,		/* Serial UART */
 	UCLASS_SPI,		/* SPI bus */
-	UCLASS_SPI_GENERIC,	/* Generic SPI flash target */
 	UCLASS_SPI_FLASH,	/* SPI flash */
+	UCLASS_SPI_GENERIC,	/* Generic SPI flash target */
 	UCLASS_THERMAL,		/* Thermal sensor */
 	UCLASS_USB,		/* USB bus */
 	UCLASS_USB_DEV_GENERIC,	/* USB generic device */
 	UCLASS_USB_HUB,		/* USB hub */
 
-	/* Power Management */
-	UCLASS_PMIC,		/* PMIC I/O device */
-	UCLASS_REGULATOR,	/* REGULATOR device */
-
 	UCLASS_COUNT,
 	UCLASS_INVALID = -1,
 };
-- 
2.2.0.rc0.207.ga3a616c

[U-Boot] [PATCH 2/4] sandbox: dts: Sort the test.dts file a little

[Simon Glass]

There are some core test nodes near the beginning of the file which should
be grouped together. But for other nodes, let's sort them.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 arch/sandbox/dts/test.dts | 48 +++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 1bc3ca0..52ff436 100644
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -8,9 +8,11 @@
 
 	aliases {
 		console = &uart0;
+		eth0 = "/eth at 10002000";
+		eth5 = &eth_5;
 		i2c0 = "/i2c at 0";
-		spi0 = "/spi at 0";
 		pci0 = &pci;
+		spi0 = "/spi at 0";
 		testfdt6 = "/e-test";
 		testbus3 = "/some-bus";
 		testfdt0 = "/some-bus/c-test at 0";
@@ -18,18 +20,11 @@
 		testfdt3 = "/b-test";
 		testfdt5 = "/some-bus/c-test at 5";
 		testfdt8 = "/a-test";
-		eth0 = "/eth at 10002000";
-		eth5 = &eth_5;
 		usb0 = &usb_0;
 		usb1 = &usb_1;
 		usb2 = &usb_2;
 	};
 
-	uart0: serial {
-		compatible = "sandbox,serial";
-		u-boot,dm-pre-reloc;
-	};
-
 	a-test {
 		reg = <0>;
 		compatible = "denx,u-boot-fdt-test";
@@ -108,6 +103,24 @@
 		compatible = "denx,u-boot-fdt-test";
 	};
 
+	eth at 10002000 {
+		compatible = "sandbox,eth";
+		reg = <0x10002000 0x1000>;
+		fake-host-hwaddr = <0x00 0x00 0x66 0x44 0x22 0x00>;
+	};
+
+	eth_5: eth at 10003000 {
+		compatible = "sandbox,eth";
+		reg = <0x10003000 0x1000>;
+		fake-host-hwaddr = <0x00 0x00 0x66 0x44 0x22 0x11>;
+	};
+
+	eth at 10004000 {
+		compatible = "sandbox,eth";
+		reg = <0x10004000 0x1000>;
+		fake-host-hwaddr = <0x00 0x00 0x66 0x44 0x22 0x22>;
+	};
+
 	gpio_a: base-gpios {
 		compatible = "sandbox,gpio";
 		gpio-controller;
@@ -175,22 +188,9 @@
 		};
 	};
 
-	eth at 10002000 {
-		compatible = "sandbox,eth";
-		reg = <0x10002000 0x1000>;
-		fake-host-hwaddr = <0x00 0x00 0x66 0x44 0x22 0x00>;
-	};
-
-	eth_5: eth at 10003000 {
-		compatible = "sandbox,eth";
-		reg = <0x10003000 0x1000>;
-		fake-host-hwaddr = <0x00 0x00 0x66 0x44 0x22 0x11>;
-	};
-
-	eth at 10004000 {
-		compatible = "sandbox,eth";
-		reg = <0x10004000 0x1000>;
-		fake-host-hwaddr = <0x00 0x00 0x66 0x44 0x22 0x22>;
+	uart0: serial {
+		compatible = "sandbox,serial";
+		u-boot,dm-pre-reloc;
 	};
 
 	usb_0: usb at 0 {
-- 
2.2.0.rc0.207.ga3a616c

[U-Boot] [PATCH 3/4] sandbox: dts: Sort the sandbox.dts file

[Simon Glass]

Sort this by node name for easier browsing.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 arch/sandbox/dts/sandbox.dts | 106 ++++++++++++++++++++++---------------------
 1 file changed, 54 insertions(+), 52 deletions(-)

diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts
index a3ebd80..8927527 100644
--- a/arch/sandbox/dts/sandbox.dts
+++ b/arch/sandbox/dts/sandbox.dts
@@ -17,30 +17,6 @@
 		stdout-path = "/serial";
 	};
 
-	/* Needs to be available prior to relocation */
-	uart0: serial {
-		compatible = "sandbox,serial";
-		sandbox,text-colour = "cyan";
-	};
-
-	triangle {
-		compatible = "demo-shape";
-		colour = "cyan";
-		sides = <3>;
-		character = <83>;
-		light-gpios = <&gpio_a 2>, <&gpio_b 6 0>;
-	};
-	square {
-		compatible = "demo-shape";
-		colour = "blue";
-		sides = <4>;
-	};
-	hexagon {
-		compatible = "demo-simple";
-		colour = "white";
-		sides = <6>;
-	};
-
 	cros_ec: cros-ec at 0 {
 		reg = <0 0>;
 		compatible = "google,cros-ec-sandbox";
@@ -70,10 +46,22 @@
 		};
 	};
 
-	lcd {
-		compatible = "sandbox,lcd-sdl";
-		xres = <1366>;
-		yres = <768>;
+	eth at 10002000 {
+		compatible = "sandbox,eth";
+		reg = <0x10002000 0x1000>;
+		fake-host-hwaddr = [00 00 66 44 22 00];
+	};
+
+	eth at 80000000 {
+		compatible = "sandbox,eth-raw";
+		reg = <0x80000000 0x1000>;
+		host-raw-interface = "eth0";
+	};
+
+	eth at 90000000 {
+		compatible = "sandbox,eth-raw";
+		reg = <0x90000000 0x1000>;
+		host-raw-interface = "lo";
 	};
 
 	gpio_a: gpios at 0 {
@@ -92,6 +80,12 @@
 		num-gpios = <10>;
 	};
 
+	hexagon {
+		compatible = "demo-simple";
+		colour = "white";
+		sides = <6>;
+	};
+
 	i2c_0: i2c at 0 {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -120,18 +114,10 @@
 		};
 	};
 
-	spi at 0 {
-		#address-cells = <1>;
-		#size-cells = <0>;
-		reg = <0 0>;
-		compatible = "sandbox,spi";
-		cs-gpios = <0>, <&gpio_a 0>;
-		firmware_storage_spi: flash at 0 {
-			reg = <0>;
-			compatible = "spansion,m25p16", "sandbox,spi-flash";
-			spi-max-frequency = <40000000>;
-			sandbox,filename = "spi.bin";
-		};
+	lcd {
+		compatible = "sandbox,lcd-sdl";
+		xres = <1366>;
+		yres = <768>;
 	};
 
 	pci: pci-controller {
@@ -150,22 +136,38 @@
 		};
 	};
 
-	eth at 10002000 {
-		compatible = "sandbox,eth";
-		reg = <0x10002000 0x1000>;
-		fake-host-hwaddr = [00 00 66 44 22 00];
+	spi at 0 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0 0>;
+		compatible = "sandbox,spi";
+		cs-gpios = <0>, <&gpio_a 0>;
+		firmware_storage_spi: flash at 0 {
+			reg = <0>;
+			compatible = "spansion,m25p16", "sandbox,spi-flash";
+			spi-max-frequency = <40000000>;
+			sandbox,filename = "spi.bin";
+		};
 	};
 
-	eth at 80000000 {
-		compatible = "sandbox,eth-raw";
-		reg = <0x80000000 0x1000>;
-		host-raw-interface = "eth0";
+	square {
+		compatible = "demo-shape";
+		colour = "blue";
+		sides = <4>;
 	};
 
-	eth at 90000000 {
-		compatible = "sandbox,eth-raw";
-		reg = <0x90000000 0x1000>;
-		host-raw-interface = "lo";
+	triangle {
+		compatible = "demo-shape";
+		colour = "cyan";
+		sides = <3>;
+		character = <83>;
+		light-gpios = <&gpio_a 2>, <&gpio_b 6 0>;
+	};
+
+	/* Needs to be available prior to relocation */
+	uart0: serial {
+		compatible = "sandbox,serial";
+		sandbox,text-colour = "cyan";
 	};
 
 	usb at 0 {
-- 
2.2.0.rc0.207.ga3a616c

[U-Boot] [PATCH 4/4] sandbox: dts: Add the real-time-clock test nodes back in

[Simon Glass]

These were lost when the PMIC series was applied. Add them back so that the
tests pass again.

Reported-by: Joe Hershberger <joe.hershberger@gmail.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
---

 arch/sandbox/dts/test.dts | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 52ff436..c25614a 100644
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -12,6 +12,8 @@
 		eth5 = &eth_5;
 		i2c0 = "/i2c at 0";
 		pci0 = &pci;
+		rtc0 = &rtc_0;
+		rtc1 = &rtc_1;
 		spi0 = "/spi at 0";
 		testfdt6 = "/e-test";
 		testbus3 = "/some-bus";
@@ -153,6 +155,22 @@
 			};
 		};
 
+		rtc_0: rtc at 43 {
+			reg = <0x43>;
+			compatible = "sandbox-rtc";
+			emul {
+				compatible = "sandbox,i2c-rtc";
+			};
+		};
+
+		rtc_1: rtc at 61 {
+			reg = <0x61>;
+			compatible = "sandbox-rtc";
+			emul {
+				compatible = "sandbox,i2c-rtc";
+			};
+		};
+
 		sandbox_pmic: sandbox_pmic {
 			reg = <0x40>;
 		};
-- 
2.2.0.rc0.207.ga3a616c

[U-Boot] [PATCH 4/4] sandbox: dts: Add the real-time-clock test nodes back in

[Joe Hershberger]

On Fri, May 22, 2015 at 4:42 PM, Simon Glass <sjg@chromium.org> wrote:
> These were lost when the PMIC series was applied. Add them back so that the
> tests pass again.
>
> Reported-by: Joe Hershberger <joe.hershberger@gmail.com>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---

Acked-by: Joe Hershberger <joe.hershberger@ni.com>

[U-Boot] [PATCH 1/4] dm: Sort the uclass IDs after the tegra/PMIC addition

[Joe Hershberger]

On Fri, May 22, 2015 at 4:42 PM, Simon Glass <sjg@chromium.org> wrote:
> Tidy up the sort order again.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reported-by: Joe Hershberger <joe.hershberger@gmail.com>
> ---

Acked-by: Joe Hershberger <joe.hershberger@ni.com>

[U-Boot] [PATCH 2/4] sandbox: dts: Sort the test.dts file a little

[Joe Hershberger]

On Fri, May 22, 2015 at 4:42 PM, Simon Glass <sjg@chromium.org> wrote:
> There are some core test nodes near the beginning of the file which should
> be grouped together. But for other nodes, let's sort them.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---

Acked-by: Joe Hershberger <joe.hershberger@ni.com>

[U-Boot] [PATCH 1/4] dm: Sort the uclass IDs after the tegra/PMIC addition

[Simon Glass]

On 22 May 2015 at 18:12, Joe Hershberger <joe.hershberger@gmail.com> wrote:
> On Fri, May 22, 2015 at 4:42 PM, Simon Glass <sjg@chromium.org> wrote:
>> Tidy up the sort order again.
>>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> Reported-by: Joe Hershberger <joe.hershberger@gmail.com>
>> ---
>
> Acked-by: Joe Hershberger <joe.hershberger@ni.com>

Applied to u-boot-dm.

[U-Boot] [PATCH 2/4] sandbox: dts: Sort the test.dts file a little

[Simon Glass]

On 22 May 2015 at 18:13, Joe Hershberger <joe.hershberger@gmail.com> wrote:
> On Fri, May 22, 2015 at 4:42 PM, Simon Glass <sjg@chromium.org> wrote:
>> There are some core test nodes near the beginning of the file which should
>> be grouped together. But for other nodes, let's sort them.
>>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> ---
>
> Acked-by: Joe Hershberger <joe.hershberger@ni.com>

Applied to u-boot-dm.

[U-Boot] [PATCH 3/4] sandbox: dts: Sort the sandbox.dts file

[Simon Glass]

On 22 May 2015 at 18:14, Joe Hershberger <joe.hershberger@gmail.com> wrote:
> On Fri, May 22, 2015 at 4:42 PM, Simon Glass <sjg@chromium.org> wrote:
>> Sort this by node name for easier browsing.
>>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> ---
>
> Acked-by: Joe Hershberger <joe.hershberger@ni.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>

Applied to u-boot-dm.

[U-Boot] [PATCH 4/4] sandbox: dts: Add the real-time-clock test nodes back in

[Simon Glass]

On 22 May 2015 at 18:11, Joe Hershberger <joe.hershberger@gmail.com> wrote:
> On Fri, May 22, 2015 at 4:42 PM, Simon Glass <sjg@chromium.org> wrote:
>> These were lost when the PMIC series was applied. Add them back so that the
>> tests pass again.
>>
>> Reported-by: Joe Hershberger <joe.hershberger@gmail.com>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> ---
>
> Acked-by: Joe Hershberger <joe.hershberger@ni.com>

Applied to u-boot-dm.