raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

BCM270x_DT: add bcm2835-mmc entry

Browse Source 
Add Device Tree entry for bcm2835-mmc.
In non-DT mode, don't add the device in the board file.

Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
This commit is contained in:
Noralf Trønnes
2015-03-24 15:12:35 +01:00
committed by popcornmix
parent 2069fa6f92
commit f239aede66
7 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
View File

@@ -44,6 +44,11 @@
};
};
&mmc {
status = "okay";
bus-width = <4>;
};
&spi0 {
pinctrl-names = "default";
pinctrl-0 = <&spi0_pins>;

5
arch/arm/boot/dts/bcm2708-rpi-b.dts
View File

@@ -44,6 +44,11 @@
};
};
&mmc {
status = "okay";
bus-width = <4>;
};
&spi0 {
pinctrl-names = "default";
pinctrl-0 = <&spi0_pins>;

19
arch/arm/boot/dts/bcm2708.dtsi
View File

@@ -41,6 +41,17 @@
#interrupt-cells = <2>;
};
mmc: mmc@7e300000 {
compatible = "brcm,bcm2835-mmc";
reg = <0x7e300000 0x100>;
interrupts = <2 30>;
clocks = <&clk_mmc>;
dmas = <&dma 11>,
<&dma 11>;
dma-names = "tx", "rx";
status = "disabled";
};
i2s: i2s@7e203000 {
compatible = "brcm,bcm2708-i2s";
reg = <0x7e203000 0x20>,
@@ -96,6 +107,14 @@
#address-cells = <1>;
#size-cells = <0>;
clk_mmc: clock@0 {
compatible = "fixed-clock";
reg = <0>;
#clock-cells = <0>;
clock-output-names = "mmc";
clock-frequency = <250000000>;
};
clk_i2c: i2c {
compatible = "fixed-clock";
reg = <1>;

5
arch/arm/boot/dts/bcm2709-rpi-2-b.dts
View File

@@ -44,6 +44,11 @@
};
};
&mmc {
status = "okay";
bus-width = <4>;
};
&spi0 {
pinctrl-names = "default";
pinctrl-0 = <&spi0_pins>;

19
arch/arm/boot/dts/bcm2709.dtsi
View File

@@ -41,6 +41,17 @@
#interrupt-cells = <2>;
};
mmc: mmc@7e300000 {
compatible = "brcm,bcm2835-mmc";
reg = <0x7e300000 0x100>;
interrupts = <2 30>;
clocks = <&clk_mmc>;
dmas = <&dma 11>,
<&dma 11>;
dma-names = "tx", "rx";
status = "disabled";
};
i2s: i2s@7e203000 {
compatible = "brcm,bcm2708-i2s";
reg = <0x7e203000 0x20>,
@@ -97,6 +108,14 @@
#address-cells = <1>;
#size-cells = <0>;
clk_mmc: clock@0 {
compatible = "fixed-clock";
reg = <0>;
#clock-cells = <0>;
clock-output-names = "mmc";
clock-frequency = <250000000>;
};
clk_i2c: i2c {
compatible = "fixed-clock";
reg = <1>;

2
arch/arm/mach-bcm2708/bcm2708.c
View File

@@ -885,7 +885,7 @@ void __init bcm2708_init(void)
bcm_register_device(&bcm2708_powerman_device);
#ifdef CONFIG_MMC_BCM2835
bcm_register_device(&bcm2835_emmc_device);
bcm_register_device_dt(&bcm2835_emmc_device);
#endif
bcm2708_init_led();
for (i = 0; i < ARRAY_SIZE(bcm2708_alsa_devices); i++)

2
arch/arm/mach-bcm2709/bcm2709.c
View File

@@ -909,7 +909,7 @@ void __init bcm2709_init(void)
bcm_register_device(&bcm2708_powerman_device);
#ifdef CONFIG_MMC_BCM2835
bcm_register_device(&bcm2835_emmc_device);
bcm_register_device_dt(&bcm2835_emmc_device);
#endif
bcm2709_init_led();
for (i = 0; i < ARRAY_SIZE(bcm2708_alsa_devices); i++)