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

[platform/kernel/linux-starfive.git] / arch / arm / boot / dts / s5pv210-aries.dtsi

diff --git a/arch/arm/boot/dts/s5pv210-aries.dtsi b/arch/arm/boot/dts/s5pv210-aries.dtsi
index 96e8c22..4da33d0 100644 (file)
--- a/arch/arm/boot/dts/s5pv210-aries.dtsi
+++ b/arch/arm/boot/dts/s5pv210-aries.dtsi
@@ -47,6 +47,18 @@
                };
        };
 
+       pmic_ap_clk: clock-0 {
+               /* Workaround for missing clock on PMIC */
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <32768>;
+       };
+
+       bt_codec: bt_sco {
+               compatible = "linux,bt-sco";
+               #sound-dai-cells = <0>;
+       };
+
        vibrator_pwr: regulator-fixed-0 {
                compatible = "regulator-fixed";
                regulator-name = "vibrator-en";
@@ -54,7 +66,7 @@
                gpio = <&gpj1 1 GPIO_ACTIVE_HIGH>;
 
                pinctrl-names = "default";
-               pinctr-0 = <&vibrator_ena>;
+               pinctrl-0 = <&vibrator_ena>;
        };
 
        touchkey_vdd: regulator-fixed-1 {
@@ -533,7 +545,7 @@
                value = <0x5200>;
        };
 
-       spi_lcd: spi-gpio-0 {
+       spi_lcd: spi-2 {
                compatible = "spi-gpio";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -624,6 +636,11 @@
        };
 };
 
+&i2s0 {
+       dmas = <&pdma0 9>, <&pdma0 10>, <&pdma0 11>;
+       status = "okay";
+};
+
 &mfc {
        memory-region = <&mfc_left>, <&mfc_right>;
 };
@@ -815,6 +832,11 @@
        samsung,pwm-outputs = <1>;
 };
 
+&rtc {
+       clocks = <&clocks CLK_RTC>, <&pmic_ap_clk>;
+       clock-names = "rtc", "rtc_src";
+};
+
 &sdhci1 {
        #address-cells = <1>;
        #size-cells = <0>;