leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for omap3 that are not urgent. Mostly to remove unnecessary

Browse Source 
noise during the boot with pointless errors and warnings.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUYkA4AAoJEBvUPslcq6VzZ10QANjwZe9kOMdj4RXpcHfE5Mm6
 q9eTyhO9umRlEIP5rJZxmejFxyNT9SdFSMYBX6sgSI5emRdkFQvTxIpuju2iLCEH
 RRRXYfqgGM1dQsE7GFJ4knWwICAdMh8NvvilcWrGb6hbbUFd617goxGiByQTZ2oF
 2vttweeKtqVUWmJm7+Z+1SISwkA2Lfw2up9MbfCa3Z/v4VzXqUJQjtN/bJS/d+Ma
 zKtohPzDkn2zIcUE/etWUU5QWNKnBFEYr7hYWGwIjlsRX0n7Jj8mPrb21qBGUd/9
 grXNBrHTPVBQaCOdjnJ/rSD1uNqWayMyd9UmjYnPjoJkxcjZrjzX/3y8p88cQ5Vk
 wFki7bXnCejo1BONx1VY9qgOK4b6JK5rSVJsIw/9OLLCKXzfcUraan8dAgB5g9/N
 Rbf3rHQpmxFNhQ1lH98JkQaIL4xuoeysHmLTVajCIkp+fRCwxyG6KKPiogJzAIiF
 RY6eIh24thJrmI4m8GQNL3U/6kmYvsK0pod9TAxjgsddreVZZqr/AdBS/ZOP6l2b
 Aknthcnn/Hp9aD1QiQyVn34McQ2L507zM/YwTlA49hDHs1GFkp9mT4AgSAuY5z5l
 eRKSlWYmSJ+WlqxdnEZWQIPV+qtl0MmtejzYNKR6VMRXQIPPAFSXNaZo/LiwCcbS
 /mLBfzR6zUKNy0brTAXb
 =NTDU
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.19/fixes-not-urgent-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

Pull "omap non-urgent fixes for v3.19" from Tony Lindgren:

Fixes for omap3 that are not urgent. Mostly to remove unnecessary
noise during the boot with pointless errors and warnings.

* tag 'omap-for-v3.19/fixes-not-urgent-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP: serial: remove last vestige of DTR_gpio support.
  ARM: OMAP2+: gpmc: Get rid of "ti,elm-id not found" warning
  ARM: OMAP2: Remove unnecessary KERN_* in omap_phy_internal.c
  ARM: OMAP4+: Remove unused omap_l3_noc platform init
  ARM: dts: Add twl keypad map for omap3 EVM
  ARM: dts: Add twl keypad map for LDP
  ARM: dts: Fix NAND last partition size on LDP
  ARM: OMAP3: Fix errors for omap_l3_smx when booted with device tree

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2014-11-20 10:44:26 +01:00
commit d6aedc4ab8
9 changed files with 71 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/arm/boot/dts/omap3-evm-common.dtsi
View File

