[PATCH 1/6] arm: configs: spear6xx: Refresh defconfig

[PATCH 1/6] arm: configs: spear6xx: Refresh defconfig

[Köry Maincent]

From: Kory Maincent <kory.maincent@bootlin.com>

Refresh the defconfig to follow the changes made over the year.
I ensure important options have not gone away.
I drop the gpio sysfs config as it is useless to keep it alone without
CONFIG_EXPERT.

Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
 arch/arm/configs/spear6xx_defconfig | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/arch/arm/configs/spear6xx_defconfig b/arch/arm/configs/spear6xx_defconfig
index 3d631b1f3cfa..1cf0621d2154 100644
--- a/arch/arm/configs/spear6xx_defconfig
+++ b/arch/arm/configs/spear6xx_defconfig
@@ -11,7 +11,6 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_BINFMT_MISC=y
 CONFIG_NET=y
 CONFIG_MTD=y
-CONFIG_MTD_OF_PARTS=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_NAND_FSMC=y
@@ -28,19 +27,15 @@ CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_SMSC is not set
 CONFIG_STMMAC_ETH=y
 # CONFIG_WLAN is not set
-CONFIG_INPUT_FF_MEMLESS=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_RAW_DRIVER=y
 CONFIG_I2C=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_SPI=y
 CONFIG_SPI_PL022=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_PL061=y
 # CONFIG_HWMON is not set
 CONFIG_WATCHDOG=y
-- 
2.25.1

[PATCH 2/6] arm: dts: spear600: Fix clcd interrupt

[Köry Maincent]

From: Kory Maincent <kory.maincent@bootlin.com>

Interrupt 12 of the Interrupt controller belongs to the SMI controller,
the right one for the display controller is the interrupt 13.

Fixes: 8113ba917dfa ("ARM: SPEAr: DT: Update device nodes")
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
 arch/arm/boot/dts/spear600.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/spear600.dtsi b/arch/arm/boot/dts/spear600.dtsi
index fd41243a0b2c..9d5a04a46b14 100644
--- a/arch/arm/boot/dts/spear600.dtsi
+++ b/arch/arm/boot/dts/spear600.dtsi
@@ -47,7 +47,7 @@ clcd: clcd@fc200000 {
 			compatible = "arm,pl110", "arm,primecell";
 			reg = <0xfc200000 0x1000>;
 			interrupt-parent = <&vic1>;
-			interrupts = <12>;
+			interrupts = <13>;
 			status = "disabled";
 		};
 
-- 
2.25.1

[PATCH 3/6] arm: configs: spear6xx: Enable PL110 display controller

[Köry Maincent]

From: Kory Maincent <kory.maincent@bootlin.com>

Enable the PL110 DRM driver, used by the spear600.

CONFIG_I2C is dropped from the defconfig as it is selected by CONFIG_DRM.

Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
 arch/arm/configs/spear6xx_defconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/configs/spear6xx_defconfig b/arch/arm/configs/spear6xx_defconfig
index 1cf0621d2154..231cbd2ac536 100644
--- a/arch/arm/configs/spear6xx_defconfig
+++ b/arch/arm/configs/spear6xx_defconfig
@@ -32,7 +32,6 @@ CONFIG_STMMAC_ETH=y
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_I2C=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_SPI=y
 CONFIG_SPI_PL022=y
@@ -40,6 +39,8 @@ CONFIG_GPIO_PL061=y
 # CONFIG_HWMON is not set
 CONFIG_WATCHDOG=y
 CONFIG_ARM_SP805_WATCHDOG=y
+CONFIG_DRM=y
+CONFIG_DRM_PL111=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
-- 
2.25.1

[PATCH 4/6] clk: spear: Fix CLCD clock definition on SPEAr600

[Köry Maincent]

From: Kory Maincent <kory.maincent@bootlin.com>

There is no SPEAr600 device named "clcd". Instead, the description of the
CLCD (color liquid crystal display controller) name is "fc200000.clcd", so
we should associate the CLCD gateable clock to this device name.

Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
 drivers/clk/spear/spear6xx_clock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/spear/spear6xx_clock.c b/drivers/clk/spear/spear6xx_clock.c
