* [PATCH 1/3] ARM: bcm2835: Fix grammar in help message
@ 2013-12-27 2:43 Stephen Warren
2013-12-27 2:43 ` [PATCH 2/3] ARM: bcm2835: add USB controller to device tree Stephen Warren
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Stephen Warren @ 2013-12-27 2:43 UTC (permalink / raw)
To: linux-arm-kernel
From: Stefan Weil <sw@weilnetz•de>
Replace "is use" by "is used" and remove a comma.
Signed-off-by: Stefan Weil <sw@weilnetz•de>
Signed-off-by: Stephen Warren <swarren@wwwdotorg•org>
---
Since I only have 3 patches for bcm2835 this kernel cycle, and they'll
likely go into different branches, I'm just re-sending them for direct
application. These patches are already in linux-next, but since there
are no linux-next being built at the moment, I've reset bcm2835's
for-next to remove them, so there will be no conflict.
I imagine this would go into a "soc" branch in arm-soc.
arch/arm/mach-bcm2835/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-bcm2835/Kconfig b/arch/arm/mach-bcm2835/Kconfig
index 560045ca..d1f9612 100644
--- a/arch/arm/mach-bcm2835/Kconfig
+++ b/arch/arm/mach-bcm2835/Kconfig
@@ -12,4 +12,4 @@ config ARCH_BCM2835
select PINCTRL_BCM2835
help
This enables support for the Broadcom BCM2835 SoC. This SoC is
- use in the Raspberry Pi, and Roku 2 devices.
+ used in the Raspberry Pi and Roku 2 devices.
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/3] ARM: bcm2835: add USB controller to device tree
2013-12-27 2:43 [PATCH 1/3] ARM: bcm2835: Fix grammar in help message Stephen Warren
@ 2013-12-27 2:43 ` Stephen Warren
2013-12-27 2:43 ` [PATCH 3/3] ARM: bcm2835: bcm2835_defconfig updates Stephen Warren
2014-01-02 20:08 ` [PATCH 1/3] ARM: bcm2835: Fix grammar in help message Olof Johansson
2 siblings, 0 replies; 4+ messages in thread
From: Stephen Warren @ 2013-12-27 2:43 UTC (permalink / raw)
To: linux-arm-kernel
The BCM2835 SoC contains a DWC2 USB controller. Add this to the DT.
Set up the pin controller to fully enable the USB controller on the
Raspberry Pi. The GPIO setup works because the default output value for
GPIO 6 (LAN_RUN/n_reset) just happens to be 1, which enables the
USB/LAN chip.
Note that you'll need a U-Boot which enables power to the USB controller;
search for U-Boot patch "ARM: rpi_b: power on SDHCI and USB HW modules".
Signed-off-by: Stephen Warren <swarren@wwwdotorg•org>
---
I imagine this will go into a dt or boards branch.
arch/arm/boot/dts/bcm2835-rpi-b.dts | 9 +++++++--
arch/arm/boot/dts/bcm2835.dtsi | 6 ++++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
index 6e9deb7..2a3b1c1 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -23,10 +23,15 @@
&gpio {
pinctrl-names = "default";
- pinctrl-0 = <&alt0 &alt3>;
+ pinctrl-0 = <&gpioout &alt0 &alt3>;
+
+ gpioout: gpioout {
+ brcm,pins = <6>;
+ brcm,function = <1>; /* GPIO out */
+ };
alt0: alt0 {
- brcm,pins = <0 1 2 3 4 5 6 7 8 9 10 11 14 15 40 45>;
+ brcm,pins = <0 1 2 3 4 5 7 8 9 10 11 14 15 40 45>;
brcm,function = <4>; /* alt0 */
};
diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
index 1e12aef..71a78f7 100644
--- a/arch/arm/boot/dts/bcm2835.dtsi
+++ b/arch/arm/boot/dts/bcm2835.dtsi
@@ -103,6 +103,12 @@
clocks = <&clk_mmc>;
status = "disabled";
};
+
+ usb {
+ compatible = "brcm,bcm2835-usb";
+ reg = <0x7e980000 0x10000>;
+ interrupts = <1 9>;
+ };
};
clocks {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 3/3] ARM: bcm2835: bcm2835_defconfig updates
2013-12-27 2:43 [PATCH 1/3] ARM: bcm2835: Fix grammar in help message Stephen Warren
2013-12-27 2:43 ` [PATCH 2/3] ARM: bcm2835: add USB controller to device tree Stephen Warren
@ 2013-12-27 2:43 ` Stephen Warren
2014-01-02 20:08 ` [PATCH 1/3] ARM: bcm2835: Fix grammar in help message Olof Johansson
2 siblings, 0 replies; 4+ messages in thread
From: Stephen Warren @ 2013-12-27 2:43 UTC (permalink / raw)
To: linux-arm-kernel
Rebuild bcm2835_defconfig using "make bcm2835_defconfig;
make savedefconfig", and add the following features:
* Enable the DWC2 USB controller present in the BCM2835 SoC.
* Enable drivers for various USB-hosted devices, which make the
controller useful.
Signed-off-by: Stephen Warren <swarren@wwwdotorg•org>
---
arch/arm/configs/bcm2835_defconfig | 37 ++++++++++++++++++++++--------------
1 file changed, 23 insertions(+), 14 deletions(-)
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig
index 34e9780..f43392d 100644
--- a/arch/arm/configs/bcm2835_defconfig
+++ b/arch/arm/configs/bcm2835_defconfig
@@ -44,17 +44,26 @@ CONFIG_VFP=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
# CONFIG_SUSPEND is not set
CONFIG_NET=y
+CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y
CONFIG_NETWORK_SECMARK=y
-# CONFIG_WIRELESS is not set
+CONFIG_NETFILTER=y
+CONFIG_CFG80211=y
+CONFIG_MAC80211=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_NETDEVICES=y
+CONFIG_USB_USBNET=y
+CONFIG_USB_NET_SMSC95XX=y
+CONFIG_ZD1211RW=y
+CONFIG_INPUT_EVDEV=y
# CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_AMBA_PL011=y
@@ -71,15 +80,13 @@ CONFIG_FB=y
CONFIG_FB_SIMPLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_USB_SUPPORT is not set
+CONFIG_USB=y
+CONFIG_USB_STORAGE=y
CONFIG_MMC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MMC_SDHCI_BCM2835=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_ONESHOT=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
@@ -88,6 +95,8 @@ CONFIG_LEDS_TRIGGER_GPIO=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_LEDS_TRIGGER_TRANSIENT=y
CONFIG_LEDS_TRIGGER_CAMERA=y
+CONFIG_STAGING=y
+CONFIG_USB_DWC2=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
@@ -109,20 +118,20 @@ CONFIG_NLS_ASCII=y
CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_UTF8=y
CONFIG_PRINTK_TIME=y
+CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DEBUG_INFO=y
# CONFIG_ENABLE_WARN_DEPRECATED is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_UNUSED_SYMBOLS=y
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_LOCKUP_DETECTOR=y
CONFIG_SCHED_TRACER=y
CONFIG_STACK_TRACER=y
CONFIG_FUNCTION_PROFILER=y
-CONFIG_DYNAMIC_DEBUG=y
+CONFIG_TEST_KSTRTOX=y
CONFIG_KGDB=y
CONFIG_KGDB_KDB=y
-CONFIG_TEST_KSTRTOX=y
CONFIG_STRICT_DEVMEM=y
CONFIG_DEBUG_LL=y
CONFIG_EARLY_PRINTK=y
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 1/3] ARM: bcm2835: Fix grammar in help message
2013-12-27 2:43 [PATCH 1/3] ARM: bcm2835: Fix grammar in help message Stephen Warren
2013-12-27 2:43 ` [PATCH 2/3] ARM: bcm2835: add USB controller to device tree Stephen Warren
2013-12-27 2:43 ` [PATCH 3/3] ARM: bcm2835: bcm2835_defconfig updates Stephen Warren
@ 2014-01-02 20:08 ` Olof Johansson
2 siblings, 0 replies; 4+ messages in thread
From: Olof Johansson @ 2014-01-02 20:08 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Dec 26, 2013 at 07:43:09PM -0700, Stephen Warren wrote:
> From: Stefan Weil <sw@weilnetz•de>
>
> Replace "is use" by "is used" and remove a comma.
>
> Signed-off-by: Stefan Weil <sw@weilnetz•de>
> Signed-off-by: Stephen Warren <swarren@wwwdotorg•org>
> ---
> Since I only have 3 patches for bcm2835 this kernel cycle, and they'll
> likely go into different branches, I'm just re-sending them for direct
> application. These patches are already in linux-next, but since there
> are no linux-next being built at the moment, I've reset bcm2835's
> for-next to remove them, so there will be no conflict.
>
> I imagine this would go into a "soc" branch in arm-soc.
Applied 1-3 (in next/fixes-non-critical, next/dt and next/boards respectively)
-Olof
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-01-02 20:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-27 2:43 [PATCH 1/3] ARM: bcm2835: Fix grammar in help message Stephen Warren
2013-12-27 2:43 ` [PATCH 2/3] ARM: bcm2835: add USB controller to device tree Stephen Warren
2013-12-27 2:43 ` [PATCH 3/3] ARM: bcm2835: bcm2835_defconfig updates Stephen Warren
2014-01-02 20:08 ` [PATCH 1/3] ARM: bcm2835: Fix grammar in help message Olof Johansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox