Merge tag 'pinctrl-v3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[cascardo/linux.git] / arch / arm / boot / dts / stih407-b2120.dts

diff --git a/arch/arm/boot/dts/stih407-b2120.dts b/arch/arm/boot/dts/stih407-b2120.dts
index fe69f92..261d5e2 100644 (file)
--- a/arch/arm/boot/dts/stih407-b2120.dts
+++ b/arch/arm/boot/dts/stih407-b2120.dts
@@ -7,13 +7,15 @@
  * published by the Free Software Foundation.
  */
 /dts-v1/;
-#include "stih407.dtsi"
+#include "stih407-clock.dtsi"
+#include "stih407-family.dtsi"
+#include "stihxxx-b2120.dtsi"
 / {
        model = "STiH407 B2120";
        compatible = "st,stih407-b2120", "st,stih407";
 
        chosen {
-               bootargs = "console=ttyAS0,115200";
+               bootargs = "console=ttyAS0,115200 clk_ignore_unused";
                linux,stdout-path = &sbc_serial0;
        };
 
@@ -26,53 +28,4 @@
                ttyAS0 = &sbc_serial0;
        };
 
-       soc {
-               sbc_serial0: serial@9530000 {
-                       status = "okay";
-               };
-
-               leds {
-                       compatible = "gpio-leds";
-                       red {
-                               #gpio-cells = <2>;
-                               label = "Front Panel LED";
-                               gpios = <&pio4 1 0>;
-                               linux,default-trigger = "heartbeat";
-                       };
-                       green {
-                               #gpio-cells = <2>;
-                               gpios = <&pio1 3 0>;
-                               default-state = "off";
-                       };
-               };
-
-               i2c@9842000 {
-                       status = "okay";
-               };
-
-               i2c@9843000 {
-                       status = "okay";
-               };
-
-               i2c@9844000 {
-                       status = "okay";
-               };
-
-               i2c@9845000 {
-                       status = "okay";
-               };
-
-               i2c@9540000 {
-                       status = "okay";
-               };
-
-               /* SSC11 to HDMI */
-               i2c@9541000 {
-                       status = "okay";
-                       /* HDMI V1.3a supports Standard mode only */
-                       clock-frequency = <100000>;
-                       st,i2c-min-scl-pulse-width-us = <0>;
-                       st,i2c-min-sda-pulse-width-us = <5>;
-               };
-       };
 };