index c192a9141b86..ee0ed89f2954 100644
--- a/drivers/clk/spear/spear6xx_clock.c
+++ b/drivers/clk/spear/spear6xx_clock.c
@@ -207,7 +207,7 @@ void __init spear6xx_clk_init(void __iomem *misc_base)
 
 	clk = clk_register_gate(NULL, "clcd_clk", "clcd_mclk", 0,
 			PERIP1_CLK_ENB, CLCD_CLK_ENB, 0, &_lock);
-	clk_register_clkdev(clk, NULL, "clcd");
+	clk_register_clkdev(clk, NULL, "fc200000.clcd");
 
 	/* gpt clocks */
 	clk = clk_register_gpt("gpt0_1_syn_clk", "pll1_clk", 0, PRSC0_CLK_CFG,
-- 
2.25.1

[PATCH 5/6] arm: dts: spear600: Add ssp controller nodes

[Köry Maincent]

From: Kory Maincent <kory.maincent@bootlin.com>

The SPEAr600 has three Synchronous serial port to enables synchronous
serial communication with slave or master peripherals (SPI). Lets add these
nodes to be able to use them.

Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
 arch/arm/boot/dts/spear600.dtsi | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/arch/arm/boot/dts/spear600.dtsi b/arch/arm/boot/dts/spear600.dtsi
index 9d5a04a46b14..6b67c0ceaed9 100644
--- a/arch/arm/boot/dts/spear600.dtsi
+++ b/arch/arm/boot/dts/spear600.dtsi
@@ -207,6 +207,36 @@ adc: adc@d820b000 {
 				interrupts = <6>;
 				status = "disabled";
 			};
+
+			ssp1: spi@d0100000 {
+				compatible = "arm,pl022", "arm,primecell";
+				reg = <0xd0100000 0x1000>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				interrupt-parent = <&vic0>;
+				interrupts = <26>;
+				status = "disabled";
+			};
+
+			ssp2: spi@d0180000 {
+				compatible = "arm,pl022", "arm,primecell";
+				reg = <0xd0180000 0x1000>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				interrupt-parent = <&vic0>;
+				interrupts = <27>;
+				status = "disabled";
+			};
+
+			ssp3: spi@d8180000 {
+				compatible = "arm,pl022", "arm,primecell";
+				reg = <0xd8180000 0x1000>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				interrupt-parent = <&vic1>;
+				interrupts = <5>;
+				status = "disabled";
+			};
 		};
 	};
 };
-- 
2.25.1

[PATCH 6/6] clk: spear: Fix SSP clock definition on SPEAr600

[Köry Maincent]

From: Kory Maincent <kory.maincent@bootlin.com>

There is no SPEAr600 device named "ssp-pl022.x". Instead, the description
of the SSP (Synchronous Serial Port) was recently added to the Device Tree,
and the device name is "xxx.spi", so we should associate the SSP gateable
clock to these device names.

Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
 drivers/clk/spear/spear6xx_clock.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/spear/spear6xx_clock.c b/drivers/clk/spear/spear6xx_clock.c
index ee0ed89f2954..adfa118520c3 100644
--- a/drivers/clk/spear/spear6xx_clock.c
+++ b/drivers/clk/spear/spear6xx_clock.c
@@ -326,13 +326,13 @@ void __init spear6xx_clk_init(void __iomem *misc_base)
 
 	clk = clk_register_gate(NULL, "ssp0_clk", "apb_clk", 0, PERIP1_CLK_ENB,
 			SSP0_CLK_ENB, 0, &_lock);
-	clk_register_clkdev(clk, NULL, "ssp-pl022.0");
+	clk_register_clkdev(clk, NULL, "d0100000.spi");
 
 	clk = clk_register_gate(NULL, "ssp1_clk", "apb_clk", 0, PERIP1_CLK_ENB,
 			SSP1_CLK_ENB, 0, &_lock);
-	clk_register_clkdev(clk, NULL, "ssp-pl022.1");
+	clk_register_clkdev(clk, NULL, "d0180000.spi");
 
 	clk = clk_register_gate(NULL, "ssp2_clk", "apb_clk", 0, PERIP1_CLK_ENB,
 			SSP2_CLK_ENB, 0, &_lock);
