Merge tag 'samsung-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...

[cascardo/linux.git] / arch / arm / boot / dts / imx27-phytec-phycore-rdk.dts

diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
index df3b2e7..538568b 100644 (file)
--- a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
@@ -12,14 +12,79 @@
 / {
        model = "Phytec pcm970";
        compatible = "phytec,imx27-pcm970", "phytec,imx27-pcm038", "fsl,imx27";
+
+       chosen {
+               stdout-path = &uart1;
+       };
+
+       display0: LQ035Q7 {
+               model = "Sharp-LQ035Q7";
+               native-mode = <&timing0>;
+               bits-per-pixel = <16>;
+               fsl,pcr = <0xf00080c0>;
+
+               display-timings {
+                       timing0: 240x320 {
+                               clock-frequency = <5500000>;
+                               hactive = <240>;
+                               vactive = <320>;
+                               hback-porch = <5>;
+                               hsync-len = <7>;
+                               hfront-porch = <16>;
+                               vback-porch = <7>;
+                               vsync-len = <1>;
+                               vfront-porch = <9>;
+                               pixelclk-active = <1>;
+                               hsync-active = <1>;
+                               vsync-active = <1>;
+                               de-active = <0>;
+                       };
+               };
+       };
+
+       regulators {
+               regulator@2 {
+                       compatible = "regulator-fixed";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_csien>;
+                       reg = <2>;
+                       regulator-name = "CSI_EN";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       gpio = <&gpio2 24 GPIO_ACTIVE_LOW>;
+                       regulator-always-on;
+               };
+       };
+
+       usbphy {
+               usbphy2: usbphy@2 {
+                       compatible = "usb-nop-xceiv";
+                       reg = <2>;
+                       vcc-supply = <&reg_5v0>;
+                       clocks = <&clks IMX27_CLK_DUMMY>;
+                       clock-names = "main_clk";
+               };
+       };
 };
 
 &cspi1 {
+       pinctrl-0 = <&pinctrl_cspi1>, <&pinctrl_cspi1cs1>;
        fsl,spi-num-chipselects = <2>;
        cs-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>,
                   <&gpio4 27 GPIO_ACTIVE_LOW>;
 };
 
+&fb {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_imxfb1>;
+       display = <&display0>;
+       lcd-supply = <&reg_5v0>;
+       fsl,dmacr = <0x00020010>;
+       fsl,lscr1 = <0x00120300>;
+       fsl,lpccr = <0x00a903ff>;
+       status = "okay";
+};
+
 &i2c1 {
        clock-frequency = <400000>;
        pinctrl-names = "default";
@@ -36,6 +101,50 @@
 
 &iomuxc {
        imx27_phycore_rdk {
+               pinctrl_csien: csiengrp {
+                       fsl,pins = <
+                               MX27_PAD_USB_OC_B__GPIO2_24 0x0
+                       >;
+               };
+
+               pinctrl_cspi1cs1: cspi1cs1grp {
+                       fsl,pins = <
+                               MX27_PAD_CSPI1_SS1__GPIO4_27 0x0
+                       >;
+               };
+
+               pinctrl_imxfb1: imxfbgrp {
+                       fsl,pins = <
+                               MX27_PAD_LD0__LD0 0x0
+                               MX27_PAD_LD1__LD1 0x0
+                               MX27_PAD_LD2__LD2 0x0
+                               MX27_PAD_LD3__LD3 0x0
+                               MX27_PAD_LD4__LD4 0x0
+                               MX27_PAD_LD5__LD5 0x0
+                               MX27_PAD_LD6__LD6 0x0
+                               MX27_PAD_LD7__LD7 0x0
+                               MX27_PAD_LD8__LD8 0x0
+                               MX27_PAD_LD9__LD9 0x0
+                               MX27_PAD_LD10__LD10 0x0
+                               MX27_PAD_LD11__LD11 0x0
+                               MX27_PAD_LD12__LD12 0x0
+                               MX27_PAD_LD13__LD13 0x0
+                               MX27_PAD_LD14__LD14 0x0
+                               MX27_PAD_LD15__LD15 0x0
+                               MX27_PAD_LD16__LD16 0x0
+                               MX27_PAD_LD17__LD17 0x0
+                               MX27_PAD_CLS__CLS 0x0
+                               MX27_PAD_CONTRAST__CONTRAST 0x0
+                               MX27_PAD_LSCLK__LSCLK 0x0
+                               MX27_PAD_OE_ACD__OE_ACD 0x0
+                               MX27_PAD_PS__PS 0x0
+                               MX27_PAD_REV__REV 0x0
+                               MX27_PAD_SPL_SPR__SPL_SPR 0x0
+                               MX27_PAD_HSYNC__HSYNC 0x0
+                               MX27_PAD_VSYNC__VSYNC 0x0
+                       >;
+               };
+
                pinctrl_i2c1: i2c1grp {
                        /* Add pullup to DATA line */
                        fsl,pins = <
@@ -193,19 +302,16 @@
        dr_mode = "host";
        phy_type = "ulpi";
        vbus-supply = <&reg_5v0>;
+       fsl,usbphy = <&usbphy2>;
        disable-over-current;
        status = "okay";
 };
 
-&usbphy2 {
-       vcc-supply = <&reg_5v0>;
-};
-
 &weim {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_weim>;
 
-       can@d4000000 {
+       can@4,0 {
                compatible = "nxp,sja1000";
                reg = <4 0x00000000 0x00000100>;
                interrupt-parent = <&gpio5>;