Merge pull request #980 from notro/power

BCM270x: Move power module
raspberrypi · May 28, 2015 · 886477a · 886477a
2 parents 9f3236d + a742dce
commit 886477a
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 333 deletions.
diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
@@ -6,7 +6,7 @@
 	interrupt-parent = <&intc>;
 
 	chosen {
-		bootargs = "earlyprintk console=ttyAMA0";
+		bootargs = "";
 	};
 
 	soc {

diff --git a/arch/arm/mach-bcm2708/Makefile b/arch/arm/mach-bcm2708/Makefile
@@ -2,6 +2,6 @@
 # Makefile for the linux kernel.
 #
 
-obj-$(CONFIG_MACH_BCM2708) 	+= bcm2708.o armctrl.o power.o
+obj-$(CONFIG_MACH_BCM2708) 	+= bcm2708.o armctrl.o
 obj-$(CONFIG_BCM2708_GPIO)	+= bcm2708_gpio.o
 obj-$(CONFIG_BCM2708_VCMEM)	+= vc_mem.o
diff --git a/arch/arm/mach-bcm2708/include/mach/power.h b/arch/arm/mach-bcm2708/include/mach/power.h
diff --git a/arch/arm/mach-bcm2709/Makefile b/arch/arm/mach-bcm2709/Makefile
@@ -2,6 +2,6 @@
 # Makefile for the linux kernel.
 #
 
-obj-$(CONFIG_MACH_BCM2709) 	+= bcm2709.o armctrl.o power.o
+obj-$(CONFIG_MACH_BCM2709) 	+= bcm2709.o armctrl.o
 obj-$(CONFIG_BCM2708_GPIO)	+= bcm2708_gpio.o
 obj-$(CONFIG_BCM2708_VCMEM)	+= vc_mem.o
diff --git a/arch/arm/mach-bcm2709/include/mach/arm_power.h b/arch/arm/mach-bcm2709/include/mach/arm_power.h
diff --git a/arch/arm/mach-bcm2709/include/mach/power.h b/arch/arm/mach-bcm2709/include/mach/power.h
diff --git a/arch/arm/mach-bcm2709/power.c b/arch/arm/mach-bcm2709/power.c
diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig
@@ -1,5 +1,6 @@
 menu "SOC (System On Chip) specific Drivers"
 
+source "drivers/soc/bcm2835/Kconfig"
 source "drivers/soc/qcom/Kconfig"
 source "drivers/soc/ti/Kconfig"
 source "drivers/soc/versatile/Kconfig"

diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
@@ -2,6 +2,7 @@
 # Makefile for the Linux Kernel SOC specific device drivers.
 #
 
+obj-y				+= bcm2835/
 obj-$(CONFIG_ARCH_QCOM)		+= qcom/
 obj-$(CONFIG_ARCH_TEGRA)	+= tegra/
 obj-$(CONFIG_SOC_TI)		+= ti/

diff --git a/drivers/soc/bcm2835/Kconfig b/drivers/soc/bcm2835/Kconfig
@@ -0,0 +1,9 @@
+#
+# BCM2835 Soc drivers
+#
+config BCM2708_POWER
+        tristate "BCM2708 legacy power driver"
+        depends on (ARCH_BCM2708 || ARCH_BCM2709 || ARCH_BCM2835) && BCM2708_MBOX
+        default y
+        help
+          Turns on USB power and provides an API for controlling power.
diff --git a/drivers/soc/bcm2835/Makefile b/drivers/soc/bcm2835/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_BCM2708_POWER)	+= bcm2708-power.o
diff --git a/arch/arm/mach-bcm2708/power.c → drivers/soc/bcm2835/bcm2708-power.c b/arch/arm/mach-bcm2708/power.c → drivers/soc/bcm2835/bcm2708-power.c
@@ -15,8 +15,7 @@
 #include <linux/semaphore.h>
 #include <linux/bug.h>
 #include <linux/platform_data/mailbox-bcm2708.h>
-#include <mach/power.h>
-#include <mach/arm_power.h>
+#include <soc/bcm2835/power.h>
 
 #define DRIVER_NAME "bcm2708_power"