@ -2,6 +2,7 @@
* Common support for omap3 EVM boards
*/
#include <dt-bindings/input/input.h>
#include "omap-gpmc-smsc911x.dtsi"
/ {
@ -111,6 +112,26 @@
ti,use-leds;
};
&twl_keypad {
linux,keymap = <
MATRIX_KEY(2, 2, KEY_1)
MATRIX_KEY(1, 1, KEY_2)
MATRIX_KEY(0, 0, KEY_3)
MATRIX_KEY(3, 2, KEY_4)
MATRIX_KEY(2, 1, KEY_5)
MATRIX_KEY(1, 0, KEY_6)
MATRIX_KEY(1, 3, KEY_7)
MATRIX_KEY(3, 1, KEY_8)
MATRIX_KEY(2, 0, KEY_9)
MATRIX_KEY(2, 3, KEY_KPASTERISK)
MATRIX_KEY(0, 2, KEY_0)
MATRIX_KEY(3, 0, KEY_KPDOT)
/* s4 not wired */
MATRIX_KEY(1, 2, KEY_BACKSPACE)
MATRIX_KEY(0, 1, KEY_ENTER)
>;
};
&usb_otg_hs {
interface-type = <0>;
usb-phy = <&usb2_phy>;

23
arch/arm/boot/dts/omap3-ldp.dts
View File

@ -7,6 +7,7 @@
*/
/dts-v1/;
#include <dt-bindings/input/input.h>
#include "omap34xx.dtsi"
#include "omap-gpmc-smsc911x.dtsi"
@ -141,7 +142,7 @@
};
partition@2000000 {
label = "Filesystem";
reg = <0x2000000 0xe000000>;
reg = <0x2000000 0x6000000>;
};
};
@ -263,6 +264,26 @@
};
};
&twl_keypad {
linux,keymap = <MATRIX_KEY(0, 0, KEY_1)
MATRIX_KEY(0, 1, KEY_2)
MATRIX_KEY(0, 2, KEY_3)
MATRIX_KEY(1, 0, KEY_4)
MATRIX_KEY(1, 1, KEY_5)
MATRIX_KEY(1, 2, KEY_6)
MATRIX_KEY(1, 3, KEY_F5)
MATRIX_KEY(2, 0, KEY_7)
MATRIX_KEY(2, 1, KEY_8)
MATRIX_KEY(2, 2, KEY_9)
MATRIX_KEY(2, 3, KEY_F6)
MATRIX_KEY(3, 0, KEY_F7)
MATRIX_KEY(3, 1, KEY_0)
MATRIX_KEY(3, 2, KEY_F8)
MATRIX_KEY(5, 4, KEY_RESERVED)
MATRIX_KEY(4, 4, KEY_VOLUMEUP)
MATRIX_KEY(5, 5, KEY_VOLUMEDOWN)>;
};
&uart3 {
interrupts-extended = <&intc 74 &omap3_pmx_core OMAP3_UART3_RX>;
};

2
arch/arm/boot/dts/omap3.dtsi
View File

