openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Actions ARM64 DT changes for v5.1: 

- Add interrupt properties to S900 pinctrl node
 - Add Reset controller support for S700
 - Add Reset controller support for S900
 - Add pinctrl support for S700
 - Add I2C support for S700
 - Enable I2C0 and I2C1 for s700-cubieboard7
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEZ6VDKoFIy9ikWCeXVZ8R5v6RzvUFAlxnwSoACgkQVZ8R5v6R
 zvXpeAf+NwhGUPtKeKeXOct24HqHVwvdbyBajcqcsUYsGXTxaIH7uGEupITAkxAj
 6kLOpmW3WDpMr2yBHSS5oEnityD2VKCL1BLP9TE7Plj56QsWucWlWsY2xhG1828+
 eT1pbSPECg7lRZnAOMj+B6EqtEcZzaoxlRdRLw6rJmb4+H5aJ80VT3pIpYI+sjR9
 5wnuaWSE2nxJoICm1dL1CeVPfT9iNluYSxerO13tkF9/lj7bQpeRI85OMvpUVo5Z
 iQ6OGJ6sc4Ynn0Z9F7hdBOb6tB8Z3ampXu8IMiXir1d+RG/uGNlhsQyGsgXGZ++Y
 uQQR4as0k+vYYscRR2J0sLhhBT4h2w==
 =EHRP
 -----END PGP SIGNATURE-----

Merge tag 'actions-arm64-dt-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions into arm/dt

Actions ARM64 DT changes for v5.1:

- Add interrupt properties to S900 pinctrl node
- Add Reset controller support for S700
- Add Reset controller support for S900
- Add pinctrl support for S700
- Add I2C support for S700
- Enable I2C0 and I2C1 for s700-cubieboard7

* tag 'actions-arm64-dt-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions:
  arm64: dts: actions: s700-cubieboard7: Enable I2C0 and I2C1
  arm64: dts: actions: s700: Add I2C controller nodes
  arm64: dts: actions: Add pinctrl node for Actions Semi S700
  arm64: dts: actions: Add Reset Controller support for S900 SoC
  arm64: dts: actions: Add Reset Controller support for S700 SoC
  arm64: dts: actions: Add interrupt properties to pinctrl node for S900

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2019-02-20 16:35:06 +01:00
parent 0d6367ca90 9175a8116f
commit 94224c2517
3 changed files with 121 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
arch/arm64/boot/dts/actions/s700-cubieboard7.dts
View File

@ -30,6 +30,59 @@ memory@1,e0000000 {
};
};
&i2c0 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&i2c0_default>;
};
&i2c1 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&i2c1_default>;
};
&i2c2 {
status = "disabled";
pinctrl-names = "default";
pinctrl-0 = <&i2c2_default>;
};
&pinctrl {
i2c0_default: i2c0_default {
pinmux {
groups = "i2c0_mfp";
function = "i2c0";
};
pinconf {
pins = "i2c0_sclk", "i2c0_sdata";
bias-pull-up;
};
};
i2c1_default: i2c1_default {
pinmux {
groups = "i2c1_dummy";
function = "i2c1";
};
pinconf {
pins = "i2c1_sclk", "i2c1_sdata";
bias-pull-up;
};
};
i2c2_default: i2c2_default {
pinmux {
groups = "i2c2_dummy";
function = "i2c2";
};
pinconf {
pins = "i2c2_sclk", "i2c2_sdata";
bias-pull-up;
};
};
};
&timer {
clocks = <&hosc>;
};

58
arch/arm64/boot/dts/actions/s700.dtsi
View File

@ -5,6 +5,7 @@
#include <dt-bindings/clock/actions,s700-cmu.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/reset/actions,s700-reset.h>
/ {
compatible = "actions,s700";
@ -172,6 +173,47 @@ cmu: clock-controller@e0168000 {
reg = <0x0 0xe0168000 0x0 0x1000>;
clocks = <&hosc>, <&losc>;
#clock-cells = <1>;
#reset-cells = <1>;
};
i2c0: i2c@e0170000 {
compatible = "actions,s700-i2c";
reg = <0 0xe0170000 0 0x1000>;
clocks = <&cmu CLK_I2C0>;
interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
i2c1: i2c@e0174000 {
compatible = "actions,s700-i2c";
reg = <0 0xe0174000 0 0x1000>;
clocks = <&cmu CLK_I2C1>;
interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
i2c2: i2c@e0178000 {
compatible = "actions,s700-i2c";
reg = <0 0xe0178000 0 0x1000>;
clocks = <&cmu CLK_I2C2>;
interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
i2c3: i2c@e017c000 {
compatible = "actions,s700-i2c";
reg = <0 0xe017c000 0 0x1000>;
clocks = <&cmu CLK_I2C3>;
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
sps: power-controller@e01b0100 {
@ -186,5 +228,21 @@ timer: timer@e024c000 {
interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "timer1";
};
pinctrl: pinctrl@e01b0000 {
compatible = "actions,s700-pinctrl";
reg = <0x0 0xe01b0000 0x0 0x1000>;
clocks = <&cmu CLK_GPIO>;
gpio-controller;
gpio-ranges = <&pinctrl 0 0 136>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
};
};
};

10
arch/arm64/boot/dts/actions/s900.dtsi
View File

@ -5,6 +5,7 @@
#include <dt-bindings/clock/actions,s900-cmu.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/reset/actions,s900-reset.h>
/ {
compatible = "actions,s900";
@ -184,6 +185,7 @@ cmu: clock-controller@e0160000 {
reg = <0x0 0xe0160000 0x0 0x1000>;
clocks = <&hosc>, <&losc>;
#clock-cells = <1>;
#reset-cells = <1>;
};
i2c0: i2c@e0170000 {
@ -253,6 +255,14 @@ pinctrl: pinctrl@e01b0000 {
gpio-controller;
gpio-ranges = <&pinctrl 0 0 146>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
};
timer: timer@e0228000 {