Skip to contentSkip to conversation

add SAM9X60 clock support

PATCH New Claudiu Beznea 2 participants 10 messages Oct 7, 2020 – Oct 19, 2020

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

v3 cover add SAM9X60 clock support

Hi,

This series adds SAM9X60 clock support, CCF compatible, so that SAM9X60 based boards (e.g. SAM9X60-EK in this case) to be able to boot with mainline code.

This series is based on u-boot-atmel/next.

Thank you,
Claudiu Beznea

Changes in v3:
- move u-boot,dm-pre-reloc properties to sam9x60ek-u-boot.dtsi
- add main_xtal to sam9x60ek-u-boot.dtsi in patch 8/8

Changes in v2:
- remove "Alignment should match open parenthesis" and "Please don't use multiple blank lines" checkpatch.pl warnings
- use u-boot,dm-pre-reloc also in sam9x60ek-u-boot.dtsi
- add patch 8/8

Claudiu Beznea (8):
board: atmel: sam9x60ek: add SYS_MALLOC_F_LEN to SYS_INIT_SP_ADDR
clk: at91: sam9x60: add support compatible with CCF
ARM: dts: sam9x60ek: add clock frequencies to board file
ARM: dts: sam9x60: use u-boot,dm-pre-reloc
ARM: dts: sam9x60: use slow clock CCF compatible bindings
ARM: dts: sam9x60: use CCF compatibles for PMC
configs: sam9x60ek: update defconfigs for CCF
ARM: dts: sam9x60: use alphabetical order

 arch/arm/dts/sam9x60.dtsi             | 171 ++-------
 arch/arm/dts/sam9x60ek-u-boot.dtsi    |  70 +---
 arch/arm/dts/sam9x60ek.dts            |  12 +-
 configs/sam9x60ek_mmc_defconfig       |   4 +-
 configs/sam9x60ek_nandflash_defconfig |   4 +-
 configs/sam9x60ek_qspiflash_defconfig |   4 +-
 drivers/clk/at91/Makefile             |   1 +
 drivers/clk/at91/sam9x60.c            | 649 ++++++++++++++++++++++++++++++++++
 include/configs/sam9x60ek.h           |   3 +-
 9 files changed, 716 insertions(+), 202 deletions(-)
 create mode 100644 drivers/clk/at91/sam9x60.c
Signature · 1 line
2.7.4
#1 lore raw

PATCH v3 1/8 board: atmel: sam9x60ek: add SYS_MALLOC_F_LEN to SYS_INIT_SP_ADDR

Heap base address is computed based on SYS_INIT_SP_ADDR by subtracting the SYS_MALLOC_F_LEN value in board_init_f_init_reserve().

---
 include/configs/sam9x60ek.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
include/configs/sam9x60ek.h +2 -1
index 19714402ca45..6a6f1de41d1e 100644
@@ -40,7 +40,8 @@
 #define CONFIG_SYS_SDRAM_SIZE		0x10000000	/* 256 megs */
 
 #define CONFIG_SYS_INIT_SP_ADDR \
-	(CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
+	(CONFIG_SYS_SDRAM_BASE + 16 * 1024 + CONFIG_SYS_MALLOC_F_LEN - \
+	 GENERATED_GBL_DATA_SIZE)
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
Signature · 1 line
2.7.4
#2 lore raw

PATCH v3 2/8 clk: at91: sam9x60: add support compatible with CCF

In reply to Claudiu Beznea

Add SAM9X60 clock support compatible with CCF.

---
 drivers/clk/at91/Makefile  |   1 +
 drivers/clk/at91/sam9x60.c | 649 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 650 insertions(+)
 create mode 100644 drivers/clk/at91/sam9x60.c
drivers/clk/at91/Makefile +1 -0
index 2453c38af1aa..580b406d7bd6 100644
@@ -10,6 +10,7 @@ obj-$(CONFIG_AT91_GENERIC_CLK)	+= clk-generic.o
 obj-$(CONFIG_AT91_UTMI)		+= clk-utmi.o
 obj-$(CONFIG_AT91_SAM9X60_PLL)	+= clk-sam9x60-pll.o
 obj-$(CONFIG_SAMA7G5)		+= sama7g5.o
+obj-$(CONFIG_SAM9X60)		+= sam9x60.o
 else
 obj-y += compat.o
 endif
drivers/clk/at91/sam9x60.c new file +649 -0

649 lines not on this page · raw message

Signature · 1 line
2.7.4
#3 lore raw

PATCH v3 3/8 ARM: dts: sam9x60ek: add clock frequencies to board file

In reply to Claudiu Beznea

Slow Xtal and Main Xtal are board specific. Add their proper frequency to board file.

---
 arch/arm/dts/sam9x60.dtsi  |  2 --
 arch/arm/dts/sam9x60ek.dts | 10 ++++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)
