mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-17 18:36:00 +00:00
Second Round of Renesas ARM Based SoC DT Updates for v4.11
Enhancements: * Add power-domains to mmcif on r7s72100 SoC * Add OSTM to rskrza1/r7s72100 * Link ARM GIC to clock and clock domain on r8a774[35] SoCs Clean-up: * Correct SATA device status on r8a7779/marzen -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJYicoiAAoJENfPZGlqN0+++P8P/REww60pI3KHlxzdU/WeMfMi VEyQCKXJ4x9HVNubJ1f9w8aJBYqSFLCJulYqk4yu1LZJNmTqqD/Z1xtk382z6vmr uDW3JUj5Vn8kX5FmobN8boU/al4ozildB6Z2r6blnhwC1w3/fZnY88U4PHnKZ9Y2 dJDaYUsjPawf81vJu68MzyEkOXQBfrWrxGr0wdngdOY1BE0ahL7tMvPy3uAtXVC3 YWSJXf25cxiDzDRbmnpMe1dz5nziOq9juaPnDiJCIi8L0Cuf1ZYpvLV2nzrA0MC2 hX+aF94CH8niZW74FMWa8ijjuq7BbgDla9G0R37St29D7/C4c+1mI2cy3qUeJBAn PKNj+Cmjvrdg/4dFU2X5NaufDXE+wbjsZ8I07iftqhkH6c0EZle6adhAVSlLAQHo Kk7PRKvTLQV3YsItlW41w0Q13jfkBhtnW3SQtTYQDY88omHytcrM5/EqLdfQxNzQ 6IEUjPuBLLufHfXL0OADAVFitOB6djT5qZDJcGFOcZ1Bh8Fx4+zY2kCpcIi/tAl1 s66kkG8QUiekl0hYcIfviFhkksYmIGVLIrQ17cSB31FCf9jR6b3zUkpPWZChXHDc jReosGFSfvbxiTdllDyKrDW8CuMaFsc9K/HVMcsRDUwUcCvTdTDF2MruQ5svChyL axMDOW4cOiSqMko0i4lQ =5/D6 -----END PGP SIGNATURE----- Merge tag 'renesas-dt2-for-v4.11' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Second Round of Renesas ARM Based SoC DT Updates for v4.11 Enhancements: - Add power-domains to mmcif on r7s72100 SoC - Add OSTM to rskrza1/r7s72100 - Link ARM GIC to clock and clock domain on r8a774[35] SoCs Clean-up: - Correct SATA device status on r8a7779/marzen * tag 'renesas-dt2-for-v4.11' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: dts: r7s72100: add power-domains to mmcif ARM: dts: rskrza1: add ostm DT support ARM: dts: r7s72100: add ostm to device tree ARM: dts: r7s72100: add ostm clock to device tree ARM: dts: r8a7745: Link ARM GIC to clock and clock domain ARM: dts: r8a7743: Link ARM GIC to clock and clock domain ARM: dts: r8a7779, marzen: Fix sata device status Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
18e738d767
@ -61,6 +61,14 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&ostm0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&ostm1 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&scif2 {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -108,6 +108,15 @@
|
||||
clock-output-names = "scif0", "scif1", "scif2", "scif3", "scif4", "scif5", "scif6", "scif7";
|
||||
};
|
||||
|
||||
mstp5_clks: mstp5_clks@fcfe0428 {
|
||||
#clock-cells = <1>;
|
||||
compatible = "renesas,r7s72100-mstp-clocks", "renesas,cpg-mstp-clocks";
|
||||
reg = <0xfcfe0428 4>;
|
||||
clocks = <&p0_clk>, <&p0_clk>;
|
||||
clock-indices = <R7S72100_CLK_OSTM0 R7S72100_CLK_OSTM1>;
|
||||
clock-output-names = "ostm0", "ostm1";
|
||||
};
|
||||
|
||||
mstp7_clks: mstp7_clks@fcfe0430 {
|
||||
#clock-cells = <1>;
|
||||
compatible = "renesas,r7s72100-mstp-clocks", "renesas,cpg-mstp-clocks";
|
||||
@ -466,6 +475,7 @@
|
||||
GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH
|
||||
GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&mstp8_clks R7S72100_CLK_MMCIF>;
|
||||
power-domains = <&cpg_clocks>;
|
||||
reg-io-width = <4>;
|
||||
bus-width = <8>;
|
||||
status = "disabled";
|
||||
@ -496,4 +506,22 @@
|
||||
cap-sdio-irq;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
ostm0: timer@fcfec000 {
|
||||
compatible = "renesas,r7s72100-ostm", "renesas,ostm";
|
||||
reg = <0xfcfec000 0x30>;
|
||||
interrupts = <GIC_SPI 102 IRQ_TYPE_EDGE_RISING>;
|
||||
clocks = <&mstp5_clks R7S72100_CLK_OSTM0>;
|
||||
power-domains = <&cpg_clocks>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
ostm1: timer@fcfec400 {
|
||||
compatible = "renesas,r7s72100-ostm", "renesas,ostm";
|
||||
reg = <0xfcfec400 0x30>;
|
||||
interrupts = <GIC_SPI 103 IRQ_TYPE_EDGE_RISING>;
|
||||
clocks = <&mstp5_clks R7S72100_CLK_OSTM1>;
|
||||
power-domains = <&cpg_clocks>;
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
|
@ -60,6 +60,9 @@
|
||||
<0 0xf1006000 0 0x2000>;
|
||||
interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) |
|
||||
IRQ_TYPE_LEVEL_HIGH)>;
|
||||
clocks = <&cpg CPG_MOD 408>;
|
||||
clock-names = "clk";
|
||||
power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
|
||||
};
|
||||
|
||||
irqc: interrupt-controller@e61c0000 {
|
||||
|
@ -60,6 +60,9 @@
|
||||
<0 0xf1006000 0 0x2000>;
|
||||
interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) |
|
||||
IRQ_TYPE_LEVEL_HIGH)>;
|
||||
clocks = <&cpg CPG_MOD 408>;
|
||||
clock-names = "clk";
|
||||
power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
|
||||
};
|
||||
|
||||
irqc: interrupt-controller@e61c0000 {
|
||||
|
@ -216,6 +216,10 @@
|
||||
};
|
||||
};
|
||||
|
||||
&sata {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&scif2 {
|
||||
pinctrl-0 = <&scif2_pins>;
|
||||
pinctrl-names = "default";
|
||||
|
@ -347,6 +347,7 @@
|
||||
interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&mstp1_clks R8A7779_CLK_SATA>;
|
||||
power-domains = <&sysc R8A7779_PD_ALWAYS_ON>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
sdhi0: sd@ffe4c000 {
|
||||
|
@ -25,6 +25,10 @@
|
||||
#define R7S72100_CLK_SCIF6 1
|
||||
#define R7S72100_CLK_SCIF7 0
|
||||
|
||||
/* MSTP5 */
|
||||
#define R7S72100_CLK_OSTM0 1
|
||||
#define R7S72100_CLK_OSTM1 0
|
||||
|
||||
/* MSTP7 */
|
||||
#define R7S72100_CLK_ETHER 4
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user