leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This pull request brings in the DT nodes for enabling HDMI audio on

Browse Source 
Raspberry Pi, and nodes to describe the DSI and SDHOST hardware
 modules (which are still disabled by default).
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE/JuuFDWp9/ZkuCBXtdYpNtH8nugFAljRfb8ACgkQtdYpNtH8
 nugDzhAApB5GSQOTsWUWijmrHVHjEjHxWKRCitLIipN18EPRRJCGzulH/ZSs0DQN
 jOxJadeuZPU7/My26gk40BVmMgE0v/9i+jKUQx6nMgpLzWPy/9XNAscH/vmqblNe
 4GBmFCUbhOB++GWOxqnNw8AzvKXKSMKrAzS0Io/NxgeKkGWJHOk+vnx8p6QDXpI9
 B8AoSUVfSRmQV/gwMMP44FPV3FrTmj9D+IY2zR62XMzaDkn3krdMqhZVn+LetiUx
 A5MiRUIqiU1lKeydTe1GdtXtKyHhhknUSUe/poICRaumr0BLCYlPA54gWzwrEMd9
 Cp3QCCaQ+dYQXtxVWgwtXQim8nRT6iVY4NjbXM3f9KoiVXQ6v9HgIcwyWU9wbqoL
 pbQLltc4vuhJCXEnZmqumfA/TrB35UTaQ11fIYQK4YDVhNete3fNhbK2QwqRV5Om
 /dlc/xVYZE9D8JSfuPZ4OjFrcz602QpX8MzIw3jjYirs+d6gVN5dmAjWI5GdzSeH
 hM7Oh4IZdCxEIDTFSzu/qlvikAOt4CizeFA7JXobCJdR5+hNkpWbVFYncMJCxl6c
 kHbpeXK/nRatGHcz0//0F2/1JSIo7fTQa7xxUjQHul4c/eTvCyIFd/mDQmVeGfBR
 a7fYgDvuYC+OHoetqgkP63kKrRAotohMbFur8hJit6cBmCGgvCo=
 =bTSQ
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJY1VOJAAoJEIfQlpxEBwcE7KoP/3B9blNn/T0vJwVkw0KxkKHL
 nvgRLiu9Rnb103aZlPA89cXxa21E9bjb6fQIt+Oxvh4gg/+L1fKqId3Xah8x8gNw
 FRuYZxbAKw0EmOgBT1cshLp3gKQhA2s2nTvt7BQzNvKFe2aBqTcZF98Y/8NTco25
 7SmDvZCAzsAYUDPtxnAbHU+VrwhS3o8nVIDlWxlkULAU9chkBs6hCIpOR/0+dxgL
 XXZUtrBphF4E9A4lW70QpFjN7cdOuRBFGS1MG2VcIw67s7CDXP47RWh8V9RVWRmk
 gN5uUuxGfMN5YHhULNUF8sK0dhd4LXKDbRDyTzBlkKbHsYWiHk9wKVAzYajIi+w9
 F8z6o7sOugmPuGxUI+lH1pNo5QTvVMb6rHI7+T+XoM3ElnB+SJUaboJhwZLk2zj1
 7P21Gl47XJT0qhtoBv1HLxT/+zOp3jQJeWEpqEejYUW9ebFgYicy2xLZVnMGlyXQ
 +Mqc2wX5VmtrnvWZjH820ncBoOs6MBgu+hKDiPpiuQxgsaDb8UyQG9qVwAbWKVz0
 5Pqx/Yp9lhF2575Ucmz0IB54daQa35kvivnmpMYrcnMNM2rRlQ7Cau0ENOj7Zk3z
 9OE4y/TMFaa8AfBOfdv634QFwR8kMkSCdxoYzAu5P7yuRBbD3946Q0wvgU8YMmaG
 TpS93aglnjv5pzCdfq+a
 =cLA3
 -----END PGP SIGNATURE-----

Merge tag 'bcm2835-dt-next-2017-03-21' into devicetree/next

This pull request brings in the DT nodes for enabling HDMI audio on
Raspberry Pi, and nodes to describe the DSI and SDHOST hardware
modules (which are still disabled by default).

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
Florian Fainelli 2017-03-24 10:12:31 -07:00
commit 414ce21ae2
2 changed files with 71 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/boot/dts/bcm2835-rpi.dtsi
View File

@ -69,6 +69,12 @@
bus-width = <4>;
};
&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
bus-width = <4>;
};
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
@ -92,3 +98,11 @@
power-domains = <&power RPI_POWER_DOMAIN_VEC>;
status = "okay";
};
&dsi0 {
power-domains = <&power RPI_POWER_DOMAIN_DSI0>;
};
&dsi1 {
power-domains = <&power RPI_POWER_DOMAIN_DSI1>;
};

60
arch/arm/boot/dts/bcm283x.dtsi
View File

@ -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 {
@ -347,6 +350,16 @@
arm,primecell-periphid = <0x00241011>;
};
sdhost: mmc@7e202000 {
compatible = "brcm,bcm2835-sdhost";
reg = <0x7e202000 0x100>;
interrupts = <2 24>;
clocks = <&clocks BCM2835_CLOCK_VPU>;
dmas = <&dma 13>;
dma-names = "rx-tx";
status = "disabled";
};
i2s: i2s@7e203000 {
compatible = "brcm,bcm2835-i2s";
reg = <0x7e203000 0x20>,
@ -390,6 +403,25 @@
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";
};
thermal: thermal@7e212000 {
compatible = "brcm,bcm2835-thermal";
reg = <0x7e212000 0x8>;
@ -456,6 +488,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>;
@ -499,6 +551,8 @@
clocks = <&clocks BCM2835_PLLH_PIX>,
<&clocks BCM2835_CLOCK_HSM>;
clock-names = "pixel", "hdmi";
dmas = <&dma 17>;
dma-names = "audio-rx";
status = "disabled";
};