Merge tag 'dlm-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

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

diff --git a/arch/arm/boot/dts/lpc18xx.dtsi b/arch/arm/boot/dts/lpc18xx.dtsi
index c17b82cc2d4c891c5da0f053cf2c4ffe515a4551..2c569a6ddc9a549718991aeacdd63b9ea608b6c1 100644 (file)
--- a/arch/arm/boot/dts/lpc18xx.dtsi
+++ b/arch/arm/boot/dts/lpc18xx.dtsi
@@ -83,6 +83,8 @@
                        reg = <0x40006100 0x100>;
                        interrupts = <8>;
                        clocks = <&ccu1 CLK_CPU_USB0>;
+                       phys = <&usb0_otg_phy>;
+                       phy-names = "usb";
                        has-transaction-translator;
                        status = "disabled";
                };
@@ -95,6 +97,30 @@
                        status = "disabled";
                };
 
+               emc: memory-controller@40005000 {
+                       compatible = "arm,pl172", "arm,primecell";
+                       reg = <0x40005000 0x1000>;
+                       clocks = <&ccu1 CLK_CPU_EMCDIV>, <&ccu1 CLK_CPU_EMC>;
+                       clock-names = "mpmcclk", "apb_pclk";
+                       #address-cells = <2>;
+                       #size-cells = <1>;
+                       ranges = <0 0 0x1c000000 0x1000000
+                                 1 0 0x1d000000 0x1000000
+                                 2 0 0x1e000000 0x1000000
+                                 3 0 0x1f000000 0x1000000>;
+                       status = "disabled";
+               };
+
+               lcdc: lcd-controller@40008000 {
+                       compatible = "arm,pl111", "arm,primecell";
+                       reg = <0x40008000 0x1000>;
+                       interrupts = <7>;
+                       interrupt-names = "combined";
+                       clocks = <&cgu BASE_LCD_CLK>, <&ccu1 CLK_CPU_LCD>;
+                       clock-names = "clcdclk", "apb_pclk";
+                       status = "disabled";
+               };
+
                mac: ethernet@40010000 {
                        compatible = "nxp,lpc1850-dwmac", "snps,dwmac-3.611", "snps,dwmac";
                        reg = <0x40010000 0x2000>;
@@ -109,6 +135,12 @@
                        compatible = "nxp,lpc1850-creg", "syscon", "simple-mfd";
                        reg = <0x40043000 0x1000>;
                        clocks = <&ccu1 CLK_CPU_CREG>;
+
+                       usb0_otg_phy: phy@004 {
+                               compatible = "nxp,lpc1850-usb-otg-phy";
+                               clocks = <&ccu1 CLK_USB0>;
+                               #phy-cells = <0>;
+                       };
                };
 
                cgu: clock-controller@40050000 {