diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-05-10 18:15:50 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-05-10 18:15:50 +0200 |
| commit | 066794f82b3355bd8302bdbb898569ee6fafcb0a (patch) | |
| tree | dd4d3d166d60931d5dfab4898cb1affbbbd73612 /arch/arm | |
| parent | bac01839b063697200d5b957b652da197b8f0b1d (diff) | |
| parent | 9036d1db4d4a9a61bcda4871a5ce844d84d3d793 (diff) | |
| download | barebox-066794f82b3355bd8302bdbb898569ee6fafcb0a.tar.gz barebox-066794f82b3355bd8302bdbb898569ee6fafcb0a.tar.xz | |
Merge branch 'for-next/mmc'
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boards/raspberry-pi/rpi-common.c | 8 | ||||
| -rw-r--r-- | arch/arm/configs/rpi_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/dts/bcm2837-rpi-3.dts | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c index bc877f853a..dd6bbd5bdd 100644 --- a/arch/arm/boards/raspberry-pi/rpi-common.c +++ b/arch/arm/boards/raspberry-pi/rpi-common.c @@ -319,6 +319,14 @@ static int rpi_clock_init(void) clkdev_add_physbase(clk, 0x20300000, NULL); clkdev_add_physbase(clk, 0x3f300000, NULL); + clk = rpi_register_firmware_clock(BCM2835_MBOX_CLOCK_ID_CORE, + "bcm2835_sdhost"); + if (IS_ERR(clk)) + return PTR_ERR(clk); + + clkdev_add_physbase(clk, 0x20202000, NULL); + clkdev_add_physbase(clk, 0x3f202000, NULL); + return 0; } postconsole_initcall(rpi_clock_init); diff --git a/arch/arm/configs/rpi_defconfig b/arch/arm/configs/rpi_defconfig index f167625c96..0ae0c42b12 100644 --- a/arch/arm/configs/rpi_defconfig +++ b/arch/arm/configs/rpi_defconfig @@ -66,12 +66,12 @@ CONFIG_SERIAL_AMBA_PL011=y CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_MCI=y CONFIG_MCI_BCM283X=y +CONFIG_MCI_BCM283X_SDHOST=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_LED_TRIGGERS=y CONFIG_WATCHDOG=y CONFIG_WATCHDOG_BCM2835=y -CONFIG_PINCTRL=y CONFIG_PINCTRL_BCM283X=y CONFIG_REGULATOR=y CONFIG_FS_EXT4=y diff --git a/arch/arm/dts/bcm2837-rpi-3.dts b/arch/arm/dts/bcm2837-rpi-3.dts index 51883613ce..420525b9e8 100644 --- a/arch/arm/dts/bcm2837-rpi-3.dts +++ b/arch/arm/dts/bcm2837-rpi-3.dts @@ -11,10 +11,5 @@ }; &sdhci { - pinctrl-0 = <&emmc_gpio48>; - /delete-node/ wifi@1; -}; - -&sdhost { status = "disabled"; }; |