-	clk_register_clkdev(clk, NULL, "ssp-pl022.2");
+	clk_register_clkdev(clk, NULL, "d8180000.spi");
 }
-- 
2.25.1

Re: [PATCH 3/6] arm: configs: spear6xx: Enable PL110 display controller

[Krzysztof Kozlowski]

On 19/10/2022 09:32, Köry Maincent wrote:
> From: Kory Maincent <kory.maincent@bootlin.com>
> 
> Enable the PL110 DRM driver, used by the spear600.
> 
> CONFIG_I2C is dropped from the defconfig as it is selected by CONFIG_DRM.

I2C as a user-selectable option should stay. Don't remove such
(user-selectable) top-level options just because something else selected it.


Best regards,
Krzysztof

Re: [PATCH 3/6] arm: configs: spear6xx: Enable PL110 display controller

[Köry Maincent]

Hello Krzysztof,

On Wed, 19 Oct 2022 09:38:45 -0400
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote:

> On 19/10/2022 09:32, Köry Maincent wrote:
> > From: Kory Maincent <kory.maincent@bootlin.com>
> > 
> > Enable the PL110 DRM driver, used by the spear600.
> > 
> > CONFIG_I2C is dropped from the defconfig as it is selected by CONFIG_DRM.  
> 
> I2C as a user-selectable option should stay. Don't remove such
> (user-selectable) top-level options just because something else selected it.

As the CONFIG_DRM selects it, the "make savedefconfig" removes it by default.
Why keeping something that is already automatically enabled by CONFIG_DRM?

Re: [PATCH 3/6] arm: configs: spear6xx: Enable PL110 display controller

[Arnd Bergmann]

On Wed, Oct 19, 2022, at 15:48, Köry Maincent wrote:
> Hello Krzysztof,
>
> On Wed, 19 Oct 2022 09:38:45 -0400
> Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote:
>
>> On 19/10/2022 09:32, Köry Maincent wrote:
>> > From: Kory Maincent <kory.maincent@bootlin.com>
>> > 
>> > Enable the PL110 DRM driver, used by the spear600.
>> > 
>> > CONFIG_I2C is dropped from the defconfig as it is selected by CONFIG_DRM.  
>> 
>> I2C as a user-selectable option should stay. Don't remove such
>> (user-selectable) top-level options just because something else selected it.
>
> As the CONFIG_DRM selects it, the "make savedefconfig" removes it by default.
> Why keeping something that is already automatically enabled by CONFIG_DRM?

It's something that DRM probably should not select, so if this
ever gets fixed in DRM, you get a broken build. Just leaving
the line in there is harmless.

      Arnd

Re: [PATCH 3/6] arm: configs: spear6xx: Enable PL110 display controller

[Krzysztof Kozlowski]

On 19/10/2022 09:48, Köry Maincent wrote:
> Hello Krzysztof,
> 
> On Wed, 19 Oct 2022 09:38:45 -0400
> Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote:
> 
>> On 19/10/2022 09:32, Köry Maincent wrote:
>>> From: Kory Maincent <kory.maincent@bootlin.com>
>>>
>>> Enable the PL110 DRM driver, used by the spear600.
>>>
>>> CONFIG_I2C is dropped from the defconfig as it is selected by CONFIG_DRM.  
>>
>> I2C as a user-selectable option should stay. Don't remove such
>> (user-selectable) top-level options just because something else selected it.
> 
> As the CONFIG_DRM selects it, the "make savedefconfig" removes it by default.
> Why keeping something that is already automatically enabled by CONFIG_DRM?

Same question every few months :)

Because otherwise we can drop select in DRM and do not update the
defconfigs.

https://patchwork.kernel.org/project/linux-samsung-soc/patch/20191125125515.30795-1-m.szyprowski@samsung.com/#23021125

https://lore.kernel.org/all/20201130202501.GA32878@kozik-lap/

https://lore.kernel.org/all/c5150e83-0e50-3be6-b6bd-bf30fe5e94d1@linaro.org/

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a2315d3aea5976acd919d3d3fcf82f752562c25b

