Merge tag 'v4.3-next-arm64' of https://github.com/mbgg/linux-mediatek into next/arm64

Correct i2c DTS node names in mt8173.dtsi.

Add spi DTS node to the mt8173 and mt8173-evb.

Add dts nodes for the subsystem clocks on mt8173.
This includes mmsys, imgsys, vdecsys, vencsys, vencltsys.

Add clock nodes to the scpsys binding, which are needed to
access the registers of venc and venc_lt power domains.

* tag 'v4.3-next-arm64' of https://github.com/mbgg/linux-mediatek:
  arm64: dts: mt8173: Add clocks for SCPSYS unit
  arm64: dts: mt8173: Add subsystem clock controller device nodes
  arm64: dts: Add spi bus dts
  arm64: mt8173.dtsi: correct i2c node names

Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 75 insertions, 5 deletions

diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
index 4be66cadbc7c..811cb760ba49 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
@@ -387,6 +387,24 @@
         };
 };
 
+&pio {
+        spi_pins_a: spi0 {
+                pins_spi {
+                        pinmux = <MT8173_PIN_69_SPI_CK__FUNC_SPI_CK_0_>,
+                                <MT8173_PIN_70_SPI_MI__FUNC_SPI_MI_0_>,
+                                <MT8173_PIN_71_SPI_MO__FUNC_SPI_MO_0_>,
+                                <MT8173_PIN_72_SPI_CS__FUNC_SPI_CS_0_>;
+                };
+        };
+};
+
+&spi {
+        pinctrl-names = "default";
+        pinctrl-0 = <&spi_pins_a>;
+        mediatek,pad-select = <0>;
+        status = "okay";
+};
+
 &uart0 {
         status = "okay";
 };
diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
index 06a15644be38..4dd5f93d0303 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
@@ -116,6 +116,13 @@
                 clock-output-names = "clk32k";
         };
 
+        cpum_ck: oscillator@2 {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+                clock-output-names = "cpum_ck";
+        };
+
         timer {
                 compatible = "arm,armv8-timer";
                 interrupt-parent = <&gic>;
@@ -227,8 +234,10 @@
                         #power-domain-cells = <1>;
                         reg = <0 0x10006000 0 0x1000>;
                         clocks = <&clk26m>,
-                                 <&topckgen CLK_TOP_MM_SEL>;
-                        clock-names = "mfg", "mm";
+                                 <&topckgen CLK_TOP_MM_SEL>,
+                                 <&topckgen CLK_TOP_VENC_SEL>,
+                                 <&topckgen CLK_TOP_VENC_LT_SEL>;
+                        clock-names = "mfg", "mm", "venc", "venc_lt";
                         infracfg = <&infracfg>;
                 };
 
@@ -365,7 +374,20 @@
                         status = "disabled";
                 };
 
-                i2c3: i2c3@11010000 {
+                spi: spi@1100a000 {
+                        compatible = "mediatek,mt8173-spi";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0 0x1100a000 0 0x1000>;
+                        interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_LOW>;
+                        clocks = <&topckgen CLK_TOP_SYSPLL3_D2>,
+                                 <&topckgen CLK_TOP_SPI_SEL>,
+                                 <&pericfg CLK_PERI_SPI0>;
+                        clock-names = "parent-clk", "sel-clk", "spi-clk";
+                        status = "disabled";
+                };
+
+                i2c3: i2c@11010000 {
                         compatible = "mediatek,mt8173-i2c";
                         reg = <0 0x11010000 0 0x70>,
                               <0 0x11000280 0 0x80>;
@@ -381,7 +403,7 @@
                         status = "disabled";
                 };
 
-                i2c4: i2c4@11011000 {
+                i2c4: i2c@11011000 {
                         compatible = "mediatek,mt8173-i2c";
                         reg = <0 0x11011000 0 0x70>,
                               <0 0x11000300 0 0x80>;
@@ -397,7 +419,7 @@
                         status = "disabled";
                 };
 
-                i2c6: i2c6@11013000 {
+                i2c6: i2c@11013000 {
                         compatible = "mediatek,mt8173-i2c";
                         reg = <0 0x11013000 0 0x70>,
                               <0 0x11000080 0 0x80>;
@@ -487,6 +509,36 @@
                         clock-names = "source", "hclk";
                         status = "disabled";
                 };
+
+                mmsys: clock-controller@14000000 {
+                        compatible = "mediatek,mt8173-mmsys", "syscon";
+                        reg = <0 0x14000000 0 0x1000>;
+                        #clock-cells = <1>;
+                };
+
+                imgsys: clock-controller@15000000 {
+                        compatible = "mediatek,mt8173-imgsys", "syscon";
+                        reg = <0 0x15000000 0 0x1000>;
+                        #clock-cells = <1>;
+                };
+
+                vdecsys: clock-controller@16000000 {
+                        compatible = "mediatek,mt8173-vdecsys", "syscon";
+                        reg = <0 0x16000000 0 0x1000>;
+                        #clock-cells = <1>;
+                };
+
+                vencsys: clock-controller@18000000 {
+                        compatible = "mediatek,mt8173-vencsys", "syscon";
+                        reg = <0 0x18000000 0 0x1000>;
+                        #clock-cells = <1>;
+                };
+
+                vencltsys: clock-controller@19000000 {
+                        compatible = "mediatek,mt8173-vencltsys", "syscon";
+                        reg = <0 0x19000000 0 0x1000>;
+                        #clock-cells = <1>;
+                };
         };
 };