arch/arm/dts/sam9x60.dtsi +0 -2
index 41ac1f164c86..51de586e1900 100644
@@ -30,13 +30,11 @@
 		slow_xtal: slow_xtal {
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
-			clock-frequency = <0>;
 		};
 
 		main_xtal: main_xtal {
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
-			clock-frequency = <0>;
 		};
 	};
 
arch/arm/dts/sam9x60ek.dts +10 -0
index 8767de98b8dd..44af5d99ee4c 100644
@@ -18,6 +18,16 @@
 		i2c0 = &flx0;
 	};
 
+	clocks {
+		slow_xtal: slow_xtal {
+			clock-frequency = <32768>;
+		};
+
+		main_xtal: main_xtal {
+			clock-frequency = <24000000>;
+		};
+	};
+
 	onewire_tm: onewire {
 		gpios = <&pioD 14 0>;
 		pinctrl-names = "default";
Signature · 1 line
2.7.4
#4 lore raw

PATCH v3 4/8 ARM: dts: sam9x60: use u-boot,dm-pre-reloc

In reply to Claudiu Beznea

Use u-boot,dm-pre-reloc for slow xtal and main xtal.

---
 arch/arm/dts/sam9x60ek-u-boot.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/dts/sam9x60ek-u-boot.dtsi +8 -0
index 93cf1262f6fc..65b4a3c7c673 100644
@@ -27,6 +27,10 @@
 	u-boot,dm-pre-reloc;
 };
 
+&slow_xtal {
+	u-boot,dm-pre-reloc;
+};
+
 &dbgu {
 	u-boot,dm-pre-reloc;
 };
@@ -67,6 +71,10 @@
 	u-boot,dm-pre-reloc;
 };
 
+&main_xtal {
+	u-boot,dm-pre-reloc;
+};
+
 &mck {
 	u-boot,dm-pre-reloc;
 };
Signature · 1 line
2.7.4
#5 lore raw

PATCH v3 5/8 ARM: dts: sam9x60: use slow clock CCF compatible bindings

In reply to Claudiu Beznea

Use slow clock CCF compatible DT bindings. This will not break the above functionality as the SoC is not booting with current PMC bindings.

---
 arch/arm/dts/sam9x60.dtsi          | 40 ++++++++++++--------------------------
 arch/arm/dts/sam9x60ek-u-boot.dtsi | 27 ++++++++-----------------
 2 files changed, 20 insertions(+), 47 deletions(-)
arch/arm/dts/sam9x60.dtsi +12 -28
index 51de586e1900..6eac2a8e3097 100644
@@ -27,6 +27,12 @@
 	};
 
 	clocks {
+		slow_rc_osc: slow_rc_osc {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <18500>;
+		};
+
 		slow_xtal: slow_xtal {
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
@@ -196,7 +202,7 @@
 				mck: masterck {
 					compatible = "atmel,at91sam9x5-clk-master";
 					#clock-cells = <0>;
-					clocks = <&md_slck>, <&main>, <&plla>;
+					clocks = <&clk32 0>, <&main>, <&plla>;
 					atmel,clk-output-range = <140000000 200000000>;
 					atmel,clk-divisors = <1 2 4 6>;
 				};
@@ -264,7 +270,7 @@
 					compatible = "microchip,sam9x60-clk-generated";
 					#address-cells = <1>;
 					#size-cells = <0>;
-					clocks = <&md_slck>, <&td_slck>, <&main>, <&mck>, <&plla>;
+					clocks = <&clk32 0>, <&clk32 1>, <&main>, <&mck>, <&plla>;
 
 					sdhci0_gclk: sdhci0_gclk {
 						#clock-cells = <0>;
@@ -279,33 +285,11 @@
 				clocks = <&mck>;
 			};
 
-			slowckc: sckc at fffffe50 {
-				compatible = "atmel,at91sam9x5-sckc";
+			clk32: sckc at fffffe50 {
+				compatible = "microchip,sam9x60-sckc";
 				reg = <0xfffffe50 0x4>;
-
-				slow_osc: slow_osc {
-					compatible = "atmel,at91sam9x5-clk-slow-osc";
-					#clock-cells = <0>;
-					clocks = <&slow_xtal>;
-				};
-
-				slow_rc_osc: slow_rc_osc {
-					compatible = "atmel,at91sam9x5-clk-slow-rc-osc";
-					#clock-cells = <0>;
-					clock-frequency = <32768>;
-				};
-
-				td_slck: td_slck {
-					compatible = "atmel,at91sam9x5-clk-slow";
-					#clock-cells = <0>;
-					clocks = <&slow_rc_osc>, <&slow_osc>;
-				};
-
-				md_slck: md_slck {
-					compatible = "atmel,at91sam9x5-clk-slow";
-					#clock-cells = <0>;
-					clocks = <&slow_rc_osc>;
-				};
+				clocks = <&slow_rc_osc>, <&slow_xtal>;
+				#clock-cells = <1>;
 			};
 		};
 	};
arch/arm/dts/sam9x60ek-u-boot.dtsi +8 -19
index 65b4a3c7c673..c360b8214f1f 100644
@@ -23,6 +23,10 @@
 	};
 };
 
