mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-24 09:50:04 +00:00
Code Issues Releases Wiki Activity

Update psci support to the arm,psci-1.0 to mt8173

Browse source 
Add display PWM driver to mt8173
 
 Add mediatek general porpose timer to mt8173
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJWdximAAoJELQ5Ylss8dNDsZ4QAIDi9HPJpKzHCs+W/7+F3e+P
 LZ+fIEYzRhhKgBWCGOWmbrOAVweOhi5ja5tk2IlOcLvZceY7X03EZLsPV0WCofKW
 F7Hcp/Qs+VhAVinUlz5Zgx8nuS3BAd+U9iOi/2CcGczj8zYB9Un2cfV4ZqTImgol
 5zgt3kXpqX3RiZ/ubkUODMsH9RLcW1yRuIyzDUlNO18GjV0+luat9Ws+fU+dMOyM
 RnfjLALnga3QwIol0tMFktLJpfbwCkKKtLY3kRKEjS1FFg+4ucSwnBfRetxtdEcQ
 ebBwF2Vh/tvx/13ewer5Xjmz/J2qRriK8WWqK88CPbSguvRjSpnwJpurGtirfT4B
 AbrlIRZyhjwyhw4Us2KCTnOvjmsuHUKsvGTJPyLBpBCsQ1s9cL/DDhbd+z3j5hdM
 qekKvGP5yygYcqyc1t5tOs5POO1Ey2/vZ4cJdfWql/0AXhwDSgjr//rUYuAAsMrJ
 g/ySJPN4erb3hR3CbfLwbYMW9wErTbUGGRbe3Buzx7nTd/zhax1psbakS2SyI2q9
 410Plhm1iHhildOyJjAINMMqXqE4uyo1eCXxr2/Ul93Xf1epcvaerBFVE/Fk2DHc
 ecIN8ufWaKfkBbBCeAs1XYVeO5zbv4YyvTTw07B2A9bKs44Skk8zOhsKJIw6ydjT
 lU2HvzhLowA8fExy1Viy
 =xWtj
 -----END PGP SIGNATURE-----

Merge tag 'v4.4-next-arm64' of https://github.com/mbgg/linux-mediatek into next/dt64

Update psci support to the arm,psci-1.0 to mt8173

Add display PWM driver to mt8173

Add mediatek general porpose timer to mt8173

* tag 'v4.4-next-arm64' of https://github.com/mbgg/linux-mediatek:
  arm64: dts: mediatek: mt8173 PSCI-1.0 support
  arm64: dts: mt8173: add MT8173 display PWM driver support node
  arm64: dts: mt8173: add timer node

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2015-12-22 13:00:10 -08:00
commit 9205a7ade8
2 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
arch/arm64/boot/dts/mediatek/mt8173-evb.dts
View file

@ -92,6 +92,13 @@ &mmc1 {
};
&pio {
disp_pwm0_pins: disp_pwm0_pins {
pins1 {
pinmux = <MT8173_PIN_87_DISP_PWM0__FUNC_DISP_PWM0>;
output-low;
};
};
mmc0_pins_default: mmc0default {
pins_cmd_dat {
pinmux = <MT8173_PIN_57_MSDC0_DAT0__FUNC_MSDC0_DAT0>,
@ -190,6 +197,12 @@ pins_clk {
};
};
&pwm0 {
pinctrl-names = "default";
pinctrl-0 = <&disp_pwm0_pins>;
status = "okay";
};
&pwrap {
pmic: mt6397 {
compatible = "mediatek,mt6397";

33
arch/arm64/boot/dts/mediatek/mt8173.dtsi
View file

@ -95,7 +95,7 @@ CPU_SLEEP_0: cpu-sleep-0 {
};
psci {
compatible = "arm,psci";
compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci";
method = "smc";
cpu_suspend = <0x84000001>;
cpu_off = <0x84000002>;
@ -247,6 +247,15 @@ watchdog: watchdog@10007000 {
reg = <0 0x10007000 0 0x100>;
};
timer: timer@10008000 {
compatible = "mediatek,mt8173-timer",
"mediatek,mt6577-timer";
reg = <0 0x10008000 0 0x1000>;
interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_LOW>;
clocks = <&infracfg CLK_INFRA_CLK_13M>,
<&topckgen CLK_TOP_RTC_SEL>;
};
pwrap: pwrap@1000d000 {
compatible = "mediatek,mt8173-pwrap";
reg = <0 0x1000d000 0 0x1000>;
@ -516,6 +525,28 @@ mmsys: clock-controller@14000000 {
#clock-cells = <1>;
};
pwm0: pwm@1401e000 {
compatible = "mediatek,mt8173-disp-pwm",
"mediatek,mt6595-disp-pwm";
reg = <0 0x1401e000 0 0x1000>;
#pwm-cells = <2>;
clocks = <&mmsys CLK_MM_DISP_PWM026M>,
<&mmsys CLK_MM_DISP_PWM0MM>;
clock-names = "main", "mm";
status = "disabled";
};
pwm1: pwm@1401f000 {
compatible = "mediatek,mt8173-disp-pwm",
"mediatek,mt6595-disp-pwm";
reg = <0 0x1401f000 0 0x1000>;
#pwm-cells = <2>;
clocks = <&mmsys CLK_MM_DISP_PWM126M>,
<&mmsys CLK_MM_DISP_PWM1MM>;
clock-names = "main", "mm";
status = "disabled";
};
imgsys: clock-controller@15000000 {
compatible = "mediatek,mt8173-imgsys", "syscon";
reg = <0 0x15000000 0 0x1000>;