p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Amlogic 32-bit DT changes for v4.16 

- meson8: GPIO IRQ support
 - switch to stable UART bindings w/correct clock
 - add more L2 cache settings
 - drop unused ADC clock
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAlovIOwACgkQWTcYmtP7
 xmUVHQ//Q0bGpcgN9XB/2nlpFpPHuaFYphMzwDezLLHuQgbKvf7a8OoiJVYducaE
 P5MLVKNj6iu1xOlrbOy7BbRZ5oq4ZpLv3hmeycWt2e49L07SrSzTfMXNET1c2Pul
 qMeYvDfpcvO8zx7fpJOPLYypdv/d17NIleGPACNYv4y1k4ZIxaCfGES5HijIrgPA
 gobtl74g62CARk8QYwdlfhLpRp0ZGBOL0OaluZxJsRqwTxDR7rG9VXO6EJX2w93y
 zJlDbArKZ3ez2ddZq0l7CFBcngiXL/zxsLuTnJLtYBLdsfkb7pAEjYcqDpB6KObF
 Bfsv4BplBoY92OFDxNtzeeU323zW2AHWUZVLtzpmGL71LH9POAN5dJQ8Q6SqsWcA
 V5mGK/RYQzxPd2XSZGUEIvzIe0vmqg2nWdx/GkbjAaL01UI0SJUPFm0GfCL18ZCp
 0nZRIMpKrpfYIg1xTcW2XAoXtNEIgE37BpN06zxAoMgy15h1Z45pZmEK5Le+oOh2
 2KbHAoEbPswnWnSW4TQdSjvXSQf96+j+mKL6cP+QzzkvYfzBf/D5TKuxBZAzzcQV
 CFOiPfyrBw2HMwc48+FMLsvmSgotKSfilG2pAUnglpcfBglzbSpnAwfIQys6528b
 J/gZUWPBXqOIyxb0sGQKRHAuD2L5TqiS5OFt2eWsQ9VB+JSlAsw=
 =c9G5
 -----END PGP SIGNATURE-----

Merge tag 'amlogic-dt' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt

Pull "Amlogic 32-bit DT changes for v4.16" from Kevin Hilman:
- meson8: GPIO IRQ support
- switch to stable UART bindings w/correct clock
- add more L2 cache settings
- drop unused ADC clock

* tag 'amlogic-dt' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM: meson: enable MESON_IRQ_GPIO also for MACH_MESON8
  ARM: dts: meson8: enable the GPIO interrupt controller
  ARM: dts: meson8b: use stable UART bindings with correct gate clock
  ARM: dts: meson8: use stable UART bindings with correct gate clock
  ARM: dts: meson: drop "sana" clock from SAR ADC
  ARM: dts: meson8: add more L2 cache settings
  ARM: dts: meson8b: add more L2 cache settings
This commit is contained in:
Arnd Bergmann 2017-12-21 16:37:34 +01:00
parent 7d44cc2082 71a3dfd07c
commit c4e8db5f05
3 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
arch/arm/boot/dts/meson8.dtsi
View File

@ -286,6 +286,11 @@ &ethmac {
clock-names = "stmmaceth";
};
&gpio_intc {
compatible = "amlogic,meson8-gpio-intc", "amlogic,meson-gpio-intc";
status = "okay";
};
&hwrng {
compatible = "amlogic,meson8-rng", "amlogic,meson-rng";
clocks = <&clkc CLKID_RNG0>;
@ -308,6 +313,9 @@ &L2 {
arm,data-latency = <3 3 3>;
arm,tag-latency = <2 2 2>;
arm,filter-ranges = <0x100000 0xc0000000>;
prefetch-data = <1>;
prefetch-instr = <1>;
arm,shared-override;
};
&pwm_ab {
@ -321,9 +329,8 @@ &pwm_cd {
&saradc {
compatible = "amlogic,meson8-saradc", "amlogic,meson-saradc";
clocks = <&clkc CLKID_XTAL>,
<&clkc CLKID_SAR_ADC>,
<&clkc CLKID_SANA>;
clock-names = "clkin", "core", "sana";
<&clkc CLKID_SAR_ADC>;
clock-names = "clkin", "core";
};
&sdio {
@ -337,19 +344,27 @@ &spifc {
};
&uart_AO {
clocks = <&clkc CLKID_CLK81>;
compatible = "amlogic,meson8-uart", "amlogic,meson-uart";
clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_XTAL>, <&clkc CLKID_CLK81>;
clock-names = "baud", "xtal", "pclk";
};
&uart_A {
clocks = <&clkc CLKID_CLK81>;
compatible = "amlogic,meson8-uart", "amlogic,meson-uart";
clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_XTAL>, <&clkc CLKID_UART0>;
clock-names = "baud", "xtal", "pclk";
};
&uart_B {
clocks = <&clkc CLKID_CLK81>;
compatible = "amlogic,meson8-uart", "amlogic,meson-uart";
clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_XTAL>, <&clkc CLKID_UART1>;
clock-names = "baud", "xtal", "pclk";
};
&uart_C {
clocks = <&clkc CLKID_CLK81>;
compatible = "amlogic,meson8-uart", "amlogic,meson-uart";
clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_XTAL>, <&clkc CLKID_UART2>;
clock-names = "baud", "xtal", "pclk";
};
&usb0 {

24
arch/arm/boot/dts/meson8b.dtsi
View File

@ -223,6 +223,9 @@ &L2 {
arm,data-latency = <3 3 3>;
arm,tag-latency = <2 2 2>;
arm,filter-ranges = <0x100000 0xc0000000>;
prefetch-data = <1>;
prefetch-instr = <1>;
arm,shared-override;
};
&pwm_ab {
@ -236,9 +239,8 @@ &pwm_cd {
&saradc {
compatible = "amlogic,meson8b-saradc", "amlogic,meson-saradc";
clocks = <&clkc CLKID_XTAL>,
<&clkc CLKID_SAR_ADC>,
<&clkc CLKID_SANA>;
clock-names = "clkin", "core", "sana";
<&clkc CLKID_SAR_ADC>;
clock-names = "clkin", "core";
};
&sdio {
@ -248,19 +250,27 @@ &sdio {
};
&uart_AO {
clocks = <&clkc CLKID_CLK81>;
compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";
clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_XTAL>, <&clkc CLKID_CLK81>;
clock-names = "baud", "xtal", "pclk";
};
&uart_A {
clocks = <&clkc CLKID_CLK81>;
compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";
clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_XTAL>, <&clkc CLKID_UART0>;
clock-names = "baud", "xtal", "pclk";
};
&uart_B {
clocks = <&clkc CLKID_CLK81>;
compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";
clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_XTAL>, <&clkc CLKID_UART1>;
clock-names = "baud", "xtal", "pclk";
};
&uart_C {
clocks = <&clkc CLKID_CLK81>;
compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";
clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_XTAL>, <&clkc CLKID_UART2>;
clock-names = "baud", "xtal", "pclk";
};
&usb0 {

1
arch/arm/mach-meson/Kconfig
View File

@ -23,6 +23,7 @@ config MACH_MESON8
default ARCH_MESON
select MESON6_TIMER
select COMMON_CLK_MESON8B
select MESON_IRQ_GPIO
config MACH_MESON8B
bool "Amlogic Meson8b SoCs support"