+&clk32 {
+	u-boot,dm-pre-reloc;
+};
+
 &sdhci0 {
 	u-boot,dm-pre-reloc;
 };
@@ -31,6 +35,10 @@
 	u-boot,dm-pre-reloc;
 };
 
+&slow_rc_osc {
+	u-boot,dm-pre-reloc;
+};
+
 &dbgu {
 	u-boot,dm-pre-reloc;
 };
@@ -119,22 +127,3 @@
 	u-boot,dm-pre-reloc;
 };
 
-&slowckc {
-	u-boot,dm-pre-reloc;
-};
-
-&slow_osc {
-	u-boot,dm-pre-reloc;
-};
-
-&slow_rc_osc {
-	u-boot,dm-pre-reloc;
-};
-
-&td_slck {
-	u-boot,dm-pre-reloc;
-};
-
-&md_slck {
-	u-boot,dm-pre-reloc;
-};
Signature · 1 line
2.7.4
#6 lore raw

PATCH v3 6/8 ARM: dts: sam9x60: use CCF compatibles for PMC

In reply to Claudiu Beznea

Use CCF compatible for PMC. With this, the board/SoC will be able to boot.

---
 arch/arm/dts/sam9x60.dtsi          | 133 +++++++------------------------------
 arch/arm/dts/sam9x60ek-u-boot.dtsi |  62 ++---------------
 arch/arm/dts/sam9x60ek.dts         |   2 +-
 3 files changed, 33 insertions(+), 164 deletions(-)
arch/arm/dts/sam9x60.dtsi +25 -108
index 6eac2a8e3097..7f3eae3f5d26 100644
@@ -12,7 +12,7 @@
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/clock/at91.h>
+#include <dt-bindings/clk/at91.h>
 
 /{
 	model = "Microchip SAM9X60 SoC";
@@ -33,6 +33,12 @@
 			clock-frequency = <18500>;
 		};
 
