From: Eric Anholt <eric@anholt.net> To: Florian Fainelli <f.fainelli@gmail.com>, Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@codeaurora.org>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, dri-devel@lists.freedesktop.org, Thierry Reding <thierry.reding@gmail.com> Cc: linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Stephen Warren <swarren@wwwdotorg.org>, Lee Jones <lee@kernel.org>, bcm-kernel-feedback-list@broadcom.com, linux-clk@vger.kernel.org, Eric Anholt <eric@anholt.net> Subject: [PATCH 10/11] ARM: bcm2835: dt: Add the DSI module nodes and clocks. Date: Wed, 14 Dec 2016 11:46:20 -0800 [thread overview] Message-ID: <20161214194621.16499-11-eric@anholt.net> (raw) In-Reply-To: <20161214194621.16499-1-eric@anholt.net> The modules stay disabled by default, and if you want to enable DSI you'll need an overlay that connects a panel to it. Signed-off-by: Eric Anholt <eric@anholt.net> --- arch/arm/boot/dts/bcm2835-rpi.dtsi | 8 +++++++ arch/arm/boot/dts/bcm283x.dtsi | 49 +++++++++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi index e9b47b2bbc33..365648898f3a 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -84,3 +84,11 @@ power-domains = <&power RPI_POWER_DOMAIN_HDMI>; status = "okay"; }; + +&dsi0 { + power-domains = <&power RPI_POWER_DOMAIN_DSI0>; +}; + +&dsi1 { + power-domains = <&power RPI_POWER_DOMAIN_DSI1>; +}; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index 46d46d894a44..82a4eccfb3d8 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -93,10 +93,13 @@ #clock-cells = <1>; reg = <0x7e101000 0x2000>; - /* CPRMAN derives everything from the platform's - * oscillator. + /* CPRMAN derives almost everything from the + * platform's oscillator. However, the DSI + * pixel clocks come from the DSI analog PHY. */ - clocks = <&clk_osc>; + clocks = <&clk_osc>, + <&dsi0 0>, <&dsi0 1>, <&dsi0 2>, + <&dsi1 0>, <&dsi1 1>, <&dsi1 2>; }; rng@7e104000 { @@ -187,6 +190,26 @@ interrupts = <2 14>; /* pwa1 */ }; + dsi0: dsi@7e209000 { + compatible = "brcm,bcm2835-dsi0"; + reg = <0x7e209000 0x78>; + interrupts = <2 4>; + #address-cells = <1>; + #size-cells = <0>; + #clock-cells = <1>; + + clocks = <&clocks BCM2835_PLLA_DSI0>, + <&clocks BCM2835_CLOCK_DSI0E>, + <&clocks BCM2835_CLOCK_DSI0P>; + clock-names = "phy", "escape", "pixel"; + + clock-output-names = "dsi0_byte", + "dsi0_ddr2", + "dsi0_ddr"; + + status = "disabled"; + }; + aux: aux@0x7e215000 { compatible = "brcm,bcm2835-aux"; #clock-cells = <1>; @@ -246,6 +269,26 @@ interrupts = <2 1>; }; + dsi1: dsi@7e700000 { + compatible = "brcm,bcm2835-dsi1"; + reg = <0x7e700000 0x8c>; + interrupts = <2 12>; + #address-cells = <1>; + #size-cells = <0>; + #clock-cells = <1>; + + clocks = <&clocks BCM2835_PLLD_DSI1>, + <&clocks BCM2835_CLOCK_DSI1E>, + <&clocks BCM2835_CLOCK_DSI1P>; + clock-names = "phy", "escape", "pixel"; + + clock-output-names = "dsi1_byte", + "dsi1_ddr2", + "dsi1_ddr"; + + status = "disabled"; + }; + i2c1: i2c@7e804000 { compatible = "brcm,bcm2835-i2c"; reg = <0x7e804000 0x1000>; -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: eric@anholt.net (Eric Anholt) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 10/11] ARM: bcm2835: dt: Add the DSI module nodes and clocks. Date: Wed, 14 Dec 2016 11:46:20 -0800 [thread overview] Message-ID: <20161214194621.16499-11-eric@anholt.net> (raw) In-Reply-To: <20161214194621.16499-1-eric@anholt.net> The modules stay disabled by default, and if you want to enable DSI you'll need an overlay that connects a panel to it. Signed-off-by: Eric Anholt <eric@anholt.net> --- arch/arm/boot/dts/bcm2835-rpi.dtsi | 8 +++++++ arch/arm/boot/dts/bcm283x.dtsi | 49 +++++++++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi index e9b47b2bbc33..365648898f3a 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -84,3 +84,11 @@ power-domains = <&power RPI_POWER_DOMAIN_HDMI>; status = "okay"; }; + +&dsi0 { + power-domains = <&power RPI_POWER_DOMAIN_DSI0>; +}; + +&dsi1 { + power-domains = <&power RPI_POWER_DOMAIN_DSI1>; +}; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index 46d46d894a44..82a4eccfb3d8 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -93,10 +93,13 @@ #clock-cells = <1>; reg = <0x7e101000 0x2000>; - /* CPRMAN derives everything from the platform's - * oscillator. + /* CPRMAN derives almost everything from the + * platform's oscillator. However, the DSI + * pixel clocks come from the DSI analog PHY. */ - clocks = <&clk_osc>; + clocks = <&clk_osc>, + <&dsi0 0>, <&dsi0 1>, <&dsi0 2>, + <&dsi1 0>, <&dsi1 1>, <&dsi1 2>; }; rng at 7e104000 { @@ -187,6 +190,26 @@ interrupts = <2 14>; /* pwa1 */ }; + dsi0: dsi at 7e209000 { + compatible = "brcm,bcm2835-dsi0"; + reg = <0x7e209000 0x78>; + interrupts = <2 4>; + #address-cells = <1>; + #size-cells = <0>; + #clock-cells = <1>; + + clocks = <&clocks BCM2835_PLLA_DSI0>, + <&clocks BCM2835_CLOCK_DSI0E>, + <&clocks BCM2835_CLOCK_DSI0P>; + clock-names = "phy", "escape", "pixel"; + + clock-output-names = "dsi0_byte", + "dsi0_ddr2", + "dsi0_ddr"; + + status = "disabled"; + }; + aux: aux at 0x7e215000 { compatible = "brcm,bcm2835-aux"; #clock-cells = <1>; @@ -246,6 +269,26 @@ interrupts = <2 1>; }; + dsi1: dsi at 7e700000 { + compatible = "brcm,bcm2835-dsi1"; + reg = <0x7e700000 0x8c>; + interrupts = <2 12>; + #address-cells = <1>; + #size-cells = <0>; + #clock-cells = <1>; + + clocks = <&clocks BCM2835_PLLD_DSI1>, + <&clocks BCM2835_CLOCK_DSI1E>, + <&clocks BCM2835_CLOCK_DSI1P>; + clock-names = "phy", "escape", "pixel"; + + clock-output-names = "dsi1_byte", + "dsi1_ddr2", + "dsi1_ddr"; + + status = "disabled"; + }; + i2c1: i2c at 7e804000 { compatible = "brcm,bcm2835-i2c"; reg = <0x7e804000 0x1000>; -- 2.11.0
next prev parent reply other threads:[~2016-12-14 19:47 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-12-14 19:46 [PATCH 00/11] drm/vc4: DSI panel support + Raspberry Pi touchscreen Eric Anholt 2016-12-14 19:46 ` Eric Anholt 2016-12-14 19:46 ` [PATCH 01/11] clk: bcm2835: Don't rate change PLLs on behalf of DSI PLL dividers Eric Anholt 2016-12-14 19:46 ` Eric Anholt 2016-12-14 19:46 ` Eric Anholt 2016-12-14 19:46 ` [PATCH 02/11] clk: bcm2835: Register the DSI0/DSI1 pixel clocks Eric Anholt 2016-12-14 19:46 ` Eric Anholt 2016-12-14 19:46 ` Eric Anholt 2016-12-21 23:14 ` Stephen Boyd 2016-12-21 23:14 ` Stephen Boyd 2016-12-21 23:14 ` Stephen Boyd 2016-12-22 1:23 ` Eric Anholt 2016-12-22 1:23 ` Eric Anholt 2016-12-22 1:23 ` Eric Anholt 2016-12-14 19:46 ` [PATCH 03/11] clk: bcm2835: Add leaf clock measurement support, disabled by default Eric Anholt 2016-12-14 19:46 ` Eric Anholt 2016-12-14 19:46 ` Eric Anholt 2016-12-14 19:46 ` [PATCH 04/11] drm/vc4: Set up SCALER_DISPCTRL at boot Eric Anholt 2016-12-14 19:46 ` Eric Anholt 2017-01-31 19:35 ` Daniel Vetter 2017-01-31 19:35 ` Daniel Vetter 2017-01-31 19:35 ` Daniel Vetter 2016-12-14 19:46 ` [PATCH 05/11] drm/vc4: Add support for feeding DSI encoders from the pixel valve Eric Anholt 2016-12-14 19:46 ` Eric Anholt 2017-01-31 19:39 ` Daniel Vetter 2017-01-31 19:39 ` Daniel Vetter 2017-01-31 19:39 ` Daniel Vetter 2017-01-31 19:54 ` Eric Anholt 2017-01-31 19:54 ` Eric Anholt 2017-01-31 19:54 ` Eric Anholt 2016-12-14 19:46 ` [PATCH 06/11] dt-bindings: Document the VC4 DSI module nodes Eric Anholt 2016-12-14 19:46 ` Eric Anholt 2016-12-14 19:46 ` Eric Anholt 2016-12-14 19:46 ` [PATCH 07/11] drm/vc4: Add DSI driver Eric Anholt 2016-12-14 19:46 ` Eric Anholt 2016-12-14 19:46 ` Eric Anholt 2017-01-31 19:51 ` Daniel Vetter 2017-01-31 19:51 ` Daniel Vetter 2017-01-31 19:51 ` Daniel Vetter 2016-12-14 19:46 ` [PATCH 08/11] dt-bindings: Document the Raspberry Pi Touchscreen nodes Eric Anholt 2016-12-14 19:46 ` Eric Anholt 2016-12-14 19:46 ` Eric Anholt 2016-12-14 19:46 ` [PATCH 09/11] drm/panel: Add support for the Raspberry Pi 7" Touchscreen Eric Anholt 2016-12-14 19:46 ` Eric Anholt 2016-12-14 19:46 ` Eric Anholt 2017-01-31 21:07 ` Thierry Reding 2017-01-31 21:07 ` Thierry Reding 2017-01-31 21:07 ` Thierry Reding 2017-01-31 21:17 ` Daniel Vetter 2017-01-31 21:17 ` Daniel Vetter 2017-01-31 21:17 ` Daniel Vetter 2017-01-31 21:42 ` Thierry Reding 2017-01-31 21:42 ` Thierry Reding 2017-01-31 21:42 ` Thierry Reding 2017-01-31 21:19 ` Daniel Vetter 2017-01-31 21:19 ` Daniel Vetter 2017-01-31 21:19 ` Daniel Vetter 2017-01-31 21:38 ` Thierry Reding 2017-01-31 21:38 ` Thierry Reding 2016-12-14 19:46 ` Eric Anholt [this message] 2016-12-14 19:46 ` [PATCH 10/11] ARM: bcm2835: dt: Add the DSI module nodes and clocks Eric Anholt 2016-12-14 19:46 ` [PATCH 11/11] ARM: bcm2835: Enable the Raspberry Pi touchscreen panel Eric Anholt 2016-12-14 19:46 ` Eric Anholt 2016-12-14 19:46 ` Eric Anholt
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20161214194621.16499-11-eric@anholt.net \ --to=eric@anholt.net \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=f.fainelli@gmail.com \ --cc=lee@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-clk@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-rpi-kernel@lists.infradead.org \ --cc=mark.rutland@arm.com \ --cc=mturquette@baylibre.com \ --cc=robh+dt@kernel.org \ --cc=sboyd@codeaurora.org \ --cc=swarren@wwwdotorg.org \ --cc=thierry.reding@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.