Skip to content

Commit

Permalink
kernel bump: v4.3-rc3
Browse files Browse the repository at this point in the history
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  • Loading branch information
RobertCNelson committed Sep 27, 2015
1 parent abb39ad commit aba538a
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 26 deletions.
3 changes: 1 addition & 2 deletions patch.sh
Expand Up @@ -119,7 +119,7 @@ reverts () {
#udoo:
${git} "${DIR}/patches/reverts/0003-Revert-usb-chipidea-usbmisc_imx-delete-clock-informa.patch"
#am335x causing random reboots...
${git} "${DIR}/patches/reverts/0004-Revert-usb-musb-dsps-just-start-polling-already.patch"
# ${git} "${DIR}/patches/reverts/0004-Revert-usb-musb-dsps-just-start-polling-already.patch"

if [ "x${regenerate}" = "xenable" ] ; then
number=4
Expand Down Expand Up @@ -191,7 +191,6 @@ dts () {
${git} "${DIR}/patches/dts/0002-ARM-dts-omap3-beagle-xm-spidev.patch"
${git} "${DIR}/patches/dts/0003-ARM-DTS-omap3-beagle.dts-enable-twl4030-power-reset.patch"
${git} "${DIR}/patches/dts/0004-arm-dts-omap4-move-emif-so-panda-es-b3-now-boots.patch"
${git} "${DIR}/patches/dts/0005-ARM-dts-omap3-beagle-ddc-i2c-bus-is-not-responding-d.patch"
${git} "${DIR}/patches/dts/0006-first-pass-imx6q-ccimx6sbc.patch"
${git} "${DIR}/patches/dts/0007-imx6-wl1835-base-boards.patch"
${git} "${DIR}/patches/dts/0008-imx6q-sabresd-add-support-for-wilink8-wlan-and-bluet.patch"
Expand Down
2 changes: 1 addition & 1 deletion patches/defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.3.0-rc2 Kernel Configuration
# Linux/arm 4.3.0-rc3 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
Expand Down
2 changes: 1 addition & 1 deletion patches/defconfig-bone
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.3.0-rc2 Kernel Configuration
# Linux/arm 4.3.0-rc3 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
Expand Down
2 changes: 1 addition & 1 deletion patches/defconfig-lpae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.3.0-rc2 Kernel Configuration
# Linux/arm 4.3.0-rc3 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
Expand Down
2 changes: 1 addition & 1 deletion patches/example_imx_v6_v7_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.3.0-rc2 Kernel Configuration
# Linux/arm 4.3.0-rc3 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
Expand Down
12 changes: 6 additions & 6 deletions patches/example_omap2plus_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.3.0-rc2 Kernel Configuration
# Linux/arm 4.3.0-rc3 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
Expand Down Expand Up @@ -1925,8 +1925,8 @@ CONFIG_GPIO_OMAP=y
# CONFIG_GPIO_ADNP is not set
# CONFIG_GPIO_MAX7300 is not set
# CONFIG_GPIO_MAX732X is not set
# CONFIG_GPIO_PCA953X is not set
CONFIG_GPIO_PCF857X=m
CONFIG_GPIO_PCA953X=m
CONFIG_GPIO_PCF857X=y
# CONFIG_GPIO_SX150X is not set

#
Expand Down Expand Up @@ -2816,8 +2816,8 @@ CONFIG_USB_MUSB_AM335X_CHILD=m
# MUSB DMA mode
#
# CONFIG_MUSB_PIO_ONLY is not set
# CONFIG_USB_INVENTRA_DMA is not set
# CONFIG_USB_TI_CPPI41_DMA is not set
CONFIG_USB_INVENTRA_DMA=y
CONFIG_USB_TI_CPPI41_DMA=y
CONFIG_USB_DWC3=m
# CONFIG_USB_DWC3_HOST is not set
# CONFIG_USB_DWC3_GADGET is not set
Expand Down Expand Up @@ -3146,7 +3146,7 @@ CONFIG_DMA_OMAP=y
# CONFIG_FSL_EDMA is not set
# CONFIG_IDMA64 is not set
# CONFIG_NBPFAXI_DMA is not set
# CONFIG_TI_CPPI41 is not set
CONFIG_TI_CPPI41=m
CONFIG_TI_DMA_CROSSBAR=y
CONFIG_TI_EDMA=y
# CONFIG_DW_DMAC is not set
Expand Down
2 changes: 1 addition & 1 deletion patches/example_sunxi_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.3.0-rc2 Kernel Configuration
# Linux/arm 4.3.0-rc3 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
Expand Down
2 changes: 1 addition & 1 deletion patches/example_tegra_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.3.0-rc2 Kernel Configuration
# Linux/arm 4.3.0-rc3 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
Expand Down
3 changes: 2 additions & 1 deletion patches/ref_multi_v7_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.3.0-rc2 Kernel Configuration
# Linux/arm 4.3.0-rc3 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
Expand Down Expand Up @@ -5227,6 +5227,7 @@ CONFIG_RAS=y
CONFIG_ARM_PSCI_FW=y
# CONFIG_FIRMWARE_MEMMAP is not set
CONFIG_QCOM_SCM=y
CONFIG_QCOM_SCM_32=y
# CONFIG_BCM47XX_NVRAM is not set

#
Expand Down
Expand Up @@ -22,10 +22,10 @@ Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
create mode 100644 arch/arm/mach-omap2/opp43xx_data.c

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index f2b2272..e30405c 100644
index 603c38f..ce0aa5c 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -78,6 +78,7 @@ ifeq ($(CONFIG_PM_OPP),y)
@@ -77,6 +77,7 @@ ifeq ($(CONFIG_PM_OPP),y)
obj-y += opp.o
obj-$(CONFIG_ARCH_OMAP3) += opp3xxx_data.o
obj-$(CONFIG_SOC_AM33XX) += opp33xx_data.o
Expand All @@ -34,17 +34,17 @@ index f2b2272..e30405c 100644
endif

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 051c5ae..909c9a4 100644
index 35aee54..18ffee9 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -622,6 +622,7 @@ void __init am43xx_init_early(void)
@@ -677,6 +677,7 @@ void __init am43xx_init_early(void)

void __init am43xx_init_late(void)
{
+ am43xx_opp_init();
omap_common_late_init();
omap2_clk_enable_autoidle_all();
}
#endif
diff --git a/arch/arm/mach-omap2/opp43xx_data.c b/arch/arm/mach-omap2/opp43xx_data.c
new file mode 100644
index 0000000..303fba2
Expand Down Expand Up @@ -164,7 +164,7 @@ index 0000000..303fba2
+ return r;
+}
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h
index 1656d1b..9f83b65 100644
index 09f7516..70b549f 100644
--- a/arch/arm/mach-omap2/pm.h
+++ b/arch/arm/mach-omap2/pm.h
@@ -39,6 +39,7 @@ extern int omap_pm_clkdms_setup(struct clockdomain *clkdm, void *unused);
Expand All @@ -187,5 +187,5 @@ index 1656d1b..9f83b65 100644

extern int omap3_pm_get_suspend_state(struct powerdomain *pwrdm);
--
2.1.4
2.5.3

8 changes: 4 additions & 4 deletions version.sh
Expand Up @@ -13,13 +13,13 @@ toolchain="gcc_linaro_gnueabihf_4_9"

#Kernel/Build
KERNEL_REL=4.3
KERNEL_TAG=${KERNEL_REL}-rc2
BUILD=armv7-devel-r30
KERNEL_TAG=${KERNEL_REL}-rc3
BUILD=armv7-devel-r31
kernel_rt=".X-rtY"

#v4.X-rcX + upto SHA
prev_KERNEL_SHA="03e8f644868f147e021e8660346890e731c2e435"
KERNEL_SHA="518a7cb6980cd640c7f979d29021ad870f60d7d7"
#prev_KERNEL_SHA="03e8f644868f147e021e8660346890e731c2e435"
#KERNEL_SHA="518a7cb6980cd640c7f979d29021ad870f60d7d7"

#git branch
#BRANCH="v4.3.x"
Expand Down

0 comments on commit aba538a

Please sign in to comment.