[PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black

[PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black

[Koen Kooi]

The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added,
so create a common dtsi both can use. MMC support for AM335x still isn't in, so
only the LDO change has been added.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 .../{am335x-bone.dts => am335x-bone-common.dtsi}   |   3 -
 arch/arm/boot/dts/am335x-bone.dts                  | 256 +--------------------
 arch/arm/boot/dts/am335x-boneblack.dts             |  18 ++
 3 files changed, 19 insertions(+), 258 deletions(-)
 copy arch/arm/boot/dts/{am335x-bone.dts => am335x-bone-common.dtsi} (99%)
 create mode 100644 arch/arm/boot/dts/am335x-boneblack.dts

diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone-common.dtsi
similarity index 99%
copy from arch/arm/boot/dts/am335x-bone.dts
copy to arch/arm/boot/dts/am335x-bone-common.dtsi
index d318987..2f66ded 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -5,9 +5,6 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-/dts-v1/;
-
-#include "am33xx.dtsi"
 
 / {
 	model = "TI AM335x BeagleBone";
diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
index d318987..7993c48 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -8,258 +8,4 @@
 /dts-v1/;
 
 #include "am33xx.dtsi"
-
-/ {
-	model = "TI AM335x BeagleBone";
-	compatible = "ti,am335x-bone", "ti,am33xx";
-
-	cpus {
-		cpu@0 {
-			cpu0-supply = <&dcdc2_reg>;
-		};
-	};
-
-	memory {
-		device_type = "memory";
-		reg = <0x80000000 0x10000000>; /* 256 MB */
-	};
-
-	am33xx_pinmux: pinmux@44e10800 {
-		pinctrl-names = "default";
-		pinctrl-0 = <&clkout2_pin>;
-
-		user_leds_s0: user_leds_s0 {
-			pinctrl-single,pins = <
-				0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a5.gpio1_21 */
-				0x58 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a6.gpio1_22 */
-				0x5c (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a7.gpio1_23 */
-				0x60 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a8.gpio1_24 */
-			>;
-		};
-
-		i2c0_pins: pinmux_i2c0_pins {
-			pinctrl-single,pins = <
-				0x188 (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_sda.i2c0_sda */
-				0x18c (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_scl.i2c0_scl */
-			>;
-		};
-
-		uart0_pins: pinmux_uart0_pins {
-			pinctrl-single,pins = <
-				0x170 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */
-				0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart0_txd.uart0_txd */
-			>;
-		};
-
-		clkout2_pin: pinmux_clkout2_pin {
-			pinctrl-single,pins = <
-				0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */
-			>;
-		};
-
-		cpsw_default: cpsw_default {
-			pinctrl-single,pins = <
-				/* Slave 1 */
-				0x110 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxerr.mii1_rxerr */
-				0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txen.mii1_txen */
-				0x118 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxdv.mii1_rxdv */
-				0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd3.mii1_txd3 */
-				0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd2.mii1_txd2 */
-				0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd1.mii1_txd1 */
-				0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd0.mii1_txd0 */
-				0x12c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_txclk.mii1_txclk */
-				0x130 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxclk.mii1_rxclk */
-				0x134 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd3.mii1_rxd3 */
-				0x138 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd2.mii1_rxd2 */
-				0x13c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd1.mii1_rxd1 */
-				0x140 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd0.mii1_rxd0 */
-			>;
-		};
-
-		cpsw_sleep: cpsw_sleep {
-			pinctrl-single,pins = <
-				/* Slave 1 reset value */
-				0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			>;
-		};
-
-		davinci_mdio_default: davinci_mdio_default {
-			pinctrl-single,pins = <
-				/* MDIO */
-				0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)	/* mdio_data.mdio_data */
-				0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0)			/* mdio_clk.mdio_clk */
-			>;
-		};
-
-		davinci_mdio_sleep: davinci_mdio_sleep {
-			pinctrl-single,pins = <
-				/* MDIO reset value */
-				0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			>;
-		};
-	};
-
-	ocp {
-		uart0: serial@44e09000 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&uart0_pins>;
-
-			status = "okay";
-		};
-
-		musb: usb@47400000 {
-			status = "okay";
-
-			control@44e10000 {
-				status = "okay";
-			};
-
-			usb-phy@47401300 {
-				status = "okay";
-			};
-
-			usb-phy@47401b00 {
-				status = "okay";
-			};
-
-			usb@47401000 {
-				status = "okay";
-			};
-
-			usb@47401800 {
-				status = "okay";
-				dr_mode = "host";
-			};
-
-			dma-controller@07402000  {
-				status = "okay";
-			};
-		};
-
-		i2c0: i2c@44e0b000 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&i2c0_pins>;
-
-			status = "okay";
-			clock-frequency = <400000>;
-
-			tps: tps@24 {
-				reg = <0x24>;
-			};
-
-		};
-	};
-
-	leds {
-		pinctrl-names = "default";
-		pinctrl-0 = <&user_leds_s0>;
-
-		compatible = "gpio-leds";
-
-		led@2 {
-			label = "beaglebone:green:heartbeat";
-			gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "heartbeat";
-			default-state = "off";
-		};
-
-		led@3 {
-			label = "beaglebone:green:mmc0";
-			gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "mmc0";
-			default-state = "off";
-		};
-
-		led@4 {
-			label = "beaglebone:green:usr2";
-			gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
-			default-state = "off";
-		};
-
-		led@5 {
-			label = "beaglebone:green:usr3";
-			gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
-			default-state = "off";
-		};
-	};
-};
-
-/include/ "tps65217.dtsi"
-
-&tps {
-	regulators {
-		dcdc1_reg: regulator@0 {
-			regulator-always-on;
-		};
-
-		dcdc2_reg: regulator@1 {
-			/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
-			regulator-name = "vdd_mpu";
-			regulator-min-microvolt = <925000>;
-			regulator-max-microvolt = <1325000>;
-			regulator-boot-on;
-			regulator-always-on;
-		};
-
-		dcdc3_reg: regulator@2 {
-			/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
-			regulator-name = "vdd_core";
-			regulator-min-microvolt = <925000>;
-			regulator-max-microvolt = <1150000>;
-			regulator-boot-on;
-			regulator-always-on;
-		};
-
-		ldo1_reg: regulator@3 {
-			regulator-always-on;
-		};
-
-		ldo2_reg: regulator@4 {
-			regulator-always-on;
-		};
-
-		ldo3_reg: regulator@5 {
-			regulator-always-on;
-		};
-
-		ldo4_reg: regulator@6 {
-			regulator-always-on;
-		};
-	};
-};
-
-&cpsw_emac0 {
-	phy_id = <&davinci_mdio>, <0>;
-	phy-mode = "mii";
-};
-
-&cpsw_emac1 {
-	phy_id = <&davinci_mdio>, <1>;
-	phy-mode = "mii";
-};
-
-&mac {
-	pinctrl-names = "default", "sleep";
-	pinctrl-0 = <&cpsw_default>;
-	pinctrl-1 = <&cpsw_sleep>;
-
-};
-
-&davinci_mdio {
-	pinctrl-names = "default", "sleep";
-	pinctrl-0 = <&davinci_mdio_default>;
-	pinctrl-1 = <&davinci_mdio_sleep>;
-};
+#include "am335x-bone-common.dtsi"
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
new file mode 100644
index 0000000..68d12aa
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+#include "am33xx.dtsi"
+#include "am335x-bone-common.dtsi"
+
+&ldo3_reg {
+	regulator-min-microvolt = <1800000>;
+	regulator-max-microvolt = <1800000>;
+	regulator-always-on;
+};
+
-- 
1.8.2.1

Re: [PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black

[George Cherian]

On 9/6/2013 12:03 PM, Koen Kooi wrote:
> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added,
> so create a common dtsi both can use. MMC support for AM335x still isn't in, so
> only the LDO change has been added.
>
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>   .../{am335x-bone.dts => am335x-bone-common.dtsi}   |   3 -
>   arch/arm/boot/dts/am335x-bone.dts                  | 256 +--------------------
>   arch/arm/boot/dts/am335x-boneblack.dts             |  18 ++
>   3 files changed, 19 insertions(+), 258 deletions(-)
>   copy arch/arm/boot/dts/{am335x-bone.dts => am335x-bone-common.dtsi} (99%)
>   create mode 100644 arch/arm/boot/dts/am335x-boneblack.dts
How did you test am335x-boneblack.dtb? where are the Makefile changes 
for boneblack?


> diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone-common.dtsi
> similarity index 99%
> copy from arch/arm/boot/dts/am335x-bone.dts
> copy to arch/arm/boot/dts/am335x-bone-common.dtsi
> index d318987..2f66ded 100644
> --- a/arch/arm/boot/dts/am335x-bone.dts
> +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
> @@ -5,9 +5,6 @@
>    * it under the terms of the GNU General Public License version 2 as
>    * published by the Free Software Foundation.
>    */
> -/dts-v1/;
> -
> -#include "am33xx.dtsi"
>   
>   / {
>   	model = "TI AM335x BeagleBone";
> diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
> index d318987..7993c48 100644
> --- a/arch/arm/boot/dts/am335x-bone.dts
> +++ b/arch/arm/boot/dts/am335x-bone.dts
> @@ -8,258 +8,4 @@
>   /dts-v1/;
>   
>   #include "am33xx.dtsi"
> -
> -/ {
> -	model = "TI AM335x BeagleBone";
> -	compatible = "ti,am335x-bone", "ti,am33xx";
> -
> -	cpus {
> -		cpu@0 {
> -			cpu0-supply = <&dcdc2_reg>;
> -		};
> -	};
> -
> -	memory {
> -		device_type = "memory";
> -		reg = <0x80000000 0x10000000>; /* 256 MB */
> -	};
> -
> -	am33xx_pinmux: pinmux@44e10800 {
> -		pinctrl-names = "default";
> -		pinctrl-0 = <&clkout2_pin>;
> -
> -		user_leds_s0: user_leds_s0 {
> -			pinctrl-single,pins = <
> -				0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a5.gpio1_21 */
> -				0x58 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a6.gpio1_22 */
> -				0x5c (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a7.gpio1_23 */
> -				0x60 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a8.gpio1_24 */
> -			>;
> -		};
> -
> -		i2c0_pins: pinmux_i2c0_pins {
> -			pinctrl-single,pins = <
> -				0x188 (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_sda.i2c0_sda */
> -				0x18c (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_scl.i2c0_scl */
> -			>;
> -		};
> -
> -		uart0_pins: pinmux_uart0_pins {
> -			pinctrl-single,pins = <
> -				0x170 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */
> -				0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart0_txd.uart0_txd */
> -			>;
> -		};
> -
> -		clkout2_pin: pinmux_clkout2_pin {
> -			pinctrl-single,pins = <
> -				0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */
> -			>;
> -		};
> -
> -		cpsw_default: cpsw_default {
> -			pinctrl-single,pins = <
> -				/* Slave 1 */
> -				0x110 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxerr.mii1_rxerr */
> -				0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txen.mii1_txen */
> -				0x118 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxdv.mii1_rxdv */
> -				0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd3.mii1_txd3 */
> -				0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd2.mii1_txd2 */
> -				0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd1.mii1_txd1 */
> -				0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd0.mii1_txd0 */
> -				0x12c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_txclk.mii1_txclk */
> -				0x130 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxclk.mii1_rxclk */
> -				0x134 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd3.mii1_rxd3 */
> -				0x138 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd2.mii1_rxd2 */
> -				0x13c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd1.mii1_rxd1 */
> -				0x140 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd0.mii1_rxd0 */
> -			>;
> -		};
> -
> -		cpsw_sleep: cpsw_sleep {
> -			pinctrl-single,pins = <
> -				/* Slave 1 reset value */
> -				0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)
> -				0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
> -				0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
> -				0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
> -				0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
> -				0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
> -				0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
> -				0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
> -				0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
> -				0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
> -				0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
> -				0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
> -				0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
> -			>;
> -		};
> -
> -		davinci_mdio_default: davinci_mdio_default {
> -			pinctrl-single,pins = <
> -				/* MDIO */
> -				0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)	/* mdio_data.mdio_data */
> -				0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0)			/* mdio_clk.mdio_clk */
> -			>;
> -		};
> -
> -		davinci_mdio_sleep: davinci_mdio_sleep {
> -			pinctrl-single,pins = <
> -				/* MDIO reset value */
> -				0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
> -				0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
> -			>;
> -		};
> -	};
> -
> -	ocp {
> -		uart0: serial@44e09000 {
> -			pinctrl-names = "default";
> -			pinctrl-0 = <&uart0_pins>;
> -
> -			status = "okay";
> -		};
> -
> -		musb: usb@47400000 {
> -			status = "okay";
> -
> -			control@44e10000 {
> -				status = "okay";
> -			};
> -
> -			usb-phy@47401300 {
> -				status = "okay";
> -			};
> -
> -			usb-phy@47401b00 {
> -				status = "okay";
> -			};
> -
> -			usb@47401000 {
> -				status = "okay";
> -			};
> -
> -			usb@47401800 {
> -				status = "okay";
> -				dr_mode = "host";
> -			};
> -
> -			dma-controller@07402000  {
> -				status = "okay";
> -			};
> -		};
> -
> -		i2c0: i2c@44e0b000 {
> -			pinctrl-names = "default";
> -			pinctrl-0 = <&i2c0_pins>;
> -
> -			status = "okay";
> -			clock-frequency = <400000>;
> -
> -			tps: tps@24 {
> -				reg = <0x24>;
> -			};
> -
> -		};
> -	};
> -
> -	leds {
> -		pinctrl-names = "default";
> -		pinctrl-0 = <&user_leds_s0>;
> -
> -		compatible = "gpio-leds";
> -
> -		led@2 {
> -			label = "beaglebone:green:heartbeat";
> -			gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
> -			linux,default-trigger = "heartbeat";
> -			default-state = "off";
> -		};
> -
> -		led@3 {
> -			label = "beaglebone:green:mmc0";
> -			gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
> -			linux,default-trigger = "mmc0";
> -			default-state = "off";
> -		};
> -
> -		led@4 {
> -			label = "beaglebone:green:usr2";
> -			gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
> -			default-state = "off";
> -		};
> -
> -		led@5 {
> -			label = "beaglebone:green:usr3";
> -			gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
> -			default-state = "off";
> -		};
> -	};
> -};
> -
> -/include/ "tps65217.dtsi"
> -
> -&tps {
> -	regulators {
> -		dcdc1_reg: regulator@0 {
> -			regulator-always-on;
> -		};
> -
> -		dcdc2_reg: regulator@1 {
> -			/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
> -			regulator-name = "vdd_mpu";
> -			regulator-min-microvolt = <925000>;
> -			regulator-max-microvolt = <1325000>;
> -			regulator-boot-on;
> -			regulator-always-on;
> -		};
> -
> -		dcdc3_reg: regulator@2 {
> -			/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
> -			regulator-name = "vdd_core";
> -			regulator-min-microvolt = <925000>;
> -			regulator-max-microvolt = <1150000>;
> -			regulator-boot-on;
> -			regulator-always-on;
> -		};
> -
> -		ldo1_reg: regulator@3 {
> -			regulator-always-on;
> -		};
> -
> -		ldo2_reg: regulator@4 {
> -			regulator-always-on;
> -		};
> -
> -		ldo3_reg: regulator@5 {
> -			regulator-always-on;
> -		};
> -
> -		ldo4_reg: regulator@6 {
> -			regulator-always-on;
> -		};
> -	};
> -};
> -
> -&cpsw_emac0 {
> -	phy_id = <&davinci_mdio>, <0>;
> -	phy-mode = "mii";
> -};
> -
> -&cpsw_emac1 {
> -	phy_id = <&davinci_mdio>, <1>;
> -	phy-mode = "mii";
> -};
> -
> -&mac {
> -	pinctrl-names = "default", "sleep";
> -	pinctrl-0 = <&cpsw_default>;
> -	pinctrl-1 = <&cpsw_sleep>;
> -
> -};
> -
> -&davinci_mdio {
> -	pinctrl-names = "default", "sleep";
> -	pinctrl-0 = <&davinci_mdio_default>;
> -	pinctrl-1 = <&davinci_mdio_sleep>;
> -};
> +#include "am335x-bone-common.dtsi"
> diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
> new file mode 100644
> index 0000000..68d12aa
> --- /dev/null
> +++ b/arch/arm/boot/dts/am335x-boneblack.dts
> @@ -0,0 +1,18 @@
> +/*
> + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +/dts-v1/;
> +
> +#include "am33xx.dtsi"
Why cant we add am33xx.dtsi  in am335x-bone-common.dtsi ?
> +#include "am335x-bone-common.dtsi"
> +
> +&ldo3_reg {
> +	regulator-min-microvolt = <1800000>;
> +	regulator-max-microvolt = <1800000>;
> +	regulator-always-on;
> +};
> +
With this ldo values mmc was not working for me on Boneblack.
got it working with

&ldo3_reg {
	regulator-min-microvolt = <1800000>;
	regulator-max-microvolt = <3300000>;
	regulator-always-on;
};



-- 
-George

Re: [PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black

[Koen Kooi]

Op 6 sep. 2013, om 08:57 heeft George Cherian <george.cherian@ti.com> het volgende geschreven:

> On 9/6/2013 12:03 PM, Koen Kooi wrote:
>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added,
>> so create a common dtsi both can use. MMC support for AM335x still isn't in, so
>> only the LDO change has been added.
>> 
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>> ---
>>  .../{am335x-bone.dts => am335x-bone-common.dtsi}   |   3 -
>>  arch/arm/boot/dts/am335x-bone.dts                  | 256 +--------------------
>>  arch/arm/boot/dts/am335x-boneblack.dts             |  18 ++
>>  3 files changed, 19 insertions(+), 258 deletions(-)
>>  copy arch/arm/boot/dts/{am335x-bone.dts => am335x-bone-common.dtsi} (99%)
>>  create mode 100644 arch/arm/boot/dts/am335x-boneblack.dts
> How did you test am335x-boneblack.dtb? where are the Makefile changes for boneblack?

Ah, I missed the makefile in my commit. I have a bunch of other patches on top to make more stuff work.

[..]

>> 
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/am335x-boneblack.dts
>> @@ -0,0 +1,18 @@
>> +/*
>> + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2 as
>> + * published by the Free Software Foundation.
>> + */
>> +/dts-v1/;
>> +
>> +#include "am33xx.dtsi"
> Why cant we add am33xx.dtsi  in am335x-bone-common.dtsi ?

That didn't work when I tried it. It did work before the preprocessor changes when using /include/

>> +#include "am335x-bone-common.dtsi"
>> +
>> +&ldo3_reg {
>> +	regulator-min-microvolt = <1800000>;
>> +	regulator-max-microvolt = <1800000>;
>> +	regulator-always-on;
>> +};
>> +
> With this ldo values mmc was not working for me on Boneblack.
> got it working with
> 
> &ldo3_reg {
> 	regulator-min-microvolt = <1800000>;
> 	regulator-max-microvolt = <3300000>;
> 	regulator-always-on;
> };

That LDO is shared, the other consumer will get fried if you use 3.3V. I forget if it's DDR3 or HDMI.

Re: [PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black

[George Cherian]

On 9/6/2013 12:40 PM, Koen Kooi wrote:
> Op 6 sep. 2013, om 08:57 heeft George Cherian <george.cherian@ti.com> het volgende geschreven:
>
>> On 9/6/2013 12:03 PM, Koen Kooi wrote:
>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added,
>>> so create a common dtsi both can use. MMC support for AM335x still isn't in, so
>>> only the LDO change has been added.
>>>
>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>>> ---
>>>   .../{am335x-bone.dts => am335x-bone-common.dtsi}   |   3 -
>>>   arch/arm/boot/dts/am335x-bone.dts                  | 256 +--------------------
>>>   arch/arm/boot/dts/am335x-boneblack.dts             |  18 ++
>>>   3 files changed, 19 insertions(+), 258 deletions(-)
>>>   copy arch/arm/boot/dts/{am335x-bone.dts => am335x-bone-common.dtsi} (99%)
>>>   create mode 100644 arch/arm/boot/dts/am335x-boneblack.dts
>> How did you test am335x-boneblack.dtb? where are the Makefile changes for boneblack?
> Ah, I missed the makefile in my commit. I have a bunch of other patches on top to make more stuff work.
>
> [..]
>
>>> --- /dev/null
>>> +++ b/arch/arm/boot/dts/am335x-boneblack.dts
>>> @@ -0,0 +1,18 @@
>>> +/*
>>> + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
>>> + *
>>> + * This program is free software; you can redistribute it and/or modify
>>> + * it under the terms of the GNU General Public License version 2 as
>>> + * published by the Free Software Foundation.
>>> + */
>>> +/dts-v1/;
>>> +
>>> +#include "am33xx.dtsi"
>> Why cant we add am33xx.dtsi  in am335x-bone-common.dtsi ?
> That didn't work when I tried it. It did work before the preprocessor changes when using /include/

It will work......
>
>>> +#include "am335x-bone-common.dtsi"
>>> +
>>> +&ldo3_reg {
>>> +	regulator-min-microvolt = <1800000>;
>>> +	regulator-max-microvolt = <1800000>;
>>> +	regulator-always-on;
>>> +};
>>> +
>> With this ldo values mmc was not working for me on Boneblack.
>> got it working with
>>
>> &ldo3_reg {
>> 	regulator-min-microvolt = <1800000>;
>> 	regulator-max-microvolt = <3300000>;
>> 	regulator-always-on;
>> };
> That LDO is shared, the other consumer will get fried if you use 3.3V. I forget if it's DDR3 or HDMI.


-- 
-George

Re: [PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black

[Koen Kooi]

Op 6 sep. 2013, om 09:10 heeft Koen Kooi <koen@dominion.thruhere.net> het volgende geschreven:

> 
> Op 6 sep. 2013, om 08:57 heeft George Cherian <george.cherian@ti.com> het volgende geschreven:
> 
>> On 9/6/2013 12:03 PM, Koen Kooi wrote:
>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added,
>>> so create a common dtsi both can use. MMC support for AM335x still isn't in, so
>>> only the LDO change has been added.
>>> 
>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>>> ---
>>> .../{am335x-bone.dts => am335x-bone-common.dtsi}   |   3 -
>>> arch/arm/boot/dts/am335x-bone.dts                  | 256 +--------------------
>>> arch/arm/boot/dts/am335x-boneblack.dts             |  18 ++
>>> 3 files changed, 19 insertions(+), 258 deletions(-)
>>> copy arch/arm/boot/dts/{am335x-bone.dts => am335x-bone-common.dtsi} (99%)
>>> create mode 100644 arch/arm/boot/dts/am335x-boneblack.dts
>> How did you test am335x-boneblack.dtb? where are the Makefile changes for boneblack?
> 
> Ah, I missed the makefile in my commit. I have a bunch of other patches on top to make more stuff work.
> 
> [..]
> 
>>> 
>>> --- /dev/null
>>> +++ b/arch/arm/boot/dts/am335x-boneblack.dts
>>> @@ -0,0 +1,18 @@
>>> +/*
>>> + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
>>> + *
>>> + * This program is free software; you can redistribute it and/or modify
>>> + * it under the terms of the GNU General Public License version 2 as
>>> + * published by the Free Software Foundation.
>>> + */
>>> +/dts-v1/;
>>> +
>>> +#include "am33xx.dtsi"
>> Why cant we add am33xx.dtsi  in am335x-bone-common.dtsi ?
> 
> That didn't work when I tried it. It did work before the preprocessor changes when using /include/
> 
>>> +#include "am335x-bone-common.dtsi"
>>> +
>>> +&ldo3_reg {
>>> +	regulator-min-microvolt = <1800000>;
>>> +	regulator-max-microvolt = <1800000>;
>>> +	regulator-always-on;
>>> +};
>>> +
>> With this ldo values mmc was not working for me on Boneblack.
>> got it working with
>> 
>> &ldo3_reg {
>> 	regulator-min-microvolt = <1800000>;
>> 	regulator-max-microvolt = <3300000>;
>> 	regulator-always-on;
>> };
> 
> That LDO is shared, the other consumer will get fried if you use 3.3V. I forget if it's DDR3 or HDMI.

On the black the LDOs changed, so for mmc (which (*$)@()$@) still isn't in mainline) you need:

diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index e76d575..ae90a30 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -362,6 +362,13 @@
                        regulator-always-on;
                };
        };
+
+       vmmcsd_fixed: fixedregulator@0 {
+               compatible = "regulator-fixed";
+               regulator-name = "vmmcsd_fixed";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+       };
 };
 
 &cpsw_emac0 {
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
index b4237fc..e092a61 100644
--- a/arch/arm/boot/dts/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
@@ -16,7 +16,12 @@
        regulator-always-on;
 };
 
-&mmc2 {
+&mmc1 { 
+       vmmc-supply = <&vmmcsd_fixed>;
+};
+
+&mmc2 { 
+       vmmc-supply = <&vmmcsd_fixed>;
        pinctrl-names = "default";
        pinctrl-0 = <&emmc_pins>;
        vmmc-supply = <&ldo3_reg>;

Re: [PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black

[Koen Kooi]

Op 6 sep. 2013, om 10:51 heeft Koen Kooi <koen@dominion.thruhere.net> het volgende geschreven:

> 
> Op 6 sep. 2013, om 09:10 heeft Koen Kooi <koen@dominion.thruhere.net> het volgende geschreven:
> 
>> 
>> Op 6 sep. 2013, om 08:57 heeft George Cherian <george.cherian@ti.com> het volgende geschreven:
>> 
>>> On 9/6/2013 12:03 PM, Koen Kooi wrote:
>>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added,
>>>> so create a common dtsi both can use. MMC support for AM335x still isn't in, so
>>>> only the LDO change has been added.
>>>> 
>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>>>> ---
>>>> .../{am335x-bone.dts => am335x-bone-common.dtsi}   |   3 -
>>>> arch/arm/boot/dts/am335x-bone.dts                  | 256 +--------------------
>>>> arch/arm/boot/dts/am335x-boneblack.dts             |  18 ++
>>>> 3 files changed, 19 insertions(+), 258 deletions(-)
>>>> copy arch/arm/boot/dts/{am335x-bone.dts => am335x-bone-common.dtsi} (99%)
>>>> create mode 100644 arch/arm/boot/dts/am335x-boneblack.dts
>>> How did you test am335x-boneblack.dtb? where are the Makefile changes for boneblack?
>> 
>> Ah, I missed the makefile in my commit. I have a bunch of other patches on top to make more stuff work.
>> 
>> [..]
>> 
>>>> 
>>>> --- /dev/null
>>>> +++ b/arch/arm/boot/dts/am335x-boneblack.dts
>>>> @@ -0,0 +1,18 @@
>>>> +/*
>>>> + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
>>>> + *
>>>> + * This program is free software; you can redistribute it and/or modify
>>>> + * it under the terms of the GNU General Public License version 2 as
>>>> + * published by the Free Software Foundation.
>>>> + */
>>>> +/dts-v1/;
>>>> +
>>>> +#include "am33xx.dtsi"
>>> Why cant we add am33xx.dtsi  in am335x-bone-common.dtsi ?
>> 
>> That didn't work when I tried it. It did work before the preprocessor changes when using /include/
>> 
>>>> +#include "am335x-bone-common.dtsi"
>>>> +
>>>> +&ldo3_reg {
>>>> +	regulator-min-microvolt = <1800000>;
>>>> +	regulator-max-microvolt = <1800000>;
>>>> +	regulator-always-on;
>>>> +};
>>>> +
>>> With this ldo values mmc was not working for me on Boneblack.
>>> got it working with
>>> 
>>> &ldo3_reg {
>>> 	regulator-min-microvolt = <1800000>;
>>> 	regulator-max-microvolt = <3300000>;
>>> 	regulator-always-on;
>>> };
>> 
>> That LDO is shared, the other consumer will get fried if you use 3.3V. I forget if it's DDR3 or HDMI.
> 
> On the black the LDOs changed, so for mmc (which (*$)@()$@) still isn't in mainline) you need:
> 
> diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
> index e76d575..ae90a30 100644
> --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
> +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
> @@ -362,6 +362,13 @@
>                        regulator-always-on;
>                };
>        };
> +
> +       vmmcsd_fixed: fixedregulator@0 {
> +               compatible = "regulator-fixed";
> +               regulator-name = "vmmcsd_fixed";
> +               regulator-min-microvolt = <3300000>;
> +               regulator-max-microvolt = <3300000>;
> +       };
> };
> 
> &cpsw_emac0 {
> diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
> index b4237fc..e092a61 100644
> --- a/arch/arm/boot/dts/am335x-boneblack.dts
> +++ b/arch/arm/boot/dts/am335x-boneblack.dts
> @@ -16,7 +16,12 @@
>        regulator-always-on;
> };
> 
> -&mmc2 {
> +&mmc1 { 
> +       vmmc-supply = <&vmmcsd_fixed>;
> +};
> +
> +&mmc2 { 
> +       vmmc-supply = <&vmmcsd_fixed>;
>        pinctrl-names = "default";
>        pinctrl-0 = <&emmc_pins>;
>        vmmc-supply = <&ldo3_reg>;

And links to all the patches:

Card-detect fix: https://github.com/koenkooi/linux/commit/c3c87f330812275ce6aa791e2a81f4c124fe981b
Add eMMC DT node: https://github.com/koenkooi/linux/commit/22459b61a7e80e05ab1cd02b9ec0a4467bf9fa4b
Fix mmc regulator: https://github.com/koenkooi/linux/commit/8007217893b7d809782e08fa1f0d56b1083ec00d

As soon as TI gets their act together and the EDMA/MMC patchset is in Linus' tree I'll rebase and submit the above properly.

regards,

Koen

Re: [PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black

[Kevin Hilman]

Koen Kooi <koen@dominion.thruhere.net> writes:

> Op 6 sep. 2013, om 10:51 heeft Koen Kooi <koen@dominion.thruhere.net> het volgende geschreven:
>
>> 
>> Op 6 sep. 2013, om 09:10 heeft Koen Kooi <koen@dominion.thruhere.net> het volgende geschreven:
>> 
>>> 
>>> Op 6 sep. 2013, om 08:57 heeft George Cherian <george.cherian@ti.com> het volgende geschreven:
>>> 
>>>> On 9/6/2013 12:03 PM, Koen Kooi wrote:
>>>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added,
>>>>> so create a common dtsi both can use. MMC support for AM335x still isn't in, so
>>>>> only the LDO change has been added.
>>>>> 
>>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>>>>> ---
>>>>> .../{am335x-bone.dts => am335x-bone-common.dtsi}   |   3 -
>>>>> arch/arm/boot/dts/am335x-bone.dts                  | 256 +--------------------
>>>>> arch/arm/boot/dts/am335x-boneblack.dts             |  18 ++
>>>>> 3 files changed, 19 insertions(+), 258 deletions(-)
>>>>> copy arch/arm/boot/dts/{am335x-bone.dts => am335x-bone-common.dtsi} (99%)
>>>>> create mode 100644 arch/arm/boot/dts/am335x-boneblack.dts
>>>> How did you test am335x-boneblack.dtb? where are the Makefile changes for boneblack?
>>> 
>>> Ah, I missed the makefile in my commit. I have a bunch of other patches on top to make more stuff work.
>>> 
>>> [..]
>>> 
>>>>> 
>>>>> --- /dev/null
>>>>> +++ b/arch/arm/boot/dts/am335x-boneblack.dts
>>>>> @@ -0,0 +1,18 @@
>>>>> +/*
>>>>> + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
>>>>> + *
>>>>> + * This program is free software; you can redistribute it and/or modify
>>>>> + * it under the terms of the GNU General Public License version 2 as
>>>>> + * published by the Free Software Foundation.
>>>>> + */
>>>>> +/dts-v1/;
>>>>> +
>>>>> +#include "am33xx.dtsi"
>>>> Why cant we add am33xx.dtsi  in am335x-bone-common.dtsi ?
>>> 
>>> That didn't work when I tried it. It did work before the preprocessor changes when using /include/
>>> 
>>>>> +#include "am335x-bone-common.dtsi"
>>>>> +
>>>>> +&ldo3_reg {
>>>>> +	regulator-min-microvolt = <1800000>;
>>>>> +	regulator-max-microvolt = <1800000>;
>>>>> +	regulator-always-on;
>>>>> +};
>>>>> +
>>>> With this ldo values mmc was not working for me on Boneblack.
>>>> got it working with
>>>> 
>>>> &ldo3_reg {
>>>> 	regulator-min-microvolt = <1800000>;
>>>> 	regulator-max-microvolt = <3300000>;
>>>> 	regulator-always-on;
>>>> };
>>> 
>>> That LDO is shared, the other consumer will get fried if you use 3.3V. I forget if it's DDR3 or HDMI.
>> 
>> On the black the LDOs changed, so for mmc (which (*$)@()$@) still isn't in mainline) you need:
>> 
>> diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
>> index e76d575..ae90a30 100644
>> --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
>> +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
>> @@ -362,6 +362,13 @@
>>                        regulator-always-on;
>>                };
>>        };
>> +
>> +       vmmcsd_fixed: fixedregulator@0 {
>> +               compatible = "regulator-fixed";
>> +               regulator-name = "vmmcsd_fixed";
>> +               regulator-min-microvolt = <3300000>;
>> +               regulator-max-microvolt = <3300000>;
>> +       };
>> };
>> 
>> &cpsw_emac0 {
>> diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
>> index b4237fc..e092a61 100644
>> --- a/arch/arm/boot/dts/am335x-boneblack.dts
>> +++ b/arch/arm/boot/dts/am335x-boneblack.dts
>> @@ -16,7 +16,12 @@
>>        regulator-always-on;
>> };
>> 
>> -&mmc2 {
>> +&mmc1 { 
>> +       vmmc-supply = <&vmmcsd_fixed>;
>> +};
>> +
>> +&mmc2 { 
>> +       vmmc-supply = <&vmmcsd_fixed>;
>>        pinctrl-names = "default";
>>        pinctrl-0 = <&emmc_pins>;
>>        vmmc-supply = <&ldo3_reg>;
>
> And links to all the patches:
>
> Card-detect fix: https://github.com/koenkooi/linux/commit/c3c87f330812275ce6aa791e2a81f4c124fe981b
> Add eMMC DT node: https://github.com/koenkooi/linux/commit/22459b61a7e80e05ab1cd02b9ec0a4467bf9fa4b
> Fix mmc regulator: https://github.com/koenkooi/linux/commit/8007217893b7d809782e08fa1f0d56b1083ec00d
>
> As soon as TI gets their act together and the EDMA/MMC patchset is in
> Linus' tree I'll rebase and submit the above properly.

In the meantime, can you resubmit the minimal splitup with the LDO
change?

Thanks,

Kevin

Re: [PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black

[Kevin Hilman]

On Mon, Sep 9, 2013 at 7:50 AM, Kevin Hilman <khilman@linaro.org> wrote:
> Koen Kooi <koen@dominion.thruhere.net> writes:
>
>> Op 6 sep. 2013, om 10:51 heeft Koen Kooi <koen@dominion.thruhere.net> het volgende geschreven:
>>
>>>
>>> Op 6 sep. 2013, om 09:10 heeft Koen Kooi <koen@dominion.thruhere.net> het volgende geschreven:
>>>
>>>>
>>>> Op 6 sep. 2013, om 08:57 heeft George Cherian <george.cherian@ti.com> het volgende geschreven:
>>>>
>>>>> On 9/6/2013 12:03 PM, Koen Kooi wrote:
>>>>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added,
>>>>>> so create a common dtsi both can use. MMC support for AM335x still isn't in, so
>>>>>> only the LDO change has been added.
>>>>>>
>>>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>>>>>> ---
>>>>>> .../{am335x-bone.dts => am335x-bone-common.dtsi}   |   3 -
>>>>>> arch/arm/boot/dts/am335x-bone.dts                  | 256 +--------------------
>>>>>> arch/arm/boot/dts/am335x-boneblack.dts             |  18 ++
>>>>>> 3 files changed, 19 insertions(+), 258 deletions(-)
>>>>>> copy arch/arm/boot/dts/{am335x-bone.dts => am335x-bone-common.dtsi} (99%)
>>>>>> create mode 100644 arch/arm/boot/dts/am335x-boneblack.dts
>>>>> How did you test am335x-boneblack.dtb? where are the Makefile changes for boneblack?
>>>>
>>>> Ah, I missed the makefile in my commit. I have a bunch of other patches on top to make more stuff work.
>>>>
>>>> [..]
>>>>
>>>>>>
>>>>>> --- /dev/null
>>>>>> +++ b/arch/arm/boot/dts/am335x-boneblack.dts
>>>>>> @@ -0,0 +1,18 @@
>>>>>> +/*
>>>>>> + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
>>>>>> + *
>>>>>> + * This program is free software; you can redistribute it and/or modify
>>>>>> + * it under the terms of the GNU General Public License version 2 as
>>>>>> + * published by the Free Software Foundation.
>>>>>> + */
>>>>>> +/dts-v1/;
>>>>>> +
>>>>>> +#include "am33xx.dtsi"
>>>>> Why cant we add am33xx.dtsi  in am335x-bone-common.dtsi ?
>>>>
>>>> That didn't work when I tried it. It did work before the preprocessor changes when using /include/
>>>>
>>>>>> +#include "am335x-bone-common.dtsi"
>>>>>> +
>>>>>> +&ldo3_reg {
>>>>>> + regulator-min-microvolt = <1800000>;
>>>>>> + regulator-max-microvolt = <1800000>;
>>>>>> + regulator-always-on;
>>>>>> +};
>>>>>> +
>>>>> With this ldo values mmc was not working for me on Boneblack.
>>>>> got it working with
>>>>>
>>>>> &ldo3_reg {
>>>>>    regulator-min-microvolt = <1800000>;
>>>>>    regulator-max-microvolt = <3300000>;
>>>>>    regulator-always-on;
>>>>> };
>>>>
>>>> That LDO is shared, the other consumer will get fried if you use 3.3V. I forget if it's DDR3 or HDMI.
>>>
>>> On the black the LDOs changed, so for mmc (which (*$)@()$@) still isn't in mainline) you need:
>>>
>>> diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
>>> index e76d575..ae90a30 100644
>>> --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
>>> +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
>>> @@ -362,6 +362,13 @@
>>>                        regulator-always-on;
>>>                };
>>>        };
>>> +
>>> +       vmmcsd_fixed: fixedregulator@0 {
>>> +               compatible = "regulator-fixed";
>>> +               regulator-name = "vmmcsd_fixed";
>>> +               regulator-min-microvolt = <3300000>;
>>> +               regulator-max-microvolt = <3300000>;
>>> +       };
>>> };
>>>
>>> &cpsw_emac0 {
>>> diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
>>> index b4237fc..e092a61 100644
>>> --- a/arch/arm/boot/dts/am335x-boneblack.dts
>>> +++ b/arch/arm/boot/dts/am335x-boneblack.dts
>>> @@ -16,7 +16,12 @@
>>>        regulator-always-on;
>>> };
>>>
>>> -&mmc2 {
>>> +&mmc1 {
>>> +       vmmc-supply = <&vmmcsd_fixed>;
>>> +};
>>> +
>>> +&mmc2 {
>>> +       vmmc-supply = <&vmmcsd_fixed>;
>>>        pinctrl-names = "default";
>>>        pinctrl-0 = <&emmc_pins>;
>>>        vmmc-supply = <&ldo3_reg>;
>>
>> And links to all the patches:
>>
>> Card-detect fix: https://github.com/koenkooi/linux/commit/c3c87f330812275ce6aa791e2a81f4c124fe981b
>> Add eMMC DT node: https://github.com/koenkooi/linux/commit/22459b61a7e80e05ab1cd02b9ec0a4467bf9fa4b
>> Fix mmc regulator: https://github.com/koenkooi/linux/commit/8007217893b7d809782e08fa1f0d56b1083ec00d
>>
>> As soon as TI gets their act together and the EDMA/MMC patchset is in
>> Linus' tree I'll rebase and submit the above properly.
>
> In the meantime, can you resubmit the minimal splitup with the LDO
> change?

doh, I see you already did, sorry for the noise.

Kevin

[PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black

[Koen Kooi]

The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added,
so create a common dtsi both can use.

IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver
after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead
of 1.8.

MMC support for AM335x still isn't in, so only the LDO change has been added.

Cc: stable@vger.kernel.org

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Tested-by: Tom Rini <trini@ti.com>
Tested-by: Matt Porter <matt.porter@linaro.org>
---

Changes since v4:
	attempting to correctly to the cc: stable@ thing
Changes since v3:
	removed stray whitespace, spotted by Matt Porter
	added CC: stable
Changes since v2:
	Updated commit message to point out that the existing DT will damage the board.
Changes since v1:
	Added the Makefile entry for the new dts

 arch/arm/boot/dts/Makefile                |   1 +
 arch/arm/boot/dts/am335x-bone-common.dtsi | 262 ++++++++++++++++++++++++++++++
 arch/arm/boot/dts/am335x-bone.dts         | 256 +----------------------------
 arch/arm/boot/dts/am335x-boneblack.dts    |  17 ++
 4 files changed, 281 insertions(+), 255 deletions(-)
 create mode 100644 arch/arm/boot/dts/am335x-bone-common.dtsi
 create mode 100644 arch/arm/boot/dts/am335x-boneblack.dts

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 000cf76..d515c54 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -183,6 +183,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
 	am335x-evm.dtb \
 	am335x-evmsk.dtb \
 	am335x-bone.dtb \
+	am335x-boneblack.dtb \
 	am3517-evm.dtb \
 	am3517_mt_ventoux.dtb \
 	am43x-epos-evm.dtb
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
new file mode 100644
index 0000000..2f66ded
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -0,0 +1,262 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/ {
+	model = "TI AM335x BeagleBone";
+	compatible = "ti,am335x-bone", "ti,am33xx";
+
+	cpus {
+		cpu@0 {
+			cpu0-supply = <&dcdc2_reg>;
+		};
+	};
+
+	memory {
+		device_type = "memory";
+		reg = <0x80000000 0x10000000>; /* 256 MB */
+	};
+
+	am33xx_pinmux: pinmux@44e10800 {
+		pinctrl-names = "default";
+		pinctrl-0 = <&clkout2_pin>;
+
+		user_leds_s0: user_leds_s0 {
+			pinctrl-single,pins = <
+				0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a5.gpio1_21 */
+				0x58 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a6.gpio1_22 */
+				0x5c (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a7.gpio1_23 */
+				0x60 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a8.gpio1_24 */
+			>;
+		};
+
+		i2c0_pins: pinmux_i2c0_pins {
+			pinctrl-single,pins = <
+				0x188 (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_sda.i2c0_sda */
+				0x18c (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_scl.i2c0_scl */
+			>;
+		};
+
+		uart0_pins: pinmux_uart0_pins {
+			pinctrl-single,pins = <
+				0x170 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */
+				0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart0_txd.uart0_txd */
+			>;
+		};
+
+		clkout2_pin: pinmux_clkout2_pin {
+			pinctrl-single,pins = <
+				0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */
+			>;
+		};
+
+		cpsw_default: cpsw_default {
+			pinctrl-single,pins = <
+				/* Slave 1 */
+				0x110 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxerr.mii1_rxerr */
+				0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txen.mii1_txen */
+				0x118 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxdv.mii1_rxdv */
+				0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd3.mii1_txd3 */
+				0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd2.mii1_txd2 */
+				0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd1.mii1_txd1 */
+				0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd0.mii1_txd0 */
+				0x12c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_txclk.mii1_txclk */
+				0x130 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxclk.mii1_rxclk */
+				0x134 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd3.mii1_rxd3 */
+				0x138 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd2.mii1_rxd2 */
+				0x13c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd1.mii1_rxd1 */
+				0x140 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd0.mii1_rxd0 */
+			>;
+		};
+
+		cpsw_sleep: cpsw_sleep {
+			pinctrl-single,pins = <
+				/* Slave 1 reset value */
+				0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+				0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+				0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+				0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
+				0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+				0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+				0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+				0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
+				0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+				0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+				0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+				0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
+				0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+			>;
+		};
+
+		davinci_mdio_default: davinci_mdio_default {
+			pinctrl-single,pins = <
+				/* MDIO */
+				0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)	/* mdio_data.mdio_data */
+				0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0)			/* mdio_clk.mdio_clk */
+			>;
+		};
+
+		davinci_mdio_sleep: davinci_mdio_sleep {
+			pinctrl-single,pins = <
+				/* MDIO reset value */
+				0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+				0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
+			>;
+		};
+	};
+
+	ocp {
+		uart0: serial@44e09000 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&uart0_pins>;
+
+			status = "okay";
+		};
+
+		musb: usb@47400000 {
+			status = "okay";
+
+			control@44e10000 {
+				status = "okay";
+			};
+
+			usb-phy@47401300 {
+				status = "okay";
+			};
+
+			usb-phy@47401b00 {
+				status = "okay";
+			};
+
+			usb@47401000 {
+				status = "okay";
+			};
+
+			usb@47401800 {
+				status = "okay";
+				dr_mode = "host";
+			};
+
+			dma-controller@07402000  {
+				status = "okay";
+			};
+		};
+
+		i2c0: i2c@44e0b000 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&i2c0_pins>;
+
+			status = "okay";
+			clock-frequency = <400000>;
+
+			tps: tps@24 {
+				reg = <0x24>;
+			};
+
+		};
+	};
+
+	leds {
+		pinctrl-names = "default";
+		pinctrl-0 = <&user_leds_s0>;
+
+		compatible = "gpio-leds";
+
+		led@2 {
+			label = "beaglebone:green:heartbeat";
+			gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "heartbeat";
+			default-state = "off";
+		};
+
+		led@3 {
+			label = "beaglebone:green:mmc0";
+			gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "mmc0";
+			default-state = "off";
+		};
+
+		led@4 {
+			label = "beaglebone:green:usr2";
+			gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
+			default-state = "off";
+		};
+
+		led@5 {
+			label = "beaglebone:green:usr3";
+			gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
+			default-state = "off";
+		};
+	};
+};
+
+/include/ "tps65217.dtsi"
+
+&tps {
+	regulators {
+		dcdc1_reg: regulator@0 {
+			regulator-always-on;
+		};
+
+		dcdc2_reg: regulator@1 {
+			/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
+			regulator-name = "vdd_mpu";
+			regulator-min-microvolt = <925000>;
+			regulator-max-microvolt = <1325000>;
+			regulator-boot-on;
+			regulator-always-on;
+		};
+
+		dcdc3_reg: regulator@2 {
+			/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
+			regulator-name = "vdd_core";
+			regulator-min-microvolt = <925000>;
+			regulator-max-microvolt = <1150000>;
+			regulator-boot-on;
+			regulator-always-on;
+		};
+
+		ldo1_reg: regulator@3 {
+			regulator-always-on;
+		};
+
+		ldo2_reg: regulator@4 {
+			regulator-always-on;
+		};
+
+		ldo3_reg: regulator@5 {
+			regulator-always-on;
+		};
+
+		ldo4_reg: regulator@6 {
+			regulator-always-on;
+		};
+	};
+};
+
+&cpsw_emac0 {
+	phy_id = <&davinci_mdio>, <0>;
+	phy-mode = "mii";
+};
+
+&cpsw_emac1 {
+	phy_id = <&davinci_mdio>, <1>;
+	phy-mode = "mii";
+};
+
+&mac {
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&cpsw_default>;
+	pinctrl-1 = <&cpsw_sleep>;
+
+};
+
+&davinci_mdio {
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&davinci_mdio_default>;
+	pinctrl-1 = <&davinci_mdio_sleep>;
+};
diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
index d318987..7993c48 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -8,258 +8,4 @@
 /dts-v1/;
 
 #include "am33xx.dtsi"
-
-/ {
-	model = "TI AM335x BeagleBone";
-	compatible = "ti,am335x-bone", "ti,am33xx";
-
-	cpus {
-		cpu@0 {
-			cpu0-supply = <&dcdc2_reg>;
-		};
-	};
-
-	memory {
-		device_type = "memory";
-		reg = <0x80000000 0x10000000>; /* 256 MB */
-	};
-
-	am33xx_pinmux: pinmux@44e10800 {
-		pinctrl-names = "default";
-		pinctrl-0 = <&clkout2_pin>;
-
-		user_leds_s0: user_leds_s0 {
-			pinctrl-single,pins = <
-				0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a5.gpio1_21 */
-				0x58 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a6.gpio1_22 */
-				0x5c (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a7.gpio1_23 */
-				0x60 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a8.gpio1_24 */
-			>;
-		};
-
-		i2c0_pins: pinmux_i2c0_pins {
-			pinctrl-single,pins = <
-				0x188 (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_sda.i2c0_sda */
-				0x18c (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_scl.i2c0_scl */
-			>;
-		};
-
-		uart0_pins: pinmux_uart0_pins {
-			pinctrl-single,pins = <
-				0x170 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */
-				0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart0_txd.uart0_txd */
-			>;
-		};
-
-		clkout2_pin: pinmux_clkout2_pin {
-			pinctrl-single,pins = <
-				0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */
-			>;
-		};
-
-		cpsw_default: cpsw_default {
-			pinctrl-single,pins = <
-				/* Slave 1 */
-				0x110 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxerr.mii1_rxerr */
-				0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txen.mii1_txen */
-				0x118 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxdv.mii1_rxdv */
-				0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd3.mii1_txd3 */
-				0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd2.mii1_txd2 */
-				0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd1.mii1_txd1 */
-				0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd0.mii1_txd0 */
-				0x12c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_txclk.mii1_txclk */
-				0x130 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxclk.mii1_rxclk */
-				0x134 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd3.mii1_rxd3 */
-				0x138 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd2.mii1_rxd2 */
-				0x13c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd1.mii1_rxd1 */
-				0x140 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd0.mii1_rxd0 */
-			>;
-		};
-
-		cpsw_sleep: cpsw_sleep {
-			pinctrl-single,pins = <
-				/* Slave 1 reset value */
-				0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			>;
-		};
-
-		davinci_mdio_default: davinci_mdio_default {
-			pinctrl-single,pins = <
-				/* MDIO */
-				0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)	/* mdio_data.mdio_data */
-				0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0)			/* mdio_clk.mdio_clk */
-			>;
-		};
-
-		davinci_mdio_sleep: davinci_mdio_sleep {
-			pinctrl-single,pins = <
-				/* MDIO reset value */
-				0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-				0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			>;
-		};
-	};
-
-	ocp {
-		uart0: serial@44e09000 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&uart0_pins>;
-
-			status = "okay";
-		};
-
-		musb: usb@47400000 {
-			status = "okay";
-
-			control@44e10000 {
-				status = "okay";
-			};
-
-			usb-phy@47401300 {
-				status = "okay";
-			};
-
-			usb-phy@47401b00 {
-				status = "okay";
-			};
-
-			usb@47401000 {
-				status = "okay";
-			};
-
-			usb@47401800 {
-				status = "okay";
-				dr_mode = "host";
-			};
-
-			dma-controller@07402000  {
-				status = "okay";
-			};
-		};
-
-		i2c0: i2c@44e0b000 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&i2c0_pins>;
-
-			status = "okay";
-			clock-frequency = <400000>;
-
-			tps: tps@24 {
-				reg = <0x24>;
-			};
-
-		};
-	};
-
-	leds {
-		pinctrl-names = "default";
-		pinctrl-0 = <&user_leds_s0>;
-
-		compatible = "gpio-leds";
-
-		led@2 {
-			label = "beaglebone:green:heartbeat";
-			gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "heartbeat";
-			default-state = "off";
-		};
-
-		led@3 {
-			label = "beaglebone:green:mmc0";
-			gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "mmc0";
-			default-state = "off";
-		};
-
-		led@4 {
-			label = "beaglebone:green:usr2";
-			gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
-			default-state = "off";
-		};
-
-		led@5 {
-			label = "beaglebone:green:usr3";
-			gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
-			default-state = "off";
-		};
-	};
-};
-
-/include/ "tps65217.dtsi"
-
-&tps {
-	regulators {
-		dcdc1_reg: regulator@0 {
-			regulator-always-on;
-		};
-
-		dcdc2_reg: regulator@1 {
-			/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
-			regulator-name = "vdd_mpu";
-			regulator-min-microvolt = <925000>;
-			regulator-max-microvolt = <1325000>;
-			regulator-boot-on;
-			regulator-always-on;
-		};
-
-		dcdc3_reg: regulator@2 {
-			/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
-			regulator-name = "vdd_core";
-			regulator-min-microvolt = <925000>;
-			regulator-max-microvolt = <1150000>;
-			regulator-boot-on;
-			regulator-always-on;
-		};
-
-		ldo1_reg: regulator@3 {
-			regulator-always-on;
-		};
-
-		ldo2_reg: regulator@4 {
-			regulator-always-on;
-		};
-
-		ldo3_reg: regulator@5 {
-			regulator-always-on;
-		};
-
-		ldo4_reg: regulator@6 {
-			regulator-always-on;
-		};
-	};
-};
-
-&cpsw_emac0 {
-	phy_id = <&davinci_mdio>, <0>;
-	phy-mode = "mii";
-};
-
-&cpsw_emac1 {
-	phy_id = <&davinci_mdio>, <1>;
-	phy-mode = "mii";
-};
-
-&mac {
-	pinctrl-names = "default", "sleep";
-	pinctrl-0 = <&cpsw_default>;
-	pinctrl-1 = <&cpsw_sleep>;
-
-};
-
-&davinci_mdio {
-	pinctrl-names = "default", "sleep";
-	pinctrl-0 = <&davinci_mdio_default>;
-	pinctrl-1 = <&davinci_mdio_sleep>;
-};
+#include "am335x-bone-common.dtsi"
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
new file mode 100644
index 0000000..197cadf
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+#include "am33xx.dtsi"
+#include "am335x-bone-common.dtsi"
+
+&ldo3_reg {
+	regulator-min-microvolt = <1800000>;
+	regulator-max-microvolt = <1800000>;
+	regulator-always-on;
+};
-- 
1.8.2.1

Re: [PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black

[Koen Kooi]

Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khilman@linaro.org> het volgende geschreven:

> Koen Kooi <koen@dominion.thruhere.net> writes:
> 
>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added,
>> so create a common dtsi both can use.
>> 
>> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver
>> after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead
>> of 1.8.
>> 
>> MMC support for AM335x still isn't in, so only the LDO change has been added.
>> 
>> Cc: stable@vger.kernel.org
>> 
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>> Tested-by: Tom Rini <trini@ti.com>
>> Tested-by: Matt Porter <matt.porter@linaro.org>
> 
> I guess the subject should've included v5?

Yes, I blame it on being monday :)

>  Also, if this is to be
> stable material, it will likely need rework since I don't think it will
> apply cleanly to older trees due to DT churn.

Ah right, the preprocessor changes. We'll see what happens with the stable trees. Most older kernels are useless on am335x, but the just released 3.11 is dangerous enough to get this backported.

> Anyways, for this patch...
> 
> Acked-by: Kevin Hilman <khilman@linaro.org>
> 
> Even though I've probably already fried my HDMI transciever due to using
> the original DTS a lot more than a dozen times.  (and to TI: yes, I'd
> accept a new BB black as a sympathy gift.)  ;)

> Also, I tested this on both BBW and BBW:
> 
> Tested-by: Kevin Hilman <khilman@linaro.org>

Thanks!

regards,

Koen

> 
> Benoit, assuming this looks good to you, can you queue this for v3.12-rc
> please?   It applies to Linus' HEAD today (which has most of arm-soc
> merged), so it should apply cleanly on top of all your stuff.
> 
> Kevin

Re: [PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black

[Joel Fernandes]

On 09/09/2013 10:51 AM, Koen Kooi wrote:
> 
> Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khilman@linaro.org> het volgende geschreven:
> 
>> Koen Kooi <koen@dominion.thruhere.net> writes:
>>
>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added,
>>> so create a common dtsi both can use.
>>>
>>> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver
>>> after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead
>>> of 1.8.
>>>
>>> MMC support for AM335x still isn't in, so only the LDO change has been added.
>>>
>>> Cc: stable@vger.kernel.org
>>>
>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>>> Tested-by: Tom Rini <trini@ti.com>
>>> Tested-by: Matt Porter <matt.porter@linaro.org>
>>
>> I guess the subject should've included v5?
> 
> Yes, I blame it on being monday :)

The series you're posting will require rebasing on the current MMC DT series
that is being discussed last couple of weeks on the mailing list which were
waiting until now as DMA support was missing. Now that DMA support is pulled in,
it is safe to apply those patches so I will be reposting them shortly.

Please hold off any changes until those patches are posted. This will avoid
unnecessary conflicts.

Thanks,

-Joel

Re: [PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black

[Koen Kooi]

Op 9 sep. 2013, om 20:27 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven:

> On 09/09/2013 10:51 AM, Koen Kooi wrote:
>> 
>> Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khilman@linaro.org> het volgende geschreven:
>> 
>>> Koen Kooi <koen@dominion.thruhere.net> writes:
>>> 
>>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added,
>>>> so create a common dtsi both can use.
>>>> 
>>>> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver
>>>> after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead
>>>> of 1.8.
>>>> 
>>>> MMC support for AM335x still isn't in, so only the LDO change has been added.
>>>> 
>>>> Cc: stable@vger.kernel.org
>>>> 
>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>>>> Tested-by: Tom Rini <trini@ti.com>
>>>> Tested-by: Matt Porter <matt.porter@linaro.org>
>>> 
>>> I guess the subject should've included v5?
>> 
>> Yes, I blame it on being monday :)
> 
> The series you're posting will require rebasing on the current MMC DT series
> that is being discussed last couple of weeks on the mailing list which were
> waiting until now as DMA support was missing. Now that DMA support is pulled in,
> it is safe to apply those patches so I will be reposting them shortly.
> 
> Please hold off any changes until those patches are posted. This will avoid
> unnecessary conflicts.

Or you can rebase on top of this patch since it has no dependencies *and* fixes blowing up boards. FWIW, git-rebase, git-cherry-pick and git-am -3 track the rename in my patch just fine.

Re: [PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black

[Joel Fernandes]

On 09/09/2013 01:43 PM, Koen Kooi wrote:
> 
> Op 9 sep. 2013, om 20:27 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven:
> 
>> On 09/09/2013 10:51 AM, Koen Kooi wrote:
>>>
>>> Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khilman@linaro.org> het volgende geschreven:
>>>
>>>> Koen Kooi <koen@dominion.thruhere.net> writes:
>>>>
>>>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added,
>>>>> so create a common dtsi both can use.
>>>>>
>>>>> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver
>>>>> after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead
>>>>> of 1.8.
>>>>>
>>>>> MMC support for AM335x still isn't in, so only the LDO change has been added.
>>>>>
>>>>> Cc: stable@vger.kernel.org
>>>>>
>>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>>>>> Tested-by: Tom Rini <trini@ti.com>
>>>>> Tested-by: Matt Porter <matt.porter@linaro.org>
>>>>
>>>> I guess the subject should've included v5?
>>>
>>> Yes, I blame it on being monday :)
>>
>> The series you're posting will require rebasing on the current MMC DT series
>> that is being discussed last couple of weeks on the mailing list which were
>> waiting until now as DMA support was missing. Now that DMA support is pulled in,
>> it is safe to apply those patches so I will be reposting them shortly.
>>
>> Please hold off any changes until those patches are posted. This will avoid
>> unnecessary conflicts.
> 
> Or you can rebase on top of this patch since it has no dependencies *and* fixes blowing up boards. FWIW, git-rebase, git-cherry-pick and git-am -3 track the rename in my patch just fine.
> 

That's fair enough, since  Kevin Acked and Benoit is pulling it, I'm fine with
rebasing on top of it and we avoid any merge conflicts.

Regards,

-Joel

Re: [PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black

[Joel Fernandes]

On 09/09/2013 01:51 PM, Joel Fernandes wrote:
> On 09/09/2013 01:43 PM, Koen Kooi wrote:
>>
>> Op 9 sep. 2013, om 20:27 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven:
>>
>>> On 09/09/2013 10:51 AM, Koen Kooi wrote:
>>>>
>>>> Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khilman@linaro.org> het volgende geschreven:
>>>>
>>>>> Koen Kooi <koen@dominion.thruhere.net> writes:
>>>>>
>>>>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added,
>>>>>> so create a common dtsi both can use.
>>>>>>
>>>>>> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver
>>>>>> after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead
>>>>>> of 1.8.
>>>>>>
>>>>>> MMC support for AM335x still isn't in, so only the LDO change has been added.
>>>>>>
>>>>>> Cc: stable@vger.kernel.org
>>>>>>
>>>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>>>>>> Tested-by: Tom Rini <trini@ti.com>
>>>>>> Tested-by: Matt Porter <matt.porter@linaro.org>
>>>>>
>>>>> I guess the subject should've included v5?
>>>>
>>>> Yes, I blame it on being monday :)
>>>
>>> The series you're posting will require rebasing on the current MMC DT series
>>> that is being discussed last couple of weeks on the mailing list which were
>>> waiting until now as DMA support was missing. Now that DMA support is pulled in,
>>> it is safe to apply those patches so I will be reposting them shortly.
>>>
>>> Please hold off any changes until those patches are posted. This will avoid
>>> unnecessary conflicts.
>>
>> Or you can rebase on top of this patch since it has no dependencies *and* fixes blowing up boards. FWIW, git-rebase, git-cherry-pick and git-am -3 track the rename in my patch just fine.
>>
> 
> That's fair enough, since  Kevin Acked and Benoit is pulling it, I'm fine with
> rebasing on top of it and we avoid any merge conflicts.
> 

I noticed - there were still some comments from Felipe on the v4 series of this
patch regarding RF cape and HDMI may be breaking it. How are you addressing that?

Regards,

-Joel

Re: [PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black

[Koen Kooi]

Op 9 sep. 2013, om 21:50 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven:

> On 09/09/2013 01:51 PM, Joel Fernandes wrote:
>> On 09/09/2013 01:43 PM, Koen Kooi wrote:
>>> 
>>> Op 9 sep. 2013, om 20:27 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven:
>>> 
>>>> On 09/09/2013 10:51 AM, Koen Kooi wrote:
>>>>> 
>>>>> Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khilman@linaro.org> het volgende geschreven:
>>>>> 
>>>>>> Koen Kooi <koen@dominion.thruhere.net> writes:
>>>>>> 
>>>>>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added,
>>>>>>> so create a common dtsi both can use.
>>>>>>> 
>>>>>>> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver
>>>>>>> after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead
>>>>>>> of 1.8.
>>>>>>> 
>>>>>>> MMC support for AM335x still isn't in, so only the LDO change has been added.
>>>>>>> 
>>>>>>> Cc: stable@vger.kernel.org
>>>>>>> 
>>>>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>>>>>>> Tested-by: Tom Rini <trini@ti.com>
>>>>>>> Tested-by: Matt Porter <matt.porter@linaro.org>
>>>>>> 
>>>>>> I guess the subject should've included v5?
>>>>> 
>>>>> Yes, I blame it on being monday :)
>>>> 
>>>> The series you're posting will require rebasing on the current MMC DT series
>>>> that is being discussed last couple of weeks on the mailing list which were
>>>> waiting until now as DMA support was missing. Now that DMA support is pulled in,
>>>> it is safe to apply those patches so I will be reposting them shortly.
>>>> 
>>>> Please hold off any changes until those patches are posted. This will avoid
>>>> unnecessary conflicts.
>>> 
>>> Or you can rebase on top of this patch since it has no dependencies *and* fixes blowing up boards. FWIW, git-rebase, git-cherry-pick and git-am -3 track the rename in my patch just fine.
>>> 
>> 
>> That's fair enough, since  Kevin Acked and Benoit is pulling it, I'm fine with
>> rebasing on top of it and we avoid any merge conflicts.
>> 
> 
> I noticed - there were still some comments from Felipe on the v4 series of this
> patch regarding RF cape and HDMI may be breaking it. How are you addressing that?

Capes will never go into the .dts and HDMI support needs some serious patching before it can get enabled in the DT. And the RF cape isn't being sold since it has no sw support. No need to worry about things in the 3.15/3.16 timeframe. Unless you want this LDO3 fix not to go in ASAP.

Joel, is there anything relevant *right now* blocking this patch going in? If not, please test it and add your Tested-by: line.

Re: [PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black

[Joel Fernandes]

On 09/09/2013 03:00 PM, Koen Kooi wrote:
> 
> Op 9 sep. 2013, om 21:50 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven:
> 
>> On 09/09/2013 01:51 PM, Joel Fernandes wrote:
>>> On 09/09/2013 01:43 PM, Koen Kooi wrote:
>>>>
>>>> Op 9 sep. 2013, om 20:27 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven:
>>>>
>>>>> On 09/09/2013 10:51 AM, Koen Kooi wrote:
>>>>>>
>>>>>> Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khilman@linaro.org> het volgende geschreven:
>>>>>>
>>>>>>> Koen Kooi <koen@dominion.thruhere.net> writes:
>>>>>>>
>>>>>>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added,
>>>>>>>> so create a common dtsi both can use.
>>>>>>>>
>>>>>>>> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver
>>>>>>>> after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead
>>>>>>>> of 1.8.
>>>>>>>>
>>>>>>>> MMC support for AM335x still isn't in, so only the LDO change has been added.
>>>>>>>>
>>>>>>>> Cc: stable@vger.kernel.org
>>>>>>>>
>>>>>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>>>>>>>> Tested-by: Tom Rini <trini@ti.com>
>>>>>>>> Tested-by: Matt Porter <matt.porter@linaro.org>
>>>>>>>
>>>>>>> I guess the subject should've included v5?
>>>>>>
>>>>>> Yes, I blame it on being monday :)
>>>>>
>>>>> The series you're posting will require rebasing on the current MMC DT series
>>>>> that is being discussed last couple of weeks on the mailing list which were
>>>>> waiting until now as DMA support was missing. Now that DMA support is pulled in,
>>>>> it is safe to apply those patches so I will be reposting them shortly.
>>>>>
>>>>> Please hold off any changes until those patches are posted. This will avoid
>>>>> unnecessary conflicts.
>>>>
>>>> Or you can rebase on top of this patch since it has no dependencies *and* fixes blowing up boards. FWIW, git-rebase, git-cherry-pick and git-am -3 track the rename in my patch just fine.
>>>>
>>>
>>> That's fair enough, since  Kevin Acked and Benoit is pulling it, I'm fine with
>>> rebasing on top of it and we avoid any merge conflicts.
>>>
>>
>> I noticed - there were still some comments from Felipe on the v4 series of this
>> patch regarding RF cape and HDMI may be breaking it. How are you addressing that?
> 
> Capes will never go into the .dts and HDMI support needs some serious patching before it can get enabled in the DT. And the RF cape isn't being sold since it has no sw support. No need to worry about things in the 3.15/3.16 timeframe. Unless you want this LDO3 fix not to go in ASAP.
> 
> Joel, is there anything relevant *right now* blocking this patch going in? If not, please test it and add your Tested-by: line.
> 

We don't merge things in hurry and focus is to do things the right way.. I just
want to make sure that all possible comments have been addressed.

Otherwise patch looks OK and hope everyone else thinks so too. I am dealing with
some merge conflicts right now with my series on top of this though, but they
should be easy enough to fix up. That's delaying my testing, but otherwise as
such I don't have any objection to this patch (provided the conclusion is that
all comments have been addressed..). Thanks!

Regards,

-Joel

Re: [PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black

[Joel Fernandes]

On 09/09/2013 03:12 PM, Joel Fernandes wrote:
> On 09/09/2013 03:00 PM, Koen Kooi wrote:
>>
>> Op 9 sep. 2013, om 21:50 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven:
>>
>>> On 09/09/2013 01:51 PM, Joel Fernandes wrote:
>>>> On 09/09/2013 01:43 PM, Koen Kooi wrote:
>>>>>
>>>>> Op 9 sep. 2013, om 20:27 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven:
>>>>>
>>>>>> On 09/09/2013 10:51 AM, Koen Kooi wrote:
>>>>>>>
>>>>>>> Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khilman@linaro.org> het volgende geschreven:
>>>>>>>
>>>>>>>> Koen Kooi <koen@dominion.thruhere.net> writes:
>>>>>>>>
>>>>>>>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added,
>>>>>>>>> so create a common dtsi both can use.
>>>>>>>>>
>>>>>>>>> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver
>>>>>>>>> after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead
>>>>>>>>> of 1.8.
>>>>>>>>>
>>>>>>>>> MMC support for AM335x still isn't in, so only the LDO change has been added.
>>>>>>>>>
>>>>>>>>> Cc: stable@vger.kernel.org
>>>>>>>>>
>>>>>>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>>>>>>>>> Tested-by: Tom Rini <trini@ti.com>
>>>>>>>>> Tested-by: Matt Porter <matt.porter@linaro.org>
>>>>>>>>
>>>>>>>> I guess the subject should've included v5?
>>>>>>>
>>>>>>> Yes, I blame it on being monday :)
>>>>>>
>>>>>> The series you're posting will require rebasing on the current MMC DT series
>>>>>> that is being discussed last couple of weeks on the mailing list which were
>>>>>> waiting until now as DMA support was missing. Now that DMA support is pulled in,
>>>>>> it is safe to apply those patches so I will be reposting them shortly.
>>>>>>
>>>>>> Please hold off any changes until those patches are posted. This will avoid
>>>>>> unnecessary conflicts.
>>>>>
>>>>> Or you can rebase on top of this patch since it has no dependencies *and* fixes blowing up boards. FWIW, git-rebase, git-cherry-pick and git-am -3 track the rename in my patch just fine.
>>>>>
>>>>
>>>> That's fair enough, since  Kevin Acked and Benoit is pulling it, I'm fine with
>>>> rebasing on top of it and we avoid any merge conflicts.
>>>>
>>>
>>> I noticed - there were still some comments from Felipe on the v4 series of this
>>> patch regarding RF cape and HDMI may be breaking it. How are you addressing that?
>>
>> Capes will never go into the .dts and HDMI support needs some serious patching before it can get enabled in the DT. And the RF cape isn't being sold since it has no sw support. No need to worry about things in the 3.15/3.16 timeframe. Unless you want this LDO3 fix not to go in ASAP.
>>
>> Joel, is there anything relevant *right now* blocking this patch going in? If not, please test it and add your Tested-by: line.
>>
> 
> We don't merge things in hurry and focus is to do things the right way.. I just
> want to make sure that all possible comments have been addressed.
> 
> Otherwise patch looks OK and hope everyone else thinks so too. I am dealing with
> some merge conflicts right now with my series on top of this though, but they
> should be easy enough to fix up. That's delaying my testing, but otherwise as
> such I don't have any objection to this patch (provided the conclusion is that
> all comments have been addressed..). Thanks!