Best regards,
Krzysztof

Re: [PATCH 3/6] arm: configs: spear6xx: Enable PL110 display controller

[Köry Maincent]

Krzysztof

On Wed, 19 Oct 2022 09:57:26 -0400
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote:

> On 19/10/2022 09:48, Köry Maincent wrote:
> > Hello Krzysztof,
> > 
> > On Wed, 19 Oct 2022 09:38:45 -0400
> > Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote:
> >   
> >> On 19/10/2022 09:32, Köry Maincent wrote:  
> >>> From: Kory Maincent <kory.maincent@bootlin.com>
> >>>
> >>> Enable the PL110 DRM driver, used by the spear600.
> >>>
> >>> CONFIG_I2C is dropped from the defconfig as it is selected by CONFIG_DRM.
> >>>    
> >>
> >> I2C as a user-selectable option should stay. Don't remove such
> >> (user-selectable) top-level options just because something else selected
> >> it.  
> > 
> > As the CONFIG_DRM selects it, the "make savedefconfig" removes it by
> > default. Why keeping something that is already automatically enabled by
> > CONFIG_DRM?  
> 
> Same question every few months :)
> 
> Because otherwise we can drop select in DRM and do not update the
> defconfigs.

Alright, thanks, I will update it in V2.
I will be more careful with savedefconfig for now !

Köry

Re: [PATCH 6/6] clk: spear: Fix SSP clock definition on SPEAr600

[Viresh Kumar]

On 19-10-22, 15:32, Köry Maincent wrote:
> From: Kory Maincent <kory.maincent@bootlin.com>
> 
> There is no SPEAr600 device named "ssp-pl022.x". Instead, the description
> of the SSP (Synchronous Serial Port) was recently added to the Device Tree,
> and the device name is "xxx.spi", so we should associate the SSP gateable
> clock to these device names.
> 
> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> ---
>  drivers/clk/spear/spear6xx_clock.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>

-- 
viresh

Re: [PATCH 2/6] arm: dts: spear600: Fix clcd interrupt

[Viresh Kumar]

On 19-10-22, 15:32, Köry Maincent wrote:
> From: Kory Maincent <kory.maincent@bootlin.com>
> 
> Interrupt 12 of the Interrupt controller belongs to the SMI controller,
> the right one for the display controller is the interrupt 13.
> 
> Fixes: 8113ba917dfa ("ARM: SPEAr: DT: Update device nodes")
> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> ---
>  arch/arm/boot/dts/spear600.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/spear600.dtsi b/arch/arm/boot/dts/spear600.dtsi
> index fd41243a0b2c..9d5a04a46b14 100644
> --- a/arch/arm/boot/dts/spear600.dtsi
> +++ b/arch/arm/boot/dts/spear600.dtsi
> @@ -47,7 +47,7 @@ clcd: clcd@fc200000 {
>  			compatible = "arm,pl110", "arm,primecell";
>  			reg = <0xfc200000 0x1000>;
>  			interrupt-parent = <&vic1>;
> -			interrupts = <12>;
> +			interrupts = <13>;
>  			status = "disabled";
>  		};

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>

-- 
viresh

Re: [PATCH 4/6] clk: spear: Fix CLCD clock definition on SPEAr600

[Viresh Kumar]