+		main_rc: main_rc {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <12000000>;
+		};
+
 		slow_xtal: slow_xtal {
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
@@ -53,8 +59,11 @@
 		sdhci0: sdhci-host at 80000000 {
 			compatible = "microchip,sam9x60-sdhci";
 			reg = <0x80000000 0x300>;
-			clocks = <&sdhci0_clk>, <&sdhci0_gclk>, <&main>;
-			clock-names = "hclock", "multclk", "baseclk";
+			clocks = <&pmc PMC_TYPE_PERIPHERAL 12>, <&pmc PMC_TYPE_GCK 12>;
+			clock-names = "hclock", "multclk";
+			assigned-clocks = <&pmc PMC_TYPE_GCK 12>;
+			assigned-clock-rates = <100000000>;
+			assigned-clock-parents = <&pmc PMC_TYPE_CORE 10>; /* ID_PLL_A_DIV */
 			bus-width = <4>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&pinctrl_sdhci0>;
@@ -70,7 +79,7 @@
 				compatible = "microchip,sam9x60-qspi";
 				reg = <0xf0014000 0x100>, <0x70000000 0x10000000>;
 				reg-names = "qspi_base", "qspi_mmap";
-				clocks =  <&qspi_clk>, <&qspick>;
+				clocks =  <&pmc PMC_TYPE_PERIPHERAL 35>, <&pmc PMC_TYPE_SYSTEM 18>; /* ID_QSPI */
 				clock-names = "pclk", "qspick";
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -80,7 +89,7 @@
 			flx0: flexcom at f801c600 {
 				compatible = "atmel,sama5d2-flexcom";
 				reg = <0xf801c000 0x200>;
-				clocks = <&flx0_clk>;
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				ranges = <0x0 0xf801c000 0x800>;
@@ -93,7 +102,7 @@
 				pinctrl-names = "default";
 				pinctrl-0 = <&pinctrl_macb0_rmii>;
 				clock-names = "hclk", "pclk";
-				clocks = <&macb0_clk>, <&macb0_clk>;
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 24>, <&pmc PMC_TYPE_PERIPHERAL 24>;
 				status = "disabled";
 			};
 
@@ -102,7 +111,7 @@
 				reg = <0xfffff200 0x200>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&pinctrl_dbgu>;
-				clocks = <&dbgu_clk>;
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 47>;
 				clock-names = "usart";
 			};
 
@@ -159,7 +168,7 @@
 				reg = <0xfffff400 0x200>;
 				#gpio-cells = <2>;
 				gpio-controller;
-				clocks = <&pioA_clk>;
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 2>;
 			};
 
 			pioB: gpio at fffff600 {
@@ -167,7 +176,7 @@
 				reg = <0xfffff600 0x200>;
 				#gpio-cells = <2>;
 				gpio-controller;
-				clocks = <&pioB_clk>;
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 3>;
 			};
 
 			pioD: gpio at fffffa00 {
@@ -175,114 +184,22 @@
 				reg = <0xfffffa00 0x200>;
 				#gpio-cells = <2>;
 				gpio-controller;
-				clocks = <&pioD_clk>;
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 44>;
 			};
 
 			pmc: pmc at fffffc00 {
-				compatible = "atmel,at91sam9x5-pmc";
+				compatible = "microchip,sam9x60-pmc";
 				reg = <0xfffffc00 0x200>;
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				main: mainck {
-					compatible = "atmel,at91sam9x5-clk-main";
-					#clock-cells = <0>;
-				};
-
-				plla: pllack {
-					compatible = "microchip,sam9x60-clk-pll";
-					#clock-cells = <0>;
-					clocks = <&main>;
-					reg = <0>;
-					atmel,clk-input-range = <8000000 24000000>;
-					#atmel,pll-clk-output-range-cells = <4>;
-					atmel,pll-clk-output-ranges = <140000000 1200000000 0 0>;
-				};
-
-				mck: masterck {
-					compatible = "atmel,at91sam9x5-clk-master";
-					#clock-cells = <0>;
-					clocks = <&clk32 0>, <&main>, <&plla>;
-					atmel,clk-output-range = <140000000 200000000>;
-					atmel,clk-divisors = <1 2 4 6>;
-				};
-
-				system: systemck {
-					compatible = "atmel,at91rm9200-clk-system";
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					qspick: qspick {
-						#clock-cells = <0>;
-						reg = <19>;
-						clocks = <&mck>;
-					};
-				};
-
-				periph: periphck {
-					compatible = "microchip,sam9x60-clk-peripheral";
-					#address-cells = <1>;
-					#size-cells = <0>;
-					clocks = <&mck>;
-
-					pioA_clk: pioA_clk {
-						#clock-cells = <0>;
-						reg = <2>;
-					};
-
-					pioB_clk: pioB_clk {
-						#clock-cells = <0>;
-						reg = <3>;
-					};
-
-					flx0_clk: flx0_clk {
-						#clock-cells = <0>;
-						reg = <5>;
-					};
-
-					pioD_clk: pioD_clk {
-						#clock-cells = <0>;
-						reg = <44>;
-					};
-
-					sdhci0_clk: sdhci0_clk {
-						#clock-cells = <0>;
-						reg = <12>;
-					};
-
-					dbgu_clk: dbgu_clk {
-						#clock-cells = <0>;
-						reg = <47>;
-					};
-
-					macb0_clk: macb0_clk {
-						#clock-cells = <0>;
-						reg = <24>;
-					};
-
-					qspi_clk: qspi_clk {
-						#clock-cells = <0>;
-						reg = <35>;
-					};
-				};
-
-				generic: gck {
-					compatible = "microchip,sam9x60-clk-generated";
-					#address-cells = <1>;
-					#size-cells = <0>;
-					clocks = <&clk32 0>, <&clk32 1>, <&main>, <&mck>, <&plla>;
-
-					sdhci0_gclk: sdhci0_gclk {
-						#clock-cells = <0>;
-						reg = <12>;
-					};
-				};
+				#clock-cells = <2>;
+				clocks = <&clk32 1>, <&clk32 0>, <&main_xtal>, <&main_rc>;
+				clock-names = "td_slck", "md_slck", "main_xtal", "main_rc";
+				status = "okay";
 			};
 
 			pit: timer at fffffe40 {
 				compatible = "atmel,at91sam9260-pit";
 				reg = <0xfffffe40 0x10>;
-				clocks = <&mck>;
+				clocks = <&pmc PMC_TYPE_CORE 11>; /* ID_MCK. */
 			};
 
 			clk32: sckc at fffffe50 {
arch/arm/dts/sam9x60ek-u-boot.dtsi +7 -55

89 lines not on this page · raw message

arch/arm/dts/sam9x60ek.dts +1 -1
index 44af5d99ee4c..96914b3ea2ca 100644
@@ -67,7 +67,7 @@
 					pinctrl-0 = <&pinctrl_flx0>;
 					#address-cells = <1>;
 					#size-cells = <0>;
-					clocks = <&flx0_clk>;
+					clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
 					status = "okay";
 
 					eeprom at 53 {
Signature · 1 line
2.7.4
#7 lore raw

PATCH v3 7/8 configs: sam9x60ek: update defconfigs for CCF

In reply to Claudiu Beznea

Update defconfigs for using common clock framework compatible clocks.

---
 configs/sam9x60ek_mmc_defconfig       | 4 +++-
 configs/sam9x60ek_nandflash_defconfig | 4 +++-
 configs/sam9x60ek_qspiflash_defconfig | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)
configs/sam9x60ek_mmc_defconfig +3 -1
index 2600f4d79d46..4afa8856ef69 100644
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_SYS_TEXT_BASE=0x23f00000
 CONFIG_TARGET_SAM9X60EK=y
-CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_SYS_MALLOC_F_LEN=0x8000
 CONFIG_NR_DRAM_BANKS=8
 CONFIG_ENV_SIZE=0x4000
 CONFIG_DM_GPIO=y
@@ -36,8 +36,10 @@ CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y
 CONFIG_CLK=y
+CONFIG_CLK_CCF=y
 CONFIG_CLK_AT91=y
 CONFIG_AT91_GENERIC_CLK=y
+CONFIG_AT91_SAM9X60_PLL=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_AT91=y
configs/sam9x60ek_nandflash_defconfig +3 -1
index e21efff34208..481356140966 100644
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_SYS_TEXT_BASE=0x23f00000
 CONFIG_TARGET_SAM9X60EK=y
-CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_SYS_MALLOC_F_LEN=0x8000
 CONFIG_NR_DRAM_BANKS=8
 CONFIG_DM_GPIO=y
 CONFIG_DEBUG_UART_BOARD_INIT=y
@@ -40,8 +40,10 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y
 CONFIG_CLK=y
+CONFIG_CLK_CCF=y
 CONFIG_CLK_AT91=y
 CONFIG_AT91_GENERIC_CLK=y
+CONFIG_AT91_SAM9X60_PLL=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_AT91=y
configs/sam9x60ek_qspiflash_defconfig +3 -1
index 1123ebcd5250..16852da810e8 100644
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_SYS_TEXT_BASE=0x23f00000
 CONFIG_TARGET_SAM9X60EK=y
-CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_SYS_MALLOC_F_LEN=0x8000
 CONFIG_NR_DRAM_BANKS=8
 CONFIG_ENV_SECT_SIZE=0x1000
 CONFIG_DM_GPIO=y
@@ -48,8 +48,10 @@ CONFIG_ENV_SPI_MODE=0x0
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y
 CONFIG_CLK=y
+CONFIG_CLK_CCF=y
 CONFIG_CLK_AT91=y
 CONFIG_AT91_GENERIC_CLK=y
+CONFIG_AT91_SAM9X60_PLL=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_AT91=y
Signature · 1 line
2.7.4
#8 lore raw

PATCH v3 8/8 ARM: dts: sam9x60: use alphabetical order

In reply to Claudiu Beznea

Use alphabetical order for entries in sam9x60ek-u-boot.dtsi

---
 arch/arm/dts/sam9x60ek-u-boot.dtsi | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)