Koen,

One note though, since I don't use HDMI (or BBB much for that matter), I was ok
with taking a risk of upping the ldo3 regulator voltage to 3.3v on my board
which I needed to do to get to the boot prompt.

I applied my AM335x DMA and MMC patches and tried to boot with rootfs as MMC1.

With 1.8v, I get the following during boot:
[    2.236043] mmc0: host doesn't support card's voltages
[    2.241659] mmc0: error -22 whilst initialising SD card

That's strange because I do have an SDHC card. With 3.3v it works fine.

I will add a note about this to my series. Since this more of an MMC issue than
anything, and your patch series doesn't enable MMC, you can add my tested-by:

Tested-by: Joel Fernandes <joelf@ti.com>

Later on, the regulator voltage may need to be tweaked for MMC support.

Regards,

-Joel

Re: [PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black

[Koen Kooi]

Op 10 sep. 2013, om 01:42 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven:

> On 09/09/2013 03:12 PM, Joel Fernandes wrote:
>> On 09/09/2013 03:00 PM, Koen Kooi wrote:
>>> 
>>> Op 9 sep. 2013, om 21:50 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven:
>>> 
>>>> On 09/09/2013 01:51 PM, Joel Fernandes wrote:
>>>>> On 09/09/2013 01:43 PM, Koen Kooi wrote:
>>>>>> 
>>>>>> Op 9 sep. 2013, om 20:27 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven:
>>>>>> 
>>>>>>> On 09/09/2013 10:51 AM, Koen Kooi wrote:
>>>>>>>> 
>>>>>>>> Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khilman@linaro.org> het volgende geschreven:
>>>>>>>> 
>>>>>>>>> Koen Kooi <koen@dominion.thruhere.net> writes:
>>>>>>>>> 
>>>>>>>>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added,
>>>>>>>>>> so create a common dtsi both can use.
>>>>>>>>>> 
>>>>>>>>>> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver
>>>>>>>>>> after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead
>>>>>>>>>> of 1.8.
>>>>>>>>>> 
>>>>>>>>>> MMC support for AM335x still isn't in, so only the LDO change has been added.
>>>>>>>>>> 
>>>>>>>>>> Cc: stable@vger.kernel.org
>>>>>>>>>> 
>>>>>>>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>>>>>>>>>> Tested-by: Tom Rini <trini@ti.com>
>>>>>>>>>> Tested-by: Matt Porter <matt.porter@linaro.org>
>>>>>>>>> 
>>>>>>>>> I guess the subject should've included v5?
>>>>>>>> 
>>>>>>>> Yes, I blame it on being monday :)
>>>>>>> 
>>>>>>> The series you're posting will require rebasing on the current MMC DT series
>>>>>>> that is being discussed last couple of weeks on the mailing list which were
>>>>>>> waiting until now as DMA support was missing. Now that DMA support is pulled in,
>>>>>>> it is safe to apply those patches so I will be reposting them shortly.
>>>>>>> 
>>>>>>> Please hold off any changes until those patches are posted. This will avoid
>>>>>>> unnecessary conflicts.
>>>>>> 
>>>>>> Or you can rebase on top of this patch since it has no dependencies *and* fixes blowing up boards. FWIW, git-rebase, git-cherry-pick and git-am -3 track the rename in my patch just fine.
>>>>>> 
>>>>> 
>>>>> That's fair enough, since  Kevin Acked and Benoit is pulling it, I'm fine with
>>>>> rebasing on top of it and we avoid any merge conflicts.
>>>>> 
>>>> 
>>>> I noticed - there were still some comments from Felipe on the v4 series of this
>>>> patch regarding RF cape and HDMI may be breaking it. How are you addressing that?
>>> 
>>> Capes will never go into the .dts and HDMI support needs some serious patching before it can get enabled in the DT. And the RF cape isn't being sold since it has no sw support. No need to worry about things in the 3.15/3.16 timeframe. Unless you want this LDO3 fix not to go in ASAP.
>>> 
>>> Joel, is there anything relevant *right now* blocking this patch going in? If not, please test it and add your Tested-by: line.
>>> 
>> 
>> We don't merge things in hurry and focus is to do things the right way.. I just
>> want to make sure that all possible comments have been addressed.
>> 
>> Otherwise patch looks OK and hope everyone else thinks so too. I am dealing with
>> some merge conflicts right now with my series on top of this though, but they
>> should be easy enough to fix up. That's delaying my testing, but otherwise as
>> such I don't have any objection to this patch (provided the conclusion is that
>> all comments have been addressed..). Thanks!
> 
> Koen,
> 
> One note though, since I don't use HDMI (or BBB much for that matter), I was ok
> with taking a risk of upping the ldo3 regulator voltage to 3.3v on my board
> which I needed to do to get to the boot prompt.
> I applied my AM335x DMA and MMC patches and tried to boot with rootfs as MMC1.
> 
> With 1.8v, I get the following during boot:
> [    2.236043] mmc0: host doesn't support card's voltages
> [    2.241659] mmc0: error -22 whilst initialising SD card
> 
> That's strange because I do have an SDHC card. With 3.3v it works fine.
> 
> I will add a note about this to my series. Since this more of an MMC issue than
> anything, and your patch series doesn't enable MMC, you can add my tested-by:
> 
> Tested-by: Joel Fernandes <joelf@ti.com>
> 
> Later on, the regulator voltage may need to be tweaked for MMC support.

