[PATCH 1/5] arm/dt: tegra: Remove /memreserve/ from device-tree files

[PATCH 1/5] arm/dt: tegra: Remove /memreserve/ from device-tree files

[Stephen Warren]

There are no drivers in the kernel at present which can make use of the
memory reserved by /memreserve/, so there is no point reserving it. Remove
/memreserve/ to allow the user more memory. It's also unclear whether any
future driver would actually require /memreserve/, or allocate memory
through some other mechanism.

Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/tegra-harmony.dts   |    1 -
 arch/arm/boot/dts/tegra-paz00.dts     |    1 -
 arch/arm/boot/dts/tegra-seaboard.dts  |    1 -
 arch/arm/boot/dts/tegra-trimslice.dts |    1 -
 arch/arm/boot/dts/tegra-ventana.dts   |    1 -
 5 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts
index 0e225b8..a802324 100644
--- a/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
@@ -1,6 +1,5 @@
 /dts-v1/;
 
-/memreserve/ 0x1c000000 0x04000000;
 /include/ "tegra20.dtsi"
 
 / {
diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts
index 15a949f..1cd0cfe 100644
--- a/arch/arm/boot/dts/tegra-paz00.dts
+++ b/arch/arm/boot/dts/tegra-paz00.dts
@@ -1,6 +1,5 @@
 /dts-v1/;
 
-/memreserve/ 0x1c000000 0x04000000;
 /include/ "tegra20.dtsi"
 
 / {
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index 88c682a..60724e4 100644
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -1,6 +1,5 @@
 /dts-v1/;
 
-/memreserve/ 0x1c000000 0x04000000;
 /include/ "tegra20.dtsi"
 
 / {
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
index d3d0d20..95117d3 100644
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -1,6 +1,5 @@
 /dts-v1/;
 
-/memreserve/ 0x1c000000 0x04000000;
 /include/ "tegra20.dtsi"
 
 / {
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
index 3f9abd6..2af12fa 100644
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@ -1,6 +1,5 @@
 /dts-v1/;
 
-/memreserve/ 0x1c000000 0x04000000;
 /include/ "tegra20.dtsi"
 
 / {
-- 
1.7.0.4

[PATCH 1/5] arm/dt: tegra: Remove /memreserve/ from device-tree files

[Stephen Warren]

There are no drivers in the kernel at present which can make use of the
memory reserved by /memreserve/, so there is no point reserving it. Remove
/memreserve/ to allow the user more memory. It's also unclear whether any
future driver would actually require /memreserve/, or allocate memory
through some other mechanism.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 arch/arm/boot/dts/tegra-harmony.dts   |    1 -
 arch/arm/boot/dts/tegra-paz00.dts     |    1 -
 arch/arm/boot/dts/tegra-seaboard.dts  |    1 -
 arch/arm/boot/dts/tegra-trimslice.dts |    1 -
 arch/arm/boot/dts/tegra-ventana.dts   |    1 -
 5 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts
index 0e225b8..a802324 100644
--- a/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
@@ -1,6 +1,5 @@
 /dts-v1/;
 
-/memreserve/ 0x1c000000 0x04000000;
 /include/ "tegra20.dtsi"
 
 / {
diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts
index 15a949f..1cd0cfe 100644
--- a/arch/arm/boot/dts/tegra-paz00.dts
+++ b/arch/arm/boot/dts/tegra-paz00.dts
@@ -1,6 +1,5 @@
 /dts-v1/;
 
-/memreserve/ 0x1c000000 0x04000000;
 /include/ "tegra20.dtsi"
 
 / {
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index 88c682a..60724e4 100644
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -1,6 +1,5 @@
 /dts-v1/;
 
-/memreserve/ 0x1c000000 0x04000000;
 /include/ "tegra20.dtsi"
 
 / {
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
index d3d0d20..95117d3 100644
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -1,6 +1,5 @@
 /dts-v1/;
 
-/memreserve/ 0x1c000000 0x04000000;
 /include/ "tegra20.dtsi"
 
 / {
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
index 3f9abd6..2af12fa 100644
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@ -1,6 +1,5 @@
 /dts-v1/;
 
-/memreserve/ 0x1c000000 0x04000000;
 /include/ "tegra20.dtsi"
 
 / {
-- 
1.7.0.4

[PATCH 2/5] arm/dt: tegra: Remove /chosen node

[Stephen Warren]

The command-lines present in the existing /chosen node are not necessarily
correct for all users. Ideally, we should simply use the command-line
supplied by the boot-loader.

In fact, using the boot-loader's cmdline is quite easy; either the
bootloader fully supports DT, in which case it can modify the DT passed
to the kernel to include its command-line, or CONFIG_APPENDED_DTB can
be used in conjunction with CONFIG_ARM_ATAG_DTB_COMPAT, and the kernel
will substitute the bootloader's command-line into the DT.

Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/tegra-harmony.dts   |    4 ----
 arch/arm/boot/dts/tegra-paz00.dts     |    4 ----
 arch/arm/boot/dts/tegra-seaboard.dts  |    4 ----
 arch/arm/boot/dts/tegra-trimslice.dts |    4 ----
 arch/arm/boot/dts/tegra-ventana.dts   |    4 ----
 5 files changed, 0 insertions(+), 20 deletions(-)

diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts
index a802324..ca6fa10 100644
--- a/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
@@ -6,10 +6,6 @@
 	model = "NVIDIA Tegra2 Harmony evaluation board";
 	compatible = "nvidia,harmony", "nvidia,tegra20";
 
-	chosen {
-		bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootwait";
-	};
-
 	memory@0 {
 		reg = < 0x00000000 0x40000000 >;
 	};
diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts
index 1cd0cfe..4f6a8aa 100644
--- a/arch/arm/boot/dts/tegra-paz00.dts
+++ b/arch/arm/boot/dts/tegra-paz00.dts
@@ -6,10 +6,6 @@
 	model = "Toshiba AC100 / Dynabook AZ";
 	compatible = "compal,paz00", "nvidia,tegra20";
 
-	chosen {
-		bootargs = "console=ttyS0,115200n8 root=/dev/mmcblk0p1";
-	};
-
 	memory@0 {
 		reg = <0x00000000 0x20000000>;
 	};
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index 60724e4..d1ada26 100644
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -6,10 +6,6 @@
 	model = "NVIDIA Seaboard";
 	compatible = "nvidia,seaboard", "nvidia,tegra20";
 
-	chosen {
-		bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk1p3 rw rootwait";
-	};
-
 	memory {
 		device_type = "memory";
 		reg = < 0x00000000 0x40000000 >;
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
index 95117d3..cf8e561 100644
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -6,10 +6,6 @@
 	model = "Compulab TrimSlice board";
 	compatible = "compulab,trimslice", "nvidia,tegra20";
 
-	chosen {
-		bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk0p1 rw rootwait";
-	};
-
 	memory@0 {
 		reg = < 0x00000000 0x40000000 >;
 	};
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
index 2af12fa..1c09485 100644
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@ -6,10 +6,6 @@
 	model = "NVIDIA Tegra2 Ventana evaluation board";
 	compatible = "nvidia,ventana", "nvidia,tegra20";
 
-	chosen {
-		bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/ram rdinit=/sbin/init";
-	};
-
 	memory {
 		reg = < 0x00000000 0x40000000 >;
 	};
-- 
1.7.0.4

[PATCH 2/5] arm/dt: tegra: Remove /chosen node

[Stephen Warren]

The command-lines present in the existing /chosen node are not necessarily
correct for all users. Ideally, we should simply use the command-line
supplied by the boot-loader.

In fact, using the boot-loader's cmdline is quite easy; either the
bootloader fully supports DT, in which case it can modify the DT passed
to the kernel to include its command-line, or CONFIG_APPENDED_DTB can
be used in conjunction with CONFIG_ARM_ATAG_DTB_COMPAT, and the kernel
will substitute the bootloader's command-line into the DT.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 arch/arm/boot/dts/tegra-harmony.dts   |    4 ----
 arch/arm/boot/dts/tegra-paz00.dts     |    4 ----
 arch/arm/boot/dts/tegra-seaboard.dts  |    4 ----
 arch/arm/boot/dts/tegra-trimslice.dts |    4 ----
 arch/arm/boot/dts/tegra-ventana.dts   |    4 ----
 5 files changed, 0 insertions(+), 20 deletions(-)

diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts
index a802324..ca6fa10 100644
--- a/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
@@ -6,10 +6,6 @@
 	model = "NVIDIA Tegra2 Harmony evaluation board";
 	compatible = "nvidia,harmony", "nvidia,tegra20";
 
-	chosen {
-		bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootwait";
-	};
-
 	memory at 0 {
 		reg = < 0x00000000 0x40000000 >;
 	};
diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts
index 1cd0cfe..4f6a8aa 100644
--- a/arch/arm/boot/dts/tegra-paz00.dts
+++ b/arch/arm/boot/dts/tegra-paz00.dts
@@ -6,10 +6,6 @@
 	model = "Toshiba AC100 / Dynabook AZ";
 	compatible = "compal,paz00", "nvidia,tegra20";
 
-	chosen {
-		bootargs = "console=ttyS0,115200n8 root=/dev/mmcblk0p1";
-	};
-
 	memory at 0 {
 		reg = <0x00000000 0x20000000>;
 	};
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index 60724e4..d1ada26 100644
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -6,10 +6,6 @@
 	model = "NVIDIA Seaboard";
 	compatible = "nvidia,seaboard", "nvidia,tegra20";
 
-	chosen {
-		bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk1p3 rw rootwait";
-	};
-
 	memory {
 		device_type = "memory";
 		reg = < 0x00000000 0x40000000 >;
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
index 95117d3..cf8e561 100644
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -6,10 +6,6 @@
 	model = "Compulab TrimSlice board";
 	compatible = "compulab,trimslice", "nvidia,tegra20";
 
-	chosen {
-		bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk0p1 rw rootwait";
-	};
-
 	memory at 0 {
 		reg = < 0x00000000 0x40000000 >;
 	};
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
index 2af12fa..1c09485 100644
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@ -6,10 +6,6 @@
 	model = "NVIDIA Tegra2 Ventana evaluation board";
 	compatible = "nvidia,ventana", "nvidia,tegra20";
 
-	chosen {
-		bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/ram rdinit=/sbin/init";
-	};
-
 	memory {
 		reg = < 0x00000000 0x40000000 >;
 	};
-- 
1.7.0.4

[PATCH 3/5] arm/dt: tegra: Fix I2C nodes to match board files

[Stephen Warren]

With board files, all I2C busses run at 400KHz. Fix the device-tree
to be consistent with this. It's possible this is incorrect, but at
least it keeps the board files and device-tree consistent.

Also, disable any I2C controllers that the board files don't register,
also for consistency.

Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/tegra-seaboard.dts  |   16 ++++++++++++++++
 arch/arm/boot/dts/tegra-trimslice.dts |    4 ++++
 arch/arm/boot/dts/tegra-ventana.dts   |   16 ++++++++++++++++
 3 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index d1ada26..92da1f1 100644
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -11,6 +11,22 @@
 		reg = < 0x00000000 0x40000000 >;
 	};
 
+	i2c@7000c000 {
+		clock-frequency = <400000>;
+	};
+
+	i2c@7000c400 {
+		clock-frequency = <400000>;
+	};
+
+	i2c@7000c500 {
+		clock-frequency = <400000>;
+	};
+
+	i2c@7000d000 {
+		clock-frequency = <400000>;
+	};
+
 	serial@70006300 {
 		clock-frequency = < 216000000 >;
 	};
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
index cf8e561..b1aaa45 100644
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -22,6 +22,10 @@
 		clock-frequency = <400000>;
 	};
 
+	i2c@7000d000 {
+		status = "disable";
+	};
+
 	serial@70006000 {
 		clock-frequency = < 216000000 >;
 	};
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
index 1c09485..0f14ee3 100644
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@ -10,6 +10,22 @@
 		reg = < 0x00000000 0x40000000 >;
 	};
 
+	i2c@7000c000 {
+		clock-frequency = <400000>;
+	};
+
+	i2c@7000c400 {
+		clock-frequency = <400000>;
+	};
+
+	i2c@7000c500 {
+		clock-frequency = <400000>;
+	};
+
+	i2c@7000d000 {
+		clock-frequency = <400000>;
+	};
+
 	serial@70006300 {
 		clock-frequency = < 216000000 >;
 	};
-- 
1.7.0.4

[PATCH 3/5] arm/dt: tegra: Fix I2C nodes to match board files

[Stephen Warren]

With board files, all I2C busses run at 400KHz. Fix the device-tree
to be consistent with this. It's possible this is incorrect, but at
least it keeps the board files and device-tree consistent.

Also, disable any I2C controllers that the board files don't register,
also for consistency.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 arch/arm/boot/dts/tegra-seaboard.dts  |   16 ++++++++++++++++
 arch/arm/boot/dts/tegra-trimslice.dts |    4 ++++
 arch/arm/boot/dts/tegra-ventana.dts   |   16 ++++++++++++++++
 3 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index d1ada26..92da1f1 100644
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -11,6 +11,22 @@
 		reg = < 0x00000000 0x40000000 >;
 	};
 
+	i2c at 7000c000 {
+		clock-frequency = <400000>;
+	};
+
+	i2c at 7000c400 {
+		clock-frequency = <400000>;
+	};
+
+	i2c at 7000c500 {
+		clock-frequency = <400000>;
+	};
+
+	i2c at 7000d000 {
+		clock-frequency = <400000>;
+	};
+
 	serial at 70006300 {
 		clock-frequency = < 216000000 >;
 	};
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
index cf8e561..b1aaa45 100644
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -22,6 +22,10 @@
 		clock-frequency = <400000>;
 	};
 
+	i2c at 7000d000 {
+		status = "disable";
+	};
+
 	serial at 70006000 {
 		clock-frequency = < 216000000 >;
 	};
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
index 1c09485..0f14ee3 100644
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@ -10,6 +10,22 @@
 		reg = < 0x00000000 0x40000000 >;
 	};
 
+	i2c at 7000c000 {
+		clock-frequency = <400000>;
+	};
+
+	i2c at 7000c400 {
+		clock-frequency = <400000>;
+	};
+
+	i2c at 7000c500 {
+		clock-frequency = <400000>;
+	};
+
+	i2c at 7000d000 {
+		clock-frequency = <400000>;
+	};
+
 	serial at 70006300 {
 		clock-frequency = < 216000000 >;
 	};
-- 
1.7.0.4

[PATCH 4/5] arm/dt: tegra: Fix serial nodes to match board files

[Stephen Warren]

Mark any serial ports that aren't registered by the board files as disabled
in the device-tree files.

In practice, none of the now-disabled ports ended up succeeding device
probing because of the missing clock-frequency property. However,
explicitly marking the devices disabled has the advantage of squashing
the dev_warn() the failed probe causes, and documenting that we intend
the port not to be used, rather than accidentally left out the property.

Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/tegra-harmony.dts   |   16 ++++++++++++++++
 arch/arm/boot/dts/tegra-seaboard.dts  |   16 ++++++++++++++++
 arch/arm/boot/dts/tegra-trimslice.dts |   16 ++++++++++++++++
 arch/arm/boot/dts/tegra-ventana.dts   |   16 ++++++++++++++++
 4 files changed, 64 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts
index ca6fa10..ac179a0 100644
--- a/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
@@ -47,10 +47,26 @@
 		ext-mic-en-gpios = <&gpio 185 0>;
 	};
 
+	serial@70006000 {
+		status = "disable";
+	};
+
+	serial@70006040 {
+		status = "disable";
+	};
+
+	serial@70006200 {
+		status = "disable";
+	};
+
 	serial@70006300 {
 		clock-frequency = < 216000000 >;
 	};
 
+	serial@70006400 {
+		status = "disable";
+	};
+
 	sdhci@c8000200 {
 		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index 92da1f1..cbb2f08 100644
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -27,10 +27,26 @@
 		clock-frequency = <400000>;
 	};
 
+	serial@70006000 {
+		status = "disable";
+	};
+
+	serial@70006040 {
+		status = "disable";
+	};
+
+	serial@70006200 {
+		status = "disable";
+	};
+
 	serial@70006300 {
 		clock-frequency = < 216000000 >;
 	};
 
+	serial@70006400 {
+		status = "disable";
+	};
+
 	sdhci@c8000400 {
 		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
index b1aaa45..6060ce0 100644
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -30,6 +30,22 @@
 		clock-frequency = < 216000000 >;
 	};
 
+	serial@70006040 {
+		status = "disable";
+	};
+
+	serial@70006200 {
+		status = "disable";
+	};
+
+	serial@70006300 {
+		status = "disable";
+	};
+
+	serial@70006400 {
+		status = "disable";
+	};
+
 	sdhci@c8000600 {
 		cd-gpios = <&gpio 121 0>;
 		wp-gpios = <&gpio 122 0>;
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
index 0f14ee3..5ac0aa3 100644
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@ -26,10 +26,26 @@
 		clock-frequency = <400000>;
 	};
 
+	serial@70006000 {
+		status = "disable";
+	};
+
+	serial@70006040 {
+		status = "disable";
+	};
+
+	serial@70006200 {
+		status = "disable";
+	};
+
 	serial@70006300 {
 		clock-frequency = < 216000000 >;
 	};
 
+	serial@70006400 {
+		status = "disable";
+	};
+
 	sdhci@c8000400 {
 		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
-- 
1.7.0.4

[PATCH 4/5] arm/dt: tegra: Fix serial nodes to match board files

[Stephen Warren]

Mark any serial ports that aren't registered by the board files as disabled
in the device-tree files.

In practice, none of the now-disabled ports ended up succeeding device
probing because of the missing clock-frequency property. However,
explicitly marking the devices disabled has the advantage of squashing
the dev_warn() the failed probe causes, and documenting that we intend
the port not to be used, rather than accidentally left out the property.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 arch/arm/boot/dts/tegra-harmony.dts   |   16 ++++++++++++++++
 arch/arm/boot/dts/tegra-seaboard.dts  |   16 ++++++++++++++++
 arch/arm/boot/dts/tegra-trimslice.dts |   16 ++++++++++++++++
 arch/arm/boot/dts/tegra-ventana.dts   |   16 ++++++++++++++++
 4 files changed, 64 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts
index ca6fa10..ac179a0 100644
--- a/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
@@ -47,10 +47,26 @@
 		ext-mic-en-gpios = <&gpio 185 0>;
 	};
 
+	serial at 70006000 {
+		status = "disable";
+	};
+
+	serial at 70006040 {
+		status = "disable";
+	};
+
+	serial at 70006200 {
+		status = "disable";
+	};
+
 	serial at 70006300 {
 		clock-frequency = < 216000000 >;
 	};
 
+	serial at 70006400 {
+		status = "disable";
+	};
+
 	sdhci at c8000200 {
 		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index 92da1f1..cbb2f08 100644
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -27,10 +27,26 @@
 		clock-frequency = <400000>;
 	};
 
+	serial at 70006000 {
+		status = "disable";
+	};
+
+	serial at 70006040 {
+		status = "disable";
+	};
+
+	serial at 70006200 {
+		status = "disable";
+	};
+
 	serial at 70006300 {
 		clock-frequency = < 216000000 >;
 	};
 
+	serial at 70006400 {
+		status = "disable";
+	};
+
 	sdhci at c8000400 {
 		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
index b1aaa45..6060ce0 100644
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -30,6 +30,22 @@
 		clock-frequency = < 216000000 >;
 	};
 
+	serial at 70006040 {
+		status = "disable";
+	};
+
+	serial at 70006200 {
+		status = "disable";
+	};
+
+	serial at 70006300 {
+		status = "disable";
+	};
+
+	serial at 70006400 {
+		status = "disable";
+	};
+
 	sdhci at c8000600 {
 		cd-gpios = <&gpio 121 0>;
 		wp-gpios = <&gpio 122 0>;
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
index 0f14ee3..5ac0aa3 100644
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@ -26,10 +26,26 @@
 		clock-frequency = <400000>;
 	};
 
+	serial at 70006000 {
+		status = "disable";
+	};
+
+	serial at 70006040 {
+		status = "disable";
+	};
+
+	serial at 70006200 {
+		status = "disable";
+	};
+
 	serial at 70006300 {
 		clock-frequency = < 216000000 >;
 	};
 
+	serial at 70006400 {
+		status = "disable";
+	};
+
 	sdhci at c8000400 {
 		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
-- 
1.7.0.4

[PATCH 5/5] arm/dt: tegra: Fix SDHCI nodes to match board files

[Stephen Warren]

Mark any SDHCI controllers that aren't registered by the board files as
disabled in the device-tree files.

In practice, these controllers:

* Have nothing hooked up to them at all, or
* For ports intended for SDIO usage, the drivers for anything that might
  be attached are not in the device-tree yet. If/when drivers appear, the
  SD/MMC port can be re-enabled.

The only possible exception is TrimSlice's mico SD slot, but that wasn't
enabled in the board files before anyway, and doesn't work when all the
SDHCI controllers are enabled anyway.

Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/tegra-harmony.dts   |    8 ++++++++
 arch/arm/boot/dts/tegra-seaboard.dts  |    8 ++++++++
 arch/arm/boot/dts/tegra-trimslice.dts |   12 ++++++++++++
 arch/arm/boot/dts/tegra-ventana.dts   |    8 ++++++++
 4 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts
index ac179a0..80afa1b 100644
--- a/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
@@ -67,12 +67,20 @@
 		status = "disable";
 	};
 
+	sdhci@c8000000 {
+		status = "disable";
+	};
+
 	sdhci@c8000200 {
 		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
 		power-gpios = <&gpio 155 0>; /* gpio PT3 */
 	};
 
+	sdhci@c8000400 {
+		status = "disable";
+	};
+
 	sdhci@c8000600 {
 		cd-gpios = <&gpio 58 0>; /* gpio PH2 */
 		wp-gpios = <&gpio 59 0>; /* gpio PH3 */
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index cbb2f08..f552bcc 100644
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -47,6 +47,14 @@
 		status = "disable";
 	};
 
+	sdhci@c8000000 {
+		status = "disable";
+	};
+
+	sdhci@c8000200 {
+		status = "disable";
+	};
+
 	sdhci@c8000400 {
 		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
index 6060ce0..3b3ee7d 100644
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -46,6 +46,18 @@
 		status = "disable";
 	};
 
+	sdhci@c8000000 {
+		status = "disable";
+	};
+
+	sdhci@c8000200 {
+		status = "disable";
+	};
+
+	sdhci@c8000400 {
+		status = "disable";
+	};
+
 	sdhci@c8000600 {
 		cd-gpios = <&gpio 121 0>;
 		wp-gpios = <&gpio 122 0>;
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
index 5ac0aa3..c7d3b87 100644
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@ -46,6 +46,14 @@
 		status = "disable";
 	};
 
+	sdhci@c8000000 {
+		status = "disable";
+	};
+
+	sdhci@c8000200 {
+		status = "disable";
+	};
+
 	sdhci@c8000400 {
 		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
-- 
1.7.0.4

[PATCH 5/5] arm/dt: tegra: Fix SDHCI nodes to match board files

[Stephen Warren]

Mark any SDHCI controllers that aren't registered by the board files as
disabled in the device-tree files.

In practice, these controllers:

* Have nothing hooked up to them at all, or
* For ports intended for SDIO usage, the drivers for anything that might
  be attached are not in the device-tree yet. If/when drivers appear, the
  SD/MMC port can be re-enabled.

The only possible exception is TrimSlice's mico SD slot, but that wasn't
enabled in the board files before anyway, and doesn't work when all the
SDHCI controllers are enabled anyway.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 arch/arm/boot/dts/tegra-harmony.dts   |    8 ++++++++
 arch/arm/boot/dts/tegra-seaboard.dts  |    8 ++++++++
 arch/arm/boot/dts/tegra-trimslice.dts |   12 ++++++++++++
 arch/arm/boot/dts/tegra-ventana.dts   |    8 ++++++++
 4 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts
index ac179a0..80afa1b 100644
--- a/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
@@ -67,12 +67,20 @@
 		status = "disable";
 	};
 
+	sdhci at c8000000 {
+		status = "disable";
+	};
+
 	sdhci at c8000200 {
 		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
 		power-gpios = <&gpio 155 0>; /* gpio PT3 */
 	};
 
+	sdhci at c8000400 {
+		status = "disable";
+	};
+
 	sdhci at c8000600 {
 		cd-gpios = <&gpio 58 0>; /* gpio PH2 */
 		wp-gpios = <&gpio 59 0>; /* gpio PH3 */
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index cbb2f08..f552bcc 100644
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -47,6 +47,14 @@
 		status = "disable";
 	};
 
+	sdhci at c8000000 {
+		status = "disable";
+	};
+
+	sdhci at c8000200 {
+		status = "disable";
+	};
+
 	sdhci at c8000400 {
 		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
index 6060ce0..3b3ee7d 100644
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -46,6 +46,18 @@
 		status = "disable";
 	};
 
+	sdhci at c8000000 {
+		status = "disable";
+	};
+
+	sdhci at c8000200 {
+		status = "disable";
+	};
+
+	sdhci at c8000400 {
+		status = "disable";
+	};
+
 	sdhci at c8000600 {
 		cd-gpios = <&gpio 121 0>;
 		wp-gpios = <&gpio 122 0>;
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
index 5ac0aa3..c7d3b87 100644
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@ -46,6 +46,14 @@
 		status = "disable";
 	};
 
+	sdhci at c8000000 {
+		status = "disable";
+	};
+
+	sdhci at c8000200 {
+		status = "disable";
+	};
+
 	sdhci at c8000400 {
 		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
-- 
1.7.0.4

Re: [PATCH 5/5] arm/dt: tegra: Fix SDHCI nodes to match board files

[Jean-Christophe PLAGNIOL-VILLARD]

On 14:44 Mon 21 Nov     , Stephen Warren wrote:
> Mark any SDHCI controllers that aren't registered by the board files as
> disabled in the device-tree files.
> 
> In practice, these controllers:
> 
> * Have nothing hooked up to them at all, or
> * For ports intended for SDIO usage, the drivers for anything that might
>   be attached are not in the device-tree yet. If/when drivers appear, the
>   SD/MMC port can be re-enabled.
> 
> The only possible exception is TrimSlice's mico SD slot, but that wasn't
> enabled in the board files before anyway, and doesn't work when all the
> SDHCI controllers are enabled anyway.
it will be better to invert the logic

just enable what you are supposed too

Best Regards,
J.

[PATCH 5/5] arm/dt: tegra: Fix SDHCI nodes to match board files

[Jean-Christophe PLAGNIOL-VILLARD]

On 14:44 Mon 21 Nov     , Stephen Warren wrote:
> Mark any SDHCI controllers that aren't registered by the board files as
> disabled in the device-tree files.
> 
> In practice, these controllers:
> 
> * Have nothing hooked up to them at all, or
> * For ports intended for SDIO usage, the drivers for anything that might
>   be attached are not in the device-tree yet. If/when drivers appear, the
>   SD/MMC port can be re-enabled.
> 
> The only possible exception is TrimSlice's mico SD slot, but that wasn't
> enabled in the board files before anyway, and doesn't work when all the
> SDHCI controllers are enabled anyway.
it will be better to invert the logic

just enable what you are supposed too

Best Regards,
J.

Re: [PATCH 1/5] arm/dt: tegra: Remove /memreserve/ from device-tree files

[Marc Dietrich]

Hi Stephen,

On Monday 21 November 2011 14:44:07 Stephen Warren wrote:
> There are no drivers in the kernel at present which can make use of the
> memory reserved by /memreserve/, so there is no point reserving it. Remove
> /memreserve/ to allow the user more memory. It's also unclear whether any
> future driver would actually require /memreserve/, or allocate memory
> through some other mechanism.

while this gives 512 MB of usable memory on my AC100, it causes some funny 
pictures on the screen ;-) I guess our bootloader (fastboot) already setups 
the frambuffer there (and enables the backlight). I guess it shouldn't be 
harmful as nothing else writes to this memory area. Otherwise you may add that 
the bootloader (or the kernel cmdline supplied by the bootloader) is now 
responsible for the reservation to the description.

Marc

> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> ---
>  arch/arm/boot/dts/tegra-harmony.dts   |    1 -
>  arch/arm/boot/dts/tegra-paz00.dts     |    1 -
>  arch/arm/boot/dts/tegra-seaboard.dts  |    1 -
>  arch/arm/boot/dts/tegra-trimslice.dts |    1 -
>  arch/arm/boot/dts/tegra-ventana.dts   |    1 -
>  5 files changed, 0 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/tegra-harmony.dts
> b/arch/arm/boot/dts/tegra-harmony.dts index 0e225b8..a802324 100644
> --- a/arch/arm/boot/dts/tegra-harmony.dts
> +++ b/arch/arm/boot/dts/tegra-harmony.dts
> @@ -1,6 +1,5 @@
>  /dts-v1/;
> 
> -/memreserve/ 0x1c000000 0x04000000;
>  /include/ "tegra20.dtsi"
> 
>  / {
> diff --git a/arch/arm/boot/dts/tegra-paz00.dts
> b/arch/arm/boot/dts/tegra-paz00.dts index 15a949f..1cd0cfe 100644
> --- a/arch/arm/boot/dts/tegra-paz00.dts
> +++ b/arch/arm/boot/dts/tegra-paz00.dts
> @@ -1,6 +1,5 @@
>  /dts-v1/;
> 
> -/memreserve/ 0x1c000000 0x04000000;
>  /include/ "tegra20.dtsi"
> 
>  / {
> diff --git a/arch/arm/boot/dts/tegra-seaboard.dts
> b/arch/arm/boot/dts/tegra-seaboard.dts index 88c682a..60724e4 100644
> --- a/arch/arm/boot/dts/tegra-seaboard.dts
> +++ b/arch/arm/boot/dts/tegra-seaboard.dts
> @@ -1,6 +1,5 @@
>  /dts-v1/;
> 
> -/memreserve/ 0x1c000000 0x04000000;
>  /include/ "tegra20.dtsi"
> 
>  / {
> diff --git a/arch/arm/boot/dts/tegra-trimslice.dts
> b/arch/arm/boot/dts/tegra-trimslice.dts index d3d0d20..95117d3 100644
> --- a/arch/arm/boot/dts/tegra-trimslice.dts
> +++ b/arch/arm/boot/dts/tegra-trimslice.dts
> @@ -1,6 +1,5 @@
>  /dts-v1/;
> 
> -/memreserve/ 0x1c000000 0x04000000;
>  /include/ "tegra20.dtsi"
> 
>  / {
> diff --git a/arch/arm/boot/dts/tegra-ventana.dts
> b/arch/arm/boot/dts/tegra-ventana.dts index 3f9abd6..2af12fa 100644
> --- a/arch/arm/boot/dts/tegra-ventana.dts
> +++ b/arch/arm/boot/dts/tegra-ventana.dts
> @@ -1,6 +1,5 @@
>  /dts-v1/;
> 
> -/memreserve/ 0x1c000000 0x04000000;
>  /include/ "tegra20.dtsi"
> 
>  / {

[PATCH 1/5] arm/dt: tegra: Remove /memreserve/ from device-tree files

[Marc Dietrich]

Hi Stephen,

On Monday 21 November 2011 14:44:07 Stephen Warren wrote:
> There are no drivers in the kernel at present which can make use of the
> memory reserved by /memreserve/, so there is no point reserving it. Remove
> /memreserve/ to allow the user more memory. It's also unclear whether any
> future driver would actually require /memreserve/, or allocate memory
> through some other mechanism.

while this gives 512 MB of usable memory on my AC100, it causes some funny 
pictures on the screen ;-) I guess our bootloader (fastboot) already setups 
the frambuffer there (and enables the backlight). I guess it shouldn't be 
harmful as nothing else writes to this memory area. Otherwise you may add that 
the bootloader (or the kernel cmdline supplied by the bootloader) is now 
responsible for the reservation to the description.

Marc

> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
>  arch/arm/boot/dts/tegra-harmony.dts   |    1 -
>  arch/arm/boot/dts/tegra-paz00.dts     |    1 -
>  arch/arm/boot/dts/tegra-seaboard.dts  |    1 -
>  arch/arm/boot/dts/tegra-trimslice.dts |    1 -
>  arch/arm/boot/dts/tegra-ventana.dts   |    1 -
>  5 files changed, 0 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/tegra-harmony.dts
> b/arch/arm/boot/dts/tegra-harmony.dts index 0e225b8..a802324 100644
> --- a/arch/arm/boot/dts/tegra-harmony.dts
> +++ b/arch/arm/boot/dts/tegra-harmony.dts
> @@ -1,6 +1,5 @@
>  /dts-v1/;
> 
> -/memreserve/ 0x1c000000 0x04000000;
>  /include/ "tegra20.dtsi"
> 
>  / {
> diff --git a/arch/arm/boot/dts/tegra-paz00.dts
> b/arch/arm/boot/dts/tegra-paz00.dts index 15a949f..1cd0cfe 100644
> --- a/arch/arm/boot/dts/tegra-paz00.dts
> +++ b/arch/arm/boot/dts/tegra-paz00.dts
> @@ -1,6 +1,5 @@
>  /dts-v1/;
> 
> -/memreserve/ 0x1c000000 0x04000000;
>  /include/ "tegra20.dtsi"
> 
>  / {
> diff --git a/arch/arm/boot/dts/tegra-seaboard.dts
> b/arch/arm/boot/dts/tegra-seaboard.dts index 88c682a..60724e4 100644
> --- a/arch/arm/boot/dts/tegra-seaboard.dts
> +++ b/arch/arm/boot/dts/tegra-seaboard.dts
> @@ -1,6 +1,5 @@
>  /dts-v1/;
> 
> -/memreserve/ 0x1c000000 0x04000000;
>  /include/ "tegra20.dtsi"
> 
>  / {
> diff --git a/arch/arm/boot/dts/tegra-trimslice.dts
> b/arch/arm/boot/dts/tegra-trimslice.dts index d3d0d20..95117d3 100644
> --- a/arch/arm/boot/dts/tegra-trimslice.dts
> +++ b/arch/arm/boot/dts/tegra-trimslice.dts
> @@ -1,6 +1,5 @@
>  /dts-v1/;
> 
> -/memreserve/ 0x1c000000 0x04000000;
>  /include/ "tegra20.dtsi"
> 
>  / {
> diff --git a/arch/arm/boot/dts/tegra-ventana.dts
> b/arch/arm/boot/dts/tegra-ventana.dts index 3f9abd6..2af12fa 100644
> --- a/arch/arm/boot/dts/tegra-ventana.dts
> +++ b/arch/arm/boot/dts/tegra-ventana.dts
> @@ -1,6 +1,5 @@
>  /dts-v1/;
> 
> -/memreserve/ 0x1c000000 0x04000000;
>  /include/ "tegra20.dtsi"
> 
>  / {

RE: [PATCH 5/5] arm/dt: tegra: Fix SDHCI nodes to match board files

[Stephen Warren]

Jean-Christophe PLAGNIOL-VILLARD wrote at Tuesday, November 22, 2011 1:38 AM:
> On 14:44 Mon 21 Nov     , Stephen Warren wrote:
> > Mark any SDHCI controllers that aren't registered by the board files as
> > disabled in the device-tree files.
> >
> > In practice, these controllers:
> >
> > * Have nothing hooked up to them at all, or
> > * For ports intended for SDIO usage, the drivers for anything that might
> >   be attached are not in the device-tree yet. If/when drivers appear, the
> >   SD/MMC port can be re-enabled.
> >
> > The only possible exception is TrimSlice's mico SD slot, but that wasn't
> > enabled in the board files before anyway, and doesn't work when all the
> > SDHCI controllers are enabled anyway.
> it will be better to invert the logic
> 
> just enable what you are supposed too

It used to be that way when the files were first added, but they got
switched around this way to match standard practice.

-- 
nvpublic

[PATCH 5/5] arm/dt: tegra: Fix SDHCI nodes to match board files

[Stephen Warren]

Jean-Christophe PLAGNIOL-VILLARD wrote at Tuesday, November 22, 2011 1:38 AM:
> On 14:44 Mon 21 Nov     , Stephen Warren wrote:
> > Mark any SDHCI controllers that aren't registered by the board files as
> > disabled in the device-tree files.
> >
> > In practice, these controllers:
> >
> > * Have nothing hooked up to them at all, or
> > * For ports intended for SDIO usage, the drivers for anything that might
> >   be attached are not in the device-tree yet. If/when drivers appear, the
> >   SD/MMC port can be re-enabled.
> >
> > The only possible exception is TrimSlice's mico SD slot, but that wasn't
> > enabled in the board files before anyway, and doesn't work when all the
> > SDHCI controllers are enabled anyway.
> it will be better to invert the logic
> 
> just enable what you are supposed too

It used to be that way when the files were first added, but they got
switched around this way to match standard practice.

-- 
nvpublic

Re: [PATCH 5/5] arm/dt: tegra: Fix SDHCI nodes to match board files

[Jean-Christophe PLAGNIOL-VILLARD]

On 08:12 Tue 22 Nov     , Stephen Warren wrote:
> Jean-Christophe PLAGNIOL-VILLARD wrote at Tuesday, November 22, 2011 1:38 AM:
> > On 14:44 Mon 21 Nov     , Stephen Warren wrote:
> > > Mark any SDHCI controllers that aren't registered by the board files as
> > > disabled in the device-tree files.
> > >
> > > In practice, these controllers:
> > >
> > > * Have nothing hooked up to them at all, or
> > > * For ports intended for SDIO usage, the drivers for anything that might
> > >   be attached are not in the device-tree yet. If/when drivers appear, the
> > >   SD/MMC port can be re-enabled.
> > >
> > > The only possible exception is TrimSlice's mico SD slot, but that wasn't
> > > enabled in the board files before anyway, and doesn't work when all the
> > > SDHCI controllers are enabled anyway.
> > it will be better to invert the logic
> > 
> > just enable what you are supposed too
> 
> It used to be that way when the files were first added, but they got
> switched around this way to match standard practice.
this is a bad practice because you can enable stuff that a hardware is not
supposed to use

and this silenty without anyone notice until you test the hardware

and you add more line and changeset

Best Regrds,
J.

[PATCH 5/5] arm/dt: tegra: Fix SDHCI nodes to match board files

[Jean-Christophe PLAGNIOL-VILLARD]

On 08:12 Tue 22 Nov     , Stephen Warren wrote:
> Jean-Christophe PLAGNIOL-VILLARD wrote at Tuesday, November 22, 2011 1:38 AM:
> > On 14:44 Mon 21 Nov     , Stephen Warren wrote:
> > > Mark any SDHCI controllers that aren't registered by the board files as
> > > disabled in the device-tree files.
> > >
> > > In practice, these controllers:
> > >
> > > * Have nothing hooked up to them at all, or
> > > * For ports intended for SDIO usage, the drivers for anything that might
> > >   be attached are not in the device-tree yet. If/when drivers appear, the
> > >   SD/MMC port can be re-enabled.
> > >
> > > The only possible exception is TrimSlice's mico SD slot, but that wasn't
> > > enabled in the board files before anyway, and doesn't work when all the
> > > SDHCI controllers are enabled anyway.
> > it will be better to invert the logic
> > 
> > just enable what you are supposed too
> 
> It used to be that way when the files were first added, but they got
> switched around this way to match standard practice.
this is a bad practice because you can enable stuff that a hardware is not
supposed to use

and this silenty without anyone notice until you test the hardware

and you add more line and changeset

Best Regrds,
J.

RE: [PATCH 1/5] arm/dt: tegra: Remove /memreserve/ from device-tree files

[Stephen Warren]

Marc Dietrich wrote at Tuesday, November 22, 2011 3:42 AM:
> On Monday 21 November 2011 14:44:07 Stephen Warren wrote:
> > There are no drivers in the kernel at present which can make use of the
> > memory reserved by /memreserve/, so there is no point reserving it. Remove
> > /memreserve/ to allow the user more memory. It's also unclear whether any
> > future driver would actually require /memreserve/, or allocate memory
> > through some other mechanism.
> 
> while this gives 512 MB of usable memory on my AC100, it causes some funny
> pictures on the screen ;-) I guess our bootloader (fastboot) already setups
> the frambuffer there (and enables the backlight). I guess it shouldn't be
> harmful as nothing else writes to this memory area. Otherwise you may add that
> the bootloader (or the kernel cmdline supplied by the bootloader) is now
> responsible for the reservation to the description.

Ah yes, I guess that would happen. I'm only testing with mainline U-Boot...

I'd suggest this is acceptable fallout for now; I don't believe it will
cause any active problems, and as you say, you can get the bootloader to
set a command-line that excludes the frame-buffer if you want to solve
this. Do you agree?

-- 
nvpublic

[PATCH 1/5] arm/dt: tegra: Remove /memreserve/ from device-tree files

[Stephen Warren]

Marc Dietrich wrote at Tuesday, November 22, 2011 3:42 AM:
> On Monday 21 November 2011 14:44:07 Stephen Warren wrote:
> > There are no drivers in the kernel at present which can make use of the
> > memory reserved by /memreserve/, so there is no point reserving it. Remove
> > /memreserve/ to allow the user more memory. It's also unclear whether any
> > future driver would actually require /memreserve/, or allocate memory
> > through some other mechanism.
> 
> while this gives 512 MB of usable memory on my AC100, it causes some funny
> pictures on the screen ;-) I guess our bootloader (fastboot) already setups
> the frambuffer there (and enables the backlight). I guess it shouldn't be
> harmful as nothing else writes to this memory area. Otherwise you may add that
> the bootloader (or the kernel cmdline supplied by the bootloader) is now
> responsible for the reservation to the description.

Ah yes, I guess that would happen. I'm only testing with mainline U-Boot...

I'd suggest this is acceptable fallout for now; I don't believe it will
cause any active problems, and as you say, you can get the bootloader to
set a command-line that excludes the frame-buffer if you want to solve
this. Do you agree?

-- 
nvpublic

Re: [PATCH 1/5] arm/dt: tegra: Remove /memreserve/ from device-treefiles

[Marc Dietrich]

On Tuesday 22 November 2011 08:25:03 Stephen Warren wrote:
> Marc Dietrich wrote at Tuesday, November 22, 2011 3:42 AM:
> > On Monday 21 November 2011 14:44:07 Stephen Warren wrote:
> > > There are no drivers in the kernel at present which can make use of
> > > the
> > > memory reserved by /memreserve/, so there is no point reserving it.
> > > Remove /memreserve/ to allow the user more memory. It's also
> > > unclear whether any future driver would actually require
> > > /memreserve/, or allocate memory through some other mechanism.
> > 
> > while this gives 512 MB of usable memory on my AC100, it causes some
> > funny pictures on the screen ;-) I guess our bootloader (fastboot)
> > already setups the frambuffer there (and enables the backlight). I
> > guess it shouldn't be harmful as nothing else writes to this memory
> > area. Otherwise you may add that the bootloader (or the kernel cmdline
> > supplied by the bootloader) is now responsible for the reservation to
> > the description.
> 
> Ah yes, I guess that would happen. I'm only testing with mainline U-Boot...
> 
> I'd suggest this is acceptable fallout for now; I don't believe it will
> cause any active problems, and as you say, you can get the bootloader to
> set a command-line that excludes the frame-buffer if you want to solve
> this. Do you agree?

Ok. Hopefully we can also use u-Boot soon.

Marc

[PATCH 1/5] arm/dt: tegra: Remove /memreserve/ from device-treefiles

[Marc Dietrich]

On Tuesday 22 November 2011 08:25:03 Stephen Warren wrote:
> Marc Dietrich wrote at Tuesday, November 22, 2011 3:42 AM:
> > On Monday 21 November 2011 14:44:07 Stephen Warren wrote:
> > > There are no drivers in the kernel at present which can make use of
> > > the
> > > memory reserved by /memreserve/, so there is no point reserving it.
> > > Remove /memreserve/ to allow the user more memory. It's also
> > > unclear whether any future driver would actually require
> > > /memreserve/, or allocate memory through some other mechanism.
> > 
> > while this gives 512 MB of usable memory on my AC100, it causes some
> > funny pictures on the screen ;-) I guess our bootloader (fastboot)
> > already setups the frambuffer there (and enables the backlight). I
> > guess it shouldn't be harmful as nothing else writes to this memory
> > area. Otherwise you may add that the bootloader (or the kernel cmdline
> > supplied by the bootloader) is now responsible for the reservation to
> > the description.
> 
> Ah yes, I guess that would happen. I'm only testing with mainline U-Boot...
> 
> I'd suggest this is acceptable fallout for now; I don't believe it will
> cause any active problems, and as you say, you can get the bootloader to
> set a command-line that excludes the frame-buffer if you want to solve
> this. Do you agree?

Ok. Hopefully we can also use u-Boot soon.

Marc

Re: [PATCH 1/5] arm/dt: tegra: Remove /memreserve/ from device-tree files

[Olof Johansson]

On Mon, Nov 21, 2011 at 02:44:07PM -0700, Stephen Warren wrote:
> There are no drivers in the kernel at present which can make use of the
> memory reserved by /memreserve/, so there is no point reserving it. Remove
> /memreserve/ to allow the user more memory. It's also unclear whether any
> future driver would actually require /memreserve/, or allocate memory
> through some other mechanism.
> 
> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Thanks, applied to for-3.3/boards


-Olof

[PATCH 1/5] arm/dt: tegra: Remove /memreserve/ from device-tree files

[Olof Johansson]

On Mon, Nov 21, 2011 at 02:44:07PM -0700, Stephen Warren wrote:
> There are no drivers in the kernel at present which can make use of the
> memory reserved by /memreserve/, so there is no point reserving it. Remove
> /memreserve/ to allow the user more memory. It's also unclear whether any
> future driver would actually require /memreserve/, or allocate memory
> through some other mechanism.
> 
> Signed-off-by: Stephen Warren <swarren@nvidia.com>

Thanks, applied to for-3.3/boards


-Olof

Re: [PATCH 2/5] arm/dt: tegra: Remove /chosen node

[Olof Johansson]

On Mon, Nov 21, 2011 at 02:44:08PM -0700, Stephen Warren wrote:
> The command-lines present in the existing /chosen node are not necessarily
> correct for all users. Ideally, we should simply use the command-line
> supplied by the boot-loader.
> 
> In fact, using the boot-loader's cmdline is quite easy; either the
> bootloader fully supports DT, in which case it can modify the DT passed
> to the kernel to include its command-line, or CONFIG_APPENDED_DTB can
> be used in conjunction with CONFIG_ARM_ATAG_DTB_COMPAT, and the kernel
> will substitute the bootloader's command-line into the DT.
> 
> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Thanks, applied to for-3.3/boards

-Olof

[PATCH 2/5] arm/dt: tegra: Remove /chosen node

[Olof Johansson]

On Mon, Nov 21, 2011 at 02:44:08PM -0700, Stephen Warren wrote:
> The command-lines present in the existing /chosen node are not necessarily
> correct for all users. Ideally, we should simply use the command-line
> supplied by the boot-loader.
> 
> In fact, using the boot-loader's cmdline is quite easy; either the
> bootloader fully supports DT, in which case it can modify the DT passed
> to the kernel to include its command-line, or CONFIG_APPENDED_DTB can
> be used in conjunction with CONFIG_ARM_ATAG_DTB_COMPAT, and the kernel
> will substitute the bootloader's command-line into the DT.
> 
> Signed-off-by: Stephen Warren <swarren@nvidia.com>

Thanks, applied to for-3.3/boards

-Olof

Re: [PATCH 3/5] arm/dt: tegra: Fix I2C nodes to match board files

[Olof Johansson]

On Mon, Nov 21, 2011 at 02:44:09PM -0700, Stephen Warren wrote:
> With board files, all I2C busses run at 400KHz. Fix the device-tree
> to be consistent with this. It's possible this is incorrect, but at
> least it keeps the board files and device-tree consistent.
> 
> Also, disable any I2C controllers that the board files don't register,
> also for consistency.
> 
> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Thanks, applied to for-3.3/boards

-Olof

[PATCH 3/5] arm/dt: tegra: Fix I2C nodes to match board files

[Olof Johansson]

On Mon, Nov 21, 2011 at 02:44:09PM -0700, Stephen Warren wrote:
> With board files, all I2C busses run at 400KHz. Fix the device-tree
> to be consistent with this. It's possible this is incorrect, but at
> least it keeps the board files and device-tree consistent.
> 
> Also, disable any I2C controllers that the board files don't register,
> also for consistency.
> 
> Signed-off-by: Stephen Warren <swarren@nvidia.com>

Thanks, applied to for-3.3/boards

-Olof

Re: [PATCH 4/5] arm/dt: tegra: Fix serial nodes to match board files

[Olof Johansson]

On Mon, Nov 21, 2011 at 02:44:10PM -0700, Stephen Warren wrote:
> Mark any serial ports that aren't registered by the board files as disabled
> in the device-tree files.
> 
> In practice, none of the now-disabled ports ended up succeeding device
> probing because of the missing clock-frequency property. However,
> explicitly marking the devices disabled has the advantage of squashing
> the dev_warn() the failed probe causes, and documenting that we intend
> the port not to be used, rather than accidentally left out the property.
> 
> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Thanks, applied to for-3.3/boards


-Olof

[PATCH 4/5] arm/dt: tegra: Fix serial nodes to match board files

[Olof Johansson]

On Mon, Nov 21, 2011 at 02:44:10PM -0700, Stephen Warren wrote:
> Mark any serial ports that aren't registered by the board files as disabled
> in the device-tree files.
> 
> In practice, none of the now-disabled ports ended up succeeding device
> probing because of the missing clock-frequency property. However,
> explicitly marking the devices disabled has the advantage of squashing
> the dev_warn() the failed probe causes, and documenting that we intend
> the port not to be used, rather than accidentally left out the property.
> 
> Signed-off-by: Stephen Warren <swarren@nvidia.com>

Thanks, applied to for-3.3/boards


-Olof

Re: [PATCH 5/5] arm/dt: tegra: Fix SDHCI nodes to match board files

[Olof Johansson]

On Mon, Nov 21, 2011 at 02:44:11PM -0700, Stephen Warren wrote:
> Mark any SDHCI controllers that aren't registered by the board files as
> disabled in the device-tree files.
> 
> In practice, these controllers:
> 
> * Have nothing hooked up to them at all, or
> * For ports intended for SDIO usage, the drivers for anything that might
>   be attached are not in the device-tree yet. If/when drivers appear, the
>   SD/MMC port can be re-enabled.
> 
> The only possible exception is TrimSlice's mico SD slot, but that wasn't
> enabled in the board files before anyway, and doesn't work when all the
> SDHCI controllers are enabled anyway.
> 
> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Thanks, applied to for-3.3/boards


-Olof

[PATCH 5/5] arm/dt: tegra: Fix SDHCI nodes to match board files

[Olof Johansson]

On Mon, Nov 21, 2011 at 02:44:11PM -0700, Stephen Warren wrote:
> Mark any SDHCI controllers that aren't registered by the board files as
> disabled in the device-tree files.
> 
> In practice, these controllers:
> 
> * Have nothing hooked up to them at all, or
> * For ports intended for SDIO usage, the drivers for anything that might
>   be attached are not in the device-tree yet. If/when drivers appear, the
>   SD/MMC port can be re-enabled.
> 
> The only possible exception is TrimSlice's mico SD slot, but that wasn't
> enabled in the board files before anyway, and doesn't work when all the
> SDHCI controllers are enabled anyway.
> 
> Signed-off-by: Stephen Warren <swarren@nvidia.com>

Thanks, applied to for-3.3/boards


-Olof

Re: [PATCH 1/5] arm/dt: tegra: Remove /memreserve/ from device-tree files

[Olof Johansson]

On Tue, Nov 22, 2011 at 08:25:03AM -0800, Stephen Warren wrote:
> Marc Dietrich wrote at Tuesday, November 22, 2011 3:42 AM:
> > On Monday 21 November 2011 14:44:07 Stephen Warren wrote:
> > > There are no drivers in the kernel at present which can make use of the
> > > memory reserved by /memreserve/, so there is no point reserving it. Remove
> > > /memreserve/ to allow the user more memory. It's also unclear whether any
> > > future driver would actually require /memreserve/, or allocate memory
> > > through some other mechanism.
> > 
> > while this gives 512 MB of usable memory on my AC100, it causes some funny
> > pictures on the screen ;-) I guess our bootloader (fastboot) already setups
> > the frambuffer there (and enables the backlight). I guess it shouldn't be
> > harmful as nothing else writes to this memory area. Otherwise you may add that
> > the bootloader (or the kernel cmdline supplied by the bootloader) is now
> > responsible for the reservation to the description.
> 
> Ah yes, I guess that would happen. I'm only testing with mainline U-Boot...
> 
> I'd suggest this is acceptable fallout for now; I don't believe it will
> cause any active problems, and as you say, you can get the bootloader to
> set a command-line that excludes the frame-buffer if you want to solve
> this. Do you agree?

Agreed. It would make more sense to teach u-boot to reserve the memory.


-Olof

[PATCH 1/5] arm/dt: tegra: Remove /memreserve/ from device-tree files

[Olof Johansson]

On Tue, Nov 22, 2011 at 08:25:03AM -0800, Stephen Warren wrote:
> Marc Dietrich wrote at Tuesday, November 22, 2011 3:42 AM:
> > On Monday 21 November 2011 14:44:07 Stephen Warren wrote:
> > > There are no drivers in the kernel at present which can make use of the
> > > memory reserved by /memreserve/, so there is no point reserving it. Remove
> > > /memreserve/ to allow the user more memory. It's also unclear whether any
> > > future driver would actually require /memreserve/, or allocate memory
> > > through some other mechanism.
> > 
> > while this gives 512 MB of usable memory on my AC100, it causes some funny
> > pictures on the screen ;-) I guess our bootloader (fastboot) already setups
> > the frambuffer there (and enables the backlight). I guess it shouldn't be
> > harmful as nothing else writes to this memory area. Otherwise you may add that
> > the bootloader (or the kernel cmdline supplied by the bootloader) is now
> > responsible for the reservation to the description.
> 
> Ah yes, I guess that would happen. I'm only testing with mainline U-Boot...
> 
> I'd suggest this is acceptable fallout for now; I don't believe it will
> cause any active problems, and as you say, you can get the bootloader to
> set a command-line that excludes the frame-buffer if you want to solve
> this. Do you agree?

Agreed. It would make more sense to teach u-boot to reserve the memory.


-Olof