* [PATCH 01/12] dt-bindings: gpio: mrvl-gpio: Fix the gpio-ranges property
2021-01-21 3:41 ARM: dts: mmp devicetree updates Lubomir Rintel
@ 2021-01-21 3:41 ` Lubomir Rintel
2021-01-21 3:41 ` [PATCH 02/12] media: dt-bindings: marvell,mmp2-ccic: Allow power-domains property Lubomir Rintel
` (11 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2021-01-21 3:41 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson
Cc: Rob Herring, SoC Team, linux-arm-kernel, devicetree,
linux-kernel, Lubomir Rintel
The property specifies a list of GPIO-capable pins. Don't limit it to a
single element as there's presumably more than one GPIO pin.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
Documentation/devicetree/bindings/gpio/mrvl-gpio.yaml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/gpio/mrvl-gpio.yaml b/Documentation/devicetree/bindings/gpio/mrvl-gpio.yaml
index 4db3b8a3332c2..9cf6137dd5241 100644
--- a/Documentation/devicetree/bindings/gpio/mrvl-gpio.yaml
+++ b/Documentation/devicetree/bindings/gpio/mrvl-gpio.yaml
@@ -82,8 +82,7 @@ properties:
'#gpio-cells':
const: 2
- gpio-ranges:
- maxItems: 1
+ gpio-ranges: true
interrupts: true
--
2.29.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 02/12] media: dt-bindings: marvell,mmp2-ccic: Allow power-domains property
2021-01-21 3:41 ARM: dts: mmp devicetree updates Lubomir Rintel
2021-01-21 3:41 ` [PATCH 01/12] dt-bindings: gpio: mrvl-gpio: Fix the gpio-ranges property Lubomir Rintel
@ 2021-01-21 3:41 ` Lubomir Rintel
2021-01-21 3:41 ` [PATCH 03/12] ARM: dts: mmp2-olpc-xo-1-75: Fix memory node name Lubomir Rintel
` (10 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2021-01-21 3:41 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson
Cc: Rob Herring, SoC Team, linux-arm-kernel, devicetree,
linux-kernel, Lubomir Rintel
On MMP3 the camera interface is on a separate power island. This
property tells the driver to enable it when appropriate.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
.../devicetree/bindings/media/marvell,mmp2-ccic.yaml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Documentation/devicetree/bindings/media/marvell,mmp2-ccic.yaml b/Documentation/devicetree/bindings/media/marvell,mmp2-ccic.yaml
index 49bff738aca54..52eab686a1774 100644
--- a/Documentation/devicetree/bindings/media/marvell,mmp2-ccic.yaml
+++ b/Documentation/devicetree/bindings/media/marvell,mmp2-ccic.yaml
@@ -23,6 +23,9 @@ properties:
interrupts:
maxItems: 1
+ power-domains:
+ maxItems: 1
+
port:
type: object
additionalProperties: false
@@ -75,6 +78,7 @@ additionalProperties: false
examples:
- |
#include <dt-bindings/clock/marvell,mmp2.h>
+ #include <dt-bindings/power/marvell,mmp2.h>
camera@d420a000 {
compatible = "marvell,mmp2-ccic";
@@ -84,6 +88,7 @@ examples:
clock-names = "axi";
#clock-cells = <0>;
clock-output-names = "mclk";
+ power-domains = <&soc_clocks MMP3_POWER_DOMAIN_CAMERA>;
port {
camera0_0: endpoint {
--
2.29.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 03/12] ARM: dts: mmp2-olpc-xo-1-75: Fix memory node name
2021-01-21 3:41 ARM: dts: mmp devicetree updates Lubomir Rintel
2021-01-21 3:41 ` [PATCH 01/12] dt-bindings: gpio: mrvl-gpio: Fix the gpio-ranges property Lubomir Rintel
2021-01-21 3:41 ` [PATCH 02/12] media: dt-bindings: marvell,mmp2-ccic: Allow power-domains property Lubomir Rintel
@ 2021-01-21 3:41 ` Lubomir Rintel
2021-01-21 3:41 ` [PATCH 04/12] ARM: dts: mmp2-olpc-xo-1-75: Drop linux,usable-memory from /memory Lubomir Rintel
` (9 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2021-01-21 3:41 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson
Cc: Rob Herring, SoC Team, linux-arm-kernel, devicetree,
linux-kernel, Lubomir Rintel
It contains a reg property. Add its base to the node name.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 2 +-
1 file changed, 1 insertion(+), 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 342304f5653af..e16171ddd93ec 100644
--- a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
+++ b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
@@ -32,7 +32,7 @@ framebuffer@1fc00000 {
};
};
- memory {
+ memory@0 {
linux,usable-memory = <0x0 0x1f800000>;
available = <0xcf000 0x1ef31000 0x1000 0xbf000>;
reg = <0x0 0x20000000>;
--
2.29.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 04/12] ARM: dts: mmp2-olpc-xo-1-75: Drop linux,usable-memory from /memory
2021-01-21 3:41 ARM: dts: mmp devicetree updates Lubomir Rintel
` (2 preceding siblings ...)
2021-01-21 3:41 ` [PATCH 03/12] ARM: dts: mmp2-olpc-xo-1-75: Fix memory node name Lubomir Rintel
@ 2021-01-21 3:41 ` Lubomir Rintel
2021-01-21 3:41 ` [PATCH 05/12] ARM: dts: mmp3-dell-ariel: " Lubomir Rintel
` (8 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2021-01-21 3:41 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson
Cc: Rob Herring, SoC Team, linux-arm-kernel, devicetree,
linux-kernel, Lubomir Rintel
Drop the linux,usable-memory properties; the schema is unhappy about
them:
mmp2-olpc-xo-1-75.dt.yaml: /: memory: False schema does not allow
{'linux,usable-memory': [[0, 528482304]],
'available': [[847872, 519245824, 4096, 782336]],
'reg': [[0, 536870912]], 'device_type': ['memory']}
They've been cargo-culted from Open Firmware and I don't know what
purpose they serve. Perhaps they are meant to provide the OFW runtime.
In that case it's still okay to drop them from here; OFW is welcome to add
it upon boot.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 1 -
1 file changed, 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 e16171ddd93ec..0f8b5ad48deed 100644
--- a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
+++ b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
@@ -33,7 +33,6 @@ framebuffer@1fc00000 {
};
memory@0 {
- linux,usable-memory = <0x0 0x1f800000>;
available = <0xcf000 0x1ef31000 0x1000 0xbf000>;
reg = <0x0 0x20000000>;
device_type = "memory";
--
2.29.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 05/12] ARM: dts: mmp3-dell-ariel: Drop linux,usable-memory from /memory
2021-01-21 3:41 ARM: dts: mmp devicetree updates Lubomir Rintel
` (3 preceding siblings ...)
2021-01-21 3:41 ` [PATCH 04/12] ARM: dts: mmp2-olpc-xo-1-75: Drop linux,usable-memory from /memory Lubomir Rintel
@ 2021-01-21 3:41 ` Lubomir Rintel
2021-01-21 3:41 ` [PATCH 06/12] ARM: dts: mmp3: Extend the MPMU reg range Lubomir Rintel
` (7 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2021-01-21 3:41 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson
Cc: Rob Herring, SoC Team, linux-arm-kernel, devicetree,
linux-kernel, Lubomir Rintel
Drop the linux,usable-memory properties; the schema is unhappy about
them.
They've been cargo-culted from Open Firmware and I don't know what
purpose they serve. Perhaps they are meant to provide the OFW runtime.
In that case it's still okay to drop them from here; OFW is welcome to add
it upon boot.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
arch/arm/boot/dts/mmp3-dell-ariel.dts | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/boot/dts/mmp3-dell-ariel.dts b/arch/arm/boot/dts/mmp3-dell-ariel.dts
index fe3b1cd695eeb..53714cb0d171e 100644
--- a/arch/arm/boot/dts/mmp3-dell-ariel.dts
+++ b/arch/arm/boot/dts/mmp3-dell-ariel.dts
@@ -26,7 +26,6 @@ chosen {
};
memory@0 {
- linux,usable-memory = <0x0 0x7f600000>;
available = <0x7f700000 0x7ff00000 0x00000000 0x7f600000>;
reg = <0x0 0x80000000>;
device_type = "memory";
--
2.29.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 06/12] ARM: dts: mmp3: Extend the MPMU reg range
2021-01-21 3:41 ARM: dts: mmp devicetree updates Lubomir Rintel
` (4 preceding siblings ...)
2021-01-21 3:41 ` [PATCH 05/12] ARM: dts: mmp3-dell-ariel: " Lubomir Rintel
@ 2021-01-21 3:41 ` Lubomir Rintel
2021-01-21 3:41 ` [PATCH 07/12] ARM: dts: mmp2: Use symbolic names for audio clocks Lubomir Rintel
` (6 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2021-01-21 3:41 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson
Cc: Rob Herring, SoC Team, linux-arm-kernel, devicetree,
linux-kernel, Lubomir Rintel
The ACGR register is at the offset of 0x1024, beyond the 4k originally
assigned to the MPMU range.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
arch/arm/boot/dts/mmp3.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/mmp3.dtsi b/arch/arm/boot/dts/mmp3.dtsi
index 4ae630d37d094..9f2b059f0900b 100644
--- a/arch/arm/boot/dts/mmp3.dtsi
+++ b/arch/arm/boot/dts/mmp3.dtsi
@@ -567,7 +567,7 @@ l2: cache-controller@d0020000 {
soc_clocks: clocks@d4050000 {
compatible = "marvell,mmp3-clock";
- reg = <0xd4050000 0x1000>,
+ reg = <0xd4050000 0x2000>,
<0xd4282800 0x400>,
<0xd4015000 0x1000>;
reg-names = "mpmu", "apmu", "apbc";
--
2.29.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 07/12] ARM: dts: mmp2: Use symbolic names for audio clocks
2021-01-21 3:41 ARM: dts: mmp devicetree updates Lubomir Rintel
` (5 preceding siblings ...)
2021-01-21 3:41 ` [PATCH 06/12] ARM: dts: mmp3: Extend the MPMU reg range Lubomir Rintel
@ 2021-01-21 3:41 ` Lubomir Rintel
2021-01-21 3:41 ` [PATCH 08/12] ARM: dts: mmp2-olpc-xo-1-75: " Lubomir Rintel
` (5 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2021-01-21 3:41 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson
Cc: Rob Herring, SoC Team, linux-arm-kernel, devicetree,
linux-kernel, Lubomir Rintel
These are slighly easier to read.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
arch/arm/boot/dts/mmp2.dtsi | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi
index 445bdcd50b9ed..46984d4c5224f 100644
--- a/arch/arm/boot/dts/mmp2.dtsi
+++ b/arch/arm/boot/dts/mmp2.dtsi
@@ -6,6 +6,7 @@
#include <dt-bindings/clock/marvell,mmp2.h>
#include <dt-bindings/power/marvell,mmp2.h>
+#include <dt-bindings/clock/marvell,mmp2-audio.h>
/ {
#address-cells = <1>;
@@ -243,7 +244,7 @@ sspa0: audio-controller@d42a0c00 {
interrupts = <2>;
clock-names = "audio", "bitclk";
clocks = <&soc_clocks MMP2_CLK_AUDIO>,
- <&audio_clk 1>;
+ <&audio_clk MMP2_CLK_AUDIO_SSPA0>;
power-domains = <&soc_clocks MMP2_POWER_DOMAIN_AUDIO>;
#sound-dai-cells = <0>;
status = "disabled";
@@ -256,7 +257,7 @@ sspa1: audio-controller@d42a0d00 {
interrupts = <3>;
clock-names = "audio", "bitclk";
clocks = <&soc_clocks MMP2_CLK_AUDIO>,
- <&audio_clk 2>;
+ <&audio_clk MMP2_CLK_AUDIO_SSPA1>;
power-domains = <&soc_clocks MMP2_POWER_DOMAIN_AUDIO>;
#sound-dai-cells = <0>;
status = "disabled";
--
2.29.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 08/12] ARM: dts: mmp2-olpc-xo-1-75: Use symbolic names for audio clocks
2021-01-21 3:41 ARM: dts: mmp devicetree updates Lubomir Rintel
` (6 preceding siblings ...)
2021-01-21 3:41 ` [PATCH 07/12] ARM: dts: mmp2: Use symbolic names for audio clocks Lubomir Rintel
@ 2021-01-21 3:41 ` Lubomir Rintel
2021-01-21 3:41 ` [PATCH 09/12] ARM: dts: mmp3-dell-ariel: Add the embedded controller Lubomir Rintel
` (4 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2021-01-21 3:41 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson
Cc: Rob Herring, SoC Team, linux-arm-kernel, devicetree,
linux-kernel, Lubomir Rintel
These are slighly easier to read.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 5 +++--
1 file changed, 3 insertions(+), 2 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 0f8b5ad48deed..55ea87870af3e 100644
--- a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
+++ b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
@@ -2,7 +2,7 @@
/*
* OLPC XO 1.75 Laptop.
*
- * Copyright (C) 2018,2019 Lubomir Rintel <lkundrak@v3.sk>
+ * Copyright (C) 2018,2019,2020 Lubomir Rintel <lkundrak@v3.sk>
*/
/dts-v1/;
@@ -10,6 +10,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/linux-event-codes.h>
#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/clock/marvell,mmp2-audio.h>
/ {
model = "OLPC XO-1.75";
@@ -194,7 +195,7 @@ audio-codec@1a {
port {
rt5631_0: endpoint {
mclk-fs = <256>;
- clocks = <&audio_clk 0>;
+ clocks = <&audio_clk MMP2_CLK_AUDIO_SYSCLK>;
remote-endpoint = <&sspa0_0>;
};
};
--
2.29.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 09/12] ARM: dts: mmp3-dell-ariel: Add the embedded controller
2021-01-21 3:41 ARM: dts: mmp devicetree updates Lubomir Rintel
` (7 preceding siblings ...)
2021-01-21 3:41 ` [PATCH 08/12] ARM: dts: mmp2-olpc-xo-1-75: " Lubomir Rintel
@ 2021-01-21 3:41 ` Lubomir Rintel
2021-01-21 3:41 ` [PATCH 10/12] ARM: dts: mmp3-dell-ariel: Add the power button node Lubomir Rintel
` (3 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2021-01-21 3:41 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson
Cc: Rob Herring, SoC Team, linux-arm-kernel, devicetree,
linux-kernel, Lubomir Rintel
Add the device node for the computer's embedded controller, responsible
for controlling the LEDs and system power.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
arch/arm/boot/dts/mmp3-dell-ariel.dts | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm/boot/dts/mmp3-dell-ariel.dts b/arch/arm/boot/dts/mmp3-dell-ariel.dts
index 53714cb0d171e..565cd0fadf3d3 100644
--- a/arch/arm/boot/dts/mmp3-dell-ariel.dts
+++ b/arch/arm/boot/dts/mmp3-dell-ariel.dts
@@ -95,6 +95,15 @@ &twsi3 {
&twsi4 {
status = "okay";
+
+ embedded-controller@58 {
+ compatible = "dell,wyse-ariel-ec", "ene,kb3930";
+ reg = <0x58>;
+ system-power-controller;
+
+ off-gpios = <&gpio 126 GPIO_ACTIVE_HIGH>,
+ <&gpio 127 GPIO_ACTIVE_HIGH>;
+ };
};
&ssp1 {
--
2.29.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 10/12] ARM: dts: mmp3-dell-ariel: Add the power button node
2021-01-21 3:41 ARM: dts: mmp devicetree updates Lubomir Rintel
` (8 preceding siblings ...)
2021-01-21 3:41 ` [PATCH 09/12] ARM: dts: mmp3-dell-ariel: Add the embedded controller Lubomir Rintel
@ 2021-01-21 3:41 ` Lubomir Rintel
2021-01-21 3:41 ` [PATCH 11/12] ARM: dts: mmp3-dell-ariel: Replace SSP2 with spi-gpio Lubomir Rintel
` (2 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2021-01-21 3:41 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson
Cc: Rob Herring, SoC Team, linux-arm-kernel, devicetree,
linux-kernel, Lubomir Rintel
This adds support for the power button attached to the Embedded Controller
on a Dell Wyse 3020 "Ariel" board.
However, while the EC itself is controlled via I2C, the input capability
for the power button acts as a separate device attached to the SPI, hence
it has a separate device node.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
arch/arm/boot/dts/mmp3-dell-ariel.dts | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/mmp3-dell-ariel.dts b/arch/arm/boot/dts/mmp3-dell-ariel.dts
index 565cd0fadf3d3..c4a6bd876d849 100644
--- a/arch/arm/boot/dts/mmp3-dell-ariel.dts
+++ b/arch/arm/boot/dts/mmp3-dell-ariel.dts
@@ -119,8 +119,16 @@ firmware-flash@0 {
};
&ssp2 {
- cs-gpios = <&gpio 56 GPIO_ACTIVE_LOW>;
status = "okay";
+ cs-gpios = <&gpio 56 GPIO_ACTIVE_LOW>;
+
+ power-button@0 {
+ reg = <0>;
+ interrupt-parent = <&gpio>;
+ interrupts = <60 IRQ_TYPE_EDGE_RISING>;
+ compatible = "dell,wyse-ariel-ec-input", "ene,kb3930-input";
+ spi-max-frequency = <33000000>;
+ };
};
&gpu_2d {
--
2.29.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 11/12] ARM: dts: mmp3-dell-ariel: Replace SSP2 with spi-gpio
2021-01-21 3:41 ARM: dts: mmp devicetree updates Lubomir Rintel
` (9 preceding siblings ...)
2021-01-21 3:41 ` [PATCH 10/12] ARM: dts: mmp3-dell-ariel: Add the power button node Lubomir Rintel
@ 2021-01-21 3:41 ` Lubomir Rintel
2021-01-21 3:41 ` [PATCH 12/12] ARM: dts: mmp3: Fix the CCIC interrupts Lubomir Rintel
[not found] ` <CAK8P3a2DYX3c-AMX9URSyrcQckY2UaRRTmnOwe=4q3P4cJ-t5A@mail.gmail.com>
12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2021-01-21 3:41 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson
Cc: Rob Herring, SoC Team, linux-arm-kernel, devicetree,
linux-kernel, Lubomir Rintel
The firmware leaves the pins in GPIO mode. Until we have a proper pinmux
driver hooked on we just need to bitbang SPI. No big deal, this is just
used for the power button and performance is not important.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
arch/arm/boot/dts/mmp3-dell-ariel.dts | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/mmp3-dell-ariel.dts b/arch/arm/boot/dts/mmp3-dell-ariel.dts
index c4a6bd876d849..fe6df364a9eb6 100644
--- a/arch/arm/boot/dts/mmp3-dell-ariel.dts
+++ b/arch/arm/boot/dts/mmp3-dell-ariel.dts
@@ -30,6 +30,17 @@ memory@0 {
reg = <0x0 0x80000000>;
device_type = "memory";
};
+
+ ec_input_spi: spi {
+ compatible = "spi-gpio";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ num-chipselects = <0>;
+ sck-gpios = <&gpio 55 GPIO_ACTIVE_HIGH>;
+ miso-gpios = <&gpio 57 GPIO_ACTIVE_HIGH>;
+ mosi-gpios = <&gpio 58 GPIO_ACTIVE_HIGH>;
+ };
};
&uart3 {
@@ -118,7 +129,7 @@ firmware-flash@0 {
};
};
-&ssp2 {
+&ec_input_spi {
status = "okay";
cs-gpios = <&gpio 56 GPIO_ACTIVE_LOW>;
--
2.29.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 12/12] ARM: dts: mmp3: Fix the CCIC interrupts
2021-01-21 3:41 ARM: dts: mmp devicetree updates Lubomir Rintel
` (10 preceding siblings ...)
2021-01-21 3:41 ` [PATCH 11/12] ARM: dts: mmp3-dell-ariel: Replace SSP2 with spi-gpio Lubomir Rintel
@ 2021-01-21 3:41 ` Lubomir Rintel
[not found] ` <CAK8P3a2DYX3c-AMX9URSyrcQckY2UaRRTmnOwe=4q3P4cJ-t5A@mail.gmail.com>
12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2021-01-21 3:41 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson
Cc: Rob Herring, SoC Team, linux-arm-kernel, devicetree,
linux-kernel, Lubomir Rintel
A copy & paste oversight from MMP2; camera interrupts are handled
via a multiplexer on MMP3.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
arch/arm/boot/dts/mmp3.dtsi | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/mmp3.dtsi b/arch/arm/boot/dts/mmp3.dtsi
index 9f2b059f0900b..a4fb9203ec1fb 100644
--- a/arch/arm/boot/dts/mmp3.dtsi
+++ b/arch/arm/boot/dts/mmp3.dtsi
@@ -293,7 +293,8 @@ mmc5: mmc@d4217000 {
camera0: camera@d420a000 {
compatible = "marvell,mmp2-ccic";
reg = <0xd420a000 0x800>;
- interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <1>;
+ interrupt-parent = <&ci_mux>;
clocks = <&soc_clocks MMP2_CLK_CCIC0>;
clock-names = "axi";
power-domains = <&soc_clocks MMP3_POWER_DOMAIN_CAMERA>;
@@ -305,7 +306,8 @@ camera0: camera@d420a000 {
camera1: camera@d420a800 {
compatible = "marvell,mmp2-ccic";
reg = <0xd420a800 0x800>;
- interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <2>;
+ interrupt-parent = <&ci_mux>;
clocks = <&soc_clocks MMP2_CLK_CCIC1>;
clock-names = "axi";
power-domains = <&soc_clocks MMP3_POWER_DOMAIN_CAMERA>;
--
2.29.2
^ permalink raw reply related [flat|nested] 15+ messages in thread[parent not found: <CAK8P3a2DYX3c-AMX9URSyrcQckY2UaRRTmnOwe=4q3P4cJ-t5A@mail.gmail.com>]
* Re: ARM: dts: mmp devicetree updates
[not found] ` <CAK8P3a2DYX3c-AMX9URSyrcQckY2UaRRTmnOwe=4q3P4cJ-t5A@mail.gmail.com>
@ 2021-01-29 22:12 ` Lubomir Rintel
[not found] ` <CAK8P3a2Ub0w3v_H_0F84MPdQZ28vUgxdYNii7eVY0o9a_sg7DQ@mail.gmail.com>
1 sibling, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2021-01-29 22:12 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Arnd Bergmann, Olof Johansson, Rob Herring, SoC Team, Linux ARM,
DTML, linux-kernel
On Fri, Jan 22, 2021 at 03:09:14PM +0100, Arnd Bergmann wrote:
> On Thu, Jan 21, 2021 at 4:41 AM Lubomir Rintel <lkundrak@v3.sk> wrote:
> >
> > Hi,
> >
> > chained to this message is a handful of patches related to MMP device
> > trees and bindings. Please take a look and consider queueing them for
> > for 5.12.
>
> These all look good to me, but I notice that a lot of them seem to be
> bugfixes, so please have another look and decide if any of them should
> go into v5.11 and perhaps backported to stable kernels as well.
I'm not sure any of these are worth backporting to stable. I believe
actually only these two are bugfixes:
[PATCH 06/12] ARM: dts: mmp3: Extend the MPMU reg range
[PATCH 12/12] ARM: dts: mmp3: Fix the CCIC interrupts
The first one only affects the audio, but the MMP I2S driver doesn't
work on MMP3 yet. The second one affects the camera, but the only board
DTS shipped at this point doesn't have one. Therefore both are somewhat
inconequential for older kernels.
>
> Arnd
Thanks
Lubo
^ permalink raw reply [flat|nested] 15+ messages in thread[parent not found: <CAK8P3a2Ub0w3v_H_0F84MPdQZ28vUgxdYNii7eVY0o9a_sg7DQ@mail.gmail.com>]