See https://lkml.org/lkml/2013/9/6/95 and https://lkml.org/lkml/2013/9/6/183

Re: [PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black

[Fernandes, Joel]

On Sep 10, 2013, at 12:45 AM, "Koen Kooi" <koen@dominion.thruhere.net> wrote:

> 
> Op 10 sep. 2013, om 01:42 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven:
> 
>> On 09/09/2013 03:12 PM, Joel Fernandes wrote:
>>> On 09/09/2013 03:00 PM, Koen Kooi wrote:
>>>> 
>>>> Op 9 sep. 2013, om 21:50 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven:
>>>> 
>>>>> On 09/09/2013 01:51 PM, Joel Fernandes wrote:
>>>>>> On 09/09/2013 01:43 PM, Koen Kooi wrote:
>>>>>>> 
>>>>>>> Op 9 sep. 2013, om 20:27 heeft Joel Fernandes <joelf@ti.com> het volgende geschreven:
>>>>>>> 
>>>>>>>> On 09/09/2013 10:51 AM, Koen Kooi wrote:
>>>>>>>>> 
>>>>>>>>> Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khilman@linaro.org> het volgende geschreven:
>>>>>>>>> 
>>>>>>>>>> Koen Kooi <koen@dominion.thruhere.net> writes:
>>>>>>>>>> 
>>>>>>>>>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added,
>>>>>>>>>>> so create a common dtsi both can use.
>>>>>>>>>>> 
>>>>>>>>>>> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI transceiver
>>>>>>>>>>> after a dozen boots with an uSD card inserted because LDO will be at 3.3V instead
>>>>>>>>>>> of 1.8.
>>>>>>>>>>> 
>>>>>>>>>>> MMC support for AM335x still isn't in, so only the LDO change has been added.
>>>>>>>>>>> 
>>>>>>>>>>> Cc: stable@vger.kernel.org
>>>>>>>>>>> 
>>>>>>>>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>>>>>>>>>>> Tested-by: Tom Rini <trini@ti.com>
>>>>>>>>>>> Tested-by: Matt Porter <matt.porter@linaro.org>
>>>>>>>>>> 
>>>>>>>>>> I guess the subject should've included v5?
>>>>>>>>> 
>>>>>>>>> Yes, I blame it on being monday :)
>>>>>>>> 
>>>>>>>> The series you're posting will require rebasing on the current MMC DT series
>>>>>>>> that is being discussed last couple of weeks on the mailing list which were
>>>>>>>> waiting until now as DMA support was missing. Now that DMA support is pulled in,
>>>>>>>> it is safe to apply those patches so I will be reposting them shortly.
>>>>>>>> 
>>>>>>>> Please hold off any changes until those patches are posted. This will avoid
>>>>>>>> unnecessary conflicts.
>>>>>>> 
>>>>>>> Or you can rebase on top of this patch since it has no dependencies *and* fixes blowing up boards. FWIW, git-rebase, git-cherry-pick and git-am -3 track the rename in my patch just fine.
>>>>>> 
>>>>>> That's fair enough, since  Kevin Acked and Benoit is pulling it, I'm fine with
>>>>>> rebasing on top of it and we avoid any merge conflicts.
>>>>> 
>>>>> I noticed - there were still some comments from Felipe on the v4 series of this
>>>>> patch regarding RF cape and HDMI may be breaking it. How are you addressing that?
>>>> 
>>>> Capes will never go into the .dts and HDMI support needs some serious patching before it can get enabled in the DT. And the RF cape isn't being sold since it has no sw support. No need to worry about things in the 3.15/3.16 timeframe. Unless you want this LDO3 fix not to go in ASAP.
>>>> 
>>>> Joel, is there anything relevant *right now* blocking this patch going in? If not, please test it and add your Tested-by: line.
>>> 
>>> We don't merge things in hurry and focus is to do things the right way.. I just
>>> want to make sure that all possible comments have been addressed.
>>> 
>>> Otherwise patch looks OK and hope everyone else thinks so too. I am dealing with
>>> some merge conflicts right now with my series on top of this though, but they
>>> should be easy enough to fix up. That's delaying my testing, but otherwise as
>>> such I don't have any objection to this patch (provided the conclusion is that
>>> all comments have been addressed..). Thanks!
>> 
>> Koen,
>> 
>> One note though, since I don't use HDMI (or BBB much for that matter), I was ok
>> with taking a risk of upping the ldo3 regulator voltage to 3.3v on my board
>> which I needed to do to get to the boot prompt.
>> I applied my AM335x DMA and MMC patches and tried to boot with rootfs as MMC1.
>> 
>> With 1.8v, I get the following during boot:
>> [    2.236043] mmc0: host doesn't support card's voltages
>> [    2.241659] mmc0: error -22 whilst initialising SD card
>> 
>> That's strange because I do have an SDHC card. With 3.3v it works fine.
>> 
>> I will add a note about this to my series. Since this more of an MMC issue than
>> anything, and your patch series doesn't enable MMC, you can add my tested-by:
>> 
>> Tested-by: Joel Fernandes <joelf@ti.com>
>> 
>> Later on, the regulator voltage may need to be tweaked for MMC support.
> 
> See https://lkml.org/lkml/2013/9/6/95 and https://lkml.org/lkml/2013/9/6/183

Ok since you said in above thread you'll rebase the card detect and the regulator fixes , I'll let you do that and drop my drop my hacked mmc1 patch for BBB from my series.

Regards,

-Joel