| Message ID | 1429780875-29096-1-git-send-email-s.hauer@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
2015-04-23 11:21 GMT+02:00 Sascha Hauer <s.hauer@pengutronix.de>: > We used to provide dummy clocks for the UART. Now that we have > common clock support we can provide the real clocks to the UART. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > --- > arch/arm/boot/dts/mt8135.dtsi | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/boot/dts/mt8135.dtsi b/arch/arm/boot/dts/mt8135.dtsi > index b0f20fc..4d1ddd9 100644 > --- a/arch/arm/boot/dts/mt8135.dtsi > +++ b/arch/arm/boot/dts/mt8135.dtsi > @@ -180,7 +180,8 @@ > compatible = "mediatek,mt8135-uart","mediatek,mt6577-uart"; > reg = <0 0x11006000 0 0x400>; > interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_LOW>; > - clocks = <&uart_clk>; > + clocks = <&pericfg CLK_PERI_UART0_SEL>, <&pericfg CLK_PERI_UART0>; > + clock-names = "baud", "bus"; > status = "disabled"; > }; We can delete the dummy uart_clk, as it is not needed any more.
On Thu, 2015-04-23 at 11:21 +0200, Sascha Hauer wrote: > This adds the pmic wrapper node to the MediaTek MT8135 dtsi file. > > This unit is used to access the PMIC on MediaTek boards. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > --- > arch/arm/boot/dts/mt8135.dtsi | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/arch/arm/boot/dts/mt8135.dtsi b/arch/arm/boot/dts/mt8135.dtsi > index b4017e2..b0f20fc 100644 > --- a/arch/arm/boot/dts/mt8135.dtsi > +++ b/arch/arm/boot/dts/mt8135.dtsi > @@ -15,6 +15,7 @@ > #include <dt-bindings/clock/mt8135-clk.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/interrupt-controller/arm-gic.h> > +#include <dt-bindings/reset-controller/mt8135-resets.h> > #include "skeleton64.dtsi" > > / { > @@ -127,6 +128,19 @@ > reg = <0 0x10003000 0 0x1000>; > }; > > + pwrap: pwrap@1000f000 { > + compatible = "mediatek,mt8135-pwrap"; > + reg = <0 0x1000f000 0 0x1000>, > + <0 0x11017000 0 0x1000>; > + reg-names = "pwrap", "pwrap-bridge"; > + interrupts = <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>; > + resets = <&infracfg MT8135_INFRA_PMIC_WRAP_RST>, > + <&pericfg MT8135_PERI_PWRAP_BRIDGE_SW_RST>; > + reset-names = "pwrap", "pwrap-bridge"; > + clocks = <&clk26m>, <&clk26m>; > + clock-names = "spi", "wrap"; > + }; > + > timer: timer@10008000 { Hi Sascha, It seems we have many 8135 dtsi updates recently. Please sort according to node instance address so it will be easier to merge or resolve conflict. Joe.C
This series contains the Mediatek MT8135 dts updates for the clock support and UART support. This needs these two series: [PATCH v12] clk: Add common clock support for Mediatek MT8135 and MT8173 tty: serial: 8250_mtk: Add support for second clock Also this adds the PMIC wrapper nodes to the dtsi file and PMIC node to the mt8135-evbp1 board. Support for the PMIC wrapper was merged during the v4.1 merge window. This series is meant for testing the new features, not (yet) for inclusion. ---------------------------------------------------------------- The following changes since commit 39a8804455fb23f09157341d3ba7db6d7ae6ee76: Linux 4.0 (2015-04-12 15:12:50 -0700) are available in the git repository at: git://git.pengutronix.de/git/sha/linux-2.6.git tags/v4.0-mtk-arm-dts for you to fetch changes up to 5fcd75a6aeded756c24d9581f49e0859b85fb3a0: ARM: dts: mediatek mt8135: Use real UART clocks (2015-04-23 11:02:27 +0200) ---------------------------------------------------------------- James Liao (1): ARM: dts: mediatek: Enable clock support for Mediatek MT8135. Sascha Hauer (3): ARM: dts: mt8135: Add pmic wrapper nodes ARM: dts: mt8135-evbp1: Add PMIC support ARM: dts: mediatek mt8135: Use real UART clocks arch/arm/boot/dts/mt8135-evbp1.dts | 193 +++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/mt8135.dtsi | 58 ++++++++++- 2 files changed, 247 insertions(+), 4 deletions(-)