xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'at91-5.3-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt

Browse Source 
AT91 DT for 5.3

 - switch to new sckc bindings
 - convert soc bindings to json-schema

* tag 'at91-5.3-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  dt-bindings: arm: Convert Atmel board/soc bindings to json-schema
  ARM: dts: at91: sama5d3: switch to new sckc bindings
  ARM: dts: at91: at91sam9rl: switch to new sckc bindings
  ARM: dts: at91: at91sam9g45: switch to new sckc bindings
  ARM: dts: at91: at91sam9x5: switch to new sckc bindings
  ARM: dts: at91sam9261ek: remove unused chosen nodes

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2019-06-25 04:49:42 -07:00
parent 9c644f83ea 271839b0a8
commit 28705661dd
8 changed files with 148 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/at91-wb50n.dtsi
View File

@@ -42,7 +42,7 @@
clock-frequency = <12000000>;
};
&slow_osc {
&clk32k {
atmel,osc-bypass;
};

8
arch/arm/boot/dts/at91sam9261ek.dts
View File

@@ -14,14 +14,6 @@
chosen {
bootargs = "rootfstype=ubifs ubi.mtd=5 root=ubi0:rootfs rw";
stdout-path = "serial0:115200n8";
clocksource {
timer = <&timer0>;
};
clockevent {
timer = <&timer1>;
};
};
memory {

25
arch/arm/boot/dts/at91sam9g45.dtsi
View File

@@ -1258,30 +1258,11 @@
};
};
sckc@fffffd50 {
clk32k: sckc@fffffd50 {
compatible = "atmel,at91sam9x5-sckc";
reg = <0xfffffd50 0x4>;
slow_osc: slow_osc {
compatible = "atmel,at91sam9x5-clk-slow-osc";
#clock-cells = <0>;
atmel,startup-time-usec = <1200000>;
clocks = <&slow_xtal>;
};
slow_rc_osc: slow_rc_osc {
compatible = "atmel,at91sam9x5-clk-slow-rc-osc";
#clock-cells = <0>;
atmel,startup-time-usec = <75>;
clock-frequency = <32768>;
clock-accuracy = <50000000>;
};
clk32k: slck {
compatible = "atmel,at91sam9x5-clk-slow";
#clock-cells = <0>;
clocks = <&slow_rc_osc &slow_osc>;
};
clocks = <&slow_xtal>;
#clock-cells = <0>;
};
rtc@fffffd20 {

25
arch/arm/boot/dts/at91sam9rl.dtsi
View File

@@ -868,30 +868,11 @@
status = "disabled";
};
sckc@fffffd50 {
clk32k: sckc@fffffd50 {
compatible = "atmel,at91sam9x5-sckc";
reg = <0xfffffd50 0x4>;
slow_osc: slow_osc {
compatible = "atmel,at91sam9x5-clk-slow-osc";
#clock-cells = <0>;
atmel,startup-time-usec = <1200000>;
clocks = <&slow_xtal>;
};
slow_rc_osc: slow_rc_osc {
compatible = "atmel,at91sam9x5-clk-slow-rc-osc";
#clock-cells = <0>;
atmel,startup-time-usec = <75>;
clock-frequency = <32768>;
clock-accuracy = <50000000>;
};
clk32k: slck {
compatible = "atmel,at91sam9x5-clk-slow";
#clock-cells = <0>;
clocks = <&slow_rc_osc &slow_osc>;
};
clocks = <&slow_xtal>;
#clock-cells = <0>;
};
rtc@fffffd20 {

23
arch/arm/boot/dts/at91sam9x5.dtsi
View File

@@ -149,28 +149,11 @@
clocks = <&pmc PMC_TYPE_CORE PMC_MCK>;
};
sckc@fffffe50 {
clk32k: sckc@fffffe50 {
compatible = "atmel,at91sam9x5-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>;
clock-accuracy = <50000000>;
};
clk32k: slck {
compatible = "atmel,at91sam9x5-clk-slow";
#clock-cells = <0>;
clocks = <&slow_rc_osc>, <&slow_osc>;
};
clocks = <&slow_xtal>;
#clock-cells = <0>;
};
tcb0: timer@f8008000 {

27
arch/arm/boot/dts/sama5d3.dtsi
View File

@@ -1371,30 +1371,11 @@
status = "disabled";
};
sckc@fffffe50 {
compatible = "atmel,at91sam9x5-sckc";
clk32k: sckc@fffffe50 {
compatible = "atmel,sama5d3-sckc";
reg = <0xfffffe50 0x4>;
slow_rc_osc: slow_rc_osc {
compatible = "atmel,at91sam9x5-clk-slow-rc-osc";
#clock-cells = <0>;
clock-frequency = <32768>;
clock-accuracy = <50000000>;
atmel,startup-time-usec = <75>;
};
slow_osc: slow_osc {
compatible = "atmel,at91sam9x5-clk-slow-osc";
#clock-cells = <0>;
clocks = <&slow_xtal>;
atmel,startup-time-usec = <1200000>;
};
clk32k: slowck {
compatible = "atmel,at91sam9x5-clk-slow";
#clock-cells = <0>;
clocks = <&slow_rc_osc &slow_osc>;
};
clocks = <&slow_xtal>;
#clock-cells = <0>;
};
rtc@fffffeb0 {