arch/arm/dts/sam9x60ek-u-boot.dtsi +13 -14
index fe8ca81448da..8c63ed869c86 100644
@@ -27,55 +27,54 @@
 	u-boot,dm-pre-reloc;
 };
 
-&sdhci0 {
+&dbgu {
 	u-boot,dm-pre-reloc;
 };
 
-&slow_xtal {
+&main_rc {
 	u-boot,dm-pre-reloc;
 };
 
-&slow_rc_osc {
+&main_xtal {
 	u-boot,dm-pre-reloc;
 };
 
-&dbgu {
+&pinctrl_dbgu {
 	u-boot,dm-pre-reloc;
 };
 
-&qspi {
+&pinctrl_sdhci0 {
 	u-boot,dm-pre-reloc;
 };
 
-&main_rc {
+&pinctrl_qspi {
 	u-boot,dm-pre-reloc;
 };
 
-&main_xtal {
+&pioA {
 	u-boot,dm-pre-reloc;
 };
 
-&pinctrl_dbgu {
+&pioB {
 	u-boot,dm-pre-reloc;
 };
 
-&pinctrl_sdhci0 {
+&pmc {
 	u-boot,dm-pre-reloc;
 };
 
-&pinctrl_qspi {
+&qspi {
 	u-boot,dm-pre-reloc;
 };
 
-&pioA {
+&sdhci0 {
 	u-boot,dm-pre-reloc;
 };
 
-&pioB {
+&slow_xtal {
 	u-boot,dm-pre-reloc;
 };
 
-&pmc {
+&slow_rc_osc {
 	u-boot,dm-pre-reloc;
 };
-
Signature · 1 line
2.7.4
#9 lore raw

v3 cover add SAM9X60 clock support

In reply to Claudiu Beznea
Quoted 41 lines · Claudiu Beznea

Hi,

This series adds SAM9X60 clock support, CCF compatible, so that SAM9X60 based boards (e.g. SAM9X60-EK in this case) to be able to boot with mainline code.

This series is based on u-boot-atmel/next.

Thank you,
Claudiu Beznea

Changes in v3:
- move u-boot,dm-pre-reloc properties to sam9x60ek-u-boot.dtsi
- add main_xtal to sam9x60ek-u-boot.dtsi in patch 8/8

Changes in v2:
- remove "Alignment should match open parenthesis" and "Please don't use multiple blank lines" checkpatch.pl warnings
- use u-boot,dm-pre-reloc also in sam9x60ek-u-boot.dtsi
- add patch 8/8

Claudiu Beznea (8):
board: atmel: sam9x60ek: add SYS_MALLOC_F_LEN to SYS_INIT_SP_ADDR
clk: at91: sam9x60: add support compatible with CCF
ARM: dts: sam9x60ek: add clock frequencies to board file
ARM: dts: sam9x60: use u-boot,dm-pre-reloc
ARM: dts: sam9x60: use slow clock CCF compatible bindings
ARM: dts: sam9x60: use CCF compatibles for PMC
configs: sam9x60ek: update defconfigs for CCF
ARM: dts: sam9x60: use alphabetical order

  arch/arm/dts/sam9x60.dtsi             | 171 ++-------
  arch/arm/dts/sam9x60ek-u-boot.dtsi    |  70 +---
  arch/arm/dts/sam9x60ek.dts            |  12 +-
  configs/sam9x60ek_mmc_defconfig       |   4 +-
  configs/sam9x60ek_nandflash_defconfig |   4 +-
  configs/sam9x60ek_qspiflash_defconfig |   4 +-
  drivers/clk/at91/Makefile             |   1 +
  drivers/clk/at91/sam9x60.c            | 649 ++++++++++++++++++++++++++++++++++
  include/configs/sam9x60ek.h           |   3 +-
  9 files changed, 716 insertions(+), 202 deletions(-)
Quoted 2 lines

create mode 100644 drivers/clk/at91/sam9x60.c

Applied series to u-boot-atmel/master, thanks !