[PATCH 1/3] arm: dts: am33xx.dtsi: Add node name to rtc device node

[PATCH 1/3] arm: dts: am33xx.dtsi: Add node name to rtc device node

[Stefan Roese]

Making it possible to reference and therefor change (disable) this
device node from other dts file which import this dtsi file.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Lukas Stockmann <lukas.stockmann@siemens.com>
Cc: Benoit Cousson <bcousson@baylibre.com>
Cc: Tony Lindgren <tony@atomide.com>
---
 arch/arm/boot/dts/am33xx.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 6d95d3d..b8daf8c 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -399,7 +399,7 @@
 			ti,timer-pwm;
 		};
 
-		rtc at 44e3e000 {
+		rtc: rtc at 44e3e000 {
 			compatible = "ti,da830-rtc";
 			reg = <0x44e3e000 0x1000>;
 			interrupts = <75
-- 
1.8.5.3

[PATCH 2/3] arm: dts: Add Siemens Draco SOM dtsi

[Stefan Roese]

This patch adds support for the Siemens Draco SOM (System On Module) which
is used by multiple Siemens boards. Support for one is posted in this
series as well, the dxr2-e.

This SOM is based on the TI AM3352 with the following configuration:

- CPU: AM3352BZCEA30
- RAM: 128MB DDR3 at 303MHz
- NAND FLASH: 256MB
- RTC: disabled via hw wiring (registers not available!)

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Lukas Stockmann <lukas.stockmann@siemens.com>
Cc: Benoit Cousson <bcousson@baylibre.com>
Cc: Tony Lindgren <tony@atomide.com>
---
 arch/arm/boot/dts/am335x-draco.dtsi | 163 ++++++++++++++++++++++++++++++++++++
 1 file changed, 163 insertions(+)
 create mode 100644 arch/arm/boot/dts/am335x-draco.dtsi

diff --git a/arch/arm/boot/dts/am335x-draco.dtsi b/arch/arm/boot/dts/am335x-draco.dtsi
new file mode 100644
index 0000000..88b414a
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-draco.dtsi
@@ -0,0 +1,163 @@
+/*
+ * Common support for Siemens Draco SOM (AM335x based)
+ *
+ * Copyright (C) 2013,2014 - Stefan Roese <sr@denx.de>
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/ {
+	memory {
+		device_type = "memory";
+		reg = <0x80000000 0x08000000>; /* 128 MB */
+	};
+
+	am33xx_pinmux: pinmux at 44e10800 {
+		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 */
+			>;
+		};
+
+		nandflash_pins: nandflash_pins {
+			pinctrl-single,pins = <
+				0x0 (PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad0.gpmc_ad0 */
+				0x4 (PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad1.gpmc_ad1 */
+				0x8 (PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad2.gpmc_ad2 */
+				0xc (PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad3.gpmc_ad3 */
+				0x10 (PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad4.gpmc_ad4 */
+				0x14 (PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad5.gpmc_ad5 */
+				0x18 (PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad6.gpmc_ad6 */
+				0x1c (PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad7.gpmc_ad7 */
+				0x70 (PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_wait0.gpmc_wait0 */
+				0x74 (PIN_INPUT_PULLUP | MUX_MODE7)	/* gpmc_wpn.gpio0_30 */
+				0x7c (PIN_OUTPUT | MUX_MODE0)		/* gpmc_csn0.gpmc_csn0  */
+				0x90 (PIN_OUTPUT | MUX_MODE0)		/* gpmc_advn_ale.gpmc_advn_ale */
+				0x94 (PIN_OUTPUT | MUX_MODE0)		/* gpmc_oen_ren.gpmc_oen_ren */
+				0x98 (PIN_OUTPUT | MUX_MODE0)		/* gpmc_wen.gpmc_wen */
+				0x9c (PIN_OUTPUT | MUX_MODE0)		/* gpmc_be0n_cle.gpmc_be0n_cle */
+			>;
+		};
+	};
+
+	ocp {
+		uart0: serial at 44e09000 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&uart0_pins>;
+			status = "okay";
+		};
+
+		i2c0: i2c at 44e0b000 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&i2c0_pins>;
+
+			status = "okay";
+			clock-frequency = <400000>;
+
+			eeprom: eeprom at 50 {
+				compatible = "atmel,24c128";
+				reg = <0x50>;
+				pagesize = <64>;
+			};
+		};
+
+		musb: usb at 47400000 {
+			status = "okay";
+
+			control at 44e10000 {
+				status = "okay";
+			};
+
+			usb-phy at 47401300 {
+				status = "okay";
+			};
+
+			usb-phy at 47401b00 {
+				status = "okay";
+			};
+
+			usb at 47401000 {
+				status = "okay";
+			};
+
+			usb at 47401800 {
+				status = "okay";
+				dr_mode = "host";
+			};
+
+			dma-controller at 07402000  {
+				status = "okay";
+			};
+		};
+	};
+};
+
+&timer3 {
+	status = "disabled";
+};
+
+&uart4 {
+	status = "disabled";
+};
+
+&elm {
+	status = "okay";
+};
+
+&gpmc {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&nandflash_pins>;
+
+	ranges = <0 0 0x08000000 0x10000000>;	/* CS0: NAND */
+
+	nand at 0,0 {
+		reg = <0 0 0>; /* CS0, offset 0 */
+		nand-bus-width = <8>;
+		ti,nand-ecc-opt = "bch8";
+		gpmc,device-nand = "true";
+		gpmc,device-width = <1>;
+		gpmc,sync-clk-ps = <0>;
+		gpmc,cs-on-ns = <0>;
+		gpmc,cs-rd-off-ns = <44>;
+		gpmc,cs-wr-off-ns = <44>;
+		gpmc,adv-on-ns = <6>;
+		gpmc,adv-rd-off-ns = <34>;
+		gpmc,adv-wr-off-ns = <44>;
+		gpmc,we-on-ns = <0>;
+		gpmc,we-off-ns = <40>;
+		gpmc,oe-on-ns = <0>;
+		gpmc,oe-off-ns = <54>;
+		gpmc,access-ns = <64>;
+		gpmc,rd-cycle-ns = <82>;
+		gpmc,wr-cycle-ns = <82>;
+		gpmc,wait-on-read = "true";
+		gpmc,wait-on-write = "true";
+		gpmc,bus-turnaround-ns = <0>;
+		gpmc,cycle2cycle-delay-ns = <0>;
+		gpmc,clk-activation-ns = <0>;
+		gpmc,wait-monitoring-ns = <0>;
+		gpmc,wr-access-ns = <40>;
+		gpmc,wr-data-mux-bus-ns = <0>;
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+		elm_id = <&elm>;
+	};
+};
+
+/* disable the RTC node as its not accessible on the draco/dxr2 board */
+&rtc {
+	status = "disabled";
+	ti,hwmods = "disabled";
+};
-- 
1.8.5.3

[PATCH 3/3] arm: dts: Add Siemens am335x-dxr2-e.dts

[Stefan Roese]

Add support for the Siemens DXR2 board. The DXR2-E is the first one
that is pushed now. It uses the Draco SOM and therefor includes this
dtsi file for the common device nodes.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Lukas Stockmann <lukas.stockmann@siemens.com>
Cc: Benoit Cousson <bcousson@baylibre.com>
Cc: Tony Lindgren <tony@atomide.com>
---
 arch/arm/boot/dts/am335x-dxr2-e.dts | 242 ++++++++++++++++++++++++++++++++++++
 1 file changed, 242 insertions(+)
 create mode 100644 arch/arm/boot/dts/am335x-dxr2-e.dts

diff --git a/arch/arm/boot/dts/am335x-dxr2-e.dts b/arch/arm/boot/dts/am335x-dxr2-e.dts
new file mode 100644
index 0000000..5fef637
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-dxr2-e.dts
@@ -0,0 +1,242 @@
+/*
+ * Support for Siemens DXR2.E board
+ *
+ * Copyright (C) 2013,2014 - Stefan Roese <sr@denx.de>
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/dts-v1/;
+
+#include "am33xx.dtsi"
+#include "am335x-draco.dtsi"
+#include <dt-bindings/pwm/pwm.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+	model = "Siemens DXR2.E";
+	compatible = "siemens,dxr2", "ti,am33xx";
+
+	/* ethernet alias is needed for the MAC address passing from U-Boot */
+	aliases {
+		ethernet0 = &cpsw_emac0;
+		mdio-gpio0 = &mdio0;
+	};
+
+	gpio-keys {
+		compatible = "gpio-keys";
+		button0 {
+			label = "button0";
+			gpios = <&gpio0 27 0>;
+			linux,code = <KEY_F1>; /* button0 */
+		};
+	};
+
+	am33xx_pinmux: pinmux at 44e10800 {
+		pinctrl-names = "default";
+		pinctrl-0 = <&gpio_mux_pins>;
+
+		gpio_mux_pins: gpio_mux_pins {
+			pinctrl-single,pins = <
+				0x020 (PIN_OUTPUT | MUX_MODE4)	/* GPMC_AD8, sinus inverter */
+				0x024 (PIN_OUTPUT | MUX_MODE4)	/* GPMC_AD9, sinus inverter */
+				0x028 (PIN_INPUT | MUX_MODE4)	/* GPMC_AD10, sinus inverter */
+				0x02c (PIN_INPUT | MUX_MODE7)	/* GPMC_AD11, button */
+				0x030 (PIN_OUTPUT | MUX_MODE7)	/* GPMC_AD12, UI */
+				0x034 (PIN_OUTPUT | MUX_MODE7)	/* GPMC_AD13, UI */
+				0x038 (PIN_OUTPUT | MUX_MODE7)	/* conf_gpmc_ad14, relay0 */
+				0x03c (PIN_OUTPUT | MUX_MODE7)	/* GPMC_AD15, UI */
+				0x08c (PIN_OUTPUT | MUX_MODE7)	/* GPMC_CLK, UI */
+				0x0d4 (PIN_OUTPUT | MUX_MODE7)	/* LCD_DATA13, AO_EN */
+				0x0dc (PIN_OUTPUT | MUX_MODE7)	/* LCD_DATA15, UI */
+				0x0ec (PIN_INPUT | MUX_MODE7)	/* LCD_AC_BIAS_EN, PWfail */
+				0x0f0 (PIN_OUTPUT | MUX_MODE7)	/* MMC0_DAT3, UI */
+				0x0f4 (PIN_OUTPUT | MUX_MODE7)	/* MMC0_DAT2, UI */
+				0x0f8 (PIN_OUTPUT | MUX_MODE7)	/* MMC0_DAT1, UI */
+				0x0fc (PIN_OUTPUT | MUX_MODE7)	/* MMC0_DAT0, UI */
+				0x108 (PIN_OUTPUT | MUX_MODE7)	/* MII1_COL, relay1 */
+				0x100 (PIN_OUTPUT | MUX_MODE7)	/* MMC0_CLK, UI */
+				0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* MII1_RX_DV.gpio3.4, di0 */
+				0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* MII1_TXD2.gpio0.17, di1 */
+				0x12c (PIN_OUTPUT | MUX_MODE1)	/* MII1_TXCLK, MSTP RX2 */
+				0x164 (PIN_OUTPUT | MUX_MODE7)	/* ECAP0_IN_PWM0_OUT, relay2 */
+				0x168 (PIN_INPUT | MUX_MODE1)	/* MII1_RXCLK, tpuart RX4 */
+				0x16c (PIN_OUTPUT | MUX_MODE1)	/* LCD_DATA9, tpuart TX4 */
+				0x178 (PIN_OUTPUT | MUX_MODE7)	/* UART1_CTS, UI */
+				0x1b0 (PIN_OUTPUT | MUX_MODE7)	/* XDMA_EVENT_INTR0, KNX Power */
+				0x1d0 (PIN_INPUT | MUX_MODE0)	/* tms jtag */
+				0x1d4 (PIN_INPUT | MUX_MODE0)	/* tdi jtag */
+				0x1d8 (PIN_OUTPUT | MUX_MODE0)	/* tdo jtag */
+				0x1dc (PIN_INPUT | MUX_MODE0)	/* tck jtag */
+				0x1e0 (PIN_INPUT | MUX_MODE0)	/* trstn jtag */
+			>;
+		};
+
+		user_leds_s0: user_leds_s0 {
+			pinctrl-single,pins = <
+				0x88 (PIN_INPUT | MUX_MODE7)	/* gpmc_csn3.gpio2_0 */
+				0x1e4 (PIN_INPUT | MUX_MODE7)	/* emu0.gpio3_7 */
+			>;
+		};
+
+		epwmss0_pins: epwmss0_pins {
+			pinctrl-single,pins = <
+				0x150 (PIN_OUTPUT | MUX_MODE3)	/* conf_spi0_sclk.ehrpwm0A */
+				0x154 (PIN_OUTPUT | MUX_MODE3)	/* conf_spi0_d0.ehrpwm0B */
+			>;
+		};
+
+		epwmss1_pins: epwmss1_pins {
+			pinctrl-single,pins = <
+				0x0c8 (PIN_OUTPUT | MUX_MODE2)	/* lcd_data10.lcd_data10 */
+				0x0cc (PIN_OUTPUT | MUX_MODE2)	/* lcd_data11.lcd_data11 */
+			>;
+		};
+
+		ecap1_pins: ecap1_pins {
+			pinctrl-single,pins = <
+				0x160 (PIN_OUTPUT | MUX_MODE2)	/* conf_spi0_cs1*/
+			>;
+		};
+
+		cpsw_default: cpsw_default {
+			pinctrl-single,pins = <
+				0x10c (PIN_INPUT_PULLDOWN | MUX_MODE1)	/* mii1_crs.rmii1_crs_dv */
+				0x114 (PIN_OUTPUT | MUX_MODE1)		/* mii1_txen.mii1_txen */
+				0x124 (PIN_OUTPUT | MUX_MODE1)		/* mii1_txd1.mii1_txd1 */
+				0x128 (PIN_OUTPUT | MUX_MODE1)		/* mii1_txd0.mii1_txd0 */
+				0x13c (PIN_INPUT_PULLDOWN | MUX_MODE1)	/* mii1_rxd1.mii1_rxd1 */
+				0x140 (PIN_INPUT_PULLDOWN | MUX_MODE1)	/* mii1_rxd0.mii1_rxd0 */
+				0x144 (PIN_INPUT_PULLDOWN | MUX_MODE0)	/* rmii1_refclk.rmii1_refclk */
+			>;
+		};
+
+		cpsw_sleep: cpsw_sleep {
+			pinctrl-single,pins = <
+				0x10c (PIN_INPUT_PULLDOWN | MUX_MODE7)
+				0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+				0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+				0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+				0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
+				0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+				0x144 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+			>;
+		};
+
+		davinci_mdio_default: davinci_mdio_default {
+			pinctrl-single,pins = <
+				/* MDIO */
+				0x148 (PIN_INPUT | SLEWCTRL_FAST | MUX_MODE0)	/* mdio_data.mdio_data */
+				0x14c (PIN_OUTPUT | 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)
+			>;
+		};
+
+		gpio_mdio_default: gpio_mdio_default {
+			pinctrl-single,pins = <
+				/* MDIO via GPIO */
+				0x148 (PIN_INPUT | MUX_MODE7)	/* mdio_data.mdio_data GPIO0_0 */
+				0x14c (PIN_OUTPUT | MUX_MODE7)	/* mdio_clk.mdio_clk GPIO0_1 */
+			>;
+		};
+	};
+
+	ocp {
+		epwmss0: epwmss at 48300000 {
+			status = "okay";
+			compatible = "ti,am33xx-pwmss";
+
+			ehrpwm0: ehrpwm at 48300200 {
+				compatible = "ti,am33xx-ehrpwm";
+				status = "okay";
+				pinctrl-names = "default";
+				pinctrl-0 = <&epwmss0_pins>;
+			};
+		};
+
+		epwmss1: epwmss at 48302000 {
+			status = "okay";
+			compatible = "ti,am33xx-pwmss";
+
+			ecap1: ecap at 48302100 {
+				compatible = "ti,am33xx-ecap";
+				status = "okay";
+				pinctrl-names = "default";
+				pinctrl-0 = <&ecap1_pins>;
+			};
+
+			ehrpwm1: ehrpwm at 48302200 {
+				compatible = "ti,am33xx-ehrpwm";
+				status = "okay";
+				pinctrl-names = "default";
+				pinctrl-0 = <&epwmss1_pins>;
+			};
+		};
+	};
+
+	leds {
+		pinctrl-names = "default";
+		pinctrl-0 = <&user_leds_s0>;
+		compatible = "gpio-leds";
+
+		led at 0 {
+			label = "led0";
+			gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;
+			default-state = "off";
+		};
+
+		led at 1 {
+			label = "led1";
+			gpios = <&gpio3 7 GPIO_ACTIVE_HIGH>;
+			default-state = "off";
+		};
+	};
+};
+
+&mac {
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&cpsw_default>;
+	pinctrl-1 = <&cpsw_sleep>;
+	slaves = <1>;			/* use only one emac if */
+
+	mdio0: gpio {
+		compatible = "virtual,mdio-gpio";
+		pinctrl-names = "default";
+		pinctrl-0 = <&gpio_mdio_default>;
+
+		#address-cells = <1>;
+		#size-cells = <0>;
+		gpios = <&gpio0 1 GPIO_ACTIVE_HIGH	/* MDIO-CLK */
+			 &gpio0 0 GPIO_ACTIVE_HIGH>;	/* MDIO-DATA */
+
+		phy0: ethernet-phy at 1 {
+			reg = <0>;
+		};
+	};
+};
+
+/* Disable davinci/am335x mdio interface on this platform */
+&davinci_mdio {
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&davinci_mdio_default>;
+	pinctrl-1 = <&davinci_mdio_sleep>;
+	status = "disabled";
+};
+
+&cpsw_emac0 {
+	phy_id = <&mdio0>, <0>;
+	phy-mode = "rmii";
+};
+
+&phy_sel {
+	rmii-clock-ext;
+};
-- 
1.8.5.3

[PATCH 1/3] arm: dts: am33xx.dtsi: Add node name to rtc device node

[Sergei Shtylyov]

Hello.

On 02/05/2014 03:12 PM, Stefan Roese wrote:

> Making it possible to reference and therefor change (disable) this
> device node from other dts file which import this dtsi file.

> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Lukas Stockmann <lukas.stockmann@siemens.com>
> Cc: Benoit Cousson <bcousson@baylibre.com>
> Cc: Tony Lindgren <tony@atomide.com>
> ---
>   arch/arm/boot/dts/am33xx.dtsi | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

> diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
> index 6d95d3d..b8daf8c 100644
> --- a/arch/arm/boot/dts/am33xx.dtsi
> +++ b/arch/arm/boot/dts/am33xx.dtsi
> @@ -399,7 +399,7 @@
>   			ti,timer-pwm;
>   		};
>
> -		rtc at 44e3e000 {
> +		rtc: rtc at 44e3e000 {

    Node name is "rtc at 44e3e000" -- what you are adding is a label.

WBR, Sergei

[PATCH 1/3] arm: dts: am33xx.dtsi: Add node name to rtc device node

[Tony Lindgren]

* Stefan Roese <sr@denx.de> [140205 04:14]:
> Making it possible to reference and therefor change (disable) this
> device node from other dts file which import this dtsi file.
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Lukas Stockmann <lukas.stockmann@siemens.com>
> Cc: Benoit Cousson <bcousson@baylibre.com>
> Cc: Tony Lindgren <tony@atomide.com>

Thanks applying into omap-for-v3.15/dt.

Tony

> ---
>  arch/arm/boot/dts/am33xx.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
> index 6d95d3d..b8daf8c 100644
> --- a/arch/arm/boot/dts/am33xx.dtsi
> +++ b/arch/arm/boot/dts/am33xx.dtsi
> @@ -399,7 +399,7 @@
>  			ti,timer-pwm;
>  		};
>  
> -		rtc at 44e3e000 {
> +		rtc: rtc at 44e3e000 {
>  			compatible = "ti,da830-rtc";
>  			reg = <0x44e3e000 0x1000>;
>  			interrupts = <75
> -- 
> 1.8.5.3
>