Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[karo-tx-linux.git] / arch / arm / boot / dts / sama5d2.dtsi

diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi
index 8067c71c3a38a956d93ccaaaf53e724715243328..cc06da3943668415e9b6379dbe38d2fde36518ec 100644 (file)
--- a/arch/arm/boot/dts/sama5d2.dtsi
+++ b/arch/arm/boot/dts/sama5d2.dtsi
@@ -135,6 +135,12 @@
                #size-cells = <1>;
                ranges;
 
+               nfc_sram: sram@00100000 {
+                       compatible = "mmio-sram";
+                       no-memory-wc;
+                       reg = <0x00100000 0x2400>;
+               };
+
                usb0: gadget@00300000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -291,6 +297,32 @@
                        cache-level = <2>;
                };
 
+               ebi: ebi@10000000 {
+                       compatible = "atmel,sama5d3-ebi";
+                       #address-cells = <2>;
+                       #size-cells = <1>;
+                       atmel,smc = <&hsmc>;
+                       reg = <0x10000000 0x10000000
+                              0x40000000 0x30000000>;
+                       ranges = <0x0 0x0 0x10000000 0x10000000
+                                 0x1 0x0 0x60000000 0x10000000
+                                 0x2 0x0 0x70000000 0x10000000
+                                 0x3 0x0 0x80000000 0x10000000>;
+                       clocks = <&mck>;
+                       status = "disabled";
+
+                       nand_controller: nand-controller {
+                               compatible = "atmel,sama5d3-nand-controller";
+                               atmel,nfc-sram = <&nfc_sram>;
+                               atmel,nfc-io = <&nfc_io>;
+                               ecc-engine = <&pmecc>;
+                               #address-cells = <2>;
+                               #size-cells = <1>;
+                               ranges;
+                               status = "disabled";
+                       };
+               };
+
                nand0: nand@80000000 {
                        compatible = "atmel,sama5d2-nand";
                        #address-cells = <1>;
@@ -347,6 +379,11 @@
                        status = "disabled";
                };
 
+               nfc_io: nfc-io@c0000000 {
+                       compatible = "atmel,sama5d3-nfc-io", "syscon";
+                       reg = <0xc0000000 0x8000000>;
+               };
+
                apb {
                        compatible = "simple-bus";
                        #address-cells = <1>;
@@ -762,6 +799,18 @@
                                                atmel,clk-output-range = <0 83000000>;
                                        };
 
+                                       can0_clk: can0_clk {
+                                               #clock-cells = <0>;
+                                               reg = <56>;
+                                               atmel,clk-output-range = <0 83000000>;
+                                       };
+
+                                       can1_clk: can1_clk {
+                                               #clock-cells = <0>;
+                                               reg = <57>;
+                                               atmel,clk-output-range = <0 83000000>;
+                                       };
+
                                        classd_clk: classd_clk {
                                                #clock-cells = <0>;
                                                reg = <59>;
@@ -890,6 +939,18 @@
                                                #clock-cells = <0>;
                                                reg = <55>;
                                        };
+
+                                       can0_gclk: can0_gclk {
+                                               #clock-cells = <0>;
+                                               reg = <56>;
+                                               atmel,clk-output-range = <0 80000000>;
+                                       };
+
+                                       can1_gclk: can1_gclk {
+                                               #clock-cells = <0>;
+                                               reg = <57>;
+                                               atmel,clk-output-range = <0 80000000>;
+                                       };
                                };
                        };
 
@@ -986,6 +1047,22 @@
                                clock-names = "t0_clk", "slow_clk";
                        };
 
+                       hsmc: hsmc@f8014000 {
+                               compatible = "atmel,sama5d3-smc", "syscon", "simple-mfd";
+                               reg = <0xf8014000 0x1000>;
+                               interrupts = <5 IRQ_TYPE_LEVEL_HIGH 6>;
+                               clocks = <&hsmc_clk>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+                               ranges;
+
+                               pmecc: ecc-engine@ffffc070 {
+                                       compatible = "atmel,sama5d2-pmecc";
+                                       reg = <0xffffc070 0x490>,
+                                             <0xffffc500 0x100>;
+                               };
+                       };
+
                        pdmic: pdmic@f8018000 {
                                compatible = "atmel,sama5d2-pdmic";
                                reg = <0xf8018000 0x124>;
@@ -1065,6 +1142,14 @@
                                status = "disabled";
                        };
 
+                       pwm0: pwm@f802c000 {
+                               compatible = "atmel,sama5d2-pwm";
+                               reg = <0xf802c000 0x4000>;
+                               interrupts = <38 IRQ_TYPE_LEVEL_HIGH 7>;
+                               #pwm-cells = <3>;
+                               clocks = <&pwm_clk>;
+                       };
+
                        sfr: sfr@f8030000 {
                                compatible = "atmel,sama5d2-sfr", "syscon";
                                reg = <0xf8030000 0x98>;
@@ -1144,6 +1229,22 @@
                                clocks = <&clk32k>;
                        };
 
+                       can0: can@f8054000 {
+                               compatible = "bosch,m_can";
+                               reg = <0xf8054000 0x4000>, <0x210000 0x4000>;
+                               reg-names = "m_can", "message_ram";
+                               interrupts = <56 IRQ_TYPE_LEVEL_HIGH 7>,
+                                            <64 IRQ_TYPE_LEVEL_HIGH 7>;
+                               interrupt-names = "int0", "int1";
+                               clocks = <&can0_clk>, <&can0_gclk>;
+                               clock-names = "hclk", "cclk";
+                               assigned-clocks = <&can0_gclk>;
+                               assigned-clock-parents = <&utmi>;
+                               assigned-clock-rates = <40000000>;
+                               bosch,mram-cfg = <0x0 0 0 64 0 0 32 32>;
+                               status = "disabled";
+                       };
+
                        spi1: spi@fc000000 {
                                compatible = "atmel,at91rm9200-spi";
                                reg = <0xfc000000 0x100>;
@@ -1305,6 +1406,22 @@
                                status = "okay";
                        };
 
+                       can1: can@fc050000 {
+                               compatible = "bosch,m_can";
+                               reg = <0xfc050000 0x4000>, <0x210000 0x4000>;
+                               reg-names = "m_can", "message_ram";
+                               interrupts = <57 IRQ_TYPE_LEVEL_HIGH 7>,
+                                            <65 IRQ_TYPE_LEVEL_HIGH 7>;
+                               interrupt-names = "int0", "int1";
+                               clocks = <&can1_clk>, <&can1_gclk>;
+                               clock-names = "hclk", "cclk";
+                               assigned-clocks = <&can1_gclk>;
+                               assigned-clock-parents = <&utmi>;
+                               assigned-clock-rates = <40000000>;
+                               bosch,mram-cfg = <0x1100 0 0 64 0 0 32 32>;
+                               status = "disabled";
+                       };
+
                        sfrbu: sfr@fc05c000 {
                                compatible = "atmel,sama5d2-sfrbu", "syscon";
                                reg = <0xfc05c000 0x20>;