On 19-10-22, 15:32, Köry Maincent wrote:
> From: Kory Maincent <kory.maincent@bootlin.com>
> 
> There is no SPEAr600 device named "clcd". Instead, the description of the
> CLCD (color liquid crystal display controller) name is "fc200000.clcd", so
> we should associate the CLCD gateable clock to this device name.
> 
> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> ---
>  drivers/clk/spear/spear6xx_clock.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/clk/spear/spear6xx_clock.c b/drivers/clk/spear/spear6xx_clock.c
> index c192a9141b86..ee0ed89f2954 100644
> --- a/drivers/clk/spear/spear6xx_clock.c
> +++ b/drivers/clk/spear/spear6xx_clock.c
> @@ -207,7 +207,7 @@ void __init spear6xx_clk_init(void __iomem *misc_base)
>  
>  	clk = clk_register_gate(NULL, "clcd_clk", "clcd_mclk", 0,
>  			PERIP1_CLK_ENB, CLCD_CLK_ENB, 0, &_lock);
> -	clk_register_clkdev(clk, NULL, "clcd");
> +	clk_register_clkdev(clk, NULL, "fc200000.clcd");
>  
>  	/* gpt clocks */
>  	clk = clk_register_gpt("gpt0_1_syn_clk", "pll1_clk", 0, PRSC0_CLK_CFG,

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>

-- 
viresh

Re: [PATCH 5/6] arm: dts: spear600: Add ssp controller nodes

[Viresh Kumar]

On 19-10-22, 15:32, Köry Maincent wrote:
> From: Kory Maincent <kory.maincent@bootlin.com>
> 
> The SPEAr600 has three Synchronous serial port to enables synchronous
> serial communication with slave or master peripherals (SPI). Lets add these
> nodes to be able to use them.
> 
> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> ---
>  arch/arm/boot/dts/spear600.dtsi | 30 ++++++++++++++++++++++++++++++
>  1 file changed, 30 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/spear600.dtsi b/arch/arm/boot/dts/spear600.dtsi
> index 9d5a04a46b14..6b67c0ceaed9 100644
> --- a/arch/arm/boot/dts/spear600.dtsi
> +++ b/arch/arm/boot/dts/spear600.dtsi
> @@ -207,6 +207,36 @@ adc: adc@d820b000 {
>  				interrupts = <6>;
>  				status = "disabled";
>  			};
> +
> +			ssp1: spi@d0100000 {
> +				compatible = "arm,pl022", "arm,primecell";
> +				reg = <0xd0100000 0x1000>;
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +				interrupt-parent = <&vic0>;
> +				interrupts = <26>;
> +				status = "disabled";
> +			};
> +
> +			ssp2: spi@d0180000 {
> +				compatible = "arm,pl022", "arm,primecell";
> +				reg = <0xd0180000 0x1000>;
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +				interrupt-parent = <&vic0>;
> +				interrupts = <27>;
> +				status = "disabled";
> +			};
> +
> +			ssp3: spi@d8180000 {
> +				compatible = "arm,pl022", "arm,primecell";
> +				reg = <0xd8180000 0x1000>;
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +				interrupt-parent = <&vic1>;
> +				interrupts = <5>;
> +				status = "disabled";
> +			};
>  		};
>  	};
>  };

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>

-- 
viresh

Re: [PATCH 6/6] clk: spear: Fix SSP clock definition on SPEAr600

[Köry Maincent]

Hello Stephen,

On Thu, 27 Oct 2022 17:22:17 -0700
Stephen Boyd <sboyd@kernel.org> wrote:

> Quoting Köry Maincent (2022-10-19 06:32:08)
> > From: Kory Maincent <kory.maincent@bootlin.com>
> > 
> > There is no SPEAr600 device named "ssp-pl022.x". Instead, the description
> > of the SSP (Synchronous Serial Port) was recently added to the Device Tree,
> > and the device name is "xxx.spi", so we should associate the SSP gateable
> > clock to these device names.
> > 
> > Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>  
> 
> Does this need a Fixes tag?

The old commits on SEAr6xx clock names definition update did not have it,
therefore I don't think so.

Regards,

Re: [PATCH 4/6] clk: spear: Fix CLCD clock definition on SPEAr600

[Köry Maincent]

Hello Stephan,

On Thu, 27 Oct 2022 17:21:47 -0700
Stephen Boyd <sboyd@kernel.org> wrote:

> Quoting Köry Maincent (2022-10-19 06:32:06)
> > From: Kory Maincent <kory.maincent@bootlin.com>
> > 
> > There is no SPEAr600 device named "clcd". Instead, the description of the
> > CLCD (color liquid crystal display controller) name is "fc200000.clcd", so
> > we should associate the CLCD gateable clock to this device name.
> > 
> > Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>  
> 
> Does this need a Fixes tag?

The old commits on SEAr6xx clock names definition update did not have it,
therefore I don't think so.

Regards,