korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-04 01:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Amlogic fixes for v4.15-rc

Browse Source 
- GPIO interrupt fixes
 - socinfo fix for GX series
 - fix typo
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAloq33MACgkQWTcYmtP7
 xmVqdxAAjP5E/B52UpRqDDxANPrhUPDHLVI+JkJqtmAEn7G9+eyf/WOOJXLsdJTY
 1JEqBd2cg2Gnj5VhhfVZDFVVebGboYB6OJPgPlvL+EjYShPf2P0Xug2xFxuxFMOA
 ed48amV2cz+/3AXGuKmDcUKdN6LAcF1ax7kXCUSQKUbK/s4EmuYXjwHRJrvw1PrH
 4Rpt5Zw6u1t5na26KDBit9OkRL5g0o8SX829MhbHqPScDvAi2wYy95i+Ay1PNFin
 uUojff5V1OBbeYZMamUIjl3e2/BCecPdaBwDFsnz+SlFfYQIy6g0zQEjRa9BGnMi
 i/LQOr09l/Dl1Wlexl0rwq3vEXr5hT9JfA9IpLBOJRccG6RUl/TarjpwSqtPPFmf
 eMdIGZd9S+06+vRtJxaFEW+AJ9qFg3EtQCU4EWuzsE1UABa3q5KnIRr5fh5X85N2
 HIJmDbnVsVLDv3gAkQykaHkO9YLjFS8Cq58ILWBEFCMKZUL2JanZAB/s5+3xTf+w
 Y+jQQA8LQ5NgvhcH+iBt+7brkBFcxbWrvgMxnWEsIxR+vFbTF/Dq52foJsjnK7kQ
 xXa/hyE52EsRiUPXLGJ5Gj+Z89VYfkjmqvLCBVIdpkyfhaOvRse82UcoPDnV0+Dt
 RiLZ0CS7z432CMLfJAy+YnbdSK/6/Kxv8BeK5DAeY2CvtXl+SYE=
 =xHta
 -----END PGP SIGNATURE-----

Merge tag 'amlogic-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into fixes

Amlogic fixes for v4.15-rc
- GPIO interrupt fixes
- socinfo fix for GX series
- fix typo

* tag 'amlogic-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM64: dts: meson-gx: fix UART pclk clock name
  meson-gx-socinfo: Fix package id parsing
  ARM: meson: fix spelling mistake: "Couln't" -> "Couldn't"
  ARM: dts: meson: fix the memory region of the GPIO interrupt controller
  ARM: dts: meson: correct the sort order for the the gpio_intc node

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2017-12-09 20:23:29 -08:00
commit ce39882eb1
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/boot/dts/meson.dtsi
View File

@ -85,15 +85,6 @@
reg = <0x7c00 0x200>; reg = <0x7c00 0x200>;
}; };
gpio_intc: interrupt-controller@9880 {
compatible = "amlogic,meson-gpio-intc";
reg = <0xc1109880 0x10>;
interrupt-controller;
#interrupt-cells = <2>;
amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;
status = "disabled";
};
hwrng: rng@8100 { hwrng: rng@8100 {
compatible = "amlogic,meson-rng"; compatible = "amlogic,meson-rng";
reg = <0x8100 0x8>; reg = <0x8100 0x8>;
@ -191,6 +182,15 @@
status = "disabled"; status = "disabled";
}; };
gpio_intc: interrupt-controller@9880 {
compatible = "amlogic,meson-gpio-intc";
reg = <0x9880 0x10>;
interrupt-controller;
#interrupt-cells = <2>;
amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;
status = "disabled";
};
wdt: watchdog@9900 { wdt: watchdog@9900 {
compatible = "amlogic,meson6-wdt"; compatible = "amlogic,meson6-wdt";
reg = <0x9900 0x8>; reg = <0x9900 0x8>;

2
arch/arm/mach-meson/platsmp.c
View File

@ -102,7 +102,7 @@ static void __init meson_smp_prepare_cpus(const char *scu_compatible,
scu_base = of_iomap(node, 0); scu_base = of_iomap(node, 0);
if (!scu_base) { if (!scu_base) {
pr_err("Couln't map SCU registers\n"); pr_err("Couldn't map SCU registers\n");
return; return;
} }

4
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
View File

@ -753,12 +753,12 @@
&uart_B { &uart_B {
clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>; clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>;
clock-names = "xtal", "core", "baud"; clock-names = "xtal", "pclk", "baud";
}; };
&uart_C { &uart_C {
clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>; clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>;
clock-names = "xtal", "core", "baud"; clock-names = "xtal", "pclk", "baud";
}; };
&vpu { &vpu {

6
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
View File

@ -688,7 +688,7 @@
&uart_A { &uart_A {
clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>; clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>;
clock-names = "xtal", "core", "baud"; clock-names = "xtal", "pclk", "baud";
}; };
&uart_AO { &uart_AO {
@ -703,12 +703,12 @@
&uart_B { &uart_B {
clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>; clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>;
clock-names = "xtal", "core", "baud"; clock-names = "xtal", "pclk", "baud";
}; };
&uart_C { &uart_C {
clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>; clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>;
clock-names = "xtal", "core", "baud"; clock-names = "xtal", "pclk", "baud";
}; };
&vpu { &vpu {

4
drivers/soc/amlogic/meson-gx-socinfo.c
View File

@ -20,8 +20,8 @@
#define AO_SEC_SOCINFO_OFFSET AO_SEC_SD_CFG8 #define AO_SEC_SOCINFO_OFFSET AO_SEC_SD_CFG8
#define SOCINFO_MAJOR GENMASK(31, 24) #define SOCINFO_MAJOR GENMASK(31, 24)
#define SOCINFO_MINOR GENMASK(23, 16) #define SOCINFO_PACK GENMASK(23, 16)
#define SOCINFO_PACK GENMASK(15, 8) #define SOCINFO_MINOR GENMASK(15, 8)
#define SOCINFO_MISC GENMASK(7, 0) #define SOCINFO_MISC GENMASK(7, 0)
static const struct meson_gx_soc_id { static const struct meson_gx_soc_id {