Skip to content

Commit

Permalink
Merge branch 'imx/dt/for-3.5' of git://git.linaro.org/people/shawnguo…
Browse files Browse the repository at this point in the history 
…/linux-2.6.git into next/dt2

Shawn Guo <shawn.guo@linaro.org> writes:

  I chose to base it on Sascha's imx-common-clk series than -rc, because
  otherwise it will keep patching clock file that has been removed by
  imx-common-clk series.  It also depends on imx-pinctrl pull-request
  I just sent to be functional.

  Note: when imx-common-clk and imx-pinctrl get merged together, the
  following files will have conflicts.  But the conflicts should not be
  so hard to resolve.

[arnd: resolved those merge conflicts by pulling pinctrl branch]

* imx/dt: (24 commits)
  ARM: dts: imx53-qsb: enable audio support
  ARM: dts: imx51-babbage: enable audio support
  ARM: imx: add audio codec clk lookup for imx53-qsb
  ARM: imx: add audmux pad setting for imx51-babbage
  ARM: imx: add more imx5 ssi clocks
  ARM: dts: imx53-qsb: Add Dialog DA9053 PMIC support
  ARM: dts: imx6q-sabrelite: add serial2 pinctrl support
  ARM: dts: imx6q-sabrelite: add sound device imx6q-sabrelite-sgtl5000
  ARM: imx6q_sabrelite: clk_register_clkdev cko1 for sgtl5000
  ARM: imx6q: add ssi1_ipg clk_lookup
  ARM: dts: imx6q-sabrelite: add audmux pinctrl support
  ARM: dts: imx6q-sabrelite: add i2c1 pinctrl support
  ARM: dts: imx6q-sabrelite: add audmux device
  ARM: dts: imx6q-sabrelite: add ssi device
  ARM: dts: imx6q-arm2: add pinctrl state for usdhc
  ARM: imx6: Add UART2 for low-level debug
  ARM: imx6q: register phy fixup only when CONFIG_PHYLIB is enabled
  ARM: imx6q: move imx6q_sabrelite specific code to a dedicated function
  ARM: dts: imx6q-sabrelite: Add SPI NOR support
  ARM: dts: Add basic support for imx6q-sabresd
  ...

Pulls in imx/pinctrl and imx/clock as dependencies.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Arnd Bergmann committed May 14, 2012
2 parents e29402e + 6b20428 commit 304ea74
Show file tree
Hide file tree
Showing 70 changed files with 4,445 additions and 8,234 deletions.
4 changes: 4 additions & 0 deletions Documentation/devicetree/bindings/arm/fsl.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ i.MX6 Quad SABRE Lite Board
Required root node properties:
- compatible = "fsl,imx6q-sabrelite", "fsl,imx6q";

i.MX6 Quad SABRE Smart Device Board
Required root node properties:
- compatible = "fsl,imx6q-sabresd", "fsl,imx6q";

Generic i.MX boards
-------------------

Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/net/fsl-fec.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Optional properties:

Example:

fec@83fec000 {
ethernet@83fec000 {
compatible = "fsl,imx51-fec", "fsl,imx27-fec";
reg = <0x83fec000 0x4000>;
interrupts = <87>;
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Optional properties:

Example:

uart@73fbc000 {
serial@73fbc000 {
compatible = "fsl,imx51-uart", "fsl,imx21-uart";
reg = <0x73fbc000 0x4000>;
interrupts = <31>;
Expand Down
8 changes: 8 additions & 0 deletions arch/arm/Kconfig.debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,14 @@ choice
Say Y here if you want kernel low-level debugging support
on i.MX50 or i.MX53.

config DEBUG_IMX6Q_UART2
bool "i.MX6Q Debug UART2"
depends on SOC_IMX6Q
help
Say Y here if you want kernel low-level debugging support
on i.MX6Q UART2. This is correct for e.g. the SabreLite
board.

config DEBUG_IMX6Q_UART4
bool "i.MX6Q Debug UART4"
depends on SOC_IMX6Q
Expand Down
8 changes: 4 additions & 4 deletions arch/arm/boot/dts/imx27-phytec-phycore.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,22 @@
status = "okay";
};

uart@1000a000 {
serial@1000a000 {
fsl,uart-has-rtscts;
status = "okay";
};

uart@1000b000 {
serial@1000b000 {
fsl,uart-has-rtscts;
status = "okay";
};

uart@1000c000 {
serial@1000c000 {
fsl,uart-has-rtscts;
status = "okay";
};

fec@1002b000 {
ethernet@1002b000 {
status = "okay";
};

Expand Down
14 changes: 7 additions & 7 deletions arch/arm/boot/dts/imx27.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,28 +59,28 @@
status = "disabled";
};

uart1: uart@1000a000 {
uart1: serial@1000a000 {
compatible = "fsl,imx27-uart", "fsl,imx21-uart";
reg = <0x1000a000 0x1000>;
interrupts = <20>;
status = "disabled";
};

uart2: uart@1000b000 {
uart2: serial@1000b000 {
compatible = "fsl,imx27-uart", "fsl,imx21-uart";
reg = <0x1000b000 0x1000>;
interrupts = <19>;
status = "disabled";
};

uart3: uart@1000c000 {
uart3: serial@1000c000 {
compatible = "fsl,imx27-uart", "fsl,imx21-uart";
reg = <0x1000c000 0x1000>;
interrupts = <18>;
status = "disabled";
};

uart4: uart@1000d000 {
uart4: serial@1000d000 {
compatible = "fsl,imx27-uart", "fsl,imx21-uart";
reg = <0x1000d000 0x1000>;
interrupts = <17>;
Expand Down Expand Up @@ -183,14 +183,14 @@
status = "disabled";
};

uart5: uart@1001b000 {
uart5: serial@1001b000 {
compatible = "fsl,imx27-uart", "fsl,imx21-uart";
reg = <0x1001b000 0x1000>;
interrupts = <49>;
status = "disabled";
};

uart6: uart@1001c000 {
uart6: serial@1001c000 {
compatible = "fsl,imx27-uart", "fsl,imx21-uart";
reg = <0x1001c000 0x1000>;
interrupts = <48>;
Expand All @@ -206,7 +206,7 @@
status = "disabled";
};

fec: fec@1002b000 {
fec: ethernet@1002b000 {
compatible = "fsl,imx27-fec";
reg = <0x1002b000 0x4000>;
interrupts = <50>;
Expand Down
40 changes: 31 additions & 9 deletions arch/arm/boot/dts/imx51-babbage.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
model = "Freescale i.MX51 Babbage Board";
compatible = "fsl,imx51-babbage", "fsl,imx51";

chosen {
bootargs = "console=ttymxc0,115200 root=/dev/mmcblk0p3 rootwait";
};

memory {
reg = <0x90000000 0x20000000>;
};
Expand All @@ -40,7 +36,7 @@
status = "okay";
};

uart3: uart@7000c000 {
uart3: serial@7000c000 {
fsl,uart-has-rtscts;
status = "okay";
};
Expand Down Expand Up @@ -166,6 +162,11 @@
};
};
};

ssi2: ssi@70014000 {
fsl,mode = "i2s-slave";
status = "okay";
};
};

wdog@73f98000 { /* WDOG1 */
Expand All @@ -177,12 +178,12 @@
reg = <0x73fa8000 0x4000>;
};

uart1: uart@73fbc000 {
uart1: serial@73fbc000 {
fsl,uart-has-rtscts;
status = "okay";
};

uart2: uart@73fc0000 {
uart2: serial@73fc0000 {
status = "okay";
};
};
Expand All @@ -195,13 +196,20 @@
i2c@83fc4000 { /* I2C2 */
status = "okay";

codec: sgtl5000@0a {
sgtl5000: codec@0a {
compatible = "fsl,sgtl5000";
reg = <0x0a>;
clock-frequency = <26000000>;
VDDA-supply = <&vdig_reg>;
VDDIO-supply = <&vvideo_reg>;
};
};

fec@83fec000 {
audmux@83fd0000 {
status = "okay";
};

ethernet@83fec000 {
phy-mode = "mii";
status = "okay";
};
Expand All @@ -218,4 +226,18 @@
gpio-key,wakeup;
};
};

sound {
compatible = "fsl,imx51-babbage-sgtl5000",
"fsl,imx-audio-sgtl5000";
model = "imx51-babbage-sgtl5000";
ssi-controller = <&ssi2>;
audio-codec = <&sgtl5000>;
audio-routing =
"MIC_IN", "Mic Jack",
"Mic Jack", "Mic Bias",
"Headphone Jack", "HP_OUT";
mux-int-port = <2>;
mux-ext-port = <3>;
};
};
41 changes: 37 additions & 4 deletions arch/arm/boot/dts/imx51.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
status = "disabled";
};

uart3: uart@7000c000 {
uart3: serial@7000c000 {
compatible = "fsl,imx51-uart", "fsl,imx21-uart";
reg = <0x7000c000 0x4000>;
interrupts = <33>;
Expand All @@ -102,6 +102,15 @@
status = "disabled";
};

ssi2: ssi@70014000 {
compatible = "fsl,imx51-ssi", "fsl,imx21-ssi";
reg = <0x70014000 0x4000>;
interrupts = <30>;
fsl,fifo-depth = <15>;
fsl,ssi-dma-events = <25 24 23 22>; /* TX0 RX0 TX1 RX1 */
status = "disabled";
};

esdhc@70020000 { /* ESDHC3 */
compatible = "fsl,imx51-esdhc";
reg = <0x70020000 0x4000>;
Expand Down Expand Up @@ -171,14 +180,14 @@
status = "disabled";
};

uart1: uart@73fbc000 {
uart1: serial@73fbc000 {
compatible = "fsl,imx51-uart", "fsl,imx21-uart";
reg = <0x73fbc000 0x4000>;
interrupts = <31>;
status = "disabled";
};

uart2: uart@73fc0000 {
uart2: serial@73fc0000 {
compatible = "fsl,imx51-uart", "fsl,imx21-uart";
reg = <0x73fc0000 0x4000>;
interrupts = <32>;
Expand Down Expand Up @@ -235,7 +244,31 @@
status = "disabled";
};

fec@83fec000 {
ssi1: ssi@83fcc000 {
compatible = "fsl,imx51-ssi", "fsl,imx21-ssi";
reg = <0x83fcc000 0x4000>;
interrupts = <29>;
fsl,fifo-depth = <15>;
fsl,ssi-dma-events = <29 28 27 26>; /* TX0 RX0 TX1 RX1 */
status = "disabled";
};

audmux@83fd0000 {
compatible = "fsl,imx51-audmux", "fsl,imx31-audmux";
reg = <0x83fd0000 0x4000>;
status = "disabled";
};

ssi3: ssi@83fe8000 {
compatible = "fsl,imx51-ssi", "fsl,imx21-ssi";
reg = <0x83fe8000 0x4000>;
interrupts = <96>;
fsl,fifo-depth = <15>;
fsl,ssi-dma-events = <47 46 37 35>; /* TX0 RX0 TX1 RX1 */
status = "disabled";
};

ethernet@83fec000 {
compatible = "fsl,imx51-fec", "fsl,imx27-fec";
reg = <0x83fec000 0x4000>;
interrupts = <87>;
Expand Down
6 changes: 1 addition & 5 deletions arch/arm/boot/dts/imx53-ard.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
model = "Freescale i.MX53 Automotive Reference Design Board";
compatible = "fsl,imx53-ard", "fsl,imx53";

chosen {
bootargs = "console=ttymxc0,115200 root=/dev/mmcblk0p3 rootwait";
};

memory {
reg = <0x70000000 0x40000000>;
};
Expand All @@ -44,7 +40,7 @@
reg = <0x53fa8000 0x4000>;
};

uart1: uart@53fbc000 {
uart1: serial@53fbc000 {
status = "okay";
};
};
Expand Down
8 changes: 2 additions & 6 deletions arch/arm/boot/dts/imx53-evk.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
model = "Freescale i.MX53 Evaluation Kit";
compatible = "fsl,imx53-evk", "fsl,imx53";

chosen {
bootargs = "console=ttymxc0,115200 root=/dev/mmcblk0p3 rootwait";
};

memory {
reg = <0x70000000 0x80000000>;
};
Expand Down Expand Up @@ -75,7 +71,7 @@
reg = <0x53fa8000 0x4000>;
};

uart1: uart@53fbc000 {
uart1: serial@53fbc000 {
status = "okay";
};
};
Expand All @@ -99,7 +95,7 @@
};
};

fec@63fec000 {
ethernet@63fec000 {
phy-mode = "rmii";
phy-reset-gpios = <&gpio7 6 0>;
status = "okay";
Expand Down
Loading

0 comments on commit 304ea74

Please sign in to comment.