github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 23:52:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Amba and clock fixes to conform better to actual dt-bindings.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAmKRDfYQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgQk8CACp6MnJPwdUL+pA0bjcP7FRCkja1NSdEiab
 Ks/bnfcWFx1D2uc6d5q20rXWPOfYuroG+BvHlh9VqfF/1nmO7Uxuwx4cznYpGmSN
 Lee8Ux0IF9WNvTTBjHbIhCtXTyz/NXtMeocbysw8Dsgl3yNb+rlnBzP12Acs108T
 SA3dIy8icBVYDnyzqcuQjtOuQNN9uMjz+58e9pv/YavNnQwu9Ex67nLQo+UQMVIK
 A0t6kezZQZVtYdgIAp8y2u/3ZcaTUebhK8nLRfuWayuzcPpCF26cDhqrPL3KoQVW
 M5o1hRf1NVSpdH56N56qDAwnBeQtyqSoAVK5QET0YoP1UZd0QIEQ
 =ywJC
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmKRMpAACgkQmmx57+YA
 GNmymBAAqjqz7YZUyb6/tGABamO5g2AxDshIARYHrmiUo8e8f8p7tMOt21RzTaua
 UB+snhRkpfdyWNPk+TlToU+fraEtvlvqbtVIcevjG4SsarDZ0FOZgRq1cGu0B3m4
 GTsmsV+McLgNepewVgrCbpT7kzvoAovGPuWVgbKj2h+CWP3kxCw23lVwR+trk4bz
 5oCcMcFX7RqKNti/mw3dfVJgdKC3z17cyT6djHiaxEMdbENJJABLsi6YoVBmbvat
 lBRvPJwXNmCJdko5u8gEf1X6W2kV9JvKR5Ax0PydsG8p9BU/dwAQuQIUjQkYPpFT
 Xv5sSw5mRY8co0FL0VDGjw7AdRdsgPO4cRnRKuiRyJhqG0W3pyUcKU+SvnfLpgfW
 EUrB/MflPgrxuoBlEjfTXC/w9uD5qByhq3NlODdABLUKR6jgzE9jU3kAuwZ2QZ7h
 cWt3KeIdgokWJbdnq13eQibB+lkt2uz/apk3aM1MPB8CbFd7AmSbcV5YrfEjDTu2
 /6yWqwCI74QMyw8KvXeiTt43gpyie7YQIowiTNR6aw9S6/dZbkof7aqAP2sMTOh0
 vDqw8YwfZ8tNxntnrvT36n77g8gmcEPAG8/q2FY8WKGhuJUkX10lQzinouATYANs
 hXtWDCBMgEWkhynWOAmw8hrxT0H+n3yDQpSQsqhUwMDJp5UdFWY=
 =RiRc
 -----END PGP SIGNATURE-----

Merge tag 'v5.19-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/late

Amba and clock fixes to conform better to actual dt-bindings.

* tag 'v5.19-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add clocks property to cru node rk3228
  ARM: dts: rockchip: add clocks property to cru node rk3036
  ARM: dts: rockchip: add clocks property to cru node rk3066a/rk3188
  ARM: dts: rockchip: add clocks property to cru node rk3288
  ARM: dts: rockchip: Remove "amba" bus nodes from rv1108
  ARM: dts: rockchip: add clocks property to cru node rv1108

Link: https://lore.kernel.org/r/4798587.jE0xQCEvom@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-05-27 22:20:31 +02:00
commit 440517772b
6 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/rk3036.dtsi
View File

@ -330,6 +330,8 @@ nfc: nand-controller@10500000 {
cru: clock-controller@20000000 {
compatible = "rockchip,rk3036-cru";
reg = <0x20000000 0x1000>;
clocks = <&xin24m>;
clock-names = "xin24m";
rockchip,grf = <&grf>;
#clock-cells = <1>;
#reset-cells = <1>;

3
arch/arm/boot/dts/rk3066a.dtsi
View File

@ -202,8 +202,9 @@ i2s2: i2s@1011c000 {
cru: clock-controller@20000000 {
compatible = "rockchip,rk3066a-cru";
reg = <0x20000000 0x1000>;
clocks = <&xin24m>;
clock-names = "xin24m";
rockchip,grf = <&grf>;
#clock-cells = <1>;
#reset-cells = <1>;
assigned-clocks = <&cru PLL_CPLL>, <&cru PLL_GPLL>,

3
arch/arm/boot/dts/rk3188.dtsi
View File

@ -195,8 +195,9 @@ spdif: sound@1011e000 {
cru: clock-controller@20000000 {
compatible = "rockchip,rk3188-cru";
reg = <0x20000000 0x1000>;
clocks = <&xin24m>;
clock-names = "xin24m";
rockchip,grf = <&grf>;
#clock-cells = <1>;
#reset-cells = <1>;
};

2
arch/arm/boot/dts/rk322x.dtsi
View File

@ -484,6 +484,8 @@ timer: timer@110c0000 {
cru: clock-controller@110e0000 {
compatible = "rockchip,rk3228-cru";
reg = <0x110e0000 0x1000>;
clocks = <&xin24m>;
clock-names = "xin24m";
rockchip,grf = <&grf>;
#clock-cells = <1>;
#reset-cells = <1>;

2
arch/arm/boot/dts/rk3288.dtsi
View File

@ -862,6 +862,8 @@ sgrf: syscon@ff740000 {
cru: clock-controller@ff760000 {
compatible = "rockchip,rk3288-cru";
reg = <0x0 0xff760000 0x0 0x1000>;
clocks = <&xin24m>;
clock-names = "xin24m";
rockchip,grf = <&grf>;
#clock-cells = <1>;
#reset-cells = <1>;

31
arch/arm/boot/dts/rv1108.dtsi
View File

@ -85,24 +85,6 @@ xin24m: oscillator {
#clock-cells = <0>;
};
amba: bus {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
pdma: pdma@102a0000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0x102a0000 0x4000>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
#dma-cells = <1>;
arm,pl330-broken-no-flushp;
arm,pl330-periph-burst;
clocks = <&cru ACLK_DMAC>;
clock-names = "apb_pclk";
};
};
bus_intmem: sram@10080000 {
compatible = "mmio-sram";
reg = <0x10080000 0x2000>;
@ -259,6 +241,17 @@ pwm7: pwm@10280030 {
status = "disabled";
};
pdma: dma-controller@102a0000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0x102a0000 0x4000>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
#dma-cells = <1>;
arm,pl330-broken-no-flushp;
arm,pl330-periph-burst;
clocks = <&cru ACLK_DMAC>;
clock-names = "apb_pclk";
};
grf: syscon@10300000 {
compatible = "rockchip,rv1108-grf", "syscon", "simple-mfd";
reg = <0x10300000 0x1000>;
@ -456,6 +449,8 @@ usbgrf: syscon@202a0000 {
cru: clock-controller@20200000 {
compatible = "rockchip,rv1108-cru";
reg = <0x20200000 0x1000>;
clocks = <&xin24m>;
clock-names = "xin24m";
rockchip,grf = <&grf>;
#clock-cells = <1>;
#reset-cells = <1>;