From patchwork Sat Jul 18 20:50:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 11672045 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B628F13A4 for ; Sat, 18 Jul 2020 20:50:37 +0000 (UTC) Received: by mail.kernel.org (Postfix) id AE76720826; Sat, 18 Jul 2020 20:50:37 +0000 (UTC) Delivered-To: soc@kernel.org Received: from v6.sk (v6.sk [167.172.42.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7F2EB205CB; Sat, 18 Jul 2020 20:50:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7F2EB205CB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=v3.sk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lkundrak@v6.sk Received: from localhost (v6.sk [IPv6:::1]) by v6.sk (Postfix) with ESMTP id 7B13660D2B; Sat, 18 Jul 2020 20:50:36 +0000 (UTC) From: Lubomir Rintel To: Arnd Bergmann , Olof Johansson List-Id: Cc: SoC Team , Rob Herring , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Lubomir Rintel Subject: [PATCH v2 01/13] ARM: dts: mmp2-olpc-xo-1-75: Fix camera I2C node validation Date: Sat, 18 Jul 2020 22:50:07 +0200 Message-Id: <20200718205019.184927-2-lkundrak@v3.sk> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200718205019.184927-1-lkundrak@v3.sk> References: <20200718205019.184927-1-lkundrak@v3.sk> MIME-Version: 1.0 mmp2-olpc-xo-1-75.dt.yaml: camera_i2c: $nodename:0: 'camera_i2c' does not match '^i2c(@.*)?' mmp2-olpc-xo-1-75.dt.yaml: camera_i2c: 'sda-gpios' is a required property mmp2-olpc-xo-1-75.dt.yaml: camera_i2c: 'scl-gpios' is a required property The "gpios" property actually was documented as deprecated, but got dropped in commit 0175ce4a58d6 ("dt-bindings: i2c: Convert i2c-gpio binding to json-schema"). It's probably best kept forgotten though. Signed-off-by: Lubomir Rintel --- arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts index 6cfa0d4a18845..02f4005a654b9 100644 --- a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts +++ b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts @@ -77,10 +77,10 @@ headphone_insert { }; }; - camera_i2c { + i2c { compatible = "i2c-gpio"; - gpios = <&gpio 109 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>, - <&gpio 108 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + sda-gpios = <&gpio 109 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + scl-gpios = <&gpio 108 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; #address-cells = <1>; #size-cells = <0>; i2c-gpio,timeout-ms = <1000>; From patchwork Sat Jul 18 20:50:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 11672047 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 63EFC13A4 for ; Sat, 18 Jul 2020 20:50:41 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 5F2B72173E; Sat, 18 Jul 2020 20:50:41 +0000 (UTC) Delivered-To: soc@kernel.org Received: from v6.sk (v6.sk [167.172.42.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2EFBF205CB; Sat, 18 Jul 2020 20:50:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2EFBF205CB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=v3.sk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lkundrak@v6.sk Received: from localhost (v6.sk [IPv6:::1]) by v6.sk (Postfix) with ESMTP id 1F52560D2C; Sat, 18 Jul 2020 20:50:40 +0000 (UTC) From: Lubomir Rintel To: Arnd Bergmann , Olof Johansson List-Id: Cc: SoC Team , Rob Herring , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Lubomir Rintel Subject: [PATCH v2 02/13] ARM: dts: mmp2-olpc-xo-1-75: Delete #address-cells from ssp3 Date: Sat, 18 Jul 2020 22:50:08 +0200 Message-Id: <20200718205019.184927-3-lkundrak@v3.sk> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200718205019.184927-1-lkundrak@v3.sk> References: <20200718205019.184927-1-lkundrak@v3.sk> MIME-Version: 1.0 On the XO-1.75, this node represents a bus interface that operates in slave mode and thus is only able to accommodate a single subnode; no address cells are necessary. The Documentation/devicetree/bindings/spi/spi-controller.yaml binding prefers that we drop the property instead of setting it to zero. This fixes a DT validation error: arch/arm/boot/dts/mmp2-olpc-xo-1-75.dt.yaml: spi@d4037000: { ... } is valid under each of {'required': ['spi-slave']}, {'required': ['#address-cells']} We also need to drop #size-cells: arch/arm/boot/dts/mmp2-olpc-xo-1-75.dt.yaml: spi@d4037000: '#address-cells' is a dependency of '#size-cells' Signed-off-by: Lubomir Rintel --- arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts index 02f4005a654b9..392f546f7915b 100644 --- a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts +++ b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts @@ -221,7 +221,8 @@ accelerometer@1d { }; &ssp3 { - #address-cells = <0>; + /delete-property/ #address-cells; + /delete-property/ #size-cells; spi-slave; status = "okay"; ready-gpio = <&gpio 125 GPIO_ACTIVE_HIGH>; From patchwork Sat Jul 18 20:50:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 11672049 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B535B13A4 for ; Sat, 18 Jul 2020 20:50:44 +0000 (UTC) Received: by mail.kernel.org (Postfix) id B0DBF22C9C; Sat, 18 Jul 2020 20:50:44 +0000 (UTC) Delivered-To: soc@kernel.org Received: from v6.sk (v6.sk [167.172.42.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 826CF205CB; Sat, 18 Jul 2020 20:50:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 826CF205CB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=v3.sk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lkundrak@v6.sk Received: from localhost (v6.sk [IPv6:::1]) by v6.sk (Postfix) with ESMTP id 6B64260D2D; Sat, 18 Jul 2020 20:50:43 +0000 (UTC) From: Lubomir Rintel To: Arnd Bergmann , Olof Johansson List-Id: Cc: SoC Team , Rob Herring , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Lubomir Rintel Subject: [PATCH v2 03/13] ARM: dts: mmp2: Add #power-domain-cells to /clocks Date: Sat, 18 Jul 2020 22:50:09 +0200 Message-Id: <20200718205019.184927-4-lkundrak@v3.sk> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200718205019.184927-1-lkundrak@v3.sk> References: <20200718205019.184927-1-lkundrak@v3.sk> MIME-Version: 1.0 The power management unit, described by the soc_clocks node, controls the power to the peripherals by the means of power domains with a single cell -- the domain number. Signed-off-by: Lubomir Rintel --- arch/arm/boot/dts/mmp2.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi index 4306f3a6742bf..9b8a156cf73e5 100644 --- a/arch/arm/boot/dts/mmp2.dtsi +++ b/arch/arm/boot/dts/mmp2.dtsi @@ -421,6 +421,7 @@ soc_clocks: clocks { reg-names = "mpmu", "apmu", "apbc"; #clock-cells = <1>; #reset-cells = <1>; + #power-domain-cells = <1>; }; }; }; From patchwork Sat Jul 18 20:50:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 11672051 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 17FFD13B4 for ; Sat, 18 Jul 2020 20:50:48 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 1393221741; Sat, 18 Jul 2020 20:50:48 +0000 (UTC) Delivered-To: soc@kernel.org Received: from v6.sk (v6.sk [167.172.42.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D8BC820738; Sat, 18 Jul 2020 20:50:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D8BC820738 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=v3.sk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lkundrak@v6.sk Received: from localhost (v6.sk [IPv6:::1]) by v6.sk (Postfix) with ESMTP id D51A960D2F; Sat, 18 Jul 2020 20:50:46 +0000 (UTC) From: Lubomir Rintel To: Arnd Bergmann , Olof Johansson List-Id: Cc: SoC Team , Rob Herring , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Lubomir Rintel Subject: [PATCH v2 04/13] ARM: dts: mmp2: Extend the MPMU reg range Date: Sat, 18 Jul 2020 22:50:10 +0200 Message-Id: <20200718205019.184927-5-lkundrak@v3.sk> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200718205019.184927-1-lkundrak@v3.sk> References: <20200718205019.184927-1-lkundrak@v3.sk> MIME-Version: 1.0 The ACGR register is at the offset of 0x1024, beyond the 4k originally assigned to the MPMU range. Signed-off-by: Lubomir Rintel --- arch/arm/boot/dts/mmp2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi index 9b8a156cf73e5..9e77f685fb188 100644 --- a/arch/arm/boot/dts/mmp2.dtsi +++ b/arch/arm/boot/dts/mmp2.dtsi @@ -415,7 +415,7 @@ ssp4: spi@d4039000 { soc_clocks: clocks { compatible = "marvell,mmp2-clock"; - reg = <0xd4050000 0x1000>, + reg = <0xd4050000 0x2000>, <0xd4282800 0x400>, <0xd4015000 0x1000>; reg-names = "mpmu", "apmu", "apbc"; From patchwork Sat Jul 18 20:50:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 11672053 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6E60013A4 for ; Sat, 18 Jul 2020 20:50:51 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 691D521775; Sat, 18 Jul 2020 20:50:51 +0000 (UTC) Delivered-To: soc@kernel.org Received: from v6.sk (v6.sk [167.172.42.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3409C20838; Sat, 18 Jul 2020 20:50:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3409C20838 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=v3.sk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lkundrak@v6.sk Received: from localhost (v6.sk [IPv6:::1]) by v6.sk (Postfix) with ESMTP id 3076260D30; Sat, 18 Jul 2020 20:50:50 +0000 (UTC) From: Lubomir Rintel To: Arnd Bergmann , Olof Johansson List-Id: Cc: SoC Team , Rob Herring , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Lubomir Rintel Subject: [PATCH v2 05/13] ARM: dts: mmp2: Add Audio SRAM Date: Sat, 18 Jul 2020 22:50:11 +0200 Message-Id: <20200718205019.184927-6-lkundrak@v3.sk> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200718205019.184927-1-lkundrak@v3.sk> References: <20200718205019.184927-1-lkundrak@v3.sk> MIME-Version: 1.0 This memory is region is where the two-channel audio DMA can pump sound samples into the SSPA's internal FIFO. Signed-off-by: Lubomir Rintel --- arch/arm/boot/dts/mmp2.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi index 9e77f685fb188..da2c92328464e 100644 --- a/arch/arm/boot/dts/mmp2.dtsi +++ b/arch/arm/boot/dts/mmp2.dtsi @@ -413,6 +413,15 @@ ssp4: spi@d4039000 { }; }; + asram: sram@e0000000 { + compatible = "mmio-sram"; + reg = <0xe0000000 0x10000>; + ranges = <0 0xe0000000 0x10000>; + #address-cells = <1>; + #size-cells = <1>; + status = "disabled"; + }; + soc_clocks: clocks { compatible = "marvell,mmp2-clock"; reg = <0xd4050000 0x2000>, From patchwork Sat Jul 18 20:50:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 11672055 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AC75D13A4 for ; Sat, 18 Jul 2020 20:50:54 +0000 (UTC) Received: by mail.kernel.org (Postfix) id A743F22B48; Sat, 18 Jul 2020 20:50:54 +0000 (UTC) Delivered-To: soc@kernel.org Received: from v6.sk (v6.sk [167.172.42.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 75E8C20838; Sat, 18 Jul 2020 20:50:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 75E8C20838 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=v3.sk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lkundrak@v6.sk Received: from localhost (v6.sk [IPv6:::1]) by v6.sk (Postfix) with ESMTP id 7271C60D31; Sat, 18 Jul 2020 20:50:53 +0000 (UTC) From: Lubomir Rintel To: Arnd Bergmann , Olof Johansson List-Id: Cc: SoC Team , Rob Herring , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Lubomir Rintel Subject: [PATCH v2 06/13] ARM: dts: mmp2: Add DMA nodes Date: Sat, 18 Jul 2020 22:50:12 +0200 Message-Id: <20200718205019.184927-7-lkundrak@v3.sk> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200718205019.184927-1-lkundrak@v3.sk> References: <20200718205019.184927-1-lkundrak@v3.sk> MIME-Version: 1.0 There is a 16-channel peripheral DMA controller along with two-channel audio DMA engines. Signed-off-by: Lubomir Rintel --- arch/arm/boot/dts/mmp2.dtsi | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi index da2c92328464e..b349f4f35706b 100644 --- a/arch/arm/boot/dts/mmp2.dtsi +++ b/arch/arm/boot/dts/mmp2.dtsi @@ -192,6 +192,24 @@ camera1: camera@d420a800 { clock-output-names = "mclk"; status = "disabled"; }; + + adma0: dma-controller@d42a0800 { + compatible = "marvell,adma-1.0"; + reg = <0xd42a0800 0x100>; + interrupts = <48>; + #dma-cells = <1>; + asram = <&asram>; + iram = <&asram>; + status = "disabled"; + }; + + adma1: dma-controller@d42a0900 { + compatible = "marvell,adma-1.0"; + reg = <0xd42a0900 0x100>; + interrupts = <48>; + #dma-cells = <1>; + status = "disabled"; + }; }; apb@d4000000 { /* APB */ @@ -201,6 +219,14 @@ apb@d4000000 { /* APB */ reg = <0xd4000000 0x00200000>; ranges; + dma-controller@d4000000 { + compatible = "marvell,pdma-1.0"; + reg = <0xd4000000 0x10000>; + interrupts = <48>; + #dma-channels = <16>; + status = "disabled"; + }; + timer0: timer@d4014000 { compatible = "mrvl,mmp-timer"; reg = <0xd4014000 0x100>; From patchwork Sat Jul 18 20:50:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 11672057 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0B1AB13A4 for ; Sat, 18 Jul 2020 20:50:58 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 0779D20838; Sat, 18 Jul 2020 20:50:58 +0000 (UTC) Delivered-To: soc@kernel.org Received: from v6.sk (v6.sk [167.172.42.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CBEE622BEB; Sat, 18 Jul 2020 20:50:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CBEE622BEB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=v3.sk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lkundrak@v6.sk Received: from localhost (v6.sk [IPv6:::1]) by v6.sk (Postfix) with ESMTP id B5C2960D33; Sat, 18 Jul 2020 20:50:56 +0000 (UTC) From: Lubomir Rintel To: Arnd Bergmann , Olof Johansson List-Id: Cc: SoC Team , Rob Herring , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Lubomir Rintel Subject: [PATCH v2 07/13] ARM: dts: mmp2: Add Audio Clock controller Date: Sat, 18 Jul 2020 22:50:13 +0200 Message-Id: <20200718205019.184927-8-lkundrak@v3.sk> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200718205019.184927-1-lkundrak@v3.sk> References: <20200718205019.184927-1-lkundrak@v3.sk> MIME-Version: 1.0 This device generates the audio codec master clock and bit clock. Signed-off-by: Lubomir Rintel --- arch/arm/boot/dts/mmp2.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi index b349f4f35706b..dd7fba65799ea 100644 --- a/arch/arm/boot/dts/mmp2.dtsi +++ b/arch/arm/boot/dts/mmp2.dtsi @@ -210,6 +210,19 @@ adma1: dma-controller@d42a0900 { #dma-cells = <1>; status = "disabled"; }; + + audio_clk: clocks@d42a0c30 { + compatible = "marvell,mmp2-audio-clock"; + reg = <0xd42a0c30 0x10>; + clock-names = "audio", "vctcxo", "i2s0", "i2s1"; + clocks = <&soc_clocks MMP2_CLK_AUDIO>, + <&soc_clocks MMP2_CLK_VCTCXO>, + <&soc_clocks MMP2_CLK_I2S0>, + <&soc_clocks MMP2_CLK_I2S1>; + power-domains = <&soc_clocks MMP2_POWER_DOMAIN_AUDIO>; + #clock-cells = <1>; + status = "disabled"; + }; }; apb@d4000000 { /* APB */ From patchwork Sat Jul 18 20:50:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 11672059 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5516713A4 for ; Sat, 18 Jul 2020 20:51:01 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 506FE22B51; Sat, 18 Jul 2020 20:51:01 +0000 (UTC) Delivered-To: soc@kernel.org Received: from v6.sk (v6.sk [167.172.42.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1EC7922B4E; Sat, 18 Jul 2020 20:51:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1EC7922B4E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=v3.sk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lkundrak@v6.sk Received: from localhost (v6.sk [IPv6:::1]) by v6.sk (Postfix) with ESMTP id 1B92660D35; Sat, 18 Jul 2020 20:51:00 +0000 (UTC) From: Lubomir Rintel To: Arnd Bergmann , Olof Johansson List-Id: Cc: SoC Team , Rob Herring , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Lubomir Rintel Subject: [PATCH v2 08/13] ARM: dts: mmp2: Add SSPA nodes Date: Sat, 18 Jul 2020 22:50:14 +0200 Message-Id: <20200718205019.184927-9-lkundrak@v3.sk> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200718205019.184927-1-lkundrak@v3.sk> References: <20200718205019.184927-1-lkundrak@v3.sk> MIME-Version: 1.0 There are two I2S-capable audio serial port blocks. Signed-off-by: Lubomir Rintel --- arch/arm/boot/dts/mmp2.dtsi | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi index dd7fba65799ea..31592acd3ef4f 100644 --- a/arch/arm/boot/dts/mmp2.dtsi +++ b/arch/arm/boot/dts/mmp2.dtsi @@ -223,6 +223,32 @@ audio_clk: clocks@d42a0c30 { #clock-cells = <1>; status = "disabled"; }; + + sspa0: audio-controller@d42a0c00 { + compatible = "marvell,mmp-sspa"; + reg = <0xd42a0c00 0x30>, + <0xd42a0c80 0x30>; + interrupts = <2>; + clock-names = "audio", "bitclk"; + clocks = <&soc_clocks MMP2_CLK_AUDIO>, + <&audio_clk 1>; + power-domains = <&soc_clocks MMP2_POWER_DOMAIN_AUDIO>; + #sound-dai-cells = <0>; + status = "disabled"; + }; + + sspa1: audio-controller@d42a0d00 { + compatible = "marvell,mmp-sspa"; + reg = <0xd42a0d00 0x30>, + <0xd42a0d80 0x30>; + interrupts = <3>; + clock-names = "audio", "bitclk"; + clocks = <&soc_clocks MMP2_CLK_AUDIO>, + <&audio_clk 2>; + power-domains = <&soc_clocks MMP2_POWER_DOMAIN_AUDIO>; + #sound-dai-cells = <0>; + status = "disabled"; + }; }; apb@d4000000 { /* APB */ From patchwork Sat Jul 18 20:50:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 11672061 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B535413B4 for ; Sat, 18 Jul 2020 20:51:04 +0000 (UTC) Received: by mail.kernel.org (Postfix) id B0BD622BF3; Sat, 18 Jul 2020 20:51:04 +0000 (UTC) Delivered-To: soc@kernel.org Received: from v6.sk (v6.sk [167.172.42.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 81AA722B4E; Sat, 18 Jul 2020 20:51:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 81AA722B4E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=v3.sk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lkundrak@v6.sk Received: from localhost (v6.sk [IPv6:::1]) by v6.sk (Postfix) with ESMTP id 6C08A60D36; Sat, 18 Jul 2020 20:51:03 +0000 (UTC) From: Lubomir Rintel To: Arnd Bergmann , Olof Johansson List-Id: Cc: SoC Team , Rob Herring , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Lubomir Rintel Subject: [PATCH v2 09/13] ARM: dts: mmp2-olpc-xo-1-75: Enable audio support Date: Sat, 18 Jul 2020 22:50:15 +0200 Message-Id: <20200718205019.184927-10-lkundrak@v3.sk> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200718205019.184927-1-lkundrak@v3.sk> References: <20200718205019.184927-1-lkundrak@v3.sk> MIME-Version: 1.0 This enables the audio SRAM, DMA engine, I2S interface, and codec, hooks them together and adds a audio-graph-card instance. It also removes the jack gpios from the gpio-keys instance, because the audio jack driver registers an input device. Signed-off-by: Lubomir Rintel --- arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 65 ++++++++++++++++++------- 1 file changed, 47 insertions(+), 18 deletions(-) diff --git a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts index 392f546f7915b..5f1da58550987 100644 --- a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts +++ b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts @@ -57,24 +57,6 @@ tablet_mode { linux,code = ; wakeup-source; }; - - microphone_insert { - label = "Microphone Plug"; - gpios = <&gpio 96 GPIO_ACTIVE_HIGH>; - linux,input-type = ; - linux,code = ; - debounce-interval = <100>; - wakeup-source; - }; - - headphone_insert { - label = "Headphone Plug"; - gpios = <&gpio 97 GPIO_ACTIVE_HIGH>; - linux,input-type = ; - linux,code = ; - debounce-interval = <100>; - wakeup-source; - }; }; i2c { @@ -123,6 +105,18 @@ wlan_pwrseq: pwrseq0 { reset-gpios = <&gpio 58 GPIO_ACTIVE_HIGH>; }; + sound-card { + compatible = "audio-graph-card"; + label = "OLPC XO"; + dais = <&sspa0_dai>; + routing = "Headphones", "HPOL", + "Headphones", "HPOR", + "MIC2", "Mic Jack"; + widgets = "Headphone", "Headphones", "Microphone", "Mic Jack"; + hp-det-gpio = <&gpio 97 GPIO_ACTIVE_HIGH>; + mic-det-gpio = <&gpio 96 GPIO_ACTIVE_HIGH>; + }; + soc { axi@d4200000 { ap-sp@d4290000 { @@ -197,6 +191,14 @@ audio-codec@1a { compatible = "realtek,alc5631"; reg = <0x1a>; status = "okay"; + + port { + rt5631_0: endpoint { + mclk-fs = <256>; + clocks = <&audio_clk 0>; + remote-endpoint = <&sspa0_0>; + }; + }; }; }; @@ -243,3 +245,30 @@ camera0_0: endpoint { }; }; }; + +&asram { + status = "okay"; +}; + +&adma0 { + status = "okay"; +}; + +&audio_clk { + status = "okay"; +}; + +&sspa0 { + status = "okay"; + dmas = <&adma0 0>, <&adma0 1>; + dma-names = "tx", "rx"; + + sspa0_dai: port { + sspa0_0: endpoint { + remote-endpoint = <&rt5631_0>; + frame-master; + bitclock-master; + dai-format = "i2s"; + }; + }; +}; From patchwork Sat Jul 18 20:50:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 11672063 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EB3FB13A4 for ; Sat, 18 Jul 2020 20:51:07 +0000 (UTC) Received: by mail.kernel.org (Postfix) id E6AB622BEF; Sat, 18 Jul 2020 20:51:07 +0000 (UTC) Delivered-To: soc@kernel.org Received: from v6.sk (v6.sk [167.172.42.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B730B22B4E; Sat, 18 Jul 2020 20:51:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B730B22B4E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=v3.sk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lkundrak@v6.sk Received: from localhost (v6.sk [IPv6:::1]) by v6.sk (Postfix) with ESMTP id B15A360D37; Sat, 18 Jul 2020 20:51:06 +0000 (UTC) From: Lubomir Rintel To: Arnd Bergmann , Olof Johansson List-Id: Cc: SoC Team , Rob Herring , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Lubomir Rintel Subject: [PATCH v2 10/13] ARM: dts: mmp2: Add the GPU Date: Sat, 18 Jul 2020 22:50:16 +0200 Message-Id: <20200718205019.184927-11-lkundrak@v3.sk> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200718205019.184927-1-lkundrak@v3.sk> References: <20200718205019.184927-1-lkundrak@v3.sk> MIME-Version: 1.0 There's a GC860 2D + 3D core. Signed-off-by: Lubomir Rintel --- arch/arm/boot/dts/mmp2.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi index 31592acd3ef4f..445bdcd50b9ed 100644 --- a/arch/arm/boot/dts/mmp2.dtsi +++ b/arch/arm/boot/dts/mmp2.dtsi @@ -5,6 +5,7 @@ */ #include +#include / { #address-cells = <1>; @@ -38,6 +39,17 @@ axi@d4200000 { /* AXI */ reg = <0xd4200000 0x00200000>; ranges; + gpu: gpu@d420d000 { + compatible = "vivante,gc"; + reg = <0xd420d000 0x4000>; + interrupts = <8>; + status = "disabled"; + clocks = <&soc_clocks MMP2_CLK_GPU_3D>, + <&soc_clocks MMP2_CLK_GPU_BUS>; + clock-names = "core", "bus"; + power-domains = <&soc_clocks MMP2_POWER_DOMAIN_GPU>; + }; + intc: interrupt-controller@d4282000 { compatible = "mrvl,mmp2-intc"; interrupt-controller; From patchwork Sat Jul 18 20:50:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 11672065 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4562413B4 for ; Sat, 18 Jul 2020 20:51:11 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 40F2322B4E; Sat, 18 Jul 2020 20:51:11 +0000 (UTC) Delivered-To: soc@kernel.org Received: from v6.sk (v6.sk [167.172.42.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 11F292177B; Sat, 18 Jul 2020 20:51:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 11F292177B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=v3.sk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lkundrak@v6.sk Received: from localhost (v6.sk [IPv6:::1]) by v6.sk (Postfix) with ESMTP id 0B08160D38; Sat, 18 Jul 2020 20:51:10 +0000 (UTC) From: Lubomir Rintel To: Arnd Bergmann , Olof Johansson List-Id: Cc: SoC Team , Rob Herring , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Lubomir Rintel Subject: [PATCH v2 11/13] ARM: dts: mmp2-olpc-xo-1-75: Enable the GPU Date: Sat, 18 Jul 2020 22:50:17 +0200 Message-Id: <20200718205019.184927-12-lkundrak@v3.sk> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200718205019.184927-1-lkundrak@v3.sk> References: <20200718205019.184927-1-lkundrak@v3.sk> MIME-Version: 1.0 Enable the 3D + 2D (GC860) GPU core. Signed-off-by: Lubomir Rintel --- arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts index 5f1da58550987..f1a41152e9dd7 100644 --- a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts +++ b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts @@ -272,3 +272,7 @@ sspa0_0: endpoint { }; }; }; + +&gpu { + status = "okay"; +}; From patchwork Sat Jul 18 20:50:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 11672067 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2D9EA13A4 for ; Sat, 18 Jul 2020 20:51:15 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 28D5B22B4B; Sat, 18 Jul 2020 20:51:15 +0000 (UTC) Delivered-To: soc@kernel.org Received: from v6.sk (v6.sk [167.172.42.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ED6F42177B; Sat, 18 Jul 2020 20:51:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ED6F42177B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=v3.sk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lkundrak@v6.sk Received: from localhost (v6.sk [IPv6:::1]) by v6.sk (Postfix) with ESMTP id E6E4060D39; Sat, 18 Jul 2020 20:51:13 +0000 (UTC) From: Lubomir Rintel To: Arnd Bergmann , Olof Johansson List-Id: Cc: SoC Team , Rob Herring , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Lubomir Rintel Subject: [PATCH v2 12/13] ARM: dts: mmp3: Add the GPU Date: Sat, 18 Jul 2020 22:50:18 +0200 Message-Id: <20200718205019.184927-13-lkundrak@v3.sk> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200718205019.184927-1-lkundrak@v3.sk> References: <20200718205019.184927-1-lkundrak@v3.sk> MIME-Version: 1.0 There's a GC2000 3D core accompanied by a GC300 2D core. Signed-off-by: Lubomir Rintel --- arch/arm/boot/dts/mmp3.dtsi | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/arch/arm/boot/dts/mmp3.dtsi b/arch/arm/boot/dts/mmp3.dtsi index 57231d49d9386..cc4efd0efabd2 100644 --- a/arch/arm/boot/dts/mmp3.dtsi +++ b/arch/arm/boot/dts/mmp3.dtsi @@ -4,6 +4,7 @@ */ #include +#include #include / { @@ -310,6 +311,30 @@ camera1: camera@d420a800 { clock-output-names = "mclk"; status = "disabled"; }; + + gpu_3d: gpu@d420d000 { + compatible = "vivante,gc"; + reg = <0xd420d000 0x2000>; + interrupt-parent = <&gpu_mux>; + interrupts = <0>; + status = "disabled"; + clocks = <&soc_clocks MMP3_CLK_GPU_3D>, + <&soc_clocks MMP3_CLK_GPU_BUS>; + clock-names = "core", "bus"; + power-domains = <&soc_clocks MMP2_POWER_DOMAIN_GPU>; + }; + + gpu_2d: gpu@d420f000 { + compatible = "vivante,gc"; + reg = <0xd420f000 0x2000>; + interrupt-parent = <&gpu_mux>; + interrupts = <2>; + status = "disabled"; + clocks = <&soc_clocks MMP3_CLK_GPU_2D>, + <&soc_clocks MMP3_CLK_GPU_BUS>; + clock-names = "core", "bus"; + power-domains = <&soc_clocks MMP2_POWER_DOMAIN_GPU>; + }; }; apb@d4000000 { From patchwork Sat Jul 18 20:50:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 11672069 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9079D13A4 for ; Sat, 18 Jul 2020 20:51:18 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 8BD162177B; Sat, 18 Jul 2020 20:51:18 +0000 (UTC) Delivered-To: soc@kernel.org Received: from v6.sk (v6.sk [167.172.42.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5CC272176B; Sat, 18 Jul 2020 20:51:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5CC272176B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=v3.sk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lkundrak@v6.sk Received: from localhost (v6.sk [IPv6:::1]) by v6.sk (Postfix) with ESMTP id 451C260D3A; Sat, 18 Jul 2020 20:51:17 +0000 (UTC) From: Lubomir Rintel To: Arnd Bergmann , Olof Johansson List-Id: Cc: SoC Team , Rob Herring , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Lubomir Rintel Subject: [PATCH v2 13/13] ARM: dts: mmp3-dell-ariel: Enable the GPU Date: Sat, 18 Jul 2020 22:50:19 +0200 Message-Id: <20200718205019.184927-14-lkundrak@v3.sk> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200718205019.184927-1-lkundrak@v3.sk> References: <20200718205019.184927-1-lkundrak@v3.sk> MIME-Version: 1.0 Enable the 2D (GC300) and the 3D (GC2000) GPUs cores. Signed-off-by: Lubomir Rintel --- Changes since v1: - s/GC200/GC2000/ in patch description (pointed out by Pavel Machek) arch/arm/boot/dts/mmp3-dell-ariel.dts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm/boot/dts/mmp3-dell-ariel.dts b/arch/arm/boot/dts/mmp3-dell-ariel.dts index b0ec14c421641..fe3b1cd695eeb 100644 --- a/arch/arm/boot/dts/mmp3-dell-ariel.dts +++ b/arch/arm/boot/dts/mmp3-dell-ariel.dts @@ -114,3 +114,11 @@ &ssp2 { cs-gpios = <&gpio 56 GPIO_ACTIVE_LOW>; status = "okay"; }; + +&gpu_2d { + status = "okay"; +}; + +&gpu_3d { + status = "okay"; +};