@ -79,7 +79,7 @@
* hierarchy.
*/
ocp {
compatible = "simple-bus";
compatible = "ti,omap3-l3-smx", "simple-bus";
reg = <0x68000000 0x10000>;
interrupts = <9 10>;
#address-cells = <1>;

36
arch/arm/mach-omap2/devices.c
View File

@ -49,7 +49,7 @@ static int __init omap3_l3_init(void)
* To avoid code running on other OMAPs in
* multi-omap builds
*/
if (!(cpu_is_omap34xx()))
if (!(cpu_is_omap34xx()) || of_have_populated_dt())
return -ENODEV;
snprintf(oh_name, L3_MODULES_MAX_LEN, "l3_main");
@ -67,40 +67,6 @@ static int __init omap3_l3_init(void)
}
omap_postcore_initcall(omap3_l3_init);
static int __init omap4_l3_init(void)
{
int i;
struct omap_hwmod *oh[3];
struct platform_device *pdev;
char oh_name[L3_MODULES_MAX_LEN];
/* If dtb is there, the devices will be created dynamically */
if (of_have_populated_dt())
return -ENODEV;
/*
* To avoid code running on other OMAPs in
* multi-omap builds
*/
if (!cpu_is_omap44xx() && !soc_is_omap54xx())
return -ENODEV;
for (i = 0; i < L3_MODULES; i++) {
snprintf(oh_name, L3_MODULES_MAX_LEN, "l3_main_%d", i+1);
oh[i] = omap_hwmod_lookup(oh_name);
if (!(oh[i]))
pr_err("could not look up %s\n", oh_name);
}
pdev = omap_device_build_ss("omap_l3_noc", 0, oh, 3, NULL, 0);
WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name);
return PTR_RET(pdev);
}
omap_postcore_initcall(omap4_l3_init);
#if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)
static struct resource omap2cam_resources[] = {

2
arch/arm/mach-omap2/gpmc.c
View File

@ -1394,8 +1394,6 @@ static int gpmc_probe_nand_child(struct platform_device *pdev,
if (gpmc_nand_data->elm_of_node == NULL)
gpmc_nand_data->elm_of_node =
of_parse_phandle(child, "elm_id", 0);
if (gpmc_nand_data->elm_of_node == NULL)
pr_warn("%s: ti,elm-id property not found\n", __func__);
/* select ecc-scheme for NAND */
if (of_property_read_string(child, "ti,nand-ecc-opt", &s)) {

8
arch/arm/mach-omap2/omap_phy_internal.c
View File

@ -21,6 +21,8 @@
*
*/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/types.h>
#include <linux/delay.h>
#include <linux/clk.h>
@ -97,13 +99,13 @@ void am35x_musb_phy_power(u8 on)
omap_ctrl_writel(devconf2, AM35XX_CONTROL_DEVCONF2);
pr_info(KERN_INFO "Waiting for PHY clock good...\n");
pr_info("Waiting for PHY clock good...\n");
while (!(omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2)
& CONF2_PHYCLKGD)) {
cpu_relax();
if (time_after(jiffies, timeout)) {
pr_err(KERN_ERR "musb PHY clock good timed out\n");
pr_err("musb PHY clock good timed out\n");
break;
}
}
@ -145,7 +147,7 @@ void am35x_set_mode(u8 musb_mode)
devconf2 |= CONF2_NO_OVERRIDE;
break;
default:
pr_info(KERN_INFO "Unsupported mode %u\n", musb_mode);
pr_info("Unsupported mode %u\n", musb_mode);
}
omap_ctrl_writel(devconf2, AM35XX_CONTROL_DEVCONF2);

3
arch/arm/mach-omap2/serial.c
View File

@ -263,9 +263,6 @@ void __init omap_serial_init_port(struct omap_board_data *bdata,
omap_up.dma_rx_timeout = info->dma_rx_timeout;
omap_up.dma_rx_poll_rate = info->dma_rx_poll_rate;
omap_up.autosuspend_timeout = info->autosuspend_timeout;
omap_up.DTR_gpio = info->DTR_gpio;
omap_up.DTR_inverted = info->DTR_inverted;
omap_up.DTR_present = info->DTR_present;
pdata = &omap_up;
pdata_size = sizeof(struct omap_uart_port_info);

26
drivers/bus/omap_l3_smx.c
View File

@ -27,6 +27,10 @@
#include <linux/platform_device.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_device.h>
#include "omap_l3_smx.h"
static inline u64 omap3_l3_readll(void __iomem *base, u16 reg)
@ -211,7 +215,17 @@ static irqreturn_t omap3_l3_app_irq(int irq, void *_l3)
return ret;
}
static int __init omap3_l3_probe(struct platform_device *pdev)
#if IS_BUILTIN(CONFIG_OF)
static const struct of_device_id omap3_l3_match[] = {
{
.compatible = "ti,omap3-l3-smx",
},
{ },
};
MODULE_DEVICE_TABLE(of, omap3_l3_match);
#endif
static int omap3_l3_probe(struct platform_device *pdev)
{
struct omap3_l3 *l3;
struct resource *res;
@ -265,7 +279,7 @@ err0:
return ret;
}
static int __exit omap3_l3_remove(struct platform_device *pdev)
static int omap3_l3_remove(struct platform_device *pdev)
{
struct omap3_l3 *l3 = platform_get_drvdata(pdev);
@ -278,15 +292,17 @@ static int __exit omap3_l3_remove(struct platform_device *pdev)
}
static struct platform_driver omap3_l3_driver = {
.remove = __exit_p(omap3_l3_remove),
.probe = omap3_l3_probe,
.remove = omap3_l3_remove,
.driver = {
.name = "omap_l3_smx",
.name = "omap_l3_smx",
.of_match_table = of_match_ptr(omap3_l3_match),
},
};
static int __init omap3_l3_init(void)
{
return platform_driver_probe(&omap3_l3_driver, omap3_l3_probe);
return platform_driver_register(&omap3_l3_driver);
}
postcore_initcall_sync(omap3_l3_init);

3
include/linux/platform_data/serial-omap.h
View File

@ -38,9 +38,6 @@ struct omap_uart_port_info {
unsigned int dma_rx_timeout;
unsigned int autosuspend_timeout;
unsigned int dma_rx_poll_rate;
int DTR_gpio;
int DTR_inverted;
int DTR_present;
int (*get_context_loss_count)(struct device *);
void (*enable_wakeup)(struct device *, bool);