Skip to contentSkip to conversation

ARM: SPEAr3xx: Minor fixes for spear3xx machine

PATCH New Vipul Kumar Samar 2 participants 8 messages Jul 13, 2012 – Jul 16, 2012

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover ARM: SPEAr3xx: Minor fixes for spear3xx machine

This patch is to fix:
-spear320 compatible string
-spear320 no of pinmux modes.
-spear3xx gpt timer parent clk id.

Vipul Kumar Samar (3):
ARM: SPEAr3xx: Rename gpt timer clk parent name
ARM: dts: SPEAr320: Fix compatible string
ARM: dts: SPEAr320: Fix no. of supported pinmux mode

 arch/arm/boot/dts/spear320-evb.dts |    4 ++--
 arch/arm/mach-spear3xx/spear3xx.c  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.2.2
#1 lore raw

PATCH 1/3 ARM: SPEAr3xx: Rename gpt timer clk parent name

As pll3_48m_clk clock is renamed like pll3_clk so make corresponding changes for gpt parent clock name.

---
 arch/arm/mach-spear3xx/spear3xx.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-spear3xx/spear3xx.c +1 -1
index 0f41bd1..66db5f1 100644
@@ -87,7 +87,7 @@ void __init spear3xx_map_io(void)
 
 static void __init spear3xx_timer_init(void)
 {
-	char pclk_name[] = "pll3_48m_clk";
+	char pclk_name[] = "pll3_clk";
 	struct clk *gpt_clk, *pclk;
 
 	spear3xx_clk_init();
Signature · 1 line
1.7.2.2
#2 lore raw

PATCH 1/3 ARM: SPEAr3xx: Rename gpt timer clk parent name

Quoted 2 lines · Vipul Kumar Samar

As pll3_48m_clk clock is renamed like pll3_clk so make corresponding changes for gpt parent clock name.

Do, this as part of clk patch only.

Quoted 11 lines
---
 arch/arm/mach-spear3xx/spear3xx.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-spear3xx/spear3xx.c +0 -0
index 0f41bd1..66db5f1 100644

arch/arm/mach-spear3xx/spear3xx.c void __init spear3xx_map_io(void) · line 93

Quoted 8 lines
arch/arm/mach-spear3xx/spear3xx.c +1 -1
@@ -87,7 +87,7 @@ void __init spear3xx_map_io(void)
 
 static void __init spear3xx_timer_init(void)
 {
-     char pclk_name[] = "pll3_48m_clk";
+     char pclk_name[] = "pll3_clk";
      struct clk *gpt_clk, *pclk;
 
      spear3xx_clk_init();

--
Viresh

-- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

#3 lore raw

PATCH 2/3 ARM: dts: SPEAr320: Fix compatible string

In reply to Vipul Kumar Samar
---
 arch/arm/boot/dts/spear320-evb.dts |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/boot/dts/spear320-evb.dts +1 -1
index c13fd1f..4d55b67 100644
@@ -16,7 +16,7 @@
 
 / {
 	model = "ST SPEAr300 Evaluation Board";
-	compatible = "st,spear300-evb", "st,spear300";
+	compatible = "st,spear320-evb", "st,spear320";
 	#address-cells = <1>;
 	#size-cells = <1>;
 
Signature · 1 line
1.7.2.2
#4 lore raw

PATCH 2/3 ARM: dts: SPEAr320: Fix compatible string

Quoted 1 line · Vipul Kumar Samar
      model = "ST SPEAr300 Evaluation Board";

Fix this too. :)

arch/arm/boot/dts/spear320-evb.dts line 19

Quoted 2 lines
arch/arm/boot/dts/spear320-evb.dts +1 -1
-     compatible = "st,spear300-evb", "st,spear300";
+     compatible = "st,spear320-evb", "st,spear320";

--
Viresh

-- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

#5 lore raw

PATCH 2/3 ARM: dts: SPEAr320: Fix compatible string

Quoted 4 lines · viresh kumar
Quoted 1 line · Vipul Kumar Samar
       model = "ST SPEAr300 Evaluation Board";

Fix this too. :)

Missed it, i'll correct it in v2.

Regards
Vipul Samar

#6 lore raw

PATCH 3/3 ARM: dts: SPEAr320: Fix no. of supported pinmux mode

In reply to Vipul Kumar Samar

On spear320 machine no. of supported mode is 4 and by mistake it is programmed to 3.
Supported modes are:
AUTO_NET_SMII_MODE
AUTO_NET_MII_MODE
AUTO_EXP_MODE
SMALL_PRINTERS_MODE
EXTENDED_MODE

---
 arch/arm/boot/dts/spear320-evb.dts |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/boot/dts/spear320-evb.dts +1 -1
index 4d55b67..c99f055 100644
@@ -26,7 +26,7 @@
 
 	ahb {
 		pinmux at b3000000 {
-			st,pinmux-mode = <3>;
+			st,pinmux-mode = <4>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&state_default>;
 
Signature · 1 line
1.7.2.2
#7 lore raw

PATCH 3/3 ARM: dts: SPEAr320: Fix no. of supported pinmux mode

Quoted 8 lines · Vipul Kumar Samar

On spear320 machine no. of supported mode is 4 and by mistake it is programmed to 3.
Supported modes are:
AUTO_NET_SMII_MODE
AUTO_NET_MII_MODE
AUTO_EXP_MODE
SMALL_PRINTERS_MODE
EXTENDED_MODE

Commit log doesn't tell what you actually wanted to do, i.e. boot the board in EXTENDED mode.

Quoted 11 lines
---
 arch/arm/boot/dts/spear320-evb.dts |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/boot/dts/spear320-evb.dts +0 -0
index 4d55b67..c99f055 100644

arch/arm/boot/dts/spear320-evb.dts line 32

Quoted 8 lines
arch/arm/boot/dts/spear320-evb.dts +1 -1
@@ -26,7 +26,7 @@
 
      ahb {
              pinmux at b3000000 {
-                     st,pinmux-mode = <3>;
+                     st,pinmux-mode = <4>;
                      pinctrl-names = "default";
                      pinctrl-0 = <&state_default>;
 

--
Viresh

-- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.