Skip to content

L
linux
Commit 7637d42c authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files
Options

ARM: dts: at91: at91sam9261: switch to new clock bindings 

Switch at91sam9261 boards to the new PMC clock bindings.
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent e239e060
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 264 deletions
arch/arm/boot/dts/at91sam9261.dtsi
View file @ 7637d42c
...@@ -75,7 +75,7 @@ usb0: ohci@500000 { ...@@ -75,7 +75,7 @@ usb0: ohci@500000 {
compatible = "atmel,at91rm9200-ohci", "usb-ohci"; compatible = "atmel,at91rm9200-ohci", "usb-ohci";
reg = <0x00500000 0x100000>; reg = <0x00500000 0x100000>;
interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>; interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;
clocks = <&ohci_clk>, <&hclk0>, <&uhpck>; clocks = <&pmc PMC_TYPE_PERIPHERAL 20>, <&pmc PMC_TYPE_SYSTEM 16>, <&pmc PMC_TYPE_SYSTEM 6>;
clock-names = "ohci_clk", "hclk", "uhpck"; clock-names = "ohci_clk", "hclk", "uhpck";
status = "disabled"; status = "disabled";
}; };
...@@ -86,7 +86,7 @@ fb0: fb@600000 { ...@@ -86,7 +86,7 @@ fb0: fb@600000 {
interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>; interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_fb>; pinctrl-0 = <&pinctrl_fb>;
clocks = <&lcd_clk>, <&hclk1>; clocks = <&pmc PMC_TYPE_PERIPHERAL 21>, <&pmc PMC_TYPE_SYSTEM 17>;
clock-names = "lcdc_clk", "hclk"; clock-names = "lcdc_clk", "hclk";
status = "disabled"; status = "disabled";
}; };
...@@ -106,7 +106,7 @@ ebi: ebi@10000000 { ...@@ -106,7 +106,7 @@ ebi: ebi@10000000 {
0x5 0x0 0x60000000 0x10000000 0x5 0x0 0x60000000 0x10000000
0x6 0x0 0x70000000 0x10000000 0x6 0x0 0x70000000 0x10000000
0x7 0x0 0x80000000 0x10000000>; 0x7 0x0 0x80000000 0x10000000>;
clocks = <&mck>; clocks = <&pmc PMC_TYPE_CORE PMC_MCK>;
status = "disabled"; status = "disabled";
nand_controller: nand-controller { nand_controller: nand-controller {
...@@ -132,7 +132,7 @@ tcb0: timer@fffa0000 { ...@@ -132,7 +132,7 @@ tcb0: timer@fffa0000 {
interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>, interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>,
<18 IRQ_TYPE_LEVEL_HIGH 0>, <18 IRQ_TYPE_LEVEL_HIGH 0>,
<19 IRQ_TYPE_LEVEL_HIGH 0>; <19 IRQ_TYPE_LEVEL_HIGH 0>;
clocks = <&tc0_clk>, <&tc1_clk>, <&tc2_clk>, <&slow_xtal>; clocks = <&pmc PMC_TYPE_PERIPHERAL 17>, <&pmc PMC_TYPE_PERIPHERAL 18>, <&pmc PMC_TYPE_PERIPHERAL 19>, <&slow_xtal>;
clock-names = "t0_clk", "t1_clk", "t2_clk", "slow_clk"; clock-names = "t0_clk", "t1_clk", "t2_clk", "slow_clk";
}; };
...@@ -140,7 +140,7 @@ usb1: gadget@fffa4000 { ...@@ -140,7 +140,7 @@ usb1: gadget@fffa4000 {
compatible = "atmel,at91sam9261-udc"; compatible = "atmel,at91sam9261-udc";
reg = <0xfffa4000 0x4000>; reg = <0xfffa4000 0x4000>;
interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>; interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>;
clocks = <&udc_clk>, <&udpck>; clocks = <&pmc PMC_TYPE_PERIPHERAL 10>, <&pmc PMC_TYPE_SYSTEM 7>;
clock-names = "pclk", "hclk"; clock-names = "pclk", "hclk";
atmel,matrix = <&matrix>; atmel,matrix = <&matrix>;
status = "disabled"; status = "disabled";
...@@ -154,7 +154,7 @@ mmc0: mmc@fffa8000 { ...@@ -154,7 +154,7 @@ mmc0: mmc@fffa8000 {
pinctrl-0 = <&pinctrl_mmc0_clk>, <&pinctrl_mmc0_slot0_cmd_dat0>, <&pinctrl_mmc0_slot0_dat1_3>; pinctrl-0 = <&pinctrl_mmc0_clk>, <&pinctrl_mmc0_slot0_cmd_dat0>, <&pinctrl_mmc0_slot0_dat1_3>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
clocks = <&mci0_clk>; clocks = <&pmc PMC_TYPE_PERIPHERAL 9>;
clock-names = "mci_clk"; clock-names = "mci_clk";
status = "disabled"; status = "disabled";
}; };
...@@ -167,7 +167,7 @@ i2c0: i2c@fffac000 { ...@@ -167,7 +167,7 @@ i2c0: i2c@fffac000 {
interrupts = <11 IRQ_TYPE_LEVEL_HIGH 6>; interrupts = <11 IRQ_TYPE_LEVEL_HIGH 6>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
clocks = <&twi0_clk>; clocks = <&pmc PMC_TYPE_PERIPHERAL 11>;
status = "disabled"; status = "disabled";
}; };
...@@ -179,7 +179,7 @@ usart0: serial@fffb0000 { ...@@ -179,7 +179,7 @@ usart0: serial@fffb0000 {
atmel,use-dma-tx; atmel,use-dma-tx;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usart0>; pinctrl-0 = <&pinctrl_usart0>;
clocks = <&usart0_clk>; clocks = <&pmc PMC_TYPE_PERIPHERAL 6>;
clock-names = "usart"; clock-names = "usart";
status = "disabled"; status = "disabled";
}; };
...@@ -192,7 +192,7 @@ usart1: serial@fffb4000 { ...@@ -192,7 +192,7 @@ usart1: serial@fffb4000 {
atmel,use-dma-tx; atmel,use-dma-tx;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usart1>; pinctrl-0 = <&pinctrl_usart1>;
clocks = <&usart1_clk>; clocks = <&pmc PMC_TYPE_PERIPHERAL 7>;
clock-names = "usart"; clock-names = "usart";
status = "disabled"; status = "disabled";
}; };
...@@ -205,7 +205,7 @@ usart2: serial@fffb8000{ ...@@ -205,7 +205,7 @@ usart2: serial@fffb8000{
atmel,use-dma-tx; atmel,use-dma-tx;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usart2>; pinctrl-0 = <&pinctrl_usart2>;
clocks = <&usart2_clk>; clocks = <&pmc PMC_TYPE_PERIPHERAL 8>;
clock-names = "usart"; clock-names = "usart";
status = "disabled"; status = "disabled";
}; };
...@@ -216,7 +216,7 @@ ssc0: ssc@fffbc000 { ...@@ -216,7 +216,7 @@ ssc0: ssc@fffbc000 {
interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>; interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>; pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
clocks = <&ssc0_clk>; clocks = <&pmc PMC_TYPE_PERIPHERAL 14>;
clock-names = "pclk"; clock-names = "pclk";
status = "disabled"; status = "disabled";
}; };
...@@ -227,7 +227,7 @@ ssc1: ssc@fffc0000 { ...@@ -227,7 +227,7 @@ ssc1: ssc@fffc0000 {
interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>; interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>; pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
clocks = <&ssc1_clk>; clocks = <&pmc PMC_TYPE_PERIPHERAL 15>;
clock-names = "pclk"; clock-names = "pclk";
status = "disabled"; status = "disabled";
}; };
...@@ -238,7 +238,7 @@ ssc2: ssc@fffc4000 { ...@@ -238,7 +238,7 @@ ssc2: ssc@fffc4000 {
interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>; interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ssc2_tx &pinctrl_ssc2_rx>; pinctrl-0 = <&pinctrl_ssc2_tx &pinctrl_ssc2_rx>;
clocks = <&ssc2_clk>; clocks = <&pmc PMC_TYPE_PERIPHERAL 16>;
clock-names = "pclk"; clock-names = "pclk";
status = "disabled"; status = "disabled";
}; };
...@@ -252,7 +252,7 @@ spi0: spi@fffc8000 { ...@@ -252,7 +252,7 @@ spi0: spi@fffc8000 {
interrupts = <12 IRQ_TYPE_LEVEL_HIGH 3>; interrupts = <12 IRQ_TYPE_LEVEL_HIGH 3>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_spi0>; pinctrl-0 = <&pinctrl_spi0>;
clocks = <&spi0_clk>; clocks = <&pmc PMC_TYPE_PERIPHERAL 12>;
clock-names = "spi_clk"; clock-names = "spi_clk";
status = "disabled"; status = "disabled";
}; };
...@@ -265,7 +265,7 @@ spi1: spi@fffcc000 { ...@@ -265,7 +265,7 @@ spi1: spi@fffcc000 {
interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>; interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_spi1>; pinctrl-0 = <&pinctrl_spi1>;
clocks = <&spi1_clk>; clocks = <&pmc PMC_TYPE_PERIPHERAL 13>;
clock-names = "spi_clk"; clock-names = "spi_clk";
status = "disabled"; status = "disabled";
}; };
...@@ -299,7 +299,7 @@ dbgu: serial@fffff200 { ...@@ -299,7 +299,7 @@ dbgu: serial@fffff200 {
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_dbgu>; pinctrl-0 = <&pinctrl_dbgu>;
clocks = <&mck>; clocks = <&pmc PMC_TYPE_CORE PMC_MCK>;
clock-names = "usart"; clock-names = "usart";
status = "disabled"; status = "disabled";
}; };
...@@ -563,7 +563,7 @@ pioA: gpio@fffff400 { ...@@ -563,7 +563,7 @@ pioA: gpio@fffff400 {
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
clocks = <&pioA_clk>; clocks = <&pmc PMC_TYPE_PERIPHERAL 2>;
}; };
pioB: gpio@fffff600 { pioB: gpio@fffff600 {
...@@ -574,7 +574,7 @@ pioB: gpio@fffff600 { ...@@ -574,7 +574,7 @@ pioB: gpio@fffff600 {
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
clocks = <&pioB_clk>; clocks = <&pmc PMC_TYPE_PERIPHERAL 3>;
}; };
pioC: gpio@fffff800 { pioC: gpio@fffff800 {
...@@ -585,7 +585,7 @@ pioC: gpio@fffff800 { ...@@ -585,7 +585,7 @@ pioC: gpio@fffff800 {
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
clocks = <&pioC_clk>; clocks = <&pmc PMC_TYPE_PERIPHERAL 4>;
}; };
}; };
...@@ -593,250 +593,9 @@ pmc: pmc@fffffc00 { ...@@ -593,250 +593,9 @@ pmc: pmc@fffffc00 {
compatible = "atmel,at91sam9261-pmc", "syscon"; compatible = "atmel,at91sam9261-pmc", "syscon";
reg = <0xfffffc00 0x100>; reg = <0xfffffc00 0x100>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
interrupt-controller; #clock-cells = <2>;
#address-cells = <1>; clocks = <&slow_xtal>, <&main_xtal>;
#size-cells = <0>; clock-names = "slow_xtal", "main_xtal";
#interrupt-cells = <1>;
main_osc: main_osc {
compatible = "atmel,at91rm9200-clk-main-osc";
#clock-cells = <0>;
interrupts-extended = <&pmc AT91_PMC_MOSCS>;
clocks = <&main_xtal>;
};
main: mainck {
compatible = "atmel,at91rm9200-clk-main";
#clock-cells = <0>;
clocks = <&main_osc>;
};
plla: pllack {
compatible = "atmel,at91rm9200-clk-pll";
#clock-cells = <0>;
interrupts-extended = <&pmc AT91_PMC_LOCKA>;
clocks = <&main>;
reg = <0>;
atmel,clk-input-range = <1000000 32000000>;
#atmel,pll-clk-output-range-cells = <4>;
atmel,pll-clk-output-ranges = <80000000 200000000 0 1>,
<190000000 240000000 2 1>;
};
pllb: pllbck {
compatible = "atmel,at91rm9200-clk-pll";
#clock-cells = <0>;
interrupts-extended = <&pmc AT91_PMC_LOCKB>;
clocks = <&main>;
reg = <1>;
atmel,clk-input-range = <1000000 5000000>;
#atmel,pll-clk-output-range-cells = <4>;
atmel,pll-clk-output-ranges = <70000000 130000000 1 1>;
};
mck: masterck {
compatible = "atmel,at91rm9200-clk-master";
#clock-cells = <0>;
interrupts-extended = <&pmc AT91_PMC_MCKRDY>;
clocks = <&slow_xtal>, <&main>, <&plla>, <&pllb>;
atmel,clk-output-range = <0 94000000>;
atmel,clk-divisors = <1 2 4 0>;
};
usb: usbck {
compatible = "atmel,at91rm9200-clk-usb";
#clock-cells = <0>;
atmel,clk-divisors = <1 2 4 0>;
clocks = <&pllb>;
};
prog: progck {
compatible = "atmel,at91rm9200-clk-programmable";
#address-cells = <1>;
#size-cells = <0>;
interrupt-parent = <&pmc>;
clocks = <&slow_xtal>, <&main>, <&plla>, <&pllb>;
prog0: prog0 {
#clock-cells = <0>;
reg = <0>;
interrupts = <AT91_PMC_PCKRDY(0)>;
};
prog1: prog1 {
#clock-cells = <0>;
reg = <1>;
interrupts = <AT91_PMC_PCKRDY(1)>;
};
prog2: prog2 {
#clock-cells = <0>;
reg = <2>;
interrupts = <AT91_PMC_PCKRDY(2)>;
};
prog3: prog3 {
#clock-cells = <0>;
reg = <3>;
interrupts = <AT91_PMC_PCKRDY(3)>;
};
};
systemck {
compatible = "atmel,at91rm9200-clk-system";
#address-cells = <1>;
#size-cells = <0>;
uhpck: uhpck {
#clock-cells = <0>;
reg = <6>;
clocks = <&usb>;
};
udpck: udpck {
#clock-cells = <0>;
reg = <7>;
clocks = <&usb>;
};
pck0: pck0 {
#clock-cells = <0>;
reg = <8>;
clocks = <&prog0>;
};
pck1: pck1 {
#clock-cells = <0>;
reg = <9>;
clocks = <&prog1>;
};
pck2: pck2 {
#clock-cells = <0>;
reg = <10>;
clocks = <&prog2>;
};
pck3: pck3 {
#clock-cells = <0>;
reg = <11>;
clocks = <&prog3>;
};
hclk0: hclk0 {
#clock-cells = <0>;
reg = <16>;
clocks = <&mck>;
};
hclk1: hclk1 {
#clock-cells = <0>;
reg = <17>;
clocks = <&mck>;
};
};
periphck {
compatible = "atmel,at91rm9200-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>;
};
pioC_clk: pioC_clk {
#clock-cells = <0>;
reg = <4>;
};
usart0_clk: usart0_clk {
#clock-cells = <0>;
reg = <6>;
};
usart1_clk: usart1_clk {
#clock-cells = <0>;
reg = <7>;
};
usart2_clk: usart2_clk {
#clock-cells = <0>;
reg = <8>;
};
mci0_clk: mci0_clk {
#clock-cells = <0>;
reg = <9>;
};
udc_clk: udc_clk {
#clock-cells = <0>;
reg = <10>;
};
twi0_clk: twi0_clk {
reg = <11>;
#clock-cells = <0>;
};
spi0_clk: spi0_clk {
#clock-cells = <0>;
reg = <12>;
};
spi1_clk: spi1_clk {
#clock-cells = <0>;
reg = <13>;
};
ssc0_clk: ssc0_clk {
#clock-cells = <0>;
reg = <14>;
};
ssc1_clk: ssc1_clk {
#clock-cells = <0>;
reg = <15>;
};
ssc2_clk: ssc2_clk {
#clock-cells = <0>;
reg = <16>;
};
tc0_clk: tc0_clk {
#clock-cells = <0>;
reg = <17>;
};
tc1_clk: tc1_clk {
#clock-cells = <0>;
reg = <18>;
};
tc2_clk: tc2_clk {
#clock-cells = <0>;
reg = <19>;
};
ohci_clk: ohci_clk {
#clock-cells = <0>;
reg = <20>;
};
lcd_clk: lcd_clk {
#clock-cells = <0>;
reg = <21>;
};
};
}; };
rstc@fffffd00 { rstc@fffffd00 {
...@@ -855,7 +614,7 @@ pit: timer@fffffd30 { ...@@ -855,7 +614,7 @@ pit: timer@fffffd30 {
compatible = "atmel,at91sam9260-pit"; compatible = "atmel,at91sam9260-pit";
reg = <0xfffffd30 0xf>; reg = <0xfffffd30 0xf>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
clocks = <&mck>; clocks = <&pmc PMC_TYPE_CORE PMC_MCK>;
}; };
rtc@fffffd20 { rtc@fffffd20 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7